diff --git a/.gitignore b/.gitignore
index 5b79863e52..c8e25cec8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 *.map
 *.swp
 .DS_Store
-npm-debug.log
 
 _Resharper.DefinitelyTyped
 bin
@@ -25,19 +24,28 @@ Properties
 # test folder
 _infrastructure/tests/build
 
+# IntelliJ based IDEs
 .idea
 *.iml
+
 *.js.map
 !*.js/
 !scripts/new-package.js
 !scripts/not-needed.js
 !scripts/lint.js
 
+# npm
 node_modules
+package-lock.json
+npm-debug.log
 
+# Sublime
 .sublimets
-.settings/launch.json
 
+# Visual Studio Code
+.settings/launch.json
 .vs
 .vscode
+
+# yarn
 yarn.lock
diff --git a/notNeededPackages.json b/notNeededPackages.json
index c89702a9f6..d6e99fbf9b 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -54,6 +54,12 @@
             "sourceRepoURL": "http://www.babylonjs.com/",
             "asOfVersion": "2.4.1"
         },
+        {
+            "libraryName": "BigInteger.js",
+            "typingsPackageName": "big-integer",
+            "sourceRepoURL": "https://github.com/peterolson/BigInteger.js",
+            "asOfVersion": "0.0.31"
+        },
         {
             "libraryName": "Bugsnag Browser",
             "typingsPackageName": "bugsnag-js",
@@ -120,6 +126,12 @@
             "sourceRepoURL": "https://github.com/bterlson/ecmarkup",
             "asOfVersion": "3.4.0"
         },
+        {
+            "libraryName": "electron",
+            "typingsPackageName": "electron",
+            "sourceRepoURL": "https://github.com/electron/electron",
+            "asOfVersion": "1.6.10"
+        },
         {
             "libraryName": "electron-builder",
             "typingsPackageName": "electron-builder",
@@ -132,6 +144,12 @@
             "sourceRepoURL": "https://github.com/primus/eventemitter3",
             "asOfVersion": "2.0.2"
         },
+        {
+            "libraryName": "express-validator",
+            "typingsPackageName": "express-validator",
+            "sourceRepoURL": "https://github.com/ctavan/express-validator",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "JSON-Patch",
             "typingsPackageName": "fast-json-patch",
@@ -222,6 +240,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/is-upper-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "jquery.ajaxfile",
+            "typingsPackageName": "jquery.ajaxfile",
+            "sourceRepoURL": "https://github.com/fpellet/jquery.ajaxFile",
+            "asOfVersion": "0.2.29"
+        },
         {
             "libraryName": "JSNLog",
             "typingsPackageName": "jsnlog",
diff --git a/qlik-engineapi/qlik-engineapi-tests.ts b/qlik-engineapi/qlik-engineapi-tests.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/types/acc-wizard/index.d.ts b/types/acc-wizard/index.d.ts
index 9c20bf3e5f..d96ef1a93a 100644
--- a/types/acc-wizard/index.d.ts
+++ b/types/acc-wizard/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sathomas/acc-wizard
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface AccWizardOptions {
     /**
@@ -110,4 +111,4 @@ interface AccWizardOptions {
  */
 interface JQuery {
     accwizard(options?: AccWizardOptions): void;
-}
\ No newline at end of file
+}
diff --git a/types/accounting/accounting-tests.ts b/types/accounting/accounting-tests.ts
index a397c559eb..41150f7a37 100644
--- a/types/accounting/accounting-tests.ts
+++ b/types/accounting/accounting-tests.ts
@@ -3,6 +3,9 @@
 // Default usage:
 accounting.formatMoney(12345678); // $12,345,678.00
 
+// Stringified usage:
+accounting.formatMoney('$4394958309392.9401'); // $4,394,958,309,392.94
+
 // European formatting (custom symbol and separators), could also use options object as second param:
 accounting.formatMoney(4999.99, "€", 2, ".", ","); // €4.999,99
 
diff --git a/types/accounting/index.d.ts b/types/accounting/index.d.ts
index ef8991999f..9a990a6519 100644
--- a/types/accounting/index.d.ts
+++ b/types/accounting/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for accounting.js 0.3
-// Project: http://josscrowcroft.github.io/accounting.js/
+// Type definitions for accounting.js 0.4
+// Project: http://openexchangerates.github.io/accounting.js/
 // Definitions by: Sergey Gerasimov <https://github.com/gerich-home/>
+//                 Christopher Eck <https://github.com/chrisleck/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace accounting {
@@ -30,9 +31,9 @@ declare namespace accounting {
     }
 
     interface Static {
-        // format any number into currency
-        formatMoney(number: number, symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string;
-        formatMoney(number: number, options: CurrencySettings<string> | CurrencySettings<CurrencyFormat>): string;
+        // format any number or stringified number into currency
+        formatMoney(number: number | string, symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string;
+        formatMoney(number: number | string, options: CurrencySettings<string> | CurrencySettings<CurrencyFormat>): string;
 
         formatMoney(numbers: number[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[];
         formatMoney(numbers: number[], options: CurrencySettings<string> | CurrencySettings<CurrencyFormat>): string[];
diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 1ac19c7c63..90466c946e 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -2643,7 +2643,9 @@ declare namespace AceAjax {
         characterWidth: number;
 
         lineHeight: number;
-
+        
+        setScrollMargin(top:number, bottom:number, left: number, right: number): void;
+        
         screenToTextCoordinates(left: number, top: number): void;
 
         /**
diff --git a/types/ace/test/virtual_renderer.ts b/types/ace/test/virtual_renderer.ts
index 74bcec2fa8..262f81e885 100644
--- a/types/ace/test/virtual_renderer.ts
+++ b/types/ace/test/virtual_renderer.ts
@@ -15,6 +15,7 @@ const aceVirtualRendererTests = {
 
         var renderer = new AceAjax.VirtualRenderer(el);
         renderer.setPadding(0);
+        renderer.setScrollMargin(0,0,0,0)
         renderer.setSession(new AceAjax.EditSession("1234"));
 
         var r = renderer.scroller.getBoundingClientRect();
diff --git a/types/acl/index.d.ts b/types/acl/index.d.ts
index 069631d2e0..3aa81de8e3 100644
--- a/types/acl/index.d.ts
+++ b/types/acl/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/optimalbits/node_acl
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="bluebird" />
 /// <reference types="node"/>
diff --git a/types/adal/index.d.ts b/types/adal/index.d.ts
index 552ca468aa..2150716b17 100644
--- a/types/adal/index.d.ts
+++ b/types/adal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AzureAD/azure-activedirectory-library-for-js
 // Definitions by: mmaitre314 <https://github.com/mmaitre314>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var AuthenticationContext: adal.AuthenticationContextStatic;
 declare var Logging: adal.Logging;
diff --git a/types/aframe/aframe-tests.ts b/types/aframe/aframe-tests.ts
new file mode 100644
index 0000000000..439d314f4a
--- /dev/null
+++ b/types/aframe/aframe-tests.ts
@@ -0,0 +1,50 @@
+// Global
+
+const threeCamera = new AFRAME.THREE.Camera();
+AFRAME.TWEEN.Easing;
+
+// Entity
+const entity = document.createElement('a-entity');
+entity.emit('rotate');
+entity.emit('collide', { target: entity });
+entity.emit('sink', null, false);
+
+const position = entity.getAttribute('position');
+position.x;
+position.y;
+position.z;
+entity.setAttribute('material', 'color', 'red');
+
+entity.components['geometry'].data;
+
+type MyEntity = AFrame.Entity<{
+	camera: THREE.Camera;
+	material: THREE.Material;
+	sound: { pause(): void };
+}>;
+const camera = document.querySelector<MyEntity>('a-entity[camera]').components.camera;
+const material = document.querySelector<MyEntity>('a-entity[material]').components.material;
+document.querySelector<MyEntity>('a-entity[sound]').components.sound.pause();
+
+entity.getDOMAttribute('geometry').primitive;
+
+entity.setAttribute('light', {
+	type: 'spot',
+	distance: 30,
+	intensity: 2.0
+});
+
+entity.addEventListener('child-detached', (event) => {
+	event.detail;
+});
+
+// Components
+const Component = AFRAME.registerComponent('test', {});
+
+// Scene
+
+const scene = document.querySelector('a-scene');
+scene.hasLoaded;
+
+// System
+const system = scene.systems['systemName'];
diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
new file mode 100644
index 0000000000..f1f5cd7a20
--- /dev/null
+++ b/types/aframe/index.d.ts
@@ -0,0 +1,328 @@
+// Type definitions for AFRAME 0.5
+// Project: https://aframe.io/
+// Definitions by: Paul Shannon <https://github.com/devpaul>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/**
+ * Extended tests available at https://github.com/devpaul/aframe-typings.git
+ */
+
+/// <reference types="three" />
+/// <reference types="tween.js" />
+
+// Globals
+declare var AFRAME: AFrame.AFrameGlobal;
+declare var hasNativeWebVRImplementation: boolean;
+
+interface NodeSelector {
+	querySelector(selectors: 'a-scene'): AFrame.Scene;
+	querySelector<T extends AFrame.Entity<any>>(selectors: string): T;
+	querySelectorAll(selectors: string): NodeListOf<AFrame.Entity<any> | Element>;
+}
+
+interface Document {
+	createElement(tagName: string): AFrame.Entity;
+}
+
+// Interfaces
+declare namespace AFrame {
+	interface ObjectMap<T = any> {
+		[ key: string ]: T;
+	}
+
+	interface AFrameGlobal {
+		AEntity: Entity;
+		ANode: ANode;
+		AScene: Scene;
+		components: { [ key: string ]: ComponentDescriptor };
+		geometries: { [ key: string ]: GeometryDescriptor };
+		primitives: { [ key: string ]: Entity };
+		registerComponent(name: string, component: ComponentDefinition): ComponentConstructor;
+		registerElement(name: string, element: ANode): void;
+		registerGeometry(name: string, geometery: THREE.Geometry): Geometry;
+		registerPrimitive(name: string, primitive: PrimitiveDefinition): void;
+		registerShader(name: string, shader: any): void;
+		registerSystem(name: string, definition: SystemDefinition): void;
+		schema: SchemaUtils;
+		shaders: { [ key: string ]: ShaderDescriptor };
+		systems: { [key: string]: System };
+		THREE: typeof THREE;
+		TWEEN: typeof TWEEN;
+		utils: Utils;
+		version: string;
+	}
+
+	interface Animation {
+		attribute: string;
+		begin: string | number;
+		delay: number;
+		direction: 'alternate' | 'alternateReverse' | 'normal' | 'reverse';
+		dur: number;
+		easing(): void;
+		end: string;
+		fill: 'backwards' | 'both' | 'forwards' | 'none';
+		from: any; // TODO type
+		repeat: number | 'indefinite';
+		to: number;
+	}
+
+	interface ANode extends HTMLElement {
+		// Only public APIs added. Many methods intentionally left out.
+		// createdCallback
+		// attachedCallback
+		// attributeChangedCallback
+		closestScene(): Scene;
+		closest(selector: string): ANode;
+		// detachedCallback
+		hasLoaded: boolean;
+		load(cb?: () => void, childFilter?: (el: Element) => boolean): void;
+		// updateMixins
+		registerMixin(id: string): void;
+		setAttribute(type: string, newValue: any): void;
+		unregisterMixin(id: string): void;
+		removeMixinListener(id: string): void;
+		attachMixinListener(mixin: HTMLElement): void;
+		emit(name: string, detail?: any, bubbles?: boolean): void;
+		emitter(name: string, detail?: any, bubbles?: boolean): () => void;
+	}
+
+	interface Behavior {
+		tick(): void;
+	}
+
+	interface Component {
+		attrName?: string;
+		data?: any;
+		dependencies?: string[];
+		el: Entity;
+		id: string;
+		multiple?: boolean;
+		name: string;
+		schema: Schema;
+
+		init(): void;
+		pause(): void;
+		play(): void;
+		remove(): void;
+		tick?(time: number, timeDelta: number): void;
+		update(oldData: any): void;
+		updateSchema?(): void;
+
+		extendSchema(update: Schema): void;
+		flushToDOM(): void;
+	}
+
+	interface ComponentConstructor {
+		new (el: Entity, name: string, id: string): Component;
+	}
+
+	interface ComponentDefinition {
+		dependencies?: string[];
+		el?: Entity;
+		id?: string;
+		multiple?: boolean;
+		schema?: Schema;
+
+		init?(): void;
+		pause?(): void;
+		play?(): void;
+		remove?(): void;
+		tick?(time: number, timeDelta: number): void;
+		update?(oldData: any): void;
+		updateSchema?(): void;
+
+		[ key: string ]: any;
+	}
+
+	interface ComponentDescriptor {
+		Component: Component;
+		dependencies: string[] | null;
+		multiple: boolean | null;
+
+		// internal APIs2
+		// parse
+		// parseAttrValueForCache
+		// schema
+		// stringify
+		// type
+		[ key: string ]: any;
+	}
+
+	interface Coordinate {
+		x: number;
+		y: number;
+		z: number;
+	}
+
+	interface Entity<C = ObjectMap<Component>> extends ANode {
+		components: C;
+		isPlaying: boolean;
+		object3D: THREE.Object3D;
+		object3DMap: ObjectMap<THREE.Object3D>;
+		sceneEl?: Scene;
+
+		addState(name: string): void;
+		flushToDOM(recursive?: boolean): void;
+		/**
+		 * @deprecated since 0.4.0
+		 */
+		getComputedAttribute<T = Component>(attr: string): T;
+		getDOMAttribute<T = any>(attr: string): T;
+		getObject3D(type: string): THREE.Object3D;
+		getOrCreateObject3D(type: string, construct: any): THREE.Object3D;
+		is(stateName: string): boolean;
+		pause(): void;
+		play(): void;
+		setObject3D(type: string, obj: THREE.Object3D): void;
+		removeAttribute(attr: string, property?: string): void;
+		removeObject3D(type: string): void;
+		removeState(stateName: string): void;
+
+		// getAttribute specific usages
+		getAttribute(type: string): any;
+		getAttribute<T = Component>(attr: string): T;
+		getAttribute(type: 'position' | 'rotation' | 'scale'): Coordinate;
+
+		// setAttribute specific usages
+		setAttribute(attr: string, value: any): void;
+		setAttribute(attr: string, property: string, componentAttrValue?: any): void;
+		setAttribute(type: 'position' | 'rotation' | 'scale', value: Coordinate): void;
+
+		// addEventListener specific usages
+		addEventListener<K extends keyof EntityEventMap>(type: K, listener: (event: Event & EntityEventMap[K]) => void, useCapture?: boolean): void;
+		addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+	}
+
+	type DetailEvent<D> = Event & { detail: D };
+
+	interface EntityEventMap {
+		'child-attached': DetailEvent<{ el: Element | Entity }>;
+		'child-detached': DetailEvent<{ el: Element | Entity }>;
+		'componentchanged': DetailEvent<{ name: string }>;
+		'componentremoved': DetailEvent<{
+			name: string,
+			id: string,
+			newData: any,
+			oldData: any
+		}>;
+		'loaded': EventListener;
+		'pause': EventListener;
+		'play': EventListener;
+		'stateadded': DetailEvent<{ state: string }>;
+		'stateremoved': DetailEvent<{ state: string }>;
+		'schemachanged': DetailEvent<{ componentName: string }>;
+	}
+
+	interface Geometry {
+		name: string;
+		geometry: THREE.Geometry;
+		schema: Schema;
+		update(data: object): void;
+		[ key: string ]: any;
+	}
+
+	interface GeometryDescriptor {
+		Geometry: Geometry;
+		schema: Schema;
+	}
+
+	interface MultiPropertySchema {
+		[ key: string ]: SinglePropertySchema<any>;
+	}
+
+	interface PrimitiveDefinition {
+		defaultComponents?: any; // TODO cleanup type
+		deprecated?: boolean;
+		mappings?: any; // TODO cleanup type
+		transforms?: any; // TODO cleanup type
+	}
+
+	type PropertyTypes = 'array' | 'boolean' | 'color' | 'int' | 'number' | 'selector' |
+		'selectorAll' | 'src' | 'string' | 'vec2' | 'vec3' | 'vec4';
+
+	type SceneEvents = 'enter-vr' | 'exit-vr' | 'loaded' | 'renderstart';
+
+	interface Scene extends Entity {
+		behaviors: Behavior[];
+		camera: THREE.Camera;
+		canvas: HTMLCanvasElement;
+		effect: THREE.VREffect;
+		isMobile: boolean;
+		object3D: THREE.Scene;
+		renderer: THREE.WebGLRenderer;
+		renderStarted: boolean;
+		systems: ObjectMap<System>;
+		time: number;
+
+		enterVR(): Promise<void> | void;
+		exitVR(): Promise<void> | void;
+		reload(): void;
+
+		addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+		addEventListener(type: SceneEvents, listener: EventListener, useCapture?: boolean): void;
+	}
+
+	type Schema = SinglePropertySchema<any> | MultiPropertySchema;
+
+	interface SchemaUtils {
+		isSingleProperty(schema: Schema): boolean;
+		process(schema: Schema): boolean;
+	}
+
+	interface Shader {
+		name: string;
+		schema: Schema;
+	}
+
+	interface ShaderDescriptor {
+		Shader: Shader;
+		schema: Schema;
+	}
+
+	interface SinglePropertySchema<T> {
+		type?: PropertyTypes;
+		'default'?: T;
+		parse?(value: string): T;
+		stringify?(value: T): string;
+		[ key: string ]: any;
+	}
+
+	interface System {
+		data: any;
+		schema: Schema;
+		init(): void;
+		pause(): void;
+		play(): void;
+		tick?(): void;
+	}
+
+	interface SystemDefinition {
+		schema?: Schema;
+		init?(): void;
+		pause?(): void;
+		play?(): void;
+		tick?(): void;
+		[ key: string ]: any;
+	}
+
+	interface Utils {
+		coordinates: {
+			isCoordinate(value: string): boolean;
+			parse(value: string): Coordinate;
+			stringify(coord: Coordinate): string;
+		};
+		entity: {
+			getComponentProperty(entity: Entity, componentName: string, delimiter?: string): any;
+			setComponentProperty(entity: Entity, componentName: string, value: any, delimiter?: string): void;
+		};
+		styleParser: {
+			parse(value: string): object;
+			stringify(data: object): string;
+		};
+		deepEqual(a: any, b: any): boolean;
+		diff(a: object, b: object): object;
+		extend(target: object, ... source: object[]): object;
+		extendDeep(target: object, ... source: object[]): object;
+	}
+}
diff --git a/types/aframe/tsconfig.json b/types/aframe/tsconfig.json
new file mode 100755
index 0000000000..9488fe8297
--- /dev/null
+++ b/types/aframe/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "baseUrl": "..",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "module": "commonjs",
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "removeComments": false,
+    "sourceMap": true,
+    "strictNullChecks": true,
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true,
+    "typeRoots": [ "../" ],
+    "types": [ ]
+  },
+  "files": [
+    "index.d.ts",
+    "aframe-tests.ts"
+  ]
+}
diff --git a/types/aframe/tslint.json b/types/aframe/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/aframe/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/agenda/index.d.ts b/types/agenda/index.d.ts
index e859de3188..fe8ecc45a6 100644
--- a/types/agenda/index.d.ts
+++ b/types/agenda/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rschmukler/agenda
 // Definitions by: Meir Gottlieb <https://github.com/meirgottlieb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/alexa-sdk/alexa-sdk-tests.ts b/types/alexa-sdk/alexa-sdk-tests.ts
index 8d309e9e81..cbf1ba70a3 100644
--- a/types/alexa-sdk/alexa-sdk-tests.ts
+++ b/types/alexa-sdk/alexa-sdk-tests.ts
@@ -1,21 +1,19 @@
-/// <reference types="node"/>
-
 import * as Alexa from "alexa-sdk";
 
-exports.handler = function(event: Alexa.RequestBody, context: Alexa.Context, callback: Function) {
+const handler = (event: Alexa.RequestBody, context: Alexa.Context, callback: () => void) => {
     let alexa = Alexa.handler(event, context);
     alexa.registerHandlers(handlers);
     alexa.execute();
 };
 
 let handlers: Alexa.Handlers = {
-    'LaunchRequest': function () {
+    'LaunchRequest': function() {
         this.emit('SayHello');
     },
-    'HelloWorldIntent': function () {
+    'HelloWorldIntent': function() {
         this.emit('SayHello');
     },
-    'SayHello': function () {
+    'SayHello': function() {
         this.emit(':tell', 'Hello World!');
     }
 };
diff --git a/types/alexa-sdk/index.d.ts b/types/alexa-sdk/index.d.ts
index 9f99b14995..256d3fee9a 100644
--- a/types/alexa-sdk/index.d.ts
+++ b/types/alexa-sdk/index.d.ts
@@ -1,13 +1,19 @@
-// Type definitions for Alexa SDK for Node.js v1.0.3
+// Type definitions for Alexa SDK for Node.js 1.0
 // Project: https://github.com/alexa/alexa-skills-kit-sdk-for-nodejs
-// Definitions by: Pete Beegle <https://github.com/petebeegle>
+// Definitions by:  Pete Beegle <https://github.com/petebeegle>
+//                  Huw <https://github.com/hoo29>
+//                  pascalwhoop <https://github.com/pascalwhoop>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-export function handler(event: RequestBody, context: Context, callback?: Function): AlexaObject;
+export function handler(event: RequestBody, context: Context, callback?: (err: any, response: any) => void ): AlexaObject;
 export function CreateStateHandler(state: string, obj: any): any;
-export var StateString: string;
+export let StateString: string;
 
-interface AlexaObject {
+export type ConfirmationStatuses = "NONE" | "DENIED" | "CONFIRMED";
+export type DialogStates = "STARTED" | "IN_PROGRESS" | "COMPLETED";
+
+export interface AlexaObject extends Handler {
     _event: any;
     _context: any;
     _callback: any;
@@ -20,11 +26,11 @@ interface AlexaObject {
     execute: () => void;
 }
 
-interface Handlers {
+export interface Handlers {
     [intent: string]: (this: Handler) => void;
 }
 
-interface Handler {
+export interface Handler {
     on: any;
     emit(event: string, ...args: any[]): boolean;
     emitWithState: any;
@@ -35,9 +41,10 @@ interface Handler {
     context: any;
     name: any;
     isOverriden: any;
+    t: (token: string) => void;
 }
 
-interface Context {
+export interface Context {
     callbackWaitsForEmptyEventLoop: boolean;
     logGroupName: string;
     logStreamName: string;
@@ -48,13 +55,13 @@ interface Context {
     awsRequestId: string;
 }
 
-interface RequestBody {
+export interface RequestBody {
     version: string;
     session: Session;
     request: LaunchRequest | IntentRequest | SessionEndedRequest;
 }
 
-interface Session {
+export interface Session {
     new: boolean;
     sessionId: string;
     attributes: any;
@@ -62,56 +69,64 @@ interface Session {
     user: SessionUser;
 }
 
-interface SessionApplication {
+export interface SessionApplication {
     applicationId: string;
 }
 
-interface SessionUser {
+export interface SessionUser {
     userId: string;
     accessToken: string;
 }
 
-interface LaunchRequest extends IRequest { }
+export interface LaunchRequest extends Request { }
 
-interface IntentRequest extends IRequest {
+export interface IntentRequest extends Request {
+    dialogState: DialogStates;
     intent: Intent;
 }
 
-interface Intent {
+export interface SlotValue {
+    confirmationStatus: ConfirmationStatuses;
     name: string;
-    slots: any;
+    value?: any;
 }
 
-interface SessionEndedRequest extends IRequest {
+export interface Intent {
+    confirmationStatus: ConfirmationStatuses;
+    name: string;
+    slots: Record<string, SlotValue>;
+}
+
+export interface SessionEndedRequest extends Request {
     reason: string;
 }
 
-interface IRequest {
+export interface Request {
     type: "LaunchRequest" | "IntentRequest" | "SessionEndedRequest";
     requestId: string;
     timeStamp: string;
 }
 
-interface ResponseBody {
+export interface ResponseBody {
     version: string;
     sessionAttributes?: any;
     response: Response;
 }
 
-interface Response {
+export interface Response {
     outputSpeech?: OutputSpeech;
     card?: Card;
     reprompt?: Reprompt;
     shouldEndSession: boolean;
 }
 
-interface OutputSpeech {
+export interface OutputSpeech {
     type: "PlainText" | "SSML";
     text?: string;
     ssml?: string;
 }
 
-interface Card {
+export interface Card {
     type: "Simple" | "Standard" | "LinkAccount";
     title?: string;
     content?: string;
@@ -119,13 +134,11 @@ interface Card {
     image?: Image;
 }
 
-interface Image {
+export interface Image {
     smallImageUrl: string;
     largeImageUrl: string;
 }
 
-interface Reprompt {
+export interface Reprompt {
     outputSpeech: OutputSpeech;
 }
-
-
diff --git a/types/alexa-sdk/tslint.json b/types/alexa-sdk/tslint.json
new file mode 100644
index 0000000000..0c1ca3b5b4
--- /dev/null
+++ b/types/alexa-sdk/tslint.json
@@ -0,0 +1,9 @@
+{ "extends": "dtslint/dt.json",
+  "rules": {
+      "object-literal-shorthand": false,
+      "object-literal-key-quote": false,
+      "no-empty-interface": false,
+      "prefer-method-signature": false,
+      "object-literal-key-quotes": false
+      }
+}
diff --git a/types/alexa-voice-service/alexa-voice-service-tests.ts b/types/alexa-voice-service/alexa-voice-service-tests.ts
new file mode 100644
index 0000000000..f9bac4e549
--- /dev/null
+++ b/types/alexa-voice-service/alexa-voice-service-tests.ts
@@ -0,0 +1,34 @@
+import * as AVS from "alexa-voice-service";
+
+const options = {
+    debug: true,
+    clientId: "",
+    clientSecret: "",
+    deviceId: "",
+    refreshToken: "",
+};
+
+const avsInstance = new AVS(options);
+
+avsInstance.on(AVS.EventTypes.RECORD_START, () => {
+});
+
+avsInstance.on(AVS.EventTypes.RECORD_STOP, () => {
+});
+
+avsInstance.player.on(AVS.Player.EventTypes.PLAY, () => {
+});
+
+avsInstance.refreshToken().then((tokens) => {
+}).catch((error: Error) => {
+});
+
+avsInstance.requestMic();
+
+avsInstance.startRecording();
+
+avsInstance.stopRecording().then((dataView: any) => { });
+
+const dataView = new DataView(new ArrayBuffer(1));
+
+avsInstance.sendAudio(dataView).then(({ xhr, response }: any) => { });
diff --git a/types/alexa-voice-service/index.d.ts b/types/alexa-voice-service/index.d.ts
new file mode 100644
index 0000000000..eb639729fd
--- /dev/null
+++ b/types/alexa-voice-service/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for alexa-voice-service 0.0
+// Project: https://github.com/miguelmota/alexa-voice-service.js
+// Definitions by: Dolan Miu <https://github.com/dolanmiu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace AVS;
+export = AVS;
+
+declare namespace AVS {
+    enum EventTypes {
+        RECORD_STOP, RECORD_START, ERROR, TOKEN_INVALID, LOG, LOGIN, LOGOUT, TOKEN_SET, REFRESH_TOKEN_SET
+    }
+
+    interface AVSParams {
+        debug: boolean;
+        clientId: string;
+        clientSecret: string;
+        deviceId: string;
+        refreshToken: string;
+    }
+
+    interface TokenResponse {
+        token: string;
+        refreshToken: string;
+    }
+
+    class Player {
+        on(eventType: Player.EventTypes, callback?: () => void): void;
+    }
+
+    namespace Player {
+        enum EventTypes {
+            LOG, ERROR, PLAY, REPLAY, PAUSE, STOP, ENQUEUE, DEQUE
+        }
+    }
+}
+
+declare class AVS {
+    player: AVS.Player;
+    constructor(params: AVS.AVSParams);
+
+    on(eventType: AVS.EventTypes, callback?: () => void): void;
+    refreshToken(): Promise<AVS.TokenResponse>;
+    requestMic(): Promise<any>;
+    startRecording(): Promise<void>;
+    stopRecording(): Promise<DataView | undefined>;
+    sendAudio(dataView: DataView): Promise<{
+        xhr: any, response: {
+            httpVersion: string,
+            statusCode: string,
+            statusMessage: string,
+            method: string,
+            url: string,
+            headers: string,
+            body: string,
+            boundary: string,
+            multipart: string
+        }
+    }>;
+}
diff --git a/types/alexa-voice-service/tsconfig.json b/types/alexa-voice-service/tsconfig.json
new file mode 100644
index 0000000000..70cb9b2201
--- /dev/null
+++ b/types/alexa-voice-service/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "alexa-voice-service-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/js-search/tslint.json b/types/alexa-voice-service/tslint.json
similarity index 100%
rename from types/js-search/tslint.json
rename to types/alexa-voice-service/tslint.json
diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index a3a04aadc2..43a4d677cf 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -1,41 +1,52 @@
-import algoliasearch = require('algoliasearch');
-import { ClientOptions, SynonymOption, AlgoliaUserKeyOptions, SearchSynonymOptions,
+import * as algoliasearch from "algoliasearch";
+import { ClientOptions, SynonymOption, AlgoliaUserKeyOptions, SearchSynonymOptions, AlgoliaResponse,
     AlgoliaSecuredApiOptions, AlgoliaIndexSettings, AlgoliaQueryParameters, AlgoliaIndex } from "algoliasearch";
 
-var _clientOptions: ClientOptions = {
-    timeout : 12,
+let _algoliaResponse: AlgoliaResponse = {
+    hits: [{}, {}],
+    page: 0,
+    nbHits: 12,
+    nbPages: 6,
+    hitsPerPage: 2,
+    processingTimeMS: 32,
+    query: "",
+    params: "",
+};
+
+let _clientOptions: ClientOptions = {
+    timeout: 12,
     protocol: "",
-    httpAgent: ""
+    httpAgent: "",
 };
 
-var _synonymOption: SynonymOption = {
+let _synonymOption: SynonymOption = {
     forwardToSlaves: false,
-    replaceExistingSynonyms: false
+    replaceExistingSynonyms: false,
 };
 
-var _algoliaUserKeyOptions : AlgoliaUserKeyOptions = {
+let _algoliaUserKeyOptions: AlgoliaUserKeyOptions = {
     validity: 0,
     maxQueriesPerIPPerHour: 0,
     indexes: [""],
     queryParameters: { attributesToRetrieve: ["algolia"] },
-    description: ""
+    description: "",
 };
 
-var _searchSynonymOptions : SearchSynonymOptions = {
+let _searchSynonymOptions: SearchSynonymOptions = {
     query: "",
     page: 0,
     type: "",
-    hitsPerPage: 0
+    hitsPerPage: 0,
 };
 
-var _algoliaSecuredApiOptions: AlgoliaSecuredApiOptions = {
+let _algoliaSecuredApiOptions: AlgoliaSecuredApiOptions = {
     filters: "",
     validUntil: 0,
     restrictIndices: "",
-    userToken: ""
+    userToken: "",
 };
 
-var _algoliaIndexSettings : AlgoliaIndexSettings = {
+let _algoliaIndexSettings: AlgoliaIndexSettings = {
     attributesToIndex: [""],
     attributesforFaceting: [""],
     unretrievableAttributes: [""],
@@ -43,12 +54,12 @@ var _algoliaIndexSettings : AlgoliaIndexSettings = {
     ranking: [""],
     customRanking: [""],
     slaves: [""],
-    maxValuesPerFacet: '',
+    maxValuesPerFacet: "",
     attributesToHighlight: [""],
     attributesToSnippet: [""],
-    highlightPreTag: '',
-    highlightPostTag: '',
-    snippetEllipsisText: '',
+    highlightPreTag: "",
+    highlightPostTag: "",
+    snippetEllipsisText: "",
     restrictHighlightAndSnippetArrays: false,
     hitsPerPage: 0,
     minWordSizefor1Typo: 0,
@@ -56,16 +67,16 @@ var _algoliaIndexSettings : AlgoliaIndexSettings = {
     typoTolerance: false,
     allowTyposOnNumericTokens: false,
     ignorePlurals: false,
-    disableTypoToleranceOnAttributes: '',
-    separatorsToIndex: '',
-    queryType: '',
-    removeWordsIfNoResults: '',
+    disableTypoToleranceOnAttributes: "",
+    separatorsToIndex: "",
+    queryType: "",
+    removeWordsIfNoResults: "",
     advancedSyntax: false,
     optionalWords: [""],
     removeStopWords: [""],
     disablePrefixOnAttributes: [""],
     disableExactOnAttributes: [""],
-    exactOnSingleWordQuery: '',
+    exactOnSingleWordQuery: "",
     alternativesAsExact: false,
     attributeForDistinct: "",
     distinct: false,
@@ -73,21 +84,21 @@ var _algoliaIndexSettings : AlgoliaIndexSettings = {
     allowCompressionOfIntegerArray: false,
     altCorrections: [{}],
     minProximity: 0,
-    placeholders: ''
+    placeholders: "",
 };
 
-var _algoliaQueryParameters : AlgoliaQueryParameters = {
-    query: '',
-    filters: '',
+let _algoliaQueryParameters: AlgoliaQueryParameters = {
+    query: "",
+    filters: "",
     attributesToRetrieve: [""],
     restrictSearchableAttributes: [""],
-    facets: '',
-    maxValuesPerFacet: '',
-    attributesToHighlight: [''],
-    attributesToSnippet: [''],
-    highlightPreTag: '',
-    highlightPostTag: '',
-    snippetEllipsisText: '',
+    facets: "",
+    maxValuesPerFacet: "",
+    attributesToHighlight: [""],
+    attributesToSnippet: [""],
+    highlightPreTag: "",
+    highlightPostTag: "",
+    snippetEllipsisText: "",
     restrictHighlightAndSnippetArrays: false,
     hitsPerPage: 0,
     page: 0,
@@ -98,38 +109,36 @@ var _algoliaQueryParameters : AlgoliaQueryParameters = {
     typoTolerance: false,
     allowTyposOnNumericTokens: false,
     ignorePlurals: false,
-    disableTypoToleranceOnAttributes: '',
-    aroundLatLng: '',
-    aroundLatLngViaIP: '',
-    aroundRadius: '',
+    disableTypoToleranceOnAttributes: "",
+    aroundLatLng: "",
+    aroundLatLngViaIP: "",
+    aroundRadius: "",
     aroundPrecision: 0,
     minimumAroundRadius: 0,
-    insideBoundingBox: '',
-    queryType: '',
-    insidePolygon: '',
-    removeWordsIfNoResults: '',
+    insideBoundingBox: "",
+    queryType: "",
+    insidePolygon: "",
+    removeWordsIfNoResults: "",
     advancedSyntax: false,
-    optionalWords: [''],
-    removeStopWords: [''],
-    disableExactOnAttributes: [''],
-    exactOnSingleWordQuery: '',
+    optionalWords: [""],
+    removeStopWords: [""],
+    disableExactOnAttributes: [""],
+    exactOnSingleWordQuery: "",
     alternativesAsExact: true,
     distinct: 0,
     getRankingInfo: false,
-    numericAttributesToIndex: [''],
-    numericFilters: [''],
-    tagFilters: '',
-    facetFilters: '',
+    numericAttributesToIndex: [""],
+    numericFilters: [""],
+    tagFilters: "",
+    facetFilters: "",
     analytics: false,
-    analyticsTags: [''],
+    analyticsTags: [""],
     synonyms: true,
     replaceSynonymsInHighlight: false,
-    minProximity: 0
+    minProximity: 0,
 };
 
-var index: AlgoliaIndex = algoliasearch('', '').initIndex('');
-
-var search = index.search({query: ""});
-index.search({query: ""}, function(err, res){});
-
+let index: AlgoliaIndex = algoliasearch("", "").initIndex("");
 
+let search = index.search({query: ""});
+             index.search({query: ""}, (err, res) => {});
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 582e91999b..2fdd00f983 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -24,7 +24,7 @@ declare namespace algoliasearch {
          * Number of pages
          * https://github.com/algolia/algoliasearch-client-js#response-format
          */
-        nbPage: number;
+        nbPages: number;
         /**
          * Number of hits per pages
          * https://github.com/algolia/algoliasearch-client-js#response-format
@@ -407,7 +407,7 @@ declare namespace algoliasearch {
          * @param cb(err, res)
          * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
          */
-        saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption, cb: (err: Error, res: any) => void): void;
+        saveSynonym(synonym: AlgoliaSynonym, options: SynonymOption, cb: (err: Error, res: any) => void): void;
         /**
          * Save a synonym object
          * @param synonyms
@@ -659,7 +659,7 @@ declare namespace algoliasearch {
          * return {Promise}
          * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
          */
-        saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption): Promise<any> ;
+        saveSynonym(synonym: AlgoliaSynonym, options: SynonymOption): Promise<any> ;
         /**
          * Save a synonym object
          * @param synonyms
diff --git a/types/alt/alt-tests.ts b/types/alt/alt-tests.ts
index 8d1108ada3..3556e3a167 100644
--- a/types/alt/alt-tests.ts
+++ b/types/alt/alt-tests.ts
@@ -119,7 +119,7 @@ interface ExtendedTestStore extends AltJS.AltStore<AltTestState> {
     split():Array<string>;
 }
 
-var testStore = <ExtendedTestStore>alt.createStore<AltTestState>(TestStore);
+var testStore = <ExtendedTestStore>alt.createStore<AltTestState>(new TestStore());
 
 function testCallback(state:AltTestState) {
     console.log(state);
diff --git a/types/alt/index.d.ts b/types/alt/index.d.ts
index f0ea3ba008..2d4c6e259f 100644
--- a/types/alt/index.d.ts
+++ b/types/alt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/goatslacker/alt
 // Definitions by: Michael Shearer <https://github.com/Shearerbeard>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react"/>
 
@@ -141,7 +141,7 @@ declare module "alt/utils/chromeDebug" {
 
 declare module "alt/AltContainer" {
 
-  import React = require("react");
+  import * as React from "react";
 
   interface ContainerProps {
     store?:AltJS.AltStore<any>;
@@ -152,7 +152,7 @@ declare module "alt/AltContainer" {
     flux?:AltJS.Alt;
     transform?:(store:AltJS.AltStore<any>, actions:any) => any;
     shouldComponentUpdate?:(props:any) => boolean;
-    component?:React.Component<any, any>;
+    component?:React.Component<any>;
   }
 
   type AltContainer = React.ReactElement<ContainerProps>;
diff --git a/types/amazon-product-api/amazon-product-api-tests.ts b/types/amazon-product-api/amazon-product-api-tests.ts
index e173d76f36..0a02153236 100644
--- a/types/amazon-product-api/amazon-product-api-tests.ts
+++ b/types/amazon-product-api/amazon-product-api-tests.ts
@@ -1,5 +1,5 @@
-
-/// <reference types="node"/>
+declare var console: { log(s: string): void };
+declare var process: { env: any };
 
 import amazon = require('amazon-product-api');
 
diff --git a/types/amcharts/index.d.ts b/types/amcharts/index.d.ts
index bc41907d50..98fae5adeb 100644
--- a/types/amcharts/index.d.ts
+++ b/types/amcharts/index.d.ts
@@ -2271,6 +2271,10 @@ If you do not set properties such as dashLength, lineAlpha, lineColor, etc - val
         hideBulletsCount: number;
         /** Name of the high field (used by candlesticks and ohlc) in your dataProvider. */
         highField: string;
+
+         /** Unique id of a graph. It is not required to set one, unless you want to use this graph for as your scrollbar's graph and need to indicate which graph should be used.*/
+        id?: string;
+
         /** Whether to include this graph when calculating min and max value of the axis.
             @default true
         */
diff --git a/types/amplify-deferred/index.d.ts b/types/amplify-deferred/index.d.ts
index c6d2940930..fd738e9cbe 100644
--- a/types/amplify-deferred/index.d.ts
+++ b/types/amplify-deferred/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://amplifyjs.com/
 // Definitions by: Jonas Eriksson <https://github.com/joeriks/>, Laurentiu Stamate <https://github.com/laurentiustamate94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/amplify/index.d.ts b/types/amplify/index.d.ts
index f88c754264..2c3e2e1e5a 100644
--- a/types/amplify/index.d.ts
+++ b/types/amplify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://amplifyjs.com/
 // Definitions by: Jonas Eriksson <https://github.com/joeriks/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/amqp/amqp-tests.ts b/types/amqp/amqp-tests.ts
new file mode 100644
index 0000000000..7940f44ed4
--- /dev/null
+++ b/types/amqp/amqp-tests.ts
@@ -0,0 +1,69 @@
+import * as amqp from 'amqp';
+
+async function connect() {
+  const promise = new Promise<amqp.AMQPClient>((resolve, reject) => {
+    const client = amqp.createConnection({
+      url: 'amqp://admin:password@localhost:5672'
+    });
+
+    client.once('error', reject);
+    client.once('ready', resolve);
+  });
+
+  return promise;
+}
+
+async function start() {
+  try {
+    const client = await connect();
+    console.log('Connected');
+
+    const queue = client.queue('perth-now',
+      {
+        autoDelete: false,
+        durable: true,
+      }, q => {
+        console.log('Queue opened');
+        console.log('Name: %s Channel: %s', q.name, q.channel);
+
+        queue.bind('amq.fanout', '#', () => {
+          queue.subscribe(
+            { ack: true },
+            (msg, _, __, ack) => {
+              ack.acknowledge(true);
+            });
+        });
+      });
+
+    const exchange = client.exchange('amq.fanout', { confirm: true });
+
+    exchange.once('open', () => {
+      exchange.publish(
+        'content',
+        { message: new Date().toLocaleTimeString() },
+        { deliveryMode: 2 },
+        (err, msg) => {
+          if (!err) {
+            return;
+          }
+          throw new Error(`Failed to publish: ${msg}`);
+        }
+      );
+
+      exchange.publish('content', { message: 'content message' }, () => {
+        console.log('Published');
+      });
+    });
+  } catch (ex) {
+    console.log(ex);
+    process.exit(1);
+  }
+}
+
+async function wait(ms: number) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
+}
+
+start();
diff --git a/types/amqp/index.d.ts b/types/amqp/index.d.ts
new file mode 100644
index 0000000000..a7dae4eb56
--- /dev/null
+++ b/types/amqp/index.d.ts
@@ -0,0 +1,419 @@
+// Type definitions for amqp 0.2
+// Project: https://github.com/postwait/node-amqp
+// Definitions by: Carl Winkler <https://github.com/seikho>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as net from 'net';
+import * as events from 'events';
+
+export type Callback<T> = (value: T) => void;
+export interface AMQPClient extends net.Socket {
+  publish(routingKey: string, body: any, options: {}, callback: (err?: boolean, msg?: string) => void): void;
+
+  disconnect(): void;
+
+  queue(queueName: string, callback?: Callback<QueueCallback>): AMQPQueue;
+  queue(queueName: string, options: QueueOptions, callback?: Callback<QueueCallback>): AMQPQueue;
+
+  exchange(callback?: Callback<void>): AMQPExchange;
+  exchange(exchangeName: string, callback?: Callback<void>): AMQPExchange;
+  exchange(exchangeName: string, options: ExchangeOptions, callback?: Callback<void>): AMQPExchange;
+}
+
+export interface AMQPQueue extends events.EventEmitter {
+  subscribe(callback: SubscribeCallback): void;
+  subscribe(options: SubscribeOptions, callback: SubscribeCallback): void;
+
+  unsubscribe(consumerTag: string): void;
+
+  bind(exchangeName: string, routingKey: string, callback?: Callback<AMQPQueue>): void;
+  bind(routingKey: string, callback?: Callback<AMQPQueue>): void;
+
+  unbind(exchangeName: string, routingKey: string): void;
+  unbind(routingKey: string): void;
+
+  bind_headers(exchangeName: string, routingKey: string): void;
+  bind_headers(routingKey: string): void;
+
+  unbind_headers(exchangeName: string, routingKey: string): void;
+  unbind_headers(routingKey: string): void;
+
+  shift(reject: boolean): void;
+  shift(reject: boolean, requeue: boolean): void;
+
+  destroy(options?: DestroyOptions): void;
+}
+
+export interface AMQPExchange extends events.EventEmitter {
+  on(event: 'open' | 'ack' | 'error' | 'exchangeBindOk' | 'exchangeUnbindOk', callback: Callback<void>): this;
+
+  publish(routingKey: string, message: Buffer | {}, options: ExchangePublishOptions, callback?: (err?: boolean, msg?: string) => void): void;
+
+  /**
+   * ifUnused default: true
+   *
+   * Deletes an exchange.
+   *
+   * If the optional boolean second argument is set, the server will only delete the exchange if it has no queue bindings.
+   *
+   * If the exchange has queue bindings the server does not delete it but raises a channel exception instead
+   */
+  destroy(ifUnused: boolean): void;
+
+  bind(sourceExchange: string, routingKey: string, callback?: Callback<void>): void;
+  unbind(sourceExchange: string, routingKey: string, callback?: Callback<void>): void;
+  bind_headers(exchange: string, routing: string, callback?: Callback<void>): void;
+}
+
+export function createConnection(options: ConnectionOptions): AMQPClient;
+
+export interface DeliveryInfo {
+  contentType: string;
+  consumerTag: string;
+  deliveryTag: Uint8Array;
+  exchange: string;
+  queue: string;
+  redelivered: boolean;
+  routingKey: string;
+}
+
+export interface Ack extends DeliveryInfo {
+  acknowledge(all: boolean): void;
+  reject(requeue: boolean): void;
+}
+
+export interface ConnectionOptions {
+  host?: string;
+  url?: string;
+  port?: number;
+  login?: string;
+  passowrd?: string;
+  connectionTimeout?: number;
+  authMechanism?: string;
+  vhost?: string;
+  noDelay?: boolean;
+  ssl?: {
+    enabled: boolean;
+    keyFile?: string;
+    certFile?: string;
+    caFile?: string;
+    rejectUnauthorized?: boolean;
+  };
+
+  /** Default: 'node-amqp' */
+  product?: string;
+
+  /** Default: 'node-{NODE_VERSION}' */
+  platform?: string;
+
+  /** Default: node-amqp/package.json version */
+  version?: string;
+
+  defaultExchangeName?: string;
+
+  /** Default: true */
+  reconnect?: boolean;
+
+  /** Default: 'linear' */
+  reconnectBackoffStrategy?: string;
+
+  /** Default: 120000 */
+  reconnectExponentialLimit?: number;
+
+  /** Default: 1000 */
+  reconnectBackoffTime?: number;
+}
+
+export interface QueueOptions {
+  /**
+   * Default: false
+   *
+   * If set, the server will not create the queue.
+   *
+   * The client can use this to check whether a queue exists without modifying the server state
+   */
+  passive?: boolean;
+
+  /**
+   * Default: false
+   *
+   * Durable queues remain active when a server restarts.
+   *
+   * Non-durable queues (transient queues) are purged if/when a server restarts.
+   *
+   * Note that durable queues do not necessarily hold persistent messages,
+   * although it does not make sense to send persistent messages to a transient queue
+   */
+  durable?: boolean;
+
+  /**
+   * Default: false
+   *
+   * Exclusive queues may only be consumed from by the current connection.
+   *
+   * Setting the 'exclusive' flag always implies 'autoDelete'
+   */
+  exclusive?: boolean;
+
+  /**
+   * Default: true
+   *
+   * If set, the queue is deleted when all consumers have finished using it.
+   *
+   * Last consumer can be cancelled either explicitly or because its channel is closed.
+   *
+   * If there was no consumer ever on the queue, it won't be deleted
+   */
+  autoDelete?: boolean;
+
+  /**
+   * Default: false
+   *
+   * If set, the queue will not be declared, this will allow a queue to be deleted if you don't know its previous options
+   */
+  noDeclare?: boolean;
+
+  /**
+   * a map of additional arguments to pass in when creating a queue
+   */
+  arguments?: { [arg: string]: any };
+
+  /**
+   * Default: false
+   *
+   * when true the channel will close on unsubscribe
+   */
+  closeChannelOnUnsubscribe?: boolean;
+}
+
+export interface ExchangeOptions {
+  /**
+   * Default: 'topic'
+   */
+  type?: 'direct' | 'fanout' | 'topic';
+
+  /**
+   * Default: false
+   *
+   * f set, the server will not create the exchange. The client can use this to check whether an exchange exists without modifying the server state
+   */
+  passive?: boolean;
+
+  /**
+   * Default: true
+   *
+   * If set when creating a new exchange, the exchange will be marked as durable.
+   *
+   * Durable exchanges remain active when a server restarts.
+   *
+   * Non-durable exchanges (transient exchanges) are purged if/when a server restarts
+   */
+  durable?: boolean;
+
+  /**
+   * Default: true
+   *
+   * If set, the exchange is deleted when there are no longer queues bound to it
+   */
+  autoDelete?: boolean;
+
+  /**
+   * Default: false
+   *
+   * If set, the exchange will not be declared,
+   * this will allow the exchange to be deleted if you dont know its previous options
+   */
+  noDeclare?: boolean;
+
+  /**
+   * Default: false
+   *
+   * If set, the exchange will be in confirm mode, and you will get a 'ack'|'error' event emitted on a publish,
+   * or the callback on the publish will be called
+   */
+  confirm?: boolean;
+
+  /**
+   * a map of additional arguments to pass in when creating an exchange
+   */
+  arguments?: { [arg: string]: any };
+}
+
+export interface SubscribeOptions {
+  /**
+   * Default: false
+   *
+   * If set to true, only one subscriber is allowed at a time
+   */
+  exclusive?: boolean;
+
+  /**
+   * Default: false
+   *
+   * Make it so that the AMQP server only delivers single messages at a time.
+   * When you want the next message, call queue.shift()
+   *
+   * When false, you will receive messages as fast as they are emitted
+   */
+  ack?: boolean;
+
+  /**
+   * Default: 1
+   *
+   * Will only send you N messages before you 'ack'.
+   *
+   * Setting to zero will widen that window to 'unlimited'. If this is set, queue.shift() should not be used
+   */
+  prefetchCount?: number;
+
+  /**
+   * Default: undefined
+   *
+   * Will inject the routingKey into the payload received
+   */
+  routingKeyInPayload?: boolean;
+
+  /**
+   * Default: undefined
+   *
+   * Will inject the routingKey into the payload received
+   */
+  deliveryKeyInPayload?: boolean;
+}
+
+export interface DestroyOptions {
+  /**
+   * Default: false
+   *
+   * Will only destroy the queue if it has no consumers
+   */
+  ifUnused?: boolean;
+
+  /**
+   * Default: false
+   *
+   * Will ony be deleted if the queue has no messages
+   */
+  ifEmpty?: boolean;
+}
+
+export type SubscribeCallback = (
+  message: any,
+  headers: { [key: string]: any },
+  deliveryInfo: DeliveryInfo,
+  ack: Ack
+) => void;
+
+export interface QueueCallback {
+  name: string;
+  consumerTagListeners: { [tag: string]: any };
+  consumerTagOptions: { [option: string]: any };
+  options: QueueOptions;
+  state: string;
+  channel: number;
+}
+
+export interface ExchangePublishOptions {
+  /**
+   * Default: false
+   *
+   * This flag tells the server how to react if the message cannot be routed to a queue.
+   *
+   * If this flag is set, the server will return an unroutable message with a Return method.
+   *
+   * If this flag is false, the server silently drops the message
+   */
+  mandatory?: boolean;
+
+  /**
+   * Default: false
+   *
+   * This flag tells the server how to react if the message cannot be routed to a queue consumer immediately.
+   *
+   * If this flag is set, the server will return an undeliverable message with a Return method.
+   *
+   * If this flag is false, the server will queue the message, but with no guarantee that it will ever be consumed
+   */
+  immediate?: boolean;
+
+  /**
+   * Default: 'application/octet-stream'
+   */
+  contentType?: string;
+
+  /**
+   * Default: null
+   */
+  contentEncoding?: string;
+
+  /**
+   * Default: {}
+   *
+   * Arbitrary application-specific message headers
+   */
+  headers?: any;
+
+  /**
+   * 1: Non-persistent
+   * 2: Persistent
+   */
+  deliveryMode?: 1 | 2;
+
+  priority?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+
+  /**
+   * Application correlation identifier
+   */
+  correlationId?: string;
+
+  /**
+   * Usually used to name a reply queue for a request message
+   */
+  replyTo?: string;
+
+  /**
+   * Default: null
+   *
+   * Message expiration specification -- ISO date string?
+   */
+  expiration?: string;
+
+  /**
+   * Default: null
+   *
+   * Application message identifier
+   */
+  messageId?: string;
+
+  /**
+   * Default: null
+   *
+   * Message timestamp
+   *
+   * ISO date string?
+   */
+  timestamp?: string;
+
+  /**
+   * Default: null
+   *
+   * Message type name
+   */
+  type?: string;
+
+  /**
+   * Default: null
+   *
+   * Creating user id
+   */
+  userId?: string;
+
+  /**
+   * Default: null
+   *
+   * Creating application id
+   */
+  appId?: string;
+}
diff --git a/types/amqp/tsconfig.json b/types/amqp/tsconfig.json
new file mode 100644
index 0000000000..2b9b4d5ce9
--- /dev/null
+++ b/types/amqp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "amqp-tests.ts"
+    ]
+}
diff --git a/types/amqp/tslint.json b/types/amqp/tslint.json
new file mode 100644
index 0000000000..9b00d57fef
--- /dev/null
+++ b/types/amqp/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": [
+            "false"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/types/amqplib/callback_api.d.ts b/types/amqplib/callback_api.d.ts
index 5d025bf314..d36a849873 100644
--- a/types/amqplib/callback_api.d.ts
+++ b/types/amqplib/callback_api.d.ts
@@ -34,7 +34,7 @@ export interface Channel extends events.EventEmitter {
     consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume, callback?: (err: any, ok: Replies.Consume) => void): void;
 
     cancel(consumerTag: string, callback?: (err: any, ok: Replies.Empty) => void): void;
-    get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | boolean) => void): void;
+    get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | false) => void): void;
 
     ack(message: Message, allUpTo?: boolean): void;
     ackAll(): void;
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 6cd326cd67..45b5e6e3ca 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/squaremo/amqp.node
 // Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
@@ -42,7 +43,7 @@ export interface Channel extends events.EventEmitter {
     consume(queue: string, onMessage: (msg: Message) => any, options?: Options.Consume): Promise<Replies.Consume>;
 
     cancel(consumerTag: string): Promise<Replies.Empty>;
-    get(queue: string, options?: Options.Get): Promise<Message | boolean>;
+    get(queue: string, options?: Options.Get): Promise<Message | false>;
 
     ack(message: Message, allUpTo?: boolean): void;
     ackAll(): void;
diff --git a/types/angular-agility/index.d.ts b/types/angular-agility/index.d.ts
index 2ff1fcf1f2..df5d2782ad 100644
--- a/types/angular-agility/index.d.ts
+++ b/types/angular-agility/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AngularAgility/AngularAgility
 // Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-animate/index.d.ts b/types/angular-animate/index.d.ts
index 219fb05b01..7e3202bc0e 100644
--- a/types/angular-animate/index.d.ts
+++ b/types/angular-animate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>, Cody Schaaf <https://github.com/codyschaaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/angular-block-ui/index.d.ts b/types/angular-block-ui/index.d.ts
index bf311b04a1..7733bc72f7 100644
--- a/types/angular-block-ui/index.d.ts
+++ b/types/angular-block-ui/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/McNull/angular-block-ui
 // Definitions by: Lasse Nørregaard <https://github.com/lassebn>, Stephan Classen <https://github.com/sclassen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from "angular";
 
diff --git a/types/angular-bootstrap-calendar/index.d.ts b/types/angular-bootstrap-calendar/index.d.ts
index a451ee9b03..1b393fa78a 100644
--- a/types/angular-bootstrap-calendar/index.d.ts
+++ b/types/angular-bootstrap-calendar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mattlewis92/angular-bootstrap-calendar
 // Definitions by: Egor Komarov <https://github.com/Odrin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as moment from 'moment';
 import * as angular from 'angular';
diff --git a/types/angular-breadcrumb/index.d.ts b/types/angular-breadcrumb/index.d.ts
index acc5f159f0..bdc4b57abe 100644
--- a/types/angular-breadcrumb/index.d.ts
+++ b/types/angular-breadcrumb/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ncuillery/angular-breadcrumb
 // Definitions by: Marc Talary <https://github.com/marctalary>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular-ui-router" />
 
diff --git a/types/angular-clipboard/index.d.ts b/types/angular-clipboard/index.d.ts
index bb2d93ce49..0f59feaf56 100644
--- a/types/angular-clipboard/index.d.ts
+++ b/types/angular-clipboard/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/omichelsen/angular-clipboard
 // Definitions by: Bradford Wagner <https://github.com/bradfordwagner/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * Definition of the Clipboard Service
diff --git a/types/angular-cookie/index.d.ts b/types/angular-cookie/index.d.ts
index 8f03fc7c11..0bacb1e2fb 100644
--- a/types/angular-cookie/index.d.ts
+++ b/types/angular-cookie/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ivpusic/angular-cookie
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-cookies/index.d.ts b/types/angular-cookies/index.d.ts
index e71d636f73..502e83a2e9 100644
--- a/types/angular-cookies/index.d.ts
+++ b/types/angular-cookies/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Anthony Ciccarello <http://github.com/aciccarello>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var _: string;
 export = _;
@@ -87,4 +88,4 @@ declare module 'angular' {
             remove(key: string): void;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-deferred-bootstrap/index.d.ts b/types/angular-deferred-bootstrap/index.d.ts
index c01059cf25..df489e48ee 100644
--- a/types/angular-deferred-bootstrap/index.d.ts
+++ b/types/angular-deferred-bootstrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/philippd/angular-deferred-bootstrap
 // Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -17,4 +18,4 @@ declare module angular {
 		module?: string,
 		resolve: any
 	}
-}
\ No newline at end of file
+}
diff --git a/types/angular-dialog-service/index.d.ts b/types/angular-dialog-service/index.d.ts
index 7d667c032c..36791262c4 100644
--- a/types/angular-dialog-service/index.d.ts
+++ b/types/angular-dialog-service/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/m-e-conroy/angular-dialog-service
 // Definitions by: William Comartin <https://github.com/wcomartin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular"/>
 /// <reference types="angular-ui-bootstrap"/>
diff --git a/types/angular-dynamic-locale/index.d.ts b/types/angular-dynamic-locale/index.d.ts
index 4ee0e6eb89..1aa14d4c3b 100644
--- a/types/angular-dynamic-locale/index.d.ts
+++ b/types/angular-dynamic-locale/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lgalfaso/angular-dynamic-locale
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-feature-flags/index.d.ts b/types/angular-feature-flags/index.d.ts
index 06cb6f5add..2335bf0eba 100644
--- a/types/angular-feature-flags/index.d.ts
+++ b/types/angular-feature-flags/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mjt01/angular-feature-flags
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -39,4 +40,4 @@ declare module "angular" {
             set(flagsPromise: angular.IPromise<FlagData> | angular.IHttpPromise<FlagData>): void;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-file-saver/index.d.ts b/types/angular-file-saver/index.d.ts
index 2fb846eef4..cee78df620 100644
--- a/types/angular-file-saver/index.d.ts
+++ b/types/angular-file-saver/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/alferov/angular-file-saver
 // Definitions by: Donald Nairn <https://github.com/deenairn/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 declare module 'angular' {
diff --git a/types/angular-formly/index.d.ts b/types/angular-formly/index.d.ts
index d37228fb79..8bcab28800 100644
--- a/types/angular-formly/index.d.ts
+++ b/types/angular-formly/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/formly-js/angular-formly
 // Definitions by: Scott Hatcher <https://github.com/scatcher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-fullscreen/index.d.ts b/types/angular-fullscreen/index.d.ts
index fb6502079a..6dd6eeaefe 100644
--- a/types/angular-fullscreen/index.d.ts
+++ b/types/angular-fullscreen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fabiobiondi/angular-fullscreen
 // Definitions by: Julien Paroche <https://github.com/julienpa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/angular-fullscreen
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-gettext/index.d.ts b/types/angular-gettext/index.d.ts
index 224f5032e0..107d9e10e2 100644
--- a/types/angular-gettext/index.d.ts
+++ b/types/angular-gettext/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://angular-gettext.rocketeer.be/
 // Definitions by: Ákos Lukács <https://github.com/AkosLukacs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-google-analytics/index.d.ts b/types/angular-google-analytics/index.d.ts
index 51a2d7eb7e..065815ce8b 100644
--- a/types/angular-google-analytics/index.d.ts
+++ b/types/angular-google-analytics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/revolunet/angular-google-analytics
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Thomas Fuchs <https://github.com/Toxantron>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 import * as angular from 'angular';
diff --git a/types/angular-gridster/index.d.ts b/types/angular-gridster/index.d.ts
index 272470bc6f..3d4fbbe799 100644
--- a/types/angular-gridster/index.d.ts
+++ b/types/angular-gridster/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ManifestWebDesign/angular-gridster
 // Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from "angular";
 
diff --git a/types/angular-growl-v2/index.d.ts b/types/angular-growl-v2/index.d.ts
index cf4b134d02..9cab9f66f8 100644
--- a/types/angular-growl-v2/index.d.ts
+++ b/types/angular-growl-v2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://janstevens.github.io/angular-growl-2
 // Definitions by: Tadeusz Hucal <https://github.com/mkp05>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-hotkeys/index.d.ts b/types/angular-hotkeys/index.d.ts
index 4515afca67..3db766706a 100644
--- a/types/angular-hotkeys/index.d.ts
+++ b/types/angular-hotkeys/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chieffancypants/angular-hotkeys
 // Definitions by: Jason Zhao <https://github.com/jlz27>, Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 //readme written by David Valentine <https://github.com/dvalenti314/>
 
 
diff --git a/types/angular-http-auth/index.d.ts b/types/angular-http-auth/index.d.ts
index 803ea36ae2..c5cf28b40a 100644
--- a/types/angular-http-auth/index.d.ts
+++ b/types/angular-http-auth/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/witoldsz/angular-http-auth
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-httpi/index.d.ts b/types/angular-httpi/index.d.ts
index 15cea5994a..126c04eeca 100644
--- a/types/angular-httpi/index.d.ts
+++ b/types/angular-httpi/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bennadel/httpi
 // Definitions by: Andrew Camilleri <https://github.com/Kukks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-idle/index.d.ts b/types/angular-idle/index.d.ts
index 782d3b4ec2..25880fa7c2 100644
--- a/types/angular-idle/index.d.ts
+++ b/types/angular-idle/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://hackedbychinese.github.io/ng-idle/
 // Definitions by: mthamil <https://github.com/mthamil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-jwt/index.d.ts b/types/angular-jwt/index.d.ts
index fd58699c79..c0d9408901 100644
--- a/types/angular-jwt/index.d.ts
+++ b/types/angular-jwt/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/auth0/angular-jwt
 // Definitions by: Reto Rezzonico <https://github.com/rerezz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-load/index.d.ts b/types/angular-load/index.d.ts
index 8e7c22b6b6..1e4d3ddf97 100644
--- a/types/angular-load/index.d.ts
+++ b/types/angular-load/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/urish/angular-load
 // Definitions by: david-gang <https://github.com/david-gang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-loading-bar/index.d.ts b/types/angular-loading-bar/index.d.ts
index 464974631d..1639ab115b 100644
--- a/types/angular-loading-bar/index.d.ts
+++ b/types/angular-loading-bar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chieffancypants/angular-loading-bar
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-local-storage/index.d.ts b/types/angular-local-storage/index.d.ts
index f403126d7a..faa99065da 100644
--- a/types/angular-local-storage/index.d.ts
+++ b/types/angular-local-storage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/grevory/angular-local-storage
 // Definitions by: Ken Fukuyama <https://github.com/kenfdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-localforage/index.d.ts b/types/angular-localforage/index.d.ts
index b37b27e7ee..c9159e5e1f 100644
--- a/types/angular-localforage/index.d.ts
+++ b/types/angular-localforage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ocombe/angular-localForage
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="localforage" />
 /// <reference types="angular" />
diff --git a/types/angular-locker/index.d.ts b/types/angular-locker/index.d.ts
index b3395b223d..0fd1d0a472 100644
--- a/types/angular-locker/index.d.ts
+++ b/types/angular-locker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tymondesigns/angular-locker
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index 93b92290e4..58e1ae5dd6 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular/material
 // Definitions by: Blake Bigelow <https://github.com/blbigelow>, Peter Hajdu <https://github.com/PeterHajdu>, Davide Donadello <https://github.com/Dona278>, Geert Jansen <https://github.com/geertjansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/angular-media-queries/index.d.ts b/types/angular-media-queries/index.d.ts
index a1f1cc820e..49c0e7450d 100644
--- a/types/angular-media-queries/index.d.ts
+++ b/types/angular-media-queries/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jacopotarantino/angular-match-media
 // Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -32,4 +33,4 @@ declare module 'angular' {
             when(list: Array<string> | string, callback: (result: boolean) => void, scope?: angular.IScope): boolean;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-meteor/index.d.ts b/types/angular-meteor/index.d.ts
index 29bacb2e83..c842dd2cf0 100644
--- a/types/angular-meteor/index.d.ts
+++ b/types/angular-meteor/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Urigo/angular-meteor
 // Definitions by: Peter Grman <https://github.com/pgrm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="meteor" />
 
diff --git a/types/angular-mocks/index.d.ts b/types/angular-mocks/index.d.ts
index 8b94fab445..14571e2eba 100644
--- a/types/angular-mocks/index.d.ts
+++ b/types/angular-mocks/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Tony Curtis <http://github.com/daltin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference path="mocks.d.ts" />
diff --git a/types/angular-modal/index.d.ts b/types/angular-modal/index.d.ts
index 8e11eab613..40106e955e 100644
--- a/types/angular-modal/index.d.ts
+++ b/types/angular-modal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/btford/angular-modal
 // Definitions by: Paul Lessing <https://github.com/paullessing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="jquery" />
diff --git a/types/angular-notifications/index.d.ts b/types/angular-notifications/index.d.ts
index 1f33a7c840..8e6a109ebc 100644
--- a/types/angular-notifications/index.d.ts
+++ b/types/angular-notifications/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/DerekRies/angular-notifications
 // Definitions by: Tomasz Ducin <https://github.com/ducin/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-notify/index.d.ts b/types/angular-notify/index.d.ts
index 1053b41b2f..526547f838 100644
--- a/types/angular-notify/index.d.ts
+++ b/types/angular-notify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/cgross/angular-notify
 // Definitions by: Suwato <https://github.com/Suwato/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="angular" />
 
diff --git a/types/angular-oauth2/index.d.ts b/types/angular-oauth2/index.d.ts
index 23df762df1..1c5e3ac6ed 100644
--- a/types/angular-oauth2/index.d.ts
+++ b/types/angular-oauth2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/oauthjs/angular-oauth2
 // Definitions by: Antério Vieira <https://github.com/anteriovieira>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/angular-odata-resources/index.d.ts b/types/angular-odata-resources/index.d.ts
index 3af2573bf8..c999de4506 100644
--- a/types/angular-odata-resources/index.d.ts
+++ b/types/angular-odata-resources/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/devnixs/ODataAngularResources
 // Definitions by: Raphael ATALLAH <http://raphael.atallah.me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-permission/index.d.ts b/types/angular-permission/index.d.ts
index 28781cb5df..7c9d4b5500 100644
--- a/types/angular-permission/index.d.ts
+++ b/types/angular-permission/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Narzerus/angular-permission
 // Definitions by: Voislav Mishevski <https://github.com/vmishevski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="angular-ui-router" />
diff --git a/types/angular-promise-tracker/index.d.ts b/types/angular-promise-tracker/index.d.ts
index b8957eab3d..ec2f7fd498 100644
--- a/types/angular-promise-tracker/index.d.ts
+++ b/types/angular-promise-tracker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ajoslin/angular-promise-tracker
 // Definitions by: Rufus Linke <https://github.com/rufusl/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-q-spread/index.d.ts b/types/angular-q-spread/index.d.ts
index 57f6327071..d6da2499c5 100644
--- a/types/angular-q-spread/index.d.ts
+++ b/types/angular-q-spread/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.npmjs.com/package/angular-q-spread
 // Definitions by: rafw87 <https://github.com/rafw87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as a from "angular";
 
diff --git a/types/angular-resource/index.d.ts b/types/angular-resource/index.d.ts
index 8880827de2..6b33790de5 100644
--- a/types/angular-resource/index.d.ts
+++ b/types/angular-resource/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Michael Jess <http://github.com/miffels>
 // Definitions: https://github.com/daptiv/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var _: string;
 export = _;
diff --git a/types/angular-route/index.d.ts b/types/angular-route/index.d.ts
index 98ba467b66..29c59f955c 100644
--- a/types/angular-route/index.d.ts
+++ b/types/angular-route/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Jonathan Park <https://github.com/park9140>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var _: string;
 export = _;
@@ -154,4 +155,4 @@ declare module 'angular' {
             when(path: string, route: IRoute): IRouteProvider;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-sanitize/index.d.ts b/types/angular-sanitize/index.d.ts
index 8e4936b4b4..89273b42fb 100644
--- a/types/angular-sanitize/index.d.ts
+++ b/types/angular-sanitize/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Diego Vilar <http://github.com/diegovilar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var _: string;
 export = _;
@@ -46,4 +47,4 @@ declare module 'angular' {
 	    (name: 'linky'): angular.sanitize.filter.ILinky;
 	}
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-scenario/index.d.ts b/types/angular-scenario/index.d.ts
index c5804ffd80..ad86b62c4c 100644
--- a/types/angular-scenario/index.d.ts
+++ b/types/angular-scenario/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: RomanoLindano <https://github.com/RomanoLindano>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/angular-scroll/index.d.ts b/types/angular-scroll/index.d.ts
index 3361dd31c0..7b8e42bae5 100644
--- a/types/angular-scroll/index.d.ts
+++ b/types/angular-scroll/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/oblador/angular-scroll
 // Definitions by: Sam Herrmann <https://github.com/samherrmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="angular" />
diff --git a/types/angular-signalr-hub/index.d.ts b/types/angular-signalr-hub/index.d.ts
index 02238f5244..780fbdff76 100644
--- a/types/angular-signalr-hub/index.d.ts
+++ b/types/angular-signalr-hub/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/JustMaier/angular-signalr-hub
 // Definitions by: Adam Santaniello <https://github.com/AdamSantaniello>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="signalr" />
 /// <reference types="angular" />
diff --git a/types/angular-spinner/index.d.ts b/types/angular-spinner/index.d.ts
index e7710e60e2..78d70e5efe 100644
--- a/types/angular-spinner/index.d.ts
+++ b/types/angular-spinner/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/urish/angular-spinner
 // Definitions by: Marcin Biegała <https://github.com/Biegal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
 * SpinnerService
diff --git a/types/angular-storage/index.d.ts b/types/angular-storage/index.d.ts
index be705f20d1..8021ba2f5e 100644
--- a/types/angular-storage/index.d.ts
+++ b/types/angular-storage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/auth0/angular-storage
 // Definitions by: Matthew DeKrey <https://github.com/mdekrey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-strap/index.d.ts b/types/angular-strap/index.d.ts
index 3f279619dc..2b31f00148 100644
--- a/types/angular-strap/index.d.ts
+++ b/types/angular-strap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://mgcrea.github.io/angular-strap/
 // Definitions by: Sam Herrmann <https://github.com/samherrmann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="angular" />
diff --git a/types/angular-toastr/index.d.ts b/types/angular-toastr/index.d.ts
index 83c42045d1..eddccb4021 100644
--- a/types/angular-toastr/index.d.ts
+++ b/types/angular-toastr/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Foxandxss/angular-toastr
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>, Troy McKinnon <https://github.com/trodi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-toasty/index.d.ts b/types/angular-toasty/index.d.ts
index 10596c2b5f..8794b2aab9 100644
--- a/types/angular-toasty/index.d.ts
+++ b/types/angular-toasty/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/invertase/angular-toasty
 // Definitions by: Dominik Muench <https://github.com/muenchdo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-tooltips/angular-tooltips-tests.ts b/types/angular-tooltips/angular-tooltips-tests.ts
new file mode 100644
index 0000000000..5b89ec363f
--- /dev/null
+++ b/types/angular-tooltips/angular-tooltips-tests.ts
@@ -0,0 +1,21 @@
+import * as angular from 'angular';
+import * as angularTooltips from 'angular-tooltips';
+
+angular
+    .module('test.angular-tooltips', [
+        angularTooltips
+    ])
+    .config((tooltipsConfProvider: angularTooltips.TooltipsConfProvider) => {
+        tooltipsConfProvider.configure({
+            side: 'left',
+            showTrigger: 'click',
+            hideTrigger: 'click',
+            class: 'class',
+            smart: true,
+            closeButton: false,
+            size: 'small',
+            speed: 'slow',
+            tooltipTemplateUrlCache: true,
+            show: false
+        });
+    });
diff --git a/types/angular-tooltips/index.d.ts b/types/angular-tooltips/index.d.ts
new file mode 100644
index 0000000000..d3cf83c1ec
--- /dev/null
+++ b/types/angular-tooltips/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for angular-tooltips 1.2
+// Project: http://720kb.github.io/angular-tooltips
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const AngularTooltips: '720kb.tooltips';
+export = AngularTooltips;
+
+declare namespace AngularTooltips {
+    interface TooltipsConfProvider {
+        configure(options: TooltipsConfProviderOptions): void;
+    }
+
+    interface TooltipsConfProviderOptions {
+        side?: 'left' | 'right' | 'top' | 'bottom' | 'top left' | 'top right' | 'bottom left' | 'bottom right';
+        showTrigger?: string;
+        hideTrigger?: string;
+        class?: string;
+        smart?: boolean;
+        closeButton?: boolean;
+        size?: 'small' | 'medium' | 'large';
+        speed?: 'slow' | 'medium' | 'fast';
+        tooltipTemplateUrlCache?: boolean;
+        show?: boolean;
+    }
+}
diff --git a/types/angular-tooltips/tsconfig.json b/types/angular-tooltips/tsconfig.json
new file mode 100644
index 0000000000..945fa84c71
--- /dev/null
+++ b/types/angular-tooltips/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "angular-tooltips-tests.ts"
+    ]
+}
diff --git a/types/angular-tooltips/tslint.json b/types/angular-tooltips/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/angular-tooltips/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/angular-touchspin/index.d.ts b/types/angular-touchspin/index.d.ts
index 4827cf97bb..305a033275 100644
--- a/types/angular-touchspin/index.d.ts
+++ b/types/angular-touchspin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nkovacic/angular-touchspin
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -39,4 +40,4 @@ declare module "angular" {
             defaults(touchSpinOptions: ITouchSpinOptions): void;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/angular-translate/index.d.ts b/types/angular-translate/index.d.ts
index 3caf9dc054..55c74629a8 100644
--- a/types/angular-translate/index.d.ts
+++ b/types/angular-translate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/PascalPrecht/angular-translate
 // Definitions by: Michel Salib <https://github.com/michelsalib>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-ui-bootstrap/index.d.ts b/types/angular-ui-bootstrap/index.d.ts
index c09d8cfbb6..7eca42520d 100644
--- a/types/angular-ui-bootstrap/index.d.ts
+++ b/types/angular-ui-bootstrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui/bootstrap
 // Definitions by: Brian Surowiec <https://github.com/xt0rted>, Ryan Southgate <https://github.com/ry8806>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-ui-notification/index.d.ts b/types/angular-ui-notification/index.d.ts
index e239f6b11d..85c16ec243 100644
--- a/types/angular-ui-notification/index.d.ts
+++ b/types/angular-ui-notification/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/alexcrack/angular-ui-notification
 // Definitions by: Kamil Rojewski <https://github.com/krojew/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-ui-router-default/index.d.ts b/types/angular-ui-router-default/index.d.ts
index 0b62245406..98bb93b51b 100644
--- a/types/angular-ui-router-default/index.d.ts
+++ b/types/angular-ui-router-default/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nonplus/angular-ui-router-default
 // Definitions by: Stepan Riha <https://github.com/nonplus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as aur from "angular-ui-router";
 
diff --git a/types/angular-ui-router-uib-modal/index.d.ts b/types/angular-ui-router-uib-modal/index.d.ts
index 931a2cbd29..b0abfdb031 100644
--- a/types/angular-ui-router-uib-modal/index.d.ts
+++ b/types/angular-ui-router-uib-modal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nonplus/angular-ui-router-uib-modal
 // Definitions by: Stepan Riha <https://github.com/nonplus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as auir from "angular-ui-router";
 
diff --git a/types/angular-ui-router/index.d.ts b/types/angular-ui-router/index.d.ts
index 380b4bfed6..f0b8ffd00b 100644
--- a/types/angular-ui-router/index.d.ts
+++ b/types/angular-ui-router/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui/ui-router
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Ivan Matiishyn <https://github.com/matiishyn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/angular-ui-scroll/index.d.ts b/types/angular-ui-scroll/index.d.ts
index b1510f1b06..92fbb3ffcc 100644
--- a/types/angular-ui-scroll/index.d.ts
+++ b/types/angular-ui-scroll/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui/ui-scroll
 // Definitions by: Mark Nadig <https://github.com/marknadig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-ui-sortable/index.d.ts b/types/angular-ui-sortable/index.d.ts
index fa27cf9b49..c364246dba 100644
--- a/types/angular-ui-sortable/index.d.ts
+++ b/types/angular-ui-sortable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui/ui-sortable
 // Definitions by: Thodoris Greasidis <https://github.com/thgreasi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-ui-tree/index.d.ts b/types/angular-ui-tree/index.d.ts
index d40dfc93d7..0c2a215b39 100644
--- a/types/angular-ui-tree/index.d.ts
+++ b/types/angular-ui-tree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui-tree/angular-ui-tree
 // Definitions by: Calvin Fernandez <https://github.com/CalvinFernandez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular-websocket/index.d.ts b/types/angular-websocket/index.d.ts
index 9c2c93ea09..b7b3f55093 100644
--- a/types/angular-websocket/index.d.ts
+++ b/types/angular-websocket/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AngularClass/angular-websocket
 // Definitions by: Nick Veys <https://github.com/nickveys>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as ng from "angular";
 
diff --git a/types/angular-wizard/index.d.ts b/types/angular-wizard/index.d.ts
index 81af2e80c7..33fa8b2b0a 100644
--- a/types/angular-wizard/index.d.ts
+++ b/types/angular-wizard/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mgonto/angular-wizard
 // Definitions by: Marko Jurisic <https://github.com/mjurisic>, Ronald Wildenberg <https://github.com/rwwilden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/angular-xeditable/index.d.ts b/types/angular-xeditable/index.d.ts
index a0069f6764..7a5f99ba61 100644
--- a/types/angular-xeditable/index.d.ts
+++ b/types/angular-xeditable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://vitalets.github.io/angular-xeditable/
 // Definitions by: Joao Monteiro <https://github.com/jpmnteiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from "angular";
 
diff --git a/types/angular.throttle/index.d.ts b/types/angular.throttle/index.d.ts
index c82d54ae44..c5b9e1bca4 100644
--- a/types/angular.throttle/index.d.ts
+++ b/types/angular.throttle/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/BaggersIO/angular.throttle
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index d01dbd25b8..80b73c062a 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -337,6 +337,16 @@ namespace TestQ {
         let result: angular.IPromise<{a: number; b: string; }>;
         result = $q.all<{a: number; b: string; }>({a: promiseAny, b: promiseAny});
     }
+    {
+        let result = $q.all({ num: $q.when(2), str: $q.when('test') });
+        // TS should infer that num is a number and str is a string
+        result.then(r => (r.num * 2) + r.str.indexOf('s'));
+    }
+    {
+        let result = $q.all({ num: $q.when(2), str: 'test' });
+        // TS should infer that num is a number and str is a string
+        result.then(r => (r.num * 2) + r.str.indexOf('s'));
+    }
 
     // $q.defer
     {
@@ -367,8 +377,7 @@ namespace TestQ {
         let result: angular.IPromise<TResult>;
         result = $q.resolve<TResult>(tResult);
         result = $q.resolve<TResult>(promiseTResult);
-        result = $q.resolve<TResult | TOther>(Math.random() > 0.5 ? tResult : promiseTOther);
-        result = $q.resolve(Math.random() > 0.5 ? tResult : promiseTOther);
+        let result2: angular.IPromise<TResult | TOther> = $q.resolve<TResult | TOther>(Math.random() > 0.5 ? tResult : promiseTOther);
     }
 
     // $q.when
@@ -378,7 +387,8 @@ namespace TestQ {
     }
     {
         let result: angular.IPromise<TResult>;
-        let resultOther: angular.IPromise<TOther>;
+        let other: angular.IPromise<TOther>;
+        let resultOther: angular.IPromise<TResult | TOther>;
 
         result = $q.when<TResult>(tResult);
         result = $q.when<TResult>(promiseTResult);
@@ -388,20 +398,21 @@ namespace TestQ {
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => tResult, (any) => any, (any) => any);
 
         result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => tResult);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther, (any) => any);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther, (any) => any);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => tOther, (any) => any);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => tResult, (any) => promiseTOther, (any) => any);
 
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult);
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult, (any) => any);
         result = $q.when<TResult, TValue>(tValue, (result: TValue) => promiseTResult, (any) => any, (any) => any);
 
         result = $q.when<TResult, TValue>(promiseTValue, (result: TValue) => promiseTResult);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther, (any) => any);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther);
-        result = resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther, (any) => any);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => tOther, (any) => any);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther);
+        resultOther = $q.when<TResult, TOther, TValue>(promiseTValue, (result: TValue) => promiseTResult, (any) => promiseTOther, (any) => any);
     }
 }
 
@@ -547,7 +558,7 @@ namespace TestPromise {
     assertPromiseType<TResult>(promise.then((result) => result, (any) => any, (any) => any));
     assertPromiseType<TResult>(promise.then((result) => result, (any) => reject, (any) => any));
 
-    assertPromiseType<TResult>(promise.then((result) => anyOf2(reject, result)));
+    assertPromiseType<angular.IPromise<never> | TResult>(promise.then((result) => anyOf2(reject, result)));
     assertPromiseType<TResult>(promise.then((result) => anyOf3(result, tresultPromise, reject)));
     assertPromiseType<TResult>(promise.then(
         (result) => anyOf3(reject, result, tresultPromise),
@@ -557,7 +568,7 @@ namespace TestPromise {
     assertPromiseType<ng.IHttpPromiseCallbackArg<TResult>>(promise.then((result) => tresultHttpPromise));
 
     assertPromiseType<TResult | TOther>(promise.then((result) => result, (any) => tother));
-    assertPromiseType<TResult | TOther>(promise.then(
+    assertPromiseType<TResult | angular.IPromise<TResult> | angular.IPromise<never> | TOther | angular.IPromise<TOther>>(promise.then(
         (result) => anyOf3(reject, result, totherPromise),
         (reason) => anyOf3(reject, tother, tresultPromise)
     ));
@@ -588,10 +599,10 @@ namespace TestPromise {
     assertPromiseType<any>(promise.catch((err) => err));
     assertPromiseType<any>(promise.catch((err) => any));
     assertPromiseType<TResult>(promise.catch((err) => tresult));
-    assertPromiseType<TResult>(promise.catch((err) => anyOf2(tresult, reject)));
+    assertPromiseType<TResult | angular.IPromise<never>>(promise.catch((err) => anyOf2(tresult, reject)));
     assertPromiseType<TResult>(promise.catch((err) => anyOf3(tresult, tresultPromise, reject)));
     assertPromiseType<TResult>(promise.catch((err) => tresultPromise));
-    assertPromiseType<ng.IHttpPromiseCallbackArg<TResult>>(promise.catch((err) => tresultHttpPromise));
+    assertPromiseType<TResult | ng.IHttpPromiseCallbackArg<TResult>>(promise.catch((err) => tresultHttpPromise));
     assertPromiseType<TResult | TOther>(promise.catch((err) => tother));
     assertPromiseType<TResult | TOther>(promise.catch((err) => totherPromise));
     assertPromiseType<TResult | ng.IHttpPromiseCallbackArg<TOther>>(promise.catch((err) => totherHttpPromise));
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index c895c4f7ee..fe78ba03ff 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularjs.org
 // Definitions by: Diego Vilar <http://github.com/diegovilar>, Georgii Dolzhykov <http://github.com/thorn0>, Caleb St-Denis <https://github.com/calebstdenis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -487,8 +488,8 @@ declare namespace angular {
         $eval(expression: (scope: IScope) => any, locals?: Object): any;
 
         $evalAsync(): void;
-        $evalAsync(expression: string): void;
-        $evalAsync(expression: (scope: IScope) => any): void;
+        $evalAsync(expression: string, locals?: Object): void;
+        $evalAsync(expression: (scope: IScope) => void, locals?: Object): void;
 
         // Defaults to false by the implementation checking strategy
         $new(isolate?: boolean, parent?: IScope): IScope;
@@ -1028,8 +1029,7 @@ declare namespace angular {
          *
          * @param promises A hash of promises.
          */
-        all(promises: { [id: string]: IPromise<any>; }): IPromise<{ [id: string]: any; }>;
-        all<T extends {}>(promises: { [id: string]: IPromise<any>; }): IPromise<T>;
+        all<T>(promises: { [K in keyof T]: (IPromise<T[K]> | T[K]); }): IPromise<T>;
         /**
          * Creates a Deferred object which represents a task which will finish in the future.
          */
@@ -1048,6 +1048,10 @@ declare namespace angular {
          * @param value Value or a promise
          */
         resolve<T>(value: IPromise<T>|T): IPromise<T>;
+        /**
+         * @deprecated Since TS 2.4, inference is stricter and no longer produces the desired type when T1 !== T2.
+         * To use resolve with two different types, pass a union type to the single-type-argument overload.
+         */
         resolve<T1, T2>(value: IPromise<T1>|T2): IPromise<T1|T2>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
@@ -1845,6 +1849,10 @@ declare namespace angular {
          * different in Angular 1 there is no direct mapping and care should be taken when upgrading.
          */
         $postLink?(): void;
+
+        // IController implementations frequently do not implement any of its methods.
+        // A string indexer indicates to TypeScript not to issue a weak type error in this case.
+        [s: string]: any;
     }
 
     /**
diff --git a/types/angularfire/index.d.ts b/types/angularfire/index.d.ts
index 5b86018eac..e27cbf5721 100644
--- a/types/angularfire/index.d.ts
+++ b/types/angularfire/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angularfire.com
 // Definitions by: Dénes Harmath <http://github.com/thSoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular"/>
 /// <reference types="firebase"/>
diff --git a/types/angularlocalstorage/angularlocalstorage-tests.ts b/types/angularlocalstorage/angularlocalstorage-tests.ts
index f62b38c897..22d71f8b5d 100644
--- a/types/angularlocalstorage/angularlocalstorage-tests.ts
+++ b/types/angularlocalstorage/angularlocalstorage-tests.ts
@@ -15,6 +15,8 @@ class TestController {
 
     storage.clearAll();
   }
+  $onInit() {
+  }
 }
 
 var app = angular.module('angularLocalStorageTests', ['angularLocalStorage']);
diff --git a/types/angularlocalstorage/index.d.ts b/types/angularlocalstorage/index.d.ts
index 34293b218b..67b84b925e 100644
--- a/types/angularlocalstorage/index.d.ts
+++ b/types/angularlocalstorage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/agrublev/angularLocalStorage
 // Definitions by: Horiuchi_H <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular"/>
 
diff --git a/types/angulartics/index.d.ts b/types/angulartics/index.d.ts
index c7bc860ebd..0d9ba1f17f 100644
--- a/types/angulartics/index.d.ts
+++ b/types/angulartics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://luisfarzati.github.io/angulartics/
 // Definitions by: Steven Fan <https://github.com/stevenfan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/anydb-sql-migrations/index.d.ts b/types/anydb-sql-migrations/index.d.ts
index 5db740c70f..ae922c37ae 100644
--- a/types/anydb-sql-migrations/index.d.ts
+++ b/types/anydb-sql-migrations/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/spion/anydb-sql-migrations
 // Definitions by: Gorgi Kosev <https://github.com/spion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import Promise = require('bluebird');
 import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
diff --git a/types/aphrodite/aphrodite-tests.tsx b/types/aphrodite/aphrodite-tests.tsx
index f3c51f899e..685a9a4283 100644
--- a/types/aphrodite/aphrodite-tests.tsx
+++ b/types/aphrodite/aphrodite-tests.tsx
@@ -39,7 +39,7 @@ const withFont = StyleSheet.create({
 });
 
 
-class App extends React.Component<{}, {}> {
+class App extends React.Component {
     render() {
         return <div>
             <span className={css(styles.red)}>
diff --git a/types/aphrodite/index.d.ts b/types/aphrodite/index.d.ts
index 63eba46927..0e04b07af7 100644
--- a/types/aphrodite/index.d.ts
+++ b/types/aphrodite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Khan/aphrodite
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
diff --git a/types/applicationinsights-js/applicationinsights-js-tests.ts b/types/applicationinsights-js/applicationinsights-js-tests.ts
index 1a4d585795..ecefb6d41a 100644
--- a/types/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/types/applicationinsights-js/applicationinsights-js-tests.ts
@@ -44,7 +44,7 @@ appInsights = {
     trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number) { return null; },
     trackException(exception: Error, handledAt?: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }, severityLevel?: AI.SeverityLevel) { return null; },
     trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: { [name: string]: string; }) { return null; },
-    trackTrace(message: string, properties?: { [name: string]: string; }) { return null; },
+    trackTrace(message: string, properties?: { [name: string]: string; }, severityLevel?: AI.SeverityLevel) { return null; },
     flush() { return null; },
     setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string) { return null; },
     clearAuthenticatedUserContext() { return null; },
@@ -77,6 +77,7 @@ appInsights.trackException(new Error("sample error"), "handledAt", null, null);
 // trackTrace
 appInsights.trackTrace("message");
 appInsights.trackTrace("message", null);
+appInsights.trackTrace("message", { a: '1', b: '2' }, AI.SeverityLevel.Error);
 
 // trackDependency
 appInsights.trackDependency("id", "POST", "http://example.com/test/abc", "/test/abc", null, true, null);
@@ -117,7 +118,18 @@ const envelope = new Microsoft.ApplicationInsights.Telemetry.Common.Envelope(dat
 
 context.track(envelope);
 
-context.addTelemetryInitializer(telemetryEnvelope => false);
+context.addTelemetryInitializer(envelope => false);
+context.addTelemetryInitializer(envelope => { });
+
+// a sample from: https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#example
+context.addTelemetryInitializer(envelope => {
+    let telemetryItem = envelope.data.baseData;
+    if (envelope.name === Microsoft.ApplicationInsights.Telemetry.PageView.envelopeType) {
+        telemetryItem.url = "URL CENSORED";
+    }
+    telemetryItem.properties = telemetryItem.properties || {};
+    telemetryItem.properties["globalProperty"] = "boo";
+});
 
 // track event
 const eventObj = new Microsoft.ApplicationInsights.Telemetry.Event("test", null, null);
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index cce53f5823..17137d67dd 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -572,6 +572,7 @@ declare module Microsoft.ApplicationInsights {
         isPerfAnalyzerEnabled?: boolean;
         url?: string;
         isStorageUseDisabled?: boolean;
+        isBeaconApiDisabled?: boolean;
     }
 
     /**
@@ -611,6 +612,7 @@ declare module Microsoft.ApplicationInsights {
         tags: {
             [name: string]: any;
         };
+        data: any;
     }
 
     interface ITelemetryContext {
@@ -650,7 +652,7 @@ declare module Microsoft.ApplicationInsights {
          * Adds telemetry initializer to the collection. Telemetry initializers will be called one by one
          * before telemetry item is pushed for sending and in the order they were added.
          */
-        addTelemetryInitializer(telemetryInitializer: (envelope: Microsoft.ApplicationInsights.IEnvelope) => boolean): any;
+        addTelemetryInitializer(telemetryInitializer: (envelope: Microsoft.ApplicationInsights.IEnvelope) => boolean | void): any;
         /**
          * Tracks telemetry object.
          */
@@ -763,7 +765,7 @@ declare module Microsoft.ApplicationInsights {
          * @param    message A message string
          * @param    properties  map[string, string] - additional data used to filter traces in the portal. Defaults to empty.
          */
-        trackTrace(message: string, properties?: { [name: string]: string }): any;
+        trackTrace(message: string, properties?: { [name: string]: string }, severityLevel?: AI.SeverityLevel): any;
         /**
          * Immediately send all queued telemetry.
          */
diff --git a/types/arcgis-js-api/arcgis-js-api-tests.ts b/types/arcgis-js-api/arcgis-js-api-tests.ts
index d5dfb99406..d2b961df66 100644
--- a/types/arcgis-js-api/arcgis-js-api-tests.ts
+++ b/types/arcgis-js-api/arcgis-js-api-tests.ts
@@ -15,7 +15,7 @@ class MapController {
     });
 
     this.map = new Map({
-      basemap: "topo"
+      basemap: { title: "topo" }
     });
 
     let view = new MapView({
diff --git a/types/are-we-there-yet/are-we-there-yet-tests.ts b/types/are-we-there-yet/are-we-there-yet-tests.ts
new file mode 100644
index 0000000000..1750cac0c2
--- /dev/null
+++ b/types/are-we-there-yet/are-we-there-yet-tests.ts
@@ -0,0 +1,25 @@
+import { Tracker, TrackerStream, TrackerGroup } from "are-we-there-yet";
+
+let simple = new Tracker("simple");
+simple.addListener("change", (name, completed, tracker) => {
+    console.log(`name: ${name}, completed: ${completed}`);
+});
+simple.addWork(10);
+simple.completeWork(1);
+console.log(simple.completed() < 1);
+
+let group = new TrackerGroup("group");
+group.addUnit(simple);
+
+let subgroup = group.newGroup("subgroup");
+console.log(group.completed());
+
+let stream = new TrackerStream("stream", 100, { encoding: "utf8" });
+subgroup.addUnit(stream);
+
+stream.addListener("change", (name, completed, tracker) => {
+    console.log(`name: ${name}, completed: ${completed}`);
+});
+
+simple.finish();
+console.log(group.debug());
diff --git a/types/are-we-there-yet/index.d.ts b/types/are-we-there-yet/index.d.ts
new file mode 100644
index 0000000000..4b70c7a012
--- /dev/null
+++ b/types/are-we-there-yet/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for are-we-there-yet 1.1
+// Project: https://github.com/iarna/are-we-there-yet
+// Definitions by: Brian J Brennan <https://github.com/brianloveswords>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+import { Transform, TransformOptions } from "stream";
+
+export type TrackerObject = Tracker | TrackerGroup | TrackerStream;
+export type TrackerEventListener = (name: string, completed: number, tracker: TrackerObject) => void;
+export type GenericEventListener = (...args: any[]) => void;
+
+export class TrackerBase extends EventEmitter {
+    constructor(name?: string);
+    addListener(event: "change", listener: TrackerEventListener): this;
+    addListener(event: string, listener: GenericEventListener): this;
+    on(event: "change", listener: TrackerEventListener): this;
+    on(event: string, listener: GenericEventListener): this;
+    once(event: "change", listener: TrackerEventListener): this;
+    once(event: string, listener: GenericEventListener): this;
+    prependListener(event: "change", listener: TrackerEventListener): this;
+    prependListener(event: string, listener: GenericEventListener): this;
+    prependOnceListener(event: "change", listener: TrackerEventListener): this;
+    prependOnceListener(event: string, listener: GenericEventListener): this;
+    removeListener(event: "change", listener: TrackerEventListener): this;
+    removeListener(event: string, listener: GenericEventListener): this;
+}
+
+export class Tracker extends TrackerBase {
+    constructor(name?: string, todo?: number);
+    addWork(work: number): void;
+    completeWork(completed: number): void;
+    completed(): number;
+    finish(): void;
+}
+
+export class TrackerGroup extends TrackerBase {
+    constructor(name?: string);
+    addUnit(tracker: TrackerBase, weight?: number): TrackerObject;
+    completed(): number;
+    debug(): string;
+    finish(): void;
+    newGroup(name?: string, weight?: number): TrackerGroup;
+    newItem(name?: string, todo?: number, weight?: number): Tracker;
+    newStream(name?: string, todo?: number, weight?: number): TrackerStream;
+}
+
+export class TrackerStream extends Transform {
+    constructor(name?: string, size?: number, options?: TransformOptions);
+    addWork(work: number): void;
+    completed(): number;
+
+    addListener(event: "change", listener: TrackerEventListener): this;
+    addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+    addListener(event: "readable" | "end" | "close", listener: () => void): this;
+    addListener(event: "error", listener: (err: Error) => void): this;
+    addListener(event: string, listener: GenericEventListener): this;
+
+    on(event: "change", listener: TrackerEventListener): this;
+    on(event: "data", listener: (chunk: Buffer | string) => void): this;
+    on(event: "readable" | "end" | "close", listener: () => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    on(event: string, listener: GenericEventListener): this;
+
+    once(event: "change", listener: TrackerEventListener): this;
+    once(event: "data", listener: (chunk: Buffer | string) => void): this;
+    once(event: "readable" | "end" | "close", listener: () => void): this;
+    once(event: "error", listener: (err: Error) => void): this;
+    once(event: string, listener: GenericEventListener): this;
+
+    prependListener(event: "change", listener: TrackerEventListener): this;
+    prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+    prependListener(event: "readable" | "end" | "close", listener: () => void): this;
+    prependListener(event: "error", listener: (err: Error) => void): this;
+    prependListener(event: string, listener: GenericEventListener): this;
+
+    prependOnceListener(event: "change", listener: TrackerEventListener): this;
+    prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+    prependOnceListener(event: "readable" | "end" | "close", listener: () => void): this;
+    prependOnceListener(event: "error", listener: (err: Error) => void): this;
+    prependOnceListener(event: string, listener: GenericEventListener): this;
+
+    removeListener(event: "change", listener: TrackerEventListener): this;
+    removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+    removeListener(event: "readable" | "end" | "close", listener: () => void): this;
+    removeListener(event: "error", listener: (err: Error) => void): this;
+    removeListener(event: string, listener: GenericEventListener): this;
+}
diff --git a/types/are-we-there-yet/tsconfig.json b/types/are-we-there-yet/tsconfig.json
new file mode 100644
index 0000000000..e4dc1462ce
--- /dev/null
+++ b/types/are-we-there-yet/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "are-we-there-yet-tests.ts"
+    ]
+}
diff --git a/types/are-we-there-yet/tslint.json b/types/are-we-there-yet/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/are-we-there-yet/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/asana/asana-tests.ts b/types/asana/asana-tests.ts
index 3bef3e2c07..0f12c97b0c 100644
--- a/types/asana/asana-tests.ts
+++ b/types/asana/asana-tests.ts
@@ -1,7 +1,6 @@
-/// <reference types="node" />
-
 import * as asana from 'asana';
-import * as util from 'util';
+declare var console: { log(x: any): void };
+declare var process: { env: { ASANA_API_KEY: string } };
 
 let version: string = asana.VERSION;
 
@@ -95,9 +94,6 @@ client.users.me()
       task.assignee_status === 'new';
   })
   .then((list: any) => {
-    console.log(util.inspect(list, {
-      colors: true,
-      depth: null
-    }));
+    console.log(list);
   });
 
diff --git a/types/asana/index.d.ts b/types/asana/index.d.ts
index 364980b66c..ede3bc99f9 100644
--- a/types/asana/index.d.ts
+++ b/types/asana/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Asana/node-asana
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="bluebird" />
 
diff --git a/types/askmethat-rating/askmethat-rating-tests.ts b/types/askmethat-rating/askmethat-rating-tests.ts
new file mode 100644
index 0000000000..2f17ad0b62
--- /dev/null
+++ b/types/askmethat-rating/askmethat-rating-tests.ts
@@ -0,0 +1,15 @@
+import { AskmethatRating, AskmethatRatingSteps } from "askmethat-rating";
+
+let options = {
+    backgroundColor: "#e5e500",
+    hoverColor: "#ffff66",
+    fontClass: "fa fa-star",
+    minRating: 1,
+    maxRating: 5,
+    readonly: false,
+    step: AskmethatRatingSteps["OnePerOneStep"],
+    inputName: "AskmethatRating"
+};
+
+let div = document.createElement("div");
+let amcRating = new AskmethatRating(div, 2 , options);
diff --git a/types/askmethat-rating/index.d.ts b/types/askmethat-rating/index.d.ts
new file mode 100644
index 0000000000..ff31f81747
--- /dev/null
+++ b/types/askmethat-rating/index.d.ts
@@ -0,0 +1,131 @@
+// Type definitions for askmethat-rating 0.3
+// Project: https://alexteixeira.github.io/Askmethat-Rating/
+// Definitions by: Alexandre Teixeira <https://github.com/AlexTeixeira/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export enum AskmethatRatingSteps {
+    /**
+     * Step 0.1 per 0.1
+     */
+    DecimalStep = 0,
+    /**
+     * Step 0.5 per 0.5
+     */
+    HalfStep = 1,
+    /**
+     * Step 1 per 1
+     */
+    OnePerOneStep = 2,
+}
+export interface AskmethatRatingOptions {
+    hoverColor?: string;
+    /**
+     * Color when the rating is not hovered
+     */
+    backgroundColor?: string;
+    /**
+     * Mininmum rating that the user can set
+     */
+    minRating?: number;
+    /**
+     * Maximum rating that the plugin display
+     */
+    maxRating?: number;
+    /**
+     * Class to display as rating (FontAwesome or Rating for exemple)
+     */
+    fontClass: string;
+    /**
+     * Set the rating to readonly
+     */
+    readonly: boolean;
+    /**
+     * The stepping for the rating
+     */
+    step: AskmethatRatingSteps;
+    /**
+     * Input name (Default is AskmethatRating)
+     */
+    inputName: string;
+}
+export class AskmethatRating {
+    private parentElement;
+    private pValue;
+    private styleSheet;
+    private changeEvent;
+    private ratingClick;
+    private mouseMove;
+    /**
+     * @function get the current value for the rating
+     */
+    /**
+     * @function set a new value for the rating
+     *
+     * @param _value this is the new value you want to set to the rating
+     * @returns the current number
+     */
+    value: number;
+    /**
+     * Default option base on @type IAskmethatRatingOptions
+     */
+    private _defaultOptions;
+    /**
+     * @function get the default option for the rating
+     *
+     * @return  options based on @type AskmethatRatingOptions
+     */
+    readonly defaultOptions: any;
+    /**
+     * constructor with div element, default rating value & default options
+     *
+     * @param element This is the html container for the rating elements
+     * @param defaultValue Default value set when the plugin render the rating
+     * @param options Default option base on AskmethatRatingOptions type
+     */
+    constructor(element: HTMLDivElement, defaultValue?: number, options?: any);
+    /**
+     * render a new rating, by default value is the minRating
+     *
+     * @param value this is the default value set when the plugin is rendered, by default IAskmethatRatingOptions.minRating
+     */
+    render(value?: number): void;
+    /**
+     * @function when a rating is clicked
+     * @param  {type} event : Event {event object}
+     */
+    private onRatingClick(event?);
+    /**
+     * @function Calculate the value according to the step provided in options
+     * @param  {Number} value:number the current value
+     * @return {Number} the new value according to step
+     */
+    protected getValueAccordingToStep(value: number): number;
+    /**
+     * @function mouse event enter in rating
+     * @param  {type} event?: Event {event}
+     */
+    private onMouseMove(event?);
+    /**
+     * @function mouse out event in rating
+     * @param  {type} event?: Event {event}
+     */
+    private onMouseLeave(event?);
+    /**
+     * @function set or unset the active class and color
+     * @param  {HTMLSpanElement} current :  current span element
+     * @param  {number} current :  value needed for the if
+     */
+    protected setOrUnsetActive(value: number): void;
+    /**
+     * Check if disabled attribute is added or removed from the input
+     * Update readonly status if needed for the rating
+     */
+    private mutationEvent();
+    /**
+     * @function static method to retrieve with identifier the value
+     * @param  {string} identifier: string container identifier
+     * @return {number} current rating
+     */
+    static value(identifier: string): number;
+}
diff --git a/types/askmethat-rating/tsconfig.json b/types/askmethat-rating/tsconfig.json
new file mode 100644
index 0000000000..fd5ef4ae50
--- /dev/null
+++ b/types/askmethat-rating/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "askmethat-rating-tests.ts"
+    ]
+}
diff --git a/types/askmethat-rating/tslint.json b/types/askmethat-rating/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/askmethat-rating/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/assert-equal-jsx/index.d.ts b/types/assert-equal-jsx/index.d.ts
index 5deb9ede36..f571020ef8 100644
--- a/types/assert-equal-jsx/index.d.ts
+++ b/types/assert-equal-jsx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/thejameskyle/assert-equal-jsx
 // Definitions by: Josh Toft <https://github.com/seryl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/asyncblock/asyncblock-tests.ts b/types/asyncblock/asyncblock-tests.ts
index 472ec80a1b..d93c9fc07a 100644
--- a/types/asyncblock/asyncblock-tests.ts
+++ b/types/asyncblock/asyncblock-tests.ts
@@ -32,7 +32,7 @@ asyncblock((flow) => {
     //Wait for a large number of tasks
     for(var i = 0; i < 100; i++){
         //Add each task in parallel with i as the key
-        fs.readFile(paths[i], 'utf8', flow.add(i));                                    
+        fs.readFile(paths[i], 'utf8', flow.add(i));
     }
 
     //Wait for all the tasks to finish. Results is an object of the form {key1: value1, key2: value2, ...}
@@ -76,7 +76,7 @@ asyncblock.nostack((flow) => {
     fs.readFile('path2', 'utf8', flow.add('second'));
 
     //Wait until done reading the first and second files, then write them to another file
-    fs.writeFile('path3', flow.wait<string>('first') + flow.wait<string>('second'), flow.add()); 
+    fs.writeFile('path3', flow.wait<string>('first') + flow.wait<string>('second'), flow.add());
     flow.wait(); //Wait on all outstanding tasks
 
     fs.readFile('path3', 'utf8', flow.add('data'));
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 1b141fb492..5987f4901d 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import path = require("path");
 import _atom = require("atom");
 
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 05c9794eec..30aa6b881b 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://atom.io/
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="space-pen" />
diff --git a/types/audiosprite/audiosprite-tests.ts b/types/audiosprite/audiosprite-tests.ts
new file mode 100644
index 0000000000..a3f400d454
--- /dev/null
+++ b/types/audiosprite/audiosprite-tests.ts
@@ -0,0 +1,26 @@
+import * as audiosprite from 'audiosprite';
+
+const files = ['file1.mp3', 'file2.mp3'];
+const opts = {output: 'result'};
+
+audiosprite(files, opts, (err, obj) => {
+	if (err) {
+		return err;
+	}
+
+	return JSON.stringify(obj, null, 2);
+});
+
+audiosprite(files, {
+	path: "aaa",
+	format: "howler",
+	export: "ogg,mp3",
+	minlength: 9999,
+	vbr: 9,
+	'vbr:vorbis': 10,
+	logger: {
+		debug(a) {
+		}
+	}
+}, (err, obj) => {
+});
diff --git a/types/audiosprite/index.d.ts b/types/audiosprite/index.d.ts
new file mode 100644
index 0000000000..c1738386d6
--- /dev/null
+++ b/types/audiosprite/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for audiosprite 0.6
+// Project: https://github.com/tonistiigi/audiosprite
+// Definitions by: Gyusun Yeom <https://github.com/Perlmint>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace audiosprite;
+export = audiosprite;
+
+declare function audiosprite(files: string[], callback: (error: Error, obj: audiosprite.Result) => void): void;
+declare function audiosprite(files: string[], option: audiosprite.Option, callback: (error: Error, obj: audiosprite.Result) => void): void;
+
+declare namespace audiosprite {
+    type ExportType = "jukebox" | "howler" | "createjs" | null;
+    type LogLevel = "debug" | "info" | "notice" | "warning" | "error";
+    type VBR = -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    type VBR_Vorbis = VBR | 10;
+    type Channels = 1 | 2;
+    interface Option {
+        output?: string;
+        path?: string;
+        export?: string;
+        format?: ExportType;
+        log?: LogLevel;
+        autoplay?: string | null;
+        loop?: string[];
+        silence?: number;
+        gap?: number;
+        minlength?: number;
+        bitrate?: number;
+        vbr?: VBR;
+        'vbr:vorbis'?: VBR_Vorbis;
+        samplerate?: number;
+        channels?: Channels;
+        rawparts?: string;
+        logger?: Logger;
+    }
+
+    interface Logger {
+        debug?(...log: any[]): void;
+        info?(...log: any[]): void;
+        log?(...log: any[]): void;
+    }
+
+    interface Result {
+        resources: string[];
+        spritemap: {
+            [key: string]: {
+                start: number;
+                end: number;
+                loop: boolean;
+            }
+        };
+        autoplay?: string;
+    }
+}
diff --git a/types/audiosprite/tsconfig.json b/types/audiosprite/tsconfig.json
new file mode 100644
index 0000000000..7348d046e8
--- /dev/null
+++ b/types/audiosprite/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "audiosprite-tests.ts"
+    ]
+}
diff --git a/types/audiosprite/tslint.json b/types/audiosprite/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/audiosprite/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/auth0-angular/index.d.ts b/types/auth0-angular/index.d.ts
index 16203813e1..0bc8e7b34d 100644
--- a/types/auth0-angular/index.d.ts
+++ b/types/auth0-angular/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/auth0/auth0-angular
 // Definitions by: Matt Emory <https://github.com/homesar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/auth0-js/auth0-js-tests.ts b/types/auth0-js/auth0-js-tests.ts
index cd7789c62d..5356dc605a 100644
--- a/types/auth0-js/auth0-js-tests.ts
+++ b/types/auth0-js/auth0-js-tests.ts
@@ -12,7 +12,64 @@ webAuth.authorize({
     redirectUri: 'https://example.com/auth/callback'
 });
 
-webAuth.parseHash(window.location.hash, (err, authResult) => {
+webAuth.parseHash((err, authResult) => {
+    if (err) {
+        return console.log(err);
+    }
+
+  // The contents of authResult depend on which authentication parameters were used.
+  // It can include the following:
+  // authResult.accessToken - access token for the API specified by `audience`
+  // authResult.expiresIn - string with the access token's expiration time in seconds
+  // authResult.idToken - ID token JWT containing user profile information
+
+    webAuth.client.userInfo(authResult.accessToken, (err, user) => {
+        // Now you have the user's information
+    });
+});
+
+webAuth.parseHash((err, authResult) => {
+    if (err) {
+        return console.log(err);
+    }
+
+  // The contents of authResult depend on which authentication parameters were used.
+  // It can include the following:
+  // authResult.accessToken - access token for the API specified by `audience`
+  // authResult.expiresIn - string with the access token's expiration time in seconds
+  // authResult.idToken - ID token JWT containing user profile information
+
+    webAuth.client.userInfo(authResult.accessToken, (err, user) => {
+        // Now you have the user's information
+    });
+});
+
+webAuth.parseHash(
+	{
+        nonce: 'asfd',
+        hash: '#access_token=VjubIMBmpgQ2W2&id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IlF6RTROMFpCTTBWRFF6RTJSVVUwTnpJMVF6WTFNelE0UVRrMU16QXdNRUk0UkRneE56RTRSZyJ9.eyJpc3MiOiJodHRwczovL3dwdGVzdC5hdXRoMC5jb20vIiwic3ViIjoiYXV0aDB8NTVkNDhjNTdkNWIwYWQwMjIzYzQwOGQ3IiwiYXVkIjoiZ1lTTmxVNFlDNFYxWVBkcXE4elBRY3VwNnJKdzFNYnQiLCJleHAiOjE0ODI5NjkwMzEsImlhdCI6MTQ4MjkzMzAzMSwibm9uY2UiOiJhc2ZkIn0.PPoh-pITcZ8qbF5l5rMZwXiwk5efbESuqZ0IfMUcamB6jdgLwTxq-HpOT_x5q6-sO1PBHchpSo1WHeDYMlRrOFd9bh741sUuBuXdPQZ3Zb0i2sNOAC2RFB1E11mZn7uNvVPGdPTg-Y5xppz30GSXoOJLbeBszfrVDCmPhpHKGGMPL1N6HV-3EEF77L34YNAi2JQ-b70nFK_dnYmmv0cYTGUxtGTHkl64UEDLi3u7bV-kbGky3iOOCzXKzDDY6BBKpCRTc2KlbrkO2A2PuDn27WVv1QCNEFHvJN7HxiDDzXOsaUmjrQ3sfrHhzD7S9BcCRkekRfD9g95SKD5J0Fj8NA&token_type=Bearer&state=theState&refresh_token=kajshdgfkasdjhgfas&scope=foo'
+    },
+    (err, authResult) => {
+    if (err) {
+        return console.log(err);
+    }
+
+  // The contents of authResult depend on which authentication parameters were used.
+  // It can include the following:
+  // authResult.accessToken - access token for the API specified by `audience`
+  // authResult.expiresIn - string with the access token's expiration time in seconds
+  // authResult.idToken - ID token JWT containing user profile information
+
+    webAuth.client.userInfo(authResult.accessToken, (err, user) => {
+        // Now you have the user's information
+    });
+});
+
+webAuth.parseHash(
+	{
+        nonce: 'asfd'
+    },
+    (err, authResult) => {
     if (err) {
         return console.log(err);
     }
@@ -29,18 +86,35 @@ webAuth.parseHash(window.location.hash, (err, authResult) => {
 });
 
 webAuth.renewAuth({
-    audience: 'https://mystore.com/api/v2',
-    scope: 'read:order write:order',
-    redirectUri: 'https://example.com/auth/silent-callback',
-
-    // this will use postMessage to comunicate between the silent callback
-    // and the SPA. When false the SDK will attempt to parse the url hash
-    // should ignore the url hash and no extra behaviour is needed.
-    usePostMessage: true
 }, function (err, authResult) {
       // Renewed tokens or error
 });
 
+webAuth.renewAuth({
+	nonce: '123',
+    state: '456'
+}, function (err, authResult) {
+      // Renewed tokens or error
+});
+
+webAuth.renewAuth({}, (err, authResult) => {});
+
+webAuth.renewAuth({
+	nonce: '123',
+    state: '456',
+    postMessageDataType: 'auth0:silent-authentication'
+}, function (err, authResult) {
+      // Renewed tokens or error
+});
+
+webAuth.renewAuth({
+  audience: 'urn:site:demo:blog',
+  redirectUri: 'http://page.com/callback',
+  usePostMessage: true
+}, (err, authResult) => {
+
+});
+
 webAuth.changePassword({connection: 'the_connection',
     email: 'me@example.com',
     password: '123456'
@@ -90,6 +164,9 @@ webAuth.popup.signupAndLogin({}, (err, data) => {
     // do something with data
 });
 
+webAuth.login({username: 'bar', password: 'foo'}, (err, data) => {});
+
+webAuth.crossOriginAuthenticationCallback();
 
 let authentication = new auth0.Authentication({
     domain: 'me.auth0.com',
@@ -108,7 +185,7 @@ authentication.buildAuthorizeUrl({
     connection_scope: 'scope1,scope2'
 });
 
-authentication.buildLogoutUrl('asdfasdfds');
+authentication.buildLogoutUrl({ clientID: 'asdfasdfds' });
 authentication.buildLogoutUrl();
 authentication.userInfo('abcd1234', (err, data) => {
   //user info retrieved
@@ -150,7 +227,7 @@ authentication.dbConnection.signup({connection: 'bla', email: 'blabla', password
 authentication.dbConnection.changePassword({connection: 'bla', email: 'blabla', password: '123456'}, () => {});
 
 authentication.passwordless.start({ connection: 'bla', send: 'blabla' }, () => {});
-authentication.passwordless.verify({ connection: 'bla', send: 'link', verificationCode: 'asdfasd', email: 'me@example.com' }, () => {});
+authentication.passwordless.verify({ connection: 'bla', verificationCode: 'asdfasd', email: 'me@example.com' }, () => {});
 
 authentication.loginWithResourceOwner({
     username: 'the username',
diff --git a/types/auth0-js/index.d.ts b/types/auth0-js/index.d.ts
index d8d1e6f392..4e6afded1d 100644
--- a/types/auth0-js/index.d.ts
+++ b/types/auth0-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Auth0.js 8.3
+// Type definitions for Auth0.js 8.6
 // Project: https://github.com/auth0/auth0.js
 // Definitions by: Adrian Chia <https://github.com/adrianchia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -15,7 +15,6 @@ export class Authentication {
     /**
      * Builds and returns the `/authorize` url in order to initialize a new authN/authZ transaction
      *
-     * @method buildAuthorizeUrl
      * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
      */
     buildAuthorizeUrl(options: any): string;
@@ -23,34 +22,32 @@ export class Authentication {
     /**
      * Builds and returns the Logout url in order to initialize a new authN/authZ transaction
      *
-     * @method buildLogoutUrl
      * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--v2-logout
      */
-    buildLogoutUrl(options?: any): string;
+    buildLogoutUrl(options?: LogoutOptions): string;
 
     /**
      * Makes a call to the `oauth/token` endpoint with `password` grant type
      *
-     * @method loginWithDefaultDirectory
-     * @param {Object} options: https://auth0.com/docs/api-auth/grant/password
+     * @param {DefaultDirectoryLoginOptions} options: https://auth0.com/docs/api-auth/grant/password
      * @param {Function} callback
      */
-    loginWithDefaultDirectory(options: any, callback: Auth0Callback<any>): void;
+    loginWithDefaultDirectory(options: DefaultDirectoryLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `/ro` endpoint
-     * @param {any}      options
+     * @param {ResourceOwnerLoginOptions}      options
      * @param {Function} callback
      * @deprecated `loginWithResourceOwner` will be soon deprecated, user `login` instead.
      */
-    loginWithResourceOwner(options: any, callback: Auth0Callback<any>): void;
+    loginWithResourceOwner(options: ResourceOwnerLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `oauth/token` endpoint with `password-realm` grant type
-     * @param {any}     options
+     * @param {DefaultLoginOptions}     options
      * @param {Function} callback
      */
-    login(options: any, callback: Auth0Callback<any>): void;
+    login(options: DefaultLoginOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Makes a call to the `oauth/token` endpoint
@@ -62,7 +59,6 @@ export class Authentication {
     /**
      * Makes a call to the `/ssodata` endpoint
      *
-     * @method getSSOData
      * @param {Function} callback
      */
     getSSOData(callback?: Auth0Callback<any>): void;
@@ -70,7 +66,6 @@ export class Authentication {
     /**
      * Makes a call to the `/ssodata` endpoint
      *
-     * @method getSSOData
      * @param {Boolean} withActiveDirectories
      * @param {Function} callback
      */
@@ -79,25 +74,22 @@ export class Authentication {
     /**
      * Makes a call to the `/userinfo` endpoint and returns the user profile
      *
-     * @method userInfo
      * @param {String} accessToken
      * @param {Function} callback
      */
-    userInfo(token: string, callback: Auth0Callback<Auth0UserProfile>): void;
+    userInfo(accessToken: string, callback: Auth0Callback<Auth0UserProfile>): void;
 
     /**
      * Makes a call to the `/delegation` endpoint
      *
-     * @method delegation
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--delegation
+     * @param {DelegationOptions} options: https://auth0.com/docs/api/authentication#!#post--delegation
      * @param {Function} callback
      */
-    delegation(options: any, callback: Auth0Callback<Auth0DelegationToken>): any;
+    delegation(options: DelegationOptions, callback: Auth0Callback<Auth0DelegationToken>): any;
 
     /**
      * Fetches the user country based on the ip.
      *
-     * @method getUserCountry
      * @param {Function} callback
      */
     getUserCountry(callback: Auth0Callback<{ countryCode: string }>): void;
@@ -109,16 +101,14 @@ export class PasswordlessAuthentication {
     /**
      * Builds and returns the passwordless TOTP verify url in order to initialize a new authN/authZ transaction
      *
-     * @method buildVerifyUrl
-     * @param {Object} options
+     * @param {PasswordlessVerifyOptions} options
      * @param {Function} callback
      */
-    buildVerifyUrl(options: any): string;
+    buildVerifyUrl(options: PasswordlessVerifyOptions): string;
 
     /**
      * Initializes a new passwordless authN/authZ transaction
      *
-     * @method start
      * @param {Object} options: https://auth0.com/docs/api/authentication#passwordless
      * @param {Function} callback
      */
@@ -127,11 +117,10 @@ export class PasswordlessAuthentication {
     /**
      * Verifies the passwordless TOTP and returns an error if any.
      *
-     * @method buildVerifyUrl
-     * @param {Object} options
+     * @param {PasswordlessVerifyOptions} options
      * @param {Function} callback
      */
-    verify(options: any, callback: Auth0Callback<any>): void;
+    verify(options: PasswordlessVerifyOptions, callback: Auth0Callback<any>): void;
 }
 
 export class DBConnection {
@@ -140,17 +129,15 @@ export class DBConnection {
     /**
      * Signup a new user
      *
-     * @method signup
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      * @param {Function} calback
      */
-    signup(options: any, callback: Auth0Callback<any>): void;
+    signup(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Initializes the change password flow
      *
-     * @method signup
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
+     * @param {ChangePasswordOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
      * @param {Function} callback
      */
     changePassword(options: ChangePasswordOptions, callback: Auth0Callback<any>): void;
@@ -162,7 +149,6 @@ export class Management {
     /**
      * Returns the user profile. https://auth0.com/docs/api/management/v2#!/Users/get_users_by_id
      *
-     * @method getUser
      * @param {String} userId
      * @param {Function} callback
      */
@@ -172,7 +158,6 @@ export class Management {
      * Updates the user metdata. It will patch the user metdata with the attributes sent.
      * https://auth0.com/docs/api/management/v2#!/Users/patch_users_by_id
      *
-     * @method patchUserMetadata
      * @param {String} userId
      * @param {Object} userMetadata
      * @param {Function} callback
@@ -182,7 +167,6 @@ export class Management {
     /**
      * Link two users. https://auth0.com/docs/api/management/v2#!/Users/post_identities
      *
-     * @method linkUser
      * @param {String} userId
      * @param {String} secondaryUserToken
      * @param {Function} callback
@@ -195,14 +179,14 @@ export class WebAuth {
     client: Authentication;
     popup: Popup;
     redirect: Redirect;
+    crossOriginAuthentication: CrossOriginAuthentication;
 
     /**
      * Redirects to the hosted login page (`/authorize`) in order to initialize a new authN/authZ transaction
      *
-     * @method authorize
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
+     * @param {AuthorizeOptions} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
      */
-    authorize(options: any): void;
+    authorize(options: AuthorizeOptions): void;
 
     /**
      * Parse the url hash and extract the returned tokens depending on the transaction.
@@ -211,82 +195,99 @@ export class WebAuth {
      * by the `/.well-known/jwks.json` endpoint. Id tokens signed with other algorithms will not be
      * accepted.
      *
-     * @method parseHash
-     * @param {Object} options:
-     * @param {String} options._idTokenVerification [OPTIONAL] Default: true
-     * @param {String} options.state [OPTIONAL] to verify the response
-     * @param {String} options.nonce [OPTIONAL] to verify the id_token
-     * @param {String} options.hash [OPTIONAL] the url hash. If not provided it will extract from window.location.hash
+     * @param {ParseHashOptions} options
      * @param {Function} callback: any(err, token_payload)
      */
-    parseHash(options: any, callback: Auth0Callback<Auth0DecodedHash>): void;
+    parseHash(callback: Auth0Callback<Auth0DecodedHash>): void;
+
+    /**
+     * Parse the url hash and extract the returned tokens depending on the transaction.
+     *
+     * Only validates id_tokens signed by Auth0 using the RS256 algorithm using the public key exposed
+     * by the `/.well-known/jwks.json` endpoint. Id tokens signed with other algorithms will not be
+     * accepted.
+     *
+     * @param {ParseHashOptions} options
+     * @param {Function} callback: any(err, token_payload)
+     */
+    parseHash(options: ParseHashOptions, callback: Auth0Callback<Auth0DecodedHash>): void;
 
     /**
      * Decodes the id_token and verifies  the nonce.
      *
-     * @method validateToken
      * @param {String} token
-     * @param {String} state
      * @param {String} nonce
      * @param {Function} callback: function(err, {payload, transaction})
      */
-    validateToken(token: string, state: string, nonce: string, callback: Auth0Callback<any>): void;
+    validateToken(token: string, nonce: string, callback: Auth0Callback<any>): void;
 
     /**
-     * Executes a silent authentication transaction under the hood in order to fetch a new token.
+     * Executes a silent authentication transaction under the hood in order to fetch a new tokens for the current session.
+     * This method requires that all Auth is performed with {@link authorize}
+     * Watch out! If you're not using the hosted login page to do social logins, you have to use your own [social connection keys](https://manage.auth0.com/#/connections/social). If you use Auth0's dev keys, you'll always get `login_required` as an error when calling this method.
      *
-     * @method renewAuth
-     * @param {Object} options: any valid oauth2 parameter to be sent to the `/authorize` endpoint
+     * @param {RenewAuthOptions} options: any valid oauth2 parameter to be sent to the `/authorize` endpoint
      * @param {Function} callback
      */
-    renewAuth(options: any, callback: Auth0Callback<any>): void;
+    renewAuth(options: RenewAuthOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Initialices a change password transaction
      *
-     * @method changePassword
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
+     * @param {ChangePasswordOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-change_password
      * @param {Function} callback
      */
-    changePassword(options: any, callback: Auth0Callback<any>): void;
+    changePassword(options: ChangePasswordOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Signs up a new user
      *
-     * @method signup
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      * @param {Function} callback
      */
-    signup(options: any, callback: Auth0Callback<any>): void;
+    signup(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
     /**
      * Signs up a new user, automatically logs the user in after the signup and returns the user token.
      * The login will be done using /oauth/token with password-realm grant type.
      *
-     * @method signupAndAuthorize
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
+     * @param {DbSignUpOptions} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
      * @param {Function} callback
      */
-    signupAndAuthorize(options: any, callback: Auth0Callback<any>): void;
+    signupAndAuthorize(options: DbSignUpOptions, callback: Auth0Callback<any>): void;
 
     /**
-     * Redirects to the auth0 logout page
+     * Logs in the user with username and password using the cross origin authentication (/co/authenticate) flow. You can use either `username` or `email` to identify the user, but `username` will take precedence over `email`.
+     * This only works when 3rd party cookies are enabled in the browser. After the /co/authenticate call, you'll have to use the {@link parseHash} function at the `redirectUri` specified in the constructor.
      *
-     * @method logout
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--v2-logout
+     * @param {CrossOriginLoginOptions} options options used in the {@link authorize} call after the login_ticket is acquired
+     * @param {crossOriginLoginCallback} cb Callback function called only when an authentication error, like invalid username or password, occurs. For other types of errors, there will be a redirect to the `redirectUri`.
      */
-    logout(options: any): void;
+    login(options: CrossOriginLoginOptions, callback: Auth0Callback<any>): void;
+
+    /**
+     * Runs the callback code for the cross origin authentication call. This method is meant to be called by the cross origin authentication callback url.
+     *
+     */
+    crossOriginAuthenticationCallback(): void;
+
+    /**
+     * Redirects to the auth0 logout endpoint
+     *
+     * If you want to navigate the user to a specific URL after the logout, set that URL at the returnTo parameter. The URL should be included in any the appropriate Allowed Logout URLs list:
+     *
+     * - If the client_id parameter is included, the returnTo URL must be listed in the Allowed Logout URLs set at the client level (see Setting Allowed Logout URLs at the App Level).
+     * - If the client_id parameter is NOT included, the returnTo URL must be listed in the Allowed Logout URLs set at the account level (see Setting Allowed Logout URLs at the Account Level).
+     *
+     * @param {LogoutOptions} options
+     * @see   {@link https://auth0.com/docs/api/authentication#logout}
+     */
+    logout(options: LogoutOptions): void;
 
     /**
      * Initialices a passwordless authentication transaction
      *
-     * @method passwordlessStart
-     * @param {Object} options: https://auth0.com/docs/api/authentication#passwordless
-     * @param {Object} options.send: `link` or `code`
-     * @param {Object} options.phoneNumber: send should be code and email not set
-     * @param {Object} options.email: phoneNumber should be ignored
-     * @param {Object} options.connection
-     * @param {Object} options.authParams
+     * @param {PasswordlessStartOptions} options: https://auth0.com/docs/api/authentication#passwordless
      * @param {Function} callback
      */
     passwordlessStart(options: PasswordlessStartOptions, callback: Auth0Callback<any>): void;
@@ -295,27 +296,28 @@ export class WebAuth {
      * Verifies the passwordless TOTP and redirects to finish the passwordless transaction
      *
      * @method passwordlessVerify
-     * @param {Object} options:
-     * @param {Object} options.type: `sms` or `email`
-     * @param {Object} options.phoneNumber: only if type = sms
-     * @param {Object} options.email: only if type = email
-     * @param {Object} options.connection: the connection name
-     * @param {Object} options.verificationCode: the TOTP code
+     * @param {PasswordlessVerifyOptions} options:
      * @param {Function} callback
      */
-    passwordlessVerify(options: any, callback: Auth0Callback<any>): void;
+    passwordlessVerify(options: PasswordlessVerifyOptions, callback: Auth0Callback<any>): void;
 }
 
 export class Redirect {
     constructor(client: any, options: any);
 
     /**
-     * Initializes the legacy Lock login flow in a popup
+     * Performs authentication with username/email and password with a database connection
+     *
+     * This method is not compatible with API Auth so if you need to fetch API tokens with audience
+     * you should use {@link authorize} or {@link login}.
      *
      * @method loginWithCredentials
      * @param {Object} options
-     * @param {Function} callback
-     * @deprecated `webauth.popup.loginWithCredentials` will be soon deprecated, use `webauth.client.login` instead.
+     * @param {String} [options.redirectUri] url that the Auth0 will redirect after Auth with the Authorization Response
+     * @param {String} [options.responseType] type of the response used. It can be any of the values `code` and `token`
+     * @param {String} [options.responseMode] how the AuthN response is encoded and redirected back to the client. Supported values are `query` and `fragment`
+     * @param {String} [options.scope] scopes to be requested during AuthN. e.g. `openid email`
+     * @param {credentialsCallback} cb
      */
     loginWithCredentials(options: any, callback: Auth0Callback<any>): void;
 
@@ -323,8 +325,11 @@ export class Redirect {
      * Signs up a new user and automatically logs the user in after the signup.
      *
      * @method signupAndLogin
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
-     * @param {Function} callback
+     * @param {Object} options
+     * @param {String} options.email user email address
+     * @param {String} options.password user password
+     * @param {String} options.connection name of the connection where the user will be created
+     * @param {credentialsCallback} cb
      */
     signupAndLogin(options: any, callback: Auth0Callback<any>): void;
 }
@@ -348,21 +353,51 @@ export class Popup {
     preload(options: any): any;
 
     /**
-     * Opens in a popup the hosted login page (`/authorize`) in order to initialize a new authN/authZ transaction
+     * Handles the popup logic for the callback page.
+     *
+     * @method callback
+     * @param {Object} options
+     * @param {String} options.hash the url hash. If not provided it will extract from window.location.hash
+     * @param {String} [options.state] value originally sent in `state` parameter to {@link authorize} to mitigate XSRF
+     * @param {String} [options.nonce] value originally sent in `nonce` parameter to {@link authorize} to prevent replay attacks
+     * @param {String} [options._idTokenVerification] makes parseHash perform or skip `id_token` verification. We **strongly** recommend validating the `id_token` yourself if you disable the verification.
+     * @see   {@link parseHash}
+     */
+    callback(options: any): void;
+
+    /**
+     * Shows inside a new window the hosted login page (`/authorize`) in order to start a new authN/authZ transaction and post its result using `postMessage`.
      *
      * @method authorize
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#get--authorize_db
-     * @param {Function} callback
+     * @param {Object} options
+     * @param {String} [options.domain] your Auth0 domain
+     * @param {String} [options.clientID] your Auth0 client identifier obtained when creating the client in the Auth0 Dashboard
+     * @param {String} options.redirectUri url that the Auth0 will redirect after Auth with the Authorization Response
+     * @param {String} options.responseType type of the response used by OAuth 2.0 flow. It can be any space separated list of the values `code`, `token`, `id_token`. {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0}
+     * @param {String} [options.responseMode] how the Auth response is encoded and redirected back to the client. Supported values are `query`, `fragment` and `form_post`. {@link https://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes}
+     * @param {String} [options.state] value used to mitigate XSRF attacks. {@link https://auth0.com/docs/protocols/oauth2/oauth-state}
+     * @param {String} [options.nonce] value used to mitigate replay attacks when using Implicit Grant. {@link https://auth0.com/docs/api-auth/tutorials/nonce}
+     * @param {String} [options.scope] scopes to be requested during Auth. e.g. `openid email`
+     * @param {String} [options.audience] identifier of the resource server who will consume the access token issued after Auth
+     * @param {Boolean} [options.owp] determines if Auth0 should render the relay page or not and the caller is responsible of handling the response.
+     * @param {authorizeCallback} cb
+     * @see {@link https://auth0.com/docs/api/authentication#authorize-client}
      */
     authorize(options: any, callback: Auth0Callback<any>): void;
 
     /**
-     * Initializes the legacy Lock login flow in a popup
+     * Performs authentication with username/email and password with a database connection inside a new window
+     *
+     * This method is not compatible with API Auth so if you need to fetch API tokens with audience
+     * you should use {@link authorize} or {@link login}.
      *
      * @method loginWithCredentials
      * @param {Object} options
-     * @param {Function} callback
-     * @deprecated `webauth.popup.loginWithCredentials` will be soon deprecated, use `webauth.client.login` instead.
+     * @param {String} [options.redirectUri] url that the Auth0 will redirect after Auth with the Authorization Response
+     * @param {String} [options.responseType] type of the response used. It can be any of the values `code` and `token`
+     * @param {String} [options.responseMode] how the AuthN response is encoded and redirected back to the client. Supported values are `query` and `fragment`
+     * @param {String} [options.scope] scopes to be requested during AuthN. e.g. `openid email`
+     * @param {credentialsCallback} cb
      */
     loginWithCredentials(options: any, callback: Auth0Callback<any>): void;
 
@@ -383,13 +418,38 @@ export class Popup {
     /**
      * Signs up a new user and automatically logs the user in after the signup.
      *
+     * This method is not compatible with API Auth so if you need to fetch API tokens with audience
+     * you should use {@link authorize} or {@link signupAndAuthorize}.
+     *
      * @method signupAndLogin
-     * @param {Object} options: https://auth0.com/docs/api/authentication#!#post--dbconnections-signup
-     * @param {Function} callback
+     * @param {Object} options
+     * @param {String} options.email user email address
+     * @param {String} options.password user password
+     * @param {String} options.connection name of the connection where the user will be created
+     * @param {credentialsCallback} cb
      */
     signupAndLogin(options: any, callback: Auth0Callback<any>): void;
 }
 
+export class CrossOriginAuthentication {
+    constructor(webAuth: any, options: any);
+
+    /**
+     * Logs in the user with username and password using the cross origin authentication (/co/authenticate) flow. You can use either `username` or `email` to identify the user, but `username` will take precedence over `email`.
+     * This only works when 3rd party cookies are enabled in the browser. After the /co/authenticate call, you'll have to use the {@link parseHash} function at the `redirectUri` specified in the constructor.
+     *
+     * @param {CrossOriginLoginOptions} options options used in the {@link authorize} call after the login_ticket is acquired
+     * @param {crossOriginLoginCallback} cb Callback function called only when an authentication error, like invalid username or password, occurs. For other types of errors, there will be a redirect to the `redirectUri`.
+     */
+    login(options: CrossOriginLoginOptions, callback: Auth0Callback<any>): void;
+
+    /**
+     * Runs the callback code for the cross origin authentication call. This method is meant to be called by the cross origin authentication callback url.
+     *
+     */
+    callback(): void;
+}
+
 type Auth0Callback<T> = (error: null | Auth0Error, result: T) => void;
 
 interface ManagementOptions {
@@ -472,6 +532,7 @@ interface PasswordlessVerifyOptions {
     verificationCode: string;
     phoneNumber?: string;
     email?: string;
+    send?: string;
 }
 
 interface Auth0UserProfile {
@@ -514,3 +575,87 @@ interface Auth0Identity {
     provider: string;
     user_id: string;
 }
+
+interface LoginOptions {
+    username: string;
+    password: string;
+    scope?: string;
+}
+
+interface DefaultLoginOptions extends LoginOptions {
+    audience?: string;
+    realm: string;
+}
+
+interface DefaultDirectoryLoginOptions extends LoginOptions {
+    audience?: string;
+}
+
+interface ResourceOwnerLoginOptions extends LoginOptions {
+    connection: string;
+    device?: string;
+}
+
+interface CrossOriginLoginOptions {
+    username?: string;
+    email?: string;
+    password: string;
+    realm?: string;
+}
+
+interface LogoutOptions {
+    clientID?: string;
+    returnTo?: string;
+    federated?: boolean;
+}
+
+interface DelegationOptions {
+    client_id?: string;
+    grant_type: string;
+    id_token?: string;
+    refresh_token?: string;
+    target?: string;
+    scope?: string;
+    api_type?: string;
+}
+
+interface DbSignUpOptions {
+    email: string;
+    password: string;
+    connection: string;
+    scope?: string;
+}
+
+interface ParseHashOptions {
+    hash?: string;
+    state?: string;
+    nonce?: string;
+    _idTokenVerification?: boolean;
+}
+
+interface RenewAuthOptions {
+    domain?: string;
+    clientID?: string;
+    redirectUri?: string;
+    responseType?: string;
+    responseMode?: string;
+    state?: string;
+    nonce?: string;
+    scope?: string;
+    audience?: string;
+    usePostMessage?: boolean;
+    postMessageDataType?: string;
+}
+
+interface AuthorizeOptions {
+    domain?: string;
+    clientID?: string;
+    connection?:string;
+    redirectUri?: string;
+    responseType?: string;
+    responseMode?: string;
+    state?: string;
+    nonce?: string;
+    scope?: string;
+    audience?: string;
+}
diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index a241eb6d0c..3abe93a7c2 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -61,11 +61,22 @@ lock.on("authenticated", function(authResult : any) {
   });
 });
 
-
 // test theme
 
 var themeOptions : Auth0LockConstructorOptions = {
   theme: {
+    authButtons: {
+      fooProvider: {
+        displayName: 'foo'
+      },
+      barProvider: {
+        displayName: 'foo',
+        primaryColor: '#FF0000',
+        foregroundColor: '#00FF00',
+        icon: 'http://baz.com/icon.png'
+      }
+    },
+    labeledSubmitButton: false,
     logo: "https://example.com/assets/logo.png",
     primaryColor: "green"
   }
@@ -73,6 +84,14 @@ var themeOptions : Auth0LockConstructorOptions = {
 
 new Auth0Lock(CLIENT_ID, DOMAIN, themeOptions);
 
+// test empty theme
+
+var themeOptionsEmpty : Auth0LockConstructorOptions = {
+  theme: { }
+};
+
+new Auth0Lock(CLIENT_ID, DOMAIN, themeOptions);
+
 // test authentication
 
 var authOptions : Auth0LockConstructorOptions = {
@@ -170,7 +189,7 @@ var selectFieldOptionsWithCallbacks : Auth0LockConstructorOptions = {
       cb(null, prefill);
     }
   }]
-}
+};
 
 new Auth0Lock(CLIENT_ID, DOMAIN, selectFieldOptionsWithCallbacks);
 
@@ -198,3 +217,17 @@ var avatarOptions : Auth0LockConstructorOptions = {
 };
 
 new Auth0Lock(CLIENT_ID, DOMAIN, avatarOptions);
+
+var authResult : AuthResult = {
+    accessToken: 'fake_access_token',
+    idToken: 'fake_id_token',
+    idTokenPayload: {
+      aud: "EaQzyHt1Dy57l-r5iHcMeT-lh1fFZntg",
+      exp: 1494393724,
+      iat: 1494357724,
+      iss: "https://www.foo.com",
+      sub: "auth0|aksjfkladsf"
+    },
+    refreshToken: undefined,
+    state: "923jf092j3.FFSDJFDSKLDF"
+};
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 285ad25288..e49c23a308 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for auth0-lock 10.10
+// Type definitions for auth0-lock 10.16
 // Project: http://auth0.com
 // Definitions by: Brian Caruso <https://github.com/carusology>
+//                 Dan Caddigan <https://github.com/goldcaddy77>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="auth0-js" />
@@ -40,7 +41,19 @@ interface Auth0LockAvatarOptions {
     displayName: (email: string, callback: Auth0LockAvatarDisplayNameCallback) => void;
 }
 
+interface Auth0LockThemeButton {
+    displayName: string;
+    primaryColor?: string;
+    foregroundColor?: string;
+    icon?: string;
+}
+interface Auth0LockThemeButtonOptions {
+    [provider: string]: Auth0LockThemeButton;
+}
+
 interface Auth0LockThemeOptions {
+    authButtons?: Auth0LockThemeButtonOptions;
+    labeledSubmitButton?: boolean;
     logo?: string;
     primaryColor?: string;
 }
@@ -121,6 +134,20 @@ interface Auth0LockShowOptions {
     rememberLastLogin?: boolean;
 }
 
+interface AuthResult {
+    accessToken: string;
+    idToken: string;
+    idTokenPayload: {
+        aud: string;
+        exp: number;
+        iat: number;
+        iss: string;
+        sub: string;
+    };
+    refreshToken?: string;
+    state: string;
+}
+
 interface Auth0LockStatic {
     new (clientId: string, domain: string, options?: Auth0LockConstructorOptions): Auth0LockStatic;
 
@@ -128,14 +155,14 @@ interface Auth0LockStatic {
     getProfile(token: string, callback: (error: auth0.Auth0Error, profile: auth0.Auth0UserProfile) => void): void;
     getUserInfo(token: string, callback: (error: auth0.Auth0Error, profile: auth0.Auth0UserProfile) => void): void;
     // https://github.com/auth0/lock#resumeauthhash-callback
-    resumeAuth( hash: string, callback: (error: auth0.Auth0Error, authResult: any) =>  void): void;
+    resumeAuth( hash: string, callback: (error: auth0.Auth0Error, authResult: AuthResult) =>  void): void;
     show(options?: Auth0LockShowOptions): void;
     hide(): void;
     logout(query: any): void;
 
     on(event: "show" | "hide", callback: () => void): void;
     on(event: "unrecoverable_error" | "authorization_error", callback: (error: auth0.Auth0Error) => void): void;
-    on(event: "authenticated", callback: (authResult: any) => void): void;
+    on(event: "authenticated", callback: (authResult: AuthResult) => void): void;
     on(event: string, callback: (...args: any[]) => void): void;
 }
 
diff --git a/types/auth0-lock/tslint.json b/types/auth0-lock/tslint.json
new file mode 100644
index 0000000000..51b68d9fc6
--- /dev/null
+++ b/types/auth0-lock/tslint.json
@@ -0,0 +1,12 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "only-arrow-functions": false,
+    "no-misused-new": false,
+    "no-single-declare-module": false,
+    "prefer-method-signature": false,
+    "object-literal-shorthand": false,
+    "typedef-whitespace": false,
+    "no-var": false
+  }
+}
diff --git a/types/auth0/auth0-tests.ts b/types/auth0/auth0-tests.ts
index 24a4aad87d..b84e92e223 100644
--- a/types/auth0/auth0-tests.ts
+++ b/types/auth0/auth0-tests.ts
@@ -28,6 +28,42 @@ management
     // Handle the error.
   });
 
+// Using a callback.
+management.getUser({id: 'user_id'},(err: Error, user: auth0.User) => {
+  if (err) {
+    // Handle error.
+  }
+  console.log(user);
+});
+
+// Using a Promise.
+management
+  .getUser({id: 'user_id'})
+  .then((user) => {
+    console.log(user);
+  })
+  .catch((err) => {
+    // Handle the error.
+  });
+
+// Using a callback.
+management.deleteUser({id: 'user_id'},(err: Error) => {
+  if (err) {
+    // Handle error.
+  }
+  console.log('deleted');
+});
+
+// Using a Promise.
+management
+  .deleteUser({id: 'user_id'})
+  .then(() => {
+    console.log('deleted');
+  })
+  .catch((err) => {
+    // Handle the error.
+  });
+
 management
   .createUser({
     connection: 'My-Connection',
diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index a8a6242bb4..3025b8d380 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for auth0 2.4
+// Type definitions for auth0 3.0
 // Project: https://github.com/auth0/node-auth0
-// Definitions by: Wilson Hobbs <https://github.com/wbhob>, Seth Westphal <https://github.com/westy92>
+// Definitions by: Wilson Hobbs <https://github.com/wbhob>, Seth Westphal <https://github.com/westy92>, Amiram Korach <https://github.com/amiram>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Promise from 'bluebird';
 
@@ -14,16 +15,29 @@ export interface UserMetadata { }
 export interface AppMetadata { }
 
 export interface UserData {
-  connection: string;
   email?: string;
   username?: string;
+  email_verified?: boolean;
+  verify_email?: boolean;
   password?: string;
   phone_number?: string;
+  phone_verified?: boolean,
   user_metadata?: UserMetadata;
-  email_verified?: boolean;
   app_metadata?: AppMetadata;
 }
 
+export interface CreateUserData extends UserData {
+  connection: string;
+}
+
+export interface UpdateUserData extends UserData {
+  connection?: string;
+  blocked?: boolean;
+  verify_phone_number?: boolean,
+  verify_password?: boolean,
+  client_id?: string
+}
+
 export interface GetUsersData {
   per_page?: number;
   page?: number;
@@ -67,10 +81,6 @@ export interface Identity {
   isSocial: boolean;
 }
 
-export interface UpdateUserParameters {
-  id: string;
-}
-
 export interface AuthenticationClientOptions {
   clientId?: string;
   domain: string;
@@ -134,17 +144,47 @@ export interface ClientParams {
   client_id: string;
 }
 
+export type DeleteDeleteMultifactorParamsProvider = 'duo' | 'google-authenticator';
+
 export interface DeleteMultifactorParams {
   id: string;
-  provider: string;
+  provider: DeleteDeleteMultifactorParamsProvider;
 }
 
-export interface LinkAccountsParams {
+export type UnlinkAccountsParamsProvider = 'ad' | 'adfs' | 'amazon' | 'dropbox' | 'bitbucket' | 'aol' | 'auth0-adldap' |
+  'auth0-oidc' | 'auth0' | 'baidu' | 'bitly' | 'box' | 'custom' | 'dwolla' | 'email' | 'evernote-sandbox' | 'evernote' |
+  'exact' | 'facebook' | 'fitbit' | 'flickr' | 'github' | 'google-apps' | 'google-oauth2' | 'guardian' | 'instagram' |
+  'ip' | 'linkedin' | 'miicard' | 'oauth1' | 'oauth2' | 'office365' | 'paypal' | 'paypal-sandbox' | 'pingfederate' |
+  'planningcenter' | 'renren' | 'salesforce-community' | 'salesforce-sandbox' | 'salesforce' | 'samlp' | 'sharepoint' |
+  'shopify' | 'sms' | 'soundcloud' | 'thecity-sandbox' | 'thecity' | 'thirtysevensignals' | 'twitter' | 'untappd' |
+  'vkontakte' | 'waad' | 'weibo' | 'windowslive' | 'wordpress' | 'yahoo' | 'yammer' | 'yandex';
+
+export interface UnlinkAccountsParams {
   id: string;
-  provider: string;
+  provider: UnlinkAccountsParamsProvider;
   user_id: string;
 }
 
+export interface UnlinkAccountsResponseProfile {
+  email?: string;
+  email_verified?: boolean;
+  name?: string;
+  username?: string;
+  given_name?: string;
+  phone_number?: string;
+  phone_verified?: boolean;
+  family_name?: string;
+}
+
+export interface UnlinkAccountsResponse {
+  connection: string;
+  user_id: string;
+  provider: string;
+  isSocial?: boolean;
+  access_token?: string;
+  profileData?: UnlinkAccountsResponseProfile
+}
+
 export interface LinkAccountsData {
   user_id: string;
   connection_id: string;
@@ -307,32 +347,33 @@ export class ManagementClient {
   getUsers(params?: GetUsersData): Promise<User[]>;
   getUsers(params?: GetUsersData, cb?: (err: Error, users: User[]) => void): void;
 
-  getUser(params?: ObjectWithId): Promise<User[]>;
-  getUser(params?: ObjectWithId, cb?: (err: Error, users: User[]) => void): void;
+  getUser(params: ObjectWithId): Promise<User>;
+  getUser(params: ObjectWithId, cb?: (err: Error, user: User) => void): void;
 
-  createUser(data: UserData): Promise<User>;
-  createUser(data: UserData, cb: (err: Error, data: User) => void): void;
+  createUser(data: CreateUserData): Promise<User>;
+  createUser(data: CreateUserData, cb: (err: Error, data: User) => void): void;
 
-  updateUser(params: UpdateUserParameters, data: User): Promise<User>;
-  updateUser(params: UpdateUserParameters, data: User, cb: (err: Error, data: User) => void): void;
+  updateUser(params: ObjectWithId, data: UpdateUserData): Promise<User>;
+  updateUser(params: ObjectWithId, data: UpdateUserData, cb: (err: Error, data: User) => void): void;
 
-  updateUserMetadata(params: UpdateUserParameters, data: UserMetadata): Promise<User>;
-  updateUserMetadata(params: UpdateUserParameters, data: UserMetadata, cb: (err: Error, data: User) => void): void;
+  updateUserMetadata(params: ObjectWithId, data: UserMetadata): Promise<User>;
+  updateUserMetadata(params: ObjectWithId, data: UserMetadata, cb: (err: Error, data: User) => void): void;
 
+  // Should be removed from auth0 also. Doesn't exist in api.
   deleteAllUsers(): Promise<User>;
   deleteAllUsers(cb: (err: Error, data: any) => void): void;
 
-  deleteUser(params?: ObjectWithId): Promise<any>;
-  deleteUser(params?: ObjectWithId, cb?: (err: Error, users: User[]) => void): void;
+  deleteUser(params: ObjectWithId): Promise<void>;
+  deleteUser(params: ObjectWithId, cb?: (err: Error) => void): void;
 
-  updateAppMetadata(params: UpdateUserParameters, data: AppMetadata): Promise<User>;
-  updateAppMetadata(params: UpdateUserParameters, data: AppMetadata, cb: (err: Error, data: User) => void): void;
+  updateAppMetadata(params: ObjectWithId, data: AppMetadata): Promise<User>;
+  updateAppMetadata(params: ObjectWithId, data: AppMetadata, cb: (err: Error, data: User) => void): void;
 
-  deleteUserMultifactor(params: DeleteMultifactorParams): Promise<any>;
-  deleteUserMultifactor(params: DeleteMultifactorParams, cb: (err: Error, data: any) => void): void;
+  deleteUserMultifactor(params: DeleteMultifactorParams): Promise<void>;
+  deleteUserMultifactor(params: DeleteMultifactorParams, cb: (err: Error) => void): void;
 
-  unlinkUsers(params: LinkAccountsParams): Promise<any>;
-  unlinkUsers(params: LinkAccountsParams, cb: (err: Error, data: any) => void): void;
+  unlinkUsers(params: UnlinkAccountsParams): Promise<UnlinkAccountsResponse>;
+  unlinkUsers(params: UnlinkAccountsParams, cb: (err: Error, data: UnlinkAccountsResponse) => void): void;
 
   linkUsers(params: ObjectWithId, data: LinkAccountsData): Promise<any>;
   linkUsers(params: ObjectWithId, data: LinkAccountsData, cb: (err: Error, data: any) => void): void;
diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index e793442177..7f8b8fabdd 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -60,7 +60,9 @@ var S3CreateEvent: AWSLambda.S3CreateEvent = {
     }
     ]
 };
-
+var cognitoUserPoolEvent: AWSLambda.CognitoUserPoolEvent;
+var cloudformationCustomResourceEvent: AWSLambda.CloudFormationCustomResourceEvent;
+var cloudformationCustomResourceResponse: AWSLambda.CloudFormationCustomResourceResponse;
 
 /* API Gateway Event */
 str = apiGwEvt.body;
@@ -164,6 +166,82 @@ authResponse = {
     policyDocument: policyDocument
 };
 
+// CognitoUserPoolEvent
+num = cognitoUserPoolEvent.version;
+cognitoUserPoolEvent.triggerSource === "PreSignUp_SignUp";
+cognitoUserPoolEvent.triggerSource === "PostConfirmation_ConfirmSignUp";
+cognitoUserPoolEvent.triggerSource === "PreAuthentication_Authentication";
+cognitoUserPoolEvent.triggerSource === "PostAuthentication_Authentication";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_SignUp";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_AdminCreateUser";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_ResendCode";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_ForgotPassword";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_UpdateUserAttribute";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_VerifyUserAttribute";
+cognitoUserPoolEvent.triggerSource === "CustomMessage_Authentication";
+cognitoUserPoolEvent.triggerSource === "DefineAuthChallenge_Authentication";
+cognitoUserPoolEvent.triggerSource === "CreateAuthChallenge_Authentication";
+cognitoUserPoolEvent.triggerSource === "VerifyAuthChallengeResponse_Authentication";
+str = cognitoUserPoolEvent.region;
+str = cognitoUserPoolEvent.userPoolId;
+str = cognitoUserPoolEvent.userName;
+str = cognitoUserPoolEvent.callerContext.awsSdkVersion;
+str = cognitoUserPoolEvent.callerContext.clientId;
+str = cognitoUserPoolEvent.request.userAttributes["email"];
+str = cognitoUserPoolEvent.request.validationData["k1"];
+str = cognitoUserPoolEvent.request.codeParameter;
+str = cognitoUserPoolEvent.request.usernameParameter;
+b = cognitoUserPoolEvent.request.newDeviceUsed;
+cognitoUserPoolEvent.request.session[0].challengeName === "CUSTOM_CHALLENGE";
+cognitoUserPoolEvent.request.session[0].challengeName === "PASSWORD_VERIFIER";
+cognitoUserPoolEvent.request.session[0].challengeName === "SMS_MFA";
+cognitoUserPoolEvent.request.session[0].challengeName === "DEVICE_SRP_AUTH";
+cognitoUserPoolEvent.request.session[0].challengeName === "DEVICE_PASSWORD_VERIFIER";
+cognitoUserPoolEvent.request.session[0].challengeName === "ADMIN_NO_SRP_AUTH";
+b = cognitoUserPoolEvent.request.session[0].challengeResult;
+str = cognitoUserPoolEvent.request.session[0].challengeMetaData;
+str = cognitoUserPoolEvent.request.challengeName;
+str = cognitoUserPoolEvent.request.privateChallengeParameters["answer"];
+str = cognitoUserPoolEvent.request.challengeAnswer["answer"];
+b = cognitoUserPoolEvent.response.answerCorrect;
+str = cognitoUserPoolEvent.response.smsMessage;
+str = cognitoUserPoolEvent.response.emailMessage;
+str = cognitoUserPoolEvent.response.emailSubject;
+str = cognitoUserPoolEvent.response.challengeName;
+b = cognitoUserPoolEvent.response.issueTokens;
+b = cognitoUserPoolEvent.response.failAuthentication;
+str = cognitoUserPoolEvent.response.publicChallengeParameters["captchaUrl"];
+str = cognitoUserPoolEvent.response.privateChallengeParameters["answer"];
+str = cognitoUserPoolEvent.response.challengeMetaData;
+b = cognitoUserPoolEvent.response.answerCorrect;
+
+// CloudFormation Custom Resource
+switch (cloudformationCustomResourceEvent.RequestType) {
+    case "Create":
+        str = cloudformationCustomResourceEvent.LogicalResourceId;
+        str = cloudformationCustomResourceEvent.RequestId;
+        anyObj = cloudformationCustomResourceEvent.ResourceProperties;
+        str = cloudformationCustomResourceEvent.ResourceProperties.ServiceToken;
+        str = cloudformationCustomResourceEvent.ResourceType;
+        str = cloudformationCustomResourceEvent.ResponseURL;
+        str = cloudformationCustomResourceEvent.ServiceToken;
+        str = cloudformationCustomResourceEvent.StackId;
+    break;
+    case "Update":
+        anyObj = cloudformationCustomResourceEvent.OldResourceProperties;
+    break;
+    case "Delete":
+        str = cloudformationCustomResourceEvent.PhysicalResourceId;
+    break;
+}
+anyObj = cloudformationCustomResourceResponse.Data;
+str = cloudformationCustomResourceResponse.LogicalResourceId;
+str = cloudformationCustomResourceResponse.PhysicalResourceId;
+str = cloudformationCustomResourceResponse.Reason;
+str = cloudformationCustomResourceResponse.RequestId;
+str = cloudformationCustomResourceResponse.StackId;
+str = cloudformationCustomResourceResponse.Status;
+
 /* Context */
 b = context.callbackWaitsForEmptyEventLoop;
 str = context.functionName;
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index a5fa271699..df8effb82b 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for AWS Lambda
 // Project: http://docs.aws.amazon.com/lambda
-// Definitions by: James Darbyshire <https://github.com/darbio/aws-lambda-typescript>, Michael Skarum <https://github.com/skarum>, Stef Heyenrath <https://github.com/StefH/DefinitelyTyped>, Toby Hede <https://github.com/tobyhede>, Rich Buggy <https://github.com/buggy>, Simon Ramsay <https://github.com/nexus-uw>
+// Definitions by: James Darbyshire <https://github.com/darbio/aws-lambda-typescript>, Michael Skarum <https://github.com/skarum>, Stef Heyenrath <https://github.com/StefH/DefinitelyTyped>, Toby Hede <https://github.com/tobyhede>, Rich Buggy <https://github.com/buggy>, Yoriki Yamaguchi <https://github.com/y13i>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // API Gateway "event"
@@ -124,6 +124,108 @@ interface S3CreateEvent {
     ];
 }
 
+/**
+ * Cognito User Pool event
+ * http://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html
+ */
+interface CognitoUserPoolEvent {
+    version: number;
+    triggerSource: "PreSignUp_SignUp" | "PostConfirmation_ConfirmSignUp" | "PreAuthentication_Authentication" | "PostAuthentication_Authentication" | "CustomMessage_SignUp" | "CustomMessage_AdminCreateUser" | "CustomMessage_ResendCode" | "CustomMessage_ForgotPassword" | "CustomMessage_UpdateUserAttribute" | "CustomMessage_VerifyUserAttribute" | "CustomMessage_Authentication" | "DefineAuthChallenge_Authentication" | "CreateAuthChallenge_Authentication" | "VerifyAuthChallengeResponse_Authentication";
+    region: string;
+    userPoolId: string;
+    userName?: string;
+    callerContext: {
+        awsSdkVersion: string;
+        clientId: string;
+    };
+    request: {
+        userAttributes: {[key: string]: string};
+        validationData?: {[key: string]: string};
+        codeParameter?: string;
+        usernameParameter?: string;
+        newDeviceUsed?: boolean;
+        session?: {
+            challengeName: "CUSTOM_CHALLENGE" | "PASSWORD_VERIFIER" | "SMS_MFA" | "DEVICE_SRP_AUTH" | "DEVICE_PASSWORD_VERIFIER" | "ADMIN_NO_SRP_AUTH";
+            challengeResult: boolean;
+            challengeMetaData?: string;
+        }[];
+        challengeName?: string;
+        privateChallengeParameters?: {[key: string]: string};
+        challengeAnswer?: {[key: string]: string};
+    };
+    response: {
+        autoConfirmUser?: boolean;
+        smsMessage?: string;
+        emailMessage?: string;
+        emailSubject?: string;
+        challengeName?: string;
+        issueTokens?: boolean;
+        failAuthentication?: boolean;
+        publicChallengeParameters?: {[key: string]: string};
+        privateChallengeParameters?: {[key: string]: string};
+        challengeMetaData?: string;
+        answerCorrect?: boolean;
+    };
+}
+
+/**
+ * CloudFormation Custom Resource event and response
+ * http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/crpg-ref.html
+ */
+type CloudFormationCustomResourceEventCommon = {
+    ServiceToken: string;
+    ResponseURL: string;
+    StackId: string;
+    RequestId: string;
+    LogicalResourceId: string;
+    ResourceType: string;
+    ResourceProperties: {
+        ServiceToken: string;
+        [Key: string]: any;
+    }
+}
+
+type CloudFormationCustomResourceCreateEvent = CloudFormationCustomResourceEventCommon & {
+    RequestType: "Create";
+}
+
+type CloudFormationCustomResourceUpdateEvent = CloudFormationCustomResourceEventCommon & {
+    RequestType: "Update";
+    PhysicalResourceId: string;
+    OldResourceProperties: {
+        [Key: string]: any;
+    };
+}
+
+type CloudFormationCustomResourceDeleteEvent = CloudFormationCustomResourceEventCommon & {
+    RequestType: "Delete";
+    PhysicalResourceId: string;
+}
+
+export type CloudFormationCustomResourceEvent = CloudFormationCustomResourceCreateEvent | CloudFormationCustomResourceUpdateEvent | CloudFormationCustomResourceDeleteEvent;
+
+type CloudFormationCustomResourceResponseCommon = {
+    PhysicalResourceId: string;
+    StackId: string;
+    RequestId: string;
+    LogicalResourceId: string;
+    Data?: {
+        [Key: string]: any;
+    }
+}
+
+type CloudFormationCustomResourceSuccessResponse = CloudFormationCustomResourceResponseCommon & {
+    Status: "SUCCESS";
+    Reason?: string;
+}
+
+type CloudFormationCustomResourceFailedResponse = CloudFormationCustomResourceResponseCommon & {
+    Status: "FAILED";
+    Reason: string;
+}
+
+export type CloudFormationCustomResourceResponse = CloudFormationCustomResourceSuccessResponse | CloudFormationCustomResourceFailedResponse;
+
 // Context
 // http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html
 interface Context {
diff --git a/types/babel-traverse/babel-traverse-tests.ts b/types/babel-traverse/babel-traverse-tests.ts
index 98afbbc0a7..5952faefd1 100644
--- a/types/babel-traverse/babel-traverse-tests.ts
+++ b/types/babel-traverse/babel-traverse-tests.ts
@@ -120,3 +120,15 @@ const BindingKindTest: Visitor  = {
         // kind === 'anythingElse';
     },
 };
+
+// https://github.com/babel/babel/blob/d33d02359474296402b1577ef53f20d94e9085c4/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/exec/scope-bindings.js#L15-L25
+const vScope: Visitor = {
+    Scope: {
+        enter(path) {
+            console.log(`Entering scope: ${path.node.type}`);
+        },
+        exit(path) {
+            console.log(`Exiting scope: ${path.node.type}`);
+        }
+    }
+};
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index e307cd664d..8d34144d0a 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -305,6 +305,7 @@ export interface Visitor extends VisitNodeObject<Node> {
     FlowBaseAnnotation?: VisitNode<t.FlowBaseAnnotation>;
     FlowDeclaration?: VisitNode<t.FlowDeclaration>;
     JSX?: VisitNode<t.JSX>;
+    Scope?: VisitNode<t.Scopable>;
 }
 
 export type VisitNode<T> = VisitNodeFunction<T> | VisitNodeObject<T>;
diff --git a/types/backbone-associations/index.d.ts b/types/backbone-associations/index.d.ts
index 84532c482d..9d0aa36614 100644
--- a/types/backbone-associations/index.d.ts
+++ b/types/backbone-associations/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/dhruvaray/backbone-associations/
 // Definitions by: Craig Brett <https://github.com/craigbrett17/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 
diff --git a/types/backbone-fetch-cache/index.d.ts b/types/backbone-fetch-cache/index.d.ts
index 0067bb4443..c5e8d84426 100644
--- a/types/backbone-fetch-cache/index.d.ts
+++ b/types/backbone-fetch-cache/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/madglory/backbone-fetch-cache
 // Definitions by: delphinus <https://github.com/delphinus35/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from "backbone";
 
diff --git a/types/backbone-relational/index.d.ts b/types/backbone-relational/index.d.ts
index f985a52d8f..b51c46f1d7 100644
--- a/types/backbone-relational/index.d.ts
+++ b/types/backbone-relational/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://backbonerelational.org/
 // Definitions by: Eirik Hoem <https://github.com/eirikhm/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/backbone.layoutmanager/index.d.ts b/types/backbone.layoutmanager/index.d.ts
index a5c469eb1b..f4eb340e7c 100644
--- a/types/backbone.layoutmanager/index.d.ts
+++ b/types/backbone.layoutmanager/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://layoutmanager.org/
 // Definitions by: He Jiang <https://github.com/hejiang2000/>
 // Definitions: https://github.com/hejiang2000/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/backbone.localstorage/index.d.ts b/types/backbone.localstorage/index.d.ts
index d08d546ec2..9fd089cdec 100644
--- a/types/backbone.localstorage/index.d.ts
+++ b/types/backbone.localstorage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jeromegn/Backbone.localStorage
 // Definitions by: Louis Grignon <https://github.com/lgrignon/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 93b82355db..8b3d338293 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/marionettejs/
 // Definitions by: Zeeshan Hamid <https://github.com/zhamid>, Natan Vivo <https://github.com/nvivo>, Sven Tschui <https://github.com/sventschui>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 import * as Radio from 'backbone.radio';
diff --git a/types/backbone.paginator/backbone.paginator-tests.ts b/types/backbone.paginator/backbone.paginator-tests.ts
index f4f5765988..f24e2855f5 100644
--- a/types/backbone.paginator/backbone.paginator-tests.ts
+++ b/types/backbone.paginator/backbone.paginator-tests.ts
@@ -107,60 +107,48 @@ namespace Paging {
 
   testCollection.getFirstPage(options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getFirstPage({silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getFirstPage({url: true});
+  testCollection.getFirstPage({silent: false});
+  testCollection.getFirstPage({url: 'zombocom'});
 
 
   result = testCollection.getLastPage();
 
   testCollection.getLastPage(options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getLastPage({silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getLastPage({url: true});
+  testCollection.getLastPage({silent: true});
+  testCollection.getLastPage({url: 'chickensnack'});
 
 
   result = testCollection.getNextPage();
 
   testCollection.getNextPage(options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getNextPage({silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getNextPage({url: true});
+  testCollection.getNextPage({silent: false});
+  testCollection.getNextPage({url: 'hampsterdance'});
 
 
   result = testCollection.getPage(1);
 
   testCollection.getPage("1", options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getPage(1, {silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getPage(1, {url: true});
+  testCollection.getPage(1, {silent: true});
+  testCollection.getPage(1, {url: 'badcandy'});
 
 
   result = testCollection.getPageByOffset(1);
 
   testCollection.getPageByOffset(1, options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getPageByOffset(1, {silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getPageByOffset(1, {url: true});
+  testCollection.getPageByOffset(1, {silent: false});
+  testCollection.getPageByOffset(1, {url: 'oldmanmurray'});
 
 
   result = testCollection.getPreviousPage();
 
   testCollection.getPreviousPage(options);
 
-  // 'silent's type is boolean. (structural subtyping)
-  testCollection.getPreviousPage({silent: 'aa'});
-  // 'url's type is string. (structural subtyping)
-  testCollection.getPreviousPage({url: true});
+  testCollection.getPreviousPage({silent: false});
+  testCollection.getPreviousPage({url: 'uncyclopedia'});
 
 
   var hasPage:boolean = testCollection.hasNextPage();
@@ -231,7 +219,7 @@ namespace Setting {
 
 
   var result2:TestCollection
-    = testCollection.setSorting('id', 1, options);
+    = testCollection.setSorting('id', 1, { full: true});
 
   result1 = testCollection.switchMode(
   'server',
diff --git a/types/backbone.paginator/index.d.ts b/types/backbone.paginator/index.d.ts
index 521ccda8bf..fc7c39e995 100644
--- a/types/backbone.paginator/index.d.ts
+++ b/types/backbone.paginator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/backbone-paginator/backbone.paginator
 // Definitions by: Nyamazing <https://github.com/Nyamazing/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 
diff --git a/types/backbone.radio/index.d.ts b/types/backbone.radio/index.d.ts
index 7596722342..61c996f6de 100644
--- a/types/backbone.radio/index.d.ts
+++ b/types/backbone.radio/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/marionettejs/backbone.radio
 // Definitions by: Peter Palotas <https://github.com/alphaleonis/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index 975d7f33c9..f151b2f42e 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://backbonejs.org/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Natan Vivo <https://github.com/nvivo/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/backgrid/index.d.ts b/types/backgrid/index.d.ts
index 83dc86bcbe..fdf7785b59 100644
--- a/types/backgrid/index.d.ts
+++ b/types/backgrid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://backgridjs.com/
 // Definitions by: Jeremy Lujan <https://github.com/jlujan/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Backbone from 'backbone';
 
diff --git a/types/baconjs/index.d.ts b/types/baconjs/index.d.ts
index 0550d6ec48..5b85bfb38e 100644
--- a/types/baconjs/index.d.ts
+++ b/types/baconjs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://baconjs.github.io/
 // Definitions by: Alexander Matsievsky <https://github.com/alexander-matsievsky>, Joonas Javanainen <https://github.com/gekkio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="node" />
diff --git a/types/bagpipes/index.d.ts b/types/bagpipes/index.d.ts
index 82a1fa32f4..ec1d0cceb7 100755
--- a/types/bagpipes/index.d.ts
+++ b/types/bagpipes/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Mrowetz <https://github.com/micmro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface FittingContext {
+export interface FittingContext {
     /** The input defined in the fitting definition
      * (string, number, object, array)
      */
@@ -17,9 +17,9 @@ interface FittingContext {
  * Fitting types has pre-defined fittings `system` and `user`
  * but can be any any string for custom types like `swagger` or `node-machine`
  */
-type FittingType = "system" | "user" | string;
+export type FittingType = "system" | "user" | string;
 
-interface FittingDef {
+export interface FittingDef {
     /**
      * If type is omitted (as it must be for in-line usage), Bagpipes will
      * first check the user fittings then the system fittings for the name and
@@ -46,8 +46,8 @@ interface FittingDef {
  *
  * Will be called called when the `Pipe` it is contained it gets 'played'
  */
-type Fitting = (
-    context: FittingContext, 
+export type Fitting = (
+    context: FittingContext,
     next: {(err: Error | null | undefined, res?: any): void}) => void;
 
 /**
@@ -58,18 +58,18 @@ type Fitting = (
  *
  * @param {Object} fittingDef Fitting Definition
  */
-type FittingFactory = (fittingDef: FittingDef, bagpipes: any) => Fitting;
+export type FittingFactory = (fittingDef: FittingDef, bagpipes: any) => Fitting;
 
 /**
  * Hashmap of `fittingType`s (the name of a fitting) and the
  * `FittingFactory` functions used to create them
  */
-interface FittingTypesMap {
+export interface FittingTypesMap {
     [fittingType: string]: FittingFactory;
 }
 
 /** The Pipe Definition */
-type PipeDef = any[] | string | FittingDef;
+export type PipeDef = any[] | string | FittingDef;
 
 /** Hashmap of Pipe Definitons */
 export interface PipeDefMap {
@@ -143,10 +143,10 @@ export function create(pipesDefs: PipeDefMap, conf?: Config): Bagpipes;
 
 // Types for imports from `pipeworks` module
 
-type Affinity = "hoist" | "sink";
+export type Affinity = "hoist" | "sink";
 
 /** PipeDef used in `pipeworks` module */
-interface PipeworksOptions {
+export interface PipeworksOptions {
     /**
      * Adds to the pre and post queues, respectively.
      * Ensures a pipe gets fitted before or after the main execution pipeline.
diff --git a/types/bagpipes/tslint.json b/types/bagpipes/tslint.json
index 3db14f85ea..a4bcc87748 100755
--- a/types/bagpipes/tslint.json
+++ b/types/bagpipes/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "callable-types": false
+    }
+}
diff --git a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
new file mode 100644
index 0000000000..cc525509c6
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
@@ -0,0 +1,24 @@
+import "./index"
+namespace BMapTests {
+    export class TestFixture {
+        //document: http://lbsyun.baidu.com/index.php?title=jspopular
+        public createMap(container: string | HTMLElement) {
+            navigator.geolocation.getCurrentPosition((position: Position) => {
+                let point = new BMap.Point(position.coords.longitude, position.coords.latitude);
+                let map = new BMap.Map(container);
+                map.centerAndZoom(point, 15);
+            }, console.log, { maximumAge: 3000, timeout: 5000, enableHighAccuracy: true });
+        }
+        public addControl(map: BMap.Map) {
+            map.addControl(new BMap.ScaleControl({ anchor: BMAP_ANCHOR_TOP_LEFT }));
+            map.addControl(new BMap.NavigationControl());
+            map.addControl(new BMap.MapTypeControl({ mapTypes: [BMAP_NORMAL_MAP, BMAP_HYBRID_MAP] }));
+            map.addControl(new BMap.OverviewMapControl({ isOpen: true, anchor: BMAP_ANCHOR_BOTTOM_RIGHT }));
+        }
+        public addMarker(map: BMap.Map, point: BMap.Point) {
+            var marker = new BMap.Marker(point);
+            map.addOverlay(marker);
+            marker.setAnimation(BMAP_ANIMATION_BOUNCE);
+        }
+    }
+}
diff --git a/types/baidumap-web-sdk/baidumap.base.d.ts b/types/baidumap-web-sdk/baidumap.base.d.ts
new file mode 100644
index 0000000000..9dc07a9377
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.base.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+declare namespace BMap {
+    class Point {
+        constructor (lng: number, lat: number)
+        lng: number
+        lat: number
+        equals(other: Point): boolean
+    }
+    class Pixel {
+        constructor (x: number, y: number)
+        x: number
+        y: number
+        equals(other: Pixel): boolean
+    }
+    class Size {
+        constructor (width: number, height: number)
+        width: number
+        height: number
+        equals(other: Size): boolean
+    }
+    class Bounds {
+        constructor (minX: number, minY: number, maxX: number, maxY: number)
+        constructor (sw: Point, ne: Point)
+        minX: number
+        minY: number
+        maxX: number
+        maxY: number
+        equals(other: Bounds): boolean
+        containsPoint(point: Point): boolean
+        containsBounds(bounds: Bounds): boolean
+        intersects(other: Bounds): boolean
+        extend(point: Point): void
+        getCenter(): Point
+        isEmpty(): boolean
+        getSouthWest(): Point
+        getNorthEast(): Point
+        toSpan(): Point
+    }
+}
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.control.d.ts b/types/baidumap-web-sdk/baidumap.control.d.ts
new file mode 100644
index 0000000000..6e3fb771be
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.control.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.maptype.d.ts" />
+/// <reference path="./baidumap.overlay.d.ts" />
+declare namespace BMap {
+    class Control {
+        constructor()
+        defaultAnchor: ControlAnchor
+        defaultOffset: Size
+        initialize(map: Map): HTMLElement
+        setAnchor(anchor: ControlAnchor): void
+        getAnchor(): ControlAnchor
+        setOffset(offset: Size): void
+        getOffset(): Size
+        show(): void
+        hide(): void
+        isVisible(): boolean
+    }
+    interface NavigationControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+        type?: NavigationControlType
+        showZoomInfo?: boolean
+        enableGeolocation?: boolean
+    }
+    interface ScaleControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+    }
+    interface CopyrightControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+    }
+    type ControlAnchor = number
+    class OverviewMapControl extends Control {
+        constructor(opts: OverviewMapControlOptions)
+        changeView(): void
+        setSize(size: Size): void
+        getSize(): Size
+        onviewchanged: (event: { type: string, target: any, isOpen: boolean }) => void
+        onviewchanging: (event: { type: string, target: any }) => void
+    }
+    type LengthUnit = string
+    class MapTypeControl extends Control {
+        constructor(opts?: MapTypeControlOptions)
+    }
+    class NavigationControl extends Control {
+        constructor(opts?: NavigationControlOptions)
+        getType(): NavigationControlOptions
+        setType(type: NavigationControlType): void
+    }
+    interface OverviewMapControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+        size?: Size
+        isOpen?: boolean
+    }
+    class CopyrightControl extends Control {
+        constructor(opts?: CopyrightControlOptions)
+        addCopyright(copyright: Copyright): void
+        removeCopyright(id: number): void
+        getCopyright(id: number): Copyright
+        getCopyrightCollection(): Copyright[]
+    }
+    interface MapTypeControlOptions {
+        type?: MapTypeControlType,
+        mapTypes?: MapType[]
+    }
+    type NavigationControlType = number
+    class ScaleControl extends Control {
+        constructor(opts?: ScaleControlOptions)
+        getUnit(): LengthUnit
+        setUnit(unit: LengthUnit): void
+    }
+    interface Copyright {
+        id?: number
+        content?: string
+        bounds?: Bounds
+    }
+    type MapTypeControlType = number
+    class GeolocationControl extends Control {
+        constructor(opts?: GeolocationControlOptions)
+    }
+    interface GeolocationControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+        showAddressBar?: boolean
+        enableAutoLocation?: boolean
+        locationIcon?: Icon
+    }
+    type StatusCode = number
+    class PanoramaControl extends Control {
+        constructor()
+    }
+}
+declare const BMAP_UNIT_METRIC: BMap.LengthUnit
+declare const BMAP_UNIT_IMPERIAL: BMap.LengthUnit
+
+declare const BMAP_ANCHOR_TOP_LEFT: BMap.ControlAnchor
+declare const BMAP_ANCHOR_TOP_RIGHT: BMap.ControlAnchor
+declare const BMAP_ANCHOR_BOTTOM_LEFT: BMap.ControlAnchor
+declare const BMAP_ANCHOR_BOTTOM_RIGHT: BMap.ControlAnchor
+
+declare const BMAP_NAVIGATION_CONTROL_LARGE: BMap.NavigationControlType
+declare const BMAP_NAVIGATION_CONTROL_SMALL: BMap.NavigationControlType
+declare const BMAP_NAVIGATION_CONTROL_PAN: BMap.NavigationControlType
+declare const BMAP_NAVIGATION_CONTROL_ZOOM: BMap.NavigationControlType
+
+declare const BMAP_MAPTYPE_CONTROL_HORIZONTAL: BMap.MapTypeControlType
+declare const BMAP_MAPTYPE_CONTROL_DROPDOWN: BMap.MapTypeControlType
+declare const BMAP_MAPTYPE_CONTROL_MAP: BMap.MapTypeControlType
+
+declare const BMAP_STATUS_PERMISSION_DENIED: BMap.StatusCode
+declare const BMAP_STATUS_SERVICE_UNAVAILABLE: BMap.StatusCode
+declare const BMAP_STATUS_TIMEOUT: BMap.StatusCode
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.core.d.ts b/types/baidumap-web-sdk/baidumap.core.d.ts
new file mode 100644
index 0000000000..24d1aed9f0
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.core.d.ts
@@ -0,0 +1,154 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.maptype.d.ts" />
+/// <reference path="./baidumap.panorama.d.ts" />
+declare namespace BMap {
+    class Map {
+        constructor(container: string | HTMLElement, opts?: MapOptions)
+        enableDragging(): void
+        disableDragging(): void
+        enableScrollWheelZoom(): void
+        disableScrollWheelZoom(): void
+        enableDoubleClickZoom(): void
+        disableDoubleClickZoom(): void
+        enableKeyboard(): void
+        disableKeyboard(): void
+        enableInertialDragging(): void
+        disableInertialDragging(): void
+        enableContinuousZoom(): void
+        disableContinuousZoom(): void
+        enablePinchToZoom(): void
+        disablePinchToZoom(): void
+        enableAutoResize(): void
+        disableAutoResize(): void
+        setDefaultCursor(cursor: string): void
+        getDefaultCursor(): string
+        setDraggingCursor(cursor: string): void
+        getDraggingCursor(): string
+        setMinZoom(zoom: number): void
+        setMaxZoom(zoom: number): void
+        setMapStyle(mapStyle: MapStyle): void
+        setPanorama(pano: Panorama): void
+        disable3DBuilding(): void
+        getBounds(): Bounds
+        getCenter(): Point
+        getDistance(start: Point, end: Point): number
+        getMapType(): MapType
+        getSize(): Size
+        getViewport(view: Point[], viewportOptions?: ViewportOptions): Viewport
+        getZoom(): number
+        getPanorama(): Panorama
+        centerAndZoom(center: Point, zoom: number): void
+        panTo(center: Point, opts?: PanOptions): void
+        panBy(x: number, y: number, opts?: PanOptions): void
+        reset(): void
+        setCenter(center: Point | string): void
+        setCurrentCity(city: string): void
+        setMapType(mapType: MapType): void
+        setViewport(view: Point[], viewportOptions?: ViewportOptions): void
+        setZoom(zoom: number): void
+        highResolutionEnabled(): boolean
+        zoomIn(): void
+        zoomOut(): void
+        addHotspot(hotspot: Hotspot): void
+        removeHotspot(hotspot: Hotspot): void
+        clearHotspots(): void
+        addControl(control: Control): void
+        removeControl(control: Control): void
+        getContainer(): HTMLElement
+        addContextMenu(menu: ContextMenu): void
+        removeContextMenu(menu: ContextMenu): void
+        addOverlay(overlay: Overlay): void
+        removeOverlay(overlay: Overlay): void
+        clearOverlays(): void
+        openInfoWindow(infoWnd: InfoWindow, point: Point): void
+        closeInfoWindow(): void
+        pointToOverlayPixel(point: Point): Pixel
+        overlayPixelToPoint(pixel: Pixel): Point
+        getInfoWindow(): InfoWindow
+        getOverlays(): Overlay[]
+        getPanes(): MapPanes
+        addTileLayer(tileLayer: TileLayer): void
+        removeTileLayer(tilelayer: TileLayer): void
+        getTileLayer(mapType: string): TileLayer
+        pixelToPoint(pixel: Pixel): Point
+        pointToPixel(point: Point): Pixel
+        onclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onrightclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+        onrightdblclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+        onmaptypechange: (event: { type: string, target: any }) => void
+        onmousemove: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+        onmouseover: (event: { type: string, target: any }) => void
+        onmouseout: (event: { type: string, target: any }) => void
+        onmovestart: (event: { type: string, target: any }) => void
+        onmoving: (event: { type: string, target: any }) => void
+        onmoveend: (event: { type: string, target: any }) => void
+        onzoomstart: (event: { type: string, target: any }) => void
+        onzoomend: (event: { type: string, target: any }) => void
+        onaddoverlay: (event: { type: string, target: any }) => void
+        onaddcontrol: (event: { type: string, target: any }) => void
+        onremovecontrol: (event: { type: string, target: any }) => void
+        onremoveoverlay: (event: { type: string, target: any }) => void
+        onclearoverlays: (event: { type: string, target: any }) => void
+        ondragstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        ondragging: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        ondragend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onaddtilelayer: (event: { type: string, target: any }) => void
+        onremovetilelayer: (event: { type: string, target: any }) => void
+        onload: (event: { type: string, target: any, point: Point, pixel: Pixel, zoom: number }) => void
+        onresize: (event: { type: string, target: any, size: Size }) => void
+        onhotspotclick: (event: { type: string, target: any, spots: HotspotOptions }) => void
+        onhotspotover: (event: { type: string, target: any, spots: HotspotOptions }) => void
+        onhotspotout: (event: { type: string, target: any, spots: HotspotOptions }) => void
+        ontilesloaded: (event: { type: string, target: any }) => void
+        ontouchstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        ontouchmove: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        ontouchend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onlongpress: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+    }
+    interface PanOptions {
+        noAnimation?: boolean
+    }
+    interface MapOptions {
+        minZoom?: number
+        maxZoom?: number
+        mapType?: MapType
+        enableHighResolution?: boolean
+        enableAutoResize?: boolean
+        enableMapClick?: boolean
+    }
+    interface Viewport {
+        center: Point
+        zoom: number
+    }
+    interface ViewportOptions {
+        enableAnimation?: boolean
+        margins?: number[]
+        zoomFactor?: number
+        delay?: number
+    }
+    type APIVersion = number
+    interface MapStyle {
+        features: any[]
+        style: string
+    }
+}
+declare const BMAP_API_VERSION: BMap.APIVersion
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.maplayer.d.ts b/types/baidumap-web-sdk/baidumap.maplayer.d.ts
new file mode 100644
index 0000000000..244fff0c7b
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.maplayer.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.control.d.ts" />
+declare namespace BMap {
+    class TileLayer {
+        constructor(opts?: TileLayerOptions)
+        getTilesUrl(tileCoord: Pixel, zoom: number): string
+        getCopyright(): Copyright
+        isTransparentPng(): boolean
+    }
+    interface TileLayerOptions {
+        transparentPng?: boolean
+        tileUrlTemplate?: string
+        copyright?: Copyright
+        zIndex?: number
+    }
+    class TrafficLayer extends TileLayer {
+        constructor(opts?: TrafficLayerOptions)
+    }
+    interface TrafficLayerOptions {
+        predictDate?: PredictDate
+    }
+    interface PredictDate {
+        weekday: number
+        hour: number
+    }
+    class CustomLayer extends TileLayer {
+        constructor(opts: CustomLayerOptions)
+        onhotspotclick: (event: { type: string, target: any, content: any }) => void
+    }
+    interface Custompoi {
+        poiId: string
+        databoxId: string
+        title: string
+        address: string
+        phoneNumber: string
+        postcode: string
+        provinceCode: number
+        province: string
+        cityCode: number
+        city: string
+        districtCode: number
+        district: string
+        point: Point
+        tags: string[]
+        typeId: number
+        extendedData: any
+    }
+    class PanoramaCoverageLayer extends TileLayer {
+        constructor()
+    }
+    interface CustomLayerOptions {
+        databoxId?: string
+        geotableId?: string
+        q?: string
+        tags?: string
+        filter?: string
+        pointDensityType?: PointDensityType
+    }
+    type PointDensityType = number
+}
+
+declare const BMAP_POINT_DENSITY_HIGH: BMap.PointDensityType
+declare const BMAP_POINT_DENSITY_MEDIUM: BMap.PointDensityType
+declare const BMAP_POINT_DENSITY_LOW: BMap.PointDensityType
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.maptype.d.ts b/types/baidumap-web-sdk/baidumap.maptype.d.ts
new file mode 100644
index 0000000000..01056212bc
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.maptype.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.maplayer.d.ts" />
+declare namespace BMap {
+    class MapType {
+        constructor(name: string, layers: TileLayer | TileLayer[], opts?: MapTypeOptions)
+        getName(): string
+        getTileLayer(): TileLayer
+        getMinZoom(): number
+        getMaxZoom(): number
+        getProjection(): Projection
+        getTextColor(): string
+        getTips(): string
+    }
+    interface MapTypeOptions {
+        minZoom?: number
+        maxZoom?: number
+        errorImageUrl?: string
+        textColor?: number
+        tips?: string
+    }
+    interface Projection {
+        lngLatToPoint(lngLat: Point): Pixel
+        pointToLngLat(point: Pixel): Point
+    }
+    interface MercatorProjection extends Projection {
+    }
+    interface PerspectiveProjection extends Projection {
+    }
+}
+declare const BMAP_NORMAL_MAP: BMap.MapType
+declare const BMAP_PERSPECTIVE_MAP: BMap.MapType
+declare const BMAP_SATELLITE_MAP: BMap.MapType
+declare const BMAP_HYBRID_MAP: BMap.MapType
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.overlay.d.ts b/types/baidumap-web-sdk/baidumap.overlay.d.ts
new file mode 100644
index 0000000000..d723ac5e48
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.overlay.d.ts
@@ -0,0 +1,438 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.core.d.ts" />
+/// <reference path="./baidumap.rightmenu.d.ts" />
+declare namespace BMap {
+    interface Overlay {
+        initialize?(map: Map): HTMLElement
+        isVisible?(): boolean
+        draw?(): void
+        show?(): void
+        hide?(): void
+    }
+    type SymbolShapeType = number
+    interface PolylineOptions {
+        strokeColor?: string
+        strokeWeight?: number
+        strokeOpacity?: number
+        strokeStyle?: string
+        enableMassClear?: boolean
+        enableEditing?: boolean
+        enableClicking?: boolean
+    }
+    interface GroundOverlayOptions {
+        opacity?: number
+        imageURL?: string
+        displayOnMinLevel?: number
+        displayOnMaxLevel?: number
+    }
+    class Marker implements Overlay {
+        constructor(point: Point, opts?: MarkerOptions)
+        openInfoWindow(infoWnd: InfoWindow): void
+        closeInfoWindow(): void
+        setIcon(icon: Icon): void
+        getIcon(): Icon
+        setPosition(position: Point): void
+        getPosition(): Point
+        setOffset(offset: Size): void
+        getOffset(): Size
+        setLabel(label: Label): void
+        getLabel(): Label
+        setTitle(title: string): void
+        getTitle(): string
+        setTop(isTop: boolean): void
+        enableDragging(): void
+        disableDragging(): void
+        enableMassClear(): void
+        disableMassClear(): void
+        setZIndex(zIndex: number): void
+        getMap(): Map
+        addContextMenu(menu: ContextMenu): void
+        removeContextMenu(menu: ContextMenu): void
+        setAnimation(animation?: Animation): void
+        setRotation(rotation: number): void
+        getRotation(): number
+        setShadow(shadow: Icon): void
+        getShadow(): void
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmousedown: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseup: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseout: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseover: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onremove: (event: { type: string, target: any }) => void
+        oninfowindowclose: (event: { type: string, target: any }) => void
+        oninfowindowopen: (event: { type: string, target: any }) => void
+        ondragstart: (event: { type: string, target: any }) => void
+        ondragging: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        ondragend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onrightclick: (event: { type: string, target: any }) => void
+    }
+    interface SymbolOptions {
+        anchor?: Size
+        fillColor?: string
+        fillOpacity?: number
+        scale?: number
+        rotation?: number
+        strokeColor?: string
+        strokeOpacity?: number
+        strokeWeight?: number
+    }
+    class IconSequence {
+        constructor(symbol: Symbol, offset?: string, repeat?: string, fixedRotation?: boolean)
+    }
+    class PointCollection implements Overlay {
+        constructor(points: Point[], opts?: PointCollectionOption)
+        setPoints(points: Point[]): void
+        setStyles(styles: PointCollectionOption): void
+        clear(): void
+        onclick: (event: { type: string, target: any, point: Point }) => void
+        onmouseover: (event: { type: string, target: any, point: Point }) => void
+        onmouseout: (event: { type: string, target: any, point: Point }) => void
+    }
+    interface MarkerOptions {
+        offset?: Size
+        icon?: Icon
+        enableMassClear?: boolean
+        enableDragging?: boolean
+        enableClicking?: boolean
+        raiseOnDrag?: boolean
+        draggingCursor?: string
+        rotation?: number
+        shadow?: Icon
+        title?: string
+    }
+    class InfoWindow implements Overlay {
+        constructor(content: string | HTMLElement, opts?: InfoWindowOptions)
+        setWidth(width: number): void
+        setHeight(height: number): void
+        redraw(): void
+        setTitle(title: string | HTMLElement): void
+        getTitle(): string | HTMLElement
+        setContent(content: string | HTMLElement): void
+        getContent(): string | HTMLElement
+        getPosition(): Point
+        enableMaximize(): void
+        disableMaximize(): void
+        isOpen(): boolean
+        setMaxContent(content: string): void
+        maximize(): void
+        restore(): void
+        enableAutoPan(): void
+        disableAutoPan(): void
+        enableCloseOnClick(): void
+        disableCloseOnClick(): void
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclose: (event: { type: string, target: any, point: Point }) => void
+        onopen: (event: { type: string, target: any, point: Point }) => void
+        onmaximize: (event: { type: string, target: any }) => void
+        onrestore: (event: { type: string, target: any }) => void
+        onclickclose: (event: { type: string, target: any }) => void
+    }
+    class Polygon implements Overlay {
+        constructor(points: Array<Point>, opts?: PolygonOptions)
+        setPath(path: Point[]): void
+        getPath(): Point[]
+        setStrokeColor(color: string): void
+        getStrokeColor(): string
+        setFillColor(color: string): void
+        getFillColor(): string
+        setStrokeOpacity(opacity: number): void
+        getStrokeOpacity(): number
+        setFillOpacity(opacity: number): void
+        getFillOpacity(): number
+        setStrokeWeight(weight: number): void
+        getStrokeWeight(): number
+        setStrokeStyle(style: string): void
+        getStrokeStyle(): string
+        getBounds(): Bounds
+        enableEditing(): void
+        disableEditing(): void
+        enableMassClear(): void
+        disableMassClear(): void
+        setPointAt(index: number, point: Point): void
+        setPositionAt(index: number, point: Point): void
+        getMap(): Map
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmousedown: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseup: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseout: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseover: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onremove: (event: { type: string, target: any }) => void
+        onlineupdate: (event: { type: string, target: any }) => void
+    }
+    interface PointCollectionOption {
+        shape?: ShapeType
+        color?: string
+        size?: SizeType
+    }
+    type Animation = number
+    interface InfoWindowOptions {
+        width?: number
+        height?: number
+        maxWidth?: number
+        offset?: Size
+        title?: string
+        enableAutoPan?: boolean
+        enableCloseOnClick?: boolean
+        enableMessage?: boolean
+        message?: string
+    }
+    interface PolygonOptions {
+        strokeColor?: string
+        fillColor?: string
+        strokeWeight?: number
+        strokeOpacity?: number
+        fillOpacity?: number
+        strokeStyle?: number
+        enableMassClear?: boolean
+        enableEditing?: boolean
+        enableClicking?: boolean
+    }
+    type ShapeType = number
+    class Icon implements Overlay {
+        constructor(url: string, size: Size, opts?: IconOptions)
+        anchor: Size
+        size: Size
+        imageOffset: Size
+        imageSize: Size
+        imageUrl: Size
+        infoWindowAnchor: Size
+        printImageUrl: string
+        setImageUrl(imageUrl: string): void
+        setSize(size: Size): void
+        setImageSize(offset: Size): void
+        setAnchor(anchor: Size): void
+        setImageOffset(offset: Size): void
+        setInfoWindowAnchor(anchor: Size): void
+        setPrintImageUrl(url: string): void
+    }
+    class Label implements Overlay {
+        constructor(content: string, opts?: LabelOptions)
+        setStyle(styles: Object): void
+        setContent(content: string): void
+        setPosition(position: Point): void
+        getPosition(): Point
+        setOffset(offset: Size): void
+        getOffset(): Size
+        setTitle(title: string): void
+        getTitle(): string
+        enableMassClear(): void
+        disableMassClear(): void
+        setZIndex(zIndex: number): void
+        setPosition(position: Point): void
+        getMap(): Map
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any }) => void
+        onmousedown: (event: { type: string, target: any }) => void
+        onmouseup: (event: { type: string, target: any }) => void
+        onmouseout: (event: { type: string, target: any }) => void
+        onmouseover: (event: { type: string, target: any }) => void
+        onremove: (event: { type: string, target: any }) => void
+        onrightclick: (event: { type: string, target: any }) => void
+    }
+    class Circle implements Overlay {
+        constructor(center: Point, radius: number, opts?: CircleOptions)
+        setCenter(center: Point): void
+        getCenter(): Point
+        setRadius(radius: number): void
+        getRadius(): number
+        getBounds(): Bounds
+        setStrokeColor(color: string): void
+        getStrokeColor(): string
+        setFillColor(color: string): void
+        getFillColor(): string
+        setStrokeOpacity(opacity: number): void
+        getStrokeOpacity(): number
+        setFillOpacity(opacity: number): void
+        getFillOpacity(): number
+        setStrokeWeight(weight: number): void
+        getStrokeWeight(): number
+        setStrokeStyle(style: string): void
+        getStrokeStyle(): string
+        getBounds(): Bounds
+        enableEditing(): void
+        disableEditing(): void
+        enableMassClear(): void
+        disableMassClear(): void
+        getMap(): Map
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmousedown: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseup: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseout: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseover: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onremove: (event: { type: string, target: any }) => void
+        onlineupdate: (event: { type: string, target: any }) => void
+    }
+    type SizeType = number
+    interface IconOptions {
+        anchor?: Size
+        imageOffset?: Size
+        infoWindowAnchor?: Size
+        printImageUrl?: string
+    }
+    interface LabelOptions {
+        offset?: Size
+        position?: Point
+        enableMassClear?: boolean
+    }
+    interface CircleOptions {
+        strokeColor?: string
+        fillColor?: string
+        strokeWeight?: number
+        strokeOpacity?: number
+        fillOpacity?: number
+        strokeStyle?: string
+        enableMassClear?: boolean
+        enableEditing?: boolean
+        enableClicking?: boolean
+    }
+    class Hotspot implements Overlay {
+        constructor(position: Point, opts?: HotspotOptions)
+        setPosition(position: Point): void
+        getPosition(): Point
+        setText(text: string): void
+        getText(): string
+        setUserData(data: any): void
+        getUserData(): any
+    }
+    class Symbol implements Overlay {
+        constructor(path: string | SymbolShapeType, opts?: SymbolOptions)
+        setPath(path: string | SymbolShapeType): void
+        setAnchor(anchor: Size): void
+        setRotation(rotation: number): void
+        setScale(scale: number): void
+        setStrokeWeight(strokeWeight: number): void
+        setStrokeColor(color: string): void
+        setStrokeOpacity(opacity: number): void
+        setFillOpacity(opacity: number): void
+        setFillColor(color: string): void
+    }
+    class Polyline implements Overlay {
+        constructor(points: Point[], opts?: PolylineOptions)
+        setPath(path: Point[]): void
+        getPath(): Point[]
+        setStrokeColor(color: string): void
+        getStrokeColor(): string
+        setFillColor(color: string): void
+        getFillColor(): string
+        setStrokeOpacity(opacity: number): void
+        getStrokeOpacity(): number
+        setFillOpacity(opacity: number): void
+        getFillOpacity(): number
+        setStrokeWeight(weight: number): void
+        getStrokeWeight(): number
+        setStrokeStyle(style: string): void
+        getStrokeStyle(): string
+        getBounds(): Bounds
+        enableEditing(): void
+        disableEditing(): void
+        enableMassClear(): void
+        disableMassClear(): void
+        setPointAt(index: number, point: Point): void
+        setPositionAt(index: number, point: Point): void
+        getMap(): Map
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmousedown: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseup: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseout: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onmouseover: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onremove: (event: { type: string, target: any }) => void
+        onlineupdate: (event: { type: string, target: any }) => void
+    }
+    class GroundOverlay implements Overlay {
+        constructor(bounds: Bounds, opts?: GroundOverlayOptions)
+        setBounds(bounds: Bounds): void
+        getBounds(): Bounds
+        setOpacity(opcity: number): void
+        getOpacity(): number
+        setImageURL(url: string): void
+        getImageURL(): string
+        setDisplayOnMinLevel(level: number): void
+        getDisplayOnMinLevel(): number
+        setDispalyOnMaxLevel(level: number): void
+        getDispalyOnMaxLevel(): number
+        onclick: (event: { type: string, target: any }) => void
+        ondblclick: (event: { type: string, target: any }) => void
+    }
+    interface HotspotOptions {
+        text?: string
+        offsets?: number[]
+        userData?: any
+        minZoom?: number
+        maxZoom?: number
+    }
+    interface MapPanes {
+        floatPane?: HTMLElement
+        markerMouseTarget?: HTMLElement
+        floatShadow?: HTMLElement
+        labelPane?: HTMLElement
+        markerPane?: HTMLElement
+        markerShadow?: HTMLElement
+        mapPane?: HTMLElement
+    }
+}
+
+declare const BMap_Symbol_SHAPE_CIRCLE: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_RECTANGLE: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_RHOMBUS: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_STAR: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_BACKWARD_CLOSED_ARROW: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_FORWARD_CLOSED_ARROW: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_BACKWARD_OPEN_ARROW: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_FORWARD_OPEN_ARROW: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_POINT: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_PLANE: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_CAMERA: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_WARNING: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_SMILE: BMap.SymbolShapeType
+declare const BMap_Symbol_SHAPE_CLOCK: BMap.SymbolShapeType
+
+
+declare const BMAP_ANIMATION_DROP: BMap.Animation
+declare const BMAP_ANIMATION_BOUNCE: BMap.Animation
+
+declare const BMAP_POINT_SHAPE_CIRCLE: BMap.ShapeType
+declare const APE_STAR: BMap.ShapeType
+declare const APE_SQUARE: BMap.ShapeType
+declare const APE_RHOMBUS: BMap.ShapeType
+declare const APE_WATERDROP: BMap.ShapeType
+
+declare const BMAP_POINT_SIZE_TINY: BMap.SizeType
+declare const BMAP_POINT_SIZE_SMALLER: BMap.SizeType
+declare const BMAP_POINT_SIZE_SMALL: BMap.SizeType
+declare const BMAP_POINT_SIZE_NORMAL: BMap.SizeType
+declare const BMAP_POINT_SIZE_BIG: BMap.SizeType
+declare const BMAP_POINT_SIZE_BIGGER: BMap.SizeType
+declare const BMAP_POINT_SIZE_HUGE: BMap.SizeType
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.panorama.d.ts b/types/baidumap-web-sdk/baidumap.panorama.d.ts
new file mode 100644
index 0000000000..f087732fb4
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.panorama.d.ts
@@ -0,0 +1,121 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.control.d.ts" />
+declare namespace BMap {
+    class Panorama {
+        constructor(container: string | HTMLElement, opts?: PanoramaOptions)
+        getLinks(): PanoramaLink[]
+        getId(): string
+        getPosition(): Point
+        getPov(): PanoramaPov
+        getZoom(): number
+        setId(id: string): void
+        setPosition(position: Point): void
+        setPov(pov: PanoramaPov): void
+        setZoom(zoom: number): void
+        enableScrollWheelZoom(): void
+        disableScrollWheelZoom(): void
+        show(): void
+        hide(): void
+        addOverlay(overlay: PanoramaLabel): void
+        removeOverlay(overlay: PanoramaLabel): void
+        getSceneType(): PanoramaSceneType
+        setOptions(opts?: PanoramaOptions): void
+        setPanoramaPOIType(): PanoramaPOIType
+        onposition_changed: () => void
+        onlinks_changed: () => void
+        onpov_changed: () => void
+        onzoom_changed: () => void
+        onscene_type_changed: () => void
+    }
+
+    interface PanoramaOptions {
+        navigationControl?: boolean
+        linksControl?: boolean
+        indoorSceneSwitchControl?: boolean
+        albumsControl?: boolean
+        albumsControlOptions?: AlbumsControlOptions
+    }
+    interface PanoramaLink {
+        description: string
+        heading: string
+        id: string
+    }
+    interface PanoramaPov {
+        heading: number
+        pitch: number
+    }
+    class PanoramaService {
+        constructor()
+        getPanoramaById(id: string, callback: (data: PanoramaData) => void): void
+        getPanoramaByLocation(point: Point, radius?: number, callback?: (data: PanoramaData) => void): void
+    }
+    interface PanoramaData {
+        id: string
+        description: string
+        links: PanoramaLink[]
+        position: Point
+        tiles: PanoramaTileData
+    }
+    interface PanoramaTileData {
+        centerHeading: number
+        tileSize: Size
+        worldSize: Size
+    }
+    class PanoramaLabel {
+        constructor(content: string, opts?: PanoramaLabelOptions)
+        setPosition(position: Point): void
+        getPosition(): Point
+        getPov(): PanoramaPov
+        setContent(content: string): void
+        getContent(): string
+        show(): void
+        hide(): void
+        setAltitude(altitude: number): void
+        getAltitude(): number
+        addEventListener(event: string, handler: Function): void
+        removeEventListener(event: string, handler: Function): void
+        onclick: (event: { type: string, target: any }) => void
+        onmouseover: (event: { type: string, target: any }) => void
+        onmouseout: (event: { type: string, target: any }) => void
+        onremove: (event: { type: string, target: any }) => void
+    }
+    interface PanoramaLabelOptions {
+        position?: Point
+        altitude?: number
+    }
+    interface AlbumsControlOptions {
+        anchor?: ControlAnchor
+        offset?: Size
+        maxWidth?: number | string
+        imageHeight?: number
+    }
+    type PanoramaSceneType = string
+    type PanoramaPOIType = string
+}
+declare const BMAP_PANORAMA_INDOOR_SCENE: string
+declare const BMAP_PANORAMA_STREET_SCENE: string
+
+declare const BMAP_PANORAMA_POI_HOTEL: string
+declare const BMAP_PANORAMA_POI_CATERING: string
+declare const BMAP_PANORAMA_POI_MOVIE: string
+declare const BMAP_PANORAMA_POI_TRANSIT: string
+declare const BMAP_PANORAMA_POI_INDOOR_SCENE: string
+declare const BMAP_PANORAMA_POI_NONE: string
diff --git a/types/baidumap-web-sdk/baidumap.rightmenu.d.ts b/types/baidumap-web-sdk/baidumap.rightmenu.d.ts
new file mode 100644
index 0000000000..b760c73561
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.rightmenu.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+
+declare namespace BMap {
+    type ContextMenuIcon = string
+    interface MenuItemOptions {
+        width?: number
+        id?: string
+        iconUrl?: string
+    }
+    class MenuItem {
+        constructor(text: string, callback: (point: Point) => void, opts?: MenuItemOptions)
+        setText(text: string): void
+        setIcon(iconUrl: string): void
+        enable(): void
+        disable(): void
+    }
+    class ContextMenu {
+        constructor()
+        addItem(item: MenuItem): void
+        getItem(index: number): MenuItem
+        removeItem(item: MenuItem): void
+        addSeparator(): void
+        removeSeparator(index: number): void
+        onopen: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+        onclose: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+    }
+}
+declare const BMAP_CONTEXT_MENU_ICON_ZOOMIN: string
+declare const BMAP_CONTEXT_MENU_ICON_ZOOMOUT: string
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.service.d.ts b/types/baidumap-web-sdk/baidumap.service.d.ts
new file mode 100644
index 0000000000..dbff0b7dfe
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.service.d.ts
@@ -0,0 +1,432 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.core.d.ts" />
+declare namespace BMap {
+    class LocalSearch {
+        constructor(location: Map | Point | string, opts?: LocalSearchOptions)
+        search(keyword: string | Array<string>, option?: Object): void
+        searchInBounds(keyword: string | Array<string>, bounds: Bounds, option?: Object): void
+        searchNearby(keyword: string | Array<string>, center: LocalResultPoi | string | Point, radius: number, option?: Object): void
+        getResults(): LocalResult | LocalResult[]
+        clearResults(): void
+        gotoPage(page: number): void
+        enableAutoViewport(): void
+        disableAutoViewport(): void
+        enableFirstResultSelection(): void
+        disableFirstResultSelection(): void
+        setLocation(location: Map | Point | string): void
+        setPageCapacity(capacity: number): void
+        getPageCapacity(): number
+        setSearchCompleteCallback(callback: (results: LocalResult | LocalResult[]) => void): void
+        setMarkersSetCallback(callback: (pois: LocalResultPoi[]) => void): void
+        setInfoHtmlSetCallback(callback: (poi: LocalResultPoi, html: HTMLElement) => void): void
+        setResultsHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        getStatus(): ServiceStatusCode
+    }
+    type LineType = number
+    interface WalkingRouteResult {
+        city: string
+        getStart(): LocalResultPoi
+        getEnd(): LocalResultPoi
+        getNumPlans(): number
+        getPlan(i: number): RoutePlan
+    }
+    class BusLineSearch {
+        constructor(location: Map | Point | string, opts?: BusLineSearchOptions)
+        getBusList(keyword: string): void
+        getBusLine(busLstItem: BusListItem): void
+        clearResults(): void
+        enableAutoViewport(): void
+        disableAutoViewport(): void
+        setLocation(location: Map | Point | string): void
+        getStatus(): ServiceStatusCode
+        toString(): string
+        setGetBusListCompleteCallback(callback: (rs: BusListResult) => void): void
+        setGetBusLineCompleteCallback(callback: (rs: BusLine) => void): void
+        setBusListHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        setBusLineHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        setPolylinesSetCallback(callback: (ply: Polyline) => void): void
+        setMarkersSetCallback(callback: (markers: Marker[]) => void): void
+    }
+    interface LocalSearchOptions {
+        renderOptions?: RenderOptions
+        onMarkersSet?: (pois: LocalResultPoi[]) => void
+        onInfoHtmlSet?: (poi: LocalResultPoi, html: HTMLElement) => void
+        onResultsHtmlSet?: (container: HTMLElement) => void
+        pageCapacity?: number
+        onSearchComplete?: (results: LocalResult[]) => void
+    }
+    class DrivingRoute {
+        constructor(location: Map | Point | string, opts?: DrivingRouteOptions)
+        search(start: string | Point | LocalResultPoi, end: string | Point | LocalResultPoi, opts?: Object): void
+        getResults(): DrivingRouteResult
+        clearResults(): void
+        enableAutoViewport(): void
+        disableAutoViewport(): void
+        setLocation(location: Map | Point | string): void
+        setPolicy(policy: DrivingPolicy): void
+        setSearchCompleteCallback(callback: (results: DrivingRouteResult) => void): void
+        setMarkersSetCallback(callback: (pois: LocalResultPoi[]) => void): void
+        setInfoHtmlSetCallback(callback: (poi: LocalResultPoi, html: HTMLElement) => void): void
+        setPolylinesSetCallback(callback: (routes: Route[]) => void): void
+        setResultsHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        getStatus(): ServiceStatusCode
+        toString(): string
+    }
+    class Geocoder {
+        constructor()
+        getPoint(address: string, callback: (point: Point) => void, city: string): void
+        getLocation(point: Point, callback: (result: GeocoderResult) => void, opts?: LocationOptions): void
+    }
+    interface BusLineSearchOptions {
+        renderOptions?: RenderOptions
+        onGetBusListComplete?: (rs: BusListResult) => void
+        onGetBusLineComplete?: (rs: BusLine) => void
+        onBusListHtmlSet?: (container: HTMLElement) => void
+        onBusLineHtmlSet?: (container: HTMLElement) => void
+        onPolylinesSet?: (ply: Polyline) => void
+        onMarkersSet?: (sts: Marker[]) => void
+    }
+    interface CustomData {
+        geotableId: number
+        tags: string
+        filter: string
+    }
+    interface DrivingRouteOptions {
+        renderOptions?: RenderOptions
+        policy?: DrivingPolicy
+        onSearchComplete?: (results: DrivingRouteResult) => void
+        onMarkersSet?: (pois: LocalResultPoi[]) => void
+        onInfoHtmlSet?: (poi: LocalResultPoi, html: HTMLElement) => void
+        onPolylinesSet?: (routes: Route[]) => void
+        onResultsHtmlSet?: (container: HTMLElement) => void
+    }
+    interface GeocoderResult {
+        point: Point
+        address: string
+        addressComponents: AddressComponent
+        surroundingPoi: LocalResultPoi[]
+        business: string
+    }
+    interface BusListResult {
+        keyword: string
+        city: string
+        moreResultsUrl: string
+        getNumBusList(): number
+        getBusListItem(i: number): BusListItem
+    }
+    interface RenderOptions {
+        map: Map
+        panel?: string | HTMLElement
+        selectFirstResult?: boolean
+        autoViewport?: boolean
+        highlightMode?: HighlightModes
+    }
+    type DrivingPolicy = number
+    interface AddressComponent {
+        streetNumber: string
+        street: string
+        district: string
+        city: string
+        province: string
+    }
+    interface BusLine {
+        name: string
+        startTime: string
+        endTime: string
+        company: string
+        getNumBusStations(): string
+        getBusStation(i: number): BusStation
+        getPath(): Point[]
+        getPolyline(): Polyline
+    }
+    interface LocalResult {
+        keyword: string
+        center: LocalResultPoi
+        radius: number
+        bounds: Bounds
+        city: string
+        moreResultsUrl: string
+        province: string
+        suggestions: string[]
+        getPoi(i: number): LocalResultPoi
+        getCurrentNumPois(): number
+        getNumPois(): number
+        getNumPages(): number
+        getPageIndex(): number
+        getCityList(): any[]
+    }
+
+    interface DrivingRouteResult {
+        policy: DrivingPolicy
+        city: string
+        moreResultsUrl: string
+        taxiFare: TaxiFare
+        getStart(): LocalResultPoi
+        getEnd(): LocalResultPoi
+        getNumPlans(): number
+        getPlan(i: number): RoutePlan
+    }
+    interface LocationOptions {
+        poiRadius?: number
+        numPois?: number
+    }
+    interface BusListItem {
+        name: string
+    }
+    interface LocalResultPoi {
+        title: string
+        point: Point
+        url: string
+        address: string
+        city: string
+        phoneNumber: string
+        postcode: string
+        type: PoiType
+        isAccurate: boolean
+        province: string
+        tags: string[]
+        detailUrl: string
+    }
+    interface TaxiFare {
+        day: TaxiFareDetail
+        night: TaxiFareDetail
+        distance: number
+        remark: string
+    }
+    class LocalCity {
+        constructor(opts?: LocalCityOptions)
+        get(callback: (result: LocalCityResult) => void): void
+    }
+    interface BusStation {
+        name: string
+        position: Point
+    }
+    type PoiType = number
+    interface TaxiFareDetail {
+        initialFare: number
+        unitFare: number
+        totalFare: number
+    }
+    interface LocalCityOptions {
+        renderOptions?: RenderOptions
+    }
+    class Autocomplete {
+        constructor(opts?: AutocompleteOptions)
+        show(): void
+        hide(): void
+        setTypes(types: string[]): void
+        setLocation(location: string | Map | Point): void
+        search(keywords: string): void
+        getResults(): AutocompleteResult
+        setInputValue(keyword: string): void
+        dispose(): void
+        onconfirm: (event: { type: string, target: any, item: any }) => void
+        onhighlight: (event: { type: string, target: any, fromitem: any, toitem: any }) => void
+    }
+    class TransitRoute {
+        constructor(location: Map | Point | string, opts?: TransitRouteOptions)
+        search(start: string | Point | LocalResultPoi, end: string | Point | LocalResultPoi): void
+        getResults(): TransitRouteResult
+        clearResults(): void
+        enableAutoViewport(): void
+        disableAutoViewport(): void
+        setPageCapacity(capacity: number): void
+        setLocation(location: Map | Point | string): void
+        setPolicy(policy: TransitPolicy): void
+        setSearchCompleteCallback(callback: (results: TransitRouteResult) => void): void
+        setMarkersSetCallback(callback: (pois: LocalResultPoi[]) => void): void
+        setInfoHtmlSetCallback(callback: (poi: LocalResultPoi, html: HTMLElement) => void): void
+        setPolylinesSetCallback(callback: (lines: Line[], routes: Route[]) => void): void
+        setResultsHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        getStatus(): ServiceStatusCode
+        toString(): string
+    }
+    interface RoutePlan {
+        getNumRoutes(): number
+        getRoute(i: number): Route
+        getDistance(format?: boolean): string | number
+        getDuration(format?: boolean): string | number
+        getDragPois(): LocalResultPoi[]
+    }
+    interface LocalCityResult {
+        center: Point
+        level: number
+        name: string
+    }
+    interface AutocompleteOptions {
+        location?: string | Map | Point
+        types?: string[]
+        onSearchComplete?: (result: AutocompleteResult) => void
+        input?: string | HTMLElement
+    }
+    interface TransitRouteOptions {
+        renderOptions?: RenderOptions
+        policy?: TransitPolicy
+        pageCapacity?: number
+        onSearchComplete?: (result: TransitRouteResult) => void
+        onMarkersSet?: (pois: LocalResultPoi[], transfers: LocalResultPoi[]) => void
+        onInfoHtmlSet?: (poi: LocalResultPoi, html: HTMLElement) => void
+        onPolylinesSet?: (lines: Line[]) => void
+        onResultsHtmlSet?: (container: HTMLElement) => void
+    }
+    interface Route {
+        getNumRoutes(): number
+        getStep(i: number): Step
+        getDistance(format?: boolean): string | number
+        getIndex(): number
+        getPolyline(): Polyline
+        getPoints(): Point[]
+        getPath(): Point[]
+        getRouteType(): RouteType
+    }
+    class TrafficControl {
+        constructor()
+        setPanelOffset(offset: Size): void
+        show(): void
+        hide(): void
+    }
+    interface AutocompleteResultPoi {
+        province: string
+        City: string//wtf
+        district: string
+        street: string
+        streetNumber: string
+        business: string
+    }
+    type TransitPolicy = number
+    type RouteType = number
+    class Geolocation {
+        constructor()
+        getCurrentPosition(callback: (result: GeolocationResult) => void, opts?: PositionOptions): void
+        getStatus(): ServiceStatusCode
+    }
+    interface AutocompleteResult {
+        keyword: string
+        getPoi(i: number): AutocompleteResultPoi
+        getNumPois(): number
+    }
+    interface TransitRouteResult {
+        policy: TransitPolicy
+        city: string
+        moreResultsUrl: string
+        getStart(): LocalResultPoi
+        getEnd(): LocalResultPoi
+        getNumPlans(): number
+        getPlan(i: number): TransitRoutePlan
+    }
+    interface Step {
+        getPoint(): Point
+        getPosition(): Point
+        getIndex(): number
+        getDescription(includeHtml: boolean): string
+        getDistance(format?: boolean): string | number
+    }
+    interface GeolocationResult {
+        point: Point
+        accuracy: number
+    }
+    class Boundary {
+        constructor()
+        get(name: string, callback: (result: string[]) => void): void
+    }
+    interface TransitRoutePlan {
+        getNumLines(): number
+        getLine(i: number): Line
+        getNumRoutes(): number
+        getRoute(i: number): Route
+        getDistance(format?: boolean): string | number
+        getDuration(format?: boolean): string | number
+        getDescription(includeHtml: boolean): string
+    }
+    class WalkingRoute {
+        constructor(location: Map | Point | string, opts?: WalkingRouteOptions)
+        search(start: string | Point | LocalResultPoi, end: string | Point | LocalResultPoi): void
+        getResults(): WalkingRouteResult
+        clearResults(): void
+        enableAutoViewport(): void
+        disableAutoViewport(): void
+        setLocation(location: Map | Point | string): void
+        setSearchCompleteCallback(callback: (result: WalkingRouteResult) => void): void
+        setMarkersSetCallback(callback: (pois: LocalResultPoi[]) => void): void
+        setInfoHtmlSetCallback(callback: (poi: LocalResultPoi, html: HTMLElement) => void): void
+        setPolylinesSetCallback(callback: (routes: Route[]) => void): void
+        setResultsHtmlSetCallback(callback: (container: HTMLElement) => void): void
+        getStatus(): ServiceStatusCode
+        toString(): string
+    }
+    interface PositionOptions {
+        enableHighAccuracy?: boolean
+        timeout?: number
+        maximumAge?: number
+    }
+    interface Line {
+        title: string
+        type: LineType
+        getNumViaStops(): number
+        getGetOnStop(): LocalResultPoi
+        getGetOffStop(): LocalResultPoi
+        getPoints(): Point[]
+        getPath(): Point[]
+        getPolyline(): Polyline
+        getDistance(format?: boolean): string | number
+    }
+    interface WalkingRouteOptions {
+        renderOptions?: RenderOptions,
+        onSearchComplete?: (result: WalkingRouteResult) => void,
+        onMarkersSet?: (pois: LocalResultPoi[]) => void,
+        onPolylinesSet?: (routes: Route[]) => void,
+        onInfoHtmlSet?: (poi: LocalResultPoi, html: HTMLElement) => void,
+        onResultsHtmlSet?: (container: HTMLElement) => void
+    }
+    type HighlightModes = number
+    type ServiceStatusCode = number
+}
+
+declare const BMAP_LINE_TYPE_BUS: BMap.LineType
+declare const BMAP_LINE_TYPE_SUBWAY: BMap.LineType
+declare const BMAP_LINE_TYPE_FERRY: BMap.LineType
+
+declare const BMAP_DRIVING_POLICY_LEAST_TIME: BMap.DrivingPolicy
+declare const BMAP_DRIVING_POLICY_LEAST_DISTANCE: BMap.DrivingPolicy
+declare const BMAP_DRIVING_POLICY_AVOID_HIGHWAYS: BMap.DrivingPolicy
+
+declare const BMAP_POI_TYPE_NORMAL: BMap.PoiType
+declare const BMAP_POI_TYPE_BUSSTOP: BMap.PoiType
+declare const BMAP_POI_TYPE_SUBSTOP: BMap.PoiType
+
+
+declare const BMAP_TRANSIT_POLICY_LEAST_TIME: BMap.TransitPolicy
+declare const BMAP_TRANSIT_POLICY_LEAST_TRANSFER: BMap.TransitPolicy
+declare const BMAP_TRANSIT_POLICY_LEAST_WALKING: BMap.TransitPolicy
+declare const BMAP_TRANSIT_POLICY_AVOID_SUBWAYS: BMap.TransitPolicy
+
+declare const BMAP_ROUTE_TYPE_DRIVING: BMap.RouteType
+declare const BMAP_ROUTE_TYPE_WALKING: BMap.RouteType
+
+declare const BMAP_HIGHLIGHT_STEP: BMap.HighlightModes
+declare const BMAP_HIGHLIGHT_ROUTE: BMap.HighlightModes
+
+declare const BMAP_STATUS_SUCCESS: BMap.ServiceStatusCode
+declare const BMAP_STATUS_CITY_LIST: BMap.ServiceStatusCode
+declare const BMAP_STATUS_UNKNOWN_LOCATION: BMap.ServiceStatusCode
+declare const BMAP_STATUS_UNKNOWN_ROUTE: BMap.ServiceStatusCode
+declare const BMAP_STATUS_INVALID_KEY: BMap.ServiceStatusCode
+declare const BMAP_STATUS_INVALID_REQUEST: BMap.ServiceStatusCode
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/baidumap.tools.d.ts b/types/baidumap-web-sdk/baidumap.tools.d.ts
new file mode 100644
index 0000000000..c1bc6bf929
--- /dev/null
+++ b/types/baidumap-web-sdk/baidumap.tools.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.core.d.ts" />
+/// <reference path="./baidumap.overlay.d.ts" />
+declare namespace BMap {
+    class PushpinTool {
+        constructor(map: Map, opts?: PushpinToolOptions)
+        open(): boolean
+        close(): boolean
+        setIcon(icon: Icon): Icon
+        getIcon(): Icon
+        setCursor(cursor: string): string
+        getCursor(): string
+        toString(): string
+        onmarkend: (event: { type: string, target: any, marker: Marker }) => void
+    }
+    interface PushpinToolOptions {
+        icon?: Icon
+        cursor?: string
+        followText?: string
+    }
+    class DistanceTool {
+        constructor(map: Map)
+        open(): boolean
+        close(): void
+        toString(): string
+        ondrawend: (event: { type: string, target: any, points: Point[], polylines: Polyline[], distance: number }) => void
+    }
+    class DragAndZoomTool {
+        constructor(map: Map, opts?: DragAndZoomToolOptions)
+        open(): boolean
+        close(): void
+        toString(): string
+        ondrawend: (event: { type: string, target: any, bounds: Bounds[] }) => void
+    }
+    interface DragAndZoomToolOptions {
+        zoomType?: ZoomType,
+        autoClose?: boolean,
+        followText?: string
+    }
+    type ZoomType = number
+}
+declare const BMAP_ZOOM_IN: BMap.ZoomType
+declare const BMAP_ZOOM_OUT: BMap.ZoomType
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/index.d.ts b/types/baidumap-web-sdk/index.d.ts
new file mode 100644
index 0000000000..ac8f27c87b
--- /dev/null
+++ b/types/baidumap-web-sdk/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for BaiduMap v2.0
+// Project: http://lbsyun.baidu.com/index.php?title=jspopular
+// Definitions by: Codemonk <http://www.youxianxueche.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright [Codemonk] [Codemonk@live.cn]
+
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***************************************************************************** */
+
+/// <reference path="./baidumap.base.d.ts" />
+/// <reference path="./baidumap.control.d.ts" />
+/// <reference path="./baidumap.core.d.ts" />
+/// <reference path="./baidumap.maplayer.d.ts" />
+/// <reference path="./baidumap.maptype.d.ts" />
+/// <reference path="./baidumap.overlay.d.ts" />
+/// <reference path="./baidumap.panorama.d.ts" />
+/// <reference path="./baidumap.rightmenu.d.ts" />
+/// <reference path="./baidumap.service.d.ts" />
+/// <reference path="./baidumap.tools.d.ts" />
\ No newline at end of file
diff --git a/types/baidumap-web-sdk/tsconfig.json b/types/baidumap-web-sdk/tsconfig.json
new file mode 100644
index 0000000000..6af444e434
--- /dev/null
+++ b/types/baidumap-web-sdk/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "baidumap-web-sdk-tests.ts"
+    ]
+}
diff --git a/types/baidumap-web-sdk/tslint.json b/types/baidumap-web-sdk/tslint.json
new file mode 100644
index 0000000000..aab43caa1d
--- /dev/null
+++ b/types/baidumap-web-sdk/tslint.json
@@ -0,0 +1,15 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // All are TODOs
+        "eofline": false,
+        "comment-format": false,
+        "dt-header": false,
+        "max-line-length": false,
+        "member-access": false,
+        "no-namespace": false,
+        "no-useless-files": false,
+        "no-var": false,
+        "semicolon": false
+    }
+}
diff --git a/types/bardjs/index.d.ts b/types/bardjs/index.d.ts
index d8a5bfd9f0..5f2a5a1863 100644
--- a/types/bardjs/index.d.ts
+++ b/types/bardjs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/wardbell/bardjs
 // Definitions by: Andrew Archibald <https://github.com/TepigMC>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="chai" />
diff --git a/types/basic-auth/basic-auth-tests.ts b/types/basic-auth/basic-auth-tests.ts
index 1fab9c10e2..e416afe352 100644
--- a/types/basic-auth/basic-auth-tests.ts
+++ b/types/basic-auth/basic-auth-tests.ts
@@ -1,4 +1,12 @@
-
+import {IncomingMessage} from 'http';
 import auth = require('basic-auth');
 
-auth(null);
+const loginData = auth(undefined! as IncomingMessage);
+if (loginData) {
+    const {name, pass} = loginData;
+}
+
+const parsed = auth.parse('Basic QmFzaWM6QXV0aA==');
+if (parsed) {
+    const {name, pass} = parsed;
+}
diff --git a/types/basic-auth/index.d.ts b/types/basic-auth/index.d.ts
index 51ada3b0c7..276b5b8af6 100644
--- a/types/basic-auth/index.d.ts
+++ b/types/basic-auth/index.d.ts
@@ -1,19 +1,25 @@
-// Type definitions for basic-auth
+// Type definitions for basic-auth 1.1
 // Project: https://github.com/jshttp/basic-auth
-// Definitions by: Clément Bourgeois <https://github.com/moonpyk>
+// Definitions by: Clément Bourgeois <https://github.com/moonpyk>, Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
 import * as http from 'http';
 
-declare function auth(req: http.IncomingMessage): auth.BasicAuthResult;
+// See https://github.com/jshttp/basic-auth/blob/v1.1.0/index.js#L49
+declare function auth(req: http.IncomingMessage): auth.BasicAuthResult | undefined;
 
 declare namespace auth {
     interface BasicAuthResult {
         name: string;
         pass: string;
     }
+
+    /**
+     * Parse basic auth to object.
+     */
+    function parse(authorizationHeader: string): auth.BasicAuthResult | undefined;
 }
 
 export = auth;
diff --git a/types/basic-auth/tsconfig.json b/types/basic-auth/tsconfig.json
index b9f77df9d2..8d9222de2c 100644
--- a/types/basic-auth/tsconfig.json
+++ b/types/basic-auth/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/basic-auth/tslint.json b/types/basic-auth/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/basic-auth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/big-integer/big-integer-tests.ts b/types/big-integer/big-integer-tests.ts
deleted file mode 100644
index 62f234b371..0000000000
--- a/types/big-integer/big-integer-tests.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-// constructor tests
-var noArgument = bigInt(),
-    numberArgument = bigInt( 93 ),
-    stringArgument = bigInt( "75643564363473453456342378564387956906736546456235345" ),
-    baseArgumentInt = bigInt( "101010", 2 ),
-    baseArgumentStr = bigInt( "101010", "2" ),
-    baseArgumentBi  = bigInt( "101010", bigInt( 2 ) ),
-    bigIntArgument = bigInt( noArgument );
-
-// method tests
-var x = bigInt(),
-    isBigInteger: BigInteger,
-    isNumber: number,
-    isBoolean: boolean,
-    isString: string,
-    isDivmod: {
-        quotient: BigInteger;
-        remainder: BigInteger;
-    };
-
-isBigInteger = x.abs();
-
-isBigInteger = x.add( 0 );
-isBigInteger = x.add( x );
-isBigInteger = x.add( "100" );
-
-isNumber = x.compare( 0 );
-isNumber = x.compare( x );
-isNumber = x.compare( "100" );
-
-isNumber = x.compareAbs( 0 );
-isNumber = x.compareAbs( x );
-isNumber = x.compareAbs( "100" );
-
-isBigInteger = x.divide( 0 );
-isBigInteger = x.divide( x );
-isBigInteger = x.divide( "100" );
-
-isDivmod = x.divmod( 0 );
-isDivmod = x.divmod( x );
-isDivmod = x.divmod( "100" );
-
-isBoolean = x.equals( 0 );
-isBoolean = x.equals( x );
-isBoolean = x.equals( "100" );
-
-isBoolean = x.greater( 0 );
-isBoolean = x.greater( x );
-isBoolean = x.greater( "100" );
-
-isBoolean = x.greaterOrEquals( 0 );
-isBoolean = x.greaterOrEquals( x );
-isBoolean = x.greaterOrEquals( "100" );
-
-isBoolean = x.isEven();
-
-isBoolean = x.isNegative();
-
-isBoolean = x.isOdd();
-
-isBoolean = x.isPositive();
-
-isBoolean = x.lesser( 0 );
-isBoolean = x.lesser( x );
-isBoolean = x.lesser( "100" );
-
-isBoolean = x.lesserOrEquals( 0 );
-isBoolean = x.lesserOrEquals( x );
-isBoolean = x.lesserOrEquals( "100" );
-
-isBigInteger = x.minus( 0 );
-isBigInteger = x.minus( x );
-isBigInteger = x.minus( "100" );
-
-isBigInteger = x.mod( 0 );
-isBigInteger = x.mod( x );
-isBigInteger = x.mod( "100" );
-
-isBigInteger = x.multiply( 0 );
-isBigInteger = x.multiply( x );
-isBigInteger = x.multiply( "100" );
-
-isBigInteger = x.next();
-
-isBoolean = x.notEquals( 0 );
-isBoolean = x.notEquals( x );
-isBoolean = x.notEquals( "100" );
-
-isBigInteger = x.over( 0 );
-isBigInteger = x.over( x );
-isBigInteger = x.over( "100" );
-
-isBigInteger = x.plus( 0 );
-isBigInteger = x.plus( x );
-isBigInteger = x.plus( "100" );
-
-isBigInteger = x.pow( 0 );
-isBigInteger = x.pow( x );
-isBigInteger = x.pow( "100" );
-
-isBigInteger = x.prev();
-
-isBigInteger = x.subtract( 0 );
-isBigInteger = x.subtract( x );
-isBigInteger = x.subtract( "100" );
-
-isBigInteger = x.times( 0 );
-isBigInteger = x.times( x );
-isBigInteger = x.times( "100" );
-
-isNumber = x.toJSNumber();
-
-isString = x.toString();
-isString = x.toString(36);
-
-isNumber = x.valueOf();
diff --git a/types/big-integer/index.d.ts b/types/big-integer/index.d.ts
deleted file mode 100644
index f8ca2b488c..0000000000
--- a/types/big-integer/index.d.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-// Type definitions for BigInteger.js
-// Project: https://github.com/peterolson/BigInteger.js
-// Definitions by: Ingo Bürk <https://github.com/Airblader>, Roel van Uden <https://github.com/Deathspike>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface BigInteger {
-    /** Returns the absolute value of a bigInt. */
-    abs(): BigInteger;
-
-    /** Performs addition */
-    add( number: number ): BigInteger;
-    /** Performs addition */
-    add( number: BigInteger ): BigInteger;
-    /** Performs addition */
-    add( number: string ): BigInteger;
-
-    /** Alias for the add method. */
-    plus( number: number ): BigInteger;
-    /** Alias for the add method. */
-    plus( number: BigInteger ): BigInteger;
-    /** Alias for the add method. */
-    plus( number: string ): BigInteger;
-
-    /** Alias for the subtract method. */
-    minus( number: number ): BigInteger;
-    /** Alias for the subtract method. */
-    minus( number: BigInteger ): BigInteger;
-    /** Alias for the subtract method. */
-    minus( number: string ): BigInteger;
-
-    /** Performs subtraction. */
-    subtract( number: number ): BigInteger;
-    /** Performs subtraction. */
-    subtract( number: BigInteger ): BigInteger;
-    /** Performs subtraction. */
-    subtract( number: string ): BigInteger;
-
-    /** Performs multiplication. */
-    multiply( number: number ): BigInteger;
-    /** Performs multiplication. */
-    multiply( number: BigInteger ): BigInteger;
-    /** Performs multiplication. */
-    multiply( number: string ): BigInteger;
-
-    /** Alias for the multiply method. */
-    times( number: number ): BigInteger;
-    /** Alias for the multiply method. */
-    times( number: BigInteger ): BigInteger;
-    /** Alias for the multiply method. */
-    times( number: string ): BigInteger;
-
-    /** Performs integer division, disregarding the remainder. */
-    divide( number: number ): BigInteger;
-    /** Performs integer division, disregarding the remainder. */
-    divide( number: BigInteger ): BigInteger;
-    /** Performs integer division, disregarding the remainder. */
-    divide( number: string ): BigInteger;
-
-    /** Alias for the divide method. */
-    over( number: number ): BigInteger;
-    /** Alias for the divide method. */
-    over( number: BigInteger ): BigInteger;
-    /** Alias for the divide method. */
-    over( number: string ): BigInteger;
-
-    /** Performs exponentiation. If the exponent is less than 0, pow returns 0. bigInt.zero.pow(0) returns 1. */
-    pow( number: number ): BigInteger;
-    /** Performs exponentiation. If the exponent is less than 0, pow returns 0. bigInt.zero.pow(0) returns 1. */
-    pow( number: BigInteger ): BigInteger;
-    /** Performs exponentiation. If the exponent is less than 0, pow returns 0. bigInt.zero.pow(0) returns 1. */
-    pow( number: string ): BigInteger;
-
-    /** Adds one to the number. */
-    next(): BigInteger;
-
-    /** Subtracts one from the number. */
-    prev(): BigInteger;
-
-    /** Performs division and returns the remainder, disregarding the quotient. The sign of the remainder will match the sign of the dividend. */
-    mod( number: number ): BigInteger;
-    /** Performs division and returns the remainder, disregarding the quotient. The sign of the remainder will match the sign of the dividend. */
-    mod( number: BigInteger ): BigInteger;
-    /** Performs division and returns the remainder, disregarding the quotient. The sign of the remainder will match the sign of the dividend. */
-    mod( number: string ): BigInteger;
-
-    /** Performs division and returns an object with two properties: quotient and remainder. The sign of the remainder will match the sign of the dividend. */
-    divmod( number: number ): { quotient: BigInteger; remainder: BigInteger };
-    /** Performs division and returns an object with two properties: quotient and remainder. The sign of the remainder will match the sign of the dividend. */
-    divmod( number: BigInteger ): { quotient: BigInteger; remainder: BigInteger };
-    /** Performs division and returns an object with two properties: quotient and remainder. The sign of the remainder will match the sign of the dividend. */
-    divmod( number: string ): { quotient: BigInteger; remainder: BigInteger };
-
-    /** Checks if the first number is greater than the second. */
-    greater( number: number ): boolean;
-    /** Checks if the first number is greater than the second. */
-    greater( number: BigInteger ): boolean;
-    /** Checks if the first number is greater than the second. */
-    greater( number: string ): boolean;
-
-    /** Checks if the first number is greater than or equal to the second. */
-    greaterOrEquals( number: number ): boolean;
-    /** Checks if the first number is greater than or equal to the second. */
-    greaterOrEquals( number: BigInteger ): boolean;
-    /** Checks if the first number is greater than or equal to the second. */
-    greaterOrEquals( number: string ): boolean;
-
-    /** Checks if the first number is lesser than the second. */
-    lesser( number: number ): boolean;
-    /** Checks if the first number is lesser than the second. */
-    lesser( number: BigInteger ): boolean;
-    /** Checks if the first number is lesser than the second. */
-    lesser( number: string ): boolean;
-
-    /** Checks if the first number is less than or equal to the second. */
-    lesserOrEquals( number: number ): boolean;
-    /** Checks if the first number is less than or equal to the second. */
-    lesserOrEquals( number: BigInteger ): boolean;
-    /** Checks if the first number is less than or equal to the second. */
-    lesserOrEquals( number: string ): boolean;
-
-    /** Returns true if the number is even, false otherwise. */
-    isEven(): boolean;
-
-    /** Returns true if the number is odd, false otherwise. */
-    isOdd(): boolean;
-
-    /** Return true if the number is positive, false otherwise. Returns true for 0 and false for -0. */
-    isPositive(): boolean;
-
-    /** Returns true if the number is negative, false otherwise. Returns false for 0 and true for -0. */
-    isNegative(): boolean;
-
-    /**
-     * Performs a comparison between two numbers. If the numbers are equal, it returns 0.
-     * If the first number is greater, it returns 1. If the first number is lesser, it returns -1.
-     */
-    compare( number: number ): number;
-    /**
-     * Performs a comparison between two numbers. If the numbers are equal, it returns 0.
-     * If the first number is greater, it returns 1. If the first number is lesser, it returns -1.
-     */
-    compare( number: BigInteger ): number;
-    /**
-     * Performs a comparison between two numbers. If the numbers are equal, it returns 0.
-     * If the first number is greater, it returns 1. If the first number is lesser, it returns -1.
-     */
-    compare( number: string ): number;
-
-    /** Performs a comparison between the absolute value of two numbers. */
-    compareAbs( number: number ): number;
-    /** Performs a comparison between the absolute value of two numbers. */
-    compareAbs( number: BigInteger ): number;
-    /** Performs a comparison between the absolute value of two numbers. */
-    compareAbs( number: string ): number;
-
-    /** Checks if two numbers are equal. */
-    equals( number: number ): boolean;
-    /** Checks if two numbers are equal. */
-    equals( number: BigInteger ): boolean;
-    /** Checks if two numbers are equal. */
-    equals( number: string ): boolean;
-
-    /** Checks if two numbers are not equal. */
-    notEquals( number: number ): boolean;
-    /** Checks if two numbers are not equal. */
-    notEquals( number: BigInteger ): boolean;
-    /** Checks if two numbers are not equal. */
-    notEquals( number: string ): boolean;
-
-    /** Performs the bitwise AND operation. */
-    and( number: number ): BigInteger;
-    /** Performs the bitwise AND operation. */
-    and( number: BigInteger ): BigInteger;
-    /** Performs the bitwise AND operation. */
-    and( number: string ): BigInteger;
-
-    /** Performs the bitwise NOT operation. */
-    not(): BigInteger;
-
-    /** Performs the bitwise OR operation. */
-    or( number: number ): BigInteger;
-    /** Performs the bitwise OR operation. */
-    or( number: BigInteger ): BigInteger;
-    /** Performs the bitwise OR operation. */
-    or( number: string ): BigInteger;
-
-    /** Performs the bitwise XOR operation. */
-    xor( number: number ): BigInteger;
-    /** Performs the bitwise XOR operation. */
-    xor( number: BigInteger ): BigInteger;
-    /** Performs the bitwise XOR operation. */
-    xor( number: string ): BigInteger;
-
-    /** Converts a bigInt into a native Javascript number. Loses precision for numbers outside the range. */
-    toJSNumber(): number;
-
-    /** Converts a bigInt to a string. */
-    toString( radix?: number ): string;
-
-    /** Converts a bigInt to a native Javascript number. This override allows you to use native arithmetic operators without explicit conversion. */
-    valueOf(): number;
-}
-
-interface BigIntegerStatic {
-    /** Equivalent to bigInt(1) */
-    one: BigInteger;
-    /** Equivalent to bigInt(0) */
-    zero: BigInteger;
-    /** Equivalent to bigInt(-1) */
-    minusOne: BigInteger;
-
-    /** Equivalent to bigInt(0) */
-    (): BigInteger;
-    /** Parse a Javascript number into a bigInt */
-    ( number: number ): BigInteger;
-    /** Parse a string into a bigInt */
-    ( string: string,  base?: string | number | BigInteger): BigInteger;
-    /** no-op */
-    ( bigInt: BigInteger ): BigInteger;
-}
-
-declare var bigInt: BigIntegerStatic;
-
-declare module "big-integer" {
-    export = bigInt;
-}
diff --git a/types/bittorrent-protocol/index.d.ts b/types/bittorrent-protocol/index.d.ts
index b5ef1a4a44..7c205edc33 100644
--- a/types/bittorrent-protocol/index.d.ts
+++ b/types/bittorrent-protocol/index.d.ts
@@ -81,7 +81,7 @@ declare namespace BittorrentProtocol {
 
         // TODO: bitfield is a bitfield instance
         on(event: 'bitfield', listener: (bitfield: any) => void): this;
-        on(event: string | 'keep-alive' | 'choke' | 'unchoke' | 'interested' | 'uninterested' | 'timeout', listener: () => void): this;
+        on(event: 'keep-alive' | 'choke' | 'unchoke' | 'interested' | 'uninterested' | 'timeout', listener: () => void): this;
         on(event: 'upload' | 'have' | 'download' | 'port', listener: (length: number) => void): this;
         on(event: 'handshake', listener: (infoHash: string, peerId: string, extensions: Extension[]) => void): this;
         on(event: 'request', listener: (index: number, offset: number, length: number, respond: () => void) => void): this;
@@ -89,6 +89,7 @@ declare namespace BittorrentProtocol {
         on(event: 'cancel', listener: (index: number, offset: number, length: number) => void): this;
         on(event: 'extended', listener: (ext: 'handshake' | string, buf: any) => void): void;
         on(event: 'unknownmessage', listener: (buffer: Buffer) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
     }
 }
 
diff --git a/types/blob-util/blob-util-tests.ts b/types/blob-util/blob-util-tests.ts
new file mode 100644
index 0000000000..af860a7ee1
--- /dev/null
+++ b/types/blob-util/blob-util-tests.ts
@@ -0,0 +1,17 @@
+import * as blobUtil from 'blob-util';
+
+const testBlob = new Blob(['abcd']);
+
+blobUtil.base64StringToBlob('abcd'); // $ExpectType Promise<Blob>
+blobUtil.createObjectURL(testBlob); // $ExpectType string
+blobUtil.imgSrcToBlob('test.jpg'); // $ExpectType Promise<Blob>
+blobUtil.createBlob(['abcd']); // $ExpectType Blob
+blobUtil.arrayBufferToBlob(new ArrayBuffer(0)); // $ExpectType Promise<Blob>
+blobUtil.binaryStringToBlob('0101'); // $ExpectType Promise<Blob>
+blobUtil.blobToArrayBuffer(testBlob); // $ExpectType Promise<ArrayBuffer>
+blobUtil.blobToBase64String(testBlob); // $ExpectType Promise<string>
+blobUtil.blobToBinaryString(testBlob); // $ExpectType Promise<string>
+blobUtil.canvasToBlob(new HTMLCanvasElement()); // $ExpectType Promise<Blob>
+blobUtil.dataURLToBlob('data:abcd'); // $ExpectType Promise<Blob>
+blobUtil.imgSrcToDataURL('test.jpg'); // $ExpectType Promise<string>
+blobUtil.revokeObjectURL('blob:example'); // $ExpectType void
diff --git a/types/blob-util/index.d.ts b/types/blob-util/index.d.ts
new file mode 100644
index 0000000000..ce99c3d893
--- /dev/null
+++ b/types/blob-util/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for blob-util 1.2
+// Project: https://github.com/nolanlawson/blob-util#readme
+// Definitions by: Max Battcher <https://github.com/WorldMaker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export function createBlob(parts: any[], options?: { type: string }): Blob;
+export function createObjectURL(blob: Blob): string;
+export function revokeObjectURL(url: string): void;
+export function blobToBinaryString(blob: Blob): Promise<string>;
+export function binaryStringToBlob(binary: string, type?: string): Promise<Blob>;
+export function blobToBase64String(blob: Blob): Promise<string>;
+export function base64StringToBlob(base64: string, type?: string): Promise<Blob>;
+export function dataURLToBlob(dataURL: string): Promise<Blob>;
+export function imgSrcToDataURL(src: string, type?: string, crossOrigin?: string): Promise<string>;
+export function canvasToBlob(canvas: HTMLCanvasElement, type?: string): Promise<Blob>;
+export function imgSrcToBlob(src: string, type?: string, crossOrigin?: string): Promise<Blob>;
+export function arrayBufferToBlob(arrayBuff: ArrayBuffer, type?: string): Promise<Blob>;
+export function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer>;
diff --git a/types/blob-util/tsconfig.json b/types/blob-util/tsconfig.json
new file mode 100644
index 0000000000..f34519775d
--- /dev/null
+++ b/types/blob-util/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "blob-util-tests.ts"
+    ]
+}
diff --git a/types/blob-util/tslint.json b/types/blob-util/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/blob-util/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/blue-tape/index.d.ts b/types/blue-tape/index.d.ts
index 133968a165..c2d2d50ab5 100644
--- a/types/blue-tape/index.d.ts
+++ b/types/blue-tape/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/spion/blue-tape
 // Definitions by: Haoqun Jiang <https://github.com/sodatea>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/bluebird-global/index.d.ts b/types/bluebird-global/index.d.ts
index 835bc59c31..c0e220ce07 100644
--- a/types/bluebird-global/index.d.ts
+++ b/types/bluebird-global/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/petkaantonov/bluebird
 // Definitions by: d-ph <https://github.com/d-ph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /*
  * 1. Why use `bluebird-global` instead of `bluebird`?
@@ -117,19 +118,19 @@ declare global {
          *
          * @todo Duplication of code is never ideal. See whether there's a better way of achieving this.
          */
-        catch(predicate: (error: any) => boolean, onReject: (error: any) => T | Bluebird.Thenable<T> | void | Bluebird.Thenable<void>): Bluebird<T>;
-        catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | T>;
-        catch<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => T | Bluebird.Thenable<T> | void | Bluebird.Thenable<void>): Bluebird<T>;
-        catch<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | T>;
-        catch(predicate: Object, onReject: (error: any) => T | Bluebird.Thenable<T> | void | Bluebird.Thenable<void>): Bluebird<T>;
-        catch<U>(predicate: Object, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | T>;
+        catch(predicate: (error: any) => boolean, onReject: (error: any) => T | PromiseLike<T> | void | PromiseLike<void>): Bluebird<T>;
+        catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | PromiseLike<U>): Bluebird<U | T>;
+        catch<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => T | PromiseLike<T> | void | PromiseLike<void>): Bluebird<T>;
+        catch<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | PromiseLike<U>): Bluebird<U | T>;
+        catch(predicate: Object, onReject: (error: any) => T | PromiseLike<T> | void | PromiseLike<void>): Bluebird<T>;
+        catch<U>(predicate: Object, onReject: (error: any) => U | PromiseLike<U>): Bluebird<U | T>;
     }
 
     /*
      * Patch all static methods and the constructor
      */
     interface PromiseConstructor {
-        new <T>(callback: (resolve: (thenableOrResult?: T | Bluebird.Thenable<T>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void): Promise<T>;
+        new <T>(callback: (resolve: (thenableOrResult?: T | PromiseLike<T>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void): Promise<T>;
 
         // all: typeof Bluebird.all;
         any: typeof Bluebird.any;
diff --git a/types/bluebird-retry/index.d.ts b/types/bluebird-retry/index.d.ts
index 63adc1476d..97d756524b 100644
--- a/types/bluebird-retry/index.d.ts
+++ b/types/bluebird-retry/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jut-io/bluebird-retry
 // Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="bluebird" />
 
diff --git a/types/bluebird/bluebird-tests.ts b/types/bluebird/bluebird-tests.ts
index b9fc8d0cef..e616ae3f85 100644
--- a/types/bluebird/bluebird-tests.ts
+++ b/types/bluebird/bluebird-tests.ts
@@ -361,6 +361,46 @@ fooProm = fooProm.catch(CustomError, reason => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+{
+	class CustomError1 extends Error {}
+	class CustomError2 extends Error {}
+	class CustomError3 extends Error {}
+	class CustomError4 extends Error {}
+	class CustomError5 extends Error {}
+
+	fooProm = fooProm.catch(CustomError1, error => {});
+	fooProm = fooProm.catch(CustomError1, CustomError2, error => {});
+	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, error => {});
+	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, error => {});
+	fooProm = fooProm.catch(CustomError1, CustomError2, CustomError3, CustomError4, CustomError5, error => {});
+
+	const booPredicate1 = (error: CustomError1) => true;
+	const booPredicate2 = (error: [number]) => true;
+	const booPredicate3 = (error: string) => true;
+	const booPredicate4 = (error: Object) => true;
+	const booPredicate5 = (error: any) => true;
+
+	fooProm = fooProm.catch(booPredicate1, error => {});
+	fooProm = fooProm.catch(booPredicate1, booPredicate2, error => {});
+	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, error => {});
+	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, error => {});
+	fooProm = fooProm.catch(booPredicate1, booPredicate2, booPredicate3, booPredicate4, booPredicate5, error => {});
+
+	const booObject1 = new CustomError1();
+	const booObject2 = [400, 500];
+	const booObject3 = ["Error1", "Error2"];
+	const booObject4 = {code: 400};
+	const booObject5: any = null;
+
+	fooProm = fooProm.catch(booObject1, error => {});
+	fooProm = fooProm.catch(booObject1, booObject2, error => {});
+	fooProm = fooProm.catch(booObject1, booObject2, booObject3, error => {});
+	fooProm = fooProm.catch(booObject1, booObject2, booObject3, booObject4, error => {});
+	fooProm = fooProm.catch(booObject1, booObject2, booObject3, booObject4, booObject5, error => {});
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 barProm = fooProm.error((reason: any) => {
 	return bar;
 });
diff --git a/types/bluebird/index.d.ts b/types/bluebird/index.d.ts
index 49cd47d7bd..8482e5fe6e 100644
--- a/types/bluebird/index.d.ts
+++ b/types/bluebird/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/petkaantonov/bluebird
 // Definitions by: Leonard Hecker <https://github.com/lhecker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /*!
  * The code following this comment originates from:
@@ -34,30 +35,29 @@
  *   THE SOFTWARE.
  */
 
-declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R> {
+declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Create a new promise. The passed in function will receive functions `resolve` and `reject` as its arguments which can be called to seal the fate of the created promise.
    * If promise cancellation is enabled, passed in function will receive one more function argument `onCancel` that allows to register an optional cancellation callback.
    */
-  constructor(callback: (resolve: (thenableOrResult?: R | Bluebird.Thenable<R>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void);
+  constructor(callback: (resolve: (thenableOrResult?: R | PromiseLike<R>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void);
 
   /**
    * Promises/A+ `.then()`. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise.
    */
-  then<U1, U2>(onFulfill: (value: R) => U1 | Bluebird.Thenable<U1>, onReject: (error: any) => U2 | Bluebird.Thenable<U2>): Bluebird<U1 | U2>;
-  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U>;
-  then<U>(onFulfill: (value: R) => U | Bluebird.Thenable<U>): Bluebird<U>;
-  then(): Bluebird<R>;
+  // Based on PromiseLike.then, but returns a Bluebird instance.
+  then<U>(onFulfill?: (value: R) => U | Bluebird.Thenable<U>, onReject?: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U>; // For simpler signature help.
+  then<TResult1 = R, TResult2 = never>(onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Bluebird<TResult1 | TResult2>;
 
   /**
    * This is a catch-all exception handler, shortcut for calling `.then(null, handler)` on this promise. Any exception happening in a `.then`-chain will propagate to nearest `.catch` handler.
    *
    * Alias `.caught();` for compatibility with earlier ECMAScript version.
    */
-  catch(onReject?: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught(onReject?: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  catch<U>(onReject?: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<U>(onReject?: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch(onReject?: (error: any) => R | PromiseLike<R> | void | PromiseLike<void>): Bluebird<R>;
+  caught(onReject?: (error: any) => R | PromiseLike<R> | void | PromiseLike<void>): Bluebird<R>;
+  catch<U>(onReject?: (error: any) => U | PromiseLike<U>): Bluebird<U | R>;
+  caught<U>(onReject?: (error: any) => U | PromiseLike<U>): Bluebird<U | R>;
 
   /**
    * This extends `.catch` to work more like catch-clauses in languages like Java or C#. Instead of manually checking `instanceof` or `.name === "SomeError"`, you may specify a number of error constructors which are eligible for this catch handler. The catch handler that is first met that has eligible constructors specified, is the one that will be called.
@@ -65,38 +65,267 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * This method also supports predicate-based filters. If you pass a predicate function instead of an error constructor, the predicate will receive the error as an argument. The return result of the predicate will be used determine whether the error handler should be called.
    *
    * Alias `.caught();` for compatibility with earlier ECMAScript version.
+   *
+   * TODO: disallow non-objects
    */
-  catch(predicate: (error: any) => boolean, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught(predicate: (error: any) => boolean, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  catch<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    filter5: (new (...args: any[]) => E5),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<E1, E2, E3, E4, E5>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    filter5: ((error: E5) => boolean) | (E5 & object),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    filter5: (new (...args: any[]) => E5),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1, E2, E3, E4, E5>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    filter5: ((error: E5) => boolean) | (E5 & object),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    filter5: (new (...args: any[]) => E5),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U> | void | PromiseLike<void>,
+  ): Bluebird<U | R>;
+  catch<U, E1, E2, E3, E4, E5>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    filter5: ((error: E5) => boolean) | (E5 & object),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    filter5: (new (...args: any[]) => E5),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1, E2, E3, E4, E5>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    filter5: ((error: E5) => boolean) | (E5 & object),
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
 
-  catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<E1, E2, E3, E4>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1, E2, E3, E4>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  catch<U, E1, E2, E3, E4>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    filter4: (new (...args: any[]) => E4),
+    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1, E2, E3, E4>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    filter4: ((error: E4) => boolean) | (E4 & object),
+    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
 
-  catch<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  catch<E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<E1, E2, E3>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1, E2, E3>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<U, E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  catch<U, E1, E2, E3>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    filter3: (new (...args: any[]) => E3),
+    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1, E2, E3>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    filter3: ((error: E3) => boolean) | (E3 & object),
+    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
 
-  catch<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch<E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<E1, E2>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1, E2>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    onReject: (error: E1 | E2) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<U, E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  catch<U, E1, E2>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    filter2: (new (...args: any[]) => E2),
+    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1, E2>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    filter2: ((error: E2) => boolean) | (E2 & object),
+    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
 
-  catch(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-
-  catch<U>(predicate: Object, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<U>(predicate: Object, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch<E1 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<E1>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  caught<E1>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    onReject: (error: E1) => R | PromiseLike<R> | void | PromiseLike<void>,
+  ): Bluebird<R>;
+  catch<U, E1 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    onReject: (error: E1) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  catch<U, E1>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    onReject: (error: E1) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1 extends Error>(
+    filter1: (new (...args: any[]) => E1),
+    onReject: (error: E1) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
+  caught<U, E1>(
+    filter1: ((error: E1) => boolean) | (E1 & object),
+    onReject: (error: E1) => U | PromiseLike<U>,
+  ): Bluebird<U | R>;
 
   /**
    * Like `.catch` but instead of catching all types of exceptions, it only catches those that don't originate from thrown errors but rather from explicit rejections.
    */
-  error<U>(onReject: (reason: any) => U | Bluebird.Thenable<U>): Bluebird<U>;
+  error<U>(onReject: (reason: any) => U | PromiseLike<U>): Bluebird<U>;
 
   /**
    * Pass a handler that will be called regardless of this promise's fate. Returns a new promise chained from this promise. There are special semantics for `.finally()` in that the final value cannot be modified from the handler.
    *
    * Alias `.lastly();` for compatibility with earlier ECMAScript version.
    */
-  finally<U>(handler: () => U | Bluebird.Thenable<U>): Bluebird<R>;
+  finally<U>(handler: () => U | PromiseLike<U>): Bluebird<R>;
 
-  lastly<U>(handler: () => U | Bluebird.Thenable<U>): Bluebird<R>;
+  lastly<U>(handler: () => U | PromiseLike<U>): Bluebird<R>;
 
   /**
    * Create a promise that follows this promise, but is bound to the given `thisArg` value. A bound promise will call its handlers with the bound value set to `this`. Additionally promises derived from a bound promise will also be bound promises with the same `thisArg` binding as the original promise.
@@ -106,21 +335,50 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
   /**
    * Like `.then()`, but any unhandled rejection that ends up here will be thrown as an error.
    */
-  done<U>(onFulfilled?: (value: R) => U | Bluebird.Thenable<U>, onRejected?: (error: any) => U | Bluebird.Thenable<U>): void;
+  done<U>(onFulfilled?: (value: R) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>): void;
 
   /**
    * Like `.finally()`, but not called for rejections.
    */
-  tap<U>(onFulFill: (value: R) => Bluebird.Thenable<U>): Bluebird<R>;
+  tap<U>(onFulFill: (value: R) => PromiseLike<U>): Bluebird<R>;
   tap<U>(onFulfill: (value: R) => U): Bluebird<R>;
 
   /**
    * Like `.catch()` but rethrows the error
+   * TODO: disallow non-objects
    */
-  tapCatch<U>(onReject: (error?: any) => U | Bluebird.Thenable<U> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  tapCatch<U, E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  tapCatch<U>(predicate: (error?: any) => boolean, onReject: (error?: any) => U | Bluebird.Thenable<U> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  tapCatch<U>(onReject: (error?: any) => U | PromiseLike<U>): Bluebird<R>;
 
+  tapCatch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    filter5: (new (...args: any[]) => E5) | ((error: any) => boolean) | Object,
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
+  ): Bluebird<R>;
+  tapCatch<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+  ): Bluebird<R>;
+  tapCatch<U, E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+  ): Bluebird<R>;
+  tapCatch<U, E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+  ): Bluebird<R>;
+  tapCatch<U, E1 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    onReject: (error: E1) => U | PromiseLike<U>,
+  ): Bluebird<R>;
 
   /**
    * Same as calling `Promise.delay(ms, this)`.
@@ -258,11 +516,40 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * </code>
    *
    * in the case where `value` doesn't change its value. That means `value` is bound at the time of calling `.catchReturn()`
+   * TODO: disallow non-objects
    */
   catchReturn<U>(value: U): Bluebird<U>;
-  catchReturn<U>(predicate: (error: any) => boolean, value: U): Bluebird<U | R>;
-  catchReturn<E extends Error, U>(ErrorClass: new (...args: any[]) => E, value: U): Bluebird<U | R>;
-  catchReturn<U>(predicate: Object, value: U): Bluebird<U | R>;
+
+  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    filter5: (new (...args: any[]) => E5) | ((error: any) => boolean) | Object,
+    value: U,
+  ): Bluebird<U>;
+  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    value: U,
+  ): Bluebird<U>;
+  catchReturn<U, E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    value: U,
+  ): Bluebird<U>;
+  catchReturn<U, E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    value: U,
+  ): Bluebird<U>;
+  catchReturn<U, E1 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    value: U,
+  ): Bluebird<U>;
 
   /**
    * Convenience method for:
@@ -273,11 +560,40 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * });
    * </code>
    * Same limitations apply as with `.catchReturn()`.
+   * TODO: disallow non-objects
    */
   catchThrow(reason: Error): Bluebird<R>;
-  catchThrow(predicate: (error: any) => boolean, reason: Error): Bluebird<R>;
-  catchThrow<E extends Error, U>(ErrorClass: new (...args: any[]) => E, reason: Error): Bluebird<R>;
-  catchThrow(predicate: Object, reason: Error): Bluebird<R>;
+
+  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error, E5 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    filter5: (new (...args: any[]) => E5) | ((error: any) => boolean) | Object,
+    reason: Error,
+  ): Bluebird<R>;
+  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error, E4 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    filter4: (new (...args: any[]) => E4) | ((error: any) => boolean) | Object,
+    reason: Error,
+  ): Bluebird<R>;
+  catchThrow<E1 extends Error, E2 extends Error, E3 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    filter3: (new (...args: any[]) => E3) | ((error: any) => boolean) | Object,
+    reason: Error,
+  ): Bluebird<R>;
+  catchThrow<E1 extends Error, E2 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    filter2: (new (...args: any[]) => E2) | ((error: any) => boolean) | Object,
+    reason: Error,
+  ): Bluebird<R>;
+  catchThrow<E1 extends Error>(
+    filter1: (new (...args: any[]) => E1) | ((error: any) => boolean) | Object,
+    reason: Error,
+  ): Bluebird<R>;
 
   /**
    * Convert to String.
@@ -292,7 +608,7 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
   /**
    * Like calling `.then`, but the fulfillment value or rejection reason is assumed to be an array, which is flattened to the formal parameters of the handlers.
    */
-  spread<U, W>(fulfilledHandler: (...values: W[]) => U | Bluebird.Thenable<U>): Bluebird<U>;
+  spread<U, W>(fulfilledHandler: (...values: W[]) => U | PromiseLike<U>): Bluebird<U>;
   spread<U>(fulfilledHandler: Function): Bluebird<U>;
 
   /**
@@ -329,29 +645,29 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * Same as calling `Bluebird.map(thisPromise, mapper)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
   // TODO type inference from array-resolving promise?
-  map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   /**
    * Same as calling `Promise.reduce(thisPromise, Function reducer, initialValue)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
   // TODO type inference from array-resolving promise?
-  reduce<Q, U>(reducer: (memo: U, item: Q, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, initialValue?: U): Bluebird<U>;
+  reduce<Q, U>(reducer: (memo: U, item: Q, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
 
   /**
    * Same as calling ``Promise.filter(thisPromise, filterer)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
   // TODO type inference from array-resolving promise?
-  filter<U>(filterer: (item: U, index: number, arrayLength: number) => boolean | Bluebird.Thenable<boolean>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  filter<U>(filterer: (item: U, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   /**
    * Same as calling ``Bluebird.each(thisPromise, iterator)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  each<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<R[]>;
+  each<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
 
   /**
    * Same as calling ``Bluebird.mapSeries(thisPromise, iterator)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  mapSeries<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<U[]>;
+  mapSeries<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<U[]>;
 
   /**
    * Cancel this `promise`. Will not do anything if this promise is already settled or if the cancellation feature has not been enabled
@@ -372,8 +688,8 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    *
    * Alias for `attempt();` for compatibility with earlier ECMAScript version.
    */
-  static try<R>(fn: () => R | Bluebird.Thenable<R>): Bluebird<R>;
-  static attempt<R>(fn: () => R | Bluebird.Thenable<R>): Bluebird<R>;
+  static try<R>(fn: () => R | PromiseLike<R>): Bluebird<R>;
+  static attempt<R>(fn: () => R | PromiseLike<R>): Bluebird<R>;
 
   /**
    * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
@@ -385,7 +701,7 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * Create a promise that is resolved with the given `value`. If `value` is a thenable or promise, the returned promise will assume its state.
    */
   static resolve(): Bluebird<void>;
-  static resolve<R>(value: R | Bluebird.Thenable<R>): Bluebird<R>;
+  static resolve<R>(value: R | PromiseLike<R>): Bluebird<R>;
 
   /**
    * Create a promise that is rejected with the given `reason`.
@@ -401,7 +717,7 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
   /**
    * Cast the given `value` to a trusted promise. If `value` is already a trusted `Promise`, it is returned as is. If `value` is not a thenable, a fulfilled is: Promise returned with `value` as its fulfillment value. If `value` is a thenable (Promise-like object, like those returned by jQuery's `$.ajax`), returns a trusted that: Promise assimilates the state of the thenable.
    */
-  static cast<R>(value: R | Bluebird.Thenable<R>): Bluebird<R>;
+  static cast<R>(value: R | PromiseLike<R>): Bluebird<R>;
 
   /**
    * Sugar for `Promise.resolve(undefined).bind(thisArg);`. See `.bind()`.
@@ -423,7 +739,7 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * If value is a promise, the delay will start counting down when it is fulfilled and the returned
    *  promise will be fulfilled with the fulfillment value of the value promise.
    */
-  static delay<R>(ms: number, value: R | Bluebird.Thenable<R>): Bluebird<R>;
+  static delay<R>(ms: number, value: R | PromiseLike<R>): Bluebird<R>;
   static delay(ms: number): Bluebird<void>;
 
   /**
@@ -475,13 +791,13 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    */
   // TODO enable more overloads
   // array with promises of different types
-  static all<T1, T2, T3, T4, T5>(values: [Bluebird.Thenable<T1> | T1, Bluebird.Thenable<T2> | T2, Bluebird.Thenable<T3> | T3, Bluebird.Thenable<T4> | T4, Bluebird.Thenable<T5> | T5]): Bluebird<[T1, T2, T3, T4, T5]>;
-  static all<T1, T2, T3, T4>(values: [Bluebird.Thenable<T1> | T1, Bluebird.Thenable<T2> | T2, Bluebird.Thenable<T3> | T3, Bluebird.Thenable<T4> | T4]): Bluebird<[T1, T2, T3, T4]>;
-  static all<T1, T2, T3>(values: [Bluebird.Thenable<T1> | T1, Bluebird.Thenable<T2> | T2, Bluebird.Thenable<T3> | T3]): Bluebird<[T1, T2, T3]>;
-  static all<T1, T2>(values: [Bluebird.Thenable<T1> | T1, Bluebird.Thenable<T2> | T2]): Bluebird<[T1, T2]>;
-  static all<T1>(values: [Bluebird.Thenable<T1> | T1]): Bluebird<[T1]>;
+  static all<T1, T2, T3, T4, T5>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3, PromiseLike<T4> | T4, PromiseLike<T5> | T5]): Bluebird<[T1, T2, T3, T4, T5]>;
+  static all<T1, T2, T3, T4>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3, PromiseLike<T4> | T4]): Bluebird<[T1, T2, T3, T4]>;
+  static all<T1, T2, T3>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3]): Bluebird<[T1, T2, T3]>;
+  static all<T1, T2>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2]): Bluebird<[T1, T2]>;
+  static all<T1>(values: [PromiseLike<T1> | T1]): Bluebird<[T1]>;
   // array with values
-  static all<R>(values: Bluebird.Thenable<(Bluebird.Thenable<R> | R)[]> | (Bluebird.Thenable<R> | R)[]): Bluebird<R[]>;
+  static all<R>(values: PromiseLike<(PromiseLike<R> | R)[]> | (PromiseLike<R> | R)[]): Bluebird<R[]>;
 
   /**
    * Like ``Promise.all`` but for object properties instead of array items. Returns a promise that is fulfilled when all the properties of the object are fulfilled. The promise's fulfillment value is an object with fulfillment values at respective keys to the original object. If any promise in the object rejects, the returned promise is rejected with the rejection reason.
@@ -499,14 +815,14 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
   /**
    * Like `Promise.some()`, with 1 as `count`. However, if the promise fulfills, the fulfillment value is not an array of 1 but the value directly.
    */
-  static any<R>(values: Bluebird.Thenable<(Bluebird.Thenable<R> | R)[]> | (Bluebird.Thenable<R> | R)[]): Bluebird<R>;
+  static any<R>(values: PromiseLike<(PromiseLike<R> | R)[]> | (PromiseLike<R> | R)[]): Bluebird<R>;
 
   /**
    * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled or rejected as soon as a promise in the array is fulfilled or rejected with the respective rejection reason or fulfillment value.
    *
    * **Note** If you pass empty array or a sparse array with no values, or a promise/thenable for such, it will be forever pending.
    */
-  static race<R>(values: Bluebird.Thenable<(Bluebird.Thenable<R> | R)[]> | (Bluebird.Thenable<R> | R)[]): Bluebird<R>;
+  static race<R>(values: PromiseLike<(PromiseLike<R> | R)[]> | (PromiseLike<R> | R)[]): Bluebird<R>;
 
   /**
    * Initiate a competetive race between multiple promises or values (values will become immediately fulfilled promises). When `count` amount of promises have been fulfilled, the returned promise is fulfilled with an array that contains the fulfillment values of the winners in order of resolution.
@@ -516,11 +832,11 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * *The original array is not modified.*
    */
   // promise of array with promises of value
-  static some<R>(values: Bluebird.Thenable<Bluebird.Thenable<R>[]>, count: number): Bluebird<R[]>;
+  static some<R>(values: PromiseLike<PromiseLike<R>[]>, count: number): Bluebird<R[]>;
   // promise of array with values
-  static some<R>(values: Bluebird.Thenable<R[]>, count: number): Bluebird<R[]>;
+  static some<R>(values: PromiseLike<R[]>, count: number): Bluebird<R[]>;
   // array with promises of value
-  static some<R>(values: Bluebird.Thenable<R>[], count: number): Bluebird<R[]>;
+  static some<R>(values: PromiseLike<R>[], count: number): Bluebird<R[]>;
   // array with values
   static some<R>(values: R[], count: number): Bluebird<R[]>;
 
@@ -533,15 +849,15 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    *
    * Note: In 1.x and 0.x Promise.join used to be a Promise.all that took the values in as arguments instead in an array. This behavior has been deprecated but is still supported partially - when the last argument is an immediate function value the new semantics will apply
    */
-  static join<R, A1>(arg1: A1 | Bluebird.Thenable<A1>, handler: (arg1: A1) => R | Bluebird.Thenable<R>): Bluebird<R>;
-  static join<R, A1, A2>(arg1: A1 | Bluebird.Thenable<A1>, arg2: A2 | Bluebird.Thenable<A2>, handler: (arg1: A1, arg2: A2) => R | Bluebird.Thenable<R>): Bluebird<R>;
-  static join<R, A1, A2, A3>(arg1: A1 | Bluebird.Thenable<A1>, arg2: A2 | Bluebird.Thenable<A2>, arg3: A3 | Bluebird.Thenable<A3>, handler: (arg1: A1, arg2: A2, arg3: A3) => R | Bluebird.Thenable<R>): Bluebird<R>;
-  static join<R, A1, A2, A3, A4>(arg1: A1 | Bluebird.Thenable<A1>, arg2: A2 | Bluebird.Thenable<A2>, arg3: A3 | Bluebird.Thenable<A3>, arg4: A4 | Bluebird.Thenable<A4>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => R | Bluebird.Thenable<R>): Bluebird<R>;
-  static join<R, A1, A2, A3, A4, A5>(arg1: A1 | Bluebird.Thenable<A1>, arg2: A2 | Bluebird.Thenable<A2>, arg3: A3 | Bluebird.Thenable<A3>, arg4: A4 | Bluebird.Thenable<A4>, arg5: A5 | Bluebird.Thenable<A5>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => R | Bluebird.Thenable<R>): Bluebird<R>;
+  static join<R, A1>(arg1: A1 | PromiseLike<A1>, handler: (arg1: A1) => R | PromiseLike<R>): Bluebird<R>;
+  static join<R, A1, A2>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, handler: (arg1: A1, arg2: A2) => R | PromiseLike<R>): Bluebird<R>;
+  static join<R, A1, A2, A3>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, handler: (arg1: A1, arg2: A2, arg3: A3) => R | PromiseLike<R>): Bluebird<R>;
+  static join<R, A1, A2, A3, A4>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, arg4: A4 | PromiseLike<A4>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => R | PromiseLike<R>): Bluebird<R>;
+  static join<R, A1, A2, A3, A4, A5>(arg1: A1 | PromiseLike<A1>, arg2: A2 | PromiseLike<A2>, arg3: A3 | PromiseLike<A3>, arg4: A4 | PromiseLike<A4>, arg5: A5 | PromiseLike<A5>, handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => R | PromiseLike<R>): Bluebird<R>;
 
   // variadic array
   /** @deprecated use .all instead */
-  static join<R>(...values: (R | Bluebird.Thenable<R>)[]): Bluebird<R[]>;
+  static join<R>(...values: (R | PromiseLike<R>)[]): Bluebird<R[]>;
 
   /**
    * Map an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `mapper` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
@@ -551,16 +867,16 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * *The original array is not modified.*
    */
   // promise of array with promises of value
-  static map<R, U>(values: Bluebird.Thenable<Bluebird.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  static map<R, U>(values: PromiseLike<PromiseLike<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   // promise of array with values
-  static map<R, U>(values: Bluebird.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  static map<R, U>(values: PromiseLike<R[]>, mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   // array with promises of value
-  static map<R, U>(values: Bluebird.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  static map<R, U>(values: PromiseLike<R>[], mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   // array with values
-  static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  static map<R, U>(values: R[], mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
 
   /**
    * Reduce an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `reducer` function with the signature `(total, current, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
@@ -570,16 +886,16 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * *The original array is not modified. If no `intialValue` is given and the array doesn't contain at least 2 items, the callback will not be called and `undefined` is returned. If `initialValue` is given and the array doesn't have at least 1 item, `initialValue` is returned.*
    */
   // promise of array with promises of value
-  static reduce<R, U>(values: Bluebird.Thenable<Bluebird.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, initialValue?: U): Bluebird<U>;
+  static reduce<R, U>(values: PromiseLike<PromiseLike<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
 
   // promise of array with values
-  static reduce<R, U>(values: Bluebird.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, initialValue?: U): Bluebird<U>;
+  static reduce<R, U>(values: PromiseLike<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
 
   // array with promises of value
-  static reduce<R, U>(values: Bluebird.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, initialValue?: U): Bluebird<U>;
+  static reduce<R, U>(values: PromiseLike<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
 
   // array with values
-  static reduce<R, U>(values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>, initialValue?: U): Bluebird<U>;
+  static reduce<R, U>(values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
 
   /**
    * Filter an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `filterer` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well.
@@ -589,16 +905,16 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * *The original array is not modified.
    */
   // promise of array with promises of value
-  static filter<R>(values: Bluebird.Thenable<Bluebird.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean | Bluebird.Thenable<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
+  static filter<R>(values: PromiseLike<PromiseLike<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
 
   // promise of array with values
-  static filter<R>(values: Bluebird.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean | Bluebird.Thenable<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
+  static filter<R>(values: PromiseLike<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
 
   // array with promises of value
-  static filter<R>(values: Bluebird.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean | Bluebird.Thenable<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
+  static filter<R>(values: PromiseLike<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
 
   // array with values
-  static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean | Bluebird.Thenable<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
+  static filter<R>(values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, option?: Bluebird.ConcurrencyOption): Bluebird<R[]>;
 
   /**
    * Iterate over an array, or a promise of an array, which contains promises (or a mix of promises and values) with the given iterator function with the signature (item, index, value) where item is the resolved value of a respective promise in the input array. Iteration happens serially. If any promise in the input array is rejected the returned promise is rejected as well.
@@ -606,11 +922,11 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * Resolves to the original array unmodified, this method is meant to be used for side effects. If the iterator function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration.
    */
   // promise of array with promises of value
-  static each<R, U>(values: Bluebird.Thenable<Bluebird.Thenable<R>[]>, iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<R[]>;
+  static each<R, U>(values: PromiseLike<PromiseLike<R>[]>, iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
   // array with promises of value
-  static each<R, U>(values: Bluebird.Thenable<R>[], iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<R[]>;
+  static each<R, U>(values: PromiseLike<R>[], iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
   // array with values OR promise of array with values
-  static each<R, U>(values: R[] | Bluebird.Thenable<R[]>, iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<R[]>;
+  static each<R, U>(values: R[] | PromiseLike<R[]>, iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
 
   /**
    * Given an Iterable(arrays are Iterable), or a promise of an Iterable, which produces promises (or a mix of promises and values), iterate over all the values in the Iterable into an array and iterate over the array serially, in-order.
@@ -619,7 +935,7 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    *
    * If any promise in the input array is rejected or any promise returned by the iterator function is rejected, the result will be rejected as well.
    */
-  static mapSeries<R, U>(values: (R | Bluebird.Thenable<R>)[] | Bluebird.Thenable<(R | Bluebird.Thenable<R>)[]>, iterator: (item: R, index: number, arrayLength: number) => U | Bluebird.Thenable<U>): Bluebird<U[]>;
+  static mapSeries<R, U>(values: (R | PromiseLike<R>)[] | PromiseLike<(R | PromiseLike<R>)[]>, iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<U[]>;
 
   /**
    * A meta method used to specify the disposer method that cleans up a resource when using `Promise.using`.
@@ -631,16 +947,16 @@ declare class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R
    * The second argument passed to a disposer is the result promise of the using block, which you can
    *  inspect synchronously.
    */
-  disposer(disposeFn: (arg: R, promise: Bluebird<R>) => void | Bluebird.Thenable<void>): Bluebird.Disposer<R>;
+  disposer(disposeFn: (arg: R, promise: Bluebird<R>) => void | PromiseLike<void>): Bluebird.Disposer<R>;
 
   /**
    * In conjunction with `.disposer`, using will make sure that no matter what, the specified disposer
    *  will be called when the promise returned by the callback passed to using has settled. The disposer is
    *  necessary because there is no standard interface in node for disposing resources.
    */
-  static using<R, T>(disposer: Bluebird.Disposer<R>, executor: (transaction: R) => Bluebird.Thenable<T>): Bluebird<T>;
-  static using<R1, R2, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, executor: (transaction1: R1, transaction2: R2) => Bluebird.Thenable<T>): Bluebird<T>;
-  static using<R1, R2, R3, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, disposer3: Bluebird.Disposer<R3>, executor: (transaction1: R1, transaction2: R2, transaction3: R3) => Bluebird.Thenable<T>): Bluebird<T>;
+  static using<R, T>(disposer: Bluebird.Disposer<R>, executor: (transaction: R) => PromiseLike<T>): Bluebird<T>;
+  static using<R1, R2, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, executor: (transaction1: R1, transaction2: R2) => PromiseLike<T>): Bluebird<T>;
+  static using<R1, R2, R3, T>(disposer: Bluebird.Disposer<R1>, disposer2: Bluebird.Disposer<R2>, disposer3: Bluebird.Disposer<R3>, executor: (transaction1: R1, transaction2: R2, transaction3: R3) => PromiseLike<T>): Bluebird<T>;
 
   /**
    * Add handler as the handler to call when there is a possibly unhandled rejection.
@@ -695,7 +1011,7 @@ declare namespace Bluebird {
     suffix?: string;
     filter?: (name: string, func: Function, target?: any, passesDefaultFilter?: boolean) => boolean;
     // The promisifier gets a reference to the original method and should return a function which returns a promise
-    promisifier?: (originalMethod: Function) => () => Thenable<any>;
+    promisifier?: (originalMethod: Function) => () => PromiseLike<any>;
   }
 
   /**
@@ -755,10 +1071,8 @@ declare namespace Bluebird {
   export class Disposer<R> {
   }
 
-  export interface Thenable<R> {
-    then<U>(onFulfilled: (value: R) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-    then<U>(onFulfilled: (value: R) => U | Thenable<U>, onRejected?: (error: any) => void | Thenable<void>): Thenable<U>;
-  }
+  /** @deprecated Use PromiseLike<T> directly. */
+  export type Thenable<T> = PromiseLike<T>;
 
   export interface Resolver<R> {
     /**
diff --git a/types/body-parser/index.d.ts b/types/body-parser/index.d.ts
index 54a9b463ed..be10668973 100644
--- a/types/body-parser/index.d.ts
+++ b/types/body-parser/index.d.ts
@@ -21,7 +21,7 @@ declare namespace bodyParser {
     }
 
     interface OptionsJson extends Options {
-        reviever?(key: string, value: any): any;
+        reviver?(key: string, value: any): any;
         strict?: boolean;
     }
 
diff --git a/types/bonjour/index.d.ts b/types/bonjour/index.d.ts
index bba5debb3c..0c2578121e 100644
--- a/types/bonjour/index.d.ts
+++ b/types/bonjour/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/watson/bonjour
 // Definitions by: Quentin Lampin <https://github.com/quentin-ol/>, Nicolas Voigt <https://github.com/octo-sniffle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference types="node" />
+
+/// <reference types="node" />
 
 declare function bonjour(opts?: bonjour.BonjourOptions): bonjour.Bonjour;
 export = bonjour;
diff --git a/types/bookshelf/index.d.ts b/types/bookshelf/index.d.ts
index 86176ed2e8..55be61ba9e 100644
--- a/types/bookshelf/index.d.ts
+++ b/types/bookshelf/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://bookshelfjs.org/
 // Definitions by: Andrew Schurman <http://github.com/arcticwaters>, Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import Knex = require('knex');
 import knex = require('knex');
@@ -40,7 +40,8 @@ declare namespace Bookshelf {
 		tableName?: string;
 	}
 
-	abstract class ModelBase<T extends Model<any>> extends Events<T | Collection<T>> implements IModelBase {
+        interface ModelBase<T extends Model<any>> extends IModelBase { }
+	abstract class ModelBase<T extends Model<any>> extends Events<T | Collection<T>> {
 		/** If overriding, must use a getter instead of a plain property. */
 		idAttribute: string;
 
diff --git a/types/boom/boom-tests.ts b/types/boom/boom-tests.ts
index e31e376dde..38dc39058f 100644
--- a/types/boom/boom-tests.ts
+++ b/types/boom/boom-tests.ts
@@ -1,44 +1,154 @@
-
 import Boom = require('boom');
+import * as Hapi from 'hapi';
 
-var bo = Boom.wrap(new Error('test'), 400, 'some message');
-var a: string = bo.output.headers['some header'];
+// 4xx and data type
 
-Boom.create(500, 'Internal server error', { timestamp: Date.now() });
+const badRequestError = Boom.badRequest('message', {some: 'data'});
+badRequestError.data.some;
+const badRequestError2: Boom.BoomError = Boom.badImplementation('message');
 
-Boom.badRequest('message', {some: 'data'});
-Boom.unauthorized('message', <string | string[]> 'scheme', {some: 'data'});
-Boom.unauthorized(null, <string | string[]> 'scheme', 'data');
-Boom.paymentRequired('message', {some: 'data'});
-Boom.forbidden('message', {some: 'data'});
-Boom.notFound('message', {some: 'data'});
-Boom.methodNotAllowed('message', {some: 'data'});
-Boom.notAcceptable('message', {some: 'data'});
-Boom.proxyAuthRequired('message', {some: 'data'});
-Boom.clientTimeout('message', {some: 'data'});
-Boom.conflict('message', {some: 'data'});
-Boom.resourceGone('message', {some: 'data'});
-Boom.lengthRequired('message', {some: 'data'});
-Boom.preconditionFailed('message', {some: 'data'});
-Boom.entityTooLarge('message', {some: 'data'});
-Boom.uriTooLong('message', {some: 'data'});
-Boom.unsupportedMediaType('message', {some: 'data'});
-Boom.rangeNotSatisfiable('message', {some: 'data'});
-Boom.expectationFailed('message', {some: 'data'});
-Boom.teapot('message', {some: 'data'});
-Boom.badData('message', {some: 'data'});
-Boom.locked('message', {some: 'data'});
-Boom.preconditionRequired('message', {some: 'data'});
-Boom.tooManyRequests('message', {some: 'data'});
-Boom.illegal('message', {some: 'data'});
+const unauthorizedError1 = Boom.unauthorized('message', 'scheme', {some: 'attribute'});
+unauthorizedError1.output.payload.attributes === { some: 'attribute', error: 'message' };
+unauthorizedError1.output.headers === { 'WWW-Authenticate': 'scheme some="attribute", error="message"' };
 
-Boom.badImplementation('message', {some: 'data'});
-Boom.notImplemented('message', {some: 'data'});
-Boom.badGateway('message', {some: 'data'});
-Boom.serverUnavailable('message', {some: 'data'});
-Boom.gatewayTimeout('message', {some: 'data'});
+const unauthorizedError2 = Boom.unauthorized('message', ['scheme']);
+unauthorizedError2.output.payload.attributes === undefined;
+unauthorizedError2.output.headers === { 'WWW-Authenticate': 'scheme' };
 
-Boom.unauthorized() as Error;
+const unauthorizedError3 = Boom.unauthorized(null, 'scheme', 'attribute');
+unauthorizedError3.output.payload.attributes === 'attribute';
+unauthorizedError3.output.headers === { 'WWW-Authenticate': 'scheme attribute' };
+
+const unauthorizedError4 = Boom.unauthorized(null, 'scheme', {some: 'attribute'});
+unauthorizedError4.output.payload.attributes === { some: 'attribute' };
+unauthorizedError4.output.headers === { 'WWW-Authenticate': 'scheme some="attribute"' };
+
+const paymentRequiredError = Boom.paymentRequired('message', {some: 'data'});
+paymentRequiredError.data.some;
+const paymentRequiredError2: Boom.BoomError = Boom.paymentRequired('message');
+
+const forbiddenError = Boom.forbidden('message', {some: 'data'});
+forbiddenError.data.some;
+const forbiddenError2: Boom.BoomError = Boom.forbidden('message');
+
+const notFoundError = Boom.notFound('message', {some: 'data'});
+notFoundError.data.some;
+const notFoundError2: Boom.BoomError = Boom.notFound('message');
+
+const methodNotAllowedError = Boom.methodNotAllowed('message', {some: 'data'});
+methodNotAllowedError.data.some;
+const methodNotAllowedError2: Boom.BoomError = Boom.methodNotAllowed('message');
+
+const notAcceptableError = Boom.notAcceptable('message', {some: 'data'});
+notAcceptableError.data.some;
+const notAcceptableError2: Boom.BoomError = Boom.notAcceptable('message');
+
+const proxyAuthRequiredError = Boom.proxyAuthRequired('message', {some: 'data'});
+proxyAuthRequiredError.data.some;
+const proxyAuthRequiredError2: Boom.BoomError = Boom.proxyAuthRequired('message');
+
+const clientTimeoutError = Boom.clientTimeout('message', {some: 'data'});
+clientTimeoutError.data.some;
+const clientTimeoutError2: Boom.BoomError = Boom.clientTimeout('message');
+
+const conflictError = Boom.conflict('message', {some: 'data'});
+conflictError.data.some;
+
+const resourceGoneError = Boom.resourceGone('message', {some: 'data'});
+resourceGoneError.data.some;
+const resourceGoneError2: Boom.BoomError = Boom.resourceGone('message');
+
+const lengthRequiredError = Boom.lengthRequired('message', {some: 'data'});
+lengthRequiredError.data.some;
+const lengthRequiredError2: Boom.BoomError = Boom.lengthRequired('message');
+
+const preconditionFailedError = Boom.preconditionFailed('message', {some: 'data'});
+preconditionFailedError.data.some;
+const preconditionFailedError2: Boom.BoomError = Boom.preconditionFailed('message');
+
+const entityTooLargeError = Boom.entityTooLarge('message', {some: 'data'});
+entityTooLargeError.data.some;
+const entityTooLargeError2: Boom.BoomError = Boom.lengthRequired('message');
+
+const uriTooLongError = Boom.uriTooLong('message', {some: 'data'});
+uriTooLongError.data.some;
+const uriTooLongError2: Boom.BoomError = Boom.uriTooLong('message');
+
+const unsupportedMediaTypeError = Boom.unsupportedMediaType('message', {some: 'data'});
+unsupportedMediaTypeError.data.some;
+const unsupportedMediaTypeError2: Boom.BoomError = Boom.unsupportedMediaType('message');
+
+const rangeNotSatisfiableError = Boom.rangeNotSatisfiable('message', {some: 'data'});
+rangeNotSatisfiableError.data.some;
+const rangeNotSatisfiableError2: Boom.BoomError = Boom.rangeNotSatisfiable('message');
+
+const expectationFailedError = Boom.expectationFailed('message', {some: 'data'});
+expectationFailedError.data.some;
+const expectationFailedError2: Boom.BoomError = Boom.expectationFailed('message');
+
+const teapotError = Boom.teapot('message', {some: 'data'});
+teapotError.data.some;
+const teapotError2: Boom.BoomError = Boom.teapot('message');
+
+const badDataError = Boom.badData('message', {some: 'data'});
+badDataError.data.some;
+const badDataError2: Boom.BoomError = Boom.badData('message');
+
+const lockedError = Boom.locked('message', {some: 'data'});
+lockedError.data.some;
+const lockedError2: Boom.BoomError = Boom.locked('message');
+
+const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
+preconditionRequiredError.data.some;
+const preconditionRequiredError2: Boom.BoomError = Boom.preconditionRequired('message');
+
+const tooManyRequestsError = Boom.tooManyRequests('message', {some: 'data'});
+tooManyRequestsError.data.some;
+const tooManyRequestsError2: Boom.BoomError = Boom.tooManyRequests('message');
+
+const illegalError = Boom.illegal('message', {some: 'data'});
+illegalError.data.some;
+const illegalError2: Boom.BoomError = Boom.illegal('message');
+
+// 5xx and data type
+
+const badImplementationError = Boom.badImplementation('message', {some: 'data'});
+badImplementationError.data.some;
+const badImplementationError2: Boom.BoomError = Boom.badImplementation('message');
+
+const internalError = Boom.internal('message', {some: 'data'});
+internalError.data.some;
+const internalError2: Boom.BoomError = Boom.internal('message');
+
+const notImplementedError = Boom.notImplemented('message', {some: 'data'});
+notImplementedError.data.some;
+const notImplementedError2: Boom.BoomError = Boom.notImplemented('message');
+
+const badGatewayError = Boom.badGateway('message', {some: 'data'});
+badGatewayError.data.some;
+const badGatewayError2: Boom.BoomError = Boom.badGateway('message');
+
+const serverUnavailableError = Boom.serverUnavailable('message', {some: 'data'});
+serverUnavailableError.data.some;
+const serverUnavailableError2: Boom.BoomError = Boom.serverUnavailable('message');
+
+const gatewayTimeoutError = Boom.gatewayTimeout('message', {some: 'data'});
+gatewayTimeoutError.data.some;
+const gatewayTimeoutError2: Boom.BoomError = Boom.gatewayTimeout('message');
+
+// wrap and create
+
+const wrappedError = Boom.wrap(new Error('test'), 400, 'some message');
+
+const error1 = Boom.create(500, 'Internal server error', { timestamp: Date.now() });
+error1.data.timestamp;
+const error2: Boom.BoomError = Boom.create(500, 'Internal server error');
+
+// type widen asserting
+
+const unauthorizedError = Boom.unauthorized() as Error;
+
+// status code and reformat
 
 const error = Boom.badRequest('Cannot feed after midnight');
 error.output.statusCode = 499;    // Assign a custom error code
@@ -53,3 +163,30 @@ interface CustomPayload extends Boom.Payload {
 }
 
 (error.output.payload as CustomPayload).custom = 'abc_123';
+
+/**
+ * Test assignment of custom error data:
+ */
+const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1', isCustom: true } as CustomData1);
+const errorWithNoExplicitDataType: Boom.BoomError = errorWithData; // can assign to error without explicit data type
+const errorWithExplicitType: Boom.BoomError<CustomData> = errorWithData; // can assign to union data type
+const errorWithConcreteCustomData: Boom.BoomError<CustomData1> = errorWithData; // can assign to concrete data type
+// assignment to CustomData2 would not be possible
+// const errorWithConcreteCustomData2: Boom.BoomError<CustomData2> = errorWithData;
+
+// Some complex error data types for testing purposes:
+interface CustomDataBase {
+    isCustom: true;
+}
+
+interface CustomData1 extends CustomDataBase {
+    customType: 'Custom1';
+    custom1: string;
+}
+
+interface CustomData2 extends CustomDataBase {
+    customType: 'Custom2';
+    custom2: string;
+}
+
+type CustomData = CustomData1 | CustomData2;
diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index 4d9d0b3a5b..b8f41a85be 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://github.com/hapijs/boom
 // Definitions by: Igor Rogatty <http://github.com/rogatty>, AJP <http://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export = Boom;
 
@@ -11,7 +12,7 @@ declare namespace Boom {
      * boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:
      * @see {@link https://github.com/hapijs/boom#boom}
      */
-    export interface BoomError extends Error {
+    export interface BoomError<Data = any> extends Error {
         /** isBoom - if true, indicates this is a Boom object instance. */
         isBoom: boolean;
         /** isServer - convenience bool indicating status code >= 500. */
@@ -24,6 +25,8 @@ declare namespace Boom {
         reformat: () => string;
         /** "If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object." mentioned in @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes} */
         isMissing?: boolean;
+        /** https://github.com/hapijs/boom#createstatuscode-message-data and https://github.com/hapijs/boom/blob/v4.3.0/lib/index.js#L99 */
+        data: Data;
     }
 
     export interface Output {
@@ -34,6 +37,7 @@ declare namespace Boom {
         /** payload - the formatted object used as the response payload (stringified). Can be directly manipulated but any changes will be lost if reformat() is called. Any content allowed and by default includes the following content: */
         payload: Payload;
     }
+
     export interface Payload {
         /** statusCode - the HTTP status code, derived from error.output.statusCode. */
         statusCode: number;
@@ -41,6 +45,11 @@ declare namespace Boom {
         error: string;
         /** message - the error message derived from error.message. */
         message: string;
+        /**
+         * "Every key/value pair will be included ... in the response payload under the attributes key."
+         * [see docs](https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes)
+         */
+        attributes?: any;
         // Excluded this to aid typing of the other values.  See tests for example casting to a custom interface to manipulate the payload
         // [anyContent: string]: any;
     }
@@ -52,7 +61,7 @@ declare namespace Boom {
      * @param message optional message string. If the error already has a message, it adds the message as a prefix. Defaults to no message.
      * @see {@link https://github.com/hapijs/boom#wraperror-statuscode-message}
      */
-    export function wrap(error: Error, statusCode?: number, message?: string): BoomError;
+    export function wrap(error: Error, statusCode?: number, message?: string): BoomError<null>;
 
     /**
      * Generates an Error object with the boom decorations
@@ -61,7 +70,7 @@ declare namespace Boom {
      * @param data additional error data set to error.data property.
      * @see {@link https://github.com/hapijs/boom#createstatuscode-message-data}
      */
-    export function create(statusCode: number, message?: string, data?: any): BoomError;
+    export function create<Data = null>(statusCode: number, message?: string, data?: Data): BoomError<Data>;
 
     // 4xx
     /**
@@ -70,7 +79,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadrequestmessage-data}
      */
-    export function badRequest(message?: string, data?: any): BoomError;
+    export function badRequest<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 401 Unauthorized error
@@ -81,8 +90,10 @@ declare namespace Boom {
      * @param attributes an object of values to use while setting the 'WWW-Authenticate' header. This value is only used when scheme is a string, otherwise it is ignored. Every key/value pair will be included in the 'WWW-Authenticate' in the format of 'key="value"' as well as in the response payload under the attributes key. Alternatively value can be a string which is use to set the value of the scheme, for example setting the token value for negotiate header. If string is used message parameter must be null. null and undefined will be replaced with an empty string. If attributes is set, message will be used as the 'error' segment of the 'WWW-Authenticate' header. If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object.
      * @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes}
      */
-    export function unauthorized(message?: string, scheme?: string | string[], attributes?: {[index: string]: string}): BoomError;
-    export function unauthorized(message?: null, scheme?: string | string[], attributes?: string): BoomError;
+    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): BoomError<null>;
+    export function unauthorized(message?: string, scheme?: string[]): BoomError<null>;
+    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): BoomError<null>;
+    export function unauthorized(message?: null, scheme?: string[]): BoomError<null>;
 
     /**
      * Returns a 402 Payment Required error
@@ -90,7 +101,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompaymentrequiredmessage-data}
      */
-    export function paymentRequired(message?: string, data?: any): BoomError;
+    export function paymentRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 403 Forbidden error
@@ -98,7 +109,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomforbiddenmessage-data}
      */
-    export function forbidden(message?: string, data?: any): BoomError;
+    export function forbidden<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 404 Not Found error
@@ -106,7 +117,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotfoundmessage-data}
      */
-    export function notFound(message?: string, data?: any): BoomError;
+    export function notFound<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 405 Method Not Allowed error
@@ -115,7 +126,7 @@ declare namespace Boom {
      * @param allow optional string or array of strings (to be combined and separated by ', ') which is set to the 'Allow' header.
      * @see {@link https://github.com/hapijs/boom#boommethodnotallowedmessage-data-allow}
      */
-    export function methodNotAllowed(message?: string, data?: any, allow?: string | string[]): BoomError;
+    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): BoomError<Data>;
 
     /**
      * Returns a 406 Not Acceptable error
@@ -123,7 +134,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotacceptablemessage-data}
      */
-    export function notAcceptable(message?: string, data?: any): BoomError;
+    export function notAcceptable<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 407 Proxy Authentication Required error
@@ -131,7 +142,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomproxyauthrequiredmessage-data}
      */
-    export function proxyAuthRequired(message?: string, data?: any): BoomError;
+    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 408 Request Time-out error
@@ -139,7 +150,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomclienttimeoutmessage-data}
      */
-    export function clientTimeout(message?: string, data?: any): BoomError;
+    export function clientTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 409 Conflict error
@@ -147,7 +158,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomconflictmessage-data}
      */
-    export function conflict(message?: string, data?: any): BoomError;
+    export function conflict<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 410 Gone error
@@ -155,7 +166,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomresourcegonemessage-data}
      */
-    export function resourceGone(message?: string, data?: any): BoomError;
+    export function resourceGone<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 411 Length Required error
@@ -163,7 +174,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlengthrequiredmessage-data}
      */
-    export function lengthRequired(message?: string, data?: any): BoomError;
+    export function lengthRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 412 Precondition Failed error
@@ -171,7 +182,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionfailedmessage-data}
      */
-    export function preconditionFailed(message?: string, data?: any): BoomError;
+    export function preconditionFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 413 Request Entity Too Large error
@@ -179,7 +190,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomentitytoolargemessage-data}
      */
-    export function entityTooLarge(message?: string, data?: any): BoomError;
+    export function entityTooLarge<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 414 Request-URI Too Large error
@@ -187,7 +198,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomuritoolongmessage-data}
      */
-    export function uriTooLong(message?: string, data?: any): BoomError;
+    export function uriTooLong<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 415 Unsupported Media Type error
@@ -195,7 +206,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomunsupportedmediatypemessage-data}
      */
-    export function unsupportedMediaType(message?: string, data?: any): BoomError;
+    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 416 Requested Range Not Satisfiable error
@@ -203,7 +214,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomrangenotsatisfiablemessage-data}
      */
-    export function rangeNotSatisfiable(message?: string, data?: any): BoomError;
+    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 417 Expectation Failed error
@@ -211,7 +222,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomexpectationfailedmessage-data}
      */
-    export function expectationFailed(message?: string, data?: any): BoomError;
+    export function expectationFailed<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 418 I'm a Teapot error
@@ -219,7 +230,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomteapotmessage-data}
      */
-    export function teapot(message?: string, data?: any): BoomError;
+    export function teapot<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 422 Unprocessable Entity error
@@ -227,7 +238,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombaddatamessage-data}
      */
-    export function badData(message?: string, data?: any): BoomError;
+    export function badData<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 423 Locked error
@@ -235,7 +246,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlockedmessage-data}
      */
-    export function locked(message?: string, data?: any): BoomError;
+    export function locked<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 428 Precondition Required error
@@ -243,7 +254,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionrequiredmessage-data}
      */
-    export function preconditionRequired(message?: string, data?: any): BoomError;
+    export function preconditionRequired<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 429 Too Many Requests error
@@ -251,7 +262,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomtoomanyrequestsmessage-data}
      */
-    export function tooManyRequests(message?: string, data?: any): BoomError;
+    export function tooManyRequests<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 451 Unavailable For Legal Reasons error
@@ -259,7 +270,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomillegalmessage-data}
      */
-    export function illegal(message?: string, data?: any): BoomError;
+    export function illegal<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     // 5xx
     /**
@@ -269,7 +280,16 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function badImplementation(message?: string, data?: any): BoomError;
+    export function badImplementation<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
+    /**
+     * Returns a 500 Internal Server Error error
+     * Only 500 errors will hide your message from the end user. Your message is recorded in the server log.
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
+     */
+    export function internal<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 501 Not Implemented error with your error message to the user
@@ -277,7 +297,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotimplementedmessage-data}
      */
-    export function notImplemented(message?: string, data?: any): BoomError;
+    export function notImplemented<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 502 Bad Gateway error with your error message to the user
@@ -285,7 +305,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadgatewaymessage-data}
      */
-    export function badGateway(message?: string, data?: any): BoomError;
+    export function badGateway<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 503 Service Unavailable error with your error message to the user
@@ -293,7 +313,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomserverunavailablemessage-data}
      */
-    export function serverUnavailable(message?: string, data?: any): BoomError;
+    export function serverUnavailable<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
     /**
      * Returns a 504 Gateway Time-out error with your error message to the user
@@ -301,5 +321,5 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomgatewaytimeoutmessage-data}
      */
-    export function gatewayTimeout(message?: string, data?: any): BoomError;
+    export function gatewayTimeout<Data = null>(message?: string, data?: Data): BoomError<Data>;
 }
diff --git a/types/bootbox/index.d.ts b/types/bootbox/index.d.ts
index 28d30e2ba0..7007d80feb 100644
--- a/types/bootbox/index.d.ts
+++ b/types/bootbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/makeusabrew/bootbox
 // Definitions by: Vincent Bortone <https://github.com/vbortone/>, Kon Pik <https://github.com/konpikwastaken/>, Anup Kattel <https://github.com/kanup/>, Dominik Schroeter <https://github.com/icereed/>, Troy McKinnon <https://github.com/trodi/>, Stanny Nuytkens <https://github.com/stannynuytkens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/bootpag/index.d.ts b/types/bootpag/index.d.ts
index 2063cf5b93..20fee59ff2 100644
--- a/types/bootpag/index.d.ts
+++ b/types/bootpag/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://botmonster.com/jquery-bootpag/
 // Definitions by: MAF.DAP / Romain Deneau <https://github.com/rdeneau/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/bootstrap-datepicker/index.d.ts b/types/bootstrap-datepicker/index.d.ts
index 5a6e80f72e..9287ee1ba3 100644
--- a/types/bootstrap-datepicker/index.d.ts
+++ b/types/bootstrap-datepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/eternicode/bootstrap-datepicker
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -17,25 +18,28 @@
 interface DatepickerOptions {
     format?: string | DatepickerCustomFormatOptions;
     weekStart?: number;
-    startDate?: any;
-    endDate?: any;
+    startDate?: Date|string;
+    endDate?: Date|string;
     autoclose?: boolean;
     startView?: number;
-    todayBtn?: any;
+    todayBtn?: boolean|"linked";
     todayHighlight?: boolean;
     keyboardNavigation?: boolean;
     language?: string;
-    beforeShowDay?: (date: any) => any;
+    beforeShowDay?: (date: Date) => undefined|string|boolean|DatepickerBeforeShowDayResponse;
+    beforeShowYear?: (date: Date) => undefined|string|boolean|DatepickerBeforeShowResponse;
+    beforeShowDecade?: (date: Date) => undefined|string|boolean|DatepickerBeforeShowResponse;
+    beforeShowCentury?: (date: Date) => undefined|string|boolean|DatepickerBeforeShowResponse;
     calendarWeeks?: boolean;
     clearBtn?: boolean;
     daysOfWeekDisabled?: number[];
     forceParse?: boolean;
     inputs?: any[];
-    minViewMode?: any;
-    multidate?: any;
+    minViewMode?: 0|"days"|1|"months"|2|"years"|3|"decades"|4|"centuries"|"millenium";
+    multidate?: boolean|number;
     multidateSeparator?: string;
-    orientation?: string;
-    assumeNearbyYear?: any;
+    orientation?: "auto"|"left top"|"left bottom"|"right top"|"right bottom";
+    assumeNearbyYear?: boolean|number;
     viewMode?: string;
     templates?: any;
     zIndexOffset?: number;
@@ -43,6 +47,28 @@ interface DatepickerOptions {
     immediateUpdates?: boolean;
     title?: string;
     container?: string;
+    datesDisabled?:string|string[];
+    daysOfWeekHighlighted?:string|number[];
+    defaultViewDate?:Date|string|DatepickerViewDate;
+    updateViewDate?:boolean;
+}
+
+interface DatepickerViewDate {
+    year:number;
+    /** Month starting with 0 */
+    month:number;
+    /** Day of the month starting with 1 */
+    day:number;
+}
+
+interface DatepickerBeforeShowResponse {
+    enabled?:boolean;
+    classes?: string;
+    tooltip?: string;
+}
+
+interface DatepickerBeforeShowDayResponse extends DatepickerBeforeShowResponse {
+    content?: string;
 }
 
 interface DatepickerCustomFormatOptions {
@@ -52,7 +78,10 @@ interface DatepickerCustomFormatOptions {
 
 interface DatepickerEventObject extends JQueryEventObject {
     date: Date;
+    dates: Date[];
+    format(ix?:number): string;
     format(format?: string): string;
+    format(ix?:number, format?: string): string;
 }
 
 interface JQuery {
diff --git a/types/bootstrap-fileinput/index.d.ts b/types/bootstrap-fileinput/index.d.ts
index b7dcd6fd16..8a7df2dbbc 100644
--- a/types/bootstrap-fileinput/index.d.ts
+++ b/types/bootstrap-fileinput/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kartik-v/bootstrap-fileinput
 // Definitions by: Ché Coxshall <https://github.com/CheCoxshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -1036,4 +1037,4 @@ declare module BootstrapFileInput {
         */
         indicatorLoadingTitle: string;
     }
-}
\ No newline at end of file
+}
diff --git a/types/bootstrap-maxlength/index.d.ts b/types/bootstrap-maxlength/index.d.ts
index fefe196dff..e1fd71deb8 100644
--- a/types/bootstrap-maxlength/index.d.ts
+++ b/types/bootstrap-maxlength/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mimo84/bootstrap-maxlength
 // Definitions by: Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/bootstrap-notify/index.d.ts b/types/bootstrap-notify/index.d.ts
index c6939a7c2c..441bb33c39 100644
--- a/types/bootstrap-notify/index.d.ts
+++ b/types/bootstrap-notify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://bootstrap-notify.remabledesigns.com/
 // Definitions by: Blake Niemyjski <https://github.com/niemyjski/>, Robert McIntosh <https://github.com/mouse0270>, Robert Voica <https://github.com/robert-voica>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -62,4 +63,4 @@ interface NotifyReturn {
 	$ele: JQueryStatic;
 	close: () => void;
 	update: (command: string, update: any) => void;
-}
\ No newline at end of file
+}
diff --git a/types/bootstrap-select/index.d.ts b/types/bootstrap-select/index.d.ts
index 5f511685ba..95dd32b348 100644
--- a/types/bootstrap-select/index.d.ts
+++ b/types/bootstrap-select/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://silviomoreto.github.io/bootstrap-select/
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/bootstrap-slider/bootstrap-slider-tests.ts b/types/bootstrap-slider/bootstrap-slider-tests.ts
index df143d4c72..8b59a25a36 100644
--- a/types/bootstrap-slider/bootstrap-slider-tests.ts
+++ b/types/bootstrap-slider/bootstrap-slider-tests.ts
@@ -1,117 +1,146 @@
-$(function() {
+import $ = require('jquery');
+
+$(() => {
     // examples from http://seiyria.github.io/bootstrap-slider/
 
     $('#ex1').slider({
-        formatter: function(value) {
+        formatter(value) {
             return 'Current value: ' + value;
         }
     });
 
+    $('#ex2').slider({});
 
-
-    $("#ex2").slider({});
-
-    var RGBChange = function() {
-        $('#RGB').css('background', 'rgb('+r.getValue()+','+g.getValue()+','+b.getValue()+')')
+    const RGBChange = () => {
+        $('#RGB').css('background', 'rgb(' + r.getValue() + ',' + g.getValue() + ',' + b.getValue() + ')');
     };
 
-    var r = $('#R').slider()
-            .on('slide', RGBChange)
-            .data('slider');
-    var g = $('#G').slider()
-            .on('slide', RGBChange)
-            .data('slider');
-    var b = $('#B').slider()
-            .on('slide', RGBChange)
-            .data('slider');
+    const r = $('#R').slider()
+        .on('slide', RGBChange)
+        .data('slider');
+    const g = $('#G').slider()
+        .on('slide', RGBChange)
+        .data('slider');
+    const b = $('#B').slider()
+        .on('slide', RGBChange)
+        .data('slider');
 
-
-
-    $("#ex4").slider({
-        reversed : true
+    $('#ex4').slider({
+        reversed: true
     });
 
+    $('#ex5').slider();
 
-
-    $("#ex5").slider();
-
-    $("#destroyEx5Slider").click(function() {
-        $("#ex5").slider('destroy');
+    $('#destroyEx5Slider').click(() => {
+        $('#ex5').slider('destroy');
     });
 
-
-
-    $("#ex6").slider();
-    $("#ex6").on("slide", function(slideEvt) {
-        $("#ex6SliderVal").text(<number>slideEvt.value);
+    $('#ex6').slider();
+    $('#ex6').on('slide', (slideEvt) => {
+        $('#ex6SliderVal').text(<number> slideEvt.value);
     });
 
+    $('#ex7').slider();
 
-
-    $("#ex7").slider();
-
-    $("#ex7-enabled").click(function() {
-        if((this as HTMLInputElement).checked) {
+    $('#ex7-enabled').click(function(this: HTMLInputElement) {
+        if (this.checked) {
             // With JQuery
-            $("#ex7").slider("enable");
-        }
-        else {
+            $('#ex7').slider('enable');
+        } else {
             // With JQuery
-            $("#ex7").slider("disable");
+            $('#ex7').slider('disable');
         }
     });
 
-
-
-    $("#ex8").slider({
+    $('#ex8').slider({
         tooltip: 'always'
     });
 
-
-
-    $("#ex9").slider({
+    $('#ex9').slider({
         precision: 2,
         value: 8.115 // Slider will instantiate showing 8.12 due to specified precision
     });
 
+    $('#ex11').slider({ step: 20000, min: 0, max: 200000 });
 
+    $('#ex12a').slider({ id: 'slider12a', min: 0, max: 10, value: 5 });
+    $('#ex12b').slider({ id: 'slider12b', min: 0, max: 10, range: true, value: [3, 7] });
+    $('#ex12c').slider({ id: 'slider12c', min: 0, max: 10, range: true, value: [3, 7] });
 
-    $("#ex11").slider({step: 20000, min: 0, max: 200000});
-
-
-
-    $("#ex12a").slider({ id: "slider12a", min: 0, max: 10, value: 5 });
-    $("#ex12b").slider({ id: "slider12b", min: 0, max: 10, range: true, value: [3, 7] });
-    $("#ex12c").slider({ id: "slider12c", min: 0, max: 10, range: true, value: [3, 7] });
-
-
-
-    $("#ex13").slider({
+    $('#ex13').slider({
         ticks: [0, 100, 200, 300, 400],
         ticks_labels: ['$0', '$100', '$200', '$300', '$400'],
         ticks_snap_bounds: 30
     });
 
-
-
-    $("#ex14").slider({
+    $('#ex14').slider({
         ticks: [0, 100, 200, 300, 400],
         ticks_positions: [0, 30, 60, 70, 90, 100],
         ticks_labels: ['$0', '$100', '$200', '$300', '$400'],
         ticks_snap_bounds: 30
     });
 
-
-
-    $("#ex15").slider({
+    $('#ex15').slider({
         min: 1000,
         max: 10000000,
         scale: 'logarithmic',
         step: 10
     });
 
+    $('#ex16a').slider({ min: 0, max: 10, value: 0, focus: true });
+    $('#ex16b').slider({ min: 0, max: 10, value: [0, 10], focus: true });
 
+    // examples from https://github.com/seiyria/bootstrap-slider/blob/master/README.md
 
-    $("#ex16a").slider({ min: 0, max: 10, value: 0, focus: true });
-    $("#ex16b").slider({ min: 0, max: 10, value: [0, 10], focus: true });
+    {
+        // Instantiate a slider
+        const mySlider = $('input.slider').slider();
+
+        // Call a method on the slider
+        const value = mySlider.slider('getValue');
+
+        // For non-getter methods, you can chain together commands
+        mySlider
+            .slider('setValue', 5)
+            .slider('setValue', 7);
+    }
+
+    {    // Instantiate a slider
+        const mySlider = $('input.slider').bootstrapSlider();
+
+        // Call a method on the slider
+        const value = mySlider.bootstrapSlider('getValue');
+
+        // For non-getter methods, you can chain together commands
+        mySlider
+            .bootstrapSlider('setValue', 5)
+            .bootstrapSlider('setValue', 7);
+    }
+
+    {
+        // Instantiate a slider
+        const mySlider = $('input.slider').bootstrapSlider();
+
+        // Call a method on the slider
+        const value = mySlider.bootstrapSlider('getValue');
+
+        // For non-getter methods, you can chain together commands
+        mySlider
+            .bootstrapSlider('setValue', 5)
+            .bootstrapSlider('setValue', 7);
+    }
+
+    {    // Instantiate a slider
+        const mySlider = new Slider('input.slider', {
+            // initial options object
+        });
+
+        // Call a method on the slider
+        const value = mySlider.getValue();
+
+        // For non-getter methods, you can chain together commands
+        mySlider
+            .setValue(5)
+            .setValue(7);
+    }
 });
diff --git a/types/bootstrap-slider/index.d.ts b/types/bootstrap-slider/index.d.ts
index 9ed5c440c3..557c7aa5ad 100644
--- a/types/bootstrap-slider/index.d.ts
+++ b/types/bootstrap-slider/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for bootstrap-slider.js 4.8.3
+// Type definitions for bootstrap-slider.js 9.8
 // Project: https://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
+// TypeScript Version: 2.3
 
-///<reference types="jquery"/>
+/// <reference types="jquery" />
 
 interface SliderOptions {
     /**
@@ -40,7 +42,7 @@ interface SliderOptions {
      * Default: 5
      * initial value. Use array to have a range slider.
      */
-    value?: number|number[];
+    value?: number | number[];
     /**
      * Default: false
      * make range slider. Optional if initial value is an array. If initial value is scalar, max will be used for second value.
@@ -81,10 +83,12 @@ interface SliderOptions {
      * formatter callback. Return the value wanted to be displayed in the tooltip
      * @param val the current value to display
      */
-    formatter?(val:number): string;
+    formatter?(val: number): string;
     /**
      * Default: false
-     * The natural order is used for the arrow keys. Arrow up select the upper slider value for vertical sliders, arrow right the righter slider value for a horizontal slider - no matter if the slider was reversed or not. By default the arrow keys are oriented by arrow up/right to the higher slider value, arrow down/left to the lower slider value.
+     * The natural order is used for the arrow keys. Arrow up select the upper slider value for vertical sliders,
+     * arrow right the righter slider value for a horizontal slider - no matter if the slider was reversed or not.
+     * By default the arrow keys are oriented by arrow up/right to the higher slider value, arrow down/left to the lower slider value.
      */
     natural_arrow_keys?: boolean;
     /**
@@ -120,12 +124,19 @@ interface SliderOptions {
 }
 
 interface JQuery {
+    slider: SliderPlugin<this>;
+    bootstrapSlider: SliderPlugin<this>;
+
+    on(event: 'slide', handler: (slideEvt: SliderEvent) => false | void): this;
+}
+
+interface SliderPlugin<TJQuery> {
+    (methodName: string, ...args: any[]): TJQuery;
     /**
      * Creates a slider from the current element.
      * @param options
      */
-    slider(options?:SliderOptions): JQuery;
-    slider(methodName:string, ...args:any[]): JQuery;
+    (options?: SliderOptions): TJQuery;
 }
 
 interface ChangeValue {
@@ -133,46 +144,42 @@ interface ChangeValue {
     newValue: number;
 }
 
-interface JQueryEventObject {
-    value: number|ChangeValue;
+interface SliderEvent extends JQuery.Event {
+    value: number | ChangeValue;
 }
 
-interface SliderStatics {
-	new (selector: string, opts: SliderOptions): Slider;
-	prototype: Slider;
-}
-
-declare var Slider: SliderStatics;
-
 /**
  * This class is actually not used when using the jQuery version of bootstrap-slider
  * The method documentation is still here thouh.
  * When using jQuery, slider methods like setValue(3, true) have to be called like $slider.slider('setValue', 3, true)
  */
-interface Slider extends JQuery {
+declare class Slider {
+    constructor(selector: string, opts: SliderOptions);
+
     /**
      * Get the current value from the slider
      */
     getValue(): number;
     /**
-     * Set a new value for the slider. If optional triggerSlideEvent parameter is true, 'slide' events will be triggered. If optional triggerChangeEvent parameter is true, 'change' events will be triggered.
+     * Set a new value for the slider. If optional triggerSlideEvent parameter is true, 'slide' events will be triggered.
+     * If optional triggerChangeEvent parameter is true, 'change' events will be triggered.
      * @param newValue
      * @param triggerSlideEvent
      * @param triggerChangeEvent
      */
-    setValue(newValue:number, triggerSlideEvent?:boolean, triggerChangeEvent?:boolean): void;
+    setValue(newValue: number, triggerSlideEvent?: boolean, triggerChangeEvent?: boolean): this;
     /**
      * Properly clean up and remove the slider instance
      */
-    destroy(): void;
+    destroy(): this;
     /**
      * Disables the slider and prevents the user from changing the value
      */
-    disable(): void;
+    disable(): this;
     /**
      * Enables the slider
      */
-    enable(): void;
+    enable(): this;
     /**
      * Returns true if enabled, false if disabled
      */
@@ -182,26 +189,18 @@ interface Slider extends JQuery {
      * @param attribute
      * @param value
      */
-    setAttribute(attribute:string, value:any): void;
+    setAttribute(attribute: string, value: any): this;
     /**
      * Get the slider's attributes
      * @param attribute
      */
-    getAttribute(attribute:string): any;
+    getAttribute(attribute: string): any;
     /**
      * Refreshes the current slider
      */
-    refresh(): void;
+    refresh(): this;
     /**
      * Renders the tooltip again, after initialization. Useful in situations when the slider and tooltip are initially hidden.
      */
-    relayout(): void;
-    on: {
-        (eventType:string, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
-        (eventType:string, data:any, callback:(eventObject:JQueryEventObject, ...args:any[]) => any): Slider;
-        (eventType:string, selector:string, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
-        (eventType:string, selector:string, data:any, callback:(eventObject:JQueryEventObject, ...eventData:any[]) => any): Slider;
-        (eventType:{ [key: string]: any; }, selector?:string, data?:any): Slider;
-        (eventType:{ [key: string]: any; }, data?:any): Slider;
-    }
+    relayout(): this;
 }
diff --git a/types/bootstrap-slider/tsconfig.json b/types/bootstrap-slider/tsconfig.json
index 7c807ad0d1..a793a1d164 100644
--- a/types/bootstrap-slider/tsconfig.json
+++ b/types/bootstrap-slider/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bootstrap-slider-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/bootstrap-slider/tslint.json b/types/bootstrap-slider/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bootstrap-slider/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bootstrap-switch/index.d.ts b/types/bootstrap-switch/index.d.ts
index 670c50c73c..329a58fa53 100644
--- a/types/bootstrap-switch/index.d.ts
+++ b/types/bootstrap-switch/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.bootstrap-switch.org/
 // Definitions by: John M. Baughman <https://github.com/johnmbaughman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * bootstrap-switch - v3.3.2 Copyright (c) 2012-2013 Mattia Larentis
diff --git a/types/bootstrap-table/index.d.ts b/types/bootstrap-table/index.d.ts
index 5ed1b5e529..e70ada9e38 100644
--- a/types/bootstrap-table/index.d.ts
+++ b/types/bootstrap-table/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://bootstrap-table.wenzhixin.net.cn/
 // Definitions by: Talat Baig <https://github.com/talatbaig/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/bootstrap-touchspin/index.d.ts b/types/bootstrap-touchspin/index.d.ts
index 3026560f02..126cdd36f3 100644
--- a/types/bootstrap-touchspin/index.d.ts
+++ b/types/bootstrap-touchspin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.virtuosoft.eu/code/bootstrap-touchspin/
 // Definitions by: Albin Sunnanbo <https://github.com/albinsunnanbo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/bootstrap-validator/index.d.ts b/types/bootstrap-validator/index.d.ts
index 92dee2c310..e9f2073d70 100644
--- a/types/bootstrap-validator/index.d.ts
+++ b/types/bootstrap-validator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/1000hz/bootstrap-validator
 // Definitions by: Brady Liles <https://github.com/BradyLiles/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/bootstrap.paginator/index.d.ts b/types/bootstrap.paginator/index.d.ts
index 52aedd0656..b79e7bca0a 100644
--- a/types/bootstrap.paginator/index.d.ts
+++ b/types/bootstrap.paginator/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lyonlai/bootstrap-paginator
 // Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/bootstrap.timepicker/index.d.ts b/types/bootstrap.timepicker/index.d.ts
index 417f385526..f0cc7f472b 100644
--- a/types/bootstrap.timepicker/index.d.ts
+++ b/types/bootstrap.timepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jdewit/bootstrap-timepicker
 // Definitions by: derikwhittaker <https://github.com/derikwhittaker/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -44,6 +45,6 @@ interface JQuery {
     timepicker(options: TimepickerOptions): JQuery;
 }
 
-interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject {
+interface JQueryEventObject {
     time?: TimepickerTime;
 }
diff --git a/types/bootstrap.v3.datetimepicker/index.d.ts b/types/bootstrap.v3.datetimepicker/index.d.ts
index f37a42b67d..0dee893fc5 100644
--- a/types/bootstrap.v3.datetimepicker/index.d.ts
+++ b/types/bootstrap.v3.datetimepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://eonasdan.github.io/bootstrap-datetimepicker
 // Definitions by: Katona Péter <https://github.com/katonap>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // based on the previous version created by Jesica N. Fera <https://github.com/bayitajesi>
 
 /**
diff --git a/types/bootstrap.v3.datetimepicker/v3/index.d.ts b/types/bootstrap.v3.datetimepicker/v3/index.d.ts
index 2c69607cb9..ecfa6d44c1 100644
--- a/types/bootstrap.v3.datetimepicker/v3/index.d.ts
+++ b/types/bootstrap.v3.datetimepicker/v3/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://eonasdan.github.io/bootstrap-datetimepicker
 // Definitions by: Jesica N. Fera <https://github.com/bayitajesi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * bootstrap-datetimepicker.js 3.0.0 Copyright (c) 2014 Jonathan Peterson
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 4a7d9676be..53d9b45b37 100644
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://twitter.github.com/bootstrap/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/bounce.js/bounce.js-tests.ts b/types/bounce.js/bounce.js-tests.ts
index afa0cdcae2..eaf736dee5 100644
--- a/types/bounce.js/bounce.js-tests.ts
+++ b/types/bounce.js/bounce.js-tests.ts
@@ -2,7 +2,6 @@
 
 
 import Bounce from 'bounce.js';
-import * as $ from 'jquery';
 
 function test_chaining_transformations() {
     var bounce = new Bounce();
diff --git a/types/bounce.js/index.d.ts b/types/bounce.js/index.d.ts
index 250fef1a51..0db872fb30 100644
--- a/types/bounce.js/index.d.ts
+++ b/types/bounce.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://github.com/tictail/bounce.js
 // Definitions by: Cherry <http://github.com/cherrry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/breeze/breeze-tests.ts b/types/breeze/breeze-tests.ts
index 17653706ad..7f46780828 100644
--- a/types/breeze/breeze-tests.ts
+++ b/types/breeze/breeze-tests.ts
@@ -7,6 +7,11 @@ function test_dataType() {
     var typ = breeze.DataType.DateTime;
     var nm = typ.getName();
     var dv = typ.defaultValue;
+    var isDate = typ.isDate;
+    var isFloat = typ.isFloat;
+    var isInteger = typ.isInteger;
+    var isNumeric = typ.isNumeric;
+    var qjod = typ.quoteJsonOData;
     var symbs = breeze.DataType.getSymbols();
     var x = typ.parentEnum === <breeze.core.IEnum> breeze.DataType;
     var isFalse = breeze.DataType.contains(breeze.DataType.Double);
diff --git a/types/breeze/index.d.ts b/types/breeze/index.d.ts
index 323e9a8f87..bfd3479d3c 100644
--- a/types/breeze/index.d.ts
+++ b/types/breeze/index.d.ts
@@ -16,7 +16,7 @@
 // Updated Jul 15 2016 - Added methods to JsonResultsAdapter - Steve Schmitt
 // Updated Sep 23 2016 - Added core methods
 // Updated March 5 2017 - Eliminate promises.IPromise<T> and replace with Promise<T>
-
+// Updated Apr 28 2017 - Fixed DataType
 declare namespace breeze.core {
 
     export interface ErrorCallback {
@@ -266,9 +266,33 @@ declare namespace breeze {
 
     export class DataTypeSymbol extends breeze.core.EnumSymbol {
         defaultValue: any;
-        isNumeric: boolean;
-        isDate: boolean;
+        isDate?: boolean;
+        isFloat?: boolean;
+        isInteger?: boolean;
+        isNumeric?: boolean;
+        quoteJsonOData?: boolean;
+
+        validatorCtor: (context: any) => Validator;
+
+        /** Function to convert a value from string to this DataType.  Note that this will be called each time a property is changed, so make it fast. */
+        parse?: (val: any, sourceTypeName?: string) => any;
+
+        /** Function to format this DataType for OData queries. */
+        fmtOData: (val: any) => any;
+
+        /** Optional function to get the next value for key generation, if this datatype is used as a key.  Uses an internal table of previous values. */
+        getNext?: () => any;
+
+        /** Optional function to normalize a data value for comparison, if its value cannot be used directly.  Note that this will be called each time a property is changed, so make it fast. */
+        normalize?: (val: any) => any;
+
+        /** Optional function to get the next value when the datatype is used as a concurrency property. */
+        getConcurrencyValue?: (val: any) => any;
+
+        /** Optional function to convert a raw (server) value from string to this DataType. */
+        parseRawValue?: (val: any) => any;
     }
+
     export interface DataType extends breeze.core.IEnum {
         Binary: DataTypeSymbol;
         Boolean: DataTypeSymbol;
@@ -285,30 +309,16 @@ declare namespace breeze {
         String: DataTypeSymbol;
         Time: DataTypeSymbol;
         Undefined: DataTypeSymbol;
-
-        toDataType(typeName: string): DataTypeSymbol;
+        
+        constants: { nextNumber: number, nextNumberIncrement: number, stringPrefix: string };
+        
+        fromEdmDataType(typeName: string): DataTypeSymbol;
+        fromValue(val: any): DataTypeSymbol;
+        getComparableFn(dataType: DataTypeSymbol): (value: any) => any;
+        parseDateAsUTC(source: any): Date;
         parseDateFromServer(date: any): Date;
-        defaultValue: any;
-        isNumeric: boolean;
-        isInteger: boolean;
-
-        /** Function to convert a value from string to this DataType.  Note that this will be called each time a property is changed, so make it fast. */
-        parse: (val: any, sourceTypeName: string) => any;
-
-        /** Function to format this DataType for OData queries. */
-        fmtOData: (val: any) => any;
-
-        /** Optional function to get the next value for key generation, if this datatype is used as a key.  Uses an internal table of previous values. */
-        getNext?: () => any;
-
-        /** Optional function to normalize a data value for comparison, if its value cannot be used directly.  Note that this will be called each time a property is changed, so make it fast. */
-        normalize?: (val: any) => any;
-
-        /** Optional function to get the next value when the datatype is used as a concurrency property. */
-        getConcurrencyValue?: (val: any) => any;
-
-        /** Optional function to convert a raw (server) value from string to this DataType. */
-        parseRawValue?: (val: any) => any;
+        parseRawValue(val: any, dataType?: DataTypeSymbol): any;
+        parseTimeFromServer(source: any): string;
     }
     export var DataType: DataType;
 
diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index 43d68326ea..c20f27236a 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -82,7 +82,7 @@ var has = browserSync.has("My server");
 var bs = browserSync.create();
 
 bs.init({
-    server: "./app"
+    server: { index: "./app" }
 });
 
 bs.reload();
diff --git a/types/browserify/browserify-tests.ts b/types/browserify/browserify-tests.ts
index 68ebb59c7f..2a1da315ed 100644
--- a/types/browserify/browserify-tests.ts
+++ b/types/browserify/browserify-tests.ts
@@ -1,6 +1,7 @@
 import browserify = require("browserify");
 import fs = require("fs");
 import stream = require('stream');
+import insertGlobals = require("insert-module-globals");
 
 var bNoArg = browserify();
 
@@ -47,4 +48,15 @@ var record_pipeline = b.pipeline.get('record');
 
 b.bundle().pipe(process.stdout);
 
+var argv = { igv: "__filename,__dirname" };
+var insertGlobalVars: insertGlobals.VarsOption = {};
+var wantedGlobalVars = argv.igv.split(',');
+Object.keys(insertGlobals.vars).forEach((x) => {
+  if (wantedGlobalVars.indexOf(x) === -1) {
+    insertGlobalVars[x] = undefined;
+  }
+});
 
+var b = browserify('./browser/main.js', {
+  insertGlobalVars: insertGlobalVars
+});
diff --git a/types/browserify/index.d.ts b/types/browserify/index.d.ts
index 8554025402..8b51a34dd5 100644
--- a/types/browserify/index.d.ts
+++ b/types/browserify/index.d.ts
@@ -1,10 +1,12 @@
-// Type definitions for Browserify v12.0.1
+// Type definitions for Browserify 12.0
 // Project: http://browserify.org/
-// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>, John Vilk <https://github.com/jvilk>
+// Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>, John Vilk <https://github.com/jvilk>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
+import insertGlobals = require('insert-module-globals');
+
 declare var browserify: browserify.BrowserifyConstructor;
 export = browserify;
 
@@ -34,13 +36,22 @@ interface FileOptions {
 // for each file in a bundle.
 type InputFile = string | NodeJS.ReadableStream | FileOptions;
 
+/**
+ * Core options pertaining to a Browserify instance, extended by user options
+ */
+interface CustomOptions {
+  /**
+   * Custom properties can be defined on Options.
+   * These options are forwarded along to module-deps and browser-pack directly.
+   */
+  [propName: string]: any;
+  /** the directory that Browserify starts bundling from for filenames that start with .. */
+  basedir?: string;
+}
 /**
  * Options pertaining to a Browserify instance.
  */
-interface Options {
-  // Custom properties can be defined on Options.
-  // These options are forwarded along to module-deps and browser-pack directly.
-  [propName: string]: any;
+interface Options extends CustomOptions {
   // String, file object, or array of those types (they may be mixed) specifying entry file(s).
   entries?: InputFile | InputFile[];
   // an array which will skip all require() and global parsing for each file in the array.
@@ -49,8 +60,6 @@ interface Options {
   // an array of optional extra extensions for the module lookup machinery to use when the extension has not been specified.
   // By default Browserify considers only .js and .json files in such cases.
   extensions?: string[];
-  // the directory that Browserify starts bundling from for filenames that start with ..
-  basedir?: string;
   // an array of directories that Browserify searches when looking for modules which are not referenced using relative path.
   // Can be absolute or relative to basedir. Equivalent of setting NODE_PATH environmental variable when calling Browserify command.
   paths?: string[];
@@ -74,7 +83,7 @@ interface Options {
   // The global export will be sanitized and camel cased.
   standalone?: string;
   // will be passed to insert-module-globals as the opts.vars parameter.
-  insertGlobalVars?: {[globalName: string]: (file: string, basedir: string) => any};
+  insertGlobalVars?: insertGlobals.VarsOption;
   // defaults to 'require' in expose mode but you can use another name.
   externalRequireName?: string;
 }
@@ -113,32 +122,32 @@ interface BrowserifyObject extends NodeJS.EventEmitter {
    * If file is an array, each item in file will be externalized.
    * If file is another bundle, that bundle's contents will be read and excluded from the current bundle as the bundle in file gets bundled.
    */
-  external(file: string[], opts?: { basedir?: string }): BrowserifyObject;
-  external(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  external(file: string[], opts?: CustomOptions): BrowserifyObject;
+  external(file: string, opts?: CustomOptions): BrowserifyObject;
   external(file: BrowserifyObject): BrowserifyObject;
   /**
    * Prevent the module name or file at file from showing up in the output bundle.
    * Instead you will get a file with module.exports = {}.
    */
-  ignore(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  ignore(file: string, opts?: CustomOptions): BrowserifyObject;
   /**
    * Prevent the module name or file at file from showing up in the output bundle.
    * If your code tries to require() that file it will throw unless you've provided another mechanism for loading it.
    */
-  exclude(file: string, opts?: { basedir?: string }): BrowserifyObject;
+  exclude(file: string, opts?: CustomOptions): BrowserifyObject;
   /**
    * Transform source code before parsing it for require() calls with the transform function or module name tr.
    * If tr is a function, it will be called with tr(file) and it should return a through-stream that takes the raw file contents and produces the transformed source.
    * If tr is a string, it should be a module name or file path of a transform module
    */
-  transform<T extends { basedir?: string }>(tr: string, opts?: T): BrowserifyObject;
-  transform<T extends { basedir?: string }>(tr: (file: string, opts: T) => NodeJS.ReadWriteStream, opts?: T): BrowserifyObject;
+  transform<T extends CustomOptions>(tr: string, opts?: T): BrowserifyObject;
+  transform<T extends CustomOptions>(tr: (file: string, opts: T) => NodeJS.ReadWriteStream, opts?: T): BrowserifyObject;
   /**
    * Register a plugin with opts. Plugins can be a string module name or a function the same as transforms.
    * plugin(b, opts) is called with the Browserify instance b.
    */
-  plugin<T extends { basedir?: string }>(plugin: string, opts?: T): BrowserifyObject;
-  plugin<T extends { basedir?: string }>(plugin: (b: BrowserifyObject, opts: T) => any, opts?: T): BrowserifyObject;
+  plugin<T extends CustomOptions>(plugin: string, opts?: T): BrowserifyObject;
+  plugin<T extends CustomOptions>(plugin: (b: BrowserifyObject, opts: T) => any, opts?: T): BrowserifyObject;
   /**
    * Reset the pipeline back to a normal state. This function is called automatically when bundle() is called multiple times.
    * This function triggers a 'reset' event.
diff --git a/types/bufferstream/postbuffer.d.ts b/types/bufferstream/postbuffer.d.ts
index f8591771cc..bd348b84db 100644
--- a/types/bufferstream/postbuffer.d.ts
+++ b/types/bufferstream/postbuffer.d.ts
@@ -8,5 +8,5 @@ declare class PostBuffer extends BufferStream {
     /** set a callback to get all post data from a http server request */
     onEnd(callback: (data: any) => void): void;
     /** pumps data into another stream to allow incoming streams given options will be passed to Stream.pipe */
-    pipe(stream: NodeJS.WritableStream, options?: BufferStream.Opts): NodeJS.ReadableStream;
+    pipe(stream: NodeJS.WritableStream, options?: { end?: boolean }): NodeJS.ReadableStream;
 }
diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index fcf339b3c3..cbdcc83e0a 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -2,71 +2,92 @@
  * Created by Bruno Grieder
  */
 
-import * as Queue from "bull"
+import * as Redis from "ioredis";
+import * as Queue from "bull";
 
-var videoQueue = Queue( 'video transcoding', 6379, '127.0.0.1' );
-var audioQueue = Queue( 'audio transcoding', 6379, '127.0.0.1' );
-var imageQueue = Queue( 'image transcoding', 6379, '127.0.0.1' );
-
-videoQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+const videoQueue = new Queue('video transcoding', 'redis://127.0.0.1:6379');
+const audioQueue = new Queue('audio transcoding', {redis: {port: 6379, host: '127.0.0.1'}}); // Specify Redis connection using object
+const imageQueue = new Queue('image transcoding');
 
+videoQueue.process((job, done) => {
     // job.data contains the custom data passed when the job was created
     // job.jobId contains id of this job.
 
     // transcode video asynchronously and report progress
-    job.progress( 42 );
+    job.progress(42);
 
     // call done when finished
     done();
 
     // or give a error if error
-    done( Error( 'error transcoding' ) );
+    done(new Error('error transcoding'));
 
     // or pass it a result
-    done( null, { framerate: 29.5 /* etc... */ } );
+    done(null, { framerate: 29.5 /* etc... */ });
 
     // If the job throws an unhandled exception it is also handled correctly
-    throw (Error( 'some unexpected error' ));
-} );
+    throw new Error('some unexpected error');
+});
 
-audioQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+audioQueue.process((job, done) => {
     // transcode audio asynchronously and report progress
-    job.progress( 42 );
+    job.progress(42);
 
     // call done when finished
     done();
 
     // or give a error if error
-    done( Error( 'error transcoding' ) );
+    done(new Error('error transcoding'));
 
     // or pass it a result
-    done( null, { samplerate: 48000 /* etc... */ } );
+    done(null, { samplerate: 48000 /* etc... */ });
 
     // If the job throws an unhandled exception it is also handled correctly
-    throw (Error( 'some unexpected error' ));
-} );
+    throw new Error('some unexpected error');
+});
 
-imageQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+imageQueue.process((job, done) => {
     // transcode image asynchronously and report progress
-    job.progress( 42 );
+    job.progress(42);
 
     // call done when finished
     done();
 
     // or give a error if error
-    done( Error( 'error transcoding' ) );
+    done(new Error('error transcoding'));
 
     // or pass it a result
-    done( null, { width: 1280, height: 720 /* etc... */ } );
+    done(null, { width: 1280, height: 720 /* etc... */ });
 
     // If the job throws an unhandled exception it is also handled correctly
-    throw (Error( 'some unexpected error' ));
-} );
+    throw new Error('some unexpected error');
+});
 
-videoQueue.add( { video: 'http://example.com/video1.mov' } );
-audioQueue.add( { audio: 'http://example.com/audio1.mp3' } );
-imageQueue.add( { image: 'http://example.com/image1.tiff' } );
+videoQueue.add({video: 'http://example.com/video1.mov'});
+audioQueue.add({audio: 'http://example.com/audio1.mp3'});
+imageQueue.add({image: 'http://example.com/image1.tiff'});
 
+//////////////////////////////////////////////////////////////////////////////////
+//
+// Re-using Redis Connections
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+const client = new Redis();
+const subscriber = new Redis();
+
+const pdfQueue = new Queue('pdf transcoding', {
+    createClient: (type: string, options: Redis.RedisOptions) => {
+        switch (type) {
+            case 'client':
+                return client;
+            case 'subscriber':
+                return subscriber;
+            default:
+                return new Redis(options);
+        }
+    }
+});
 
 //////////////////////////////////////////////////////////////////////////////////
 //
@@ -74,42 +95,38 @@ imageQueue.add( { image: 'http://example.com/image1.tiff' } );
 //
 //////////////////////////////////////////////////////////////////////////////////
 
-const fetchVideo = ( url: string ): Promise<any> => { return null }
-const transcodeVideo = ( data: any ): Promise<void> => { return null }
+pdfQueue.process((job) => {
+    // Processors can also return promises instead of using the done callback
+    return Promise.resolve();
+});
 
-interface VideoJob extends Queue.Job {
-    data: {url: string}
-}
-
-
-videoQueue.process( ( job: VideoJob ) => { // don't forget to remove the done callback!
-    // Simply return a promise
-    fetchVideo( job.data.url ).then( transcodeVideo );
-
-    // Handles promise rejection
-    Promise.reject( new Error( 'error transcoding' ) );
-
-    // Passes the value the promise is resolved with to the "completed" event
-    Promise.resolve( { framerate: 29.5 /* etc... */ } );
-
-    // same as
-    Promise.reject( new Error( 'some unexpected error' ) );
-
-    // If the job throws an unhandled exception it is also handled correctly
-    throw new Error( 'some unexpected error' );
-} );
-
-
-var addVideo1Job = videoQueue.add( { video: 'http://example.com/video1.mov' } );
-
-addVideo1Job.then((video1Job) => {
+videoQueue.add({ video: 'http://example.com/video1.mov' }, { jobId: 1 })
+.then((video1Job) => {
     // When job has successfully be placed in the queue the job is returned
     // then wait for completion
     return video1Job.finished();
 })
 .then(() => {
-    // video1Job completed successfully
+    // completed successfully
 })
 .catch((err) => {
     // error
 });
+
+//////////////////////////////////////////////////////////////////////////////////
+//
+// Typed Event Handlers
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+pdfQueue
+.on('error', (err: Error) => undefined)
+.on('active', (job: Queue.Job, jobPromise: Queue.JobPromise) => jobPromise.cancel())
+.on('active', (job: Queue.Job) => undefined)
+.on('stalled', (job: Queue.Job) => undefined)
+.on('progress', (job: Queue.Job) => undefined)
+.on('completed', (job: Queue.Job) => undefined)
+.on('failed', (job: Queue.Job) => undefined)
+.on('paused', () => undefined)
+.on('resumed', () => undefined)
+.on('cleaned', (jobs: Queue.Job[], status: Queue.JobStatus) => undefined);
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 3c89655101..82a31a4ff3 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -1,316 +1,414 @@
-// Type definitions for bull 2.1.2
+// Type definitions for bull 3.0
 // Project: https://github.com/OptimalBits/bull
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Cameron Crothers <https://github.com/JProgrammer>
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>
+//                 Cameron Crothers <https://github.com/JProgrammer>
+//                 Marshall Cottrell <https://github.com/marshall007>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="redis" />
+import * as Redis from "ioredis";
 
-declare module "bull" {
+/**
+ * This is the Queue constructor.
+ * It creates a new Queue that is persisted in Redis.
+ * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
+ */
+declare const Bull: {
+    // tslint:disable:unified-signatures
+    (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
+    (queueName: string, url?: string): Bull.Queue;
+    new (queueName: string, opts?: Bull.QueueOptions): Bull.Queue;
+    new (queueName: string, url?: string): Bull.Queue;
+    // tslint:enable:unified-signatures
+};
 
-    import * as Redis from "redis";
-
-    /**
-    * This is the Queue constructor.
-    * It creates a new Queue that is persisted in Redis.
-    * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
-    */
-    function Bull(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): Bull.Queue;
-
-    namespace Bull {
-
-        export interface DoneCallback {
-            (error?: Error, value?: any): void
-        }
-
-        export interface Job {
-
-            jobId: string
-
-            /**
-            * The custom data passed when the job was created
-            */
-            data: Object;
-
-            /**
-             * Report progress on a job
-             */
-            progress(value: any): Promise<void>;
-
-            /**
-             * Removes a Job from the queue from all the lists where it may be included.
-             * @returns {Promise} A promise that resolves when the job is removed.
-             */
-            remove(): Promise<void>;
-
-            /**
-             * Rerun a Job that has failed.
-             * @returns {Promise} A promise that resolves when the job is scheduled for retry.
-             */
-            retry(): Promise<void>;
-
-            /**
-             * Returns a promise the resolves when the job has been finished.
-             * TODO: Add a watchdog to check if the job has finished periodically.
-             * since pubsub does not give any guarantees.
-             */
-            finished(): Promise<void>;
-        }
-
-        export interface Backoff {
-
-            /**
-             * Backoff type, which can be either `fixed` or `exponential`
-             */
-            type: string
-
-            /**
-             * Backoff delay, in milliseconds
-             */
-            delay: number;
-        }
-
-        export interface AddOptions {
-            /**
-             * An amount of miliseconds to wait until this job can be processed.
-             * Note that for accurate delays, both server and clients should have their clocks synchronized
-             */
-            delay?: number;
-
-            /**
-             * A number of attempts to retry if the job fails [optional]
-             */
-            attempts?: number;
-
-            /**
-             * Backoff setting for automatic retries if the job fails
-             */
-            backoff?: number | Backoff
-
-            /**
-             * A boolean which, if true, adds the job to the right
-             * of the queue instead of the left (default false)
-             */
-            lifo?: boolean;
-
-            /**
-             *  The number of milliseconds after which the job should be fail with a timeout error
-             */
-            timeout?: number;
-        }
-
-        export interface Queue {
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-             * Errors will be passed as a second argument to the "failed" event;
-             * results, as a second argument to the "completed" event.
-             *
-             * concurrency: Bull will then call you handler in parallel respecting this max number.
-            */
-            process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-             * Errors will be passed as a second argument to the "failed" event;
-             * results, as a second argument to the "completed" event.
-            */
-            process(callback: (job: Job, done: DoneCallback) => void): void;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * A promise must be returned to signal job completion.
-             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-             * If it is resolved, its value will be the "completed" event's second argument.
-             *
-             * concurrency: Bull will then call you handler in parallel respecting this max number.
-            */
-            process(concurrency: number, callback: (job: Job) => void): Promise<any>;
-
-            /**
-             * Defines a processing function for the jobs placed into a given Queue.
-             *
-             * The callback is called everytime a job is placed in the queue.
-             * It is passed an instance of the job as first argument.
-             *
-             * A promise must be returned to signal job completion.
-             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-             * If it is resolved, its value will be the "completed" event's second argument.
-            */
-            process(callback: (job: Job) => void): Promise<any>;
-
-            // process(callback: (job: Job, done?: DoneCallback) => void): Promise<any>;
-
-            /**
-             * Creates a new job and adds it to the queue.
-             * If the queue is empty the job will be executed directly,
-             * otherwise it will be placed in the queue and executed as soon as possible.
-             */
-            add(data: Object, opts?: AddOptions): Promise<Job>;
-
-            /**
-             * Returns a promise that resolves when the queue is paused.
-             * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
-             * A paused queue will not process new jobs until resumed,
-             * but current jobs being processed will continue until they are finalized.
-             *
-             * Pausing a queue that is already paused does nothing.
-             */
-            pause(): Promise<void>;
-
-            /**
-             * Returns a promise that resolves when the queue is resumed after being paused.
-             * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
-             *
-             * Resuming a queue that is not paused does nothing.
-             */
-            resume(): Promise<void>;
-
-            /**
-             * Returns a promise that returns the number of jobs in the queue, waiting or paused.
-             * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
-             */
-            count(): Promise<number>;
-
-            /**
-             * Empties a queue deleting all the input lists and associated jobs.
-             */
-            empty(): Promise<void>;
-
-            /**
-             * Closes the underlying redis client. Use this to perform a graceful shutdown.
-             *
-             * `close` can be called from anywhere, with one caveat:
-             * if called from within a job handler the queue won't close until after the job has been processed
-             */
-            close(): Promise<void>;
-
-            /**
-             * Returns a promise that will return the job instance associated with the jobId parameter.
-             * If the specified job cannot be located, the promise callback parameter will be set to null.
-             */
-            getJob(jobId: string): Promise<Job>;
-
-            /**
-             * Tells the queue remove all jobs created outside of a grace period in milliseconds.
-             * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
-             */
-            clean(gracePeriod: number, jobsState?: string): Promise<Job[]>;
-
-            /**
-             * Listens to queue events
-             * 'ready', 'error', 'activ', 'progress', 'completed', 'failed', 'paused', 'resumed', 'cleaned'
-             */
-            on(eventName: string, callback: EventCallback): void;
-        }
-
-        interface EventCallback {
-            (...args: any[]): void
-        }
-
-        interface ReadyEventCallback extends EventCallback {
-            (): void;
-        }
-
-        interface ErrorEventCallback extends EventCallback {
-            (error: Error): void;
-        }
-
-        interface JobPromise {
-            /**
-             * Abort this job
-             */
-            cancel(): void
-        }
-
-        interface ActiveEventCallback extends EventCallback {
-            (job: Job, jobPromise: JobPromise): void;
-        }
-
-        interface ProgressEventCallback extends EventCallback {
-            (job: Job, progress: any): void;
-        }
-
-        interface CompletedEventCallback extends EventCallback {
-            (job: Job, result: Object): void;
-        }
-
-        interface FailedEventCallback extends EventCallback {
-            (job: Job, error: Error): void;
-        }
-
-        interface PausedEventCallback extends EventCallback {
-            (): void;
-        }
-
-        interface ResumedEventCallback extends EventCallback {
-            (job?: Job): void;
-        }
+declare namespace Bull {
+    interface QueueOptions {
+        /**
+         * Options passed directly to the `ioredis` constructor
+         */
+        redis?: Redis.RedisOptions;
 
         /**
-         * @see clean() for details
+         * When specified, the `Queue` will use this function to create new `ioredis` client connections.
+         * This is useful if you want to re-use connections.
          */
-        interface CleanedEventCallback extends EventCallback {
-            (jobs: Job[], type: string): void;
-        }
+        createClient?(type: 'client' | 'subscriber', redisOpts?: Redis.RedisOptions): Redis.Redis;
+
+        /**
+         * Prefix to use for all redis keys
+         */
+        prefix?: string;
+
+        settings?: AdvancedSettings;
     }
 
-    export = Bull;
-}
+    interface AdvancedSettings {
+        /**
+         * Key expiration time for job locks
+         */
+        lockDuration?: number;
 
-declare module "bull/lib/priority-queue" {
+        /**
+         * How often check for stalled jobs (use 0 for never checking)
+         */
+        stalledInterval?: number;
 
-    import * as Bull from "bull";
-    import * as Redis from "redis";
+        /**
+         * Max amount of times a stalled job will be re-processed
+         */
+        maxStalledCount?: number;
 
-    /**
-     * This is the Queue constructor of priority queue.
-     *
-     * It works same a normal queue, with same function and parameters.
-     * The only difference is that the Queue#add() allow an options opts.priority
-     * that could take ["low", "normal", "medium", "hight", "critical"]. If no options provider, "normal" will be taken.
-     *
-     * The priority queue will process more often highter priority jobs than lower.
-     */
-    function PQueue(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): PQueue.PriorityQueue;
+        /**
+         * Poll interval for delayed jobs and added jobs
+         */
+        guardInterval?: number;
 
-    namespace PQueue {
-
-        export interface AddOptions extends Bull.AddOptions {
-
-            /**
-             * "low", "normal", "medium", "high", "critical"
-             */
-            priority?: string;
-        }
-
-
-        export interface PriorityQueue extends Bull.Queue {
-
-            /**
-             * Creates a new job and adds it to the queue.
-             * If the queue is empty the job will be executed directly,
-             * otherwise it will be placed in the queue and executed as soon as possible.
-             */
-            add(data: Object, opts?: PQueue.AddOptions): Promise<Bull.Job>;
-
-        }
+        /**
+         * Delay before processing next job in case of internal error
+         */
+        retryProcessDelay?: number;
     }
 
-    export = PQueue;
+    type DoneCallback = (error?: Error | null, value?: any) => void;
+
+    type JobId = number | string;
+
+    interface Job {
+        id: JobId;
+
+        /**
+         * The custom data passed when the job was created
+         */
+        data: any;
+
+        /**
+         * Report progress on a job
+         */
+        progress(value: any): Promise<void>;
+
+        /**
+         * Removes a job from the queue and from any lists it may be included in.
+         * @returns {Promise} A promise that resolves when the job is removed.
+         */
+        remove(): Promise<void>;
+
+        /**
+         * Re-run a job that has failed.
+         * @returns {Promise} A promise that resolves when the job is scheduled for retry.
+         */
+        retry(): Promise<void>;
+
+        /**
+         * Returns a promise the resolves when the job has been finished.
+         * TODO: Add a watchdog to check if the job has finished periodically.
+         * since pubsub does not give any guarantees.
+         */
+        finished(): Promise<void>;
+    }
+
+    type JobStatus = 'completed' | 'waiting' | 'active' | 'delayed' | 'failed';
+
+    interface BackoffOptions {
+        /**
+         * Backoff type, which can be either `fixed` or `exponential`
+         */
+        type: 'fixed' | 'exponential';
+
+        /**
+         * Backoff delay, in milliseconds
+         */
+        delay: number;
+    }
+
+    interface RepeatOptions {
+        /**
+         * Cron pattern specifying when the job should execute
+         */
+        cron: string;
+
+        /**
+         * Timezone
+         */
+        tz?: string;
+
+        /**
+         * End date when the repeat job should stop repeating
+         */
+        endDate?: Date | string | number;
+    }
+
+    interface JobOptions {
+        /**
+         * Optional priority value. ranges from 1 (highest priority) to MAX_INT  (lowest priority).
+         * Note that using priorities has a slight impact on performance, so do not use it if not required
+         */
+        priority?: number;
+
+        /**
+         * An amount of miliseconds to wait until this job can be processed.
+         * Note that for accurate delays, both server and clients should have their clocks synchronized. [optional]
+         */
+        delay?: number;
+
+        /**
+         * The total number of attempts to try the job until it completes
+         */
+        attempts?: number;
+
+        /**
+         * Repeat job according to a cron specification
+         */
+        repeat?: RepeatOptions;
+
+        /**
+         * Backoff setting for automatic retries if the job fails
+         */
+        backoff?: number | BackoffOptions;
+
+        /**
+         * A boolean which, if true, adds the job to the right
+         * of the queue instead of the left (default false)
+         */
+        lifo?: boolean;
+
+        /**
+         *  The number of milliseconds after which the job should be fail with a timeout error
+         */
+        timeout?: number;
+
+        /**
+         * Override the job ID - by default, the job ID is a unique
+         * integer, but you can use this setting to override it.
+         * If you use this option, it is up to you to ensure the
+         * jobId is unique. If you attempt to add a job with an id that
+         * already exists, it will not be added.
+         */
+        jobId?: JobId;
+
+        /**
+         * A boolean which, if true, removes the job when it successfully completes.
+         * Default behavior is to keep the job in the completed set.
+         */
+        removeOnComplete?: boolean;
+
+        /**
+         * A boolean which, if true, removes the job when it fails after all attempts
+         * Default behavior is to keep the job in the completed set.
+         */
+        removeOnFail?: boolean;
+    }
+
+    interface JobCounts {
+        wait: number;
+        active: number;
+        completed: number;
+        failed: number;
+        delayed: number;
+    }
+
+    interface Queue {
+        /**
+         * Returns a promise that resolves when Redis is connected and the queue is ready to accept jobs.
+         * This replaces the `ready` event emitted on Queue in previous verisons.
+         */
+        isReady(): Promise<this>;
+
+        /**
+         * Defines a processing function for the jobs placed into a given Queue.
+         *
+         * The callback is called everytime a job is placed in the queue.
+         * It is passed an instance of the job as first argument.
+         *
+         * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+         * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+         * Errors will be passed as a second argument to the "failed" event;
+         * results, as a second argument to the "completed" event.
+         *
+         * concurrency: Bull will then call you handler in parallel respecting this max number.
+         */
+        process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+
+        /**
+         * Defines a processing function for the jobs placed into a given Queue.
+         *
+         * The callback is called everytime a job is placed in the queue.
+         * It is passed an instance of the job as first argument.
+         *
+         * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+         * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+         * Errors will be passed as a second argument to the "failed" event;
+         * results, as a second argument to the "completed" event.
+         */
+        process(callback: (job: Job, done: DoneCallback) => void): void;
+
+        /**
+         * Defines a processing function for the jobs placed into a given Queue.
+         *
+         * The callback is called everytime a job is placed in the queue.
+         * It is passed an instance of the job as first argument.
+         *
+         * A promise must be returned to signal job completion.
+         * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+         * If it is resolved, its value will be the "completed" event's second argument.
+         *
+         * concurrency: Bull will then call you handler in parallel respecting this max number.
+         */
+        process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+
+        /**
+         * Defines a processing function for the jobs placed into a given Queue.
+         *
+         * The callback is called everytime a job is placed in the queue.
+         * It is passed an instance of the job as first argument.
+         *
+         * A promise must be returned to signal job completion.
+         * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+         * If it is resolved, its value will be the "completed" event's second argument.
+         */
+        process(callback: (job: Job) => void): Promise<any>;
+
+        /**
+         * Creates a new job and adds it to the queue.
+         * If the queue is empty the job will be executed directly,
+         * otherwise it will be placed in the queue and executed as soon as possible.
+         */
+        add(data: any, opts?: JobOptions): Promise<Job>;
+
+        /**
+         * Returns a promise that resolves when the queue is paused.
+         * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
+         * A paused queue will not process new jobs until resumed,
+         * but current jobs being processed will continue until they are finalized.
+         *
+         * Pausing a queue that is already paused does nothing.
+         */
+        pause(): Promise<void>;
+
+        /**
+         * Returns a promise that resolves when the queue is resumed after being paused.
+         * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
+         *
+         * Resuming a queue that is not paused does nothing.
+         */
+        resume(): Promise<void>;
+
+        /**
+         * Returns a promise that returns the number of jobs in the queue, waiting or paused.
+         * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
+         */
+        count(): Promise<number>;
+
+        /**
+         * Empties a queue deleting all the input lists and associated jobs.
+         */
+        empty(): Promise<void>;
+
+        /**
+         * Closes the underlying redis client. Use this to perform a graceful shutdown.
+         *
+         * `close` can be called from anywhere, with one caveat:
+         * if called from within a job handler the queue won't close until after the job has been processed
+         */
+        close(): Promise<void>;
+
+        /**
+         * Returns a promise that will return the job instance associated with the jobId parameter.
+         * If the specified job cannot be located, the promise callback parameter will be set to null.
+         */
+        getJob(jobId: JobId): Promise<Job>;
+
+        /**
+         * Returns a promise that resolves with the job counts for the given queue
+         */
+        getJobCounts(): Promise<JobCounts>;
+
+        /**
+         * Tells the queue remove all jobs created outside of a grace period in milliseconds.
+         * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
+         */
+        clean(grace: number, status?: JobStatus, limit?: number): Promise<Job[]>;
+
+        // tslint:disable:unified-signatures
+
+        /**
+         * Listens to queue events
+         */
+        on(event: string, callback: (...args: any[]) => void): this;
+
+        /**
+         * An error occured
+         */
+        on(event: 'error', callback: ErrorEventCallback): this;
+
+        /**
+         * A job has started. You can use `jobPromise.cancel()` to abort it
+         */
+        on(event: 'active', callback: ActiveEventCallback): this;
+
+        /**
+         * A job has been marked as stalled.
+         * This is useful for debugging job workers that crash or pause the event loop.
+         */
+        on(event: 'stalled', callback: StalledEventCallback): this;
+
+        /**
+         * A job's progress was updated
+         */
+        on(event: 'progress', callback: ProgressEventCallback): this;
+
+        /**
+         * A job successfully completed with a `result`
+         */
+        on(event: 'completed', callback: CompletedEventCallback): this;
+
+        /**
+         * A job failed with `err` as the reason
+         */
+        on(event: 'failed', callback: FailedEventCallback): this;
+
+        /**
+         * The queue has been paused
+         */
+        on(event: 'paused', callback: EventCallback): this;
+
+        /**
+         * The queue has been resumed
+         */
+        on(event: 'resumed', callback: EventCallback): this;
+
+        /**
+         * Old jobs have been cleaned from the queue.
+         * `jobs` is an array of jobs that were removed, and `type` is the type of those jobs.
+         *
+         * @see Queue#clean() for details
+         */
+        on(event: 'cleaned', callback: CleanedEventCallback): this;
+
+        // tslint:enable:unified-signatures
+    }
+
+    type EventCallback = () => void;
+
+    type ErrorEventCallback = (error: Error) => void;
+
+    interface JobPromise {
+        /**
+         * Abort this job
+         */
+        cancel(): void;
+    }
+
+    type ActiveEventCallback = (job: Job, jobPromise?: JobPromise) => void;
+
+    type StalledEventCallback = (job: Job) => void;
+
+    type ProgressEventCallback = (job: Job, progress: any) => void;
+
+    type CompletedEventCallback = (job: Job, result: any) => void;
+
+    type FailedEventCallback = (job: Job, error: Error) => void;
+
+    type CleanedEventCallback = (jobs: Job[], status: JobStatus) => void;
 }
+
+export = Bull;
diff --git a/types/bull/tsconfig.json b/types/bull/tsconfig.json
index 56a53750f3..0751a977c1 100644
--- a/types/bull/tsconfig.json
+++ b/types/bull/tsconfig.json
@@ -1,16 +1,12 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": [ "es6" ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": [ "../" ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/bull/tslint.json b/types/bull/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/bull/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/bull/v2/bull-tests.tsx b/types/bull/v2/bull-tests.tsx
new file mode 100644
index 0000000000..fcf339b3c3
--- /dev/null
+++ b/types/bull/v2/bull-tests.tsx
@@ -0,0 +1,115 @@
+/**
+ * Created by Bruno Grieder
+ */
+
+import * as Queue from "bull"
+
+var videoQueue = Queue( 'video transcoding', 6379, '127.0.0.1' );
+var audioQueue = Queue( 'audio transcoding', 6379, '127.0.0.1' );
+var imageQueue = Queue( 'image transcoding', 6379, '127.0.0.1' );
+
+videoQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+
+    // job.data contains the custom data passed when the job was created
+    // job.jobId contains id of this job.
+
+    // transcode video asynchronously and report progress
+    job.progress( 42 );
+
+    // call done when finished
+    done();
+
+    // or give a error if error
+    done( Error( 'error transcoding' ) );
+
+    // or pass it a result
+    done( null, { framerate: 29.5 /* etc... */ } );
+
+    // If the job throws an unhandled exception it is also handled correctly
+    throw (Error( 'some unexpected error' ));
+} );
+
+audioQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+    // transcode audio asynchronously and report progress
+    job.progress( 42 );
+
+    // call done when finished
+    done();
+
+    // or give a error if error
+    done( Error( 'error transcoding' ) );
+
+    // or pass it a result
+    done( null, { samplerate: 48000 /* etc... */ } );
+
+    // If the job throws an unhandled exception it is also handled correctly
+    throw (Error( 'some unexpected error' ));
+} );
+
+imageQueue.process( ( job: Queue.Job, done: Queue.DoneCallback ) => {
+    // transcode image asynchronously and report progress
+    job.progress( 42 );
+
+    // call done when finished
+    done();
+
+    // or give a error if error
+    done( Error( 'error transcoding' ) );
+
+    // or pass it a result
+    done( null, { width: 1280, height: 720 /* etc... */ } );
+
+    // If the job throws an unhandled exception it is also handled correctly
+    throw (Error( 'some unexpected error' ));
+} );
+
+videoQueue.add( { video: 'http://example.com/video1.mov' } );
+audioQueue.add( { audio: 'http://example.com/audio1.mp3' } );
+imageQueue.add( { image: 'http://example.com/image1.tiff' } );
+
+
+//////////////////////////////////////////////////////////////////////////////////
+//
+// Using Promises
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+const fetchVideo = ( url: string ): Promise<any> => { return null }
+const transcodeVideo = ( data: any ): Promise<void> => { return null }
+
+interface VideoJob extends Queue.Job {
+    data: {url: string}
+}
+
+
+videoQueue.process( ( job: VideoJob ) => { // don't forget to remove the done callback!
+    // Simply return a promise
+    fetchVideo( job.data.url ).then( transcodeVideo );
+
+    // Handles promise rejection
+    Promise.reject( new Error( 'error transcoding' ) );
+
+    // Passes the value the promise is resolved with to the "completed" event
+    Promise.resolve( { framerate: 29.5 /* etc... */ } );
+
+    // same as
+    Promise.reject( new Error( 'some unexpected error' ) );
+
+    // If the job throws an unhandled exception it is also handled correctly
+    throw new Error( 'some unexpected error' );
+} );
+
+
+var addVideo1Job = videoQueue.add( { video: 'http://example.com/video1.mov' } );
+
+addVideo1Job.then((video1Job) => {
+    // When job has successfully be placed in the queue the job is returned
+    // then wait for completion
+    return video1Job.finished();
+})
+.then(() => {
+    // video1Job completed successfully
+})
+.catch((err) => {
+    // error
+});
diff --git a/types/bull/v2/index.d.ts b/types/bull/v2/index.d.ts
new file mode 100644
index 0000000000..3c89655101
--- /dev/null
+++ b/types/bull/v2/index.d.ts
@@ -0,0 +1,316 @@
+// Type definitions for bull 2.1.2
+// Project: https://github.com/OptimalBits/bull
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Cameron Crothers <https://github.com/JProgrammer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="redis" />
+
+declare module "bull" {
+
+    import * as Redis from "redis";
+
+    /**
+    * This is the Queue constructor.
+    * It creates a new Queue that is persisted in Redis.
+    * Everytime the same queue is instantiated it tries to process all the old jobs that may exist from a previous unfinished session.
+    */
+    function Bull(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): Bull.Queue;
+
+    namespace Bull {
+
+        export interface DoneCallback {
+            (error?: Error, value?: any): void
+        }
+
+        export interface Job {
+
+            jobId: string
+
+            /**
+            * The custom data passed when the job was created
+            */
+            data: Object;
+
+            /**
+             * Report progress on a job
+             */
+            progress(value: any): Promise<void>;
+
+            /**
+             * Removes a Job from the queue from all the lists where it may be included.
+             * @returns {Promise} A promise that resolves when the job is removed.
+             */
+            remove(): Promise<void>;
+
+            /**
+             * Rerun a Job that has failed.
+             * @returns {Promise} A promise that resolves when the job is scheduled for retry.
+             */
+            retry(): Promise<void>;
+
+            /**
+             * Returns a promise the resolves when the job has been finished.
+             * TODO: Add a watchdog to check if the job has finished periodically.
+             * since pubsub does not give any guarantees.
+             */
+            finished(): Promise<void>;
+        }
+
+        export interface Backoff {
+
+            /**
+             * Backoff type, which can be either `fixed` or `exponential`
+             */
+            type: string
+
+            /**
+             * Backoff delay, in milliseconds
+             */
+            delay: number;
+        }
+
+        export interface AddOptions {
+            /**
+             * An amount of miliseconds to wait until this job can be processed.
+             * Note that for accurate delays, both server and clients should have their clocks synchronized
+             */
+            delay?: number;
+
+            /**
+             * A number of attempts to retry if the job fails [optional]
+             */
+            attempts?: number;
+
+            /**
+             * Backoff setting for automatic retries if the job fails
+             */
+            backoff?: number | Backoff
+
+            /**
+             * A boolean which, if true, adds the job to the right
+             * of the queue instead of the left (default false)
+             */
+            lifo?: boolean;
+
+            /**
+             *  The number of milliseconds after which the job should be fail with a timeout error
+             */
+            timeout?: number;
+        }
+
+        export interface Queue {
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+             * Errors will be passed as a second argument to the "failed" event;
+             * results, as a second argument to the "completed" event.
+             *
+             * concurrency: Bull will then call you handler in parallel respecting this max number.
+            */
+            process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+             * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
+             * Errors will be passed as a second argument to the "failed" event;
+             * results, as a second argument to the "completed" event.
+            */
+            process(callback: (job: Job, done: DoneCallback) => void): void;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * A promise must be returned to signal job completion.
+             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+             * If it is resolved, its value will be the "completed" event's second argument.
+             *
+             * concurrency: Bull will then call you handler in parallel respecting this max number.
+            */
+            process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+
+            /**
+             * Defines a processing function for the jobs placed into a given Queue.
+             *
+             * The callback is called everytime a job is placed in the queue.
+             * It is passed an instance of the job as first argument.
+             *
+             * A promise must be returned to signal job completion.
+             * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+             * If it is resolved, its value will be the "completed" event's second argument.
+            */
+            process(callback: (job: Job) => void): Promise<any>;
+
+            // process(callback: (job: Job, done?: DoneCallback) => void): Promise<any>;
+
+            /**
+             * Creates a new job and adds it to the queue.
+             * If the queue is empty the job will be executed directly,
+             * otherwise it will be placed in the queue and executed as soon as possible.
+             */
+            add(data: Object, opts?: AddOptions): Promise<Job>;
+
+            /**
+             * Returns a promise that resolves when the queue is paused.
+             * The pause is global, meaning that all workers in all queue instances for a given queue will be paused.
+             * A paused queue will not process new jobs until resumed,
+             * but current jobs being processed will continue until they are finalized.
+             *
+             * Pausing a queue that is already paused does nothing.
+             */
+            pause(): Promise<void>;
+
+            /**
+             * Returns a promise that resolves when the queue is resumed after being paused.
+             * The resume is global, meaning that all workers in all queue instances for a given queue will be resumed.
+             *
+             * Resuming a queue that is not paused does nothing.
+             */
+            resume(): Promise<void>;
+
+            /**
+             * Returns a promise that returns the number of jobs in the queue, waiting or paused.
+             * Since there may be other processes adding or processing jobs, this value may be true only for a very small amount of time.
+             */
+            count(): Promise<number>;
+
+            /**
+             * Empties a queue deleting all the input lists and associated jobs.
+             */
+            empty(): Promise<void>;
+
+            /**
+             * Closes the underlying redis client. Use this to perform a graceful shutdown.
+             *
+             * `close` can be called from anywhere, with one caveat:
+             * if called from within a job handler the queue won't close until after the job has been processed
+             */
+            close(): Promise<void>;
+
+            /**
+             * Returns a promise that will return the job instance associated with the jobId parameter.
+             * If the specified job cannot be located, the promise callback parameter will be set to null.
+             */
+            getJob(jobId: string): Promise<Job>;
+
+            /**
+             * Tells the queue remove all jobs created outside of a grace period in milliseconds.
+             * You can clean the jobs with the following states: completed, waiting, active, delayed, and failed.
+             */
+            clean(gracePeriod: number, jobsState?: string): Promise<Job[]>;
+
+            /**
+             * Listens to queue events
+             * 'ready', 'error', 'activ', 'progress', 'completed', 'failed', 'paused', 'resumed', 'cleaned'
+             */
+            on(eventName: string, callback: EventCallback): void;
+        }
+
+        interface EventCallback {
+            (...args: any[]): void
+        }
+
+        interface ReadyEventCallback extends EventCallback {
+            (): void;
+        }
+
+        interface ErrorEventCallback extends EventCallback {
+            (error: Error): void;
+        }
+
+        interface JobPromise {
+            /**
+             * Abort this job
+             */
+            cancel(): void
+        }
+
+        interface ActiveEventCallback extends EventCallback {
+            (job: Job, jobPromise: JobPromise): void;
+        }
+
+        interface ProgressEventCallback extends EventCallback {
+            (job: Job, progress: any): void;
+        }
+
+        interface CompletedEventCallback extends EventCallback {
+            (job: Job, result: Object): void;
+        }
+
+        interface FailedEventCallback extends EventCallback {
+            (job: Job, error: Error): void;
+        }
+
+        interface PausedEventCallback extends EventCallback {
+            (): void;
+        }
+
+        interface ResumedEventCallback extends EventCallback {
+            (job?: Job): void;
+        }
+
+        /**
+         * @see clean() for details
+         */
+        interface CleanedEventCallback extends EventCallback {
+            (jobs: Job[], type: string): void;
+        }
+    }
+
+    export = Bull;
+}
+
+declare module "bull/lib/priority-queue" {
+
+    import * as Bull from "bull";
+    import * as Redis from "redis";
+
+    /**
+     * This is the Queue constructor of priority queue.
+     *
+     * It works same a normal queue, with same function and parameters.
+     * The only difference is that the Queue#add() allow an options opts.priority
+     * that could take ["low", "normal", "medium", "hight", "critical"]. If no options provider, "normal" will be taken.
+     *
+     * The priority queue will process more often highter priority jobs than lower.
+     */
+    function PQueue(queueName: string, redisPort: number, redisHost: string, redisOpt?: Redis.ClientOpts): PQueue.PriorityQueue;
+
+    namespace PQueue {
+
+        export interface AddOptions extends Bull.AddOptions {
+
+            /**
+             * "low", "normal", "medium", "high", "critical"
+             */
+            priority?: string;
+        }
+
+
+        export interface PriorityQueue extends Bull.Queue {
+
+            /**
+             * Creates a new job and adds it to the queue.
+             * If the queue is empty the job will be executed directly,
+             * otherwise it will be placed in the queue and executed as soon as possible.
+             */
+            add(data: Object, opts?: PQueue.AddOptions): Promise<Bull.Job>;
+
+        }
+    }
+
+    export = PQueue;
+}
diff --git a/types/bull/v2/tsconfig.json b/types/bull/v2/tsconfig.json
new file mode 100644
index 0000000000..12445fc199
--- /dev/null
+++ b/types/bull/v2/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [ "es6" ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [ "../../" ],
+        "types": [],
+        "paths": {
+            "bull": [ "bull/v2" ],
+            "bull/*": [ "bull/v2/*" ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bull-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/bunnymq/bunnymq-tests.ts b/types/bunnymq/bunnymq-tests.ts
index 4105363f25..960c0b6949 100644
--- a/types/bunnymq/bunnymq-tests.ts
+++ b/types/bunnymq/bunnymq-tests.ts
@@ -1,34 +1,27 @@
 import * as bunnymq from "bunnymq";
 
 // Basic usage
-var instance = bunnymq({ host: 'amqp://localhost' });
+const instance = bunnymq({ host: "amqp://localhost" });
 
 // Publisher
-instance.producer.produce('queue:name', 'Hello World!');
+instance.publish("queue:name", "message");
+instance.producer.produce("queue:name", "message");
+
 // Subscriber
-instance.consumer.consume('queue:name', message => { });
+instance.subscribe("queue:name", (message: string) => "response");
+instance.consumer.consume("queue:name", (message: string) => "response");
 
 // RPC Support
-instance.producer.produce('queue:name', { message: 'content' }, { rpc: true })
-    .then(function (consumerResponse) {
-        console.log(consumerResponse);
-    });
-
-// Routing keys
-instance.producer.produce('queue:name', { message: 'content' }, { routingKey: 'my-routing-key' });
+instance.publish("queue:name", { message: "content" }, { routingKey: "my-routing-key", rpc: true, timeout: 1000 }).then((consumerResponse: string) => "response");
+instance.producer.produce("queue:name", { message: "content" }, { rpc: true, routingKey: "my-routing-key", timeout: 1000 });
 
 // Config
-var custom = bunnymq({
-    host: 'amqp://localhost',
-    //number of fetched messages at once on the channel
+const instanceWithCustomOptions = bunnymq({
+    host: "amqp://localhost",
     prefetch: 5,
-    //requeue put back message into the broker if consumer crashes/trigger exception
     requeue: true,
-    //time between two reconnect (ms)
     timeout: 1000,
-    consumerSuffix: '',
-    //generate a hostname so we can track this connection on the broker (rabbitmq management plugin)
+    consumerSuffix: "",
     hostname: "",
-    //the transport to use to debug. if provided, bunnymq will show some logs
     transport: new Object()
-});
\ No newline at end of file
+});
diff --git a/types/bunnymq/index.d.ts b/types/bunnymq/index.d.ts
index 1167db21ed..c4c0a770e1 100644
--- a/types/bunnymq/index.d.ts
+++ b/types/bunnymq/index.d.ts
@@ -1,120 +1,98 @@
-// Type definitions for node-bunnymq 2.2.1
+// Type definitions for node-bunnymq 2.3
 // Project: https://github.com/dial-once/node-bunnymq
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "bunnymq" {
-    namespace bunnymq {
-        export type ConsumerCallback = (message: Object) => void;
+declare function bunnymq(options?: bunnymq.Options): bunnymq.Instance;
+declare namespace bunnymq {
+    type ConsumerCallback<T> = (...args: any[]) => T;
+    type LoggerOutput = (format: any, ...args: any[]) => void;
 
-        /**
-         * Consumer.
-         * @interface
-         */
-        export interface Consumer {
-            /**
-             * Handle messages from a named queue.
-             * @param {string}           queue      A named queue.
-             * @param {ConsumerCallback} callback   A callback.
-             */
-            consume(queue: string, callback: ConsumerCallback): void;
-        }
-
-        /**
-         * bunnymq instance.
-         * @interface
-         */
-        export interface Instance {
-            /**
-             * Consumer.
-             * @type {Consumer}
-             */
-            consumer: Consumer;
-
-            /**
-             * Producer.
-             * @type {Producer}
-             */
-            producer: Producer;
-        }
-
-        /**
-         * Options.
-         * @interface
-         */
-        export interface Options {
-            /**
-             * Consumer suffix.
-             * @type {string}
-             */
-            consumerSuffix?: string;
-
-            /**
-             * Host.
-             * @type {string}
-             */
-            host?: string;
-
-            /**
-             * Hostname.
-             * @type {string}
-             */
-            hostname?: string;
-
-            /**
-             * Number of fetched messages at once on the channel.
-             * @type {number}
-             */
-            prefetch?: number;
-
-            /**
-             * Requeue put back message into the broker if consumer crashes/trigger exception.
-             * @type {boolean}
-             */
-            requeue?: boolean;
-
-            /**
-             * Time between two reconnect (in milliseconds).
-             * @type {number}
-             */
-            timeout?: number;
-
-            /**
-             * Transport.
-             * @type {any}
-             */
-            transport?: any;
-        }
-
-        /**
-         * Producer.
-         * @inteface
-         */
-        export interface Producer {
-            /**
-             * Send messages to a named queue.
-             * @param {string}  queue   A named queue.
-             * @param {Object}  message A message.
-             * @return {Object} The consumer response.
-             */
-            produce(queue: string, message: Object, options?: ProducerOptions): PromiseLike<Object>;
-        }
-
-        /**
-         * Options for producer.
-         * @interface
-         */
-        export interface ProducerOptions {
-            routingKey?: string;
-            rpc?: boolean;
-        }
+    interface Connection {
+        [address: string]: any;
+        startedAt: string;
     }
 
-    /**
-     * Constructor.
-     * @param {Options} [options] Options.
-     * @return {Instance} A instance of bunnymq.
-     */
-    function bunnymq(options?: bunnymq.Options): bunnymq.Instance;
-    export = bunnymq;
+    interface Consumer {
+        /**
+         * Handle messages from a named queue.
+         *
+         * @param {string}           queue      A named queue.
+         * @param {ConsumerCallback} callback   A callback.
+         */
+        consume<T>(queue: string, callback: ConsumerCallback<T>): void;
+    }
+
+    interface Instance {
+        connection: Connection;
+        consumer: Consumer;
+        producer: Producer;
+
+        /**
+         * Subscriber to handle messages from a named queue.
+         *
+         * @param {string}           queue      A named queue.
+         * @param {ConsumerCallback} callback   A callback.
+         */
+        subscribe<T>(queueName: string, callback: ConsumerCallback<T>): void;
+
+        /**
+         * Publisher to send messages to a named queue.
+         *
+         * @type {Producer}
+         * @return {Promise} The consumer response.
+         */
+        publish<T>(queueName: string, message: any, options?: ProducerOptions): Promise<T>;
+    }
+
+    interface Logger {
+        debug: LoggerOutput;
+        error: LoggerOutput;
+        info: LoggerOutput;
+        log: LoggerOutput;
+        warn: LoggerOutput;
+    }
+
+    interface Options {
+        consumerSuffix?: string;
+        host?: string;
+        hostname?: string;
+
+        /**
+         * Number of fetched messages at once on the channel.
+         *
+         * @type {number}
+         */
+        prefetch?: number;
+
+        /**
+         * Requeue put back message into the broker if consumer crashes/trigger exception.
+         *
+         * @type {boolean}
+         */
+        requeue?: boolean;
+        rpcTimeout?: number;
+        timeout?: number;
+        transport?: any;
+    }
+
+    interface Producer {
+        /**
+         * Send messages to a named queue.
+         *
+         * @param {string}  queue   A named queue.
+         * @param {any}     message A message.
+         * @return {Promise} The consumer response.
+         */
+        produce<T>(queue: string, message: any, options?: ProducerOptions): Promise<T>;
+    }
+
+    interface ProducerOptions {
+        routingKey?: string;
+        rpc?: boolean;
+        timeout?: number;
+    }
 }
+
+export = bunnymq;
+export as namespace bunnymq;
diff --git a/types/bunnymq/tslint.json b/types/bunnymq/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/bunnymq/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/bunyan-config/index.d.ts b/types/bunyan-config/index.d.ts
index 49b642eaa1..0ff84fd9d2 100644
--- a/types/bunyan-config/index.d.ts
+++ b/types/bunyan-config/index.d.ts
@@ -7,6 +7,23 @@
 
 declare module "bunyan-config" {
     import * as bunyan from "bunyan";
+    interface StreamConfiguration {
+        name: string,
+        params?: {
+            host: string,
+            port: number
+        }
+    }
+
+    interface Stream {
+        type?: string;
+        level?: bunyan.LogLevel;
+        path?: string;
+        stream?: string | StreamConfiguration
+        closeOnExit?: boolean;
+        period?: string;
+        count?: number;
+    }
 
     /**
      * Configuration.
@@ -14,7 +31,7 @@ declare module "bunyan-config" {
      */
     interface Configuration {
         name: string;
-        streams?: bunyan.Stream[];
+        streams?: Stream[];
         level?: string | number;
         stream?: NodeJS.WritableStream;
         serializers?: {};
diff --git a/types/bunyan/bunyan-tests.ts b/types/bunyan/bunyan-tests.ts
index acf382c7c2..657a59c3a8 100644
--- a/types/bunyan/bunyan-tests.ts
+++ b/types/bunyan/bunyan-tests.ts
@@ -1,16 +1,15 @@
-
 import Logger = require('bunyan');
 
-var ringBufferOptions: Logger.RingBufferOptions = {
+let ringBufferOptions: Logger.RingBufferOptions = {
     limit: 100
 };
-var ringBuffer: Logger.RingBuffer = new Logger.RingBuffer(ringBufferOptions);
+let ringBuffer: Logger.RingBuffer = new Logger.RingBuffer(ringBufferOptions);
 ringBuffer.write("hello");
 ringBuffer.end();
 ringBuffer.destroy();
 ringBuffer.destroySoon();
 
-var level: number;
+let level: number;
 level = Logger.resolveLevel("trace");
 level = Logger.resolveLevel("debug");
 level = Logger.resolveLevel("info");
@@ -24,7 +23,7 @@ level = Logger.resolveLevel(Logger.WARN);
 level = Logger.resolveLevel(Logger.ERROR);
 level = Logger.resolveLevel(Logger.FATAL);
 
-var options: Logger.LoggerOptions = {
+let options: Logger.LoggerOptions = {
     name: 'test-logger',
     serializers: Logger.stdSerializers,
     streams: [{
@@ -54,13 +53,13 @@ var options: Logger.LoggerOptions = {
     }]
 };
 
-var log = Logger.createLogger(options);
+let log = Logger.createLogger(options);
 
-var customSerializer = function(anything: any) {
-    return { obj: anything};
+let customSerializer = (anything: any) => {
+    return { obj: anything };
 };
 
-log.addSerializers({anything: customSerializer});
+log.addSerializers({ anything: customSerializer });
 log.addSerializers(Logger.stdSerializers);
 log.addSerializers(
     {
@@ -70,9 +69,9 @@ log.addSerializers(
     }
 );
 
-var child = log.child({name: 'child'});
+let child = log.child({ name: 'child' });
 child.reopenFileStreams();
-log.addStream({path: '/dev/null'});
+log.addStream({ path: '/dev/null' });
 child.level(Logger.DEBUG);
 child.level('debug');
 child.levels(0, Logger.ERROR);
@@ -80,9 +79,9 @@ child.levels(0, 'error');
 child.levels('stream1', Logger.FATAL);
 child.levels('stream1', 'fatal');
 
-var buffer = new Buffer(0);
-var error = new Error('');
-var object = {
+let buffer = new Buffer(0);
+let error = new Error('');
+let object = {
     test: 123
 };
 
@@ -117,12 +116,11 @@ log.fatal(error);
 log.fatal(object);
 log.fatal('Hello, %s', 'world!');
 
-var recursive: any = {
+let recursive: any = {
     hello: 'world',
-    whats: {
-        huh: recursive
-    }
-}
+    whats: {}
+};
+recursive.whats['huh'] = recursive;
 
 JSON.stringify(recursive, Logger.safeCycles());
 
diff --git a/types/bunyan/index.d.ts b/types/bunyan/index.d.ts
index 060fa8eaa3..bc1dca298d 100644
--- a/types/bunyan/index.d.ts
+++ b/types/bunyan/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-bunyan
+// Type definitions for bunyan 1.8
 // Project: https://github.com/trentm/node-bunyan
 // Definitions by: Alex Mikhalev <https://github.com/amikhalev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,21 +10,24 @@ import { EventEmitter } from 'events';
 declare class Logger extends EventEmitter {
     constructor(options: Logger.LoggerOptions);
     addStream(stream: Logger.Stream): void;
-    addSerializers(serializers: Logger.Serializers | Logger.StdSerializers): void;
-    child(options: Logger.LoggerOptions, simple?: boolean): Logger;
-    child(obj: Object, simple?: boolean): Logger;
+    addSerializers(serializers: Logger.Serializers): void;
+    child(options: Object, simple?: boolean): Logger;
     reopenFileStreams(): void;
 
-    level(): string | number;
-    level(value: number | string): void;
-    levels(name: number | string, value: number | string): void;
+    level(): number;
+    level(value: Logger.LogLevel): void;
+    levels(): number[];
+    levels(name: number | string): number;
+    levels(name: number | string, value: Logger.LogLevel): void;
 
     fields: any;
     src: boolean;
 
+    /* tslint:disable:unified-signatures */
+
     /**
      * Returns a boolean: is the `trace` level enabled?
-     * 
+     *
      * This is equivalent to `log.isTraceEnabled()` or `log.isEnabledFor(TRACE)` in log4j.
      */
     trace(): boolean;
@@ -35,27 +38,25 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    trace(error: Error, format?: any, ...params: any[]): void;
-
-    trace(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    trace(format: string | number, ...params: any[]): void;
+    trace(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    trace(obj: Object, format?: any, ...params: any[]): void;
+    trace(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    trace(format: any, ...params: any[]): void;
 
     /**
      * Returns a boolean: is the `debug` level enabled?
-     * 
+     *
      * This is equivalent to `log.isDebugEnabled()` or `log.isEnabledFor(DEBUG)` in log4j.
      */
     debug(): boolean;
@@ -66,27 +67,25 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    debug(error: Error, format?: any, ...params: any[]): void;
-
-    debug(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    debug(format: string | number, ...params: any[]): void;
+    debug(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    debug(obj: Object, format?: any, ...params: any[]): void;
+    debug(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    debug(format: any, ...params: any[]): void;
 
     /**
      * Returns a boolean: is the `info` level enabled?
-     * 
+     *
      * This is equivalent to `log.isInfoEnabled()` or `log.isEnabledFor(INFO)` in log4j.
      */
     info(): boolean;
@@ -97,27 +96,25 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    info(error: Error, format?: any, ...params: any[]): void;
-
-    info(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    info(format: string | number, ...params: any[]): void;
+    info(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    info(obj: Object, format?: any, ...params: any[]): void;
+    info(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    info(format: any, ...params: any[]): void;
 
     /**
      * Returns a boolean: is the `warn` level enabled?
-     * 
+     *
      * This is equivalent to `log.isWarnEnabled()` or `log.isEnabledFor(WARN)` in log4j.
      */
     warn(): boolean;
@@ -128,27 +125,25 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    warn(error: Error, format?: any, ...params: any[]): void;
-
-    warn(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    warn(format: string | number, ...params: any[]): void;
+    warn(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    warn(obj: Object, format?: any, ...params: any[]): void;
+    warn(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    warn(format: any, ...params: any[]): void;
 
     /**
      * Returns a boolean: is the `error` level enabled?
-     * 
+     *
      * This is equivalent to `log.isErrorEnabled()` or `log.isEnabledFor(ERROR)` in log4j.
      */
     error(): boolean;
@@ -159,27 +154,25 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    error(error: Error, format?: any, ...params: any[]): void;
-
-    error(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    error(format: string | number, ...params: any[]): void;
+    error(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    error(obj: Object, format?: any, ...params: any[]): void;
+    error(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    error(format: any, ...params: any[]): void;
 
     /**
      * Returns a boolean: is the `fatal` level enabled?
-     * 
+     *
      * This is equivalent to `log.isFatalEnabled()` or `log.isEnabledFor(FATAL)` in log4j.
      */
     fatal(): boolean;
@@ -190,90 +183,90 @@ declare class Logger extends EventEmitter {
      * (including the stack) and sets `msg` to the exception
      * message or you can specify the `msg`.
      */
-    fatal(error: Error, format?: any, ...params: any[]): void;
-
-    fatal(buffer: Buffer, format?: any, ...params: any[]): void;
-
-    /**
-     * Uses `util.format` for msg formatting.
-     */
-    fatal(format: string | number, ...params: any[]): void;
+    fatal(error: Error, ...params: any[]): void;
 
     /**
      * The first field can optionally be a "fields" object, which
      * is merged into the log record.
-     * 
+     *
      * To pass in an Error *and* other fields, use the `err`
      * field name for the Error instance.
      */
-    fatal(obj: Object, format?: any, ...params: any[]): void;
+    fatal(obj: Object, ...params: any[]): void;
+
+    /**
+     * Uses `util.format` for msg formatting.
+     */
+    fatal(format: any, ...params: any[]): void;
+
+    /* tslint:enable:unified-signatures */
 }
 
 declare namespace Logger {
-  const TRACE: number;
-  const DEBUG: number;
-  const INFO: number;
-  const WARN: number;
-  const ERROR: number;
-  const FATAL: number;
+    const TRACE: number;
+    const DEBUG: number;
+    const INFO: number;
+    const WARN: number;
+    const ERROR: number;
+    const FATAL: number;
 
-  const stdSerializers: StdSerializers;
+    type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal' | number;
 
-  function createLogger(options: LoggerOptions): Logger;
+    const stdSerializers: StdSerializers;
 
-  function safeCycles(): (key: string, value: any) => any;
+    function createLogger(options: LoggerOptions): Logger;
 
-  function resolveLevel(value: number | string): number;
+    function safeCycles(): (key: string, value: any) => any;
 
-  interface Stream {
-    type?: string;
-    level?: number | string;
-    path?: string;
-    stream?: NodeJS.WritableStream | Stream;
-    closeOnExit?: boolean;
-    period?: string;
-    count?: number;
-  }
+    function resolveLevel(value: LogLevel): number;
 
-  interface LoggerOptions {
-    name: string;
-    streams?: Stream[];
-    level?: string | number;
-    stream?: NodeJS.WritableStream;
-    serializers?: Serializers | StdSerializers;
-    src?: boolean;
-    [custom: string]: any;
-  }
+    interface Stream {
+        type?: string;
+        level?: LogLevel;
+        path?: string;
+        stream?: NodeJS.WritableStream | Stream;
+        closeOnExit?: boolean;
+        period?: string;
+        count?: number;
+    }
 
-  interface Serializer {
-    (input:any): any;
-  }
+    interface LoggerOptions {
+        name: string;
+        streams?: Stream[];
+        level?: LogLevel;
+        stream?: NodeJS.WritableStream;
+        serializers?: Serializers;
+        src?: boolean;
+        [custom: string]: any;
+    }
 
-  interface Serializers {
-    [key: string]: Serializer
-  }
+    type Serializer = (input: any) => any;
 
-  interface StdSerializers {
-    err: Serializer;
-    res: Serializer;
-    req: Serializer;
-  }
+    interface Serializers {
+        [key: string]: Serializer;
+    }
 
-  interface RingBufferOptions {
-    limit?: number;
-  }
+    interface StdSerializers extends Serializers {
+        err: Serializer;
+        res: Serializer;
+        req: Serializer;
+    }
 
-  class RingBuffer extends EventEmitter {
-    constructor(options: RingBufferOptions);
+    interface RingBufferOptions {
+        limit?: number;
+    }
 
-    writable: boolean;
-    records: any[];
+    class RingBuffer extends EventEmitter implements NodeJS.WritableStream {
+        constructor(options: RingBufferOptions);
 
-    write(record: any): void;
-    end(record?: any): void;
-    destroy(): void;
-    destroySoon(): void;
-  }
+        writable: boolean;
+        records: any[];
+
+        write(record: any): boolean;
+        end(record?: any): void;
+        destroy(): void;
+        destroySoon(): void;
+    }
 }
 
 export = Logger;
diff --git a/types/bunyan/tslint.json b/types/bunyan/tslint.json
new file mode 100644
index 0000000000..09f94cd344
--- /dev/null
+++ b/types/bunyan/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // ban-types needs to be disabled to support TypeScript <2.2
+    "ban-types": false
+  }
+}
diff --git a/types/bytes/bytes-tests.ts b/types/bytes/bytes-tests.ts
index 9c7f7abd5d..69bac3977d 100644
--- a/types/bytes/bytes-tests.ts
+++ b/types/bytes/bytes-tests.ts
@@ -9,8 +9,9 @@ console.log(bytes.format(104857, { thousandsSeparator: ' ' }));
 console.log(bytes.format(104857, { decimalPlaces: 2 }));
 console.log(bytes.format(104857, { fixedDecimals: true }));
 console.log(bytes.format(104857, { unitSeparator: '-' }));
+console.log(bytes.format(104857, { unit: 'GB' }));
 console.log(bytes('1024kb'));
 console.log(bytes(1024));
 
 console.log(bytes.parse('1024kb'));
-console.log(bytes.parse(1024));
\ No newline at end of file
+console.log(bytes.parse(1024));
diff --git a/types/bytes/index.d.ts b/types/bytes/index.d.ts
index fd0a65c365..ae9e8f2d87 100644
--- a/types/bytes/index.d.ts
+++ b/types/bytes/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bytes v2.4.0
+// Type definitions for bytes v2.5.0
 // Project: https://github.com/visionmedia/bytes.js
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,7 +7,8 @@ interface BytesOptions {
     decimalPlaces?: number,
     thousandsSeparator?: string,
     unitSeparator?: string,
-    fixedDecimals?: boolean
+    fixedDecimals?: boolean,
+    unit?: string
 }
 /**
  *Convert the given value in bytes into a string.
diff --git a/types/c3/c3-tests.ts b/types/c3/c3-tests.ts
index d9057eabb6..029946c710 100644
--- a/types/c3/c3-tests.ts
+++ b/types/c3/c3-tests.ts
@@ -1,11 +1,9 @@
-
-
 //////////////////
 // Doc Examples
 //////////////////
 
 function chart_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         bindto: "#myContainer",
         size: {
@@ -24,27 +22,27 @@ function chart_examples() {
         transition: {
             duration: 500
         },
-        oninit: function() { /* code*/ },
-        onrendered: function() { /* code*/ },
-        onmouseover: function() { /* code*/ },
-        onmouseout: function() { /* code*/ },
-        onresize: function() { /* code*/ },
-        onresized: function() { /* code*/ }
+        oninit: () => { /* code*/ },
+        onrendered: () => { /* code*/ },
+        onmouseover: () => { /* code*/ },
+        onmouseout: () => { /* code*/ },
+        onresize: () => { /* code*/ },
+        onresized: () => { /* code*/ }
     });
 
-    var chart2 = c3.generate({
+    let chart2 = c3.generate({
         bindto: document.getElementById("myContainer"),
         data: {}
     });
 
-    var chart3 = c3.generate({
+    let chart3 = c3.generate({
         bindto: d3.select("#myContainer"),
         data: {}
     });
 }
 
 function data_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             url: "/data/c3_test.csv",
             json: [
@@ -102,9 +100,9 @@ function data_examples() {
             labels: true,
             order: "asc",
             regions: {
-                data1: [{ "start": 1, "end": 2, "style": "dashed" }, { "start": 3 }],
+                data1: [{ start: 1, end: 2, style: "dashed" }, { start: 3 }],
             },
-            color: function(color, d) { return "#ff0000"; },
+            color: (color, d) => "#ff0000",
             colors: {
                 data1: "#ff0000"
                 /* ... */
@@ -120,24 +118,24 @@ function data_examples() {
                 grouped: true,
                 multiple: true,
                 draggable: true,
-                isselectable: function(d) { return true; }
+                isselectable: (d) => true
             },
-            onclick: function(d, element) { /* code */ },
-            onmouseover: function(d) { /* code */ },
-            onmouseout: function(d) { /* code */ }
+            onclick: (d, element) => { /* code */ },
+            onmouseover: (d) => { /* code */ },
+            onmouseout: (d) => { /* code */ }
         }
     });
 
-    var chart2 = c3.generate({
+    let chart2 = c3.generate({
         data: {
-            labels: { format: function(v, id, i, j) { /* code */ } },
+            labels: { format: (v, id, i, j) => { /* code */ } },
             hide: ["data1"]
         }
     });
 }
 
 function axis_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         axis: {
             rotated: true,
@@ -148,7 +146,7 @@ function axis_examples() {
                 categories: ["Category 1", "Category 2"],
                 tick: {
                     centered: true,
-                    format: function(x: Date) { return x.getFullYear(); },
+                    format: (x: Date) => x.getFullYear(),
                     culling: false,
                     count: 5,
                     fit: true,
@@ -209,7 +207,7 @@ function axis_examples() {
         }
     });
 
-    var chart2 = c3.generate({
+    let chart2 = c3.generate({
         data: {},
         axis: {
             x: {
@@ -229,7 +227,7 @@ function axis_examples() {
                     position: "outer-middle",
                 },
                 tick: {
-                    format: function(d) { return "$" + d; }
+                    format: (d) => "$" + d
                 }
             },
             y2: {
@@ -243,7 +241,7 @@ function axis_examples() {
 }
 
 function grid_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         grid: {
             x: {
@@ -267,7 +265,7 @@ function grid_examples() {
 }
 
 function region_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         regions: [
             { axis: "x", start: 1, end: 4, class: "region-1-4" },
@@ -276,7 +274,7 @@ function region_examples() {
 }
 
 function legend_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         legend: {
             show: true,
@@ -289,14 +287,14 @@ function legend_examples() {
                 step: undefined
             },
             item: {
-                onclick: function(id) { /* code */ },
-                onmouseover: function(id) { /* code */ },
-                onmouseout: function(id) { /* code */ },
+                onclick: (id) => { /* code */ },
+                onmouseover: (id) => { /* code */ },
+                onmouseout: (id) => { /* code */ },
             }
         }
     });
 
-    var chart2 = c3.generate({
+    let chart2 = c3.generate({
         data: {},
         legend: {
             hide: "data1",
@@ -309,7 +307,7 @@ function legend_examples() {
         }
     });
 
-    var chart3 = c3.generate({
+    let chart3 = c3.generate({
         data: {},
         legend: {
             hide: ["data1", "data2"]
@@ -318,34 +316,34 @@ function legend_examples() {
 }
 
 function subchart_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         subchart: {
             show: true,
             size: {
                 height: 20
             },
-            onbrush: function(domain) { /* code */ }
+            onbrush: (domain) => { /* code */ }
         }
     });
 }
 
 function zoom_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         zoom: {
             enabled: false,
             rescale: true,
             extent: [1, 100], // enable more zooming
-            onzoom: function(domain) { /* code */ },
-            onzoomstart: function(event) { /* code */ },
-            onzoomend: function(domain) { /* code */ }
+            onzoom: (domain) => { /* code */ },
+            onzoomstart: (event) => { /* code */ },
+            onzoomend: (domain) => { /* code */ }
         }
     });
 }
 
 function point_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         point: {
             show: false,
@@ -364,7 +362,7 @@ function point_examples() {
 }
 
 function line_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         line: {
             connectNull: true,
@@ -376,7 +374,7 @@ function line_examples() {
 }
 
 function area_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         area: {
             zerobased: false
@@ -385,7 +383,7 @@ function area_examples() {
 }
 
 function bar_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         bar: {
             width: 10,
@@ -393,7 +391,7 @@ function bar_examples() {
         }
     });
 
-    var chart2 = c3.generate({
+    let chart2 = c3.generate({
         data: {},
         bar: {
             width: {
@@ -405,12 +403,12 @@ function bar_examples() {
 }
 
 function pie_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         pie: {
             label: {
                 show: false,
-                format: function(value, ratio, id) {
+                format: (value, ratio, id) => {
                     return d3.format("$")(value);
                 },
                 threshold: 0.1
@@ -421,12 +419,12 @@ function pie_examples() {
 }
 
 function donut_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         donut: {
             label: {
                 show: false,
-                format: function(value, ratio, id) {
+                format: (value, ratio, id) => {
                     return d3.format("$")(value);
                 },
                 threshold: 0.05
@@ -439,12 +437,12 @@ function donut_examples() {
 }
 
 function gauge_examples() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {},
         gauge: {
             label: {
                 show: false,
-                format: function(value, ratio) {
+                format: (value, ratio) => {
                     return d3.format("$")(value);
                 }
             },
@@ -462,8 +460,7 @@ function gauge_examples() {
 /////////////////
 
 function simple_multiple() {
-
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -481,10 +478,10 @@ function simple_multiple() {
     chart.unload({
         ids: "data1"
     });
-};
+}
 
 function timeseries() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             xFormat: "%Y%m%d", // 'xFormat' can be used as custom format of 'x'
@@ -506,7 +503,7 @@ function timeseries() {
 }
 
 function chart_spline() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -518,7 +515,7 @@ function chart_spline() {
 }
 
 function simple_xy() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -531,11 +528,11 @@ function simple_xy() {
 }
 
 function simple_xy_multiple() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             xs: {
-                "data1": "x1",
-                "data2": "x2",
+                data1: "x1",
+                data2: "x2",
             },
             columns: [
                 ["x1", 10, 30, 45, 50, 70, 100],
@@ -548,22 +545,22 @@ function simple_xy_multiple() {
 }
 
 function simple_regions() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
                 ["data2", 50, 20, 10, 40, 15, 25]
             ],
             regions: {
-                "data1": [{ "start": 1, "end": 2, "style": "dashed" }, { "start": 3 }], // currently 'dashed' style only
-                "data2": [{ "end": 3 }]
+                data1: [{ start: 1, end: 2, style: "dashed" }, { start: 3 }], // currently 'dashed' style only
+                data2: [{ end: 3 }]
             }
         }
     });
 }
 
 function chart_step() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 300, 350, 300, 0, 0, 100],
@@ -578,7 +575,7 @@ function chart_step() {
 }
 
 function area_chart() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 300, 350, 300, 0, 0, 0],
@@ -593,7 +590,7 @@ function area_chart() {
 }
 
 function chart_area_stacked() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 300, 350, 300, 0, 0, 120],
@@ -610,7 +607,7 @@ function chart_area_stacked() {
 }
 
 function chart_bar() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -620,16 +617,17 @@ function chart_bar() {
         },
         bar: {
             width: {
-                ratio: 0.5 // this makes bar width 50% of length between ticks
+                ratio: 0.5, // this makes bar width 50% of length between ticks
+                max: 50 // this limits maximum width of bar to 50px
             }
             // or
-            //width: 100 // this makes bar width 100px
+            // width: 100 // this makes bar width 100px
         }
     });
 }
 
 function chart_bar_stacked() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", -30, 200, 200, 400, -150, 250],
@@ -650,7 +648,7 @@ function chart_bar_stacked() {
 }
 
 function chart_scatter() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             xs: {
                 setosa: "setosa_x",
@@ -658,10 +656,14 @@ function chart_scatter() {
             },
             // iris data from R
             columns: [
-                ["setosa_x", 3.5, 3.0, 3.2, 3.1, 3.6, 3.9, 3.4, 3.4, 2.9, 3.1, 3.7, 3.4, 3.0, 3.0, 4.0, 4.4, 3.9, 3.5, 3.8, 3.8, 3.4, 3.7, 3.6, 3.3, 3.4, 3.0, 3.4, 3.5, 3.4, 3.2, 3.1, 3.4, 4.1, 4.2, 3.1, 3.2, 3.5, 3.6, 3.0, 3.4, 3.5, 2.3, 3.2, 3.5, 3.8, 3.0, 3.8, 3.2, 3.7, 3.3],
-                ["versicolor_x", 3.2, 3.2, 3.1, 2.3, 2.8, 2.8, 3.3, 2.4, 2.9, 2.7, 2.0, 3.0, 2.2, 2.9, 2.9, 3.1, 3.0, 2.7, 2.2, 2.5, 3.2, 2.8, 2.5, 2.8, 2.9, 3.0, 2.8, 3.0, 2.9, 2.6, 2.4, 2.4, 2.7, 2.7, 3.0, 3.4, 3.1, 2.3, 3.0, 2.5, 2.6, 3.0, 2.6, 2.3, 2.7, 3.0, 2.9, 2.9, 2.5, 2.8],
-                ["setosa", 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.3, 0.2, 0.2, 0.1, 0.2, 0.2, 0.1, 0.1, 0.2, 0.4, 0.4, 0.3, 0.3, 0.3, 0.2, 0.4, 0.2, 0.5, 0.2, 0.2, 0.4, 0.2, 0.2, 0.2, 0.2, 0.4, 0.1, 0.2, 0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.3, 0.3, 0.2, 0.6, 0.4, 0.3, 0.2, 0.2, 0.2, 0.2],
-                ["versicolor", 1.4, 1.5, 1.5, 1.3, 1.5, 1.3, 1.6, 1.0, 1.3, 1.4, 1.0, 1.5, 1.0, 1.4, 1.3, 1.4, 1.5, 1.0, 1.5, 1.1, 1.8, 1.3, 1.5, 1.2, 1.3, 1.4, 1.4, 1.7, 1.5, 1.0, 1.1, 1.0, 1.2, 1.6, 1.5, 1.6, 1.5, 1.3, 1.3, 1.3, 1.2, 1.4, 1.2, 1.0, 1.3, 1.2, 1.3, 1.3, 1.1, 1.3],
+                ["setosa_x", 3.5, 3.0, 3.2, 3.1, 3.6, 3.9, 3.4, 3.4, 2.9, 3.1, 3.7, 3.4, 3.0, 3.0, 4.0, 4.4, 3.9, 3.5, 3.8, 3.8, 3.4, 3.7, 3.6, 3.3, 3.4, 3.0, 3.4, 3.5, 3.4, 3.2, 3.1, 3.4,
+                4.1, 4.2, 3.1, 3.2, 3.5, 3.6, 3.0, 3.4, 3.5, 2.3, 3.2, 3.5, 3.8, 3.0, 3.8, 3.2, 3.7, 3.3],
+                ["versicolor_x", 3.2, 3.2, 3.1, 2.3, 2.8, 2.8, 3.3, 2.4, 2.9, 2.7, 2.0, 3.0, 2.2, 2.9, 2.9, 3.1, 3.0, 2.7, 2.2, 2.5, 3.2, 2.8, 2.5, 2.8, 2.9, 3.0, 2.8, 3.0, 2.9, 2.6, 2.4,
+                2.4, 2.7, 2.7, 3.0, 3.4, 3.1, 2.3, 3.0, 2.5, 2.6, 3.0, 2.6, 2.3, 2.7, 3.0, 2.9, 2.9, 2.5, 2.8],
+                ["setosa", 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.3, 0.2, 0.2, 0.1, 0.2, 0.2, 0.1, 0.1, 0.2, 0.4, 0.4, 0.3, 0.3, 0.3, 0.2, 0.4, 0.2, 0.5, 0.2, 0.2, 0.4, 0.2, 0.2, 0.2, 0.2, 0.4,
+                0.1, 0.2, 0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.3, 0.3, 0.2, 0.6, 0.4, 0.3, 0.2, 0.2, 0.2, 0.2],
+                ["versicolor", 1.4, 1.5, 1.5, 1.3, 1.5, 1.3, 1.6, 1.0, 1.3, 1.4, 1.0, 1.5, 1.0, 1.4, 1.3, 1.4, 1.5, 1.0, 1.5, 1.1, 1.8, 1.3, 1.5, 1.2, 1.3, 1.4, 1.4, 1.7, 1.5, 1.0, 1.1,
+                1.0, 1.2, 1.6, 1.5, 1.6, 1.5, 1.3, 1.3, 1.3, 1.2, 1.4, 1.2, 1.0, 1.3, 1.2, 1.3, 1.3, 1.1, 1.3],
             ],
             type: "scatter"
         },
@@ -680,7 +682,7 @@ function chart_scatter() {
 }
 
 function chart_pie() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             // iris data from R
             columns: [
@@ -688,24 +690,24 @@ function chart_pie() {
                 ["data2", 120],
             ],
             type: "pie",
-            onclick: function(d, i) { console.log("onclick", d, i); },
-            onmouseover: function(d, i) { console.log("onmouseover", d, i); },
-            onmouseout: function(d, i) { console.log("onmouseout", d, i); }
+            onclick: (d, i) => { console.log("onclick", d, i); },
+            onmouseover: (d, i) => { console.log("onmouseover", d, i); },
+            onmouseout: (d, i) => { console.log("onmouseout", d, i); }
         }
     });
 }
 
 function chart_donut() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30],
                 ["data2", 120],
             ],
             type: "donut",
-            onclick: function(d, i) { console.log("onclick", d, i); },
-            onmouseover: function(d, i) { console.log("onmouseover", d, i); },
-            onmouseout: function(d, i) { console.log("onmouseout", d, i); }
+            onclick: (d, i) => { console.log("onclick", d, i); },
+            onmouseover: (d, i) => { console.log("onmouseover", d, i); },
+            onmouseout: (d, i) => { console.log("onmouseout", d, i); }
         },
         donut: {
             title: "Iris Petal Width"
@@ -714,19 +716,19 @@ function chart_donut() {
 }
 
 function gauge_chart() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data", 91.4]
             ],
             type: "gauge",
-            onclick: function(d, i) { console.log("onclick", d, i); },
-            onmouseover: function(d, i) { console.log("onmouseover", d, i); },
-            onmouseout: function(d, i) { console.log("onmouseout", d, i); }
+            onclick: (d, i) => { console.log("onclick", d, i); },
+            onmouseover: (d, i) => { console.log("onmouseover", d, i); },
+            onmouseout: (d, i) => { console.log("onmouseout", d, i); }
         },
         gauge: {
             label: {
-                format: function(value, ratio) {
+                format: (value, ratio) => {
                     return value;
                 },
                 show: false // to turn off the min/max labels.
@@ -751,7 +753,7 @@ function gauge_chart() {
 }
 
 function chart_combination() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 20, 50, 40, 60, 50],
@@ -779,7 +781,7 @@ function chart_combination() {
 ////////////////////
 
 function categorized() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250, 50, 100, 250]
@@ -795,7 +797,7 @@ function categorized() {
 }
 
 function axes_rotated() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -812,7 +814,7 @@ function axes_rotated() {
 }
 
 function axes_y2() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -832,7 +834,7 @@ function axes_y2() {
 }
 
 function axes_x_tick_format() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -844,8 +846,8 @@ function axes_x_tick_format() {
             x: {
                 type: "timeseries",
                 tick: {
-                    format: function(x: Date) { return x.getFullYear(); }
-                    //format: '%Y' // format string is also available for timeseries data
+                    format: (x: Date) => x.getFullYear()
+                    // format: '%Y' // format string is also available for timeseries data
                 }
             }
         }
@@ -853,7 +855,7 @@ function axes_x_tick_format() {
 }
 
 function axes_x_tick_count() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -874,7 +876,7 @@ function axes_x_tick_count() {
 }
 
 function axes_x_tick_values() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -895,7 +897,7 @@ function axes_x_tick_values() {
 }
 
 function axes_x_tick_culling() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250, 30, 200, 100, 400, 150, 250, 30, 200, 100, 400, 150, 250, 200, 100, 400, 150, 250]
@@ -917,7 +919,7 @@ function axes_x_tick_culling() {
 }
 
 function axes_x_tick_fit() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -938,7 +940,7 @@ function axes_x_tick_fit() {
 }
 
 function axes_x_localtime() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             xFormat: "%Y",
@@ -964,11 +966,12 @@ function axes_x_localtime() {
 }
 
 function axes_x_tick_rotate() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
-                ["x", "www.somesitename1.com", "www.somesitename2.com", "www.somesitename3.com", "www.somesitename4.com", "www.somesitename5.com", "www.somesitename6.com", "www.somesitename7.com", "www.somesitename8.com", "www.somesitename9.com", "www.somesitename10.com", "www.somesitename11.com", "www.somesitename12.com"],
+                ["x", "www.somesitename1.com", "www.somesitename2.com", "www.somesitename3.com", "www.somesitename4.com", "www.somesitename5.com", "www.somesitename6.com", "www.somesitename7.com",
+                "www.somesitename8.com", "www.somesitename9.com", "www.somesitename10.com", "www.somesitename11.com", "www.somesitename12.com"],
                 ["pv", 90, 100, 140, 200, 100, 400, 90, 100, 140, 200, 100, 400],
             ],
             type: "bar"
@@ -987,7 +990,7 @@ function axes_x_tick_rotate() {
 }
 
 function axes_y_tick_format() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 2500]
@@ -997,7 +1000,7 @@ function axes_y_tick_format() {
             y: {
                 tick: {
                     format: d3.format("$,")
-                    //                format: function (d) { return "$" + d; }
+                    //                format: (d) => { return "$" + d; }
                 }
             }
         }
@@ -1005,7 +1008,7 @@ function axes_y_tick_format() {
 }
 
 function axes_y_padding() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1029,7 +1032,7 @@ function axes_y_padding() {
 }
 
 function axes_y_range() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250]
@@ -1047,7 +1050,7 @@ function axes_y_range() {
 }
 
 function axes_label() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250],
@@ -1073,7 +1076,7 @@ function axes_label() {
 }
 
 function axes_label_position() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample1", 30, 200, 100, 400, 150, 250],
@@ -1131,7 +1134,7 @@ function axes_label_position() {
 ///////////////////
 
 function data_columned() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 20, 50, 40, 60, 50],
@@ -1143,7 +1146,7 @@ function data_columned() {
 }
 
 function data_rowed() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             rows: [
                 ["data1", "data2", "data3"],
@@ -1159,7 +1162,7 @@ function data_rowed() {
 }
 
 function data_json() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             json: {
                 data1: [30, 20, 50, 40, 60, 50],
@@ -1169,7 +1172,7 @@ function data_json() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart = c3.generate({
             data: {
                 json: [
@@ -1191,7 +1194,7 @@ function data_json() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             json: [
                 { name: "www.site1.com", upload: 800, download: 500, total: 400 },
@@ -1207,13 +1210,13 @@ function data_json() {
 }
 
 function data_url() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             url: "/data/c3_test.csv"
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         c3.generate({
             data: {
                 url: "/data/c3_test.json",
@@ -1224,7 +1227,7 @@ function data_url() {
 }
 
 function data_stringx() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -1244,7 +1247,7 @@ function data_stringx() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["x", "www.siteA.com", "www.siteB.com", "www.siteC.com", "www.siteD.com"],
@@ -1254,7 +1257,7 @@ function data_stringx() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["x", "www.siteE.com", "www.siteF.com", "www.siteG.com"],
@@ -1264,7 +1267,7 @@ function data_stringx() {
         });
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["x", "www.site1.com", "www.site2.com", "www.site3.com", "www.site4.com"],
@@ -1274,7 +1277,7 @@ function data_stringx() {
         });
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["download", 30, 30, 20, 170],
@@ -1283,7 +1286,7 @@ function data_stringx() {
         });
     }, 4000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             url: "/data/c3_string_x.csv"
         });
@@ -1291,20 +1294,20 @@ function data_stringx() {
 }
 
 function data_load() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             url: "/data/c3_test.csv",
             type: "line"
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             url: "/data/c3_test2.csv"
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data1", 130, 120, 150, 140, 160, 150],
@@ -1314,7 +1317,7 @@ function data_load() {
         });
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             rows: [
                 ["data2", "data3"],
@@ -1329,7 +1332,7 @@ function data_load() {
         });
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data4", 30, 20, 50, 40, 60, 50, 100, 200]
@@ -1338,13 +1341,13 @@ function data_load() {
         });
     }, 4000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.unload({
             ids: "data4"
         });
     }, 5000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data2", null, 30, 20, 50, 40, 60, 50]
@@ -1352,11 +1355,11 @@ function data_load() {
         });
     }, 6000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.unload();
     }, 7000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             rows: [
                 ["data4", "data2", "data3"],
@@ -1371,7 +1374,7 @@ function data_load() {
         });
     }, 8000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             rows: [
                 ["data5", "data6"],
@@ -1386,7 +1389,7 @@ function data_load() {
         });
     }, 9000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.unload({
             ids: ["data2", "data3"]
         });
@@ -1394,7 +1397,7 @@ function data_load() {
 }
 
 function data_name() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1409,7 +1412,7 @@ function data_name() {
 }
 
 function data_color() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 20, 50, 40, 60, 50],
@@ -1422,7 +1425,7 @@ function data_color() {
                 data2: "#00ff00",
                 data3: "#0000ff"
             },
-            color: function(color, d) {
+            color: (color, d) => {
                 // d will be 'id' when called for legends
                 return d.id && d.id === "data3" ? d3.rgb(color).darker(d.value / 150) : color;
             }
@@ -1431,7 +1434,7 @@ function data_color() {
 }
 
 function data_order() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 130, 200, 320, 400, 530, 750],
@@ -1453,7 +1456,7 @@ function data_order() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data4", 1200, 1300, 1450, 1600, 1520, 1820],
@@ -1461,7 +1464,7 @@ function data_order() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data5", 200, 300, 450, 600, 520, 820],
@@ -1469,13 +1472,13 @@ function data_order() {
         });
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.groups([["data1", "data2", "data3", "data4", "data5"]]);
     }, 3000);
 }
 
 function data_label() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, -200, -100, 400, 150, 250],
@@ -1497,7 +1500,7 @@ function data_label() {
 }
 
 function data_label_format() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, -200, -100, 400, 150, 250],
@@ -1529,7 +1532,7 @@ function data_label_format() {
 ///////////////////
 
 function options_gridline() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250, 120, 200]
@@ -1547,7 +1550,7 @@ function options_gridline() {
 }
 
 function grid_x_lines() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250]
@@ -1566,7 +1569,7 @@ function grid_x_lines() {
 }
 
 function grid_y_lines() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250],
@@ -1598,7 +1601,7 @@ function grid_y_lines() {
 ///////////////////
 
 function region() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250, 400],
@@ -1628,7 +1631,7 @@ function region() {
 }
 
 function region_timeseries() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "date",
             columns: [
@@ -1654,7 +1657,7 @@ function region_timeseries() {
 /////////////////////
 
 function options_subchart() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250]
@@ -1667,10 +1670,11 @@ function options_subchart() {
 }
 
 function interaction_zoom() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
-                ["sample", 30, 200, 100, 400, 150, 250, 150, 200, 170, 240, 350, 150, 100, 400, 150, 250, 150, 200, 170, 240, 100, 150, 250, 150, 200, 170, 240, 30, 200, 100, 400, 150, 250, 150, 200, 170, 240, 350, 150, 100, 400, 350, 220, 250, 300, 270, 140, 150, 90, 150, 50, 120, 70, 40]
+                ["sample", 30, 200, 100, 400, 150, 250, 150, 200, 170, 240, 350, 150, 100, 400, 150, 250, 150, 200, 170, 240, 100, 150, 250, 150, 200, 170, 240, 30, 200, 100, 400, 150, 250, 150,
+                200, 170, 240, 350, 150, 100, 400, 350, 220, 250, 300, 270, 140, 150, 90, 150, 50, 120, 70, 40]
             ]
         },
         zoom: {
@@ -1684,7 +1688,7 @@ function interaction_zoom() {
 /////////////////////
 
 function options_legend() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250]
@@ -1697,7 +1701,7 @@ function options_legend() {
 }
 
 function legend_position() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1709,7 +1713,7 @@ function legend_position() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data3", 130, 150, 200, 300, 200, 100]
@@ -1717,23 +1721,23 @@ function legend_position() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.unload({
             ids: "data1"
         });
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("pie");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line");
     }, 4000);
 }
 
 function legend_custom() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 100],
@@ -1754,21 +1758,22 @@ function legend_custom() {
     d3.select(".container").insert("div", ".chart").attr("class", "legend").selectAll("span")
         .data(["data1", "data2", "data3"])
         .enter().append("span")
-        .attr("data-id", function(id) { return id; })
-        .html(function(id) { return id; })
-        .each(function(id) {
+        .attr("data-id", (id) => id)
+        .html((id) => id)
+        .each((id) => {
+            // this is most likely the wrong context now
+            // tslint:disable-next-line
             d3.select(this).style("background-color", chart.color(id));
         })
-        .on("mouseover", function(id) {
+        .on("mouseover", (id) => {
             chart.focus(id);
         })
-        .on("mouseout", function(id) {
+        .on("mouseout", (id) => {
             chart.revert();
         })
-        .on("click", function(id) {
+        .on("click", (id) => {
             chart.toggle(id);
         });
-
 }
 
 /////////////////////
@@ -1776,7 +1781,7 @@ function legend_custom() {
 /////////////////////
 
 function tooltip_show() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1790,7 +1795,7 @@ function tooltip_show() {
 }
 
 function tooltip_grouped() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1805,7 +1810,7 @@ function tooltip_grouped() {
 }
 
 function tooltip_format() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30000, 20000, 10000, 40000, 15000, 250000],
@@ -1830,9 +1835,9 @@ function tooltip_format() {
         },
         tooltip: {
             format: {
-                title: function(d: any) { return "Data " + d; },
-                value: function(value: any, ratio: any, id: any) {
-                    var format = id === "data1" ? d3.format(",") : d3.format("$");
+                title: (d: any) => "Data " + d,
+                value: (value: any, ratio: any, id: any) => {
+                    let format = id === "data1" ? d3.format(",") : d3.format("$");
                     return format(value);
                 }
                 //            value: d3.format(",") // apply this format to both y and y2
@@ -1846,7 +1851,7 @@ function tooltip_format() {
 ////////////////////////
 
 function options_size() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         size: {
             height: 240,
             width: 480
@@ -1860,7 +1865,7 @@ function options_size() {
 }
 
 function options_padding() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         padding: {
             top: 40,
             right: 100,
@@ -1876,7 +1881,7 @@ function options_padding() {
 }
 
 function options_color() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1888,13 +1893,14 @@ function options_color() {
             ]
         },
         color: {
-            pattern: ["#1f77b4", "#aec7e8", "#ff7f0e", "#ffbb78", "#2ca02c", "#98df8a", "#d62728", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b", "#c49c94", "#e377c2", "#f7b6d2", "#7f7f7f", "#c7c7c7", "#bcbd22", "#dbdb8d", "#17becf", "#9edae5"]
+            pattern: ["#1f77b4", "#aec7e8", "#ff7f0e", "#ffbb78", "#2ca02c", "#98df8a", "#d62728", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b", "#c49c94", "#e377c2", "#f7b6d2", "#7f7f7f", "#c7c7c7",
+            "#bcbd22", "#dbdb8d", "#17becf", "#9edae5"]
         }
     });
 }
 
 function transition_duration() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             url: "/data/c3_test.csv"
         },
@@ -1903,13 +1909,13 @@ function transition_duration() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             url: "/data/c3_test2.csv"
         });
     }, 500);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data1", 30, 20, 50, 40, 60, 50],
@@ -1919,7 +1925,7 @@ function transition_duration() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             rows: [
                 ["data1", "data2", "data3"],
@@ -1933,7 +1939,7 @@ function transition_duration() {
         });
     }, 1500);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.load({
             columns: [
                 ["data1", null, 30, 20, 50, 40, 60, 50, 100, 200]
@@ -1947,7 +1953,7 @@ function transition_duration() {
 /////////////////////////////
 
 function point_show() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -1965,7 +1971,7 @@ function point_show() {
 ////////////////////////////
 
 function pie_label_format() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30],
@@ -1975,7 +1981,7 @@ function pie_label_format() {
         },
         pie: {
             label: {
-                format: function(value: any, ratio: any, id: any) {
+                format: (value: any, ratio: any, id: any) => {
                     return d3.format("$")(value);
                 }
             }
@@ -1988,7 +1994,7 @@ function pie_label_format() {
 /////////////////////
 
 function api_flow() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             x: "x",
             columns: [
@@ -2008,7 +2014,7 @@ function api_flow() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.flow({
             columns: [
                 ["x", "2013-01-11", "2013-01-21"],
@@ -2017,7 +2023,7 @@ function api_flow() {
                 ["data3", 200, 120],
             ],
             duration: 1500,
-            done: function() {
+            done: () => {
                 chart.flow({
                     columns: [
                         ["x", "2013-02-11", "2013-02-12", "2013-02-13", "2013-02-14"],
@@ -2027,7 +2033,7 @@ function api_flow() {
                     ],
                     length: 0,
                     duration: 1500,
-                    done: function() {
+                    done: () => {
                         chart.flow({
                             columns: [
                                 ["x", "2013-03-01", "2013-03-02"],
@@ -2037,7 +2043,7 @@ function api_flow() {
                             ],
                             length: 2,
                             duration: 1500,
-                            done: function() {
+                            done: () => {
                                 chart.flow({
                                     columns: [
                                         ["x", "2013-03-21", "2013-04-01"],
@@ -2058,7 +2064,7 @@ function api_flow() {
 }
 
 function api_data_name() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2071,17 +2077,17 @@ function api_data_name() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.data.names({ data1: "New name for data1", data2: "New name for data2" });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.data.names({ data1: "New name for data1 again" });
     }, 2000);
 }
 
 function api_data_color() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 20, 50, 40, 60, 50],
@@ -2098,7 +2104,7 @@ function api_data_color() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.data.colors({
             data1: d3.rgb("#ff0000").darker(1),
             data2: d3.rgb("#00ff00").darker(1),
@@ -2106,7 +2112,7 @@ function api_data_color() {
         });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.data.colors({
             data1: d3.rgb("#ff0000").darker(2),
             data2: d3.rgb("#00ff00").darker(2),
@@ -2116,7 +2122,7 @@ function api_data_color() {
 }
 
 function api_axis_label() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2138,17 +2144,17 @@ function api_axis_label() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.labels({ y2: "New Y2 Axis Label" });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.labels({ y: "New Y Axis Label", y2: "New Y2 Axis Label Again" });
     }, 2000);
 }
 
 function api_axis_range() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2166,45 +2172,45 @@ function api_axis_range() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.max(500);
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.min(-500);
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.max({ y: 600, y2: 100 });
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.min({ y: -600, y2: -100 });
     }, 4000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.range({ max: 1000, min: -1000 });
     }, 5000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.range({ max: { y: 600, y2: 100 }, min: { y: -100, y2: 0 } });
     }, 6000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.max({ x: 10 });
     }, 7000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.min({ x: -10 });
     }, 8000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.axis.range({ max: { x: 5 }, min: { x: 0 } });
     }, 9000);
 }
 
 function api_resize() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2213,21 +2219,21 @@ function api_resize() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.resize({ height: 100, width: 300 });
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.resize({ height: 200 });
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.resize();
     }, 3000);
 }
 
 function api_grid_x() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         bindto: "#chart",
         data: {
             columns: [
@@ -2236,31 +2242,31 @@ function api_grid_x() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids([{ value: 1, text: "Label 1" }, { value: 4, text: "Label 4" }]);
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids([{ value: 2, text: "Label 2" }]);
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids.add([{ value: 3, text: "Label 3", class: "hoge" }]);
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids.remove({ value: 2 });
     }, 4000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids.remove({ class: "hoge" });
     }, 5000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids([{ value: 1, text: "Label 1" }, { value: 4, text: "Label 4" }]);
     }, 6000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.xgrids.remove();
     }, 7000);
 }
@@ -2270,7 +2276,7 @@ function api_grid_x() {
 /////////////////////
 
 function transform_line() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2280,25 +2286,25 @@ function transform_line() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line", "data1");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line", "data2");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line");
     }, 4000);
 }
 
 function transform_spline() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2308,25 +2314,25 @@ function transform_spline() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("spline", "data1");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("spline", "data2");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("spline");
     }, 4000);
 }
 
 function transform_bar() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2336,25 +2342,25 @@ function transform_bar() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar", "data1");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar", "data2");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar");
     }, 4000);
 }
 
 function transform_area() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2364,25 +2370,25 @@ function transform_area() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area", "data1");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area", "data2");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area");
     }, 4000);
 }
 
 function transform_areaspline() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2392,25 +2398,25 @@ function transform_areaspline() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area-spline", "data1");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area-spline", "data2");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("bar");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("area-spline");
     }, 4000);
 }
 
 function transform_scatter() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             xs: {
                 setosa: "setosa_x",
@@ -2418,10 +2424,14 @@ function transform_scatter() {
             },
             // iris data from R
             columns: [
-                ["setosa_x", 3.5, 3.0, 3.2, 3.1, 3.6, 3.9, 3.4, 3.4, 2.9, 3.1, 3.7, 3.4, 3.0, 3.0, 4.0, 4.4, 3.9, 3.5, 3.8, 3.8, 3.4, 3.7, 3.6, 3.3, 3.4, 3.0, 3.4, 3.5, 3.4, 3.2, 3.1, 3.4, 4.1, 4.2, 3.1, 3.2, 3.5, 3.6, 3.0, 3.4, 3.5, 2.3, 3.2, 3.5, 3.8, 3.0, 3.8, 3.2, 3.7, 3.3],
-                ["versicolor_x", 3.2, 3.2, 3.1, 2.3, 2.8, 2.8, 3.3, 2.4, 2.9, 2.7, 2.0, 3.0, 2.2, 2.9, 2.9, 3.1, 3.0, 2.7, 2.2, 2.5, 3.2, 2.8, 2.5, 2.8, 2.9, 3.0, 2.8, 3.0, 2.9, 2.6, 2.4, 2.4, 2.7, 2.7, 3.0, 3.4, 3.1, 2.3, 3.0, 2.5, 2.6, 3.0, 2.6, 2.3, 2.7, 3.0, 2.9, 2.9, 2.5, 2.8],
-                ["setosa", 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.3, 0.2, 0.2, 0.1, 0.2, 0.2, 0.1, 0.1, 0.2, 0.4, 0.4, 0.3, 0.3, 0.3, 0.2, 0.4, 0.2, 0.5, 0.2, 0.2, 0.4, 0.2, 0.2, 0.2, 0.2, 0.4, 0.1, 0.2, 0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.3, 0.3, 0.2, 0.6, 0.4, 0.3, 0.2, 0.2, 0.2, 0.2],
-                ["versicolor", 1.4, 1.5, 1.5, 1.3, 1.5, 1.3, 1.6, 1.0, 1.3, 1.4, 1.0, 1.5, 1.0, 1.4, 1.3, 1.4, 1.5, 1.0, 1.5, 1.1, 1.8, 1.3, 1.5, 1.2, 1.3, 1.4, 1.4, 1.7, 1.5, 1.0, 1.1, 1.0, 1.2, 1.6, 1.5, 1.6, 1.5, 1.3, 1.3, 1.3, 1.2, 1.4, 1.2, 1.0, 1.3, 1.2, 1.3, 1.3, 1.1, 1.3],
+                ["setosa_x", 3.5, 3.0, 3.2, 3.1, 3.6, 3.9, 3.4, 3.4, 2.9, 3.1, 3.7, 3.4, 3.0, 3.0, 4.0, 4.4, 3.9, 3.5, 3.8, 3.8, 3.4, 3.7, 3.6, 3.3, 3.4, 3.0, 3.4, 3.5, 3.4, 3.2, 3.1, 3.4,
+                4.1, 4.2, 3.1, 3.2, 3.5, 3.6, 3.0, 3.4, 3.5, 2.3, 3.2, 3.5, 3.8, 3.0, 3.8, 3.2, 3.7, 3.3],
+                ["versicolor_x", 3.2, 3.2, 3.1, 2.3, 2.8, 2.8, 3.3, 2.4, 2.9, 2.7, 2.0, 3.0, 2.2, 2.9, 2.9, 3.1, 3.0, 2.7, 2.2, 2.5, 3.2, 2.8, 2.5, 2.8, 2.9, 3.0, 2.8, 3.0, 2.9, 2.6, 2.4, 2.4,
+                2.7, 2.7, 3.0, 3.4, 3.1, 2.3, 3.0, 2.5, 2.6, 3.0, 2.6, 2.3, 2.7, 3.0, 2.9, 2.9, 2.5, 2.8],
+                ["setosa", 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.3, 0.2, 0.2, 0.1, 0.2, 0.2, 0.1, 0.1, 0.2, 0.4, 0.4, 0.3, 0.3, 0.3, 0.2, 0.4, 0.2, 0.5, 0.2, 0.2, 0.4, 0.2, 0.2, 0.2, 0.2, 0.4, 0.1,
+                0.2, 0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.3, 0.3, 0.2, 0.6, 0.4, 0.3, 0.2, 0.2, 0.2, 0.2],
+                ["versicolor", 1.4, 1.5, 1.5, 1.3, 1.5, 1.3, 1.6, 1.0, 1.3, 1.4, 1.0, 1.5, 1.0, 1.4, 1.3, 1.4, 1.5, 1.0, 1.5, 1.1, 1.8, 1.3, 1.5, 1.2, 1.3, 1.4, 1.4, 1.7, 1.5, 1.0, 1.1, 1.0,
+                1.2, 1.6, 1.5, 1.6, 1.5, 1.3, 1.3, 1.3, 1.2, 1.4, 1.2, 1.0, 1.3, 1.2, 1.3, 1.3, 1.1, 1.3],
             ],
             type: "pie"
         },
@@ -2438,21 +2448,21 @@ function transform_scatter() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("scatter");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("pie");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("scatter");
     }, 3000);
 }
 
 function transform_pie() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2461,21 +2471,21 @@ function transform_pie() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("pie");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("pie");
     }, 3000);
 }
 
 function transform_donut() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 30, 200, 100, 400, 150, 250],
@@ -2484,19 +2494,19 @@ function transform_donut() {
         }
     });
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("donut");
     }, 1000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("line");
     }, 2000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("pie");
     }, 3000);
 
-    setTimeout(function() {
+    setTimeout(() => {
         chart.transform("donut");
     }, 4000);
 }
@@ -2506,7 +2516,7 @@ function transform_donut() {
 /////////////////////
 
 function style_region() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["sample", 30, 200, 100, 400, 150, 250]
@@ -2520,7 +2530,7 @@ function style_region() {
 }
 
 function style_grid() {
-    var chart = c3.generate({
+    let chart = c3.generate({
         data: {
             columns: [
                 ["data1", 100, 200, 1000, 900, 500]
@@ -2536,3 +2546,19 @@ function style_grid() {
         }
     });
 }
+
+// set colors via function
+c3.generate({
+  bindto: '#chart',
+  data: {
+    columns: [
+      ['data1', ...[]],
+    ],
+    type: 'bar',
+    colors: {
+      data1: (d: any) => {
+        return d.value > 90 ? 'green' : 'orange';
+      }
+    }
+  }
+});
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index 748b19bfc5..2d0c4381d6 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -1,31 +1,37 @@
-// Type definitions for C3js v0.4
+// Type definitions for C3js 0.4
 // Project: http://c3js.org/
 // Definitions by: Marc Climent <https://github.com/mcliment>
+//                 Gerin Jacob <https://github.com/gerinjacob>
+//                 Bernd Hacker <https://github.com/denyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as d3 from "d3";
 
+/* tslint:disable:export-just-namespace */
+
 export = c3;
 export as namespace c3;
 
 declare namespace c3 {
-
-    type PrimitiveArray = Array<string | boolean | number>;
+    type PrimitiveArray = Array<string | boolean | number | null>;
     type FormatFunction = (v: any, id: string, i: number, j: number) => void;
 
     interface TargetIds {
         ids: ArrayOrString;
     }
 
-    type ArrayOrString = Array<string> | string;
+    type ArrayOrString = string[] | string;
 
     interface ChartConfiguration {
         /**
-         * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart can be set in one element).
+         * The CSS selector or the element which the chart will be set to. D3 selection object can be specified. If other chart is set already, it will be replaced with the new one (only one chart
+         * can be set in one element).
          * If this option is not specified, the chart will be generated but not be set. Instead, we can access the element by chart.element and set it by ourselves.
-         * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
+         * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support
+         * MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
          */
-        bindto?: string | HTMLElement | d3.Selection<any>;
+        bindto?: string | HTMLElement | d3.Selection<any> | null;
         size?: {
             /**
              * The desired width of the chart element.
@@ -63,7 +69,7 @@ declare namespace c3 {
             /**
              * Set custom color pattern.
              */
-            pattern?: Array<string>;
+            pattern?: string[];
             threshold?: any; // Undocumented
         };
 
@@ -86,32 +92,32 @@ declare namespace c3 {
         /**
          * Set a callback to execute when the chart is initialized.
          */
-        oninit?: () => void;
+        oninit?(): void;
 
         /**
          * Set a callback which is executed when the chart is rendered. Basically, this callback will be called in each time when the chart is redrawed.
          */
-        onrendered?: () => void;
+        onrendered?(): void;
 
         /**
          * Set a callback to execute when mouse enters the chart.
          */
-        onmouseover?: () => void;
+        onmouseover?(): void;
 
         /**
          * Set a callback to execute when mouse leaves the chart.
          */
-        onmouseout?: () => void;
+        onmouseout?(): void;
 
         /**
          * Set a callback to execute when user resizes the screen.
          */
-        onresize?: () => void;
+        onresize?(): void;
 
         /**
          * Set a callback to execute when screen resize finished.
          */
-        onresized?: () => void;
+        onresized?(): void;
 
         data: Data;
 
@@ -122,9 +128,10 @@ declare namespace c3 {
         /**
          * Show rectangles inside the chart.
          * This option accepts array including object that has axis, start, end and class. The keys start, end and class are optional.
-         * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and unixtime integer can be used. If class is set, the region element will have it as class.
+         * axis must be x, y or y2. start and end should be the value where regions start and end. If not specified, the edge values will be used. If timeseries x axis, date string, Date object and
+         * unixtime integer can be used. If class is set, the region element will have it as class.
          */
-        regions?: Array<RegionOptions>;
+        regions?: RegionOptions[];
 
         legend?: LegendOptions;
 
@@ -146,8 +153,8 @@ declare namespace c3 {
              * Change step type for step chart. 'step', 'step-before' and 'step-after' can be used.
              */
             step?: {
-                 type: string;
-             };
+                type: string;
+            };
         };
 
         area?: {
@@ -161,7 +168,16 @@ declare namespace c3 {
             /**
              * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
              */
-            width?: number | { ratio: number };
+            width?: number | {
+                /**
+                 * Set the width of each bar by ratio
+                 */
+                ratio: number,
+                /**
+                 * Set max width of each bar
+                 */
+                max?: number
+            };
             /**
              * Set if min or max value will be 0 on bar chart.
              */
@@ -177,7 +193,7 @@ declare namespace c3 {
                 /**
                  * Set formatter for the label on each pie piece.
                  */
-                format?: (value: number, ratio: number, id: string) => string;
+                format?(value: number, ratio: number, id: string): string;
                 /**
                  * Set threshold to show/hide labels.
                  */
@@ -198,7 +214,7 @@ declare namespace c3 {
                 /**
                  * Set formatter for the label on each donut piece.
                  */
-                format?: (value: number, ratio: number, id: string) => string;
+                format?(value: number, ratio: number, id: string): string;
                 /**
                  * Set threshold to show/hide labels.
                  */
@@ -227,7 +243,7 @@ declare namespace c3 {
                 /**
                  * Set formatter for the label on gauge.
                  */
-                format?: (value: any, ratio: number) => string;
+                format?(value: any, ratio: number): string;
             };
             /**
              * Enable or disable expanding gauge.
@@ -269,15 +285,15 @@ declare namespace c3 {
         /**
          * Parse a JSON object for data.
          */
-        json?: Object;
+        json?: {};
         /**
          * Load data from a multidimensional array, with the first element containing the data names, the following containing related data in that order.
          */
-        rows?: Array<PrimitiveArray>;
+        rows?: PrimitiveArray[];
         /*
          * Load data from a multidimensional array, with each element containing an array consisting of a datum name and associated data values.
          */
-        columns?: Array<PrimitiveArray>;
+        columns?: PrimitiveArray[];
         /**
          * Used if loading JSON via data.url
          */
@@ -285,10 +301,11 @@ declare namespace c3 {
         /**
          * Choose which JSON object keys correspond to desired data.
          */
-        keys?: { x?: string; value: Array<string>; };
+        keys?: { x?: string; value: string[]; };
         /**
          * Specify the key of x values in the data.
-         * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data on the key will be used for category names.
+         * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data
+         * on the key will be used for category names.
          */
         x?: string;
         /**
@@ -301,8 +318,8 @@ declare namespace c3 {
          * Default is %Y-%m-%d
          */
         xFormat?: string;
-        //xLocaltime?: any;
-        //xSort?: any;
+        // xLocaltime?: any;
+        // xSort?: any;
         /**
          * Set custom data name.
          */
@@ -315,7 +332,7 @@ declare namespace c3 {
         /**
          * Set groups for the data for stacking.
          */
-        groups?: Array<Array<string>>;
+        groups?: string[][];
         /**
          * Set y axis the data related to. y and y2 can be used.
          */
@@ -345,30 +362,33 @@ declare namespace c3 {
         { format: { [key: string]: FormatFunction } };
         /**
          * Define the order of the data.
-         * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data and it will recieve the data as argument.
+         * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data
+         * and it will recieve the data as argument.
          * Available Values: desc, asc, function (data1, data2) { ... }, null
          */
         order?: string | ((...data: string[]) => void);
         /**
          * Define regions for each data.
-         * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the end will be the last data point.
+         * The values must be an array for each data and it should include an object that has start, end, style. If start is not set, the start will be the first data point. If end is not set, the
+         * end will be the last data point.
          * Currently this option supports only line chart and dashed style. If this option specified, the line will be dashed only in the regions.
          */
         regions?: { [key: string]: any };
         /**
          * Set color converter function.
-         * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that represents color (e.g. '#00ff00').
+         * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that
+         * represents color (e.g. '#00ff00').
          */
-        color?: (color: string, d: any) => string | d3.Rgb;
+        color?(color: string, d: any): string | d3.Rgb;
         /**
          * Set color for each data.
          */
-        colors?: { [key: string]: string | d3.Rgb };
+        colors?: { [key: string]: string | d3.Rgb | ((d: any) => string | d3.Rgb) };
         /**
          * Hide each data when the chart appears.
          * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
          */
-        hide?: boolean | Array<string>;
+        hide?: boolean | string[];
         /**
          * Set text displayed when empty data.
          */
@@ -379,30 +399,30 @@ declare namespace c3 {
             grouped?: boolean;
             multiple?: boolean;
             draggable?: boolean;
-            isselectable?: (d?: any) => boolean;
+            isselectable?(d?: any): boolean;
         };
         /**
          * Set a callback for click event on each data point.
          * This callback will be called when each data point clicked and will receive d and element as the arguments.
          * - d is the data clicked and element is the element clicked. In this callback, this will be the Chart object.
          */
-        onclick?: (d: any, element: any) => void;
+        onclick?(d: any, element: any): void;
         /**
          * Set a callback for mouseover event on each data point.
          * This callback will be called when mouse cursor moves onto each data point and will receive d as the argument.
          * - d is the data where mouse cursor moves onto. In this callback, this will be the Chart object.
          */
-        onmouseover?: (d: any, element?: any) => void;
+        onmouseover?(d: any, element?: any): void;
         /**
          * Set a callback for mouseout event on each data point.
          * This callback will be called when mouse cursor moves out each data point and will receive d as the argument.
          * - d is the data where mouse cursor moves out. In this callback, this will be the Chart object.
          */
-        onmouseout?: (d: any, element?: any) => void;
+        onmouseout?(d: any, element?: any): void;
 
-        onselected?: (d: any, element?: any) => void;
+        onselected?(d: any, element?: any): void;
 
-        onunselected?: (d: any, element?: any) => void;
+        onunselected?(d: any, element?: any): void;
     }
 
     interface Axis {
@@ -433,7 +453,7 @@ declare namespace c3 {
          * Set category names on category axis.
          * This must be an array that includes category names in string. If category names are included in the date by data.x option, this is not required.
          */
-        categories?: Array<string>;
+        categories?: string[];
 
         tick?: XTickConfiguration;
         /**
@@ -446,7 +466,8 @@ declare namespace c3 {
         min?: number;
         /**
          * Set padding for x axis.
-         * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option will be ignored.
+         * If this option is set, the range of x axis will increase/decrease according to the values. If no padding is needed in the ragen of x axis, 0 should be set. On category axis, this option
+         * will be ignored.
          */
         padding?: {
             left?: number;
@@ -460,10 +481,11 @@ declare namespace c3 {
         /**
          * Set default extent for subchart and zoom. This can be an array or function that returns an array.
          */
-        extent?: Array<number> | (() => Array<number>);
+        extent?: number[] | (() => number[]);
         /**
          * Set label on x axis.
-         * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
+         * You can set x axis label and change its position by this option. string and object can be passed and we can change the poisiton by passing object that has position key. Available position
+         * differs according to the axis direction (vertical or horizontal). If string set, the position will be the default.
          * Valid horizontal positions: inner-right (Default), inner-center, inner-left, outer-right, outer-center, outer-left
          * Valid vertical positions: inner-top, inner-middle, inner-bottom, outer-top, outer-middle, outer-bottom
          */
@@ -514,8 +536,7 @@ declare namespace c3 {
         /**
          * Set default range of y axis. This option set the default value for y axis when there is no data on init.
          */
-        default?: Array<number>;
-
+        default?: number[];
     }
 
     interface XTickConfiguration {
@@ -528,14 +549,15 @@ declare namespace c3 {
          */
         format?: string | ((x: number | Date) => string | number);
         /**
-        * Setting for culling ticks.
-        * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
-        */
+         * Setting for culling ticks.
+         * If true is set, the ticks will be culled, then only limitted tick text will be shown. This option does not hide the tick lines. If false is set, all of ticks will be shown.
+         */
         culling?: boolean | CullingConfiguration;
         /**
          * The number of x axis ticks to show.
-         * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will have rough second value).
-        */
+         * This option hides tick lines together with tick text. If this option is used on timeseries axis, the ticks position will be determined precisely and not nicely positioned (e.g. it will
+         * have rough second value).
+         */
         count?: number;
         /**
          * Fit x axis ticks.
@@ -544,9 +566,10 @@ declare namespace c3 {
         fit?: boolean;
         /**
          * Set the x values of ticks manually.
-         * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type of the value and data.xFormat option.
+         * If this option is provided, the position of the ticks will be determined based on those values. This option works with timeseries data and the x values will be parsed accoding to the type
+         * of the value and data.xFormat option.
          */
-        values?: Array<number> | Array<string>;
+        values?: number[] | string[];
         /**
          * Rotate x axis tick text. If you set negative value, it will rotate to opposite direction.
          */
@@ -563,7 +586,7 @@ declare namespace c3 {
          * Set formatter for y axis tick text.
          * This option accepts d3.format object as well as a function you define.
          */
-        format?: (x: number) => string;
+        format?(x: number): string;
         /**
          * Show or hide outer tick.
          */
@@ -571,18 +594,18 @@ declare namespace c3 {
         /**
          * Set the y values of ticks manually.
          */
-        values?: Array<number>;
+        values?: number[];
         /**
          * The number of y axis ticks to show.
          * The position of the ticks will be calculated precisely, so the values on the ticks will not be rounded nicely. In the case, axis.y.tick.format or axis.y.tick.values will be helpful.
-        */
+         */
         count?: number;
     }
 
     interface CullingConfiguration {
         /**
-        * The number of tick texts will be adjusted to less than this value.
-        */
+         * The number of tick texts will be adjusted to less than this value.
+         */
         max: number;
     }
 
@@ -597,7 +620,7 @@ declare namespace c3 {
              * This option accepts array including object that has value, text, position and class. text, position and class are optional. For position, start, middle and end (default) are available.
              * If x axis is category axis, value can be category name. If x axis is timeseries axis, value can be date string, Date object and unixtime integer.
              */
-            lines?: Array<LineOptions>;
+            lines?: LineOptions[];
         };
         y?: {
             /**
@@ -608,7 +631,7 @@ declare namespace c3 {
              * Show additional grid lines along y axis.
              * This option accepts array including object that has value, text, position and class.
              */
-            lines?: Array<LineOptions>;
+            lines?: LineOptions[];
         };
     }
 
@@ -660,15 +683,15 @@ declare namespace c3 {
             /**
              * Set click event handler to the legend item.
              */
-            onclick?: (id: any) => void;
+            onclick?(id: any): void;
             /**
              * Set mouseover event handler to the legend item.
              */
-            onmouseover?: (id: any) => void;
+            onmouseover?(id: any): void;
             /**
              * Set mouseout event handler to the legend item.
              */
-            onmouseout?: (id: any) => void;
+            onmouseout?(id: any): void;
         };
     }
 
@@ -685,27 +708,28 @@ declare namespace c3 {
             /**
              * Set format for the title of tooltip. Specified function receives x of the data point to show.
              */
-            title?: (x: any) => string;
+            title?(x: any): string;
             /**
-             * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
+             * Set format for the name of each data in tooltip. Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not
+             * donut/pie/gauge.
              */
-            name?: (name: string, ratio: number, id: string, index: number) => string;
+            name?(name: string, ratio: number, id: string, index: number): string;
             /**
              * Set format for the value of each data in tooltip.
              * Specified function receives name, ratio, id and index of the data point to show. ratio will be undefined if the chart is not donut/pie/gauge.
              * If undefined returned, the row of that value will be skipped.
              */
-            value?: (value: any, ratio: number, id: string, index: number) => string;
+            value?(value: any, ratio: number, id: string, index: number): string;
         };
         /**
          * Set custom position for the tooltip. This option can be used to modify the tooltip position by returning object that has top and left.
          */
-        position?: (data: any, width: number, height: number, element: any) => { top: number; left: number };
+        position?(data: any, width: number, height: number, element: any): { top: number; left: number };
         /**
          * Set custom HTML for the tooltip.
          * Specified function receives data, defaultTitleFormat, defaultValueFormat and color of the data point to show. If tooltip.grouped is true, data includes multiple data points.
          */
-        contents?: (data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any) => string;
+        contents?(data: any, defaultTitleFormat: string, defaultValueFormat: string, color: any): string;
     }
 
     interface SubchartOptions {
@@ -723,7 +747,7 @@ declare namespace c3 {
          * Set callback for brush event.
          * Specified function receives the current zoomed x domain.
          */
-        onbrush?: (domain: any) => void;
+        onbrush?(domain: any): void;
     }
 
     interface ZoomOptions {
@@ -742,15 +766,15 @@ declare namespace c3 {
         /**
          * Set callback that is called when the chart is zooming. Specified function receives the zoomed domain.
          */
-        onzoom?: (domain: any) => void;
+        onzoom?(domain: any): void;
         /**
          * Set callback that is called when zooming starts. Specified function receives the zoom event.
          */
-        onzoomstart?: (event: Event) => void;
+        onzoomstart?(event: Event): void;
         /**
          * Set callback that is called when zooming ends. Specified function receives the zoomed domain.
          */
-        onzoomend?: (domain: any) => void;
+        onzoomend?(domain: any): void;
     }
 
     interface PointOptions {
@@ -829,23 +853,24 @@ declare namespace c3 {
          * If type or types given, the type of targets will be updated. type must be String and types must be Object.
          * If unload given, data will be unloaded before loading new data. If true given, all of data will be unloaded. If target ids given as String or Array, specified targets will be unloaded.
          * If done given, the specified function will be called after data loded.
-         * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly because of cancel of animation.
+         * NOTE: unload should be used if some data needs to be unloaded simultaneously. If you call unload API soon after/before load instead of unload param, chart will not be rendered properly
+         * because of cancel of animation.
          * NOTE: done will be called after data loaded, but it's not after rendering. It's because rendering will finish after some transition and there is some time lag between loading and rendering.
          */
         load(args: {
             url?: string;
-            json?: Object;
-            keys?: { x?: string; value: Array<string>; }
-            rows?: Array<PrimitiveArray>;
-            columns?: Array<PrimitiveArray>;
+            json?: {};
+            keys?: { x?: string; value: string[]; }
+            rows?: PrimitiveArray[];
+            columns?: PrimitiveArray[];
             classes?: { [key: string]: string };
-            categories?: Array<string>;
+            categories?: string[];
             axes?: { [key: string]: string };
             colors?: { [key: string]: string | d3.Rgb };
             type?: string;
             types?: { [key: string]: string };
             unload?: boolean | ArrayOrString;
-            done?: () => any;
+            done?(): any;
         }): void;
         /**
          * Unload data to the chart.
@@ -858,21 +883,22 @@ declare namespace c3 {
         unload(targetIds?: TargetIds, done?: () => any): any;
         /**
          * Flow data to the chart. By this API, you can append new data points to the chart.
-         * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is required when calling. If json specified, keys is required as well as data.json
+         * If json, rows and columns given, the data will be loaded. If data that has the same target id is given, the chart will be appended. Otherwise, new target will be added. One of these is
+         * required when calling. If json specified, keys is required as well as data.json
          * If to is given, the lower x edge will move to that point. If not given, the lower x edge will move by the number of given data points.
          * If length is given, the lower x edge will move by the number of this argument.
          * If duration is given, the duration of the transition will be specified value. If not given, transition.duration will be used as default.
          * If done is given, the specified function will be called when flow ends.
          */
         flow(args: {
-            json?: Object;
-            keys?: { x?: string; value: Array<string>; }
-            rows?: Array<PrimitiveArray>;
-            columns?: Array<PrimitiveArray>;
+            json?: {};
+            keys?: { x?: string; value: string[]; }
+            rows?: PrimitiveArray[];
+            columns?: PrimitiveArray[];
             to?: any;
             length?: number;
             duration?: number;
-            done?: () => any;
+            done?(): any;
         }): void;
         /**
          * Change data point state to selected. By this API, you can select data points. To use this API, data.selection.enabled needs to be set true.
@@ -880,13 +906,13 @@ declare namespace c3 {
          * @param indices Specify indices to be selected. If this argument is not given, all data points will be the candidate.
          * @param resetOthers If this argument is set true, the data points that are not specified by ids, indices will be unselected.
          */
-        select(ids?: Array<string>, indices?: Array<number>, resetOthers?: boolean): void;
+        select(ids?: string[], indices?: number[], resetOthers?: boolean): void;
         /**
          * Change data point state to unselected. By this API, you can unselect data points. To use this API, data.selection.enabled needs to be set true.
          * @param ids Specify target ids to be unselected. If this argument is not given, all targets will be the candidate.
          * @param indices Specify indices to be unselected. If this argument is not given, all data points will be the candidate.
          */
-        unselect(ids?: Array<string>, indices?: Array<number>): void;
+        unselect(ids?: string[], indices?: number[]): void;
         /**
          * Get selected data points. By this API, you can get selected data points information. To use this API, data.selection.enabled needs to be set true.
          * @param targetId You can filter the result by giving target id that you want to get. If not given, all of data points will be returned.
@@ -902,7 +928,7 @@ declare namespace c3 {
          * Update groups for the targets.
          * @param groups This argument needs to be an Array that includes one or more Array that includes target ids to be grouped.
          */
-        groups(groups: Array<Array<string>>): void;
+        groups(groups: string[][]): void;
 
         xgrids: GridOperations;
 
@@ -913,15 +939,16 @@ declare namespace c3 {
              * Update regions.
              * @param regions Regions will be replaced with this argument. The format of this argument is the same as regions.
              */
-            (regions: Array<any>): void;
+            (regions: any[]): void;
             /**
              * Add new region. This API adds new region instead of replacing like regions.
              * @param grids New region will be added. The format of this argument is the same as regions and it's possible to give an Object if only one region will be added.
              */
-            add(regions: Array<any> | Object): void;
+            add(regions: any[] | {}): void;
             /**
              * Remove regions. This API removes regions.
-             * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be removed.
+             * @param args This argument should include classes. If classes is given, the regions that have one of the specified classes will be removed. If args is not given, all of regions will be
+             * removed.
              */
             remove(args?: { value?: number | string; class?: string }): void;
         };
@@ -941,7 +968,7 @@ declare namespace c3 {
              * Get values of the data loaded in the chart.
              * @param targetIds This API returns the values of specified target. If this argument is not given, null will be retruned.
              */
-            values(targetIds?: ArrayOrString): Array<any>;
+            values(targetIds?: ArrayOrString): any[];
             /**
              * Get and set names of the data loaded in the chart.
              * @param names If this argument is given, the names of data will be updated. If not given, the current names will be returned. The format of this argument is the same as data.names.
@@ -970,7 +997,7 @@ declare namespace c3 {
          * Get and set the categories
          * @param categories: Value of the categories to update
          */
-        categories(categories?: Array<string>): Array<string>;
+        categories(categories?: string[]): string[];
 
         /**
          * Get the color for the specified targetId
@@ -1015,12 +1042,14 @@ declare namespace c3 {
         legend: {
             /**
              * Show legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be shown.
+             * @param targetIds If targetIds is given, specified target's legend will be shown. If only one target is the candidate, String can be passed. If no argument is given, all of target's
+             * legend will be shown.
              */
             show(targetIds?: ArrayOrString): void;
             /**
              * Hide legend for each target.
-             * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's legend will be hidden.
+             * @param targetIds If targetIds is given, specified target's legend will be hidden. If only one target is the candidate, String can be passed. If no argument is given, all of target's
+             * legend will be hidden.
              */
             hide(targetIds?: ArrayOrString): void;
         };
@@ -1030,7 +1059,7 @@ declare namespace c3 {
              * Zoom by giving x domain.
              * @param domain If domain is given, the chart will be zoomed to the given domain. If no argument is given, the current zoomed domain will be returned.
              */
-            (domain?: Array<number>): Array<number>;
+            (domain?: number[]): number[];
 
             /**
              * Enable and disable zooming.
@@ -1066,18 +1095,19 @@ declare namespace c3 {
          * Update the x/y grid lines.
          * @param grids X/Y grid lines will be replaced with this argument. The format of this argument is the same as grid.x.lines or grid.y.lines.
          */
-        (grids: Array<any>): void;
+        (grids: any[]): void;
         /**
          * Add x/y grid lines. This API adds new x/y grid lines instead of replacing like xgrids.
          * @param grids New x/y grid lines will be added. The format of this argument is the same as grid.x.lines or grid.y.lines and it's possible to give an Object if only one line will be added.
          */
-        add(grids: Array<any> | Object): void;
+        add(grids: any[] | {}): void;
         /**
          * Remove x/y grid lines. This API removes x/y grid lines.
-         * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
+         * @param args This argument should include value or class. If value is given, the x/y grid lines that have specified x/y value will be removed. If class is given, the x/y grid lines that
+         * have specified class will be removed. If args is not given, all of x/y grid lines will be removed.
          */
         remove(args?: { class?: string; value?: number | string }): void;
     }
 
-    export function generate(config: ChartConfiguration): ChartAPI;
+    function generate(config: ChartConfiguration): ChartAPI;
 }
diff --git a/types/c3/tsconfig.json b/types/c3/tsconfig.json
index 640f7156af..e94921ceb7 100644
--- a/types/c3/tsconfig.json
+++ b/types/c3/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/c3/tslint.json b/types/c3/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/c3/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/cal-heatmap/index.d.ts b/types/cal-heatmap/index.d.ts
index 194d9fa128..f4b9f4df4f 100644
--- a/types/cal-heatmap/index.d.ts
+++ b/types/cal-heatmap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/wa0x6e/cal-heatmap
 // Definitions by: Chris Baker <https://github.com/RetroChrisB/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as d3 from "d3";
 
diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index e832f58446..5dad5af29a 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/catbox
 // Definitions by: Jason Swearingen <http://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Boom from 'boom';
 
diff --git a/types/chai-arrays/index.d.ts b/types/chai-arrays/index.d.ts
index d387d1614d..d50be4f101 100644
--- a/types/chai-arrays/index.d.ts
+++ b/types/chai-arrays/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Clément Prévot <https://github.com/clementprevot/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="chai" />
+/// <reference types="chai" />
 
 declare global {
     namespace Chai {
diff --git a/types/chai-as-promised/chai-as-promised-tests.ts b/types/chai-as-promised/chai-as-promised-tests.ts
index 7dceef924a..7e422521aa 100644
--- a/types/chai-as-promised/chai-as-promised-tests.ts
+++ b/types/chai-as-promised/chai-as-promised-tests.ts
@@ -7,7 +7,7 @@ class TestClass {}
 
 // ReSharper disable WrongExpressionStatement
 // BDD API (expect)
-var thenableNum: PromiseLike<number>;
+var thenableNum: PromiseLike<number> = Promise.resolve(3);
 thenableNum = chai.expect(thenableNum).to.eventually.equal(3);
 thenableNum = chai.expect(thenableNum).to.eventually.have.property('foo');
 thenableNum = chai.expect(thenableNum).to.become(3);
@@ -40,8 +40,8 @@ thenableNum = thenableNum.should.eventually.equal(3).notify(() => console.log('d
 thenableNum = thenableNum.should.be.fulfilled.and.notify(() => console.log('done'));
 
 // Complex examples on https://github.com/domenic/chai-as-promised#working-with-non-promisefriendly-test-runners
-thenableNum.should.be.fulfilled.then(function () {
-  thenableNum.should.equal("after");
+thenableNum.should.be.fulfilled.then(() => {
+    thenableNum.should.equal("after");
 }).should.notify(() => console.log('done'));
 
 Promise.all([
@@ -63,3 +63,15 @@ thenableVoid = chai.assert.isRejected(thenableNum, /error message matcher/, "opt
 // Check that original chai assertions are not broken
 var undef: void;
 undef = chai.assert.equal(10, 4, 'Message');
+
+chaiAsPromised.transferPromiseness = (assertion, promise) => {
+    assertion.then = promise.then.bind(promise);
+};
+
+chaiAsPromised.transformAsserterArgs = (args) => {
+    return args.map((x) => x + 1);
+};
+
+chaiAsPromised.transformAsserterArgs = (args) => {
+    return Promise.all(args);
+};
diff --git a/types/chai-as-promised/index.d.ts b/types/chai-as-promised/index.d.ts
index 4c36eccb61..0dde8837dd 100644
--- a/types/chai-as-promised/index.d.ts
+++ b/types/chai-as-promised/index.d.ts
@@ -1,13 +1,19 @@
 // Type definitions for chai-as-promised
 // Project: https://github.com/domenic/chai-as-promised/
-// Definitions by: jt000 <https://github.com/jt000>, Yuki Kokubun <https://github.com/Kuniwak>
+// Definitions by: jt000 <https://github.com/jt000>, Yuki Kokubun <https://github.com/Kuniwak>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="chai" />
 
 declare module 'chai-as-promised' {
     function chaiAsPromised(chai: any, utils: any): void;
-    namespace chaiAsPromised {}
+
+    namespace chaiAsPromised {
+        function transferPromiseness(assertion: Chai.PromisedAssertion, promise: PromiseLike<any>): void;
+
+        function transformAsserterArgs(values: any[]): any;
+    }
+
     export = chaiAsPromised;
 }
 
@@ -59,7 +65,7 @@ declare namespace Chai {
         haveOwnProperty: PromisedOwnProperty;
         length: PromisedLength;
         lengthOf: PromisedLength;
-        match(regexp: RegExp|string, message?: string): PromisedAssertion;
+        match(regexp: RegExp | string, message?: string): PromisedAssertion;
         string(string: string, message?: string): PromisedAssertion;
         keys: PromisedKeys;
         key(string: string): PromisedAssertion;
diff --git a/types/chai-as-promised/tsconfig.json b/types/chai-as-promised/tsconfig.json
index cdca01dc50..71874931b3 100644
--- a/types/chai-as-promised/tsconfig.json
+++ b/types/chai-as-promised/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "chai-as-promised-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/chai-enzyme/chai-enzyme-tests.tsx b/types/chai-enzyme/chai-enzyme-tests.tsx
index 8fc64e2711..77ad5a0169 100644
--- a/types/chai-enzyme/chai-enzyme-tests.tsx
+++ b/types/chai-enzyme/chai-enzyme-tests.tsx
@@ -5,7 +5,7 @@ import { shallow } from "enzyme";
 
 const Test = () => <div/>;
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component {
     render() {
         return <div/>;
     }
diff --git a/types/chai-enzyme/index.d.ts b/types/chai-enzyme/index.d.ts
index 92c5817504..86b6f6f7b3 100644
--- a/types/chai-enzyme/index.d.ts
+++ b/types/chai-enzyme/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/producthunt/chai-enzyme
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 
 /// <reference types="enzyme" />
diff --git a/types/chai-jquery/index.d.ts b/types/chai-jquery/index.d.ts
index 839a57a370..453336b08b 100644
--- a/types/chai-jquery/index.d.ts
+++ b/types/chai-jquery/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chaijs/chai-jquery
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="chai" />
 /// <reference types="jquery" />
diff --git a/types/chai-string/chai-string-tests.ts b/types/chai-string/chai-string-tests.ts
index 16f32760f8..615a6c1f95 100644
--- a/types/chai-string/chai-string-tests.ts
+++ b/types/chai-string/chai-string-tests.ts
@@ -1,12 +1,11 @@
 
 /// <reference types="mocha" />
-/// <reference types="node" />
 
 var should = chai.should();
 var assert = chai.assert;
 var expect = chai.expect;
 
-var chai_string = require('chai-string');
+import chai_string = require("chai-string");
 chai.use(chai_string);
 
 describe('chai-string', function() {
diff --git a/types/chai/chai-tests.ts b/types/chai/chai-tests.ts
index 756212995d..31802ca303 100644
--- a/types/chai/chai-tests.ts
+++ b/types/chai/chai-tests.ts
@@ -490,20 +490,20 @@ function property() {
     ({ foo: { bar: 'baz' } }).should.have.property('foo.bar');
 }
 
-function deepProperty() {
+function nestedProperty() {
     expect({ 'foo.bar': 'baz' })
-        .to.not.have.deep.property('foo.bar');
+        .to.not.have.nested.property('foo.bar');
     ({ 'foo.bar': 'baz' }).should
-        .not.have.deep.property('foo.bar');
+        .not.have.nested.property('foo.bar');
     expect({ foo: { bar: 'baz' } })
-        .to.have.deep.property('foo.bar');
+        .to.have.nested.property('foo.bar');
     ({ foo: { bar: 'baz' } }).should
-        .have.deep.property('foo.bar');
+        .have.nested.property('foo.bar');
 
     expect({ 'foo.bar': 'baz' })
-        .to.have.deep.property('foo.bar');
+        .to.have.nested.property('foo.bar');
     ({ 'foo.bar': 'baz' }).should
-        .have.deep.property('foo.bar');
+        .have.nested.property('foo.bar');
 }
 
 function property2() {
@@ -525,24 +525,24 @@ function property2() {
     'asd'.should.have.property('constructor', Number, 'blah');
 }
 
-function deepProperty2() {
+function nestedProperty2() {
     expect({ foo: { bar: 'baz' } })
-        .to.have.deep.property('foo.bar', 'baz');
+        .to.have.nested.property('foo.bar', 'baz');
     ({ foo: { bar: 'baz' } }).should
-        .have.deep.property('foo.bar', 'baz');
+        .have.nested.property('foo.bar', 'baz');
 
     expect({ foo: { bar: 'baz' } })
-        .to.have.deep.property('foo.bar', 'quux', 'blah');
+        .to.have.nested.property('foo.bar', 'quux', 'blah');
     ({ foo: { bar: 'baz' } }).should
-        .have.deep.property('foo.bar', 'quux', 'blah');
+        .have.nested.property('foo.bar', 'quux', 'blah');
     expect({ foo: { bar: 'baz' } })
-        .to.not.have.deep.property('foo.bar', 'baz', 'blah');
+        .to.not.have.nested.property('foo.bar', 'baz', 'blah');
     ({ foo: { bar: 'baz' } }).should
-        .not.have.deep.property('foo.bar', 'baz', 'blah');
+        .not.have.nested.property('foo.bar', 'baz', 'blah');
     expect({ foo: 5 })
-        .to.not.have.deep.property('foo.bar', 'baz', 'blah');
+        .to.not.have.nested.property('foo.bar', 'baz', 'blah');
     ({ foo: 5 }).should
-        .not.have.deep.property('foo.bar', 'baz', 'blah');
+        .not.have.nested.property('foo.bar', 'baz', 'blah');
 }
 
 function ownProperty() {
@@ -1017,6 +1017,24 @@ function sameDeepMembers() {
     assert.sameDeepMembers([{ id: 5 }, { id: 4 }], [{ id: 4 }, { id: 5 }]);
 }
 
+function orderedMembers() {
+    expect([1, 2]).to.have.ordered.members([1, 2]).but.not.have.ordered.members([2, 1]);
+    expect([1, 2, 3]).to.include.ordered.members([1, 2]).but.not.include.ordered.members([2, 3]);
+    expect([1, 2, 3]).to.have.ordered.members([1, 2, 3]);
+    expect([1, 2, 3]).to.have.members([2, 1, 3]).but.not.ordered.members([2, 1, 3]);
+    expect([{a: 1}, {b: 2}, {c: 3}]).to.include.deep.ordered.members([{a: 1}, {b: 2}]).but.not.include.deep.ordered.members([{b: 2}, {c: 3}]);
+
+    assert.sameOrderedMembers([ 1, 2, 3 ], [ 1, 2, 3 ], 'same ordered members');
+    assert.notSameOrderedMembers([ 1, 2, 3 ], [ 2, 1, 3 ], 'not same ordered members');
+    assert.sameDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { a: 1 }, { b: 2 }, { c: 3 } ], 'same deep ordered members');
+    assert.notSameDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { b: 2 }, { a: 1 }, { c: 3 } ], 'not same deep ordered members');
+
+    assert.includeOrderedMembers([ 1, 2, 3 ], [ 1, 2 ], 'include ordered members');
+    assert.notIncludeOrderedMembers([ 1, 2, 3 ], [ 2, 1 ], 'not include ordered members');
+    assert.includeDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { a: 1 }, { b: 2 } ], 'include deep ordered members');
+    assert.notIncludeDeepOrderedMembers([ { a: 1 }, { b: 2 }, { c: 3 } ], [ { b: 2 }, { c: 3 } ], 'not include deep ordered members');
+}
+
 function members() {
     expect([5, 4]).members([4, 5]);
     expect([5, 4]).members([5, 4]);
@@ -1343,7 +1361,7 @@ suite('assert', () => {
         assert.lengthOf([1, 2, 3], 3);
         assert.lengthOf('foobar', 6);
         assert.lengthOf('foobar', 5);
-        assert.lengthOf(1, 5);
+        assert.lengthOf({ length: 1 }, 5);
     });
 
     test('match', () => {
@@ -1659,4 +1677,4 @@ suite('assert', () => {
         assert.notFrozen(obj);
         assert.notFrozen(obj, 'message');
     });
-});
\ No newline at end of file
+});
diff --git a/types/chai/index.d.ts b/types/chai/index.d.ts
index 7690fe49a7..20f3c2b7df 100644
--- a/types/chai/index.d.ts
+++ b/types/chai/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chai 3.5.0
+// Type definitions for chai 4.0.0
 // Project: http://chaijs.com/
 // Definitions by: Jed Mao <https://github.com/jedmao/>,
 //                 Bart van der Schoor <https://github.com/Bartvds>,
@@ -61,6 +61,8 @@ declare namespace Chai {
     interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
         not: Assertion;
         deep: Deep;
+        ordered: Ordered;
+        nested: Nested;
         any: KeyFilter;
         all: KeyFilter;
         a: TypeComparison;
@@ -133,6 +135,8 @@ declare namespace Chai {
         at: Assertion;
         of: Assertion;
         same: Assertion;
+        but: Assertion;
+        does: Assertion;
     }
 
     interface NumericComparison {
@@ -167,6 +171,12 @@ declare namespace Chai {
         (expected: number, delta: number, message?: string): Assertion;
     }
 
+    interface Nested {
+      include: Include;
+      property: Property;
+      members: Members;
+    }
+
     interface Deep {
         equal: Equal;
         equals: Equal;
@@ -174,6 +184,11 @@ declare namespace Chai {
         include: Include;
         property: Property;
         members: Members;
+        ordered: Ordered;
+    }
+
+    interface Ordered {
+        members: Members;
     }
 
     interface KeyFilter {
@@ -206,6 +221,8 @@ declare namespace Chai {
         (value: string, message?: string): Assertion;
         (value: number, message?: string): Assertion;
         keys: Keys;
+        deep: Deep;
+        ordered: Ordered;
         members: Members;
         any: KeyFilter;
         all: KeyFilter;
@@ -256,7 +273,7 @@ declare namespace Chai {
 
         /**
          * Throws a failure.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -268,7 +285,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is truthy.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Object to test.
          * @param message    Message to display on error.
@@ -277,7 +294,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is truthy.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Object to test.
          * @param message    Message to display on error.
@@ -286,7 +303,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is falsy.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Object to test.
          * @param message    Message to display on error.
@@ -295,7 +312,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is falsy.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Object to test.
          * @param message    Message to display on error.
@@ -304,7 +321,7 @@ declare namespace Chai {
 
         /**
          * Asserts non-strict equality (==) of actual and expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -314,7 +331,7 @@ declare namespace Chai {
 
         /**
          * Asserts non-strict inequality (==) of actual and expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -324,7 +341,7 @@ declare namespace Chai {
 
         /**
          * Asserts strict equality (===) of actual and expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -334,7 +351,7 @@ declare namespace Chai {
 
         /**
          * Asserts strict inequality (==) of actual and expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -344,7 +361,7 @@ declare namespace Chai {
 
         /**
          * Asserts that actual is deeply equal to expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -354,7 +371,7 @@ declare namespace Chai {
 
         /**
          * Asserts that actual is not deeply equal to expected.
-         * 
+         *
          * @type T   Type of the objects.
          * @param actual   Actual value.
          * @param expected   Potential expected value.
@@ -364,7 +381,7 @@ declare namespace Chai {
 
         /**
          * Asserts valueToCheck is strictly greater than (>) valueToBeAbove.
-         * 
+         *
          * @param valueToCheck   Actual value.
          * @param valueToBeAbove   Minimum Potential expected value.
          * @param message   Message to display on error.
@@ -373,7 +390,7 @@ declare namespace Chai {
 
         /**
          * Asserts valueToCheck is greater than or equal to (>=) valueToBeAtLeast.
-         * 
+         *
          * @param valueToCheck   Actual value.
          * @param valueToBeAtLeast   Minimum Potential expected value.
          * @param message   Message to display on error.
@@ -382,7 +399,7 @@ declare namespace Chai {
 
         /**
          * Asserts valueToCheck is strictly less than (<) valueToBeBelow.
-         * 
+         *
          * @param valueToCheck   Actual value.
          * @param valueToBeBelow   Minimum Potential expected value.
          * @param message   Message to display on error.
@@ -391,7 +408,7 @@ declare namespace Chai {
 
         /**
          * Asserts valueToCheck is greater than or equal to (>=) valueToBeAtMost.
-         * 
+         *
          * @param valueToCheck   Actual value.
          * @param valueToBeAtMost   Minimum Potential expected value.
          * @param message   Message to display on error.
@@ -400,7 +417,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is true.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -409,7 +426,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is false.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -418,7 +435,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not true.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -427,7 +444,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not false.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -436,7 +453,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is null.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -445,7 +462,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not null.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -454,7 +471,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not null.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -463,7 +480,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not null.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -472,7 +489,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is undefined.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -481,7 +498,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not undefined.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -490,7 +507,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is a function.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -499,7 +516,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not a function.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -509,7 +526,7 @@ declare namespace Chai {
         /**
          * Asserts that value is an object of type 'Object'
          * (as revealed by Object.prototype.toString).
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -520,7 +537,7 @@ declare namespace Chai {
         /**
          * Asserts that value is not an object of type 'Object'
          * (as revealed by Object.prototype.toString).
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -529,7 +546,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is an array.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -538,7 +555,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not an array.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -547,7 +564,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is a string.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -556,7 +573,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not a string.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -565,7 +582,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is a number.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -574,7 +591,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not a number.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -583,7 +600,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is a boolean.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -592,7 +609,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not a boolean.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param message   Message to display on error.
@@ -601,7 +618,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value's type is name, as determined by Object.prototype.toString.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param name   Potential expected type name of value.
@@ -611,7 +628,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value's type is not name, as determined by Object.prototype.toString.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param name   Potential expected type name of value.
@@ -621,7 +638,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is an instance of constructor.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param constructor   Potential expected contructor of value.
@@ -631,7 +648,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value is not an instance of constructor.
-         * 
+         *
          * @type T   Type of value.
          * @param value   Actual value.
          * @param constructor   Potential expected contructor of value.
@@ -641,7 +658,7 @@ declare namespace Chai {
 
         /**
          * Asserts that haystack includes needle.
-         * 
+         *
          * @param haystack   Container string.
          * @param needle   Potential expected substring of haystack.
          * @param message   Message to display on error.
@@ -650,7 +667,7 @@ declare namespace Chai {
 
         /**
          * Asserts that haystack includes needle.
-         * 
+         *
          * @type T   Type of values in haystack.
          * @param haystack   Container array.
          * @param needle   Potential value contained in haystack.
@@ -660,7 +677,7 @@ declare namespace Chai {
 
         /**
          * Asserts that haystack does not include needle.
-         * 
+         *
          * @param haystack   Container string.
          * @param needle   Potential expected substring of haystack.
          * @param message   Message to display on error.
@@ -669,7 +686,7 @@ declare namespace Chai {
 
         /**
          * Asserts that haystack does not include needle.
-         * 
+         *
          * @type T   Type of values in haystack.
          * @param haystack   Container array.
          * @param needle   Potential value contained in haystack.
@@ -679,7 +696,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value matches the regular expression regexp.
-         * 
+         *
          * @param value   Actual value.
          * @param regexp   Potential match of value.
          * @param message   Message to display on error.
@@ -688,7 +705,7 @@ declare namespace Chai {
 
         /**
          * Asserts that value does not match the regular expression regexp.
-         * 
+         *
          * @param value   Actual value.
          * @param regexp   Potential match of value.
          * @param message   Message to display on error.
@@ -697,7 +714,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object has a property named by property.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Container object.
          * @param property   Potential contained property of object.
@@ -707,7 +724,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object has a property named by property.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Container object.
          * @param property   Potential contained property of object.
@@ -718,7 +735,7 @@ declare namespace Chai {
         /**
          * Asserts that object has a property named by property, which can be a string
          * using dot- and bracket-notation for deep reference.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Container object.
          * @param property   Potential contained property of object.
@@ -729,7 +746,7 @@ declare namespace Chai {
         /**
          * Asserts that object does not have a property named by property, which can be a
          * string using dot- and bracket-notation for deep reference.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Container object.
          * @param property   Potential contained property of object.
@@ -739,7 +756,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object has a property named by property with value given by value.
-         * 
+         *
          * @type T   Type of object.
          * @type V   Type of value.
          * @param object   Container object.
@@ -751,7 +768,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object has a property named by property with value given by value.
-         * 
+         *
          * @type T   Type of object.
          * @type V   Type of value.
          * @param object   Container object.
@@ -764,7 +781,7 @@ declare namespace Chai {
         /**
          * Asserts that object has a property named by property, which can be a string
          * using dot- and bracket-notation for deep reference.
-         * 
+         *
          * @type T   Type of object.
          * @type V   Type of value.
          * @param object   Container object.
@@ -777,7 +794,7 @@ declare namespace Chai {
         /**
          * Asserts that object does not have a property named by property, which can be a
          * string using dot- and bracket-notation for deep reference.
-         * 
+         *
          * @type T   Type of object.
          * @type V   Type of value.
          * @param object   Container object.
@@ -789,7 +806,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object has a length property with the expected value.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Container object.
          * @param length   Potential expected length of object.
@@ -799,7 +816,7 @@ declare namespace Chai {
 
         /**
          * Asserts that fn will throw an error.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param message   Message to display on error.
          */
@@ -807,7 +824,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param regExp   Potential expected message match.
          * @param message   Message to display on error.
@@ -816,7 +833,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error that is an instance of constructor.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -826,7 +843,7 @@ declare namespace Chai {
         /**
          * Asserts that function will throw an error that is an instance of constructor
          * and an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -835,7 +852,7 @@ declare namespace Chai {
 
         /**
          * Asserts that fn will throw an error.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param message   Message to display on error.
          */
@@ -843,7 +860,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param regExp   Potential expected message match.
          * @param message   Message to display on error.
@@ -852,7 +869,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error that is an instance of constructor.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -862,7 +879,7 @@ declare namespace Chai {
         /**
          * Asserts that function will throw an error that is an instance of constructor
          * and an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -871,7 +888,7 @@ declare namespace Chai {
 
         /**
          * Asserts that fn will throw an error.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param message   Message to display on error.
          */
@@ -879,7 +896,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param regExp   Potential expected message match.
          * @param message   Message to display on error.
@@ -888,7 +905,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error that is an instance of constructor.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -898,7 +915,7 @@ declare namespace Chai {
         /**
          * Asserts that function will throw an error that is an instance of constructor
          * and an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -907,7 +924,7 @@ declare namespace Chai {
 
         /**
          * Asserts that fn will not throw an error.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param message   Message to display on error.
          */
@@ -915,7 +932,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param regExp   Potential expected message match.
          * @param message   Message to display on error.
@@ -924,7 +941,7 @@ declare namespace Chai {
 
         /**
          * Asserts that function will throw an error that is an instance of constructor.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -934,7 +951,7 @@ declare namespace Chai {
         /**
          * Asserts that function will throw an error that is an instance of constructor
          * and an error with message matching regexp.
-         * 
+         *
          * @param fn   Function that may throw.
          * @param constructor   Potential expected error constructor.
          * @param message   Message to display on error.
@@ -943,7 +960,7 @@ declare namespace Chai {
 
         /**
          * Compares two values using operator.
-         * 
+         *
          * @param val1   Left value during comparison.
          * @param operator   Comparison operator.
          * @param val2   Right value during comparison.
@@ -953,7 +970,7 @@ declare namespace Chai {
 
         /**
          * Asserts that the target is equal to expected, to within a +/- delta range.
-         * 
+         *
          * @param actual   Actual value
          * @param expected   Potential expected value.
          * @param delta   Maximum differenced between values.
@@ -963,7 +980,7 @@ declare namespace Chai {
 
         /**
          * Asserts that the target is equal to expected, to within a +/- delta range.
-         * 
+         *
          * @param actual   Actual value
          * @param expected   Potential expected value.
          * @param delta   Maximum differenced between values.
@@ -973,7 +990,7 @@ declare namespace Chai {
 
         /**
          * Asserts that set1 and set2 have the same members. Order is not take into account.
-         * 
+         *
          * @type T   Type of set values.
          * @param set1   Actual set of values.
          * @param set2   Potential expected set of values.
@@ -984,7 +1001,7 @@ declare namespace Chai {
         /**
          * Asserts that set1 and set2 have the same members using deep equality checking.
          * Order is not take into account.
-         * 
+         *
          * @type T   Type of set values.
          * @param set1   Actual set of values.
          * @param set2   Potential expected set of values.
@@ -992,9 +1009,97 @@ declare namespace Chai {
          */
         sameDeepMembers<T>(set1: T[], set2: T[], message?: string): void;
 
+        /**
+         * Asserts that set1 and set2 have the same members in the same order.
+         * Uses a strict equality check (===).
+         *
+         * @type T   Type of set values.
+         * @param set1   Actual set of values.
+         * @param set2   Potential expected set of values.
+         * @param message   Message to display on error.
+         */
+        sameOrderedMembers<T>(set1: T[], set2: T[], message?: string): void;
+
+        /**
+         * Asserts that set1 and set2 don’t have the same members in the same order.
+         * Uses a strict equality check (===).
+         *
+         * @type T   Type of set values.
+         * @param set1   Actual set of values.
+         * @param set2   Potential expected set of values.
+         * @param message   Message to display on error.
+         */
+        notSameOrderedMembers<T>(set1: T[], set2: T[], message?: string): void;
+
+        /**
+         * Asserts that set1 and set2 have the same members in the same order.
+         * Uses a deep equality check.
+         *
+         * @type T   Type of set values.
+         * @param set1   Actual set of values.
+         * @param set2   Potential expected set of values.
+         * @param message   Message to display on error.
+         */
+        sameDeepOrderedMembers<T>(set1: T[], set2: T[], message?: string): void;
+
+        /**
+         * Asserts that set1 and set2 don’t have the same members in the same order.
+         * Uses a deep equality check.
+         *
+         * @type T   Type of set values.
+         * @param set1   Actual set of values.
+         * @param set2   Potential expected set of values.
+         * @param message   Message to display on error.
+         */
+        notSameDeepOrderedMembers<T>(set1: T[], set2: T[], message?: string): void;
+
+        /**
+         * Asserts that subset is included in superset in the same order beginning with the first element in superset.
+         * Uses a strict equality check (===).
+         *
+         * @type T   Type of set values.
+         * @param superset   Actual set of values.
+         * @param subset   Potential contained set of values.
+         * @param message   Message to display on error.
+         */
+        includeOrderedMembers<T>(superset: T[], subset: T[], message?: string): void;
+
+        /**
+         * Asserts that subset isn’t included in superset in the same order beginning with the first element in superset.
+         * Uses a strict equality check (===).
+         *
+         * @type T   Type of set values.
+         * @param superset   Actual set of values.
+         * @param subset   Potential contained set of values.
+         * @param message   Message to display on error.
+         */
+        notIncludeOrderedMembers<T>(superset: T[], subset: T[], message?: string): void;
+
+        /**
+         * Asserts that subset is included in superset in the same order beginning with the first element in superset.
+         * Uses a deep equality check.
+         *
+         * @type T   Type of set values.
+         * @param superset   Actual set of values.
+         * @param subset   Potential contained set of values.
+         * @param message   Message to display on error.
+         */
+        includeDeepOrderedMembers<T>(superset: T[], subset: T[], message?: string): void;
+
+        /**
+         * Asserts that subset isn’t included in superset in the same order beginning with the first element in superset.
+         * Uses a deep equality check.
+         *
+         * @type T   Type of set values.
+         * @param superset   Actual set of values.
+         * @param subset   Potential contained set of values.
+         * @param message   Message to display on error.
+         */
+        notIncludeDeepOrderedMembers<T>(superset: T[], subset: T[], message?: string): void;
+
         /**
          * Asserts that subset is included in superset. Order is not take into account.
-         * 
+         *
          * @type T   Type of set values.
          * @param superset   Actual set of values.
          * @param subset   Potential contained set of values.
@@ -1005,7 +1110,7 @@ declare namespace Chai {
         /**
          * Asserts that subset is included in superset using deep equality checking.
          * Order is not take into account.
-         * 
+         *
          * @type T   Type of set values.
          * @param superset   Actual set of values.
          * @param subset   Potential contained set of values.
@@ -1015,7 +1120,7 @@ declare namespace Chai {
 
         /**
          * Asserts that non-object, non-array value inList appears in the flat array list.
-         * 
+         *
          * @type T   Type of list values.
          * @param inList   Value expected to be in the list.
          * @param list   List of values.
@@ -1025,7 +1130,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function changes the value of a property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1036,7 +1141,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function does not change the value of a property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1047,7 +1152,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function increases an object property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1058,7 +1163,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function does not increase an object property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1069,7 +1174,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function decreases an object property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1080,7 +1185,7 @@ declare namespace Chai {
 
         /**
          * Asserts that a function does not decrease an object property.
-         * 
+         *
          * @type T   Type of object.
          * @param modifier   Function to run.
          * @param object   Container object.
@@ -1091,7 +1196,7 @@ declare namespace Chai {
 
         /**
          * Asserts if value is not a false value, and throws if it is a true value.
-         * 
+         *
          * @type T   Type of object.
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1102,7 +1207,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is extensible (can have new properties added to it).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1111,7 +1216,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is extensible (can have new properties added to it).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1120,7 +1225,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is not extensible.
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1129,7 +1234,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is not extensible.
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1139,7 +1244,7 @@ declare namespace Chai {
         /**
          * Asserts that object is sealed (can have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1149,7 +1254,7 @@ declare namespace Chai {
         /**
          * Asserts that object is sealed (can have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1158,7 +1263,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is not sealed.
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1167,7 +1272,7 @@ declare namespace Chai {
 
         /**
          * Asserts that object is not sealed.
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1177,7 +1282,7 @@ declare namespace Chai {
         /**
          * Asserts that object is frozen (cannot have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1187,7 +1292,7 @@ declare namespace Chai {
         /**
          * Asserts that object is frozen (cannot have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1197,7 +1302,7 @@ declare namespace Chai {
         /**
          * Asserts that object is not frozen (cannot have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
@@ -1207,7 +1312,7 @@ declare namespace Chai {
         /**
          * Asserts that object is not frozen (cannot have new properties added to it
          * and its existing properties cannot be removed).
-         * 
+         *
          * @type T   Type of object
          * @param object   Actual value.
          * @param message   Message to display on error.
diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 2b38efaa25..b9ffd7a8f6 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -1,15 +1,17 @@
-import { Chart, LinearChartData } from 'chart.js';
+import { Chart, ChartData } from 'chart.js';
 
-//alternative:
-//import chartjs = require('chart.js');
+// alternative:
+// import chartjs = require('chart.js');
 // => chartjs.Chart
 
-var chart = new Chart(new CanvasRenderingContext2D(), {
+let chart: Chart = new Chart(new CanvasRenderingContext2D(), {
     type: 'bar',
-    data: <LinearChartData> {
+    data: <ChartData> {
         labels: ['group 1'],
         datasets: [
             {
+                backgroundColor: '#000000',
+                borderWidth: 1,
                 label: 'test',
                 data: [1]
             }
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index cad58a2aa8..d567492602 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -1,7 +1,9 @@
-// Type definitions for Chart.js 2.4.0
+// Type definitions for Chart.js 2.4
 // Project: https://github.com/nnnick/Chart.js
 // Definitions by: Alberto Nuti <https://github.com/anuti>
+//                 Fabien Lavocat <https://github.com/FabienLavocat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -22,24 +24,63 @@ declare class Chart {
     toBase64: () => string;
     generateLegend: () => {};
     getElementAtEvent: (e: any) => {};
-    getElementsAtEvent: (e: any) => {}[];
-    getDatasetAtEvent: (e: any) => {}[];
+    getElementsAtEvent: (e: any) => Array<{}>;
+    getDatasetAtEvent: (e: any) => Array<{}>;
+    static pluginService: PluginServiceStatic;
 
     static defaults: {
         global: Chart.ChartOptions;
-    }
+    };
+}
+declare class PluginServiceStatic {
+    register(plugin?: PluginServiceRegistrationOptions): void;
+}
+
+interface PluginServiceRegistrationOptions {
+    beforeInit?(chartInstance: Chart): void;
+    afterInit?(chartInstance: Chart): void;
+
+    resize?(chartInstance: Chart, newChartSize: Size): void;
+
+    beforeUpdate?(chartInstance: Chart): void;
+    afterScaleUpdate?(chartInstance: Chart): void;
+    beforeDatasetsUpdate?(chartInstance: Chart): void;
+    afterDatasetsUpdate?(chartInstance: Chart): void;
+    afterUpdate?(chartInstance: Chart): void;
+
+    // This is called at the start of a render. It is only called once, even if the animation will run for a number of frames. Use beforeDraw or afterDraw
+    // to do something on each animation frame
+    beforeRender?(chartInstance: Chart): void;
+
+    // Easing is for animation
+    beforeDraw?(chartInstance: Chart, easing: string): void;
+    afterDraw?(chartInstance: Chart, easing: string): void;
+    // Before the datasets are drawn but after scales are drawn
+    beforeDatasetsDraw?(chartInstance: Chart, easing: string): void;
+    afterDatasetsDraw?(chartInstance: Chart, easing: string): void;
+
+    destroy?(chartInstance: Chart): void;
+
+    // Called when an event occurs on the chart
+    beforeEvent?(chartInstance: Chart, event: Event): void;
+    afterEvent?(chartInstance: Chart, event: Event): void;
+}
+
+interface Size {
+    height: number;
+    width: number;
 }
 
 declare namespace Chart {
-    export type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble';
+    type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble';
 
-    export type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
+    type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
 
-    export type ScaleType = 'category' | 'linear' | 'logarithmic' | 'time' | 'radialLinear';
+    type ScaleType = 'category' | 'linear' | 'logarithmic' | 'time' | 'radialLinear';
 
-    export type PositionType = 'left' | 'right' | 'top' | 'bottom';
+    type PositionType = 'left' | 'right' | 'top' | 'bottom';
 
-    export interface ChartLegendItem {
+    interface ChartLegendItem {
         text?: string;
         fillStyle?: string;
         hidden?: boolean;
@@ -51,58 +92,54 @@ declare namespace Chart {
         strokeStyle?: string;
     }
 
-    export interface ChartTooltipItem {
+    interface ChartTooltipItem {
         xLabel?: string;
         yLabel?: string;
         datasetIndex?: number;
         index?: number;
     }
 
-    export interface ChartTooltipCallback {
-        beforeTitle?: (item?: ChartTooltipItem[], data?: any) => void;
-        title?: (item?: ChartTooltipItem[], data?: any) => void;
-        afterTitle?: (item?: ChartTooltipItem[], data?: any) => void;
-        beforeBody?: (item?: ChartTooltipItem[], data?: any) => void;
-        beforeLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-        label?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-        afterLabel?: (tooltipItem?: ChartTooltipItem, data?: any) => void;
-        afterBody?: (item?: ChartTooltipItem[], data?: any) => void;
-        beforeFooter?: (item?: ChartTooltipItem[], data?: any) => void;
-        footer?: (item?: ChartTooltipItem[], data?: any) => void;
-        afterFooter?: (item?: ChartTooltipItem[], data?: any) => void;
+    interface ChartTooltipCallback {
+        beforeTitle?(item?: ChartTooltipItem[], data?: any): void;
+        title?(item?: ChartTooltipItem[], data?: any): void;
+        afterTitle?(item?: ChartTooltipItem[], data?: any): void;
+        beforeBody?(item?: ChartTooltipItem[], data?: any): void;
+        beforeLabel?(tooltipItem?: ChartTooltipItem, data?: any): void;
+        label?(tooltipItem?: ChartTooltipItem, data?: any): void;
+        afterLabel?(tooltipItem?: ChartTooltipItem, data?: any): void;
+        afterBody?(item?: ChartTooltipItem[], data?: any): void;
+        beforeFooter?(item?: ChartTooltipItem[], data?: any): void;
+        footer?(item?: ChartTooltipItem[], data?: any): void;
+        afterFooter?(item?: ChartTooltipItem[], data?: any): void;
     }
 
-    export interface ChartAnimationParameter {
+    interface ChartAnimationParameter {
         chartInstance?: any;
         animationObject?: any;
     }
 
-    export interface ChartPoint {
+    interface ChartPoint {
         x?: number | string | Date;
         y?: number;
     }
 
-    export interface ChartConfiguration {
+    interface ChartConfiguration {
         type?: ChartType | string;
         data?: ChartData;
         options?: ChartOptions;
     }
 
-    export interface ChartData {
-
-    }
-
-    export interface LinearChartData extends ChartData {
+    interface ChartData {
         labels?: string[];
         datasets?: ChartDataSets[];
     }
 
-    export interface ChartOptions {
+    interface ChartOptions {
         responsive?: boolean;
         responsiveAnimationDuration?: number;
         maintainAspectRatio?: boolean;
         events?: string[];
-        onClick?: (any?: any) => any;
+        onClick?(any?: any): any;
         title?: ChartTitleOptions;
         legend?: ChartLegendOptions;
         tooltips?: ChartTooltipOptions;
@@ -113,14 +150,14 @@ declare namespace Chart {
         cutoutPercentage?: number;
     }
 
-    export interface ChartFontOptions {
+    interface ChartFontOptions {
         defaultFontColor?: ChartColor;
         defaultFontFamily?: string;
         defaultFontSize?: number;
         defaultFontStyle?: string;
     }
 
-    export interface ChartTitleOptions {
+    interface ChartTitleOptions {
         display?: boolean;
         position?: string;
         fullWdith?: boolean;
@@ -132,27 +169,27 @@ declare namespace Chart {
         text?: string;
     }
 
-    export interface ChartLegendOptions {
+    interface ChartLegendOptions {
         display?: boolean;
         position?: string;
         fullWidth?: boolean;
-        onClick?: (event: any, legendItem: any) => void;
+        onClick?(event: any, legendItem: any): void;
         labels?: ChartLegendLabelOptions;
     }
 
-    export interface ChartLegendLabelOptions {
+    interface ChartLegendLabelOptions {
         boxWidth?: number;
         fontSize?: number;
         fontStyle?: number;
         fontColor?: ChartColor;
         fontFamily?: string;
         padding?: number;
-        generateLabels?: (chart: any) => any;
+        generateLabels?(chart: any): any;
     }
 
-    export interface ChartTooltipOptions {
+    interface ChartTooltipOptions {
         enabled?: boolean;
-        custom?: (a: any) => void;
+        custom?(a: any): void;
         mode?: string;
         backgroundColor?: ChartColor;
         titleFontFamily?: string;
@@ -180,42 +217,42 @@ declare namespace Chart {
         callbacks?: ChartTooltipCallback;
     }
 
-    export interface ChartHoverOptions {
+    interface ChartHoverOptions {
         mode?: string;
         animationDuration?: number;
-        onHover?: (active: any) => void;
+        onHover?(active: any): void;
     }
 
-    export interface ChartAnimationObject {
+    interface ChartAnimationObject {
         currentStep?: number;
         numSteps?: number;
         easing?: string;
-        render?: (arg: any) => void;
-        onAnimationProgress?: (arg: any) => void;
-        onAnimationComplete?: (arg: any) => void;
+        render?(arg: any): void;
+        onAnimationProgress?(arg: any): void;
+        onAnimationComplete?(arg: any): void;
     }
 
-    export interface ChartAnimationOptions {
+    interface ChartAnimationOptions {
         duration?: number;
         easing?: string;
-        onProgress?: (chart: any) => void;
-        onComplete?: (chart: any) => void;
+        onProgress?(chart: any): void;
+        onComplete?(chart: any): void;
     }
 
-    export interface ChartElementsOptions {
+    interface ChartElementsOptions {
         point?: ChartPointOptions;
         line?: ChartLineOptions;
         arc?: ChartArcOptions;
         rectangle?: ChartRectangleOptions;
     }
 
-    export interface ChartArcOptions {
+    interface ChartArcOptions {
         backgroundColor?: ChartColor;
         borderColor?: ChartColor;
         borderWidth?: number;
     }
 
-    export interface ChartLineOptions {
+    interface ChartLineOptions {
         tension?: number;
         backgroundColor?: ChartColor;
         borderWidth?: number;
@@ -224,9 +261,12 @@ declare namespace Chart {
         borderDash?: any[];
         borderDashOffset?: number;
         borderJoinStyle?: string;
+        capBezierPoints?: boolean;
+        fill?: 'zero' | 'top' | 'bottom' | boolean;
+        stepped?: boolean;
     }
 
-    export interface ChartPointOptions {
+    interface ChartPointOptions {
         radius?: number;
         pointStyle?: string;
         backgroundColor?: ChartColor;
@@ -237,13 +277,13 @@ declare namespace Chart {
         hoverBorderWidth?: number;
     }
 
-    export interface ChartRectangleOptions {
+    interface ChartRectangleOptions {
         backgroundColor?: ChartColor;
         borderWidth?: number;
         borderColor?: ChartColor;
         borderSkipped?: string;
     }
-    export interface GridLineOptions {
+    interface GridLineOptions {
         display?: boolean;
         color?: ChartColor;
         lineWidth?: number;
@@ -256,7 +296,7 @@ declare namespace Chart {
         offsetGridLines?: boolean;
     }
 
-    export interface ScaleTitleOptions {
+    interface ScaleTitleOptions {
         display?: boolean;
         labelString?: string;
         fontColor?: ChartColor;
@@ -265,9 +305,9 @@ declare namespace Chart {
         fontStyle?: string;
     }
 
-    export interface TickOptions {
+    interface TickOptions {
         autoSkip?: boolean;
-        callback?: (value: any, index: any, values: any) => string;
+        callback?(value: any, index: any, values: any): string;
         display?: boolean;
         fontColor?: ChartColor;
         fontFamily?: string;
@@ -282,28 +322,28 @@ declare namespace Chart {
         min?: any;
         max?: any;
     }
-    export interface AngleLineOptions {
+    interface AngleLineOptions {
         display?: boolean;
         color?: ChartColor;
         lineWidth?: number;
     }
 
-    export interface PointLabelOptions {
-        callback?: (arg: any) => any;
+    interface PointLabelOptions {
+        callback?(arg: any): any;
         fontColor?: ChartColor;
         fontFamily?: string;
         fontSize?: number;
         fontStyle?: string;
     }
 
-    export interface TickOptions {
+    interface TickOptions {
         backdropColor?: ChartColor;
         backdropPaddingX?: number;
         backdropPaddingY?: number;
         maxTicksLimit?: number;
         showLabelBackdrop?: boolean;
     }
-    export interface LinearTickOptions extends TickOptions {
+    interface LinearTickOptions extends TickOptions {
         beginAtZero?: boolean;
         min?: number;
         max?: number;
@@ -313,15 +353,15 @@ declare namespace Chart {
         suggestedMax?: number;
     }
 
-    export interface LogarithmicTickOptions extends TickOptions {
+    interface LogarithmicTickOptions extends TickOptions {
         min?: number;
         max?: number;
     }
 
-    type ChartColor = string | CanvasGradient | CanvasPattern;
+    type ChartColor = string | CanvasGradient | CanvasPattern | string[];
 
-    export interface ChartDataSets {
-        backgroundColor?: ChartColor;
+    interface ChartDataSets {
+        backgroundColor?: ChartColor | ChartColor[];
         borderWidth?: number;
         borderColor?: ChartColor;
         borderCapStyle?: string;
@@ -344,26 +384,30 @@ declare namespace Chart {
         pointStyle?: string | string[] | HTMLImageElement | HTMLImageElement[];
         xAxisID?: string;
         yAxisID?: string;
+        type?: string;
+        hidden?: boolean;
+        hideInLegendAndTooltip?: boolean;
+        stack?: string;
     }
 
-    export interface ChartScales {
+    interface ChartScales {
         type?: ScaleType | string;
         display?: boolean;
         position?: PositionType | string;
-        beforeUpdate?: (scale?: any) => void;
-        beforeSetDimension?: (scale?: any) => void;
-        beforeDataLimits?: (scale?: any) => void;
-        beforeBuildTicks?: (scale?: any) => void;
-        beforeTickToLabelConversion?: (scale?: any) => void;
-        beforeCalculateTickRotation?: (scale?: any) => void;
-        beforeFit?: (scale?: any) => void;
-        afterUpdate?: (scale?: any) => void;
-        afterSetDimension?: (scale?: any) => void;
-        afterDataLimits?: (scale?: any) => void;
-        afterBuildTicks?: (scale?: any) => void;
-        afterTickToLabelConversion?: (scale?: any) => void;
-        afterCalculateTickRotation?: (scale?: any) => void;
-        afterFit?: (scale?: any) => void;
+        beforeUpdate?(scale?: any): void;
+        beforeSetDimension?(scale?: any): void;
+        beforeDataLimits?(scale?: any): void;
+        beforeBuildTicks?(scale?: any): void;
+        beforeTickToLabelConversion?(scale?: any): void;
+        beforeCalculateTickRotation?(scale?: any): void;
+        beforeFit?(scale?: any): void;
+        afterUpdate?(scale?: any): void;
+        afterSetDimension?(scale?: any): void;
+        afterDataLimits?(scale?: any): void;
+        afterBuildTicks?(scale?: any): void;
+        afterTickToLabelConversion?(scale?: any): void;
+        afterCalculateTickRotation?(scale?: any): void;
+        afterFit?(scale?: any): void;
         gridLines?: GridLineOptions;
         scaleLabel?: ScaleTitleOptions;
         ticks?: TickOptions;
@@ -371,7 +415,7 @@ declare namespace Chart {
         yAxes?: ChartYAxe[];
     }
 
-    export interface CommonAxe {
+    interface CommonAxe {
         type?: ScaleType | string;
         display?: boolean;
         id?: string;
@@ -383,24 +427,25 @@ declare namespace Chart {
         scaleLabel?: ScaleTitleOptions;
     }
 
-    export interface ChartXAxe extends CommonAxe {
+    interface ChartXAxe extends CommonAxe {
         categoryPercentage?: number;
         barPercentage?: number;
         time?: TimeScale;
     }
 
-    export interface ChartYAxe extends CommonAxe {
+    // tslint:disable-next-line no-empty-interface
+    interface ChartYAxe extends CommonAxe {
     }
 
-    export interface LinearScale extends ChartScales {
+    interface LinearScale extends ChartScales {
         ticks?: LinearTickOptions;
     }
 
-    export interface LogarithmicScale extends ChartScales {
+    interface LogarithmicScale extends ChartScales {
         ticks?: LogarithmicTickOptions;
     }
 
-    export interface TimeDisplayFormat {
+    interface TimeDisplayFormat {
         millisecond?: string;
         second?: string;
         minute?: string;
@@ -412,7 +457,7 @@ declare namespace Chart {
         year?: string;
     }
 
-    export interface TimeScale extends ChartScales {
+    interface TimeScale extends ChartScales {
         displayFormats?: TimeDisplayFormat;
         isoWeekday?: boolean;
         max?: string;
@@ -425,7 +470,7 @@ declare namespace Chart {
         minUnit?: TimeUnit;
     }
 
-    export interface RadialLinearScale {
+    interface RadialLinearScale {
         lineArc?: boolean;
         angleLines?: AngleLineOptions;
         pointLabels?: PointLabelOptions;
diff --git a/types/chart.js/tslint.json b/types/chart.js/tslint.json
new file mode 100644
index 0000000000..a62d0d4e68
--- /dev/null
+++ b/types/chart.js/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false
+    }
+}
diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index 2a4a362e7e..13a7c7dd1c 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -401,3 +401,29 @@ var overlappingBarsResponsiveOptions: Array<Chartist.IResponsiveOptionTuple<Char
 ];
 
 new Chartist.Bar('.ct-chart', overlappingBarsData, overlappingBarsOptions, overlappingBarsResponsiveOptions);
+
+new Chartist.Candle('.ct-chart', {
+  labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+  series: [
+    [5, 4, 3, 7],
+    [3, 2, 9, 5],
+    [5, 4, 3, 7],
+    [3, 2, 9, 5],
+    [5, 4, 3, 7],
+    [3, 2, 9, 5],
+    [3, 2, 9, 5]
+  ]
+}, {
+  axisX: {
+    labelOffset: {
+      x: -10,
+      y: 0
+    }
+  },
+  axisY: {
+    showGrid: false,
+    labelInterpolationFnc: function (value: any) {
+      return value + 12000;
+    }
+  }
+});
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index f2a74d7c31..e1d4cba452 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Chartist v0.9.5
+// Type definitions for Chartist v0.9.6
 // Project: https://github.com/gionkunz/chartist-js
-// Definitions by: Matt Gibbs <https://github.com/mtgibbs>
+// Definitions by: Matt Gibbs <https://github.com/mtgibbs>, Simon Pfeifer <https://github.com/psimonski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chartist {
@@ -20,6 +20,7 @@ declare namespace Chartist {
     Pie: IChartistPieChart;
     Bar: IChartistBarChart;
     Line: IChartistLineChart;
+    Candle: IChartistCandleChart;
 
     FixedScaleAxis: IFixedScaleAxisStatic;
     AutoScaleAxis: IAutoScaleAxisStatic;
@@ -138,6 +139,10 @@ declare namespace Chartist {
     new (target: any, data: IChartistData, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
   }
 
+  interface IChartistCandleChart extends IChartistBase<ICandleChartOptions> {
+    new (target: any, data: IChartistData, options?: ICandleChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ICandleChartOptions>>): IChartistCandleChart;
+  }
+
   interface IChartOptions {
     /**
      * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
@@ -352,6 +357,124 @@ declare namespace Chartist {
     end?: string;
   }
 
+  interface ICandleChartOptions extends IChartOptions {
+
+    /**
+     * Options for X-Axis
+     */
+    axisX?: ICandleChartAxis;
+
+    /**
+     * Options for Y-Axis
+     */
+    axisY?: ICandleChartAxis;
+
+    /**
+     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
+     */
+    width?: number | string;
+
+    /**
+     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
+     */
+    height?: number | string;
+
+    /**
+     * Overriding the natural high of the chart allows you to zoom in or limit the charts highest displayed value
+     */
+    hight?: number | string;
+
+    /**
+     * Overriding the natural low of the chart allows you to zoom in or limit the charts lowest displayed value
+     */
+    low?: number | string;
+
+    /**
+     * Width of candle body in pixel (IMO is 2 px best minimum value)
+     */
+    candleWidth?: number | string;
+
+    /**
+     * Width of candle wick in pixel (IMO is 1 px best minimum value)
+     */
+    candleWickWidth?: number | string;
+
+    /**
+     * Use calculated x-axis step length, depending on the number of quotes to display, as candle width. Otherwise the candleWidth is being used.
+     */
+    useStepLengthAsCandleWidth?: boolean | string;
+
+    /**
+     * Use 1/3 of candle body width as width for the candle wick, otherwise the candleWickWidth is being used.
+     */
+    useOneThirdAsCandleWickWidth?: boolean | string;
+
+    /**
+     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
+     */
+    chartPadding?: IChartPadding | number;
+
+    /**
+     * When set to true, the last grid line on the x-axis is not drawn and the chart elements will expand to the full available width of the chart. For the last label to be drawn correctly you might need to add chart padding or offset the last label with a draw event handler.
+     */
+    fullWidth?: boolean | string;
+
+    /**
+     * Override the class names that get used to generate the SVG structure of the chart
+     */
+    classNames?: ICandleChartClasses;
+  }
+
+  interface ICandleChartAxis {
+    /**
+     * The offset of the chart drawing area to the border of the container
+     */
+    offset?: number;
+    /**
+     * Position where labels are placed. Can be set to `start` or `end` where `start` is equivalent to left or top on vertical axis and `end` is equivalent to right or bottom on horizontal axis.
+     */
+    position?: string;
+    /**
+     * Allows you to correct label positioning on this axis by positive or negative x and y offset.
+     */
+    labelOffset?: {
+      x?: number;
+      y?: number;
+    };
+    /**
+     * If labels should be shown or not
+     */
+    showLabel?: boolean;
+    /**
+     * If the axis grid should be drawn or not
+     */
+    showGrid?: boolean;
+    /**
+     * Interpolation function that allows you to intercept the value from the axis label
+     */
+    labelInterpolationFnc?: Function;
+    /**
+     * Set the axis type to be used to project values on this axis. If not defined, Chartist.StepAxis will be used for the X-Axis, where the ticks option will be set to the labels in the data and the stretch option will be set to the global fullWidth option. This type can be changed to any axis constructor available (e.g. Chartist.FixedScaleAxis), where all axis options should be present here.
+     */
+    type?: any;
+  }
+
+  interface ICandleChartClasses {
+    chart?: string;
+    label?: string;
+    labelGroup?: string;
+    series?: string;
+    candlePositive?: string;
+    candleNegative?: string,
+    grid?: string,
+    gridGroup?: string,
+    gridBackground?: string,
+    vertical?: string,
+    horizontal?: string,
+    start?: string,
+    end?: string,
+  }
+
   interface ChartistSvgStatic {
     new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
 
diff --git a/types/chokidar/index.d.ts b/types/chokidar/index.d.ts
index dd0569656c..09e957aa05 100644
--- a/types/chokidar/index.d.ts
+++ b/types/chokidar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for chokidar 1.6.1
+// Type definitions for chokidar 1.7.0
 // Project: https://github.com/paulmillr/chokidar
 // Definitions by: Stefan Steinhart <https://github.com/reppners/>, Felix Becker <https://github.com/felixfbecker/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -79,6 +79,12 @@ export interface WatchOptions {
      * be relative to this.
      */
     cwd?: string;
+    
+    /**
+     *  If set to true then the strings passed to .watch() and .add() are treated as literal path
+     *  names, even if they look like globs. Default: false.
+     */
+    disableGlobbing?: boolean;
 
     /**
      * Whether to use fs.watchFile (backed by polling), or fs.watch. If polling leads to high CPU
diff --git a/types/chosen-js/index.d.ts b/types/chosen-js/index.d.ts
index c7ffa437bc..221eefb3d3 100644
--- a/types/chosen-js/index.d.ts
+++ b/types/chosen-js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://harvesthq.github.com/chosen/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, denis <https://github.com/denisname/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/chroma-js/chroma-js-tests.ts b/types/chroma-js/chroma-js-tests.ts
index 200d07615a..53a3e912b8 100644
--- a/types/chroma-js/chroma-js-tests.ts
+++ b/types/chroma-js/chroma-js-tests.ts
@@ -1,13 +1,9 @@
-
-
-import * as myChroma from "chroma-js";
-
 function test_chroma() {
     chroma('hotpink');
     chroma('#ff3399');
     chroma('F39');
     chroma.hex("#fff");
-    
+
     chroma(0xff3399);
     chroma(0xff, 0x33, 0x99);
     chroma(255, 51, 153);
@@ -37,15 +33,15 @@ function test_chroma() {
     chroma.contrast('pink', 'hotpink');
     chroma.contrast('pink', 'purple');
     chroma.brewer.OrRd;
-    var data = [3.0, 3.5, 3.6, 3.8, 3.8, 4.1, 4.3, 4.4,
+    const data = [3.0, 3.5, 3.6, 3.8, 3.8, 4.1, 4.3, 4.4,
         4.6, 4.9, 5.2, 5.3, 5.4, 5.7, 5.8, 5.9,
         6.2, 6.5, 6.8, 7.2, 9];
     chroma.limits(data, 'e', 5);
     chroma.limits(data, 'q', 5);
     chroma.limits(data, 'k', 5);
 
-    myChroma(0xff3399);
-    myChroma.limits(data, 'k', 5);
+    chroma(0xff3399);
+    chroma.limits(data, 'k', 5);
 }
 
 function test_color() {
@@ -105,13 +101,13 @@ function test_color() {
     chroma('#b3ccff').temperature();
     chroma('33cc00').gl();
 
-    myChroma('teal').alpha(0.5).css();
-    myChroma('teal').css('hsl');
-    myChroma('orange').rgb();
+    chroma('teal').alpha(0.5).css();
+    chroma('teal').css('hsl');
+    chroma('orange').rgb();
 }
 
 function test_scale() {
-    var f = chroma.scale();
+    const f = chroma.scale();
     f(0.25);
     f(0.5);
     f(0.75);
@@ -173,7 +169,7 @@ function test_scale() {
     chroma.scale('OrRd').classes(5);
     chroma.scale('OrRd').classes(8);
 
-    myChroma.cubehelix()
+    chroma.cubehelix()
         .start(200)
         .rotations(-0.35)
         .gamma(0.7)
@@ -183,6 +179,6 @@ function test_scale() {
         .correctLightness()
         .colors(5);
 
-    myChroma.scale('RdYlBu');
-    myChroma.scale('RdYlBu').padding(0.15);
+    chroma.scale('RdYlBu');
+    chroma.scale('RdYlBu').padding(0.15);
 }
diff --git a/types/chroma-js/index.d.ts b/types/chroma-js/index.d.ts
index e3f463d368..1b679b816a 100644
--- a/types/chroma-js/index.d.ts
+++ b/types/chroma-js/index.d.ts
@@ -1,29 +1,35 @@
-// Type definitions for Chroma.js v1.1.1
+// Type definitions for Chroma.js 1.3
 // Project: https://github.com/gka/chroma.js
 // Definitions by: Sebastian Brückner <https://github.com/invliD>, Marcin Pacholec <https://github.com/mpacholec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * Chroma.js is a tiny library for all kinds of color conversions and color scales.
  */
 declare namespace Chroma {
-    export interface ChromaStatic {
+    interface ColorSpaces {
+        rgb: [number, number, number];
+        rgba: [number, number, number, number];
+        hsl: [number, number, number];
+        hsv: [number, number, number];
+        hsi: [number, number, number];
+        lab: [number, number, number];
+        lch: [number, number, number];
+        hcl: [number, number, number];
+        cmyk: [number, number, number, number];
+        gl: [number, number, number, number];
+    }
 
+    interface ChromaStatic {
         /**
          * Creates a color from a string representation (as supported in CSS).
+         * Creates a color from a number representation [0; 16777215]
          *
          * @param color The string to convert to a color.
          * @return the color object.
          */
-        (color: string): Color;
-
-        /**
-         * Creates a color from a number representation [0; 16777215]
-         * 
-         * @param color The number to convert to a color.
-         * @return the color object.
-         */
-        (number: number): Color;
+        (color: string | number): Color;
 
         /**
          * Create a color in the specified color space using a, b and c as values.
@@ -31,21 +37,21 @@ declare namespace Chroma {
          * @param a
          * @param b
          * @param c
-         * @param colorSpace The color space to use (one of "rgb", "hsl", "hsv", "lab", "lch", "gl"). Defaults to "rgb".
+         * @param colorSpace The color space to use. Defaults to "rgb".
          * @return the color object.
-        */
-        (a: number, b: number, c: number, colorSpace?: string): Color;
+         */
+        (a: number, b: number, c: number, colorSpace?: keyof ColorSpaces): Color;
 
-        (a: number, b: number, c: number, d: number, colorSpace?: string): Color;
+        (a: number, b: number, c: number, d: number, colorSpace?: keyof ColorSpaces): Color;
 
         /**
-          * Create a color in the specified color space using values.
-          *
-          * @param values An array of values (e.g. [r, g, b, a?]).
-          * @param colorSpace The color space to use (one of "rgb", "hsl", "hsv", "lab", "lch", "gl"). Defaults to "rgb".
-          * @return the color object.
-          */
-        (values: number[], colorSpace?: string): Color;
+         * Create a color in the specified color space using values.
+         *
+         * @param values An array of values (e.g. [r, g, b, a?]).
+         * @param colorSpace The color space to use. Defaults to "rgb".
+         * @return the color object.
+         */
+        (values: number[], colorSpace?: keyof ColorSpaces): Color;
 
         /**
          * Create a color from a hex or string representation (as supported in CSS).
@@ -67,25 +73,43 @@ declare namespace Chroma {
 
         rgb(r: number, g: number, b: number): Color;
 
-        /** 
+        /**
          * GL is a variant of RGB(A), with the only difference that the components are normalized to the range of 0..1.
-        */
+         */
         gl(red: number, green: number, blue: number, alpha?: number): Color;
 
-        /** 
-         * light 2000K, bright sunlight 6000K. Based on Neil Bartlett's implementation. 
+        /**
+         * Returns a color from the color temperature scale.
+         * light 2000K, bright sunlight 6000K.
+         * Based on Neil Bartlett's implementation.
          * https://github.com/neilbartlett/color-temperature
-        */
+         */
         temperature(t: number): Color;
 
-        mix(col1: string | Color, col2: string | Color, f?: number, colorSpace?: string): Color;
-
-        interpolate(col1: string | Color, col2: string | Color, f?: number, colorSpace?: string): Color;
+        /**
+         * Mixes two colors. The mix ratio is a value between 0 and 1.
+         * The color mixing produces different results based the color space used for interpolation.
+         * @example chroma.mix('red', 'blue', 0.25) // => #bf0040
+         * @example chroma.mix('red', 'blue', 0.5, 'hsl') // => #ff00ff
+         */
+        mix(color1: string | Color, color2: string | Color, f?: number, colorSpace?: keyof ColorSpaces): Color;
 
         /**
-         * Blends two colors using RGB channel-wise blend functions. Valid blend modes are multiply, darken, lighten, screen, overlay, burn, and dogde.
+         * Alias for {@see mix}.
          */
-        blend(col1: string, col2: string, blendMode: string): Color;
+        interpolate(color1: string | Color, color2: string | Color, f?: number, colorSpace?: keyof ColorSpaces): Color;
+
+        /**
+         * Similar to {@link mix}, but accepts more than two colors. Simple averaging of R,G,B components and the alpha
+         * channel.
+         */
+        average(colors: Array<string | Color>, colorSpace?: keyof ColorSpaces): Color;
+
+        /**
+         * Blends two colors using RGB channel-wise blend functions.
+         */
+        blend(color1: string | Color, color2: string | Color,
+              blendMode: 'multiply' | 'darken' | 'lighten' | 'screen' | 'overlay' | 'burn' | 'dogde'): Color;
 
         /**
          * Returns a random color.
@@ -93,19 +117,29 @@ declare namespace Chroma {
         random(): Color;
 
         /**
-         * Computes the WCAG contrast ratio between two colors. 
-         * A minimum contrast of 4.5:1 is recommended to ensure that text is still readable against a background color.
-         *
-         * @param color1 The first color.
-         * @param color2 The second color.
-         * @return the contrast ratio.
+         * Computes the WCAG contrast ratio between two colors.
+         * A minimum contrast of 4.5:1 is recommended {@link https://www.w3.org/TR/WCAG20-TECHS/G18.html}
+         * to ensure that text is still readable against a background color.
          */
-        contrast(col1: string | Color, col2: string | Color): number;
-
-        bezier(colors: string[]): Scale;
+        contrast(color1: string | Color, color2: string | Color): number;
 
         /**
-         * chroma.brewer is an map of ColorBrewer scales that are included in chroma.js for convenience. 
+         * Computes the eucledian distance between two colors in a given color space (default is 'lab').
+         * {@link https://en.wikipedia.org/wiki/Euclidean_distance#Three_dimensions}
+         */
+        distance(color1: string | Color, color2: string | Color, colorSpace?: keyof ColorSpaces): Color;
+
+        /**
+         * Computes color difference {@link https://en.wikipedia.org/wiki/Color_difference#CMC_l:c_.281984.29} as
+         * developed by the Colour Measurement Committee of the Society of Dyers and Colourists (CMC) in 1984.
+         * The implementation is adapted from Bruce Lindbloom.
+         * {@link https://web.archive.org/web/20160306044036/http://www.brucelindbloom.com/javascript/ColorDiff.js}
+         * The parameters L (default 1) and C (default 1) are weighting factors for lightness and chromacity.
+         */
+        deltaE(color1: string | Color, color2: string | Color, L?: number, C?: number): Color;
+
+        /**
+         * chroma.brewer is an map of ColorBrewer scales that are included in chroma.js for convenience.
          * chroma.scale uses the colors to construct.
          */
         brewer: {
@@ -147,123 +181,179 @@ declare namespace Chroma {
         };
 
         /**
-         * Helper function that computes class breaks for you, based on actual data. 
-         * Supports three different modes: equidistant breaks, quantiles breaks and breaks based on k-means clusting.
+         * Helper function that computes class breaks based on data.
+         * Mode:
+         *  <li>equidistant <code>'e'</code> breaks are computed by dividing the total range of the data into n groups
+         *  of equal size.
+         *  <li>quantile <code>'q'</code> input domain is divided by quantile ranges.
+         *  <li>logarithmic <code>'l'</code> breaks are equidistant breaks but on a logarithmic scale.
+         *  <li>k-means <code>'k'</code> breaks use the 1-dimensional
+         *  [k-means clustering algorithm]{@link https://en.wikipedia.org/wiki/K-means_clustering} to find (roughly) n
+         *  groups of "similar" values. Note that this k-means implementation does not guarantee to find exactly n groups.
          */
-        limits(data: number[], mode: string, c: number): number[];
+        limits(data: number[], mode: 'e' | 'q' | 'l' | 'k', c: number): number[];
 
-        scale(name: string): Scale;
+        /**
+         * Returns a function that
+         * [bezier-interpolates]{@link https://www.vis4.net/blog/posts/mastering-multi-hued-color-scales/} between
+         * colors in Lab space. The input range of the function is [0..1].
+         * You can convert it to a scale instance by calling <code>chroma.bezier(...).scale()</code>
+         */
+        bezier(colors: string[]): { (t: number): Color, scale(): Scale};
 
-        scale(colors?: string[]): Scale;
+        scale(name: string | Color): Scale;
+
+        scale(colors?: Array<string | Color>): Scale;
 
         cubehelix(): Cubehelix;
 
         cmyk(c: number, m: number, y: number, k: number): Color;
-        
-        /**
-         * Create a color from a hex or string representation (as supported in CSS).
-         *
-         * This is an alias of chroma.hex().
-         *
-         * @param color The string to convert to a color.
-         * @return the color object.
-         */
-        css(col: string, mode?: string): string;
+
+        css(col: string): Color;
     }
 
-    export interface Color {
+    type Color = {
+        /**
+         * Get and set the color opacity.
+         */
         alpha(a?: number): Color;
 
         darken(f?: number): Color;
 
         brighten(f?: number): Color;
 
+        /**
+         * Changes the saturation of a color by manipulating the Lch chromacity.
+         */
         saturate(s?: number): Color;
 
+        /**
+         * Similar to saturate, but the opposite direction.
+         */
         desaturate(s?: number): Color;
 
+        /**
+         * Changes a single channel and returns the result a new chroma object.
+         * @example
+         * // half Lab lightness
+         * chroma('orangered').set('lab.l', '*0.5')
+         * @example
+         * // double Lch saturation
+         * chroma('darkseagreen').set('lch.c', '*2')
+         */
         set(modechan: string, v: number | string): Color;
 
+        /**
+         * Returns a single channel value.
+         * @see set
+         */
         get(modechan: string): number;
 
+        /**
+         * Relative brightness, according to the
+         * [WCAG]{@link http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef} definition. Normalized to
+         * 0 for darkest black and 1 for lightest white.
+         */
         luminance(): number;
 
-        luminance(l: number, mode?: string): Color;
+        /**
+         * Set luminance of color. The source color will be interpolated with black or white until the correct luminance is found.
+         * The color space used defaults to RGB.
+         */
+        luminance(l: number, colorSpace?: keyof ColorSpaces): Color;
 
+        /**
+         * Get color as hexadecimal string. E.g. '#ffa500'
+         */
         hex(): string;
 
+        /**
+         * Returns the named color. Falls back to hexadecimal RGB string, if the color isn't present.
+         */
         name(): string;
 
         /**
-         * Create a color from a hex or string representation (as supported in CSS).
-         *
-         * This is an alias of chroma.hex().
-         *
-         * @param color The string to convert to a color.
-         * @return the color object.
+         * Returns a RGB() or HSL() string representation that can be used as CSS-color definition.
+         * mode defaults to <code>'rgb'</code>
          */
-        css(mode?: string): string;
-
-        rgb(): number[];
-
-        rgba(): number[];
-
-        hsl(): number[];
-
-        hsv(): number[];
-
-        hsi(): number[];
-
-        lab(): number[];
-
-        lch(): number[];
-
-        hcl(): number[];
+        css(mode?: 'hsl'): string;
 
+        /**
+         * Estimate the temperature in Kelvin of any given color, though this makes the only sense for colors from the
+         * [temperature gradient]{@link ChromaStatic.temperature} above.
+         */
         temperature(): number;
+    } & {
+        [K in keyof ColorSpaces]: () => ColorSpaces[K];
+    };
 
-        gl(): number[];
-    }
-
-    export interface Scale {
+    interface Scale<OutType = Color> {
         (c: string[]): Scale;
 
-        (value: number): any;
+        (value: number): OutType;
 
-        domain(d?: number[], n?: number, mode?: string): Scale;
+        domain(d?: number[], n?: number, mode?: string): this;
 
-        mode(mode: string): Scale;
+        mode(mode: keyof ColorSpaces): this;
 
-        correctLightness(enable?: boolean): Scale;
+        cache(use: boolean): boolean;
 
-        bezier(colors: string[]): Scale;
+        correctLightness(enable?: boolean): this;
 
-        padding(p: number | number[]): Scale;
+        padding(p: number | number[]): this;
 
-        colors(c?: number): string[];
+        /**
+         * You can call scale.colors(n) to quickly grab `c` equi-distant colors from a color scale. If called with no
+         * arguments, scale.colors returns the original array of colors used to create the scale.
+         */
+        colors(c?: number, format?: 'hex' | 'name'): string[];
+        colors(c?: number, format?: null | 'alpha' | 'darken' | 'brighten' | 'saturate' | 'desaturate'): Color[];
+        colors(c?: number, format?: 'luminance' | 'temperature'): number[];
+        colors<K extends keyof ColorSpaces>(c?: number, format?: K): Array<ColorSpaces[K]>;
 
-        classes(c: number | number[]): (t: number) => Color;
+        /**
+         * If you want the scale function to return a distinct set of colors instead of a continuous gradient, you can
+         * use scale.classes. If you pass a number the scale will broken into equi-distant classes.
+         * You can also define custom class breaks by passing them as array
+         */
+        classes(c: number | number[]): this;
 
-        range(arg: string[]): Scale;
-
-        scale(): Scale;
-
-        out(mode: string): Scale;
+        /**
+         * Set out format for scale() call. Passing null will result in a scale which outputs colors.
+         */
+        out(format: null): Scale;
+        out<K extends keyof ColorSpaces>(format: K): Scale<ColorSpaces[K]>;
     }
 
-    export interface Cubehelix extends Scale {
+    interface Cubehelix {
+        /**
+         * Set start color for hue rotation, default=300
+         */
         start(s: number): Cubehelix;
 
+        /**
+         * number (and direction) of hue rotations (e.g. 1=360°, 1.5=`540°``), default=-1.5
+         */
         rotations(r: number): Cubehelix;
 
+        /**
+         * gamma factor can be used to emphasise low or high intensity values, default=1
+         */
         gamma(g: number): Cubehelix;
 
+        /**
+         * lightness range: default: [0,1] (black -> white)
+         */
         lightness(l: number[]): Cubehelix;
+
+        /**
+         * You can call cubehelix.scale() to use the cube-helix through the chroma.scale interface.
+         */
+        scale(): Scale;
     }
 }
 
 declare var chroma: Chroma.ChromaStatic;
 
-declare module "chroma-js" {
-    export = chroma;
-}
+export = chroma;
+export as namespace chroma;
diff --git a/types/chroma-js/tslint.json b/types/chroma-js/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/chroma-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 8fe0f9b993..ee61cf5575 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://developer.chrome.com/extensions/
 // Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>, sreimer15 <https://github.com/sreimer15>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="filesystem" />
 
diff --git a/types/chrome/test/index.ts b/types/chrome/test/index.ts
index ffe1ece74d..b7b7868ba3 100644
--- a/types/chrome/test/index.ts
+++ b/types/chrome/test/index.ts
@@ -80,7 +80,7 @@ function bookmarksExample() {
                             'Add': function () {
                                 chrome.bookmarks.create({
                                     parentId: bookmarkNode.id,
-                                    title: $('#title').val(), url: $('#url').val()
+                                    title: $('#title').val() as string, url: $('#url').val() as string
                                 });
                                 $('#bookmarks').empty();
                                 $(this).dialog('destroy');
@@ -100,9 +100,9 @@ function bookmarksExample() {
                         show: 'slide', buttons: {
                             'Save': function () {
                                 chrome.bookmarks.update(String(bookmarkNode.id), {
-                                    title: edit.val()
+                                    title: edit.val() as string
                                 });
-                                anchor.text(edit.val());
+                                anchor.text(edit.val() as string);
                                 options.show();
                                 $(this).dialog('destroy');
                             },
diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 2512d73c9d..96c0c31496 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -23,4 +23,4 @@
         "test/index.ts",
         "test/chrome-app.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/chui/chui-tests.ts b/types/chui/chui-tests.ts
index 5e1e549dc7..f37ab7caf0 100644
--- a/types/chui/chui-tests.ts
+++ b/types/chui/chui-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="jquery"/>
+import $ = require('jquery');
 
 $(function() {
 
@@ -94,4 +94,4 @@ $(function() {
    $('#mySwitch').UISwitch();
    $('#myRangeControl').UIRange();
    
-});
\ No newline at end of file
+});
diff --git a/types/chui/index.d.ts b/types/chui/index.d.ts
index 4bf597e869..7042edd4bd 100644
--- a/types/chui/index.d.ts
+++ b/types/chui/index.d.ts
@@ -1545,4 +1545,4 @@ interface JQueryKeyEventObject extends JQueryInputEventObject {
 }
 
 interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject {
-}
\ No newline at end of file
+}
diff --git a/types/chui/tsconfig.json b/types/chui/tsconfig.json
index a3163f3e43..08c1f7740e 100644
--- a/types/chui/tsconfig.json
+++ b/types/chui/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "chui-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 518c44ae2a..dc4d27871e 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -77,7 +77,7 @@ declare namespace CKEDITOR {
     function addCss(css: string): void;
     function addTemplate(name: string, source: string): template;
     function appendTo(element: string, config?: config, data?: string): editor;
-    function appendTo(element: HTMLTextAreaElement, config?: config, data?: string): editor;
+    function appendTo(element: HTMLElement, config?: config, data?: string): editor;
     function domReady(): void;
     function dialogCommand(dialogName: string): void;
     function editorConfig(config: config): void;
diff --git a/types/cli-table2/cli-table2-tests.ts b/types/cli-table2/cli-table2-tests.ts
new file mode 100644
index 0000000000..dfaed4ec33
--- /dev/null
+++ b/types/cli-table2/cli-table2-tests.ts
@@ -0,0 +1,232 @@
+import * as Table from "cli-table2";
+
+// Code snippets from README.md
+
+// Horizontal table
+const table1 = new Table({ head: ['TH 1 label', 'TH 2 label'], colWidths: [100, 200] }) as Table.HorizontalTable;
+table1.push(
+    ['First value', 'Second value'],
+    ['First value', 'Second value']
+);
+
+// Vertical table
+const table2 = new Table() as Table.VerticalTable;
+table2.push(
+    { 'Some key': 'Some value' },
+    { 'Another key': 'Another value' }
+);
+
+// Cross table
+const table3 = new Table({ head: ["", "Top Header 1", "Top Header 2"] }) as Table.CrossTable;
+table3.push(
+    { 'Left Header 1': ['Value Row 1 Col 1', 'Value Row 1 Col 2'] },
+    { 'Left Header 2': ['Value Row 2 Col 1', 'Value Row 2 Col 2'] }
+);
+
+// Custom styles
+const table4 = new Table({
+    chars: {
+        top: '═', 'top-mid': '╤', 'top-left': '╔', 'top-right': '╗',
+        bottom: '═', 'bottom-mid': '╧', 'bottom-left': '╚', 'bottom-right': '╝',
+        left: '║', 'left-mid': '╟', mid: '─', 'mid-mid': '┼',
+        right: '║', 'right-mid': '╢', middle: '│'
+    }
+}) as Table.HorizontalTable;
+table4.push(
+    ['foo', 'bar', 'baz'],
+    ['frob', 'bar', 'quuz']
+);
+const table5 = new Table({ chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' } }) as Table.HorizontalTable;
+table5.push(
+    ['foo', 'bar', 'baz'],
+    ['frobnicate', 'bar', 'quuz']
+);
+const table6 = new Table({
+    chars: {
+        top: '', 'top-mid': '', 'top-left': '', 'top-right': '',
+        bottom: '', 'bottom-mid': '', 'bottom-left': '', 'bottom-right': '',
+        left: '', 'left-mid': '', mid: '', 'mid-mid': '',
+        right: '', 'right-mid': '', middle: ' '
+    },
+    style: { 'padding-left': 0, 'padding-right': 0 }
+}) as Table.HorizontalTable;
+table6.push(
+    ['foo', 'bar', 'baz'],
+    ['frobnicate', 'bar', 'quuz']
+);
+
+// Code snippets from basic-usage.md
+
+// Basic Usage
+const table7 = new Table({ head: ['a', 'b'] }) as Table.HorizontalTable;
+table7.push(['c', 'd']);
+
+// Basic Usage - disable colors - (used often in the examples and tests)
+const table8 = new Table({
+    head: ['Rel', 'Change', 'By', 'When'],
+    style: { head: [], border: [] },
+    colWidths: [6, 21, 25, 17]
+}) as Table.HorizontalTable;
+table8.push(
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '7 minutes ago'],
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '8 minutes ago']
+);
+
+// Create vertical tables by adding objects a that specify key-value pairs
+const table9 = new Table({ style: { 'padding-left': 0, 'padding-right': 0, head: [], border: [] } }) as Table.VerticalTable;
+table9.push(
+    { 'v0.1': 'Testing something cool' },
+    { 'v0.1': 'Testing something cool' }
+);
+
+// Cross tables are similar to vertical tables, but include an empty string for the first header
+const table10 = new Table({
+    head: ["", "Header 1", "Header 2"],
+    style: { 'padding-left': 0, 'padding-right': 0, head: [], border: [] }
+}) as Table.CrossTable;
+table10.push(
+    { "Header 3": ['v0.1', 'Testing something cool'] },
+    { "Header 4": ['v0.1', 'Testing something cool'] }
+);
+
+// Stylize the table with custom border characters
+const table11 = new Table({
+    chars: {
+        top: '═',
+        'top-mid': '╤',
+        'top-left': '╔',
+        'top-right': '╗',
+        bottom: '═',
+        'bottom-mid': '╧',
+        'bottom-left': '╚',
+        'bottom-right': '╝',
+        left: '║',
+        'left-mid': '╟',
+        right: '║',
+        'right-mid': '╢'
+    },
+    style: { head: [], border: [] }
+}) as Table.HorizontalTable;
+table11.push(
+    ['foo', 'bar', 'baz'],
+    ['frob', 'bar', 'quuz']
+);
+
+// Use ansi colors (i.e. colors.js) to style text within the cells at will, even across multiple lines
+const table12 = new Table({ style: { border: [], head: [] } }) as Table.HorizontalTable;
+table12.push([
+    /*colors.red(*/'Hello\nhow\nare\nyou?'/*)*/,
+    /*colors.blue(*/'I\nam\nfine\nthanks!'/*)*/
+]);
+
+// Set wordWrap to true to make lines of text wrap instead of being truncated
+const table13 = new Table({
+    style: { border: [], head: [] },
+    colWidths: [7, 9],
+    wordWrap: true
+}) as Table.HorizontalTable;
+table13.push([
+    'Hello how are you?',
+    'I am fine thanks!'
+]);
+
+// Code snippets from advanced-usage.md
+
+// use colSpan to span columns - (colSpan above normal cell)
+const table14 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table14.push(
+    [{ colSpan: 2, content: 'greetings' }],
+    [{ colSpan: 2, content: 'greetings' }],
+    ['hello', 'howdy']
+);
+
+// use colSpan to span columns - (colSpan below normal cell)
+const table15 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table15.push(
+    ['hello', 'howdy'],
+    [{ colSpan: 2, content: 'greetings' }],
+    [{ colSpan: 2, content: 'greetings' }]
+);
+
+// use rowSpan to span rows - (rowSpan on the left side)
+const table16 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table16.push(
+    [{ rowSpan: 2, content: 'greetings' }, { rowSpan: 2, content: 'greetings', vAlign: 'center' }, 'hello'],
+    ['howdy']
+);
+
+// use rowSpan to span rows - (rowSpan on the right side)
+const table17 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table17.push(
+    ['hello', { rowSpan: 2, content: 'greetings' }, { rowSpan: 2, content: 'greetings', vAlign: 'bottom' }],
+    ['howdy']
+);
+
+// mix rowSpan and colSpan together for complex table layouts
+const table18 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table18.push(
+    [{ content: 'hello', colSpan: 2 }, { rowSpan: 2, colSpan: 2, content: 'sup' }, { rowSpan: 3, content: 'hi' }],
+    [{ content: 'howdy', colSpan: 2 }],
+    ['o', 'k', '', '']
+);
+
+// multi-line content will flow across rows in rowSpan cells
+const table19 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table19.push(
+    ['hello', { rowSpan: 2, content: 'greetings\nfriends' }, { rowSpan: 2, content: 'greetings\nfriends' }],
+    ['howdy']
+);
+
+// multi-line content will flow across rows in rowSpan cells - (complex layout)
+const table20 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table20.push(
+    [{ content: 'hello', colSpan: 2 }, { rowSpan: 2, colSpan: 2, content: 'sup\nman\nhey' }, { rowSpan: 3, content: 'hi\nyo' }],
+    [{ content: 'howdy', colSpan: 2 }],
+    ['o', 'k', '', '']
+);
+
+// rowSpan cells can have a staggered layout
+const table21 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table21.push(
+    [{ content: 'a', rowSpan: 2 }, 'b'],
+    [{ content: 'c', rowSpan: 2 }],
+    ['d']
+);
+
+// the layout manager automatically create empty cells to fill in the table
+const table22 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table22.push(
+    [{ content: 'a', rowSpan: 3, colSpan: 2 }, 'b'],
+    [],
+    [{ content: 'c', rowSpan: 2, colSpan: 2 }],
+    []
+);
+
+// use table rowHeights option to fix row height. The truncation symbol will be shown on the last line.
+const table23 = new Table({ rowHeights: [2], style: { head: [], border: [] } }) as Table.HorizontalTable;
+table23.push(['hello\nhi\nsup']);
+
+// if colWidths is not specified, the layout manager will automatically widen rows to fit the content
+const table24 = new Table({ style: { head: [], border: [] } }) as Table.HorizontalTable;
+table24.push(
+    [{ colSpan: 2, content: 'hello there' }],
+    ['hi', 'hi']
+);
+
+// you can specify a column width for only the first row, other rows will be automatically widened to fit content
+const table25 = new Table({ colWidths: [4], style: { head: [], border: [] } }) as Table.HorizontalTable;
+table25.push(
+    [{ colSpan: 2, content: 'hello there' }],
+    ['hi', { hAlign: 'center', content: 'hi' }]
+);
+
+// a column with a null column width will be automatically widened to fit content
+const table26 = new Table({ colWidths: [null, 4], style: { head: [], border: [] } }) as Table.HorizontalTable;
+table26.push(
+    [{ colSpan: 2, content: 'hello there' }],
+    [{ hAlign: 'right', content: 'hi' }, 'hi']
+);
+
+// feel free to use colors in your content strings, column widths will be calculated correctly
+const table27 = new Table({ colWidths: [5], style: { head: [], border: [] } }) as Table.HorizontalTable;
+table27.push([/*colors.red(*/'hello'/*)*/]);
diff --git a/types/cli-table2/index.d.ts b/types/cli-table2/index.d.ts
new file mode 100644
index 0000000000..46d4619162
--- /dev/null
+++ b/types/cli-table2/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for cli-table2 0.2
+// Project: https://github.com/jamestalmage/cli-table2
+// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare namespace CliTable2 {
+    type CharName =
+        "top" |
+        "top-mid" |
+        "top-left" |
+        "top-right" |
+        "bottom" |
+        "bottom-mid" |
+        "bottom-left" |
+        "bottom-right" |
+        "left" |
+        "left-mid" |
+        "mid" |
+        "mid-mid" |
+        "right" |
+        "right-mid" |
+        "middle";
+
+    type HorizontalAlignment = "left" | "center" | "right";
+    type VerticalAlignment = "top" | "center" | "bottom";
+
+    interface TableOptions {
+        truncate: string;
+        colWidths: Array<number | null>;
+        rowHeights: Array<number | null>;
+        colAligns: HorizontalAlignment[];
+        rowAligns: VerticalAlignment[];
+        head: string[];
+        wordWrap: boolean;
+    }
+
+    interface TableInstanceOptions extends TableOptions {
+        chars: Record<CharName, string>;
+        style: {
+            "padding-left": number;
+            "padding-right": number;
+            head: string[];
+            border: string[];
+            compact: boolean;
+        };
+    }
+
+    interface TableConstructorOptions extends Partial<TableOptions> {
+        chars?: Partial<Record<CharName, string>>;
+        style?: Partial<TableInstanceOptions["style"]>;
+    }
+
+    type CellValue = boolean | number | string | null | undefined;
+
+    interface CellOptions {
+        content: CellValue;
+        chars?: Partial<Record<CharName, string>>;
+        truncate?: string;
+        colSpan?: number;
+        rowSpan?: number;
+        hAlign?: HorizontalAlignment;
+        vAlign?: VerticalAlignment;
+        style?: {
+            "padding-left"?: number;
+            "padding-right"?: number;
+            head?: string[];
+            border?: string[];
+        };
+    }
+
+    interface GenericTable<T> extends Array<T> {
+        options: CliTable2.TableInstanceOptions;
+        readonly width: number;
+    }
+
+    type Table = HorizontalTable | VerticalTable | CrossTable;
+    type Cell = CellValue | CellOptions;
+
+    type HorizontalTable = GenericTable<HorizontalTableRow>;
+    type HorizontalTableRow = Cell[];
+
+    type VerticalTable = GenericTable<VerticalTableRow>;
+    interface VerticalTableRow {
+        [name: string]: Cell;
+    }
+
+    type CrossTable = GenericTable<CrossTableRow>;
+    interface CrossTableRow {
+        [name: string]: Cell[];
+    }
+}
+
+interface CliTable2 {
+    new (options?: CliTable2.TableConstructorOptions): CliTable2.Table;
+    readonly prototype: CliTable2.Table;
+}
+
+declare const CliTable2: CliTable2;
+
+export = CliTable2;
diff --git a/types/express-validator/tsconfig.json b/types/cli-table2/tsconfig.json
similarity index 84%
rename from types/express-validator/tsconfig.json
rename to types/cli-table2/tsconfig.json
index cd9c9145d7..e816ba5105 100644
--- a/types/express-validator/tsconfig.json
+++ b/types/cli-table2/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -17,6 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "express-validator-tests.ts"
+        "cli-table2-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/cli-table2/tslint.json b/types/cli-table2/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/cli-table2/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/clipboard/clipboard-tests.ts b/types/clipboard/clipboard-tests.ts
index 23de4c89e6..361ccddd93 100644
--- a/types/clipboard/clipboard-tests.ts
+++ b/types/clipboard/clipboard-tests.ts
@@ -16,6 +16,7 @@ const cb5 = new Clipboard('.btn', {
 });
 
 cb1.destroy();
+cb1.isSupported();
 
 cb2.on('success', e => {
     console.info('Action:', e.action);
diff --git a/types/clipboard/index.d.ts b/types/clipboard/index.d.ts
index 861d8c326b..0aa51518dd 100644
--- a/types/clipboard/index.d.ts
+++ b/types/clipboard/index.d.ts
@@ -18,6 +18,11 @@ declare class Clipboard {
      * Clears all event bindings.
      */
     destroy(): void;
+
+    /**
+     * Checks if clipboard.js is supported
+     */
+    isSupported(): boolean;
 }
 
 declare namespace Clipboard {
diff --git a/types/clndr/clndr-tests.ts b/types/clndr/clndr-tests.ts
index 07bff7f9e4..d0939c3e80 100644
--- a/types/clndr/clndr-tests.ts
+++ b/types/clndr/clndr-tests.ts
@@ -1,4 +1,5 @@
 import * as Clndr from 'clndr';
+import $ = require('jquery');
 
 const options: Clndr.ClndrOptions = {
     template: '',
diff --git a/types/clndr/index.d.ts b/types/clndr/index.d.ts
index 3e9fbbb09c..2c01d82518 100644
--- a/types/clndr/index.d.ts
+++ b/types/clndr/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: jasperjn <https://github.com/jasperjn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 import * as moment from 'moment';
 
 export as namespace Clndr;
diff --git a/types/clndr/tsconfig.json b/types/clndr/tsconfig.json
index 8e68c59399..e2791aa5f0 100644
--- a/types/clndr/tsconfig.json
+++ b/types/clndr/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "clndr-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/cloud-env/cloud-env-tests.ts b/types/cloud-env/cloud-env-tests.ts
new file mode 100644
index 0000000000..64cbadd7f0
--- /dev/null
+++ b/types/cloud-env/cloud-env-tests.ts
@@ -0,0 +1,9 @@
+import * as cloudEnv from 'cloud-env';
+
+if (cloudEnv.get('IP', '0.0.0.0') !== '0.0.0.0') {
+	throw new Error(`cloudEnv.get: expected value 0.0.0.0, but actually received value ${cloudEnv.get('IP', '0.0.0.0')}`);
+}
+
+if (!(cloudEnv.defaults instanceof Object)) {
+	throw new Error(`cloudEnv.defaults: expected value of defaults be an instance of Object, but it was actually an instance of another class: ${typeof cloudEnv.defaults}`);
+}
diff --git a/types/cloud-env/index.d.ts b/types/cloud-env/index.d.ts
new file mode 100644
index 0000000000..daec09022f
--- /dev/null
+++ b/types/cloud-env/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for cloud-env 0.2.2
+// Project: https://github.com/ryanj/cloud-env
+// Definitions by: Ben Davies <https://github.com/Morfent>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare interface DefaultSettings {
+	PORT?: number;
+	IP?: string;
+	HOSTNAME?: string;
+	APP_NAME?: string;
+	MONGODB_DB_URL?: string;
+	MONGODB_DB_HOST?: string;
+	MONGODB_DB_PORT?: number;
+	MONGODB_DB_USERNAME?: string;
+	MONGODB_DB_PASSWORD?: string;
+	POSTGRESQL_DB_URL?: string;
+	POSTGRESQL_DB_HOST?: string;
+	POSTGRESQL_DB_PORT?: number;
+	POSTGRESQL_DB_USERNAME?: string;
+	POSTGRESQL_DB_PASSWORD?: string;
+	MYSQL_DB_URL?: string;
+	MYSQL_DB_HOST?: string;
+	MYSQL_DB_PORT?: number;
+	MYSQL_DB_USERNAME?: string;
+	MYSQL_DB_PASSWORD?: string;
+}
+
+declare type MaybeNum = number | void;
+declare type MaybeStr = string | void;
+
+export const get: (key: string, default_key?: string) => MaybeStr;
+export const defaults: { [key: string]: DefaultSettings; };
+export const PORT: MaybeNum;
+export const IP: MaybeStr;
+export const HOSTNAME: MaybeStr;
+export const APP_NAME: MaybeStr;
+export const MONGODB_DB_URL: MaybeStr;
+export const MONGODB_DB_HOST: MaybeStr;
+export const MONGODB_DB_PORT: MaybeNum;
+export const MONGODB_DB_USERNAME: MaybeStr;
+export const MONGODB_DB_PASSWORD: MaybeStr;
+export const POSTGRESQL_DB_URL: MaybeStr;
+export const POSTGRESQL_DB_HOST: MaybeStr;
+export const POSTGRESQL_DB_PORT: MaybeNum;
+export const POSTGRESQL_DB_USERNAME: MaybeStr;
+export const POSTGRESQL_DB_PASSWORD: MaybeStr;
+export const MYSQL_DB_URL: MaybeStr;
+export const MYSQL_DB_HOST: MaybeStr;
+export const MYSQL_DB_PORT: MaybeNum;
+export const MYSQL_DB_USERNAME: MaybeStr;
+export const MYSQL_DB_PASSWORD: MaybeStr;
diff --git a/types/cloud-env/tsconfig.json b/types/cloud-env/tsconfig.json
new file mode 100644
index 0000000000..e6a1323629
--- /dev/null
+++ b/types/cloud-env/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "cloud-env-tests.ts"
+  ]
+}
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 9a74dc1e53..b42ebabae3 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -1097,7 +1097,7 @@ declare namespace CodeMirror {
      * Both modes get to parse all of the text, but when both assign a non-null style to a piece of code, the overlay wins, unless
      * the combine argument was true and not overridden, or state.overlay.combineTokens was true, in which case the styles are combined.
      */
-    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>
+    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>;
 
     /**
      * async specifies that the lint process runs asynchronously. hasGutters specifies that lint errors should be displayed in the CodeMirror
@@ -1114,13 +1114,20 @@ declare namespace CodeMirror {
      * linter.
      */
     interface LintOptions extends LintStateOptions {
-        getAnnotations: AnnotationsCallback;
+        getAnnotations: Linter | AsyncLinter;
+    }
+
+    /**
+     * A function that return errors found during the linting process.
+     */
+    interface Linter {
+        (content: string, options: LintStateOptions, codeMirror: Editor): Annotation[] | PromiseLike<Annotation[]>;
     }
 
     /**
      * A function that calls the updateLintingCallback with any errors found during the linting process.
      */
-    interface AnnotationsCallback {
+    interface AsyncLinter {
         (content: string, updateLintingCallback: UpdateLintingCallback, options: LintStateOptions, codeMirror: Editor): void;
     }
 
diff --git a/types/codemirror/test/index.ts b/types/codemirror/test/index.ts
index 41b7170fd1..e283abe974 100644
--- a/types/codemirror/test/index.ts
+++ b/types/codemirror/test/index.ts
@@ -28,7 +28,7 @@ var lintStateOptions: CodeMirror.LintStateOptions = {
     hasGutters: true
 };
 
-var lintOptions: CodeMirror.LintOptions = {
+var asyncLintOptions: CodeMirror.LintOptions = {
     async: true,
     hasGutters: true,
     getAnnotations: (content: string,
@@ -37,6 +37,14 @@ var lintOptions: CodeMirror.LintOptions = {
                      codeMirror: CodeMirror.Editor) => {}
 };
 
+var syncLintOptions: CodeMirror.LintOptions = {
+    async: false,
+    hasGutters: true,
+    getAnnotations: (content: string,
+                     options: CodeMirror.LintStateOptions,
+                     codeMirror: CodeMirror.Editor): CodeMirror.Annotation[] => { return []; }
+};
+
 var updateLintingCallback: CodeMirror.UpdateLintingCallback = (codeMirror: CodeMirror.Editor,
                                                                annotations: CodeMirror.Annotation[]) => {};
 
diff --git a/types/collections/collections-tests.ts b/types/collections/collections-tests.ts
new file mode 100644
index 0000000000..b7feef3c05
--- /dev/null
+++ b/types/collections/collections-tests.ts
@@ -0,0 +1,32 @@
+import SortedSet = require('collections/sorted-set');
+
+interface Person {
+    name: string;
+}
+
+let set = new SortedSet<Person>(
+    [{name: 'John'}, {name: 'Jack'}, {name: 'Linda'}],
+    (a: Person, b: Person) => a.name === b.name,
+    (a: Person, b: Person) => {
+        if (a.name < b.name) {
+            return -1;
+        }
+        if (a.name > b.name) {
+            return 1;
+        }
+        return 0;
+    }
+);
+
+let p1: Person | undefined = set.max();
+let p2: Person | undefined = set.min();
+
+
+set.push({name: 'Laurie'}, {name: 'Max'});
+set.pop();
+
+set.get({name: 'Laurie'});
+set.has({name: 'John'});
+
+let a = 1;
+set.forEach((p: Person) => a++);
\ No newline at end of file
diff --git a/types/collections/index.d.ts b/types/collections/index.d.ts
new file mode 100644
index 0000000000..8a92df0f2d
--- /dev/null
+++ b/types/collections/index.d.ts
@@ -0,0 +1,133 @@
+// Type definitions for collections v5.0.6
+// Project: http://www.collectionsjs.com/
+// Definitions by: Scarabe Dore <https://github.com/scarabedore>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'collections/sorted-set' {
+    namespace internal {
+        // TODO: These methods can be similar in others collection. One's should make some
+        // class model.
+        abstract class AbstractSet {
+            union(...plus: any[]): any;
+            intersection(...plus: any[]): any;
+            difference(...plus: any[]): any;
+            symmetricDifference(...plus: any[]): any;
+            remove(...plus: any[]): any;
+            contains(...plus: any[]): any;
+            toggle(...plus: any[]): any;
+            addEach(...plus: any[]): any;
+            deleteEach(...plus: any[]): any;
+            deleteAll(...plus: any[]): any;
+            findValue(...plus: any[]): any;
+            iterator(...plus: any[]): any;
+            forEach(...plus: any[]): any;
+            map(...plus: any[]): any;
+
+            filter(...plus: any[]): any;
+            group(...plus: any[]): any;
+            some(...plus: any[]): any;
+            every(...plus: any[]): any;
+            any(...plus: any[]): any;
+            all(...plus: any[]): any;
+            only(...plus: any[]): any;
+            sorted(...plus: any[]): any;
+            reversed(...plus: any[]): any;
+            join(...plus: any[]): any;
+            sum(...plus: any[]): any;
+            average(...plus: any[]): any;
+            zip(...plus: any[]): any;
+            enumerate(...plus: any[]): any;
+            concat(...plus: any[]): any;
+            flatten(...plus: any[]): any;
+            toArray(...plus: any[]): any;
+            toObject(...plus: any[]): any;
+            toJSON(...plus: any[]): any;
+            equals(...plus: any[]): any;
+            clone(...plus: any[]): any;
+            contentCompare(...plus: any[]): any;
+            contentEquals(...plus: any[]): any;
+            sortedSetLog(...plus: any[]): any;
+            addRangeChangeListener(...plus: any[]): any;
+            removeRangeChangeListener(...plus: any[]): any;
+            dispatchRangeChange(...plus: any[]): any;
+            addBeforeRangeChangeListener(...plus: any[]): any;
+            removeBeforeRangeChangeListener(...plus: any[]): any;
+            dispatchBeforeRangeChange(...plus: any[]): any;
+            addOwnPropertyChangeListener(...plus: any[]): any;
+            addBeforeOwnPropertyChangeListener(...plus: any[]): any;
+            removeOwnPropertyChangeListener(...plus: any[]): any;
+            removeBeforeOwnPropertyChangeListener(...plus: any[]): any;
+            dispatchOwnPropertyChange(...plus: any[]): any;
+            dispatchBeforeOwnPropertyChange(...plus: any[]): any;
+            makePropertyObservable(...plus: any[]): any;
+        }
+
+        class Node<T> {
+            reduce(cb: (result?: any, val?: any, key?: any, collection?: any) => any,
+                   basis: any, index: number, thisp: any, tree: any, depth: number): any;
+            touch(...plus: any[]): void;
+            checkIntegrity(...plus: any[]): number;
+            getNext(...plus: any[]): Node<T> | undefined;
+            getPrevious(...plus: any[]): Node<T> | undefined;
+            summary(...plus: any[]): string;
+            log(charmap: any, logNode: any, log: any, logAbove: any): any;
+        }
+
+        class Iterator<T> {
+            next(): {done: true, value: T | null | undefined};
+        }
+
+        export class SortedSet<T> extends AbstractSet {
+            constructor(
+                values?: T[],
+                equals?:  (a: T, b: T) => boolean,
+                compare?: (a: T, b: T) => number,
+                getDefault?: any
+            );
+            constructClone(values?: T[]): SortedSet<T>;
+
+            add(value: T): boolean;
+            clear(): void;
+            ['delete'](value: T): boolean;
+
+            find(value: T): Node<T> | undefined;
+            findGreatest(n?: Node<T> | undefined): Node<T> | undefined;
+            findGreatestLessThan(value: T): Node<T> | undefined;
+            findGreatestLessThanOrEqual(value: T): Node<T> | undefined;
+            findLeast(n?: Node<T> | undefined): Node<T> | undefined;
+            findLeastGreaterThan(value: T): Node<T> | undefined;
+            findLeastGreaterThanOrEqual(value: T): Node<T> | undefined;
+            max(n?: Node<T>): T | undefined;
+            min(n?: Node<T>): T | undefined;
+            one(): T | undefined;
+
+            get(elt: T): T | undefined;
+            has(elt: T): boolean;
+            indexOf(value: T): number;
+
+            pop(): T | undefined;
+            push(...rest: T[]): void;
+
+            shift(): T | undefined;
+            unshift(...rest: T[]): void;
+
+            slice(start?: number, end?: number): T[];
+            splice(start: Node<T>, length: number, ...values: T[]): T[];
+            swap(start: number, length: number, values?: T[]): T[];
+
+            splay(value: T): void;
+            splayIndex(index: number): boolean;
+
+            reduce(callback: (result?: any, val?: any, key?: any, collection?: any) => any,
+                   basis?: any, thisp?: any): any;
+            reduceRight(
+                callback: (result?: any, val?: any, key?: any, collection?: any) => any,
+                basis?: any, thisp?: any
+            ): any;
+
+            iterate(start: number, stop: number): Iterator<T>;
+        }
+    }
+
+    export = internal.SortedSet;
+}
diff --git a/types/collections/tsconfig.json b/types/collections/tsconfig.json
new file mode 100644
index 0000000000..6b5293a242
--- /dev/null
+++ b/types/collections/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "files": [
+    "collections-tests.ts",
+    "index.d.ts"
+  ],
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "lib": ["es6"],
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "noEmit": true
+  }
+}
diff --git a/types/combine-source-map/combine-source-map-tests.ts b/types/combine-source-map/combine-source-map-tests.ts
new file mode 100644
index 0000000000..70f426d7ce
--- /dev/null
+++ b/types/combine-source-map/combine-source-map-tests.ts
@@ -0,0 +1,12 @@
+import combine = require("combine-source-map");
+
+const sourcemap = combine.create();
+
+sourcemap.addFile({ sourceFile: "file.js", source: "return 123" })
+    .addFile({ sourceFile: "source.js", source: "return 'abc'" });
+
+const res: string = sourcemap.base64();
+
+const res2 = sourcemap.comment();
+
+combine.removeComments("(123 | 'abc') // #sourceMappingURL=file.js.map");
diff --git a/types/combine-source-map/index.d.ts b/types/combine-source-map/index.d.ts
new file mode 100644
index 0000000000..43f1c994b0
--- /dev/null
+++ b/types/combine-source-map/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for combine-source-map 0.8
+// Project: https://github.com/thlorenz/combine-source-map
+// Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/** Add source maps of multiple files, offset them and then combine them into one source map.
+ * (documentation based on project's README file)
+ */
+declare class Combiner {
+    constructor(file?: string, sourceRoot?: string);
+
+    /** Adds map to underlying source map.
+     * If source contains a source map comment that has the source of the original file inlined it will offset these
+     * mappings and include them.
+     * If no source map comment is found or it has no source inlined, mappings for the file will be generated and included
+     * @param opts the 'sourceFile' path/name and the file's 'source' contents
+     * @param offset the source file 'line' number and 'column' number offsets
+     */
+    addFile(opts: { sourceFile: string; source: string }, offset?: Combiner.Offset): Combiner;
+
+    /** output the combined source map in base64 format
+     * @return base64 encoded combined source map
+     */
+    base64(): string;
+
+    /** generate a base64 encoded sourceMappingURL comment
+     * @return base64 encoded sourceMappingUrl comment of the combined source map
+     */
+    comment(): string;
+
+    _addGeneratedMap(sourceFile: string, source: string, offset?: Combiner.Offset): Combiner;
+
+    _addExistingMap(sourceFile: string, source: string, existingMap: any, offset?: Combiner.Offset): Combiner;
+}
+
+declare namespace Combiner {
+    /** An offset line and column number */
+    interface Offset {
+        line?: number;
+        column?: number;
+    }
+
+    /** Create a source map combiner that accepts multiple files, offsets them and then combines them into one source map.
+     * @param file optional name of the generated file
+     * @param sourceRoot optional sourceRoot of the map to be generated
+     * @return Combiner instance to which source maps can be added and later combined
+     */
+    function create(file?: string, sourceRoot?: string): Combiner;
+
+    /** removeComments
+     * @param src
+     * @return src with all sourceMappingUrl comments removed
+     */
+    function removeComments(src: string): string;
+}
+
+export = Combiner;
+
+export as namespace Combiner;
diff --git a/types/combine-source-map/tsconfig.json b/types/combine-source-map/tsconfig.json
new file mode 100644
index 0000000000..8ee6b85743
--- /dev/null
+++ b/types/combine-source-map/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "combine-source-map-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/combine-source-map/tslint.json b/types/combine-source-map/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/combine-source-map/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/commander/commander-tests.ts b/types/commander/commander-tests.ts
index fe09be7b34..259b107bbf 100644
--- a/types/commander/commander-tests.ts
+++ b/types/commander/commander-tests.ts
@@ -1,5 +1,11 @@
-// NOTE: import statement can not use in TypeScript 1.0.1
-import program = require('commander');
+import * as program from "commander";
+
+interface ExtendedOptions extends program.CommandOptions {
+    isNew: any;
+}
+
+const commandInstance = new program.Command("-f");
+const optionsInstance = new program.Option("-f");
 
 program
     .version('0.0.1')
@@ -54,7 +60,6 @@ console.log(' collect: %j', program['collect']);
 console.log(' verbosity: %j', program['verbose']);
 console.log(' args: %j', program['args']);
 
-
 program
     .version('0.0.1')
     .option('-f, --foo', 'enable some foo')
diff --git a/types/commander/index.d.ts b/types/commander/index.d.ts
index 675ece0417..017495784a 100644
--- a/types/commander/index.d.ts
+++ b/types/commander/index.d.ts
@@ -5,6 +5,267 @@
 
 /// <reference types="node" />
 
+declare class Option {
+    flags: string;
+    required: boolean;
+    optional: boolean;
+    bool: boolean;
+    short?: string;
+    long: string;
+    description: string;
+
+    /**
+     * Initialize a new `Option` with the given `flags` and `description`.
+     *
+     * @param {string} flags
+     * @param {string} [description]
+     */
+    constructor(flags: string, description?: string);
+}
+
+declare class Command extends NodeJS.EventEmitter {
+    [key: string]: any;
+
+    args: string[];
+
+    /**
+     * Initialize a new `Command`.
+     *
+     * @param {string} [name]
+     */
+    constructor(name?: string);
+
+    /**
+     * Set the program version to `str`.
+     *
+     * This method auto-registers the "-V, --version" flag
+     * which will print the version number when passed.
+     *
+     * @param {string} str
+     * @param {string} [flags]
+     * @returns {Command} for chaining
+     */
+    version(str: string, flags?: string): Command;
+
+    /**
+     * Add command `name`.
+     *
+     * The `.action()` callback is invoked when the
+     * command `name` is specified via __ARGV__,
+     * and the remaining arguments are applied to the
+     * function for access.
+     *
+     * When the `name` is "*" an un-matched command
+     * will be passed as the first arg, followed by
+     * the rest of __ARGV__ remaining.
+     *
+     * @example
+     *      program
+     *        .version('0.0.1')
+     *        .option('-C, --chdir <path>', 'change the working directory')
+     *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
+     *        .option('-T, --no-tests', 'ignore test hook')
+     *
+     *      program
+     *        .command('setup')
+     *        .description('run remote setup commands')
+     *        .action(function() {
+     *          console.log('setup');
+     *        });
+     *
+     *      program
+     *        .command('exec <cmd>')
+     *        .description('run the given remote command')
+     *        .action(function(cmd) {
+     *          console.log('exec "%s"', cmd);
+     *        });
+     *
+     *      program
+     *        .command('teardown <dir> [otherDirs...]')
+     *        .description('run teardown commands')
+     *        .action(function(dir, otherDirs) {
+     *          console.log('dir "%s"', dir);
+     *          if (otherDirs) {
+     *            otherDirs.forEach(function (oDir) {
+     *              console.log('dir "%s"', oDir);
+     *            });
+     *          }
+     *        });
+     *
+     *      program
+     *        .command('*')
+     *        .description('deploy the given env')
+     *        .action(function(env) {
+     *          console.log('deploying "%s"', env);
+     *        });
+     *
+     *      program.parse(process.argv);
+     *
+     * @param {string} name
+     * @param {string} [desc] for git-style sub-commands
+     * @param {CommandOptions} [opts] command options
+     * @returns {Command} the new command
+     */
+    command(name: string, desc?: string, opts?: commander.CommandOptions): Command;
+
+    /**
+     * Define argument syntax for the top-level command.
+     *
+     * @param {string} desc
+     * @returns {Command} for chaining
+     */
+    arguments(desc: string): Command;
+
+    /**
+     * Parse expected `args`.
+     *
+     * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
+     *
+     * @param {string[]} args
+     * @returns {Command} for chaining
+     */
+    parseExpectedArgs(args: string[]): Command;
+    /**
+     * Register callback `fn` for the command.
+     *
+     * @example
+     *      program
+     *        .command('help')
+     *        .description('display verbose help')
+     *        .action(function() {
+     *           // output help here
+     *        });
+     *
+     * @param {(...args: any[]) => void} fn
+     * @returns {Command} for chaining
+     */
+    action(fn: (...args: any[]) => void): Command;
+
+    /**
+     * Define option with `flags`, `description` and optional
+     * coercion `fn`.
+     *
+     * The `flags` string should contain both the short and long flags,
+     * separated by comma, a pipe or space. The following are all valid
+     * all will output this way when `--help` is used.
+     *
+     *    "-p, --pepper"
+     *    "-p|--pepper"
+     *    "-p --pepper"
+     *
+     * @example
+     *     // simple boolean defaulting to false
+     *     program.option('-p, --pepper', 'add pepper');
+     *
+     *     --pepper
+     *     program.pepper
+     *     // => Boolean
+     *
+     *     // simple boolean defaulting to true
+     *     program.option('-C, --no-cheese', 'remove cheese');
+     *
+     *     program.cheese
+     *     // => true
+     *
+     *     --no-cheese
+     *     program.cheese
+     *     // => false
+     *
+     *     // required argument
+     *     program.option('-C, --chdir <path>', 'change the working directory');
+     *
+     *     --chdir /tmp
+     *     program.chdir
+     *     // => "/tmp"
+     *
+     *     // optional argument
+     *     program.option('-c, --cheese [type]', 'add cheese [marble]');
+     *
+     * @param {string} flags
+     * @param {string} [description]
+     * @param {((arg1: any, arg2: any) => void) | RegExp} [fn] function or default
+     * @param {*} [defaultValue]
+     * @returns {Command} for chaining
+     */
+    option(flags: string, description?: string, fn?: ((arg1: any, arg2: any) => void) | RegExp, defaultValue?: any): Command;
+    option(flags: string, description?: string, defaultValue?: any): Command;
+
+    /**
+     * Allow unknown options on the command line.
+     *
+     * @param {boolean} [arg] if `true` or omitted, no error will be thrown for unknown options.
+     * @returns {Command} for chaining
+     */
+    allowUnknownOption(arg?: boolean): Command;
+
+    /**
+     * Parse `argv`, settings options and invoking commands when defined.
+     *
+     * @param {string[]} argv
+     * @returns {Command} for chaining
+     */
+    parse(argv: string[]): Command;
+
+    /**
+     * Parse options from `argv` returning `argv` void of these options.
+     *
+     * @param {string[]} argv
+     * @returns {ParseOptionsResult}
+     */
+    parseOptions(argv: string[]): commander.ParseOptionsResult;
+
+    /**
+     * Return an object containing options as key-value pairs
+     *
+     * @returns {{[key: string]: string}}
+     */
+    opts(): { [key: string]: string };
+
+    /**
+     * Set the description to `str`.
+     *
+     * @param {string} str
+     * @return {(Command | string)}
+     */
+    description(str: string): Command;
+    description(): string;
+
+    /**
+     * Set an alias for the command.
+     *
+     * @param {string} alias
+     * @return {(Command | string)}
+     */
+    alias(alias: string): Command;
+    alias(): string;
+
+    /**
+     * Set or get the command usage.
+     *
+     * @param {string} str
+     * @return {(Command | string)}
+     */
+    usage(str: string): Command;
+    usage(): string;
+
+    /**
+     * Get the name of the command.
+     *
+     * @return {string}
+     */
+    name(): string;
+
+    /**
+     * Output help information for this command.
+     *
+     * @param {() => void} [cb] Callback method
+     */
+    outputHelp(cb?: () => void): void;
+
+    /** Output help information and exit. */
+    help(): void;
+}
+
 declare namespace commander {
 
     interface CommandOptions {
@@ -17,266 +278,14 @@ declare namespace commander {
         unknown: string[];
     }
 
-    class Option {
-        flags: string;
-        required: boolean;
-        optional: boolean;
-        bool: boolean;
-        short?: string;
-        long: string;
-        description: string;
-
-        /**
-         * Initialize a new `Option` with the given `flags` and `description`.
-         *
-         * @param {string} flags
-         * @param {string} [description]
-         */
-        constructor(flags: string, description?: string);
+    interface CommanderStatic extends Command {
+        Command: typeof Command;
+        Option: typeof Option;
+        CommandOptions: CommandOptions;
+        ParseOptionsResult: ParseOptionsResult;
     }
 
-    class Command extends NodeJS.EventEmitter {
-        args: string[];
-
-        /**
-         * Initialize a new `Command`.
-         *
-         * @param {string} [name]
-         */
-        constructor(name?: string);
-
-        /**
-         * Set the program version to `str`.
-         *
-         * This method auto-registers the "-V, --version" flag
-         * which will print the version number when passed.
-         *
-         * @param {string} str
-         * @param {string} [flags]
-         * @returns {Command} for chaining
-         */
-        version(str: string, flags?: string): Command;
-
-        /**
-         * Add command `name`.
-         *
-         * The `.action()` callback is invoked when the
-         * command `name` is specified via __ARGV__,
-         * and the remaining arguments are applied to the
-         * function for access.
-         *
-         * When the `name` is "*" an un-matched command
-         * will be passed as the first arg, followed by
-         * the rest of __ARGV__ remaining.
-         *
-         * @example
-         *      program
-         *        .version('0.0.1')
-         *        .option('-C, --chdir <path>', 'change the working directory')
-         *        .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
-         *        .option('-T, --no-tests', 'ignore test hook')
-         *
-         *      program
-         *        .command('setup')
-         *        .description('run remote setup commands')
-         *        .action(function() {
-         *          console.log('setup');
-         *        });
-         *
-         *      program
-         *        .command('exec <cmd>')
-         *        .description('run the given remote command')
-         *        .action(function(cmd) {
-         *          console.log('exec "%s"', cmd);
-         *        });
-         *
-         *      program
-         *        .command('teardown <dir> [otherDirs...]')
-         *        .description('run teardown commands')
-         *        .action(function(dir, otherDirs) {
-         *          console.log('dir "%s"', dir);
-         *          if (otherDirs) {
-         *            otherDirs.forEach(function (oDir) {
-         *              console.log('dir "%s"', oDir);
-         *            });
-         *          }
-         *        });
-         *
-         *      program
-         *        .command('*')
-         *        .description('deploy the given env')
-         *        .action(function(env) {
-         *          console.log('deploying "%s"', env);
-         *        });
-         *
-         *      program.parse(process.argv);
-         *
-         * @param {string} name
-         * @param {string} [desc] for git-style sub-commands
-         * @param {CommandOptions} [opts] command options
-         * @returns {Command} the new command
-         */
-        command(name: string, desc?: string, opts?: CommandOptions): Command;
-
-
-        /**
-         * Define argument syntax for the top-level command.
-         *
-         * @param {string} desc
-         * @returns {Command} for chaining
-         */
-        arguments(desc: string): Command;
-
-        /**
-         * Parse expected `args`.
-         *
-         * For example `["[type]"]` becomes `[{ required: false, name: 'type' }]`.
-         *
-         * @param {string[]} args
-         * @returns {Command} for chaining
-         */
-        parseExpectedArgs(args: string[]): Command;
-        /**
-         * Register callback `fn` for the command.
-         *
-         * @example
-         *      program
-         *        .command('help')
-         *        .description('display verbose help')
-         *        .action(function() {
-         *           // output help here
-         *        });
-         *
-         * @param {(...args: any[]) => void} fn
-         * @returns {Command} for chaining
-        */
-        action(fn: (...args: any[]) => void): Command;
-
-        /**
-         * Define option with `flags`, `description` and optional
-         * coercion `fn`.
-         *
-         * The `flags` string should contain both the short and long flags,
-         * separated by comma, a pipe or space. The following are all valid
-         * all will output this way when `--help` is used.
-         *
-         *    "-p, --pepper"
-         *    "-p|--pepper"
-         *    "-p --pepper"
-         *
-         *@example
-         *     // simple boolean defaulting to false
-         *     program.option('-p, --pepper', 'add pepper');
-         *
-         *     --pepper
-         *     program.pepper
-         *     // => Boolean
-         *
-         *     // simple boolean defaulting to true
-         *     program.option('-C, --no-cheese', 'remove cheese');
-         *
-         *     program.cheese
-         *     // => true
-         *
-         *     --no-cheese
-         *     program.cheese
-         *     // => false
-         *
-         *     // required argument
-         *     program.option('-C, --chdir <path>', 'change the working directory');
-         *
-         *     --chdir /tmp
-         *     program.chdir
-         *     // => "/tmp"
-         *
-         *     // optional argument
-         *     program.option('-c, --cheese [type]', 'add cheese [marble]');
-         *
-         * @param {string} flags
-         * @param {string} [description]
-         * @param {((arg1: any, arg2: any) => void) | RegExp} [fn] function or default
-         * @param {*} [defaultValue]
-         * @returns {Command} for chaining
-         */
-        option(flags: string, description?: string, fn?: ((arg1: any, arg2: any) => void) | RegExp, defaultValue?: any): Command;
-        option(flags: string, description?: string, defaultValue?: any): Command;
-
-        /**
-         * Allow unknown options on the command line.
-         *
-         * @param {boolean} [arg] if `true` or omitted, no error will be thrown for unknown options.
-         * @returns {Command} for chaining
-         */
-        allowUnknownOption(arg?: boolean): Command;
-
-        /**
-         * Parse `argv`, settings options and invoking commands when defined.
-         *
-         * @param {string[]} argv
-         * @returns {Command} for chaining
-         */
-        parse(argv: string[]): Command;
-
-        /**
-         * Parse options from `argv` returning `argv` void of these options.
-         *
-         * @param {string[]} argv
-         * @returns {ParseOptionsResult}
-         */
-        parseOptions(argv: string[]): ParseOptionsResult;
-
-        /**
-         * Return an object containing options as key-value pairs
-         *
-         * @returns {{[key: string]: string}}
-         */
-        opts(): { [key: string]: string };
-
-        /**
-         * Set the description to `str`.
-         *
-         * @param {string} str
-         * @return {(Command | string)}
-         */
-        description(str: string): Command;
-        description(): string;
-
-        /**
-         * Set an alias for the command.
-         *
-         * @param {string} alias
-         * @return {(Command | string)}
-         */
-        alias(alias: string): Command;
-        alias(): string;
-
-        /**
-         * Set or get the command usage.
-         *
-         * @param {string} str
-         * @return {(Command | string)}
-         */
-        usage(str: string): Command;
-        usage(): string;
-
-        /**
-         * Get the name of the command.
-         *
-         * @return {string}
-         */
-        name(): string;
-
-        /**
-         * Output help information for this command.
-         *
-         * @param {() => void} [cb] Callback method
-         */
-        outputHelp(cb?: () => void): void;
-
-        /** Output help information and exit. */
-        help(): void;
-    }
 }
 
-declare var command: commander.Command & commander.Option & { [key: string]: any };
-export = command;
+declare const commander: commander.CommanderStatic;
+export = commander;
diff --git a/types/commangular/index.d.ts b/types/commangular/index.d.ts
index 06126ac64f..4eb9d07230 100644
--- a/types/commangular/index.d.ts
+++ b/types/commangular/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://commangular.org
 // Definitions by: Hiraash Thawfeek <https://github.com/hiraash>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -270,4 +271,4 @@ declare module angular {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/types/commonmark/commonmark-tests.ts b/types/commonmark/commonmark-tests.ts
index d298972f89..8d3a3a5447 100644
--- a/types/commonmark/commonmark-tests.ts
+++ b/types/commonmark/commonmark-tests.ts
@@ -1,9 +1,6 @@
-
-
 import commonmark = require('commonmark');
 
 function logNode(node: commonmark.Node) {
-
     console.log(
         node.destination,
         node.firstChild,
@@ -24,12 +21,10 @@ function logNode(node: commonmark.Node) {
         node.sourcepos,
         node.title,
         node.type);
-
 }
 
-var parser = new commonmark.Parser({ smart: true, time: true });
-var node = parser.parse('# a piece of _markdown_');
-
+const parser = new commonmark.Parser({ smart: true, time: true });
+const node = parser.parse('# a piece of _markdown_');
 
 let w = node.walker();
 let step = w.next();
@@ -37,11 +32,75 @@ if (step.entering) {
     logNode(step.node);
 }
 
-
 let xmlRenderer = new commonmark.XmlRenderer({ sourcepos: true, time: true });
 let xml = xmlRenderer.render(node);
 console.log(xml);
 
-let htmlRenderer = new commonmark.HtmlRenderer({ safe: true, smart: true, sourcepos: true, time: true});
+let htmlRenderer = new commonmark.HtmlRenderer({ safe: true, smart: true, sourcepos: true, time: true });
 let html = htmlRenderer.render(node);
-console.log(html);
\ No newline at end of file
+console.log(html);
+
+function basic_usage() {
+    const reader = new commonmark.Parser();
+    const writer = new commonmark.HtmlRenderer();
+    const parsed = reader.parse('Hello *world*'); // parsed is a 'Node' tree
+    // transform parsed if you like...
+    const result = writer.render(parsed); // result is a String
+}
+
+function constructor_optional_options() {
+    const writer = new commonmark.HtmlRenderer({ sourcepos: true });
+}
+
+function soft_breaks_as_hard_breaks() {
+    const writer = new commonmark.HtmlRenderer();
+    writer.softbreak = '<br />';
+}
+
+function soft_breaks_as_spaces() {
+    const writer = new commonmark.HtmlRenderer();
+    writer.softbreak = ' ';
+}
+
+function text_to_ALL_CAPS(parsed: commonmark.Node) {
+    const walker = parsed.walker();
+    let event: commonmark.NodeWalkingStep;
+    let node: commonmark.Node;
+
+    event = walker.next();
+    while (event) {
+        node = event.node;
+        if (event.entering && node.type === 'text') {
+            node.literal = node.literal!.toUpperCase();
+        }
+        event = walker.next();
+    }
+}
+
+function emphasis_to_ALL_CAPS(parsed: commonmark.Node) {
+    const walker = parsed.walker();
+    let event: commonmark.NodeWalkingStep;
+    let node: commonmark.Node;
+    let inEmph = false;
+
+    event = walker.next();
+    while (event) {
+        node = event.node;
+        if (node.type === 'emph') {
+            if (event.entering) {
+                inEmph = true;
+            } else {
+                inEmph = false;
+                // add Emph node's children as siblings
+                while (node.firstChild) {
+                    node.insertBefore(node.firstChild);
+                }
+                // remove the empty Emph node
+                node.unlink();
+            }
+        } else if (inEmph && node.type === 'text') {
+            node.literal = node.literal!.toUpperCase();
+        }
+        event = walker.next();
+    }
+}
diff --git a/types/commonmark/index.d.ts b/types/commonmark/index.d.ts
index bba8cd7e36..01b9541efa 100644
--- a/types/commonmark/index.d.ts
+++ b/types/commonmark/index.d.ts
@@ -1,212 +1,221 @@
-// Type definitions for commonmark.js 0.22.1
+// Type definitions for commonmark.js 0.27
 // Project: https://github.com/jgm/commonmark.js
 // Definitions by: Nico Jansen <https://github.com/nicojs>
+//                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = commonmark;
-export as namespace commonmark;
-
-declare namespace commonmark {
-
-    export interface NodeWalkingStep {
-        /**
-         * a boolean, which is true when we enter a Node from a parent or sibling, and false when we reenter it from a child
-         */
-        entering: boolean;
-        /**
-         * The node belonging to this step
-         */
-        node: Node;
-    }
-
-    export interface NodeWalker {
-        /**
-         * Returns an object with properties entering and node. Returns null when we have finished walking the tree.
-         */
-        next(): NodeWalkingStep;
-        /**
-         * Resets the iterator to resume at the specified node and setting for entering. (Normally this isn't needed unless you do destructive updates to the Node tree.)
-         */
-        resumeAt(node: Node, entering?: boolean): void;
-    }
-
-    export interface Position extends Array<Array<number>> {
-    }
-
-    export interface ListData {
-        type?: string,
-        tight?: boolean,
-        delimiter?: string,
-        bulletChar?: string
-    }
-
-    export class Node {
-        constructor(nodeType: string, sourcepos?: Position);
-        isContainer: boolean;
-
-        /**
-         * (read-only): one of Text, Softbreak, Hardbreak, Emph, Strong, Html, Link, Image, Code, Document, Paragraph, BlockQuote, Item, List, Heading, CodeBlock, HtmlBlock ThematicBreak.
-         */
-        type: string;
-        /**
-         * (read-only): a Node or null.
-         */
-        firstChild: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        lastChild: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        next: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        prev: Node;
-        /**
-         * (read-only): a Node or null.
-         */
-        parent: Node;
-        /**
-         * (read-only): an Array with the following form: [[startline, startcolumn], [endline, endcolumn]]
-         */
-        sourcepos: Position;
-        /**
-         *  the literal String content of the node or null.
-         */
-        literal: string;
-        /**
-         * link or image destination (String) or null.
-         */
-        destination: string;
-        /**
-         *  link or image title (String) or null.
-         */
-        title: string;
-        /**
-         * fenced code block info string (String) or null.
-         */
-        info: string;
-        /**
-         * heading level (Number).
-         */
-        level: number;
-        /**
-         * either Bullet or Ordered (or undefined).
-         */
-        listType: string;
-        /**
-         * true if list is tight
-         */
-        listTight: boolean;
-        /**
-         * a Number, the starting number of an ordered list.
-         */
-        listStart: number;
-        /**
-         * a String, either ) or . for an ordered list.
-         */
-        listDelimiter: string;
-        /**
-         * used only for CustomBlock or CustomInline.
-         */
-        onEnter: string;
-        /**
-         * used only for CustomBlock or CustomInline.
-         */
-        onExit: string;
-        /**
-         * Append a Node child to the end of the Node's children.
-         */
-        appendChild(child: Node): void;
-        /**
-         *  Prepend a Node child to the beginning of the Node's children.
-         */
-        prependChild(child: Node): void;
-        /**
-         *  Remove the Node from the tree, severing its links with siblings and parents, and closing up gaps as needed.
-         */
-        unlink(): void;
-        /**
-         * Insert a Node sibling after the Node.
-         */
-        insertAfter(sibling: Node): void;
-        /**
-         * Insert a Node sibling before the Node.
-         */
-        insertBefore(sibling: Node): void;
-        /**
-         * Returns a NodeWalker that can be used to iterate through the Node tree rooted in the Node
-         */
-        walker(): NodeWalker;
-        /**
-         * Setting the backing object of listType, listTight, listStat and listDelimiter directly.
-         * Not needed unless creating list nodes directly. Should be fixed from v>0.22.1
-         * https://github.com/jgm/commonmark.js/issues/74
-         */
-        _listData: ListData;
-    }
+export class Node {
+    constructor(nodeType: string, sourcepos?: Position);
 
     /**
-     * Instead of converting Markdown directly to HTML, as most converters do, commonmark.js parses Markdown to an AST (abstract syntax tree), and then renders this AST as HTML.
-     * This opens up the possibility of manipulating the AST between parsing and rendering. For example, one could transform emphasis into ALL CAPS.
+     * (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.
      */
-    export class Parser {
-        /**
-         * Constructs a new Parser
-         */
-        constructor(options?: ParserOptions);
-        parse(input: string): Node;
-    }
+    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';
+    /**
+     * (read-only): a Node or null.
+     */
+    readonly firstChild: Node | null;
+    /**
+     * (read-only): a Node or null.
+     */
+    readonly lastChild: Node | null;
+    /**
+     * (read-only): a Node or null.
+     */
+    readonly next: Node | null;
+    /**
+     * (read-only): a Node or null.
+     */
+    readonly prev: Node | null;
+    /**
+     * (read-only): a Node or null.
+     */
+    readonly parent: Node | null;
+    /**
+     * (read-only): an Array with the following form: [[startline, startcolumn], [endline, endcolumn]]
+     */
+    readonly sourcepos: Position;
+    /**
+     * (read-only): true if the Node can contain other Nodes as children.
+     */
+    readonly isContainer: boolean;
+    /**
+     *  the literal String content of the node or null.
+     */
+    literal: string | null;
+    /**
+     * link or image destination (String) or null.
+     */
+    destination: string | null;
+    /**
+     *  link or image title (String) or null.
+     */
+    title: string | null;
+    /**
+     * fenced code block info string (String) or null.
+     */
+    info: string | null;
+    /**
+     * heading level (Number).
+     */
+    level: number;
+    /**
+     * either Bullet or Ordered (or undefined).
+     */
+    listType: 'Bullet' | 'Ordered';
+    /**
+     * true if list is tight
+     */
+    listTight: boolean;
+    /**
+     * a Number, the starting number of an ordered list.
+     */
+    listStart: number;
+    /**
+     * a String, either ) or . for an ordered list.
+     */
+    listDelimiter: ')' | '.';
+    /**
+     * used only for CustomBlock or CustomInline.
+     */
+    onEnter: string;
+    /**
+     * used only for CustomBlock or CustomInline.
+     */
+    onExit: string;
 
-    export interface ParserOptions {
-        /**
-         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
-         */
-        smart?: boolean;
-        time?: boolean;
-    }
+    /**
+     * Append a Node child to the end of the Node's children.
+     */
+    appendChild(child: Node): void;
 
-    export interface HtmlRenderingOptions extends XmlRenderingOptions {
-        /**
-         *  if true, raw HTML will not be passed through to HTML output (it will be replaced by comments), and potentially unsafe URLs in links and images (those beginning with javascript:, vbscript:, file:, and with a few exceptions data:) will be replaced with empty strings.
-         */
-        safe?: boolean;
-        /**
-         *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
-         */
-        smart?: boolean;
-        /**
-         *  if true, source position information for block-level elements will be rendered in the data-sourcepos attribute (for HTML) or the sourcepos attribute (for XML).
-         */
-        sourcepos?: boolean;
-    }
+    /**
+     *  Prepend a Node child to the beginning of the Node's children.
+     */
+    prependChild(child: Node): void;
 
-    export class HtmlRenderer {
-        constructor(options?: HtmlRenderingOptions)
-        render(root: Node): string;
-        /**
-         * Let's you override the softbreak properties of a renderer. So, to make soft breaks render as hard breaks in HTML:
-         * writer.softbreak = "<br />";
-         */
-        softbreak: string;
-        /**
-         * Override the function that will be used to escape (sanitize) the html output. Return value is used to add to the html output
-         * @param input the input to escape
-         * @param isAttributeValue indicates wheter or not the input value will be used as value of an html attribute.
-         */
-        escape: (input: string, isAttributeValue: boolean) => string;
-    }
+    /**
+     *  Remove the Node from the tree, severing its links with siblings and parents, and closing up gaps as needed.
+     */
+    unlink(): void;
 
-    export interface XmlRenderingOptions {
-        time?: boolean;
-        sourcepos?: boolean;
-    }
+    /**
+     * Insert a Node sibling after the Node.
+     */
+    insertAfter(sibling: Node): void;
 
-    export class XmlRenderer {
-        constructor(options?: XmlRenderingOptions)
-        render(root: Node): string;
-    }
+    /**
+     * Insert a Node sibling before the Node.
+     */
+    insertBefore(sibling: Node): void;
 
+    /**
+     * Returns a NodeWalker that can be used to iterate through the Node tree rooted in the Node
+     */
+    walker(): NodeWalker;
+
+    /**
+     * Setting the backing object of listType, listTight, listStat and listDelimiter directly.
+     * Not needed unless creating list nodes directly. Should be fixed from v>0.22.1
+     * https://github.com/jgm/commonmark.js/issues/74
+     */
+    _listData: ListData;
+}
+
+/**
+ * Instead of converting Markdown directly to HTML, as most converters do, commonmark.js parses Markdown to an AST (abstract syntax tree), and then renders this AST as HTML.
+ * This opens up the possibility of manipulating the AST between parsing and rendering. For example, one could transform emphasis into ALL CAPS.
+ */
+export class Parser {
+    /**
+     * Constructs a new Parser
+     */
+    constructor(options?: ParserOptions);
+
+    parse(input: string): Node;
+}
+
+export class HtmlRenderer {
+    constructor(options?: HtmlRenderingOptions)
+
+    render(root: Node): string;
+
+    /**
+     * Let's you override the softbreak properties of a renderer. So, to make soft breaks render as hard breaks in HTML:
+     * writer.softbreak = "<br />";
+     */
+    softbreak: string;
+    /**
+     * Override the function that will be used to escape (sanitize) the html output. Return value is used to add to the html output
+     * @param input the input to escape
+     * @param isAttributeValue indicates wheter or not the input value will be used as value of an html attribute.
+     */
+    escape: (input: string, isAttributeValue: boolean) => string;
+}
+
+export class XmlRenderer {
+    constructor(options?: XmlRenderingOptions)
+
+    render(root: Node): string;
+}
+export interface NodeWalkingStep {
+    /**
+     * a boolean, which is true when we enter a Node from a parent or sibling, and false when we reenter it from a child
+     */
+    entering: boolean;
+    /**
+     * The node belonging to this step
+     */
+    node: Node;
+}
+
+export interface NodeWalker {
+    /**
+     * Returns an object with properties entering and node. Returns null when we have finished walking the tree.
+     */
+    next(): NodeWalkingStep;
+    /**
+     * Resets the iterator to resume at the specified node and setting for entering. (Normally this isn't needed unless you do destructive updates to the Node tree.)
+     */
+    resumeAt(node: Node, entering?: boolean): void;
+}
+
+export type Position = [[number, number], [number, number]];
+
+export interface ListData {
+    type?: string;
+    tight?: boolean;
+    delimiter?: string;
+    bulletChar?: string;
+}
+
+export interface ParserOptions {
+    /**
+     *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
+     */
+    smart?: boolean;
+    time?: boolean;
+}
+
+export interface HtmlRenderingOptions extends XmlRenderingOptions {
+    /**
+     *  if true, raw HTML will not be passed through to HTML output (it will be replaced by comments), and potentially unsafe URLs in links and images
+     *  (those beginning with javascript:, vbscript:, file:, and with a few exceptions data:) will be replaced with empty strings.
+     */
+    safe?: boolean;
+    /**
+     *  if true, straight quotes will be made curly, -- will be changed to an en dash, --- will be changed to an em dash, and ... will be changed to ellipses.
+     */
+    smart?: boolean;
+    /**
+     *  if true, source position information for block-level elements will be rendered in the data-sourcepos attribute (for HTML) or the sourcepos attribute (for XML).
+     */
+    sourcepos?: boolean;
+}
+
+export interface XmlRenderingOptions {
+    time?: boolean;
+    sourcepos?: boolean;
 }
diff --git a/types/commonmark/tsconfig.json b/types/commonmark/tsconfig.json
index e424e972ca..82e3004b78 100644
--- a/types/commonmark/tsconfig.json
+++ b/types/commonmark/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "commonmark-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/commonmark/tslint.json b/types/commonmark/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/commonmark/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts b/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts
new file mode 100644
index 0000000000..382e436366
--- /dev/null
+++ b/types/connect-history-api-fallback/connect-history-api-fallback-tests.ts
@@ -0,0 +1,64 @@
+import * as historyApiFallback from 'connect-history-api-fallback';
+
+import * as express from "express";
+
+const app = express();
+app.use(historyApiFallback());
+
+historyApiFallback({
+    verbose: true
+});
+
+historyApiFallback({
+    logger: console.log.bind(console)
+});
+
+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/index.d.ts b/types/connect-history-api-fallback/index.d.ts
new file mode 100644
index 0000000000..9cd77ac174
--- /dev/null
+++ b/types/connect-history-api-fallback/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for connect-history-api-fallback 1.3
+// Project: https://github.com/bripkens/connect-history-api-fallback#readme
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Url } from 'url';
+
+import * as core from "express-serve-static-core";
+
+declare function historyApiFallback(options?: Options): core.RequestHandler;
+declare namespace historyApiFallback {}
+export = historyApiFallback;
+
+interface Options {
+    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;
+}
diff --git a/types/connect-history-api-fallback/tsconfig.json b/types/connect-history-api-fallback/tsconfig.json
new file mode 100644
index 0000000000..124c7dc340
--- /dev/null
+++ b/types/connect-history-api-fallback/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "connect-history-api-fallback-tests.ts"
+    ]
+}
diff --git a/types/connect-history-api-fallback/tslint.json b/types/connect-history-api-fallback/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/connect-history-api-fallback/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/connect-mongo/index.d.ts b/types/connect-mongo/index.d.ts
index b469d08d00..0b7443f7e1 100644
--- a/types/connect-mongo/index.d.ts
+++ b/types/connect-mongo/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kcbanner/connect-mongo
 // Definitions by: Mizuki Yamamoto <https://github.com/Syati>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="express-session" />
 
diff --git a/types/connect-redis/connect-redis-tests.ts b/types/connect-redis/connect-redis-tests.ts
index 3c50074117..11cd583a74 100644
--- a/types/connect-redis/connect-redis-tests.ts
+++ b/types/connect-redis/connect-redis-tests.ts
@@ -2,3 +2,9 @@ import * as connectRedis from "connect-redis";
 import * as session from "express-session";
 
 let RedisStore = connectRedis(session);
+const store = new RedisStore({
+    host: 'localhost',
+    port: 6379,
+    logErrors: error => console.warn(error),
+    scanCount: 80,
+});
diff --git a/types/connect-redis/index.d.ts b/types/connect-redis/index.d.ts
index f66314a083..b5084609a2 100644
--- a/types/connect-redis/index.d.ts
+++ b/types/connect-redis/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for connect-redis
 // Project: https://npmjs.com/package/connect-redis
 // Definitions by: Xavier Stouder <https://github.com/xstoudi>
+//                 Albert Kurniawan <https://github.com/morcerf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="express" />
@@ -32,6 +33,8 @@ declare module "connect-redis" {
             prefix?: string;
             unref?: boolean;
             serializer?: Serializer | JSON;
+            logErrors?: boolean | ((error: string) => void);
+            scanCount?: number;
         }
         interface Serializer {
             stringify: Function;
diff --git a/types/consolidate/consolidate-tests.ts b/types/consolidate/consolidate-tests.ts
index 06239710c0..c4bbe207c8 100644
--- a/types/consolidate/consolidate-tests.ts
+++ b/types/consolidate/consolidate-tests.ts
@@ -4,133 +4,136 @@ import cons = require('consolidate');
 var path: string = 'test/path';
 var options = {user: 'tobi'};
 var fn = function(err: Error, html: string) {};
+(async () => {
+  let res: string;
 
-cons.atpl(path);
-cons.atpl(path, options);
-cons.atpl(path, options, fn);
+  res = await cons.atpl(path);
+  res = await cons.atpl(path, options);
+  cons.atpl(path, options, fn);
 
-cons.dot(path);
-cons.dot(path, options);
-cons.dot(path, options, fn);
+  res = await cons.dot(path);
+  res = await cons.dot(path, options);
+  cons.dot(path, options, fn);
 
-cons.dust(path);
-cons.dust(path, options);
-cons.dust(path, options, fn);
+  res = await cons.dust(path);
+  res = await cons.dust(path, options);
+  cons.dust(path, options, fn);
 
-cons.eco(path);
-cons.eco(path, options);
-cons.eco(path, options, fn);
+  res = await cons.eco(path);
+  res = await cons.eco(path, options);
+  cons.eco(path, options, fn);
 
-cons.ect(path);
-cons.ect(path, options);
-cons.ect(path, options, fn);
+  res = await cons.ect(path);
+  res = await cons.ect(path, options);
+  cons.ect(path, options, fn);
 
-cons.ejs(path);
-cons.ejs(path, options);
-cons.ejs(path, options, fn);
+  res = await cons.ejs(path);
+  res = await cons.ejs(path, options);
+  cons.ejs(path, options, fn);
 
-cons.haml(path);
-cons.haml(path, options);
-cons.haml(path, options, fn);
+  res = await cons.haml(path);
+  res = await cons.haml(path, options);
+  cons.haml(path, options, fn);
 
-// TODO figure out how to type haml-coffee
-// cons['haml-coffee'](path, options, fn);
+  // TODO figure out how to type haml-coffee
+  // cons['haml-coffee'](path, options, fn);
 
-cons.hamlet(path);
-cons.hamlet(path, options);
-cons.hamlet(path, options, fn);
+  res = await cons.hamlet(path);
+  res = await cons.hamlet(path, options);
+  cons.hamlet(path, options, fn);
 
-cons.handlebars(path);
-cons.handlebars(path, options);
-cons.handlebars(path, options, fn);
+  res = await cons.handlebars(path);
+  res = await cons.handlebars(path, options);
+  cons.handlebars(path, options, fn);
 
-cons.hogan(path);
-cons.hogan(path, options);
-cons.hogan(path, options, fn);
+  res = await cons.hogan(path);
+  res = await cons.hogan(path, options);
+  cons.hogan(path, options, fn);
 
-cons.htmling(path);
-cons.htmling(path, options);
-cons.htmling(path, options, fn);
+  res = await cons.htmling(path);
+  res = await cons.htmling(path, options);
+  cons.htmling(path, options, fn);
 
-cons.jade(path);
-cons.jade(path, options);
-cons.jade(path, options, fn);
+  res = await cons.jade(path);
+  res = await cons.jade(path, options);
+  cons.jade(path, options, fn);
 
-cons.jazz(path);
-cons.jazz(path, options);
-cons.jazz(path, options, fn);
+  res = await cons.jazz(path);
+  res = await cons.jazz(path, options);
+  cons.jazz(path, options, fn);
 
-cons.jqtpl(path);
-cons.jqtpl(path, options);
-cons.jqtpl(path, options, fn);
+  res = await cons.jqtpl(path);
+  res = await cons.jqtpl(path, options);
+  cons.jqtpl(path, options, fn);
 
-cons.just(path);
-cons.just(path, options);
-cons.just(path, options, fn);
+  res = await cons.just(path);
+  res = await cons.just(path, options);
+  cons.just(path, options, fn);
 
-cons.liquid(path);
-cons.liquid(path, options);
-cons.liquid(path, options, fn);
+  res = await cons.liquid(path);
+  res = await cons.liquid(path, options);
+  cons.liquid(path, options, fn);
 
-cons.liquor(path);
-cons.liquor(path, options);
-cons.liquor(path, options, fn);
+  res = await cons.liquor(path);
+  res = await cons.liquor(path, options);
+  cons.liquor(path, options, fn);
 
-cons.lodash(path);
-cons.lodash(path, options);
-cons.lodash(path, options, fn);
+  res = await cons.lodash(path);
+  res = await cons.lodash(path, options);
+  cons.lodash(path, options, fn);
 
-cons.mote(path);
-cons.mote(path, options);
-cons.mote(path, options, fn);
+  res = await cons.mote(path);
+  res = await cons.mote(path, options);
+  cons.mote(path, options, fn);
 
-cons.mustache(path);
-cons.mustache(path, options);
-cons.mustache(path, options, fn);
+  res = await cons.mustache(path);
+  res = await cons.mustache(path, options);
+  cons.mustache(path, options, fn);
 
-cons.nunjucks(path);
-cons.nunjucks(path, options);
-cons.nunjucks(path, options, fn);
+  res = await cons.nunjucks(path);
+  res = await cons.nunjucks(path, options);
+  cons.nunjucks(path, options, fn);
 
-cons.pug(path);
-cons.pug(path, options);
-cons.pug(path, options, fn);
+  res = await cons.pug(path);
+  res = await cons.pug(path, options);
+  cons.pug(path, options, fn);
 
-cons.qejs(path);
-cons.qejs(path, options);
-cons.qejs(path, options, fn);
+  res = await cons.qejs(path);
+  res = await cons.qejs(path, options);
+  cons.qejs(path, options, fn);
 
-cons.ractive(path);
-cons.ractive(path, options);
-cons.ractive(path, options, fn);
+  res = await cons.ractive(path);
+  res = await cons.ractive(path, options);
+  cons.ractive(path, options, fn);
 
-cons.react(path);
-cons.react(path, options);
-cons.react(path, options, fn);
+  res = await cons.react(path);
+  res = await cons.react(path, options);
+  cons.react(path, options, fn);
 
-cons.swig(path);
-cons.swig(path, options);
-cons.swig(path, options, fn);
+  res = await cons.swig(path);
+  res = await cons.swig(path, options);
+  cons.swig(path, options, fn);
 
-cons.templayed(path);
-cons.templayed(path, options);
-cons.templayed(path, options, fn);
+  res = await cons.templayed(path);
+  res = await cons.templayed(path, options);
+  cons.templayed(path, options, fn);
 
-cons.toffee(path);
-cons.toffee(path, options);
-cons.toffee(path, options, fn);
+  res = await cons.toffee(path);
+  res = await cons.toffee(path, options);
+  cons.toffee(path, options, fn);
 
-cons.underscore(path);
-cons.underscore(path, options);
-cons.underscore(path, options, fn);
+  res = await cons.underscore(path);
+  res = await cons.underscore(path, options);
+  cons.underscore(path, options, fn);
 
-cons.walrus(path);
-cons.walrus(path, options);
-cons.walrus(path, options, fn);
+  res = await cons.walrus(path);
+  res = await cons.walrus(path, options);
+  cons.walrus(path, options, fn);
 
-cons.whiskers(path);
-cons.whiskers(path, options);
-cons.whiskers(path, options, fn);
+  res = await cons.whiskers(path);
+  res = await cons.whiskers(path, options);
+  cons.whiskers(path, options, fn);
+})();
 
 /**
  * Examples from documentation
diff --git a/types/consolidate/index.d.ts b/types/consolidate/index.d.ts
index 454d13263f..bfe432214f 100644
--- a/types/consolidate/index.d.ts
+++ b/types/consolidate/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for consolidate
 // Project: https://github.com/visionmedia/consolidate.js
-// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Theo Sherry <https://github.com/theosherry>
+// Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Theo Sherry <https://github.com/theosherry>, Nicolas Henry <https://github.com/nicolashenry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/consolidate.d.ts
 
@@ -61,15 +62,15 @@ interface Consolidate {
 }
 
 interface RendererInterface {
-    render(path: String, fn: (err: Error, html: String) => any): any;
+    render(path: string, fn: (err: Error, html: string) => any): any;
 
-    render(path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+    render(path: string, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: string) => any): any;
 
-    render(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
+    render(path: string, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<string>;
 
-    (path: String, fn: (err: Error, html: String) => any): any;
+    (path: string, fn: (err: Error, html: string) => any): any;
 
-    (path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+    (path: string, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: string) => any): any;
 
-    (path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
+    (path: string, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<string>;
 }
diff --git a/types/consolidate/tsconfig.json b/types/consolidate/tsconfig.json
index a7ae476c88..c03c07a3a9 100644
--- a/types/consolidate/tsconfig.json
+++ b/types/consolidate/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
+        "target": "es6",
         "lib": [
             "es6"
         ],
@@ -19,4 +20,4 @@
         "index.d.ts",
         "consolidate-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/content-type/content-type-tests.ts b/types/content-type/content-type-tests.ts
index f173a1efbb..0705d440c1 100644
--- a/types/content-type/content-type-tests.ts
+++ b/types/content-type/content-type-tests.ts
@@ -1,19 +1,18 @@
 import contentType = require('content-type');
 import express = require('express');
 
-var obj = contentType.parse('image/svg+xml; charset=utf-8');
+let obj = contentType.parse('image/svg+xml; charset=utf-8');
 
 console.log(obj.type);  // => 'image/svg+xml'
 console.log(obj.parameters.charset);  // => 'utf-8'
 
-
-var req: express.Request;
+let req: express.Request;
 obj = contentType.parse(req);
 
-var res: express.Response;
+let res: express.Response;
 obj = contentType.parse(res);
 
-var str: string = contentType.format({type: 'image/svg+xml'});
+let str: string = contentType.format({type: 'image/svg+xml'});
 
-var media: contentType.MediaType;
+let media: contentType.MediaType;
 contentType.format(media);
diff --git a/types/content-type/index.d.ts b/types/content-type/index.d.ts
index 3dd39182f4..ec60de446f 100644
--- a/types/content-type/index.d.ts
+++ b/types/content-type/index.d.ts
@@ -1,16 +1,16 @@
-// Type definitions for content-type v1.0.1
+// Type definitions for content-type 1.1
 // Project: https://www.npmjs.com/package/content-type
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+import * as express from 'express';
+
 declare var ct: ct.StaticFunctions;
 export = ct;
 
 declare namespace ct {
     interface StaticFunctions {
-        parse(string: string): MediaType;
-        parse(req: { headers: any; }): MediaType;
-        parse(res: { getHeader(key: string): string; }): MediaType;
+        parse(input: express.Request | express.Response | string): MediaType;
         format(obj: MediaType): string;
     }
 
diff --git a/types/content-type/tslint.json b/types/content-type/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/content-type/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/convict/convict-tests.ts b/types/convict/convict-tests.ts
index 0451954ca1..3bc0b4565f 100644
--- a/types/convict/convict-tests.ts
+++ b/types/convict/convict-tests.ts
@@ -129,6 +129,7 @@ if (conf.has('key')) {
   });
 }
 
+conf.get();
 conf.getSchema();
 conf.getProperties();
 conf.getSchemaString();
diff --git a/types/convict/index.d.ts b/types/convict/index.d.ts
index ebe5d21490..82b22ba2db 100644
--- a/types/convict/index.d.ts
+++ b/types/convict/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-convict v3.0.0
+// Type definitions for convict 3.0
 // Project: https://github.com/mozilla/node-convict
 // Definitions by: Wim Looman <https://github.com/Nemo157>, Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -53,7 +53,7 @@ declare namespace convict {
          * @returns the current value of the name property. name can use dot
          * notation to reference nested values
          */
-        get(name: string): any;
+        get(name?: string): any;
         /**
          * @returns the default value of the name property. name can use dot
          * notation to reference nested values
diff --git a/types/copy-paste/copy-paste-tests.ts b/types/copy-paste/copy-paste-tests.ts
index 24ab6c5d95..8b17d67ace 100644
--- a/types/copy-paste/copy-paste-tests.ts
+++ b/types/copy-paste/copy-paste-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as CopyPaste from 'copy-paste';
 
 class TestClass {}
diff --git a/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts b/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
index 1c62521293..dbad990b8d 100644
--- a/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
+++ b/types/cordova-plugin-battery-status/cordova-plugin-battery-status-tests.ts
@@ -1,5 +1,29 @@
-window.addEventListener('batterystatus',
-    (ev: BatteryStatusEvent) => { console.log('Battery level is ' + ev.level); });
+function eventCallBack(ev: BatteryStatusEvent) {
+    console.log('Battery level is ' + ev.level);
+}
+window.addEventListener('batterystatus', (ev: BatteryStatusEvent) => { console.log('Battery level is ' + ev.level); });
+window.addEventListener('batterystatus', (ev) => { console.log('Battery level is ' + ev.level); });
+window.addEventListener('batterycritical', (ev) => { console.log('Battery is critical: ' + ev.level); });
+window.addEventListener('batterylow', (ev) => { console.log('Battery is low: ' + ev.level); });
 
-window.addEventListener('batterycritical',
-    () => { alert('Battery is critical low!'); });
\ No newline at end of file
+window.addEventListener('baterystatus', eventCallBack);
+window.addEventListener('batterycritical', eventCallBack);
+window.addEventListener('batterylow', eventCallBack);
+
+window.removeEventListener('batterystatus', eventCallBack);
+window.removeEventListener('batterycritical', eventCallBack);
+window.removeEventListener('batterylow', eventCallBack);
+
+window.addEventListener('batterycritical', () => { alert('Battery is critical low!'); });
+window.addEventListener('batterylow', () => { alert('Battery is low!'); });
+
+function batteryCriticalCallback() {
+    alert('Battery is critical low!');
+}
+
+function batteryLowCallback() {
+    alert('Battery is critical low!');
+}
+
+window.addEventListener('batterycritical', batteryCriticalCallback);
+window.addEventListener('batterylow', batteryLowCallback);
\ No newline at end of file
diff --git a/types/cordova-plugin-battery-status/index.d.ts b/types/cordova-plugin-battery-status/index.d.ts
index 9baedc8cb0..0cdf729d30 100644
--- a/types/cordova-plugin-battery-status/index.d.ts
+++ b/types/cordova-plugin-battery-status/index.d.ts
@@ -4,116 +4,28 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // 
 // Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
+// TypeScript Version: 2.3
+
+interface WindowEventMap {
+    /**
+     * batterystatus: event fires when the percentage of battery charge changes by at least 1 percent, or if the device is plugged in or unplugged.
+     */
+    "batterystatus" : BatteryStatusEvent;
+    /**
+     * batterycritical: event fires when the percentage of battery charge has reached the critical battery threshold. The value is device-specific.
+     */
+    "batterycritical": BatteryStatusEvent;
+    /**
+     * batterylow: event fires when the percentage of battery charge has reached the low battery threshold, device-specific value.
+     */
+    "batterylow": BatteryStatusEvent;
+}
 
 interface Window {
     onbatterystatus: (type: BatteryStatusEvent) => void;
     onbatterycritical: (type: BatteryStatusEvent) => void;
     onbatterylow: (type: BatteryStatusEvent) => void;
-    /**
-     * Adds a listener for an event from the BatteryStatus plugin.
-     * @param type      the event to listen for
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param listener  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    addEventListener(type: "batterystatus", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Adds a listener for an event from the BatteryStatus plugin.
-     * @param type      the event to listen for
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param listener  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    addEventListener(type: "batterycritical", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Adds a listener for an event from the BatteryStatus plugin.
-     * @param type      the event to listen for
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param listener  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    addEventListener(type: "batterylow", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Adds a listener for an event from the BatteryStatus plugin.
-     * @param type      the event to listen for
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param listener  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    addEventListener(type: string, listener: (ev: Event) => any, useCapture?: boolean): void;
-    /**
-     * Removes a listener for an event from the BatteryStatus plugin.
-     * @param type      The event to stop listening for.
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    removeEventListener(type: "batterystatus", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Removes a listener for an event from the BatteryStatus plugin.
-     * @param type      The event to stop listening for.
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    removeEventListener(type: "batterycritical", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Removes a listener for an event from the BatteryStatus plugin.
-     * @param type      The event to stop listening for.
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    removeEventListener(type: "batterylow", listener: (ev: BatteryStatusEvent) => any, useCapture?: boolean): void;
-    /**
-     * Removes a listener for an event from the BatteryStatus plugin.
-     * @param type      The event to stop listening for.
-     *                  batterystatus: event fires when the percentage of battery charge
-     *                  changes by at least 1 percent, or if the device is plugged in or unplugged.
-     *                  batterycritical: event fires when the percentage of battery charge has reached
-     *                  the critical battery threshold. The value is device-specific.
-     *                  batterylow: event fires when the percentage of battery charge has
-     *                  reached the low battery threshold, device-specific value.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an BatteryStatusEvent object as a parameter.
-     */
-    removeEventListener(type: string, listener: (ev: Event) => any, useCapture?: boolean): void;
 }
 
 /** Object, that passed into battery event listener */
diff --git a/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts b/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
index cef288c921..1497eec386 100644
--- a/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
+++ b/types/cordova-plugin-inappbrowser/cordova-plugin-inappbrowser-tests.ts
@@ -1,13 +1,34 @@
 // InAppBrowser plugin
-//----------------------------------------------------------------------
+// ----------------------------------------------------------------------
 
 // signature of window.open() added by InAppBrowser plugin
 // is similar to native window.open signature, so the compiler can's
 // select proper overload, but we cast result to InAppBrowser manually.
-var iab = <InAppBrowser>window.open('google.com', '_self');
+const iab = <InAppBrowser> window.open('google.com', '_self');
+
 iab.addEventListener('loadstart', (ev: InAppBrowserEvent) => { console.log('Start opening ' + ev.url); });
+iab.addEventListener('loadstart', (ev) => { console.log('loadstart' + ev.url); });
+iab.addEventListener('loadstop', (ev) => { console.log('loadstop' + ev.code); });
+iab.addEventListener('loaderror', (ev) => { console.log('loaderror' + ev.code); });
+iab.addEventListener('exit', (ev) => { console.log('exit' + ev.code); });
+
+function inAppBrowserCallBack(ev: InAppBrowserEvent) {
+    console.log('InAppBrowser callback ' + ev.url);
+}
+
+iab.addEventListener('loadstart', inAppBrowserCallBack);
+iab.addEventListener('loadstart', inAppBrowserCallBack);
+iab.addEventListener('loadstop', inAppBrowserCallBack);
+iab.addEventListener('loaderror', inAppBrowserCallBack);
+iab.addEventListener('exit', inAppBrowserCallBack);
+
+iab.removeEventListener('loadstart', inAppBrowserCallBack);
+iab.removeEventListener('loadstop', inAppBrowserCallBack);
+iab.removeEventListener('loaderror', inAppBrowserCallBack);
+iab.removeEventListener('exit', inAppBrowserCallBack);
+
 iab.show();
 iab.executeScript(
     { code: "console.log('Injected script in action')" },
-    ()=> { console.log('Script is executed'); }
-);
\ No newline at end of file
+    () => { console.log('Script is executed'); }
+);
diff --git a/types/cordova-plugin-inappbrowser/index.d.ts b/types/cordova-plugin-inappbrowser/index.d.ts
index ea3d3adba8..b266fbab44 100644
--- a/types/cordova-plugin-inappbrowser/index.d.ts
+++ b/types/cordova-plugin-inappbrowser/index.d.ts
@@ -1,39 +1,14 @@
-// Type definitions for Apache Cordova InAppBrowser plugin
+// Type definitions for Apache Cordova InAppBrowser plugin 1.7
 // Project: https://github.com/apache/cordova-plugin-inappbrowser
 // Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
+//
 // Copyright (c) Microsoft Open Technologies Inc
 // Licensed under the MIT license.
+// TypeScript Version: 2.3
+type channel = "loadstart" | "loadstop" | "loaderror" | "exit";
 
 interface Window {
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_self", options?: string): InAppBrowser;
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_blank", options?: string): InAppBrowser;
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_system", options?: string): InAppBrowser;
     /**
      * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
      * @param  url     The URL to load.
@@ -50,66 +25,21 @@ interface Window {
  * NOTE: The InAppBrowser window behaves like a standard web browser, and can't access Cordova APIs.
  */
 interface InAppBrowser extends Window {
-    onloadstart: (type: InAppBrowserEvent) => void;
-    onloadstop: (type: InAppBrowserEvent) => void;
-    onloaderror: (type: InAppBrowserEvent) => void;
-    onexit: (type: InAppBrowserEvent) => void;
+    onloadstart(type: InAppBrowserEvent): void;
+    onloadstop(type: InAppBrowserEvent): void;
+    onloaderror(type: InAppBrowserEvent): void;
+    onexit(type: InAppBrowserEvent): void;
     // addEventListener overloads
     /**
      * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
+     * @param type      loadstart: event fires when the InAppBrowser starts to load a URL.
      *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
      *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
      *                  exit: event fires when the InAppBrowser window is closed.
      * @param callback  the function that executes when the event fires. The function is
      *                  passed an InAppBrowserEvent object as a parameter.
      */
-    addEventListener(type: "loadstart", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "loadstop", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "loaderror", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "exit", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an Event object as a parameter.
-     */
-    addEventListener(type: string, callback: (event: Event) => void): void;
+    addEventListener(type: channel, callback: (event: InAppBrowserEvent) => void): void;
     // removeEventListener overloads
     /**
      * Removes a listener for an event from the InAppBrowser.
@@ -121,51 +51,7 @@ interface InAppBrowser extends Window {
      * @param callback  the function that executes when the event fires. The function is
      *                  passed an InAppBrowserEvent object as a parameter.
      */
-    removeEventListener(type: "loadstart", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "loadstop", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "loaderror", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "exit", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an Event object as a parameter.
-     */
-    removeEventListener(type: string, callback: (event: Event) => void): void;
+    removeEventListener(type: channel, callback: (event: InAppBrowserEvent) => void): void;
     /** Closes the InAppBrowser window. */
     close(): void;
     /** Hides the InAppBrowser window. Calling this has no effect if the InAppBrowser was already hidden. */
@@ -184,29 +70,13 @@ interface InAppBrowser extends Window {
      *                  For multi-line scripts, this is the return value of the last statement,
      *                  or the last expression evaluated.
      */
-    executeScript(script: { code: string }, callback: (result: any) => void): void;
-    /**
-     * Injects JavaScript code into the InAppBrowser window.
-     * @param script    Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the JavaScript code is injected.
-     *                  If the injected script is of type code, the callback executes with
-     *                  a single parameter, which is the return value of the script, wrapped in an Array.
-     *                  For multi-line scripts, this is the return value of the last statement,
-     *                  or the last expression evaluated.
-     */
-    executeScript(script: { file: string }, callback: (result: any) => void): void;
+    executeScript(script: { code: string } | { file: string }, callback: (result: any) => void): void;
     /**
      * Injects CSS into the InAppBrowser window.
      * @param css       Details of the script to run, specifying either a file or code key.
      * @param callback  The function that executes after the CSS is injected.
      */
-    insertCSS(css: { code: string }, callback: () => void): void;
-    /**
-     * Injects CSS into the InAppBrowser window.
-     * @param css       Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the CSS is injected.
-     */
-    insertCSS(css: { file: string }, callback: () => void): void;
+    insertCSS(css: { code: string } | { file: string }, callback: () => void): void;
 }
 
 interface InAppBrowserEvent extends Event {
@@ -218,4 +88,8 @@ interface InAppBrowserEvent extends Event {
     code: number;
     /** the error message, only in the case of loaderror. */
     message: string;
-}
\ No newline at end of file
+}
+
+interface Cordova {
+    InAppBrowser: InAppBrowser;
+}
diff --git a/types/cordova-plugin-inappbrowser/tslint.json b/types/cordova-plugin-inappbrowser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cordova-plugin-inappbrowser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts b/types/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
index 62e44e3e77..ad8fa420a9 100644
--- a/types/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
+++ b/types/cordova-plugin-x-socialsharing/cordova-plugin-x-socialsharing-tests.ts
@@ -60,3 +60,4 @@ window.plugins.socialsharing.shareViaFacebook("Optional message, may be ignored
 window.plugins.socialsharing.share("Optional message", "Optional title", ["www/manual.pdf", "https://www.google.nl/images/srpr/logo4w.png"], "http://www.myurl.com");
 
 window.plugins.socialsharing.saveToPhotoAlbum(["https://www.google.nl/images/srpr/logo4w.png", "www/image.gif"], function () { console.log("share ok") }, function (msg) { alert("error: " + msg) });
+window.plugins.socialsharing.shareWithOptions({"message":"sharethis","subject":"thesubject","files":["",""],"url":"https: //www.website.com/foo/#bar?a=b","chooserTitle":"Pickanapp"}, function () { console.log("share ok") }, function (msg) { alert("error: " + msg) });
diff --git a/types/cordova-plugin-x-socialsharing/index.d.ts b/types/cordova-plugin-x-socialsharing/index.d.ts
index e68a072ee2..4560dd3f1a 100644
--- a/types/cordova-plugin-x-socialsharing/index.d.ts
+++ b/types/cordova-plugin-x-socialsharing/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for SocialSharing-PhoneGap-Plugin v5.0.12
+// Type definitions for SocialSharing-PhoneGap-Plugin v5.1.8
 // Project: https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin
-// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>
+// Definitions by: Markus Wagner <https://github.com/Ritzlgrmft/>, Larry Bahr <https://github.com/larrybahr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Window {
@@ -18,6 +18,7 @@ declare module SocialSharingPlugin {
 		subject?: string;
 		files?: string | string[];
 		url?: string;
+		chooserTitle?: string;
 	}
 
 	interface ShareResult {
diff --git a/types/core-js/core-js-tests.ts b/types/core-js/core-js-tests.ts
index 3f585db33e..325ff56fc1 100644
--- a/types/core-js/core-js-tests.ts
+++ b/types/core-js/core-js-tests.ts
@@ -243,15 +243,15 @@ promiseLikeOfPoint = promiseLikeOfPoint.then(p => promiseLikeOfPoint);
 promiseLikeOfPoint = promiseLikeOfPoint.then(p => point, e => point);
 promiseLikeOfPoint = promiseLikeOfPoint.then(p => promiseLikeOfPoint, e => point);
 promiseLikeOfPoint = promiseLikeOfPoint.then(p => point, e => promiseLikeOfPoint);
-promiseLikeOfPoint = promiseLikeOfPoint.then(p => point, e => { });
-promiseLikeOfPoint = promiseLikeOfPoint.then(p => promiseLikeOfPoint, e => { });
+promiseLikeOfPoint = promiseLikeOfPoint.then(p => point, e => { throw e; });
+promiseLikeOfPoint = promiseLikeOfPoint.then(p => promiseLikeOfPoint, e => { throw e; });
 promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => point3d);
 promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => promiseLikeOfPoint3D);
 promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => point3d, e => point3d);
 promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => promiseLikeOfPoint3D, e => point3d);
 promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => point3d, e => promiseLikeOfPoint3D);
-promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => point3d, e => { });
-promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => promiseLikeOfPoint3D, e => { });
+promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => point3d, e => { throw e; });
+promiseLikeOfPoint3D = promiseLikeOfPoint.then(p => promiseLikeOfPoint3D, e => { throw e; });
 promiseOfPoint.then((point: Point) => { });
 promiseOfPoint = promiseOfPoint.then();
 promiseOfPoint = promiseOfPoint.then(p => point);
@@ -262,9 +262,9 @@ promiseOfPoint = promiseOfPoint.then(p => promiseOfPoint, e => point);
 promiseOfPoint = promiseOfPoint.then(p => promiseLikeOfPoint, e => point);
 promiseOfPoint = promiseOfPoint.then(p => point, e => promiseOfPoint);
 promiseOfPoint = promiseOfPoint.then(p => point, e => promiseLikeOfPoint);
-promiseOfPoint = promiseOfPoint.then(p => point, e => { });
-promiseOfPoint = promiseOfPoint.then(p => promiseOfPoint, e => { });
-promiseOfPoint = promiseOfPoint.then(p => promiseLikeOfPoint, e => { });
+promiseOfPoint = promiseOfPoint.then(p => point, e => { throw e; });
+promiseOfPoint = promiseOfPoint.then(p => promiseOfPoint, e => { throw e; });
+promiseOfPoint = promiseOfPoint.then(p => promiseLikeOfPoint, e => { throw e; });
 promiseOfPoint3D = promiseOfPoint.then(p => point3d);
 promiseOfPoint3D = promiseOfPoint.then(p => promiseOfPoint3D);
 promiseOfPoint3D = promiseOfPoint.then(p => promiseLikeOfPoint3D);
@@ -273,16 +273,16 @@ promiseOfPoint3D = promiseOfPoint.then(p => promiseOfPoint3D, e => point3d);
 promiseOfPoint3D = promiseOfPoint.then(p => promiseLikeOfPoint3D, e => point3d);
 promiseOfPoint3D = promiseOfPoint.then(p => point3d, e => promiseOfPoint3D);
 promiseOfPoint3D = promiseOfPoint.then(p => point3d, e => promiseLikeOfPoint3D);
-promiseOfPoint3D = promiseOfPoint.then(p => point3d, e => { });
-promiseOfPoint3D = promiseOfPoint.then(p => promiseOfPoint3D, e => { });
-promiseOfPoint3D = promiseOfPoint.then(p => promiseLikeOfPoint3D, e => { });
+promiseOfPoint3D = promiseOfPoint.then(p => point3d, e => { throw e; });
+promiseOfPoint3D = promiseOfPoint.then(p => promiseOfPoint3D, e => { throw e; });
+promiseOfPoint3D = promiseOfPoint.then(p => promiseLikeOfPoint3D, e => { throw e; });
 promiseOfPoint = promiseOfPoint.catch(e => point);
 promiseOfPoint = promiseOfPoint.catch(e => promiseOfPoint);
 promiseOfPoint = promiseOfPoint.catch(e => promiseLikeOfPoint);
-promiseOfPoint = promiseOfPoint.catch(e => { });
-promiseOfPoint3D = promiseOfPoint.catch(e => point3d);
-promiseOfPoint3D = promiseOfPoint.catch(e => promiseOfPoint3D);
-promiseOfPoint3D = promiseOfPoint.catch(e => promiseLikeOfPoint3D);
+promiseOfPoint = promiseOfPoint.catch(e => { throw e; });
+promiseOfPoint3D = promiseOfPoint.then(p2d => ({ ...p2d, z: 0 })).catch(e => point3d);
+promiseOfPoint3D = promiseOfPoint.then(p2d => ({ ...p2d, z: 0 })).catch(e => promiseOfPoint3D);
+promiseOfPoint3D = promiseOfPoint.then(p2d => ({ ...p2d, z: 0 })).catch(e => promiseLikeOfPoint3D);
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(point));
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(promiseOfPoint));
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(promiseLikeOfPoint));
diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
new file mode 100644
index 0000000000..3236fe83b7
--- /dev/null
+++ b/types/cote/cote-tests.ts
@@ -0,0 +1,185 @@
+import * as cote from 'cote';
+
+/**
+ * Examples from https://github.com/dashersw/cote. Note some differences, such
+ * as stricter request shape and Promises everywhere.
+ */
+class Readme {
+    requester() {
+        const randomRequester = new cote.Requester({
+            name: 'Random Requester',
+            namespace: 'rnd',
+            key: 'a certain key',
+            requests: ['randomRequest']
+        });
+
+        const req = {
+            type: 'randomRequest',
+            payload: {
+                val: Math.floor(Math.random() * 10)
+            }
+        };
+
+        randomRequester.send(req)
+            .then(console.log)
+            .catch(console.log)
+            .then(() => process.exit());
+    }
+
+    responder() {
+        const randomResponder = new cote.Responder({
+            name: 'Random Responder',
+            namespace: 'rnd',
+            key: 'a certain key',
+            respondsTo: ['randomRequest']
+        });
+
+        randomResponder.on('randomRequest', (req: cote.Action<{ val: number }>) => {
+            const answer = Math.floor(Math.random() * 10);
+            console.log('request', req.payload.val, 'answering with', answer);
+            return Promise.resolve(answer);
+        });
+    }
+
+    mongooseResponder() {
+        const UserModel = require('UserModel'); // a promise-based model API
+
+        const userResponder = new cote.Responder({ name: 'User Responder' });
+
+        userResponder.on('find', (req: cote.Action<{ username: string }>) => UserModel.findOne(req.payload));
+    }
+
+    mongooseRequester() {
+        const userRequester = new cote.Requester({ name: 'User Requester' });
+
+        userRequester
+            .send({ type: 'find', payload: { username: 'foo' } })
+            .then(user => console.log(user))
+            .then(() => process.exit());
+    }
+
+    publisher() {
+        const randomPublisher = new cote.Publisher({
+            name: 'Random Publisher',
+            namespace: 'rnd',
+            key: 'a certain key',
+            broadcasts: ['randomUpdate']
+        });
+
+        setInterval(() => {
+            const action = {
+                type: 'randomUpdate',
+                payload: {
+                    val: Math.floor(Math.random() * 1000)
+                }
+            };
+
+            console.log('emitting', action);
+
+            randomPublisher.publish('randomUpdate', action);
+        }, 3000);
+    }
+
+    subscriber() {
+        const randomSubscriber = new cote.Subscriber({
+            name: 'Random Subscriber',
+            namespace: 'rnd',
+            key: 'a certain key',
+            subscribesTo: ['randomUpdate']
+        });
+
+        randomSubscriber.on('randomUpdate', (req) => {
+            console.log('notified of ', req);
+        });
+    }
+
+    sockend() {
+        const app = require('http').createServer(handler);
+        const io = require('socket.io').listen(app);
+        const fs = require('fs');
+
+        app.listen(process.argv[2] || 5555);
+
+        function handler(req: any, res: any) {
+            fs.readFile(__dirname + '/index.html', (err: Error, data: Buffer) => {
+                if (err) {
+                    res.writeHead(500);
+                    return res.end('Error loading index.html');
+                }
+
+                res.writeHead(200);
+                res.end(data);
+            });
+        }
+
+        const sockend = new cote.Sockend(io, {
+            name: 'Sockend',
+            key: 'a certain key'
+        });
+    }
+
+    keys() {
+        const purchaseRequester = new cote.Requester({
+            name: 'Purchase Requester',
+            key: 'purchase'
+        });
+
+        const inventoryRequester = new cote.Requester({
+            name: 'Inventory Requester',
+            key: 'inventory'
+        });
+    }
+
+    namespacesFront() {
+        const responder = new cote.Responder({
+            name: 'Conversion Sockend Responder',
+            namespace: 'conversion'
+        });
+
+        const conversionRequester = new cote.Requester({
+            name: 'Conversion Requester',
+            key: 'conversion backend'
+        });
+
+        responder.on('convert', (req) => {
+            return conversionRequester.send(req); // proxy the request
+        });
+    }
+
+    namespacesBack() {
+        const responder = new cote.Responder({
+            name: 'Conversion Responder',
+            key: 'conversion backend'
+        });
+
+        const rates: { [key: string]: number } = {
+            usd_eur: 0.91,
+            eur_usd: 1.10
+        };
+
+        responder.on('convert', (req: cote.Action<{
+            amount: number,
+            from: string,
+            to: string
+        }>) => {
+            const { payload } = req;
+            return Promise.resolve(payload.amount * rates[`${payload.from}_${payload.to}`]);
+        });
+    }
+
+    multicast() {
+        const cote = require('cote')({ multicast: '239.1.11.111' });
+    }
+
+    multicastComponent() {
+        const req = new cote.Requester({ name: 'req' }, { multicast: '239.1.11.111' });
+    }
+
+    broadcast() {
+        const cote = require('cote')({ broadcast: '255.255.255.255' });
+    }
+
+    broadcastComponent() {
+        const req = new cote.Requester({ name: 'req' }, { broadcast: '255.255.255.255' });
+    }
+}
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
new file mode 100644
index 0000000000..6a59b37392
--- /dev/null
+++ b/types/cote/index.d.ts
@@ -0,0 +1,211 @@
+// Type definitions for cote 0.14
+// Project: https://github.com/dashersw/cote#readme
+// Definitions by: makepost <https://github.com/makepost>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as SocketIO from "socket.io";
+import { Stream } from "stream";
+import { Server } from "http";
+
+export class Requester {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+
+    /**
+     * Queues a request until a Responder is available, and once so, delivers
+     * the request. Requests are dispatched to Responders in a round-robin way.
+     *
+     * @param action Request.
+     */
+    send<T>(action: Action<T>): Promise<any>;
+}
+
+export class Responder {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+
+    /**
+     * Responds to certain requests from a Requester.
+     *
+     * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
+     * @param listener Callback. Should return a result.
+     */
+    on<T>(
+        type: string,
+        listener: (action: Action<T>) => Promise<any>
+    ): void;
+}
+
+export class Publisher {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+
+    /**
+     * Publishes an event to all Subscribers. Does not wait for results. If
+     * there are no Subscribers listening, the event is lost.
+     *
+     * @param type EventEmitter-compatible type.
+     * @param action Request.
+     */
+    publish<T>(
+        type: string,
+        action: Action<T>
+    ): void;
+}
+
+export class Subscriber {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+
+    /**
+     * Subscribes to events emitted from a Publisher.
+     *
+     * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
+     * @param listener Callback. Returns nothing.
+     */
+    on<T>(
+        type: string,
+        listener: (action: Action<T>) => void
+    ): void;
+}
+
+export class Sockend {
+    /**
+     * Exposes APIs directly to front-end. Make sure to use namespaces.
+     */
+    constructor(
+        io: SocketIO.Server,
+
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+}
+
+export class Monitor {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions,
+
+        stream?: Stream
+    )
+}
+
+/**
+ * Displays the cote ecosystem running in your environment in a nice graph.
+ *
+ * @param port Open in browser to see network graph in action.
+ */
+export function MonitoringTool(port: number): {
+    monitor: Monitor,
+    server: Server
+};
+
+/**
+ * Flux standard action.
+ * @see https://github.com/acdlite/flux-standard-action
+ */
+export interface Action<T> {
+    type: string;
+    payload: T;
+    error?: boolean;
+    meta?: {};
+}
+
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface Advertisement {
+    name: string;
+
+    /**
+     * Maps to a socket.io namespace. Shields a service from the rest of the
+     * system. Components with different namespaces won't recognize each other
+     * and try to communicate.
+     */
+    namespace?: string;
+
+    /**
+     * Tunes the performance by grouping certain components. Two components
+     * with exact same `environment`s with different `key`s wouldn't be able
+     * to communicate. Think of it as `${environment}_${key}`.
+     */
+    key?: string;
+
+    /**
+     * Request types that a Requester can send.
+     */
+    requests?: string[];
+
+    /**
+     * Response types that a Responder can listen to.
+     */
+    respondsTo?: string[];
+
+    /**
+     * Event types that a Publisher can publish.
+     */
+    broadcasts?: string[];
+
+    /**
+     * Event types that a Subscriber can listen to.
+     */
+    subscribesTo?: string[];
+}
+
+/**
+ * Controls the network-layer configuration and environments for components.
+ */
+export interface DiscoveryOptions {
+    multicast?: string;
+    broadcast?: string;
+}
diff --git a/types/cote/tsconfig.json b/types/cote/tsconfig.json
new file mode 100644
index 0000000000..2f8460f53d
--- /dev/null
+++ b/types/cote/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cote-tests.ts"
+    ]
+}
diff --git a/types/cote/tslint.json b/types/cote/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cote/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/country-select-js/index.d.ts b/types/country-select-js/index.d.ts
index 72c33489c2..8ed28a224c 100644
--- a/types/country-select-js/index.d.ts
+++ b/types/country-select-js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mrmarkfrench/country-select-js
 // Definitions by: Humberto Rocha <https://github.com/humrochagf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/create-error/create-error-tests.ts b/types/create-error/create-error-tests.ts
index 51cdab4381..7a635b8dc6 100644
--- a/types/create-error/create-error-tests.ts
+++ b/types/create-error/create-error-tests.ts
@@ -1,9 +1,9 @@
-
-/// <reference types="node" />
 /// <reference types="mocha" />
 
+declare function equal<T>(a: T, b: T): void;
+declare function deepEqual<T>(a: T, b: T): void;
+
 import * as createError from 'create-error';
-import * as assert from 'assert';
 
 // Example taken from https://github.com/tgriesser/create-error/blob/0.3.1/README.md#use
 
@@ -23,14 +23,12 @@ sub instanceof SubCustomError // true
 sub instanceof MyCustomError  // true
 sub instanceof Error          // true
 
-assert.deepEqual(sub.messages, []) // true
-assert.equal(sub.someVal, 'value') // true
+deepEqual(sub.messages, []) // true
+equal(sub.someVal, 'value') // true
 
 
 // Taken and adapted from https://github.com/tgriesser/create-error/blob/0.3.1/test/index.js
 
-var equal     = assert.equal;
-var deepEqual = assert.deepEqual;
 
 describe('create-error', function() {
 
diff --git a/types/cryptiles/cryptiles-tests.ts b/types/cryptiles/cryptiles-tests.ts
new file mode 100644
index 0000000000..b4d6eb1340
--- /dev/null
+++ b/types/cryptiles/cryptiles-tests.ts
@@ -0,0 +1,5 @@
+import * as cryptiles from "cryptiles";
+
+cryptiles.randomString(0); // $ExpectType string
+cryptiles.randomDigits(0); // $ExpectType string
+cryptiles.fixedTimeComparison("", ""); // $ExpectTpe boolean
diff --git a/types/cryptiles/index.d.ts b/types/cryptiles/index.d.ts
new file mode 100644
index 0000000000..31a7972a58
--- /dev/null
+++ b/types/cryptiles/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for cryptiles 3.1
+// Project: https://github.com/hapijs/cryptiles
+// Definitions by: Alex Wendland <https://github.com/awendland>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Returns a cryptographically strong pseudo-random data string. Takes a size argument for the length of the string.
+ */
+export function randomString(size: number): string;
+
+/**
+ * Returns a cryptographically strong pseudo-random data string consisting of only numerical digits (0-9).
+ * Takes a size argument for the length of the string.
+ */
+export function randomDigits(size: number): string;
+
+/**
+ * Compare two strings using fixed time algorithm (to prevent time-based analysis of MAC digest match).
+ * Returns true if the strings match, false if they differ.
+ */
+export function fixedTimeComparison(a: string, b: string): boolean;
diff --git a/types/cryptiles/tsconfig.json b/types/cryptiles/tsconfig.json
new file mode 100644
index 0000000000..2515c735a4
--- /dev/null
+++ b/types/cryptiles/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cryptiles-tests.ts"
+    ]
+}
diff --git a/types/cryptiles/tslint.json b/types/cryptiles/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cryptiles/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/css-modules-require-hook/css-modules-require-hook-tests.ts b/types/css-modules-require-hook/css-modules-require-hook-tests.ts
index 93da1326bd..9a7325ab0c 100644
--- a/types/css-modules-require-hook/css-modules-require-hook-tests.ts
+++ b/types/css-modules-require-hook/css-modules-require-hook-tests.ts
@@ -1,7 +1,4 @@
-/// <reference types="node" />
-
 import * as hook from 'css-modules-require-hook';
-import * as path from 'path';
 
 //
 // https://github.com/css-modules/css-modules-require-hook/blob/master/README.md#usage
@@ -170,4 +167,4 @@ hook({ mode: 'pure' });
 // https://github.com/css-modules/css-modules-require-hook/blob/master/README.md#rootdir-string
 //
 
-hook({ rootDir: path.resolve('./my-folder') });
+hook({ rootDir: './my-folder' });
diff --git a/types/csvtojson/csvtojson-tests.ts b/types/csvtojson/csvtojson-tests.ts
index a4ee3d76d4..5b58451fac 100644
--- a/types/csvtojson/csvtojson-tests.ts
+++ b/types/csvtojson/csvtojson-tests.ts
@@ -9,6 +9,18 @@ const csvStr: string = `1,2,3
 4,5,6
 7,8,9`;
 
+// Factory instantiation with options.
+csv({
+    noheader: true,
+    constructResult: false,
+    delimiter: 'auto',
+    checkType: false,
+    trim: true,
+    workerNum: 2,
+    checkColumn: true,
+    maxRowLength: 65535
+});
+
 // event emitter version using factory function
 csv({ noheader: true })
     .fromString(csvStr)
diff --git a/types/csvtojson/index.d.ts b/types/csvtojson/index.d.ts
index 87e8286867..832a4acb6a 100644
--- a/types/csvtojson/index.d.ts
+++ b/types/csvtojson/index.d.ts
@@ -17,6 +17,12 @@ declare namespace csvtojson {
      * Converter options
      */
     interface ConverterOptions {
+       /**
+        * Whether to construct final json object in memory which will be populated in "end_parsed"
+        * event. Set to false if deal with huge csv data. default: true.
+        */
+        constructResult?: boolean;
+
         /**
          * Delimiter used for seperating columns. Use "auto" if delimiter is unknown in advance,
          * in this case, delimiter will be auto-detected (by best attempt). Use an array to give
diff --git a/types/cypress/cypress-tests.ts b/types/cypress/cypress-tests.ts
index 2a6b70b2a6..ac987e757a 100644
--- a/types/cypress/cypress-tests.ts
+++ b/types/cypress/cypress-tests.ts
@@ -11,3 +11,28 @@ cy
   .contains('ul', 'oranges').should('have.class', 'query-list')
   .get('.query-button')
   .contains('Save Form').should('have.class', 'btn');
+
+cy
+  .get('form')
+  .find('input')
+  .then($input => $input.click());
+
+cy
+  .wrap({ sum: (a: number, b: number, c: number) => a + b + c })
+  .invoke('sum', 2, 4, 6);
+
+cy
+  .get('ul>li')
+  .each(($el, index, $list) => {
+      // $el is wrapped jquery element
+      if ($el.someMethod() === "something") {
+        // wrap this element so we can
+        // use cypress commands on it
+        cy.wrap($el).click();
+      } else {
+        // do something else
+      }
+    })
+    .spread((x , y, z) => {
+        x + y + z;
+    });
diff --git a/types/cypress/index.d.ts b/types/cypress/index.d.ts
index a32c84b25d..d3fe95c92b 100644
--- a/types/cypress/index.d.ts
+++ b/types/cypress/index.d.ts
@@ -32,9 +32,9 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/commands
      */
-    addChildCommand(name: string, fn: (args: any[]) => void): void;
-    addDualCommand(name: string, fn: (args: any[]) => void): void;
-    addParentCommand(name: string, fn: (args: any[]) => void): void;
+    addChildCommand(name: string, fn: (...args: any[]) => void): void;
+    addDualCommand(name: string, fn: (...args: any[]) => void): void;
+    addParentCommand(name: string, fn: (...args: any[]) => void): void;
 
     _: any;
     $: any;
@@ -42,6 +42,7 @@ declare namespace Cypress {
     moment: any;
     Blob: any;
     Promise: any;
+    Log: any;
 
     /**
      * @see https://on.cypress.io/api/cookies
@@ -73,7 +74,7 @@ declare namespace Cypress {
      */
     and(chainers: string, value?: any): Chainable;
     and(chainers: string, method: string, value: any): Chainable;
-    and(fn: (args: any[]) => void): Chainable;
+    and(fn: (currentSubject?: any) => void): Chainable;
 
     /**
      * @see https://on.cypress.io/api/as
@@ -155,7 +156,7 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/each
      */
-    each(fn: (args: any[]) => void): Chainable;
+    each(fn: (element?: any, index?: number, $list?: any) => void): Chainable;
 
     /**
      * @see https://on.cypress.io/api/end
@@ -232,7 +233,7 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/invoke
      */
-    invoke(functionName: string, args: any[]): Chainable;
+    invoke(functionName: string, ...args: any[]): Chainable;
 
     /**
      * @see https://on.cypress.io/api/its
@@ -317,7 +318,7 @@ declare namespace Cypress {
      */
     route(url: string, response?: any): Chainable;
     route(method: string, url: string, response?: any): Chainable;
-    route(fn: (args: any[]) => void | RouteOptions): Chainable;
+    route(fn: () => RouteOptions | RouteOptions): Chainable;
 
     /**
      * @see https://on.cypress.io/api/screenshot
@@ -346,7 +347,7 @@ declare namespace Cypress {
      */
     should(chainers: string, value?: any): Chainable;
     should(chainers: string, method: string, value: any): Chainable;
-    should(fn: (args: any[]) => void): Chainable;
+    should(fn: (currentSubject?: any) => void): Chainable;
 
     /**
      * @see https://on.cypress.io/api/siblings
@@ -357,7 +358,7 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/spread
      */
-    spread(fn: (args: any[]) => void): Chainable;
+    spread(fn: (...args: any[]) => any): Chainable;
 
     /**
      * @see https://on.cypress.io/api/submit
@@ -367,7 +368,7 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/then
      */
-    then(fn: (args: any[]) => void): Chainable;
+    then(fn: (currentSubject: any) => any): Chainable;
 
     /**
      * @see https://on.cypress.io/api/title
@@ -415,8 +416,8 @@ declare namespace Cypress {
     /**
      * @see https://on.cypress.io/api/within
      */
-    within(fn: (args: any[]) => void): Chainable;
-    within(options: Loggable, fn: (args: any[]) => void): Chainable; // inconsistent argument order
+    within(fn: (currentSubject?: any) => void): Chainable;
+    within(options: Loggable, fn: (currentSubject?: any) => void): Chainable; // inconsistent argument order
 
     /**
      * @see https://on.cypress.io/api/wrap
@@ -435,7 +436,7 @@ declare namespace Cypress {
   }
 
   interface CookieDefaults {
-    whitelist?: string | string[] | RegExp | ((args: any[]) => void);
+    whitelist?: string | string[] | RegExp | ((cookie: any) => boolean);
   }
 
   interface Loggable {
@@ -494,9 +495,9 @@ declare namespace Cypress {
     delay?: number;
     headers?: object;
     force404?: boolean;
-    onRequest?(args: any[]): void;
-    onResponse?(args: any[]): void;
-    onAbort?(args: any[]): void;
+    onRequest?(...args: any[]): void;
+    onResponse?(...args: any[]): void;
+    onAbort?(...args: any[]): void;
   }
 
   interface SelectOptions extends Loggable, Timeoutable {
@@ -510,13 +511,13 @@ declare namespace Cypress {
     status?: number;
     headers?: object;
     response?: any;
-    onRequest?(args: any[]): void;
-    onResponse?(args: any[]): void;
-    onAbort?(args: any[]): void;
+    onRequest?(...args: any[]): void;
+    onResponse?(...args: any[]): void;
+    onAbort?(...args: any[]): void;
     enable?: boolean;
     force404?: boolean;
     urlMatchingOptions?: object;
-    whitelist?(args: any[]): void;
+    whitelist?(...args: any[]): void;
   }
 
   interface SetCookieOptions extends Loggable, Timeoutable {
diff --git a/types/d3-sankey/d3-sankey-tests.ts b/types/d3-sankey/d3-sankey-tests.ts
index 246755a900..abf61775b8 100644
--- a/types/d3-sankey/d3-sankey-tests.ts
+++ b/types/d3-sankey/d3-sankey-tests.ts
@@ -7,7 +7,8 @@
  */
 
 import * as d3Sankey from 'd3-sankey';
-import {select, Selection} from 'd3-selection';
+import { select, Selection } from 'd3-selection';
+import { Link } from 'd3-shape';
 
 // ---------------------------------------------------------------------------
 // Preparatory Steps
@@ -17,41 +18,47 @@ import {select, Selection} from 'd3-selection';
 // the Sankey layout generator. The latter are reflected in the SankeyNode and SankeyLink interfaces provided
 // by the definitions file
 interface SNodeExtra {
-    nodeId: number;
-    name: string;
+  name: string;
+}
+
+interface SNodeExtraCustomId {
+  nodeId: string;
+  name: string;
 }
 
 interface SLinkExtra {
-    uom: string;
+  uom: string;
 }
 
 // For convenience
 type SNode = d3Sankey.SankeyNode<SNodeExtra, SLinkExtra>;
+type SNodeCustomId = d3Sankey.SankeyNode<SNodeExtraCustomId, SLinkExtra>;
 type SLink = d3Sankey.SankeyLink<SNodeExtra, SLinkExtra>;
+type SLinkCustomId = d3Sankey.SankeyLink<SNodeExtraCustomId, SLinkExtra>;
 
 interface DAG {
-    nodes: SNode[];
-    links: SLink[];
+  customNodes: SNode[];
+  customLinks: SLink[];
 }
 
-const graph: DAG = {
-  nodes: [{
-    nodeId: 0,
+interface DAGCustomId {
+  customNodes: SNodeCustomId[];
+  customLinks: SLinkCustomId[];
+}
+
+const graphDefault: DAG = {
+  customNodes: [{
     name: "node0"
   }, {
-    nodeId: 1,
     name: "node1"
   }, {
-    nodeId: 2,
     name: "node2"
   }, {
-    nodeId: 3,
     name: "node3"
   }, {
-    nodeId: 4,
     name: "node4"
   }],
-  links: [{
+  customLinks: [{
     source: 0,
     target: 2,
     value: 2,
@@ -89,6 +96,61 @@ const graph: DAG = {
   }]
 };
 
+const graphCustomId: DAGCustomId = {
+  customNodes: [{
+    nodeId: "n0",
+    name: "node0"
+  }, {
+    nodeId: "n1",
+    name: "node1"
+  }, {
+    nodeId: "n2",
+    name: "node2"
+  }, {
+    nodeId: "n3",
+    name: "node3"
+  }, {
+    nodeId: "n4",
+    name: "node4"
+  }],
+  customLinks: [{
+    source: "n0",
+    target: "n2",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n1",
+    target: "n2",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n1",
+    target: "n3",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n0",
+    target: "n4",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n2",
+    target: "n3",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n2",
+    target: "n4",
+    value: 2,
+    uom: 'Widget(s)'
+  }, {
+    source: "n3",
+    target: "n4",
+    value: 4,
+    uom: 'Widget(s)'
+  }]
+};
+
 let sNodes: SNode[];
 let sLinks: SLink[];
 
@@ -96,15 +158,19 @@ let num: number;
 let numMaybe: number | undefined;
 let str: string;
 let size: [number, number];
+let extent: [[number, number], [number, number]];
 
 const svgLinkPaths = select<SVGSVGElement, undefined>('svg').selectAll<SVGPathElement, SLink>('.linkPath'); // assume mock DOM
 
+let sGraph: d3Sankey.SankeyGraph<SNodeExtra, SLinkExtra>;
+
 // ---------------------------------------------------------------------------
 // Obtain SankeyLayout Generator
 // ---------------------------------------------------------------------------
 
-let slgDefault: d3Sankey.SankeyLayout<{}, {}> = d3Sankey.sankey();
-let slgDAG: d3Sankey.SankeyLayout<SNodeExtra, SLinkExtra> = d3Sankey.sankey<SNodeExtra, SLinkExtra>();
+let slgDefault: d3Sankey.SankeyLayout<d3Sankey.SankeyGraph<{}, {}>, {}, {}> = d3Sankey.sankey();
+let slgDAG: d3Sankey.SankeyLayout<DAG, SNodeExtra, SLinkExtra> = d3Sankey.sankey<DAG, SNodeExtra, SLinkExtra>();
+let slgDAGCustomId: d3Sankey.SankeyLayout<DAGCustomId, SNodeExtraCustomId, SLinkExtra> = d3Sankey.sankey<DAGCustomId, SNodeExtraCustomId, SLinkExtra>();
 
 // ---------------------------------------------------------------------------
 // NodeWidth
@@ -132,6 +198,19 @@ slgDAG = slgDAG.nodePadding(8);
 
 num = slgDAG.nodePadding();
 
+// ---------------------------------------------------------------------------
+// Extent
+// ---------------------------------------------------------------------------
+
+// Set -----------------------------------------------------------------------
+
+// test return type for chainability
+slgDAG = slgDAG.extent([[0, 0], [1200, 800]]);
+
+// Get -----------------------------------------------------------------------
+
+extent = slgDAG.extent();
+
 // ---------------------------------------------------------------------------
 // Size
 // ---------------------------------------------------------------------------
@@ -146,17 +225,81 @@ slgDAG = slgDAG.size([1200, 800]);
 size = slgDAG.size();
 
 // ---------------------------------------------------------------------------
-// Nodes
+// Iterations
 // ---------------------------------------------------------------------------
 
 // Set -----------------------------------------------------------------------
 
 // test return type for chainability
-slgDAG = slgDAG.nodes(graph.nodes);
+slgDAG = slgDAG.iterations(40);
 
 // Get -----------------------------------------------------------------------
 
-sNodes = slgDAG.nodes();
+num = slgDAG.iterations();
+
+// ---------------------------------------------------------------------------
+// Node Id
+// ---------------------------------------------------------------------------
+
+// Set -----------------------------------------------------------------------
+
+slgDAGCustomId = slgDAGCustomId.nodeId((d) => {
+  const node: SNodeCustomId = d;
+  return d.nodeId;
+});
+
+// Get -----------------------------------------------------------------------
+
+let nodeIdAccessor: (d: SNodeCustomId) => string | number;
+
+nodeIdAccessor = slgDAGCustomId.nodeId();
+
+// ---------------------------------------------------------------------------
+// Node Alignment
+// ---------------------------------------------------------------------------
+
+// Set -----------------------------------------------------------------------
+
+declare const testNode: SNode;
+
+// Test pre-defined alignment functions
+slgDAG = slgDAG.nodeAlign(d3Sankey.sankeyLeft);
+num = d3Sankey.sankeyLeft(testNode, 10);
+slgDAG = slgDAG.nodeAlign(d3Sankey.sankeyRight);
+num = d3Sankey.sankeyRight(testNode, 10);
+slgDAG = slgDAG.nodeAlign(d3Sankey.sankeyCenter);
+num = d3Sankey.sankeyCenter(testNode, 10);
+slgDAG = slgDAG.nodeAlign(d3Sankey.sankeyJustify);
+num = d3Sankey.sankeyJustify(testNode, 10);
+
+// Test custom
+slgDAG = slgDAG.nodeAlign((node, maxN) => {
+  const n: SNode = node;
+  const mN: number = maxN;
+  return node.depth || 0;
+});
+
+// Get -----------------------------------------------------------------------
+
+let nodeAlignmentFn: (d: SNode, n: number) => number;
+
+nodeAlignmentFn = slgDAG.nodeAlign();
+
+// ---------------------------------------------------------------------------
+// Nodes
+// ---------------------------------------------------------------------------
+
+// Set -----------------------------------------------------------------------
+
+// Use array and test return type for chainability
+slgDAG = slgDAG.nodes(graphDefault.customNodes);
+
+// Use accessor function and test return type for chainability
+slgDAG = slgDAG.nodes(d => d.customNodes);
+
+// Get -----------------------------------------------------------------------
+
+let nodesAccessor: (d: DAG) => SNode[] = slgDAG.nodes();
 
 // ---------------------------------------------------------------------------
 // Links
@@ -165,65 +308,75 @@ sNodes = slgDAG.nodes();
 // Set -----------------------------------------------------------------------
 
 // test return type for chainability
-slgDAG = slgDAG.links(graph.links);
+slgDAG = slgDAG.links(graphDefault.customLinks);
+
+// Use accessor function and test return type for chainability
+slgDAG = slgDAG.links(d => d.customLinks);
 
 // Get -----------------------------------------------------------------------
 
-sLinks = slgDAG.links();
+let linksAccessor: (d: DAG) => SLink[] = slgDAG.links();
 
 // ---------------------------------------------------------------------------
-// Compute Layout
+// Compute Initial Layout
 // ---------------------------------------------------------------------------
 
-// test return type for chainability
-slgDAG = slgDAG.layout(22);
+sGraph = slgDAG(graphDefault);
+// With additional arguments, although here unused.
+sGraph = slgDAG(graphDefault, "foo", 50);
 
 // ---------------------------------------------------------------------------
-// Relayout
+// Update Layout
 // ---------------------------------------------------------------------------
 
-// test return type for chainability
-slgDAG = slgDAG.relayout();
+sGraph = slgDAG.update(sGraph);
 
 // ---------------------------------------------------------------------------
-// Obtain and Use Link SVG Path Generator
+// Obtain and Use Horizontal Link Path Generator
 // ---------------------------------------------------------------------------
 
-let pathGen: d3Sankey.SankeyLinkPathGenerator<SNodeExtra, SLinkExtra>;
+let defaultPathGen: Link<any, d3Sankey.SankeyLink<{}, {}>, [number, number]>;
+let pathGen: Link<any, SLink, [number, number]>;
 
-pathGen = slgDAG.link();
+defaultPathGen = d3Sankey.sankeyLinkHorizontal();
 
-// Adjust Link SVG Path Generator curvature ----------------------------------
+pathGen = d3Sankey.sankeyLinkHorizontal<SNodeExtra, SLinkExtra>();
 
-// test return type
-pathGen = pathGen.curvature(0.6);
-num = pathGen.curvature();
+// Render to svg path
 
-// uses
-
-let svgPathString: string = pathGen(slgDAG.links()[0]);
+let svgPathString: string | null = pathGen(sGraph.links[0]);
 svgLinkPaths.attr('d', pathGen);
 
+// Render to canvas
+
+declare const ctx: CanvasRenderingContext2D;
+
+pathGen.context(ctx);
+pathGen(sGraph.links[0]);
+
 // ---------------------------------------------------------------------------
 // Shape test Node/Link related interfaces and types
 // ---------------------------------------------------------------------------
 
 // Sankey Node --------------------------------------------------------------
 
+sNodes = sGraph.nodes;
 let sNode = sNodes[0];
 
 // User-specified extra properties:
 
-num = sNode.nodeId;
 str = sNode.name;
 
 // Sankey Layout calculated (if layout has been run, otherwise undefined):
 
-numMaybe = sNode.dx;
-numMaybe = sNode.x;
-numMaybe = sNode.dy;
-numMaybe = sNode.y;
+numMaybe = sNode.x0;
+numMaybe = sNode.x1;
+numMaybe = sNode.y0;
+numMaybe = sNode.y1;
 numMaybe = sNode.value;
+numMaybe = sNode.index;
+numMaybe = sNode.depth;
+numMaybe = sNode.height;
 
 let linksArrMaybe: SLink[] | undefined;
 
@@ -232,6 +385,7 @@ linksArrMaybe = sNode.targetLinks;
 
 // Sankey Link --------------------------------------------------------------
 
+sLinks = sGraph.links;
 let sLink = sLinks[0];
 
 // User-specified extra properties:
@@ -246,13 +400,14 @@ num = sLink.value;
 // layout(...) was invoked, the source and target nodes may be numbers
 // objects without the Sankey layout coordinates, or objects with calculated
 // information
-let numOrSankeyNode: number  | SNode;
+let numStringOrSankeyNode: number | string | SNode;
 
-numOrSankeyNode = sLink.source;
-numOrSankeyNode = sLink.target;
+numStringOrSankeyNode = sLink.source;
+numStringOrSankeyNode = sLink.target;
 
 // Sankey Layout calculated (if layout has been run, otherwise undefined):
 
-numMaybe = sLink.sy;
-numMaybe = sLink.ty;
-numMaybe = sLink.dy;
+numMaybe = sLink.y0;
+numMaybe = sLink.y1;
+numMaybe = sLink.width;
+numMaybe = sLink.index;
diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index 1446bc917f..46a80b2671 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for D3JS d3-sankey module 0.4
+// Type definitions for D3JS d3-sankey module 0.7
 // Project: https://github.com/d3/d3-sankey/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 0.4.2
+// Last module patch version validated against: 0.7
+
+import { Link } from 'd3-shape';
 
 /**
  * A helper interface as an extension reference for user-provided properties of
  * nodes and links in the graph, which are not required or calculated by
- * the Sankey Layout Generator
+ * the Sankey layout Generator
  */
 export interface SankeyExtraProperties { [key: string]: any; }
 
@@ -26,35 +28,48 @@ export interface SankeyExtraProperties { [key: string]: any; }
  */
 export interface SankeyNodeMinimal<N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
     /**
-     * Array of links which have this node as their source.
+     * Array of outgoing links which have this node as their source.
      * This property is calculated internally by the Sankey layout generator.
      */
     sourceLinks?: Array<SankeyLink<N, L>>;
     /**
-     * Array of links which have this node as their target.
+     * Array of incoming links which have this node as their target.
      * This property is calculated internally by the Sankey layout generator.
      */
     targetLinks?: Array<SankeyLink<N, L>>;
     /**
-     * Node value calculated by Sankey Layout Generator based on values of incoming and outgoing links
+     * Node's value calculated by Sankey layout Generator;
+     * the sum of link.value for the node’s incoming links.
      */
     value?: number;
     /**
-     * Node horizontal position calculated by Sankey layout generator
+     * Node’s zero-based index within the array of nodes calculated by Sankey layout generator.
      */
-    x?: number;
+    index?: number;
     /**
-     * Node width calculated by Sankey layout generator
+     * Node’s zero-based graph depth, derived from the graph topology calculated by Sankey layout generator.
      */
-    dx?: number;
+    depth?: number;
     /**
-     * Node vertical position (depth) calculated by Sankey layout generator
+     * Node’s zero-based graph height, derived from the graph topology calculated by Sankey layout generator.
      */
-    y?: number;
+    height?: number;
     /**
-     * Node height (vertical extent based on node value) calculated by Sankey layout generator
+     * Node's minimum horizontal position (derived from the node.depth) calculated by Sankey layout generator.
      */
-    dy?: number;
+    x0?: number;
+    /**
+     * Node’s maximum horizontal position (node.x0 + sankey.nodeWidth) calculated by Sankey layout generator.
+     */
+    x1?: number;
+    /**
+     * Node's minimum vertical position calculated by Sankey layout generator.
+     */
+    y0?: number;
+    /**
+     * Node's maximum vertical position (node.y1 - node.y0 is proportional to node.value) calculated by Sankey layout generator.
+     */
+    y1?: number;
 }
 
 /**
@@ -85,33 +100,45 @@ export type SankeyNode<N extends SankeyExtraProperties, L extends SankeyExtraPro
  */
 export interface SankeyLinkMinimal<N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
     /**
-     * Source node of the link. For convenience, when initializing a Sankey layout, source may be the index of the source node in the nodes array
-     * passed into the Sankey layout generator. Once the layout(...) method is invoked, the numeric index will be replaced with the corresponding
-     * source node object.
+     * Link's source node. For convenience, when initializing a Sankey layout using the default node id accessor,
+     * source may be the zero-based index of the corresponding node in the nodes array
+     * returned by the nodes accessor of the Sankey layout generator rather than object references. Alternatively,
+     * the Sankey layout can be configured with a custom node ID accessor to resolve the source node of the link upon initialization.
+     *
+     * Once the Sankey generator is invoked to return the Sankey graph object,
+     * the numeric index will be replaced with the corresponding source node object.
      */
-    source: number | SankeyNode<N, L>;
+    source: number | string | SankeyNode<N, L>;
     /**
-     * Target node of the link. For convenience, when initializing a Sankey layout, target may be the index of the target node in the nodes array
-     * passed into the Sankey layout generator. Once the layout(...) method is invoked, the numeric index will be replaced with the corresponding
-     * target node object.
+     * Link's target node. For convenience, when initializing a Sankey layout using the default node id accessor,
+     * target may be the zero-based index of the corresponding node in the nodes array
+     * returned by the nodes accessor of the Sankey layout generator rather than object references. Alternatively,
+     * the Sankey layout can be configured with a custom node ID accessor to resolve the target node of the link upon initialization.
+     *
+     * Once the Sankey generator is invoked to return the Sankey graph object,
+     * the numeric index will be replaced with the corresponding target node object.
      */
-    target: number | SankeyNode<N, L>;
+    target: number | string | SankeyNode<N, L>;
     /**
-     * Value of the link
+     * Link's numeric value
      */
     value: number;
     /**
-     * Link breadth calculated by Sankey layout generator based on the link value
+     * Link's vertical starting position (at source node) calculated by Sankey layout generator.
      */
-    dy?: number;
+    y0?: number;
     /**
-     * Vertical starting position of the link (at source node) calculated by Sankey layout generator
+     * Link's vertical end position (at target node) calculated by Sankey layout generator.
      */
-    sy?: number;
+    y1?: number;
     /**
-     * Vertical end position of the link (at target node) calculated by Sankey layout generator
+     * Link's width (proportional to its value) calculated by Sankey layout generator.
      */
-    ty?: number;
+    width?: number;
+    /**
+     * Link's zero-based index within the array of links calculated by Sankey layout generator.
+     */
+    index?: number;
 }
 
 /**
@@ -129,32 +156,7 @@ export interface SankeyLinkMinimal<N extends SankeyExtraProperties, L extends Sa
 export type SankeyLink<N extends SankeyExtraProperties, L extends SankeyExtraProperties> = L & SankeyLinkMinimal<N, L>;
 
 /**
- * An svg path generator factory for the link paths in a calculated Sankey Layout.
- */
-export interface SankeyLinkPathGenerator<N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
-    /**
-     * Return svg path string for a given link.
-     *
-     * IMPORTANT: Only invoke for link data with Sankey Layout information previously calculated.
-     *
-     * @param link A Sankey diagram link, for which the layout has already been calculated.
-     */
-    (link: SankeyLink<N, L>): string;
-    /**
-     * Returns the current curvature used to calculate svg paths for links.
-     * The default curvature is 0.5.
-     */
-    curvature(): number;
-    /**
-     * Set the curvature used to calculate svg paths for links and return the updated link path generator.
-     *
-     * @param curvature Curvature to be used when calculating svg paths for links. The default curvature is 0.5.
-     */
-    curvature(curvature: number): this;
-}
-
-/**
- * A Sankey layout generator.
+ * A Sankey Graph Object which contains the computed layout information for nodes and links.
  *
  * The first generic N refers to user-defined properties contained in the node data passed into
  * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
@@ -164,7 +166,118 @@ export interface SankeyLinkPathGenerator<N extends SankeyExtraProperties, L exte
  * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
  * SankeyLinkMinimal interface.
  */
-export interface SankeyLayout<N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
+export interface SankeyGraph<N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
+    /**
+     * Array of Sankey diagram nodes
+     */
+    nodes: Array<SankeyNode<N, L>>;
+    /**
+     * Array of Sankey diagram links
+     */
+    links: Array<SankeyLink<N, L>>;
+}
+
+/**
+ * A Sankey layout generator.
+ *
+ * The first generic Data refers to the data type of the first argument passed in when invoking the
+ * Sankey layout generator and internally the configured nodes/links accessor functions.
+ *
+ * The second generic N refers to user-defined properties contained in the node data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyNodeMinimal interface.
+ *
+ * The third generic L refers to user-defined properties contained in the link data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyLinkMinimal interface.
+ */
+export interface SankeyLayout<Data, N extends SankeyExtraProperties, L extends SankeyExtraProperties> {
+    /**
+     * Computes the node and link positions for the given arguments, returning a graph representing the Sankey layout.
+     *
+     * @param data Data object being passed as the first argument to the nodes and links accessor functions. Additional arguments will also be passed
+     * to the accessor functions.
+     */
+    (data: Data, ...args: any[]): SankeyGraph<N, L>;
+
+    /**
+     * Recomputes the specified graph’s links’ positions, updating the following properties of each link:
+     *
+     * - link.sy: the link’s vertical starting position (at source node)
+     * - link.ty: the link’s vertical end position (at target node)
+     *
+     * This method is intended to be called after computing the initial Sankey layout, for example when the diagram is repositioned interactively.
+     *
+     * @param graph
+     */
+    update(graph: SankeyGraph<N, L>): SankeyGraph<N, L>;
+
+    /**
+     * Return the current nodes accessor function, which defaults to a function returning the "nodes" property of the
+     * first argument it is invoked with.
+     */
+    nodes(): (data: Data, ...args: any[]) => Array<SankeyNode<N, L>>;
+    /**
+     * Set the Sankey generator's nodes accessor to a function returning the specified array of objects and returns this Sankey layout generator.
+     *
+     * @param nodes Array of nodes.
+     */
+    nodes(nodes: Array<SankeyNode<N, L>>): this;
+    /**
+     * Set the Sankey generator's nodes accessor to the specified function and returns this Sankey layout generator.
+     *
+     * @param nodes A nodes accessor function. The function is invoked when the Sankey layout is generated, being passed any arguments passed to the Sankey generator.
+     * This function must return an array of nodes.
+     */
+    nodes(nodes: (data: Data, ...args: any[]) => Array<SankeyNode<N, L>>): this;
+
+    /**
+     * Return the current links accessor function, which defaults to a function returning the "links" property of the
+     * first argument it is invoked with.
+     */
+    links(): (data: Data, ...args: any[]) => Array<SankeyLink<N, L>>;
+    /**
+     * Set the Sankey generator's links accessor to a function returning the specified array of objects and returns this Sankey layout generator.
+     *
+     * @param links Array of links.
+     */
+    links(links: Array<SankeyLink<N, L>>): this;
+    /**
+     * Set the Sankey generator's links accessor to the specified function and returns this Sankey layout generator.
+     *
+     * @param links A links accessor function. The function is invoked when the Sankey layout is generated, being passed any arguments passed to the Sankey generator.
+     * This function must return an array of links.
+     */
+    links(links: (data: Data, ...args: any[]) => Array<SankeyLink<N, L>>): this;
+
+    /**
+     * Return the current node id accessor.
+     * The default accessor is a function being passed in a Sankey layout node and returning its numeric node.index.
+     */
+    nodeId(): (node: SankeyNode<N, L>) => string | number;
+    /**
+     * Set the node id accessor to the specified function and return this Sankey layout generator.
+     *
+     * The default accessor is a function being passed in a Sankey layout node and returning its numeric node.index.
+     * The default id accessor allows each link’s source and target to be specified as a zero-based index into the nodes array.
+     *
+     * @param nodeId A node id accessor function being passed a node in the Sankey graph and returning its id.
+     */
+    nodeId(nodeId: (node: SankeyNode<N, L>) => string | number): this;
+
+    /**
+     * Return the current node alignment method, which defaults to d3.sankeyLeft.
+     */
+    nodeAlign(): (node: SankeyNode<N, L>, n: number) => number;
+    /**
+     * Set the node alignment method the specified function and return this Sankey layout generator.
+     *
+     * @param nodeAlign A node alignment function which is evaluated for each input node in order,
+     * being passed the current node and the total depth n of the graph (one plus the maximum node.depth),
+     * and must return an integer between 0 and n - 1 that indicates the desired horizontal position of the node in the generated Sankey diagram.
+     */
+    nodeAlign(nodeAlign: (node: SankeyNode<N, L>, n: number) => number): this;
+
     /**
      * Return the current node width, which defaults to 24.
      */
@@ -183,48 +296,23 @@ export interface SankeyLayout<N extends SankeyExtraProperties, L extends SankeyE
      */
     nodePadding(): number;
     /**
-     * Set the node padding to the specified number and return this Sankey layout generator.
+     * Set the vertical separation between nodes at each column to the specified number and return this Sankey layout generator.
      *
-     * Node padding refers to the vertical space between nodes which occupy the same horizontal space.
-     *
-     * @param padding Node padding in pixels, which defaults to 8.
+     * @param padding Node padding, i.e. vertical separation between nodes at each column, in pixels, which defaults to 8.
      */
     nodePadding(padding: number): this;
 
     /**
-     * Return the current array of nodes, which defaults to [].
+     * Return the current extent which defaults to [[0, 0], [1, 1]].
      */
-    nodes(): Array<SankeyNode<N, L>>;
+    extent(): [[number, number], [number, number]];
     /**
-     * Set the sankey generator's nodes to the specified array of objects and returns this sankey layout generator.
+     * Set the extent of the Sankey layout to the specified bounds and returns this Sankey layout generator.
      *
-     * @param nodes Array of nodes.
+     * @param extent Extent bounds for the layout. The extent bounds are specified as an array [[x0, y0], [x1, y1]],
+     * where x0 is the left side of the extent, y0 is the top, x1 is the right and y1 is the bottom. The default is [[0, 0], [1, 1]].
      */
-    nodes(nodes: Array<SankeyNode<N, L>>): this;
-
-    /**
-     * Return the current array of links, which defaults to [].
-     */
-    links(): Array<SankeyLink<N, L>>;
-    /**
-     * Set the sankey generator's links to the specified array of objects and returns this sankey layout generator.
-     *
-     * @param links Array of links.
-     */
-    links(links: Array<SankeyLink<N, L>>): this;
-
-    /**
-     * Runs the sankey layout algorithm updating the nodes and links with their respective layout information and returns this sankey generator.
-     *
-     * @param iterations Number of passes to be used in the iterative relaxation algorithm for node placement.
-     */
-    layout(iterations: number): this;
-
-    /**
-     * Recalculate the depth of links and return this Sankey layout generator.
-     * This methods is primarily used when a node is moved vertically, e.g. using d3-drag.
-     */
-    relayout(): this;
+    extent(extent: [[number, number], [number, number]]): this;
 
     /**
      * Return the current layout size in pixels. The size is a two element array of [width, height] which defaults to [1, 1].
@@ -232,18 +320,22 @@ export interface SankeyLayout<N extends SankeyExtraProperties, L extends SankeyE
     size(): [number, number];
     /**
      * Set the size of the layout and return this Sankey layout generator.
+     * This convenience method is equivalent to using extent([[0, 0], [width, height]]).
      *
      * @param size A two element array of [width, height] in pixels which defaults to [1, 1].
      */
     size(size: [number, number]): this;
 
     /**
-     * Return a Sankey link path generator for the links based on the calculated Sankey diagram layout.
-     * The link path generator can be invoked as a function being passed as its argument a link object
-     * with calculated layout information. It returns the computed <svg> path string for the link.
-     * By default the link path generator uses a curvature of 0.5.
+     * Return the current number of relaxation iterations, which defaults to 32.
      */
-    link(): SankeyLinkPathGenerator<N, L>;
+    iterations(): number;
+    /**
+     * Set the number of relaxation iterations when generating the layout and return this Sankey layout generator.
+     *
+     * @param iterations Number of relaxation iterations, which defaluts to 32.
+     */
+    iterations(iterations: number): this;
 }
 
 /**
@@ -251,11 +343,15 @@ export interface SankeyLayout<N extends SankeyExtraProperties, L extends SankeyE
  *
  * Invoking sankey() without generics, means the node type and link type assume no user-defined attributes, i.e.
  * only the attributes internally used by the Sankey layout generator.
+ *
+ * Default nodes/links accessors are assumed.
  */
-export function sankey(): SankeyLayout<{}, {}>;
+export function sankey(): SankeyLayout<SankeyGraph<{}, {}>, {}, {}>;
 /**
  * Get a Sankey layout generator.
  *
+ * Default nodes/links accessors are assumed.
+ *
  * The first generic N refers to user-defined properties contained in the node data passed into
  * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
  * SankeyNodeMinimal interface.
@@ -264,4 +360,81 @@ export function sankey(): SankeyLayout<{}, {}>;
  * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
  * SankeyLinkMinimal interface.
  */
-export function sankey<N extends SankeyExtraProperties, L extends SankeyExtraProperties>(): SankeyLayout<N, L>;
+export function sankey<N extends SankeyExtraProperties, L extends SankeyExtraProperties>(): SankeyLayout<SankeyGraph<N, L>, N, L>;
+/**
+ * Get a Sankey layout generator.
+ *
+ * The nodes/links accessors need to be configured to work with the data type of the first argument passed
+ * in when invoking the Sankey lyout generator.
+ *
+ * The first generic corresponds to the data type of the first argument passed in when invoking the Sankey layout generator,
+ * and its nodes/links accessors.
+ *
+ * The second generic N refers to user-defined properties contained in the node data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyNodeMinimal interface.
+ *
+ * The third generic L refers to user-defined properties contained in the link data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyLinkMinimal interface.
+ */
+export function sankey<Data, N extends SankeyExtraProperties, L extends SankeyExtraProperties>(): SankeyLayout<Data, N, L>;
+
+/**
+ * Compute the horizontal node position of a node in a Sankey layout with left alignment.
+ * Returns (node.depth) to indicate the desired horizontal position of the node in the generated Sankey diagram.
+ *
+ * @param node Sankey node for which to calculate the horizontal node position.
+ * @param n Total depth n of the graph  (one plus the maximum node.depth)
+ */
+export function sankeyLeft(node: SankeyNode<{}, {}>, n: number): number;
+
+/**
+ * Compute the horizontal node position of a node in a Sankey layout with right alignment.
+ * Returns (n - 1 - node.height) to indicate the desired horizontal position of the node in the generated Sankey diagram.
+ *
+ * @param node Sankey node for which to calculate the horizontal node position.
+ * @param n Total depth n of the graph  (one plus the maximum node.depth)
+ */
+export function sankeyRight(node: SankeyNode<{}, {}>, n: number): number;
+
+/**
+ * Compute the horizontal node position of a node in a Sankey layout with center alignment.
+ * Like d3.sankeyLeft, except that nodes without any incoming links are moved as right as possible.
+ * Returns an integer between 0 and n - 1 that indicates the desired horizontal position of the node in the generated Sankey diagram.
+ *
+ * @param node Sankey node for which to calculate the horizontal node position.
+ * @param n Total depth n of the graph  (one plus the maximum node.depth)
+ */
+export function sankeyCenter(node: SankeyNode<{}, {}>, n: number): number;
+
+/**
+ * Compute the horizontal node position of a node in a Sankey layout with justified alignment.
+ * Like d3.sankeyLeft, except that nodes without any outgoing links are moved to the far right.
+ * Returns an integer between 0 and n - 1 that indicates the desired horizontal position of the node in the generated Sankey diagram.
+ *
+ * @param node Sankey node for which to calculate the horizontal node position.
+ * @param n Total depth n of the graph  (one plus the maximum node.depth)
+ */
+export function sankeyJustify(node: SankeyNode<{}, {}>, n: number): number;
+
+/**
+ * Get a horizontal link shape suitable for a Sankey diagram.
+ * Source and target accessors are pre-configured and work with the
+ * default x- and y- accessors of the link shape generator.
+ */
+export function sankeyLinkHorizontal(): Link<any, SankeyLink<{}, {}>, [number, number]>;
+/**
+ * Get a horizontal link shape suitable for a Sankey diagram.
+ * Source and target accessors are pre-configured and work with the
+ * default x- and y- accessors of the link shape generator.
+ *
+ * The first generic N refers to user-defined properties contained in the node data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyNodeMinimal interface.
+ *
+ * The second generic L refers to user-defined properties contained in the link data passed into
+ * Sankey layout generator. These properties are IN EXCESS to the properties explicitly identified in the
+ * SankeyLinkMinimal interface.
+ */
+export function sankeyLinkHorizontal<N extends SankeyExtraProperties, L extends SankeyExtraProperties>(): Link<any, SankeyLink<N, L>, [number, number]>;
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index 55ec29a89b..38e204a6ea 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -626,7 +626,7 @@ export interface ScaleIdentity {
      *
      * @param range Array of range values.
      */
-    range(range: Array<Range | { valueOf(): number }>): this;
+    range(range: Array<number | { valueOf(): number }>): this;
 
     /**
      * Returns approximately count representative values from the scale’s domain.
@@ -1297,7 +1297,7 @@ export interface ScaleQuantile<Range> {
      *
      * @param domain Array of domain values.
      */
-    domain(domain: Array<number | { valueOf(): number } | null | undefined>): this;
+    domain(domain: Array<number | { valueOf(): number } | null | undefined >): this;
 
     /**
      * Returns the current range.
diff --git a/types/d3-zoom/d3-zoom-tests.ts b/types/d3-zoom/d3-zoom-tests.ts
index 09974bf299..185b9fd45a 100644
--- a/types/d3-zoom/d3-zoom-tests.ts
+++ b/types/d3-zoom/d3-zoom-tests.ts
@@ -104,7 +104,7 @@ function zoomedCanvas(this: HTMLCanvasElement, d: CanvasDatum) {
 
 let canvasZoom: d3Zoom.ZoomBehavior<HTMLCanvasElement, CanvasDatum>;
 
-canvasZoom = d3Zoom.zoom()
+canvasZoom = d3Zoom.zoom<HTMLCanvasElement, CanvasDatum>()
     .scaleExtent([1 / 2, 4])
     .on('zoom', zoomedCanvas);
 
@@ -135,6 +135,23 @@ svgZoom = svgZoom.filter(function(d, i, group) {
 let filterFn: (this: SVGRectElement, d: SVGDatum, index: number, group: SVGRectElement[]) => boolean;
 filterFn = svgZoom.filter();
 
+// wheelDelta() ----------------------------------------------------------------
+
+// chainable
+svgZoom = svgZoom.wheelDelta(function(d, i, group) {
+    // Cast d3 event to D3ZoomEvent to be used in filter logic
+    const e = <WheelEvent> event;
+    const that: SVGRectElement = this;
+    const datum: SVGDatum = d;
+    const index: number = i;
+    const g: SVGRectElement[] | ArrayLike<SVGRectElement> = group;
+
+    return -e.deltaY * (e.deltaMode ? 100 : 1) / 600;
+});
+
+let wheelDeltaFn: (this: SVGRectElement, d: SVGDatum, index: number, group: SVGRectElement[]) => number;
+wheelDeltaFn = svgZoom.wheelDelta();
+
 // extent()  ---------------------------------------------------------------
 
 let extentAccessor: (this: SVGRectElement, d: SVGDatum, index: number, group: SVGRectElement[]) => [[number, number], [number, number]];
diff --git a/types/d3-zoom/index.d.ts b/types/d3-zoom/index.d.ts
index 88a9a7b95f..a0980344bb 100644
--- a/types/d3-zoom/index.d.ts
+++ b/types/d3-zoom/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for d3JS d3-zoom module 1.2
+// Type definitions for d3JS d3-zoom module 1.3
 // Project: https://github.com/d3/d3-zoom/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.2.0
+// Last module patch version validated against: 1.3.0
 
 import { ArrayLike, Selection, TransitionLike, ValueFn } from 'd3-selection';
 import { ZoomView, ZoomInterpolator } from 'd3-interpolate';
@@ -371,17 +371,34 @@ export interface ZoomBehavior<ZoomRefElement extends ZoomedElementBaseType, Datu
     filter(): ValueFn<ZoomRefElement, Datum, boolean>;
     /**
      * Sets the filter to the specified filter function and returns the zoom behavior.
+     * The filter function is invoked in the zoom initiating event handlers of each element to which the zoom behavior was applied.
      *
      * If the filter returns falsey, the initiating event is ignored and no zoom gesture is started.
      * Thus, the filter determines which input events are ignored. The default filter ignores mousedown events on secondary buttons,
      * since those buttons are typically intended for other purposes, such as the context menu.
      *
-     * @param filterFn A filter function which is evaluated for each selected element,
+     * @param filterFn A filter function which is invoked in the zoom initiating event handlers of each element to which the zoom behavior was applied,
      * in order, being passed the current datum (d), the current index (i), and the current group (nodes),
      * with this as the current DOM element. The function returns a boolean value.
      */
     filter(filterFn: ValueFn<ZoomRefElement, Datum, boolean>): this;
 
+    /**
+     * Returns the current wheelDelta function.
+     */
+    wheelDelta(): ValueFn<ZoomRefElement, Datum, number>;
+    /**
+     * Sets the wheel delta function to the specified function and returns the zoom behavior. The wheel delta function which is invoked in the wheel event handler
+     * of each element to which the zoom behavior was applied.
+     * The value Δ returned by the wheel delta function determines the amount of scaling applied in response to a WheelEvent.
+     * The scale factor transform.k is multiplied by 2Δ; for example, a Δ of +1 doubles the scale factor, Δ of -1 halves the scale factor.
+     *
+     * @param delta Wheel delta function which is invoked in the wheel event handler of each element to which the zoom behavior was applied,
+     * in order, being passed the current datum (d), the current index (i), and the current group (nodes),
+     * with this as the current DOM element. The function returns a numeric value.
+     */
+    wheelDelta(delta: ValueFn<ZoomRefElement, Datum, number>): this;
+
     /**
      * Return the current extent accessor, which defaults to [[0, 0], [width, height]] where width is the client width of the element and height is its client height;
      * for SVG elements, the nearest ancestor SVG element’s width and height is used. In this case,
diff --git a/types/dat-gui/index.d.ts b/types/dat-gui/index.d.ts
index 32b2083542..3cf4883fd8 100644
--- a/types/dat-gui/index.d.ts
+++ b/types/dat-gui/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for dat.GUI v0.6.1
+// Type definitions for dat.GUI 0.6
 // Project: https://github.com/dataarts/dat.gui
-// Definitions by: Satoru Kimura <https://github.com/gyohk>, ZongJing Lu <https://github.com/sonic3d>
+// Definitions by: Satoru Kimura <https://github.com/gyohk>, ZongJing Lu <https://github.com/sonic3d>, Richard Roylance <https://github.com/rroylance>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 export as namespace dat;
 
 export class GUI {
@@ -57,6 +58,7 @@ export class GUI {
 export interface GUIParams{
     autoPlace?: boolean;
     closed?: boolean;
+    closeOnTop?: boolean;
     load?: any;
     name?: string;
     preset?: string;
diff --git a/types/datatables.net-buttons/index.d.ts b/types/datatables.net-buttons/index.d.ts
index ba4aa75654..a5b32c1bf6 100644
--- a/types/datatables.net-buttons/index.d.ts
+++ b/types/datatables.net-buttons/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://datatables.net/extensions/buttons/
 // Definitions by: Sam Germano <https://github.com/SammyG4Free>, Jim Hartford <https://github.com/jimhartford>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="datatables.net"/>
diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index 838ca9131c..8ec7ecb084 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -60,12 +60,35 @@ $(document).ready(function () {
         sort: "asc"
     };
 
-    var colRenderFunc: DataTables.FunctionColumnRender = function (data, type, row, meta) {
+    var colRenderFunc: DataTables.FunctionColumnRender = (data: any, type: 'filter' | 'display' | 'type' | 'sort' | undefined | any, row: any, meta: DataTables.CellMetaSettings): any => {
         meta.col;
         meta.row;
         meta.settings;
+        switch (type) {
+            case undefined:
+                return data.value;
+            case 'filter':
+                return data.filterValue;
+            case 'display':
+                return data.displayValue;
+            case 'type':
+                return data.typeValue;
+            case 'sort':
+                return data.sortValue;
+            default:
+                // Extensibility: the render type can be a custom value, useful for plugins that require custom rendering.
+                // Custom values are declared as any.
+                return data.valueForPlugin;
+        }
     };
 
+    colRenderFunc({}, 'filter', {}, null);
+    colRenderFunc({}, 'display', {}, null);
+    colRenderFunc({}, 'type', {}, null);
+    colRenderFunc({}, 'sort', {}, null);
+    colRenderFunc({}, undefined, {}, null);
+    colRenderFunc({}, 'custom value', {}, null);
+
     var col: DataTables.ColumnSettings =
         {
             cellType: "th",
@@ -410,7 +433,7 @@ $(document).ready(function () {
         .on('change', function () {
             dt
                 .column(0)
-                .search($(this).val())
+                .search($(this).val() as string)
                 .draw();
         });
     // Get the search data for the first column and add to the select list
@@ -547,7 +570,7 @@ $(document).ready(function () {
             .on('change', function () {
                 dt
                     .column(colIdx)
-                    .search($(this).val())
+                    .search($(this).val() as string)
                     .draw();
             });
 
@@ -631,7 +654,7 @@ $(document).ready(function () {
         .on('change', function () {
             dt
                 .column(0)
-                .search($(this).val())
+                .search($(this).val() as string)
                 .draw();
         });
 
@@ -715,7 +738,7 @@ $(document).ready(function () {
             .on('change', function () {
                 dt
                     .column(colIdx)
-                    .search($(this).val())
+                    .search($(this).val() as string)
                     .draw();
             });
 
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index c0aaf9cc6c..37c57198c9 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.datatables.net
 // Definitions by: Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>, Omid Rad <https://github.com/omidkrad>, Armin Sander <https://github.com/pragmatrix/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // missing:
 // - Static methods that are defined in JQueryStatic.fn are not typed.
@@ -1603,7 +1604,7 @@ declare namespace DataTables {
     }
 
     interface FunctionColumnRender {
-        (data: any, t: string, row: any, meta: CellMetaSettings): void;
+        (data: any, type: 'filter' | 'display' | 'type' | 'sort' | undefined | any, row: any, meta: CellMetaSettings): any;
     }
 
     interface CellMetaSettings {
diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts
index 600e8b3d5f..3846ea2472 100644
--- a/types/daterangepicker/index.d.ts
+++ b/types/daterangepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.daterangepicker.com/
 // Definitions by: SirMartin <https://github.com/SirMartin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 import moment = require("moment");
diff --git a/types/db-migrate-base/index.d.ts b/types/db-migrate-base/index.d.ts
index de3a4c0812..a881fa6a06 100644
--- a/types/db-migrate-base/index.d.ts
+++ b/types/db-migrate-base/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/db-migrate/db-migrate-base
 // Definitions by: nickiannone <https://github.com/nickiannone>
 // Definitions: https://github.com/nickiannone/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
diff --git a/types/db-migrate-pg/index.d.ts b/types/db-migrate-pg/index.d.ts
index 7804f4ddad..6a72fd1109 100644
--- a/types/db-migrate-pg/index.d.ts
+++ b/types/db-migrate-pg/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/db-migrate/pg
 // Definitions by: nickiannone <http://github.com/nickiannone>
 // Definitions: https://github.com/nickiannone/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as pg from "pg";
 import * as DbMigrateBase from "db-migrate-base";
diff --git a/types/dc/index.d.ts b/types/dc/index.d.ts
index 9f9d7d3a57..7d893baf3e 100644
--- a/types/dc/index.d.ts
+++ b/types/dc/index.d.ts
@@ -44,6 +44,11 @@ declare namespace dc {
         (datum: T, index?: number): V;
     }
 
+    export interface Columns {
+        label: string;
+        format: Accessor<any, string>;
+    }
+
     export interface UnitFunction {
         (start: number, end: number, domain?: Array<any>): number|Array<any>;
     }
@@ -117,6 +122,7 @@ declare namespace dc {
         itemHeight: IGetSet<number, Legend>;
         horizontal: IGetSet<boolean, Legend>;
         legendWidth: IGetSet<number, Legend>;
+        legendText: IGetSet<any, Legend>;
         itemWidth: IGetSet<number, Legend>;
         autoItemWidth: IGetSet<boolean, Legend>;
         render: () => void;
@@ -139,6 +145,7 @@ declare namespace dc {
         svg: IGetSet<d3.Selection<any>, d3.Selection<any>>;
         resetSvg(): void;
         filterPrinter: IGetSet<(filters: Array<any>) => string, T>;
+        controlsUseVisibility: IGetSet<boolean, T>;
         turnOnControls(): void;
         turnOffControls(): void;
         transitionDuration: IGetSet<number, T>;
@@ -299,7 +306,8 @@ declare namespace dc {
 
     export interface DataTableWidget extends BaseMixin<DataTableWidget> {
         size: IGetSet<number, DataTableWidget>;
-        columns: IGetSet<Array<Accessor<any, any>|string|Array<Accessor<any, any>|string>>, DataTableWidget>;
+        showGroups: IGetSet<boolean, DataTableWidget>;
+        columns: IGetSet<Array<string|Accessor<any, any>|Columns>, DataTableWidget>;
         sortBy: IGetSet<Accessor<any, any>, DataTableWidget>;
         order: IGetSet<(a: any, b: any) => number, DataTableWidget>;
     }
diff --git a/types/debessmann/debessmann-tests.ts b/types/debessmann/debessmann-tests.ts
index 3e44ff8cd6..802257992e 100644
--- a/types/debessmann/debessmann-tests.ts
+++ b/types/debessmann/debessmann-tests.ts
@@ -1,7 +1,7 @@
 import {DM, Event, EventId} from 'debessmann';
 
 let eventId: EventId = {seq: 0, time: new Date()};
-let e: Event = {_id: eventId, headers: {'header1': 'header1Val'}};
+let e: Event = {_id: eventId, headers: {header1: 'header1Val'}};
 
 let dm: DM = {
     init(endpoint: string, auth: string): void {
diff --git a/types/deep-freeze/deep-freeze-tests.ts b/types/deep-freeze/deep-freeze-tests.ts
index 4eeb1e9890..b8a6061859 100644
--- a/types/deep-freeze/deep-freeze-tests.ts
+++ b/types/deep-freeze/deep-freeze-tests.ts
@@ -1,8 +1,7 @@
-
-
 import df = require('deep-freeze');
 
 class Foo {
-	foo: string;
+    foo: string;
 }
-var foo:Foo = df(new Foo());
+const foo = df(new Foo());
+const items = df([{id: 0, name: 'first'}]);
diff --git a/types/deep-freeze/index.d.ts b/types/deep-freeze/index.d.ts
index 92f6c8db2f..16e183d185 100644
--- a/types/deep-freeze/index.d.ts
+++ b/types/deep-freeze/index.d.ts
@@ -1,13 +1,17 @@
-// Type definitions for deep-freeze
+// Type definitions for deep-freeze 0.1
 // Project: https://github.com/substack/deep-freeze
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Aluan Haddad <https://github.com/aluanhaddad>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-declare var deepFreeze: DeepFreeze.DeepFreezeInterface;
 export = deepFreeze;
 
-declare namespace DeepFreeze {
-   export interface DeepFreezeInterface {
-      <T>(obj: T): T;
-    }
+declare function deepFreeze<T>(a: T[]): ReadonlyArray<deepFreeze.DeepReadonly<T>>;
+declare function deepFreeze<T extends Function>(f: T): T;
+declare function deepFreeze<T>(o: T): deepFreeze.DeepReadonly<T>;
+
+declare namespace deepFreeze {
+    type DeepReadonly<T> = {
+        readonly [P in keyof T]: DeepReadonly<T[P]>
+    };
 }
diff --git a/types/deep-freeze/tslint.json b/types/deep-freeze/tslint.json
new file mode 100644
index 0000000000..1cd17c5dc4
--- /dev/null
+++ b/types/deep-freeze/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // This package uses the Function type to align with lib.d.ts
+    "ban-types": false
+  }
+}
diff --git a/types/devexpress-web/README.md b/types/devexpress-web/README.md
index 341304e192..897ec236e1 100644
--- a/types/devexpress-web/README.md
+++ b/types/devexpress-web/README.md
@@ -2,8 +2,7 @@ DevExpress ASP.NET/MVC TypeScript definitions
 =============================================
 
 You can use these TypeScript definitions for your web projects, which contain
-DevExpress ASP.NET or MVC controls. For this, simply add  at the top of your
-code `<reference path="TypeScript/devexpress-web.d.ts" />`.
+DevExpress ASP.NET or MVC controls.
 
 The API enclosed into the DevExpress ASP.NET/MVC TypeScript definition file
 fully corresponds to the API described in the DevExpress ASP.NET/MVC
diff --git a/types/devexpress-web/devexpress-web-tests.ts b/types/devexpress-web/devexpress-web-tests.ts
index 8a76a68f26..ef7eb8de37 100644
--- a/types/devexpress-web/devexpress-web-tests.ts
+++ b/types/devexpress-web/devexpress-web-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="jquery" />
-
 declare var hiddenField: ASPxClientHiddenField;
 declare var mainCallbackPanel: ASPxClientCallbackPanel;
 declare var loginPopup: ASPxClientPopupControl;
@@ -82,7 +80,6 @@ module DXDemo {
 
     export function onSearchComboBoxIndexChanged(s: ASPxClientComboBox, e: ASPxClientProcessingModeEventArgs): void {
         hideMenu();
-        $("#IndexContent").addClass("search-extend");
         searchButton.AdjustControl();
     };
 
@@ -303,19 +300,14 @@ module DXDemo {
         } catch (e) { }
         ASPxClientUtils.AttachEventToElement(window, "resize", onWindowResize);
         if (ASPxClientUtils.iOSPlatform) {
-            $("form :input").blur(function () {
-                $('html, body').animate({ scrollTop: 0 }, 0);
-            });
+            // animate
         }
     };
 
     export function updateRatingLabels(ratingControl: ASPxClientTrackBar) {
-		$("#cpLeftLabelID").html(ratingControl.GetPositionStart().toString());
-		$("#cpRightLabelID").html(ratingControl.GetPositionEnd().toString());
-    };
-
-    export function onAboutWindowCloseUp(): void {
-        $(mainCallbackPanel.GetMainElement()).removeClass("show-about");
+        var start = ratingControl.GetPositionStart().toString();
+        var end = ratingControl.GetPositionEnd().toString();
+        document.getElementById("cpLeftLabelID").innerHTML = start + " " + end;
     };
 
     export function onRatingControlItemClick(s: ASPxClientRatingControl, e: ASPxClientRatingControlItemClickEventArgs): void {
@@ -324,10 +316,8 @@ module DXDemo {
 
     export function onInputKeyDown(s: ASPxClientTextBox, e: ASPxClientEditKeyEventArgs): void {
         var keyCode = ASPxClientUtils.GetKeyCode(e.htmlEvent);
-        if (keyCode == 13) {
-            (<any>jQuery).event.fix(e.htmlEvent).preventDefault();
+        if (keyCode == 13)
             (<HTMLElement>s.GetInputElement()).blur();
-        }
     };
 
     function getCurrentPage(): string {
@@ -339,7 +329,6 @@ module DXDemo {
     };
 
     function showAboutWindow(): void {
-        $(mainCallbackPanel.GetMainElement()).addClass("show-about");
         aboutWindow.ShowAtElementByID("MainCallbackPanel_ContentPane");
     };
 
diff --git a/types/devexpress-web/index.d.ts b/types/devexpress-web/index.d.ts
index 0da78411ac..466f002f36 100644
--- a/types/devexpress-web/index.d.ts
+++ b/types/devexpress-web/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for DevExpress ASP.NET 16.1
+// Type definitions for DevExpress ASP.NET v171.3
 // Project: http://devexpress.com/
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -41,7 +41,7 @@ interface ASPxClientDashboardItemUnderlyingData {
 interface ASPxClientDashboardItemRequestUnderlyingDataParameters {
     /**
      * Gets or sets an array of data member identifiers used to obtain underlying data.
-     * Value: An array of String objects that specify data member identifiers.
+     * Value: An array of string values that specify data member identifiers.
      */
     DataMembers: string[];
     /**
@@ -71,23 +71,23 @@ interface ASPxClientDashboardItemRequestUnderlyingDataCompleted {
     (data: ASPxClientDashboardItemUnderlyingData): void;
 }
 /**
- * References a method that will handle the ItemClick event.
+ * References a method that will handle the ItemClick events.
  */
 interface ASPxClientDashboardItemClickEventHandler<S> {
     /**
-     * References a method that will handle the ItemClick event.
+     * References a method that will handle the ItemClick events.
      * @param source The event source.
      * @param e A ASPxClientDashboardItemClickEventArgs object that contains event data.
      */
     (source: S, e: ASPxClientDashboardItemClickEventArgs): void;
 }
 /**
- * Provides data for the ItemClick event.
+ * Provides data for the ItemClick events.
  */
 interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the name of the dashboard item for which the event has been raised.
-     * Value: A String that is the dashboard item name.
+     * Value: A string value that is the dashboard item name.
      */
     ItemName: string;
     /**
@@ -115,28 +115,28 @@ interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
     /**
      * Requests underlying data corresponding to the clicked visual element.
      * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
-     * @param dataMembers An array of String values that specify data members used to obtain underlying data.
+     * @param dataMembers An array of string values that specify data members used to obtain underlying data.
      */
     RequestUnderlyingData(onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted, dataMembers: string[]): void;
 }
 /**
- * References a method that will handle the ItemVisualInteractivity event.
+ * References a method that will handle the ItemVisualInteractivity events.
  */
 interface ASPxClientDashboardItemVisualInteractivityEventHandler<S> {
     /**
-     * References a method that will handle the ItemVisualInteractivity event.
+     * References a method that will handle the ItemVisualInteractivity events.
      * @param source The event source.
      * @param e A ASPxClientDashboardItemVisualInteractivityEventArgs object containing event data.
      */
     (source: S, e: ASPxClientDashboardItemVisualInteractivityEventArgs): void;
 }
 /**
- * Provides data for the ItemVisualInteractivity event.
+ * Provides data for the ItemVisualInteractivity events.
  */
 interface ASPxClientDashboardItemVisualInteractivityEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the component name of the dashboard item for which the event was raised.
-     * Value: A String that is the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
      */
     ItemName: string;
     /**
@@ -177,23 +177,23 @@ interface ASPxClientDashboardItemVisualInteractivityEventArgs extends ASPxClient
     SetDefaultSelection(values: ASPxClientDashboardItemDataAxisPointTuple[]): void;
 }
 /**
- * References a method that will handle the ItemSelectionChanged event.
+ * References a method that will handle the ItemSelectionChanged events.
  */
 interface ASPxClientDashboardItemSelectionChangedEventHandler<S> {
     /**
-     * References a method that will handle the ItemSelectionChanged event.
+     * References a method that will handle the ItemSelectionChanged events.
      * @param source The event source.
      * @param e A ASPxClientDashboardItemSelectionChangedEventArgs object containing event data.
      */
     (source: S, e: ASPxClientDashboardItemSelectionChangedEventArgs): void;
 }
 /**
- * Provides data for the ItemSelectionChanged event.
+ * Provides data for the ItemSelectionChanged events.
  */
 interface ASPxClientDashboardItemSelectionChangedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the component name of the dashboard item for which the event was raised.
-     * Value: A String that is the component name of the dashboard item.
+     * Value: A string that is the component name of the dashboard item.
      */
     ItemName: string;
     /**
@@ -206,19 +206,19 @@ interface ASPxClientDashboardItemSelectionChangedEventArgs extends ASPxClientEve
  */
 interface ASPxClientDashboardItemElementCustomColorEventHandler<S> {
     /**
-     * References a method that will handle the ItemElementCustomColor event.
+     * References a method that will handle the ItemElementCustomColor events.
      * @param source The event source.
      * @param e An ASPxClientDashboardItemElementCustomColorEventArgs object that contains event data.
      */
     (source: S, e: ASPxClientDashboardItemElementCustomColorEventArgs): void;
 }
 /**
- * Provides data for the ItemElementCustomColor event.
+ * Provides data for the ItemElementCustomColor events.
  */
 interface ASPxClientDashboardItemElementCustomColorEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the component name of the dashboard item for which the event was raised.
-     * Value: A String that is the component name of the dashboard item for which the event was raised.
+     * Value: A string value that is the component name of the dashboard item for which the event was raised.
      */
     ItemName: string;
     /**
@@ -240,11 +240,11 @@ interface ASPxClientDashboardItemElementCustomColorEventArgs extends ASPxClientE
     GetMeasures(): ASPxClientDashboardItemDataMeasure[];
 }
 /**
- * References a method that will handle the ItemWidgetCreated event.
+ * References a method that will handle the ItemWidgetCreated events.
  */
 interface ASPxClientDashboardItemWidgetCreatedEventHandler<S> {
     /**
-     * References a method that will handle the ItemWidgetCreated event.
+     * References a method that will handle the ItemWidgetCreated events.
      * @param source The event source.
      * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
      */
@@ -273,11 +273,11 @@ interface ASPxClientDashboardItemWidgetUpdatedEventHandler<S> {
     (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
 }
 /**
- * References a method that will handle the ItemBeforeWidgetDisposed event.
+ * References a method that will handle the ItemBeforeWidgetDisposed events.
  */
 interface ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<S> {
     /**
-     * References a method that will handle the ItemBeforeWidgetDisposed event.
+     * References a method that will handle the ItemBeforeWidgetDisposed events.
      * @param source The event source.
      * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
      */
@@ -289,7 +289,7 @@ interface ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<S> {
 interface ASPxClientDashboardItemWidgetEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the component name of the dashboard item for which the event was raised.
-     * Value: A String that is the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
      */
     ItemName: string;
     /**
@@ -391,27 +391,27 @@ interface ASPxClientDashboardItemDataAxis {
 interface ASPxClientDashboardItemDataDimension {
     /**
      * Gets the dimension identifier.
-     * Value: A String that is the dimension identifier.
+     * Value: A string value that is the dimension identifier.
      */
     Id: string;
     /**
      * Gets or sets the name of the dimension.
-     * Value: A String that is the name of the dimension.
+     * Value: A string value that is the name of the dimension.
      */
     Name: string;
     /**
      * Gets the data member identifier for the current dimension.
-     * Value: A String value that identifies a data member.
+     * Value: A string value that identifies a data member.
      */
     DataMember: string;
     /**
      * Gets the group interval for date-time values for the current dimension.
-     * Value: A String value that represents how date-time values are grouped.
+     * Value: A string value that represents how date-time values are grouped.
      */
     DateTimeGroupInterval: string;
     /**
      * Gets the group interval for string values.
-     * Value: A String value that specifies the group interval for string values.
+     * Value: A string value that specifies the group interval for string values.
      */
     TextGroupInterval: string;
     /**
@@ -426,22 +426,22 @@ interface ASPxClientDashboardItemDataDimension {
 interface ASPxClientDashboardItemDataMeasure {
     /**
      * Gets the measure identifier.
-     * Value: A String that is the measure identifier.
+     * Value: A string value that is the measure identifier.
      */
     Id: string;
     /**
      * Gets the name of the measure.
-     * Value: A String that is the name of the measure.
+     * Value: A string value that is the name of the measure.
      */
     Name: string;
     /**
      * Gets the data member that identifies the data source list used to provide data for the current measure.
-     * Value: A String value that identifies the data source list used to provide data for the current measure.
+     * Value: A string value that identifies the data source list used to provide data for the current measure.
      */
     DataMember: string;
     /**
      * Gets the type of summary function calculated against the current measure.
-     * Value: A String value that identifies the type of summary function calculated against the current measure.
+     * Value: A string value that identifies the type of summary function calculated against the current measure.
      */
     SummaryType: string;
     /**
@@ -456,22 +456,22 @@ interface ASPxClientDashboardItemDataMeasure {
 interface ASPxClientDashboardItemDataDelta {
     /**
      * Gets the data item identifier.
-     * Value: A String that is the data item identifier.
+     * Value: A string that is the data item identifier.
      */
     Id: string;
     /**
      * Gets the name of the data item container.
-     * Value: A String value that is the name of the data item container.
+     * Value: A string value that is the name of the data item container.
      */
     Name: string;
     /**
      * Gets the identifier for the measure that provides actual values.
-     * Value: A String value that is the measure identifier.
+     * Value: A string value that is the measure identifier.
      */
     ActualMeasureId: string;
     /**
      * Gets the identifier for the measure that provides target values.
-     * Value: A String value that is the measure identifier.
+     * Value: A string value that is the measure identifier.
      */
     TargetMeasureId: string;
 }
@@ -611,55 +611,1040 @@ interface ASPxClientDashboardItemDataAxisPointTuple {
     GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
 }
 /**
- * A client-side equivalent of the ASPxDashboardDesigner control.
+ * A range in the Range Filter dashboard item.
  */
-interface ASPxClientDashboardDesigner extends ASPxClientControl {
+interface ASPxClientDashboardRangeFilterSelection {
     /**
-     * Occurs after the state of the dashboard displayed in the ASPxClientDashboardDesigner is changed.
+     * Gets or sets a maximum value in the range of the Range Filter dashboard item.
+     * Value: A maximum value in the range of the Range Filter dashboard item.
      */
-    DashboardStateChanged: ASPxClientEvent<ASPxClientDashboardStateChangedEventHandler<ASPxClientDashboardDesigner>>;
+    Maximum: Object;
     /**
-     * Occurs after another dashboard is loaded to the ASPxClientDashboardDesigner.
+     * Gets or sets a minimum value in the range of the Range Filter dashboard item.
+     * Value: A minimum value in the range of the Range Filter dashboard item.
      */
-    DashboardChanged: ASPxClientEvent<ASPxClientDashboardChangedEventHandler<ASPxClientDashboardDesigner>>;
+    Minimum: Object;
+}
+/**
+ * A collection of ASPxClientDashboardParameter objects.
+ */
+interface ASPxClientDashboardParameters {
+    /**
+     * Returns an array of dashboard parameters from the ASPxClientDashboardParameters collection.
+     */
+    GetParameterList(): ASPxClientDashboardParameter[];
+    /**
+     * Returns a dashboard parameter by its name.
+     * @param name A String object that specifies the parameter name.
+     */
+    GetParameterByName(name: string): ASPxClientDashboardParameter;
+    /**
+     * Returns a dashboard parameter by its index in the ASPxClientDashboardParameters collection.
+     * @param index An integer value that specifies the parameter index.
+     */
+    GetParameterByIndex(index: number): ASPxClientDashboardParameter;
+}
+/**
+ * A client-side dashboard parameter.
+ */
+interface ASPxClientDashboardParameter {
+    /**
+     * Gets the dashboard parameter name on the client side.
+     * Value: A string value that is the dashboard parameter name on the client side.
+     */
+    Name: string;
+    /**
+     * Gets the dashboard parameter value on the client side.
+     * Value: A string value that specifies the dashboard parameter value on the client side.
+     */
+    Value: Object;
+    /**
+     * Returns a parameter name.
+     */
+    GetName(): string;
+    /**
+     * Returns a current parameter value(s).
+     */
+    GetValue(): Object;
+    /**
+     * Specifies the current parameter value(s).
+     * @param value The current parameter value(s).
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a default parameter value.
+     */
+    GetDefaultValue(): Object;
+    /**
+     * Returns the parameter's description displayed to an end-user.
+     */
+    GetDescription(): string;
+    /**
+     * Returns a parameter type.
+     */
+    GetType(): string;
+    /**
+     * Returns possible parameter values.
+     */
+    GetValues(): ASPxClientDashboardParameterValue[];
+}
+/**
+ * Provides access to the parameter value and display text.
+ */
+interface ASPxClientDashboardParameterValue {
+    /**
+     * Returns the parameter display text.
+     */
+    GetDisplayText(): string;
+    /**
+     * Returns a parameter value.
+     */
+    GetValue(): Object;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+ */
+interface ImageFormatOptions {
+    /**
+     * Gets or sets an image format in which the dashboard (dashboard item) is exported.
+     * Value: A value returned by the DashboardExportImageFormat class that specifies an image format in which the dashboard (dashboard item) is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     */
+    Resolution: number;
+}
+/**
+ * Contains options which define how the dashboard item is exported to Excel format.
+ */
+interface ExcelFormatOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A value returned by the DashboardExportExcelFormat class that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A string value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the Grid dashboard item is exported.
+ */
+interface GridExportOptions {
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    FitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to print column headers of the Grid dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pivot dashboard item is exported.
+ */
+interface PivotExportOptions {
+    /**
+     * Gets or sets whether to print the column headers of the Pivot dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pie dashboard item is exported.
+ */
+interface PieExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Gauge dashboard item is exported.
+ */
+interface GaugeExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Card dashboard item is exported.
+ */
+interface CardExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Range Filter dashboard item is exported.
+ */
+interface RangeFilterExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Range Filter dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A value returned by the RangeFilterExportSizeMode class that specifies the export size mode for the Range Filter dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Chart dashboard items are exported.
+ */
+interface ChartExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Chart dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A value returned by the ChartExportSizeMode class that specifies the export size mode for the Chart dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Map dashboard items are exported.
+ */
+interface MapExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a map dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the map dashboard item.
+     * Value: A value returned by the MapExportSizeMode class that specifies specifies the export size mode for the map dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard (dashboard item) is exported.
+ */
+interface ASPxClientDashboardExportOptions {
+    /**
+     * Gets or sets the standard paper size.
+     * Value: A string value returned by the DashboardExportPaperKind class that specifies the standard paper size.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportPageLayout class that specifies the page orientation used to export a dashboard (dashboard item).
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling when exporting a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportScaleMode class that specifies the mode for scaling when exporting a dashboard (dashboard item).
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1) by which a dashboard (dashboard item) is scaled.
+     * Value: A Single value that specifies the scale factor by which a dashboard (dashboard item) is scaled.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A boolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets the filter state's location on the exported document.
+     * Value: A string value returned by the DashboardExportFilterState class that specifies the filter state's location on the exported document.
+     */
+    FilterState: string;
+    /**
+     * Provides access to options for exporting a dashboard or individual items in Image format.
+     * Value: An ImageFormatOptions object containing settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+     */
+    ImageOptions: ImageFormatOptions;
+    /**
+     * Provides access to options for exporting individual dashboard items in Excel format.
+     * Value: An ExcelFormatOptions object containing settings that specify parameters affecting how the dashboard item is exported in Excel format.
+     */
+    ExcelOptions: ExcelFormatOptions;
+    /**
+     * Provides access to options for exporting a Grid dashboard item.
+     * Value: A GridExportOptions object containing settings that specify parameters that affect how Grid dashboard items are exported.
+     */
+    GridOptions: GridExportOptions;
+    /**
+     * Provides access to options for exporting a Pivot dashboard item.
+     * Value: A PivotExportOptions object containing settings that specify parameters that affect how Pivot dashboard items are exported.
+     */
+    PivotOptions: PivotExportOptions;
+    /**
+     * Provides access to options for exporting a Pie dashboard item.
+     * Value: A PieExportOptions object containing settings that specify parameters that affect how Pie dashboard items are exported.
+     */
+    PieOptions: PieExportOptions;
+    /**
+     * Provides access to options for exporting a Gauge dashboard item.
+     * Value: A GaugeExportOptions object containing settings that specify parameters that affect how Gauge dashboard items are exported.
+     */
+    GaugeOptions: GaugeExportOptions;
+    /**
+     * Provides access to options for exporting a Card dashboard item.
+     * Value: A CardExportOptions object containing settings that specify parameters that affect how Card dashboard items are exported.
+     */
+    CardOptions: CardExportOptions;
+    /**
+     * Provides access to options for exporting a Range Filter dashboard item.
+     * Value: A RangeFilterExportOptions object containing settings that specify parameters affecting how the Range Filter dashboard item is exported.
+     */
+    RangeFilterOptions: RangeFilterExportOptions;
+    /**
+     * Provides access to options for exporting a Chart dashboard item.
+     * Value: A ChartExportOptions object containing settings that specify parameters that affect how Chart dashboard items are exported.
+     */
+    ChartOptions: ChartExportOptions;
+    /**
+     * Provides access to options for exporting map dashboard items.
+     * Value: A MapExportOptions object containing settings that specify parameters that affect how map dashboard items are exported.
+     */
+    MapOptions: MapExportOptions;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to the PDF format.
+ */
+interface DashboardPdfExportOptions {
+    /**
+     * Gets or sets the type of paper for the exported document.
+     * Value: A DashboardExportPaperKind value that specifies the type of paper for the exported document.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard/dashboard item.
+     * Value: A DashboardExportPageLayout value that specifies the page orientation used to export a dashboard/dashboard item.
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling a dashboard/dashboard item in the exported document.
+     * Value: A DashboardExportScaleMode value that specifies the mode for scaling a dashboard/dashboard item in the exported document.
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1), by which a dashboard/dashboard item is scaled in the exported document.
+     * Value: A Single value that specifies the scale factor by which a dashboard/dashboard item is scaled in the exported document.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard/dashboard item.
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard/dashboard item.
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A boolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets a position of the dashboard state (such as master filter or current parameter values) in the exported document.
+     * Value: A DashboardStateExportPosition object that specifies the position of the dashboard state in the exported document.
+     */
+    DashboardStatePosition: string;
+    /**
+     * Gets or sets whether cards within the Card dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange cards automatically on the exported page; otherwise, false.
+     */
+    CardAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Chart dashboard item; otherwise, false.
+     */
+    ChartAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A ChartExportSizeMode value that specifies the export size mode for the Chart dashboard item.
+     */
+    ChartSizeMode: string;
+    /**
+     * Gets or sets whether gauges within the Gauge dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange gauges automatically on the exported page; otherwise, false.
+     */
+    GaugeAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    GridFitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to add column headers of the Grid dashboard item to every page.
+     * Value: true, to add column headers to every page; otherwise, false.
+     */
+    GridPrintHeadersOnEveryPage: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Map dashboard item; otherwise, false.
+     */
+    MapAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Map dashboard item.
+     * Value: A MapExportSizeMode value that specifies the export size mode for the Map dashboard item.
+     */
+    MapSizeMode: string;
+    /**
+     * Gets or sets whether pies within the Pie dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange pies automatically on the exported page; otherwise, false.
+     */
+    PieAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether to add column headers of the Pivot dashboard item to every page.
+     * Value: true, to add column headers to every page; otherwise, false.
+     */
+    PivotPrintHeadersOnEveryPage: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Range Filter dashboard item; otherwise, false.
+     */
+    RangeFilterAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A RangeFilterExportSizeMode value that specifies the export size mode for the Range Filter dashboard item.
+     */
+    RangeFilterSizeMode: string;
+    /**
+     * Gets or sets whether the page orientation used to export the Treemap dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Treemap dashboard item; otherwise, false.
+     */
+    TreemapAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Treemap dashboard item.
+     * Value: A TreemapExportSizeMode value that specifies the export size mode for the Treemap dashboard item.
+     */
+    TreemapSizeMode: string;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to an image.
+ */
+interface DashboardImageExportOptions {
+    /**
+     * Gets or sets a title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: true, to include a dashboard title (or dashboard item's caption) as the exported document title; otherwise, false.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets an image format in which the dashboard/dashboard item is exported.
+     * Value: A DashboardExportImageFormat value that specifies an image format in which the dashboard/dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard/dashboard item to an image.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard/dashboard item to an image.
+     */
+    Resolution: number;
+    /**
+     * Gets or sets the scale factor (in fractions of 1), by which a dashboard/dashboard item is scaled in the exported document.
+     * Value: A string value that specifies the scale factor by which a dashboard/dashboard item is scaled in the exported document.
+     */
+    ScaleFactor: number;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to the Excel format.
+ */
+interface DashboardExcelExportOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A DashboardExportExcelFormat value that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A string value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets the position of the dashboard state (such as master filter or current parameter values) in the exported document.
+     * Value: A DashboardStateExcelExportPosition object that specifies the position of the dashboard state in the exported document.
+     */
+    DashboardStatePosition: string;
+}
+/**
+ * A client-side equivalent of the ASPxDashboard control.
+ */
+interface ASPxClientDashboard extends ASPxClientControl {
+    /**
+     * Fires when a round trip to the server has been initiated by a call to the client PerformDataCallback method.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the state of the dashboard displayed in the ASPxClientDashboard is changed.
+     */
+    DashboardStateChanged: ASPxClientEvent<ASPxClientDashboardStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after a new dashboard is displayed in the ASPxClientDashboard.
+     */
+    DashboardChanged: ASPxClientEvent<ASPxClientDashboardChangedEventHandler<ASPxClientDashboard>>;
     /**
      * For internal use.
      */
-    CustomizeMenuItems: ASPxClientEvent<ASPxClientDashboardDesignerCustomizeMenuItemsEventHandler<ASPxClientDashboardDesigner>>;
-    BeforeRender: ASPxClientEvent<ASPxClientDashboardDesignerBeforeRenderEventHandler<ASPxClientDashboardDesigner>>;
+    CustomizeMenuItems: ASPxClientEvent<ASPxClientDashboardCustomizeMenuItemsEventHandler<ASPxClientDashboard>>;
     /**
-     * Switches the ASPxClientDashboardDesigner to the viewer mode.
+     * Occurs before any element in the Web Dashboard control has been rendered.
+     */
+    BeforeRender: ASPxClientEvent<ASPxClientDashboardBeforeRenderEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting.
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a master filter state is changed.
+     */
+    ItemMasterFilterStateChanged: ASPxClientEvent<ASPxClientDashboardItemMasterFilterStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a drill-down/drill-up is performed.
+     */
+    ItemDrillDownStateChanged: ASPxClientEvent<ASPxClientDashboardItemDrillDownStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the available interactivity actions have changed for the specific dashboard item.
+     */
+    ActionAvailabilityChanged: ASPxClientEvent<ASPxClientActionAvailabilityChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after parameter values provided using a Dynamic List are loaded.
+     */
+    DynamicLookUpValuesLoaded: ASPxClientEvent<ASPxClientDynamicLookUpValuesLoadedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a dashboard item update is initiated.
+     */
+    ItemBeginUpdate: ASPxClientEvent<ASPxClientItemBeginUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the dashboard item update is performed.
+     */
+    ItemEndUpdate: ASPxClientEvent<ASPxClientItemEndUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a dashboard update is initiated.
+     */
+    DashboardBeginUpdate: ASPxClientEvent<ASPxClientDashboardBeginUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the dashboard update is performed.
+     */
+    DashboardEndUpdate: ASPxClientEvent<ASPxClientDashboardEndUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Gets an inner part of the ASPxClientDashboard control.
+     */
+    GetDashboardControl(): DashboardControl;
+    /**
+     * Switches the ASPxClientDashboard to the viewer mode.
      */
     SwitchToViewer(): void;
     /**
-     * Switches the ASPxClientDashboardDesigner to the designer mode.
+     * Switches the ASPxClientDashboard to the designer mode.
      */
     SwitchToDesigner(): void;
     /**
-     * Gets the current working mode of the Web Designer.
+     * Gets the current working mode of the Web Dashboard.
      */
     GetWorkingMode(): string;
     /**
-     * Gets the identifier of the dashboard that is displayed in the ASPxClientDashboardDesigner.
+     * Gets the identifier of the dashboard that is displayed in the ASPxClientDashboard.
      */
     GetDashboardId(): string;
     /**
-     * Gets the name of the dashboard that is displayed in the ASPxClientDashboardDesigner.
+     * Gets the name of the dashboard that is displayed in the ASPxClientDashboard.
      */
     GetDashboardName(): string;
     /**
-     * Gets the state of the dashboard (for instance, the master filtering state) displayed in the ASPxClientDashboardDesigner.
+     * Gets the state of the dashboard displayed in the ASPxClientDashboard.
      */
     GetDashboardState(): string;
     /**
-     * Loads a dashboard with the specified identifier.
-     * @param dashboardId A String value that specifies the dashboard identifier.
+     * Sets the state of the dashboard displayed in the ASPxClientDashboard.
+     * @param dashboardState A JSON object that specifies the dashboard state.
+     */
+    SetDashboardState(dashboardState: Object): void;
+    /**
+     * Sets the state of the dashboard displayed in the ASPxClientDashboard.
+     * @param dashboardStateString A string value that specifies the state of the dashboard displayed in the ASPxClientDashboard.
+     */
+    SetDashboardState(dashboardStateString: string): void;
+    /**
+     * Loads a dashboard with the specified identifier from the dashboard storage.
+     * @param dashboardId A string value that specifies the dashboard identifier.
      */
     LoadDashboard(dashboardId: string): void;
     /**
-     * Saves a dashboard to the dashboard storage.
+     * Saves a current dashboard to the dashboard storage.
      */
     SaveDashboard(): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Invokes the dialog that allows end-users to export the entire dashboard to the specified format.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF' or 'Image'.
+     */
+    ShowExportDashboardDialog(format: string): void;
+    /**
+     * Invokes the dialog that allows end-users to export the dashboard item to the specified format.
+     * @param itemComponentName A string value that specifies the component name of the dashboard item to export.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF, 'Image' or 'Excel'. Note that some items (i.e., ImageDashboardItem) do not support exporting to the 'Excel' format.
+     */
+    ShowExportDashboardItemDialog(itemComponentName: string, format: string): void;
+    /**
+     * Hides the dialog that allows end-users to export the dashboard/dashboard item.
+     */
+    HideExportDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    GetPdfExportOptions(): DashboardPdfExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to an image.
+     */
+    GetImageExportOptions(): DashboardImageExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the Excel format.
+     */
+    GetExcelExportOptions(): DashboardExcelExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the PDF format.
+     * @param options A DashboardPdfExportOptions object containing options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    SetPdfExportOptions(options: DashboardPdfExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to an image.
+     * @param options A DashboardImageExportOptions object containing options related to exporting a dashboard/dashboard item to an image.
+     */
+    SetImageExportOptions(options: DashboardImageExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the Excel format.
+     * @param options A DashboardExcelExportOptions object containing options related to exporting a dashboard item to the Excel format.
+     */
+    SetExcelExportOptions(options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportToImage(options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     */
+    ExportToExcel(): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     */
+    ExportToExcel(options: DashboardExcelExportOptions): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportToExcel(options: DashboardExcelExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Returns whether or not master filtering  can be applied in the current state of the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down into the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down into the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+    /**
+     * Refreshes an entire dashboard displayed in the Web Dashboard control.
+     */
+    Refresh(): void;
+    /**
+     * Refreshes the specific item from the dashboard displayed in the Web Dashboard control.
+     * @param itemName A string value that specifies the component name of the dashboard item to be refreshed.
+     */
+    Refresh(itemName: string): void;
+    /**
+     * Refreshes specific items from the dashboard displayed in the Web Dashboard control.
+     * @param itemName An array of string values that specify the component names of the dashboard items to be refreshed.
+     */
+    Refresh(itemName: string[]): void;
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A ASPxClientDashboardRangeFilterSelection object that specifies a range to be selected.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
+     */
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns names of the predefined ranges available for the specified Range Filter.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetAvailablePredefinedRanges(itemName: string): string[];
+    /**
+     * Returns the name of the currently selected predefined range.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentPredefinedRange(itemName: string): string;
 }
 /**
  * References a method that will handle the DashboardStateChanged event.
@@ -678,7 +1663,7 @@ interface ASPxClientDashboardStateChangedEventHandler<S> {
 interface ASPxClientDashboardStateChangedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the current state of the dashboard.
-     * Value: A String that is the current state of the dashboard.
+     * Value: A string value that is the current state of the dashboard.
      */
     DashboardState: string;
 }
@@ -699,19 +1684,19 @@ interface ASPxClientDashboardChangedEventHandler<S> {
 interface ASPxClientDashboardChangedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the identifier of a newly opened dashboard.
-     * Value: A String values that is an identifier of newly opened dashboard.
+     * Value: A string value that is an identifier of newly opened dashboard.
      */
     DashboardId: string;
     /**
      * Gets the name of a newly opened dashboard.
-     * Value: A String values that is the name of newly opened dashboard.
+     * Value: A string value that is the name of newly opened dashboard.
      */
     DashboardName: string;
 }
-interface ASPxClientDashboardDesignerCustomizeMenuItemsEventHandler<S> {
-    (source: S, e: ASPxClientDashboardDesignerCustomizeMenuItemsEventArgs): void;
+interface ASPxClientDashboardCustomizeMenuItemsEventHandler<S> {
+    (source: S, e: ASPxClientDashboardCustomizeMenuItemsEventArgs): void;
 }
-interface ASPxClientDashboardDesignerMenuItem {
+interface ASPxClientDashboardMenuItem {
     id: string;
     title: string;
     template: string;
@@ -721,13 +1706,214 @@ interface ASPxClientDashboardDesignerMenuItem {
     click: Function;
     hotKey: number;
 }
-interface ASPxClientDashboardDesignerCustomizeMenuItemsEventArgs extends ASPxClientEventArgs {
-    Items: ASPxClientDashboardDesignerMenuItem[];
-    FindById(itemId: string): ASPxClientDashboardDesignerMenuItem;
+interface ASPxClientDashboardCustomizeMenuItemsEventArgs extends ASPxClientEventArgs {
+    Items: ASPxClientDashboardMenuItem[];
+    FindById(itemId: string): ASPxClientDashboardMenuItem;
 }
-interface ASPxClientDashboardDesignerBeforeRenderEventHandler<S> {
+/**
+ * References a method that will handle the BeforeRender event.
+ */
+interface ASPxClientDashboardBeforeRenderEventHandler<S> {
+    /**
+     * References a method that will handle the BeforeRender event.
+     * @param source The event source.
+     * @param e An ASPxClientEventArgs object that contains event data.
+     */
     (source: S, e: ASPxClientEventArgs): void;
 }
+/**
+ * Serves as the base class for classes that provide data for client-side events related to dashboard items.
+ */
+interface ASPxClientDashboardItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns whether or not the specified value is null.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is 'others'.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemMasterFilterStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemMasterFilterStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemMasterFilterStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the currently selected values.
+     * Value: An array of objects that are the currently selected values.
+     */
+    Values: Object[][];
+}
+/**
+ * References a method that will handle the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemDrillDownStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemDrillDownStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemDrillDownStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the drill-down action performed in the dashboard item.
+     * Value: A string value that is the drill-down action performed in the dashboard item.
+     */
+    Action: string;
+    /**
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
+     */
+    Values: Object[];
+}
+/**
+ * References a method that will handle the ActionAvailabilityChanged event.
+ */
+interface ASPxClientActionAvailabilityChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ActionAvailabilityChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientActionAvailabilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientActionAvailabilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the ActionAvailabilityChanged event.
+ */
+interface ASPxClientActionAvailabilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DynamicLookUpValuesLoaded event.
+ */
+interface ASPxClientDynamicLookUpValuesLoadedEventHandler<S> {
+    /**
+     * References a method that will handle the DynamicLookUpValuesLoaded event.
+     * @param source The event source.
+     * @param e A ASPxClientDynamicLookUpValuesLoadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDynamicLookUpValuesLoadedEventArgs): void;
+}
+/**
+ * Provides data for the DynamicLookUpValuesLoaded event.
+ */
+interface ASPxClientDynamicLookUpValuesLoadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the dashboard parameter name whose values have been loaded.
+     * Value: A string value that is the dashboard parameter name whose values have been loaded.
+     */
+    ParameterName: string;
+}
+/**
+ * References a method that will handle the ItemBeginUpdate event.
+ */
+interface ASPxClientItemBeginUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the ItemBeginUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientItemBeginUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientItemBeginUpdateEventArgs): void;
+}
+/**
+ * Provides data for the ItemBeginUpdate event.
+ */
+interface ASPxClientItemBeginUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the ItemEndUpdate event.
+ */
+interface ASPxClientItemEndUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the ItemEndUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientItemEndUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientItemEndUpdateEventArgs): void;
+}
+/**
+ * Provides data for the ItemEndUpdate event.
+ */
+interface ASPxClientItemEndUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DashboardBeginUpdate event.
+ */
+interface ASPxClientDashboardBeginUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardBeginUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardBeginUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardBeginUpdateEventArgs): void;
+}
+/**
+ * Provides data for the DashboardBeginUpdate event.
+ */
+interface ASPxClientDashboardBeginUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of the dashboard for which the event was raised.
+     * Value: A string value that is the dashboard identifier.
+     */
+    DashboardId: string;
+}
+/**
+ * References a method that will handle the DashboardEndUpdate event.
+ */
+interface ASPxClientDashboardEndUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardEndUpdate event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardEndUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardEndUpdateEventArgs): void;
+}
+/**
+ * Provides data for the DashboardEndUpdate event.
+ */
+interface ASPxClientDashboardEndUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of the dashboard for which the event was raised.
+     * Value: A string value that is the dashboard identifier.
+     */
+    DashboardId: string;
+}
 /**
  * A client-side equivalent of the ASPxDashboardViewer control.
  */
@@ -773,7 +1959,7 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
      */
     ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboardViewer>>;
     /**
-     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting.
      */
     ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboardViewer>>;
     /**
@@ -834,15 +2020,25 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
     /**
      * Selects the required range in the specified Range Filter dashboard item.
      * @param itemName A String that specifies the component name of the Range Filter dashboard item.
-     * @param range A String value that specifies the component name of the Range Filter dashboard item.
+     * @param range A ASPxClientDashboardRangeFilterSelection object that specifies a range to be selected.
      */
     SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
     /**
-     * Selects the specified range in the specified Range Filter dashboard item.
-     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
-     * @param dateTimePeriodName A String that specifies the name of the predefined range used to perform a selection.
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
      */
-    SetRange(itemName: string, dateTimePeriodName: string): void;
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns names of the predefined ranges available for the specified Range Filter.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetAvailablePredefinedRanges(itemName: string): string[];
+    /**
+     * Returns the name of the currently selected predefined range.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentPredefinedRange(itemName: string): string;
     /**
      * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
      * @param itemName A String that is the component name of the dashboard item.
@@ -870,7 +2066,7 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
     GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
     /**
      * Requests underlying data for the specified dashboard item.
-     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
      * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
      * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
      */
@@ -887,62 +2083,198 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
      * Returns settings that specify parameters affecting how the dashboard is exported.
      */
     GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    GetPdfExportOptions(): DashboardPdfExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to an image.
+     */
+    GetImageExportOptions(): DashboardImageExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the Excel format.
+     */
+    GetExcelExportOptions(): DashboardExcelExportOptions;
     /**
      * Specifies settings that specify parameters affecting how the dashboard is exported.
      * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
      */
     SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the PDF format.
+     * @param options A DashboardPdfExportOptions object containing options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    SetPdfExportOptions(options: DashboardPdfExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to an image.
+     * @param options A DashboardImageExportOptions object containing options related to exporting a dashboard/dashboard item to an image.
+     */
+    SetImageExportOptions(options: DashboardImageExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the Excel format.
+     * @param options A DashboardExcelExportOptions object containing options related to exporting a dashboard item to the Excel format.
+     */
+    SetExcelExportOptions(options: DashboardExcelExportOptions): void;
     /**
      * Exports a dashboard to a PDF file and writes it to the Response.
      */
     ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions, fileName: string): void;
     /**
      * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
      * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
      */
     ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
     /**
      * Exports a dashboard to an Image file and writes it to the Response.
      */
     ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportToImage(options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: DashboardImageExportOptions, fileName: string): void;
     /**
      * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
      * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
      */
     ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     */
+    ExportToExcel(): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     */
+    ExportToExcel(options: DashboardImageExportOptions): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportToExcel(options: DashboardImageExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to a PDF file and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      */
     ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
      */
     ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to an Image file and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      */
     ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
      */
     ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to an Excel file and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      */
     ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions, fileName: string): void;
     /**
      * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
      * @param itemName A String that is the component name of the dashboard item to be exported.
      * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
      */
     ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
     /**
      * Returns the dashboard width.
      */
@@ -1023,326 +2355,10 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
     CanPerformDrillUp(itemName: string): boolean;
     /**
      * Returns the client data for the specified dashboard item.
-     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
      */
     GetItemData(itemName: string): ASPxClientDashboardItemData;
 }
-/**
- * A range in the Range Filter dashboard item.
- */
-interface ASPxClientDashboardRangeFilterSelection {
-    /**
-     * Gets or sets a maximum value in the range of the Range Filter dashboard item.
-     * Value: A maximum value in the range of the Range Filter dashboard item.
-     */
-    Maximum: Object;
-    /**
-     * Gets or sets a minimum value in the range of the Range Filter dashboard item.
-     * Value: A minimum value in the range of the Range Filter dashboard item.
-     */
-    Minimum: Object;
-}
-/**
- * A collection of ASPxClientDashboardParameter objects.
- */
-interface ASPxClientDashboardParameters {
-    /**
-     * Returns an array of dashboard parameters from the ASPxClientDashboardParameters collection.
-     */
-    GetParameterList(): ASPxClientDashboardParameter[];
-    /**
-     * Returns a dashboard parameter by its name.
-     * @param name A String object that specifies the parameter name.
-     */
-    GetParameterByName(name: string): ASPxClientDashboardParameter;
-    /**
-     * Returns a dashboard parameter by its index in the ASPxClientDashboardParameters collection.
-     * @param index An integer value that specifies the parameter index.
-     */
-    GetParameterByIndex(index: number): ASPxClientDashboardParameter;
-}
-/**
- * A client-side dashboard parameter.
- */
-interface ASPxClientDashboardParameter {
-    /**
-     * Gets the dashboard parameter name on the client side.
-     * Value: A String that is the dashboard parameter name on the client side.
-     */
-    Name: string;
-    /**
-     * Gets the dashboard parameter value on the client side.
-     * Value: A String that specifies the dashboard parameter value on the client side.
-     */
-    Value: Object;
-    /**
-     * Returns a parameter name.
-     */
-    GetName(): string;
-    /**
-     * Returns a current parameter value.
-     */
-    GetValue(): Object;
-    /**
-     * Specifies the current parameter value.
-     * @param value The current parameter value.
-     */
-    SetValue(value: Object): void;
-    /**
-     * Returns a default parameter value.
-     */
-    GetDefaultValue(): Object;
-    /**
-     * Returns the parameter's description displayed to an end-user.
-     */
-    GetDescription(): string;
-    /**
-     * Returns a parameter type.
-     */
-    GetType(): string;
-    /**
-     * Returns possible parameter values.
-     */
-    GetValues(): ASPxClientDashboardParameterValue[];
-}
-/**
- * Provides access to the parameter value and display text.
- */
-interface ASPxClientDashboardParameterValue {
-    /**
-     * Returns the parameter display text.
-     */
-    GetDisplayText(): string;
-    /**
-     * Returns a parameter value.
-     */
-    GetValue(): Object;
-}
-/**
- * Contains settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
- */
-interface ImageFormatOptions {
-    /**
-     * Gets or sets an image format in which the dashboard (dashboard item) is exported.
-     * Value: A value returned by the DashboardExportImageFormat class that specifies an image format in which the dashboard (dashboard item) is exported.
-     */
-    Format: string;
-    /**
-     * Gets or sets the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
-     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
-     */
-    Resolution: number;
-}
-/**
- * Contains options which define how the dashboard item is exported to Excel format.
- */
-interface ExcelFormatOptions {
-    /**
-     * Gets or sets the Excel format in which the dashboard item is exported.
-     * Value: A value returned by the DashboardExportExcelFormat class that specifies the Excel format in which the dashboard item is exported.
-     */
-    Format: string;
-    /**
-     * Gets or sets a character used to separate values in a CSV document.
-     * Value: A String value that specifies the character used to separate values in a CSV document.
-     */
-    CsvValueSeparator: string;
-}
-/**
- * Contains settings that specify parameters affecting how the Grid dashboard item is exported.
- */
-interface GridExportOptions {
-    /**
-     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
-     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
-     */
-    FitToPageWidth: boolean;
-    /**
-     * Gets or sets whether to print column headers of the Grid dashboard item on every page.
-     * Value: true, to print column headers on every page; otherwise, false.
-     */
-    PrintHeadersOnEveryPage: boolean;
-}
-/**
- * Contains settings that specify parameters affecting how the Pivot dashboard item is exported.
- */
-interface PivotExportOptions {
-    /**
-     * Gets or sets whether to print the column headers of the pivot dashboard item on every page.
-     * Value: true, to print column headers on every page; otherwise, false.
-     */
-    PrintHeadersOnEveryPage: boolean;
-}
-/**
- * Contains settings that specify parameters affecting how the Pie dashboard item is exported.
- */
-interface PieExportOptions {
-    /**
-     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
-     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
-     */
-    AutoArrangeContent: boolean;
-}
-/**
- * Contains settings that specify parameters affecting how the Gauge dashboard item is exported.
- */
-interface GaugeExportOptions {
-    /**
-     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
-     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
-     */
-    AutoArrangeContent: boolean;
-}
-/**
- * Contains settings that specify parameters affecting how the Card dashboard item is exported.
- */
-interface CardExportOptions {
-    /**
-     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
-     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
-     */
-    AutoArrangeContent: boolean;
-}
-/**
- * Contains settings that specify parameters affecting how the Range Filter dashboard item is exported.
- */
-interface RangeFilterExportOptions {
-    /**
-     * Gets or sets whether the page orientation used to export a Range Filter dashboard item is selected automatically.
-     * Value: true, to automatically select the page orientation used to export a Range Filter dashboard item; otherwise, false.
-     */
-    AutomaticPageLayout: boolean;
-    /**
-     * Gets or sets the export size mode for the Range Filter dashboard item.
-     * Value: A value returned by the RangeFilterExportSizeMode class that specifies the export size mode for the Range Filter dashboard item.
-     */
-    SizeMode: string;
-}
-/**
- * Contains settings that specify parameters affecting how Chart dashboard items are exported.
- */
-interface ChartExportOptions {
-    /**
-     * Gets or sets whether the page orientation used to export a Chart dashboard item is selected automatically.
-     * Value: true, to automatically select the page orientation used to export a Chart dashboard item; otherwise, false.
-     */
-    AutomaticPageLayout: boolean;
-    /**
-     * Gets or sets the export size mode for the Chart dashboard item.
-     * Value: A value returned by the ChartExportSizeMode class that specifies the export size mode for the Chart dashboard item.
-     */
-    SizeMode: string;
-}
-/**
- * Contains settings that specify parameters affecting how map dashboard items are exported.
- */
-interface MapExportOptions {
-    /**
-     * Gets or sets whether the page orientation used to export a map dashboard item is selected automatically.
-     * Value: true, to automatically select the page orientation used to export a map dashboard item; otherwise, false.
-     */
-    AutomaticPageLayout: boolean;
-    /**
-     * Gets or sets the export size mode for the map dashboard item.
-     * Value: A value returned by the MapExportSizeMode class that specifies specifies the export size mode for the map dashboard item.
-     */
-    SizeMode: string;
-}
-/**
- * Contains settings that specify parameters affecting how the dashboard (dashboard item) is exported.
- */
-interface ASPxClientDashboardExportOptions {
-    /**
-     * Gets or sets the standard paper size.
-     * Value: A string value returned by the DashboardExportPaperKind class that specifies the standard paper size.
-     */
-    PaperKind: string;
-    /**
-     * Gets or sets the page orientation used to export a dashboard (dashboard item).
-     * Value: A string value returned by the DashboardExportPageLayout class that specifies the page orientation used to export a dashboard (dashboard item).
-     */
-    PageLayout: string;
-    /**
-     * Gets or sets the mode for scaling when exporting a dashboard (dashboard item).
-     * Value: A string value returned by the DashboardExportScaleMode class that specifies the mode for scaling when exporting a dashboard (dashboard item).
-     */
-    ScaleMode: string;
-    /**
-     * Gets or sets the scale factor (in fractions of 1) by which a dashboard (dashboard item) is scaled.
-     * Value: A Single value that specifies the scale factor by which a dashboard (dashboard item) is scaled.
-     */
-    ScaleFactor: number;
-    /**
-     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
-     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
-     */
-    AutoFitPageCount: number;
-    /**
-     * Gets or sets the title of the exported document.
-     * Value: A String value that specifies the title of the exported document.
-     */
-    Title: string;
-    /**
-     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
-     * Value: A DefaultBoolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
-     */
-    ShowTitle: boolean;
-    /**
-     * Gets or sets the filter state's location on the exported document.
-     * Value: A string value returned by the DashboardExportFilterState class that specifies the filter state's location on the exported document.
-     */
-    FilterState: string;
-    /**
-     * Provides access to options for exporting a dashboard or individual items in Image format.
-     * Value: An ImageFormatOptions object containing settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
-     */
-    ImageOptions: ImageFormatOptions;
-    /**
-     * Provides access to options for exporting individual dashboard items in Excel format.
-     * Value: An ExcelFormatOptions object containing settings that specify parameters affecting how the dashboard item is exported in Excel format.
-     */
-    ExcelOptions: ExcelFormatOptions;
-    /**
-     * Provides access to options for exporting a Grid dashboard item.
-     * Value: A GridExportOptions object containing settings that specify parameters that affect how Grid dashboard items are exported.
-     */
-    GridOptions: GridExportOptions;
-    /**
-     * Provides access to options for exporting a Pivot dashboard item.
-     * Value: A PivotExportOptions object containing settings that specify parameters that affect how Pivot dashboard items are exported.
-     */
-    PivotOptions: PivotExportOptions;
-    /**
-     * Provides access to options for exporting a Pie dashboard item.
-     * Value: A PieExportOptions object containing settings that specify parameters that affect how Pie dashboard items are exported.
-     */
-    PieOptions: PieExportOptions;
-    /**
-     * Provides access to options for exporting a Gauge dashboard item.
-     * Value: A GaugeExportOptions object containing settings that specify parameters that affect how Gauge dashboard items are exported.
-     */
-    GaugeOptions: GaugeExportOptions;
-    /**
-     * Provides access to options for exporting a Card dashboard item.
-     * Value: A CardExportOptions object containing settings that specify parameters that affect how Card dashboard items are exported.
-     */
-    CardOptions: CardExportOptions;
-    /**
-     * Provides access to options for exporting a Range Filter dashboard item.
-     * Value: A RangeFilterExportOptions object containing settings that specify parameters affecting how the Range Filter dashboard item is exported.
-     */
-    RangeFilterOptions: RangeFilterExportOptions;
-    /**
-     * Provides access to options for exporting a Chart dashboard item.
-     * Value: A ChartExportOptions object containing settings that specify parameters that affect how Chart dashboard items are exported.
-     */
-    ChartOptions: ChartExportOptions;
-    /**
-     * Provides access to options for exporting map dashboard items.
-     * Value: A MapExportOptions object containing settings that specify parameters that affect how map dashboard items are exported.
-     */
-    MapOptions: MapExportOptions;
-}
 /**
  * References a method that will handle the ActionAvailabilityChanged event.
  */
@@ -1409,7 +2425,7 @@ interface ASPxClientDashboardDataLoadingErrorEventArgs extends ASPxClientEventAr
 interface ASPxClientDashboardItemAction {
     /**
      * Gets the name of the dashboard item.
-     * Value: A String that specifies the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
      */
     ItemName: string;
     /**
@@ -1441,7 +2457,7 @@ interface ASPxClientDashboardMasterFilterSetEventHandler<S> {
 interface ASPxClientDashboardMasterFilterSetEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the name of the dashboard item.
-     * Value: A String that specifies the name of the dashboard item.
+     * Value: A string value that specifies the component name of the dashboard item.
      */
     ItemName: string;
     /**
@@ -1477,7 +2493,7 @@ interface ASPxClientDashboardMasterFilterClearedEventHandler<S> {
 interface ASPxClientDashboardMasterFilterClearedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the name of the dashboard item.
-     * Value: A String that is the name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
      */
     ItemName: string;
 }
@@ -1498,14 +2514,14 @@ interface ASPxClientDashboardDrillDownPerformedEventHandler<S> {
 interface ASPxClientDashboardDrillDownPerformedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the name of the dashboard item.
-     * Value: A String that specifies the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
      */
     ItemName: string;
     /**
-     * Gets the bottommost value from the current drill-down hierarchy.
-     * Value: The bottommost value from the current drill-down hierarchy.
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
      */
-    Value: Object[];
+    Values: Object[];
     /**
      * Returns whether or not the specified value is NullValue.
      * @param value The specified value.
@@ -1534,10 +2550,434 @@ interface ASPxClientDashboardDrillUpPerformedEventHandler<S> {
 interface ASPxClientDashboardDrillUpPerformedEventArgs extends ASPxClientEventArgs {
     /**
      * Gets the name of the dashboard item.
-     * Value: A String that is the name of the dashboard item.
+     * Value: A string that is the name of the dashboard item.
      */
     ItemName: string;
 }
+/**
+ * When implemented, represents the Web Dashboard extension.
+ */
+interface IExtension {
+    /**
+     * A unique name of a Web Dashboard extension.
+     * Value: A string value that is a unique name of a Web Dashboard extension.
+     */
+    name: string;
+    /**
+     * Contains code that will be invoked when you register the dashboard extension.
+     */
+    start(): void;
+    /**
+     * Contains code that will be invoked when you unregister the dashboard extension.
+     */
+    stop(): void;
+}
+/**
+ * An inner part of the ASPxClientDashboard control.
+ */
+interface DashboardControl {
+    /**
+     * Gets or sets knockout templates that you can used in the Web Dashboard.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a knockout template.
+     */
+    customTemplates: KnockoutObservableArray;
+    /**
+     * Provide an access to the collection of registered dashboard extensions.
+     * Value: An array of IExtension objects that are dashboard extensions.
+     */
+    extensions: IExtension[];
+    /**
+     * Initializes a new dashboard with the specified name and JSON model.
+     * @param id A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    initializeDashboard(id: string, dashboardJson: string): void;
+    /**
+     * Initializes a new dashboard with the specified name, JSON model and initial state.
+     * @param id A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     * @param initialState A JSON object that specifies the  dashboard state.
+     */
+    initializeDashboard(id: string, dashboardJson: string, initialState: Object): void;
+    /**
+     * Allows you to register a dashboard extension to add its functionality to the Web Dashboard.
+     * @param extension An IExtension object that is a dashboard extension.
+     */
+    registerExtension(extension: IExtension): void;
+    /**
+     * Allows you to get access to the extension.
+     * @param extensionName A string value that is the dashboard extension name.
+     */
+    findExtension(extensionName: string): IExtension;
+    /**
+     * Allows you to unregister a dashboard extension to disable its functionality in the Web Dashboard.
+     * @param extensionName A string value that is a dashboard extension name.
+     */
+    unregisterExtension(extensionName: string): void;
+}
+interface DashboardParameterDialogExtension extends IExtension {
+}
+interface DashboardExportExtension extends IExtension {
+}
+interface DashboardClientApiExtension extends IExtension {
+}
+interface DashboardCurrencyEditorExtension extends IExtension {
+}
+interface DataSourceBrowserExtension extends IExtension {
+}
+interface DataSourceWizardExtension extends IExtension {
+}
+interface DashboadItemMenuExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to keep track of all user actions, and cancel or repeat them.
+ */
+interface UndoRedoExtension extends IExtension {
+    /**
+     * Allows you to track whether the Web Dashboard has unsaved changes.
+     */
+    isChanged(): boolean;
+}
+/**
+ * An extension that is the dashboard item's Binding menu allowing you to create and modify data binding.
+ */
+interface BindingPanelExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to configure color schemes.
+ */
+interface DashboardColorSchemeEditorExtension extends IExtension {
+}
+/**
+ * An extension that is the dashboard item's Convert To menu allowing you to convert or duplicate the current item.
+ */
+interface ConversionPanelExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to save the current dashboard.
+ */
+interface SaveDashboardExtension extends IExtension {
+    /**
+     * Allows you to save the current dashboard with a specified unique name and JSON model.
+     * @param dashboardId A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    performSaveDashboard(dashboardId: string, dashboardJson: string): void;
+    /**
+     * Allows you to invoke a custom function while you save a dashboard.
+     * @param action A custom function that is invoked when the dashboard is about to be saved.
+     */
+    ensureDashboardSaved(action: Function): void;
+    /**
+     * Saves the opened dashboard.
+     */
+    saveDashboard(): void;
+}
+/**
+ * A Web Dashboard extension that allows you to create a new dashboard.
+ */
+interface CreateDashboardExtension extends IExtension {
+    /**
+     * Creates a new dashboard with a specified name and JSON model.
+     * @param dashboardName A string value that is the name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    performCreateDashboard(dashboardName: string, dashboardJson: string): void;
+}
+/**
+ * A Web Dashboard extension that allows you to open the created dashboards.
+ */
+interface OpenDashboardExtension extends IExtension {
+    /**
+     * Loads a dashboard with the specified identifier from the dashboard storage.
+     * @param id A String value that specifies the unique dashboard name.
+     */
+    loadDashboard(id: string): void;
+}
+/**
+ * An extension that is the dashboard item's Interactivity menu containing settings that affect on interaction between various dashboard items.
+ */
+interface InteractivityPanelExtension extends IExtension {
+}
+/**
+ * An extension that is the dashboard item's Options menu containing specific options and settings related to the current dashboard item.
+ */
+interface OptionsPanelExtension extends IExtension {
+}
+/**
+ * An extension that is the Web Dashboard title editor.
+ */
+interface DashboardTitleEditorExtension extends IExtension {
+}
+/**
+ * The Dashboard Panel extension that displays a list of available dashboards and lets you switch between the designer and viewer modes.
+ */
+interface DashboardPanelExtension extends IExtension {
+    /**
+     * Gets or sets the width of the Dashboard Panel extension.
+     * Value: An integer value that specifies the Dashboard Panel's width.
+     */
+    panelWidth: number;
+    /**
+     * Allows you to control the Dashboard Panel's visibility.
+     * Value: true, to display the Dashboard Panel; otherwise, false.
+     */
+    visible: KnockoutObservableBoolean;
+    /**
+     * Gets or sets whether you can switch into the designer mode.
+     * Value: true, to display the Edit in Designer button on the dashboard panel; otherwise, false.
+     */
+    allowSwitchToDesigner: KnockoutObservableBoolean;
+}
+/**
+ * An extension that is a list of available data sources used to provide data to the Web Dashboard.
+ */
+interface AvailableDataSourcesExtension extends IExtension {
+}
+/**
+ * A dashboard menu item.
+ */
+interface DashboardMenuItem {
+    /**
+     * Gets or sets a unique id of a dashboard menu item.
+     * Value: A string value that is a menu item's unique name.
+     */
+    id: string;
+    /**
+     * Gets or sets a dashboard menu item title.
+     * Value: A string value that is a dashboard menu item title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the dashboard menu item group within the dashboard menu.
+     * Value: A zero-based integer specifying the position of the current dashboard menu item.
+     */
+    index: number;
+    /**
+     * Gets or sets a keyboard shortcut used to invoke the command.
+     * Value: An integer value that specifies a hotkey combination.
+     */
+    hotKey: number;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+    /**
+     * Gets or sets a knockout template for the extension.
+     * Value: A string value that is an id of the knockout template.
+     */
+    template: string;
+    /**
+     * Gets or sets whether the dashboard menu item is selected.
+     * Value: true, if the dashboard menu item is selected; otherwise, false;
+     */
+    selected: KnockoutObservableBoolean;
+    /**
+     * Gets or sets whether a dashboard menu item should be disabled.
+     * Value: true, if a dashboard menu item should be disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets whether a dashboard menu item has a separator.
+     * Value: true, if a dashboard menu item has a separator; otherwise, false.
+     */
+    hasSeparator: boolean;
+    /**
+     * Gets or sets data that is used by a menu item.
+     * Value: An object that contains data used by a menu item.
+     */
+    data: Object;
+}
+/**
+ * A toolbox item of the specified dashboard toolbox group.
+ */
+interface DashboardToolboxItem {
+    /**
+     * Gets or sets a dashboard item type.
+     * Value: A string value that is a dashboard item type.
+     */
+    type: string;
+    /**
+     * Gets or sets an icon of the dashboard toolbox item.
+     * Value: A string value that is the icon id from the SVG definition.
+     */
+    icon: string;
+    /**
+     * Gets or sets a unique name of the dashboard toolbox item.
+     * Value: A string value that is a toolbox item's unique name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbox item title.
+     * Value: A string value that is a dashboard toolbox item title.
+     */
+    title: string;
+    /**
+     * Gets or sets whether a toolbox item should be disabled.
+     * Value: true, if a toolbox item should be disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+}
+/**
+ * A toolbar item of the specified dashboard toolbar group.
+ */
+interface DashboardToolbarItem {
+    /**
+     * Gets or sets an icon of the dashboard toolbar item.
+     * Value: A string value that is the icon id from the SVG definition.
+     */
+    icon: string;
+    /**
+     * Gets or sets a unique name of the dashboard toolbar item.
+     * Value: A string value that is a unique toolbar item name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbar item title.
+     * Value: A string value that is a dashboard toolbar item title.
+     */
+    title: string;
+    /**
+     * Gets or sets whether a toolbar item should be disabled.
+     * Value: true, if a toolbar item should be disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets a knockout extension template.
+     * Value: A string value that is an id of the knockout template.
+     */
+    template: string;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+}
+/**
+ * A toolbox group that contains dashboard toolbox items.
+ */
+interface DashboardToolboxGroup {
+    /**
+     * Gets or sets a unique name of the dashboard toolbox group.
+     * Value: A string value that is a unique toolbox group name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbox group title.
+     * Value: A string value that is a dashboard toolbox group title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the toolbox group within the Toolbox.
+     * Value: A zero-based integer specifying the position of the current toolbox group.
+     */
+    index: number;
+    /**
+     * Provide an access to the collection of toolbox items obtained from the specified toolbox group.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbox group.
+     */
+    items: KnockoutObservableArray;
+}
+/**
+ * A toolbar group that contains dashboard toolbar items.
+ */
+interface DashboardToolbarGroup {
+    /**
+     * Gets or sets a unique name of the dashboard toolbar group.
+     * Value: A string value that is a unique toolbar group name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbar group title.
+     * Value: A string value that is a dashboard toolbar group title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the toolbar group within the Toolbox.
+     * Value: A zero-based integer specifying the position of the current toolbar group.
+     */
+    index: number;
+    /**
+     * Provide an access to the collection of toolbox items obtained from the specified toolbar group.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbar group.
+     */
+    items: KnockoutObservableArray;
+}
+/**
+ * The Web Dashboard Toolbox extension that provides access to the dashboard menu and allows you to add dashboard items, as well as undo or repeat user actions.
+ */
+interface ToolboxExtension extends IExtension {
+    /**
+     * Gets or sets the visibility of the dashboard menu.
+     * Value: true, to display the dashboard menu; otherwise, false.
+     */
+    menuVisible: KnockoutObservableBoolean;
+    /**
+     * Provide an access to the collection of menu items obtained from the dashboard menu.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the dashboard menu items .
+     */
+    menuItems: KnockoutObservableArray;
+    /**
+     * Provide an access to the collection of toolbox groups obtained from the Toolbox.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbox groups.
+     */
+    toolboxGroups: KnockoutObservableArray;
+    /**
+     * Provide an access to the collection of toolbar groups obtained from the Toolbox.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbar groups.
+     */
+    toolbarGroups: KnockoutObservableArray;
+    /**
+     * Allows you to add a specified menu item to the dashboard menu.
+     * @param menuItem A DashboardMenuItem object that is a dashboard menu item.
+     */
+    addMenuItem(menuItem: DashboardMenuItem): void;
+    /**
+     * Removes the specified dashboard item from the dashboard menu.
+     * @param menuItemId A string value that is a unique dashboard item name.
+     */
+    removeMenuItem(menuItemId: string): void;
+    /**
+     * Simulates a dashboard menu item selection.
+     * @param menuItem A DashboardMenuItem object that is a dashboard menu item.
+     */
+    selectMenuItem(menuItem: DashboardMenuItem): void;
+    /**
+     * Allows you to add a specified toolbox item into a specified toolbox group.
+     * @param groupName A string value that is a toolbox group name. To get a toolbox group name, use the name property.
+     * @param toolboxItem A DashboardToolboxItem object that is a dashboard toolbox item.
+     */
+    addToolboxItem(groupName: string, toolboxItem: DashboardToolboxItem): void;
+    /**
+     * Removes the specified toolbox item from the specified toolbox group.
+     * @param groupName A string value that is a unique toolbox group name.
+     * @param toolboxItemName A string value that is a unique toolbox item name.
+     */
+    removeToolboxItem(groupName: string, toolboxItemName: string): void;
+    /**
+     * Allows you to add a specified toolbar item into a specified toolbar group.
+     * @param groupName A string value that is a toolbar group name. To get a toolbar group name, use the name property.
+     * @param toolbarItem A DashboardToolbarItem object that is a dashboard toolbar item.
+     */
+    addToolbarItem(groupName: string, toolbarItem: DashboardToolbarItem): void;
+    /**
+     * Removes the specified toolbar item from the specified toolbar group.
+     * @param groupName A string value that is a unique toolbar group name.
+     * @param toolbarItemName A string value that is a unique toolbar item name.
+     */
+    removeToolbarItem(groupName: string, toolbarItemName: string): void;
+}
+/**
+ * A Web Dashboard extension that allows you to create and edit dashboard parameters.
+ */
+interface DashboardParameterEditorExtension extends IExtension {
+}
 /**
  * Serves as the base object for all the editors included in the client-side object model.
  */
@@ -2265,6 +3705,58 @@ interface ASPxClientComboBox extends ASPxClientDropDownEditBase {
      * @param callbackFunction An object that is the JavaScript function that receives the callback data as a parameter. The function is performed after the combo box content is loaded.
      */
     EnsureDropDownLoaded(callbackFunction: Object): void;
+    /**
+     * Defines the HTML content for the specified combo box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the combo box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified combo box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
 }
 /**
  * Represents the client-side equivalent of the ASPxDateEdit control.
@@ -2295,10 +3787,13 @@ interface ASPxClientDateEdit extends ASPxClientDropDownEditBase {
      */
     GetTimeEdit(): ASPxClientTimeEdit;
     /**
-     * 
-     * @param date 
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
      */
     SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
     GetDate(): Date;
     /**
      * Returns the number of days in a range selected within a date edit.
@@ -2773,6 +4268,58 @@ interface ASPxClientListBox extends ASPxClientListEdit {
      * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
      */
     InsertItem(index: number, texts: string[]): void;
+    /**
+     * Defines the HTML content for the specified list box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the list box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified list box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
 }
 /**
  * Serves as the base type for the ASPxClientRadioButtonList objects.
@@ -2997,10 +4544,13 @@ interface ASPxClientTimeEdit extends ASPxClientSpinEditBase {
      */
     DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimeEdit>>;
     /**
-     * 
-     * @param date 
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
      */
     SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
     GetDate(): Date;
 }
 /**
@@ -3407,16 +4957,82 @@ interface ASPxClientGaugeControl extends ASPxClientControl {
      */
     PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
 }
+/**
+ * Lists values that specify the position relative to the target column in which a moved column should be placed.
+ */
+interface ASPxClientGridColumnMovingTargetPosition {
+    /**
+     * A moved column should be placed to the right of the target column.
+     */
+    Right: number;
+    /**
+     * A moved column should be placed to the left of the target column.
+     */
+    Left: number;
+    /**
+     * A moved column should be placed at the top of the target column.
+     */
+    Top: number;
+    /**
+     * A moved column should be placed at the bottom of the target column.
+     */
+    Bottom: number;
+}
 /**
  * Represents the client ASPxGridView.
  */
 interface ASPxClientGridBase extends ASPxClientControl {
+    /**
+     * Fires after a toolbar item has been clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientGridToolbarItemClickEventHandler<ASPxClientGridBase>>;
+    /**
+     * Returns a toolbar specified by its name.
+     * @param name A string value specifying the toolbar name.
+     */
+    GetToolbarByName(name: string): ASPxClientMenu;
+    /**
+     * Returns a grid's toolbar specified by its index.
+     * @param index An integer value specifying the zero-based index of the toolbar object to retrieve.
+     */
+    GetToolbar(index: number): ASPxClientMenu;
 }
 /**
  * Serves as a base object implementing the client column functionality.
  */
 interface ASPxClientGridColumnBase {
 }
+/**
+ * A method that will handle the ToolbarItemClick event.
+ */
+interface ASPxClientGridToolbarItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientGridToolbarItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridToolbarItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarItemClick event.
+ */
+interface ASPxClientGridToolbarItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the toolbar index.
+     * Value: An integer value that is the toolbar index.
+     */
+    toolbarIndex: number;
+    /**
+     * Gets the clicked toolbar item.
+     * Value: A ASPxClientMenuItem object that is the toolbar item.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+}
 /**
  * The client-side equivalent of the ASPxGridLookup control.
  */
@@ -3503,6 +5119,10 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * Occurs on the client side before a card is deleted in batch edit mode.
      */
     BatchEditCardDeleting: ASPxClientEvent<ASPxClientCardViewBatchEditCardDeletingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientCardViewFocusedCellChangingEventHandler<ASPxClientCardView>>;
     /**
      * Fires on the client when a card is clicked.
      */
@@ -3531,6 +5151,21 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * Fires after the customization window has been closed.
      */
     CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientCardView>>;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientCardViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
     /**
      * Moves focus to the specified edit cell within the edited card.
      * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
@@ -3911,6 +5546,12 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Selects the specified page.
      * @param pageIndex An integer value that specifies the active page's index.
@@ -4036,21 +5677,6 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
      */
     GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
-    /**
-     * Returns the value of the specified edit cell.
-     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
-     */
-    GetEditValue(column: ASPxClientCardViewColumn): string;
-    /**
-     * Returns the value of the specified edit cell.
-     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
-     */
-    GetEditValue(columnIndex: number): string;
-    /**
-     * Returns the value of the specified edit cell.
-     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
-     */
-    GetEditValue(columnFieldNameOrId: string): string;
 }
 /**
  * Represents a client column.
@@ -4435,6 +6061,27 @@ interface ASPxClientCardViewBatchEditCardDeletingEventArgs extends ASPxClientCan
      */
     cardValues: Object;
 }
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientCardViewFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientCardViewFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information of a card's cell currently being focused.
+     * Value: A ASPxClientCardViewCellInfo object that provides information about the card's cell.
+     */
+    cellInfo: ASPxClientCardViewCellInfo;
+}
 /**
  * Provides members related to Batch Edit Mode
  */
@@ -4503,6 +6150,12 @@ interface ASPxClientCardViewBatchEditApi {
      * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
      */
     GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding a data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
     /**
      * Gets information about the cell currently being edited.
      */
@@ -4672,6 +6325,10 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * Occurs on the client side before a data row is deleted in batch edit mode.
      */
     BatchEditRowDeleting: ASPxClientEvent<ASPxClientGridViewBatchEditRowDeletingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientGridViewFocusedCellChangingEventHandler<ASPxClientGridView>>;
     /**
      * Occurs when a callback for server-side processing is initiated.
      */
@@ -4688,6 +6345,55 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * Fires after the Customization Window has been closed.
      */
     CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGridView>>;
+    /**
+     * Selects or deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    SelectRowsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid row by its key.
+     * @param key An object that uniquely identifies the row.
+     */
+    SelectRowsByKey(key: Object): void;
+    /**
+     * Deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    UnselectRowsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     */
+    UnselectRowsByKey(key: Object): void;
+    /**
+     * Deselects all the selected rows within the grid.
+     */
+    UnselectRows(): void;
+    /**
+     * Deselects the specified rows (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    UnselectRows(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified row (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRows(visibleIndex: number): void;
+    /**
+     * Deselects all grid rows that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRows(): void;
+    /**
+     * Selects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRowOnPage(visibleIndex: number): void;
     /**
      * Selects or deselects the specified row displayed on the current page.
      * @param visibleIndex A zero-based integer value that specifies the row's visible index.
@@ -4763,6 +6469,11 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param position An integer value specifying the horizontal scroll position.
      */
     SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Sets the scrollability of various types of grid rows when the grid displays fixed columns.
+     * @param scrollableRowSettings An object specifying which types of grid rows should or should not be scrollable.
+     */
+    SetFixedColumnScrollableRows(scrollableRowSettings: Object): void;
     /**
      * Applies a filter specified in the filter row to the GridView.
      */
@@ -4827,6 +6538,12 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Selects the specified page.
      * @param pageIndex An integer value that specifies the active page's index.
@@ -5036,6 +6753,10 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
      */
     SetFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Invokes the Customization Dialog and displays it over the grid.
+     */
+    ShowCustomizationDialog(): void;
     /**
      * Sorts data by the specified data column's values.
      * @param column An ASPxClientGridViewColumn object that represents the data column.
@@ -5219,6 +6940,38 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
      */
     MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the ASPxGridView's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
     /**
      * Groups data by the values of the specified column.
      * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
@@ -5288,6 +7041,21 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
      */
     UnGroup(columnFieldNameOrId: string): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param column A ASPxClientGridViewColumn object that is the grid column.
+     */
+    Ungroup(column: ASPxClientGridViewColumn): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param columnIndex An integer value that is the column index.
+     */
+    Ungroup(columnIndex: number): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param columnFieldNameOrId A string value that is the column's FieldName or ID.
+     */
+    Ungroup(columnFieldNameOrId: string): void;
     /**
      * Expands all group rows.
      */
@@ -5415,55 +7183,6 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param selected true to select the specified rows; false to deselect the rows.
      */
     SelectRowsByKey(keys: Object[], selected?: boolean): void;
-    /**
-     * Selects or deselects the specified row displayed within the grid.
-     * @param key An object that uniquely identifies the row.
-     * @param selected true to select the specified row; false to deselect the row.
-     */
-    SelectRowsByKey(key: Object, selected?: boolean): void;
-    /**
-     * Selects the specified rows displayed within the grid.
-     * @param keys An array of objects that uniquely identify the rows.
-     */
-    SelectRowsByKey(keys: Object[]): void;
-    /**
-     * Selects a grid row by its key.
-     * @param key An object that uniquely identifies the row.
-     */
-    SelectRowsByKey(key: Object): void;
-    /**
-     * Deselects the specified rows displayed within the grid.
-     * @param keys An array of objects that uniquely identify the rows.
-     */
-    UnselectRowsByKey(keys: Object[]): void;
-    /**
-     * Deselects the specified row displayed within the grid.
-     * @param key An object that uniquely identifies the row.
-     */
-    UnselectRowsByKey(key: Object): void;
-    /**
-     * Deselects all the selected rows within the grid.
-     */
-    UnselectRows(): void;
-    /**
-     * Deselects the specified rows (if selected) within the grid.
-     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
-     */
-    UnselectRows(visibleIndices: number[]): void;
-    /**
-     * Deselects the specified row (if selected) within the grid.
-     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
-     */
-    UnselectRows(visibleIndex: number): void;
-    /**
-     * Deselects all grid rows that match the filter criteria currently applied to the grid.
-     */
-    UnselectFilteredRows(): void;
-    /**
-     * Selects the specified row displayed on the current page.
-     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
-     */
-    SelectRowOnPage(visibleIndex: number): void;
 }
 /**
  * A client grid column.
@@ -6013,6 +7732,27 @@ interface ASPxClientGridViewBatchEditRowDeletingEventArgs extends ASPxClientCanc
      */
     rowValues: Object;
 }
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientGridViewFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientGridViewFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information on a cell currently being focused.
+     * Value: A ASPxClientGridViewCellInfo object that is the cell information.
+     */
+    cellInfo: ASPxClientGridViewCellInfo;
+}
 /**
  * Contains information on a grid cell.
  */
@@ -6096,6 +7836,12 @@ interface ASPxClientGridViewBatchEditApi {
      * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
      */
     GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding a data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
     /**
      * Gets information about the cell currently being edited.
      */
@@ -6190,6 +7936,10 @@ interface ASPxClientVerticalGrid extends ASPxClientGridBase {
      * Enables you to specify whether record data is valid and provide an error text.
      */
     BatchEditRecordValidating: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientVerticalGridFocusedCellChangingEventHandler<ASPxClientVerticalGrid>>;
     /**
      * Enables you to prevent rows from being sorted.
      */
@@ -6477,6 +8227,12 @@ interface ASPxClientVerticalGrid extends ASPxClientGridBase {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Selects the specified page.
      * @param pageIndex An integer value that specifies the active page's index.
@@ -7050,6 +8806,27 @@ interface ASPxClientVerticalGridBatchEditRecordDeletingEventArgs extends ASPxCli
      */
     recordValues: Object;
 }
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientVerticalGridFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientVerticalGridFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information on a cell currently being focused.
+     * Value: A ASPxClientVerticalGridCellInfo object that is the cell information.
+     */
+    cellInfo: ASPxClientVerticalGridCellInfo;
+}
 /**
  * Contains information on a cell that is being edited.
  */
@@ -7133,6 +8910,12 @@ interface ASPxClientVerticalGridBatchEditApi {
      * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
      */
     GetCellValue(visibleIndex: number, rowFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding the data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
     /**
      * Gets information about the cell currently being edited.
      */
@@ -7228,6 +9011,21 @@ interface ASPxClientHtmlEditorCommandStyleSettings {
      * Value: A string that specifies an element's left margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
      */
     marginLeft: string;
+    /**
+     * Gets or sets a media element's background color.
+     * Value: A string that specifies a background color <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    backgroundColor: string;
+    /**
+     * Gets or sets the element's text alignment.
+     * Value: A string value that specifies the element's text alignment <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    textAlign: string;
+    /**
+     * Gets or sets the element's vertical alignment.
+     * Value: A string value that specifies the element's vertical alignment <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    verticalAlign: string;
 }
 /**
  * The base class for parameters used in the ASPxHtmlEditor's client-side commands.
@@ -7298,6 +9096,11 @@ interface ASPxClientHtmlEditorInsertLinkCommandArguments extends ASPxClientHtmlE
      * Value: A string value defining the title of the target link.
      */
     title: string;
+    /**
+     * Contains the style settings defining the appearance of the target link element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target link element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
 }
 /**
  * The base class for parameters related to inserting or changing media elements in the ASPxHtmlEditor.
@@ -7443,6 +9246,101 @@ interface ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments extends ASPxCli
  */
 interface ASPxClientHtmlEditorChangeYouTubeVideoCommandArguments extends ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments {
 }
+/**
+ * Contains settings related to the TABLEPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTablePropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target table element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target table element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Determines the position of the target table element.
+     * Value: A string value indicating the position of the target table element.
+     */
+    align: string;
+    /**
+     * Gets or sets a table cell padding.
+     * Value: An integer value that is the cell padding.
+     */
+    cellPadding: number;
+    /**
+     * Gets or sets the table cell spacing.
+     * Value: An integer value that is the table cell spacing.
+     */
+    cellSpacing: number;
+    /**
+     * Gets or sets a value that is the table caption.
+     * Value: A string value that is the caption.
+     */
+    caption: string;
+    /**
+     * Gets or sets a value indicating whether the first row/column serves as the table's header.
+     * Value: A string value that specifies whether the first row/column serves as the table's header.
+     */
+    headers: string;
+    /**
+     * Gets or sets the table's summary.
+     * Value: A string value that is the table's summary.
+     */
+    summary: string;
+}
+/**
+ * Contains settings related to the INSERTTABLE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertTableCommandArguments extends ASPxClientHtmlEditorTablePropertiesCommandArguments {
+    /**
+     * Gets or sets the count of columns in the table.
+     * Value: An integer value that is the count of columns.
+     */
+    columns: number;
+    /**
+     * Gets or sets the count of rows in the table.
+     * Value: An integer value that is the count of rows.
+     */
+    rows: number;
+    /**
+     * Gets or sets a value indicating whether all table columns should have equal width.
+     * Value: true, to create equal widths for all columns; otherwise, false.
+     */
+    isEqualColumnWidth: boolean;
+}
+/**
+ * Contains settings related to the TABLECELLPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableCellPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target cell element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target cell element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Gets or sets a value that indicates whether the cell settings should be applied to all cells in the table.
+     * Value: true, if the cell settings should be applied to all cells in the table; otherwise, false.
+     */
+    applyForAll: boolean;
+}
+/**
+ * Contains settings related to the TABLEROWPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableRowPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings specifying the appearance of the specified table row.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings specifying the appearance of the specified table row.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * Contains settings related to the TABLECOLUMNPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableColumnPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target column element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target column element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
 /**
  * A method that will handle the DialogInitialized client event.
  */
@@ -7463,6 +9361,68 @@ interface ASPxClientHtmlEditorDialogInitializedEventArgs extends ASPxClientEvent
      * Value: A string value that is the name of the initialized dialog.
      */
     dialogName: string;
+    /**
+     * Gets a dialog object related to the event.
+     * Value: A ASPxClientHtmlEditorDialogBase object that is the dialog.
+     */
+    dialog: ASPxClientHtmlEditorDialogBase;
+}
+/**
+ * Provides data for the event that fires when the HTML Editor dialogs are closed or are going to be closed.
+ */
+interface ASPxClientHtmlEditorDialogCloseEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the dialog name related to the event.
+     * Value: A string value that is the dialog name.
+     */
+    dialogName: string;
+    /**
+     * Gets the dialog object related to the event.
+     * Value: An ASPxClientHtmlEditorDialogBase object that is the dialog.
+     */
+    dialog: ASPxClientHtmlEditorDialogBase;
+    /**
+     * Gets a string that contains specific information (if any) passed from the client side for server-side processing.
+     * Value: A string value representing specific information passed from the client to the server side.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the DialogClosing event.
+ */
+interface ASPxClientHtmlEditorDialogClosingEventHandler<S> {
+    /**
+     * A method that will handle the DialogClosing event.
+     * @param source The event source.
+     * @param e An ASPxClientHtmlEditorDialogClosingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogClosingEventArgs): void;
+}
+/**
+ * Provides data for the DialogClosing event.
+ */
+interface ASPxClientHtmlEditorDialogClosingEventArgs extends ASPxClientHtmlEditorDialogCloseEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the DialogClosed event.
+ */
+interface ASPxClientHtmlEditorDialogClosedEventHandler<S> {
+    /**
+     * A method that will handle the DialogClosed event.
+     * @param source The event source.
+     * @param e An ASPxClientHtmlEditorDialogClosedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogClosedEventArgs): void;
+}
+/**
+ * Provides data for the DialogClosed event.
+ */
+interface ASPxClientHtmlEditorDialogClosedEventArgs extends ASPxClientHtmlEditorDialogCloseEventArgs {
 }
 /**
  * A method that will handle the CommandExecuting event.
@@ -7696,6 +9656,14 @@ interface ASPxClientHtmlEditor extends ASPxClientControl {
      * Occurs on the client side after a dialog has been initialized.
      */
     DialogInitialized: ASPxClientEvent<ASPxClientHtmlEditorDialogInitializedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before a dialog is going to be closed.
+     */
+    DialogClosing: ASPxClientEvent<ASPxClientHtmlEditorDialogClosingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a dialog is closed.
+     */
+    DialogClosed: ASPxClientEvent<ASPxClientHtmlEditorDialogClosedEventHandler<ASPxClientHtmlEditor>>;
     /**
      * Occurs before a default or custom command has been executed and allows you to cancel the action.
      */
@@ -7780,6 +9748,10 @@ interface ASPxClientHtmlEditor extends ASPxClientControl {
      * Returns the document object generated by an iframe element within a design view area.
      */
     GetDesignViewDocument(): Object;
+    /**
+     * Provides access to the client ASPxPopupControl object that is a Html Editor's dialog.
+     */
+    GetDialogPopupControl(): ASPxClientPopupControl;
     /**
      * Returns the document object generated by an iframe element within a preview area.
      */
@@ -7910,6 +9882,513 @@ interface ASPxClientHtmlEditor extends ASPxClientControl {
      */
     PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
 }
+/**
+ * Provides client functionality for dialogs within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client ASPxFormLayout object that arranges all editors in the Html Editor's dialogs.
+     */
+    GetFormLayout(): ASPxClientFormLayout;
+    /**
+     * Provides access to the client object of the "OK" button in the Html Editor's dialogs.
+     */
+    GetOkButton(): ASPxClientButton;
+    /**
+     * Provides access to the client object of the "Cancel" button in the Html Editor's dialogs.
+     */
+    GetCancelButton(): ASPxClientButton;
+}
+/**
+ * Provides client functionality for Html Editor's dialogs operated with the elements.
+ */
+interface ASPxClientHtmlEditorEditElementDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Border style" combo box in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderStyleComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Border width" spin editor in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Border color" color editor in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderColorColorEdit(): ASPxClientColorEdit;
+    /**
+     * Provides access to the client object of the "Top margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetTopMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Bottom margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetBottomMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Left margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetLeftMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Right margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetRightMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "CSS class" combo box in the Html Editor's dialogs (Style Settings).
+     */
+    GetCssClassNameComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Change Element Properties dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeElementPropertiesDialog extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the "ID" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetIdTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Title" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetTitleTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Direction" combo box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetDirectionComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Value" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetValueTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Tab index" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetTabIndexTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Disabled" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetDisabledCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Input type" combo box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetInputTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "For" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetForTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Name" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetNameTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Method" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetMethodTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Action" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetActionTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Checked" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetCheckedCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Max length" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetMaxLengthTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Size" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetSizeTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Readonly" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetReadonlyCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Src" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetSrcTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Accept" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetAcceptTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Alt" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetAltTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Start" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetStartSpinEdit(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Width" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows you to specify the element width measurement unit in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Height" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows to specify the element height measurement unit in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Link dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorLinkDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "E-mail to" text box in the Html Editor's Link dialog.
+     */
+    GetEmailTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Text" text box in the Html Editor's Link dialog.
+     */
+    GetTextTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "ToolTip" text box in the Html Editor's Link dialog.
+     */
+    GetTooltipTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Subject" text box in the Html Editor's Link dialog.
+     */
+    GetSubjectTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "URL" text box in the Html Editor's Link dialog.
+     */
+    GetUrlTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the file manager used in the Link dialog's "Select Document" popup window.
+     */
+    GetFileManager(): ASPxClientFileManager;
+    /**
+     * Provides access to the client object of the "Cancel" button in the Link dialog's "Select Document" popup window.
+     */
+    GetSelectDocumentPopupCancelButton(): ASPxClientButton;
+    /**
+     * Provides access to the client object of the "Select" button in the Link dialog's "Select Document" popup window.
+     */
+    GetSelectDocumentPopupSelectButton(): ASPxClientButton;
+    /**
+     * Provides access to the client popup control object that is the "Select Document" popup window in the Html Editor's Link dialog.
+     */
+    GetSelectDocumentPopupControl(): ASPxClientPopupControl;
+    /**
+     * Provides access to the client object of the "Open in new window" check box in the Html Editor's Link dialog.
+     */
+    GetOpenInNewWindowCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client radio button list object used to specify the link type in the Html Editor's Link dialog.
+     */
+    GetLinkTypeRadioButtonList(): ASPxClientRadioButtonList;
+}
+/**
+ * Provides client functionality for the Placeholder dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorPlaceholderDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the ASPxListBox client object that lists placeholder names in the Html Editor's Placeholder dialog.
+     */
+    GetPlaceholderNameListBox(): ASPxClientListBox;
+}
+/**
+ * Provides client functionality for the Paste From Word dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorPasteFromWordDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Remove font family" check box in the Html Editor's Flash dialog.
+     */
+    GetRemoveFontFamilyCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the media dialogs within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorMediaDialogBase extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the media file selector that allows you to insert/change media files in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetMediaFileSelector(): ASPxClientMediaFileSelector;
+    /**
+     * Provides access to the client object of the "More options" check box in the Html Editor's Audio/Video/Flash/Image dialogs.
+     */
+    GetMoreOptionsCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Width" spin editor in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Height" spin editor in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetHeightSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Position" combo box in the Html Editor's Audio/Video/Flash/Image dialogs.
+     */
+    GetPositionComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Image dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorImageDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Size" combo box in the Html Editor's Image dialog.
+     */
+    GetSizeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Create thumbnail" check box in the Html Editor's Image dialog.
+     */
+    GetCreateThumbnailCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "New image name" text box in the Html Editor's Image dialog.
+     */
+    GetThumbnailNameTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Wrap text around image" check box in the Html Editor's Image dialog.
+     */
+    GetWrapTextCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Description" text box in the Html Editor's Image dialog.
+     */
+    GetDescriptionTextBox(): ASPxClientTextBox;
+}
+/**
+ * Provides client functionality for the Flash dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorFlashDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Quality" combo box in the Html Editor's Flash dialog.
+     */
+    GetQualityComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Flash dialog.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Enable flash menu" check box in the Html Editor's Flash dialog.
+     */
+    GetEnableFlashMenuCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Flash dialog.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Allow fullscreen" check box in the Html Editor's Flash dialog.
+     */
+    GetAllowFullscreenCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Audio dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorAudioDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Audio dialogs.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Preload mode" combo box in the Html Editor's Audio dialogs.
+     */
+    GetPreloadModeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Audio dialogs.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's Audio dialogs.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Video dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorVideoDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Video dialog.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Preload mode" combo box in the Html Editor's Video dialog.
+     */
+    GetPreloadModeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Video dialog.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's Video dialog.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Poster URL" text box in the Html Editor's Video dialog.
+     */
+    GetPosterTextBox(): ASPxClientTextBox;
+}
+/**
+ * Provides client functionality for the YouTube Video dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorYouTubeDialog extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the "Enable privacy-enhanced mode" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetConfidentModeCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show suggested videos when the video finishes" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowSameVideosCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show video title and player actions" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowVideoNameCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides base client functionality for the Table dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableDialogBase extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Background color" color editor in the Html Editor's Table dialogs.
+     */
+    GetBackgroundColorColorEdit(): ASPxClientColorEdit;
+}
+/**
+ * Provides client functionality for the Table dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableDialog extends ASPxClientHtmlEditorTableDialogBase {
+    /**
+     * Provides access to the client object of the "Width" combo box in the Html Editor's Table dialogs.
+     */
+    GetWidthTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor in the Html Editor's Table dialogs that allows you to specify the table width value.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box in the Html Editor's Table dialogs that allows you to specify the table width measurement unit.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Height" combo box in the Html Editor's Table dialogs.
+     */
+    GetHeightTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor in the Html Editor's Table dialogs that allows you specify the table height value.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box in the Html Editor's Table dialogs that allows you to specify the table height measurement unit.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Cell padding" spin editor in the Html Editor's Table dialogs.
+     */
+    GetCellPaddingSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Cell spacing" spin editor in the Html Editor's Table dialogs.
+     */
+    GetCellSpacingSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Alignment" combo box in the Html Editor's Table dialogs.
+     */
+    GetAlignmentComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Border Color" color editor in the Html Editor's Table dialogs.
+     */
+    GetBorderColorColorEdit(): ASPxClientColorEdit;
+    /**
+     * Provides access to the client object of the "Border size" spin editor in the Html Editor's Table dialogs.
+     */
+    GetBorderWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Headers" combo box in the Html Editor's Table dialogs.
+     */
+    GetHeadersComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Caption" text box in the Html Editor's Table dialogs.
+     */
+    GetCaptionTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Summary" text box in the Html Editor's Table dialogs.
+     */
+    GetSummaryTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Accessibility" check box related to the Html Editor's Table dialogs.
+     */
+    GetAccessibilityCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Insert Table dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorInsertTableDialog extends ASPxClientHtmlEditorTableDialog {
+    /**
+     * Provides access to the client object of the "Columns" spin editor in the Html Editor's Table dialogs.
+     */
+    GetColumnCountSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Rows" spin editor in the Html Editor's Table dialogs.
+     */
+    GetRowCountSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Equal column widths" check box in the Html Editor's Table dialogs.
+     */
+    GetEqualWidthCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for Table dialogs within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableElementPropertiesDialog extends ASPxClientHtmlEditorTableDialogBase {
+    /**
+     * Provides access to the client object of the "Horizontal" combo box in the Html Editor's Row/Column/Cell Properties dialog's Alignment group.
+     */
+    GetHorizontalAlignmentComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Vertical" combo box in the Html Editor's Row/Column/Cell Properties dialog's Alignment group.
+     */
+    GetVerticalAlignmentComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Cell Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableCellPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Apply to all cells in the table" check box in the Html Editor's Cell Properties dialog.
+     */
+    GetApplyToAllCellsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Row Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableRowPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Height" combo box in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client ASPxSpinEdit object that allows you to specify the row height in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows you to specify the row height measurement unit in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Column Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableColumnPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Width" combo box in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor that allows you to set the column width value in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box that allows you to specify the column width measurement unit in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+}
 /**
  * A selection in the ASPxHtmlEditor.
  */
@@ -7938,7 +10417,7 @@ interface ASPxClientHtmlEditorSelection {
     SetHtml(html: string, addToHistory: boolean): void;
 }
 /**
- * A client-side equivalent of the ASPxPivotGrid control.
+ * The client-side equivalent of the ASPxPivotGrid control.
  */
 interface ASPxClientPivotGrid extends ASPxClientControl {
     /**
@@ -8246,6 +10725,10 @@ interface ASPxClientRichEdit extends ASPxClientControl {
      * Value: A <see cref="RichEditSelection" /> object that lists methods to work with the selection.
      */
     selection: RichEditSelection;
+    /**
+     * Gets a unit converter.
+     * Value: A <see cref="RichEditUnitConverter" /> object representing a unit converter.
+     */
     unitConverter: RichEditUnitConverter;
     /**
      * Occurs after a custom command has been executed on the client side.
@@ -8350,6 +10833,11 @@ interface RichEditCommands {
      * Value: A <see cref="FileSaveAsCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileSaveAs: FileSaveAsCommand;
+    /**
+     * Gets a command to open the file's Save As dialog.
+     * Value: A <see cref="FileSaveAsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSaveAsDialog: FileSaveAsDialogCommand;
     /**
      * Gets a command to invoke a browser-specific Print dialog allowing one to print the current document.
      * Value: A <see cref="FilePrintCommand" /> object that provides methods for executing the command and checking its state.
@@ -8620,6 +11108,10 @@ interface RichEditCommands {
      * Value: A <see cref="DeleteBookmarkCommand" /> object that provides methods for executing the command and checking its state.
      */
     deleteBookmark: DeleteBookmarkCommand;
+    /**
+     * Gets a command to navigate to the specified bookmark.
+     * Value: A <see cref="GoToBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
     goToBookmark: GoToBookmarkCommand;
     /**
      * Gets a command to invoke the Hyperlink dialog window.
@@ -8671,6 +11163,10 @@ interface RichEditCommands {
      * Value: A <see cref="ChangePageOrientationCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePageOrientation: ChangePageOrientationCommand;
+    /**
+     * Gets a command to define the page size dialog's settings.
+     * Value: A <see cref="SetPageSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
     setPageSizeDialog: SetPageSizeDialogCommand;
     /**
      * Gets a command to invoke the Paper tab of the Page Setup dialog window.
@@ -8752,6 +11248,16 @@ interface RichEditCommands {
      * Value: A <see cref="DeleteCommand" /> object that provides methods for executing the command and checking its state.
      */
     delete: DeleteCommand;
+    /**
+     * Gets a command to remove the previous word.
+     * Value: A <see cref="RemovePrevWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removePrevWord: RemovePrevWordCommand;
+    /**
+     * Gets a command to remove the next word.
+     * Value: A <see cref="RemoveNextWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNextWord: RemoveNextWordCommand;
     /**
      * Gets a command to move the cursor backwards and erase the character in that space.
      * Value: A <see cref="BackspaceCommand" /> object that provides methods for executing the command and checking its state.
@@ -9022,6 +11528,10 @@ interface RichEditCommands {
      * Value: A <see cref="ChangeTableCellPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTableCellPreferredWidth: ChangeTableCellPreferredWidthCommand;
+    /**
+     * Gets a command to toggle inside borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
     toggleTableCellInsideBorders: ToggleTableCellInsideBordersCommand;
     /**
      * Gets a command to change the selected table columns' preferred width.
@@ -9273,7 +11783,86 @@ interface RichEditCommands {
      * Value: A <see cref="OpenSpellingDialogCommand" /> object that provides methods for executing the command and checking its state.
      */
     openSpellingDialog: OpenSpellingDialogCommand;
+    /**
+     * Gets a command to assign a shortcut to the specified client command.
+     * Value: A <see cref="AssignShortcutCommand" /> object that provides methods for executing the command and checking its state.
+     */
     assignShortcut: AssignShortcutCommand;
+    /**
+     * Gets a command to invoke the Layout dialog window to customize the settings of a floating object.
+     * Value: A <see cref="OpenLayoutOptionsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openLayoutOptionsDialog: OpenLayoutOptionsDialogCommand;
+    /**
+     * Gets a command to insert a floating text box.
+     * Value: A <see cref="InsertFloatingTextBoxCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertFloatingTextBox: InsertFloatingTextBoxCommand;
+    /**
+     * Gets a command to modify a floating object's alignment position.
+     * Value: A <see cref="ChangeFloatingObjectAlignmentPositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAlignmentPosition: ChangeFloatingObjectAlignmentPositionCommand;
+    /**
+     * Gets a command to change a floating object's absolute position.
+     * Value: A <see cref="ChangeFloatingObjectAbsolutePositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAbsolutePosition: ChangeFloatingObjectAbsolutePositionCommand;
+    /**
+     * Gets a command to modify a floating object's relative position.
+     * Value: A <see cref="ChangeFloatingObjectRelativePositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectRelativePosition: ChangeFloatingObjectRelativePositionCommand;
+    /**
+     * Gets a command to lock a floating object's anchor.
+     * Value: A <see cref="ChangeFloatingObjectLockAnchorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectLockAnchor: ChangeFloatingObjectLockAnchorCommand;
+    /**
+     * Gets a command to modify a floating object's text wrapping settings.
+     * Value: A <see cref="ChangeFloatingObjectTextWrappingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectTextWrapping: ChangeFloatingObjectTextWrappingCommand;
+    /**
+     * Gets a command to change a floating object's absolute size.
+     * Value: A <see cref="ChangeFloatingObjectAbsoluteSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAbsoluteSize: ChangeFloatingObjectAbsoluteSizeCommand;
+    /**
+     * Gets a command to modify a text box' relative size settings.
+     * Value: A <see cref="ChangeTextBoxRelativeSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTextBoxRelativeSize: ChangeTextBoxRelativeSizeCommand;
+    /**
+     * Gets a command to rotate a floating object.
+     * Value: A <see cref="ChangeFloatingObjectRotationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectRotation: ChangeFloatingObjectRotationCommand;
+    /**
+     * Gets a command to lock a floating object's aspect ratio.
+     * Value: A <see cref="ChangeFloatingObjectLockAspectRatioCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectLockAspectRatio: ChangeFloatingObjectLockAspectRatioCommand;
+    /**
+     * Gets a command to modify a floating object's background fill color.
+     * Value: A <see cref="ChangeFloatingObjectFillColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectFillColor: ChangeFloatingObjectFillColorCommand;
+    /**
+     * Gets a command to modify a floating object's outline color.
+     * Value: A <see cref="ChangeFloatingObjectOutlineColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectOutlineColor: ChangeFloatingObjectOutlineColorCommand;
+    /**
+     * Gets a command to modify a floating object's outline width.
+     * Value: A <see cref="ChangeFloatingObjectOutlineWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectOutlineWidth: ChangeFloatingObjectOutlineWidthCommand;
+    /**
+     * Gets a command to modify a text box' content margins.
+     * Value: A <see cref="ChangeTextBoxContentMarginsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTextBoxContentMargins: ChangeTextBoxContentMarginsCommand;
 }
 /**
  * Serves as a base for objects that implement different client command functionalities.
@@ -9303,7 +11892,7 @@ interface CommandWithBooleanStateBase extends CommandBase {
  */
 interface SimpleCommandState {
     /**
-     * Gets a value indicating whether the command's UI element is enabled.
+     * Gets a value indicating whether the command's UI element is enabled (within the ribbon and context menu).
      * Value: true, if the command's related UI element is enabled; otherwise, false.
      */
     enabled: boolean;
@@ -9357,6 +11946,10 @@ interface RichEditDocument {
      * Value: An array of TableStyle objects storing information about table styles.
      */
     tableStylesInfo: TableStyle[];
+    /**
+     * Provides information about spell checking in the current document.
+     * Value: A <see cref="SpellingInfo" /> object.
+     */
     spellingInfo: SpellingInfo;
 }
 /**
@@ -9379,6 +11972,10 @@ interface Paragraph {
      * Value: An integer value specifying the start position.
      */
     start: number;
+    /**
+     * Gets the text buffer interval occupied by the current paragraph element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Gets the name of the paragraph style applied to the current paragraph (see name).
@@ -9391,7 +11988,7 @@ interface Paragraph {
      */
     listIndex: number;
     /**
-     * Gets or sets the index of the list level applied to the current paragraph in the numbering list.
+     * Gets the index of the list level applied to the current paragraph in the numbering list.
      * Value: An integer that is the index of the list level of the current paragraph.
      */
     listLevelIndex: number;
@@ -9410,6 +12007,20 @@ interface Field {
      * Value: An integer value specifying the field length.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the field code element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    codeInterval: Interval;
+    /**
+     * Gets the text buffer interval occupied by the field result element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    resultInterval: Interval;
+    /**
+     * Gets the text buffer interval occupied by the current field element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Gets or sets a URI to navigate to when the hyperlink (represented by the current field) is activated.
@@ -9426,6 +12037,10 @@ interface Field {
      * Value: A string representing the bookmark's name.
      */
     hyperlinkAnchor: string;
+    /**
+     * Gets a value specifying whether a field's code or result is dispalyed.
+     * Value: true, if the field code is displayed; false, if the field result is displayed.
+     */
     showCode: boolean;
 }
 /**
@@ -9442,6 +12057,10 @@ interface Bookmark {
      * Value: An integer value specifying the length of the bookmark.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current bookmark element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Gets the name of a bookmark in the document.
@@ -9463,6 +12082,10 @@ interface Section {
      * Value: An integer value specifying the element length in characters.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current section element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Provides access to the section's headers.
@@ -9490,15 +12113,50 @@ interface HeaderFooter {
      */
     subDocument: SubDocument;
 }
+/**
+ * Contains in-line picture settings.
+ */
 interface InlinePictureInfo {
+    /**
+     * Gets the image identifier.
+     * Value: An integer value specifying the image identifier.
+     */
     id: number;
+    /**
+     * Gets the image position.
+     * Value: An integer value specifying the image position.
+     */
     position: number;
+    /**
+     * Gets the initial image width.
+     * Value: An integer value specifying the image width.
+     */
     initialWidth: number;
+    /**
+     * Gets the initial image height.
+     * Value: An integer value specifying the image height.
+     */
     initialHeight: number;
+    /**
+     * Gets the X-scaling factor of the inline image.
+     * Value: An integer value specifying the scaling factor for the X-axis.
+     */
     scaleX: number;
+    /**
+     * Gets the Y-scaling factor of the inline image.
+     * Value: An integer value specifying the scaling factor for the Y-axis.
+     */
     scaleY: number;
+    /**
+     * Gets the actual image width.
+     * Value: An integer value specifying the image width.
+     */
     actualWidth: number;
-    actualHeigth: number;
+    /**
+     * Gets the actual image height.
+     * Value: An integer value specifying the image height.
+     */
+    actualHeight: number;
 }
 declare enum HeaderFooterType {
     First=0,
@@ -9506,6 +12164,26 @@ declare enum HeaderFooterType {
     Primary=1,
     Even=2
 }
+/**
+ * Contains the settings defining a file to save to.
+ */
+interface RichEditFileInfo {
+    /**
+     * Gets or sets the file's folder name.
+     * Value: A string value specifying the folder name.
+     */
+    folderPath: string;
+    /**
+     * Gets or sets the file name.
+     * Value: A string value specifying the file name.
+     */
+    fileName: string;
+    /**
+     * Gets or sets the file's document format.
+     * Value: A DocumentFormat enumeration value.
+     */
+    documentFormat: any;
+}
 declare enum DocumentFormat {
     Undefined=0,
     PlainText=1,
@@ -9523,11 +12201,19 @@ declare enum DocumentFormat {
  */
 interface RichEditSelection {
     /**
-     * Gets or sets an array of document interval in the selection.
+     * Gets or sets an array of document intervals in the selection.
      * Value: An array of Interval objects.
      */
     intervals: Interval[];
+    /**
+     * Gets or sets a value specifying whether the current selection is collapsed (and represents the cursor position).
+     * Value: true, if the selection is collapsed; otherwise, false.
+     */
     collapsed: boolean;
+    /**
+     * Gets the maximum position of a document interval in the selection.
+     */
+    getIntervalMaxPosition(): number;
     /**
      * Moves the cursor to the next line.
      */
@@ -9667,6 +12353,24 @@ interface RichEditSelection {
      * Selects the paragraph in which the cursor is located.
      */
     selectParagraph(): void;
+    /**
+     * Moves the cursor to the next page break mark.
+     */
+    goToStartNextPageCommand(): void;
+    /**
+     * Moves the cursor to the next page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartNextPageCommand(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous page break mark.
+     */
+    goToStartPrevPageCommand(): void;
+    /**
+     * Moves the cursor to the previous page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartPrevPageCommand(extendSelection: boolean): void;
     /**
      * Selects the table cell in which the cursor is located.
      */
@@ -9699,17 +12403,17 @@ interface RichEditSelection {
      */
     selectAll(): void;
     /**
-     * Moves the cursor to the main sub-document.
+     * Makes the main sub-document active and moves the cursor to its beginning.
      */
     setMainSubDocumentAsActive(): void;
     /**
-     * Moves the cursor to the footer of the specified document page.
-     * @param pageIndex An integer value specifying the page index.
+     * Creates a footer sub-document (if it was not created before) and sets the footer as the active sub-document. Moves the cursor to the footer's start position.
+     * @param pageIndex An integer value specifying the active page's index.
      */
     setFooterSubDocumentAsActiveByPageIndex(pageIndex: number): void;
     /**
-     * Moves the cursor to the header of the specified document page.
-     * @param pageIndex An integer value specifying the page index.
+     * Creates a header sub-document (if it was not created before) and sets the header as the active sub-document. Moves the cursor to the header's start position.
+     * @param pageIndex An integer value specifying the active page's index.
      */
     setHeaderSubDocumentAsActiveByPageIndex(pageIndex: number): void;
 }
@@ -9728,8 +12432,19 @@ interface Interval {
      */
     length: number;
 }
+/**
+ * Contains spell checking related settings.
+ */
 interface SpellingInfo {
+    /**
+     * Gets a value specifying the spell checking state.
+     * Value: One of the <see cref="SpellCheckerState" /> enumeration values.
+     */
     spellCheckerState: any;
+    /**
+     * Provides access to an array containing misspelled intervals.
+     * Value: An array of <see cref="MisspelledInterval[]" /> objects.
+     */
     misspelledIntervals: MisspelledInterval[];
 }
 declare enum SpellCheckerState {
@@ -9737,12 +12452,39 @@ declare enum SpellCheckerState {
     InProgress=1,
     Done=2
 }
+/**
+ * Contains the settings defining a misspelled interval.
+ */
 interface MisspelledInterval {
+    /**
+     * Gets the start position of the misspelled word in the interval.
+     * Value: An integer value specifying the misspelled word's start position.
+     */
     start: number;
+    /**
+     * Gets the length of the misspelled interval.
+     * Value: An integer value specifying the misspelled interval's length.
+     */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
+    /**
+     * Gets the spelling error type.
+     * Value: One of the <see cref="SpellingErrorType" /> enumeration values.
+     */
     errorType: any;
+    /**
+     * Gets an erroneous word found during spell check.
+     * Value: A string that is the erroneous or misspelled word.
+     */
     word: string;
+    /**
+     * Gets a list of suggested words to replace the misspelled word.
+     * Value: A string array containing suggested words.
+     */
     suggestions: string[];
 }
 declare enum SpellingErrorType {
@@ -9823,7 +12565,15 @@ interface TableStyle extends StyleBase {
  * Exposes the settings providing the information about the essential document functionality.
  */
 interface SubDocument {
+    /**
+     * Gets the sub-document identifier.
+     * Value: An integer value specifying the sub-document identifier.
+     */
     id: number;
+    /**
+     * Gets a value specifying the sub-document type.
+     * Value: One of the <see cref="SubDocumentType" /> enumeration values.
+     */
     type: any;
     /**
      * Provides information about paragraphs contained in the document.
@@ -9845,6 +12595,10 @@ interface SubDocument {
      * Value: An array of Bookmark objects storing information about document bookmarks.
      */
     bookmarksInfo: Bookmark[];
+    /**
+     * Provides access to an array of objects containing in-line picture settings.
+     * Value: An array of <see cref="InlinePictureInfo[]" /> objects.
+     */
     inlinePicturesInfo: InlinePictureInfo[];
     /**
      * Gets the document's textual representation.
@@ -9877,6 +12631,10 @@ interface Table {
      * Value: A integer value specifying the character length of the table.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Provides access to a collection of table rows.
@@ -9903,6 +12661,10 @@ interface TableRow {
      * Value: An integer value specifying the element length in characters.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table row element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
     /**
      * Provides information about the table row's cells.
@@ -9924,18 +12686,65 @@ interface TableCell {
      * Value: An integer value specifying the element length in characters.
      */
     length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table cell element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
     interval: Interval;
 }
+/**
+ * Contains the method to convert different units of measurement.
+ */
 interface RichEditUnitConverter {
+    /**
+     * Converts a measurement from pixels to twips.
+     * @param value The pixels value to be converted.
+     */
     pixelsToTwips(value: number): number;
+    /**
+     * Converts a measurement from inches to twips.
+     * @param value The inches value (floating) to be converted.
+     */
     inchesToTwips(value: number): number;
+    /**
+     * Converts a measurement from points to twips.
+     * @param value The points value to be converted.
+     */
     pointsToTwips(value: number): number;
+    /**
+     * Converts a value in centimeters to twips.
+     * @param value A floating value specifying the value in centimeters to convert.
+     */
     centimetersToTwips(value: number): number;
+    /**
+     * Converts a measurement from twips to centimeters.
+     * @param value The twips value to be converted.
+     */
     twipsToCentimeters(value: number): number;
+    /**
+     * Converts a measurement from pixels to centimeters.
+     * @param value The pixels value to be converted.
+     */
     pixelsToCentimeters(value: number): number;
+    /**
+     * Converts a measurement from twips to inches.
+     * @param value The twips value to be converted.
+     */
     twipsToInches(value: number): number;
+    /**
+     * Converts a measurement from pixels to inches.
+     * @param value The pixels value to be converted.
+     */
     pixelsToInches(value: number): number;
+    /**
+     * Converts a measurement from pixels to points.
+     * @param value The pixels value to be converted.
+     */
     pixelsToPoints(value: number): number;
+    /**
+     * Converts a measurement from twips to points.
+     * @param value The twips value to be converted.
+     */
     twipsToPoints(value: number): number;
 }
 /**
@@ -10097,9 +12906,19 @@ interface GoToDataRecordCommand extends CommandBase {
      * @param activeRecordIndex An integer value specifying index of the next data record.
      */
     execute(activeRecordIndex: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
     getState(): any;
 }
+/**
+ * Contains the settings defining a data record.
+ */
 interface DataRecordOptions {
+    /**
+     * Gets or sets the index of the active data record.
+     * Value: An integer value specifying the data record index.
+     */
     activeRecordIndex: number;
     recordCount: number;
 }
@@ -10190,12 +13009,23 @@ interface MailMergeAndDownloadCommand extends CommandBase {
      * @param fileExtension A string value specifying the file extension of the resulting document.
      */
     execute(fileExtension: string): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat One of the DocumentFormat enumeration values.
+     */
+    execute(documentFormat: any): boolean;
     /**
      * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      * @param fileExtension A string value specifying the file extension of the resulting document.
      * @param settings A MailMergeSettings object containing settings to set up mail merge operations.
      */
     execute(fileExtension: string, settings: MailMergeSettings): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat One of the DocumentFormat enumeration values.
+     * @param settings A MailMergeSettings object specifying the mail merge settings.
+     */
+    execute(documentFormat: any, settings: MailMergeSettings): boolean;
     /**
      * Gets information about the command state.
      */
@@ -10212,10 +13042,10 @@ interface MailMergeAndSaveAsCommand extends CommandBase {
     execute(filePath: string): boolean;
     /**
      * Executes the MailMergeAndSaveAsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param filePath A string value specifying path to the saving file.
-     * @param settings A MailMergeSettings object specifying hyperlink settings.
+     * @param fileInfo A RichEditFileInfo object specifying a file to save to.
+     * @param settings A MailMergeSettings object specifying the mail merge settings.
      */
-    execute(filePath: string, settings: MailMergeSettings): boolean;
+    execute(fileInfo: RichEditFileInfo, settings: MailMergeSettings): boolean;
     /**
      * Gets information about the command state.
      */
@@ -10311,6 +13141,11 @@ interface FileSaveAsCommand extends CommandWithSimpleStateBase {
      * @param path A string value specifying path to the saving file.
      */
     execute(path: string): boolean;
+    /**
+     * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileInfo A <see cref="Boolean" /> object specifying a file to save to.
+     */
+    execute(fileInfo: RichEditFileInfo): boolean;
 }
 /**
  * A command to download the document file, specifying its extension.
@@ -10321,6 +13156,20 @@ interface FileDownloadCommand extends CommandWithSimpleStateBase {
      * @param fileExtension A string value specifying the extension of the downloading file.
      */
     execute(fileExtension: string): boolean;
+    /**
+     * Executes the FileDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat A DocumentFormat enumeration value.
+     */
+    execute(documentFormat: any): boolean;
+}
+/**
+ * A command to open the file's Save As dialog.
+ */
+interface FileSaveAsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveAsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
 }
 /**
  * A command to invoke a browser-specific Print dialog allowing one to print the current document.
@@ -10402,6 +13251,418 @@ interface ReplaceNextCommand extends CommandWithSimpleStateBase {
      */
     execute(text: string, replaceText: string, matchCase: boolean): boolean;
 }
+interface OpenLayoutOptionsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenLayoutOptionsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a floating text box.
+ */
+interface InsertFloatingTextBoxCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertFloatingTextBoxCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to lock a floating object's anchor.
+ */
+interface ChangeFloatingObjectLockAnchorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectLockAnchorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param lockAnchor true to lock the anchor; false, otherwise.
+     */
+    execute(lockAnchor: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's alignment position.
+ */
+interface ChangeFloatingObjectAlignmentPositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAlignmentPositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAlignmentPositionSettings object specifying alignment position settings.
+     */
+    execute(settings: FloatingObjectAlignmentPositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change a floating object's absolute position.
+ */
+interface ChangeFloatingObjectAbsolutePositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAbsolutePositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAbsolutePositionSettings object specifying page margin settings.
+     */
+    execute(settings: FloatingObjectAbsolutePositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's relative position.
+ */
+interface ChangeFloatingObjectRelativePositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectRelativePositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectRelativePositionSettings object specifying relative positioin settings.
+     */
+    execute(settings: FloatingObjectRelativePositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's text wrapping settings.
+ */
+interface ChangeFloatingObjectTextWrappingCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectTextWrappingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectTextWrappingSettings object specifying text wrapping settings.
+     */
+    execute(settings: FloatingObjectTextWrappingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change a floating object's absolute size.
+ */
+interface ChangeFloatingObjectAbsoluteSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAbsoluteSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAbsoluteSizeSettings object specifying absolute size settings.
+     */
+    execute(settings: FloatingObjectAbsoluteSizeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a text box' relative size settings.
+ */
+interface ChangeTextBoxRelativeSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeTextBoxRelativeSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TextBoxRelativeSizeSettings object specifying relative size settings.
+     */
+    execute(settings: TextBoxRelativeSizeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to rotate a floating object.
+ */
+interface ChangeFloatingObjectRotationCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectRotationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param rotation An integer value specifying the angle of rotation.
+     */
+    execute(rotation: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to lock a floating object's aspect ratio.
+ */
+interface ChangeFloatingObjectLockAspectRatioCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectLockAspectRatioCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param lockAspectRatio true to lock the aspect ratio and maintain the proportions; otherwise, false.
+     */
+    execute(lockAspectRatio: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's background fill color.
+ */
+interface ChangeFloatingObjectFillColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectFillColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string value specifying the color.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's outline color.
+ */
+interface ChangeFloatingObjectOutlineColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectOutlineColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string value specifying the color.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's outline width.
+ */
+interface ChangeFloatingObjectOutlineWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectOutlineWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param width An integer value specifying the outline width.
+     */
+    execute(width: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a text box' content margins.
+ */
+interface ChangeTextBoxContentMarginsCommand extends CommandBase {
+    /**
+     * Executes the ChangeTextBoxContentMarginsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A Margins object specifying margin settings.
+     */
+    execute(settings: Margins): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains alignment position settings for floating objects.
+ */
+interface FloatingObjectAlignmentPositionSettings {
+    /**
+     * Gets or sets a value specifying how a floating object is horizontally aligned relative to an element specified by the horizontalPositionAlignment property.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionAlignment" /> enumeration values.
+     */
+    horizontalPositionAlignment: any;
+    /**
+     * Gets or sets a value specifying to what element the horizontal alignment of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets a value specifying how a floating object is vertically aligned relative to an element specified by the verticalPositionAlignment property.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionAlignment" /> enumeration values.
+     */
+    verticalPositionAlignment: any;
+    /**
+     * Gets or sets a value specifying to what element the vertical alignment of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains page margin settings.
+ */
+interface FloatingObjectAbsolutePositionSettings {
+    /**
+     * Gets or sets a floating object's horizontal position relative to an element specified by the horizontalPositionType property.
+     * Value: An integer value specifying the position.
+     */
+    horizontalAbsolutePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the horizontal position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets a floating object's vertical position relative to an element specified by the verticalPositionType property.
+     * Value: An integer value specifying the position.
+     */
+    verticalAbsolutePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the vertical position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains relative position settings for floating objects.
+ */
+interface FloatingObjectRelativePositionSettings {
+    /**
+     * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the horizontalRelativePosition property
+     * Value: An integer value specifying the horizontal position.
+     */
+    horizontalRelativePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the horizontal position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the verticalRelativePosition property
+     * Value: An integer value specifying the vertical position.
+     */
+    verticalRelativePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the vertical position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains text wrapping settings for floating objects.
+ */
+interface FloatingObjectTextWrappingSettings {
+    /**
+     * Gets or sets a value specifying how text is wrapped around a floating object.
+     * Value: One of the <see cref="FloatingObjectTextWrapType" /> enumeration values.
+     */
+    floatingObjectTextWrapType: any;
+    /**
+     * Gets or sets a value specifying how text can wrap around a floating object's left and right sides.
+     * Value: One of the <see cref="FloatingObjectTextWrapSide" /> enumeration values.
+     */
+    floatingObjectTextWrapSide: any;
+    /**
+     * Gets or sets the left offset of text wrapping.
+     * Value: An integer value specifying the left offset.
+     */
+    leftDistance: number;
+    /**
+     * Gets or sets the right offset of text wrapping.
+     * Value: An integer value specifying the right offset.
+     */
+    rightDistance: number;
+    /**
+     * Gets or sets the top offset of text wrapping.
+     * Value: An integer value specifying the top offset.
+     */
+    topDistance: number;
+    /**
+     * Gets or sets the bottom offset of text wrapping.
+     * Value: An integer value specifying the bottom offset.
+     */
+    bottomDistance: number;
+}
+/**
+ * Contains absolute size settings for floating objects.
+ */
+interface FloatingObjectAbsoluteSizeSettings {
+    /**
+     * Gets or sets a floating object's absolute width.
+     * Value: An integer value specifying the width.
+     */
+    absoluteWidth: number;
+    /**
+     * Gets or sets a floating object's absolute height.
+     * Value: An integer value specifying the height.
+     */
+    absoluteHeight: number;
+}
+/**
+ * Contains relative size settings for floating objects.
+ */
+interface TextBoxRelativeSizeSettings {
+    /**
+     * Gets or sets the percentage specifying a floating object's width relative to the element defined by the relativeWidthType property.
+     * Value: An integer value specifying the relative width, as a percentage.
+     */
+    relativeWidth: number;
+    /**
+     * Gets or sets a value specifying to what element the floating object width is relative.
+     * Value: One of the <see cref="FloatingObjectRelativeWidthType" /> enumeration values.
+     */
+    relativeWidthType: any;
+    /**
+     * Gets or sets the percentage specifying a floating object's height relative to the element defined by the relativeHeightType property.
+     * Value: An integer value specifying the relative height, as a percentage.
+     */
+    relativeHeight: number;
+    /**
+     * Gets or sets a value specifying to what element the floating object height is relative.
+     * Value: One of the <see cref="FloatingObjectRelativeHeightType" /> enumeration values.
+     */
+    relativeHeightType: any;
+}
+declare enum FloatingObjectRelativeWidthType {
+    Margin=0,
+    Page=1,
+    LeftMargin=2,
+    RightMargin=3,
+    InsideMargin=4,
+    OutsideMargin=5
+}
+declare enum FloatingObjectRelativeHeightType {
+    Margin=0,
+    Page=1,
+    TopMargin=2,
+    BottomMargin=3,
+    InsideMargin=4,
+    OutsideMargin=5
+}
+declare enum FloatingObjectTextWrapType {
+    None=0,
+    TopAndBottom=1,
+    Tight=2,
+    Through=3,
+    Square=4
+}
+declare enum FloatingObjectTextWrapSide {
+    Both=0,
+    Left=1,
+    Right=2,
+    Largest=3
+}
+declare enum FloatingObjectHorizontalPositionType {
+    Page=0,
+    Character=1,
+    Column=2,
+    Margin=3,
+    LeftMargin=4,
+    RightMargin=5,
+    InsideMargin=6,
+    OutsideMargin=7
+}
+declare enum FloatingObjectHorizontalPositionAlignment {
+    None=0,
+    Left=1,
+    Center=2,
+    Right=3,
+    Inside=4,
+    Outside=5
+}
+declare enum FloatingObjectVerticalPositionType {
+    Page=0,
+    Line=1,
+    Paragraph=2,
+    Margin=3,
+    TopMargin=4,
+    BottomMargin=5,
+    InsideMargin=6,
+    OutsideMargin=7
+}
+declare enum FloatingObjectVerticalPositionAlignment {
+    None=0,
+    Top=1,
+    Center=2,
+    Bottom=3,
+    Inside=4,
+    Outside=5
+}
 /**
  * A command to cancel changes caused by the previous command.
  */
@@ -10696,6 +13957,10 @@ interface ListLevelSettings {
      * Value: One of the <see cref="ListLevelNumberAlignment" /> values.
      */
     alignment: any;
+    /**
+     * Gets or sets the character inserted after the number for a numbered list item.
+     * Value: A string value that is the trailing character for the list level.
+     */
     separator: string;
     /**
      * Gets or sets the left indent for text within the current list level's paragraph.
@@ -10872,6 +14137,24 @@ interface DeleteCommand extends CommandWithSimpleStateBase {
      */
     execute(): boolean;
 }
+/**
+ * A command to remove the previous word.
+ */
+interface RemovePrevWordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemovePrevWordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove the next word.
+ */
+interface RemoveNextWordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveNextWordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
 /**
  * A command to move the cursor backwards and erase the character in that space.
  */
@@ -10973,8 +14256,8 @@ interface OpenPageMarginsDialogCommand extends CommandWithSimpleStateBase {
  */
 interface ChangePageOrientationCommand extends CommandBase {
     /**
-     * 
-     * @param isPortrait 
+     * Executes the ChangePageOrientationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param isPortrait One of the Orientation enumeration values.
      */
     execute(isPortrait: any): boolean;
     /**
@@ -11048,8 +14331,8 @@ interface OpenSectionColumnsDialogCommand extends CommandWithSimpleStateBase {
  */
 interface ChangeSectionColumnsCommand extends CommandBase {
     /**
-     * 
-     * @param columns 
+     * Executes the ChangeSectionColumnsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columns An array of SectionColumn objects.
      */
     execute(columns: SectionColumn[]): boolean;
     /**
@@ -11588,10 +14871,24 @@ declare enum ParagraphFirstLineIndent {
     Indented=1,
     Hanging=2
 }
+/**
+ * A command to assign a shortcut to the specified client command.
+ */
 interface AssignShortcutCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AssignShortcutCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param keyCode An integer value specifying the code uniquely identifying the key combination.
+     * @param callback A callback function to execute on pressing the shortcut.
+     */
     execute(keyCode: number, callback: (arg1: string) => void): boolean;
 }
+/**
+ * A command to invoke the Spelling dialog window.
+ */
 interface OpenSpellingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenSpellingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
     execute(): boolean;
 }
 /**
@@ -11991,7 +15288,13 @@ interface ToggleTableCellBottomBorderCommand extends CommandWithBooleanStateBase
      */
     execute(): boolean;
 }
+/**
+ * A command to toggle left borders for selected cells on/off.
+ */
 interface ToggleTableCellLeftBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellLeftBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
     execute(): boolean;
 }
 /**
@@ -12522,6 +15825,10 @@ interface TableHeightUnit {
      * Value: An integer value specifying the table height.
      */
     value: number;
+    /**
+     * Gets or sets the unit type for the table height.
+     * Value: One of the <see cref="TableHeightUnitType" /> enumeration values.
+     */
     type: any;
 }
 declare enum TableHeightUnitType {
@@ -12851,6 +16158,10 @@ interface FontFormattingSettings {
      * Value: true, if characters are italicized; otherwise, false.
      */
     italic: boolean;
+    /**
+     * Gets or sets a value specifying whether the strikeout formatting is applied to a character(s).
+     * Value: true if the strikeout formatting is applied; otherwise, false.
+     */
     strikeout: boolean;
     /**
      * Gets or sets whether only word characters are underlined.
@@ -13239,9 +16550,9 @@ interface ASPxClientRecurrenceInfo {
     GetPeriodicity(): number;
     /**
      * Sets the ordinal number of a day within a defined month.
-     * @param dayNubmer A positive integer value that specifies the day number within a month.
+     * @param dayNumber A positive integer value that specifies the day number within a month.
      */
-    SetDayNumber(dayNubmer: number): void;
+    SetDayNumber(dayNumber: number): void;
     /**
      * Gets the ordinal number of a day within a defined month.
      */
@@ -13547,7 +16858,7 @@ interface DefaultRecurrenceRuleValuesAccessor {
      */
     GetMonth(): number;
     /**
-     * Gets the days of the week to which a weekly recurrent appointment is scheduled.
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
      */
     GetWeekDays(): ASPxClientWeekDays;
     /**
@@ -13577,7 +16888,7 @@ interface WeeklyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcce
      */
     GetPeriodicity(): number;
     /**
-     * Gets the days of the week to which a weekly recurrent appointment is scheduled.
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
      */
     GetWeekDays(): ASPxClientWeekDays;
 }
@@ -13586,7 +16897,7 @@ interface WeeklyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcce
  */
 interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
     /**
-     * Gets the number of the month's day in which the appointment is scheduled.
+     * Gets the day of the month on which the appointment is scheduled.
      */
     GetDayNumber(): number;
     /**
@@ -13594,7 +16905,7 @@ interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcc
      */
     GetPeriodicity(): number;
     /**
-     * Gets the days of the week to which a monthly recurrent appointment is scheduled.
+     * Gets the days of the week on which a monthly recurrent appointment is scheduled.
      */
     GetWeekDays(): ASPxClientWeekDays;
     /**
@@ -13607,7 +16918,7 @@ interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcc
  */
 interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
     /**
-     * Gets the number of the month's day in which the appointment is scheduled.
+     * Gets the day of the month on which the appointment is scheduled.
      */
     GetDayNumber(): number;
     /**
@@ -13615,7 +16926,7 @@ interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcce
      */
     GetMonth(): number;
     /**
-     * Gets the days of the week to which a yearly recurrent appointment is scheduled.
+     * Gets the days of the week on which a yearly recurrent appointment is scheduled.
      */
     GetWeekDays(): ASPxClientWeekDays;
     /**
@@ -13789,6 +17100,10 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side event. Occurs after the active view of the ASPxScheduler has been changed.
      */
     ActiveViewChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when an end-user pressers a keyboard shortcut.
+     */
+    Shortcut: ASPxClientEvent<ShortcutEventHandler<ASPxClientScheduler>>;
     /**
      * Occurs when the end-user clicks an appointment.
      */
@@ -13797,6 +17112,14 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Occurs when the end-user double clicks on an appointment.
      */
     AppointmentDoubleClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when an end-user clicks a time cell.
+     */
+    CellClick: ASPxClientEvent<CellClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when and end-user double-clicks a time cell.
+     */
+    CellDoubleClick: ASPxClientEvent<CellClickEventHandler<ASPxClientScheduler>>;
     /**
      * Occurs on the client side when the user selects an appointment.
      */
@@ -13825,6 +17148,14 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side event that occurs after an appointment has been dragged and dropped.
      */
     AppointmentDrop: ASPxClientEvent<AppointmentDropEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being dragged.
+     */
+    AppointmentDrag: ASPxClientEvent<AppointmentDragEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being resized.
+     */
+    AppointmentResizing: ASPxClientEvent<AppointmentResizingEventHandler<ASPxClientScheduler>>;
     /**
      * Client-side event that occurs when an appointment is resized.
      */
@@ -13901,6 +17232,10 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side function that returns the ResourceId of selected time cell's resource.
      */
     GetSelectedResource(): string;
+    /**
+     * Gets a collection of visible appointments.
+     */
+    GetVisibleAppointments(): ASPxClientAppointment[];
     /**
      * Client-side function that returns an appointment with the specified ID.
      * @param id An appointment's identifier.
@@ -14102,6 +17437,11 @@ interface ASPxSchedulerViewType {
      * Value: A string "FullWeek", indicating the FullWeekView.
      */
     FullWeek: string;
+    /**
+     * Gets a string representation equivalent to the Agenda enumeration for use in client scripts.
+     * Value: A string "Agenda", indicating the AgendaView.
+     */
+    Agenda: string;
 }
 /**
  * Represents a client-side equivalent of the SchedulerGroupType enumeration.
@@ -14220,6 +17560,37 @@ interface AppointmentsSelectionEventArgs extends ASPxClientEventArgs {
      */
     appointmentIds: string[];
 }
+/**
+ * A method that will handle the Shortcut event.
+ */
+interface ShortcutEventHandler<S> {
+    /**
+     * A method that will handle the Shortcut event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ShortcutEventArgs object that contains event data.
+     */
+    (source: S, e: ShortcutEventArgs): void;
+}
+/**
+ * Provides data for the client-side Shortcut event.
+ */
+interface ShortcutEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of a command associated with the keyboard shortcut.
+     * Value: A string containing a command name.
+     */
+    commandName: string;
+    /**
+     * Gets an object containing information about a keyboard shortcut event.
+     * Value: An object containing event data.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true, if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
 /**
  * A method that will handle the ActiveViewChanging event.
  */
@@ -14313,21 +17684,55 @@ interface MenuItemClickedEventArgs extends ASPxClientEventArgs {
      */
     handled: boolean;
 }
-interface AppointmentDropEventHandler<S> {
+/**
+ * A method that will handle the AppointmentDrag event.
+ */
+interface AppointmentDragEventHandler<S> {
     /**
-     * A method that will handle the AppointmentDrop event.
-     * @param source The event sender (typically an ASPxClientScheduler control).
+     * A method that will handle the AppointmentDrag event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
      * @param e A ASPxClientAppointmentDragEventArgs object that contains event data.
      */
     (source: S, e: ASPxClientAppointmentDragEventArgs): void;
 }
 /**
- * Provides data for the AppointmentDrop event.
+ * Provides data for the AppointmentDrag event.
  */
 interface ASPxClientAppointmentDragEventArgs extends ASPxClientEventArgs {
     /**
-     * Gets or sets whether default event processing is required.
-     * Value: true to process an event using only custom code; otherwise, false.
+     * Specifies whether or not appointments can be dropped into the intervals over which they are currently dragged.
+     * Value: true to allow dropping appointments; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current drag operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Provides information about dragged appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dragged appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+/**
+ * A method that will handle the AppointmentDrop event.
+ */
+interface AppointmentDropEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDrop event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
+     * @param e A ASPxClientAppointmentDropEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDropEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrop event.
+ */
+interface ASPxClientAppointmentDropEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
      */
     handled: boolean;
     /**
@@ -14336,8 +17741,8 @@ interface ASPxClientAppointmentDragEventArgs extends ASPxClientEventArgs {
      */
     operation: ASPxClientAppointmentOperation;
     /**
-     * Provides information about dragged appointments.
-     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dragged appointments.
+     * Provides information about dropped appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dropped appointments.
      */
     dragInformation: ASPxClientAppointmentDragInfo[];
 }
@@ -14379,6 +17784,47 @@ interface ASPxClientAppointmentResizeEventArgs extends ASPxClientEventArgs {
      */
     newInterval: ASPxClientTimeInterval;
 }
+/**
+ * A method that will handle the AppointmentResizing event.
+ */
+interface AppointmentResizingEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentResizing event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
+     * @param e A ASPxClientAppointmentResizingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentResizingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResizing event.
+ */
+interface ASPxClientAppointmentResizingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not an appointment can be resized to the new time interval.
+     * Value: true to allow resizing the appointment; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current appointment resizing operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
 /**
  * Stores information about an appointment drag operation.
  */
@@ -14409,6 +17855,37 @@ interface ASPxClientAppointmentDragInfo {
      */
     newResources: string[];
 }
+/**
+ * A method that will handle the CellDoubleClick events.
+ */
+interface CellClickEventHandler<S> {
+    /**
+     * A method that will handle the CellClick event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A CellClickEventArgs object that contains event data.
+     */
+    (source: S, e: CellClickEventArgs): void;
+}
+/**
+ * Provides data for the CellDoubleClick events.
+ */
+interface CellClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object containing information about an HTML element representing the clicked time cell.
+     * Value: An object containing information about an HTML element.
+     */
+    htmlElement: Object;
+    /**
+     * Provides access to a time interval occupied by the clicked time cell.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the name of a resource to which the clicked time cell belongs.
+     * Value: A string containing the name of a resource.
+     */
+    resource: string;
+}
 /**
  * Contains information about a client tooltip.
  */
@@ -14560,6 +18037,11 @@ interface ASPxClientSpellCheckerAfterCheckEventArgs extends ASPxClientEventArgs
      * Value: A string, containing checked text.
      */
     checkedText: string;
+    /**
+     * Gets a value specifying whether spell checking is finished or stopped by the user.
+     * Value: A string value identifying the reason ("Default" or "User").
+     */
+    reason: string;
 }
 /**
  * Represents an object that will handle the client-side WordChanged event.
@@ -14572,6 +18054,15 @@ interface ASPxClientWordChangedEventHandler<S> {
      */
     (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
 }
+declare enum ASPxClientSpreadsheetPopupMenuType {
+    ColumnHeading=0,
+    RowHeading=1,
+    SheetTab=3,
+    Picture=4,
+    Chart=5,
+    Cell=7,
+    AutoFilter=8
+}
 /**
  * A method that will handle the CustomCommandExecuted event.
  */
@@ -14597,6 +18088,9 @@ interface ASPxClientSpreadsheetCustomCommandExecutedEventArgs extends ASPxClient
      * Value: A string value containing additional information about the processed command.
      */
     parameter: string;
+    /**
+     * This property is now obsolete. Use the commandName property instead.
+     */
     item: ASPxClientRibbonItem;
 }
 /**
@@ -14667,6 +18161,32 @@ interface ASPxClientSpreadsheetHyperlinkClickEventArgs extends ASPxClientEventAr
      */
     targetUri: string;
 }
+/**
+ * A method that will handle the PopupMenuShowing event.
+ */
+interface ASPxClientSpreadsheetPopupMenuShowingEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuShowing event.
+     * @param source The event sender (typically an ASPxClientSpreadsheet object).
+     * @param e A ASPxClientSpreadsheetPopupMenuShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetPopupMenuShowingEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuShowing event.
+ */
+interface ASPxClientSpreadsheetPopupMenuShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides access to a collection of menu items in the context menu being invoked.
+     * Value: A <see cref="ASPxClientSpreadsheetPopupMenuItemCollection" /> object representing the context menu's item collection.
+     */
+    menuItems: ASPxClientSpreadsheetPopupMenuItemCollection;
+    /**
+     * Gets the currently displayed context menu's type.
+     * Value: One of the <see cref="ASPxClientSpreadsheetPopupMenuType" /> enumeration values.
+     */
+    menuType: any;
+}
 /**
  * A client-side equivalent of the ASPxSpreadsheet object.
  */
@@ -14707,6 +18227,10 @@ interface ASPxClientSpreadsheet extends ASPxClientControl {
      * Occurs on the client side after a hyperlink is clicked within the Spreadsheet's document.
      */
     HyperlinkClick: ASPxClientEvent<ASPxClientSpreadsheetHyperlinkClickEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs before the context menu is displayed and allows menu customization.
+     */
+    PopupMenuShowing: ASPxClientEvent<ASPxClientSpreadsheetPopupMenuShowingEventHandler<ASPxClientSpreadsheet>>;
     /**
      * Sets input focus to the Spreadsheet.
      */
@@ -14734,6 +18258,12 @@ interface ASPxClientSpreadsheet extends ASPxClientControl {
      * @param rowModelIndex An integer value specifying the cell's row index.
      */
     GetCellValue(colModelIndex: number, rowModelIndex: number): Object;
+    /**
+     * Returns the comment associated with the specified data cell.
+     * @param colModelIndex An integer value specifying the data cell's column index.
+     * @param rowModelIndex An integer value specifying the data cell's row index.
+     */
+    GetCellComment(colModelIndex: number, rowModelIndex: number): Object;
     /**
      * Gets the value of the currently active cell.
      */
@@ -14815,6 +18345,123 @@ interface ASPxClientSpreadsheetSelection {
      */
     bottomRowIndex: number;
 }
+/**
+ * Represents an individual item of the Spreadsheet's context menu.
+ */
+interface ASPxClientSpreadsheetPopupMenuItem {
+    /**
+     * Gets the immediate parent menu item to which the current menu item belongs.
+     * Value: A ASPxClientSpreadsheetPopupMenuItem object representing the menu item's immediate parent.
+     */
+    parent: ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Gets or sets the unique identifier name for the current menu item.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+    /**
+     * Gets or sets the text content of the current menu item.
+     * Value: A string value that specifies the text content of the menu item.
+     */
+    text: string;
+    /**
+     * Gets or sets a value that indicates whether the menu item is enabled, allowing the item to respond to end-user interactions.
+     * Value: true if the item is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets or sets the CSS class name defining the menu item's image.
+     * Value: A string value specifying the class name.
+     */
+    imageClassName: string;
+    /**
+     * Gets or sets an URL which defines the navigation location.
+     * Value: A string value which represents an URL where the client web browser will navigate.
+     */
+    navigateUrl: string;
+    /**
+     * Gets or sets the URL of the menu item's image.
+     * Value: A string value that specifies the location of an image.
+     */
+    imageUrl: string;
+    /**
+     * Gets or sets a value that specifies whether the current menu item starts a group.
+     * Value: true if the current menu item starts a group; otherwise, false.
+     */
+    beginGroup: boolean;
+    /**
+     * Gets or sets the current menu item's tooltip text.
+     * Value: A string which specifies the text content of the current menu item's tooltip.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the window or frame at which to target the contents of the URL associated with the current menu item.
+     * Value: A string which identifies the window or frame at which to target the URL content.
+     */
+    target: string;
+    /**
+     * Gets a collection that contains the submenu items of the current menu item.
+     */
+    GetSubItems(): ASPxClientSpreadsheetPopupMenuItemCollection;
+    /**
+     * Returns the menu item's sub-item with the specified index.
+     * @param index An integer value specifying the index of the sub-item within a collection of the current menu item's submenu items.
+     */
+    GetItem(index: number): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns the menu item's sub-item with the specified name property value.
+     * @param name A string value specifying the name property value of the sub-item to find.
+     */
+    GetItemByName(name: string): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns the total number of the menu item's child items (submenu items).
+     */
+    GetItemCount(): number;
+}
+/**
+ * Represents a collection of items in the Spreadhseet's context menu.
+ */
+interface ASPxClientSpreadsheetPopupMenuItemCollection {
+    /**
+     * Adds the specified menu item to the end of the collection.
+     * @param item An ASPxClientSpreadsheetPopupMenuItem object specifying the item to be added to the collection.
+     */
+    Add(item: ASPxClientSpreadsheetPopupMenuItem): void;
+    /**
+     * Removes a menu item specified by its index within the collection.
+     * @param index An integer value specifying the index of the menu item to remove.
+     */
+    Remove(index: number): void;
+    /**
+     * Removes a menu item specified by its name.
+     * @param name A string value specifying the name property value of a menu item to remove from the collection.
+     */
+    RemoveByName(name: string): void;
+    /**
+     * Adds the specified item to the specified position within the collection.
+     * @param index An integer value that specifies the zero-based index at which the specified item should be inserted.
+     * @param item An ASPxClientSpreadsheetPopupMenuItem object to insert.
+     */
+    Insert(index: number, item: ASPxClientSpreadsheetPopupMenuItem): void;
+    /**
+     * Returns the total number of menu items in the collection.
+     */
+    GetCount(): number;
+    /**
+     * Returns an item object with the specified name property value.
+     * @param name A string value representing the name property value of the required item.
+     */
+    GetByName(name: string): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns a menu item specified by its index in the collection.
+     * @param index An integer value that is the zero-based index of the <see cref="ASPxClientSpreadsheetPopupMenuItem" /> to retrieve from the ASPxClientSpreadsheetPopupMenuItemCollection.
+     */
+    Get(index: number): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Removes all menu items from the collection.
+     */
+    Clear(): void;
+}
 /**
  * Represents the client ASPxTreeList.
  */
@@ -14839,6 +18486,10 @@ interface ASPxClientTreeList extends ASPxClientControl {
      * Occurs when a custom command button has been clicked.
      */
     CustomButtonClick: ASPxClientEvent<ASPxClientTreeListCustomButtonEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after a toolbar item has been clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientTreeListToolbarItemClickEventHandler<ASPxClientTreeList>>;
     /**
      * Fires before the focused node has been changed.
      */
@@ -14899,6 +18550,16 @@ interface ASPxClientTreeList extends ASPxClientControl {
      * Gets the Popup Edit Form.
      */
     GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Returns a toolbar specified by its name.
+     * @param name A string value specifying the toolbar name.
+     */
+    GetToolbarByName(name: string): ASPxClientMenu;
+    /**
+     * Returns a toolbar specified by its index.
+     * @param index An integer value specifying the zero-based index of the toolbar object to retrieve.
+     */
+    GetToolbar(index: number): ASPxClientMenu;
     /**
      * Returns the focused node's key value.
      */
@@ -15374,7 +19035,7 @@ interface ASPxClientTreeListContextMenuEventArgs extends ASPxClientEventArgs {
     htmlEvent: Object;
     /**
      * Gets or sets whether to invoke the browser's context menu.
-     * Value: true to show the browser's context menu; otherwise, false.
+     * Value: true to hide the browser's context menu; otherwise, false.
      */
     cancel: boolean;
 }
@@ -15514,6 +19175,679 @@ interface ASPxClientTreeListColumnResizedEventHandler<S> {
      */
     (source: S, e: ASPxClientTreeListColumnResizedEventArgs): void;
 }
+/**
+ * Provides data for the ToolbarItemClick event.
+ */
+interface ASPxClientTreeListToolbarItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the toolbar index related to the event.
+     * Value: An integer value that is the toolbar index.
+     */
+    toolbarIndex: number;
+    /**
+     * Gets the toolbar item related to the event.
+     * Value: An ASPxClientMenuItem object that is the toolbar item.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+}
+/**
+ * A method that will handle the ToolbarItemClick event.
+ */
+interface ASPxClientTreeListToolbarItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListToolbarItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListToolbarItemClickEventArgs): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapAccordion control.
+ */
+interface BootstrapClientAccordion extends ASPxClientNavBar {
+}
+interface BootstrapClientBinaryImage extends ASPxClientHyperLink {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButton control.
+ */
+interface BootstrapClientButton extends ASPxClientButton {
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCalendar control.
+ */
+interface BootstrapClientCalendar extends ASPxClientCalendar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCallbackPanel control.
+ */
+interface BootstrapClientCallbackPanel extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the BootstrapClientCallbackPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the HTML code that specifies the contents of the control's window.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML markup specifying the contents of the control's window.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the callback panel is enabled.
+     * @param enabled true, to enable the callback panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a callback panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Serves as the base type for the BootstrapClientPieChart objects.
+ */
+interface BootstrapClientChartBase extends ASPxClientControl {
+    Done: ASPxClientEvent<BootstrapClientChartBaseDoneEventHandler<BootstrapClientChartBase>>;
+    LegendClick: ASPxClientEvent<BootstrapClientChartBaseLegendClickEventHandler<BootstrapClientChartBase>>;
+    PointClick: ASPxClientEvent<BootstrapClientChartBasePointClickEventHandler<BootstrapClientChartBase>>;
+    PointHoverChanged: ASPxClientEvent<BootstrapClientChartBasePointHoverChangedEventHandler<BootstrapClientChartBase>>;
+    PointSelectionChanged: ASPxClientEvent<BootstrapClientChartBasePointSelectionChangedEventHandler<BootstrapClientChartBase>>;
+    TooltipHidden: ASPxClientEvent<BootstrapClientChartBaseTooltipHiddenEventHandler<BootstrapClientChartBase>>;
+    TooltipShown: ASPxClientEvent<BootstrapClientChartBaseTooltipShownEventHandler<BootstrapClientChartBase>>;
+    ArgumentAxisClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<BootstrapClientChartBase>>;
+    SeriesClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesClickEventHandler<BootstrapClientChartBase>>;
+    SeriesHoverChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<BootstrapClientChartBase>>;
+    SeriesSelectionChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<BootstrapClientChartBase>>;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapChart control.
+ */
+interface BootstrapClientChart extends BootstrapClientChartBase {
+    ZoomStart: ASPxClientEvent<BootstrapClientChartZoomStartEventHandler<BootstrapClientChart>>;
+    ZoomEnd: ASPxClientEvent<BootstrapClientChartZoomEndEventHandler<BootstrapClientChart>>;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPolarChart control.
+ */
+interface BootstrapClientPolarChart extends BootstrapClientChartBase {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPieChart control.
+ */
+interface BootstrapClientPieChart extends BootstrapClientChartBase {
+}
+interface BootstrapClientChartBaseDoneEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapClientChartBaseLegendClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientChartBasePointClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientChartBasePointHoverChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBasePointSelectionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBaseTooltipHiddenEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBaseTooltipShownEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartZoomStartEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapClientChartZoomEndEventHandler<S> {
+    (source: S, e: BootstrapClientChartZoomEndEventArgs): void;
+}
+interface BootstrapUIWidgetEventArgsBase extends ASPxClientEventArgs {
+    component: Object;
+    element: Object;
+}
+interface BootstrapClientChartZoomEndEventArgs extends BootstrapUIWidgetEventArgsBase {
+    rangeStart: Object;
+    rangeEnd: Object;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCheckBox control.
+ */
+interface BootstrapClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<BootstrapClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked 
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState 
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text 
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapRadioButton control.
+ */
+interface BootstrapClientRadioButton extends BootstrapClientCheckBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapComboBox control.
+ */
+interface BootstrapClientComboBox extends ASPxClientComboBox {
+    /**
+     * Returns the combo box editor's selected item.
+     */
+    GetSelectedItem(): BootstrapClientListBoxItem;
+    /**
+     * Sets the combo box editor's selected item.
+     * @param item 
+     */
+    SetSelectedItem(item: BootstrapClientListBoxItem): void;
+    /**
+     * Returns an item specified by its index within the combo box editor's item collection.
+     * @param index 
+     */
+    GetItem(index: number): BootstrapClientListBoxItem;
+    /**
+     * Returns a combo box item by its text.
+     * @param text 
+     */
+    FindItemByText(text: string): BootstrapClientListBoxItem;
+    /**
+     * Returns a combo box item by its value.
+     * @param value 
+     */
+    FindItemByValue(value: Object): BootstrapClientListBoxItem;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(texts: string[], value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
+     * @param text 
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(text: string, value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDateEdit control.
+ */
+interface BootstrapClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDropDownEdit control.
+ */
+interface BootstrapClientDropDownEdit extends ASPxClientDropDownEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapFormLayout control.
+ */
+interface BootstrapClientFormLayout extends ASPxClientFormLayout {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapGridView control.
+ */
+interface BootstrapClientGridView extends ASPxClientGridView {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapHyperLink control.
+ */
+interface BootstrapClientHyperLink extends ASPxClientHyperLink {
+}
+interface BootstrapClientImage extends ASPxClientImage {
+}
+/**
+ * Represents the client-side equivalent of the BootstrapListEditItem object.
+ */
+interface BootstrapClientListBoxItem extends ASPxClientListEditItem {
+    /**
+     * This member is not in effect for this class. It is overridden only for the purpose of preventing it from appearing in Microsoft Visual Studio designer tools.
+     */
+    imageUrl: string;
+    iconCssClass: string;
+    /**
+     * 
+     * @param columnIndex 
+     */
+    GetColumnText(columnIndex: number): string;
+    /**
+     * 
+     * @param columnName 
+     */
+    GetColumnText(columnName: string): string;
+    /**
+     * 
+     * @param fieldIndex 
+     */
+    GetFieldText(fieldIndex: number): string;
+    /**
+     * 
+     * @param fieldName 
+     */
+    GetFieldText(fieldName: string): string;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapListBox control.
+ */
+interface BootstrapClientListBox extends ASPxClientListBox {
+    /**
+     * Returns the list box editor's selected item.
+     */
+    GetSelectedItem(): BootstrapClientListBoxItem;
+    /**
+     * Sets the list box editor's selected item.
+     * @param item 
+     */
+    SetSelectedItem(item: BootstrapClientListBoxItem): void;
+    /**
+     * Returns an item specified by its index within the list box editor's item collection.
+     * @param index 
+     */
+    GetItem(index: number): BootstrapClientListBoxItem;
+    /**
+     * Returns an array of the list editor's selected items.
+     */
+    GetSelectedItems(): BootstrapClientListBoxItem[];
+    /**
+     * Selects the specified items within a list box.
+     * @param items 
+     */
+    SelectItems(items: BootstrapClientListBoxItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items 
+     */
+    UnselectItems(items: BootstrapClientListBoxItem[]): void;
+    /**
+     * Returns a list box item by its text.
+     * @param text 
+     */
+    FindItemByText(text: string): BootstrapClientListBoxItem;
+    /**
+     * Returns a list box item by its value.
+     * @param value 
+     */
+    FindItemByValue(value: Object): BootstrapClientListBoxItem;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * @param texts 
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(texts: string[], value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text 
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(text: string, value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Selects the specified items within a list box.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCheckBoxList control.
+ */
+interface BootstrapClientCheckBoxList extends ASPxClientCheckBoxList {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapRadioButtonList control.
+ */
+interface BootstrapClientRadioButtonList extends ASPxClientRadioButtonList {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMenu control.
+ */
+interface BootstrapClientMenu extends ASPxClientMenu {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPager control.
+ */
+interface BootstrapClientPager extends ASPxClientPager {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupControl control.
+ */
+interface BootstrapClientPopupControl extends ASPxClientPopupControl {
+    /**
+     * 
+     * @param selector 
+     */
+    SetPopupElementCssSelector(selector: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupMenu control.
+ */
+interface BootstrapClientPopupMenu extends ASPxClientPopupMenu {
+    /**
+     * 
+     * @param selector 
+     */
+    SetPopupElementCssSelector(selector: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapProgressBar control.
+ */
+interface BootstrapClientProgressBar extends ASPxClientProgressBar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapSpinEdit control.
+ */
+interface BootstrapClientSpinEdit extends ASPxClientSpinEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTabControl control.
+ */
+interface BootstrapClientTabControl extends ASPxClientTabControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPageControl control.
+ */
+interface BootstrapClientPageControl extends ASPxClientPageControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTextBox control.
+ */
+interface BootstrapClientTextBox extends ASPxClientTextBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMemo control.
+ */
+interface BootstrapClientMemo extends ASPxClientMemo {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButtonEdit control.
+ */
+interface BootstrapClientButtonEdit extends ASPxClientButtonEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTreeView control.
+ */
+interface BootstrapClientTreeView extends ASPxClientTreeView {
+}
+interface BootstrapUIWidgetBase extends ASPxClientControl {
+    Init: ASPxClientEvent<BootstrapUIWidgetInitializedEventHandler<BootstrapUIWidgetBase>>;
+    Drawn: ASPxClientEvent<BootstrapUIWidgetDrawnEventHandler<BootstrapUIWidgetBase>>;
+    Disposing: ASPxClientEvent<BootstrapUIWidgetDisposingEventHandler<BootstrapUIWidgetBase>>;
+    OptionChanged: ASPxClientEvent<BootstrapUIWidgetOptionChangedEventHandler<BootstrapUIWidgetBase>>;
+    Exporting: ASPxClientEvent<BootstrapUIWidgetExportingEventHandler<BootstrapUIWidgetBase>>;
+    Exported: ASPxClientEvent<BootstrapUIWidgetExportedEventHandler<BootstrapUIWidgetBase>>;
+    FileSaving: ASPxClientEvent<BootstrapUIWidgetFileSavingEventHandler<BootstrapUIWidgetBase>>;
+    IncidentOccurred: ASPxClientEvent<BootstrapUIWidgetErrorEventHandler<BootstrapUIWidgetBase>>;
+    GetInstance(): Object;
+    SetOptions(options: Object): void;
+    ExportTo(format: string, fileName: string): void;
+    Print(): void;
+}
+interface BootstrapUIWidgetInitializedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetDrawnEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetDisposingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetExportedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetOptionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetOptionChangedEventArgs): void;
+}
+interface BootstrapUIWidgetOptionChangedEventArgs extends BootstrapUIWidgetEventArgsBase {
+    fullName: string;
+    name: string;
+    previousValue: Object;
+    value: Object;
+}
+interface BootstrapUIWidgetExportingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+interface BootstrapUIWidgetFileSavingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+interface BootstrapUIWidgetExportEventArgs extends BootstrapUIWidgetEventArgsBase {
+    cancel: boolean;
+    data: Object;
+    fileName: string;
+    format: string;
+}
+interface BootstrapUIWidgetErrorEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetErrorEventArgs): void;
+}
+interface BootstrapUIWidgetErrorEventArgs extends BootstrapUIWidgetEventArgsBase {
+    target: Object;
+}
+interface BootstrapUIWidgetElementActionEventArgs extends BootstrapUIWidgetEventArgsBase {
+    target: Object;
+}
+interface BootstrapUIWidgetElementClickEventArgs extends BootstrapUIWidgetElementActionEventArgs {
+    jQueryEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapUploadControl.
+ */
+interface BootstrapClientUploadControl extends ASPxClientUploadControl {
+}
 /**
  * A client-side counterpart of the Calendar and CalendarFor extensions.
  */
@@ -15584,6 +19918,12 @@ interface MVCxClientCardView extends ASPxClientCardView {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Sends a callback to the server and generates the server-side CustomDataCallback event.
      * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
@@ -15796,6 +20136,12 @@ interface MVCxClientGridView extends ASPxClientGridView {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Sends a callback to the server and generates the server-side CustomDataCallback event.
      * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
@@ -16176,9 +20522,9 @@ interface MVCxClientSchedulerTemplateToolTip extends ASPxClientToolTipBase {
  */
 interface MVCxClientSchedulerToolTipDisplayingEventHandler<S> {
     /**
-     * 
-     * @param source 
-     * @param e 
+     * A method that will handle the ToolTipDisplaying event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientSchedulerToolTipDisplayingEventArgs object that contains the related arguments.
      */
     (source: S, e: MVCxClientSchedulerToolTipDisplayingEventArgs): void;
 }
@@ -16429,6 +20775,12 @@ interface MVCxClientVerticalGrid extends ASPxClientVerticalGrid {
      * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
      */
     PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
     /**
      * Sends a callback to the server and generates the server-side CustomDataCallback event.
      * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
@@ -16458,6 +20810,11 @@ interface ASPxClientControlBase {
      * Returns an HTML element that is the root of the control's hierarchy.
      */
     GetMainElement(): Object;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
     /**
      * Returns a value specifying whether a control is displayed.
      */
@@ -16576,10 +20933,66 @@ interface ASPxClientCallbackCompleteEventArgs extends ASPxClientEventArgs {
      */
     result: string;
 }
+/**
+ * Serves as the base class for controls that implement panel functionality.
+ */
+interface ASPxClientPanelBase extends ASPxClientControl {
+    /**
+     * Returns the HTML code that is the content of the panel.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML content for the panel.
+     * @param html A string value that is the HTML code defining the content of the panel.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the panel is enabled.
+     * @param enabled true to enable the panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxPanel control.
+ */
+interface ASPxClientPanel extends ASPxClientPanelBase {
+    /**
+     * Occurs when the expanded panel is closed.
+     */
+    Collapsed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Occurs when an end-user opens the expand panel.
+     */
+    Expanded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Expands or collapses the client panel.
+     */
+    Toggle(): void;
+    /**
+     * Returns a value specifying whether the panel can be expanded.
+     */
+    IsExpandable(): boolean;
+    /**
+     * Returns a value specifying whether the panel is expanded.
+     */
+    IsExpanded(): boolean;
+    /**
+     * Expands the collapsed panel.
+     */
+    Expand(): void;
+    /**
+     * Collapses the expanded panel.
+     */
+    Collapse(): void;
+}
 /**
  * Represents a client-side equivalent of the ASPxCallbackPanel control.
  */
-interface ASPxClientCallbackPanel extends ASPxClientControl {
+interface ASPxClientCallbackPanel extends ASPxClientPanel {
     /**
      * Occurs when a callback for server-side processing is initiated.
      */
@@ -16721,6 +21134,16 @@ interface ASPxClientProcessingModeCancelEventArgs extends ASPxClientProcessingMo
      */
     cancel: boolean;
 }
+/**
+ * Provides access to an observable boolean, that allows you to detect and respond to changes.
+ */
+interface KnockoutObservableBoolean {
+}
+/**
+ * Provides access to observable arrays that allow you to detect and respond to changes in a collection of things.
+ */
+interface KnockoutObservableArray {
+}
 /**
  * Represents a JavaScript function which receives callback data obtained via a call to a specific client method (such as the PerformDataCallback).
  */
@@ -16986,17 +21409,23 @@ interface ASPxClientControlsInitializedEventArgs extends ASPxClientEventArgs {
      */
     isCallback: boolean;
 }
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
 interface ASPxClientControlPredicate {
     /**
-     * 
-     * @param control 
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param control An object to compare against the criteria defined within the method.
      */
     (control: Object): boolean;
 }
+/**
+ * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+ */
 interface ASPxClientControlAction {
     /**
-     * 
-     * @param control 
+     * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+     * @param control An object that specifies a control.
      */
     (control: Object): void;
 }
@@ -17585,7 +22014,7 @@ interface ASPxClientDockPanel extends ASPxClientPopupControlBase {
      */
     MakeFloat(x: number, y: number): void;
     /**
-     * Gets or sets a value specifying the position of the current panel, amongst the visible panels within a zone.
+     * Gets a value specifying the position of the current panel, amongst the visible panels within a zone.
      */
     GetVisibleIndex(): number;
     /**
@@ -17855,6 +22284,10 @@ interface ASPxClientFileManager extends ASPxClientControl {
      * Occurs on the client side after upload of all selected files has been completed.
      */
     FilesUploaded: ASPxClientEvent<ASPxClientFileManagerFilesUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to specify whether the selected file(s) are valid and provide an error text.
+     */
+    FileUploadValidationErrorOccurred: ASPxClientEvent<ASPxClientUploadControlValidationErrorOccurredEventHandler<ASPxClientFileManager>>;
     /**
      * Fires on the client side before a file download starts, and allows you to cancel the action.
      */
@@ -18892,6 +23325,229 @@ interface ASPxClientHiddenField extends ASPxClientControl {
      */
     Contains(propertyName: string): boolean;
 }
+/**
+ * Represents the client-side equivalent of the ASPxHint control.
+ */
+interface ASPxClientHint extends ASPxClientControl {
+    /**
+     * Occurs on the client side when a hint is about to be shown.
+     */
+    Showing: ASPxClientEvent<ASPxClientHintShowingEventHandler>;
+    /**
+     * Occurs on the client side when a hint is about to be hidden.
+     */
+    Hiding: ASPxClientEvent<ASPxClientHintHidingEventHandler>;
+    /**
+     * This method is not in effect for a ASPxClientHint object.
+     */
+    GetMainElement(): Object;
+    /**
+     * Invokes a hint.
+     * @param targetElement A HTML DOM element near to which the hint is displayed in response to user interaction.
+     */
+    Show(targetElement: Object): ASPxClientHintWindow;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector used to specify for which UI elements on a web page a hint is displayed.
+     */
+    Show(targetSelector: string): ASPxClientHintWindow;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHint's window.
+ */
+interface ASPxClientHintWindow {
+    /**
+     * Forces the ASPxClientHint's window to recalculate its position.
+     */
+    UpdatePosition(): void;
+}
+/**
+ * A method that will handle the Showing event.
+ */
+interface ASPxClientHintShowingEventHandler {
+    /**
+     * A method that will handle the Showing event.
+     * @param sender The event source.
+     * @param e A ASPxClientHintShowingEventArgs object that contains the required data.
+     */
+    (sender: ASPxClientHintWindow, e: ASPxClientHintShowingEventArgs): void;
+}
+/**
+ * Provides data for the Showing event.
+ */
+interface ASPxClientHintShowingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the object that is the hint's target element.
+     * Value: An object representing the hint's target element related to the event.
+     */
+    targetElement: Object;
+    /**
+     * Gets the object that is the hint.
+     * Value: An object representing the hint related to the event.
+     */
+    hintElement: Object;
+    /**
+     * Gets the object that is the hint's content.
+     * Value: An object representing the hint's content element related to the event.
+     */
+    contentElement: Object;
+    /**
+     * Gets the object that is the hint's title.
+     * Value: An object representing the hint's title element related to the event.
+     */
+    titleElement: Object;
+}
+/**
+ * A method that will handle the Hiding event.
+ */
+interface ASPxClientHintHidingEventHandler {
+    /**
+     * A method that will handle the Hiding event.
+     * @param sender The event source.
+     * @param e A ASPxClientHintHidingEventArgs object that contains the required data.
+     */
+    (sender: ASPxClientHintWindow, e: ASPxClientHintHidingEventArgs): void;
+}
+/**
+ * Provides data for the Hiding event.
+ */
+interface ASPxClientHintHidingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the object that is the hint's target element.
+     * Value: An object representing the hint's target element.
+     */
+    targetElement: Object;
+    /**
+     * Gets the object that is the hint element.
+     * Value: An object representing the hint related to the event.
+     */
+    hintElement: Object;
+    /**
+     * Gets the object that is the hint's content.
+     * Value: An object representing the hint's content element related to the event.
+     */
+    contentElement: Object;
+    /**
+     * Gets the object that is the hint's title.
+     * Value: An object representing the hint's title element related to the event.
+     */
+    titleElement: Object;
+    /**
+     * Gets or sets a value indicating whether the event should be canceled.
+     * Value: true, if the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * The hint control's options.
+ */
+interface ASPxClientHintOptions {
+    /**
+     * Gets or sets which user action triggers a hint.
+     * Value: A string value that is a user action.
+     */
+    triggerAction: string;
+    /**
+     * Gets or sets the delay in displaying the hint.
+     * Value: An integer value that specifies the time interval, in milliseconds, after which a hint is displayed.
+     */
+    appearAfter: number;
+    /**
+     * Gets or sets the duration after which a hint disappears when the mouse pointer is no longer positioned over the target element.
+     * Value: The length of time (in milliseconds) a hint is displayed after the mouse pointer is no longer positioned over the target element.
+     */
+    disappearAfter: number;
+    /**
+     * Gets or sets a value that specifies whether a hint is displayed in a callout box.
+     * Value: true, to display a hint in a callout box; otherwise, false.
+     */
+    showCallout: boolean;
+    /**
+     * Gets or sets where a hint should be positioned.
+     * Value: A string value that specifies a hint position.
+     */
+    position: string;
+    /**
+     * Gets or sets a custom CSS class name that will be assigned to the root ASPxHint element.
+     * Value: A string value that is the CSS class name.
+     */
+    className: string;
+    /**
+     * Gets or sets the attribute name.
+     * Value: A string value that is the attribute name.
+     */
+    contentAttribute: string;
+    /**
+     * Gets or sets the attribute name.
+     * Value: A string value that is the attribute name.
+     */
+    titleAttribute: string;
+    /**
+     * Gets or sets the hint's content.
+     * Value: A string value that is the hint's content.
+     */
+    content: string;
+    /**
+     * Gets or sets a value that is the hint's title.
+     * Value: A string value that is the title text.
+     */
+    title: string;
+    /**
+     * Gets or sets a value that is the HTML DOM-element.
+     * Value: A string that is the DOM-element.
+     */
+    container: string;
+    /**
+     * A handler for the Showing event.
+     * Value: An <see cref="ASPxClientHintShowingEventHandler" /> delegate method allowing you to implement custom processing.
+     */
+    onShowing: ASPxClientHintShowingEventHandler;
+    /**
+     * A handler for the Hiding event.
+     * Value: An <see cref="ASPxClientHintHidingEventHandler" /> delegate method allowing you to implement custom processing.
+     */
+    onHiding: ASPxClientHintHidingEventHandler;
+    /**
+     * Gets or sets a value that is the hint's width.
+     * Value: A string value that is the hint's width.
+     */
+    width: string;
+    /**
+     * Gets or sets a value that is the hint's height.
+     * Value: A string value that is the hint's height.
+     */
+    height: string;
+    /**
+     * Gets or sets the X coordinate.
+     * Value: An integer value that is the X coordinate.
+     */
+    x: number;
+    /**
+     * Gets or sets the Y coordinate.
+     * Value: An integer value that is the Y coordinate.
+     */
+    y: number;
+    /**
+     * Gets or sets a value that specifies whether to flip the hint to the opposite position relative to the target element.
+     * Value: true, to flip the hint; otherwise, false.
+     */
+    allowFlip: boolean;
+    /**
+     * Gets or sets a value that specifies whether to shift a hint if its content and title are hidden outside of the client area.
+     * Value: true, to shift the hint; otherwise, false.
+     */
+    allowShift: boolean;
+    /**
+     * Gets or sets whether it should use animation effects when a hint appears.
+     * Value: true if animation is enabled; otherwise false.
+     */
+    animation: any;
+    /**
+     * Gets the offset of a hint.
+     * Value: An integer value.
+     */
+    offset: number;
+}
 /**
  * The client-side equivalent of the ASPxImageGallery control.
  */
@@ -19163,6 +23819,20 @@ interface ASPxClientLoadingPanel extends ASPxClientControl {
      */
     Hide(): void;
 }
+/**
+ * Represents the client-side equivalent of the area that is used within the Html Editor's media dialogs.
+ */
+interface ASPxClientMediaFileSelector extends ASPxClientControl {
+    /**
+     * Returns a URL text from the URL text box in Html Editor's media dialogs.
+     */
+    GetUrl(): string;
+    /**
+     * Sets a URL text in the Html Editor's media dialogs.
+     * @param url A string value that is the Url text.
+     */
+    SetUrl(url: string): void;
+}
 /**
  * Serves as the base type for the ASPxClientPopupMenu objects.
  */
@@ -19839,60 +24509,9 @@ interface ASPxClientFlashScriptCommandEventArgs extends ASPxClientEventArgs {
 interface ASPxClientOfficeDocumentLinkType {
 }
 /**
- * Serves as the base class for controls that implement panel functionality.
+ * Represents the client-side equivalent of the ASPxPager control.
  */
-interface ASPxClientPanelBase extends ASPxClientControl {
-    /**
-     * Returns the HTML code that is the content of the panel.
-     */
-    GetContentHtml(): string;
-    /**
-     * Sets the HTML content for the panel.
-     * @param html A string value that is the HTML code defining the content of the panel.
-     */
-    SetContentHtml(html: string): void;
-    /**
-     * Sets a value specifying whether the panel is enabled.
-     * @param enabled true to enable the panel; false to disable it.
-     */
-    SetEnabled(enabled: boolean): void;
-    /**
-     * Returns a value specifying whether a panel is enabled.
-     */
-    GetEnabled(): boolean;
-}
-/**
- * Represents a client-side equivalent of the ASPxPanel control.
- */
-interface ASPxClientPanel extends ASPxClientPanelBase {
-    /**
-     * Occurs when the expanded panel is closed.
-     */
-    Collapsed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
-    /**
-     * Occurs when an end-user opens the expand panel.
-     */
-    Expanded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
-    /**
-     * Expands or collapses the client panel.
-     */
-    Toggle(): void;
-    /**
-     * Returns a value specifying whether the panel can be expanded.
-     */
-    IsExpandable(): boolean;
-    /**
-     * Returns a value specifying whether the panel is expanded.
-     */
-    IsExpanded(): boolean;
-    /**
-     * Expands the collapsed panel.
-     */
-    Expand(): void;
-    /**
-     * Collapses the expanded panel.
-     */
-    Collapse(): void;
+interface ASPxClientPager extends ASPxClientControl {
 }
 /**
  * Represents a client-side equivalent of the ASPxPopupControl control.
@@ -21728,6 +26347,10 @@ interface ASPxClientUploadControl extends ASPxClientControl {
      * Occurs on the client side when the file input elements count is changed.
      */
     FileInputCountChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Enables you to specify whether the selected file(s) are valid and provide an error text.
+     */
+    ValidationErrorOccurred: ASPxClientEvent<ASPxClientUploadControlValidationErrorOccurredEventHandler<ASPxClientUploadControl>>;
     /**
      * Fires when the mouse enters a drop zone or an external drop zone element while dragging a file.
      */
@@ -21736,6 +26359,10 @@ interface ASPxClientUploadControl extends ASPxClientControl {
      * Fires when the mouse leaves a drop zone or an external drop zone element while dragging a file.
      */
     DropZoneLeave: ASPxClientEvent<ASPxClientUploadControlDropZoneLeaveEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Specifies whether the upload control's Advanced mode is enabled.
+     */
+    IsAdvancedModeEnabled(): boolean;
     /**
      * Initiates uploading of the specified file to the web server's memory.
      */
@@ -21754,6 +26381,16 @@ interface ASPxClientUploadControl extends ASPxClientControl {
      * @param fileIndex An integer value that is the zero-based index of an item in the file list.
      */
     RemoveFileFromSelection(fileIndex: number): void;
+    /**
+     * Removes the specified file from the list of files selected for uploading in the upload control.
+     * @param file An ASPxClientUploadControl object that is the file to be removed from the list of files.
+     */
+    RemoveFileFromSelection(file: ASPxClientUploadControlFile): void;
+    /**
+     * Returns files selected for uploading within the specified file input.
+     * @param inputIndex An integer value that specifies the index of a file input. Default value is "0".
+     */
+    GetSelectedFiles(inputIndex: number): ASPxClientUploadControlFile[];
     /**
      * Gets the text displayed within the edit box of the specified file input element.
      * @param index An integer value that specifies the required file input element's index.
@@ -21973,6 +26610,112 @@ interface ASPxClientUploadControlUploadingProgressChangedEventArgs extends ASPxC
      */
     progress: number;
 }
+/**
+ * A method that will handle the ValidationErrorOccurred client event.
+ */
+interface ASPxClientUploadControlValidationErrorOccurredEventHandler<S> {
+    /**
+     * A method that will handle the ValidationErrorOccurred event.
+     * @param source The event source.
+     * @param e An ASPxClientUploadControlValidationErrorOccurredEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlValidationErrorOccurredEventArgs): void;
+}
+/**
+ * Provides data for the ValidationErrorOccurred event.
+ */
+interface ASPxClientUploadControlValidationErrorOccurredEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the error text.
+     * Value: A string value that represents the error text.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an alert message is displayed when the ValidationErrorOccurred event fires.
+     * Value: true, to display an alert message; otherwise, false.
+     */
+    showAlert: boolean;
+    /**
+     * Gets the validation settings for the selected files.
+     * Value: An ASPxClientUploadControlValidationSettings object that provides validation settings.
+     */
+    validationSettings: ASPxClientUploadControlValidationSettings;
+    /**
+     * Returns an array of invalid files.
+     * Value: An array of the ASPxClientUploadControlInvalidFileInfo objects.
+     */
+    invalidFiles: ASPxClientUploadControlInvalidFileInfo[];
+}
+/**
+ * Contains settings that relate to the ValidationErrorOccurred client event.
+ */
+interface ASPxClientUploadControlValidationSettings {
+    /**
+     * Gets the maximum file size.
+     * Value: An <see cref="Int64" /> value that specifies the maximum file size, in bytes.
+     */
+    maxFileSize: any;
+    /**
+     * Gets the maximum count of files that can be selected for uploading at once.
+     * Value: An integer value that specifies the maximum count of files.
+     */
+    maxFileCount: number;
+    /**
+     * Gets the allowed file extensions.
+     * Value: An array of string values that contains file extensions that are allowed.
+     */
+    allowedFileExtensions: string[];
+    /**
+     * Gets which characters in a file name are not allowed.
+     * Value: An array of string values that contains characters that are not allowed.
+     */
+    invalidFileNameCharacters: string[];
+}
+/**
+ * Contains settings of the file that hasn't passed validation.
+ */
+interface ASPxClientUploadControlInvalidFileInfo {
+    /**
+     * Gets the name of the invalid file.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+    /**
+     * Gets the size of the invalid file.
+     * Value: An integer value that specifies the file size.
+     */
+    fileSize: number;
+    /**
+     * Gets the error type.
+     * Value: An ASPxClientUploadControlValidationErrorTypeConsts object that provides possible types of errors.
+     */
+    errorType: ASPxClientUploadControlValidationErrorTypeConsts;
+}
+/**
+ * Declares client constants containing codes of validation errors that can occur while selecting files for uploading.
+ */
+interface ASPxClientUploadControlValidationErrorTypeConsts {
+}
+/**
+ * Represents a client file that corresponds to a particular file selected for uploading in the upload control.
+ */
+interface ASPxClientUploadControlFile {
+    /**
+     * Gets the name of the file selected for uploading.
+     * Value: A string value that specifies the file's name.
+     */
+    name: string;
+    /**
+     * Gets the size of the file selected for uploading.
+     * Value: An Int64 value specifying the file's size, in bytes.
+     */
+    size: any;
+    /**
+     * Provides access to the file as a native Javascript object.
+     * Value: A JavaScript object that is the file selected for uploading.
+     */
+    sourceFileObject: any;
+}
 /**
  * A method that will handle the DropZoneEnter event.
  */
@@ -22919,6 +27662,12 @@ interface ASPxClientXYDiagram2D extends ASPxClientXYDiagramBase {
      * @param pane An ASPxClientXYDiagramPane object, representing the pane.
      */
     DiagramToPoint(argument: Object, value: Object, axisX: ASPxClientAxis2D, axisY: ASPxClientAxis2D, pane: ASPxClientXYDiagramPane): ASPxClientControlCoordinates;
+    /**
+     * Shows the Crosshair Cursor at the point with the specified coordinates.
+     * @param screenX The horizontal coordinate that is related to the top-left angle of the chart.
+     * @param screenY The vertical coordinate that is related to the top-left angle of the chart.
+     */
+    ShowCrosshair(screenX: number, screenY: number): void;
 }
 /**
  * Represents the client-side equivalent of the XYDiagram class.
@@ -23941,6 +28690,16 @@ interface ASPxClientCrosshairOptions extends ASPxClientWebChartEmptyElement {
      * Value: A String, which represents the group header's pattern.
      */
     groupHeaderPattern: string;
+    /**
+     * Gets a value that specifies whether the Crosshair cursor should show points that are out of visual range.
+     * Value: true if the out of visual range points should be shown in the Crosshair label; otherwise false.
+     */
+    showOutOfRangePoints: boolean;
+    /**
+     * Gets the identifier specifying the behavior of the selection of points shown in the crosshair label.
+     * Value: The selection behavior identifier.
+     */
+    valueSelectionMode: string;
     /**
      * Gets the color of a crosshair argument line.
      * Value: A String value, specifying the color of a crosshair argument line.
@@ -24267,69 +29026,9 @@ interface ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<S> {
     /**
      * A method that will handle the CustomizeToolbarActions event.
      * @param source The event sender.
-     * @param e An ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs object that contains data related to the event.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
      */
-    (source: S, e: ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs): void;
-}
-/**
- * Provides settings to the actions listed in a Query Builder menu.
- */
-interface ASPxClientQueryBuilderMenuAction {
-    /**
-     * Provides access to the text for the command.
-     * Value: A String value.
-     */
-    text: string;
-    /**
-     * Provides access to the CSS class of the command's glyph.
-     * Value: A String value.
-     */
-    imageClassName: string;
-    /**
-     * Provides access to the action performed when a Query Builder's button is clicked.
-     * Value: The specific action implementation.
-     */
-    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;
-    /**
-     * Provides access to the value that specifies whether or not the command is visible in the Query Builder user interface.
-     * Value: true if the command is visible; otherwise false.
-     */
-    visible: boolean;
-    /**
-     * Provides access to the keyboard shortcut used to invoke the command.
-     * Value: A String value.
-     */
-    hotKey: string;
-    /**
-     * Provides access to the value that specifies whether or not the command has a visual separator.
-     * Value: true, if the command has a visual separator; otherwise, false.
-     */
-    hasSeparator: string;
-    /**
-     * Provides access to the location of the displayed command.
-     * Value: A String value.
-     */
-    container: string;
-}
-/**
- * Provides data for the CustomizeToolbarActions event.
- */
-interface ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs extends ASPxClientEventArgs {
-    /**
-     * Returns the collection of customized menu actions.
-     * Value: An ASPxClientQueryBuilderMenuAction array.
-     */
-    Actions: ASPxClientQueryBuilderMenuAction[];
-    /**
-     * Returns a menu action with the specified ID.
-     * @param actionId A String value, specifying the action ID.
-     */
-    GetById(actionId: string): ASPxClientQueryBuilderMenuAction;
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
 }
 /**
  * The client-side equivalent of the Web Report Designer control.
@@ -24352,7 +29051,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     SaveCommandExecute: ASPxClientEvent<ASPxClientReportDesignerSaveCommandExecuteEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Enables you to customize the menu actions of a Web Report Designer.
+     * Enables you to customize the menu actions of the Web Report Designer.
      */
     CustomizeMenuActions: ASPxClientEvent<ASPxClientReportDesignerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
     /**
@@ -24367,6 +29066,78 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      * Occurs on the client side when the Report Designer is being closed.
      */
     ExitDesigner: ASPxClientEvent<ASPxClientReportDesignerExitDesignerEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report is about to be saved in the Web Report Designer.
+     */
+    ReportSaving: ASPxClientEvent<ASPxClientReportDesignerReportSavingEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report has been saved in the Web Report Designer.
+     */
+    ReportSaved: ASPxClientEvent<ASPxClientReportDesignerReportSavedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report is about to be opened in the Web Report Designer.
+     */
+    ReportOpening: ASPxClientEvent<ASPxClientReportDesignerReportOpeningEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report has been opened in the Web Report Designer.
+     */
+    ReportOpened: ASPxClientEvent<ASPxClientReportDesignerReportOpenedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client each time a server-side error raises.
+     */
+    OnServerError: ASPxClientEvent<ASPxClientReportDesignerErrorEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after a component has been added to the report currently being edited in the Web Report Designer.
+     */
+    ComponentAdded: ASPxClientEvent<ASPxClientReportDesignerComponentAddedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize UI elements of the Web Report Designer.
+     */
+    CustomizeElements: ASPxClientEvent<ASPxClientReportDesignerCustomizeElementsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Save dialog of the Web Report Designer.
+     */
+    CustomizeSaveDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeSaveDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Save Report dialog of the Web Report Designer.
+     */
+    CustomizeSaveAsDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeSaveAsDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Open Report dialog of the Web Report Designer.
+     */
+    CustomizeOpenDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeOpenDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Toolbox of the Web Report Designer.
+     */
+    CustomizeToolbox: ASPxClientEvent<ASPxClientReportDesignerCustomizeToolboxEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after a report has been switched to Print Preview.
+     */
+    PreviewDocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a value of an editing field changes in Print Preview.
+     */
+    PreviewEditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize UI elements of a Document Viewer built into a Web Report Designer.
+     */
+    PreviewCustomizeElements: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeElementsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the actions of a Document Viewer built into a Web Report Designer.
+     */
+    PreviewCustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when the left mouse button has been clicked over a report document in Print Preview.
+     */
+    PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after report parameter values have been reset to their default values in Print Preview.
+     */
+    PreviewParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after report parameter values have been submitted in Print Preview.
+     */
+    PreviewParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientReportDesigner>>;
     /**
      * Sends a callback to the server with the specified argument.
      * @param arg A String value, specifying the callback argument.
@@ -24387,16 +29158,30 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      * Returns the object model of a Web Report Designer.
      */
     GetDesignerModel(): Object;
+    /**
+     * Provides access to the preview model of the ASPxClientReportDesigner.
+     */
+    GetPreviewModel(): Object;
+    /**
+     * Returns information about the specified property of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param path A string that specifies the path to the property.
+     */
+    GetPropertyInfo(controlType: string, path: string): ASPxDesignerElementSerializationInfo;
+    /**
+     * Returns information about the specified properties of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param path An array of strings that specify paths to properties.
+     */
+    GetPropertyInfo(controlType: string, path: string[]): ASPxDesignerElementSerializationInfo;
+    /**
+     * Returns actions performed by buttons available in the menu and toolbar of the Web Report Designer.
+     */
+    GetButtonStorage(): Object;
     /**
      * Gets a client-side model of the currently opened report serialized to Json.
      */
     GetJsonReportModel(): string;
-    /**
-     * Returns serialization information for the specific property of the specific control type.
-     * @param controlType A string that identifies the name of the control type for which serialization information is to be returned.
-     * @param propertyDisplayName A string that identifies the name of the property for which serialization information is to be returned.
-     */
-    GetPropertyInfo(controlType: string, propertyDisplayName: string): ASPxDesignerElementSerializationInfo;
     /**
      * Indicates whether or not the current ASPxClientReportDesigner instance has been modified.
      */
@@ -24405,6 +29190,76 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      * Resets the value returned by the IsModified method.
      */
     ResetIsModified(): void;
+    /**
+     * Adds a custom property to the Properties Panel.
+     * @param groupName A string that specifies the name of group to which a property should be added.
+     * @param property An object that provides information required to serialize a property.
+     */
+    AddToPropertyGrid(groupName: string, property: ASPxDesignerElementSerializationInfo): void;
+    /**
+     * Adds a custom parameter type to the Web End-User Report Designer.
+     * @param parameterInfo An object that provides information about a parameter type to be added.
+     * @param editorOptions An object that provides information about an editor used to specify parameter values in design mode.
+     */
+    AddParameterType(parameterInfo: ASPxDesignerParameterType, editorOptions: ASPxDesignerEditorOptions): void;
+    /**
+     * Removes the specified parameter type from the Web End-User Report Designer.
+     * @param parameterType A string that specifies a parameter type to be deleted.
+     */
+    RemoveParameterType(parameterType: string): void;
+    /**
+     * Returns an object that contains information on the specified parameter type.
+     * @param parameterType A string that specifies a parameter type.
+     */
+    GetParameterInfo(parameterType: string): ASPxDesignerParameterType;
+    /**
+     * Returns a value editor associated with the specified parameter type.
+     * @param parameterType A string that specifies a parameter type.
+     */
+    GetParameterEditor(parameterType: string): ASPxDesignerEditorOptions;
+    /**
+     * Returns the report layout stored in a report storage under the specified URL.
+     * @param url A string that specifies the report URL.
+     */
+    ReportStorageGetData(url: string): any;
+    /**
+     * Stores the specified report to a report storage using the specified URL.
+     * @param reportLayout A string that specifies the report layout to be saved.
+     * @param url A string that specifies the URL used to save a report.
+     */
+    ReportStorageSetData(reportLayout: string, url: string): any;
+    /**
+     * Stores the specified report to a report storage using a new URL.
+     * @param reportLayout A string that specifies the report layout to be saved.
+     * @param url A string that specifies the default report URL.
+     */
+    ReportStorageSetNewData(reportLayout: string, url: string): any;
+    /**
+     * Saves the current report.
+     */
+    SaveReport(): any;
+    /**
+     * Closes the report tab currently being opened in the Web Report Designer.
+     */
+    CloseCurrentTab(): void;
+    /**
+     * Saves the current report under a new name.
+     * @param reportName A string that specifies the report name.
+     */
+    SaveNewReport(reportName: string): any;
+    /**
+     * Returns the report URLs and display names existing in a report storage.
+     */
+    ReportStorageGetUrls(): any;
+    /**
+     * Opens the specified report on the client side of the Web Report Designer.
+     * @param url A string that specifies the URL of a report to be opened.
+     */
+    OpenReport(url: string): void;
+    /**
+     * Switches the Web Report Designer to the preview mode.
+     */
+    ShowPreview(): void;
 }
 /**
  * A method that will handle the SaveCommandExecute event.
@@ -24427,6 +29282,114 @@ interface ASPxClientReportDesignerSaveCommandExecuteEventArgs extends ASPxClient
      */
     handled: boolean;
 }
+/**
+ * Provides data for the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * Provides data for the events related to opening and saving reports in the Web Report Designer.
+ */
+interface ASPxClientReportDesignerDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies the URL of the report currently being processed.
+     * Value: A string that specifies the URL of the report currently being processed.
+     */
+    Url: string;
+    /**
+     * Specifies the report currently being processed.
+     * Value: An object that specifies the report currently being processed.
+     */
+    Report: Object;
+    /**
+     * Specifies whether or not the operation performed with a report should be canceled.
+     * Value: true, if the operation should be canceled; otherwise, false.
+     */
+    Cancel: boolean;
+}
+/**
+ * Provides data for the OnServerError event.
+ */
+interface ASPxClientReportDesignerErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to information about a server-side error.
+     * Value: An object that provides information about an error.
+     */
+    Error: Object;
+}
+/**
+ * Provides data for the ComponentAdded event.
+ */
+interface ASPxClientReportDesignerComponentAddedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the model of a component that has been added to a report.
+     * Value: An object that specifies the component model.
+     */
+    Model: Object;
+    /**
+     * Gets the parent of a component that has been added to a report.
+     * Value: An object that specifies the component parent.
+     */
+    Parent: Object;
+}
+/**
+ * Provides data for the CustomizeSaveDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Save dialog.
+     * Value: An object that specifies the Save dialog.
+     */
+    Popup: ASPxDesignerSaveDialog;
+    /**
+     * Customizes the Save dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Save dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeSaveAsDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Save Report dialog.
+     * Value: An object that specifies the  Save Report dialog.
+     */
+    Popup: ASPxDesignerSaveAsDialog;
+    /**
+     * Customizes the Save Report dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Save Report dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeOpenDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeOpenDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Open Report dialog.
+     * Value: An object that specifies the Open Report dialog.
+     */
+    Popup: ASPxDesignerOpenDialog;
+    /**
+     * Customizes the Open Report dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Open Report dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeToolbox event.
+ */
+interface ASPxClientReportDesignerCustomizeToolboxEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides information about all controls available in the Toolbox.
+     * Value: An ASPxDesignerControlsFactory object that provides information about toolbox controls.
+     */
+    ControlsFactory: ASPxDesignerControlsFactory;
+}
 /**
  * A method that will handle the CustomizeMenuActions event.
  */
@@ -24434,76 +29397,19 @@ interface ASPxClientReportDesignerCustomizeMenuActionsEventHandler<S> {
     /**
      * A method that will handle the CustomizeMenuActions event.
      * @param source The event sender.
-     * @param e An ASPxClientReportDesignerCustomizeMenuActionsEventArgs object that contains data related to the event.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
      */
-    (source: S, e: ASPxClientReportDesignerCustomizeMenuActionsEventArgs): void;
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
 }
 /**
- * Provides settings to the actions listed in a Web Report Designer menu.
+ * A method that will handle the CustomizeParameterLookUpSource event.
  */
-interface ASPxClientReportDesignerMenuAction {
-    /**
-     * Provides access to the text for the command.
-     * Value: A String value.
-     */
-    text: string;
-    /**
-     * Provides access to the CSS class of the command's glyph.
-     * Value: A String value.
-     */
-    imageClassName: string;
-    /**
-     * Provides access to the action performed when a Web Report Designer's button is clicked.
-     * Value: The specific action implementation.
-     */
-    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;
-    /**
-     * Provides access to the value that specifies whether or not the command is visible in the designer user interface.
-     * Value: true if the command is visible; otherwise false.
-     */
-    visible: boolean;
-    /**
-     * Provides access to the keyboard shortcut used to invoke the command.
-     * Value: A String value.
-     */
-    hotKey: string;
-    /**
-     * Provides access to the value that specifies whether or not the command has a visual separator.
-     * Value: true, if the command has a visual separator; otherwise, false.
-     */
-    hasSeparator: string;
-    /**
-     * Provides access to the location of the displayed command.
-     * Value: A String value.
-     */
-    container: string;
-}
-/**
- * Provides data for the CustomizeMenuActions event.
- */
-interface ASPxClientReportDesignerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
-    /**
-     * Returns the collection of customized menu actions.
-     * Value: An ASPxClientReportDesignerMenuAction array.
-     */
-    Actions: ASPxClientReportDesignerMenuAction[];
-    /**
-     * Returns a menu action with the specified ID.
-     * @param actionId A String value, specifying the action ID.
-     */
-    GetById(actionId: string): ASPxClientReportDesignerMenuAction;
-}
-/**
- * Provides data for the ExitDesigner event.
- */
-interface ASPxClientReportDesignerExitDesignerEventArgs extends ASPxClientEventArgs {
-}
 interface ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
     (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
 }
 /**
@@ -24517,6 +29423,17 @@ interface ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<S> {
      */
     (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
 }
+/**
+ * A method that will handle the CustomizeElements event.
+ */
+interface ASPxClientReportDesignerCustomizeElementsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeElements event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeElementsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeElementsEventArgs): void;
+}
 /**
  * A method that will handle the ExitDesigner event.
  */
@@ -24528,6 +29445,422 @@ interface ASPxClientReportDesignerExitDesignerEventHandler<S> {
      */
     (source: S, e: ASPxClientReportDesignerExitDesignerEventArgs): void;
 }
+/**
+ * A method that will handle the ReportSaving event.
+ */
+interface ASPxClientReportDesignerReportSavingEventHandler<S> {
+    /**
+     * A method that will handle the ReportSaving event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportSaved event.
+ */
+interface ASPxClientReportDesignerReportSavedEventHandler<S> {
+    /**
+     * A method that will handle the ReportSaved event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportOpening event.
+ */
+interface ASPxClientReportDesignerReportOpeningEventHandler<S> {
+    /**
+     * A method that will handle the ReportOpening event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportOpened event.
+ */
+interface ASPxClientReportDesignerReportOpenedEventHandler<S> {
+    /**
+     * A method that will handle the ReportOpened event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the OnServerError event.
+ */
+interface ASPxClientReportDesignerErrorEventHandler<S> {
+    /**
+     * A method that will handle the OnServerError event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerErrorEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerErrorEventArgs): void;
+}
+/**
+ * A method that will handle the ComponentAdded event.
+ */
+interface ASPxClientReportDesignerComponentAddedEventHandler<S> {
+    /**
+     * A method that will handle the ComponentAdded event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerComponentAddedEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerComponentAddedEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeSaveDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeSaveDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeSaveDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeSaveDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeSaveAsDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveAsDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeSaveAsDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeOpenDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeOpenDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeOpenDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeOpenDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeOpenDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeToolbox event.
+ */
+interface ASPxClientReportDesignerCustomizeToolboxEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeToolbox event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeToolboxEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeToolboxEventArgs): void;
+}
+/**
+ * Provides information about a value editor used in the Property Grid.
+ */
+interface ASPxDesignerEditorOptions {
+    /**
+     * Provides access to the name of an HTML template specifying the editor and header of a complex object.
+     * Value: A string that specifies the HTML template.
+     */
+    header: string;
+    /**
+     * Provides access to the name of an HTML template used by a complex object's editor.
+     * Value: A string that specifies the name of an HTML template.
+     */
+    content: string;
+    /**
+     * Provides access to the type of the editor model.
+     * Value: An object that specifies the editor type.
+     */
+    editorType: Object;
+}
+/**
+ * Provides functionality to an undo/redo engine in the Web Report Designer.
+ */
+interface ASPxDesignerUndoEngine {
+    /**
+     * Provides access to a value that specifies whether or not the redo action can currently be performed.
+     * Value: A knockout observable boolean object, whose value is true if the redo action can be performed, and false otherwise.
+     */
+    redoEnabled: any;
+    /**
+     * Provides access to a value that specifies whether or not the undo action can currently be performed.
+     * Value: A knockout observable boolean object, whose value is true if the undo action can be performed, and false otherwise.
+     */
+    undoEnabled: any;
+    /**
+     * Provides access to a value that specifies whether or not a report has been changed.
+     * Value: A knockout observable boolean object, whose value is true if the report has been modified, and false otherwise.
+     */
+    isDirty: any;
+    /**
+     * Undoes all changes made to a report.
+     */
+    undoAll(): void;
+    /**
+     * Clears information about edit operations made to a report, so they cannot not be undone.
+     */
+    clearHistory(): void;
+    /**
+     * Undoes the last edit action in a report.
+     */
+    undo(): void;
+    /**
+     * Reverses the results of the last undo action.
+     */
+    redo(): void;
+}
+/**
+ * Provides functionality for a tab displayed a report in the Web Report Designer.
+ */
+interface ASPxDesignerNavigateTab {
+    /**
+     * Provides access to a value that specifies the display name of the current tab.
+     * Value: A knockout computed string that specifies the tab's display name.
+     */
+    displayName: any;
+    /**
+     * Provides access to a value that specifies whether or not the report in the current tab has been changed.
+     * Value: A knockout computed boolean object, whose value is true if the report has been modified, and false otherwise.
+     */
+    isDirty: any;
+    /**
+     * 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;
+    /**
+     * 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.
+     */
+    undoEngine: ASPxDesignerUndoEngine;
+    /**
+     * Provides access to the URL of a report opened in the current tab.
+     * Value: A knockout observable string that specifies the report URL.
+     */
+    url: any;
+}
+/**
+ * A model of dialogs used to save and open reports in the Web Report Designer.
+ */
+interface ASPxDesignerDialogModel {
+    /**
+     * Provides access to the collection of buttons displayed in a dialog.
+     * Value: An array of objects that specify buttons displayed in a dialog.
+     */
+    popupButtons: Object[];
+    /**
+     * Specifies a function that gets the report URL.
+     */
+    getUrl(): string;
+    /**
+     * Specifies a function that sets the report URL.
+     * @param url A string that specifies the report URL.
+     */
+    setUrl(url: string): void;
+    /**
+     * Specifies a function to be executed when showing a dialog.
+     * @param tab An object that specifies the report tab for which a dialog is invoked.
+     */
+    onShow(tab: ASPxDesignerNavigateTab): void;
+}
+/**
+ * Provides the base functionality for dialogs used to open and save reports on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerReportDialogBase {
+    /**
+     * Provides access to a dialog's width.
+     * Value: A knockout observable object that specifies a dialog's width.
+     */
+    width: any;
+    /**
+     * Provides access to a dialog's height.
+     * Value: A knockout observable object that specifies a dialog's height.
+     */
+    height: any;
+    /**
+     * Provides access to the name of an HTML template used by a dialog.
+     * Value: A knockout observable string that specifies the name of the HTML template used by a dialog.
+     */
+    template: any;
+    /**
+     * Provides access to buttons displayed in a dialog.
+     * Value: An array of objects that specify buttons displayed in the dialog.
+     */
+    buttons: Object[];
+    /**
+     * Provides access to a dialog's model.
+     * Value: A knockout observable object of the ASPxDesignerDialogModel type.
+     */
+    model: any;
+    /**
+     * Provides access to a report tab for which a dialog appears.
+     * Value: A knockout observable object of the ASPxDesignerNavigateTab type.
+     */
+    tab: any;
+    /**
+     * Provides access to a value that specifies a dialog's visibility state.
+     * Value: true, if the dialog is visible; otherwise, false;
+     */
+    visible: any;
+    /**
+     * Provides access to a dialog's title.
+     * Value: A string that specifies a dialog's title.
+     */
+    title: string;
+    /**
+     * Shows the dialog for the specified report tab.
+     * @param tab A report tab for which the dialog should be shown.
+     */
+    show(tab: ASPxDesignerNavigateTab): void;
+    /**
+     * Customizes the dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model An object that specifies the dialog model.
+     */
+    customize(template: string, model: ASPxDesignerDialogModel): void;
+    /**
+     * Cancels the dialog.
+     */
+    cancel(): void;
+}
+/**
+ * Provides functionality for the Save dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerSaveDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Provides access to the Save Report dialog that appears if a user selected to save changes in the Save dialog.
+     * Value: An object that specifies the Save As dialog.
+     */
+    saveReportDialog: ASPxDesignerSaveAsDialog;
+    /**
+     * Saves the report with the specified URL.
+     * @param url A string that specifies an URL of the report to be saved.
+     */
+    save(url: string): void;
+    /**
+     * Closes the dialog without saving the current report.
+     */
+    notSave(): void;
+}
+/**
+ * Provides functionality for the Save Report dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerSaveAsDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Saves the report with the specified URL.
+     * @param url A string that specifies a URL of the report to be saved.
+     */
+    save(url: string): void;
+}
+/**
+ * Provides functionality for the Open Report dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerOpenDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Opens the report with the specified URL.
+     * @param url A string that specifies an URL of the report to be opened.
+     */
+    open(url: string): void;
+}
+/**
+ * Provides information about a toolbox control item.
+ */
+interface ASPxDesignerToolboxItem {
+    /**
+     * Provides access to information required to serialize a toolbox control.
+     * Value: An array of ASPxDesignerElementSerializationInfo objects that provide information required to serialize an element.
+     */
+    info: ASPxDesignerElementSerializationInfo[];
+    /**
+     * Provides access to a surface type of toolbox control.
+     * Value: A surface type of toolbox control.
+     */
+    surfaceType: any;
+    /**
+     * Provides access to a toolbox control type.
+     * Value: A toolbox control type.
+     */
+    type: any;
+    /**
+     * Provides access to a zero-based index of a control in the toolbox.
+     * Value: An integer value that specifies a control index in the toolbox.
+     */
+    toolboxIndex: number;
+    /**
+     * Provides access to the default property values used for a toolbox control.
+     * Value: An object that specifies default propery values.
+     */
+    defaultVal: Object;
+    /**
+     * Provides access to popular properties of a toolbox control.
+     * Value: An array of strings that specify names of popular properties.
+     */
+    popularProperties: string[];
+    /**
+     * Gets whether a control item is displayed in a toolbox.
+     * Value: true, if the control is available in the toolbox; otherwise, false.
+     */
+    isToolboxItem: boolean;
+}
+/**
+ * Enables you to customize controls available in the Toolbox of the Web Report Designer.
+ */
+interface ASPxDesignerControlsFactory {
+    /**
+     * Returns information about the specified toolbox control.
+     * @param controlType A string that specifies the control type.
+     */
+    getControlInfo(controlType: string): ASPxDesignerToolboxItem;
+    /**
+     * Returns a control type by the specified model.
+     * @param model An object that specifies the control model.
+     */
+    getControlType(model: Object): string;
+    /**
+     * Registers the specified control in the Toolbox of the Web Report Designer.
+     * @param typeName A string that specifies the name of a custom control.
+     * @param metadata An ASPxDesignerToolboxItem object that provides information about a toolbox item.
+     */
+    registerControl(typeName: string, metadata: ASPxDesignerToolboxItem): void;
+    /**
+     * Returns information about the specified property of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param propertyDisplayName A string that specifies the property display name.
+     */
+    getPropertyInfo(controlType: string, propertyDisplayName: string): ASPxDesignerElementSerializationInfo;
+}
+/**
+ * Provides information about a report parameter type.
+ */
+interface ASPxDesignerParameterType {
+    /**
+     * Provides access to an actual parameter type.
+     * Value: A string that specifies the parameter type.
+     */
+    value: string;
+    /**
+     * Provides access to a text displayed to end-users when creating parameters of the current type.
+     * Value: A string displayed to end-users.
+     */
+    displayValue: string;
+    /**
+     * Provides access to the default value for parameters of the current type.
+     * Value: An object that specifies the default value.
+     */
+    defaultVal: Object;
+    /**
+     * Provides access to the specifics of a current parameter type.
+     * Value: Parameter type specifics.
+     */
+    specifics: string;
+    /**
+     * Converts the specified parameter value to the current parameter type.
+     * @param val An object that specifies the parameter value to be converted.
+     */
+    valueConverter(val: Object): Object;
+}
 /**
  * The client-side equivalent of the ASPxClientDocumentViewer control's Document Map.
  */
@@ -24562,8 +29895,19 @@ interface ASPxClientReportParametersPanel extends ASPxClientControl {
      */
     GetEditorByParameterName(parameterName: string): ASPxClientControl;
 }
+/**
+ * Provides information about a report parameter on the client side.
+ */
 interface ASPxClientReportParameterInfo {
+    /**
+     * Specifies the parameter path, relative to its parent container (e.g., "subreport1.subreportParameter1" for a subreport's parameter, or "parameter1" for a report's parameter).
+     * Value: A String value, specifying the parameter path (e.g., "subreport1.subreportParameter1").
+     */
     Path: string;
+    /**
+     * Provides access to a parameter value on the client.
+     * Value: A Object value.
+     */
     Value: Object;
 }
 /**
@@ -24638,11 +29982,19 @@ interface ASPxClientReportViewer extends ASPxClientControl {
      */
     IsSearchAllowed(): boolean;
 }
+/**
+ * A method that will handle the PageLoad events.
+ */
 interface ASPxClientReportViewerPageLoadEventHandler<S> {
+    /**
+     * A method that will handle the PageLoad event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportViewerPageLoadEventArgs object that contains data related to the event.
+     */
     (source: S, e: ASPxClientReportViewerPageLoadEventArgs): void;
 }
 /**
- * Provides data for a Report Viewer's PageLoad event on the client side.
+ * Provides data for the PageLoad events on the client side.
  */
 interface ASPxClientReportViewerPageLoadEventArgs extends ASPxClientEventArgs {
     /**
@@ -24679,11 +30031,116 @@ interface ASPxClientCustomizeParameterEditorsEventArgs extends ASPxClientEventAr
      */
     info: ASPxDesignerElementSerializationInfo;
 }
+/**
+ * Provides data for the CustomizeParameterLookUpSource events.
+ */
 interface ASPxClientCustomizeParameterLookUpSourceEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object that stores information about the parameter.
+     */
     parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to the collection of look-up parameter values.
+     * Value: An array of ASPxDesignerElementEditorItem objects that store information about look-up parameter values.
+     */
     items: ASPxDesignerElementEditorItem[];
+    /**
+     * Specifies the data source that provides look-up values for the parameter editor.
+     * Value: An Object specifying the data source that provides look-up values to the parameter editor.
+     */
     dataSource: Object;
 }
+/**
+ * Provides information about a command available in the toolbar or menu.
+ */
+interface ASPxClientMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A string that is the command text.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A string that specifies the name of the CSS class.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when a button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * 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.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: An ASPxClientMenuActionHotKey object that specifies the keyboard shortcut.
+     */
+    hotKey: ASPxClientMenuActionHotKey;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to a value that specifies the command location.
+     * Value: A string that specifies the command location.
+     */
+    container: string;
+}
+/**
+ * Provides information about a hot key used to perform an action assigned to a menu item.
+ */
+interface ASPxClientMenuActionHotKey {
+    /**
+     * Provides access to a hot key code.
+     * Value: An integer value that specifies the hot key code.
+     */
+    keyCode: number;
+    /**
+     * Provides access to a value that specifies whether the CTRL key is used in combination with a hot key.
+     * Value: true, if the CTRL key is included into the key combination; otherwise, false.
+     */
+    ctrlKey: boolean;
+}
+/**
+ * Provides data for the CustomizeMenuActions.
+ */
+interface ASPxClientCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the collection of actions available in the toolbar and menu.
+     * Value: An array of ASPxClientMenuAction objects.
+     */
+    Actions: ASPxClientMenuAction[];
+    /**
+     * Returns a menu action with the specified ID.
+     * @param actionId A String value that specifies the action ID.
+     */
+    GetById(actionId: string): ASPxClientMenuAction;
+}
+/**
+ * Provides data for the CustomizeElements events.
+ */
+interface ASPxClientCustomizeElementsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the collection of UI elements.
+     * Value: An array of the ASPxReportUIElement objects.
+     */
+    Elements: ASPxReportUIElement[];
+    /**
+     * Returns UI elements with the specified ID.
+     * @param templateId A string that specifies the element ID.
+     */
+    GetById(templateId: string): ASPxReportUIElement[];
+}
 /**
  * Provides general information about a report parameter.
  */
@@ -24793,6 +30250,11 @@ interface ASPxDesignerElementEditor {
      * Value: A String value.
      */
     content: string;
+    /**
+     * Gets additional options for <a href="https://js.devexpress.com/Documentation/Overview/">DevExtreme</a> UI widgets.
+     * Value: An object that provides editor options.
+     */
+    extendedOptions: Object;
     /**
      * Gets a nullable value, specifying the type of the editor's model.
      * Value: A Object value.
@@ -24814,10 +30276,251 @@ interface ASPxDesignerElementEditorItem {
      */
     displayValue: string;
 }
+/**
+ * Provides information about a UI element of the Web Report Designer or Web Document Viewer.
+ */
+interface ASPxReportUIElement {
+    /**
+     * Provides access to an element model.
+     * Value: An object that specifies the element model.
+     */
+    model: Object;
+    /**
+     * Provides access to the name of an HTML template used by an element.
+     * Value: A string that specifies the name of the HTML template.
+     */
+    templateName: string;
+}
+/**
+ * Provides data for the PreviewDocumentReady events.
+ */
+interface ASPxClientWebDocumentViewerDocumentReadyEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies the report ID.
+     */
+    ReportId: string;
+    /**
+     * Specifies the report document ID.
+     */
+    DocumentId: string;
+    /**
+     * Specifies the total number of pages in a report document.
+     */
+    PageCount: number;
+}
+/**
+ * Provides data for the PreviewEditingFieldChanged events.
+ */
+interface ASPxClientWebDocumentViewerEditingFieldChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an editing field whose value has been changed.
+     * Value: An object that specifies an editing field whose content has been changed.
+     */
+    Field: ASPxClientWebDocumentViewerEditingField;
+    /**
+     * Provides access to a previous value of an editing field.
+     * Value: An object that specifies an editing field's previous value.
+     */
+    OldValue: Object;
+    /**
+     * Provides access to a new value of an editing field.
+     * Value: An object that specifies an editing field's new value.
+     */
+    NewValue: Object;
+}
+/**
+ * Provides functionality for a field whose content can be edited in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerEditingField {
+    /**
+     * Provides access to a value that specifies whether or not an editing field's content can be customized in Print Preview.
+     * Returns: true, if a field cannot be edited in Print Preview; otherwise, false.
+     */
+    readOnly: any;
+    /**
+     * Provides access to the current value of an editing field.
+     * Returns: An object that specifies the current field value.
+     */
+    editValue: any;
+    /**
+     * Returns the unique identifier of an editing field.
+     */
+    id(): string;
+    /**
+     * Returns the ID of a logical group to which an editing field for a check box belongs.
+     */
+    groupID(): string;
+    /**
+     * Returns the name of an editor used to change a field value in Print Preview.
+     */
+    editorName(): string;
+    /**
+     * Returns the index of the page on which an editing field is located.
+     */
+    pageIndex(): number;
+}
+/**
+ * Provides data for the PreviewParametersSubmitted events.
+ */
+interface ASPxClientParametersSubmittedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to a View Model for report parameters.
+     * Value: A View Model object.
+     */
+    ParametersViewModel: Object;
+    /**
+     * Provides access to report parameters and their submitted values.
+     * Value: A dictionary containing the parameter names along with their values.
+     */
+    Parameters: { [key: string]: Object; };
+}
+/**
+ * Provides data for the PreviewParametersReset events.
+ */
+interface ASPxClientParametersResetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to a View Model for report parameters.
+     * Value: A View Model object.
+     */
+    ParametersViewModel: Object;
+    /**
+     * Provides access to report parameters whose values have been reset.
+     * Value: An ASPxClientWebDocumentViewerParameter array.
+     */
+    Parameters: ASPxClientWebDocumentViewerParameter[];
+}
+/**
+ * Provides general information about a report parameter on the client-side of the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerParameter {
+    /**
+     * Provides access to the current value of a report parameter.
+     * Value: An object that specifies the report parameter's current value.
+     */
+    value: Object;
+    /**
+     * Provides access to a report parameter's value type.
+     * Value: An object that specifies the report parameter type.
+     */
+    type: Object;
+    /**
+     * Provides access to a value that specifies whether or not a parameter can have multiple values.
+     * Value: true, if a parameter can have multiple values; otherwise, false.
+     */
+    isMultiValue: boolean;
+    /**
+     * Returns an object that provides general information about a report parameter.
+     */
+    getParameterDescriptor(): ASPxDesignerElementParameterDescriptor;
+}
+/**
+ * Provides data for the PreviewClick events.
+ */
+interface ASPxClientPreviewClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value specifying the zero-based index of the page that has been clicked.
+     * Value: An integer value that specifies a page index.
+     */
+    PageIndex: number;
+    /**
+     * Provides information on a visual brick representing content of a report control that has been clicked.
+     * Value: An object that provides information on a visual brick.
+     */
+    Brick: ASPxClientWebDocumentViewerBrick;
+    /**
+     * Specifies whether or not the event was handled and no default processing is required.
+     * Value: true, if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    Handled: boolean;
+    /**
+     * Specifies the default function used to handle the PreviewClick event.
+     */
+    DefaultHandler(): void;
+    /**
+     * Returns the text displayed by the Brick.
+     */
+    GetBrickText(): string;
+    /**
+     * Returns a string providing additional information on the Brick.
+     */
+    GetBrickValue(): string;
+}
+/**
+ * Provides information about a visual brick used to render a report control to construct a document in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerBrick {
+    /**
+     * Provides access to a brick's content.
+     * Value: A dictionary that stores content keys along with the corresponding contents.
+     */
+    content: { [key: string]: string; };
+    /**
+     * Provides access to navigation settings of the current brick.
+     * Value: An object that provides a brick's navigation settings.
+     */
+    navigation: ASPxClientWebDocumentViewerBrickNavigation;
+    /**
+     * Provides access to a brick's top vertical coordinate.
+     * Value: An integer value that specifies the brick's top coordinate.
+     */
+    top: number;
+    /**
+     * Provides access to a brick's left horizontal coordinate.
+     * Value: An integer value that specifies the brick's left coordinate.
+     */
+    left: number;
+    /**
+     * Provides access to a brick's width.
+     * Value: An integer value that specifies the brick width.
+     */
+    width: number;
+    /**
+     * Provides access to a brick's height.
+     * Value: An integer value that specifies the brick height.
+     */
+    height: number;
+    /**
+     * Provides access to a value that specifies whether or not the right-to-left feature is enabled for a brick.
+     * Value: true, if the right-to-left feature is enabled; otherwise, false.
+     */
+    rtl: boolean;
+}
+/**
+ * Provides navigation settings for a brick used to construct a document in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerBrickNavigation {
+    /**
+     * Provides access to the URL to navigate to when a brick is a clicked.
+     * Value: A string that specifies the URL.
+     */
+    url: string;
+    /**
+     * Provides access to a value that specifies the target window or frame in which to display the linked Web page's content when the brick is clicked.
+     * Value: A string that specifies the window or frame to which to target the URL's content.
+     */
+    target: string;
+    /**
+     * Provides access to a drill-down key.
+     * Value: A string that specifies a drill-down key.
+     */
+    drillDownKey: string;
+}
 /**
  * A client-side equivalent of the ASPxWebDocumentViewer class.
  */
 interface ASPxClientWebDocumentViewer extends ASPxClientControl {
+    /**
+     * Occurs after a report document has been loaded to the Web Document Viewer.
+     */
+    DocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a value of an editing field changes.
+     */
+    EditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Enables you to customize UI elements of the Web Document Viewer.
+     */
+    CustomizeElements: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeElementsEventHandler<ASPxClientWebDocumentViewer>>;
     /**
      * Enables you to customize the menu actions of a Web Document Viewer.
      */
@@ -24830,14 +30533,31 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
      * Occurs each time a look-up editor is created for a report parameter.
      */
     CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs when the left mouse button has been clicked over a report document.
+     */
+    PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs after report parameter values have been reset to their default values.
+     */
+    ParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs after report parameter values have been submitted.
+     */
+    ParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientWebDocumentViewer>>;
     /**
      * Provides access to the preview model of the ASPxClientWebDocumentViewer.
      */
     GetPreviewModel(): Object;
     /**
-     * Opens the specified report in the HTML5 Document Viewer.
+     * Returns a model for a report parameter.
      */
-    OpenReport(): Object;
+    GetParametersModel(): Object;
+    /**
+     * Opens the specified report on the client side of the Web Document Viewer.
+     * @param url A string that specifies the URL of a report to be opened.
+     */
+    OpenReport(url: string): any;
     /**
      * Prints the current document.
      */
@@ -24853,9 +30573,36 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
     ExportTo(): void;
     /**
      * Exports the document to a specified file format.
-     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'txt', 'xls', and 'xlsx'.
+     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
      */
     ExportTo(format: string): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value that specifies the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
+     * @param inlineResult true, to try opening the result file in a new browser tab without a download; otherwise, false.
+     */
+    ExportTo(format: string, inlineResult: boolean): void;
+    /**
+     * Returns the zero-based index of the currently displayed page.
+     */
+    GetCurrentPageIndex(): number;
+    /**
+     * Displays the report page with the specified page index.
+     * @param pageIndex A zero-based integer value that specifies the index of a page to be displayed.
+     */
+    GoToPage(pageIndex: number): void;
+    /**
+     * Closes the document currently being opened in the Web Document Viewer.
+     */
+    Close(): void;
+    /**
+     * Resets the values of report parameters to their default values.
+     */
+    ResetParameters(): void;
+    /**
+     * Starts building a report document.
+     */
+    StartBuild(): void;
     /**
      * Updates the localization settings of the ASPxClientWebDocumentViewer properties.
      * @param localization A dictionary containing the property names, along with their localized equivalents.
@@ -24863,64 +30610,37 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
     UpdateLocalization(localization: { [key: string]: string; }): void;
 }
 /**
- * Provides settings to the actions listed in a Web Document Viewer menu.
+ * A method that will handle the EditingFieldChanged event.
  */
-interface ASPxClientWebDocumentViewerMenuAction {
+interface ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<S> {
     /**
-     * Provides access to the text for the command.
-     * Value: A String value.
+     * A method that will handle the PreviewEditingFieldChanged event.
+     * @param source The event sender.
+     * @param e An ASPxClientWebDocumentViewerEditingFieldChangedEventArgs object that contains data related to the event.
      */
-    text: string;
-    /**
-     * Provides access to the CSS class of the command's glyph.
-     * Value: A String value.
-     */
-    imageClassName: string;
-    /**
-     * Provides access to the action performed when a Document Viewer's button is clicked.
-     * Value: The specific action implementation.
-     */
-    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;
-    /**
-     * Provides access to the value that specifies whether or not the command is visible in the Document Viewer user interface.
-     * Value: true if the command is visible; otherwise false.
-     */
-    visible: boolean;
-    /**
-     * Provides access to the keyboard shortcut used to invoke the command.
-     * Value: A String value.
-     */
-    hotKey: string;
-    /**
-     * Provides access to the value that specifies whether or not the command has a visual separator.
-     * Value: true, if the command has a visual separator; otherwise, false.
-     */
-    hasSeparator: string;
-    /**
-     * Provides access to the location of the displayed command.
-     * Value: A String value.
-     */
-    container: string;
+    (source: S, e: ASPxClientWebDocumentViewerEditingFieldChangedEventArgs): void;
 }
 /**
- * Provides data for the CustomizeMenuActions event.
+ * A method that will handle the DocumentReady event.
  */
-interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+interface ASPxClientWebDocumentViewerDocumentReadyEventHandler<S> {
     /**
-     * Returns the collection of customized menu actions.
-     * Value: An ASPxClientWebDocumentViewerMenuAction array.
+     * A method that will handle the PreviewDocumentReady event.
+     * @param source The event sender.
+     * @param e An ASPxClientWebDocumentViewerDocumentReadyEventArgs object that contains data related to the event.
      */
-    Actions: ASPxClientWebDocumentViewerMenuAction[];
+    (source: S, e: ASPxClientWebDocumentViewerDocumentReadyEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeElements event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeElementsEventHandler<S> {
     /**
-     * Returns a menu action with the specified ID.
-     * @param actionId A String value, specifying the action ID.
+     * A method that will handle the PreviewCustomizeElements event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeElementsEventArgs object that contains data related to the event.
      */
-    GetById(actionId: string): ASPxClientWebDocumentViewerMenuAction;
+    (source: S, e: ASPxClientCustomizeElementsEventArgs): void;
 }
 /**
  * A method that will handle the CustomizeMenuActions event.
@@ -24929,9 +30649,9 @@ interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<S> {
     /**
      * A method that will handle the CustomizeMenuActions event.
      * @param source The event sender.
-     * @param e An ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs object that contains data related to the event.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
      */
-    (source: S, e: ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs): void;
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
 }
 /**
  * A method that will handle the CustomizeParameterEditors event.
@@ -24944,8 +30664,49 @@ interface ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<S> {
      */
     (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
 }
+/**
+ * A method that will handle the CustomizeParameterLookUpSource event.
+ */
 interface ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<S> {
-    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+/**
+ * A method that will handle the PreviewClick event.
+ */
+interface ASPxClientWebDocumentViewerPreviewClickEventHandler<S> {
+    /**
+     * A method that will handle the PreviewClick event.
+     * @param source The event sender.
+     * @param e An ASPxClientPreviewClickEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientPreviewClickEventArgs): void;
+}
+/**
+ * A method that will handle the ParametersReset event.
+ */
+interface ASPxClientWebDocumentViewerParametersResetEventHandler<S> {
+    /**
+     * A method that will handle the PreviewParametersReset event.
+     * @param source The event sender.
+     * @param e An ASPxClientParametersResetEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientParametersResetEventArgs): void;
+}
+/**
+ * A method that will handle the ParametersSubmitted event.
+ */
+interface ASPxClientWebDocumentViewerParametersSubmittedEventHandler<S> {
+    /**
+     * A method that will handle the PreviewParametersSubmitted event.
+     * @param source The event sender.
+     * @param e An ASPxClientParametersSubmittedEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientParametersSubmittedEventArgs): void;
 }
 
 interface MVCxClientDashboardViewerStatic extends ASPxClientDashboardViewerStatic {
@@ -25014,15 +30775,6 @@ interface DashboardSpecialValuesStatic {
      */
     IsErrorValue(value: Object): boolean;
 }
-interface ASPxClientDashboardDesignerStatic extends ASPxClientControlStatic {
-}
-interface ASPxClientDashboardViewerStatic extends ASPxClientControlStatic {
-    /**
-     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
-     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
-     */
-    Cast(obj: Object): ASPxClientDashboardViewer;
-}
 interface DashboardExportPageLayoutStatic {
     /**
      * The page orientation used to export a dashboard (dashboard item) is portrait.
@@ -25091,6 +30843,26 @@ interface DashboardExportFilterStateStatic {
      */
     SeparatePage: string;
 }
+interface DashboardStateExportPositionStatic {
+    /**
+     * The dashboard state is placed below the exported dashboard/dashboard item.
+     */
+    Below: string;
+    /**
+     * The dashboard state is placed on a separate page.
+     */
+    SeparatePage: string;
+}
+interface DashboardStateExcelExportPositionStatic {
+    /**
+     * The dashboard state is placed below the exported data.
+     */
+    Below: string;
+    /**
+     * The dashboard state is placed on a separate sheet.
+     */
+    SeparateSheet: string;
+}
 interface DashboardExportImageFormatStatic {
     /**
      * The PNG image format.
@@ -25105,6 +30877,11 @@ interface DashboardExportImageFormatStatic {
      */
     Jpg: string;
 }
+interface ExcelExportFilterStateStatic {
+    none: string;
+    below: string;
+    separatePage: string;
+}
 interface DashboardExportExcelFormatStatic {
     /**
      * The Excel 97 - Excel 2003 (XLS) file format.
@@ -25143,6 +30920,16 @@ interface MapExportSizeModeStatic {
      */
     Zoom: string;
 }
+interface TreemapExportSizeModeStatic {
+    /**
+     * For internal use.
+     */
+    none: string;
+    /**
+     * For internal use.
+     */
+    zoom: string;
+}
 interface RangeFilterExportSizeModeStatic {
     /**
      * A Range Filter dashboard item is exported in a size identical to that shown on the dashboard.
@@ -25162,6 +30949,15 @@ interface DashboardSelectionModeStatic {
     Single: string;
     Multiple: string;
 }
+interface ASPxClientDashboardStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDashboardViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDashboardViewer;
+}
 interface ASPxClientEditBaseStatic extends ASPxClientControlStatic {
 }
 interface ASPxClientEditStatic extends ASPxClientEditBaseStatic {
@@ -25605,6 +31401,10 @@ interface ASPxClientGridViewCallbackCommandStatic {
      * Default value: "APPLYSEARCHPANELFILTER"
      */
     ApplySearchPanelFilter: string;
+    /**
+     * Default value: "APPLYCUSTOMIZATIONDIALOGCHANGES"
+     */
+    ApplyCustomizationDialogChanges: string;
     /**
      * Default value: "FILTERROWMENU"
      */
@@ -25673,6 +31473,10 @@ interface ASPxClientGridViewCallbackCommandStatic {
      * Default value: "CONTEXTMENU"
      */
     ContextMenu: string;
+    /**
+     * Default value: "TOOLBAR"
+     */
+    Toolbar: string;
     /**
      * Default value: "CUSTOMVALUES"
      */
@@ -26284,9 +32088,9 @@ interface ASPxSchedulerDateTimeHelperStatic {
      */
     ToDayTime(date: Date): any;
     /**
-     * 
-     * @param date 
-     * @param dayCount 
+     * Adds the specified number of days to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add days.
+     * @param dayCount The number of days to add.
      */
     AddDays(date: Date, dayCount: number): Date;
     /**
@@ -26340,6 +32144,16 @@ interface ASPxClientSpellCheckerStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientSpellChecker;
 }
+interface ASPxClientSpellCheckerStopCheckingReasonStatic {
+    /**
+     * Spell checking is finished normally.
+     */
+    Default: string;
+    /**
+     * The user stopped spell checking.
+     */
+    User: string;
+}
 interface ASPxClientSpreadsheetStatic extends ASPxClientControlStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -26354,6 +32168,76 @@ interface ASPxClientTreeListStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientTreeList;
 }
+interface BootstrapClientAccordionStatic extends ASPxClientNavBarStatic {
+}
+interface BootstrapClientBinaryImageStatic extends ASPxClientHyperLinkStatic {
+}
+interface BootstrapClientButtonStatic extends ASPxClientButtonStatic {
+}
+interface BootstrapClientCalendarStatic extends ASPxClientCalendarStatic {
+}
+interface BootstrapClientCallbackPanelStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientChartBaseStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPolarChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPieChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientCheckBoxStatic extends ASPxClientEditStatic {
+}
+interface BootstrapClientRadioButtonStatic extends BootstrapClientCheckBoxStatic {
+}
+interface BootstrapClientComboBoxStatic extends ASPxClientComboBoxStatic {
+}
+interface BootstrapClientDateEditStatic extends ASPxClientDateEditStatic {
+}
+interface BootstrapClientDropDownEditStatic extends ASPxClientDropDownEditStatic {
+}
+interface BootstrapClientFormLayoutStatic extends ASPxClientFormLayoutStatic {
+}
+interface BootstrapClientGridViewStatic extends ASPxClientGridViewStatic {
+}
+interface BootstrapClientHyperLinkStatic extends ASPxClientHyperLinkStatic {
+}
+interface BootstrapClientImageStatic extends ASPxClientImageStatic {
+}
+interface BootstrapClientListBoxStatic extends ASPxClientListBoxStatic {
+}
+interface BootstrapClientCheckBoxListStatic extends ASPxClientCheckBoxListStatic {
+}
+interface BootstrapClientRadioButtonListStatic extends ASPxClientRadioButtonListStatic {
+}
+interface BootstrapClientMenuStatic extends ASPxClientMenuStatic {
+}
+interface BootstrapClientPagerStatic extends ASPxClientPagerStatic {
+}
+interface BootstrapClientPopupControlStatic extends ASPxClientPopupControlStatic {
+}
+interface BootstrapClientPopupMenuStatic extends ASPxClientPopupMenuStatic {
+}
+interface BootstrapClientProgressBarStatic extends ASPxClientProgressBarStatic {
+}
+interface BootstrapClientSpinEditStatic extends ASPxClientSpinEditStatic {
+}
+interface BootstrapClientTabControlStatic extends ASPxClientTabControlStatic {
+}
+interface BootstrapClientPageControlStatic extends ASPxClientPageControlStatic {
+}
+interface BootstrapClientTextBoxStatic extends ASPxClientTextBoxStatic {
+}
+interface BootstrapClientMemoStatic extends ASPxClientMemoStatic {
+}
+interface BootstrapClientButtonEditStatic extends ASPxClientButtonEditStatic {
+}
+interface BootstrapClientTreeViewStatic extends ASPxClientTreeViewStatic {
+}
+interface BootstrapUIWidgetBaseStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientUploadControlStatic extends ASPxClientUploadControlStatic {
+}
 interface MVCxClientCalendarStatic extends ASPxClientCalendarStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -26501,8 +32385,17 @@ interface MVCxClientSchedulerStatic extends ASPxClientSchedulerStatic {
     Cast(obj: Object): MVCxClientScheduler;
 }
 interface MVCxSchedulerToolTipTypeStatic {
+    /**
+     * The tooltip is displayed for a selected appointment.
+     */
     Appointment: number;
+    /**
+     * The tooltip is displayed for a dragged appointment.
+     */
     AppointmentDrag: number;
+    /**
+     * The tooltip is displayed for a selected time interval.
+     */
     Selection: number;
 }
 interface MVCxClientSpreadsheetStatic extends ASPxClientSpreadsheetStatic {
@@ -26629,7 +32522,21 @@ interface ASPxClientCallbackStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientCallback;
 }
-interface ASPxClientCallbackPanelStatic extends ASPxClientControlStatic {
+interface ASPxClientPanelBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanelBase;
+}
+interface ASPxClientPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanel;
+}
+interface ASPxClientCallbackPanelStatic extends ASPxClientPanelStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
      * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
@@ -26774,6 +32681,82 @@ interface ASPxClientHiddenFieldStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientHiddenField;
 }
+interface ASPxClientHintStatic extends ASPxClientControlStatic {
+    /**
+     * Forces the hint to reselect target UI elements according to the specified CSS selector.
+     */
+    Update(): void;
+    /**
+     * Forces the hint to recalculate its position.
+     */
+    UpdatePosition(): void;
+    /**
+     * Forces the hint to recalculate its position.
+     * @param hintElementOrTargetElement An object that is the hint element or the target element.
+     */
+    UpdatePosition(hintElementOrTargetElement: Object): void;
+    /**
+     * Registers a hint's functionality with the specified settings.
+     * @param targetSelector A string value that is the CSS selector. Specifies to which UI elements the hint is displayed.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Register(targetSelector: string, options: ASPxClientHintOptions): ASPxClientHint;
+    /**
+     * 
+     * @param targetSelector 
+     * @param contentAttribute 
+     */
+    Register(targetSelector: string, contentAttribute: string): ASPxClientHint;
+    /**
+     * 
+     * @param targetSelector 
+     * @param onShowing 
+     */
+    Register(targetSelector: string, onShowing: ASPxClientHintShowingEventHandler): ASPxClientHint;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(targetSelector: string, options: ASPxClientHintOptions): void;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector used to specify for which UI elements on a web page a hint is displayed.
+     * @param content A string value that is the hint's content.
+     */
+    Show(targetSelector: string, content: string): void;
+    /**
+     * Invokes a hint.
+     * @param targetElement An object that is the target element.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(targetElement: Object, options: ASPxClientHintOptions): void;
+    /**
+     * Invokes a hint.
+     * @param targetElement A HTML DOM element near to which the hint is displayed in response to user interaction.
+     * @param content A string value that is the hint's content.
+     */
+    Show(targetElement: Object, content: string): void;
+    /**
+     * Invokes a hint.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(options: ASPxClientHintOptions): void;
+    /**
+     * Hides a hint window.
+     * @param targetSelector A string value that is the CSS selector.
+     */
+    Hide(targetSelector: string): void;
+    /**
+     * Hides a hint window.
+     * @param targetElementOrHintElement An object that is the target element or hint element.
+     */
+    Hide(targetElementOrHintElement: Object): void;
+    /**
+     * Hides all hints.
+     */
+    HideAll(): void;
+}
 interface ASPxClientImageGalleryStatic extends ASPxClientDataViewStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -26799,6 +32782,8 @@ interface ASPxClientLoadingPanelStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientLoadingPanel;
 }
+interface ASPxClientMediaFileSelectorStatic extends ASPxClientControlStatic {
+}
 interface ASPxClientMenuBaseStatic extends ASPxClientControlStatic {
     /**
      * Returns a collection of client menu objects.
@@ -26857,19 +32842,7 @@ interface ASPxClientObjectContainerStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientObjectContainer;
 }
-interface ASPxClientPanelBaseStatic extends ASPxClientControlStatic {
-    /**
-     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
-     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
-     */
-    Cast(obj: Object): ASPxClientPanelBase;
-}
-interface ASPxClientPanelStatic extends ASPxClientPanelBaseStatic {
-    /**
-     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
-     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
-     */
-    Cast(obj: Object): ASPxClientPanel;
+interface ASPxClientPagerStatic extends ASPxClientControlStatic {
 }
 interface ASPxClientPopupControlStatic extends ASPxClientPopupControlBaseStatic {
     /**
@@ -27019,6 +32992,24 @@ interface ASPxClientUploadControlStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientUploadControl;
 }
+interface ASPxClientUploadControlValidationErrorTypeConstsStatic {
+    /**
+     * The allowed maximum file size is exceeded.  Return Value: 1
+     */
+    MaxFileSizeExceeded: number;
+    /**
+     * The file's extension is not allowed.  Return Value: 2
+     */
+    NotAllowedFileExtension: number;
+    /**
+     * The allowed maximum count of the files is exceeded.  Return Value: 3
+     */
+    MaxFileCountExceeded: number;
+    /**
+     * A file name contains invalid character.Return Value: 4
+     */
+    FileNameContainsInvalidCharacter: number;
+}
 interface ASPxClientUtilsStatic {
     /**
      * Gets the user-agent string, which identifies the client browser and provides certain system details of the client computer.
@@ -27363,6 +33354,11 @@ interface ASPxClientUtilsStatic {
      * @param str A string value representing the string for trimming.
      */
     TrimEnd(str: string): string;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
 }
 interface ASPxClientChartDesignerStatic extends ASPxClientControlStatic {
     /**
@@ -27428,18 +33424,22 @@ interface ASPxClientWebDocumentViewerStatic extends ASPxClientControlStatic {
 declare var MVCxClientDashboardViewer: MVCxClientDashboardViewerStatic;
 declare var DashboardDataAxisNames: DashboardDataAxisNamesStatic;
 declare var DashboardSpecialValues: DashboardSpecialValuesStatic;
-declare var ASPxClientDashboardDesigner: ASPxClientDashboardDesignerStatic;
-declare var ASPxClientDashboardViewer: ASPxClientDashboardViewerStatic;
 declare var DashboardExportPageLayout: DashboardExportPageLayoutStatic;
 declare var DashboardExportPaperKind: DashboardExportPaperKindStatic;
 declare var DashboardExportScaleMode: DashboardExportScaleModeStatic;
 declare var DashboardExportFilterState: DashboardExportFilterStateStatic;
+declare var DashboardStateExportPosition: DashboardStateExportPositionStatic;
+declare var DashboardStateExcelExportPosition: DashboardStateExcelExportPositionStatic;
 declare var DashboardExportImageFormat: DashboardExportImageFormatStatic;
+declare var ExcelExportFilterState: ExcelExportFilterStateStatic;
 declare var DashboardExportExcelFormat: DashboardExportExcelFormatStatic;
 declare var ChartExportSizeMode: ChartExportSizeModeStatic;
 declare var MapExportSizeMode: MapExportSizeModeStatic;
+declare var TreemapExportSizeMode: TreemapExportSizeModeStatic;
 declare var RangeFilterExportSizeMode: RangeFilterExportSizeModeStatic;
 declare var DashboardSelectionMode: DashboardSelectionModeStatic;
+declare var ASPxClientDashboard: ASPxClientDashboardStatic;
+declare var ASPxClientDashboardViewer: ASPxClientDashboardViewerStatic;
 declare var ASPxClientEditBase: ASPxClientEditBaseStatic;
 declare var ASPxClientEdit: ASPxClientEditStatic;
 declare var ASPxClientBinaryImage: ASPxClientBinaryImageStatic;
@@ -27503,8 +33503,44 @@ declare var ASPxClientRecurrenceTypeEdit: ASPxClientRecurrenceTypeEditStatic;
 declare var ASPxClientTimeInterval: ASPxClientTimeIntervalStatic;
 declare var ASPxClientScheduler: ASPxClientSchedulerStatic;
 declare var ASPxClientSpellChecker: ASPxClientSpellCheckerStatic;
+declare var ASPxClientSpellCheckerStopCheckingReason: ASPxClientSpellCheckerStopCheckingReasonStatic;
 declare var ASPxClientSpreadsheet: ASPxClientSpreadsheetStatic;
 declare var ASPxClientTreeList: ASPxClientTreeListStatic;
+declare var BootstrapClientAccordion: BootstrapClientAccordionStatic;
+declare var BootstrapClientBinaryImage: BootstrapClientBinaryImageStatic;
+declare var BootstrapClientButton: BootstrapClientButtonStatic;
+declare var BootstrapClientCalendar: BootstrapClientCalendarStatic;
+declare var BootstrapClientCallbackPanel: BootstrapClientCallbackPanelStatic;
+declare var BootstrapClientChartBase: BootstrapClientChartBaseStatic;
+declare var BootstrapClientChart: BootstrapClientChartStatic;
+declare var BootstrapClientPolarChart: BootstrapClientPolarChartStatic;
+declare var BootstrapClientPieChart: BootstrapClientPieChartStatic;
+declare var BootstrapClientCheckBox: BootstrapClientCheckBoxStatic;
+declare var BootstrapClientRadioButton: BootstrapClientRadioButtonStatic;
+declare var BootstrapClientComboBox: BootstrapClientComboBoxStatic;
+declare var BootstrapClientDateEdit: BootstrapClientDateEditStatic;
+declare var BootstrapClientDropDownEdit: BootstrapClientDropDownEditStatic;
+declare var BootstrapClientFormLayout: BootstrapClientFormLayoutStatic;
+declare var BootstrapClientGridView: BootstrapClientGridViewStatic;
+declare var BootstrapClientHyperLink: BootstrapClientHyperLinkStatic;
+declare var BootstrapClientImage: BootstrapClientImageStatic;
+declare var BootstrapClientListBox: BootstrapClientListBoxStatic;
+declare var BootstrapClientCheckBoxList: BootstrapClientCheckBoxListStatic;
+declare var BootstrapClientRadioButtonList: BootstrapClientRadioButtonListStatic;
+declare var BootstrapClientMenu: BootstrapClientMenuStatic;
+declare var BootstrapClientPager: BootstrapClientPagerStatic;
+declare var BootstrapClientPopupControl: BootstrapClientPopupControlStatic;
+declare var BootstrapClientPopupMenu: BootstrapClientPopupMenuStatic;
+declare var BootstrapClientProgressBar: BootstrapClientProgressBarStatic;
+declare var BootstrapClientSpinEdit: BootstrapClientSpinEditStatic;
+declare var BootstrapClientTabControl: BootstrapClientTabControlStatic;
+declare var BootstrapClientPageControl: BootstrapClientPageControlStatic;
+declare var BootstrapClientTextBox: BootstrapClientTextBoxStatic;
+declare var BootstrapClientMemo: BootstrapClientMemoStatic;
+declare var BootstrapClientButtonEdit: BootstrapClientButtonEditStatic;
+declare var BootstrapClientTreeView: BootstrapClientTreeViewStatic;
+declare var BootstrapUIWidgetBase: BootstrapUIWidgetBaseStatic;
+declare var BootstrapClientUploadControl: BootstrapClientUploadControlStatic;
 declare var MVCxClientCalendar: MVCxClientCalendarStatic;
 declare var MVCxClientCallbackPanel: MVCxClientCallbackPanelStatic;
 declare var MVCxClientCardView: MVCxClientCardViewStatic;
@@ -27542,6 +33578,8 @@ declare var MVCxClientWebDocumentViewer: MVCxClientWebDocumentViewerStatic;
 declare var ASPxClientControlBase: ASPxClientControlBaseStatic;
 declare var ASPxClientControl: ASPxClientControlStatic;
 declare var ASPxClientCallback: ASPxClientCallbackStatic;
+declare var ASPxClientPanelBase: ASPxClientPanelBaseStatic;
+declare var ASPxClientPanel: ASPxClientPanelStatic;
 declare var ASPxClientCallbackPanel: ASPxClientCallbackPanelStatic;
 declare var ASPxClientCloudControl: ASPxClientCloudControlStatic;
 declare var ASPxClientDataView: ASPxClientDataViewStatic;
@@ -27554,19 +33592,20 @@ declare var ASPxClientFileManagerCommandConsts: ASPxClientFileManagerCommandCons
 declare var ASPxClientFileManagerErrorConsts: ASPxClientFileManagerErrorConstsStatic;
 declare var ASPxClientFormLayout: ASPxClientFormLayoutStatic;
 declare var ASPxClientHiddenField: ASPxClientHiddenFieldStatic;
+declare var ASPxClientHint: ASPxClientHintStatic;
 declare var ASPxClientImageGallery: ASPxClientImageGalleryStatic;
 declare var ASPxClientImageSlider: ASPxClientImageSliderStatic;
 declare var ASPxClientImageZoomNavigator: ASPxClientImageZoomNavigatorStatic;
 declare var ASPxClientImageZoom: ASPxClientImageZoomStatic;
 declare var ASPxClientLoadingPanel: ASPxClientLoadingPanelStatic;
+declare var ASPxClientMediaFileSelector: ASPxClientMediaFileSelectorStatic;
 declare var ASPxClientMenuBase: ASPxClientMenuBaseStatic;
 declare var ASPxClientMenu: ASPxClientMenuStatic;
 declare var ASPxClientTouchUI: ASPxClientTouchUIStatic;
 declare var ASPxClientNavBar: ASPxClientNavBarStatic;
 declare var ASPxClientNewsControl: ASPxClientNewsControlStatic;
 declare var ASPxClientObjectContainer: ASPxClientObjectContainerStatic;
-declare var ASPxClientPanelBase: ASPxClientPanelBaseStatic;
-declare var ASPxClientPanel: ASPxClientPanelStatic;
+declare var ASPxClientPager: ASPxClientPagerStatic;
 declare var ASPxClientPopupControl: ASPxClientPopupControlStatic;
 declare var ASPxClientPopupControlResizeState: ASPxClientPopupControlResizeStateStatic;
 declare var ASPxClientPopupControlCloseReason: ASPxClientPopupControlCloseReasonStatic;
@@ -27583,6 +33622,7 @@ declare var ASPxClientTimer: ASPxClientTimerStatic;
 declare var ASPxClientTitleIndex: ASPxClientTitleIndexStatic;
 declare var ASPxClientTreeView: ASPxClientTreeViewStatic;
 declare var ASPxClientUploadControl: ASPxClientUploadControlStatic;
+declare var ASPxClientUploadControlValidationErrorTypeConsts: ASPxClientUploadControlValidationErrorTypeConstsStatic;
 declare var ASPxClientUtils: ASPxClientUtilsStatic;
 declare var ASPxClientChartDesigner: ASPxClientChartDesignerStatic;
 declare var ASPxClientWebChartControl: ASPxClientWebChartControlStatic;
diff --git a/types/devexpress-web/v161/devexpress-web-tests.ts b/types/devexpress-web/v161/devexpress-web-tests.ts
new file mode 100644
index 0000000000..ef7eb8de37
--- /dev/null
+++ b/types/devexpress-web/v161/devexpress-web-tests.ts
@@ -0,0 +1,418 @@
+declare var hiddenField: ASPxClientHiddenField;
+declare var mainCallbackPanel: ASPxClientCallbackPanel;
+declare var loginPopup: ASPxClientPopupControl;
+declare var searchButton: ASPxClientButton;
+declare var searchComboBox: ASPxClientComboBox;
+declare var roomsNumberSpinEdit: ASPxClientSpinEdit;
+declare var adultsNumberSpinEdit: ASPxClientSpinEdit; 
+declare var childrenNumberSpinEdit: ASPxClientSpinEdit;
+declare var checkInDateEdit: ASPxClientDateEdit;
+declare var checkOutDateEdit: ASPxClientDateEdit;
+declare var backSlider: ASPxClientImageSlider;
+declare var locationComboBox: ASPxClientComboBox;
+declare var nightyRateTrackBar: ASPxClientTrackBar;
+declare var customerRatingTrackBar: ASPxClientTrackBar;
+declare var ourRatingCheckBoxList: ASPxClientCheckBoxList;
+declare var startFilterPopupControl: ASPxClientPopupControl;
+declare var imagePopupControl: ASPxClientPopupControl;
+declare var emailTextBox: ASPxClientTextBox;
+declare var creditCardEmailTextBox: ASPxClientTextBox;
+declare var accountEmailTextBox: ASPxClientTextBox;
+declare var bookingPageControl: ASPxClientPageControl;
+declare var paymentTypePageControl: ASPxClientPageControl;
+declare var offerFormPopup: ASPxClientPopupControl;
+declare var roomsSpinEdit: ASPxClientSpinEdit;
+declare var adultsSpinEdit: ASPxClientSpinEdit;
+declare var childrenSpinEdit: ASPxClientSpinEdit;
+declare var hotelDetailsCallbackPanel: ASPxClientCallbackPanel;
+declare var leftPanel: ASPxClientPanel;
+declare var menuButton: ASPxClientButton;
+declare var aboutWindow: ASPxClientPopupControl;
+declare var offersZone: ASPxClientDockZone;
+
+module DXDemo {
+    function showPage(page: string, params: { [key: string]: any }, skipHistory?: boolean): void {
+        var queryString = getQueryString(params || {});
+        hiddenField.Set("page", page);
+        hiddenField.Set("parameters", queryString);
+        hideMenu();
+        var uri = queryString.length ? (page + "?" + queryString) : page;
+        try {
+            if (!skipHistory && window.history && window.history.pushState)
+                window.history.pushState(uri, "", uri || "Default.aspx");
+        } catch (e) { }
+        mainCallbackPanel.PerformCallback(uri);
+    };
+
+    export function onMainMenuItemClick(s: ASPxClientMenu, e: ASPxClientMenuItemClickEventArgs): void {
+        switch (e.item.name) {
+            case "login":
+                hideMenu();
+                setTimeout(function () { loginPopup.ShowAtElementByID("MainCallbackPanel_ContentPane"); }, 300);
+                break;
+            case "offers":
+                showPage("SpecialOffers", {});
+                break;
+            default:
+                hideMenu();
+                setTimeout(function () { showAboutWindow(); }, 300);
+                break;
+        }
+    };
+
+    export function onLoginButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        loginPopup.Hide();
+        showAboutWindow();
+    };
+
+    export function onSearchButtonClick(): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            showPage("ShowHotels", {
+                location: searchComboBox.GetValue(),
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsNumberSpinEdit.GetValue() || 1,
+                adults: adultsNumberSpinEdit.GetValue() || 1,
+                children: childrenNumberSpinEdit.GetValue() || 0
+            });
+        }
+    };
+
+    export function onSearchComboBoxIndexChanged(s: ASPxClientComboBox, e: ASPxClientProcessingModeEventArgs): void {
+        hideMenu();
+        searchButton.AdjustControl();
+    };
+
+    export function onIndexOfferCloseClick(index: number): void {
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + index);
+        var sibPanel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + (index == 1 ? 2 : 1));
+        panel.Hide();
+        sibPanel.MakeFloat();
+        sibPanel.SetWidth(offersZone.GetWidth());
+        sibPanel.Dock(offersZone);
+    };
+
+    export function onLogoClick(): void {
+        showPage("", null, false);
+    };
+
+    export function onMenuNavButtonCheckedChanged(s: ASPxClientCheckBox, e: ASPxClientProcessingModeEventArgs): void {
+        var mainContainer = mainCallbackPanel.GetMainElement();
+        if (s.GetChecked()) {
+            backSlider.Pause();
+            showMenu();
+        }
+        else {
+            hideMenu();
+            backSlider.Play();
+        }
+    };
+
+    export function onBackNavButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        var params = getCurrentQueryParams();
+        switch (getCurrentPage()) {
+            case "PrintInvoice":
+                showPage("Booking", params, false);
+                break;
+            case "Booking":
+                if (bookingPageControl.GetActiveTabIndex() > 0)
+                    bookingPageControl.SetActiveTabIndex(bookingPageControl.GetActiveTabIndex() - 1);
+                else
+                    showPage("ShowRooms", params, false);
+                break;
+            case "ShowRooms":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowDetails":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowHotels":
+            case "SpecialOffers":
+                showPage("", null, false);
+                break;
+        }
+    };
+
+    export function updateSearchResults(): void {
+        var params = getCurrentQueryParams();
+        params["location"] = locationComboBox.GetValue();
+        params["minprice"] = nightyRateTrackBar.GetPositionStart();
+        params["maxprice"] = nightyRateTrackBar.GetPositionEnd();
+        params["custrating"] = customerRatingTrackBar.GetPosition();
+        params["ourrating"] = ourRatingCheckBoxList.GetSelectedValues().join(",");
+        showPage("ShowHotels", params);
+    };
+
+    export function onBookHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onDetailsHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onShowStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        startFilterPopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    export function onChangeStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var params = getCurrentQueryParams();
+            params["checkin"] = getFormattedDate(<Date>checkInDateEdit.GetValue());
+            params["checkout"] = getFormattedDate(<Date>checkOutDateEdit.GetValue());
+            params["rooms"] = roomsNumberSpinEdit.GetValue() || 1;
+            params["adults"] = adultsNumberSpinEdit.GetValue() || 1;
+            params["children"] = childrenNumberSpinEdit.GetValue() || 0;
+            startFilterPopupControl.Hide();
+            showPage(hiddenField.Get("page").toString(), params);
+        }
+    };
+
+    export function onBookRoomButtonClick(roomID: string): void {
+        var params = getCurrentQueryParams();
+        params["roomID"] = roomID;
+        showPage("Booking", params);
+    };
+
+    export function onShowRoomsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onShowDetailsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onRoomImageNavItemClick(roomID: string, pictureName: string): void {
+        setTimeout(function () {
+            imagePopupControl.PerformCallback(roomID + "|" + pictureName);
+            imagePopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+        }, 500);
+    };
+
+    export function onRoomsNavBarExpandedChanged(s: ASPxClientNavBar, e: ASPxClientNavBarGroupEventArgs): void {
+        ASPxClientControl.AdjustControls(s.GetMainElement());
+    };
+
+    export function onNextBookingStepButtonClick(step: number): void {
+        var valid = true;
+        var validationGroup = "";
+        if (step == 1)
+            validationGroup = "Account";
+        if (step == 2)
+            validationGroup = "RoomDetails";
+        if (step == 3)
+            validationGroup = "PaymentDetails";
+
+        switch (step) {
+            case 1:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Account");
+                if (valid) {
+                    emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    creditCardEmailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    showPage("Booking", getCurrentQueryParams());
+                    return;
+                }
+                break;
+            case 2:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "RoomDetails");
+                emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                break;
+            case 3:
+                var paymentType = paymentTypePageControl.GetActiveTabIndex();
+                if (paymentType == 0)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "CreditCard");
+                else if (paymentType == 1)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Cash");
+                else if (paymentType == 2)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "PayPal");
+                break;
+        }
+        if (valid) {
+            bookingPageControl.GetTab(step).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(step);
+        }
+    };
+
+    export function onAccountCaptchaHiddenFieldInit(s: ASPxClientHiddenField, e: ASPxClientEventArgs): void {
+        if (s.Get("IsCaptchaValid")) {
+            bookingPageControl.GetTab(1).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(1);
+        }
+    };
+
+    export function onFinishBookingStepButtonClick(): void {
+        showAboutWindow();
+    };
+
+    export function OnPrintInvoiceButtonClick(): void {
+        showPage("PrintInvoice", getCurrentQueryParams());
+    };
+
+    export function onOfferClick(offerID: string): void {
+        offerFormPopup.SetContentHtml("");
+        offerFormPopup.PerformCallback(offerID);
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + offerID);
+        var panelElement = <HTMLElement>panel.GetMainElement();
+        if (panelElement.offsetWidth < 330 || panelElement.offsetHeight < 250) {
+            offerFormPopup.SetWidth(400);
+            offerFormPopup.SetHeight(280);
+            offerFormPopup.ShowAtElementByID("SpecialOffersContainer");
+        }
+        else {
+            offerFormPopup.SetWidth(panelElement.offsetWidth);
+            offerFormPopup.SetHeight(panelElement.offsetHeight);
+            offerFormPopup.ShowAtElement(panelElement);
+        }
+    };
+
+    export function onSpecialOfferCheckButtonClick(hotelID: string, locationID: string): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var queryParams: { [key: string]: any } = {
+                location: locationID,
+                hotelID: hotelID,
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsSpinEdit.GetValue() || 1,
+                adults: adultsSpinEdit.GetValue() || 1,
+                children: childrenSpinEdit.GetValue() || 0
+            };
+            showPage("ShowRooms", queryParams);
+        }
+    };
+
+    export function onIndexOfferClick(): void {
+        showPage("SpecialOffers", {});
+    };
+
+    export function onControlsInit(): void {
+        ASPxClientUtils.AttachEventToElement(window, 'popstate', onHistoryPopState);
+        var pathParts = document.location.href.split("/");
+        var url = pathParts[pathParts.length - 1];
+        try {
+            if (window.history)
+                window.history.replaceState(url, "");
+        } catch (e) { }
+        ASPxClientUtils.AttachEventToElement(window, "resize", onWindowResize);
+        if (ASPxClientUtils.iOSPlatform) {
+            // animate
+        }
+    };
+
+    export function updateRatingLabels(ratingControl: ASPxClientTrackBar) {
+        var start = ratingControl.GetPositionStart().toString();
+        var end = ratingControl.GetPositionEnd().toString();
+        document.getElementById("cpLeftLabelID").innerHTML = start + " " + end;
+    };
+
+    export function onRatingControlItemClick(s: ASPxClientRatingControl, e: ASPxClientRatingControlItemClickEventArgs): void {
+        hotelDetailsCallbackPanel.PerformCallback(s.GetValue().toString());
+    };
+
+    export function onInputKeyDown(s: ASPxClientTextBox, e: ASPxClientEditKeyEventArgs): void {
+        var keyCode = ASPxClientUtils.GetKeyCode(e.htmlEvent);
+        if (keyCode == 13)
+            (<HTMLElement>s.GetInputElement()).blur();
+    };
+
+    function getCurrentPage(): string {
+        var hfPage = <string>hiddenField.Get("page");
+        if (hfPage)
+            return hfPage;
+        var pathParts = document.location.pathname.split("/");
+        return pathParts[pathParts.length - 1];
+    };
+
+    function showAboutWindow(): void {
+        aboutWindow.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    function hideMenu(): void {
+        leftPanel.Collapse();
+        if (menuButton.GetMainElement() && menuButton.GetChecked())
+            menuButton.SetChecked(false);
+    };
+
+    function showMenu(): void {
+        leftPanel.Expand();
+    };
+
+    var _resizeSpecialOffersTimeoutID = -1;
+    function onWindowResize(): void {
+        switch (<string>hiddenField.Get("page")) {
+            case "SpecialOffers":
+                if (_resizeSpecialOffersTimeoutID == -1)
+                    _resizeSpecialOffersTimeoutID = setTimeout(resizeSpecialOffers, 200);
+                break;
+        }
+        hidePopups("AboutWindow", "StartFilterPopupControl", "LoginPopup", "OfferFormPopup", "ImagePopupControl");
+    };
+
+    function hidePopups(...names: string[]): void {
+        for (var i = 0; i < names.length; i++) {
+            var popupControl = <ASPxClientPopupControl>ASPxClientControl.GetControlCollection().GetByName(names[i]);
+            popupControl.Hide();
+        }
+    };
+
+    function resizeSpecialOffers(): void {
+        for (var i = 1; i <= 4; i++) {
+            var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + i);
+            if (panel && panel.IsVisible()) {
+                var zone = panel.GetOwnerZone();
+                zone.SetWidth((<HTMLElement>(<HTMLElement>zone.GetMainElement()).parentNode).offsetWidth)
+            }
+        }
+        _resizeSpecialOffersTimeoutID = -1;
+    };
+
+    function getFormattedDate(date: Date): string {
+        return (date.getMonth() + 1) + "-" + date.getDate() + "-" + date.getFullYear();
+    };
+
+    function getCurrentQueryParams(): { [key:string]: any } {
+        var hfParams = <string>hiddenField.Get("parameters");
+        if (hfParams)
+            return getParamsByQueryString(hfParams);
+        var query = document.location.search;
+        if (query[0] === "?")
+            query = query.substr(1);
+        return getParamsByQueryString(query);
+    };
+
+    function getQueryString(params: { [key:string]: any }): string {
+        var queryItems: any[] = [];
+        for (var key in params) {
+            if (!params.hasOwnProperty(key)) continue;
+            queryItems.push(key + "=" + params[key]);
+        }
+        if (queryItems.length > 0)
+            return queryItems.join("&");
+        return "";
+    };
+
+    function getParamsByQueryString(queryString: string): { [key: string]: string } {
+        var result: { [key: string]: any } = {};
+        if (queryString) {
+            var queryStringArray = queryString.split("&");
+            for (var i = 0; i < queryStringArray.length; i++) {
+                var part = queryStringArray[i].split('=');
+                if (part.length != 2) continue;
+                result[part[0]] = decodeURIComponent(part[1].replace(/\+/g, " "));
+            }
+        }
+        return result;
+    };
+
+    function onHistoryPopState(evt: any): void {
+        if (evt.state !== null && evt.state !== undefined) {
+            var uriParts = evt.state.split("?");
+            showPage(uriParts[0], getParamsByQueryString(uriParts[1]), true);
+        }
+    };
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v161/index.d.ts b/types/devexpress-web/v161/index.d.ts
new file mode 100644
index 0000000000..331718afb0
--- /dev/null
+++ b/types/devexpress-web/v161/index.d.ts
@@ -0,0 +1,27630 @@
+// Type definitions for DevExpress ASP.NET v161.12
+// Project: http://devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * A client-side counterpart of the DashboardViewer extension.
+ */
+interface MVCxClientDashboardViewer extends ASPxClientDashboardViewer {
+}
+/**
+ * Represents a list of records from the dashboard data source.
+ */
+interface ASPxClientDashboardItemUnderlyingData {
+    /**
+     * Gets the number of rows in the underlying data set.
+     */
+    GetRowCount(): number;
+    /**
+     * Returns the value of the specified cell within the underlying data set.
+     * @param rowIndex An integer value that specifies the zero-based index of the required row.
+     * @param dataMember A String that specifies the required data member.
+     */
+    GetRowValue(rowIndex: number, dataMember: string): Object;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Returns whether or not a request for underlying data was successful.
+     */
+    IsDataReceived(): boolean;
+    /**
+     * Returns a callstack containing the error caused by an unsuccessful request for underlying data.
+     */
+    GetRequestDataError(): string;
+}
+/**
+ * Contains parameters used to obtain the underlying data for the dashboard item.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataParameters {
+    /**
+     * Gets or sets an array of data member identifiers used to obtain underlying data.
+     * Value: An array of String objects that specify data member identifiers.
+     */
+    DataMembers: string[];
+    /**
+     * Gets or sets axis points used to obtain the underlying data.
+     * Value: An array of ASPxClientDashboardItemDataAxisPoint objects that represent axis points.
+     */
+    AxisPoints: ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets or sets the dimension value used to obtain the underlying data.
+     * Value: The dimension value.
+     */
+    ValuesByAxisName: Object;
+    /**
+     * Gets or sets the unique dimension value used to obtain the underlying data.
+     * Value: The unique dimension value.
+     */
+    UniqueValuesByAxisName: Object;
+}
+/**
+ * References a method executed after an asynchronous request is complete.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataCompleted {
+    /**
+     * References a method executed after an asynchronous request is completed.
+     * @param data An ASPxClientDashboardItemUnderlyingData object that represents a list of records from the dashboard data source.
+     */
+    (data: ASPxClientDashboardItemUnderlyingData): void;
+}
+/**
+ * References a method that will handle the ItemClick event.
+ */
+interface ASPxClientDashboardItemClickEventHandler<S> {
+    /**
+     * References a method that will handle the ItemClick event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick event.
+ */
+interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item for which the event has been raised.
+     * Value: A String that is the dashboard item name.
+     */
+    ItemName: string;
+    /**
+     * Gets the dashboard item's client data.
+     */
+    GetData(): ASPxClientDashboardItemData;
+    /**
+     * Returns the axis point corresponding to the clicked visual element.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Gets measures corresponding to the clicked visual element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets deltas corresponding to the clicked visual element.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Requests underlying data corresponding to the clicked visual element.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     * @param dataMembers An array of String values that specify data members used to obtain underlying data.
+     */
+    RequestUnderlyingData(onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted, dataMembers: string[]): void;
+}
+/**
+ * References a method that will handle the ItemVisualInteractivity event.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventHandler<S> {
+    /**
+     * References a method that will handle the ItemVisualInteractivity event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemVisualInteractivityEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemVisualInteractivityEventArgs): void;
+}
+/**
+ * Provides data for the ItemVisualInteractivity event.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets the selection mode for dashboard item elements.
+     */
+    GetSelectionMode(): string;
+    /**
+     * Sets the selection mode for dashboard item elements.
+     * @param selectionMode A String that specifies the selection mode.
+     */
+    SetSelectionMode(selectionMode: string): void;
+    /**
+     * Returns whether or not highlighting is enabled for the current dashboard item.
+     */
+    IsHighlightingEnabled(): boolean;
+    /**
+     * Enables highlighting for the current dashboard item.
+     * @param enableHighlighting true, to enable highlighting; otherwise, false.
+     */
+    EnableHighlighting(enableHighlighting: boolean): void;
+    /**
+     * Gets data axes used to perform custom interactivity actions.
+     */
+    GetTargetAxes(): string[];
+    /**
+     * Sets data axes used to perform custom interactivity actions.
+     * @param targetAxes An array of String objects that specify names of data axes.
+     */
+    SetTargetAxes(targetAxes: string[]): void;
+    /**
+     * Gets the default selection for the current dashboard item.
+     */
+    GetDefaultSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Sets the default selection for the current dashboard item.
+     * @param values An array of ASPxClientDashboardItemDataAxisPointTuple objects specifying axis point tuples used to select default elements.
+     */
+    SetDefaultSelection(values: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+}
+/**
+ * References a method that will handle the ItemSelectionChanged event.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemSelectionChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemSelectionChangedEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemSelectionChanged event.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets currently selected elements.
+     */
+    GetCurrentSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+}
+/**
+ * References a method that will handle the ItemElementCustomColor event.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventHandler<S> {
+    /**
+     * References a method that will handle the ItemElementCustomColor event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemElementCustomColorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemElementCustomColorEventArgs): void;
+}
+/**
+ * Provides data for the ItemElementCustomColor event.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item for which the event was raised.
+     */
+    ItemName: string;
+    /**
+     * Gets the axis point tuple that corresponds to the current dashboard item element.
+     */
+    GetTargetElement(): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Gets the color of the current dashboard item element.
+     */
+    GetColor(): string;
+    /**
+     * Sets the color of the current dashboard item element.
+     * @param color A String that specifies the color of the current dashboard item element.
+     */
+    SetColor(color: string): void;
+    /**
+     * Gets measures corresponding to the current dashboard item element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+}
+/**
+ * References a method that will handle the ItemWidgetCreated event.
+ */
+interface ASPxClientDashboardItemWidgetCreatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetCreated event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdating event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatingEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdating event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdated event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdated event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemBeforeWidgetDisposed event.
+ */
+interface ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemBeforeWidgetDisposed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * Provides data for events related to client widgets used to visualize data in dashboard items.
+ */
+interface ASPxClientDashboardItemWidgetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns an underlying widget corresponding to the current dashboard item.
+     */
+    GetWidget(): Object;
+}
+/**
+ * Represents multidimensional data visualized in the dashboard item.
+ */
+interface ASPxClientDashboardItemData {
+    /**
+     * Gets the names of the axes that constitute the current ASPxClientDashboardItemData.
+     */
+    GetAxisNames(): string[];
+    /**
+     * Returns the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxis(axisName: string): ASPxClientDashboardItemDataAxis;
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the measures for the current ASPxClientDashboardItemData object.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets the deltas for the current ASPxClientDashboardItemData object.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point tuple.
+     * @param tuple A ASPxClientDashboardItemDataAxisPointTuple object that is a tuple of axis points.
+     */
+    GetSlice(tuple: ASPxClientDashboardItemDataAxisPointTuple): ASPxClientDashboardItemData;
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point.
+     * @param axisPoint An ASPxClientDashboardItemDataAxisPoint object that is the data point in a multidimensional space.
+     */
+    GetSlice(axisPoint: ASPxClientDashboardItemDataAxisPoint): ASPxClientDashboardItemData;
+    /**
+     * Returns a total summary value for the specified measure.
+     * @param measureId A String that is the measure identifier.
+     */
+    GetMeasureValue(measureId: string): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the summary value for the specified delta.
+     * @param deltaId A String that is the data item identifier.
+     */
+    GetDeltaValue(deltaId: string): ASPxClientDashboardItemDataDeltaValue;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Creates a tuple based on the specified axes names and corresponding values.
+     * @param values An array of name-value pairs containing the axis name and corresponding values.
+     */
+    CreateTuple(values: Object[]): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Creates a tuple based on the specified axis points.
+     * @param axisPoints An array of ASPxClientDashboardItemDataAxisPoint objects that specify axis points belonging to different data axes.
+     */
+    CreateTuple(axisPoints: ASPxClientDashboardItemDataAxisPoint[]): ASPxClientDashboardItemDataAxisPointTuple;
+}
+/**
+ * An axis that contains data points corresponding to the specified value hierarchy.
+ */
+interface ASPxClientDashboardItemDataAxis {
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points belonging to the current axis.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the root axis point belonging to the current ASPxClientDashboardItemDataAxis.
+     */
+    GetRootPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns axis points corresponding to values of the last-level dimension.
+     */
+    GetPoints(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns axis points corresponding to the specified dimension.
+     * @param dimensionId A String that is the dimension identifier.
+     */
+    GetPointsByDimension(dimensionId: string): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns the data point for the specified axis by unique values.
+     * @param uniqueValues A hierarchy of unique values identifying the required data point.
+     */
+    GetPointByUniqueValues(uniqueValues: Object[]): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Contains the dimension metadata.
+ */
+interface ASPxClientDashboardItemDataDimension {
+    /**
+     * Gets the dimension identifier.
+     * Value: A String that is the dimension identifier.
+     */
+    Id: string;
+    /**
+     * Gets or sets the name of the dimension.
+     * Value: A String that is the name of the dimension.
+     */
+    Name: string;
+    /**
+     * Gets the data member identifier for the current dimension.
+     * Value: A String value that identifies a data member.
+     */
+    DataMember: string;
+    /**
+     * Gets the group interval for date-time values for the current dimension.
+     * Value: A String value that represents how date-time values are grouped.
+     */
+    DateTimeGroupInterval: string;
+    /**
+     * Gets the group interval for string values.
+     * Value: A String value that specifies the group interval for string values.
+     */
+    TextGroupInterval: string;
+    /**
+     * Formats the specified value using format settings of the current dimension.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the measure metadata.
+ */
+interface ASPxClientDashboardItemDataMeasure {
+    /**
+     * Gets the measure identifier.
+     * Value: A String that is the measure identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the measure.
+     * Value: A String that is the name of the measure.
+     */
+    Name: string;
+    /**
+     * Gets the data member that identifies the data source list used to provide data for the current measure.
+     * Value: A String value that identifies the data source list used to provide data for the current measure.
+     */
+    DataMember: string;
+    /**
+     * Gets the type of summary function calculated against the current measure.
+     * Value: A String value that identifies the type of summary function calculated against the current measure.
+     */
+    SummaryType: string;
+    /**
+     * Formats the specified value using format settings of the current measure.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the delta metadata.
+ */
+interface ASPxClientDashboardItemDataDelta {
+    /**
+     * Gets the data item identifier.
+     * Value: A String that is the data item identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the data item container.
+     * Value: A String value that is the name of the data item container.
+     */
+    Name: string;
+    /**
+     * Gets the identifier for the measure that provides actual values.
+     * Value: A String value that is the measure identifier.
+     */
+    ActualMeasureId: string;
+    /**
+     * Gets the identifier for the measure that provides target values.
+     * Value: A String value that is the measure identifier.
+     */
+    TargetMeasureId: string;
+}
+/**
+ * Provides dimension values at the specified axis point.
+ */
+interface ASPxClientDashboardItemDataDimensionValue {
+    /**
+     * Gets the current dimension value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the unique value for the current dimension value.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the display text for the current dimension value.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides the measure value and display text.
+ */
+interface ASPxClientDashboardItemDataMeasureValue {
+    /**
+     * Gets the measure value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the measure display text.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides delta element values.
+ */
+interface ASPxClientDashboardItemDataDeltaValue {
+    /**
+     * Provides access to the actual value displayed within the delta element.
+     */
+    GetActualValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the target value.
+     */
+    GetTargetValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the absolute difference between the actual and target values.
+     */
+    GetAbsoluteVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percent of variation between the actual and target values.
+     */
+    GetPercentVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percentage of the actual value in the target value.
+     */
+    GetPercentOfTarget(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the main delta value.
+     */
+    GetDisplayValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the first additional delta value.
+     */
+    GetDisplaySubValue1(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the second additional delta value.
+     */
+    GetDisplaySubValue2(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the value specifying the condition for displaying the delta indication.
+     */
+    GetIsGood(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the type of delta indicator.
+     */
+    GetIndicatorType(): ASPxClientDashboardItemDataMeasureValue;
+}
+/**
+ * A point on the data axis.
+ */
+interface ASPxClientDashboardItemDataAxisPoint {
+    /**
+     * Gets the name of the axis to which the current axis point belongs.
+     */
+    GetAxisName(): string;
+    /**
+     * Gets the last level dimension corresponding to the current axis point.
+     */
+    GetDimension(): ASPxClientDashboardItemDataDimension;
+    /**
+     * Gets the collection of dimensions used to create a hierarchy of axis points from the root point to the current axis point.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the value corresponding to the current axis point.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the display text corresponding to the current axis point.
+     */
+    GetDisplayText(): string;
+    /**
+     * Gets the unique value corresponding to the current axis point.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the dimension values at the specified axis point.
+     */
+    GetDimensionValue(): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the dimension value at the current axis point.
+     * @param dimensionId A String value that specifies the dimension identifier.
+     */
+    GetDimensionValue(dimensionId: string): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the child axis points for the current axis point.
+     */
+    GetChildren(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets the parent axis point for the current axis point.
+     */
+    GetParent(): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Represents a tuple of axis points.
+ */
+interface ASPxClientDashboardItemDataAxisPointTuple {
+    /**
+     * Returns the axis point belonging to the default data axis.
+     */
+    GetAxisPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns the axis point belonging to the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * A client-side equivalent of the ASPxDashboardDesigner control.
+ */
+interface ASPxClientDashboardDesigner extends ASPxClientControl {
+    /**
+     * Occurs after the state of the dashboard displayed in the ASPxClientDashboardDesigner is changed.
+     */
+    DashboardStateChanged: ASPxClientEvent<ASPxClientDashboardStateChangedEventHandler<ASPxClientDashboardDesigner>>;
+    /**
+     * Occurs after another dashboard is loaded to the ASPxClientDashboardDesigner.
+     */
+    DashboardChanged: ASPxClientEvent<ASPxClientDashboardChangedEventHandler<ASPxClientDashboardDesigner>>;
+    /**
+     * For internal use.
+     */
+    CustomizeMenuItems: ASPxClientEvent<ASPxClientDashboardDesignerCustomizeMenuItemsEventHandler<ASPxClientDashboardDesigner>>;
+    BeforeRender: ASPxClientEvent<ASPxClientDashboardDesignerBeforeRenderEventHandler<ASPxClientDashboardDesigner>>;
+    /**
+     * Switches the ASPxClientDashboardDesigner to the viewer mode.
+     */
+    SwitchToViewer(): void;
+    /**
+     * Switches the ASPxClientDashboardDesigner to the designer mode.
+     */
+    SwitchToDesigner(): void;
+    /**
+     * Gets the current working mode of the Web Designer.
+     */
+    GetWorkingMode(): string;
+    /**
+     * Gets the identifier of the dashboard that is displayed in the ASPxClientDashboardDesigner.
+     */
+    GetDashboardId(): string;
+    /**
+     * Gets the name of the dashboard that is displayed in the ASPxClientDashboardDesigner.
+     */
+    GetDashboardName(): string;
+    /**
+     * Gets the state of the dashboard (for instance, the master filtering state) displayed in the ASPxClientDashboardDesigner.
+     */
+    GetDashboardState(): string;
+    /**
+     * Loads a dashboard with the specified identifier.
+     * @param dashboardId A String value that specifies the dashboard identifier.
+     */
+    LoadDashboard(dashboardId: string): void;
+    /**
+     * Saves a dashboard to the dashboard storage.
+     */
+    SaveDashboard(): void;
+}
+/**
+ * References a method that will handle the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardStateChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the current state of the dashboard.
+     * Value: A String that is the current state of the dashboard.
+     */
+    DashboardState: string;
+}
+/**
+ * References a method that will handle the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of a newly opened dashboard.
+     * Value: A String values that is an identifier of newly opened dashboard.
+     */
+    DashboardId: string;
+    /**
+     * Gets the name of a newly opened dashboard.
+     * Value: A String values that is the name of newly opened dashboard.
+     */
+    DashboardName: string;
+}
+interface ASPxClientDashboardDesignerCustomizeMenuItemsEventHandler<S> {
+    (source: S, e: ASPxClientDashboardDesignerCustomizeMenuItemsEventArgs): void;
+}
+interface ASPxClientDashboardDesignerMenuItem {
+    id: string;
+    title: string;
+    template: string;
+    selected: boolean;
+    disabled: boolean;
+    hasSeparator: boolean;
+    click: Function;
+    hotKey: number;
+}
+interface ASPxClientDashboardDesignerCustomizeMenuItemsEventArgs extends ASPxClientEventArgs {
+    Items: ASPxClientDashboardDesignerMenuItem[];
+    FindById(itemId: string): ASPxClientDashboardDesignerMenuItem;
+}
+interface ASPxClientDashboardDesignerBeforeRenderEventHandler<S> {
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * A client-side equivalent of the ASPxDashboardViewer control.
+ */
+interface ASPxClientDashboardViewer extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the available interactivity actions have changed.
+     */
+    ActionAvailabilityChanged: ASPxClientEvent<ASPxClientDashboardActionAvailabilityChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user changes the state of the master filter.
+     */
+    MasterFilterSet: ASPxClientEvent<ASPxClientDashboardMasterFilterSetEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clears the selection in the master filter item.
+     */
+    MasterFilterCleared: ASPxClientEvent<ASPxClientDashboardMasterFilterClearedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Provides the capability to handle data loading errors in the ASPxClientDashboardViewer.
+     */
+    DataLoadingError: ASPxClientEvent<ASPxClientDashboardDataLoadingErrorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-down is performed.
+     */
+    DrillDownPerformed: ASPxClientEvent<ASPxClientDashboardDrillDownPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-up is performed.
+     */
+    DrillUpPerformed: ASPxClientEvent<ASPxClientDashboardDrillUpPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the ASPxClientDashboardViewer is loaded.
+     */
+    Loaded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Reloads data in the data sources.
+     */
+    ReloadData(): void;
+    /**
+     * Reloads data in the data sources.
+     * @param parameters An array of ASPxClientDashboardParameter objects that specify dashboard parameters on the client side.
+     */
+    ReloadData(parameters: ASPxClientDashboardParameter[]): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Locks the EndUpdateParameters method call.
+     */
+    BeginUpdateParameters(): void;
+    /**
+     * Unlocks the BeginUpdateParameters method and applies changes made to the parameter settings.
+     */
+    EndUpdateParameters(): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects the specified range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param dateTimePeriodName A String that specifies the name of the predefined range used to perform a selection.
+     */
+    SetRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Returns the dashboard width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the dashboard height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the dashboard width.
+     * @param width An integer value that specifies the dashboard width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the dashboard height.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Specifies the dashboard size.
+     * @param width An integer value that specifies the dashboard width.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down for the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down for the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns whether or not the specified master filter item allows selecting one or more elements.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+}
+/**
+ * A range in the Range Filter dashboard item.
+ */
+interface ASPxClientDashboardRangeFilterSelection {
+    /**
+     * Gets or sets a maximum value in the range of the Range Filter dashboard item.
+     * Value: A maximum value in the range of the Range Filter dashboard item.
+     */
+    Maximum: Object;
+    /**
+     * Gets or sets a minimum value in the range of the Range Filter dashboard item.
+     * Value: A minimum value in the range of the Range Filter dashboard item.
+     */
+    Minimum: Object;
+}
+/**
+ * A collection of ASPxClientDashboardParameter objects.
+ */
+interface ASPxClientDashboardParameters {
+    /**
+     * Returns an array of dashboard parameters from the ASPxClientDashboardParameters collection.
+     */
+    GetParameterList(): ASPxClientDashboardParameter[];
+    /**
+     * Returns a dashboard parameter by its name.
+     * @param name A String object that specifies the parameter name.
+     */
+    GetParameterByName(name: string): ASPxClientDashboardParameter;
+    /**
+     * Returns a dashboard parameter by its index in the ASPxClientDashboardParameters collection.
+     * @param index An integer value that specifies the parameter index.
+     */
+    GetParameterByIndex(index: number): ASPxClientDashboardParameter;
+}
+/**
+ * A client-side dashboard parameter.
+ */
+interface ASPxClientDashboardParameter {
+    /**
+     * Gets the dashboard parameter name on the client side.
+     * Value: A String that is the dashboard parameter name on the client side.
+     */
+    Name: string;
+    /**
+     * Gets the dashboard parameter value on the client side.
+     * Value: A String that specifies the dashboard parameter value on the client side.
+     */
+    Value: Object;
+    /**
+     * Returns a parameter name.
+     */
+    GetName(): string;
+    /**
+     * Returns a current parameter value.
+     */
+    GetValue(): Object;
+    /**
+     * Specifies the current parameter value.
+     * @param value The current parameter value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a default parameter value.
+     */
+    GetDefaultValue(): Object;
+    /**
+     * Returns the parameter's description displayed to an end-user.
+     */
+    GetDescription(): string;
+    /**
+     * Returns a parameter type.
+     */
+    GetType(): string;
+    /**
+     * Returns possible parameter values.
+     */
+    GetValues(): ASPxClientDashboardParameterValue[];
+}
+/**
+ * Provides access to the parameter value and display text.
+ */
+interface ASPxClientDashboardParameterValue {
+    /**
+     * Returns the parameter display text.
+     */
+    GetDisplayText(): string;
+    /**
+     * Returns a parameter value.
+     */
+    GetValue(): Object;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+ */
+interface ImageFormatOptions {
+    /**
+     * Gets or sets an image format in which the dashboard (dashboard item) is exported.
+     * Value: A value returned by the DashboardExportImageFormat class that specifies an image format in which the dashboard (dashboard item) is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     */
+    Resolution: number;
+}
+/**
+ * Contains options which define how the dashboard item is exported to Excel format.
+ */
+interface ExcelFormatOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A value returned by the DashboardExportExcelFormat class that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A String value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the Grid dashboard item is exported.
+ */
+interface GridExportOptions {
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    FitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to print column headers of the Grid dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pivot dashboard item is exported.
+ */
+interface PivotExportOptions {
+    /**
+     * Gets or sets whether to print the column headers of the pivot dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pie dashboard item is exported.
+ */
+interface PieExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Gauge dashboard item is exported.
+ */
+interface GaugeExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Card dashboard item is exported.
+ */
+interface CardExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Range Filter dashboard item is exported.
+ */
+interface RangeFilterExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Range Filter dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A value returned by the RangeFilterExportSizeMode class that specifies the export size mode for the Range Filter dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Chart dashboard items are exported.
+ */
+interface ChartExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Chart dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A value returned by the ChartExportSizeMode class that specifies the export size mode for the Chart dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how map dashboard items are exported.
+ */
+interface MapExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a map dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the map dashboard item.
+     * Value: A value returned by the MapExportSizeMode class that specifies specifies the export size mode for the map dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard (dashboard item) is exported.
+ */
+interface ASPxClientDashboardExportOptions {
+    /**
+     * Gets or sets the standard paper size.
+     * Value: A string value returned by the DashboardExportPaperKind class that specifies the standard paper size.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportPageLayout class that specifies the page orientation used to export a dashboard (dashboard item).
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling when exporting a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportScaleMode class that specifies the mode for scaling when exporting a dashboard (dashboard item).
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1) by which a dashboard (dashboard item) is scaled.
+     * Value: A Single value that specifies the scale factor by which a dashboard (dashboard item) is scaled.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A String value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A DefaultBoolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets the filter state's location on the exported document.
+     * Value: A string value returned by the DashboardExportFilterState class that specifies the filter state's location on the exported document.
+     */
+    FilterState: string;
+    /**
+     * Provides access to options for exporting a dashboard or individual items in Image format.
+     * Value: An ImageFormatOptions object containing settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+     */
+    ImageOptions: ImageFormatOptions;
+    /**
+     * Provides access to options for exporting individual dashboard items in Excel format.
+     * Value: An ExcelFormatOptions object containing settings that specify parameters affecting how the dashboard item is exported in Excel format.
+     */
+    ExcelOptions: ExcelFormatOptions;
+    /**
+     * Provides access to options for exporting a Grid dashboard item.
+     * Value: A GridExportOptions object containing settings that specify parameters that affect how Grid dashboard items are exported.
+     */
+    GridOptions: GridExportOptions;
+    /**
+     * Provides access to options for exporting a Pivot dashboard item.
+     * Value: A PivotExportOptions object containing settings that specify parameters that affect how Pivot dashboard items are exported.
+     */
+    PivotOptions: PivotExportOptions;
+    /**
+     * Provides access to options for exporting a Pie dashboard item.
+     * Value: A PieExportOptions object containing settings that specify parameters that affect how Pie dashboard items are exported.
+     */
+    PieOptions: PieExportOptions;
+    /**
+     * Provides access to options for exporting a Gauge dashboard item.
+     * Value: A GaugeExportOptions object containing settings that specify parameters that affect how Gauge dashboard items are exported.
+     */
+    GaugeOptions: GaugeExportOptions;
+    /**
+     * Provides access to options for exporting a Card dashboard item.
+     * Value: A CardExportOptions object containing settings that specify parameters that affect how Card dashboard items are exported.
+     */
+    CardOptions: CardExportOptions;
+    /**
+     * Provides access to options for exporting a Range Filter dashboard item.
+     * Value: A RangeFilterExportOptions object containing settings that specify parameters affecting how the Range Filter dashboard item is exported.
+     */
+    RangeFilterOptions: RangeFilterExportOptions;
+    /**
+     * Provides access to options for exporting a Chart dashboard item.
+     * Value: A ChartExportOptions object containing settings that specify parameters that affect how Chart dashboard items are exported.
+     */
+    ChartOptions: ChartExportOptions;
+    /**
+     * Provides access to options for exporting map dashboard items.
+     * Value: A MapExportOptions object containing settings that specify parameters that affect how map dashboard items are exported.
+     */
+    MapOptions: MapExportOptions;
+}
+/**
+ * References a method that will handle the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ActionAvailabilityChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardActionAvailabilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardActionAvailabilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets whether or not data reloading is available in the current state of dashboard item.
+     * Value: true, if data reloading is available in the current state of dashboard item; otherwise, false.
+     */
+    IsReloadDataAvailable: boolean;
+    /**
+     * Gets interactivity actions currently available for the dashboard item.
+     * Value: An array of ASPxClientDashboardItemAction objects that represent interactivity actions currently available for the dashboard item.
+     */
+    ItemActions: ASPxClientDashboardItemAction[];
+}
+/**
+ * References a method that will handle the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventHandler<S> {
+    /**
+     * References a method that will handle the DataLoadingError event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDataLoadingErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDataLoadingErrorEventArgs): void;
+}
+/**
+ * Provides data for the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Allows you to determine whether or not the error message will be shown.
+     */
+    IsErrorMessageShown(): boolean;
+    /**
+     * Allows you to specify whether to show the error message.
+     * @param value true, to show the error message; otherwise, false.
+     */
+    ShowErrorMessage(value: boolean): void;
+    /**
+     * Allows you to obtain the displayed error message.
+     */
+    GetError(): string;
+    /**
+     * Allows you to specify the displayed error message.
+     * @param value A string value that specifies the displayed error message.
+     */
+    SetError(value: string): void;
+}
+/**
+ * Represents an interactivity action in the dashboard item.
+ */
+interface ASPxClientDashboardItemAction {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets interactivity actions performed on a dashboard item.
+     * Value: An array of ASPxClientDashboardAction values that specify interactivity actions performed on a dashboard item.
+     */
+    Actions: any[];
+}
+declare enum ASPxClientDashboardAction {
+    SetMasterFilter=0,
+    ClearMasterFilter=1,
+    DrillDown=2,
+    DrillUp=3
+}
+/**
+ * References a method that will handle the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterSet event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterSetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterSetEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets values of currently selected elements in the master filter item.
+     * Value: Values of currently selected elements in the master filter item.
+     */
+    Values: Object[][];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterCleared event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterClearedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterClearedEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that is the name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillDownPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillDownPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillDownPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets the bottommost value from the current drill-down hierarchy.
+     * Value: The bottommost value from the current drill-down hierarchy.
+     */
+    Value: Object[];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillUpPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillUpPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillUpPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that is the name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * Serves as the base object for all the editors included in the client-side object model.
+ */
+interface ASPxClientEditBase extends ASPxClientControl {
+    /**
+     * Returns the editor's value.
+     */
+    GetValue(): Object;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the text displayed in the editor caption.
+     */
+    GetCaption(): string;
+    /**
+     * Specifies the text displayed in the editor caption.
+     * @param caption A string value specifying the editor caption.
+     */
+    SetCaption(caption: string): void;
+}
+/**
+ * Serves as the base object for all the editors that support validation.
+ */
+interface ASPxClientEdit extends ASPxClientEditBase {
+    /**
+     * Fires on the client side when the editor receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires on the client side when the editor loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Allows you to specify whether the value entered into the editor is valid, and whether the editor is allowed to lose focus.
+     */
+    Validation: ASPxClientEvent<ASPxClientEditValidationEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires after the editor's value has been changed by end-user interactions.
+     */
+    ValueChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientEdit>>;
+    /**
+     * Returns an HTML element that represents the control's input element.
+     */
+    GetInputElement(): Object;
+    /**
+     * Sets input focus to the editor.
+     */
+    Focus(): void;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value is valid.
+     * @param isValid True if the editor's value is valid; otherwise, False.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs the editor's validation.
+     */
+    Validate(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxBinaryImage control.
+ */
+interface ASPxClientBinaryImage extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after an image is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Fires on the client side if any server error occurs during server-side processing of a callback sent by the ASPxClientBinaryImage.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Sets the size of the image editor.
+     * @param width An integer value that specifies the control's width.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * For internal use only.
+     */
+    GetValue(): Object;
+    /**
+     * For internal use only.
+     * @param value 
+     */
+    SetValue(value: Object): void;
+    /**
+     * Removes an image from the editor content.
+     */
+    Clear(): void;
+    /**
+     * Returns a name of the last uploaded file.
+     */
+    GetUploadedFileName(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxButton control.
+ */
+interface ASPxClientButton extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the button's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Occurs on the client side after a button is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientButtonClickEventHandler<ASPxClientButton>>;
+    /**
+     * Simulates a mouse click action on the button control.
+     */
+    DoClick(): void;
+    /**
+     * Returns a value indicating whether the button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value that specifies the button's checked status.
+     * @param value true if the button is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the button.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL pointing to the image displayed within the button.
+     * @param value A string value that is the URL to the image displayed within the button.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Sets a value specifying whether the button is enabled.
+     * @param value true to enable the button; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns a value indicating whether the button is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets input focus to the button.
+     */
+    Focus(): void;
+}
+/**
+ * A method that will handle the client Click event.
+ */
+interface ASPxClientButtonClickEventHandler<S> {
+    /**
+     * A method that will handle the client Click event.
+     * @param source An object that is the event's source.
+     * @param e An ASPxClientButtonClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonClickEventArgs): void;
+}
+/**
+ * Provides data for the Click event.
+ */
+interface ASPxClientButtonClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Specifies whether both the event's default action and the event's bubbling upon the hierarchy of event handlers should be canceled.
+     * Value: true to cancel the event's default action and the event's bubbling upon the hierarchy of event handlers; otherwise, false.
+     */
+    cancelEventAndBubble: boolean;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCalendar control.
+ */
+interface ASPxClientCalendar extends ASPxClientEdit {
+    /**
+     * Fires on the client side after the selected date has been changed within the calendar.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side when the month displayed within the calendar is changed.
+     */
+    VisibleMonthChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side after the callback server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCalendar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCalendar>>;
+    /**
+     * Tests whether the specified date is selected.
+     * @param date A date-time value that specifies the date to test.
+     */
+    IsDateSelected(date: Date): boolean;
+    /**
+     * Sets the date that specifies the month and year to be displayed in the calendar.
+     * @param date The date that specifies calendar's visible month and year.
+     */
+    SetVisibleDate(date: Date): void;
+    /**
+     * Sets the calendar's selected date.
+     * @param date A date object that specifies the calendar's selected date.
+     */
+    SetSelectedDate(date: Date): void;
+    /**
+     * Returns the calendar's selected date.
+     */
+    GetSelectedDate(): Date;
+    /**
+     * Gets the date that determines the month and year that are currently displayed in the calendar.
+     */
+    GetVisibleDate(): Date;
+    /**
+     * Selects the specified date within the calendar.
+     * @param date A date-time value that specifies the selected date.
+     */
+    SelectDate(date: Date): void;
+    /**
+     * Selects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    SelectRange(start: Date, end: Date): void;
+    /**
+     * Deselects the specified date within the calendar.
+     * @param date A date-time value that specifies the date to deselect.
+     */
+    DeselectDate(date: Date): void;
+    /**
+     * Deselects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    DeselectRange(start: Date, end: Date): void;
+    /**
+     * Deselects all the selected dates within the calendar.
+     */
+    ClearSelection(): void;
+    /**
+     * Returns a list of dates which are selected within the calendar.
+     */
+    GetSelectedDates(): Date[];
+    /**
+     * Gets the minimum date on the calendar.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the calendar.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date on the calendar.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the calendar.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the date processed in the calendar.
+     * Value: A DateTime value containing processed data.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether selection of the processed calendar date is disabled.
+     * Value: true, if the date is disabled; otherwise, false.
+     */
+    isDisabled: boolean;
+}
+/**
+ * A method that will handle the client CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDisabledDate event.
+     * @param source The event source.
+     * @param e An ASPxClientCalendarCustomDisabledDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCalendarCustomDisabledDateEventArgs): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCaptcha control.
+ */
+interface ASPxClientCaptcha extends ASPxClientControl {
+    /**
+     * Sets input focus to the control's text box.
+     */
+    Focus(): void;
+    /**
+     * Refreshes the code displayed within the editor's challenge image.
+     */
+    Refresh(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCheckBox control.
+ */
+interface ASPxClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked true if the check box editor is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState A string value matches one of the CheckState enumeration values.
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButton control.
+ */
+interface ASPxClientRadioButton extends ASPxClientCheckBox {
+    /**
+     * Returns a value indicating whether the radio button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the radio button's checked status.
+     * @param isChecked true if the radio button is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+}
+/**
+ * Represents a base for client-side objects which allow single-line text input.
+ */
+interface ASPxClientTextEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Fires on the client side when the editor's text is changed and focus moves out of the editor by end-user interactions.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+    /**
+     * Selects all text in the text editor.
+     */
+    SelectAll(): void;
+    /**
+     * Sets the caret position within the edited text.
+     * @param position An integer value that specifies the zero-based index of a text character that shall precede the caret.
+     */
+    SetCaretPosition(position: number): void;
+    /**
+     * Selects the specified portion of the editor's text.
+     * @param startPos A zero-based integer value specifying the selection's starting position.
+     * @param endPos A zero-based integer value specifying the selection's ending position.
+     * @param scrollToSelection true to scroll the editor's contents to make the selection visible; otherwise, false.
+     */
+    SetSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying and editing text data in their edit regions.
+ */
+interface ASPxClientTextBoxBase extends ASPxClientTextEdit {
+}
+/**
+ * Represents a base for client button editor objects.
+ */
+interface ASPxClientButtonEditBase extends ASPxClientTextBoxBase {
+    /**
+     * Occurs on the client side after an editor button is clicked.
+     */
+    ButtonClick: ASPxClientEvent<ASPxClientButtonEditClickEventHandler<ASPxClientButtonEditBase>>;
+    /**
+     * Specifies whether the button is visible.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     * @param value true, to make the button visible; otherwise, false.
+     */
+    SetButtonVisible(number: number, value: boolean): void;
+    /**
+     * Returns a value specifying whether a button is displayed.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     */
+    GetButtonVisible(number: number): boolean;
+}
+/**
+ * Represents a base class for the editors that contain a drop down window.
+ */
+interface ASPxClientDropDownEditBase extends ASPxClientButtonEditBase {
+    /**
+     * Occurs on the client-side when the drop down window is opened.
+     */
+    DropDown: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side when the drop down window is closed.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side before the drop down window is closed and allows you to cancel the operation.
+     */
+    QueryCloseUp: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Modifies the size of the drop down window in accordance with its content.
+     */
+    AdjustDropDownWindow(): void;
+    /**
+     * Invokes the editor's drop down window.
+     */
+    ShowDropDown(): void;
+    /**
+     * Closes the opened drop down window of the editor.
+     */
+    HideDropDown(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxColorEdit control.
+ */
+interface ASPxClientColorEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected color has been changed within the color editor via end-user interaction.
+     */
+    ColorChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientColorEdit. Use the ColorChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * Returns the color editor's value.
+     */
+    GetColor(): string;
+    /**
+     * Specifies the color value for the color editor.
+     * @param value A string value specifying the editor color.
+     */
+    SetColor(value: string): void;
+    /**
+     * Indicates whether the automatic color item is selected.
+     */
+    IsAutomaticColorSelected(): boolean;
+}
+/**
+ * Represent the client-side equivalent of the ASPxComboBox control.
+ */
+interface ASPxClientComboBox extends ASPxClientDropDownEditBase {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientComboBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientComboBox>>;
+    /**
+     * Specifies the text displayed within the editor's edit box.
+     * @param text A string value specifying the editor's text.
+     */
+    SetText(text: string): void;
+    /**
+     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Removes all items from the client combo box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Prevents the client combobox editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Returns an item specified by its index within the combo box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the index of the selected item within the combo box editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the combobox editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+    /**
+     * Returns the combo box editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Gets the text displayed in the editor's edit box.
+     */
+    GetText(): string;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Determines whether the drop-down content is loaded; if not - loads the content.
+     * @param callbackFunction An object that is the JavaScript function that receives the callback data as a parameter. The function is performed after the combo box content is loaded.
+     */
+    EnsureDropDownLoaded(callbackFunction: Object): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxDateEdit control.
+ */
+interface ASPxClientDateEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected date has been changed within the date editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Enables you to convert the value entered by an end user into the value that will be stored by the date editor.
+     */
+    ParseDate: ASPxClientEvent<ASPxClientParseDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CalendarCustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientDateEdit. Use the DateChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Returns the calendar of the date editor.
+     */
+    GetCalendar(): ASPxClientCalendar;
+    /**
+     * Returns the built-in time edit control.
+     */
+    GetTimeEdit(): ASPxClientTimeEdit;
+    /**
+     * 
+     * @param date 
+     */
+    SetDate(date: Date): void;
+    GetDate(): Date;
+    /**
+     * Returns the number of days in a range selected within a date edit.
+     */
+    GetRangeDayCount(): number;
+    /**
+     * Gets the minimum date of the editor.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the editor.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date of the editor.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the editor.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the ParseDate client-side event that parses a string entered into a date editor.
+ */
+interface ASPxClientParseDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value entered into the date editor by an end user.
+     * Value: The string value entered into the date editor by an end user.
+     */
+    value: string;
+    /**
+     * Gets or sets the edit value of the date editor.
+     * Value: A date/time value representing the edit value of the date editor.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the client ParseDate event, that parses a date editor's value when entered.
+ */
+interface ASPxClientParseDateEventHandler<S> {
+    /**
+     * A method that will handle the ParseDate event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientParseDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientParseDateEventArgs): void;
+}
+/**
+ * Represents a base for client editor objects realizing the dropdown editor functionality.
+ */
+interface ASPxClientDropDownEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Obtains the key value associated with the text displayed within the editor's edit box.
+     */
+    GetKeyValue(): string;
+    /**
+     * Specifies the key value associated with the text displayed within the editor's edit box.
+     * @param keyValue A string specifying the key value associated with the editor's value (displayed text).
+     */
+    SetKeyValue(keyValue: string): void;
+}
+/**
+ * A method that will handle the client events involving a keyboard key being pressed or released.
+ */
+interface ASPxClientEditKeyEventHandler<S> {
+    /**
+     * A method that will handle the client events concerning a keyboard key being pressed.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientEditKeyEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditKeyEventArgs): void;
+}
+/**
+ * Provides data for the client events involved with a key being pressed or released.
+ */
+interface ASPxClientEditKeyEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle client validation events.
+ */
+interface ASPxClientEditValidationEventHandler<S> {
+    /**
+     * A method that will handle client validation events.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientEditValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditValidationEventArgs): void;
+}
+/**
+ * Provides data for the client events that are related to data validation (see Validate).
+ */
+interface ASPxClientEditValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the error description.
+     * Value: A string representing the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the value is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the editor's value being validated.
+     * Value: An object that represents the validated value.
+     */
+    value: string;
+}
+/**
+ * Represents the client ASPxFilterControl.
+ */
+interface ASPxClientFilterControl extends ASPxClientControl {
+    /**
+     * Occurs after a new filter expression has been applied.
+     */
+    Applied: ASPxClientEvent<ASPxClientFilterAppliedEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFilterControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Returns the filter expression.
+     */
+    GetFilterExpression(): string;
+    /**
+     * Returns the applied filter expression.
+     */
+    GetAppliedFilterExpression(): string;
+    /**
+     * Returns the editor used to edit operand values for the specified filter column.
+     * @param editorIndex An integer value that identifies the filter column by its index within the collection.
+     */
+    GetEditor(editorIndex: number): ASPxClientEditBase;
+    /**
+     * Returns a value indicating whether the filter expression being currently composed on the client side is valid - all expression conditions are filled.
+     */
+    IsFilterExpressionValid(): boolean;
+    /**
+     * Applies a filter constructed by an end-user.
+     */
+    Apply(): void;
+    /**
+     * Resets the current filter expression to a previously applied filter expression.
+     */
+    Reset(): void;
+}
+/**
+ * A method that will handle the Applied event.
+ */
+interface ASPxClientFilterAppliedEventHandler<S> {
+    /**
+     * A method that will handle the Applied event.
+     * @param source The event source.
+     * @param e An ASPxClientFilterAppliedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFilterAppliedEventArgs): void;
+}
+/**
+ * Provides data for the Applied event.
+ */
+interface ASPxClientFilterAppliedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the filter expression currently being applied.
+     * Value: A string value that specifies the filter expression currently being applied.
+     */
+    filterExpression: string;
+}
+/**
+ * Represents a base for client editor objects that display a list of items.
+ */
+interface ASPxClientListEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientListEdit>>;
+    /**
+     * Returns the list editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Returns the index of the selected item within the list editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Sets the list editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ListEditItem object.
+ */
+interface ASPxClientListEditItem {
+    /**
+     * Gets a value that indicates whether a list edit item is selected.
+     * Value: true if a list edit item is selected; otherwise, false.
+     */
+    selected: boolean;
+    /**
+     * Gets an editor to which the current item belongs.
+     * Value: An ASPxClientListEdit object that represents the item's owner editor.
+     */
+    listEditBase: ASPxClientListEdit;
+    /**
+     * Gets the item's index.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets the item's associated image.
+     * Value: A string value that represents the path to the image displayed by the item.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that represents the item's display text.
+     */
+    text: string;
+    /**
+     * Gets the item's associated value.
+     * Value: An object that represents the value associated with the item.
+     */
+    value: Object;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its index.
+     * @param columnIndex An integer value that specifies the column's index within the editor's Columns collection.
+     */
+    GetColumnText(columnIndex: number): string;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its field name.
+     * @param columnName A string value that specifies the column's field name defined via the FieldName property.
+     */
+    GetColumnText(columnName: string): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxListBox control.
+ */
+interface ASPxClientListBox extends ASPxClientListEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientListBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a different item in the list box has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client when the editor's item is double clicked.
+     */
+    ItemDoubleClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientListBox>>;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns an item specified by its index within the list box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns an array of the list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all list box items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all list box items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects the items with the specified indices within a list box.
+     * @param indices An array of integer values that represent the items indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Unselects an array of the list box items with the specified indices.
+     * @param indices An array of integer values that represent the indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a list box.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Select the items with the specified values within a list box.
+     * @param values An array of Object[] objects that represent the item's values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects an array of the list box items with the specified values.
+     * @param values An array of Object[] objects that represent the values.
+     */
+    UnselectValues(values: Object[]): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Initializes the ASPxClientListBox client object when its parent container becomes visible dynamically, on the client side.
+     */
+    InitOnContainerMadeVisible(): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Prevents the client list box editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method, and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Removes all items from the client list box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Returns a list box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a list box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+}
+/**
+ * Serves as the base type for the ASPxClientRadioButtonList objects.
+ */
+interface ASPxClientCheckListBase extends ASPxClientListEdit {
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButtonList control.
+ */
+interface ASPxClientRadioButtonList extends ASPxClientCheckListBase {
+}
+/**
+ * A client-side equivalent of the ASPxCheckBoxList object.
+ */
+interface ASPxClientCheckBoxList extends ASPxClientCheckListBase {
+    /**
+     * Occurs on the client side after a different item in the check box list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientCheckBoxList>>;
+    /**
+     * Returns an array of the check box list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the check box list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the check box list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all check box list items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all check box list items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Selects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Unselects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    UnselectValues(values: Object[]): void;
+}
+/**
+ * A method that will handle the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedIndexChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientListEditItemSelectedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientListEditItemSelectedChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the item is selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxProgressBar control.
+ */
+interface ASPxClientProgressBar extends ASPxClientEditBase {
+    /**
+     * Sets the position of the operation's progress.
+     * @param position An integer value specifying the progress position.
+     */
+    SetPosition(position: number): void;
+    /**
+     * Gets the position of the operation's progress.
+     */
+    GetPosition(): number;
+    /**
+     * Sets the pattern used to format the displayed text for the progress bar.
+     * @param text A  value that is the format pattern.
+     */
+    SetCustomDisplayFormat(text: string): void;
+    /**
+     * Returns the text displayed within the progress bar.
+     */
+    GetDisplayText(): string;
+    /**
+     * Sets the percentage representation of the progress position.
+     */
+    GetPercent(): number;
+    /**
+     * Sets the minimum range value of the progress bar.
+     * @param min An integer value specifying the minimum value of the progress bar range.
+     */
+    SetMinimum(min: number): void;
+    /**
+     * Sets the maximum range value of the progress bar.
+     * @param max An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMaximum(max: number): void;
+    /**
+     * Gets the minimum range value of the progress bar.
+     */
+    GetMinimum(): number;
+    /**
+     * Gets the maximum range value of the progress bar.
+     */
+    GetMaximum(): number;
+    /**
+     * Sets the minimum and maximum range values of the progress bar.
+     * @param minValue An integer value specifying the minimum value of the progress bar range.
+     * @param maxValue An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMinMaxValues(minValue: number, maxValue: number): void;
+}
+/**
+ * Represents a base class for the ASPxClientSpinEdit object.
+ */
+interface ASPxClientSpinEditBase extends ASPxClientButtonEditBase {
+    /**
+     * This event is not in effect for the ASPxClientSpinEditBase. Use the ASPxClientTimeEdit.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEditBase>>;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpinEdit control.
+ */
+interface ASPxClientSpinEdit extends ASPxClientSpinEditBase {
+    /**
+     * Occurs on the client side when the editor's value is altered in any way.
+     */
+    NumberChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEdit>>;
+    /**
+     * Specifies the value of the spin edit control on the client side.
+     * @param number A Decimal value specifying the control value.
+     */
+    SetValue(number: number): void;
+    /**
+     * Sets the spin editor's value.
+     * @param number A decimal number specifying the value to assign to the spin editor.
+     */
+    SetNumber(number: number): void;
+    /**
+     * Gets a number which represents the spin editor's value.
+     */
+    GetNumber(): number;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the minimum value of the editor.
+     * @param value A decimal value specifying the minimum value of the editor.
+     */
+    SetMinValue(value: number): void;
+    /**
+     * Gets the minimum value of the editor.
+     */
+    GetMinValue(): number;
+    /**
+     * Sets the maximum value of the editor.
+     * @param value A decimal value specifying the maximum value of the editor.
+     */
+    SetMaxValue(value: number): void;
+    /**
+     * Gets the maximum value of the editor.
+     */
+    GetMaxValue(): number;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTimeEdit control.
+ */
+interface ASPxClientTimeEdit extends ASPxClientSpinEditBase {
+    /**
+     * Fires after the selected date has been changed within the time editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimeEdit>>;
+    /**
+     * 
+     * @param date 
+     */
+    SetDate(date: Date): void;
+    GetDate(): Date;
+}
+/**
+ * Represents a base for client-side static editors whose values cannot be visually changed by end users.
+ */
+interface ASPxClientStaticEdit extends ASPxClientEditBase {
+    /**
+     * Occurs on the client side after an end-user clicks within a static editor.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientStaticEdit>>;
+}
+/**
+ * A method that will handle client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditEventHandler<S> {
+    /**
+     * A method that will handle client-side events which concern clicking within editors.
+     * @param source An object representing the event source. Identifies the editor that raised the event.
+     * @param e An ASPxClientEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditClickEventArgs): void;
+}
+/**
+ * Provides data for the client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the HTML element related to the event.
+     * Value: An object that represents the clicked HTML element.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHyperLink control.
+ */
+interface ASPxClientHyperLink extends ASPxClientStaticEdit {
+    /**
+     * Gets an URL which defines the navigation location for the editor's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies an URL which defines the navigation location for the editor's hyperlink.
+     * @param url A string value which specifies an URL to where the client web browser will navigate when a hyperlink in the editor is clicked.
+     */
+    SetNavigateUrl(url: string): void;
+    /**
+     * Gets the text caption displayed for the hyperlink in the hyperlink editor.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text caption displayed for the hyperlink in the hyperlink editor.
+     * @param text A string value specifying the text caption for the hyperlink in the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying images.
+ */
+interface ASPxClientImageBase extends ASPxClientStaticEdit {
+    /**
+     * Sets the size of the image displayed within the image editor.
+     * @param width An integer value that specifies the image's width.
+     * @param height An integer value that specifies the image's height.
+     */
+    SetSize(width: number, height: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxImage control.
+ */
+interface ASPxClientImage extends ASPxClientImageBase {
+    /**
+     * Returns the URL pointing to the image displayed within the image editor.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the image editor.
+     * @param url A string value specifying the URL to the image displayed within the editor.
+     */
+    SetImageUrl(url: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxLabel control.
+ */
+interface ASPxClientLabel extends ASPxClientStaticEdit {
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTextBox control.
+ */
+interface ASPxClientTextBox extends ASPxClientTextBoxBase {
+}
+/**
+ * Represents the client-side equivalent of the ASPxMemo control.
+ */
+interface ASPxClientMemo extends ASPxClientTextEdit {
+}
+/**
+ * Represents the client-side equivalent of the ASPxButtonEdit control.
+ */
+interface ASPxClientButtonEdit extends ASPxClientButtonEditBase {
+}
+/**
+ * A method that will handle the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventHandler<S> {
+    /**
+     * A method that will handle the ButtonClick event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientButtonEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonEditClickEventArgs): void;
+}
+/**
+ * Provides data for the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the clicked button.
+     * Value: An integer value representing the index of the clicked button within the editor's Buttons collection.
+     */
+    buttonIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxTokenBox object.
+ */
+interface ASPxClientTokenBox extends ASPxClientComboBox {
+    /**
+     * Fires on the client side after the token collection has been changed.
+     */
+    TokensChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTokenBox>>;
+    /**
+     * Adds a new token with the specified text to the end of the control's token collection.
+     * @param text A string value specifying the token's text.
+     */
+    AddToken(text: string): void;
+    /**
+     * Removes a token specified by its text from the client token box.
+     * @param text A string value that is the text of the token to be removed.
+     */
+    RemoveTokenByText(text: string): void;
+    /**
+     * Removes a token specified by its index from the client token box.
+     * @param index An integer value that is the index of the token to be removed.
+     */
+    RemoveToken(index: number): void;
+    /**
+     * Returns an HTML span element that corresponds to the specified token.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's text.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenTextHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's remove button.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenRemoveButtonHtmlElement(index: number): Object;
+    /**
+     * Returns a collection of tokens.
+     */
+    GetTokenCollection(): string[];
+    /**
+     * Sets a collection of tokens.
+     * @param collection A  object that is the collection of tokens.
+     */
+    SetTokenCollection(collection: string[]): void;
+    /**
+     * Removes all tokens contained in the token box.
+     */
+    ClearTokenCollection(): void;
+    /**
+     * Returns the index of a token specified by its text.
+     * @param text A string value that specifies the text of the token.
+     */
+    GetTokenIndexByText(text: string): number;
+    /**
+     * Gets the token texts, separated with a sign, specified by the TextSeparator property.
+     */
+    GetText(): string;
+    /**
+     * Sets the token texts, separated with a sign, specified by the TextSeparator property.
+     * @param text A string value that is the token texts separated with a text separator.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the editor value.
+     */
+    GetValue(): string;
+    /**
+     * Sets the editor value.
+     * @param value A string that is the editor value.
+     */
+    SetValue(value: string): void;
+    /**
+     * Returns a value that indicates if the specified token (string) is a custom token.
+     * @param text A string value that is a token.
+     * @param caseSensitive true, if tokens are case sensitive; otherwise, false.
+     */
+    IsCustomToken(text: string, caseSensitive: boolean): boolean;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * The client-side equivalent of the ASPxTrackBar control.
+ */
+interface ASPxClientTrackBar extends ASPxClientEdit {
+    /**
+     * Fires on the client side before a track bar position is changed and allows you to cancel the action.
+     */
+    PositionChanging: ASPxClientEvent<ASPxClientTrackBarPositionChangingEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Fires after the editor's position has been changed.
+     */
+    PositionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user moves a cursor while the drag handle is held down.
+     */
+    Track: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a drag handle and moves it.
+     */
+    TrackStart: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a drag handle after moving it.
+     */
+    TrackEnd: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Returns a track bar item index by the item's value.
+     * @param value An object that specifies the item's value.
+     */
+    GetItemIndexByValue(value: Object): number;
+    /**
+     * Returns a track bar item's associated value.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemValue(index: number): Object;
+    /**
+     * Returns a track bar item text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemText(index: number): string;
+    /**
+     * Returns a track bar item's tooltip text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemToolTip(index: number): string;
+    /**
+     * Returns the number of the track bar items that are maintained by the item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Specifies the secondary drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionEnd(position: number): void;
+    /**
+     * Specifies the main drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionStart(position: number): void;
+    /**
+     * Returns the secondary drag handle position.
+     */
+    GetPositionEnd(): number;
+    /**
+     * Returns the main drag handle position.
+     */
+    GetPositionStart(): number;
+    /**
+     * Gets a drag handle position.
+     */
+    GetPosition(): number;
+    /**
+     * Specifies a drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPosition(position: number): void;
+}
+/**
+ * A method that will handle the client PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventHandler<S> {
+    /**
+     * A method that will handle the PositionChanging event.
+     * @param source The event source. Identifies the ASPxTrackBar control that raised the event.
+     * @param e A ASPxClientTrackBarPositionChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTrackBarPositionChangingEventArgs): void;
+}
+/**
+ * Provides data for the PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+    /**
+     * Gets the current drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPosition: number;
+    /**
+     * Gets the current secondary drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionEnd: number;
+    /**
+     * Gets the current main drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionStart: number;
+    /**
+     * Gets a position where the drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPosition: number;
+    /**
+     * Gets a position where the secondary drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionEnd: number;
+    /**
+     * Gets a position where the main drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionStart: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxValidationSummary control.
+ */
+interface ASPxClientValidationSummary extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the validation summary's visibility is changed.
+     */
+    VisibilityChanged: ASPxClientEvent<ASPxClientValidationSummaryVisibilityChangedEventHandler<ASPxClientValidationSummary>>;
+}
+/**
+ * A method that will handle the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventHandler<S> {
+    /**
+     * A method that will handle the VisibilityChanged client event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientValidationSummaryVisibilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationSummaryVisibilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the editor is visible on the client.
+     * Value: true if the editor is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client ASPxGaugeControl.
+ */
+interface ASPxClientGaugeControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Fires when errors have occurred during callback processing.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents the client ASPxGridView.
+ */
+interface ASPxClientGridBase extends ASPxClientControl {
+}
+/**
+ * Serves as a base object implementing the client column functionality.
+ */
+interface ASPxClientGridColumnBase {
+}
+/**
+ * The client-side equivalent of the ASPxGridLookup control.
+ */
+interface ASPxClientGridLookup extends ASPxClientDropDownEditBase {
+    /**
+     * Fires on the client when a data row is clicked within the built-in dropdown grid.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Returns a client object representing the built-in dropdown grid.
+     */
+    GetGridView(): ASPxClientGridView;
+    /**
+     * Confirms the current selection made by an end-user within the editor's dropdown grid.
+     */
+    ConfirmCurrentSelection(): void;
+    /**
+     * Cancels the current selection made by an end-user within the editor's dropdown grid and rolls back to the last confirmed selection. The selection can be confirmed by either pressing the Enter key or calling the ConfirmCurrentSelection method.
+     */
+    RollbackToLastConfirmedSelection(): void;
+}
+/**
+ * Represents the client ASPxCardView.
+ */
+interface ASPxClientCardView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientCardViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientCardViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientCardViewCustomButtonEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientCardViewSelectionEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientCardViewColumnCancelEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientCardViewBatchEditStartEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid leaves batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientCardViewBatchEditEndEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientCardViewBatchEditConfirmShowingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to specify whether card data is valid and provide an error text.
+     */
+    BatchEditCardValidating: ASPxClientEvent<ASPxClientCardViewBatchEditCardValidatingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientCardViewBatchEditChangesSavingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientCardViewBatchEditChangesCancelingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is inserted in batch edit mode.
+     */
+    BatchEditCardInserting: ASPxClientEvent<ASPxClientCardViewBatchEditCardInsertingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is deleted in batch edit mode.
+     */
+    BatchEditCardDeleting: ASPxClientEvent<ASPxClientCardViewBatchEditCardDeletingEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is clicked.
+     */
+    CardClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is double clicked.
+     */
+    CardDblClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires in response to changing card focus.
+     */
+    FocusedCardChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientCardView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the customization window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientCardView>>;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientCardViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientCardViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientCardViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param cardVisibleIndex An  value that specifies the visible index of the card.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(cardVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientCardViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientCardViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A string value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the CardView.
+     * @param moveBefore true, to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Returns the key value of the specified card.
+     * @param visibleIndex An integer value that specifies the card's visible index.
+     */
+    GetCardKey(visibleIndex: number): string;
+    /**
+     * Switches the CardView to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a card to be edited.
+     */
+    StartEditCard(visibleIndex: number): void;
+    /**
+     * Switches the ASPxCardView to edit mode.
+     * @param key An object that uniquely identifies a card to be edited.
+     */
+    StartEditCardByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new card is being edited.
+     */
+    IsNewCardEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewCard(): void;
+    /**
+     * Deletes the specified card.
+     * @param visibleIndex An integer value that identifies the card.
+     */
+    DeleteCard(visibleIndex: number): void;
+    /**
+     * Deletes a card with the specified key value.
+     * @param key An object that uniquely identifies the card.
+     */
+    DeleteCardByKey(key: Object): void;
+    /**
+     * Returns the focused card's index.
+     */
+    GetFocusedCardIndex(): number;
+    /**
+     * Moves focus to the specified card.
+     * @param visibleIndex An integer value that specifies the focused card's index.
+     */
+    SetFocusedCardIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected cards within the CardView.
+     */
+    SelectCards(): void;
+    /**
+     * Selects the specified card displayed within the CardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCards(visibleIndex: number): void;
+    /**
+     * Selects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    SelectCards(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCards(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified card within the GridView.
+     * @param visibleIndex An integer zero-based index that identifies the data card within the grid.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCards(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCardsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified card displayed within the CardView.
+     * @param key An object that uniquely identifies the card.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    SelectCardsByKey(keys: Object[]): void;
+    /**
+     * Selects a card displayed within the CardView by its key.
+     * @param key An object that uniquely identifies the card.
+     */
+    SelectCardsByKey(key: Object): void;
+    /**
+     * Deselects the specified cards displayed within the ASPxCardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    UnselectCardsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified card displayed within the ASPxCardView.
+     * @param key An object that uniquely identifies the card.
+     */
+    UnselectCardsByKey(key: Object): void;
+    /**
+     * Deselects all the selected cards within the ASPxCardView.
+     */
+    UnselectCards(): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    UnselectCards(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCards(visibleIndex: number): void;
+    /**
+     * Deselects all grid cards that match the filter criteria currently applied to the CardView.
+     */
+    UnselectFilteredCards(): void;
+    /**
+     * Selects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified cards (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected cards displayed on the current page.
+     */
+    SelectAllCardsOnPage(): void;
+    /**
+     * Allows you to select or deselect all cards displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected cards displayed on the current page; false to deselect all selected cards on the page.
+     */
+    SelectAllCardsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected cards displayed on the current page.
+     */
+    UnselectAllCardsOnPage(): void;
+    /**
+     * Returns the number of selected cards.
+     */
+    GetSelectedCardCount(): number;
+    /**
+     * Indicates whether or not the specified card is selected within the current page.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsCardSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the grid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client CardView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first card displayed within the grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the CardView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the customization window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the customization window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the customization window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the customization window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client grid.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the card values displayed within all selected cards.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected cards are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns key values of selected cards displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified card.
+     * @param visibleIndex An integer value that identifies the data card.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified card are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetCardValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the card values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetPageCardValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the number of cards actually displayed within the active page.
+     */
+    GetVisibleCardsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientCardViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientCardViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientCardViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientCardViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientCardViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientCardViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of card values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxCardView column.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientCardViewColumn object that represents the processed column.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A method that will handle the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventHandler<S> {
+    /**
+     * A method that will handle the CardClick event.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCardClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCardClickEventArgs): void;
+}
+/**
+ * Provides data for the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the CardClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the card whose custom button has been clicked.
+     * Value: An integer value that identifies the card whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the card whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the card has been selected.
+     * Value: true if the card has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all cards displayed within a page have been selected or unselected.
+     * Value: true if all cards displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the CardView column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the focused CardView column.
+     */
+    focusedColumn: ASPxClientCardViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditCardValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer value that specifies the processed card's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a card currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientCardViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardDeleting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    cardValues: Object;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientCardViewBatchEditApi {
+    /**
+     * Performs validation of CardView data contained in the cards when the CardView operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified cards should be validated; otherwise, false.
+     */
+    ValidateCards(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of CardView data contained in the specified card when the CardView operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated card.
+     */
+    ValidateCard(visibleIndex: number): boolean;
+    /**
+     * Returns an array of card visible indices.
+     * @param includeDeleted true, to include visible indices of deleted cards to the returned array; otherwise, false.
+     */
+    GetCardVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted card visible indices.
+     */
+    GetDeletedCardIndices(): number[];
+    /**
+     * Returns an array of the inserted card visible indices.
+     */
+    GetInsertedCardIndices(): number[];
+    /**
+     * Indicates if the card with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsDeletedCard(visibleIndex: number): boolean;
+    /**
+     * Indicates if the card with the specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsNewCard(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the card
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the card.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientCardViewCellInfo;
+    /**
+     * Returns a value that indicates whether the card view has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified card has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified card.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or card editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientCardViewCellInfo {
+    /**
+     * Gets the visible index of the card that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    cardVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A client-side equivalent of the ASPxGridView object.
+ */
+interface ASPxClientGridView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientGridViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientGridViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientGridViewCustomButtonEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientGridViewSelectionEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires in response to changing row focus.
+     */
+    FocusedRowChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to cancel data grouping.
+     */
+    ColumnGrouping: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires when an end-user starts dragging the column's header and enables you to cancel this operation.
+     */
+    ColumnStartDragging: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientGridViewColumnProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to control column movement.
+     */
+    ColumnMoving: ASPxClientEvent<ASPxClientGridViewColumnMovingEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is expanded.
+     */
+    RowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is collapsed.
+     */
+    RowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is expanded.
+     */
+    DetailRowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is collapsed.
+     */
+    DetailRowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is clicked.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is double clicked.
+     */
+    RowDblClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after an end-user right clicks in the GridView, and enables you to provide a custom context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientGridViewContextMenuEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client side when a context menu item has been clicked.
+     */
+    ContextMenuItemClick: ASPxClientEvent<ASPxClientGridViewContextMenuItemClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to specify whether row data is valid and provide an error text.
+     */
+    BatchEditRowValidating: ASPxClientEvent<ASPxClientGridViewBatchEditRowValidatingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientGridViewBatchEditConfirmShowingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientGridViewBatchEditStartEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientGridViewBatchEditEndEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientGridViewBatchEditChangesSavingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientGridViewBatchEditChangesCancelingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is inserted in batch edit mode.
+     */
+    BatchEditRowInserting: ASPxClientEvent<ASPxClientGridViewBatchEditRowInsertingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is deleted in batch edit mode.
+     */
+    BatchEditRowDeleting: ASPxClientEvent<ASPxClientGridViewBatchEditRowDeletingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientGridView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGridView>>;
+    /**
+     * Selects or deselects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified row (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRowOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected rows displayed on the current page.
+     */
+    SelectAllRowsOnPage(): void;
+    /**
+     * Allows you to select or deselect all rows displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected rows displayed on the current page; false to deselect all selected rows on the page.
+     */
+    SelectAllRowsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected rows displayed on the current page.
+     */
+    UnselectAllRowsOnPage(): void;
+    /**
+     * Returns the number of selected rows.
+     */
+    GetSelectedRowCount(): number;
+    /**
+     * Indicates whether or not the specified row is selected within the current page.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsRowSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a group row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsGroupRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a data row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDataRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified group row is expanded.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    IsGroupRowExpanded(visibleIndex: number): boolean;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVertScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorzScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVertScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorzScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Applies a filter specified in the filter row to the GridView.
+     */
+    ApplyOnClickRowFilter(): void;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data colum within the ASPxGridView.
+     */
+    GetAutoFilterEditor(column: ASPxClientGridViewColumn): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnIndex An integer value that identifies the data column by its index.
+     */
+    GetAutoFilterEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's name or its data base field name.
+     */
+    GetAutoFilterEditor(columnFieldNameOrId: string): Object;
+    /**
+     * Applies a filter to the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client GridView.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(column: ASPxClientGridViewColumn, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnIndex: number, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnFieldNameOrId: string, val: string): void;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the GridView.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client GridView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first data row displayed within the GridView's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the GridView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnsCount(): number;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the row values displayed within all selected rows.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected rows are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns key values of selected rows displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified row.
+     * @param visibleIndex An integer value that identifies the data row.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified row are returned.
+     * @param onCallback An ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetRowValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the row values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetPageRowValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the number of rows actually displayed within the active page.
+     */
+    GetVisibleRowsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientGridViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientGridViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientGridViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientGridViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientGridViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientGridViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientGridViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param rowVisibleIndex An integer value that specifies the visible index of the row.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A String value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the ASPxGridView's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     */
+    GroupBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GroupBy(columnIndex: number): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GroupBy(columnFieldNameOrId: string): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnIndex: number, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnIndex: number, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number, sortOrder: string): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the ASPxGridView.
+     */
+    UnGroup(column: ASPxClientGridViewColumn): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    UnGroup(columnIndex: number): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    UnGroup(columnFieldNameOrId: string): void;
+    /**
+     * Expands all group rows.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all group rows.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all detail rows.
+     */
+    ExpandAllDetailRows(): void;
+    /**
+     * Collapses all detail rows.
+     */
+    CollapseAllDetailRows(): void;
+    /**
+     * Expands the specified group row preserving the collapsed state of any child group row.
+     * @param visibleIndex An integer value that identifies the group row.
+     */
+    ExpandRow(visibleIndex: number): void;
+    /**
+     * Expands the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row.
+     * @param recursive true to expand any child group rows at all nesting levels; false to preserve the collapsed state of any child group rows.
+     */
+    ExpandRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Collapses the specified group row preserving the expanded state of child group rows.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    CollapseRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     * @param recursive true to collapse child group rows at all nesting levels; false to preserve the expanded state of any child group row.
+     */
+    CollapseRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Scrolls the view to the specified row.
+     * @param visibleIndex An integer value that identifies a row by its visible index.
+     */
+    MakeRowVisible(visibleIndex: number): void;
+    /**
+     * Expands the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    ExpandDetailRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    CollapseDetailRow(visibleIndex: number): void;
+    /**
+     * Returns the key value of the specified data row.
+     * @param visibleIndex An integer value that specifies the row's visible index.
+     */
+    GetRowKey(visibleIndex: number): string;
+    /**
+     * Switches the grid to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a data row to be edited.
+     */
+    StartEditRow(visibleIndex: number): void;
+    /**
+     * Switches the grid to edit mode.
+     * @param key An object that uniquely identifies a data row to be edited.
+     */
+    StartEditRowByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new row is being edited.
+     */
+    IsNewRowEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewRow(): void;
+    /**
+     * Deletes the specified row.
+     * @param visibleIndex An integer value that identifies the row.
+     */
+    DeleteRow(visibleIndex: number): void;
+    /**
+     * Deletes a row with the specified key value.
+     * @param key An object that uniquely identifies the row.
+     */
+    DeleteRowByKey(key: Object): void;
+    /**
+     * Returns the focused row's index.
+     */
+    GetFocusedRowIndex(): number;
+    /**
+     * Moves focus to the specified row.
+     * @param visibleIndex An integer value that specifies the focused row's index.
+     */
+    SetFocusedRowIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected rows within the grid.
+     */
+    SelectRows(): void;
+    /**
+     * Selects the specified row displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRows(visibleIndex: number): void;
+    /**
+     * Selects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    SelectRows(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRows(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified row within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the data row within the grid.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRows(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRowsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    SelectRowsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid row by its key.
+     * @param key An object that uniquely identifies the row.
+     */
+    SelectRowsByKey(key: Object): void;
+    /**
+     * Deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    UnselectRowsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     */
+    UnselectRowsByKey(key: Object): void;
+    /**
+     * Deselects all the selected rows within the grid.
+     */
+    UnselectRows(): void;
+    /**
+     * Deselects the specified rows (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    UnselectRows(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified row (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRows(visibleIndex: number): void;
+    /**
+     * Deselects all grid rows that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRows(): void;
+    /**
+     * Selects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRowOnPage(visibleIndex: number): void;
+}
+/**
+ * A client grid column.
+ */
+interface ASPxClientGridViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the column's unique identifier.
+     * Value: A string value that specifies the column's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientGridViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxGridView column.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientGridViewColumn object that represents the processed column.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the client events concerned with column processing.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with column processing.
+     * @param source The event source.
+     * @param e A ASPxClientGridViewColumnProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events  concerned with column processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a grid column related to the event.
+     * Value: An ASPxClientGridViewColumn object representing the column related to the event.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the RowExpanding events.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer zero-based index that identifies the processed row.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the row whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the row has been selected.
+     * Value: true if the row has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all rows displayed within a page have been selected or unselected.
+     * Value: true if all rows displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowClick events.
+ */
+interface ASPxClientGridViewRowClickEventHandler<S> {
+    /**
+     * A method that will handle the RowClick event.
+     * @param source The event source. This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewRowClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowClickEventArgs): void;
+}
+/**
+ * Provides data for the RowClick event.
+ */
+interface ASPxClientGridViewRowClickEventArgs extends ASPxClientGridViewRowCancelEventArgs {
+    /**
+     * Provides access to the parameters associated with the RowClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies grid element.
+     */
+    objectType: string;
+    /**
+     * Identifies the grid element being right clicked by the user.
+     * Value: A zero-based integer index that identifies the grid element being clicked by the user.
+     */
+    index: number;
+    /**
+     * Provides access to the parameters associated with the ContextMenu event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets the currently processed menu object.
+     * Value: An object that is the currently processed menu.
+     */
+    menu: Object;
+    /**
+     * Specifies whether a browser context menu should be displayed.
+     * Value: true, to display a browser context menu; otherwise, false.    The default is false.
+     */
+    showBrowserMenu: boolean;
+}
+/**
+ * A method that will handle the client ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the clicked context menu item.
+     * Value: An <see cref="ASPxClientMenuItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies the grid element.
+     */
+    objectType: string;
+    /**
+     * Returns the processed element index.
+     * Value: An integer value that specifies the processed element index.
+     */
+    elementIndex: number;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+    /**
+     * Specifies whether default context menu item click is handled manually, so no default processing is required.
+     * Value: true if no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the row whose custom button has been clicked.
+     * Value: An integer value that identifies the row whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnMoving event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnMovingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnMovingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether a column is allowed to be moved.
+     * Value: true to allow column moving; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets the column currently being dragged by an end-user.
+     * Value: An ASPxClientGridViewColumn object that represents the column currently being dragged by an end-user.
+     */
+    sourceColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets the target column, before or after which the source column will be inserted (if dropped).
+     * Value: An ASPxClientGridViewColumn object that represents the target column. null (Nothing in Visual Basic) if the source column isn't over the column header panel.
+     */
+    destinationColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets whether the source column will be inserted before the target column (if dropped).
+     * Value: true if the source column will be inserted before the target column (if dropped); otherwise, false.
+     */
+    isDropBefore: boolean;
+    /**
+     * Gets whether the source column is currently over the Group Panel.
+     * Value: true if the source column is currently over the Group Panel; otherwise, false.
+     */
+    isGroupPanel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the focused grid column.
+     */
+    focusedColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells has been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditRowValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a row currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: A <see cref="ASPxClientGridViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientGridViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowDeleting event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    rowValues: Object;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientGridViewCellInfo {
+    /**
+     * Gets the visible index of the row that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    rowVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientGridViewBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all rows when the grid operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified rows should be validated; otherwise, false.
+     */
+    ValidateRows(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified row when the grid operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated row.
+     */
+    ValidateRow(visibleIndex: number): boolean;
+    /**
+     * Returns an array of row visible indices.
+     * @param includeDeleted true, to include visible indices of deleted rows to the returned array; otherwise, false.
+     */
+    GetRowVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted row visible indices.
+     */
+    GetDeletedRowIndices(): number[];
+    /**
+     * Returns an array of the inserted row visible indices.
+     */
+    GetInsertedRowIndices(): number[];
+    /**
+     * Indicates if the row with specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDeletedRow(visibleIndex: number): boolean;
+    /**
+     * Indicates if the row with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsNewRow(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the row.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the row.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientGridViewCellInfo;
+    /**
+     * Returns a value that indicates whether the grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified row has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     * @param columnFieldNameOrId A string value that identifies the column by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified row.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or row editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * A client-side equivalent of the ASPxVerticalGrid object.
+ */
+interface ASPxClientVerticalGrid extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientVerticalGridBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientVerticalGridBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientVerticalGridCustomButtonEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientVerticalGridSelectionEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditStartEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditEndEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesSavingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is inserted in batch edit mode.
+     */
+    BatchEditRecordInserting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is deleted in batch edit mode.
+     */
+    BatchEditRecordDeleting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to specify whether record data is valid and provide an error text.
+     */
+    BatchEditRecordValidating: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent rows from being sorted.
+     */
+    RowSorting: ASPxClientEvent<ASPxClientVerticalGridRowCancelEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side before the expansion state of a row is changed by end-user interaction.
+     */
+    RowExpandedChanging: ASPxClientEvent<ASPxClientVerticalGridRowExpandingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side after a row's expansion state has been changed by end-user interaction.
+     */
+    RowExpandedChanged: ASPxClientEvent<ASPxClientVerticalGridRowExpandedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is clicked.
+     */
+    RecordClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is double clicked.
+     */
+    RecordDblClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientVerticalGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     */
+    SortBy(rowIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    SortBy(rowFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true, to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param row An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Returns the key value of the specified data row (record in the vertical grid).
+     * @param visibleIndex An integer value that specifies the record's visible index.
+     */
+    GetRecordKey(visibleIndex: number): string;
+    /**
+     * Adds a new record.
+     */
+    AddNewRecord(): void;
+    /**
+     * Deletes the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     */
+    DeleteRecord(visibleIndex: number): void;
+    /**
+     * Deletes a record with the specified key value.
+     * @param key An object that uniquely identifies the record.
+     */
+    DeleteRecordByKey(key: Object): void;
+    /**
+     * Selects all the unselected records within the grid.
+     */
+    SelectRecords(): void;
+    /**
+     * Selects the specified record displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecords(visibleIndex: number): void;
+    /**
+     * Selects the specified rercords within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    SelectRecords(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified records within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecords(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified record within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the record within the grid.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecords(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecordsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    SelectRecordsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid record by its key.
+     * @param key An object that uniquely identifies the record.
+     */
+    SelectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all the selected records within the grid.
+     */
+    UnselectRecords(): void;
+    /**
+     * Deselects the specified records (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    UnselectRecords(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified record (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecords(visibleIndex: number): void;
+    /**
+     * Deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    UnselectRecordsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     */
+    UnselectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all grid records that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRecords(): void;
+    /**
+     * Selects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified record (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected records displayed on the current page.
+     */
+    SelectAllRecordsOnPage(): void;
+    /**
+     * Allows you to select or deselect all records displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected records displayed on the current page; false to deselect all selected records on the page.
+     */
+    SelectAllRecordsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected records displayed on the current page.
+     */
+    UnselectAllRecordsOnPage(): void;
+    /**
+     * Returns the number of selected records.
+     */
+    GetSelectedRecordCount(): number;
+    /**
+     * Indicates whether or not the specified record is selected within the current page.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsRecordSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Returns the values of the specified data source fields within the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     * @param fieldNames The names of data source fields separated using a semicolon, whose values within the specified record are returned.
+     * @param onCallback An ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetRecordValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the record values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetPageRecordValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the number of records actually displayed within the active page.
+     */
+    GetVisibleRecordsOnPage(): number;
+    /**
+     * Returns the number of rows within the client vertical grid.
+     */
+    GetRowCount(): number;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the ASPxVerticalGrid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client vertical grid.
+     */
+    ClearFilter(): void;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first record displayed within the vertical grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxVerticalGrid to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Returns the record values displayed within all selected records.
+     * @param fieldNames The names of data source fields separated by a semicolon, whose values within the selected records are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns key values of selected records displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     */
+    GetEditor(row: ASPxClientVerticalGridRow): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowIndex An integer value that specifies the row's position within the rows collection.
+     */
+    GetEditor(rowIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    GetEditor(rowFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the client row that resides at the specified position within the row collection.
+     * @param rowIndex A zero-based index that identifies the row within the row collection (the row's Index property value).
+     */
+    GetRow(rowIndex: number): ASPxClientVerticalGridRow;
+    /**
+     * Returns the row with the specified unique identifier.
+     * @param rowId A string value that specifies the row's unique identifier (the row's Name property value).
+     */
+    GetRowById(rowId: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the client row which is bound to the specified data source field.
+     * @param rowFieldName A string value that specifies the name of the data source field to which the row is bound (the row's fieldName property value).
+     */
+    GetRowByField(rowFieldName: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Gets the value that specifies whether the required row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the row.
+     */
+    GetRowExpanded(row: ASPxClientVerticalGridRow): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified index is expanded.
+     * @param rowIndex An integer value specifying the row's index.
+     */
+    GetRowExpanded(rowIndex: number): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified field name or ID is expanded.
+     * @param rowFieldNameOrId A string value specifying the row's field name or ID.
+     */
+    GetRowExpanded(rowFieldNameOrId: string): boolean;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(row: ASPxClientVerticalGridRow, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowIndex An integer value specifying the index of the row.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowIndex: number, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowFieldNameOrId: string, value: boolean): void;
+}
+/**
+ * A client grid row.
+ */
+interface ASPxClientVerticalGridRow extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the row.
+     * Value: A string value assigned to the row's Name property.
+     */
+    name: string;
+    /**
+     * Gets the row's position within the collection.
+     * Value: An integer zero-bazed index that specifies the row's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current row.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the row is visible.
+     * Value: true, to display the row; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientVerticalGridValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of record values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxVerticalGrid row.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxVerticalGrid row.
+ */
+interface ASPxClientVerticalGridRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client row.
+     * Value: An ASPxClientVerticalGridRow object that represents the processed row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventHandler<S> {
+    /**
+     * A method that will handle the RecordClick event.
+     * @param source The event source. This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridRecordClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRecordClickEventArgs): void;
+}
+/**
+ * Provides data for the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the RecordClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the record whose custom button has been clicked.
+     * Value: An integer value that identifies the record whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the record whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the record has been selected.
+     * Value: true, if the record has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all records displayed within a page have been selected or unselected.
+     * Value: true if all records displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandedEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the expanded row.
+     * Value: An ASPxClientVerticalGridRow object that represents the expanded row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandingEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventArgs extends ASPxClientVerticalGridRowExpandedEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid row that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the focused grid row.
+     */
+    focusedRow: ASPxClientVerticalGridRow;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: Gets a hashtable that maintains information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditRecordValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information on the record currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed row.
+     * Value: A <see cref="ASPxClientVerticalGridRow" /> object that is the client-side row object.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordInserting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordDeleting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Contains information on a cell that is being edited.
+ */
+interface ASPxClientVerticalGridCellInfo {
+    /**
+     * Gets the row that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the row which contains the processed cell.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets the visible index of the record that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    recordVisibleIndex: number;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientVerticalGridBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all records when the grid operates in batch edit mode.
+     * @param validateOnlyModified true, if only modified records should be validated; otherwise, false.
+     */
+    ValidateRecords(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified record when the grid operates in batch edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated record.
+     */
+    ValidateRecord(visibleIndex: number): boolean;
+    /**
+     * Returns an array of record visible indices.
+     * @param includeDeleted true, to include visible indices of deleted records to the returned array; otherwise, false.
+     */
+    GetRecordVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted record visible indices.
+     */
+    GetDeletedRecordIndices(): number[];
+    /**
+     * Returns an array of the inserted record visible indices.
+     */
+    GetInsertedRecordIndices(): number[];
+    /**
+     * Indicates if the record with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsDeletedRecord(visibleIndex: number): boolean;
+    /**
+     * Indicates if the record with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsNewRecord(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the record.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the record.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, rowFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientVerticalGridCellInfo;
+    /**
+     * Returns a value that indicates whether the vertical grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified record has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     * @param rowFieldNameOrId A string value that identifies the row by the name of the data source field to which the row is bound, or by the row's name.
+     */
+    HasChanges(visibleIndex: number, rowFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified record.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Switches the specified cell to batch edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A zero-based integer value that identifies the row which contains the processed cell in the rows collection.
+     */
+    StartEdit(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Ends the cell(s) editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains style settings related to media elements in ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorCommandStyleSettings {
+    /**
+     * Gets or sets a media element's CSS class name.
+     * Value: A string that specifies a class name.
+     */
+    className: string;
+    /**
+     * Gets or sets an element's width.
+     * Value: A string that specifies an element's width <a href="http://www.w3schools.com/cssref/pr_dim_width.asp">in any correct format</a>.
+     */
+    width: string;
+    /**
+     * Gets or sets an element's height.
+     * Value: A string that specifies an element's height <a href="http://www.w3schools.com/cssref/pr_dim_height.asp">in any correct format</a>.
+     */
+    height: string;
+    /**
+     * Gets or sets a media element's border width.
+     * Value: A string that specifies a border width <a href="http://www.w3schools.com/cssref/pr_border-width.asp">in any correct format</a>.
+     */
+    borderWidth: string;
+    /**
+     * Gets or sets a media element's border color.
+     * Value: A string that specifies a border color <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    borderColor: string;
+    /**
+     * Gets or sets a media element's border style.
+     * Value: A string that specifies a border style <a href="http://www.w3schools.com/cssref/pr_border-style.asp">in any correct format</a>.
+     */
+    borderStyle: string;
+    /**
+     * Gets or sets an element's top margin.
+     * Value: A string that specifies an element's top margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginTop: string;
+    /**
+     * Gets or sets an element's right margin.
+     * Value: A string that specifies an element's right margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginRight: string;
+    /**
+     * Gets or sets an element's bottom margin.
+     * Value: A string that specifies an element's bottom margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginBottom: string;
+    /**
+     * Gets or sets an element's left margin.
+     * Value: A string that specifies an element's left margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginLeft: string;
+}
+/**
+ * The base class for parameters used in the ASPxHtmlEditor's client-side commands.
+ */
+interface ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Gets the currently selected element in the ASPxHtmlEditor.
+     * Value: An HTML object which is the currently selected element.
+     */
+    selectedElement: Object;
+}
+/**
+ * Contains settings related to the INSERTIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertImageCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the source of the target image.
+     * Value: A string specifying the source of the target image.
+     */
+    src: string;
+    /**
+     * Creates an alternate text for the target image.
+     * Value: A string that specifies an alternate text for the target image.
+     */
+    alt: string;
+    /**
+     * Determines if the target image is wrapped with text.
+     * Value: true, if the target image is wrapped with text; otherwise, false.
+     */
+    useFloat: boolean;
+    /**
+     * Determines the position of the target image.
+     * Value: A string value defining the position of the target image.
+     */
+    align: string;
+    /**
+     * Contains the style settings specifying the appearance of the target image.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings specifying the appearance of the target image.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * Contains settings related to the CHANGEIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeImageCommandArguments extends ASPxClientHtmlEditorInsertImageCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTLINK_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertLinkCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the url of the page the target link goes to.
+     * Value: A string value specifying the target link url.
+     */
+    url: string;
+    /**
+     * Specifiies the text of the target link.
+     * Value: A string value specifying the text of the target link.
+     */
+    text: string;
+    /**
+     * Determines where to open the target link.
+     * Value: A string that specifies where to open the target link <a href="http://www.w3schools.com/tags/att_a_target.asp">in any correct format</a>.
+     */
+    target: string;
+    /**
+     * Defines the title of the target link.
+     * Value: A string value defining the title of the target link.
+     */
+    title: string;
+}
+/**
+ * The base class for parameters related to inserting or changing media elements in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeMediaElementCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Defines the <a href="http://www.w3schools.com/tags/att_global_id.asp">HTML "id"</a> attribute of the target media element.
+     * Value: A string value which is a unique identifier for the element.
+     */
+    id: string;
+    /**
+     * Defines the source of the target media element.
+     * Value: A string defining the source of the target media element.
+     */
+    src: string;
+    /**
+     * Determines the position of the target media element.
+     * Value: A string value indicating the position of the target media element.
+     */
+    align: string;
+    /**
+     * Contains the style settings defining the appearance of the target media element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target media element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Returns the name of the client-side command corresponding to the parameter.
+     */
+    GetCommandName(): string;
+}
+/**
+ * The base class for parameters related to inserting or changing HTML5 media elements (Audio and Video) in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if a media file will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Determines if a media file repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the media player controls should be displayed.
+     * Value: true, if media player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+    /**
+     * Determines how a media file should be loaded when the page loads.
+     * Value: One of the ASPxClientHtmlEditorMediaPreloadMode enumeration values.
+     */
+    preloadMode: string;
+}
+/**
+ * Contains settings related to the INSERTAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertAudioCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+}
+/**
+ * Contains settings related to the CHANGEAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeAudioCommandArguments extends ASPxClientHtmlEditorInsertAudioCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertVideoCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+    /**
+     * Defines the URL of an image that is shown while the video file is downloading, or until an end-user clicks the play button.
+     * Value: A string value that specifies the poster image URL.
+     */
+    posterUrl: string;
+}
+/**
+ * Contains settings related to the CHANGEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeVideoCommandArguments extends ASPxClientHtmlEditorInsertVideoCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertFlashCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if the target flash element will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Defines if the target flash element repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the flash related items are displayed in the context menu of the target flash element.
+     * Value: true, if the specific context menu items are displayed; otherwise, false
+     */
+    enableFlashMenu: boolean;
+    /**
+     * Determines if the target flash element can be displayed in the fullscreen mode.
+     * Value: true, if the fullscreen mode is allowed; otherwise, false.
+     */
+    allowFullscreen: boolean;
+    /**
+     * Defines the rendering quality level used for the target flash element.
+     * Value: A string value that specifies the target flash element rendering quality.
+     */
+    quality: string;
+}
+/**
+ * Contains settings related to the CHANGEFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeFlashCommandArguments extends ASPxClientHtmlEditorInsertFlashCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if suggested videos are shown after the target YouTube video finishes.
+     * Value: true, to show suggested videos; otherwise, false
+     */
+    showRelatedVideos: boolean;
+    /**
+     * Determines if the target YouTube video title and player actions (Watch later, Share) are shown.
+     * Value: true, to display the title and player actions; otherwise, false.
+     */
+    showVideoInfo: boolean;
+    /**
+     * Determines if the privacy-enhanced mode is enabled for the target YouTube video.
+     * Value: true, if the privace-enhanced mode is enabled; otherwise, false
+     */
+    enablePrivacyEnhancedMode: boolean;
+    /**
+     * Determines if the player controls are displayed for the target YouTube video.
+     * Value: true, if the player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+}
+/**
+ * Contains settings related to the CHANGEYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeYouTubeVideoCommandArguments extends ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments {
+}
+/**
+ * A method that will handle the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client DialogInitialized event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorDialogInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogInitializedEventArgs): void;
+}
+/**
+ * Provides data for the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dialog that has been initialized.
+     * Value: A string value that is the name of the initialized dialog.
+     */
+    dialogName: string;
+}
+/**
+ * A method that will handle the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventHandler<S> {
+    /**
+     * A method that will handle the client CommandExecuted event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorCommandExecutingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandExecutingEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value specifying the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: An object containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events related to command processing.
+ */
+interface ASPxClientHtmlEditorCommandEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientHtmlEditorCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to command processing (CustomCommand).
+ */
+interface ASPxClientHtmlEditorCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogOpened event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed custom dialog.
+     * Value: A string value that represents the value assigned to the processed custom dialog's Name property.
+     */
+    name: string;
+}
+/**
+ * Provides data for client events that relate to closing a custom dialog.
+ */
+interface ASPxClientHtmlEditorCustomDialogCloseEventArgsBase extends ASPxClientHtmlEditorCustomDialogEventArgs {
+    /**
+     * Gets the status of the closed custom dialog.
+     * Value: An object representing a custom dialog's closing status. By default, it's the "cancel" string if the dialog operation is canceled, or the "ok" string if a dialog is closed by submitting a file. You can also provide your custom status, if your dialog contains additional buttons.
+     */
+    status: Object;
+}
+/**
+ * A method that will handle the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosing event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosingEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosed event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosedEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets an object associated with the closed dialog.
+     * Value: An object containing custom data associated with dialog closing.
+     */
+    data: Object;
+}
+/**
+ * A method that will handle the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventHandler<S> {
+    /**
+     * A method that will handle the client Validation event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorValidationEventArgs): void;
+}
+/**
+ * Provides data for the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the HTML markup that is the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to validate.
+     */
+    html: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientHtmlEditorTabEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanged event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies an editor tab.
+     * Value: A string value that is the tab name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the ActiveTabChanging event.
+ */
+interface ASPxClientHtmlEditorTabCancelEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanging event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancellable ActiveTabChanging event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabCancelEventArgs extends ASPxClientHtmlEditorTabEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventHandler<S> {
+    /**
+     * A method that will handle the BeforePaste event.
+     * @param source The event source. This parameter identifies the HTML editor object that raised the event.
+     * @param e An ASPxClientHtmlEditorBeforePasteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorBeforePasteEventArgs): void;
+}
+/**
+ * Provides data for the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value identifying the command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the HTML markup that is about to be pasted to the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to paste.
+     */
+    html: string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHtmlEditor control.
+ */
+interface ASPxClientHtmlEditor extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a dialog has been initialized.
+     */
+    DialogInitialized: ASPxClientEvent<ASPxClientHtmlEditorDialogInitializedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before a default or custom command has been executed and allows you to cancel the action.
+     */
+    CommandExecuting: ASPxClientEvent<ASPxClientHtmlEditorCommandExecutingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Enables you to implement a custom command's logic.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs after a default or custom command has been executed on the client side.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client when a selection is changed within the ASPxHtmlEditor.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side when the content of the editor changes.
+     */
+    HtmlChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is opened.
+     */
+    CustomDialogOpened: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before a custom dialog is closed.
+     */
+    CustomDialogClosing: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is closed.
+     */
+    CustomDialogClosed: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Allows you to specify whether the value entered into the ASPxHtmlEditor is valid.
+     */
+    Validation: ASPxClientEvent<ASPxClientHtmlEditorValidationEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side before a context menu is shown.
+     */
+    ContextMenuShowing: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHtmlEditor.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires after a callback, sent by the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after the editor content is spell checked.
+     */
+    SpellingChecked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientHtmlEditorTabEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before the active tab is changed within a control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientHtmlEditorTabCancelEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before an HTML code is pasted to editor content, and allows you to modify it.
+     */
+    BeforePaste: ASPxClientEvent<ASPxClientHtmlEditorBeforePasteEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Returns the document object generated by an iframe element within a design view area.
+     */
+    GetDesignViewDocument(): Object;
+    /**
+     * Returns the document object generated by an iframe element within a preview area.
+     */
+    GetPreviewDocument(): Object;
+    /**
+     * Returns a collection of client context menu objects.
+     */
+    GetContextMenu(): ASPxClientPopupMenu;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Sets input focus to the ASPxHtmlEditor's edit region.
+     */
+    Focus(): void;
+    /**
+     * Gets the HTML markup that represents the editor's content.
+     */
+    GetHtml(): string;
+    /**
+     * Specifies the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetHtml(html: string): void;
+    /**
+     * Sets the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     * @param clearUndoHistory true to clear the undo stack; otherwise, false.
+     */
+    SetHtml(html: string, clearUndoHistory: boolean): void;
+    /**
+     * Replaces placeholders with the specified values.
+     * @param html A string value that specifies the HTML code to process.
+     * @param placeholders An array of objects that specify the placeholders and values to replace them.
+     */
+    ReplacePlaceholders(html: string, placeholders: Object[]): string;
+    /**
+     * Creates a parameter for ASPxHtmlEditor's client-side commands related to changing media elements.
+     * @param element An element that is being changed.
+     */
+    CreateChangeMediaElementCommandArguments(element: Object): ASPxClientHtmlEditorChangeMediaElementCommandArguments;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     * @param parameter A string value specifying additional information about the command to perform.
+     * @param addToUndoHistory true, to add the specified command to the undo stack; otherwise, false.
+     */
+    ExecuteCommand(commandName: string, parameter: Object, addToUndoHistory: boolean): boolean;
+    /**
+     * Adds the current editor state to the undo/redo history.
+     */
+    SaveToUndoHistory(): void;
+    /**
+     * Returns the selection in the ASPxHtmlEditor.
+     */
+    GetSelection(): ASPxClientHtmlEditorSelection;
+    /**
+     * Restores the selection within the ASPxHtmlEditor.
+     */
+    RestoreSelection(): boolean;
+    /**
+     * Sets the value of the combo box within the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the combo box's command name within the HtmlEditor's control collection.
+     * @param value A string value that specifies the combo box's new value.
+     */
+    SetToolbarComboBoxValue(commandName: string, value: string): void;
+    /**
+     * Sets the value of the dropdown item picker in the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the dropdown item picker by its command name. This value is contained in the CommandName property.
+     * @param value A string value that specifies the dropdown item picker's new value, i.e., the ToolbarItemPickerItem object.
+     */
+    SetToolbarDropDownItemPickerValue(commandName: string, value: string): void;
+    /**
+     * Specifies the visibility of a ribbon context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param active true to make a category visible; false to make it hidden.
+     */
+    SetRibbonContextTabCategoryVisible(categoryName: string, active: string): void;
+    /**
+     * Provides access to an object implementing the HtmlEditor's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value passes validation.
+     * @param isValid true if the editor's value passes validation; otherwise, false.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs validation of the editor's content.
+     */
+    Validate(): void;
+    /**
+     * Set an active tab specified by its name.
+     * @param name A string value that is the name of the tab.
+     */
+    SetActiveTabByName(name: string): void;
+    /**
+     * Returns the name of the active HTML editor tab.
+     */
+    GetActiveTabName(): string;
+    /**
+     * Reconnect the control to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * A selection in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorSelection {
+    /**
+     * Returns a DOM element that relates to the current selection.
+     */
+    GetSelectedElement(): Object;
+    /**
+     * Returns the HTML markup specifying the currently selected ASPxHtmlEditor content.
+     */
+    GetHtml(): string;
+    /**
+     * Returns the text within the currently selected ASPxHtmlEditor content.
+     */
+    GetText(): string;
+    /**
+     * Returns an array of the currently selected elements.
+     */
+    GetElements(): Object[];
+    /**
+     * Sets the new HTML markup in place of the currently selected within ASPxHtmlEditor content.
+     * @param html A string value specifying the new HTML markup.
+     * @param addToHistory true to add this operation to the history; otherwise, false.
+     */
+    SetHtml(html: string, addToHistory: boolean): void;
+}
+/**
+ * A client-side equivalent of the ASPxPivotGrid control.
+ */
+interface ASPxClientPivotGrid extends ASPxClientControl {
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientPivotGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires after a callback that has been processed on the server returns back to the client.
+     */
+    AfterCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires before a callback is sent to the server for server-side processing.
+     */
+    BeforeCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client side after the customization form's visible state has been changed.
+     */
+    CustomizationFieldsVisibleChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is clicked.
+     */
+    CellClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is double clicked.
+     */
+    CellDblClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a custom menu item has been clicked.
+     */
+    PopupMenuItemClick: ASPxClientEvent<ASPxClientPivotMenuItemClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Indicates whether the Defer Layout Update check box is enabled.
+     */
+    IsDeferUpdatesChecked(): boolean;
+    /**
+     * Indicates whether the Filter Editor (Prefilter) is visible.
+     */
+    IsPrefilterVisible(): boolean;
+    /**
+     * Shows the Filter Editor.
+     */
+    ShowPrefilter(): void;
+    /**
+     * Hides the Filter Editor.
+     */
+    HidePrefilter(): void;
+    /**
+     * Clears the filter expression applied using the Prefilter (Filter Editor).
+     */
+    ClearPrefilter(): void;
+    /**
+     * Enables or disables the current filter applied by the Filter Editor (Prefilter).
+     */
+    ChangePrefilterEnabled(): void;
+    /**
+     * Returns a value that specifies whether the customization form is visible.
+     */
+    GetCustomizationFieldsVisibility(): boolean;
+    /**
+     * Specifies the visibility of the customization form.
+     * @param value true to display the customization form; false to hide the customization form.
+     */
+    SetCustomizationFieldsVisibility(value: boolean): void;
+    /**
+     * Switches the customization form's visible state.
+     */
+    ChangeCustomizationFieldsVisibility(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the CellDblClick event.
+ */
+interface ASPxClientClickEventHandler<S> {
+    /**
+     * A method that will handle the CellDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientClickEventArgs): void;
+}
+/**
+ * Provides data for the CellDblClick client events.
+ */
+interface ASPxClientClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the parameters associated with the CellDblClick events.
+     * Value: An object that contains parameters associated with the CellDblClick events.
+     */
+    HtmlEvent: Object;
+    /**
+     * Gets the processed cell's value.
+     * Value: An object that represents the processed cell's value.
+     */
+    Value: Object;
+    /**
+     * Gets the index of a column that owns the processed cell.
+     * Value: An integer value that identifies a column.
+     */
+    ColumnIndex: number;
+    /**
+     * Gets the index of a row that owns the processed cell.
+     * Value: An integer value that identifies a row.
+     */
+    RowIndex: number;
+    /**
+     * Gets a column field value.
+     * Value: An object that represents a column field value.
+     */
+    ColumnValue: Object;
+    /**
+     * Gets a row field value.
+     * Value: An object that represents a row field value.
+     */
+    RowValue: Object;
+    /**
+     * Gets a column field name.
+     * Value: A String value that represents a column field name.
+     */
+    ColumnFieldName: string;
+    /**
+     * Gets a row field name.
+     * Value: A String value that represents a row field name.
+     */
+    RowFieldName: string;
+    /**
+     * Gets a column value type.
+     * Value: A String value that represents a column value type.
+     */
+    ColumnValueType: string;
+    /**
+     * Gets a row value type.
+     * Value: A String value that represents a row value type.
+     */
+    RowValueType: string;
+    /**
+     * Gets the index of the data field which corresponds to the clicked summary value.
+     * Value: An integer value that identifies the data field.
+     */
+    DataIndex: number;
+}
+/**
+ * A method that will handle the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientPivotMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPivotMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the context menu's type.
+     * Value: A PivotGridPopupMenuType enumeration value that identifies the context menu.
+     */
+    MenuType: string;
+    /**
+     * Gets the name of the menu item currently being clicked.
+     * Value: A String value that identifies the clicked item by its name.
+     */
+    MenuItemName: string;
+    /**
+     * Gets the field's unique indentifier.
+     * Value: A string which specifies the field's unique indentifier.
+     */
+    FieldID: string;
+    /**
+     * Gets the index of the field value for which the popup menu has been invoked.
+     * Value: An integer value that identifies the field value.
+     */
+    FieldValueIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxPivotCustomizationControl control.
+ */
+interface ASPxClientPivotCustomization extends ASPxClientControl {
+    /**
+     * Returns an HTML element that represents the root of the control's hierarchy.
+     */
+    GetMainContainer(): Object;
+    /**
+     * Returns a client-side equivalent of the owner Pivot Grid Control.
+     */
+    GetPivotGrid(): ASPxClientPivotGrid;
+    /**
+     * Specifies the Customization Control's height.
+     * @param value An integer value that specifies the Customization Control's height.
+     */
+    SetHeight(value: number): void;
+    /**
+     * Specifies the Customization Control's width.
+     * @param value An integer value that specifies the Customization Control's width.
+     */
+    SetWidth(value: number): void;
+    /**
+     * Recalculates the Customization Control height.
+     */
+    UpdateHeight(): void;
+    /**
+     * Specifies the Customization Control's layout.
+     * @param layout A string that specifies the Customization Control's layout.
+     */
+    SetLayout(layout: string): void;
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the RichEdit that raised the event.
+     * @param e A ASPxClientRichEditCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A client-side equivalent of the ASPxRichEdit object.
+ */
+interface ASPxClientRichEdit extends ASPxClientControl {
+    /**
+     * Provides access to document structural elements.
+     * Value: A <see cref="RichEditDocument" /> object that lists RichEdit's document structural elements.
+     */
+    document: RichEditDocument;
+    /**
+     * Provides access to RichEdit's client-side commands.
+     * Value: A <see cref="RichEditCommands" /> object that lists RichEdit's client-side commands.
+     */
+    commands: RichEditCommands;
+    /**
+     * Provides access to the client methods that changes the selection.
+     * Value: A <see cref="RichEditSelection" /> object that lists methods to work with the selection.
+     */
+    selection: RichEditSelection;
+    unitConverter: RichEditUnitConverter;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientRichEditCustomCommandExecutedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the RichEdit.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires if any change is made to the RichEdit's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a hyperlink is clicked within the document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientRichEditHyperlinkClickEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the selection is changed within the document.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Enables you to switch the full-screen mode of the Rich Text Editor.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Provides access to an object implementing the RichEdit's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Sets input focus to the RichEdit.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Reconnects the RichEdit to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * Contains a set of the available client commands.
+ */
+interface RichEditCommands {
+    /**
+     * Gets a command to create a new empty document.
+     * Value: A <see cref="FileNewCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileNew: FileNewCommand;
+    /**
+     * Gets a command to open the file, specifying its path.
+     * Value: A <see cref="FileOpenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpen: FileOpenCommand;
+    /**
+     * Gets a command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+     * Value: A <see cref="FileOpenDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpenDialog: FileOpenDialogCommand;
+    /**
+     * Gets a command to save the document to a file.
+     * Value: A <see cref="FileSaveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSave: FileSaveCommand;
+    /**
+     * Gets a command to download the document file, specifying its extension.
+     * Value: A <see cref="FileDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileDownload: FileDownloadCommand;
+    /**
+     * Gets a command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+     * Value: A <see cref="FileSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSaveAs: FileSaveAsCommand;
+    fileSaveAsDialog: FileSaveAsDialogCommand;
+    /**
+     * Gets a command to invoke a browser-specific Print dialog allowing one to print the current document.
+     * Value: A <see cref="FilePrintCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    filePrint: FilePrintCommand;
+    /**
+     * Gets a command to cancel changes caused by the previous command.
+     * Value: A <see cref="UndoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    undo: UndoCommand;
+    /**
+     * Gets a command to reverse actions of the previous undo command.
+     * Value: A <see cref="RedoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    redo: RedoCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the clipboard.
+     * Value: A <see cref="CopyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copy: CopyCommand;
+    /**
+     * Gets a command to paste the text from the clipboard over the selection.
+     * Value: A <see cref="PasteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    paste: PasteCommand;
+    /**
+     * Gets a command to cut the selected text and place it to the clipboard.
+     * Value: A <see cref="CutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    cut: CutCommand;
+    /**
+     * Gets a command to change the font name of characters in a selected range.
+     * Value: A <see cref="ChangeFontNameCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontName: ChangeFontNameCommand;
+    /**
+     * Gets a command to change the font size of characters in a selected range.
+     * Value: A <see cref="ChangeFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSize: ChangeFontSizeCommand;
+    /**
+     * Gets a command to increase the font size of characters in a selected range to the closest larger predefined value.
+     * Value: A <see cref="IncreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseFontSize: IncreaseFontSizeCommand;
+    /**
+     * Gets a command to decrease the selected range's font size to the closest smaller predefined value.
+     * Value: A <see cref="DecreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseFontSize: DecreaseFontSizeCommand;
+    /**
+     * Gets a command to convert selected text to upper case.
+     * Value: A <see cref="MakeTextUpperCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextUpperCase: MakeTextUpperCaseCommand;
+    /**
+     * Gets a command to convert selected text to lower case.
+     * Value: A <see cref="MakeTextLowerCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextLowerCase: MakeTextLowerCaseCommand;
+    /**
+     * Gets a command to capitalize each word in the selected sentence.
+     * Value: A <see cref="CapitalizeEachWordTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    capitalizeEachWordTextCase: CapitalizeEachWordTextCaseCommand;
+    /**
+     * Gets a command to toggle case for each character - upper case becomes lower, lower case becomes upper.
+     * Value: A <see cref="ToggleTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTextCase: ToggleTextCaseCommand;
+    /**
+     * Gets a command to change the bold formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontBoldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBold: ChangeFontBoldCommand;
+    /**
+     * Gets a command to change the italic formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontItalicCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontItalic: ChangeFontItalicCommand;
+    /**
+     * Gets a command to change the underline formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontUnderlineCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontUnderline: ChangeFontUnderlineCommand;
+    /**
+     * Gets a command to change the strikeout formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontStrikeoutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontStrikeout: ChangeFontStrikeoutCommand;
+    /**
+     * Gets a command to change the superscript formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontSuperscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSuperscript: ChangeFontSuperscriptCommand;
+    /**
+     * Gets a command to change the subscript formatting of characters in the selected range.
+     * Value: A <see cref="ChangeFontSubscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSubscript: ChangeFontSubscriptCommand;
+    /**
+     * Gets a command to change the font color of characters in a selected range.
+     * Value: A <see cref="ChangeFontForeColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontForeColor: ChangeFontForeColorCommand;
+    /**
+     * Gets a command to change the background color of characters in a selected range.
+     * Value: A <see cref="ChangeFontBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBackColor: ChangeFontBackColorCommand;
+    /**
+     * Gets a command to reset the selected text's formatting to default.
+     * Value: A <see cref="ClearFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    clearFormatting: ClearFormattingCommand;
+    /**
+     * Gets a command to change the selected range's style.
+     * Value: A <see cref="ChangeStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeStyle: ChangeStyleCommand;
+    /**
+     * Gets a command to toggle between the bulleted paragraph and normal text.
+     * Value: A <see cref="ToggleBulletedListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleBulletedList: ToggleBulletedListCommand;
+    /**
+     * Gets a command to toggle between the numbered paragraph and normal text.
+     * Value: A <see cref="ToggleNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleNumberingList: ToggleNumberingListCommand;
+    /**
+     * Gets a command to toggle between the multilevel list style and normal text.
+     * Value: A <see cref="ToggleMultilevelListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleMultilevelList: ToggleMultilevelListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected range.
+     * Value: A <see cref="IncreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseIndent: IncreaseIndentCommand;
+    /**
+     * Gets a command to decrement the indent level of paragraphs in a selected range.
+     * Value: A <see cref="DecreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseIndent: DecreaseIndentCommand;
+    /**
+     * Gets a command to toggle hidden symbol visibility.
+     * Value: A <see cref="ShowHiddenSymbolsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHiddenSymbols: ShowHiddenSymbolsCommand;
+    /**
+     * Gets a command to toggle left paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentLeft: ToggleParagraphAlignmentLeftCommand;
+    /**
+     * Gets a command to toggle centered paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentCenter: ToggleParagraphAlignmentCenterCommand;
+    /**
+     * Gets a command to toggle right paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentRight: ToggleParagraphAlignmentRightCommand;
+    /**
+     * Gets a command to toggle justified paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentJustifyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentJustify: ToggleParagraphAlignmentJustifyCommand;
+    /**
+     * Gets a command to format a current paragraph with single line spacing.
+     * Value: A <see cref="SetSingleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSingleParagraphSpacing: SetSingleParagraphSpacingCommand;
+    /**
+     * Gets a command to format a current paragraph with one and a half line spacing.
+     * Value: A <see cref="SetSesquialteralParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSesquialteralParagraphSpacing: SetSesquialteralParagraphSpacingCommand;
+    /**
+     * Gets a command to format a selected paragraph with double line spacing.
+     * Value: A <see cref="SetDoubleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDoubleParagraphSpacing: SetDoubleParagraphSpacingCommand;
+    /**
+     * Gets a command to add spacing before a paragraph.
+     * Value: A <see cref="AddSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingBeforeParagraph: AddSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to add spacing after a paragraph.
+     * Value: A <see cref="AddSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingAfterParagraph: AddSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to remove spacing before the selected paragraph.
+     * Value: A <see cref="RemoveSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingBeforeParagraph: RemoveSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to remove spacing after the selected paragraph.
+     * Value: A <see cref="RemoveSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingAfterParagraph: RemoveSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to change the background color of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphBackColor: ChangeParagraphBackColorCommand;
+    /**
+     * Gets a command to invoke the Font dialog window.
+     * Value: A <see cref="OpenFontFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFontFormattingDialog: OpenFontFormattingDialogCommand;
+    /**
+     * Gets a command to change the font formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontFormatting: ChangeFontFormattingCommand;
+    /**
+     * Gets a command to invoke the Indents And Spacing tab of the Paragraph dialog window.
+     * Value: A <see cref="OpenParagraphFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openParagraphFormattingDialog: OpenParagraphFormattingDialogCommand;
+    /**
+     * Gets a command to change the formatting of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphFormatting: ChangeParagraphFormattingCommand;
+    /**
+     * Gets a command to insert a page break at the current position in the document.
+     * Value: A <see cref="InsertPageBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPageBreak: InsertPageBreakCommand;
+    /**
+     * Gets a command to invoke the Insert Table dialog window.
+     * Value: A <see cref="OpenInsertTableDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertTableDialog: OpenInsertTableDialogCommand;
+    /**
+     * Gets a command to invoke the Insert Table dialog window.
+     * Value: A <see cref="InsertTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTable: InsertTableCommand;
+    /**
+     * Gets a command to invoke the Insert Image dialog window.
+     * Value: A <see cref="OpenInsertPictureDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertPictureDialog: OpenInsertPictureDialogCommand;
+    /**
+     * Gets a command to insert a picture from a file.
+     * Value: A <see cref="InsertPictureCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPicture: InsertPictureCommand;
+    /**
+     * Gets a command to invoke the Bookmark dialog window.
+     * Value: A <see cref="OpenInsertBookmarkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertBookmarkDialog: OpenInsertBookmarkDialogCommand;
+    /**
+     * Gets a command to insert a new bookmark that references the current selection.
+     * Value: A <see cref="InsertBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertBookmark: InsertBookmarkCommand;
+    /**
+     * A command to delete a specific bookmark.
+     * Value: A <see cref="DeleteBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteBookmark: DeleteBookmarkCommand;
+    goToBookmark: GoToBookmarkCommand;
+    /**
+     * Gets a command to invoke the Hyperlink dialog window.
+     * Value: A <see cref="OpenInsertHyperlinkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertHyperlinkDialog: OpenInsertHyperlinkDialogCommand;
+    /**
+     * Gets a command to insert a hyperlink at the current position in the document.
+     * Value: A <see cref="InsertHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHyperlink: InsertHyperlinkCommand;
+    /**
+     * Gets a command to delete the selected hyperlink.
+     * Value: A <see cref="DeleteHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlink: DeleteHyperlinkCommand;
+    /**
+     * Gets a command to delete all hyperlinks in the selected range.
+     * Value: A <see cref="DeleteHyperlinksCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlinks: DeleteHyperlinksCommand;
+    /**
+     * Gets a command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+     * Value: A <see cref="OpenHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openHyperlink: OpenHyperlinkCommand;
+    /**
+     * Gets a command to invoke the Symbols dialog window.
+     * Value: A <see cref="OpenInsertSymbolDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertSymbolDialog: OpenInsertSymbolDialogCommand;
+    /**
+     * Gets a command to insert a character into a document.
+     * Value: A <see cref="InsertSymbolCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSymbol: InsertSymbolCommand;
+    /**
+     * Gets a command to change page margin settings.
+     * Value: A <see cref="ChangePageMarginsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageMargins: ChangePageMarginsCommand;
+    /**
+     * Gets a command to invoke the Margins tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPageMarginsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPageMarginsDialog: OpenPageMarginsDialogCommand;
+    /**
+     * Gets a command to change the page orientation.
+     * Value: A <see cref="ChangePageOrientationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageOrientation: ChangePageOrientationCommand;
+    setPageSizeDialog: SetPageSizeDialogCommand;
+    /**
+     * Gets a command to invoke the Paper tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPagePaperSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPagePaperSizeDialog: OpenPagePaperSizeDialogCommand;
+    /**
+     * Gets a command to change the page size.
+     * Value: A <see cref="ChangePageSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageSize: ChangePageSizeCommand;
+    /**
+     * Gets a command to change the number of section columns having the same width.
+     * Value: A <see cref="ChangeSectionEqualColumnCountCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionEqualColumnCount: ChangeSectionEqualColumnCountCommand;
+    /**
+     * Gets a command to invoke the Columns dialog window.
+     * Value: A <see cref="OpenSectionColumnsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSectionColumnsDialog: OpenSectionColumnsDialogCommand;
+    /**
+     * Gets a command to change the settings of individual section columns.
+     * Value: A <see cref="ChangeSectionColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionColumns: ChangeSectionColumnsCommand;
+    /**
+     * Gets a command to insert a column break at the current position in the document.
+     * Value: A <see cref="InsertColumnBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertColumnBreak: InsertColumnBreakCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next page.
+     * Value: A <see cref="InsertSectionBreakNextPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakNextPage: InsertSectionBreakNextPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next even-numbered page.
+     * Value: A <see cref="InsertSectionBreakEvenPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakEvenPage: InsertSectionBreakEvenPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next odd-numbered page.
+     * Value: A <see cref="InsertSectionBreakOddPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakOddPage: InsertSectionBreakOddPageCommand;
+    /**
+     * Gets a command to set the background color of the page.
+     * Value: A <see cref="ChangePageColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageColor: ChangePageColorCommand;
+    /**
+     * Gets a command to toggle the horizontal ruler's visibility.
+     * Value: A <see cref="ShowHorizontalRulerCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHorizontalRuler: ShowHorizontalRulerCommand;
+    /**
+     * Gets a command to toggle the fullscreen mode.
+     * Value: A <see cref="SetFullscreenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setFullscreen: SetFullscreenCommand;
+    /**
+     * Gets a command to invoke the Bulleted and Numbering dialog window.
+     * Value: A <see cref="OpenNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openNumberingListDialog: OpenNumberingListDialogCommand;
+    /**
+     * Gets a command to insert a paragraph break at the current position in the document.
+     * Value: A <see cref="InsertParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertParagraph: InsertParagraphCommand;
+    /**
+     * Gets a command to insert text at the current position in a document.
+     * Value: A <see cref="InsertTextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertText: InsertTextCommand;
+    /**
+     * Gets a command to delete the text in a selected range.
+     * Value: A <see cref="DeleteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    delete: DeleteCommand;
+    /**
+     * Gets a command to move the cursor backwards and erase the character in that space.
+     * Value: A <see cref="BackspaceCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    backspace: BackspaceCommand;
+    /**
+     * Gets a command to insert the line break at the current position in the document.
+     * Value: A <see cref="InsertLineBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertLineBreak: InsertLineBreakCommand;
+    /**
+     * Gets a command to scale pictures in a selected range.
+     * Value: A <see cref="ChangePictureScaleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePictureScale: ChangePictureScaleCommand;
+    /**
+     * Gets a command to increment the left indentation of paragraphs in a selected range.
+     * Value: A <see cref="IncrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementParagraphLeftIndent: IncrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to decrement the paragraph's left indent position.
+     * Value: A <see cref="DecrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementParagraphLeftIndent: DecrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to move the selected range.
+     * Value: A <see cref="MoveContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    moveContent: MoveContentCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the specified position.
+     * Value: A <see cref="CopyContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copyContent: CopyContentCommand;
+    /**
+     * Gets a command to insert a tab character at the current position in the document.
+     * Value: A <see cref="InsertTabCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTab: InsertTabCommand;
+    /**
+     * Gets a command to invoke the Tabs dialog window.
+     * Value: A <see cref="OpenTabsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTabsDialog: OpenTabsDialogCommand;
+    /**
+     * Gets a command to change paragraph tab stops.
+     * Value: A <see cref="ChangeTabsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTabs: ChangeTabsCommand;
+    /**
+     * Gets a command to invoke the Customize Numbered List dialog window.
+     * Value: A <see cref="OpenCustomNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openCustomNumberingListDialog: OpenCustomNumberingListDialogCommand;
+    /**
+     * Gets a command to customize the numbered list parameters.
+     * Value: A <see cref="ChangeCustomNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeCustomNumberingList: ChangeCustomNumberingListCommand;
+    /**
+     * Gets a command to restart the numbering list.
+     * Value: A <see cref="RestartNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    restartNumberingList: RestartNumberingListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="IncrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementNumberingIndent: IncrementNumberingIndentCommand;
+    /**
+     * Gets a command to decrement the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="DecrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementNumberingIndent: DecrementNumberingIndentCommand;
+    /**
+     * Gets a command to create an empty field in the document.
+     * Value: A <see cref="CreateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createField: CreateFieldCommand;
+    /**
+     * Gets a command to update the field's result.
+     * Value: A <see cref="UpdateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateField: UpdateFieldCommand;
+    /**
+     * Gets a command to display the selected field's codes.
+     * Value: A <see cref="ShowFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showFieldCodes: ShowFieldCodesCommand;
+    /**
+     * Get a command to display all field codes in place of the fields in the document.
+     * Value: A <see cref="ShowAllFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showAllFieldCodes: ShowAllFieldCodesCommand;
+    /**
+     * Gets a command to continue the list's numbering.
+     * Value: A <see cref="ContinueNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    continueNumberingList: ContinueNumberingListCommand;
+    /**
+     * Gets a command to insert numeration to a paragraph making it a numbering list item.
+     * Value: A <see cref="InsertNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertNumeration: InsertNumerationCommand;
+    /**
+     * Gets a command to remove the selected numeration.
+     * Value: A <see cref="RemoveNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNumeration: RemoveNumerationCommand;
+    /**
+     * Gets a command to update all fields in the selected range.
+     * Value: A <see cref="UpdateAllFieldsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateAllFields: UpdateAllFieldsCommand;
+    /**
+     * Gets a command to insert a DATE field displaying the current date.
+     * Value: A <see cref="CreateDateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createDateField: CreateDateFieldCommand;
+    /**
+     * Gets a command to insert a TIME field displaying the current time.
+     * Value: A <see cref="CreateTimeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createTimeField: CreateTimeFieldCommand;
+    /**
+     * A command to insert a PAGE field displaying the current page number.
+     * Value: A <see cref="CreatePageFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageField: CreatePageFieldCommand;
+    /**
+     * Gets a command to convert the text of all selected sentences to sentence case.
+     * Value: A <see cref="MakeTextSentenceCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextSentenceCase: MakeTextSentenceCaseCommand;
+    /**
+     * Gets a command to switch the text case at the current position in the document.
+     * Value: A <see cref="SwitchTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    switchTextCase: SwitchTextCaseCommand;
+    /**
+     * Gets a command to navigate to the first data record.
+     * Value: A <see cref="GoToFirstDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFirstDataRecord: GoToFirstDataRecordCommand;
+    /**
+     * Gets a command to navigate to the previous data record of the bound data source.
+     * Value: A <see cref="GoToPreviousDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousDataRecord: GoToPreviousDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record of the bound data source.
+     * Value: A <see cref="GoToNextDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextDataRecord: GoToNextDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record.
+     * Value: A <see cref="GoToDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToDataRecord: GoToDataRecordCommand;
+    /**
+     * Gets a command to navigate to the last data record of the bound data source.
+     * Value: A <see cref="GoToLastDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToLastDataRecord: GoToLastDataRecordCommand;
+    /**
+     * Gets a command to display or hide actual data in MERGEFIELD fields.
+     * Value: A <see cref="ShowMergedDataCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showMergedData: ShowMergedDataCommand;
+    /**
+     * Gets a command to invoke the Insert Merge Field dialog window.
+     * Value: A <see cref="MergeFieldDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeFieldDialog: MergeFieldDialogCommand;
+    /**
+     * Gets a command to insert a MERGEFIELD field (with a data source column name) at the current position in the document.
+     * Value: A <see cref="CreateMergeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createMergeField: CreateMergeFieldCommand;
+    /**
+     * Gets a command to invoke the Export Range dialog window to start a mail merge.
+     * Value: A <see cref="MailMergeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeDialog: MailMergeDialogCommand;
+    /**
+     * Gets a command to perform a mail merge and download the merged document.
+     * Value: A <see cref="MailMergeAndDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndDownload: MailMergeAndDownloadCommand;
+    /**
+     * Gets a command to perform a mail merge and save the merged document to the server.
+     * Value: A <see cref="MailMergeAndSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndSaveAs: MailMergeAndSaveAsCommand;
+    /**
+     * Gets a command to activate the page header and begin editing.
+     * Value: A <see cref="InsertHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHeader: InsertHeaderCommand;
+    /**
+     * Gets a command to activate the page footer and begin editing.
+     * Value: A <see cref="InsertFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertFooter: InsertFooterCommand;
+    /**
+     * Gets a command to link a header/footer to the previous section, so it has the same content.
+     * Value: A <see cref="LinkHeaderFooterToPreviousCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    linkHeaderFooterToPrevious: LinkHeaderFooterToPreviousCommand;
+    /**
+     * Gets a command to navigate to the page footer from the page header in the header/footer editing mode.
+     * Value: A <see cref="GoToFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFooter: GoToFooterCommand;
+    /**
+     * Gets a command to navigate to the page header from the page footer in the header/footer editing mode.
+     * Value: A <see cref="GoToHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToHeader: GoToHeaderCommand;
+    /**
+     * Gets a command to navigate to the next page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToNextHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextHeaderFooter: GoToNextHeaderFooterCommand;
+    /**
+     * Gets a command to navigate to the previous page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToPreviousHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousHeaderFooter: GoToPreviousHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+     * Value: A <see cref="SetDifferentFirstPageHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentFirstPageHeaderFooter: SetDifferentFirstPageHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+     * Value: A <see cref="SetDifferentOddAndEvenPagesHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentOddAndEvenPagesHeaderFooter: SetDifferentOddAndEvenPagesHeaderFooterCommand;
+    /**
+     * Gets a command to finish header/footer editing.
+     * Value: A <see cref="CloseHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    closeHeaderFooter: CloseHeaderFooterCommand;
+    /**
+     * Gets a command to insert a NUMPAGES field displaying the total number of pages.
+     * Value: A <see cref="CreatePageCountFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageCountField: CreatePageCountFieldCommand;
+    /**
+     * Gets a command to invoke the Table tab of the Table Properties dialog window.
+     * Value: A <see cref="OpenTableFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableFormattingDialog: OpenTableFormattingDialogCommand;
+    /**
+     * Gets a command to change the selected table's formatting.
+     * Value: A <see cref="ChangeTableFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableFormatting: ChangeTableFormattingCommand;
+    /**
+     * Gets a command to change the selected table rows' preferred height.
+     * Value: A <see cref="ChangeTableRowPreferredHeightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableRowPreferredHeight: ChangeTableRowPreferredHeightCommand;
+    /**
+     * Gets a command to change the preferred cell width of the selected table rows.
+     * Value: A <see cref="ChangeTableCellPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellPreferredWidth: ChangeTableCellPreferredWidthCommand;
+    toggleTableCellInsideBorders: ToggleTableCellInsideBordersCommand;
+    /**
+     * Gets a command to change the selected table columns' preferred width.
+     * Value: A <see cref="ChangeTableColumnPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableColumnPreferredWidth: ChangeTableColumnPreferredWidthCommand;
+    /**
+     * Gets a command to change the cell formatting of the selected table elements.
+     * Value: A <see cref="ChangeTableCellFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellFormatting: ChangeTableCellFormattingCommand;
+    /**
+     * Gets a command to insert a table column to the left of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheLeft: InsertTableColumnToTheLeftCommand;
+    /**
+     * Gets a command to insert a table column to the right of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheRight: InsertTableColumnToTheRightCommand;
+    /**
+     * Gets a command to insert a row in the table below the selected row.
+     * Value: A <see cref="InsertTableRowBelowCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowBelow: InsertTableRowBelowCommand;
+    /**
+     * Gets a command to insert a row in the table above the selected row.
+     * Value: A <see cref="InsertTableRowAboveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowAbove: InsertTableRowAboveCommand;
+    /**
+     * Gets a command to delete the selected rows in the table.
+     * Value: A <see cref="DeleteTableRowsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableRows: DeleteTableRowsCommand;
+    /**
+     * Gets a command to delete the selected columns in the table.
+     * Value: A <see cref="DeleteTableColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableColumns: DeleteTableColumnsCommand;
+    /**
+     * Gets a command to insert table cells with a horizontal shift into the selected table.
+     * Value: A <see cref="InsertTableCellWithShiftToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellWithShiftToTheLeft: InsertTableCellWithShiftToTheLeftCommand;
+    /**
+     * Gets a command to delete the selected table cells with a horizontal shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftHorizontallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftHorizontally: DeleteTableCellsWithShiftHorizontallyCommand;
+    /**
+     * Gets a command to delete the selected table cells with a vertical shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftVertically: DeleteTableCellsWithShiftVerticallyCommand;
+    /**
+     * Gets a command to delete the selected table.
+     * Value: A <see cref="DeleteTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTable: DeleteTableCommand;
+    /**
+     * Gets a command to invoke the Insert Cells dialog window.
+     * Value: A <see cref="InsertTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsDialog: InsertTableCellsDialogCommand;
+    /**
+     * Gets a command to invoke the Delete Cells dialog window.
+     * Value: A <see cref="DeleteTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsDialog: DeleteTableCellsDialogCommand;
+    /**
+     * Gets a command to merge the selected cells.
+     * Value: A <see cref="MergeTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeTableCells: MergeTableCellsCommand;
+    /**
+     * Gets a command to invoke the Split Cells dialog window.
+     * Value: A <see cref="SplitTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCellsDialog: SplitTableCellsDialogCommand;
+    /**
+     * Gets a command to split the selected table cells.
+     * Value: A <see cref="SplitTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCells: SplitTableCellsCommand;
+    /**
+     * Gets a command to insert table cells with a vertical shift into the selected table.
+     * Value: A <see cref="InsertTableCellsWithShiftToTheVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsWithShiftToTheVertically: InsertTableCellsWithShiftToTheVerticallyCommand;
+    /**
+     * Gets a command to invoke the Borders tab of the Borders and Shading dialog window.
+     * Value: A <see cref="OpenTableBordersAndShadingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableBordersAndShadingDialog: OpenTableBordersAndShadingDialogCommand;
+    /**
+     * Gets a command to change the selected table's borders and shading.
+     * Value: A <see cref="ChangeTableBordersAndShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBordersAndShading: ChangeTableBordersAndShadingCommand;
+    /**
+     * Gets a command to apply top-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopLeft: ToggleTableCellAlignTopLeftCommand;
+    /**
+     * Gets a command to apply top-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopCenter: ToggleTableCellAlignTopCenterCommand;
+    /**
+     * Gets a command to apply top-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopRight: ToggleTableCellAlignTopRightCommand;
+    /**
+     * Gets a command to apply middle-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleLeft: ToggleTableCellAlignMiddleLeftCommand;
+    /**
+     * Gets a command to apply middle-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleCenter: ToggleTableCellAlignMiddleCenterCommand;
+    /**
+     * Gets a command to apply middle-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleRight: ToggleTableCellAlignMiddleRightCommand;
+    /**
+     * Gets a command to apply bottom-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomLeft: ToggleTableCellAlignBottomLeftCommand;
+    /**
+     * Gets a command to apply bottom-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomCenter: ToggleTableCellAlignBottomCenterCommand;
+    /**
+     * Gets a command to apply bottom-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomRight: ToggleTableCellAlignBottomRightCommand;
+    /**
+     * Gets a command to change the selected table's style.
+     * Value: A <see cref="ChangeTableStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableStyle: ChangeTableStyleCommand;
+    /**
+     * Gets a command to toggle top borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellTopBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellTopBorder: ToggleTableCellTopBorderCommand;
+    /**
+     * Gets a command to toggle right borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellRightBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellRightBorder: ToggleTableCellRightBorderCommand;
+    /**
+     * Gets a command to toggle bottom borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellBottomBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellBottomBorder: ToggleTableCellBottomBorderCommand;
+    /**
+     * Gets a command to toggle left borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellLeftBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellLeftBorder: ToggleTableCellLeftBorderCommand;
+    /**
+     * Gets a command to remove the borders of the selected table cells.
+     * Value: A <see cref="RemoveTableCellBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeTableCellBorders: RemoveTableCellBordersCommand;
+    /**
+     * Gets a command to toggle all borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellAllBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAllBorders: ToggleTableCellAllBordersCommand;
+    /**
+     * Gets a command to toggle inner horizontal borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideHorizontalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideHorizontalBorders: ToggleTableCellInsideHorizontalBordersCommand;
+    /**
+     * Gets a command to toggle inner vertical borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideVerticalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideVerticalBorders: ToggleTableCellInsideVerticalBordersCommand;
+    /**
+     * Gets a command to toggle outer borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellOutsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellOutsideBorders: ToggleTableCellOutsideBordersCommand;
+    /**
+     * Gets a command to change the selected table's style options.
+     * Value: A <see cref="ChangeTableLookCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableLook: ChangeTableLookCommand;
+    /**
+     * Gets a command to change the repository item's table border style.
+     * Value: A <see cref="ChangeTableBorderRepositoryItemCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBorderRepositoryItem: ChangeTableBorderRepositoryItemCommand;
+    /**
+     * Gets a command to change cell shading in the selected table elements.
+     * Value: A <see cref="ChangeTableCellShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellShading: ChangeTableCellShadingCommand;
+    /**
+     * Gets a command to toggle the display of grid lines for a table with no borders applied - on/off.
+     * Value: A <see cref="ShowTableGridLinesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showTableGridLines: ShowTableGridLinesCommand;
+    /**
+     * Gets a command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+     * Value: A <see cref="OpenFindPanelCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindPanel: OpenFindPanelCommand;
+    /**
+     * Gets a command to invoke the Find and Replace dialog window.
+     * Value: A <see cref="OpenFindAndReplaceDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindAndReplaceDialog: OpenFindAndReplaceDialogCommand;
+    /**
+     * Gets a command to find all matches of the specified text in the document.
+     * Value: A <see cref="FindAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    findAll: FindAllCommand;
+    /**
+     * Gets a command to hide the results of the search.
+     * Value: A <see cref="HideFindResultsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    hideFindResults: HideFindResultsCommand;
+    /**
+     * Gets a command to search for a specific text and replace all matches in the document with the specified string.
+     * Value: A <see cref="ReplaceAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceAll: ReplaceAllCommand;
+    /**
+     * Gets a command to search for a specific text and replace the next match in the document with the specified string.
+     * Value: A <see cref="ReplaceNextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceNext: ReplaceNextCommand;
+    /**
+     * Gets a command to invoke the Spelling dialog window.
+     * Value: A <see cref="OpenSpellingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSpellingDialog: OpenSpellingDialogCommand;
+    assignShortcut: AssignShortcutCommand;
+}
+/**
+ * Serves as a base for objects that implement different client command functionalities.
+ */
+interface CommandBase {
+}
+/**
+ * Serves as a base for commands with a simple common command state.
+ */
+interface CommandWithSimpleStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): SimpleCommandState;
+}
+/**
+ * Serves as a base for commands with the Boolean state.
+ */
+interface CommandWithBooleanStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Defines a simple state common to most of the client commands.
+ */
+interface SimpleCommandState {
+    /**
+     * Gets a value indicating whether the command's UI element is enabled.
+     * Value: true, if the command's related UI element is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets a value indicating whether the command's UI element is visible.
+     * Value: true, if the command's related UI element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Defines the state of a command.
+ */
+interface CommandState<T> extends SimpleCommandState {
+    /**
+     * Gets the command state value.
+     * Value: A T object specifying the command state value.
+     */
+    value: T;
+}
+/**
+ * Contains a set properties providing the current information about certain document structural elements.
+ */
+interface RichEditDocument {
+    /**
+     * Provides the information about the active sub-document.
+     * Value: A <see cref="SubDocument" /> object storing information about the essential document functionality.
+     */
+    activeSubDocument: SubDocument;
+    /**
+     * Provides information about sections in the current document.
+     * Value: An array of Section objects storing information about sections.
+     */
+    sectionsInfo: Section[];
+    /**
+     * Provides information about paragraph styles in the current document.
+     * Value: An array of ParagraphStyle objects storing information about paragraph styles.
+     */
+    paragraphStylesInfo: ParagraphStyle[];
+    /**
+     * Provides information about character styles in the current document.
+     * Value: An array of CharacterStyle objects storing information about character styles.
+     */
+    characterStylesInfo: CharacterStyle[];
+    /**
+     * Provides information about numbered paragraphs in the document.
+     * Value: An array of AbstractNumberingList objects storing the information about numbered paragraphs.
+     */
+    abstractNumberingListsInfo: AbstractNumberingList[];
+    /**
+     * Provides information about table styles in the current document.
+     * Value: An array of TableStyle objects storing information about table styles.
+     */
+    tableStylesInfo: TableStyle[];
+    spellingInfo: SpellingInfo;
+}
+/**
+ * An abstract numbering list definition that defines the appearance and behavior of numbered paragraphs in a document.
+ */
+interface AbstractNumberingList {
+    deleted: boolean;
+}
+/**
+ * Defines a paragraph in the document.
+ */
+interface Paragraph {
+    /**
+     * Gets the paragraph's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the paragraph's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    interval: Interval;
+    /**
+     * Gets the name of the paragraph style applied to the current paragraph (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+    /**
+     * Gets the index of a list applied to the paragraph.
+     * Value: An integer that is the index of a list to which the paragraph belongs.
+     */
+    listIndex: number;
+    /**
+     * Gets or sets the index of the list level applied to the current paragraph in the numbering list.
+     * Value: An integer that is the index of the list level of the current paragraph.
+     */
+    listLevelIndex: number;
+}
+/**
+ * Defines a field in the document.
+ */
+interface Field {
+    /**
+     * Gets the field's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the field length in a document.
+     * Value: An integer value specifying the field length.
+     */
+    length: number;
+    codeInterval: Interval;
+    resultInterval: Interval;
+    interval: Interval;
+    /**
+     * Gets or sets a URI to navigate to when the hyperlink (represented by the current field) is activated.
+     * Value: A string representing an URI.
+     */
+    hyperlinkUri: string;
+    /**
+     * Gets or sets the text for the tooltip displayed when the mouse hovers over a hyperlink field.
+     * Value: A string containing the tooltip text.
+     */
+    hyperlinkTip: string;
+    /**
+     * Gets or sets the name of a bookmark (or a hyperlink) in the current document which shall be the target of the hyperlink field.
+     * Value: A string representing the bookmark's name.
+     */
+    hyperlinkAnchor: string;
+    showCode: boolean;
+}
+/**
+ * Defines a bookmark in the document.
+ */
+interface Bookmark {
+    /**
+     * Gets the bookmark's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the bookmark's length.
+     * Value: An integer value specifying the length of the bookmark.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Gets the name of a bookmark in the document.
+     * Value: A string that is the unique bookmark's name.
+     */
+    name: string;
+}
+/**
+ * Defines a section in the document.
+ */
+interface Section {
+    /**
+     * Gets the section's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the section's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides access to the section's headers.
+     * Value: An array of HeaderFooter objects storing information about the section's headers.
+     */
+    headers: HeaderFooter[];
+    /**
+     * Provides access to the section's footers.
+     * Value: An array of HeaderFooter objects storing information about the section's footers.
+     */
+    footers: HeaderFooter[];
+}
+/**
+ * Contains settings defining a header or footer in a document.
+ */
+interface HeaderFooter {
+    /**
+     * Gets the type of the header (footer).
+     * Value: One of the <see cref="HeaderFooterType" /> values.
+     */
+    type: any;
+    /**
+     * Provides access to an object implementing the basic document functionality that is common to the header, footer and the main document body.
+     * Value: A <see cref="SubDocument" /> object exposing the basic document functionality.
+     */
+    subDocument: SubDocument;
+}
+interface InlinePictureInfo {
+    id: number;
+    position: number;
+    initialWidth: number;
+    initialHeight: number;
+    scaleX: number;
+    scaleY: number;
+    actualWidth: number;
+    actualHeight: number;
+}
+declare enum HeaderFooterType {
+    First=0,
+    Odd=1,
+    Primary=1,
+    Even=2
+}
+interface RichEditFileInfo {
+    folderPath: string;
+    fileName: string;
+    documentFormat: any;
+}
+declare enum DocumentFormat {
+    Undefined=0,
+    PlainText=1,
+    Rtf=2,
+    Html=3,
+    OpenXml=4,
+    Mht=5,
+    WordML=6,
+    OpenDocument=7,
+    ePub=9,
+    Doc=10
+}
+/**
+ * Contains a set of methods and properties to work with the document selection.
+ */
+interface RichEditSelection {
+    /**
+     * Gets or sets an array of document interval in the selection.
+     * Value: An array of Interval objects.
+     */
+    intervals: Interval[];
+    collapsed: boolean;
+    getIntervalMaxPosition(): number;
+    /**
+     * Moves the cursor to the next line.
+     */
+    goToNextLine(): void;
+    /**
+     * Moves the cursor to the next line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located.
+     */
+    goToLineEnd(): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located.
+     */
+    goToLineStart(): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous line.
+     */
+    goToPreviousLine(): void;
+    /**
+     * Moves the cursor to the previous line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next character.
+     */
+    goToNextCharacter(): void;
+    /**
+     * Moves the cursor to the next character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextCharacter(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous character.
+     */
+    goToPreviousCharacter(): void;
+    /**
+     * Moves the cursor to the previous character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousCharacter(extendSelection: boolean): void;
+    /**
+     * Selects the line in which the cursor is located.
+     */
+    selectLine(): void;
+    /**
+     * Selects the line in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the next page.
+     */
+    goToNextPage(): void;
+    /**
+     * Moves the cursor to the beginning of the next page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the previous page.
+     */
+    goToPreviousPage(): void;
+    /**
+     * Moves the cursor to the beginning of the previous page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the document.
+     */
+    goToDocumentStart(): void;
+    /**
+     * Moves the cursor to the start of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the document.
+     */
+    goToDocumentEnd(): void;
+    /**
+     * Moves the cursor to the end of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next word.
+     */
+    goToNextWord(): void;
+    /**
+     * Moves the cursor to the next word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous word.
+     */
+    goToPrevWord(): void;
+    /**
+     * Moves the cursor to the previous word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPrevWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located.
+     */
+    goToParagraphStart(): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located.
+     */
+    goToParagraphEnd(): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphEnd(extendSelection: boolean): void;
+    /**
+     * Selects the paragraph in which the cursor is located.
+     */
+    selectParagraph(): void;
+    /**
+     * Selects the table cell in which the cursor is located.
+     */
+    selectTableCell(): void;
+    /**
+     * Selects the table cell in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableCell(extendSelection: boolean): void;
+    /**
+     * Selects the table row in which the cursor is located.
+     */
+    selectTableRow(): void;
+    /**
+     * Selects the table row in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableRow(extendSelection: boolean): void;
+    /**
+     * Selects the entire table in which the cursor is located.
+     */
+    selectTable(): void;
+    /**
+     * Selects the entire table in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTable(extendSelection: boolean): void;
+    /**
+     * Selects the editor's entire content.
+     */
+    selectAll(): void;
+    /**
+     * Moves the cursor to the main sub-document.
+     */
+    setMainSubDocumentAsActive(): void;
+    /**
+     * Moves the cursor to the footer of the specified document page.
+     * @param pageIndex An integer value specifying the page index.
+     */
+    setFooterSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+    /**
+     * Moves the cursor to the header of the specified document page.
+     * @param pageIndex An integer value specifying the page index.
+     */
+    setHeaderSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+}
+/**
+ * Defines a document's interval.
+ */
+interface Interval {
+    /**
+     * Gets the interval's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the interval's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+}
+interface SpellingInfo {
+    spellCheckerState: any;
+    misspelledIntervals: MisspelledInterval[];
+}
+declare enum SpellCheckerState {
+    Disabled=0,
+    InProgress=1,
+    Done=2
+}
+interface MisspelledInterval {
+    start: number;
+    length: number;
+    interval: Interval;
+    errorType: any;
+    word: string;
+    suggestions: string[];
+}
+declare enum SpellingErrorType {
+    Misspelling=0,
+    Repeating=1
+}
+/**
+ * Serves as a base for objects implementing different element styles.
+ */
+interface StyleBase {
+    /**
+     * Gets or sets the name of the style.
+     * Value: A string specifying the style name.
+     */
+    name: string;
+    /**
+     * Gets whether the specified style is marked as deleted.
+     * Value: true, if the style is deleted; otherwise, false.
+     */
+    isDeleted: boolean;
+}
+/**
+ * Defines the paragraph style settings.
+ */
+interface ParagraphStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="CharacterStyle" /> object representing a character style linked to a current style.
+     */
+    linkedStyle: CharacterStyle;
+    /**
+     * Gets or sets the default style for a paragraph that immediately follows the current paragraph.
+     * Value: A <see cref="ParagraphStyle" /> object specifying the style for the next paragraph.
+     */
+    nextStyle: ParagraphStyle;
+    /**
+     * Gets the index of the list item associated with the paragraph formatted with the current style.
+     * Value: An integer value specifying the list item index.
+     */
+    listIndex: number;
+    /**
+     * Gets the index of the list level applied to the paragraph formatted with the current style.
+     * Value: An integer that is the list level index.
+     */
+    listLevelIndex: number;
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="ParagraphStyle" /> object representing the parent style.
+     */
+    parent: ParagraphStyle;
+}
+/**
+ * Contains characteristics of a character style in a document.
+ */
+interface CharacterStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="ParagraphStyle" /> object representing a paragraph style linked to a current style.
+     */
+    linkedStyle: ParagraphStyle;
+    /**
+     * Gets the style form which the current style inherits.
+     * Value: A <see cref="CharacterStyle" /> object representing the parent style.
+     */
+    parent: CharacterStyle;
+}
+/**
+ * Defines the table style settings.
+ */
+interface TableStyle extends StyleBase {
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="TableStyle" /> object that is the parent style.
+     */
+    parent: TableStyle;
+}
+/**
+ * Exposes the settings providing the information about the essential document functionality.
+ */
+interface SubDocument {
+    id: number;
+    type: any;
+    /**
+     * Provides information about paragraphs contained in the document.
+     * Value: An array of Paragraph objects storing information about document paragraphs.
+     */
+    paragraphsInfo: Paragraph[];
+    /**
+     * Provides information about fields in the current document.
+     * Value: An array of Field objects storing information about document fields.
+     */
+    fieldsInfo: Field[];
+    /**
+     * Provides information about tables contained in the document.
+     * Value: An array of Table objects storing information about document tables.
+     */
+    tablesInfo: Table[];
+    /**
+     * Provides information about document bookmarks.
+     * Value: An array of Bookmark objects storing information about document bookmarks.
+     */
+    bookmarksInfo: Bookmark[];
+    inlinePicturesInfo: InlinePictureInfo[];
+    /**
+     * Gets the document's textual representation.
+     * Value: A string value specifying the document's text.
+     */
+    text: string;
+    /**
+     * Gets the character length of the document.
+     * Value: An integer that is the number of character positions in the document.
+     */
+    length: number;
+}
+declare enum SubDocumentType {
+    Main=0,
+    Header=1,
+    Footer=2,
+    TextBox=3
+}
+/**
+ * Defines a table in the document.
+ */
+interface Table {
+    /**
+     * Gets the table's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table length in characters.
+     * Value: A integer value specifying the character length of the table.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides access to a collection of table rows.
+     * Value: An array of TableRow objects storing information about individual table rows.
+     */
+    rows: TableRow[];
+    /**
+     * Gets the name of the style applied to the table (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+}
+/**
+ * Defines a table row in the document.
+ */
+interface TableRow {
+    /**
+     * Gets the table row's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table row's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides information about the table row's cells.
+     * Value: An array of TableCell objects storing information about cells.
+     */
+    cells: TableCell[];
+}
+/**
+ * Defines a table cell in the document.
+ */
+interface TableCell {
+    /**
+     * Gets the table cell's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table cell's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+}
+interface RichEditUnitConverter {
+    pixelsToTwips(value: number): number;
+    inchesToTwips(value: number): number;
+    pointsToTwips(value: number): number;
+    centimetersToTwips(value: number): number;
+    twipsToCentimeters(value: number): number;
+    pixelsToCentimeters(value: number): number;
+    twipsToInches(value: number): number;
+    pixelsToInches(value: number): number;
+    pixelsToPoints(value: number): number;
+    twipsToPoints(value: number): number;
+}
+/**
+ * A command to invoke the Bookmark dialog.
+ */
+interface OpenInsertBookmarkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertBookmarkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a new bookmark that references the current selection.
+ */
+interface InsertBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertBookmarkCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying name of creating bookmark.
+     * @param start An integer value specifying the start position of bookmark's range.
+     * @param length An integer value specifying the length of bookmark's range.
+     */
+    execute(name: string, start: number, length: number): boolean;
+}
+/**
+ * A command to delete a specific bookmark.
+ */
+interface DeleteBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying name of the deleted bookmark.
+     */
+    execute(name: string): boolean;
+}
+/**
+ * Gets a command to navigate to the specified bookmark in the document.
+ */
+interface GoToBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name 
+     */
+    execute(name: string): boolean;
+}
+/**
+ * A command to paste the text from the clipboard over the selection.
+ */
+interface PasteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the PasteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the clipboard.
+ */
+interface CopyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to cut the selected text and place it to the clipboard.
+ */
+interface CutCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert an empty document field at the current position in the document.
+ */
+interface CreateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update the field's result.
+ */
+interface UpdateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display the selected field's field codes.
+ */
+interface ShowFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display all field codes in place of the fields in the document.
+ */
+interface ShowAllFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowAllFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowAllFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update all fields in the selected range.
+ */
+interface UpdateAllFieldsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateAllFieldsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a DATE field displaying the current date.
+ */
+interface CreateDateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateDateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a TIME field displaying the current time.
+ */
+interface CreateTimeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateTimeFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a PAGE field displaying the current page number.
+ */
+interface CreatePageFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToDataRecordCommand extends CommandBase {
+    /**
+     * Executes the GoToDataRecordCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param activeRecordIndex An integer value specifying index of the next data record.
+     */
+    execute(activeRecordIndex: number): boolean;
+    getState(): any;
+}
+interface DataRecordOptions {
+    activeRecordIndex: number;
+    recordCount: number;
+}
+/**
+ * A command to navigate to the first data record of the bound data source.
+ */
+interface GoToFirstDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFirstDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous data record of the bound data source.
+ */
+interface GoToPreviousDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToNextDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the last data record of the bound data source.
+ */
+interface GoToLastDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToLastDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display or hide actual data in MERGEFIELD fields.
+ */
+interface ShowMergedDataCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowMergedDataCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowMergedDataCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showMergedData true to display merged data, false to hide merged data.
+     */
+    execute(showMergedData: boolean): boolean;
+}
+/**
+ * A command to invoke the Insert Merge Field dialog.
+ */
+interface MergeFieldDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeFieldDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a MERGEFIELD field (with a data source column name) at the current position in the document.
+ */
+interface CreateMergeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateMergeFieldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fieldName A string value specifying the name of the merge field.
+     */
+    execute(fieldName: string): boolean;
+}
+/**
+ * Gets a command to invoke the Export Range dialog to start a mail merge.
+ */
+interface MailMergeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MailMergeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to start the mail merge process and download the resulting document containing the merged information.
+ */
+interface MailMergeAndDownloadCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     */
+    execute(documentFormat: any): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     * @param settings A MailMergeSettings object containing settings to set up mail merge operations.
+     */
+    execute(fileExtension: string, settings: MailMergeSettings): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     * @param settings 
+     */
+    execute(documentFormat: any, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to start the mail merge process and save the resulting merged document to the server.
+ */
+interface MailMergeAndSaveAsCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param filePath A string value specifying path to the saving file on the server.
+     */
+    execute(filePath: string): boolean;
+    /**
+     * 
+     * @param fileInfo 
+     * @param settings 
+     */
+    execute(fileInfo: RichEditFileInfo, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a NUMPAGES field displaying the total number of pages.
+ */
+interface CreatePageCountFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageCountFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to set up mail merge operations.
+ */
+interface MailMergeSettings {
+    /**
+     * Gets or sets a value specifying which data rows should be exported into a merged document.
+     * Value: One of the <see cref="MailMergeExportRange" /> values.
+     */
+    range: any;
+    /**
+     * Gets or sets the index of the row from which the exported range starts.
+     * Value: An integer value specifying the row index.
+     */
+    exportFrom: number;
+    /**
+     * Gets or sets the number of data rows in the exported mail-merge range.
+     * Value: An integer value specifying the row count.
+     */
+    exportRecordsCount: number;
+    /**
+     * Gets or sets the merge mode.
+     * Value: One of the <see cref="MergeMode" /> values.
+     */
+    mergeMode: any;
+}
+declare enum MergeMode {
+    NewParagraph=0,
+    NewSection=1,
+    JoinTables=2
+}
+declare enum MailMergeExportRange {
+    AllRecords=0,
+    CurrentRecord=1,
+    Range=2
+}
+/**
+ * A command to create a new empty document.
+ */
+interface FileNewCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileNewCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to open the file, specifying its path.
+ */
+interface FileOpenCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the opening file.
+     */
+    execute(path: string): boolean;
+}
+/**
+ * A command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+ */
+interface FileOpenDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to save the document to a file.
+ */
+interface FileSaveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+ */
+interface FileSaveAsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the saving file.
+     */
+    execute(path: string): boolean;
+    /**
+     * 
+     * @param fileInfo 
+     */
+    execute(fileInfo: RichEditFileInfo): boolean;
+}
+interface FileSaveAsDialogCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to download the document file, specifying its extension.
+ */
+interface FileDownloadCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the extension of the downloading file.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     */
+    execute(documentFormat: any): boolean;
+}
+/**
+ * A command to invoke a browser-specific Print dialog allowing one to print the current document.
+ */
+interface FilePrintCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FilePrintCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+ */
+interface OpenFindPanelCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindPanelCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Find and Replace dialog.
+ */
+interface OpenFindAndReplaceDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindAndReplaceDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to find all matches of the specified text in the document.
+ */
+interface FindAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying finding text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean): boolean;
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to find.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     * @param results An array of Interval objects containing the results of search.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean, results: Interval[]): boolean;
+}
+/**
+ * A command to hide the search results.
+ */
+interface HideFindResultsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the HideFindResultsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to search for a specific text and replace all matches in the document with the specified string.
+ */
+interface ReplaceAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to replace.
+     * @param replaceText A string value specifying replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+/**
+ * A command to search for a specific text and replace the next match in the document with the specified string.
+ */
+interface ReplaceNextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceNextCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to replace.
+     * @param replaceText A string value specifying replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+/**
+ * A command to cancel changes caused by the previous command.
+ */
+interface UndoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UndoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to reverse actions of the previous undo command.
+ */
+interface RedoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RedoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Hyperlink dialog.
+ */
+interface OpenInsertHyperlinkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertHyperlinkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a hyperlink at the current position in the document.
+ */
+interface InsertHyperlinkCommand extends CommandBase {
+    /**
+     * Executes the InsertHyperlinkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A HyperLinkSettings object specifying hyperlink settings.
+     */
+    execute(settings: HyperlinkSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to delete the selected hyperlink.
+ */
+interface DeleteHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete all hyperlinks in a selected range.
+ */
+interface DeleteHyperlinksCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinksCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+ */
+interface OpenHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define hyperlinks.
+ */
+interface HyperlinkSettings {
+    /**
+     * Gets or sets a text displayed for a hyperlink.
+     * Value: A string value specifying the hyperlink display text.
+     */
+    text: string;
+    /**
+     * Gets or sets a text for the tooltip displayed when the mouse hovers over a hyperlink.
+     * Value: A string containing the tooltip text.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the hyperlink destination.
+     * Value: A string value that specifies the destination to which a hyperlink refers.
+     */
+    url: string;
+    /**
+     * Gets or sets the associated bookmak.
+     * Value: A string value specifying the bookmark name.
+     */
+    bookmark: string;
+}
+/**
+ * A command to insert a page break at the current position in the document.
+ */
+interface InsertPageBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPageBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a column break at the current position in the document.
+ */
+interface InsertColumnBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertColumnBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next page.
+ */
+interface InsertSectionBreakNextPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakNextPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next even-numbered page.
+ */
+interface InsertSectionBreakEvenPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakEvenPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next odd-numbered page.
+ */
+interface InsertSectionBreakOddPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakOddPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert the line break at the current position in the document.
+ */
+interface InsertLineBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertLineBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the bulleted paragraph and normal text.
+ */
+interface ToggleBulletedListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleBulletedListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the numbered paragraph and normal text.
+ */
+interface ToggleNumberingListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the multilevel list style and normal text.
+ */
+interface ToggleMultilevelListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleMultilevelListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Bulleted and Numbering dialog.
+ */
+interface OpenNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenNumberingListDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Customize Numbered List dialog.
+ */
+interface OpenCustomNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenCustomNumberingListDialogCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+}
+/**
+ * A command to customize the numbered list parameters.
+ */
+interface ChangeCustomNumberingListCommand extends CommandBase {
+    /**
+     * Executes the ChangeCustomNumberingListCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying the numbering list index.
+     * @param listLevelSettings An array of ListLevelSettings objects defining settings for list levels.
+     */
+    execute(abstractNumberingListIndex: number, listLevelSettings: ListLevelSettings[]): boolean;
+    /**
+     * Gets information about the command state.
+     * @param abstractNumberingListIndex An integer value specifying the index of the abstract numbering list item whose state to return.
+     */
+    getState(abstractNumberingListIndex: number): any;
+}
+/**
+ * A command to restart the numbering list.
+ */
+interface RestartNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RestartNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected numbered list.
+ */
+interface IncrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected numbered list.
+ */
+interface DecrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to continue the list's numbering.
+ */
+interface ContinueNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ContinueNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert numeration to a paragraph making it a numbering list item.
+ */
+interface InsertNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param numberingListIndex An integer value specifying index of numbering list.
+     * @param isAbstractNumberingList true, to insert an abstract numbering list; otherwise, false.
+     */
+    execute(numberingListIndex: number, isAbstractNumberingList: boolean): boolean;
+}
+/**
+ * A command to remove the selected numeration.
+ */
+interface RemoveNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveNumerationCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define individual bulleted or numbered list levels.
+ */
+interface ListLevelSettings {
+    /**
+     * Gets or sets the pattern used to format the list level for display purposes.
+     * Value: A string value specifying the format pattern.
+     */
+    displayFormatString: string;
+    /**
+     * Gets or sets the numbering format used for the current list level's paragraph.
+     * Value: One of the <see cref="ListLevelFormat" /> values.
+     */
+    format: any;
+    /**
+     * Gets the list level item's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets or sets the paragraph text alignment within numbered list levels.
+     * Value: One of the <see cref="ListLevelNumberAlignment" /> values.
+     */
+    alignment: any;
+    separator: string;
+    /**
+     * Gets or sets the left indent for text within the current list level's paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a value specifying the indent of the first line of the current list level's paragraph.
+     * Value: An integer value specifying the indent.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets a value specifying whether and how the first line of the current list level's paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets the font name of the current list level's paragraph.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the font color of the current list level's paragraph.
+     * Value: A string value specifying the font color.
+     */
+    fontColor: string;
+    /**
+     * Gets or sets the font size of the current list level's paragraph.
+     * Value: An integer value specifying the font size.
+     */
+    fontSize: number;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is bold.
+     * Value: true, if the font formatting is bold; otherwise, false.
+     */
+    fontBold: boolean;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is italic.
+     * Value: true, if the font formatting is italic; otherwise, false.
+     */
+    fontItalic: boolean;
+}
+declare enum ListLevelFormat {
+    Decimal=0,
+    AIUEOHiragana=1,
+    AIUEOFullWidthHiragana=2,
+    ArabicAbjad=3,
+    ArabicAlpha=4,
+    Bullet=5,
+    CardinalText=6,
+    Chicago=7,
+    ChineseCounting=8,
+    ChineseCountingThousand=9,
+    ChineseLegalSimplified=10,
+    Chosung=11,
+    DecimalEnclosedCircle=12,
+    DecimalEnclosedCircleChinese=13,
+    DecimalEnclosedFullstop=14,
+    DecimalEnclosedParentheses=15,
+    DecimalFullWidth=16,
+    DecimalFullWidth2=17,
+    DecimalHalfWidth=18,
+    DecimalZero=19,
+    Ganada=20,
+    Hebrew1=21,
+    Hebrew2=22,
+    Hex=23,
+    HindiConsonants=24,
+    HindiDescriptive=25,
+    HindiNumbers=26,
+    HindiVowels=27,
+    IdeographDigital=28,
+    IdeographEnclosedCircle=29,
+    IdeographLegalTraditional=30,
+    IdeographTraditional=31,
+    IdeographZodiac=32,
+    IdeographZodiacTraditional=33,
+    Iroha=34,
+    IrohaFullWidth=35,
+    JapaneseCounting=36,
+    JapaneseDigitalTenThousand=37,
+    JapaneseLegal=38,
+    KoreanCounting=39,
+    KoreanDigital=40,
+    KoreanDigital2=41,
+    KoreanLegal=42,
+    LowerLetter=43,
+    LowerRoman=44,
+    None=45,
+    NumberInDash=46,
+    Ordinal=47,
+    OrdinalText=48,
+    RussianLower=49,
+    RussianUpper=50,
+    TaiwaneseCounting=51,
+    TaiwaneseCountingThousand=52,
+    TaiwaneseDigital=53,
+    ThaiDescriptive=54,
+    ThaiLetters=55,
+    ThaiNumbers=56,
+    UpperLetter=57,
+    UpperRoman=58,
+    VietnameseDescriptive=59
+}
+declare enum ListLevelNumberAlignment {
+    Left=0,
+    Center=1,
+    Right=2
+}
+/**
+ * A command to invoke the Insert Image dialog.
+ */
+interface OpenInsertPictureDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertPictureDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a picture from a file.
+ */
+interface InsertPictureCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPictureCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param imageUrl A string value specifying picture's Url.
+     */
+    execute(imageUrl: string): boolean;
+}
+/**
+ * A command to invoke the Symbols dialog.
+ */
+interface OpenInsertSymbolDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertSymbolDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a character into the document.
+ */
+interface InsertSymbolCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSymbolCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param symbol A string value specifying symbols to insert.
+     * @param fontName A string value specifying font of symbols to insert.
+     */
+    execute(symbol: string, fontName: string): boolean;
+}
+/**
+ * A command to insert a paragraph break at the current position in the document.
+ */
+interface InsertParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert text at the current position in the document.
+ */
+interface InsertTextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTextCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to insert.
+     */
+    execute(text: string): boolean;
+}
+/**
+ * A command to delete the text in a selected range.
+ */
+interface DeleteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to move the cursor backwards and erase the character in that space.
+ */
+interface BackspaceCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the BackspaceCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to scale pictures in a selected range.
+ */
+interface ChangePictureScaleCommand extends CommandBase {
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param scale A Scale object specifying scaling of the picture.
+     */
+    execute(scale: Scale): boolean;
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param x An interger number specifying width of the picture
+     * @param y An interger number specifying height of the picture
+     */
+    execute(x: number, y: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to move the selected range to a specific position in the document.
+ */
+interface MoveContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MoveContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer value specifying position to insert selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the specified position.
+ */
+interface CopyContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer number value specifying position for pasting selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to insert a tab character at the current position in the document.
+ */
+interface InsertTabCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTabCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines the scaling settings.
+ */
+interface Scale {
+    x: number;
+    y: number;
+}
+/**
+ * A command to change page margin settings.
+ */
+interface ChangePageMarginsCommand extends CommandBase {
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param left An integer number specifying left margin of the page.
+     * @param top An integer number specifying top margin of the page.
+     * @param right An integer number specifying right margin of the page.
+     * @param bottom An integer number specifying bottom margin of the page.
+     */
+    execute(left: number, top: number, right: number, bottom: number): boolean;
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param margins A Margins object specifying page margin settings.
+     */
+    execute(margins: Margins): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Margins tab of the Page Setup dialog.
+ */
+interface OpenPageMarginsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPageMarginsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page orientation.
+ */
+interface ChangePageOrientationCommand extends CommandBase {
+    /**
+     * 
+     * @param isPortrait 
+     */
+    execute(isPortrait: any): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paper tab of the Page Setup dialog.
+ */
+interface OpenPagePaperSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPagePaperSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to set the page size.
+ */
+interface SetPageSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SetPageSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page size.
+ */
+interface ChangePageSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param width An integer number specifying width of the page.
+     * @param height An integer number specifying height of the page.
+     */
+    execute(width: number, height: number): boolean;
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param size A Size object specifying the page size settings.
+     */
+    execute(size: Size): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the number of section columns having the same width.
+ */
+interface ChangeSectionEqualColumnCountCommand extends CommandBase {
+    /**
+     * Executes the ChangeSectionEqualColumnCountCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An interger number specifying the number of section columns having the same width.
+     */
+    execute(columnCount: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Columns dialog.
+ */
+interface OpenSectionColumnsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenSectionColumnsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the settings of individual section columns.
+ */
+interface ChangeSectionColumnsCommand extends CommandBase {
+    /**
+     * 
+     * @param columns 
+     */
+    execute(columns: SectionColumn[]): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of the page.
+ */
+interface ChangePageColorCommand extends CommandBase {
+    /**
+     * Executes the ChangePageColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying background color of the page. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to activate the page header and begin editing.
+ */
+interface InsertHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to activate the page footer and begin editing.
+ */
+interface InsertFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to link a header/footer to the previous section, so it has the same content.
+ */
+interface LinkHeaderFooterToPreviousCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the LinkHeaderFooterToPreviousCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page footer from the page header in the header/footer editing mode.
+ */
+interface GoToFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page header from the page footer in the header/footer editing mode.
+ */
+interface GoToHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next page header or footer in the header/footer editing mode.
+ */
+interface GoToNextHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous page header or footer in the header/footer editing mode.
+ */
+interface GoToPreviousHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+ */
+interface SetDifferentFirstPageHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentFirstPage true to apply different text for first page's header and footer, false to remove difference.
+     */
+    execute(differentFirstPage: boolean): boolean;
+}
+/**
+ * A command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+ */
+interface SetDifferentOddAndEvenPagesHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentOddAndEvenPages true to apply different text for odd and even pages' header and footer, false to remove difference.
+     */
+    execute(differentOddAndEvenPages: boolean): boolean;
+}
+/**
+ * A command to finish header/footer editing.
+ */
+interface CloseHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CloseHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines a section column in the document.
+ */
+interface SectionColumn {
+    /**
+     * Gets or sets the width of the section column.
+     * Value: An integer value specifying the section column width.
+     */
+    width: number;
+    /**
+     * Gets or sets the amount of space between adjacent section columns.
+     * Value: An integer value specifying the spacing between section columns.
+     */
+    spacing: number;
+}
+/**
+ * Defines the size settings.
+ */
+interface Size {
+    /**
+     * Gets or sets the width value.
+     * Value: An integer value specifying the width.
+     */
+    width: number;
+    /**
+     * Gets or sets the height value.
+     * Value: An integer value specifying the height.
+     */
+    height: number;
+}
+/**
+ * Defines the margin settings.
+ */
+interface Margins {
+    /**
+     * Gets or sets the left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    left: number;
+    /**
+     * Gets or sets the top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    top: number;
+    /**
+     * Gets or sets the right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    right: number;
+    /**
+     * Gets or sets the bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    bottom: number;
+}
+declare enum Orientation {
+    Landscape=0,
+    Portrait=1
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected range.
+ */
+interface IncreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected range.
+ */
+interface DecreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the visibility of hidden symbols.
+ */
+interface ShowHiddenSymbolsCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display hidden symbols; otherwise, false.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle left paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle centered paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle justified paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentJustifyCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentJustifyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with single line spacing.
+ */
+interface SetSingleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSingleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with one and a half line spacing.
+ */
+interface SetSesquialteralParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSesquialteralParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with double line spacing.
+ */
+interface SetDoubleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDoubleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing before a paragraph.
+ */
+interface AddSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing after a paragraph.
+ */
+interface AddSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing before the selected paragraph.
+ */
+interface RemoveSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing after the selected paragraph.
+ */
+interface RemoveSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the background color of paragraphs in a selected range.
+ */
+interface ChangeParagraphBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying highlighting color of the paragraphs in a selected range. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paragraph dialog allowing end-users to set paragraph formatting.
+ */
+interface OpenParagraphFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenParagraphFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the formatting of paragraphs in a selected range.
+ */
+interface ChangeParagraphFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A ParagraphFormattingSettings object specifying paragraph formatting settings.
+     */
+    execute(settings: ParagraphFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increment the left indentation of paragraphs in a selected range.
+ */
+interface IncrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the left indentation of paragraphs in a selected range.
+ */
+interface DecrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Tabs paragraph dialog.
+ */
+interface OpenTabsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTabsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change paragraph tab stops.
+ */
+interface ChangeTabsCommand extends CommandBase {
+    /**
+     * Executes the ChangeTabsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TabsSettings object maintaining the information about tab stops.
+     */
+    execute(settings: TabsSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains the information about tab stops.
+ */
+interface TabsSettings {
+    /**
+     * Gets or sets the default tab stop value.
+     * Value: An integer value specifying the default tab stop.
+     */
+    defaultTabStop: number;
+    /**
+     * Gets or sets a list of tab stops.
+     * Value: An array of TabSettings objects containing individual tab stop settings.
+     */
+    tabs: TabSettings[];
+}
+/**
+ * Contains settings of a tab stop.
+ */
+interface TabSettings {
+    /**
+     * Gets or sets the alignment type, specifying how any text after the tab will be lined up.
+     * Value: One of the <see cref="TabAlign" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the tab leader style, i.e., the symbol used as a tab leader.
+     * Value: One of the <see cref="TabLeaderType" /> values.
+     */
+    leader: any;
+    /**
+     * Gets or sets the position of the tab stop.
+     * Value: A number representing the distance from the left edge of the text area.
+     */
+    position: number;
+    /**
+     * Gets or sets whether the individual tab stop is in effect.
+     * Value: true to switch off this tab stop; otherwise, false.
+     */
+    deleted: boolean;
+}
+declare enum TabAlign {
+    Left=0,
+    Center=1,
+    Right=2,
+    Decimal=3
+}
+declare enum TabLeaderType {
+    None=0,
+    Dots=1,
+    MiddleDots=2,
+    Hyphens=3,
+    Underline=4,
+    ThickLine=5,
+    EqualSign=6
+}
+/**
+ * Contains settings to define the paragraph formatting.
+ */
+interface ParagraphFormattingSettings {
+    /**
+     * Gets or sets the paragraph alignment.
+     * Value: One of the <see cref="ParagraphAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the outline level of a paragraph.
+     * Value: An integer specifying the level number.
+     */
+    outlineLevel: number;
+    /**
+     * Gets or sets the right indent value for the specified paragraph.
+     * Value: An integer value specifying the right indent.
+     */
+    rightIndent: number;
+    /**
+     * Gets or sets the spacing before the current paragraph.
+     * Value: An integer value specifying the spacing before the paragraph.
+     */
+    spacingBefore: number;
+    /**
+     * Gets or sets the spacing after the current paragraph.
+     * Value: An integer value specifying the spacing after the paragraph.
+     */
+    spacingAfter: number;
+    /**
+     * Gets or sets a value which determines the spacing between lines in a paragraph.
+     * Value: One of the <see cref="ParagraphLineSpacingType" /> values.
+     */
+    lineSpacingType: any;
+    /**
+     * Gets or sets a value specifying whether and how the first line of a paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets a value specifying the indent of the first line of a paragraph.
+     * Value: An integer value specifying the indent of the first line.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets whether to suppress addition of additional space (contextual spacing) between paragraphs of the same style.
+     * Value: true to remove extra spacing between paragraphs, false to add extra space.
+     */
+    contextualSpacing: boolean;
+    /**
+     * Gets or sets whether to prevent all page breaks that interrupt a paragraph.
+     * Value: true, to keep paragraph lines together; otherwise, false.
+     */
+    keepLinesTogether: boolean;
+    /**
+     * Gets or sets whether a page break is inserted automatically before a specified paragraph(s).
+     * Value: true, if a page break is inserted automatically before a paragraph(s); otherwise, false.
+     */
+    pageBreakBefore: boolean;
+    /**
+     * Gets or sets the left indent for text within a paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a line spacing value.
+     * Value: An integer value specifying the line spacing.
+     */
+    lineSpacing: number;
+    /**
+     * Gets or sets the paragraph background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+}
+declare enum ParagraphAlignment {
+    Left=0,
+    Right=1,
+    Center=2,
+    Justify=3
+}
+declare enum ParagraphLineSpacingType {
+    Single=0,
+    Sesquialteral=1,
+    Double=2,
+    Multiple=3,
+    Exactly=4,
+    AtLeast=5
+}
+declare enum ParagraphFirstLineIndent {
+    None=0,
+    Indented=1,
+    Hanging=2
+}
+interface AssignShortcutCommand extends CommandWithSimpleStateBase {
+    execute(keyCode: number, callback: (arg1: string) => void): boolean;
+}
+interface OpenSpellingDialogCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface OpenInsertTableDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertTableDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface InsertTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An integer value specifying number of columns in a generated table.
+     * @param rowCount An integer value specifying number of rows in a generated table.
+     */
+    execute(columnCount: number, rowCount: number): boolean;
+}
+/**
+ * A command to invoke the Table Properties dialog.
+ */
+interface OpenTableFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's formatting.
+ */
+interface ChangeTableFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object containing the settings to format a table.
+     */
+    execute(settings: TableFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred row height.
+ */
+interface ChangeTableRowPreferredHeightCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableRowPreferredHeightCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredHeight A TableHeightUnit object specifying preferred height of the selected table rows.
+     */
+    execute(preferredHeight: TableHeightUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the preferred cell width of the selected table rows.
+ */
+interface ChangeTableCellPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table rows.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred column width.
+ */
+interface ChangeTableColumnPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableColumnPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table columns.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the cell formatting of the selected table elements.
+ */
+interface ChangeTableCellFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object specifying cell formatting of the selected table elements.
+     */
+    execute(settings: TableCellFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a table column to the left of the current position in the table.
+ */
+interface InsertTableColumnToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a table column to the right of the current position in the table.
+ */
+interface InsertTableColumnToTheRightCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table below the selected row.
+ */
+interface InsertTableRowBelowCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowBelowCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table above the selected row.
+ */
+interface InsertTableRowAboveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowAboveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table rows.
+ */
+interface DeleteTableRowsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableRowsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table columns.
+ */
+interface DeleteTableColumnsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableColumnsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert table cells with a horizontal shift into the selected table.
+ */
+interface InsertTableCellWithShiftToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellWithShiftToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a horizontal shift.
+ */
+interface DeleteTableCellsWithShiftHorizontallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftHorizontallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a vertical shift.
+ */
+interface DeleteTableCellsWithShiftVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table.
+ */
+interface DeleteTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Cells dialog.
+ */
+interface InsertTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Delete Cells dialog.
+ */
+interface DeleteTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to merge the selected table cells.
+ */
+interface MergeTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeTableCellsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Split Cells dialog.
+ */
+interface SplitTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to split the selected table cells based on the specified options.
+ */
+interface SplitTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param rowCount An integer value specifying number of rows in the splitted table cells.
+     * @param columnCount An integer value specifying number of columns in the splitted table cells.
+     * @param mergeBeforeSplit true to merge the selected cells before splitting; otherwise, false.
+     */
+    execute(rowCount: number, columnCount: number, mergeBeforeSplit: boolean): boolean;
+}
+/**
+ * A command to insert table cells with a vertical shift into the selected table.
+ */
+interface InsertTableCellsWithShiftToTheVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsWithShiftToTheVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Borders and Shading table dialog.
+ */
+interface OpenTableBordersAndShadingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableBordersAndShadingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change borders and shading of the selected table elements.
+ */
+interface ChangeTableBordersAndShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBordersAndShadingCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object with settings specifying table borders.
+     * @param applyToWholeTable true to apply the border settings to the whole table, false to apply the border settings to the selected cells.
+     */
+    execute(settings: TableBordersSettings, applyToWholeTable: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to apply top-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style.
+ */
+interface ChangeTableStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A TableStyle object specifying the style applying to the table.
+     */
+    execute(style: TableStyle): boolean;
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the name of style applying to the table.
+     */
+    execute(styleName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle top borders for selected cells on/off.
+ */
+interface ToggleTableCellTopBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellTopBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right borders for selected cells on/off.
+ */
+interface ToggleTableCellRightBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellRightBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle bottom borders for selected cells on/off.
+ */
+interface ToggleTableCellBottomBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellBottomBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+interface ToggleTableCellLeftBorderCommand extends CommandWithBooleanStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to remove the borders of the selected table cells.
+ */
+interface RemoveTableCellBordersCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveTableCellBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle all borders for selected cells on/off.
+ */
+interface ToggleTableCellAllBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAllBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner horizontal borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideHorizontalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideHorizontalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner vertical borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideVerticalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideVerticalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle outer borders for selected cells on/off.
+ */
+interface ToggleTableCellOutsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellOutsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style options.
+ */
+interface ChangeTableLookCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableLookCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableLookSettings object containing the settings that modify the table appearance.
+     */
+    execute(settings: TableLookSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the repository item's table border style.
+ */
+interface ChangeTableBorderRepositoryItemCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBorderRepositoryItemCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object specifying the repository item's table border style.
+     */
+    execute(settings: TableBorderSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change cell shading in the selected table elements.
+ */
+interface ChangeTableCellShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellShadingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying color of the selected cells' shading. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle the display of grid lines for a table with no borders applied - on/off.
+ */
+interface ShowTableGridLinesCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowTableGridLinesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowTableGridLinesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showTableGridLines true to display grid lines of the table, false to hide grid lines of the table.
+     */
+    execute(showTableGridLines: boolean): boolean;
+}
+/**
+ * Contains the table style settings that modify the table appearance.
+ */
+interface TableLookSettings {
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether row banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyRowBanding: boolean;
+    /**
+     * Gets or sets a value specifying whether column banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyColumnBanding: boolean;
+}
+/**
+ * Contains settings to define table borders.
+ */
+interface TableBordersSettings {
+    /**
+     * Gets or sets the top border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    top: TableBorderSettings;
+    /**
+     * Gets or sets the right border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    right: TableBorderSettings;
+    /**
+     * Gets or sets the bottom border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    bottom: TableBorderSettings;
+    /**
+     * Gets or sets the left border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    left: TableBorderSettings;
+    /**
+     * Gets or sets the inside horizontal border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideHorizontal: TableBorderSettings;
+    /**
+     * Gets or sets the inside vertical border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideVertical: TableBorderSettings;
+    /**
+     * Gets or sets the background color of table borders.
+     * Value: A string value specifying the background color.
+     */
+    backgroundColor: string;
+}
+/**
+ * Contains settings to define a table border.
+ */
+interface TableBorderSettings {
+    /**
+     * Gets or sets the border color.
+     * Value: A string value specifying the border color.
+     */
+    color: string;
+    /**
+     * Gets or sets the border line width.
+     * Value: An integer value defining the border line width.
+     */
+    width: number;
+    /**
+     * Gets or sets the border line style.
+     * Value: A <see cref="BorderLineStyle" /> object defining the border line style.
+     */
+    style: any;
+}
+declare enum BorderLineStyle {
+    None=0,
+    Single=1,
+    Thick=2,
+    Double=3,
+    Dotted=4,
+    Dashed=5,
+    DotDash=6,
+    DotDotDash=7,
+    Triple=8,
+    ThinThickSmallGap=9,
+    ThickThinSmallGap=10,
+    ThinThickThinSmallGap=11,
+    ThinThickMediumGap=12,
+    ThickThinMediumGap=13,
+    ThinThickThinMediumGap=14,
+    ThinThickLargeGap=15,
+    ThickThinLargeGap=16,
+    ThinThickThinLargeGap=17,
+    Wave=18,
+    DoubleWave=19,
+    DashSmallGap=20,
+    DashDotStroked=21,
+    ThreeDEmboss=22,
+    ThreeDEngrave=23,
+    Outset=24,
+    Inset=25,
+    Apples=26,
+    ArchedScallops=27,
+    BabyPacifier=28,
+    BabyRattle=29,
+    Balloons3Colors=30,
+    BalloonsHotAir=31,
+    BasicBlackDashes=32,
+    BasicBlackDots=33,
+    BasicBlackSquares=34,
+    BasicThinLines=35,
+    BasicWhiteDashes=36,
+    BasicWhiteDots=37,
+    BasicWhiteSquares=38,
+    BasicWideInline=39,
+    BasicWideMidline=40,
+    BasicWideOutline=41,
+    Bats=42,
+    Birds=43,
+    BirdsFlight=44,
+    Cabins=45,
+    CakeSlice=46,
+    CandyCorn=47,
+    CelticKnotwork=48,
+    CertificateBanner=49,
+    ChainLink=50,
+    ChampagneBottle=51,
+    CheckedBarBlack=52,
+    CheckedBarColor=53,
+    Checkered=54,
+    ChristmasTree=55,
+    CirclesLines=56,
+    CirclesRectangles=57,
+    ClassicalWave=58,
+    Clocks=59,
+    Compass=60,
+    Confetti=61,
+    ConfettiGrays=62,
+    ConfettiOutline=63,
+    ConfettiStreamers=64,
+    ConfettiWhite=65,
+    CornerTriangles=66,
+    CouponCutoutDashes=67,
+    CouponCutoutDots=68,
+    CrazyMaze=69,
+    CreaturesButterfly=70,
+    CreaturesFish=71,
+    CreaturesInsects=72,
+    CreaturesLadyBug=73,
+    CrossStitch=74,
+    Cup=75,
+    DecoArch=76,
+    DecoArchColor=77,
+    DecoBlocks=78,
+    DiamondsGray=79,
+    DoubleD=80,
+    DoubleDiamonds=81,
+    Earth1=82,
+    Earth2=83,
+    EclipsingSquares1=84,
+    EclipsingSquares2=85,
+    EggsBlack=86,
+    Fans=87,
+    Film=88,
+    Firecrackers=89,
+    FlowersBlockPrint=90,
+    FlowersDaisies=91,
+    FlowersModern1=92,
+    FlowersModern2=93,
+    FlowersPansy=94,
+    FlowersRedRose=95,
+    FlowersRoses=96,
+    FlowersTeacup=97,
+    FlowersTiny=98,
+    Gems=99,
+    GingerbreadMan=100,
+    Gradient=101,
+    Handmade1=102,
+    Handmade2=103,
+    HeartBalloon=104,
+    HeartGray=105,
+    Hearts=106,
+    HeebieJeebies=107,
+    Holly=108,
+    HouseFunky=109,
+    Hypnotic=110,
+    IceCreamCones=111,
+    LightBulb=112,
+    Lightning1=113,
+    Lightning2=114,
+    MapleLeaf=115,
+    MapleMuffins=116,
+    MapPins=117,
+    Marquee=118,
+    MarqueeToothed=119,
+    Moons=120,
+    Mosaic=121,
+    MusicNotes=122,
+    Northwest=123,
+    Ovals=124,
+    Packages=125,
+    PalmsBlack=126,
+    PalmsColor=127,
+    PaperClips=128,
+    Papyrus=129,
+    PartyFavor=130,
+    PartyGlass=131,
+    Pencils=132,
+    People=133,
+    PeopleHats=134,
+    PeopleWaving=135,
+    Poinsettias=136,
+    PostageStamp=137,
+    Pumpkin1=138,
+    PushPinNote1=139,
+    PushPinNote2=140,
+    Pyramids=141,
+    PyramidsAbove=142,
+    Quadrants=143,
+    Rings=144,
+    Safari=145,
+    Sawtooth=146,
+    SawtoothGray=147,
+    ScaredCat=148,
+    Seattle=149,
+    ShadowedSquares=150,
+    SharksTeeth=151,
+    ShorebirdTracks=152,
+    Skyrocket=153,
+    SnowflakeFancy=154,
+    Snowflakes=155,
+    Sombrero=156,
+    Southwest=157,
+    Stars=158,
+    Stars3d=159,
+    StarsBlack=160,
+    StarsShadowed=161,
+    StarsTop=162,
+    Sun=163,
+    Swirligig=164,
+    TornPaper=165,
+    TornPaperBlack=166,
+    Trees=167,
+    TriangleParty=168,
+    Triangles=169,
+    Tribal1=170,
+    Tribal2=171,
+    Tribal3=172,
+    Tribal4=173,
+    Tribal5=174,
+    Tribal6=175,
+    TwistedLines1=176,
+    TwistedLines2=177,
+    Vine=178,
+    Waveline=179,
+    WeavingAngles=180,
+    WeavingBraid=181,
+    WeavingRibbon=182,
+    WeavingStrips=183,
+    WhiteFlowers=184,
+    Woodwork=185,
+    XIllusions=186,
+    ZanyTriangles=187,
+    ZigZag=188,
+    ZigZagStitch=189,
+    Nil=-1
+}
+/**
+ * Contains the settings to define the table cell formatting.
+ */
+interface TableCellFormattingSettings {
+    /**
+     * Gets or sets a table cell's preferred width.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the preferred cell width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the vertical alignment of a table cell's content.
+     * Value: One the <see cref="TableCellVerticalAlignment" /> values.
+     */
+    verticalAlignment: any;
+    /**
+     * Gets or sets a value specifying whether text is wrapped in a table cell.
+     * Value: true if text is wrapped; false if text is not wrapped.
+     */
+    noWrap: boolean;
+    /**
+     * Gets or sets a table cell's left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    marginLeft: number;
+    /**
+     * Gets or sets a table cell's right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    marginRight: number;
+    /**
+     * Gets or sets a table cell's top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    marginTop: number;
+    /**
+     * Gets or sets a table cell's bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    marginBottom: number;
+    /**
+     * Gets or sets a value specifying whether a table cell's margins are inherited from the table level settings.
+     * Value: true to inherit table level margins; false to use a table cell's own margin settings.
+     */
+    marginsSameAsTable: boolean;
+}
+declare enum TableCellVerticalAlignment {
+    Top=0,
+    Both=1,
+    Center=2,
+    Bottom=3
+}
+/**
+ * Contains the settings to format a table.
+ */
+interface TableFormattingSettings {
+    /**
+     * Gets or sets the preferred width of cells in the table.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the alignment of table rows.
+     * Value: One of the <see cref="TableRowAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the table's left indent.
+     * Value: An integer value specifying the indent.
+     */
+    indent: number;
+    /**
+     * Gets or sets the spacing between table cells.
+     * Value: An integer value specifying the spacing.
+     */
+    spacingBetweenCells: number;
+    /**
+     * Gets or sets a value specifying whether spacing is allowed between table cells.
+     * Value: true, to allow spacing; otherwise, false.
+     */
+    allowSpacingBetweenCells: boolean;
+    /**
+     * Gets or sets a value that specifying whether to allow automatic resizing of table cells to fit their contents.
+     * Value: true, to allow automatic resizing; otherwise, false.
+     */
+    resizeToFitContent: boolean;
+    /**
+     * Gets or sets the default left margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginLeft: number;
+    /**
+     * Gets or sets the default right margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginRight: number;
+    /**
+     * Gets or sets the default top margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginTop: number;
+    /**
+     * Gets or sets the default bottom margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginBottom: number;
+}
+/**
+ * Contains settings defining the table width's measurement units and value.
+ */
+interface TableWidthUnit {
+    /**
+     * Gets or sets the table width value.
+     * Value: An integer value specifying the table width.
+     */
+    value: number;
+    /**
+     * Gets or sets the unit type for the table width.
+     * Value: One of the <see cref="TableWidthUnitType" /> values.
+     */
+    type: any;
+}
+/**
+ * Contains settings defining the table height's measurement units and value.
+ */
+interface TableHeightUnit {
+    /**
+     * Gets or sets the table height value.
+     * Value: An integer value specifying the table height.
+     */
+    value: number;
+    type: any;
+}
+declare enum TableHeightUnitType {
+    Minimum=0,
+    Auto=1,
+    Exact=2
+}
+declare enum TableRowAlignment {
+    Both=0,
+    Center=1,
+    Distribute=2,
+    Left=3,
+    NumTab=4,
+    Right=5
+}
+declare enum TableWidthUnitType {
+    Nil=0,
+    Auto=1,
+    FiftiethsOfPercent=2,
+    ModelUnits=3
+}
+/**
+ * A command to change the font name of characters in a selected range.
+ */
+interface ChangeFontNameCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontNameCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontName A string specifying font name.
+     */
+    execute(fontName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the font size of characters in a selected range.
+ */
+interface ChangeFontSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSize An integer number specifying font size.
+     */
+    execute(fontSize: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increase the font size of characters in a selected range to the closest larger predefined value.
+ */
+interface IncreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrease the font size of characters in a selected range to the closest smaller predefined value.
+ */
+interface DecreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to upper case.
+ */
+interface MakeTextUpperCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextUpperCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to lower case.
+ */
+interface MakeTextLowerCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextLowerCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to capitalize each word in the selected sentence.
+ */
+interface CapitalizeEachWordTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CapitalizeEachWordTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the case for each character - upper case becomes lower, lower case becomes upper.
+ */
+interface ToggleTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ToggleTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the bold formatting of characters in a selected range.
+ */
+interface ChangeFontBoldCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontBoldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontBoldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontBold true to apply bold formatting to the text, false to remove bold formatting.
+     */
+    execute(fontBold: boolean): boolean;
+}
+/**
+ * A command to change the italic formatting of characters in a selected range.
+ */
+interface ChangeFontItalicCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontItalicCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontItalicCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontItalic true to apply italic formatting to the text, false to remove italic formatting.
+     */
+    execute(fontItalic: boolean): boolean;
+}
+/**
+ * A command to change the underline formatting of characters in a selected range.
+ */
+interface ChangeFontUnderlineCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontUnderlineCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontUnderlineCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontUnderline true to apply underline formatting to the text, false to remove underline formatting.
+     */
+    execute(fontUnderline: boolean): boolean;
+}
+/**
+ * A command to change the strikeout formatting of characters in a selected range.
+ */
+interface ChangeFontStrikeoutCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontStrikeout true to apply strikeout formatting to the text, false to remove strikeout formatting.
+     */
+    execute(fontStrikeout: boolean): boolean;
+}
+/**
+ * A command to change the superscript formatting of characters in a selected range.
+ */
+interface ChangeFontSuperscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSuperscript true to apply superscript formatting to the text, false to remove superscript formatting.
+     */
+    execute(fontSuperscript: boolean): boolean;
+}
+/**
+ * A command to change the subscript formatting of characters in the selected range.
+ */
+interface ChangeFontSubscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSubscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSubscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSubscript true to apply subscript formatting to the text, false to remove subscript formatting.
+     */
+    execute(fontSubscript: boolean): boolean;
+}
+/**
+ * A command to change the font color of characters in a selected range.
+ */
+interface ChangeFontForeColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontForeColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying font color. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of characters in a selected range.
+ */
+interface ChangeFontBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying highlighting color. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to reset the selected text's formatting to default.
+ */
+interface ClearFormattingCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ClearFormattingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected range's style.
+ */
+interface ChangeStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A StyleBase object specifying the selected range's style.
+     */
+    execute(style: StyleBase): boolean;
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the name of applying style.
+     * @param isParagraphStyle true to apply style to paragraph, false to apply style to character.
+     */
+    execute(styleName: string, isParagraphStyle: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Font dialog allowing end-users to change the font, size and style of the selected text.
+ */
+interface OpenFontFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFontFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the text of all selected sentences to sentence case.
+ */
+interface MakeTextSentenceCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextSentenceCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to switch the text case at the current position in the document.
+ */
+interface SwitchTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SwitchTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the font formatting of characters in a selected range.
+ */
+interface ChangeFontFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A  FontFormattingSettings object specifying font formatting settings.
+     */
+    execute(settings: FontFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains settings to define the font formatting.
+ */
+interface FontFormattingSettings {
+    /**
+     * Gets or sets the character(s) font name.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the character(s) font size.
+     * Value: An integer value specifying the font size.
+     */
+    size: number;
+    /**
+     * Gets or sets the foreground color of characters.
+     * Value: A string value specifying the foreground color.
+     */
+    foreColor: string;
+    /**
+     * Gets or sets the character background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+    /**
+     * Gets or sets the type of underline applied to the character(s).
+     * Value: true, if characters are underlined; otherwise, false.
+     */
+    underline: boolean;
+    /**
+     * Gets or sets the color of the underline for the specified characters.
+     * Value: A string value specifying the underline color.
+     */
+    underlineColor: string;
+    /**
+     * Gets or sets whether the character formatting is bold.
+     * Value: true, if characters are bold; otherwise, false.
+     */
+    bold: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is italicized.
+     * Value: true, if characters are italicized; otherwise, false.
+     */
+    italic: boolean;
+    strikeout: boolean;
+    /**
+     * Gets or sets whether only word characters are underlined.
+     * Value: true to underline only characters in words; false to underline all characters.
+     */
+    underlineWordsOnly: boolean;
+    /**
+     * Gets or sets a value specifying character script formatting.
+     * Value: One of the <see cref="CharacterFormattingScript" /> values.
+     */
+    script: any;
+    /**
+     * Gets or sets a value indicating whether all characters are capital letters.
+     * Value: true, if all characters are capitalized; otherwise, false.
+     */
+    allCaps: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is hidden.
+     * Value: true, if characters are hidden; otherwise, false.
+     */
+    hidden: boolean;
+}
+declare enum CharacterFormattingScript {
+    Normal=0,
+    Subscript=1,
+    Superscript=2
+}
+/**
+ * A command to toggle the horizontal ruler's visibility.
+ */
+interface ShowHorizontalRulerCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHorizontalRulerCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHorizontalRulerCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display the horizontal ruler, false to hide the horizontal ruler.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle the fullscreen mode.
+ */
+interface SetFullscreenCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetFullscreenCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetFullscreenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fullscreen true to apply fullscreen mode, false to remove fullscreen mode.
+     */
+    execute(fullscreen: boolean): boolean;
+}
+/**
+ * Holds the information that determines what action types can be performed for appointments.
+ */
+interface ASPxClientAppointmentFlags {
+    /**
+     * Gets a value that specifies whether an end-user is allowed to delete appointments.
+     * Value: true if an end-user can delete appointments; otherwise, false. Default is true.
+     */
+    allowDelete: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to edit appointments.
+     * Value: true if the end-user can edit appointments; otherwise, false.
+     */
+    allowEdit: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to change the time boundaries of appointments.
+     * Value: true if appointment resizing is allowed; otherwise, false. Default is true.
+     */
+    allowResize: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to copy appointments.
+     * Value: true if a user can copy appointments; otherwise, false. Default is true.
+     */
+    allowCopy: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments to another time slot or date.
+     * Value: true if the user can drag and drop appointments; otherwise, false.
+     */
+    allowDrag: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments between resources.
+     * Value: true if the end-user can drag appointment from one resource to another; otherwise, false.
+     */
+    allowDragBetweenResources: boolean;
+    /**
+     * Gets a value that specifies whether an inplace editor can be activated for an appointment.
+     * Value: true if an inplace editor is activated; otherwise, false. Default is true.
+     */
+    allowInplaceEditor: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to share the schedule time between two or more appointments.
+     * Value: true if appointments with the same schedule time are allowed; otherwise, false. Default is true.
+     */
+    allowConflicts: boolean;
+}
+/**
+ * Represents a client-side equivalent of the Appointment class.
+ */
+interface ASPxClientAppointment {
+    /**
+     * Gets the time interval of the appointment for client-side scripting.
+     * Value: An ASPxClientTimeInterval object, representing the interval assigned to an appointment.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the identifiers of resources associated with the appointment for client-side scripting.
+     * Value: An array of string representations for resource identifiers.
+     */
+    resources: string[];
+    /**
+     * Gets the ID of an appointment for use in client-side scripts.
+     * Value: A string representation of the appointment ID.
+     */
+    appointmentId: string;
+    /**
+     * Gets the type of appointment for use in client-side scripts.
+     * Value: An ASPxAppointmentType enumeration member, representing the appointment's type.
+     */
+    appointmentType: ASPxAppointmentType;
+    /**
+     * Gets the index of the availability status object associated with the appointment.
+     * Value: An integer value that specifies the index of the corresponding Statuses collection.
+     */
+    statusIndex: number;
+    /**
+     * Gets  the index of the label object associated with the appointment for client-side scripting.
+     * Value: An integer value that specifies the index of the corresponding Labels collection.
+     */
+    labelIndex: number;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Subject property.
+     * Value: A string representing the appointment subject.
+     */
+    subject: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Description property.
+     * Value: A string, representing the description for an appointment.
+     */
+    description: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Location property.
+     * Value: A string representing the appointment location.
+     */
+    location: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the AllDay property.
+     * Value: true indicates the all-day appointment; otherwise, false.
+     */
+    allDay: boolean;
+    /**
+     * Adds a resource to the collection of resources associated with the client appointment.
+     * @param resourceId An object, representing the resource id.
+     */
+    AddResource(resourceId: Object): void;
+    /**
+     * Gets the resource associated with the client-side appointment by its index.
+     * @param index An integer, representing an index of a resource in a resource collection associated with the current appointment.
+     */
+    GetResource(index: number): Object;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Start appointment property.
+     * @param start A JavaScript Date object representing the appointment start.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Start appointment property.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the End appointment property.
+     * @param end A JavaScript Date object representing the end of the appointment.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the End appointment property.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Duration appointment property.
+     * @param duration A TimeSpan object representing the appointment duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Duration appointment property.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the ID of the client appointment.
+     * @param id An object representing the appointment identifier.
+     */
+    SetId(id: Object): void;
+    /**
+     * Gets the ID of the client appointment.
+     */
+    GetId(): Object;
+    /**
+     * Specifies the type of the current client appointment.
+     * @param type An ASPxAppointmentType enumeration value indicating the appointment type.
+     */
+    SetAppointmentType(type: ASPxAppointmentType): void;
+    /**
+     * Gets the type of the client appointment.
+     */
+    GetAppointmentType(): ASPxAppointmentType;
+    /**
+     * Sets the property value of the client appointment, corresponding to the StatusId appointment property.
+     * @param statusId An integer representing the index in the AppointmentStatusCollection.
+     */
+    SetStatusId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the StatusId appointment property.
+     */
+    GetStatusId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the LabelId appointment property.
+     * @param statusId An integer representing the index of the label in the Labels label collection.
+     */
+    SetLabelId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the LabelId appointment property.
+     */
+    GetLabelId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Subject appointment property.
+     * @param subject A string containing the appointment subject.
+     */
+    SetSubject(subject: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Subject appointment property.
+     */
+    GetSubject(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Description appointment property.
+     * @param description A string representing the appointment description.
+     */
+    SetDescription(description: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Description appointment property.
+     */
+    GetDescription(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Location appointment property.
+     * @param location A string representing the appointment location.
+     */
+    SetLocation(location: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Location appointment property.
+     */
+    GetLocation(): string;
+    /**
+     * Specifies the property value of the client appointment corresponding to the AllDay appointment property.
+     * @param allDay true to indicate the all-day appointment; otherwise, false.
+     */
+    SetAllDay(allDay: boolean): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the AllDay appointment property.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Gets the appointment that is the RecurrencePattern for the current appointment.
+     */
+    GetRecurrencePattern(): ASPxClientAppointment;
+    /**
+     * Sets the property value of the client appointment, corresponding to the RecurrenceInfo appointment property.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object representing the recurrence information.
+     */
+    SetRecurrenceInfo(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the RecurrenceInfo appointment property.
+     */
+    GetRecurrenceInfo(): ASPxClientRecurrenceInfo;
+}
+/**
+ * A client point object.
+ */
+interface ASPxClientPoint {
+    /**
+     * Gets the point's X-coordinate.
+     */
+    GetX(): number;
+    /**
+     * Gets the point's Y-coordinate.
+     */
+    GetY(): number;
+}
+/**
+ * A client rectangle object.
+ */
+interface ASPxClientRect {
+    /**
+     * Gets the X-coordinate of the rectangle's left edge.
+     */
+    GetLeft(): number;
+    /**
+     * Gets the X-coordinate of the rectangle's right edge.
+     */
+    GetRight(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's top edge.
+     */
+    GetTop(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's bottom edge.
+     */
+    GetBottom(): number;
+    /**
+     * Gets the rectangle's width.
+     */
+    GetWidth(): number;
+    /**
+     * Gets the rectangle's height.
+     */
+    GetHeight(): number;
+}
+/**
+ * Contains information defining the occurrences of a recurring client appointment.
+ */
+interface ASPxClientRecurrenceInfo {
+    /**
+     * Sets the recurrence start date.
+     * @param start A JavaScript date object value that specifies the start date for the recurrence.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the recurrence start date.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the recurrence end date.
+     * @param end A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the duration of the recurrence.
+     * @param duration A TimeSpan object representing the duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the duration of the recurrence.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the time base for the frequency of the corresponding appointment occurrences.
+     * @param type An ASPxClientRecurrenceType enumeration value that specifies the recurrence's frequency type.
+     */
+    SetRecurrenceType(type: ASPxClientRecurrenceType): void;
+    /**
+     * Gets the time base for the frequency of the corresponding appointment reoccurrence.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the day/days in a week that the corresponding appointment recurs on.
+     * @param weekDays The ASPxClientWeekDays enumeration value specifying the day/days in a week.
+     */
+    SetWeekDays(weekDays: ASPxClientWeekDays): void;
+    /**
+     * Gets the day/days in a week on which the corresponding appointment occurs.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Sets the frequency with which the corresponding appointment occurs (dependent on the recurrence Type).
+     * @param periodicity An integer value that specifies the frequency with which the corresponding appointment occurs.
+     */
+    SetPeriodicity(periodicity: number): void;
+    /**
+     * Gets the frequency with which the corresponding appointment reoccurs (dependent on the recurrence Type).
+     */
+    GetPeriodicity(): number;
+    /**
+     * Sets the ordinal number of a day within a defined month.
+     * @param dayNumber A positive integer value that specifies the day number within a month.
+     */
+    SetDayNumber(dayNumber: number): void;
+    /**
+     * Gets the ordinal number of a day within a defined month.
+     */
+    GetDayNumber(): number;
+    /**
+     * Sets the occurrence number of the week in a month for the recurrence pattern.
+     * @param weekOfMonth A ASPxClientWeekOfMonth enumeration value that specifies a particular week in every month.
+     */
+    SetWeekOfMonth(weekOfMonth: ASPxClientWeekOfMonth): void;
+    /**
+     * Gets the occurrence number of the week in a month for the recurrence pattern.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+    /**
+     * Sets the month (as a number) on which the corresponding appointment occurs.
+     * @param month A positive integer value that specifies the month's number.
+     */
+    SetMonth(month: number): void;
+    /**
+     * Gets the month (as a number) on which the corresponding appointment recurs.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+}
+/**
+ * Contains types of the recurrence range.
+ */
+interface ASPxClientRecurrenceRange {
+    /**
+     * A recurring appointment will not have an end date, i.e. infinite recurrence
+     * Value: The "NoEndDate" string.
+     */
+    NoEndDate: string;
+    /**
+     * A recurring appointment will end after its recurrence count exceeds the value specified by the SetOccurrenceCount method.
+     * Value: The "OccurrenceCount" string.
+     */
+    OccurrenceCount: string;
+    /**
+     * A recurring appointment will end after the date specified by the SetEnd method.
+     * Value: The "EndByDate" string.
+     */
+    EndByDate: string;
+}
+/**
+ * Contains recurrence types.
+ */
+interface ASPxClientRecurrenceType {
+    /**
+     * The recurring appointment occurs on a daily basis.
+     * Value: The "Daily" string.
+     */
+    Daily: string;
+    /**
+     * The recurring appointment reoccurs on a weekly basis.
+     * Value: The "Weekly" string.
+     */
+    Weekly: string;
+    /**
+     * The recurring appointment reoccurs on a monthly basis.
+     * Value: The "Monthly" string.
+     */
+    Monthly: string;
+    /**
+     * The recurring appointment reoccurs on an yearly basis.
+     * Value: The "Yearly" string.
+     */
+    Yearly: string;
+    /**
+     * The recurring appointment occurs on an hourly base.
+     * Value: The "Hourly" string.
+     */
+    Hourly: string;
+}
+/**
+ * Contains days and groups of days for use in recurrence patterns.
+ */
+interface ASPxClientWeekDays {
+    /**
+     * Specifies Sunday.
+     * Value: The integer 1 value.
+     */
+    Sunday: number;
+    /**
+     * Specifies Monday.
+     * Value: The integer 2 value.
+     */
+    Monday: number;
+    /**
+     * Specifies Tuesday.
+     * Value: The integer 4 value.
+     */
+    Tuesday: number;
+    /**
+     * Specifies Wednesday.
+     * Value: The integer 8 value.
+     */
+    Wednesday: number;
+    /**
+     * Specifies Thursday.
+     * Value: The integer 16 value.
+     */
+    Thursday: number;
+    /**
+     * Specifies Friday.
+     * Value: The integer 32 value.
+     */
+    Friday: number;
+    /**
+     * Specifies Saturday.
+     * Value: The integer 64 value.
+     */
+    Saturday: number;
+    /**
+     * Specifies Saturday and Sunday.
+     * Value: The integer 65 value.
+     */
+    WeekendDays: number;
+    /**
+     * Specifies work days (Monday, Tuesday, Wednesday, Thursday and Friday).
+     * Value: The integer 62 value.
+     */
+    WorkDays: number;
+    /**
+     * Specifies every day of the week.
+     * Value: The integer 127 value.
+     */
+    EveryDay: number;
+}
+/**
+ * Contains number of weeks in a month in which the event occurs.
+ */
+interface ASPxClientWeekOfMonth {
+    /**
+     * There isn't any recurrence rule based on the weeks in a month.
+     * Value: The integer 0 value.
+     */
+    None: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the first week in the month.
+     * Value: The integer 1 value.
+     */
+    First: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the second week in the month.
+     * Value: The integer 2 value.
+     */
+    Second: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the third week in the month.
+     * Value: The integer 3 value.
+     */
+    Third: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the fourth week in the month.
+     * Value: The integer 4 value;
+     */
+    Fourth: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the last week in the month.
+     * Value: The integer 5 value;
+     */
+    Last: number;
+}
+/**
+ * Represents a client-side equivalent of the WeekDaysCheckEdit control.
+ */
+interface ASPxClientWeekDaysCheckEdit extends ASPxClientControl {
+    /**
+     * Gets the selection state of the week day check boxes.
+     */
+    GetValue(): ASPxClientWeekDays;
+    /**
+     * Gets the selection state of the week day check boxes.
+     * @param value An ASPxClientWeekDays object specifying the selection state of the week day check boxes.
+     */
+    SetValue(value: ASPxClientWeekDays): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceRangeControl.
+ */
+interface ASPxClientRecurrenceRangeControl extends ASPxClientControl {
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEndDate(): Date;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Sets the recurrence end date.
+     * @param date A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEndDate(date: Date): void;
+}
+/**
+ * A base for client equivalents of recurrence controls available in the XtraScheduler library.
+ */
+interface ASPxClientRecurrenceControlBase extends ASPxClientControl {
+    /**
+     * Returns an object providing access to the ASPxClientRecurrenceControlBase control's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientRecurrenceControlBase control.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the DailyRecurrenceControl - a control for specifying the daily recurrence.
+ */
+interface ASPxClientDailyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientDailyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientDailyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the WeeklyRecurrenceControl.
+ */
+interface ASPxClientWeeklyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientWeeklyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientWeeklyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the MonthlyRecurrenceControl.
+ */
+interface ASPxClientMonthlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientMonthlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientMonthlyRecurrenceControll.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the YearlyRecurrenceControl.
+ */
+interface ASPxClientYearlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientYearlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientYearlyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * An object providing access to an ASPxClientRecurrenceControlBase control's editor values.
+ */
+interface DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Get the frequency with which the appointment occurs with respect to the appointment's recurrence type.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the number of the month's day in which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week to which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientDailyRecurrenceControl's editor values.
+ */
+interface DailyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of days between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week to which a daily recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientWeeklyRecurrenceControl's editor values.
+ */
+interface WeeklyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of weeks between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week to which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientMonthlyRecurrenceControl's editor values.
+ */
+interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of the month's day in which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets the number of months between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week to which a monthly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientYearlyRecurrenceControl's editor values.
+ */
+interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of the month's day in which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week to which a yearly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets or sets the number of a week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * Provides base functionality for ASPxClientScheduler's forms.
+ */
+interface ASPxClientFormBase {
+    /**
+     * Occurs when the form has been closed.
+     */
+    FormClosed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientFormBase>>;
+    /**
+     * Closes the form.
+     */
+    Close(): void;
+    /**
+     * Sets the visibility state of the specified form element.
+     * @param element An object specifying the element whose visibility state should be changed.
+     * @param isVisible true to display the element; false to hide the element.
+     */
+    SetVisibleCore(element: Object, isVisible: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceTypeEdit.
+ */
+interface ASPxClientRecurrenceTypeEdit extends ASPxClientRadioButtonList {
+    /**
+     * Gets the selected recurrence type.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the selected recurrence type.
+     * @param recurrenceType An ASPxClientRecurrenceType enumeration value.
+     */
+    SetRecurrenceType(recurrenceType: ASPxClientRecurrenceType): void;
+}
+/**
+ * Contains lists of property names for different appointment types.
+ */
+interface AppointmentPropertyNames {
+    /**
+     * Gets the list of properties characteristic for appointments of the Normal type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Normal: string;
+    /**
+     * Gets the list of properties characteristic for appointments of the Pattern type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Pattern: string;
+}
+/**
+ * Represents the client-side equivalent of the TimeInterval class.
+ */
+interface ASPxClientTimeInterval {
+    /**
+     * Gets a value indicating if the time interval is All-Day.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Sets a value specifying if the time interval is All-Day.
+     * @param allDayValue true, if this is an all-day time interval; otherwise, false.
+     */
+    SetAllDay(allDayValue: boolean): void;
+    /**
+     * Client-side function that returns the start time of the interval.
+     */
+    GetStart(): Date;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     */
+    GetDuration(): number;
+    /**
+     * Client-side function that returns the end time of the interval.
+     */
+    GetEnd(): Date;
+    /**
+     * Client-side function that sets the start time of the interval.
+     * @param value A DateTime value, representing the beginning of the interval.
+     */
+    SetStart(value: Date): void;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     * @param value A TimeSpan  object, representing the duration of the time period.
+     */
+    SetDuration(value: any): void;
+    /**
+     * Client-side function that sets the end time of the interval.
+     * @param value A DateTime value, representing the end of the interval.
+     */
+    SetEnd(value: Date): void;
+    /**
+     * Determines whether the specified object is equal to the current ASPxClientTimeInterval instance.
+     * @param interval The object to compare with the current object.
+     */
+    Equals(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWith(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval. The boundaries of the time intervals are excluded from the check.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWithExcludingBounds(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Client-side function that determines whether the specified interval is contained within the current one.
+     * @param interval An ASPxClientTimeInterval object, representing the time interval to check.
+     */
+    Contains(interval: ASPxClientTimeInterval): boolean;
+}
+/**
+ * Holds action types for the client-side Refresh method.
+ */
+interface ASPxClientSchedulerRefreshAction {
+    /**
+     * Gets the value of the action parameter which initiates a simple reload of the control.
+     * Value: An integer representing the action parameter value.
+     */
+    None: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its data-dependent satellites.
+     * Value: An integer representing the action parameter value.
+     */
+    VisibleIntervalChanged: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its satellite View controls.
+     * Value: An integer representing the action parameter value.
+     */
+    ActiveViewTypeChanged: number;
+}
+/**
+ * Contains methods allowing you to perform or cancel an operation.
+ */
+interface ASPxClientAppointmentOperation {
+    /**
+     * Passes parameters to the corresponding callback function to accomplish the operation.
+     */
+    Apply(): void;
+    /**
+     * Cancels the operation.
+     */
+    Cancel(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxScheduler control.
+ */
+interface ASPxClientScheduler extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientScheduler.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the Scheduler control is about to change its active view.
+     */
+    ActiveViewChanging: ASPxClientEvent<ActiveViewChangingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event. Occurs after the active view of the ASPxScheduler has been changed.
+     */
+    ActiveViewChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user clicks an appointment.
+     */
+    AppointmentClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user double clicks on an appointment.
+     */
+    AppointmentDoubleClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the user selects an appointment.
+     */
+    AppointmentsSelectionChanged: ASPxClientEvent<AppointmentsSelectionEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the time cell selection is changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the time cell selection is about to change.
+     */
+    SelectionChanging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the  time interval of the scheduling area is changed.
+     */
+    VisibleIntervalChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when one of  More Buttons is clicked.
+     */
+    MoreButtonClicked: ASPxClientEvent<MoreButtonClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when a popup menu item is clicked.
+     */
+    MenuItemClicked: ASPxClientEvent<MenuItemClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs after an appointment has been dragged and dropped.
+     */
+    AppointmentDrop: ASPxClientEvent<AppointmentDropEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when an appointment is resized.
+     */
+    AppointmentResize: ASPxClientEvent<AppointmentResizeEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that fires before an appointment is deleted.
+     */
+    AppointmentDeleting: ASPxClientEvent<ASPxClientAppointmentDeletingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side scripting  method that gets the active View.
+     */
+    GetActiveViewType(): ASPxSchedulerViewType;
+    /**
+     * Client-side scripting  method to change the ASPxScheduler's active View.
+     * @param value A ASPxSchedulerViewType enumeration value, representing a view type to set.
+     */
+    SetActiveViewType(value: ASPxSchedulerViewType): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the control will be reloaded using the specified refresh action.
+     * @param refreshAction An ASPxClientSchedulerRefreshAction enumeration value, specifying the refresh action.
+     */
+    Refresh(refreshAction: ASPxClientSchedulerRefreshAction): void;
+    /**
+     * Client-side function that returns the type of grouping applied to the appointments displayed in the scheduler.
+     */
+    GetGroupType(): ASPxSchedulerGroupType;
+    /**
+     * Client-side scripting method which raises the callback command to set the GroupType.
+     * @param value An ASPxSchedulerGroupType enumeration value, which specifies how appointments are grouped.
+     */
+    SetGroupType(value: ASPxSchedulerGroupType): void;
+    /**
+     * Client-side method that navigates the scheduler to the current system date.
+     */
+    GotoToday(): void;
+    /**
+     * Client-side scripting method which raises the GotoDate callback command.
+     * @param date A DateTime value specifying the destination time.
+     */
+    GotoDate(date: Date): void;
+    /**
+     * Client-side function which slides the visible interval one time span back.
+     */
+    NavigateBackward(): void;
+    /**
+     * Client-side function which slides the visible interval one time span forward.
+     */
+    NavigateForward(): void;
+    /**
+     * Client-side method which raises the callback command to change the ClientTimeZoneId of the scheduler.
+     * @param timeZoneId A string, a time zone identifier which is valid for the System.TimeZoneInfo.Id property.
+     */
+    ChangeTimeZoneId(timeZoneId: string): void;
+    /**
+     * Displays a Selection ToolTip on a position given by the specified coordinates.
+     * @param x An integer representing the X-coordinate.
+     * @param y An integer representing the Y-coordinate.
+     */
+    ShowSelectionToolTip(x: number, y: number): void;
+    /**
+     * Client-side function that returns the time interval, selected in the scheduler.
+     */
+    GetSelectedInterval(): ASPxClientTimeInterval;
+    /**
+     * Client-side function that returns the ResourceId of selected time cell's resource.
+     */
+    GetSelectedResource(): string;
+    /**
+     * Client-side function that returns an appointment with the specified ID.
+     * @param id An appointment's identifier.
+     */
+    GetAppointmentById(id: Object): ASPxClientAppointment;
+    /**
+     * Client-side function that returns the id's of selected appointments.
+     */
+    GetSelectedAppointmentIds(): string[];
+    /**
+     * Client-side function that removes the appointment specified by its client ID from a collection of selected appointments.
+     * @param aptId An appointment's identifier.
+     */
+    DeselectAppointmentById(aptId: Object): void;
+    /**
+     * Client-side function that selects an appointment with the specified ID.
+     * @param aptId An appointment's identifier.
+     */
+    SelectAppointmentById(aptId: Object): void;
+    /**
+     * Enables obtaining appointment property values in a client-side script. Executes the callback command with the AppointmentData identifier.
+     * @param aptId An integer, representing the appointment ID.
+     * @param propertyNames An array of strings, representing the appointment properties to query.
+     * @param onCallBack A handler of a function which will receive and process the properties' values.
+     */
+    GetAppointmentProperties(aptId: number, propertyNames: string[], onCallBack: Object): string[];
+    /**
+     * Initiates a callback to retrieve and apply the values for the specified list of properties to the specified appointment, and transfer control to the specified function.
+     * @param clientAppointment An ASPxClientAppointment object that is the client appointment for which the data is retrieved.
+     * @param propertyNames An array of strings, that are the names of appointment properties to query.
+     * @param onCallBack A handler of a function executed after a callback.
+     */
+    RefreshClientAppointmentProperties(clientAppointment: ASPxClientAppointment, propertyNames: string[], onCallBack: Object): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its client ID.
+     * @param aptClientId A string, representing the appointment client identifier.
+     */
+    ShowAppointmentFormByClientId(aptClientId: string): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its storage identifier.
+     * @param aptServerId A string, representing the appointment identifier.
+     */
+    ShowAppointmentFormByServerId(aptServerId: string): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either 'Day' or 'WorkWeek'.
+     */
+    SetTopRowTime(duration: number, viewType: ASPxSchedulerViewType): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     */
+    SetTopRowTime(duration: number): void;
+    /**
+     * Gets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either "Day" or  "WorkWeek", otherwise the result is undefined.
+     */
+    GetTopRowTime(viewType: ASPxSchedulerViewType): number;
+    /**
+     * Gets the time of day corresponding to the start of the topmost displayed time cell row.
+     */
+    GetTopRowTime(): number;
+    /**
+     * Client-side scripting method which displays the Loading Panel.
+     */
+    ShowLoadingPanel(): void;
+    /**
+     * Client-side scripting method which hides the Loading Panel from view.
+     */
+    HideLoadingPanel(): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     * @param resourceId An object representing the identifier of a resource associated with the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date, resourceId: string): void;
+    /**
+     * Client-side scripting  method to insert the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    InsertAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to update the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    UpdateAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to delete the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    DeleteAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side method that allows retrieving a collection of time intervals displayed by the ASPxScheduler.
+     */
+    GetVisibleIntervals(): ASPxClientTimeInterval[];
+    /**
+     * Changes the container that the ASPxScheduler tooltip belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangeToolTipContainer(container: Object): void;
+    /**
+     * Changes the container that the ASPxScheduler pop-up menu belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangePopupMenuContainer(container: Object): void;
+    /**
+     * Returns focus to the form if the ASPxScheduler control is not visible when the reminder fires.
+     * @param container A DIV object that is located in such a way that it is visible on the page in situations when the ASPxScheduler control is hidden.
+     */
+    ChangeFormContainer(container: Object): void;
+    /**
+     * Client-side scripting method that saves appointment modifications and closes the form.
+     */
+    AppointmentFormSave(): void;
+    /**
+     * Client-side scripting method that deletes the appointment being edited.
+     */
+    AppointmentFormDelete(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the appointment editing form.
+     */
+    AppointmentFormCancel(): void;
+    /**
+     * Client-side scripting method that navigates the scheduler to the date selected in the GotoDate form and closes the form.
+     */
+    GoToDateFormApply(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the GotoDate form.
+     */
+    GoToDateFormCancel(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormSave(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormCancel(): void;
+    /**
+     * Client-side scripting method that invokes the appointment editing form for the appointment being edited in the inplace editor.
+     */
+    InplaceEditFormShowMore(): void;
+    /**
+     * Client-side scripting method that closes the Reminder form.
+     */
+    ReminderFormCancel(): void;
+    /**
+     * Client-side scripting method that calls the Dismiss method for the selected reminder.
+     */
+    ReminderFormDismiss(): void;
+    /**
+     * Client-side scripting method that dismisses all reminders shown in the Reminder form.
+     */
+    ReminderFormDismissAll(): void;
+    /**
+     * Client-side scripting method that changes the alert time for the selected reminder to the specified interval.
+     */
+    ReminderFormSnooze(): void;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerViewType object.
+ */
+interface ASPxSchedulerViewType {
+    /**
+     * Gets a string representation equivalent of Day enumeration for use in client scripts.
+     * Value: A string "Day", indicating the DayView.
+     */
+    Day: string;
+    /**
+     * Gets a string representation equivalent of WorkWeek enumeration for use in client scripts.
+     * Value: A string "WorkWeek", indicating the WorkWeekView.
+     */
+    WorkWeek: string;
+    /**
+     * Gets a string representation equivalent of Week enumeration for use in client scripts.
+     * Value: A string "Week", indicating the WeekView.
+     */
+    Week: string;
+    /**
+     * Gets a string representation equivalent of Month enumeration for use in client scripts.
+     * Value: A string "Month", indicating the MonthView.
+     */
+    Month: string;
+    /**
+     * Gets a string representation equivalent of Timeline enumeration for use in client scripts.
+     * Value: A string "Timeline", indicating the TimelineView.
+     */
+    Timeline: string;
+    /**
+     * Gets a string representation equivalent of FullWeek enumeration for use in client scripts.
+     * Value: A string "FullWeek", indicating the FullWeekView.
+     */
+    FullWeek: string;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerGroupType enumeration.
+ */
+interface ASPxSchedulerGroupType {
+    /**
+     * Gets a string representation equivalent of None enumeration for use in client scripts.
+     * Value: A "None" string value.
+     */
+    None: string;
+    /**
+     * Gets a string representation equivalent of Date enumeration for use in client scripts.
+     * Value: A "Date" string value.
+     */
+    Date: string;
+    /**
+     * Gets a string representation equivalent of Resource enumeration for use in client scripts.
+     * Value: A "Resource" string value.
+     */
+    Resource: string;
+}
+/**
+ * Represents a client-side equivalent of the AppointmentType enumeration.
+ */
+interface ASPxAppointmentType {
+    /**
+     * Gets a string representation equivalent of Normal enumeration for use in client scripts.
+     * Value: A "Normal" string value.
+     */
+    Normal: string;
+    /**
+     * Gets a string representation equivalent of Pattern enumeration for use in client scripts.
+     * Value: A "Pattern" string value.
+     */
+    Pattern: string;
+    /**
+     * Gets a string representation equivalent of Occurrence enumeration for use in client scripts.
+     * Value: An "Occurrence" string value.
+     */
+    Occurrence: string;
+    /**
+     * Gets a string representation equivalent of ChangedOccurrence enumeration for use in client scripts.
+     * Value: A "ChangedOccurrence" string value.
+     */
+    ChangedOccurrence: string;
+    /**
+     * Gets a string representation equivalent of DeletedOccurrence enumeration for use in client scripts.
+     * Value: A "DeletedOccurrence" string value.
+     */
+    DeletedOccurrence: string;
+}
+interface ASPxClientAppointmentDeletingEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDeleting event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDeletingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDeleting event.
+ */
+interface ASPxClientAppointmentDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets client IDs of the appointments that are intended to be removed.
+     * Value: An array of client appointment identifiers, representing appointments passed for deletion.
+     */
+    appointmentIds: Object[];
+}
+interface AppointmentClickEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentClick event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A AppointmentClickEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentClickEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDoubleClick events.
+ */
+interface AppointmentClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the client appointment ID for the appointment being clicked.
+     * Value: A string, representing the client ID of the appointment.
+     */
+    appointmentId: string;
+    /**
+     * Gets the HTML element that the event was triggered on.
+     * Value: An object containing event data.
+     */
+    htmlElement: Object;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentsSelectionChanged event.
+     * @param source The ASPxScheduler control which fires the event.
+     * @param e A AppointmentsSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentsSelectionEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets identifiers of the selected appointments.
+     * Value: A comma separated list of string values, representing appointment IDs.
+     */
+    appointmentIds: string[];
+}
+/**
+ * A method that will handle the ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventHandler<S> {
+    /**
+     * A method that will handle the ActiveViewChanging event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e An ActiveViewChangingEventArgs object that contains event data
+     */
+    (source: S, e: ActiveViewChangingEventArgs): void;
+}
+/**
+ * Provides data for the client-side ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value of the ActiveView property before modification.
+     * Value: A SchedulerViewType enumeration.
+     */
+    oldView: ASPxSchedulerViewType;
+    /**
+     * Gets the new value of the ActiveView property.
+     * Value: A string, which is the SchedulerViewType enumeration value.
+     */
+    newView: ASPxSchedulerViewType;
+    /**
+     * Gets or sets whether the change of active view should be canceled.
+     * Value: true to cancel the operation; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the MoreButtonClicked event.
+ */
+interface MoreButtonClickedEventHandler<S> {
+    /**
+     * A method that will handle MoreButtonClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MoreButtonClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MoreButtonClickedEventArgs): void;
+}
+/**
+ * Provides data for the MoreButtonClicked client-side event.
+ */
+interface MoreButtonClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the Start or End values of the target appointment.
+     * Value: A DateTime value representing the target appointment's boundary.
+     */
+    targetDateTime: Date;
+    /**
+     * Gets the time interval of the cell where the button is located.
+     * Value: An ASPxClientTimeInterval object representing the time interval of the cell which holds the button.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the resource identifier associated with the cell where the button is located.
+     * Value: A string, corresponding to ResourceId.
+     */
+    resource: string;
+    /**
+     * Gets or sets whether an event is handled. If it is handled, default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the MenuItemClicked event.
+ */
+interface MenuItemClickedEventHandler<S> {
+    /**
+     * A method that will handle the MenuItemClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MenuItemClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MenuItemClickedEventArgs): void;
+}
+/**
+ * Provides data for the MenuItemClicked event.
+ */
+interface MenuItemClickedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the menu item which is clicked.
+     * Value: A string, containing the menu item name.
+     */
+    itemName: string;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+interface AppointmentDropEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDrop event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentDragEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDragEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrop event.
+ */
+interface ASPxClientAppointmentDragEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether default event processing is required.
+     * Value: true to process an event using only custom code; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Provides information about dragged appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dragged appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+interface AppointmentResizeEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentResize event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentResizeEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResize event.
+ */
+interface ASPxClientAppointmentResizeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether default event processing is required.
+     * Value: true to process an event using only custom code; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
+/**
+ * Stores information about an appointment drag operation.
+ */
+interface ASPxClientAppointmentDragInfo {
+    /**
+     * Gets the dragged appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources that were associated with the appointment before the drag operation.
+     * Value: A array of strings containing resource identifiers.
+     */
+    oldResources: string[];
+    /**
+     * Gets the appointment's interval after the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources associated with the appointment after the drag operation.
+     * Value: An array of strings containing resource identifiers.
+     */
+    newResources: string[];
+}
+/**
+ * Contains information about a client tooltip.
+ */
+interface ASPxClientSchedulerToolTipData {
+    /**
+     * Returns the client appointment for which the tooltip is displayed.
+     */
+    GetAppointment(): ASPxClientAppointment;
+    /**
+     * Returns the client time interval for which the tooltip is displayed.
+     */
+    GetInterval(): ASPxClientTimeInterval;
+    /**
+     * Returns the resources associated with the appointment for which the tooltip is displayed.
+     */
+    GetResources(): Object[];
+}
+/**
+ * A client-side equivalent of the ASPxSchedulerToolTipBase control.
+ */
+interface ASPxClientToolTipBase {
+    /**
+     * Returns the value that indicates whether or not the tooltip can be displayed.
+     */
+    CanShowToolTip(): boolean;
+    /**
+     * Ends updating the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    FinalizeUpdate(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Updates the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    Update(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Closes the tooltip.
+     */
+    Close(): void;
+    /**
+     * 
+     * @param bounds 
+     */
+    CalculatePosition(bounds: Object): ASPxClientPoint;
+    /**
+     * Displays the Appointment Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowAppointmentMenu(eventObject: Object): void;
+    /**
+     * Displays the View Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowViewMenu(eventObject: Object): void;
+    /**
+     * Returns the string representation of the specified interval.
+     * @param interval An ASPxClientTimeInterval object to convert.
+     */
+    ConvertIntervalToString(interval: ASPxClientTimeInterval): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpellChecker class.
+ */
+interface ASPxClientSpellChecker extends ASPxClientControl {
+    /**
+     * Client-side event that occurs before the spell check starts.
+     */
+    BeforeCheck: ASPxClientEvent<ASPxClientBeforeCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs before a message box informing about process completion is shown.
+     */
+    CheckCompleteFormShowing: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs when a spell check is finished.
+     */
+    AfterCheck: ASPxClientEvent<ASPxClientAfterCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Occurs after a word is changed in a checked text.
+     */
+    WordChanged: ASPxClientEvent<ASPxClientWordChangedEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Starts the spelling check of the text contained within the element specified by the CheckedElementID value.
+     */
+    Check(): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param element An object representing the element being checked.
+     */
+    CheckElement(element: Object): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param id A string representing the identifier of the element being checked.
+     */
+    CheckElementById(id: string): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerElement An object representing a control which contains elements being checked.
+     */
+    CheckElementsInContainer(containerElement: Object): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerId A string, specifying the control's identifier.
+     */
+    CheckElementsInContainerById(containerId: string): void;
+}
+/**
+ * Represents an object that will handle the client-side BeforeCheck event.
+ */
+interface ASPxClientBeforeCheckEventHandler<S> {
+    /**
+     * A method that will handle the BeforeCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerBeforeCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerBeforeCheckEventArgs): void;
+}
+/**
+ * Provides data for an event that occurs before a spelling check is started. Represents the client-side equivalent of the BeforeCheckEventArgs class.
+ */
+interface ASPxClientSpellCheckerBeforeCheckEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which is going to be checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+}
+/**
+ * Represents an object that will handle the client-side AfterCheck event.
+ */
+interface ASPxClientAfterCheckEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerAfterCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+/**
+ * Provides data for the client event that occurs after a spelling check is complete.
+ */
+interface ASPxClientSpellCheckerAfterCheckEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which has been checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+    /**
+     * Gets the text that has been checked.
+     * Value: A string, containing checked text.
+     */
+    checkedText: string;
+}
+/**
+ * Represents an object that will handle the client-side WordChanged event.
+ */
+interface ASPxClientWordChangedEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The event source.
+     * @param e An ASPxClientSpellCheckerAfterCheckEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+    item: ASPxClientRibbonItem;
+}
+/**
+ * A method that will handle the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventHandler<S> {
+    /**
+     * A method that will handle the DocumentChanged event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetDocumentChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetDocumentChangedEventArgs): void;
+}
+/**
+ * Provides data for the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventHandler<S> {
+    /**
+     * A method that will handle the EndSynchronization events.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetSynchronizationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSynchronizationEventArgs): void;
+}
+/**
+ * Provides data for the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e An ASPxClientSpreadsheetHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A client-side equivalent of the ASPxSpreadsheet object.
+ */
+interface ASPxClientSpreadsheet extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientSpreadsheet.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client when a selection is changed in the ASPxSpreadsheet.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientSpreadsheetSelectionChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientSpreadsheetCustomCommandExecutedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires if any change is made to the Spreadsheet's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientSpreadsheetDocumentChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a hyperlink is clicked within the Spreadsheet's document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientSpreadsheetHyperlinkClickEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Sets input focus to the Spreadsheet.
+     */
+    Focus(): void;
+    /**
+     * Gets access to the client ribbon object.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Enables you to switch the full-screen mode of the Spreadsheet.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Returns the current selection made in a Spreadsheet.
+     */
+    GetSelection(): ASPxClientSpreadsheetSelection;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Gets the value of the specified cell.
+     * @param colModelIndex An integer value specifying the cell's column index.
+     * @param rowModelIndex An integer value specifying the cell's row index.
+     */
+    GetCellValue(colModelIndex: number, rowModelIndex: number): Object;
+    /**
+     * Gets the value of the currently active cell.
+     */
+    GetActiveCellValue(): Object;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side DocumentCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side DocumentCallback event.
+     */
+    PerformDocumentCallback(parameter: string): void;
+    /**
+     * Reconnects the Spreadsheet to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientSpreadsheetSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object that determines the currently selected region within the Spreadsheet.
+     * Value: A <see cref="ASPxClientSpreadsheetSelection" /> object defining the current selection.
+     */
+    selection: ASPxClientSpreadsheetSelection;
+}
+/**
+ * Represents the selection in the Spreadsheet.
+ */
+interface ASPxClientSpreadsheetSelection {
+    /**
+     * Gets the column index of the active cell.
+     * Value: An integer value specifying the active cell column index.
+     */
+    activeCellColumnIndex: number;
+    /**
+     * Gets the row index of the active cell.
+     * Value: An integer value specifying the active cell row index.
+     */
+    activeCellRowIndex: number;
+    /**
+     * Gets the index of the selection's left column.
+     * Value: An integer value specifying the index of the left column within the selection.
+     */
+    leftColumnIndex: number;
+    /**
+     * Gets the index of the selection's top row.
+     * Value: An integer value specifying the index of the top row within the selection.
+     */
+    topRowIndex: number;
+    /**
+     * Gets the index of the selection's right column.
+     * Value: An integer value specifying the index of the right column within the selection.
+     */
+    rightColumnIndex: number;
+    /**
+     * Gets the index of the selection's bottom row.
+     * Value: An integer value specifying the index of the bottom row within the selection.
+     */
+    bottomRowIndex: number;
+}
+/**
+ * Represents the client ASPxTreeList.
+ */
+interface ASPxClientTreeList extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientTreeList.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to display a context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientTreeListContextMenuEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientTreeListCustomButtonEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before the focused node has been changed.
+     */
+    NodeFocusing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires in response to changing node focus.
+     */
+    FocusedNodeChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the selection has been changed via end-user interaction.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the callback has been processed in the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientTreeListCustomDataCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is double clicked.
+     */
+    NodeDblClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is expanded.
+     */
+    NodeExpanding: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is collapsed.
+     */
+    NodeCollapsing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs before a node is dragged by an end-user.
+     */
+    StartDragNode: ASPxClientEvent<ASPxClientTreeListStartDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a node drag and drop operation is completed.
+     */
+    EndDragNode: ASPxClientEvent<ASPxClientTreeListEndDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientTreeListColumnResizingEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientTreeListColumnResizedEventHandler<ASPxClientTreeList>>;
+    /**
+     * Sets input focus to the ASPxTreeList.
+     */
+    Focus(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Returns the focused node's key value.
+     */
+    GetFocusedNodeKey(): string;
+    /**
+     * Moves focus to the specified node.
+     * @param key A String value that uniquely identifies the node.
+     */
+    SetFocusedNodeKey(key: string): void;
+    /**
+     * Indicates whether the specified node is selected.
+     * @param nodeKey A String value that identifies the node by its key value.
+     */
+    IsNodeSelected(nodeKey: string): any;
+    /**
+     * Selects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    SelectNode(nodeKey: string): void;
+    /**
+     * Selects or deselects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     * @param state true to select the node; otherwise, false.
+     */
+    SelectNode(nodeKey: string, state: boolean): void;
+    /**
+     * Obtains key values of selected nodes that are displayed within the current page.
+     */
+    GetVisibleSelectedNodeKeys(): string[];
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param htmlElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(htmlElement: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCustomCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames A string value that contains the names of data source fields whose values within the specified node are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames The names of data source fields whose values within the specified node are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within visible nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within visible nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Selects the specified page.
+     * @param index An integer value that specifies the active page's index.
+     */
+    GoToPage(index: number): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the ASPxTreeList's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Returns the specified node's state.
+     * @param nodeKey A String value that identifies the node.
+     */
+    GetNodeState(nodeKey: string): string;
+    /**
+     * Expands all nodes.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all Node.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands the specified node preserving the collapsed state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    ExpandNode(key: string): void;
+    /**
+     * Collapses the specified node preserving the expanded state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    CollapseNode(key: string): void;
+    /**
+     * Obtains key values of nodes that are displayed within the current page.
+     */
+    GetVisibleNodeKeys(): string[];
+    /**
+     * Returns an HTML table row that represents the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    GetNodeHtmlElement(nodeKey: string): Object;
+    /**
+     * Returns the number of visible columns within the client ASPxTreeList.
+     */
+    GetVisibleColumnCount(): number;
+    /**
+     * Returns the number of columns within the client ASPxTreeList.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the column located at the specified position within the Columns collection.
+     * @param index An integer value that identifies the column within the collection (the column's Index property value).
+     */
+    GetColumnByIndex(index: number): ASPxClientTreeListColumn;
+    /**
+     * Returns the column with the specified name.
+     * @param name A string value that specifies the column's name (the column's Name property value).
+     */
+    GetColumnByName(name: string): ASPxClientTreeListColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param fieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByFieldName(fieldName: string): ASPxClientTreeListColumn;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     */
+    SortBy(nameOrFieldName: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientTreeListColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Switches the ASPxTreeList to edit mode.
+     * @param nodeKey A string value that identifies the node by its key value.
+     */
+    StartEdit(nodeKey: string): void;
+    /**
+     * Saves all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Indicates whether the ASPxTreeList is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Gets the key value of the node currently being edited.
+     */
+    GetEditingNodeKey(): string;
+    /**
+     * Moves the specified node to a new position.
+     * @param nodeKey A string value that identifies the target node by its key value.
+     * @param parentNodeKey A string value that identifies the node to whose child collection the target node is moved. An empty string to display the target node within the root.
+     */
+    MoveNode(nodeKey: string, parentNodeKey: string): void;
+    /**
+     * Deletes the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    DeleteNode(nodeKey: string): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new root node values to be edited.
+     */
+    StartEditNewNode(): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new node values to be edited.
+     * @param parentNodeKey A String value that identifies the parent node, which owns a new node.
+     */
+    StartEditNewNode(parentNodeKey: string): void;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditor(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that identifies the column by its position within the column collection.
+     */
+    GetEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditor(columnNameOrFieldName: string): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditValue(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     */
+    GetEditValue(columnIndex: number): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditValue(columnNameOrFieldName: string): Object;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientTreeListColumn, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnNameOrFieldName: string, value: Object): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param column A ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    FocusEditor(column: ASPxClientTreeListColumn): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnIndex An integer value that identifies the data column.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnNameOrFieldName A String value that specifies the column's name or field name.
+     */
+    FocusEditor(columnNameOrFieldName: string): void;
+    /**
+     * Scrolls the tree list so that the specified node becomes visible.
+     * @param nodeKey An integer value that specifies the node index within the tree list's client item list.
+     */
+    MakeNodeVisible(nodeKey: string): void;
+    /**
+     * Returns the current vertical scroll position of the tree list's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the tree list's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the tree list's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the tree list's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientTreeListColumn {
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A String value that specifies the name of a data field.
+     */
+    fieldName: string;
+}
+/**
+ * Provides data for the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the information that has been collected on the client-side and sent to the  server-side CustomDataCallback event.
+     * Value: A string value that represents the information that has been collected on the client-side and sent to the server-side CustomDataCallback event.
+     */
+    arg: string;
+    /**
+     * Gets the information passed from the server-side CustomDataCallback event.
+     * Value: An object that represents the information passed from the server-side CustomDataCallback event.
+     */
+    result: Object;
+}
+/**
+ * A method that will handle the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the CustomDataCallback event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomDataCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the NodeDblClick events.
+ */
+interface ASPxClientTreeListNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed node's key value.
+     * Value: A String value that identifies the processed node.
+     */
+    nodeKey: string;
+    /**
+     * Provides access to the parameters associated with the NodeDblClick events.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the NodeDblClick event.
+ */
+interface ASPxClientTreeListNodeEventHandler<S> {
+    /**
+     * A method that will handle the NodeDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListNodeEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Identifies which tree list element has been right-clicked.
+     * Value: A string value that identifies which tree list element ('Header' or 'Node') has been right-clicked.
+     */
+    objectType: string;
+    /**
+     * Gets a value that identifies the right-clicked object.
+     * Value: The right-clicked object's identifier.
+     */
+    objectKey: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that relates to the processed event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets whether to invoke the browser's context menu.
+     * Value: true to hide the browser's context menu; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event sender.
+     * @param e An ASPxClientTreeListContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets an array of targets where a node can be dragged.
+     * Value: An array of objects that represent targets for the dragged node.
+     */
+    targets: Object[];
+}
+/**
+ * A method that will handle the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the StartDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListStartDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListStartDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets the target element.
+     * Value: An object that represents the target element to which the dragged node has been dropped.
+     */
+    targetElement: Object;
+}
+/**
+ * A method that will handle the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the EndDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListEndDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListEndDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the key value of the node whose custom button has been clicked.
+     * Value: A string value that uniquely identifies the node whose custom button has been clicked.
+     */
+    nodeKey: string;
+    /**
+     * Gets the button's index.
+     * Value: An integer value that specifies the button's position within the CustomButtons collection.
+     */
+    buttonIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A String value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomButtonEventArgs): void;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+ */
+interface ASPxClientTreeListValuesCallback {
+    /**
+     * A JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * Provides data for the ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResizing event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResized event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizedEventArgs): void;
+}
+/**
+ * A client-side counterpart of the Calendar and CalendarFor extensions.
+ */
+interface MVCxClientCalendar extends ASPxClientCalendar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCalendar>>;
+}
+/**
+ * A client-side counterpart of the CallbackPanel extension.
+ */
+interface MVCxClientCallbackPanel extends ASPxClientCallbackPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCallbackPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the CardView extension.
+ */
+interface MVCxClientCardView extends ASPxClientCardView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCardView>>;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the CardView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the CardView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the Chart extension.
+ */
+interface MVCxClientChart extends ASPxClientWebChartControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientChart>>;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ComboBox and ComboBoxFor extensions.
+ */
+interface MVCxClientComboBox extends ASPxClientComboBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientComboBox>>;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the DataView extension.
+ */
+interface MVCxClientDataView extends ASPxClientDataView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDataView>>;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DateEdit extension.
+ */
+interface MVCxClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * A client-side counterpart of the DockManager extension.
+ */
+interface MVCxClientDockManager extends ASPxClientDockManager {
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DockPanel extension.
+ */
+interface MVCxClientDockPanel extends ASPxClientDockPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDockPanel>>;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the FileManager extension.
+ */
+interface MVCxClientFileManager extends ASPxClientFileManager {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientFileManager>>;
+    /**
+     * Sends a callback with a parameter to update the FileManager by processing the passed information on the server, in an Action specified via the extension's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the file manager's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param data A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the GridView extension.
+ */
+interface MVCxClientGridView extends ASPxClientGridView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientGridView>>;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the GridView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the GridView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the HtmlEditor extension.
+ */
+interface MVCxClientHtmlEditor extends ASPxClientHtmlEditor {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientHtmlEditor>>;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformDataCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback An ASPxClientDataCallback object that is the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(data: Object, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * A client-side counterpart of the ImageGallery extension.
+ */
+interface MVCxClientImageGallery extends ASPxClientImageGallery {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientImageGallery>>;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ListBox and ListBoxFor extensions.
+ */
+interface MVCxClientListBox extends ASPxClientListBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientListBox>>;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the NavBar extension.
+ */
+interface MVCxClientNavBar extends ASPxClientNavBar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientNavBar>>;
+}
+/**
+ * A client-side counterpart of the PivotGrid extension.
+ */
+interface MVCxClientPivotGrid extends ASPxClientPivotGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPivotGrid>>;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Passes PivotGrid callback parameters to the specified object.
+     * @param obj An object that receives PivotGrid callback parameters.
+     */
+    FillStateObject(obj: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PopupControl extension.
+ */
+interface MVCxClientPopupControl extends ASPxClientPopupControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPopupControl>>;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameters to update the popup window by processing the related popup window and the passed information on the server, in an Action specified by the PopupControl's CallbackRouteValues property.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, data: Object): void;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side equivalent of the MVCxDocumentViewer class.
+ */
+interface MVCxClientDocumentViewer extends ASPxClientDocumentViewer {
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientDocumentViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDocumentViewer>>;
+}
+/**
+ * Obsolete. Use the MVCxClientDocumentViewer class instead.
+ */
+interface MVCxClientReportViewer extends ASPxClientReportViewer {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportViewer>>;
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientReportViewer>>;
+}
+/**
+ * A method that will handle the BeforeExportRequest event.
+ */
+interface MVCxClientBeforeExportRequestEventHandler<S> {
+    /**
+     * A method that will handle the BeforeExportRequest event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeforeExportRequestEventArgs): void;
+}
+/**
+ * Provides data for client BeforeExportRequest events.
+ */
+interface MVCxClientBeforeExportRequestEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A client-side equivalent of the MVCxReportDesigner class.
+ */
+interface MVCxClientReportDesigner extends ASPxClientReportDesigner {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Occurs after executing the Save command on the client.
+     */
+    SaveCommandExecuted: ASPxClientEvent<MVCxClientReportDesignerSaveCommandExecutedEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A Object value, specifying the callback argument.
+     */
+    PerformCallback(arg: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecuted event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientReportDesignerSaveCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the operation result.
+     * Value: A String value, specifying the operation result.
+     */
+    Result: string;
+}
+/**
+ * A client-side counterpart of the RichEdit extension.
+ */
+interface MVCxClientRichEdit extends ASPxClientRichEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRichEdit>>;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the RoundPanel extension.
+ */
+interface MVCxClientRoundPanel extends ASPxClientRoundPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRoundPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the Scheduler extension.
+ */
+interface MVCxClientScheduler extends ASPxClientScheduler {
+    ToolTipDisplaying: ASPxClientEvent<MVCxClientSchedulerToolTipDisplayingEventHandler<MVCxClientScheduler>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientScheduler>>;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A template that is rendered to display a tooltip.
+ */
+interface MVCxClientSchedulerTemplateToolTip extends ASPxClientToolTipBase {
+    type: MVCxSchedulerToolTipType;
+}
+/**
+ * A delegate method that enables you to adjust the tooltip content before displaying.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: MVCxClientSchedulerToolTipDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ToolTipDisplaying event.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventArgs extends ASPxClientEventArgs {
+    toolTip: MVCxClientSchedulerTemplateToolTip;
+    data: ASPxClientSchedulerToolTipData;
+}
+/**
+ * Lists available tooltip types.
+ */
+interface MVCxSchedulerToolTipType {
+}
+/**
+ * A client-side counterpart of the Spreadsheet extension.
+ */
+interface MVCxClientSpreadsheet extends ASPxClientSpreadsheet {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientSpreadsheet>>;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PageControl extension.
+ */
+interface MVCxClientPageControl extends ASPxClientPageControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPageControl>>;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the TokenBox and TokenBoxFor extensions.
+ */
+interface MVCxClientTokenBox extends ASPxClientTokenBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTokenBox>>;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the TreeList extension.
+ */
+interface MVCxClientTreeList extends ASPxClientTreeList {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeList>>;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the TreeList's CustomDataCallback event. This method does not update the TreeList.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformCustomDataCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+}
+/**
+ * A client-side counterpart of the TreeView extension.
+ */
+interface MVCxClientTreeView extends ASPxClientTreeView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeView>>;
+}
+/**
+ * A client-side counterpart of the UploadControl extension.
+ */
+interface MVCxClientUploadControl extends ASPxClientUploadControl {
+}
+/**
+ * A method that will handle client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientGlobalBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventArgs extends ASPxClientGlobalBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * An ASP.NET MVC equivalent of the client ASPxClientGlobalEvents component.
+ */
+interface MVCxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress MVC extensions contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientGlobalBeginCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a DevExpress MVC extension.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<MVCxClientGlobalEvents>>;
+}
+/**
+ * A client-side counterpart of the VerticalGrid extension.
+ */
+interface MVCxClientVerticalGrid extends ASPxClientVerticalGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientVerticalGrid>>;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the VerticalGrid's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the VerticalGrid.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+}
+/**
+ * A client-side equivalent of the MVCxWebDocumentViewer class.
+ */
+interface MVCxClientWebDocumentViewer extends ASPxClientWebDocumentViewer {
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControlBase {
+    /**
+     * Gets the unique, hierarchically-qualified identifier for the control.
+     * Value: The fully-qualified identifier for the control.
+     */
+    name: string;
+    /**
+     * Occurs on the client side after the control has been initialized.
+     */
+    Init: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlBase>>;
+    /**
+     * Returns an HTML element that is the root of the control's hierarchy.
+     */
+    GetMainElement(): Object;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetClientVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible 
+     */
+    SetClientVisible(visible: boolean): void;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible true to make a control visible; false to make it hidden.
+     */
+    SetVisible(visible: boolean): void;
+    /**
+     * Returns a value that determines whether a callback request sent by a web control is being currently processed on the server side.
+     */
+    InCallback(): boolean;
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControl extends ASPxClientControlBase {
+    /**
+     * Returns the control's width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the control's height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the control's width.
+     * @param width An integer value that specifies the control's width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the control's height.   Note that this method is not in effect for some controls.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Modifies the control's size against the control's container.
+     */
+    AdjustControl(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallback control.
+ */
+interface ASPxClientCallback extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallback.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client side when a callback initiated by the client Callback event's handler returns back to the client.
+     */
+    CallbackComplete: ASPxClientEvent<ASPxClientCallbackCompleteEventHandler<ASPxClientCallback>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    SendCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the client events related to completion of callback server-side processing.
+ */
+interface ASPxClientCallbackCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client events related to completion of callback server-side processing.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCallbackCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackCompleteEventArgs): void;
+}
+/**
+ * Serves as the base class for arguments of the web controls' client-side events.
+ */
+interface ASPxClientEventArgs {
+}
+/**
+ * Provides data for events concerning the final processing of a callback.
+ */
+interface ASPxClientCallbackCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) passed from the client side for server-side processing.
+     * Value: A string value representing specific information passed from the client to the server side.
+     */
+    parameter: string;
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallbackPanel control.
+ */
+interface ASPxClientCallbackPanel extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallbackPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the control's loading panel.
+     */
+    GetLoadingPanelText(): string;
+    /**
+     * Sets the text to be displayed within the control's loading panel.
+     * @param loadingPanelText A string value specifying the text to be displayed within the loading panel.
+     */
+    SetLoadingPanelText(loadingPanelText: string): void;
+    /**
+     * Sets a value specifying whether the callback panel is enabled.
+     * @param enabled true, to enable the callback panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a callback panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents the event object used for client-side events.
+ */
+interface ASPxClientEvent<T> {
+    /**
+     * Dynamically connects the event with an appropriate event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    AddHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from the associated event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    RemoveHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from all the associated event handler functions.
+     */
+    ClearHandlers(): void;
+    /**
+     * For internal use only.
+     * @param source 
+     * @param e 
+     */
+    FireEvent(source: Object, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the client-side events of a web control's client-side equivalent.
+ */
+interface ASPxClientEventHandler<S> {
+    /**
+     * A method that will handle the client-side events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the control that raised the event.
+     * @param e An ASPxClientEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the cancelable events of a web control's client-side equivalent.
+ */
+interface ASPxClientCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCancelEventArgs): void;
+}
+/**
+ * Provides data for cancelable client events.
+ */
+interface ASPxClientCancelEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents a JavaScript function which receives callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+ */
+interface ASPxClientDataCallback {
+    /**
+     * A JavaScript function which receives a callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+     * @param sender An object whose client method generated a callback.
+     * @param result A string value that represents the result of server-side callback processing.
+     */
+    (sender: Object, result: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCloudControl control.
+ */
+interface ASPxClientCloudControl extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientCloudControlItemEventHandler<ASPxClientCloudControl>>;
+}
+/**
+ * A method that will handle client events involving manipulations with the control's items.
+ */
+interface ASPxClientCloudControlItemEventHandler<S> {
+    /**
+     * A method that will handle client events concerning manipulations with items.
+     * @param source The event source. This parameter identifies the cloud control object which raised the event.
+     * @param e An ASPxClientCloudControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCloudControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which involve clicking on the control's items.
+ */
+interface ASPxClientCloudControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the client events related to the begining of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the beginning of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command name that identifies which client action forced a callback to be occurred.
+     * Value: A string value that represents the name of the command which initiated a callback.
+     */
+    command: string;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle client EndCallback events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle the EndCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventArgs extends ASPxClientEndCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle a CustomCallback client event exposed by some DevExpress web controls.
+ */
+interface ASPxClientCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the client CustomCallback event of some controls.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientCustomDataCallbackEventHandler object that contains event data.
+     */
+    (source: S, e: ASPxClientCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the CustomCallback event.
+ */
+interface ASPxClientCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing, related to the CustomCallback event.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * A method that will handle client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle client CallbackError events.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientCallbackErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error message that describes the server error that occurred.
+     * Value: A string value that represents the error message.
+     */
+    message: string;
+    /**
+     * Gets or sets whether the event is handled and the default error handling actions are not required.
+     * Value: true if the error is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle the CallbackError event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventArgs extends ASPxClientCallbackErrorEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the ValidationCompleted client event.
+ */
+interface ASPxClientValidationCompletedEventHandler<S> {
+    /**
+     * A method that will handle the ValidationCompleted event.
+     * @param source An object representing the event source. Identifies the ASPxClientGlobalEvents object that raised the event.
+     * @param e An ASPxClientValidationCompletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationCompletedEventArgs): void;
+}
+/**
+ * Provides data for the ValidationCompleted client event that allows you to centrally validate user input within all DevExpress web controls to which validation is applied.
+ */
+interface ASPxClientValidationCompletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a container object that holds the validated control(s).
+     * Value: An object that represents a container of the validated control(s).
+     */
+    container: Object;
+    /**
+     * Gets the name of the validation group name to which validation has been applied.
+     * Value: A string value that represents the name of the validation group that has been validated.
+     */
+    validationGroup: string;
+    /**
+     * Gets a value that indicates whether validation has been applied to both visible and invisible controls.
+     * Value: true if validation has been applied to both visible and invisible controls; false if only visible controls have been validated.
+     */
+    invisibleControlsValidated: boolean;
+    /**
+     * Gets a value specifying whether the validation has been completed successfully.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the first control (either visible or invisible) that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first invalid control.
+     */
+    firstInvalidControl: ASPxClientControl;
+    /**
+     * Gets the first visible control that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first visible invalid control.
+     */
+    firstVisibleInvalidControl: ASPxClientControl;
+}
+/**
+ * A method that will handle the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client ControlsInitialized event.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientControlsInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientControlsInitializedEventArgs): void;
+}
+/**
+ * Provides data for the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value that specifies whether a callback is sent during a controls initialization.
+     * Value: true if a callback is sent; otherwise, false.
+     */
+    isCallback: boolean;
+}
+interface ASPxClientControlPredicate {
+    /**
+     * 
+     * @param control 
+     */
+    (control: Object): boolean;
+}
+interface ASPxClientControlAction {
+    /**
+     * 
+     * @param control 
+     */
+    (control: Object): void;
+}
+/**
+ * A collection object used on the client side to maintain particular client control objects
+ */
+interface ASPxClientControlCollection {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any DevExpress web control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Returns a collection item identified by its unique hierarchically-qualified identifier.
+     * @param name A string value representing the hierarchically-qualified identifier of the required control.
+     */
+    Get(name: Object): Object;
+    /**
+     * Returns a DevExpress client control object identified by its unique hierarchically-qualified identifier (either ClientInstanceName or ClientID property value).
+     * @param name A string value that is the hierarchically-qualified identifier of the required DevExpress control.
+     */
+    GetByName(name: string): Object;
+    /**
+     * Returns all controls in the collection that satisfy the specified predicate.
+     * @param predicate An ASPxClientControlPredicate object that is a predicate used to search for controls in the collection.
+     */
+    GetControlsByPredicate(predicate: ASPxClientControlPredicate): Object[];
+    /**
+     * Returns all controls of the specified type.
+     * @param type The object specifying the client control type.
+     */
+    GetControlsByType(type: Object): Object[];
+    /**
+     * Performs the specified action for each control in the collection.
+     * @param action An ASPxClientControlAction object specifying an action to perform.
+     */
+    ForEachControl(action: ASPxClientControlAction): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxDataView object.
+ */
+interface ASPxClientDataView extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDataView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDataView>>;
+    /**
+     * Activates the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page that is currently active.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the size of a single ASPxDataView's page.
+     */
+    GetPageSize(): number;
+    /**
+     * Sets the size of a single ASPxDataView's page.
+     * @param pageSize An integer value that specifies the page size.
+     */
+    SetPageSize(pageSize: number): void;
+    /**
+     * Gets the number of pages into which the ASPxDataView's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the first page.
+     */
+    FirstPage(): void;
+    /**
+     * Activates the last page.
+     */
+    LastPage(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
+interface ASPxClientDockingFilterPredicate {
+    /**
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param item An object to compare against the criteria defined within the method.
+     */
+    (item: Object): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockManager   object.
+ */
+interface ASPxClientDockManager extends ASPxClientControl {
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side before a panel is closed, and allows you to cancel the action.
+     */
+    PanelClosing: ASPxClientEvent<ASPxClientDockManagerCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel is closed.
+     */
+    PanelCloseUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel pops up.
+     */
+    PanelPopUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been invoked.
+     */
+    PanelShown: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been resized.
+     */
+    PanelResize: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns a zone specified by its unique identifier (zoneUID).
+     * @param zoneUID A string value specifying the unique identifier of the zone.
+     */
+    GetZoneByUID(zoneUID: string): ASPxClientDockZone;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels contained in a page.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+    /**
+     * Returns an array of zones contained in a page.
+     */
+    GetZones(): ASPxClientDockZone[];
+    /**
+     * Returns an array of zones that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a zone meets those criteria.
+     */
+    GetZones(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockZone[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle client-side events concerning manipulations with panels.
+ */
+interface ASPxClientDockManagerEventHandler<S> {
+    /**
+     * A method that will handle client-side events concerning manipulations with panels.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on panels.
+ */
+interface ASPxClientDockManagerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventHandler<S> {
+    /**
+     * A method that will handle the PanelClosing event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Serves as a base class for the ASPxClientPopupControl classes.
+ */
+interface ASPxClientPopupControlBase extends ASPxClientControl {
+    /**
+     * Occurs on the client side when window resizing initiates.
+     */
+    BeforeResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when window resizing completes.
+     */
+    AfterResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window closes or hides.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientPopupWindowCloseUpEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Enables you to cancel window closing on the client side.
+     */
+    Closing: ASPxClientEvent<ASPxClientPopupWindowCancelEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window is invoked.
+     */
+    PopUp: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a window has been resized.
+     */
+    Resize: ASPxClientEvent<ASPxClientPopupWindowResizeEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a control's window has been invoked.
+     */
+    Shown: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when the window pin state is changed.
+     */
+    PinnedChanged: ASPxClientEvent<ASPxClientPopupWindowPinnedChangedEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Modifies a control's window size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Brings the window to the front of the z-order.
+     */
+    BringToFront(): void;
+    /**
+     * Returns a value indicating whether the window is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Returns the HTML code that specifies the contents of the control's window.
+     */
+    GetContentHtml(): string;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrameWindow(): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's window.
+     */
+    GetContentUrl(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer by default.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Gets the width of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentWidth(): number;
+    /**
+     * Gets the height of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentHeight(): number;
+    /**
+     * Returns a value indicating whether the window is maximized.
+     */
+    GetMaximized(): boolean;
+    /**
+     * Returns a value indicating whether the window is pinned.
+     */
+    GetPinned(): boolean;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's window.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Sets a value indicating whether the window is collapsed.
+     * @param value true, to collapse the window; otherwise, false.
+     */
+    SetCollapsed(value: boolean): void;
+    /**
+     * Sets the HTML markup specifying the contents of the control's window.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets the URL to point to the web page that should be loaded into, and displayed within the control's window.
+     * @param url A string value specifying the URL to the web page displayed within the control's window.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer by default.
+     * @param value A string value that is the URL for the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's footer.
+     * @param value A string value that specifies a window's footer text.
+     */
+    SetFooterText(value: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's header.
+     * @param value A string value that specifies a window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Sets a value indicating whether the window is maximized.
+     * @param value true. to maximize the window; otherwise, false.
+     */
+    SetMaximized(value: boolean): void;
+    /**
+     * Sets a value indicating whether the window is pinned.
+     * @param value true, to pin the window; otherwise, false.
+     */
+    SetPinned(value: boolean): void;
+    /**
+     * Invokes the control's window.
+     */
+    Show(): void;
+    /**
+     * Invokes the control's window at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the control's window and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the control's window and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the control's window at the specified position.
+     * @param x A integer value specifying the x-coordinate of the window's display position.
+     * @param y A integer value specifying the y-coordinate of the window's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Closes the control's window.
+     */
+    Hide(): void;
+    /**
+     * Returns a value that specifies whether the control's window is displayed.
+     */
+    IsVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockPanel object.
+ */
+interface ASPxClientDockPanel extends ASPxClientPopupControlBase {
+    /**
+     * Gets or sets the unique identifier of a panel on a page.
+     * Value: A string that is the unique identifier of a panel.
+     */
+    panelUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Retrieves a zone that owns the current panel.
+     */
+    GetOwnerZone(): ASPxClientDockZone;
+    /**
+     * Docks the current panel in the specified zone.
+     * @param zone An ASPxClientDockZone object specifying the zone.
+     */
+    Dock(zone: ASPxClientDockZone): void;
+    /**
+     * Docks the current panel in a zone at the specified position.
+     * @param zone An ASPxClientDockZone object specifying the zone, where the panel is docked
+     * @param visibleIndex An integer value specifying the visible index position.
+     */
+    Dock(zone: ASPxClientDockZone, visibleIndex: number): void;
+    /**
+     * Undocks the current panel.
+     */
+    MakeFloat(): void;
+    /**
+     * Undocks the current panel and place it at the specified position.
+     * @param x An integer value that specifies the X-coordinate of the panel's display position.
+     * @param y An integer value that specifies the Y-coordinate of the panel's display position.
+     */
+    MakeFloat(x: number, y: number): void;
+    /**
+     * Gets or sets a value specifying the position of the current panel, amongst the visible panels within a zone.
+     */
+    GetVisibleIndex(): number;
+    /**
+     * Sets a value specifying the position of the current panel, amongst the visible panels in a zone.
+     * @param visibleIndex An integer value specifying the zero-based index of the panel amongst visible panels in the zone.
+     */
+    SetVisibleIndex(visibleIndex: number): void;
+    /**
+     * Returns a value indicating whether the panel is docked.
+     */
+    IsDocked(): boolean;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterFloat event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterFloat event.
+ */
+interface ASPxClientDockPanelProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A client-side equivalent of the ASPxDockZone object.
+ */
+interface ASPxClientDockZone extends ASPxClientControl {
+    /**
+     * Gets or sets the unique identifier of a zone on a page.
+     * Value: A string that is the unique identifier of a zone.
+     */
+    zoneUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockZoneCancelEventHandler<ASPxClientDockZone>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockZoneProcessingModeEventHandler<ASPxClientDockZone>>;
+    /**
+     * Returns a value that indicates the orientation in which panels are stacked in the current zone.
+     */
+    IsVertical(): boolean;
+    /**
+     * Gets a value that indicates whether the zone can enlarge its size.
+     */
+    GetAllowGrowing(): boolean;
+    /**
+     * Gets the number of panels contained in the zone.
+     */
+    GetPanelCount(): number;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns a panel specified by its visible index.
+     * @param visibleIndex An integer value specifying the panel's position among the visible panels within the current zone.
+     */
+    GetPanelByVisibleIndex(visibleIndex: number): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels docked in the current zone.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are docked in the current zone and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e A ASPxClientDockZoneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e An  ASPxClientDockZoneProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Represents the client-side equivalent of the ASPxFileManager control.
+ */
+interface ASPxClientFileManager extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFileManager.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the selected file has been changed.
+     */
+    SelectedFileChanged: ASPxClientEvent<ASPxClientFileManagerFileEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when an end-user opens a file by double-clicking it or pressing the Enter key.
+     */
+    SelectedFileOpened: ASPxClientEvent<ASPxClientFileManagerFileOpenedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the focused item has been changed.
+     */
+    FocusedItemChanged: ASPxClientEvent<ASPxClientFileManagerFocusedItemChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientFileManagerSelectionChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the current folder has been changed within a file manager.
+     */
+    CurrentFolderChanged: ASPxClientEvent<ASPxClientFileManagerCurrentFolderChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the folder is created, and allows you to cancel the action.
+     */
+    FolderCreating: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a folder has been created.
+     */
+    FolderCreated: ASPxClientEvent<ASPxClientFileManagerItemCreatedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is renamed and allows you to cancel the action.
+     */
+    ItemRenaming: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been renamed.
+     */
+    ItemRenamed: ASPxClientEvent<ASPxClientFileManagerItemRenamedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is deleted and allows you to cancel the action.
+     */
+    ItemDeleting: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been deleted.
+     */
+    ItemDeleted: ASPxClientEvent<ASPxClientFileManagerItemDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been deleted.
+     */
+    ItemsDeleted: ASPxClientEvent<ASPxClientFileManagerItemsDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is moved and allows you to cancel the action.
+     */
+    ItemMoving: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been moved.
+     */
+    ItemMoved: ASPxClientEvent<ASPxClientFileManagerItemMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been moved .
+     */
+    ItemsMoved: ASPxClientEvent<ASPxClientFileManagerItemsMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is copied and allows you to cancel the action.
+     */
+    ItemCopying: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager item has been copied.
+     */
+    ItemCopied: ASPxClientEvent<ASPxClientFileManagerItemCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been copied.
+     */
+    ItemsCopied: ASPxClientEvent<ASPxClientFileManagerItemsCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any error occurs while editing an item.
+     */
+    ErrorOccurred: ASPxClientEvent<ASPxClientFileManagerErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to display the alert with the result error description.
+     */
+    ErrorAlertDisplaying: ASPxClientEvent<ASPxClientFileManagerErrorAlertDisplayingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires when a custom item is clicked, allowing you to perform custom actions.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientFileManagerCustomCommandEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when the file manager updates the state of toolbar or context menu items.
+     */
+    ToolbarUpdating: ASPxClientEvent<ASPxClientFileManagerToolbarUpdatingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to highlight the search text, which is specified using the filter box, in templates.
+     */
+    HighlightItemTemplate: ASPxClientEvent<ASPxClientFileManagerHighlightItemTemplateEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file upload starts, and allows you to cancel the action.
+     */
+    FileUploading: ASPxClientEvent<ASPxClientFileManagerFileUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the selected items are uploaded and allows you to cancel the action.
+     */
+    FilesUploading: ASPxClientEvent<ASPxClientFileManagerFilesUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file has been uploaded.
+     */
+    FileUploaded: ASPxClientEvent<ASPxClientFileManagerFileUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after upload of all selected files has been completed.
+     */
+    FilesUploaded: ASPxClientEvent<ASPxClientFileManagerFilesUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file download starts, and allows you to cancel the action.
+     */
+    FileDownloading: ASPxClientEvent<ASPxClientFileManagerFileDownloadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Gets the name of the currently active file manager area.
+     */
+    GetActiveAreaName(): string;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     */
+    ExecuteCommand(commandName: string): boolean;
+    /**
+     * Returns the selected file within the ASPxFileManager control's file container.
+     */
+    GetSelectedFile(): ASPxClientFileManagerFile;
+    /**
+     * Returns an array of the file manager's selected items.
+     */
+    GetSelectedItems(): ASPxClientFileManagerFile[];
+    /**
+     * Returns a list of files that are loaded on the current page.
+     */
+    GetItems(): ASPxClientFileManagerFile[];
+    /**
+     * Sends a callback to the server and returns a list of files that are contained within the current folder.
+     * @param onCallback A  object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetAllItems(onCallback: ASPxClientFileManagerAllItemsCallback): void;
+    /**
+     * Returns a toolbar item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetToolbarItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Returns a context menu item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetContextMenuItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Gets the current folder's path.
+     */
+    GetCurrentFolderPath(): string;
+    /**
+     * Gets the current folder's path with the specified separator.
+     * @param separator A string value that specifies the separator between the folder's name within a path.
+     */
+    GetCurrentFolderPath(separator: string): string;
+    /**
+     * Gets the current folder's path with the specified settings.
+     * @param separator A string value that specifies the separator between the folder's name within the path.
+     * @param skipRootFolder true to skip the root folder; otherwise, false.
+     */
+    GetCurrentFolderPath(separator: string, skipRootFolder: boolean): string;
+    /**
+     * Sets the current folder's path.
+     * @param path A String value that is the relative path to the folder (without the root folder).
+     * @param onCallback A ASPxClientFileManagerCallback object that is the JavaScript function that receives the callback data as a parameter.
+     */
+    SetCurrentFolderPath(path: string, onCallback: ASPxClientFileManagerCallback): void;
+    /**
+     * Gets the current folder's ID.
+     */
+    GetCurrentFolderId(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which receives callback data obtained via a call to the client SetCurrentFolderPath method.
+ */
+interface ASPxClientFileManagerCallback {
+    /**
+     * A JavaScript function that receives callback data obtained via a call to the SetCurrentFolderPath method.
+     * @param result An object that contains a callback data.
+     */
+    (result: Object): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerItem object and serves as a base class for client file and folder objects.
+ */
+interface ASPxClientFileManagerItem {
+    /**
+     * Gets the name of the current item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the item's unique identifier.
+     * Value: A String value that specifies the item's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets a value that indicates if the current file manager item is a folder.
+     * Value: true if the current item is a folder or parent folder; false if the current item is a file.
+     */
+    isFolder: boolean;
+    /**
+     * Specifies whether the file manager item is selected.
+     * @param selected true, to select the item; otherwise, false.
+     */
+    SetSelected(selected: boolean): void;
+    /**
+     * Gets a value indicating whether the item is selected in the file manager.
+     */
+    IsSelected(): boolean;
+    /**
+     * Gets the current item's full name.
+     */
+    GetFullName(): string;
+    /**
+     * Gets the current item's full name with the specified separator.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     */
+    GetFullName(separator: string): string;
+    /**
+     * Gets the current item's full name with the specified settings.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     * @param skipRootFolder true, to skip the root folder; otherwise, false.
+     */
+    GetFullName(separator: string, skipRootFolder: boolean): string;
+}
+/**
+ * Represents the client-side equivalent of the FileManagerFile object.
+ */
+interface ASPxClientFileManagerFile extends ASPxClientFileManagerItem {
+    /**
+     * Downloads a file from a file manager.
+     */
+    Download(): void;
+}
+/**
+ * A client-side equivalent of the FileManagerFolder object.
+ */
+interface ASPxClientFileManagerFolder extends ASPxClientFileManagerItem {
+    /**
+     * Gets a value specifying whether an item is a parent folder.
+     * Value: true if an item is a parent folder; false if an item is a file or folder.
+     */
+    isParentFolder: boolean;
+}
+/**
+ * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+ */
+interface ASPxClientFileManagerAllItemsCallback {
+    /**
+     * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+     * @param items An array of ASPxClientFileManagerItem objects that are items contained in the current folder.
+     */
+    (items: ASPxClientFileManagerItem[]): void;
+}
+/**
+ * A method that will handle the client SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened events.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerFileEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a file related to the event.
+     * Value: An ASPxClientFileManagerFile object that represents a file currently being processed.
+     */
+    file: ASPxClientFileManagerFile;
+}
+/**
+ * A method that will handle the client SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened event.
+     * @param source The event source. This parameter identifies the file manager object which raised the event.
+     * @param e An ASPxClientFileManagerFileOpenedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileOpenedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * Serves as a base for classes that are used as arguments for events generated on the client side.
+ */
+interface ASPxClientFileManagerActionEventArgsBase extends ASPxClientEventArgs {
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+    /**
+     * Gets the name of the currently processed item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets a value specifying whether the current processed item is a folder.
+     * Value: true if the processed  item is a folder; false if the processed item is a file.
+     */
+    isFolder: boolean;
+}
+/**
+ * A method that will handle the client ItemRenaming events.
+ */
+interface ASPxClientFileManagerItemEditingEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenaming events.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemEditingEventArgs): void;
+}
+/**
+ * Provides data for the item editing event.
+ */
+interface ASPxClientFileManagerItemEditingEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenamed event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemRenamedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemRenamedEventArgs): void;
+}
+/**
+ * Provides data for the ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the previous name of the renamed item.
+     * Value: A  string value that specifies the item name.
+     */
+    oldName: string;
+}
+/**
+ * A method that will handle the client ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+}
+/**
+ * A method that will handle the client ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventHandler<S> {
+    /**
+     * A method that will handle the FolderCreated event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCreatedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCreatedEventArgs): void;
+}
+/**
+ * Provides data for the FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventHandler<S> {
+    /**
+     * A method that will handle the client ErrorOccurred event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorEventArgs): void;
+}
+/**
+ * Provides data for the ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the error description.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an event error message is sent to the ErrorAlertDisplaying event.
+     * Value: true to sent an error message; otherwise, false.
+     */
+    showAlert: boolean;
+    /**
+     * Gets a specifically generated code that uniquely identifies an error, which occurs while editing an item.
+     * Value: An integer value that specifies the code uniquely identifying an error.
+     */
+    errorCode: number;
+}
+/**
+ * A method that will handle the client ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventHandler<S> {
+    /**
+     * A method that will handle the ErrorAlertDisplaying event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerErrorAlertDisplayingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorAlertDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the errors description.
+     * Value: A string that is the errors description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an alert message is displayed when the event fires.
+     * Value: true to display an alert message; otherwise, false.
+     */
+    showAlert: boolean;
+}
+/**
+ * A method that will handle the client FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FileUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is being uploaded.
+     * Value: A string value specifying the path where a file is being uploaded.
+     */
+    folder: string;
+    /**
+     * Gets the name of a file selected for upload.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are being uploaded.
+     * Value: A string value specifying the folder path.
+     */
+    folder: string;
+    /**
+     * Gets the names of files selected for upload.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FileUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is uploaded.
+     * Value: A string value specifying the uploaded file path.
+     */
+    folder: string;
+    /**
+     * Gets the name of the uploaded file.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+}
+/**
+ * A method that will handle the client FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are uploaded.
+     * Value: A string value specifying the uploaded files path.
+     */
+    folder: string;
+    /**
+     * Gets an array of uploaded file names.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+}
+/**
+ * A method that will handle the client FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventHandler<S> {
+    /**
+     * A method that will handle the FileDownloading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileDownloadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileDownloadingEventArgs): void;
+}
+/**
+ * Provides data for the FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventHandler<S> {
+    /**
+     * A method that will handle the FocusedItemChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFocusedItemChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFocusedItemChangedEventArgs): void;
+}
+/**
+ * Provides data for the FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the focused item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventHandler<S> {
+    /**
+     * A method that will handle the CurrentFolderChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerCurrentFolderChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCurrentFolderChangedEventArgs): void;
+}
+/**
+ * Provides data for the CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently processed folder.
+     * Value: A string value that specifies the folder's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the folder currently being processed.
+     * Value: A string value that is the folder's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the currently processed file.
+     * Value: A string value that specifies the file's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the file currently being processed.
+     * Value: A string value that is the file's full name.
+     */
+    fullName: string;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the file has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * A method that will handle the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommand event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerCustomCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCustomCommandEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+}
+/**
+ * A method that will handle the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarUpdating event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerToolbarUpdatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerToolbarUpdatingEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently active file manager area.
+     * Value: A string value that identifies the active area.
+     */
+    activeAreaName: string;
+}
+/**
+ * A method that will handle the client HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventHandler<S> {
+    /**
+     * A method that will handle the HighlightItemTemplate event.
+     * @param source The event source. This parameter identifies the file manager object that raised the event.
+     * @param e An ASPxClientFileManagerHighlightItemTemplateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerHighlightItemTemplateEventArgs): void;
+}
+/**
+ * Provides data for the HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that is a filter value specified by the filter box.
+     * Value: A string that is a filter value.
+     */
+    filterValue: string;
+    /**
+     * Gets the name of the item currently being processed.
+     * Value: A string that is the item name.
+     */
+    itemName: string;
+    /**
+     * Gets an element containing the item template.
+     * Value: An object that is an element containing the item template.
+     */
+    templateElement: string;
+    /**
+     * Get the name of the cascading style sheet (CSS) class associated with an item in the highlighted state.
+     * Value: A string that is the name of a CSS class.
+     */
+    highlightCssClassName: string;
+}
+/**
+ * Represents a client-side equivalent of the menu's MenuItem object.
+ */
+interface ASPxClientMenuItem {
+    /**
+     * Gets the menu object to which the current item belongs.
+     * Value: An ASPxClientMenuBase object representing the menu to which the item belongs.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * Gets the immediate parent item to which the current item belongs.
+     * Value: An ASPxClientMenuItem object representing the item's immediate parent.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * Gets the item's index within the parent's collection of items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the parent object (a menu or item) to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the menu item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * For internal use only.
+     */
+    indexPath: string;
+    /**
+     * Returns the number of the current menu item's immediate child items.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the current menu item's immediate subitem specified by its index.
+     * @param index An integer value specifying the zero-based index of the submenu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns the current menu item's subitem specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Indicates whether the menu item is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Specifies whether the menu item is checked.
+     * @param value true if the menu item is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value specifying whether a menu item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the menu item is enabled.
+     * @param value true to enable the menu item; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the menu item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the menu item.
+     * @param value A string value specifying the URL to the image displayed within the menu item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets a URL which defines the navigation location for the menu item.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the menu item.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the menu item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the menu item.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the menu item.
+     * @param value A string value specifying the text to be displayed within the menu item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a menu item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the menu item's visibility.
+     * @param value true if the menu item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerToolbarItemBase object.
+ */
+interface ASPxClientFileManagerToolbarItem extends ASPxClientMenuItem {
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    index: number;
+}
+/**
+ * A client-side equivalent of the ASPxFormLayout's LayoutItem object.
+ */
+interface ASPxClientLayoutItem {
+    /**
+     * Gets the form layout object to which the current item belongs.
+     * Value: An <see cref="ASPxClientFormLayout" /> object representing the form layout to which the item belongs.
+     */
+    formLayout: ASPxClientFormLayout;
+    /**
+     * Gets the name that uniquely identifies the layout item.
+     * Value: A string value that represents the value assigned to the layout item's Name property.
+     */
+    name: string;
+    /**
+     * Gets the immediate parent layout item to which the current layout item belongs.
+     * Value: An <see cref="ASPxClientLayoutItem" /> object representing the item's immediate parent.
+     */
+    parent: ASPxClientLayoutItem;
+    /**
+     * Returns the current layout item's subitem specified by its name.
+     * @param name A string value specifying the name of the layout item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+    /**
+     * Returns a value specifying whether a layout item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the layout item's visibility.
+     * @param value true, if the layout item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Specifies the text displayed in the layout item caption.
+     * @param caption A string value specifying the item caption.
+     */
+    SetCaption(caption: string): void;
+    /**
+     * Returns the text displayed in the layout item caption.
+     */
+    GetCaption(): string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxFormLayout object.
+ */
+interface ASPxClientFormLayout extends ASPxClientControl {
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+}
+/**
+ * Represents a client-side equivalent of the ASPxGlobalEvents component.
+ */
+interface ASPxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any of DevExpress web controls.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientGlobalEvents>>;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHiddenField control.
+ */
+interface ASPxClientHiddenField extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHiddenField.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the value of the specified property.
+     */
+    Add(propertyName: string, propertyValue: Object): void;
+    /**
+     * Returns the value with the specified property name.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Get(propertyName: string): Object;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the property value.
+     */
+    Set(propertyName: string, propertyValue: Object): void;
+    /**
+     * Removes the specified value from the ASPxHiddenField collection.
+     * @param propertyName A string value representing the property name.
+     */
+    Remove(propertyName: string): void;
+    /**
+     * Clears the ASPxHiddenField's value collection.
+     */
+    Clear(): void;
+    /**
+     * Returns a value indicating whether the value with the specified property name is contained within the ASPxHiddenField control's value collection.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Contains(propertyName: string): boolean;
+}
+/**
+ * The client-side equivalent of the ASPxImageGallery control.
+ */
+interface ASPxClientImageGallery extends ASPxClientDataView {
+    /**
+     * Fires on the client side before the fullscreen viewer is shown and allows you to cancel the action.
+     */
+    FullscreenViewerShowing: ASPxClientEvent<ASPxClientImageGalleryCancelEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Occurs on the client side after an active item has been changed within the fullscreen viewer.
+     */
+    FullscreenViewerActiveItemIndexChanged: ASPxClientEvent<ASPxClientImageGalleryFullscreenViewerEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Shows the fullscreen viewer with the specified active item.
+     * @param index An Int32 value that is an index of the active item.
+     */
+    ShowFullscreenViewer(index: number): void;
+    /**
+     * Hides the fullscreen viewer.
+     */
+    HideFullscreenViewer(): void;
+    /**
+     * Makes the specified item active within the fullscreen viewer on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetFullscreenViewerActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetFullscreenViewerItemCount(): number;
+    /**
+     * Returns the index of the active item within the fullscreen viewer.
+     */
+    GetFullscreenViewerActiveItemIndex(): number;
+    /**
+     * Plays a slide show within a fullscreen viewer.
+     */
+    PlaySlideShow(): void;
+    /**
+     * Pauses a slide show within a fullscreen viewer.
+     */
+    PauseSlideShow(): void;
+}
+/**
+ * A method that will handle the client FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerShowing event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryCancelEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the client FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerActiveItemIndexChanged event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryFullscreenViewerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryFullscreenViewerEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A client-side equivalent of the ASPxImageSlider object.
+ */
+interface ASPxClientImageSlider extends ASPxClientControl {
+    /**
+     * Occurs after the active image, displayed within the image area, is changed.
+     */
+    ActiveItemChanged: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Fires after an image item has been clicked within the image area.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Occurs on the client side when a thumbnail is clicked.
+     */
+    ThumbnailItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Returns an item specified by its index within the image slider's item collection.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientImageSliderItem;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientImageSliderItem;
+    /**
+     * Returns the index of the active item within the image slider control.
+     */
+    GetActiveItemIndex(): number;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Returns the active item within the ASPxImageSlider control.
+     */
+    GetActiveItem(): ASPxClientImageSliderItem;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param item An ASPxClientImageSliderItem object specifying the item to select.
+     * @param preventAnimation true to prevent animation effect; false to enable animation.
+     */
+    SetActiveItem(item: ASPxClientImageSliderItem, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Sets input focus to the ASPxImageSlider control.
+     */
+    Focus(): void;
+    /**
+     * Plays a slide show within an image slider.
+     */
+    Play(): void;
+    /**
+     * Pauses a slide show within image slider.
+     */
+    Pause(): void;
+    /**
+     * Gets a value indicating whether the slide show is playing.
+     */
+    IsSlideShowPlaying(): boolean;
+}
+/**
+ * A method that will handle the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventHandler<S> {
+    /**
+     * A method that will handle the ItemClick events.
+     * @param source The event source. Identifies the ASPxImageSlider control that raised the event.
+     * @param e An ASPxClientImageSliderItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageSliderItemEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientImageSliderItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientImageSliderItem;
+}
+/**
+ * A client-side equivalent of the image slider's ImageSliderItem object.
+ */
+interface ASPxClientImageSliderItem {
+    /**
+     * Gets an image slider to which the current item belongs.
+     * Value: An <see cref="ASPxClientImageSlider" /> object that is the item's owner.
+     */
+    imageSlider: ASPxClientImageSlider;
+    /**
+     * Gets the item's index within an items collection.
+     * Value: An integer value is the item's zero-based index within the Items collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the image slider item.
+     * Value: A string value that is the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Gets or sets the path to the image displayed within the ASPxClientImageSliderItem.
+     * Value: A <see cref="String" /> value specifying the path to the image.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that is the item's display text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxImageZoomNavigator object.
+ */
+interface ASPxClientImageZoomNavigator extends ASPxClientImageSlider {
+}
+/**
+ * A client-side equivalent of the ASPxImageZoom object.
+ */
+interface ASPxClientImageZoom extends ASPxClientControl {
+    /**
+     * Sets the properties on an image displayed in the image zoom control.
+     * @param imageUrl A string value specifying the path to the preview image displayed in the preview image.
+     * @param largeImageUrl A string value specifying the path to the preview image displayed in the zoom window and the expand window.
+     * @param zoomWindowText A string value specifying the text displayed in the zoom window.
+     * @param expandWindowText A string value specifying the text displayed in the expand window.
+     * @param alternateText A string value that specifies the alternate text displayed instead of the image.
+     */
+    SetImageProperties(imageUrl: string, largeImageUrl: string, zoomWindowText: string, expandWindowText: string, alternateText: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxLoadingPanel control.
+ */
+interface ASPxClientLoadingPanel extends ASPxClientControl {
+    /**
+     * Invokes the loading panel.
+     */
+    Show(): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified HTML element.
+     * @param htmlElement An object that specifies the required HTML element.
+     */
+    ShowInElement(htmlElement: Object): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified element.
+     * @param id A string that specifies the required element's identifier.
+     */
+    ShowInElementByID(id: string): void;
+    /**
+     * Invokes the loading panel at the specified position.
+     * @param x An integer value specifying the x-coordinate of the loading panel's display position.
+     * @param y An integer value specifying the y-coordinate of the loaidng panel's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Sets the text to be displayed within the ASPxLoadingPanel.
+     * @param text A string value specifying the text to be displayed within the ASPxLoadingPanel.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the text displayed within the ASPxLoadingPanel.
+     */
+    GetText(): string;
+    /**
+     * Hides the loading panel.
+     */
+    Hide(): void;
+}
+/**
+ * Serves as the base type for the ASPxClientPopupMenu objects.
+ */
+interface ASPxClientMenuBase extends ASPxClientControl {
+    /**
+     * Fires after a menu item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientMenuItemClickEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a menu item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a menu item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu pops up.
+     */
+    PopUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu closes.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Returns the number of menu items at the root menu level.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the menu's root menu item specified by its index.
+     * @param index An integer value specifying the zero-based index of the root menu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns a menu item specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Returns the selected item within the menu control.
+     */
+    GetSelectedItem(): ASPxClientMenuItem;
+    /**
+     * Selects the specified menu item within a menu control on the client side.
+     * @param item An ASPxClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: ASPxClientMenuItem): void;
+    /**
+     * Returns a root menu item.
+     */
+    GetRootItem(): ASPxClientMenuItem;
+}
+/**
+ * Represents a client collection that maintains client menu objects.
+ */
+interface ASPxClientMenuCollection extends ASPxClientControlCollection {
+    /**
+     * Recalculates the position of visible sub menus.
+     */
+    RecalculateAll(): void;
+    /**
+     * Hides all menus maitained by the collection.
+     */
+    HideAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxMenu object.
+ */
+interface ASPxClientMenu extends ASPxClientMenuBase {
+    /**
+     * Gets a value specifying the menu orientation.
+     */
+    GetOrientation(): string;
+    /**
+     * Sets the menu orientation.
+     * @param orientation 'Vertical' to orient the menu vertically; 'Horizontal' to orient the menu horizontally.
+     */
+    SetOrientation(orientation: string): void;
+}
+/**
+ * A method that will handle the menu's client events concerning manipulations with an item.
+ */
+interface ASPxClientMenuItemEventHandler<S> {
+    /**
+     * A method that will handle the menu's client events concerning manipulations with an item.
+     * @param source The event source. This parameter identifies the menu object which raised the event.
+     * @param e An ASPxClientMenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on menu items.
+ */
+interface ASPxClientMenuItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+}
+/**
+ * A method that will handle client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemMouseEventArgs): void;
+}
+/**
+ * Provides data for client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventArgs extends ASPxClientMenuItemEventArgs {
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An HTML object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's items.
+ */
+interface ASPxClientMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle client ItemClick events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's items.
+ */
+interface ASPxClientMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Contains options affecting the touch scrolling functionality.
+ */
+interface ASPxClientTouchUIOptions {
+    /**
+     * Gets or sets a value that specifies whether or not the horizontal scroll bar should be displayed.
+     * Value: true to display the horizontal scroll bar; otherwise, false. The default value is true.
+     */
+    showHorizontalScrollbar: boolean;
+    /**
+     * Gets or sets a value that specifies whether or not the vertical scroll bar should be displayed.
+     * Value: true to display the vertical scroll bar; otherwise, false. The default value is true.
+     */
+    showVerticalScrollbar: boolean;
+    /**
+     * Gets or sets the name of the CSS class defining the vertical scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    vScrollClassName: string;
+    /**
+     * Gets or sets the name of the CSS class defining the horizontal scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    hScrollClassName: string;
+}
+/**
+ * Contains a method allowing you to apply the current scroll extender to a specific element.
+ */
+interface ScrollExtender {
+    /**
+     * Applies the current scroll extender to the element specified by the ID.
+     * @param id A string value specifying the element's ID.
+     */
+    ChangeElement(id: string): void;
+    /**
+     * Applies the current scroll extender to the specified DOM element.
+     * @param element An object specifying the required DOM element.
+     */
+    ChangeElement(element: Object): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNavBar control.
+ */
+interface ASPxClientNavBar extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientNavBarItemEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side after a group's expansion state has been changed.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientNavBarGroupEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side before the expansion state of a group is changed.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientNavBarGroupCancelEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires when a group header is clicked.
+     */
+    HeaderClick: ASPxClientEvent<ASPxClientNavBarGroupClickEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientNavBar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientNavBar>>;
+    /**
+     * Returns the number of groups in the navbar.
+     */
+    GetGroupCount(): number;
+    /**
+     * Returns a group specified by its index.
+     * @param index An integer value specifying the zero-based index of the group object to retrieve.
+     */
+    GetGroup(index: number): ASPxClientNavBarGroup;
+    /**
+     * Returns a group specified by its name.
+     * @param name A string value specifying the name of the group.
+     */
+    GetGroupByName(name: string): ASPxClientNavBarGroup;
+    /**
+     * Returns the navbar's active group.
+     */
+    GetActiveGroup(): ASPxClientNavBarGroup;
+    /**
+     * Makes the specified group active.
+     * @param group A ASPxClientNavBarGroup object that specifies the active group.
+     */
+    SetActiveGroup(group: ASPxClientNavBarGroup): void;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+    /**
+     * Returns the selected item within the navbar control.
+     */
+    GetSelectedItem(): ASPxClientNavBarItem;
+    /**
+     * Selects the specified item within the navbar control on the client side.
+     * @param item An ASPxClientNavBarItem object specifying the item to select.
+     */
+    SetSelectedItem(item: ASPxClientNavBarItem): void;
+    /**
+     * Collapses all groups of the navbar.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all groups of the navbar.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarGroup object.
+ */
+interface ASPxClientNavBarGroup {
+    /**
+     * Gets the navbar to which the current group belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the group belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group's index within a collection of a navbar's groups.
+     * Value: An integer value representing the group's zero-based index within the Groups collection of the navbar to which the group belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the group.
+     * Value: A string value that represents the value assigned to the group's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a group is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether the group is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets the group's expansion state.
+     * @param value true to expand the group; false to collapse the group.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value specifying whether a group is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Returns text displayed within a group.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within a group.
+     * @param text A string value that is the text displayed within the navbar group.
+     */
+    SetText(text: string): void;
+    /**
+     * Specifies whether the group is visible.
+     * @param value true if the group is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Returns the number of items in the group.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the group's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientNavBarItem;
+    /**
+     * Returns a group item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarItem object.
+ */
+interface ASPxClientNavBarItem {
+    /**
+     * Gets the navbar to which the current item belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the item belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group to which the current item belongs.
+     * Value: An ASPxClientNavBarGroup object representing the group to which the item belongs.
+     */
+    group: ASPxClientNavBarGroup;
+    /**
+     * Gets the item's index within a collection of a group's items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the group to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value indicating whether an item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the item is enabled.
+     * @param value true if the item is enabled; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL which points to the image displayed within the item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the item.
+     * @param value A string value that specifies the URL to the image displayed within the item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the item's navigation location.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the item's navigation location.
+     * @param value A string value which represents the URL to where the client web browser will navigate when the item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the item.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the item.
+     * @param value A string value that represents the text displayed within the item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether an item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the item is visible.
+     * @param value true is the item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with an item.
+ */
+interface ASPxClientNavBarItemEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on items.
+ */
+interface ASPxClientNavBarItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the item object related to the event.
+     * Value: An ASPxClientNavBarItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientNavBarItem;
+    /**
+     * Gets the HTML object that contains the processed navbar item.
+     * Value: An object representing a container for the navbar item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object, manipulations on which forced the event to be raised.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupCancelEventHandler<S> {
+    /**
+     * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object representing the group manipulations on which forced the navbar to raise the event.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning clicks on groups.
+     * @param source The event source. This parameter identifies the navbar object which raised the event.
+     * @param e An ASPxClientNavBarGroupClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventArgs extends ASPxClientNavBarGroupCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed group.
+     * Value: An object representing a container for the group related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNewsControl object.
+ */
+interface ASPxClientNewsControl extends ASPxClientDataView {
+    /**
+     * Fires after an item's tail has been clicked.
+     */
+    TailClick: ASPxClientEvent<ASPxClientNewsControlItemEventHandler<ASPxClientNewsControl>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientNewsControlItemEventHandler<S> {
+    /**
+     * A method that will handle the news control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the news control object that raised the event.
+     * @param e An ASPxClientNewsControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNewsControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern tail clicking within the control's items.
+ */
+interface ASPxClientNewsControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxObjectContainer control.
+ */
+interface ASPxClientObjectContainer extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the FSCommand action is called within the associated flash object's action script.
+     */
+    FlashScriptCommand: ASPxClientEvent<ASPxClientFlashScriptCommandEventHandler<ASPxClientObjectContainer>>;
+    /**
+     * Play the Flash movie backwards.
+     */
+    Back(): void;
+    /**
+     * Returns the value of the Flash variable specified.
+     * @param name A string value that specifies the Flash variable.
+     */
+    GetVariable(name: string): string;
+    /**
+     * Play the Flash movie forwards.
+     */
+    Forward(): void;
+    /**
+     * Activates the specified frame in the Flash movie.
+     * @param frameNumber An integer value that specifies the requested frame.
+     */
+    GotoFrame(frameNumber: number): void;
+    /**
+     * Indicates whether the Flash movie is currently playing.
+     */
+    IsPlaying(): boolean;
+    /**
+     * Loads the Flash movie to the specified layer.
+     * @param layerNumber An integer value that identifies a layer in which to load the movie.
+     * @param url A string value that specifies the movie's URL.
+     */
+    LoadMovie(layerNumber: number, url: string): void;
+    /**
+     * Pans a zoomed-in Flash movie to the specified coordinates.
+     * @param x An integer value that specifies the X-coordinate.
+     * @param y An integer value that specifies the Y-coordinate.
+     * @param mode 0 the coordinates are pixels; 1 the coordinates are a percentage of the window.
+     */
+    Pan(x: number, y: number, mode: number): void;
+    /**
+     * Returns the percent of the Flash Player movie that has streamed into the browser so far.
+     */
+    PercentLoaded(): string;
+    /**
+     * Starts playing the Flash movie.
+     */
+    Play(): void;
+    /**
+     * Rewinds the Flash movie to the first frame.
+     */
+    Rewind(): void;
+    /**
+     * Sets the value of the specified Flash variable.
+     * @param name A string value that specifies the Flash variable.
+     * @param value A string value that represents a new value.
+     */
+    SetVariable(name: string, value: string): void;
+    /**
+     * Zooms in on the specified rectangular area of the Flash movie.
+     * @param left An integer value that specifies the x-coordinate of the rectangle's left side, in twips.
+     * @param top An integer value that specifies the y-coordinate of the rectangle's top side, in twips.
+     * @param right An integer value that specifies the x-coordinate of the rectangle's right side, in twips.
+     * @param bottom An integer value that specifies the y-coordinate of the rectangle's bottom side, in twips.
+     */
+    SetZoomRect(left: number, top: number, right: number, bottom: number): void;
+    /**
+     * Stops playing the Flash movie.
+     */
+    StopPlay(): void;
+    /**
+     * Returns the total number of frames in the Flash movie.
+     */
+    TotalFrames(): number;
+    /**
+     * Zooms the Flash view by a relative scale factor.
+     * @param percent An integer value that specifies the relative scale factor, as a  percentage.
+     */
+    Zoom(percent: number): void;
+    /**
+     * Starts playing a Quick Time movie.
+     */
+    QTPlay(): void;
+    /**
+     * Stops playing a Quick Time movie.
+     */
+    QTStopPlay(): void;
+    /**
+     * Rewinds a Quick Time movie to the first frame.
+     */
+    QTRewind(): void;
+    /**
+     * Steps through a Quick Time video stream by a specified number of frames.
+     * @param count An integer value that specifies the number of frames to step.
+     */
+    QTStep(count: number): void;
+}
+/**
+ * A method that will handle the FlashScriptCommand event.
+ */
+interface ASPxClientFlashScriptCommandEventHandler<S> {
+    /**
+     * A method that will handle the FlashScriptCommand event.
+     * @param source The event source.
+     * @param e A ASPxClientFlashScriptCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFlashScriptCommandEventArgs): void;
+}
+/**
+ * Provides data for the FlashScriptCommand client event.
+ */
+interface ASPxClientFlashScriptCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's command parameter.
+     */
+    command: string;
+    /**
+     * Gets arguments passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's args parameter.
+     */
+    args: string;
+}
+/**
+ * Lists the available link types within office documents.
+ */
+interface ASPxClientOfficeDocumentLinkType {
+}
+/**
+ * Serves as the base class for controls that implement panel functionality.
+ */
+interface ASPxClientPanelBase extends ASPxClientControl {
+    /**
+     * Returns the HTML code that is the content of the panel.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML content for the panel.
+     * @param html A string value that is the HTML code defining the content of the panel.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the panel is enabled.
+     * @param enabled true to enable the panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxPanel control.
+ */
+interface ASPxClientPanel extends ASPxClientPanelBase {
+    /**
+     * Occurs when the expanded panel is closed.
+     */
+    Collapsed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Occurs when an end-user opens the expand panel.
+     */
+    Expanded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Expands or collapses the client panel.
+     */
+    Toggle(): void;
+    /**
+     * Returns a value specifying whether the panel can be expanded.
+     */
+    IsExpandable(): boolean;
+    /**
+     * Returns a value specifying whether the panel is expanded.
+     */
+    IsExpanded(): boolean;
+    /**
+     * Expands the collapsed panel.
+     */
+    Expand(): void;
+    /**
+     * Collapses the expanded panel.
+     */
+    Collapse(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupControl control.
+ */
+interface ASPxClientPopupControl extends ASPxClientPopupControlBase {
+    /**
+     * Occurs when a popup window's close button is clicked.
+     */
+    CloseButtonClick: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControl>>;
+    /**
+     * This method is not in effect for a ASPxClientPopupControl object.
+     */
+    GetMainElement(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked a default popup window.
+     */
+    GetPopUpReasonMouseEvent(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked the specified popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowPopUpReasonMouseEvent(window: ASPxClientPopupWindow): Object;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Specifies the default popup window's size.
+     * @param width An integer value that specifies the default popup window's width.
+     * @param height An integer value that specifies the default popup window's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Gets the width of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Gets the height of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the height of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the width of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Specifies the size of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param width An integer value that specifies the required popup window's width.
+     * @param height An integer value that specifies the required popup window's height.
+     */
+    SetWindowSize(window: ASPxClientPopupWindow, width: number, height: number): void;
+    /**
+     * Returns the HTML code that is the content of the popup control's default popup window.
+     */
+    GetContentHTML(): string;
+    /**
+     * Defines the HTML content for the popup control's default popup window.
+     * @param html A string value that is the HTML code defining the content of the popup window.
+     */
+    SetContentHTML(html: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control's window is associated.
+     * @param window An ASPxClientPopupWindow object representing a popup control's window.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup control's window is associated.
+     */
+    SetWindowPopupElementID(window: ASPxClientPopupWindow, popupElementId: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element to which the popup control is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the default window within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an index of the object that invoked the specified popup window, within the window's PopupElementID list.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElementIndex(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns an object that invoked the default window.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Returns an object that invoked the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElement(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns a value that specifies whether the popup control's specific window is displayed.
+     * @param window A ASPxClientPopupWindow object representing the popup window whose visibility is checked.
+     */
+    IsWindowVisible(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Returns a popup window specified by its index.
+     * @param index An integer value specifying the zero-based index of the popup window object to be retrieved.
+     */
+    GetWindow(index: number): ASPxClientPopupWindow;
+    /**
+     * Returns a popup window specified by its name.
+     * @param name A string value specifying the name of the popup window.
+     */
+    GetWindowByName(name: string): ASPxClientPopupWindow;
+    /**
+     * Returns the number of popup windows in the popup control.
+     */
+    GetWindowCount(): number;
+    /**
+     * Invokes the popup control's specific window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     */
+    ShowWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Invokes the specified popup window at the popup element with the specified index.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element within the window's PopupElementID list.
+     */
+    ShowWindow(window: ASPxClientPopupWindow, popupElementIndex: number): void;
+    /**
+     * Invokes the popup control's specific window and displays it over the specified HTML element.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param htmlElement An object specifying the HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Invokes the popup control's specific window and displays it over an HTML element specified by its unique identifier.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElementByID(window: ASPxClientPopupWindow, id: string): void;
+    /**
+     * Invokes the popup control's specific popup window at the specified position.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param x A integer value specifying the x-coordinate of the popup window's display position.
+     * @param y A integer value specifying the y-coordinate of the popup window's display position.
+     */
+    ShowWindowAtPos(window: ASPxClientPopupWindow, x: number, y: number): void;
+    /**
+     * Brings the specified popup window to the front of the z-order.
+     * @param window A ASPxClientPopupWindow object representing the popup window.
+     */
+    BringWindowToFront(window: ASPxClientPopupWindow): void;
+    /**
+     * Closes the popup control's specified window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to close.
+     */
+    HideWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Returns the HTML code that represents the contents of the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHtml(window: ASPxClientPopupWindow): string;
+    /**
+     * Defines the HTML content for a specific popup window within the popup control.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param html A string value that represents the HTML code defining the content of the specified popup window.
+     */
+    SetWindowContentHtml(window: ASPxClientPopupWindow, html: string): void;
+    /**
+     * Returns an iframe object containing a web page specified via the specified popup window's SetWindowContentUrl client method).
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentIFrame(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentUrl(window: ASPxClientPopupWindow): string;
+    /**
+     * Sets the URL pointing to the web page that should be loaded into and displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param url A string value specifying the URL to the web page to be displayed within the specified popup window.
+     */
+    SetWindowContentUrl(window: ASPxClientPopupWindow, url: string): void;
+    /**
+     * Returns a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowPinned(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to pin the window; otherwise, false.
+     */
+    SetWindowPinned(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowMaximized(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to maximize the window; otherwise, false.
+     */
+    SetWindowMaximized(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowCollapsed(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to collapse the window; otherwise, false.
+     */
+    SetWindowCollapsed(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    RefreshWindowContentUrl(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     */
+    UpdatePosition(): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at the specified HTML element.
+     * @param htmlElement An object specifying the HTML element to which the default popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdatePositionAtElement(htmlElement: Object): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    UpdateWindowPosition(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at the specified HTML element.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param htmlElement An object specifying the HTML element to which the specified popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdateWindowPositionAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Refreshes the connection between the ASPxPopupControl and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+}
+/**
+ * Represents a client-side equivalent of a popup control's PopupWindow object.
+ */
+interface ASPxClientPopupWindow {
+    /**
+     * Gets the popup control to which the current popup window belongs.
+     * Value: An ASPxClientPopupControl object representing the popup control to which the window belongs.
+     */
+    popupControl: ASPxClientPopupControl;
+    /**
+     * Gets the index of the current popup window within the popup control's Windows collection.
+     * Value: An integer value representing the zero-based index of the current popup window within the Windows collection of the popup control to which the window belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current popup window.
+     * Value: A string value that represents a value assigned to the popup window's Name property.
+     */
+    name: string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer.
+     * @param value A string value that is the URL to the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Returns the text displayed within the window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed within the window's header.
+     * @param value A string value that specifies the window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Returns the text displayed within the popup window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Specifies the text displayed within the window's footer.
+     * @param value A string value that specifies the window's footer text.
+     */
+    SetFooterText(value: string): void;
+}
+/**
+ * A method that will handle the popup control's client events invoked in response to manipulating a popup window.
+ */
+interface ASPxClientPopupWindowEventHandler<S> {
+    /**
+     * A method that will handle the popup control's client events when a popup window is manipulated.
+     * @param source An object representing the event's source. Identifies the popup control object (ASPxClientPopupControl) that raised the event.
+     * @param e An ASPxClientPopupWindowEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowEventArgs): void;
+}
+/**
+ * Provides data for events concerning client manipulations on popup windows.
+ */
+interface ASPxClientPopupWindowEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+}
+/**
+ * A method that will handle the popup window's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventHandler<S> {
+    /**
+     * A method that will handle the popup window's cancelable client events.
+     * @param source An object representing the event's source. Identifies the popup window object that raised the event.
+     * @param e An ASPxClientPopupWindowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCancelEventArgs): void;
+}
+/**
+ * Provides data for the popup control's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+    /**
+     * Gets the value that identifies the reason the popup window is about to close.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventHandler<S> {
+    /**
+     * A method that will handle the CloseUp event.
+     * @param source The event source.
+     * @param e An ASPxClientPopupWindowCloseUpEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCloseUpEventArgs): void;
+}
+/**
+ * Provides data for the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets the value that identifies the reason the popup window closes.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventHandler<S> {
+    /**
+     * A method that will handle the Resize event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowResizeEventArgs): void;
+}
+/**
+ * Provides data for the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Returns the value indicating the window state after resizing.
+     * Value: The integer value indicating the window resize state.
+     */
+    resizeState: number;
+}
+/**
+ * A method that will handle the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventHandler<S> {
+    /**
+     * A method that will handle the PinnedChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowPinnedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowPinnedChangedEventArgs): void;
+}
+/**
+ * Provides data for the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets a value indicating whether the processed popup window has been pinned.
+     * Value: true, if the window has been pinned; otherwise, false.
+     */
+    pinned: boolean;
+}
+/**
+ * Represents a client collection that maintains client popup control objects.
+ */
+interface ASPxClientPopupControlCollection extends ASPxClientControlCollection {
+    /**
+     * Hides all popup windows maintained by the collection.
+     */
+    HideAllWindows(): void;
+}
+/**
+ * Declares client constants that identify the reason the popup window closes.
+ */
+interface ASPxClientPopupControlCloseReason {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupMenu object.
+ */
+interface ASPxClientPopupMenu extends ASPxClientMenuBase {
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup menu is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup menu is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the popup menu within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an object that invoked the popup menu.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Refreshes the connection between the ASPxPopupMenu and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+    /**
+     * Hides the popup menu.
+     */
+    Hide(): void;
+    /**
+     * Invokes the popup menu.
+     */
+    Show(): void;
+    /**
+     * Invokes the popup menu at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the popup menu and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the popup menu and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the popup menu at the specified position.
+     * @param x An integer value specifying the x-coordinate of the popup menu's display position.
+     * @param y An integer value specifying the y-coordinate of the popup menu's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRatingControl control.
+ */
+interface ASPxClientRatingControl extends ASPxClientControl {
+    /**
+     * Fires on the server after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientRatingControlItemClickEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a rating control item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a rating control item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Gets the item tooltip title specified by the item index.
+     * @param index An integer value specifying the item index.
+     */
+    GetTitle(index: number): string;
+    /**
+     * Returns a value indicating whether the control's status is read-only.
+     */
+    GetReadOnly(): boolean;
+    /**
+     * Specifies whether the control's status is read-only.
+     * @param value true to make the control read-only; otherwise, false.
+     */
+    SetReadOnly(value: boolean): void;
+    /**
+     * Returns the value of the ASPxRatingControl.
+     */
+    GetValue(): number;
+    /**
+     * Modifies the value of the ASPxRatingControl on the client side.
+     * @param value A decimal value representing the value of the control.
+     */
+    SetValue(value: number): void;
+}
+/**
+ * A method that will handle the client ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventHandler<S> {
+    /**
+     * A method that will handle the client ItemClick event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientRatingControlItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the clicked item's index.
+     */
+    index: number;
+}
+/**
+ * A method that will handle the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source The event source.
+     * @param e An ASPxClientRatingControlItemMouseEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemMouseEventArgs): void;
+}
+/**
+ * Provides data for the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the related item's index.
+     */
+    index: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRibbon control.
+ */
+interface ASPxClientRibbon extends ASPxClientControl {
+    /**
+     * Occurs after an end-user executes an action on a ribbon item.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientRibbonCommandExecutedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a ribbon control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientRibbonTabEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs on the client side when the ribbon minimization state is changed by end-user actions.
+     */
+    MinimizationStateChanged: ASPxClientEvent<ASPxClientRibbonMinimizationStateEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs when the file tab is clicked.
+     */
+    FileTabClicked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after a dialog box launcher has been clicked.
+     */
+    DialogBoxLauncherClicked: ASPxClientEvent<ASPxClientRibbonDialogBoxLauncherClickedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires after key tips are closed by pressing Esc.
+     */
+    KeyTipsClosedOnEscape: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Specifies whether the ribbon control is enabled.
+     * @param enabled true to enable the ribbon; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the ribbon is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientRibbonTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientRibbonTab;
+    /**
+     * Returns the number of tabs in the ribbon Tabs collection.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns the active tab within the ribbon control.
+     */
+    GetActiveTab(): ASPxClientRibbonTab;
+    /**
+     * Makes the specified tab active in the ribbon control on the client side.
+     * @param tab A ASPxClientRibbonTab object specifying the tab selection.
+     */
+    SetActiveTab(tab: ASPxClientRibbonTab): void;
+    /**
+     * Makes a tab active within the ribbon control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns a ribbon item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientRibbonItem;
+    /**
+     * Returns a value of item with the specified name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemValueByName(name: string): Object;
+    /**
+     * Sets the value of the item with the specified name.
+     * @param name A string value specifying the name of the item.
+     * @param value An object that is the new item value.
+     */
+    SetItemValueByName(name: string, value: Object): void;
+    /**
+     * Specifies whether the ribbon is minimized.
+     * @param minimized true to set the ribbon state to minimized; false to set the ribbon state to normal.
+     */
+    SetMinimized(minimized: boolean): void;
+    /**
+     * Gets a value specifying whether the ribbon is minimized.
+     */
+    GetMinimized(): boolean;
+    /**
+     * Specifies the visibility of a context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param visible true to make a category visible; false to make it hidden.
+     */
+    SetContextTabCategoryVisible(categoryName: string, visible: boolean): void;
+    /**
+     * Shows ribbon key tips.
+     */
+    ShowKeyTips(): void;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonTab object.
+ */
+interface ASPxClientRibbonTab {
+    /**
+     * Gets the client ribbon object to which the current tab belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the tab belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets or sets the tab's index within the collection.
+     * Value: An integer value that is the zero-based index of the tab within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon tab.
+     * Value: A string value that is the tab's name.
+     */
+    name: string;
+    /**
+     * Returns the text displayed in the tab.
+     */
+    GetText(): string;
+    /**
+     * Sets a value specifying whether the tab is enabled.
+     * @param enabled true to enable the tab; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether a ribbon tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether a ribbon tab is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonGroup object.
+ */
+interface ASPxClientRibbonGroup {
+    /**
+     * Gets the client ribbon object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the group belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets the client tab object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object to which the group belongs.
+     */
+    tab: ASPxClientRibbonTab;
+    /**
+     * Gets or sets the group's index within the collection.
+     * Value: An integer value that is the zero-based index of the group within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon group.
+     * Value: A string value that is the group's name.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a ribbon group is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonItemBase object.
+ */
+interface ASPxClientRibbonItem {
+    /**
+     * Gets the client group object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the item belongs.
+     */
+    group: ASPxClientRibbonGroup;
+    /**
+     * Gets or sets the item's index within the collection.
+     * Value: An integer value that is the zero-based index of the item within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the client ribbon object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the item belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Returns a value indicating whether a ribbon item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the item is enabled.
+     * @param enabled true to enable the item; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns the item value.
+     */
+    GetValue(): Object;
+    /**
+     * Sets the item value.
+     * @param value An  that specifies the item value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value specifying whether a ribbon item is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A method that will handle the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CommandExecuted event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientRibbonItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientRibbonItem;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventHandler<S> {
+    /**
+     * A method that will handle the ActiveTabChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e A ASPxClientRibbonTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object that is the tab, manipulations on which forced the ribbon control to raise the event.
+     */
+    tab: ASPxClientRibbonTab;
+}
+/**
+ * A method that will handle the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventHandler<S> {
+    /**
+     * A method that will handle the MinimizationStateChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonMinimizationStateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonMinimizationStateEventArgs): void;
+}
+/**
+ * Provides data for the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the value indicating the new ribbon state.
+     * Value: The integer value indicating the ribbon minimization state.
+     */
+    ribbonState: number;
+}
+/**
+ * A method that will handle the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventHandler<S> {
+    /**
+     * A method that will handle the DialogBoxLauncherClicked event.
+     * @param source The event source. This parameter identifies the ribbon object which raised the event.
+     * @param e An ASPxClientRibbonDialogBoxLauncherClickedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonDialogBoxLauncherClickedEventArgs): void;
+}
+/**
+ * Provides data for the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the client group object to which the clicked dialog box launcher belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the dialog box launcher belongs.
+     */
+    group: ASPxClientRibbonGroup;
+}
+/**
+ * Represents a client-side equivalent of the ASPxRoundPanel control.
+ */
+interface ASPxClientRoundPanel extends ASPxClientPanelBase {
+    /**
+     * Fires on the client side after a panel has been expanded or collapsed via end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client side before a panel is expanded or collapsed by end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanging: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientRoundPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the panel's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed in the panel's header.
+     * @param text A string value that specifies the panel header's text.
+     */
+    SetHeaderText(text: string): void;
+    /**
+     * Returns a value indicating whether the panel is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Sets a value indicating whether the panel is collapsed.
+     * @param collapsed true, to collapse the panel; otherwise, false.
+     */
+    SetCollapsed(collapsed: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxSplitter object.
+ */
+interface ASPxClientSplitter extends ASPxClientControl {
+    /**
+     * Fires before a pane is resized.
+     */
+    PaneResizing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been resized.
+     */
+    PaneResized: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is collapsed.
+     */
+    PaneCollapsing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been collapsed.
+     */
+    PaneCollapsed: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is expanded.
+     */
+    PaneExpanding: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been expanded.
+     */
+    PaneExpanded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Occurs when a pane resize operation has been completed.
+     */
+    PaneResizeCompleted: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a specific web page has been loaded into a pane.
+     */
+    PaneContentUrlLoaded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Returns the number of panes at the root level of a splitter.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the splitter's root pane specified by its index within the Panes collection.
+     * @param index An integer value specifying the zero-based index of the root pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns a pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Specifies whether the control's panes can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Returns a string value that represents the client state of splitter panes.
+     */
+    GetLayoutData(): string;
+}
+/**
+ * Represents a client-side equivalent of the splitter's SplitterPane object.
+ */
+interface ASPxClientSplitterPane {
+    /**
+     * Gets the index of the current pane within the pane collection to which it belongs.
+     * Value: An integer value representing the zero-based index of the current pane within the SplitterPaneCollection collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current splitter pane.
+     * Value: A string value that represents the value assigned to the pane's Name property.
+     */
+    name: string;
+    /**
+     * Returns a client splitter object that contains the current pane.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Returns the immediate parent of the current pane.
+     */
+    GetParentPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the previous sibling pane of the current pane.
+     */
+    GetPrevPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the next sibling pane of the current pane.
+     */
+    GetNextPane(): ASPxClientSplitterPane;
+    /**
+     * Determines whether the current pane is the first pane within the SplitterPaneCollection.
+     */
+    IsFirstPane(): boolean;
+    /**
+     * Determines whether the current pane is the last pane within the SplitterPaneCollection.
+     */
+    IsLastPane(): boolean;
+    /**
+     * Returns a value that indicates the orientation in which the current pane and its sibling panes are stacked.
+     */
+    IsVertical(): boolean;
+    /**
+     * Returns the number of the current pane's immediate child panes.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the current pane's immediate child pane specified by its index.
+     * @param index An integer value specifying the zero-based index of the child pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns the current pane's child pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Gets the width of the pane's content area.
+     */
+    GetClientWidth(): number;
+    /**
+     * Gets the height of the pane's content area.
+     */
+    GetClientHeight(): number;
+    /**
+     * Collapses the current pane and occupies its space by maximizing the specified pane.
+     * @param maximizedPane A ASPxClientSplitterPane object specifying the pane to be maximized to occupy the freed space.
+     */
+    Collapse(maximizedPane: ASPxClientSplitterPane): boolean;
+    /**
+     * Collapses the current pane in a forward direction and occupies its space by maximizing the previous adjacent pane.
+     */
+    CollapseForward(): boolean;
+    /**
+     * Collapses the current pane in a backward direction, and occupies its space by maximizing the next adjacent pane.
+     */
+    CollapseBackward(): boolean;
+    /**
+     * Expands the current pane object on the client side.
+     */
+    Expand(): boolean;
+    /**
+     * Returns whether the pane is collapsed.
+     */
+    IsCollapsed(): boolean;
+    /**
+     * Returns whether the pane's content is loaded from an external web page.
+     */
+    IsContentUrlPane(): boolean;
+    /**
+     * Gets the URL of a web page displayed as a pane's content.
+     */
+    GetContentUrl(): string;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane, but should not be cached by a client browser.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     * @param preventBrowserCaching true to prevent the browser to cache the loaded content; false to allow browser caching.
+     */
+    SetContentUrl(url: string, preventBrowserCaching: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the current pane.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Returns an iframe object containing a web page specified via the pane's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Specifies whether the current pane can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Forces the client PaneResized event to be generated.
+     */
+    RaiseResizedEvent(): void;
+    /**
+     * Returns an HTML element representing a splitter pane object.
+     */
+    GetElement(): Object;
+    /**
+     * Specifies the splitter pane's size in pixels.
+     * @param size An integer value that specifies the splitter pane's size.
+     */
+    SetSize(size: number): void;
+    /**
+     * Specifies the splitter pane's size, in pixels or percents.
+     * @param size A string value that specifies the splitter pane's size, in pixels or percents.
+     */
+    SetSize(size: string): void;
+    /**
+     * Returns the splitter pane's size, in pixels or percents.
+     */
+    GetSize(): string;
+    /**
+     * Returns the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     */
+    GetScrollTop(): number;
+    /**
+     * Specifies the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollTop(value: number): void;
+    /**
+     * Returns the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     */
+    GetScrollLeft(): number;
+    /**
+     * Specifies the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollLeft(value: number): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventHandler<S> {
+    /**
+     * A method that will handle the splitter's client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter object that raised the event.
+     * @param e An ASPxClientSplitterPaneEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneEventArgs): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the pane object related to the event.
+     * Value: An ASPxClientSplitterPane object, manipulations on which forced the event to be raised.
+     */
+    pane: ASPxClientSplitterPane;
+}
+/**
+ * A method that will handle a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventHandler<S> {
+    /**
+     * A method that will handle a splitter control's cancelable client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter control object that raised the event.
+     * @param e An ASPxClientSplitterPaneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneCancelEventArgs): void;
+}
+/**
+ * Provides data for a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventArgs extends ASPxClientSplitterPaneEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents a base for the ASPxClientPageControl objects.
+ */
+interface ASPxClientTabControlBase extends ASPxClientControl {
+    /**
+     * Fires when a tab is clicked.
+     */
+    TabClick: ASPxClientEvent<ASPxClientTabControlTabClickEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a tab control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientTabControlTabEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side before the active tab is changed within a tab control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientTabControlTabCancelEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a client tab control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Modifies a tab page's size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Returns the active tab within the tab control.
+     */
+    GetActiveTab(): ASPxClientTab;
+    /**
+     * Makes the specified tab active within the tab control on the client side.
+     * @param tab An ASPxClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: ASPxClientTab): void;
+    /**
+     * Returns the index of the active tab within the tab control.
+     */
+    GetActiveTabIndex(): number;
+    /**
+     * Makes a tab active within the tab control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns the number of tabs in the ASPxTabControl.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientTab;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTabControl object.
+ */
+interface ASPxClientTabControl extends ASPxClientTabControlBase {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPageControl object.
+ */
+interface ASPxClientPageControl extends ASPxClientTabControlBase {
+    /**
+     * Returns the HTML code that represents the contents of the specified page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required page.
+     */
+    GetTabContentHTML(tab: ASPxClientTab): string;
+    /**
+     * Defines the HTML content for a specific tab page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required tab page.
+     * @param html A string value that represents the HTML code defining the content of the specified page.
+     */
+    SetTabContentHTML(tab: ASPxClientTab, html: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents a client-side equivalent of a tab control's TabPage object.
+ */
+interface ASPxClientTab {
+    /**
+     * Gets the tab control to which the current tab belongs.
+     * Value: An ASPxClientTabControlBase object representing the control to which the tab belongs.
+     */
+    tabControl: ASPxClientTabControlBase;
+    /**
+     * Gets the index of the current tab (tabbed page) within the control's collection of tabs (tabbed pages).
+     * Value: An integer value representing the zero-based index of the current tab (tabbed page) within the TabPages) collection of the control to which the tab belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current tab.
+     * Value: A string value that represents the value assigned to the tab's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the tab is enabled.
+     * @param value true to enable the tab; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the tab.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the tab.
+     * @param value A string value that is the URL to the image displayed within the tab.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the active tab.
+     */
+    GetActiveImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the active tab.
+     * @param value A string value that is the URL to the image displayed within the active tab.
+     */
+    SetActiveImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the tab.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the tab.
+     * @param value A string value which is a URL to where the client web browser will navigate when the tab is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the tab.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the tab.
+     * @param value A string value that is the text displayed within the tab.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a tab is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the tab is visible.
+     * @param value true is the tab is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle a tab control's client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabEventHandler<S> {
+    /**
+     * A method that will handle a tab control's client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object, manipulations on which forced the event to be raised.
+     */
+    tab: ASPxClientTab;
+}
+/**
+ * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabCancelEventHandler<S> {
+    /**
+     * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object representing the tab manipulations on which forced the tab control to raise the event.
+     */
+    tab: ASPxClientTab;
+    /**
+     * Gets or sets a value specifying whether a callback should be sent to the server to reload the content of the page being activated.
+     * Value: true to reload the page's content; otherwise, false.
+     */
+    reloadContentOnCallback: boolean;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventHandler<S> {
+    /**
+     * A method that will handle client events concerning clicks on tabs.
+     * @param source The event source. This parameter identifies the tab control object which raised the event.
+     * @param e An ASPxClientTabControlTabClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventArgs extends ASPxClientTabControlTabCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed tab.
+     * Value: An object representing a container for the tab related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTimer object.
+ */
+interface ASPxClientTimer extends ASPxClientControl {
+    /**
+     * Fires on the client side when the specified timer interval has elapsed, and the timer is enabled.
+     */
+    Tick: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimer>>;
+    /**
+     * Returns a value indicating whether the timer is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Enables the timer.
+     * @param enabled true to turn the timer on; false, to turn the timer off.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Gets the time before the Tick event.
+     */
+    GetInterval(): number;
+    /**
+     * Specifies the time before the Tick event.
+     * @param interval An integer value that specifies the number of milliseconds before the Tick event is raised relative to the last occurrence of the Tick event. The value cannot be less than one.
+     */
+    SetInterval(interval: number): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTitleIndex object.
+ */
+interface ASPxClientTitleIndex extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientTitleIndexItemEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTitleIndex.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTitleIndex>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientTitleIndexItemEventHandler<S> {
+    /**
+     * A method that will handle the title index control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the title index control object that raised the event.
+     * @param e An ASPxClientTitleIndexItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTitleIndexItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on the control's items.
+ */
+interface ASPxClientTitleIndexItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView object.
+ */
+interface ASPxClientTreeView extends ASPxClientControl {
+    /**
+     * Fires on the client side after a node has been clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeViewNodeClickEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side after a node's expansion state has been changed by end-user interaction.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientTreeViewNodeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side before the expansion state of a node is changed via end-user interaction.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientTreeViewNodeCancelEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side when the node's checked state is changed by clicking on a check box.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientTreeViewNodeProcessingModeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTreeView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeView>>;
+    /**
+     * Returns a node specified by its index within the ASPxTreeView's node collection.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the number of nodes at the ASPxTreeView's zero level.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the selected node within the ASPxTreeView control on the client side.
+     */
+    GetSelectedNode(): ASPxClientTreeViewNode;
+    /**
+     * Selects the specified node within the ASPxTreeView control on the client side.
+     * @param node An ASPxClientTreeViewNode object specifying the node to select.
+     */
+    SetSelectedNode(node: ASPxClientTreeViewNode): void;
+    /**
+     * Gets the root node of the ASPxTreeView object.
+     */
+    GetRootNode(): ASPxClientTreeViewNode;
+    /**
+     * Collapses all nodes in the ASPxTreeView on the client side.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all nodes in the ASPxTreeView on the client side.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView's TreeViewNode object.
+ */
+interface ASPxClientTreeViewNode {
+    /**
+     * Gets the client representation of the ASPxTreeView control to which the current node belongs.
+     * Value: An ASPxClientTreeView object representing the control to which the node belongs.
+     */
+    treeView: ASPxClientTreeView;
+    /**
+     * Gets the current node's parent node.
+     * Value: An ASPxClientTreeViewNode object representing the node's immediate parent.
+     */
+    parent: ASPxClientTreeViewNode;
+    /**
+     * Gets the node's index within the parent's collection of nodes.
+     * Value: An integer value representing the node's zero-based index within the Nodes collection of the node to which the node belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the node.
+     * Value: A string value that represents the value assigned to the node's Name property.
+     */
+    name: string;
+    /**
+     * Returns the number of the current node's immediate child nodes.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the current node's immediate child node specified by its index.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a value indicating whether the node is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets a value which specifies the node's expansion state.
+     * @param value true if the node is expanded; otherwise, false.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value indicating whether the node is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value indicating whether the node is checked.
+     * @param value true if the node is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value which specifies the node's check state.
+     */
+    GetCheckState(): string;
+    /**
+     * Returns a value specifying whether the node is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the node is enabled.
+     * @param value true to make the node enabled; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the node.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the node.
+     * @param value A string value specifying the URL to the image displayed within the node.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the node's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the node's navigate URL.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the node is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Gets the text, displayed within the node.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text, displayed within the node.
+     * @param value A string value that represents the text displayed within the node.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a node is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the node is visible.
+     * @param value true if the node is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Gets the HTML object that contains the current node.
+     */
+    GetHtmlElement(): Object;
+}
+/**
+ * A method that will handle the client events concerned with node processing.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with node processing.
+     * @param source An object representing the event source. Identifies the ASPxClientTreeView control that raised the event.
+     * @param e An ASPxClientTreeViewNodeProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events concerned with node processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxClientTreeView.ItemClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventHandler<S> {
+    /**
+     * A method that will handle the NodeClick event.
+     * @param source The ASPxClientTreeView control which fires the event.
+     * @param e An ASPxClientTreeViewNodeClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeClickEventArgs): void;
+}
+/**
+ * Provides data for the NodeClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventArgs extends ASPxClientTreeViewNodeProcessingModeEventArgs {
+    /**
+     * Gets the HTML object that contains the processed node.
+     * Value: An object representing a container for the node related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ASPxTreeView control's client events concerning manipulations with a node.
+ */
+interface ASPxClientTreeViewNodeEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView control's client events, concerning manipulations with a node.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView control object that raised the event.
+     * @param e An ASPxClientTreeViewNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanged events.
+ */
+interface ASPxClientTreeViewNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+ */
+interface ASPxClientTreeViewNodeCancelEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView object that raised the event.
+     * @param e An ASPxClientTreeViewNodeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeCancelEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanging event.
+ */
+interface ASPxClientTreeViewNodeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * Represents a client-side equivalent of the ASPxUploadControl control.
+ */
+interface ASPxClientUploadControl extends ASPxClientControl {
+    /**
+     * Occurs on the client after a file has been uploaded.
+     */
+    FileUploadComplete: ASPxClientEvent<ASPxClientUploadControlFileUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client after upload of all selected files has been completed.
+     */
+    FilesUploadComplete: ASPxClientEvent<ASPxClientUploadControlFilesUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before upload of the specified files starts.
+     */
+    FileUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before file upload is started.
+     */
+    FilesUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires on the client side when the text within the control's edit box is changed while the control has focus.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientUploadControlTextChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the progress bar indicator position is changed.
+     */
+    UploadingProgressChanged: ASPxClientEvent<ASPxClientUploadControlUploadingProgressChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the file input elements count is changed.
+     */
+    FileInputCountChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse enters a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneEnter: ASPxClientEvent<ASPxClientUploadControlDropZoneEnterEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse leaves a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneLeave: ASPxClientEvent<ASPxClientUploadControlDropZoneLeaveEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Initiates uploading of the specified file to the web server's memory.
+     */
+    UploadFile(): void;
+    /**
+     * Adds a new file input element to the ASPxUploadControl.
+     */
+    AddFileInput(): void;
+    /**
+     * Removes a file input element from the ASPxUploadControl.
+     * @param index An integer value that represents a file input element's index.
+     */
+    RemoveFileInput(index: number): void;
+    /**
+     * Removes a file with the specified index from the selected file list.
+     * @param fileIndex An integer value that is the zero-based index of an item in the file list.
+     */
+    RemoveFileFromSelection(fileIndex: number): void;
+    /**
+     * Gets the text displayed within the edit box of the specified file input element.
+     * @param index An integer value that specifies the required file input element's index.
+     */
+    GetText(index: number): string;
+    /**
+     * Gets the number of file input elements contained within the ASPxUploadControl.
+     */
+    GetFileInputCount(): number;
+    /**
+     * Specifies the count of the file input elements within the upload control.
+     * @param count An integer value that specifies the file input elements count.
+     */
+    SetFileInputCount(count: number): void;
+    /**
+     * Specifies whether the upload control is enabled.
+     * @param enabled true, to enable the upload control; otherwise, false.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the upload control is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Initiates uploading of the specified file(s) to the web server's memory.
+     */
+    Upload(): void;
+    /**
+     * Cancels the initiated file uploading process.
+     */
+    Cancel(): void;
+    /**
+     * Clears the file selection in the upload control.
+     */
+    ClearText(): void;
+    /**
+     * Sets the text to be displayed within the add button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetAddButtonText(text: string): void;
+    /**
+     * Sets the text to be displayed within the upload button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetUploadButtonText(text: string): void;
+    /**
+     * Returns the text displayed within the add button.
+     */
+    GetAddButtonText(): string;
+    /**
+     * Returns the text displayed within the upload button.
+     */
+    GetUploadButtonText(): string;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs), a click on which invokes file upload dialog.
+     * @param ids A string value specifying the ID or a list of IDs separated by the semicolon (;).
+     */
+    SetDialogTriggerID(ids: string): void;
+}
+/**
+ * A method that will handle the client FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploadStart event.
+     * @param source The event source. Identifies the ASPxUploadControl control that raised the event.
+     * @param e A ASPxClientUploadControlFilesUploadStartEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadStartEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that handles the FileUploadComplete client event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlFileUploadCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFileUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FileUploadComplete event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+    /**
+     * Gets or sets a value indicating whether the uploaded file passes validation.
+     * Value: true if the file is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the error text to be displayed within the ASPxUploadControl's error frame.
+     * Value: A string value that represents the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value representing callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the FilesUploadComplete client event.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client FilesUploadComplete event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e A  object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadComplete client event, which enables you to perform specific actions after all selected files have been uploaded.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error text to be displayed within the upload control's error frame.
+     * Value: A string value that is the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value that is the callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the TextChanged client event.
+ */
+interface ASPxClientUploadControlTextChangedEventHandler<S> {
+    /**
+     * A method that will handle the TextChanged client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlTextChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlTextChangedEventArgs): void;
+}
+/**
+ * Provides data for the TextChanged client event that allows you to respond to an end-user changing an edit box's text.
+ */
+interface ASPxClientUploadControlTextChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+}
+/**
+ * A method that will handle the ASPxUploadControl's client event, concerned with changes in upload progress.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventHandler<S> {
+    /**
+     * A method that will handle the ASPxUploadControl's client event concerning the uploading process being changed.
+     * @param source An object representing the event's source. Identifies the ASPxUploadControl object that raised the event.
+     * @param e An ASPxClientUploadControlUploadingProgressChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlUploadingProgressChangedEventArgs): void;
+}
+/**
+ * Provides data for the UploadingProgressChanged event.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the number of the files selected for upload.
+     * Value: An integer value that represents the total number of selected files.
+     */
+    fileCount: number;
+    /**
+     * Gets the name of the file being currently uploaded.
+     * Value: A string value that represents the file name.
+     */
+    currentFileName: string;
+    /**
+     * Gets the content length of the currently uploaded file.
+     * Value: An integer value specifying the content length.
+     */
+    currentFileContentLength: number;
+    /**
+     * Gets the content length of the current file already uploaded to the server.
+     * Value: An integer value that is the content length.
+     */
+    currentFileUploadedContentLength: number;
+    /**
+     * Gets the position of the current file upload progress.
+     * Value: An <see cref="Int32" /> value specifying the upload progress position.
+     */
+    currentFileProgress: number;
+    /**
+     * Gets the content length of the files selected for upload.
+     * Value: An integer value specifying the total content length of the selected files.
+     */
+    totalContentLength: number;
+    /**
+     * Gets the content length of the files already uploaded to the server.
+     * Value: An integer value that represents the content length.
+     */
+    uploadedContentLength: number;
+    /**
+     * Gets the current position of total upload progress.
+     * Value: An <see cref="Int32" /> value specifying the total upload progress position.
+     */
+    progress: number;
+}
+/**
+ * A method that will handle the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneEnter event.
+     * @param source The event source. This parameter identifies the upload control object which raised the event.
+     * @param e An ASPxClientUploadControlDropZoneEnterEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneEnterEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * A method that will handle the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneLeave event.
+     * @param source The event source. Identifies the upload control object that raised the event.
+     * @param e A ASPxClientUploadControlDropZoneLeaveEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneLeaveEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * The JavaScript equivalent of the ASPxChartDesigner class.
+ */
+interface ASPxClientChartDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientChartDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientChartDesignerSaveCommandExecuteEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Enables you to customize the menu actions of a Client Chart Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientChartDesignerCustomizeMenuActionsEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientChartDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the model of the Client Chart Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * For internal use.
+     */
+    GetJsonChartModel(): string;
+}
+/**
+ * A method that will handle the SaveCommandExecute  event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * Represents a method that will handle the SaveCommandExecute event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e A ASPxClientChartDesignerSaveCommandExecuteEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for a chart control's SaveCommandExecute event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value specifying whether an event has been handled.
+     * Value: true, if the event hasn't been handled by a control; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * Represents a method that will handle the CustomizeMenuActions events.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * Represents a method that will handle the CustomizeMenuActions event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e An ASPxClientChartDesignerCustomizeMenuActionsEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * An action of the Client Chart Designer's menu.
+ */
+interface ASPxClientChartDesignerMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when the Client Chart Designer's button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the designer user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for a chart control's CustomizeMenuActions event on the client side.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns an array of the Client Chart Designer's menu actions.
+     * Value: An array of the ASPxClientChartDesignerMenuAction objects.
+     */
+    actions: ASPxClientChartDesignerMenuAction[];
+}
+/**
+ * A class which provides access to the entire hierarchy of chart elements on the client side.
+ */
+interface ASPxClientWebChartControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientWebChartControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is hot-tracked.
+     */
+    ObjectHotTracked: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs before crosshair items are drawn when the chart's contents are being drawn.
+     */
+    CustomDrawCrosshair: ASPxClientEvent<ASPxClientWebChartControlCustomDrawCrosshairEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is selected.
+     */
+    ObjectSelected: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Returns an ASPxClientWebChart object, which contains information about the hierarchy of a chart control, and provides access to the main properties of chart elements  on the client side.
+     */
+    GetChart(): ASPxClientWebChart;
+    /**
+     * Returns the printing options of the chart control.
+     */
+    GetPrintOptions(): ASPxClientChartPrintOptions;
+    /**
+     * Changes the mouse pointer, which is shown when the mouse is over the chart control, to the pointer with the specified name.
+     * @param cursor A string value representing the name of the desired cursor.
+     */
+    SetCursor(cursor: string): void;
+    /**
+     * Returns the specific chart element which is located under the test point.
+     * @param x An integer value that specifies the x coordinate of the test point.
+     * @param y An integer value that specifies the y coordinate of the test point.
+     */
+    HitTest(x: number, y: number): ASPxClientHitObject[];
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Prints the current chart on the client side.
+     */
+    Print(): void;
+    /**
+     * Loads a chart which should be customized from its object model.
+     * @param serializedChartObjectModel A String object representing the chart model.
+     */
+    LoadFromObjectModel(serializedChartObjectModel: string): void;
+    /**
+     * Exports a chart to the file of the specified format, and saves it to the disk.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Exports a chart to a file in the specified format, and saves it to disk, using the specified file name.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     * @param filename A string value specifying the file name, to which a chart should be exported. If this parameter is missing or set to an empty string, then the created file will be named using the client-side name of a chart.
+     */
+    SaveToDisk(format: string, filename: string): void;
+    /**
+     * Exports a report to the file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string  value specifying a format in which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Gets the main DOM (Document Object Model) element on a Web Page representing this ASPxClientWebChartControl object.
+     */
+    GetMainDOMElement(): Object;
+}
+/**
+ * A method that will handle the CustomDrawCrosshair  event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventHandler<S> {
+    /**
+     * A method that will handle the CustomDrawCrosshair event.
+     * @param source The event source. This parameter identifies the chartControl which raised the event.
+     * @param e An ASPxClientWebChartControlCustomDrawCrosshairEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlCustomDrawCrosshairEventArgs): void;
+}
+/**
+ * Provides data for a chart control's CustomDrawCrosshair event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets crosshair elements settings  to custom draw a crosshair cursor.
+     * Value: An  ASPxClientCrosshairElement object.
+     */
+    crosshairElements: ASPxClientCrosshairElement;
+    /**
+     * Gets the settings of crosshair axis label elements to customize their appearance.
+     * Value: An ASPxClientCrosshairAxisLabelElement object.
+     */
+    cursorCrosshairAxisLabelElements: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets crosshair line element settings that are used to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object that contains crosshair line element settings.
+     */
+    cursorCrosshairLineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Gets the settings of crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairGroupHeaderElement object.
+     */
+    crosshairGroupHeaderElements: ASPxClientCrosshairGroupHeaderElement;
+    /**
+     * Provides access to the settings of crosshair elements and crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairElementGroup object.
+     */
+    crosshairElementGroups: ASPxClientCrosshairElementGroup;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElement class.
+ */
+interface ASPxClientCrosshairElement {
+    /**
+     * Gets a series that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeries object which represents the series currently being painted.
+     */
+    Series: ASPxClientSeries;
+    /**
+     * Gets the series point that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeriesPoint object, representing the series point that a crosshair element hovers over.
+     */
+    Point: ASPxClientSeriesPoint;
+    /**
+     * Gets or sets the crosshair line element to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object, representing the crosshair line element.
+     */
+    LineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Provides access to the crosshair axis label element.
+     * Value: An ASPxClientCrosshairAxisLabelElement object, representing the crosshair axis label element.
+     */
+    AxisLabelElement: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets the crosshair label element.
+     * Value: An ASPxClientCrosshairSeriesLabelElement object, representing the crosshair label element.
+     */
+    LabelElement: ASPxClientCrosshairSeriesLabelElement;
+    /**
+     * Specifies whether the crosshair element is visible when implementing custom drawing in the crosshair cursor.
+     * Value: true, if the crosshair element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairLineElement class.
+ */
+interface ASPxClientCrosshairLineElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairAxisLabelElement class.
+ */
+interface ASPxClientCrosshairAxisLabelElement {
+}
+/**
+ * The client-side equivalent of the CrosshairGroupHeaderElement class.
+ */
+interface ASPxClientCrosshairGroupHeaderElement {
+}
+/**
+ * The client-side equivalent of the CrosshairLabelElement class.
+ */
+interface ASPxClientCrosshairSeriesLabelElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElementGroup class.
+ */
+interface ASPxClientCrosshairElementGroup {
+}
+/**
+ * Represents a method that will handle the ObjectSelected events.
+ */
+interface ASPxClientWebChartControlHotTrackEventHandler<S> {
+    /**
+     * Represents a method that will handle the ObjectSelected events.
+     * @param source The event source. This parameter identifies the ASPxClientWebChartControl which raised the event.
+     * @param e An ASPxClientWebChartControlHotTrackEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlHotTrackEventArgs): void;
+}
+/**
+ * Provides data for a chart control's ObjectSelected events on the client side.
+ */
+interface ASPxClientWebChartControlHotTrackEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Provides access on the client side to the chart element, for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, which represents the chart element for which the event was raised.
+     */
+    hitObject: ASPxClientWebChartElement;
+    /**
+     * Provides access on the client side to the object, which is in some way related to the object being hit. The returned value depends on the hitObject type and hit point location.
+     * Value: An ASPxClientWebChartElement object representing an additional object that relates to the one being hit.
+     */
+    additionalHitObject: ASPxClientWebChartElement;
+    /**
+     * Gets details on the chart elements located at the point where an end-user has clicked when hot-tracking or selecting a chart element on the client side.
+     * Value: An ASPxClientWebChartHitInfo object, which contains information about the chart elements located at the point where an end-user has clicked.
+     */
+    hitInfo: ASPxClientWebChartHitInfo;
+    /**
+     * Provides access on the client side to the chart and all its elements.
+     * Value: An ASPxClientWebChart object, which provides access to chart properties.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    absoluteX: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    absoluteY: number;
+    /**
+     * Gets a value indicating whether the hot-tracking or object selection should be canceled.
+     * Value: true to cancel the hot-tracking or selection of an object; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object under the hit test point within a chart control, on the client side.
+ */
+interface ASPxClientHitObject {
+    /**
+     * Gets the chart element for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, representing the chart element for which the event was raised.
+     */
+    Object: ASPxClientWebChartElement;
+    /**
+     * Provides access to an object, which is in some way related to the object being hit. The returned value depends on the Object type and hit point location.
+     * Value: An ASPxClientWebChartElement object that represents an additional object related to the one being hit.
+     */
+    AdditionalObject: ASPxClientWebChartElement;
+}
+/**
+ * Contains information about a specific test point within a chart control, on the client side.
+ */
+interface ASPxClientWebChartHitInfo {
+    /**
+     * Gets a value indicating whether the test point is within the chart.
+     * Value: true if the test point is within a chart; otherwise, false.
+     */
+    inChart: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the chart title.
+     * Value: true if the test point is within a chart title; otherwise, false.
+     */
+    inChartTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis.
+     * Value: true if the test point is within an axis; otherwise, false.
+     */
+    inAxis: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis label item.
+     * Value: true if the test point is within an axis label item; otherwise, false.
+     */
+    inAxisLabelItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis title.
+     * Value: true if the test point is within an axis title; otherwise, false.
+     */
+    inAxisTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the constant line.
+     * Value: true if the test point is within a constant line; otherwise, false.
+     */
+    inConstantLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the diagram.
+     * Value: true if the test point is within a diagram; otherwise, false.
+     */
+    inDiagram: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the non-default pane.
+     * Value: true if the test point is within a non-default pane; otherwise, false.
+     */
+    inNonDefaultPane: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the legend.
+     * Value: true if the test point is within a legend; otherwise, false.
+     */
+    inLegend: boolean;
+    /**
+     * Gets the value indicating whether or not the test point is within a custom legend item.
+     * Value: true if the test point is within a custom legend item; otherwise, false.
+     */
+    inCustomLegendItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series.
+     * Value: true if the test point is within a series; otherwise, false.
+     */
+    inSeries: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series label.
+     * Value: true if the test point is within a series label; otherwise, false.
+     */
+    inSeriesLabel: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series point.
+     * Value: true if the test point is within a series point; otherwise, false.
+     */
+    inSeriesPoint: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series title.
+     * Value: true if the test point is within a series title; otherwise, false.
+     */
+    inSeriesTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the trendline.
+     * Value: true if the test point is within a trendline; otherwise, false.
+     */
+    inTrendLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the Fibonacci Indicator.
+     * Value: true if the test point is within a Fibonacci Indicator; otherwise, false.
+     */
+    inFibonacciIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the regression line.
+     * Value: true if the test point is within a regression line; otherwise, false.
+     */
+    inRegressionLine: boolean;
+    /**
+     * Gets a value specifying whether the test point is within an indicator.
+     * Value: true if the test point is within an indicator; otherwise, false.
+     */
+    inIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within an annotation.
+     * Value: true if the test point is within an annotation; otherwise, false.
+     */
+    inAnnotation: boolean;
+    /**
+     * Gets a value indicating whether the test point is within a hyperlink.
+     * Value: true, if the test point is within a hyperlink; otherwise, false.
+     */
+    inHyperlink: boolean;
+    /**
+     * Gets the client-side chart instance from under the test point.
+     * Value: An ASPxClientWebChart object.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the client-side chart title instance from under the test point.
+     * Value: An ASPxClientChartTitle object.
+     */
+    chartTitle: ASPxClientChartTitle;
+    /**
+     * Gets the client-side axis instance from under the test point.
+     * Value: An ASPxClientAxisBase descendant.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the client-side constant line instance from under the test point.
+     * Value: An ASPxClientConstantLine object.
+     */
+    constantLine: ASPxClientConstantLine;
+    /**
+     * Gets the client-side diagram instance from under the test point.
+     * Value: An ASPxClientXYDiagramBase descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Gets the client-side non-default pane instance from under the test point.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    nonDefaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the client-side legend instance from under the test point.
+     * Value: An ASPxClientLegend object.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Gets a custom legend item which is located under the test point.
+     * Value: An ASPxClientCustomLegendItem object which represents the item located under the test point.
+     */
+    customLegendItem: ASPxClientCustomLegendItem;
+    /**
+     * Gets the client-side series instance from under the test point.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the client-side series label instance from under the test point.
+     * Value: An ASPxClientSeriesLabel object.
+     */
+    seriesLabel: ASPxClientSeriesLabel;
+    /**
+     * Gets the client-side series title instance from under the test point.
+     * Value: An ASPxClientSeriesTitle object.
+     */
+    seriesTitle: ASPxClientSeriesTitle;
+    /**
+     * Gets the client-side trendline instance from under the test point.
+     * Value: An ASPxClientTrendLine object.
+     */
+    trendLine: ASPxClientTrendLine;
+    /**
+     * Gets the client-side Fibonacci indicator instance from under the test point.
+     * Value: An ASPxClientFibonacciIndicator object.
+     */
+    fibonacciIndicator: ASPxClientFibonacciIndicator;
+    /**
+     * Gets the client-side regression line instance from under the test point.
+     * Value: An ASPxClientRegressionLine object.
+     */
+    regressionLine: ASPxClientRegressionLine;
+    /**
+     * Gets the client-side indicator instance from under the test point.
+     * Value: An ASPxClientIndicator descendant.
+     */
+    indicator: ASPxClientIndicator;
+    /**
+     * Gets the client-side annotation instance from under the test point.
+     * Value: An ASPxClientAnnotation object.
+     */
+    annotation: ASPxClientAnnotation;
+    /**
+     * Gets the client-side series point instance from under the test point.
+     * Value: An ASPxClientSeriesPoint object.
+     */
+    seriesPoint: ASPxClientSeriesPoint;
+    /**
+     * Gets the client-side axis label item instance from under the test point.
+     * Value: An ASPxClientAxisLabelItem object.
+     */
+    axisLabelItem: ASPxClientAxisLabelItem;
+    /**
+     * Gets the client-side axis title instance from under the test point.
+     * Value: An ASPxClientAxisTitle object.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Returns a hyperlink which is located under the test point.
+     * Value: A String object representing a hyperlink.
+     */
+    hyperlink: string;
+}
+/**
+ * Represents the client-side equivalent of the DiagramCoordinates class.
+ */
+interface ASPxClientDiagramCoordinates {
+    /**
+     * Gets the type of the argument scale.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets the type of the value scale.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the argument of the data point as a text string.
+     * Value: A string object, representing a data point's argument.
+     */
+    qualitativeArgument: string;
+    /**
+     * Gets the numerical representation of the data point's argument.
+     * Value: A Double value, representing the data point's argument.
+     */
+    numericalArgument: number;
+    /**
+     * Gets the date-time representation of the data point's argument.
+     * Value: A date object, representing the point's argument.
+     */
+    dateTimeArgument: Date;
+    /**
+     * Gets the numerical representation of the data point's value.
+     * Value: A Double value, representing the data point's value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the date-time representation of the data point's value.
+     * Value: A date object, representing the point's value.
+     */
+    dateTimeValue: Date;
+    /**
+     * Gets the X-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of arguments (X-axis).
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of values (Y-axis).
+     */
+    axisY: ASPxClientAxisBase;
+    /**
+     * Gets the pane of the diagram point.
+     * Value: An ASPxClientXYDiagramPane descendant, representing the pane.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Checks whether the current object represents a point outside the diagram area.
+     */
+    IsEmpty(): boolean;
+    /**
+     * Gets the value of the client-side axis instance.
+     * @param axis An ASPxClientAxisBase class descendant, representing the axis that contains the requested value.
+     */
+    GetAxisValue(axis: ASPxClientAxisBase): ASPxClientAxisValue;
+}
+/**
+ * Contains the information about an axis value.
+ */
+interface ASPxClientAxisValue {
+    /**
+     * Gets the axis scale type.
+     * Value: A String value, specifying the axis scale type.
+     */
+    scaleType: string;
+    /**
+     * Gets the axis value, if the axis scale type is qualitative.
+     * Value: A String value, specifying the axis value.
+     */
+    qualitativeValue: string;
+    /**
+     * Gets the axis value, if the axis scale type is numerical.
+     * Value: A Double value, specifying the axis value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the axis value, if the axis scale type is date-time.
+     * Value: A DateTime value, specifying the axis value.
+     */
+    dateTimeValue: Date;
+}
+/**
+ * Represents the client-side equivalent of the ControlCoordinates class.
+ */
+interface ASPxClientControlCoordinates {
+    /**
+     * Gets the point's pane.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the point's X-coordinate, in pixels.
+     * Value: An integer value, specifying the X-coordinate (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the point's Y-coordinate, in pixels.
+     * Value: An integer value, specifying the Y-coordinate (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the point's visibility state.
+     * Value: "Visible", "Hidden", or "Undefined".
+     */
+    visibility: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartElement class.
+ */
+interface ASPxClientWebChartElement {
+    /**
+     * Gets the chart that owns the current chart element.
+     * Value: An ASPxClientWebChart object, to which the chart element belongs.
+     */
+    chart: ASPxClientWebChart;
+}
+/**
+ * Represents a base class for chart elements, which are not necessarily required to be present on the client side.
+ */
+interface ASPxClientWebChartEmptyElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents a base class for chart elements, which are required to be present on the client side.
+ */
+interface ASPxClientWebChartRequiredElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents the client-side equivalent of the ChartElementNamed class.
+ */
+interface ASPxClientWebChartElementNamed extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the name of the chart element.
+     * Value: A string object representing the name of the chart element.
+     */
+    name: string;
+}
+/**
+ * Represents the client-side equivalent of the WebChartControl control.
+ */
+interface ASPxClientWebChart extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the client-side Chart Control that owns the current chart.
+     * Value: An ASPxClientWebChartControl object, to which the chart belongs.
+     */
+    chartControl: ASPxClientWebChartControl;
+    /**
+     * Gets the chart's diagram and provides access to its settings.
+     * Value: An ASPxClientRadarDiagram),  that represents the chart's diagram.
+     */
+    diagram: ASPxClientWebChartElement;
+    /**
+     * Provides access to the chart's collection of series.
+     * Value: An array of ASPxClientSeries objects that represent the collection of series.
+     */
+    series: ASPxClientSeries[];
+    /**
+     * Provides access to the collection of chart titles.
+     * Value: An array of ASPxClientChartTitle objects, that represent the collection of chart titles.
+     */
+    titles: ASPxClientChartTitle[];
+    /**
+     * Provides access to the chart's collection of annotations.
+     * Value: An array of ASPxClientAnnotation objects, representing the collection of annotations.
+     */
+    annotations: ASPxClientAnnotation[];
+    /**
+     * Gets the chart's legend and provides access to its settings.
+     * Value: An ASPxClientLegend object that represents the chart's legend.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Returns the collection of legends.
+     * Value: An array of ASPxClientLegend objects.
+     */
+    legends: ASPxClientLegend[];
+    /**
+     * Gets the name of the appearance, which is currently used to draw the chart's elements.
+     * Value: A string value that represents the appearance name.
+     */
+    appearanceName: string;
+    /**
+     * Gets the name of the palette currently used to draw the chart's series.
+     * Value: A string value that represents the palette name.
+     */
+    paletteName: string;
+    /**
+     * Gets a value indicating whether series tooltips should be shown.
+     * Value: true to show tooltips for series; otherwise, false.
+     */
+    showSeriesToolTip: boolean;
+    /**
+     * Gets a value indicating whether point tooltips should be shown.
+     * Value: true to show tooltips for series points; otherwise, false.
+     */
+    showPointToolTip: boolean;
+    /**
+     * Gets a value indicating whether a crosshair cursor should be shown.
+     * Value: true to show a crosshair cursor; otherwise, false.
+     */
+    showCrosshair: boolean;
+    /**
+     * Gets a value that contains information on how the tooltip position is defined, for example, relative to a mouse pointer or chart element.
+     * Value: An ASPxClientToolTipPosition class descendant that defines the tooltip position type.
+     */
+    toolTipPosition: ASPxClientToolTipPosition;
+    /**
+     * Returns the tooltip controller that shows tooltips for chart elements.
+     * Value: An ASPxClientToolTipController object.
+     */
+    toolTipController: ASPxClientToolTipController;
+    /**
+     * Gets the settings for a crosshair cursor concerning its position and appearance on a diagram.
+     * Value: An ASPxClientCrosshairOptions object descendant which provides access to crosshair cursor options on a diagram.
+     */
+    crosshairOptions: ASPxClientCrosshairOptions;
+    /**
+     * Gets a css postfix for a chart.
+     * Value: A string value.
+     */
+    cssPostfix: string;
+    /**
+     * Gets or sets a value which specifies how the chart elements are selected.
+     * Value: A String object representing the name of the selection mode.
+     */
+    selectionMode: string;
+}
+/**
+ * Represents the client-side equivalent of the SimpleDiagram class.
+ */
+interface ASPxClientSimpleDiagram extends ASPxClientWebChartEmptyElement {
+}
+/**
+ * Represents the base class for all diagram classes, which have X and Y axes.
+ */
+interface ASPxClientXYDiagramBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the X-axis.
+     * Value: An ASPxClientAxisBase object which represents the X-axis.
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis.
+     * Value: An ASPxClientAxisBase object which represents the Y-axis.
+     */
+    axisY: ASPxClientAxisBase;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram2D class.
+ */
+interface ASPxClientXYDiagram2D extends ASPxClientXYDiagramBase {
+    /**
+     * Provides access to a collection of secondary X-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesX: ASPxClientAxis[];
+    /**
+     * Provides access to a collection of secondary Y-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesY: ASPxClientAxis[];
+    /**
+     * Provides access to a default pane object.
+     * Value: An ASPxClientXYDiagramPane object which represents the default pane of a chart.
+     */
+    defaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Provides access to an array of a diagram's panes.
+     * Value: An array of ASPxClientXYDiagramPane objects.
+     */
+    panes: ASPxClientXYDiagramPane[];
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     * @param axisX An ASPxClientAxis2D descendant, representing the X-axis.
+     * @param axisY An ASPxClientAxis2D descendant, representing the Y-axis.
+     * @param pane An ASPxClientXYDiagramPane object, representing the pane.
+     */
+    DiagramToPoint(argument: Object, value: Object, axisX: ASPxClientAxis2D, axisY: ASPxClientAxis2D, pane: ASPxClientXYDiagramPane): ASPxClientControlCoordinates;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram class.
+ */
+interface ASPxClientXYDiagram extends ASPxClientXYDiagram2D {
+    /**
+     * Gets a value indicating whether the diagram is rotated.
+     * Value: true if the diagram is rotated; otherwise, false.
+     */
+    rotated: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagram class.
+ */
+interface ASPxClientSwiftPlotDiagram extends ASPxClientXYDiagram2D {
+}
+/**
+ * Represents the client-side equivalent of the XYDiagramPane class.
+ */
+interface ASPxClientXYDiagramPane extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the diagram that owns the current pane object.
+     * Value: An ASPxClientXYDiagram object, to which the pane belongs.
+     */
+    diagram: ASPxClientXYDiagram;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram3D class.
+ */
+interface ASPxClientXYDiagram3D extends ASPxClientXYDiagramBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarDiagram class.
+ */
+interface ASPxClientRadarDiagram extends ASPxClientXYDiagramBase {
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     */
+    DiagramToPoint(argument: Object, value: Object): ASPxClientControlCoordinates;
+}
+/**
+ * Represents the client-side equivalent of the AxisBase class.
+ */
+interface ASPxClientAxisBase extends ASPxClientWebChartElementNamed {
+    /**
+     * Provides access to the XY-diagram which contains the current axis.
+     * Value: An ASPxClientXYDiagramBase class descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Provides acess to the range of the axis coordinates.
+     * Value: An ASPxClientAxisRange object, which contains the common range settings of the axis coordinates.
+     */
+    range: ASPxClientAxisRange;
+}
+/**
+ * Represents the client-side equivalent of the Axis2D class.
+ */
+interface ASPxClientAxis2D extends ASPxClientAxisBase {
+    /**
+     * Provides access to an axis title object.
+     * Value: An ASPxClientAxisTitle object which represents the axis title.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Provides access to the axis strips collection.
+     * Value: An array of ASPxClientStrip objects.
+     */
+    strips: ASPxClientStrip[];
+    /**
+     * Provides access to the collection of the axis constant lines.
+     * Value: An array of ASPxClientConstantLine objects which represent constant lines that belong to this axis.
+     */
+    constantLines: ASPxClientConstantLine[];
+}
+/**
+ * Represents the client-side equivalent of the Axis class.
+ */
+interface ASPxClientAxis extends ASPxClientAxis2D {
+    /**
+     * Gets a value indicating whether the axis is reversed.
+     * Value: true if the axis is reversed; otherwise, false.
+     */
+    reverse: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagramAxis class.
+ */
+interface ASPxClientSwiftPlotDiagramAxis extends ASPxClientAxis2D {
+}
+/**
+ * Represents the client-side equivalent of the Axis3D class.
+ */
+interface ASPxClientAxis3D extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarAxis class.
+ */
+interface ASPxClientRadarAxis extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the AxisTitle class.
+ */
+interface ASPxClientAxisTitle extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which the axis title belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of the axis title.
+     * Value: A string object which contains the axis title's text.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the AxisLabelItem class.
+ */
+interface ASPxClientAxisLabelItem extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which an axis label item belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of an axis label item.
+     * Value: A string object which contains the axis label item's text.
+     */
+    text: string;
+    /**
+     * Gets the axis value to which an axis label item corresponds.
+     * Value: An object that specifies the axis value.
+     */
+    axisValue: Object;
+    /**
+     * Gets the internal representation of the axis value to which an axis label item corresponds.
+     * Value: A Double value which specifies the internal representation of the axis value.
+     */
+    axisValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the AxisRange class.
+ */
+interface ASPxClientAxisRange extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis that owns the current axis range object.
+     * Value: An ASPxClientAxisBase object, to which the axis range belongs.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the minimum value to display on an axis.
+     * Value: An object representing the minimum value of the axis range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value to display on an axis.
+     * Value: An object representing the maximum value of the axis range.
+     */
+    maxValue: Object;
+    /**
+     * Gets the internal float representation of the range minimum value.
+     * Value: A Double value which specifies the internal representation of the range minimum value.
+     */
+    minValueInternal: number;
+    /**
+     * Gets the internal float representation of the range maximum value.
+     * Value: A Double value which specifies the internal representation of the range maximum value.
+     */
+    maxValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the Strip class.
+ */
+interface ASPxClientStrip extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current strip object.
+     * Value: An ASPxClientAxis object, to which the strip belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the minimum value of the strip's range.
+     * Value: An object that represents the minimum value of the strip's range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value of the strip's range.
+     * Value: An object that represents the maximum value of the strip's range.
+     */
+    maxValue: Object;
+}
+/**
+ * Represents the client-side equivalent of the ConstantLine class.
+ */
+interface ASPxClientConstantLine extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current constant line object.
+     * Value: An ASPxClientAxis object, to which the constant line belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the constant line's position along the axis.
+     * Value: An object that specifies the constant line's position.
+     */
+    value: Object;
+    /**
+     * Gets the constant line title.
+     * Value: A string object, representing the title's text.
+     */
+    title: string;
+}
+/**
+ * Represents the client-side equivalent of the Series class.
+ */
+interface ASPxClientSeries extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets a value that specifies the view type of the series.
+     * Value: A string object which contains the current view type.
+     */
+    viewType: string;
+    /**
+     * Gets a value that specifies the scale type for the argument data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets a value that specifies the scale type for the value data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the X-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the X-axis name.
+     */
+    axisX: string;
+    /**
+     * Gets the Y-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Gets the pane that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the pane's name.
+     */
+    pane: string;
+    /**
+     * Gets a value indicating whether the series is visible.
+     * Value: true if the series is visible; otherwise, false.
+     */
+    visible: boolean;
+    /**
+     * Gets a value that specifies whether or not a tooltip is enabled for a chart.
+     * Value: true - a tooltip is enabled for a chart; false - a tooltip is disabled.
+     */
+    toolTipEnabled: boolean;
+    /**
+     * Gets the text to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets an image to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipImage: string;
+    /**
+     * Gets the settings of series labels.
+     * Value: An ASPxClientSeriesLabel object, which provides the series label settings.
+     */
+    label: ASPxClientSeriesLabel;
+    /**
+     * Gets the series' collection of data points.
+     * Value: An array of ASPxClientSeriesPoint objects, that represent the series' data points.
+     */
+    points: ASPxClientSeriesPoint[];
+    /**
+     * Provides access to the collection of series titles.
+     * Value: An array of ASPxClientSeriesTitle objects, that represent the collection of series titles.
+     */
+    titles: ASPxClientSeriesTitle[];
+    /**
+     * Gets the series' collection of indicators.
+     * Value: An array of ASPxClientIndicator objects, that belong to the series.
+     */
+    indicators: ASPxClientIndicator[];
+    /**
+     * Provides access to the collection of regression lines.
+     * Value: An array of ASPxClientRegressionLine objects which represent regression lines available for the series.
+     */
+    regressionLines: ASPxClientRegressionLine[];
+    /**
+     * Provides access to the collection of trendlines.
+     * Value: An array of ASPxClientTrendLine objects, that represent the collection of trendlines.
+     */
+    trendLines: ASPxClientTrendLine[];
+    /**
+     * Provides access to the collection of Fibonacci Indicators.
+     * Value: An array of ASPxClientFibonacciIndicator objects, that represent the collection of Fibonacci Indicators.
+     */
+    fibonacciIndicators: ASPxClientFibonacciIndicator[];
+    /**
+     * Gets the color of a series.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets a value that defines a group for stacked series.
+     * Value: A string value.
+     */
+    stackedGroup: string;
+    /**
+     * Gets a string which represents the pattern specifying the text to be displayed within a crosshair label for the current Series  type.
+     * Value: A Empty.
+     */
+    crosshairLabelPattern: string;
+    /**
+     * This property is intended for internal use only.
+     * Value: A String value.
+     */
+    groupedElementsPattern: string;
+    /**
+     * Returns a collection of crosshair value items.
+     * Value: An array of ASPxClientCrosshairValueItem objects.
+     */
+    crosshairValueItems: ASPxClientCrosshairValueItem[];
+    /**
+     * Gets a value indicating whether a crosshair cursor is enabled.
+     * Value: true if a crosshair cursor is enabled; otherwise, false.
+     */
+    actualCrosshairEnabled: boolean;
+    /**
+     * Gets a value indicating whether a crosshair label should be shown for this series.
+     * Value: true if crosshair labels are visible; otherwise, false.
+     */
+    actualCrosshairLabelVisibility: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SeriesLabelBase class.
+ */
+interface ASPxClientSeriesLabel extends ASPxClientWebChartElement {
+    /**
+     * Gets the series that owns the current series label object.
+     * Value: An ASPxClientSeries object, to which the series label belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the common text for all series point labels.
+     * Value: Returns an empty string object.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the SeriesPoint class.
+ */
+interface ASPxClientSeriesPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the series that owns the current series point object.
+     * Value: An ASPxClientSeries object, to which the series point belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the data point's argument.
+     * Value: An object that specifies the data point's argument.
+     */
+    argument: Object;
+    /**
+     * Gets the point's data value(s).
+     * Value: An array of objects that represent the data value(s) of the series data point.
+     */
+    values: Object[];
+    /**
+     * Gets the text to be displayed within series points tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets the color of a series point.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets the percent value of a series point.
+     * Value: A float value.
+     */
+    percentValue: number;
+    /**
+     * Gets a hint that is shown in series points tooltips.
+     * Value: A string value.
+     */
+    toolTipHint: string;
+}
+/**
+ * Represents the client-side equivalent of the Legend class.
+ */
+interface ASPxClientLegend extends ASPxClientWebChartEmptyElement {
+    /**
+     * Returns a value which determines whether to use checkboxes instead of markers on a chart legend for all legend items.
+     * Value: true, if legend checkboxes are shown instead of markers for all legend items; otherwise, false.
+     */
+    useCheckBoxes: boolean;
+    /**
+     * Returns a collection of custom legend items of the legend.
+     * Value: A collection of ASPxClientCustomLegendItem objects.
+     */
+    customItems: ASPxClientCustomLegendItem[];
+    /**
+     * Returns the name of the legend.
+     * Value: The string value representing the name of the legend.
+     */
+    name: string;
+}
+/**
+ * Represents the base for ASPxClientSeriesTitle classes.
+ */
+interface ASPxClientTitleBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the lines of text within a title.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+    /**
+     * Gets the alignment of the title.
+     * Value: A string value containing the text, which specifies the alignment of a title.
+     */
+    alignment: string;
+    /**
+     * Gets a value that specifies to which edges of a parent element the title should be docked.
+     * Value: A string value.
+     */
+    dock: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartTitle class.
+ */
+interface ASPxClientChartTitle extends ASPxClientTitleBase {
+}
+/**
+ * Represents the client-side equivalent of the SeriesTitle class.
+ */
+interface ASPxClientSeriesTitle extends ASPxClientTitleBase {
+    /**
+     * Gets the series that owns the current title object.
+     * Value: An ASPxClientSeries object, to which the series title belongs.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the Indicator class.
+ */
+interface ASPxClientIndicator extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the indicator's associated series.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicator class.
+ */
+interface ASPxClientFinancialIndicator extends ASPxClientIndicator {
+    /**
+     * Gets the first point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's first point.
+     */
+    point1: ASPxClientFinancialIndicatorPoint;
+    /**
+     * Gets the second point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's second point.
+     */
+    point2: ASPxClientFinancialIndicatorPoint;
+}
+/**
+ * Represents the client-side equivalent of the TrendLine class.
+ */
+interface ASPxClientTrendLine extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FibonacciIndicator class.
+ */
+interface ASPxClientFibonacciIndicator extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicatorPoint class.
+ */
+interface ASPxClientFinancialIndicatorPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the financial indicator that owns the current financial indicator point.
+     * Value: An ASPxClientFinancialIndicator object, to which the point belongs.
+     */
+    financialIndicator: ASPxClientFinancialIndicator;
+    /**
+     * Gets the argument of the financial indicator's point.
+     * Value: An object that specifies the point argument.
+     */
+    argument: Object;
+    /**
+     * Gets a value, indicating how the value of a financial indicator's point is obtained.
+     * Value: A string value, which indicates how to obtain a financial indicator point's value.
+     */
+    valueLevel: string;
+}
+/**
+ * The client-side equivalent of the SingleLevelIndicator class.
+ */
+interface ASPxClientSingleLevelIndicator extends ASPxClientIndicator {
+    /**
+     * Gets a value specifying the value level to which the single-level indicator corresponds.
+     * Value: A string value.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RegressionLine class.
+ */
+interface ASPxClientRegressionLine extends ASPxClientSingleLevelIndicator {
+}
+/**
+ * The client-side equivalent of the MovingAverage class.
+ */
+interface ASPxClientMovingAverage extends ASPxClientSingleLevelIndicator {
+    /**
+     * Gets the number of data points used to calculate the moving average.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value specifying whether to display a Moving Average, Envelope, or both.
+     * Value: A string value.
+     */
+    kind: string;
+    /**
+     * Gets a value specifying the Envelope percent.
+     * Value: A double value which specifies the Envelope percent.
+     */
+    envelopePercent: number;
+}
+/**
+ * The client-side equivalent of the SimpleMovingAverage class.
+ */
+interface ASPxClientSimpleMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the ExponentialMovingAverage class.
+ */
+interface ASPxClientExponentialMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the WeightedMovingAverage class.
+ */
+interface ASPxClientWeightedMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the TriangularMovingAverage class.
+ */
+interface ASPxClientTriangularMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTema class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTema extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the BollingerBands class.
+ */
+interface ASPxClientBollingerBands extends ASPxClientIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MedianPrice class.
+ */
+interface ASPxClientMedianPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the TypicalPrice class.
+ */
+interface ASPxClientTypicalPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the WeightedClose class.
+ */
+interface ASPxClientWeightedClose extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the SeparatePaneIndicator class.
+ */
+interface ASPxSeparatePaneIndicator extends ASPxClientIndicator {
+    /**
+     * Returns the name of the Y-axis that is used to plot the current indicator on a ASPxClientXYDiagram.
+     * Value: A string value specifying the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Returns the name of a pane, used to plot the separate pane indicator on an XYDiagram.
+     * Value: A string that is the name of a pane.
+     */
+    pane: string;
+}
+/**
+ * Represents the client-side equivalent of the AverageTrueRange class.
+ */
+interface ASPxClientAverageTrueRange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the ChaikinsVolatility class.
+ */
+interface ASPxClientChaikinsVolatility extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the CommodityChannelIndex class.
+ */
+interface ASPxClientCommodityChannelIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the DetrendedPriceOscillator class.
+ */
+interface ASPxClientDetrendedPriceOscillator extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MassIndex class.
+ */
+interface ASPxClientMassIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the count of points used to calculate the exponential moving average (EMA).
+     * Value: An integer value, specifying the count of points used to calculate EMA.
+     */
+    movingAveragePointsCount: number;
+    /**
+     * Returns the count of summable values.
+     * Value: An integer value specifying the count of summable ratios.
+     */
+    sumPointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the MovingAverageConvergenceDivergence class.
+ */
+interface ASPxClientMovingAverageConvergenceDivergence extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the short period value required to calculate the indicator.
+     * Value: An integer value specifying the short period value.
+     */
+    shortPeriod: number;
+    /**
+     * Returns the long period value required to calculate the indicator.
+     * Value: An integer value specifying the long period.
+     */
+    longPeriod: number;
+    /**
+     * Returns the smoothing period value required to calculate the indicator.
+     * Value: An integer value specifying the smoothing period value.
+     */
+    signalSmoothingPeriod: number;
+}
+/**
+ * Represents the client-side equivalent of the RateOfChange class.
+ */
+interface ASPxClientRateOfChange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RelativeStrengthIndex class.
+ */
+interface ASPxClientRelativeStrengthIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviation class.
+ */
+interface ASPxClientStandardDeviation extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTrix class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTrix extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the WilliamsR class.
+ */
+interface ASPxClientWilliamsR extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the FixedValueErrorBars class.
+ */
+interface ASPxClientFixedValueErrorBars extends ASPxClientIndicator {
+    /**
+     * Gets or sets the fixed positive error value.
+     * Value: A double value specifying the positive error value.
+     */
+    positiveError: number;
+    /**
+     * Returns the fixed negative error value.
+     * Value: A double value specifying the negative error value.
+     */
+    negativeError: number;
+}
+/**
+ * Represents the client-side equivalent of the PercentageErrorBars class.
+ */
+interface ASPxClientPercentageErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the value specifying the percentage of error values of series point values.
+     * Value: A double value specifying the percentage. Values less than or equal to 0 are not allowed.
+     */
+    percent: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviationErrorBars class.
+ */
+interface ASPxClientStandardDeviationErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the multiplier on which the standard deviation value is multiplied before display.
+     * Value: A double value specifying the multiplier. Values less than 0 are not allowed.
+     */
+    multiplier: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardErrorBars class.
+ */
+interface ASPxClientStandardErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the DataSourceBasedErrorBars class.
+ */
+interface ASPxClientDataSourceBasedErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the Annotation class.
+ */
+interface ASPxClientAnnotation extends ASPxClientWebChartElementNamed {
+}
+/**
+ * Represents the client-side equivalent of the TextAnnotation class.
+ */
+interface ASPxClientTextAnnotation extends ASPxClientAnnotation {
+    /**
+     * Gets the lines of text within an annotation.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+}
+/**
+ * Represents the client-side equivalent of the ImageAnnotation class.
+ */
+interface ASPxClientImageAnnotation extends ASPxClientAnnotation {
+}
+/**
+ * The client-side equivalent of the CrosshairValueItem class.
+ */
+interface ASPxClientCrosshairValueItem {
+    /**
+     * Gets the value that is displayed in a crosshair label.
+     * Value: A float value.
+     */
+    value: number;
+    /**
+     * Gets an index of a point for which this crosshair value item is displayed.
+     * Value: An integer value.
+     */
+    pointIndex: number;
+}
+/**
+ * The client-side equivalent of the ChartToolTipController class.
+ */
+interface ASPxClientToolTipController extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether an image should be shown in tooltips.
+     * Value: true to show an image in tooltips; otherwise, false.
+     */
+    showImage: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show text in tooltips.
+     * Value: true to show text in tooltips; otherwise, false.
+     */
+    showText: boolean;
+    /**
+     * Gets a value that defines the position of an image within a tooltip.
+     * Value: A string value.
+     */
+    imagePosition: string;
+    /**
+     * Gets a value that defines when tooltips should be invoked.
+     * Value: A string value.
+     */
+    openMode: string;
+}
+/**
+ * The client-side equivalent of the ToolTipPosition class.
+ */
+interface ASPxClientToolTipPosition {
+}
+/**
+ * The client-side equivalent of the ToolTipRelativePosition class.
+ */
+interface ASPxClientToolTipRelativePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the ToolTipFreePosition class.
+ */
+interface ASPxClientToolTipFreePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+    /**
+     * Gets the ID of a pane.
+     * Value: An integer value.
+     */
+    paneID: number;
+    /**
+     * Gets an object containing settings that define how a tooltip should be docked.
+     * Value: A string value.
+     */
+    dockPosition: string;
+}
+/**
+ * The client-side equivalent of the CrosshairLabelPosition class.
+ */
+interface ASPxClientCrosshairPosition {
+    /**
+     * Gets the horizontal offset of a crosshair cursor.
+     * Value: An integer value that is the X-offset.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a crosshair cursor.
+     * Value: An integer value that is the Y-offset.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the CrosshairMousePosition class.
+ */
+interface ASPxClientCrosshairMousePosition extends ASPxClientCrosshairPosition {
+}
+/**
+ * The client-side equivalent of the CrosshairFreePosition class.
+ */
+interface ASPxClientCrosshairFreePosition extends ASPxClientCrosshairPosition {
+    /**
+     * Gets a Pane's ID when the crosshair cursor is in the free position mode.
+     * Value: An integer value that is the pane's ID.
+     */
+    paneID: number;
+    /**
+     * Gets a string containing information on a crosshair label's dock position when the crosshair cursor is in the free position mode.
+     * Value: A string value containing information on a crosshair label's dock position.
+     */
+    dockPosition: string;
+}
+/**
+ * Defines line style settings.
+ */
+interface ASPxClientLineStyle extends ASPxClientWebChartElement {
+    /**
+     * Gets the dash style used to paint the line.
+     * Value: A string value that contains information about the style used to paint the line.
+     */
+    dashStyle: string;
+    /**
+     * Gets the thickness that corresponds to the value of the current ASPxClientLineStyle object.
+     * Value: An integer value which specifies the thickness, in pixels.
+     */
+    thickness: number;
+    /**
+     * Returns the join style for the ends of consecutive lines.
+     * Value: A string representing the name of the line join type.
+     */
+    lineJoin: string;
+}
+/**
+ * The client-side equivalent of the CrosshairOptions class.
+ */
+interface ASPxClientCrosshairOptions extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the X-axis.
+     * Value: true to show a crosshair label for the X-axis; otherwise, false.
+     */
+    showAxisXLabels: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the Y-axis.
+     * Value: true to show the crosshair label for the Y-axis; otherwise, false.
+     */
+    showAxisYLabels: boolean;
+    /**
+     * Gets a value that defines whether a crosshair label of a series point indicated by a crosshair cursor is shown on a diagram.
+     * Value: true if a crosshair label indicated by a crosshair cursor is shown on a diagram; otherwise, false.
+     */
+    showCrosshairLabels: boolean;
+    /**
+     * Gets a value that indicates whether a crosshair cursor argument line is shown for a series point on a diagram.
+     * Value: true if a crosshair cursor argument line is displayed on a diagram;  otherwise, false.
+     */
+    showArgumentLine: boolean;
+    /**
+     * Specifies whether to show a value line of a series point indicated by a crosshair cursor on a diagram.
+     * Value: true to display a value line indicated by a crosshair cursor on a diagram; otherwise, false.
+     */
+    showValueLine: boolean;
+    /**
+     * Gets a value that specifies whether to show a crosshair cursor in a focused pane only.
+     * Value: true to display a crosshair cursor in a focused pane; otherwise, false.
+     */
+    showOnlyInFocusedPane: boolean;
+    /**
+     * Specifies the current snap mode of a crosshair cursor.
+     * Value: A string value.
+     */
+    snapMode: string;
+    /**
+     * Specifies the way in which the crosshair label is shown for a series on a diagram.
+     * Value: A string value that specifies how the crosshair label is shown for a series.
+     */
+    crosshairLabelMode: string;
+    /**
+     * Gets a value that indicates whether to show a header for each series group in crosshair cursor labels.
+     * Value: true, to show a group header in crosshair cursor labels; otherwise, false.
+     */
+    showGroupHeaders: boolean;
+    /**
+     * Gets a string which represents the  pattern specifying the group header text to be displayed within the crosshair label.
+     * Value: A String, which represents the group header's pattern.
+     */
+    groupHeaderPattern: string;
+    /**
+     * Gets the color of a crosshair argument line.
+     * Value: A String value, specifying the color of a crosshair argument line.
+     */
+    argumentLineColor: string;
+    /**
+     * Gets the color of a crosshair value line.
+     * Value: A String value, specifying the color of a crosshair value line.
+     */
+    valueLineColor: string;
+}
+/**
+ * The chart print options storage.
+ */
+interface ASPxClientChartPrintOptions {
+    /**
+     * Gets the size mode used to print a chart.
+     */
+    GetSizeMode(): string;
+    /**
+     * Sets the size mode used to print a chart.
+     * @param sizeMode A System.String object, specifying the name of the size mode.
+     */
+    SetSizeMode(sizeMode: string): void;
+    /**
+     * Gets a value indicating that the landscape orientation will be used to print a chart.
+     */
+    GetLandscape(): boolean;
+    /**
+     * Sets a value indicating that the landscape orientation will be used to print a chart.
+     * @param landscape A Boolean value, specifying that the landscape orientation will be used to print a chart.
+     */
+    SetLandscape(landscape: boolean): void;
+    /**
+     * Gets the left margin which will be used to print a chart.
+     */
+    GetMarginLeft(): number;
+    /**
+     * Sets the left margin which will be used to print a chart.
+     * @param marginLeft A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginLeft(marginLeft: number): void;
+    /**
+     * Gets the top margin which will be used to print a chart.
+     */
+    GetMarginTop(): number;
+    /**
+     * Sets the top margin which will be used to print a chart.
+     * @param marginTop A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginTop(marginTop: number): void;
+    /**
+     * Gets the right margin which will be used to print a chart.
+     */
+    GetMarginRight(): number;
+    /**
+     * Sets the right margin which will be used to print a chart.
+     * @param marginRight A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginRight(marginRight: number): void;
+    /**
+     * Gets the bottom margin which will be used to print a chart.
+     */
+    GetMarginBottom(): number;
+    /**
+     * Sets the bottom margin which will be used to print a chart.
+     * @param marginBottom A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginBottom(marginBottom: number): void;
+    /**
+     * Gets the predefined size ratio of the paper which will be used to print a chart.
+     */
+    GetPaperKind(): string;
+    /**
+     * Sets the predefined size ratio of the paper which will be used to print a chart.
+     * @param paperKind A System.String object, specifying the name of a size ratio.
+     */
+    SetPaperKind(paperKind: string): void;
+    /**
+     * Gets the custom paper width which will be used to print a chart.
+     */
+    GetCustomPaperWidth(): number;
+    /**
+     * Sets the custom paper width which will be used to print a chart.
+     * @param customPaperWidth A System.Int32 object, specifying the width in hundredths of an inch.
+     */
+    SetCustomPaperWidth(customPaperWidth: number): void;
+    /**
+     * Gets the custom paper height which will be used to print a chart.
+     */
+    GetCustomPaperHeight(): number;
+    /**
+     * Sets the custom paper height which will be used to print a chart.
+     * @param customPaperHeight A System.Int32 object, specifying the height in hundredths of an inch.
+     */
+    SetCustomPaperHeight(customPaperHeight: number): void;
+    /**
+     * Gets the name of the custom paper width-height ratio used to print the chart.
+     */
+    GetCustomPaperName(): string;
+    /**
+     * Sets the name of the custom paper width-height ratio used to print a chart.
+     * @param customPaperName A String object, specifying the name of the custom paper width-height ratio.
+     */
+    SetCustomPaperName(customPaperName: string): void;
+}
+/**
+ * Represents the client-side equivalent of the CustomLegendItem class.
+ */
+interface ASPxClientCustomLegendItem extends ASPxClientWebChartElementNamed {
+    /**
+     * Returns the text displayed by the custom legend item.
+     * Value: A string value that specifies legend item text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxDocumentViewer control.
+ */
+interface ASPxClientDocumentViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDocumentViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when the value of an item within the Document Viewer's report toolbar is changed.
+     */
+    ToolbarItemValueChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when an item within the Document Viewer's report toolbar is clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client side when a report page is loaded into this ASPxClientDocumentViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Provides access to the Splitter of the ASPxClientDocumentViewer.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Provides access to the ASPxClientDocumentViewer's preview that exposes methods to print and export the document.
+     */
+    GetViewer(): ASPxClientReportViewer;
+    /**
+     * Provides access to the Document Viewer toolbar on the client.
+     */
+    GetToolbar(): ASPxClientReportToolbar;
+    /**
+     * Provides access to the Ribbon of the ASPxClientDocumentViewer.
+     */
+    GetRibbonToolbar(): ASPxClientRibbon;
+    /**
+     * Provides access to the parameters panel of the ASPxClientDocumentViewer.
+     */
+    GetParametersPanel(): ASPxClientReportParametersPanel;
+    /**
+     * Provides access to the document of the ASPxClientDocumentViewer.
+     */
+    GetDocumentMap(): ASPxClientReportDocumentMap;
+    /**
+     * Sets focus on the report control specified by its bookmark.
+     * @param pageIndex An integer value, specifying the page index.
+     * @param bookmarkPath A String value, specifying the path to the bookmark.
+     */
+    GotoBookmark(pageIndex: number, bookmarkPath: string): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified page index.
+     * @param pageIndex A Int32 representing the index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays the specified report page.
+     * @param pageIndex An integer value, identifying the report page.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+}
+/**
+ * A method that will handle the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemValueChanged event.
+     * @param source A Object that is the event source.
+     * @param e An ASPxClientToolbarItemValueChangedEventArgs object, containing the event arguments.
+     */
+    (source: S, e: ASPxClientToolbarItemValueChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Provides access to the toolbar's value editor on the client.
+     * Value: An ASPxClientControl descendant.
+     */
+    editor: ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ASPxQueryBuilder control.
+ */
+interface ASPxClientQueryBuilder extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientQueryBuilder.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Enables you to customize the menu actions of a Query Builder.
+     */
+    CustomizeToolbarActions: ASPxClientEvent<ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientQueryBuilderSaveCommandExecuteEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientQueryBuilder properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Query Builder.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Gets a client-side model of the currently opened query serialized to Json.
+     */
+    GetJsonQueryModel(): string;
+    /**
+     * Saves the current query.
+     */
+    Save(): void;
+    /**
+     * Invokes a Data Preview for the current query.
+     */
+    ShowPreview(): void;
+    /**
+     * Specifies whether or not the current query is a valid SQL string.
+     */
+    IsQueryValid(): boolean;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientQueryBuilderSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientQueryBuilderSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomizeToolbarActions event.
+ */
+interface ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeToolbarActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs): void;
+}
+/**
+ * Provides settings to the actions listed in a Query Builder menu.
+ */
+interface ASPxClientQueryBuilderMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when a Query Builder's button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the Query Builder user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for the CustomizeToolbarActions event.
+ */
+interface ASPxClientQueryBuilderCustomizeToolbarActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the collection of customized menu actions.
+     * Value: An ASPxClientQueryBuilderMenuAction array.
+     */
+    Actions: ASPxClientQueryBuilderMenuAction[];
+    /**
+     * Returns a menu action with the specified ID.
+     * @param actionId A String value, specifying the action ID.
+     */
+    GetById(actionId: string): ASPxClientQueryBuilderMenuAction;
+}
+/**
+ * The client-side equivalent of the Web Report Designer control.
+ */
+interface ASPxClientReportDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientReportDesignerSaveCommandExecuteEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the menu actions of a Web Report Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientReportDesignerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client side when the Report Designer is being closed.
+     */
+    ExitDesigner: ASPxClientEvent<ASPxClientReportDesignerExitDesignerEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientReportDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Web Report Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Gets a client-side model of the currently opened report serialized to Json.
+     */
+    GetJsonReportModel(): string;
+    /**
+     * Returns serialization information for the specific property of the specific control type.
+     * @param controlType A string that identifies the name of the control type for which serialization information is to be returned.
+     * @param propertyDisplayName A string that identifies the name of the property for which serialization information is to be returned.
+     */
+    GetPropertyInfo(controlType: string, propertyDisplayName: string): ASPxDesignerElementSerializationInfo;
+    /**
+     * Indicates whether or not the current ASPxClientReportDesigner instance has been modified.
+     */
+    IsModified(): boolean;
+    /**
+     * Resets the value returned by the IsModified method.
+     */
+    ResetIsModified(): void;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientReportDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeMenuActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeMenuActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * Provides settings to the actions listed in a Web Report Designer menu.
+ */
+interface ASPxClientReportDesignerMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when a Web Report Designer's button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the designer user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for the CustomizeMenuActions event.
+ */
+interface ASPxClientReportDesignerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the collection of customized menu actions.
+     * Value: An ASPxClientReportDesignerMenuAction array.
+     */
+    Actions: ASPxClientReportDesignerMenuAction[];
+    /**
+     * Returns a menu action with the specified ID.
+     * @param actionId A String value, specifying the action ID.
+     */
+    GetById(actionId: string): ASPxClientReportDesignerMenuAction;
+}
+/**
+ * Provides data for the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventArgs extends ASPxClientEventArgs {
+}
+interface ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<S> {
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+/**
+ * A method that will handle the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventHandler<S> {
+    /**
+     * A method that will handle the ExitDesigner event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerExitDesignerEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerExitDesignerEventArgs): void;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Document Map.
+ */
+interface ASPxClientReportDocumentMap extends ASPxClientControl {
+    /**
+     * Occurs after the content of the Document Viewer's document map is updated.
+     */
+    ContentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientReportDocumentMap>>;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Parameters Panel.
+ */
+interface ASPxClientReportParametersPanel extends ASPxClientControl {
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param parametersInfo An array of ASPxClientReportParameterInfo values specifying parameters and values to assign.
+     */
+    AssignParameters(parametersInfo: ASPxClientReportParameterInfo[]): void;
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param path A System.String specifying the parameter's path.
+     * @param value An object specifying the parameter value.
+     */
+    AssignParameter(path: string, value: Object): void;
+    /**
+     * Returns an array storing the names of parameters available in a report.
+     */
+    GetParameterNames(): string[];
+    /**
+     * Returns a value editor that is associated with a parameter with the specified name.
+     * @param parameterName A String value, specifying the parameter name.
+     */
+    GetEditorByParameterName(parameterName: string): ASPxClientControl;
+}
+interface ASPxClientReportParameterInfo {
+    Path: string;
+    Value: Object;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's toolbar.
+ */
+interface ASPxClientReportToolbar extends ASPxClientControl {
+    /**
+     * Provides access to the control template assigned for the specified menu item.
+     * @param name A String value, specifying the menu item name.
+     */
+    GetItemTemplateControl(name: string): ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ReportViewer.
+ */
+interface ASPxClientReportViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client side when another report page is loaded into this ASPxClientReportViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Submits the values of the specified parameters.
+     * @param parameters A dictionary containing the parameter names, along with their Object values.
+     */
+    SubmitParameters(parameters: { [key: string]: Object; }): void;
+    /**
+     * Prints a report shown in the ReportViewer.
+     */
+    Print(): void;
+    /**
+     * Prints a report page with the specified page index.
+     * @param pageIndex An integer value which specifies an index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays a report page with the specified page index in the ReportViewer.
+     * @param pageIndex An integer value which specifies the index of a page to be displayed.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+}
+interface ASPxClientReportViewerPageLoadEventHandler<S> {
+    (source: S, e: ASPxClientReportViewerPageLoadEventArgs): void;
+}
+/**
+ * Provides data for a Report Viewer's PageLoad event on the client side.
+ */
+interface ASPxClientReportViewerPageLoadEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value specifying a zero-based index of a page to be displayed in a report viewer.
+     * Returns: $
+     */
+    PageIndex: number;
+    /**
+     * Gets a value specifying the total number of pages displayed in a report viewer.
+     * Returns: $
+     */
+    PageCount: number;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the first page of a report.
+     */
+    IsFirstPage(): boolean;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the last page of a report.
+     */
+    IsLastPage(): boolean;
+}
+/**
+ * Provides data for the CustomizeParameterEditors events.
+ */
+interface ASPxClientCustomizeParameterEditorsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object.
+     */
+    parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to an object that stores information required to serialize a parameter editor.
+     * Value: An ASPxDesignerElementSerializationInfo object.
+     */
+    info: ASPxDesignerElementSerializationInfo;
+}
+interface ASPxClientCustomizeParameterLookUpSourceEventArgs extends ASPxClientEventArgs {
+    parameter: ASPxDesignerElementParameterDescriptor;
+    items: ASPxDesignerElementEditorItem[];
+    dataSource: Object;
+}
+/**
+ * Provides general information about a report parameter.
+ */
+interface ASPxDesignerElementParameterDescriptor {
+    /**
+     * Provides access to the parameter description.
+     * Value: A String value, specifying the parameter description.
+     */
+    description: string;
+    /**
+     * Provides access to the parameter name.
+     * Value: A String value, specifying the parameter name.
+     */
+    name: string;
+    /**
+     * Provides access to the parameter type.
+     * Value: A String value, specifying the parameter type.
+     */
+    type: string;
+    /**
+     * Provides access to the parameter value.
+     * Value: A Object, specifying the parameter value.
+     */
+    value: Object;
+    /**
+     * Provides access to the parameter visibility state.
+     * Value: true if the parameter is visible; otherwise false.
+     */
+    visible: boolean;
+}
+/**
+ * Provides information required to serialize an element.
+ */
+interface ASPxDesignerElementSerializationInfo {
+    /**
+     * Gets the property name that will be used in the model to store the property value.
+     * Value: A String value.
+     */
+    propertyName: string;
+    /**
+     * Gets the property name in the model that is displayed in the Property grid.
+     * Value: A String value.
+     */
+    displayName: string;
+    /**
+     * Gets the property name that will be used during serialization to store the property value.
+     * Value: A String value.
+     */
+    modelName: string;
+    /**
+     * Gets the default property value used for serialization.
+     * Value: A Object value.
+     */
+    defaultVal: Object;
+    /**
+     * Gets the information about a complex object's content.
+     * Value: An array of ASPxDesignerElementSerializationInfo objects.
+     */
+    info: ASPxDesignerElementSerializationInfo[];
+    /**
+     * Gets a value indicating whether or not the property returns an array.
+     * Value: true if the property returns an array; otherwise false.
+     */
+    array: boolean;
+    /**
+     * Gets a value indicating whether an object should be serialized to the ComponentStorage property.
+     * Value: true to serialize an object to the ObjectStorage; otherwise false.
+     */
+    link: boolean;
+    /**
+     * Gets a value specifying the type of value editor for the Property Grid.
+     * Value: An ASPxDesignerElementEditor object.
+     */
+    editor: ASPxDesignerElementEditor;
+    /**
+     * Gets the collection of values displayed in the Property grid.
+     * Value: An array of ASPxDesignerElementEditorItem objects.
+     */
+    valuesArray: ASPxDesignerElementEditorItem[];
+    /**
+     * Gets the rules for validating the property value entered into its editor.
+     * Value: An array of Object values.
+     */
+    validationRules: Object[];
+    /**
+     * Gets the visibility state of the value editor in the Property Grid.
+     * Value: A Object value.
+     */
+    visible: Object;
+    /**
+     * Gets a value, indicating whether or not the property value can be edited.
+     * Value: true to disable the property editing; otherwise false.
+     */
+    disabled: Object;
+}
+/**
+ * Provides information about a serialized property's value editor used in the Property Grid.
+ */
+interface ASPxDesignerElementEditor {
+    /**
+     * Gets the name of an HTML template specifying the editor and header of a complex object (i.e., an object having its content properties specified).
+     * Value: A String value.
+     */
+    header: string;
+    /**
+     * Gets a nullable value, specifying the name of an HTML template used by a complex object's editor.
+     * Value: A String value.
+     */
+    content: string;
+    /**
+     * Gets a nullable value, specifying the type of the editor's model.
+     * Value: A Object value.
+     */
+    editorType: Object;
+}
+/**
+ * Provides information about property values.
+ */
+interface ASPxDesignerElementEditorItem {
+    /**
+     * Gets an actual property value.
+     * Value: A Object value.
+     */
+    value: Object;
+    /**
+     * Gets a value displayed by a property editor.
+     * Value: A String value.
+     */
+    displayValue: string;
+}
+/**
+ * A client-side equivalent of the ASPxWebDocumentViewer class.
+ */
+interface ASPxClientWebDocumentViewer extends ASPxClientControl {
+    /**
+     * Enables you to customize the menu actions of a Web Document Viewer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Provides access to the preview model of the ASPxClientWebDocumentViewer.
+     */
+    GetPreviewModel(): Object;
+    /**
+     * Opens the specified report in the HTML5 Document Viewer.
+     */
+    OpenReport(): Object;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified index.
+     * @param pageIndex An index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Exports the document to a PDF file.
+     */
+    ExportTo(): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'txt', 'xls', and 'xlsx'.
+     */
+    ExportTo(format: string): void;
+    /**
+     * Updates the localization settings of the ASPxClientWebDocumentViewer properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+}
+/**
+ * Provides settings to the actions listed in a Web Document Viewer menu.
+ */
+interface ASPxClientWebDocumentViewerMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when a Document Viewer's button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the Document Viewer user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for the CustomizeMenuActions event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the collection of customized menu actions.
+     * Value: An ASPxClientWebDocumentViewerMenuAction array.
+     */
+    Actions: ASPxClientWebDocumentViewerMenuAction[];
+    /**
+     * Returns a menu action with the specified ID.
+     * @param actionId A String value, specifying the action ID.
+     */
+    GetById(actionId: string): ASPxClientWebDocumentViewerMenuAction;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeMenuActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientWebDocumentViewerCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+interface ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<S> {
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+
+interface MVCxClientDashboardViewerStatic extends ASPxClientDashboardViewerStatic {
+}
+interface DashboardDataAxisNamesStatic {
+    /**
+     * Identifies a default axis in all data-bound dashboard items.
+     */
+    DefaultAxis: string;
+    /**
+     * Identifies a series axis in a chart and pie.
+     */
+    ChartSeriesAxis: string;
+    /**
+     * Identifies an argument axis in a chart, scatter chart and pie.
+     */
+    ChartArgumentAxis: string;
+    /**
+     * Identifies a sparkline axis in a grid and cards.
+     */
+    SparklineAxis: string;
+    /**
+     * Identifies a pivot column axis.
+     */
+    PivotColumnAxis: string;
+    /**
+     * Identifies a pivot row axis.
+     */
+    PivotRowAxis: string;
+}
+interface DashboardSpecialValuesStatic {
+    /**
+     * Represents a null value.
+     */
+    NullValue: string;
+    /**
+     * Represents a null value in OLAP mode.
+     */
+    OlapNullValue: string;
+    /**
+     * Represents an Others value.
+     */
+    OthersValue: string;
+    /**
+     * Represents an error value for calculated fields.
+     */
+    ErrorValue: string;
+    /**
+     * Returns whether or not the specified value is an NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OlapNullValue.
+     * @param value The specified value.
+     */
+    IsOlapNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an ErrorValue.
+     * @param value The specified value.
+     */
+    IsErrorValue(value: Object): boolean;
+}
+interface ASPxClientDashboardDesignerStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDashboardViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDashboardViewer;
+}
+interface DashboardExportPageLayoutStatic {
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is portrait.
+     */
+    Portrait: string;
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is landscape.
+     */
+    Landscape: string;
+}
+interface DashboardExportPaperKindStatic {
+    /**
+     * Letter paper (8.5 in. by 11 in.).
+     */
+    Letter: string;
+    /**
+     * Legal paper (8.5 in. by 14 in.).
+     */
+    Legal: string;
+    /**
+     * Executive paper (7.25 in. by 10.5 in.).
+     */
+    Executive: string;
+    /**
+     * A5 paper (148 mm by 210 mm).
+     */
+    A5: string;
+    /**
+     * A4 paper (210 mm by 297 mm).
+     */
+    A4: string;
+    /**
+     * A3 paper (297 mm by 420 mm).
+     */
+    A3: string;
+}
+interface DashboardExportScaleModeStatic {
+    /**
+     * The dashboard (dashboard item) on the exported page retains its original size.
+     */
+    None: string;
+    /**
+     * The size of the dashboard (dashboard item) on the exported page is changed according to the scale factor value.
+     */
+    UseScaleFactor: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed according to the width of the exported page.
+     */
+    AutoFitToPageWidth: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed to fit its content on a single page.
+     */
+    AutoFitWithinOnePage: string;
+}
+interface DashboardExportFilterStateStatic {
+    /**
+     * The filter state is not included in the exported document.
+     */
+    None: string;
+    /**
+     * The filter state is placed below the dashboard (dashboard item) in the exported document.
+     */
+    Below: string;
+    /**
+     * The filter state is placed on a separate page in the exported document.
+     */
+    SeparatePage: string;
+}
+interface DashboardExportImageFormatStatic {
+    /**
+     * The PNG image format.
+     */
+    Png: string;
+    /**
+     * The GIF image format.
+     */
+    Gif: string;
+    /**
+     * The JPG image format.
+     */
+    Jpg: string;
+}
+interface DashboardExportExcelFormatStatic {
+    /**
+     * The Excel 97 - Excel 2003 (XLS) file format.
+     */
+    Xls: string;
+    /**
+     * The Office Excel 2007 XML-based (XLSX) file format.
+     */
+    Xlsx: string;
+    /**
+     * A comma-separated values (CSV) file format.
+     */
+    Csv: string;
+}
+interface ChartExportSizeModeStatic {
+    /**
+     * A chart dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A chart dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A chart dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface MapExportSizeModeStatic {
+    /**
+     * A map dashboard item is exported in a size identical to that shown on the dashboard
+     */
+    None: string;
+    /**
+     * A map dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface RangeFilterExportSizeModeStatic {
+    /**
+     * A Range Filter dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A Range Filter dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A Range Filter dashboard item is resized proportionally to best fit the printed page.
+     */
+    Zoom: string;
+}
+interface DashboardSelectionModeStatic {
+    None: string;
+    Single: string;
+    Multiple: string;
+}
+interface ASPxClientEditBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientEditStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Assigns a null value to all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container, and belonging to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ClearEditorsInContainer(container: Object): void;
+    /**
+     * Assigns a null value to all editors which are located within the specified container object, and belonging to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object, and belonging to a specific validation group.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object.
+     * @param containerId A string value specifying the editor container's identifier.
+     */
+    ClearEditorsInContainerById(containerId: string): void;
+    /**
+     * Assigns a null value to all editors which belong to a specific validation group, dependent on the visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified validation group; false to clear only visible editors.
+     */
+    ClearGroup(validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors which belong to a specific validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearGroup(validationGroup: string): void;
+    /**
+     * Performs validation of all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ValidateEditorsInContainer(container: Object): boolean;
+    /**
+     * Performs validation of the editors which are located within the specified container and belong to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors which are located within the specified container.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    ValidateEditorsInContainerById(containerId: string): boolean;
+    /**
+     * Performs validation of editors contained within the specified validation group, dependent on the editor visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified validation group; false to validate only visible editors.
+     */
+    ValidateGroup(validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors contained within the specified validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ValidateGroup(validationGroup: string): boolean;
+    /**
+     * Verifies whether the editors in a specified visibility state, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(container: Object, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(container: Object, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors located in a specified container are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    AreEditorsValid(container: Object): boolean;
+    /**
+     * Verifies whether the editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    AreEditorsValid(containerId: string): boolean;
+    /**
+     * Verifies whether visible editors on a page are valid.
+     */
+    AreEditorsValid(): boolean;
+}
+interface ASPxClientBinaryImageStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientBinaryImage;
+}
+interface ASPxClientButtonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButton;
+}
+interface ASPxClientCalendarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCalendar;
+}
+interface ASPxClientCaptchaStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCaptcha;
+}
+interface ASPxClientCheckBoxStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBox;
+}
+interface ASPxClientRadioButtonStatic extends ASPxClientCheckBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButton;
+}
+interface ASPxClientTextEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientTextBoxBaseStatic extends ASPxClientTextEditStatic {
+}
+interface ASPxClientButtonEditBaseStatic extends ASPxClientTextBoxBaseStatic {
+}
+interface ASPxClientDropDownEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientColorEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientColorEdit;
+}
+interface ASPxClientComboBoxStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientComboBox;
+}
+interface ASPxClientDateEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDateEdit;
+}
+interface ASPxClientDropDownEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDropDownEdit;
+}
+interface ASPxClientFilterControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFilterControl;
+}
+interface ASPxClientListEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientListBoxStatic extends ASPxClientListEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientListBox;
+}
+interface ASPxClientCheckListBaseStatic extends ASPxClientListEditStatic {
+}
+interface ASPxClientRadioButtonListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButtonList;
+}
+interface ASPxClientCheckBoxListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBoxList;
+}
+interface ASPxClientProgressBarStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientProgressBar;
+}
+interface ASPxClientSpinEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientSpinEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpinEdit;
+}
+interface ASPxClientTimeEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimeEdit;
+}
+interface ASPxClientStaticEditStatic extends ASPxClientEditBaseStatic {
+}
+interface ASPxClientHyperLinkStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHyperLink;
+}
+interface ASPxClientImageBaseStatic extends ASPxClientStaticEditStatic {
+}
+interface ASPxClientImageStatic extends ASPxClientImageBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImage;
+}
+interface ASPxClientLabelStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLabel;
+}
+interface ASPxClientTextBoxStatic extends ASPxClientTextBoxBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTextBox;
+}
+interface ASPxClientMemoStatic extends ASPxClientTextEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMemo;
+}
+interface ASPxClientButtonEditStatic extends ASPxClientButtonEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButtonEdit;
+}
+interface ASPxClientTokenBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTokenBox;
+}
+interface ASPxClientTrackBarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTrackBar;
+}
+interface ASPxClientValidationSummaryStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGaugeControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGaugeControl;
+}
+interface ASPxClientGridBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGridViewCallbackCommandStatic {
+    /**
+     * Default value: "NEXTPAGE"
+     */
+    NextPage: string;
+    /**
+     * Default value: "PREVPAGE"
+     */
+    PreviousPage: string;
+    /**
+     * Default value: "GOTOPAGE"
+     */
+    GotoPage: string;
+    /**
+     * Default value: "SELECTROWS"
+     */
+    SelectRows: string;
+    /**
+     * Default value: "SELECTROWSKEY"
+     */
+    SelectRowsKey: string;
+    /**
+     * Default value: "SELECTION"
+     */
+    Selection: string;
+    /**
+     * Default value: "FOCUSEDROW"
+     */
+    FocusedRow: string;
+    /**
+     * Default value: "GROUP"
+     */
+    Group: string;
+    /**
+     * Default value: "UNGROUP"
+     */
+    UnGroup: string;
+    /**
+     * Default value: "SORT"
+     */
+    Sort: string;
+    /**
+     * Default value: "COLUMNMOVE"
+     */
+    ColumnMove: string;
+    /**
+     * Default value: "COLLAPSEALL"
+     */
+    CollapseAll: string;
+    /**
+     * Default value: "EXPANDALL"
+     */
+    ExpandAll: string;
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+    /**
+     * Default value: "COLLAPSEROW"
+     */
+    CollapseRow: string;
+    /**
+     * Default value: "HIDEALLDETAIL"
+     */
+    HideAllDetail: string;
+    /**
+     * Default value: "SHOWALLDETAIL"
+     */
+    ShowAllDetail: string;
+    /**
+     * Default value: "SHOWDETAILROW"
+     */
+    ShowDetailRow: string;
+    /**
+     * Default value: "HIDEDETAILROW"
+     */
+    HideDetailRow: string;
+    /**
+     * Default value: "PAGERONCLICK"
+     */
+    PagerOnClick: string;
+    /**
+     * Default value: "APPLYFILTER"
+     */
+    ApplyFilter: string;
+    /**
+     * Default value: "APPLYCOLUMNFILTER"
+     */
+    ApplyColumnFilter: string;
+    /**
+     * Default value: "APPLYMULTICOLUMNFILTER"
+     */
+    ApplyMultiColumnFilter: string;
+    /**
+     * Default value: "APPLYHEADERCOLUMNFILTER"
+     */
+    ApplyHeaderColumnFilter: string;
+    /**
+     * Default value: "APPLYSEARCHPANELFILTER"
+     */
+    ApplySearchPanelFilter: string;
+    /**
+     * Default value: "FILTERROWMENU"
+     */
+    FilterRowMenu: string;
+    /**
+     * Default value: "STARTEDIT"
+     */
+    StartEdit: string;
+    /**
+     * Default value: "CANCELEDIT"
+     */
+    CancelEdit: string;
+    /**
+     * Default value: "UPDATEEDIT"
+     */
+    UpdateEdit: string;
+    /**
+     * Default value: "ADDNEWROW"
+     */
+    AddNewRow: string;
+    /**
+     * Default value: "DELETEROW"
+     */
+    DeleteRow: string;
+    /**
+     * Default value: "CUSTOMBUTTON"
+     */
+    CustomButton: string;
+    /**
+     * Default value: "CUSTOMCALLBACK"
+     */
+    CustomCallback: string;
+    /**
+     * Default value: "SHOWFILTERCONTROL"
+     */
+    ShowFilterControl: string;
+    /**
+     * Default value: "CLOSEFILTERCONTROL"
+     */
+    CloseFilterControl: string;
+    /**
+     * Default value: "SETFILTERENABLED"
+     */
+    SetFilterEnabled: string;
+    /**
+     * Default value: "REFRESH"
+     */
+    Refresh: string;
+    /**
+     * Default value: "SELFIELDVALUES"
+     */
+    SelFieldValues: string;
+    /**
+     * Default value: "ROWVALUES"
+     */
+    RowValues: string;
+    /**
+     * Default value: "PAGEROWVALUES"
+     */
+    PageRowValues: string;
+    /**
+     * Default value: "FILTERPOPUP"
+     */
+    FilterPopup: string;
+    /**
+     * Default value: "CONTEXTMENU"
+     */
+    ContextMenu: string;
+    /**
+     * Default value: "CUSTOMVALUES"
+     */
+    CustomValues: string;
+}
+interface ASPxClientGridLookupStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridLookup;
+}
+interface ASPxClientCardViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCardView;
+}
+interface ASPxClientGridViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridView;
+}
+interface ASPxClientVerticalGridStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientVerticalGrid;
+}
+interface ASPxClientVerticalGridCallbackCommandStatic {
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+}
+interface ASPxClientCommandConstsStatic {
+    /**
+     * Identifies a command that shows a search panel.
+     * Value: "showsearchpanel"
+     */
+    SHOWSEARCHPANEL_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Find and Replace dialog.
+     * Value: "findandreplacedialog"
+     */
+    FINDANDREPLACE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that applies the bold text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "bold"
+     */
+    BOLD_COMMAND: string;
+    /**
+     * Identifies a command that makes the selected text italic or regular type depending on the current state.
+     * Value: "italic"
+     */
+    ITALIC_COMMAND: string;
+    /**
+     * Identifies a command that applies the underline text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "underline"
+     */
+    UNDERLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the strike through text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "strikethrough"
+     */
+    STRIKETHROUGH_COMMAND: string;
+    /**
+     * Identifies a command that applies the superscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "superscript"
+     */
+    SUPERSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that applies the subscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "subscript"
+     */
+    SUBSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that centers the content of the currently focused paragraph.
+     * Value: "justifycenter"
+     */
+    JUSTIFYCENTER_COMMAND: string;
+    /**
+     * Identifies a command that left justifies the content of the currently focused paragraph.
+     * Value: "justifyleft"
+     */
+    JUSTIFYLEFT_COMMAND: string;
+    /**
+     * Identifies a command that creates an indent for the selected paragarph.
+     * Value: "indent"
+     */
+    INDENT_COMMAND: string;
+    /**
+     * Identifies a command that creates an outdent for the focused paragarph.
+     * Value: "outdent"
+     */
+    OUTDENT_COMMAND: string;
+    /**
+     * Identifies a command that right justifies the content of the currently focused paragraph.
+     * Value: "justifyright"
+     */
+    JUSTIFYRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that fully justifies the content of the currently focused paragraph (aligned with both the left and right margines).
+     * Value: "justifyfull"
+     */
+    JUSTIFYFULL_COMMAND: string;
+    /**
+     * Identifies a command that changes the size of the selected text.
+     * Value: "fontsize"
+     */
+    FONTSIZE_COMMAND: string;
+    /**
+     * Identifies a command that changes the font of the selected text.
+     * Value: "fontname"
+     */
+    FONTNAME_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a fore color pickers and sets the selected text fore color.
+     * Value: "forecolor"
+     */
+    FONTCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a back color pickers and sets the selected text back color.
+     * Value: "backcolor"
+     */
+    BACKCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that wraps the selected paragraph in the specified html tag.
+     * Value: "formatblock"
+     */
+    FORMATBLOCK_COMMAND: string;
+    /**
+     * Identifies a command that wraps the currently selected text content in a specific html tag with a css class assigned to it.
+     * Value: "applycss"
+     */
+    APPLYCSS_COMMAND: string;
+    /**
+     * Identifies a command that removes all formatting from the selected content.
+     * Value: "removeformat"
+     */
+    REMOVEFORMAT_COMMAND: string;
+    /**
+     * Identifies a command that cancels the last action.
+     * Value: "undo"
+     */
+    UNDO_COMMAND: string;
+    /**
+     * Identifies a command that returns a previously canceled action.
+     * Value: "redo"
+     */
+    REDO_COMMAND: string;
+    /**
+     * Identifies a command that copies the selected content.
+     * Value: "copy"
+     */
+    COPY_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard at the current cursor position.
+     * Value: "paste"
+     */
+    PASTE_COMMAND: string;
+    /**
+     * Identifies a command that pastes a specified content taking into account that it was copied from Word.
+     * Value: "pastefromword"
+     */
+    PASTEFROMWORD_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Paste from Word dialog.
+     * Value: "pastefromworddialog"
+     */
+    PASTEFROMWORDDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that cuts the selected content.
+     * Value: "cut"
+     */
+    CUT_COMMAND: string;
+    /**
+     * Identifies a command that selects all content inside the html editor.
+     * Value: "selectall"
+     */
+    SELECT_ALL: string;
+    /**
+     * Identifies a command that deletes the selected content.
+     * Value: "delete"
+     */
+    DELETE_COMMAND: string;
+    /**
+     * Identifies a command that can be used to correctly insert HTML code into the editor.
+     * Value: "pastehtml"
+     */
+    PASTEHTML_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new ordered list.
+     * Value: "insertorderedlist"
+     */
+    INSERTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new unordered list.
+     * Value: "insertunorderedlist"
+     */
+    INSERTUNORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that restarts the current ordered list.
+     * Value: "restartorderedlist"
+     */
+    RESTARTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that continues a disrupted ordered list.
+     * Value: "continueorderedlist"
+     */
+    CONTINUEORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that removes a hyperlink from the selected text or image.
+     * Value: "unlink"
+     */
+    UNLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new hyperlink.
+     * Value: "insertlink"
+     */
+    INSERTLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new image.
+     * Value: "insertimage"
+     */
+    INSERTIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected image.
+     * Value: "changeimage"
+     */
+    CHANGEIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that initiates spell checking.
+     * Value: "checkspelling"
+     */
+    CHECKSPELLING_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Image dialog.
+     * Value: "insertimagedialog"
+     */
+    INSERTIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Image dialog.
+     * Value: "changeimagedialog"
+     */
+    CHANGEIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Link dialog.
+     * Value: "insertlinkdialog"
+     */
+    INSERTLINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Link dialog.
+     * Value: "changelinkdialog"
+     */
+    CHANGELINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Table dialog.
+     * Value: "inserttabledialog"
+     */
+    INSERTTABLE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Table Properties dialog.
+     * Value: "tablepropertiesdialog"
+     */
+    TABLEPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Cell Properties dialog.
+     * Value: "tablecellpropertiesdialog"
+     */
+    TABLECELLPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Column Properties dialog.
+     * Value: "tablecolumnpropertiesdialog"
+     */
+    TABLECOLUMNPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Row Properties dialog.
+     * Value: "tablerowpropertiesdialog"
+     */
+    TABLEROWPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes a default browser Print dialog, allowing an end-user to print the content of the html editor.
+     * Value: "print"
+     */
+    PRINT_COMMAND: string;
+    /**
+     * Identifies a command that toggles the full-screen mode.
+     * Value: "fullscreen"
+     */
+    FULLSCREEN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new table.
+     * Value: "inserttable"
+     */
+    INSERTTABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table.
+     * Value: "changetable"
+     */
+    CHANGETABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table cell.
+     * Value: "changetablecell"
+     */
+    CHANGETABLECELL_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table row.
+     * Value: "changetablerow"
+     */
+    CHANGETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table column.
+     * Value: "changetablecolumn"
+     */
+    CHANGETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table.
+     * Value: "deletetable"
+     */
+    DELETETABLE_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table row.
+     * Value: "deletetablerow"
+     */
+    DELETETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table column.
+     * Value: "deletetablecolumn"
+     */
+    DELETETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the left from the currently focused one.
+     * Value: "inserttablecolumntoleft"
+     */
+    INSERTTABLECOLUMNTOLEFT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the right from the currently focused one.
+     * Value: "inserttablecolumntoright"
+     */
+    INSERTTABLECOLUMNTORIGHT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row below the currently focused one.
+     * Value: "inserttablerowbelow"
+     */
+    INSERTTABLEROWBELOW_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row above the currently focused one.
+     * Value: "inserttablerowabove"
+     */
+    INSERTTABLEROWABOVE_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell horizontally.
+     * Value: "splittablecellhorizontally"
+     */
+    SPLITTABLECELLHORIZONTALLY_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell vertically.
+     * Value: "splittablecellvertically"
+     */
+    SPLITTABLECELLVERTICALLY_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one to the right.
+     * Value: "mergetablecellright"
+     */
+    MERGETABLECELLRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one below.
+     * Value: "mergetablecelldown"
+     */
+    MERGETABLECELLDOWN_COMMAND: string;
+    /**
+     * Identifies a command that invokes a custom dialog.
+     * Value: "customdialog"
+     */
+    CUSTOMDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that exports the html editor content.
+     * Value: "export"
+     */
+    EXPORT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new audio element.
+     * Value: "insertaudio"
+     */
+    INSERTAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new video.
+     * Value: "insertvideo"
+     */
+    INSERTVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new flash element.
+     * Value: "insertflash"
+     */
+    INSERTFLASH_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new YouTube video.
+     * Value: "insertyoutubevideo"
+     */
+    INSERTYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected audio element.
+     * Value: "changeaudio"
+     */
+    CHANGEAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected video element.
+     * Value: "changevideo"
+     */
+    CHANGEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected flash element.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected YouTube video element.
+     * Value: "changeyoutubevideo"
+     */
+    CHANGEYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Audio dialog.
+     * Value: "insertaudiodialog"
+     */
+    INSERTAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Video dialog.
+     * Value: "insertvideodialog"
+     */
+    INSERTVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Flash dialog.
+     * Value: "insertflashdialog"
+     */
+    INSERTFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert YouTube Video dialog.
+     * Value: "insertyoutubevideodialog"
+     */
+    INSERTYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Audio dialog.
+     * Value: "changeaudiodialog"
+     */
+    CHANGEAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Video dialog.
+     * Value: "changevideodialog"
+     */
+    CHANGEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Flash dialog.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change YouTube Video dialog.
+     * Value: "changeyoutubevideodialog"
+     */
+    CHANGEYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to SourceFormatting.
+     * Value: "pastehtmlsourceformatting"
+     */
+    PASTEHTMLSOURCEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to PlainText.
+     * Value: "pastehtmlplaintext"
+     */
+    PASTEHTMLPLAINTEXT_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to MergeFormatting.
+     * Value: "pastehtmlmergeformatting"
+     */
+    PASTEHTMLMERGEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new placeholder.
+     * Value: "insertplaceholder"
+     */
+    INSERTPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected placeholder.
+     * Value: "changeplaceholder"
+     */
+    CHANGEPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Placeholder dialog.
+     * Value: "insertplaceholderdialog"
+     */
+    INSERTPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Placeholder dialog.
+     * Value: "changeplaceholderdialog"
+     */
+    CHANGEPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that updates the editor content.
+     * Value: "updatedocument"
+     */
+    UPDATEDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that changes properties of the element selected in the tag inspector.
+     * Value: "changeelementproperties"
+     */
+    CHANGEELEMENTPROPERTIES_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Element Properties dialog.
+     * Value: "changeelementpropertiesdialog"
+     */
+    CHANGEELEMENTPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that comments the selected HTML code. If no code is selected, it comments the focused tag.
+     * Value: "comment"
+     */
+    COMMENT_COMMAND: string;
+    /**
+     * Identifies a command that uncomments the selected HTML code. If no code is selected, the command uncomments the currently focused tag.
+     * Value: "uncomment"
+     */
+    UNCOMMENTHTML_COMMAND: string;
+    /**
+     * Identifies a command that formats the current HTML document.
+     * Value: "formatdocument"
+     */
+    FORMATDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that applies the indent formatting to the selected content.
+     * Value: "indent"
+     */
+    INDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the outdent formatting to the focused content.
+     * Value: "outdent"
+     */
+    OUTDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that collapses the selected HTML tag.
+     * Value: "collapsetag"
+     */
+    COLLAPSETAG_COMMAND: string;
+    /**
+     * Identifies a command that expands the selected HTML tag.
+     * Value: "expandtag"
+     */
+    EXPANDTAG_COMMAND: string;
+    /**
+     * Identifies a command that shows intellisense for the HTML code editor.
+     * Value: "showintellisense"
+     */
+    SHOWINTELLISENSE_COMMAND: string;
+}
+interface ASPxClientHtmlEditorStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHtmlEditor;
+    /**
+     * Programmatically closes a custom dialog, supplying it with specific parameters.
+     * @param status An object representing a custom dialog's closing status.
+     * @param data An object representing custom data associated with a custom dialog.
+     */
+    CustomDialogComplete(status: Object, data: Object): void;
+}
+interface ASPxClientHtmlEditorMediaPreloadModeStatic {
+    /**
+     * The browser does not load a media file when the page loads.
+     */
+    None: string;
+    /**
+     * The browser loads the entire video when the page loads.
+     */
+    Auto: string;
+    /**
+     * The browser loads only metadata when the page loads.
+     */
+    Metadata: string;
+}
+interface ASPxClientPivotGridStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPivotGrid;
+}
+interface ASPxClientPivotCustomizationStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRichEditStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRichEdit;
+}
+interface ASPxSchedulerDateTimeHelperStatic {
+    /**
+     * Returns the date part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the date.
+     */
+    TruncToDate(date: Date): Date;
+    /**
+     * Returns the day time part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the day time.
+     */
+    ToDayTime(date: Date): any;
+    /**
+     * 
+     * @param date 
+     * @param dayCount 
+     */
+    AddDays(date: Date, dayCount: number): Date;
+    /**
+     * Adds the specified timespan to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add a timespan.
+     * @param timeSpan A TimeSpan object specifying the timespan to add.
+     */
+    AddTimeSpan(date: Date, timeSpan: any): Date;
+    /**
+     * Rounds a DateTime value up to the nearest interval.
+     * @param date A DateTime object containing a value to round.
+     * @param spanInMs A TimeSpan object specifying an interval to which to round.
+     */
+    CeilDateTime(date: Date, spanInMs: any): Date;
+}
+interface ASPxClientWeekDaysCheckEditStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceRangeControlStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDailyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientWeeklyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientMonthlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientYearlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientRecurrenceTypeEditStatic extends ASPxClientRadioButtonListStatic {
+}
+interface ASPxClientTimeIntervalStatic {
+    /**
+     * Gets the duration of a time interval between two points in time.
+     * @param start A DateTime object specifying the starting point of the time interval.
+     * @param end A DateTime object specifying the ending point of the time interval.
+     */
+    CalculateDuration(start: Date, end: Date): number;
+}
+interface ASPxClientSchedulerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientScheduler;
+}
+interface ASPxClientSpellCheckerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpellChecker;
+}
+interface ASPxClientSpreadsheetStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpreadsheet;
+}
+interface ASPxClientTreeListStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeList;
+}
+interface MVCxClientCalendarStatic extends ASPxClientCalendarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCalendar;
+}
+interface MVCxClientCallbackPanelStatic extends ASPxClientCallbackPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCallbackPanel;
+}
+interface MVCxClientCardViewStatic extends ASPxClientCardViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCardView;
+}
+interface MVCxClientChartStatic extends ASPxClientWebChartControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientChart;
+}
+interface MVCxClientComboBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientComboBox;
+}
+interface MVCxClientDataViewStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDataView;
+}
+interface MVCxClientDateEditStatic extends ASPxClientDateEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDateEdit;
+}
+interface MVCxClientDockManagerStatic extends ASPxClientDockManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockManager;
+}
+interface MVCxClientDockPanelStatic extends ASPxClientDockPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockPanel;
+}
+interface MVCxClientFileManagerStatic extends ASPxClientFileManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientFileManager;
+}
+interface MVCxClientGridViewStatic extends ASPxClientGridViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientGridView;
+}
+interface MVCxClientHtmlEditorStatic extends ASPxClientHtmlEditorStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientHtmlEditor;
+}
+interface MVCxClientImageGalleryStatic extends ASPxClientImageGalleryStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientImageGallery;
+}
+interface MVCxClientListBoxStatic extends ASPxClientListBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientListBox;
+}
+interface MVCxClientNavBarStatic extends ASPxClientNavBarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientNavBar;
+}
+interface MVCxClientPivotGridStatic extends ASPxClientPivotGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPivotGrid;
+}
+interface MVCxClientPopupControlStatic extends ASPxClientPopupControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPopupControl;
+}
+interface MVCxClientDocumentViewerStatic extends ASPxClientDocumentViewerStatic {
+}
+interface MVCxClientReportViewerStatic extends ASPxClientReportViewerStatic {
+}
+interface MVCxClientReportDesignerStatic extends ASPxClientReportDesignerStatic {
+}
+interface MVCxClientRichEditStatic extends ASPxClientRichEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRichEdit;
+}
+interface MVCxClientRoundPanelStatic extends ASPxClientRoundPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRoundPanel;
+}
+interface MVCxClientSchedulerStatic extends ASPxClientSchedulerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientScheduler;
+}
+interface MVCxSchedulerToolTipTypeStatic {
+    Appointment: number;
+    AppointmentDrag: number;
+    Selection: number;
+}
+interface MVCxClientSpreadsheetStatic extends ASPxClientSpreadsheetStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientSpreadsheet;
+}
+interface MVCxClientPageControlStatic extends ASPxClientPageControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPageControl;
+}
+interface MVCxClientTokenBoxStatic extends ASPxClientTokenBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTokenBox;
+}
+interface MVCxClientTreeListStatic extends ASPxClientTreeListStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeList;
+}
+interface MVCxClientTreeViewStatic extends ASPxClientTreeViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeView;
+}
+interface MVCxClientUploadControlStatic extends ASPxClientUploadControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientUploadControl;
+}
+interface MVCxClientUtilsStatic {
+    /**
+     * Loads service resources (such as scripts, CSS files, etc.) required for DevExpress functionality to work properly after a non DevExpress callback has been processed on the server and returned back to the client.
+     */
+    FinalizeCallback(): void;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object): Object;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     * @param processInvisibleEditors true to process both visible and invisible editors that belong to the specified container; false to process only visible editors.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object, processInvisibleEditors: boolean): Object;
+}
+interface MVCxClientGlobalEventsStatic {
+    /**
+     * Dynamically connects the ControlsInitialized client event with an appropriate event handler function.
+     * @param handler A object representing the event handling function's content.
+     */
+    AddControlsInitializedEventHandler(handler: ASPxClientControlsInitializedEventHandler<any>): void;
+    /**
+     * Dynamically connects the BeginCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddBeginCallbackEventHandler(handler: MVCxClientBeginCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the EndCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddEndCallbackEventHandler(handler: ASPxClientEndCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the CallbackError client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddCallbackErrorHandler(handler: ASPxClientCallbackErrorEventHandler<any>): void;
+}
+interface MVCxClientVerticalGridStatic extends ASPxClientVerticalGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientVerticalGrid;
+}
+interface MVCxClientWebDocumentViewerStatic extends ASPxClientWebDocumentViewerStatic {
+}
+interface ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControlBase;
+}
+interface ASPxClientControlStatic extends ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControl;
+    /**
+     * Modifies the controls size on the page.
+     */
+    AdjustControls(): void;
+    /**
+     * Modifies the controls size within the specified container.
+     * @param container An HTML element that is the container of the controls.
+     */
+    AdjustControls(container: Object): void;
+    /**
+     * Returns a collection of client web control objects.
+     */
+    GetControlCollection(): ASPxClientControlCollection;
+}
+interface ASPxClientCallbackStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallback;
+}
+interface ASPxClientCallbackPanelStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallbackPanel;
+}
+interface ASPxClientCloudControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCloudControl;
+}
+interface ASPxClientDataViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDataView;
+}
+interface ASPxClientDockManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockManager;
+}
+interface ASPxClientPopupControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDockPanelStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockPanel;
+}
+interface ASPxClientDockZoneStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockZone;
+}
+interface ASPxClientFileManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFileManager;
+}
+interface ASPxClientFileManagerCommandConstsStatic {
+    /**
+     * The name of a command that is executed when an end-user renames an item.
+     */
+    Rename: string;
+    /**
+     * The name of a command that is executed when an end-user moves an item.
+     */
+    Move: string;
+    /**
+     * The name of a command that is executed when an end-user deletes an item.
+     */
+    Delete: string;
+    /**
+     * The name of a command that is executed when an end-user creates a folder.
+     */
+    Create: string;
+    /**
+     * The name of a command that is executed when an end-user uploads a file.
+     */
+    Upload: string;
+    /**
+     * The name of a command that is executed when an end-user downloads an item.
+     */
+    Download: string;
+    /**
+     * The name of a command that is executed when an end-user copies an item.
+     */
+    Copy: string;
+    /**
+     * The name of a command that is executed when an end-user opens an item.
+     */
+    Open: string;
+}
+interface ASPxClientFileManagerErrorConstsStatic {
+    /**
+     * The specified file is not found.    Return Value: 0
+     */
+    FileNotFound: number;
+    /**
+     * The specified folder is not found.    Return Value: 1
+     */
+    FolderNotFound: number;
+    /**
+     * Access is denied.    Return Value: 2
+     */
+    AccessDenied: number;
+    /**
+     * Unspecified IO error occurs.    Return Value: 3
+     */
+    UnspecifiedIO: number;
+    /**
+     * Unspecified error occurs.    Return Value: 4
+     */
+    Unspecified: number;
+    /**
+     * The file/folder name is empty.    Return Value: 5
+     */
+    EmptyName: number;
+    /**
+     * The operation was canceled.    Return Value: 6
+     */
+    CanceledOperation: number;
+    /**
+     * The specified name contains invalid characters.    Return Value: 7
+     */
+    InvalidSymbols: number;
+    /**
+     * The specified file extension is not allowed.    Return Value: 8
+     */
+    WrongExtension: number;
+    /**
+     * The file/folder is being used by another process.    Return Value: 9
+     */
+    UsedByAnotherProcess: number;
+    /**
+     * The specified file/folder already exists.    Return Value: 10
+     */
+    AlreadyExists: number;
+}
+interface ASPxClientFormLayoutStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFormLayout;
+}
+interface ASPxClientHiddenFieldStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHiddenField;
+}
+interface ASPxClientImageGalleryStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageGallery;
+}
+interface ASPxClientImageSliderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageSlider;
+}
+interface ASPxClientImageZoomNavigatorStatic extends ASPxClientImageSliderStatic {
+}
+interface ASPxClientImageZoomStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientLoadingPanelStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLoadingPanel;
+}
+interface ASPxClientMenuBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Returns a collection of client menu objects.
+     */
+    GetMenuCollection(): ASPxClientMenuCollection;
+}
+interface ASPxClientMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMenu;
+}
+interface ASPxClientTouchUIStatic {
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param id A string value specifying the element's ID.
+     */
+    MakeScrollable(id: string): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param element An object that specifies the required DOM element.
+     */
+    MakeScrollable(element: Object): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with  scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param id A string value specifying the name of a DOM element that should be extended with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(id: string, options: ASPxClientTouchUIOptions): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param element An object specifying the DOM element to extend with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(element: Object, options: ASPxClientTouchUIOptions): ScrollExtender;
+}
+interface ASPxClientNavBarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNavBar;
+}
+interface ASPxClientNewsControlStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNewsControl;
+}
+interface ASPxClientObjectContainerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientObjectContainer;
+}
+interface ASPxClientPanelBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanelBase;
+}
+interface ASPxClientPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanel;
+}
+interface ASPxClientPopupControlStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupControl;
+    /**
+     * Returns a collection of client popup control objects.
+     */
+    GetPopupControlCollection(): ASPxClientPopupControlCollection;
+}
+interface ASPxClientPopupControlResizeStateStatic {
+    /**
+     * A window has been resized. Returns 0.
+     */
+    Resized: number;
+    /**
+     * A window has been collapsed. Returns 1.
+     */
+    Collapsed: number;
+    /**
+     * A window has been expanded. Returns 2.
+     */
+    Expanded: number;
+    /**
+     * A window has been maximized. Returns 3.
+     */
+    Maximized: number;
+    /**
+     * A window has been restored after maximizing. Returns 4.
+     */
+    RestoredAfterMaximized: number;
+}
+interface ASPxClientPopupControlCloseReasonStatic {
+    /**
+     * The window has been closed by an API.
+     */
+    API: string;
+    /**
+     * An end-user clicks the close header button.
+     */
+    CloseButton: string;
+    /**
+     * An end-user clicks outside the window's region
+     */
+    OuterMouseClick: string;
+    /**
+     * An end-user moves the mouse pointer out of the window region.
+     */
+    MouseOut: string;
+    /**
+     * An end-user presses the ESC key.
+     */
+    Escape: string;
+}
+interface ASPxClientPopupMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupMenu;
+}
+interface ASPxClientRatingControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRatingControl;
+}
+interface ASPxClientRibbonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRibbon;
+}
+interface ASPxClientRibbonStateStatic {
+    /**
+     * A ribbon is in the normal state. Returns 0
+     */
+    Normal: number;
+    /**
+     * A ribbon is minimized. Returns 1
+     */
+    Minimized: number;
+    /**
+     * A ribbon is temporarily shown. Returns 2
+     */
+    TemporaryShown: number;
+}
+interface ASPxClientRoundPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRoundPanel;
+}
+interface ASPxClientSplitterStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSplitter;
+}
+interface ASPxClientTabControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientTabControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTabControl;
+}
+interface ASPxClientPageControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPageControl;
+}
+interface ASPxClientTimerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimer;
+}
+interface ASPxClientTitleIndexStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTitleIndex;
+}
+interface ASPxClientTreeViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeView;
+}
+interface ASPxClientUploadControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientUploadControl;
+}
+interface ASPxClientUtilsStatic {
+    /**
+     * Gets the user-agent string, which identifies the client browser and provides certain system details of the client computer.
+     * Value: A string value representing the browser's user-agent string.
+     */
+    agent: string;
+    /**
+     * Gets a value that specifies whether the client browser is Opera.
+     * Value: true if the client browser is Opera; otherwise, false.
+     */
+    opera: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Opera version 9.
+     * Value: true if the client browser is Opera version 9; otherwise, false.
+     */
+    opera9: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari.
+     * Value: true if the client browser is Safari; otherwise, false.
+     */
+    safari: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari version 3.
+     * Value: true if the client browser is Safari version 3; otherwise, false.
+     */
+    safari3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari, running under a MacOS operating system.
+     * Value: true if the client browser is Safari, running under a MacOS operating system; otherwise, false.
+     */
+    safariMacOS: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Google Chrome.
+     * Value: true if the client browser is Google Chrome; otherwise, false.
+     */
+    chrome: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer.
+     * Value: true if the client browser is Intenet Explorer; otherwise, false.
+     */
+    ie: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer version 7.
+     * Value: true if the client browser is Intenet Explorer version 7; otherwise, false.
+     */
+    ie7: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox.
+     * Value: true if the client browser is Firefox; otherwise, false.
+     */
+    firefox: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox version 3.
+     * Value: true if the client browser is Firefox version 3; otherwise, false.
+     */
+    firefox3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Mozilla.
+     * Value: true if the client browser is Mozilla; otherwise, false.
+     */
+    mozilla: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Netscape.
+     * Value: true if the client browser is Netscape; otherwise, false.
+     */
+    netscape: boolean;
+    /**
+     * Gets a value that specifies a client browser's full version.
+     * Value: A double precision floating-point value that specifies a client browser's version.
+     */
+    browserVersion: number;
+    /**
+     * Gets a value that specifies a client browser's major version.
+     * Value: An integer value that specifies a client browser's major version.
+     */
+    browserMajorVersion: number;
+    /**
+     * Gets a value that specifies whether the application is run under a MacOS platform.
+     * Value: true if the application is run under the MacOS platform; otherwise, false.
+     */
+    macOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Windows platform.
+     * Value: true if the application is run under the Windows platform; otherwise, false.
+     */
+    windowsPlatform: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on WebKit.
+     * Value: true if the client browser is based on WebKit; otherwise, false.
+     */
+    webKitFamily: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on Netscape.
+     * Value: true if client browser is based on Netscape; otherwise, false.
+     */
+    netscapeFamily: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports touch.
+     * Value: true if the client browser supports touch; otherwise, false.
+     */
+    touchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the WebKit touch user interface.
+     * Value: true if the client browser supports the WebKit touch user interface; otherwise, false.
+     */
+    webKitTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the Microsoft touch user interface.
+     * Value: true if the client browser supports the Microsoft touch user interface; otherwise, false.
+     */
+    msTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under an iOS platform.
+     * Value: true if the application is run under the iOS platform; otherwise, false.
+     */
+    iOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Android platform.
+     * Value: true if the application is run under the Android platform; otherwise, false.
+     */
+    androidPlatform: boolean;
+    /**
+     * Inserts the specified item into the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to insert.
+     */
+    ArrayInsert(array: Object[], element: Object): void;
+    /**
+     * Removes the specified item from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to remove.
+     */
+    ArrayRemove(array: Object[], element: Object): void;
+    /**
+     * Removes an item at the specified index location from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param index The zero-based index location of the array item to remove.
+     */
+    ArrayRemoveAt(array: Object[], index: number): void;
+    /**
+     * Removes all items from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     */
+    ArrayClear(array: Object[]): void;
+    /**
+     * Searches for the specified array item and returns the zero-based index of its first occurrence within the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to locate.
+     */
+    ArrayIndexOf(array: Object[], element: Object): number;
+    /**
+     * Binds the specified function to a specific element's event, so that the function gets called whenever the event fires on the element.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name without the "on" prefix.
+     * @param method An object that specifies the event's handling function.
+     */
+    AttachEventToElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Unbinds the specified function from a specific element's event, so that the function stops receiving notifications when the event fires.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name.
+     * @param method An object that specifies the event's handling function.
+     */
+    DetachEventFromElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Returns the object that fired the event.
+     * @param htmlEvent An object that represents the current event.
+     */
+    GetEventSource(htmlEvent: Object): Object;
+    /**
+     * Gets the x-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventX(htmlEvent: Object): number;
+    /**
+     * Gets the y-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventY(htmlEvent: Object): number;
+    /**
+     * Gets the keyboard code for the specified event.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetKeyCode(htmlEvent: Object): number;
+    /**
+     * Cancels the default action of the specified event.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEvent(htmlEvent: Object): boolean;
+    /**
+     * Cancels both the specified event's default action and the event's bubbling upon the hierarchy of event handlers.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEventAndBubble(htmlEvent: Object): boolean;
+    /**
+     * Removes mouse capture from the specified event's source object.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventDragStart(htmlEvent: Object): boolean;
+    /**
+     * Clears any text selection made within the window's client region.
+     */
+    ClearSelection(): void;
+    /**
+     * Gets a value that indicates whether the specified object exists on the client side.
+     * @param obj The object to test.
+     */
+    IsExists(obj: Object): boolean;
+    /**
+     * Gets a value that indicates whether the specified object is a function.
+     * @param obj The object to test.
+     */
+    IsFunction(obj: Object): boolean;
+    /**
+     * Gets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteX(element: Object): number;
+    /**
+     * Gets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteY(element: Object): number;
+    /**
+     * Sets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param x An integer value specifying the required element's x-coordinate, in pixels.
+     */
+    SetAbsoluteX(element: Object, x: number): void;
+    /**
+     * Sets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param y An integer value specifying the required element's y-coordinate, in pixels.
+     */
+    SetAbsoluteY(element: Object, y: number): void;
+    /**
+     * Returns the distance between the top edge of the document and the topmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollTop(): number;
+    /**
+     * Returns the distance between the left edge of the document and the leftmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollLeft(): number;
+    /**
+     * Gets the width of the window's client region.
+     */
+    GetDocumentClientWidth(): number;
+    /**
+     * Gets the height of the window's client region.
+     */
+    GetDocumentClientHeight(): number;
+    /**
+     * Gets a value indicating whether the object passed via the parentElement parameter is a parent of the object passed via the element parameter.
+     * @param parentElement An object specifying the parent HTML element.
+     * @param element An object specifying the child HTML element.
+     */
+    GetIsParent(parentElement: Object, element: Object): boolean;
+    /**
+     * Returns a reference to the specified HTML element's first parent object which has an ID that matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param id A string specifying the required parent's ID.
+     */
+    GetParentById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose element name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     */
+    GetParentByTagName(element: Object, tagName: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose class name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param className A string value specifying the class name of the desired HTML element.
+     */
+    GetParentByClassName(element: Object, className: string): Object;
+    /**
+     * Returns a reference to the first element that has the specified ID in the parent HTML element specified.
+     * @param element An object identifying the parent HTML element to search.
+     * @param id A string specifying the ID attribute value of the desired child element.
+     */
+    GetChildById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the particular element that has the specified element name and is contained within the specified parent HTML element.
+     * @param element An object specifying the parent HTML element to search.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     * @param index An integer value specifying the zero-based index of the desired element amongst all the matching elements found.
+     */
+    GetChildByTagName(element: Object, tagName: string, index: number): Object;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     */
+    SetCookie(name: string, value: string): void;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     * @param expirationDate A date-time object that represents the expiration date and time for the cookie.
+     */
+    SetCookie(name: string, value: string, expirationDate: Date): void;
+    /**
+     * Retrieves a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    GetCookie(name: string): string;
+    /**
+     * Deletes a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    DeleteCookie(name: string): void;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameters.
+     * @param keyCode An integer value that specifies the code of the key.
+     * @param isCtrlKey true if the CTRL key should be included into the key combination; otherwise, false.
+     * @param isShiftKey true if the SHIFT key should be included into the key combination; otherwise, false.
+     * @param isAltKey true if the ALT key should be included into the key combination; otherwise, false.
+     */
+    GetShortcutCode(keyCode: number, isCtrlKey: boolean, isShiftKey: boolean, isAltKey: boolean): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the pressed key combination, which is specified by the related HTML event.
+     * @param htmlEvent A DHTML event object that relates to a key combination being pressed.
+     */
+    GetShortcutCodeByEvent(htmlEvent: Object): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameter.
+     * @param shortcutString A string value that specifies the key combination.
+     */
+    StringToShortcutCode(shortcutString: string): number;
+    /**
+     * Trims all leading and trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    Trim(str: string): string;
+    /**
+     * Trims all leading whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimStart(str: string): string;
+    /**
+     * Trims all trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimEnd(str: string): string;
+}
+interface ASPxClientChartDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientChartDesigner;
+}
+interface ASPxClientWebChartControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebChartControl;
+}
+interface ASPxClientDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDocumentViewer;
+}
+interface ASPxClientQueryBuilderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientQueryBuilder;
+}
+interface ASPxClientReportDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportDesigner;
+}
+interface ASPxClientReportDocumentMapStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportParametersPanelStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportToolbarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportToolbar;
+}
+interface ASPxClientReportViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportViewer;
+}
+interface ASPxClientWebDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebDocumentViewer;
+}
+
+declare var MVCxClientDashboardViewer: MVCxClientDashboardViewerStatic;
+declare var DashboardDataAxisNames: DashboardDataAxisNamesStatic;
+declare var DashboardSpecialValues: DashboardSpecialValuesStatic;
+declare var ASPxClientDashboardDesigner: ASPxClientDashboardDesignerStatic;
+declare var ASPxClientDashboardViewer: ASPxClientDashboardViewerStatic;
+declare var DashboardExportPageLayout: DashboardExportPageLayoutStatic;
+declare var DashboardExportPaperKind: DashboardExportPaperKindStatic;
+declare var DashboardExportScaleMode: DashboardExportScaleModeStatic;
+declare var DashboardExportFilterState: DashboardExportFilterStateStatic;
+declare var DashboardExportImageFormat: DashboardExportImageFormatStatic;
+declare var DashboardExportExcelFormat: DashboardExportExcelFormatStatic;
+declare var ChartExportSizeMode: ChartExportSizeModeStatic;
+declare var MapExportSizeMode: MapExportSizeModeStatic;
+declare var RangeFilterExportSizeMode: RangeFilterExportSizeModeStatic;
+declare var DashboardSelectionMode: DashboardSelectionModeStatic;
+declare var ASPxClientEditBase: ASPxClientEditBaseStatic;
+declare var ASPxClientEdit: ASPxClientEditStatic;
+declare var ASPxClientBinaryImage: ASPxClientBinaryImageStatic;
+declare var ASPxClientButton: ASPxClientButtonStatic;
+declare var ASPxClientCalendar: ASPxClientCalendarStatic;
+declare var ASPxClientCaptcha: ASPxClientCaptchaStatic;
+declare var ASPxClientCheckBox: ASPxClientCheckBoxStatic;
+declare var ASPxClientRadioButton: ASPxClientRadioButtonStatic;
+declare var ASPxClientTextEdit: ASPxClientTextEditStatic;
+declare var ASPxClientTextBoxBase: ASPxClientTextBoxBaseStatic;
+declare var ASPxClientButtonEditBase: ASPxClientButtonEditBaseStatic;
+declare var ASPxClientDropDownEditBase: ASPxClientDropDownEditBaseStatic;
+declare var ASPxClientColorEdit: ASPxClientColorEditStatic;
+declare var ASPxClientComboBox: ASPxClientComboBoxStatic;
+declare var ASPxClientDateEdit: ASPxClientDateEditStatic;
+declare var ASPxClientDropDownEdit: ASPxClientDropDownEditStatic;
+declare var ASPxClientFilterControl: ASPxClientFilterControlStatic;
+declare var ASPxClientListEdit: ASPxClientListEditStatic;
+declare var ASPxClientListBox: ASPxClientListBoxStatic;
+declare var ASPxClientCheckListBase: ASPxClientCheckListBaseStatic;
+declare var ASPxClientRadioButtonList: ASPxClientRadioButtonListStatic;
+declare var ASPxClientCheckBoxList: ASPxClientCheckBoxListStatic;
+declare var ASPxClientProgressBar: ASPxClientProgressBarStatic;
+declare var ASPxClientSpinEditBase: ASPxClientSpinEditBaseStatic;
+declare var ASPxClientSpinEdit: ASPxClientSpinEditStatic;
+declare var ASPxClientTimeEdit: ASPxClientTimeEditStatic;
+declare var ASPxClientStaticEdit: ASPxClientStaticEditStatic;
+declare var ASPxClientHyperLink: ASPxClientHyperLinkStatic;
+declare var ASPxClientImageBase: ASPxClientImageBaseStatic;
+declare var ASPxClientImage: ASPxClientImageStatic;
+declare var ASPxClientLabel: ASPxClientLabelStatic;
+declare var ASPxClientTextBox: ASPxClientTextBoxStatic;
+declare var ASPxClientMemo: ASPxClientMemoStatic;
+declare var ASPxClientButtonEdit: ASPxClientButtonEditStatic;
+declare var ASPxClientTokenBox: ASPxClientTokenBoxStatic;
+declare var ASPxClientTrackBar: ASPxClientTrackBarStatic;
+declare var ASPxClientValidationSummary: ASPxClientValidationSummaryStatic;
+declare var ASPxClientGaugeControl: ASPxClientGaugeControlStatic;
+declare var ASPxClientGridBase: ASPxClientGridBaseStatic;
+declare var ASPxClientGridViewCallbackCommand: ASPxClientGridViewCallbackCommandStatic;
+declare var ASPxClientGridLookup: ASPxClientGridLookupStatic;
+declare var ASPxClientCardView: ASPxClientCardViewStatic;
+declare var ASPxClientGridView: ASPxClientGridViewStatic;
+declare var ASPxClientVerticalGrid: ASPxClientVerticalGridStatic;
+declare var ASPxClientVerticalGridCallbackCommand: ASPxClientVerticalGridCallbackCommandStatic;
+declare var ASPxClientCommandConsts: ASPxClientCommandConstsStatic;
+declare var ASPxClientHtmlEditor: ASPxClientHtmlEditorStatic;
+declare var ASPxClientHtmlEditorMediaPreloadMode: ASPxClientHtmlEditorMediaPreloadModeStatic;
+declare var ASPxClientPivotGrid: ASPxClientPivotGridStatic;
+declare var ASPxClientPivotCustomization: ASPxClientPivotCustomizationStatic;
+declare var ASPxClientRichEdit: ASPxClientRichEditStatic;
+declare var ASPxSchedulerDateTimeHelper: ASPxSchedulerDateTimeHelperStatic;
+declare var ASPxClientWeekDaysCheckEdit: ASPxClientWeekDaysCheckEditStatic;
+declare var ASPxClientRecurrenceRangeControl: ASPxClientRecurrenceRangeControlStatic;
+declare var ASPxClientRecurrenceControlBase: ASPxClientRecurrenceControlBaseStatic;
+declare var ASPxClientDailyRecurrenceControl: ASPxClientDailyRecurrenceControlStatic;
+declare var ASPxClientWeeklyRecurrenceControl: ASPxClientWeeklyRecurrenceControlStatic;
+declare var ASPxClientMonthlyRecurrenceControl: ASPxClientMonthlyRecurrenceControlStatic;
+declare var ASPxClientYearlyRecurrenceControl: ASPxClientYearlyRecurrenceControlStatic;
+declare var ASPxClientRecurrenceTypeEdit: ASPxClientRecurrenceTypeEditStatic;
+declare var ASPxClientTimeInterval: ASPxClientTimeIntervalStatic;
+declare var ASPxClientScheduler: ASPxClientSchedulerStatic;
+declare var ASPxClientSpellChecker: ASPxClientSpellCheckerStatic;
+declare var ASPxClientSpreadsheet: ASPxClientSpreadsheetStatic;
+declare var ASPxClientTreeList: ASPxClientTreeListStatic;
+declare var MVCxClientCalendar: MVCxClientCalendarStatic;
+declare var MVCxClientCallbackPanel: MVCxClientCallbackPanelStatic;
+declare var MVCxClientCardView: MVCxClientCardViewStatic;
+declare var MVCxClientChart: MVCxClientChartStatic;
+declare var MVCxClientComboBox: MVCxClientComboBoxStatic;
+declare var MVCxClientDataView: MVCxClientDataViewStatic;
+declare var MVCxClientDateEdit: MVCxClientDateEditStatic;
+declare var MVCxClientDockManager: MVCxClientDockManagerStatic;
+declare var MVCxClientDockPanel: MVCxClientDockPanelStatic;
+declare var MVCxClientFileManager: MVCxClientFileManagerStatic;
+declare var MVCxClientGridView: MVCxClientGridViewStatic;
+declare var MVCxClientHtmlEditor: MVCxClientHtmlEditorStatic;
+declare var MVCxClientImageGallery: MVCxClientImageGalleryStatic;
+declare var MVCxClientListBox: MVCxClientListBoxStatic;
+declare var MVCxClientNavBar: MVCxClientNavBarStatic;
+declare var MVCxClientPivotGrid: MVCxClientPivotGridStatic;
+declare var MVCxClientPopupControl: MVCxClientPopupControlStatic;
+declare var MVCxClientDocumentViewer: MVCxClientDocumentViewerStatic;
+declare var MVCxClientReportViewer: MVCxClientReportViewerStatic;
+declare var MVCxClientReportDesigner: MVCxClientReportDesignerStatic;
+declare var MVCxClientRichEdit: MVCxClientRichEditStatic;
+declare var MVCxClientRoundPanel: MVCxClientRoundPanelStatic;
+declare var MVCxClientScheduler: MVCxClientSchedulerStatic;
+declare var MVCxSchedulerToolTipType: MVCxSchedulerToolTipTypeStatic;
+declare var MVCxClientSpreadsheet: MVCxClientSpreadsheetStatic;
+declare var MVCxClientPageControl: MVCxClientPageControlStatic;
+declare var MVCxClientTokenBox: MVCxClientTokenBoxStatic;
+declare var MVCxClientTreeList: MVCxClientTreeListStatic;
+declare var MVCxClientTreeView: MVCxClientTreeViewStatic;
+declare var MVCxClientUploadControl: MVCxClientUploadControlStatic;
+declare var MVCxClientUtils: MVCxClientUtilsStatic;
+declare var MVCxClientGlobalEvents: MVCxClientGlobalEventsStatic;
+declare var MVCxClientVerticalGrid: MVCxClientVerticalGridStatic;
+declare var MVCxClientWebDocumentViewer: MVCxClientWebDocumentViewerStatic;
+declare var ASPxClientControlBase: ASPxClientControlBaseStatic;
+declare var ASPxClientControl: ASPxClientControlStatic;
+declare var ASPxClientCallback: ASPxClientCallbackStatic;
+declare var ASPxClientCallbackPanel: ASPxClientCallbackPanelStatic;
+declare var ASPxClientCloudControl: ASPxClientCloudControlStatic;
+declare var ASPxClientDataView: ASPxClientDataViewStatic;
+declare var ASPxClientDockManager: ASPxClientDockManagerStatic;
+declare var ASPxClientPopupControlBase: ASPxClientPopupControlBaseStatic;
+declare var ASPxClientDockPanel: ASPxClientDockPanelStatic;
+declare var ASPxClientDockZone: ASPxClientDockZoneStatic;
+declare var ASPxClientFileManager: ASPxClientFileManagerStatic;
+declare var ASPxClientFileManagerCommandConsts: ASPxClientFileManagerCommandConstsStatic;
+declare var ASPxClientFileManagerErrorConsts: ASPxClientFileManagerErrorConstsStatic;
+declare var ASPxClientFormLayout: ASPxClientFormLayoutStatic;
+declare var ASPxClientHiddenField: ASPxClientHiddenFieldStatic;
+declare var ASPxClientImageGallery: ASPxClientImageGalleryStatic;
+declare var ASPxClientImageSlider: ASPxClientImageSliderStatic;
+declare var ASPxClientImageZoomNavigator: ASPxClientImageZoomNavigatorStatic;
+declare var ASPxClientImageZoom: ASPxClientImageZoomStatic;
+declare var ASPxClientLoadingPanel: ASPxClientLoadingPanelStatic;
+declare var ASPxClientMenuBase: ASPxClientMenuBaseStatic;
+declare var ASPxClientMenu: ASPxClientMenuStatic;
+declare var ASPxClientTouchUI: ASPxClientTouchUIStatic;
+declare var ASPxClientNavBar: ASPxClientNavBarStatic;
+declare var ASPxClientNewsControl: ASPxClientNewsControlStatic;
+declare var ASPxClientObjectContainer: ASPxClientObjectContainerStatic;
+declare var ASPxClientPanelBase: ASPxClientPanelBaseStatic;
+declare var ASPxClientPanel: ASPxClientPanelStatic;
+declare var ASPxClientPopupControl: ASPxClientPopupControlStatic;
+declare var ASPxClientPopupControlResizeState: ASPxClientPopupControlResizeStateStatic;
+declare var ASPxClientPopupControlCloseReason: ASPxClientPopupControlCloseReasonStatic;
+declare var ASPxClientPopupMenu: ASPxClientPopupMenuStatic;
+declare var ASPxClientRatingControl: ASPxClientRatingControlStatic;
+declare var ASPxClientRibbon: ASPxClientRibbonStatic;
+declare var ASPxClientRibbonState: ASPxClientRibbonStateStatic;
+declare var ASPxClientRoundPanel: ASPxClientRoundPanelStatic;
+declare var ASPxClientSplitter: ASPxClientSplitterStatic;
+declare var ASPxClientTabControlBase: ASPxClientTabControlBaseStatic;
+declare var ASPxClientTabControl: ASPxClientTabControlStatic;
+declare var ASPxClientPageControl: ASPxClientPageControlStatic;
+declare var ASPxClientTimer: ASPxClientTimerStatic;
+declare var ASPxClientTitleIndex: ASPxClientTitleIndexStatic;
+declare var ASPxClientTreeView: ASPxClientTreeViewStatic;
+declare var ASPxClientUploadControl: ASPxClientUploadControlStatic;
+declare var ASPxClientUtils: ASPxClientUtilsStatic;
+declare var ASPxClientChartDesigner: ASPxClientChartDesignerStatic;
+declare var ASPxClientWebChartControl: ASPxClientWebChartControlStatic;
+declare var ASPxClientDocumentViewer: ASPxClientDocumentViewerStatic;
+declare var ASPxClientQueryBuilder: ASPxClientQueryBuilderStatic;
+declare var ASPxClientReportDesigner: ASPxClientReportDesignerStatic;
+declare var ASPxClientReportDocumentMap: ASPxClientReportDocumentMapStatic;
+declare var ASPxClientReportParametersPanel: ASPxClientReportParametersPanelStatic;
+declare var ASPxClientReportToolbar: ASPxClientReportToolbarStatic;
+declare var ASPxClientReportViewer: ASPxClientReportViewerStatic;
+declare var ASPxClientWebDocumentViewer: ASPxClientWebDocumentViewerStatic;
+
diff --git a/types/devexpress-web/v161/tsconfig.json b/types/devexpress-web/v161/tsconfig.json
new file mode 100644
index 0000000000..a64418f9b0
--- /dev/null
+++ b/types/devexpress-web/v161/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "devexpress-web": ["devexpress-web/v161"],
+            "devexpress-web/*": ["devexpress-web/v161/*"]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "devexpress-web-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v162/devexpress-web-tests.ts b/types/devexpress-web/v162/devexpress-web-tests.ts
new file mode 100644
index 0000000000..ef7eb8de37
--- /dev/null
+++ b/types/devexpress-web/v162/devexpress-web-tests.ts
@@ -0,0 +1,418 @@
+declare var hiddenField: ASPxClientHiddenField;
+declare var mainCallbackPanel: ASPxClientCallbackPanel;
+declare var loginPopup: ASPxClientPopupControl;
+declare var searchButton: ASPxClientButton;
+declare var searchComboBox: ASPxClientComboBox;
+declare var roomsNumberSpinEdit: ASPxClientSpinEdit;
+declare var adultsNumberSpinEdit: ASPxClientSpinEdit; 
+declare var childrenNumberSpinEdit: ASPxClientSpinEdit;
+declare var checkInDateEdit: ASPxClientDateEdit;
+declare var checkOutDateEdit: ASPxClientDateEdit;
+declare var backSlider: ASPxClientImageSlider;
+declare var locationComboBox: ASPxClientComboBox;
+declare var nightyRateTrackBar: ASPxClientTrackBar;
+declare var customerRatingTrackBar: ASPxClientTrackBar;
+declare var ourRatingCheckBoxList: ASPxClientCheckBoxList;
+declare var startFilterPopupControl: ASPxClientPopupControl;
+declare var imagePopupControl: ASPxClientPopupControl;
+declare var emailTextBox: ASPxClientTextBox;
+declare var creditCardEmailTextBox: ASPxClientTextBox;
+declare var accountEmailTextBox: ASPxClientTextBox;
+declare var bookingPageControl: ASPxClientPageControl;
+declare var paymentTypePageControl: ASPxClientPageControl;
+declare var offerFormPopup: ASPxClientPopupControl;
+declare var roomsSpinEdit: ASPxClientSpinEdit;
+declare var adultsSpinEdit: ASPxClientSpinEdit;
+declare var childrenSpinEdit: ASPxClientSpinEdit;
+declare var hotelDetailsCallbackPanel: ASPxClientCallbackPanel;
+declare var leftPanel: ASPxClientPanel;
+declare var menuButton: ASPxClientButton;
+declare var aboutWindow: ASPxClientPopupControl;
+declare var offersZone: ASPxClientDockZone;
+
+module DXDemo {
+    function showPage(page: string, params: { [key: string]: any }, skipHistory?: boolean): void {
+        var queryString = getQueryString(params || {});
+        hiddenField.Set("page", page);
+        hiddenField.Set("parameters", queryString);
+        hideMenu();
+        var uri = queryString.length ? (page + "?" + queryString) : page;
+        try {
+            if (!skipHistory && window.history && window.history.pushState)
+                window.history.pushState(uri, "", uri || "Default.aspx");
+        } catch (e) { }
+        mainCallbackPanel.PerformCallback(uri);
+    };
+
+    export function onMainMenuItemClick(s: ASPxClientMenu, e: ASPxClientMenuItemClickEventArgs): void {
+        switch (e.item.name) {
+            case "login":
+                hideMenu();
+                setTimeout(function () { loginPopup.ShowAtElementByID("MainCallbackPanel_ContentPane"); }, 300);
+                break;
+            case "offers":
+                showPage("SpecialOffers", {});
+                break;
+            default:
+                hideMenu();
+                setTimeout(function () { showAboutWindow(); }, 300);
+                break;
+        }
+    };
+
+    export function onLoginButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        loginPopup.Hide();
+        showAboutWindow();
+    };
+
+    export function onSearchButtonClick(): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            showPage("ShowHotels", {
+                location: searchComboBox.GetValue(),
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsNumberSpinEdit.GetValue() || 1,
+                adults: adultsNumberSpinEdit.GetValue() || 1,
+                children: childrenNumberSpinEdit.GetValue() || 0
+            });
+        }
+    };
+
+    export function onSearchComboBoxIndexChanged(s: ASPxClientComboBox, e: ASPxClientProcessingModeEventArgs): void {
+        hideMenu();
+        searchButton.AdjustControl();
+    };
+
+    export function onIndexOfferCloseClick(index: number): void {
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + index);
+        var sibPanel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + (index == 1 ? 2 : 1));
+        panel.Hide();
+        sibPanel.MakeFloat();
+        sibPanel.SetWidth(offersZone.GetWidth());
+        sibPanel.Dock(offersZone);
+    };
+
+    export function onLogoClick(): void {
+        showPage("", null, false);
+    };
+
+    export function onMenuNavButtonCheckedChanged(s: ASPxClientCheckBox, e: ASPxClientProcessingModeEventArgs): void {
+        var mainContainer = mainCallbackPanel.GetMainElement();
+        if (s.GetChecked()) {
+            backSlider.Pause();
+            showMenu();
+        }
+        else {
+            hideMenu();
+            backSlider.Play();
+        }
+    };
+
+    export function onBackNavButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        var params = getCurrentQueryParams();
+        switch (getCurrentPage()) {
+            case "PrintInvoice":
+                showPage("Booking", params, false);
+                break;
+            case "Booking":
+                if (bookingPageControl.GetActiveTabIndex() > 0)
+                    bookingPageControl.SetActiveTabIndex(bookingPageControl.GetActiveTabIndex() - 1);
+                else
+                    showPage("ShowRooms", params, false);
+                break;
+            case "ShowRooms":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowDetails":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowHotels":
+            case "SpecialOffers":
+                showPage("", null, false);
+                break;
+        }
+    };
+
+    export function updateSearchResults(): void {
+        var params = getCurrentQueryParams();
+        params["location"] = locationComboBox.GetValue();
+        params["minprice"] = nightyRateTrackBar.GetPositionStart();
+        params["maxprice"] = nightyRateTrackBar.GetPositionEnd();
+        params["custrating"] = customerRatingTrackBar.GetPosition();
+        params["ourrating"] = ourRatingCheckBoxList.GetSelectedValues().join(",");
+        showPage("ShowHotels", params);
+    };
+
+    export function onBookHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onDetailsHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onShowStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        startFilterPopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    export function onChangeStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var params = getCurrentQueryParams();
+            params["checkin"] = getFormattedDate(<Date>checkInDateEdit.GetValue());
+            params["checkout"] = getFormattedDate(<Date>checkOutDateEdit.GetValue());
+            params["rooms"] = roomsNumberSpinEdit.GetValue() || 1;
+            params["adults"] = adultsNumberSpinEdit.GetValue() || 1;
+            params["children"] = childrenNumberSpinEdit.GetValue() || 0;
+            startFilterPopupControl.Hide();
+            showPage(hiddenField.Get("page").toString(), params);
+        }
+    };
+
+    export function onBookRoomButtonClick(roomID: string): void {
+        var params = getCurrentQueryParams();
+        params["roomID"] = roomID;
+        showPage("Booking", params);
+    };
+
+    export function onShowRoomsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onShowDetailsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onRoomImageNavItemClick(roomID: string, pictureName: string): void {
+        setTimeout(function () {
+            imagePopupControl.PerformCallback(roomID + "|" + pictureName);
+            imagePopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+        }, 500);
+    };
+
+    export function onRoomsNavBarExpandedChanged(s: ASPxClientNavBar, e: ASPxClientNavBarGroupEventArgs): void {
+        ASPxClientControl.AdjustControls(s.GetMainElement());
+    };
+
+    export function onNextBookingStepButtonClick(step: number): void {
+        var valid = true;
+        var validationGroup = "";
+        if (step == 1)
+            validationGroup = "Account";
+        if (step == 2)
+            validationGroup = "RoomDetails";
+        if (step == 3)
+            validationGroup = "PaymentDetails";
+
+        switch (step) {
+            case 1:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Account");
+                if (valid) {
+                    emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    creditCardEmailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    showPage("Booking", getCurrentQueryParams());
+                    return;
+                }
+                break;
+            case 2:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "RoomDetails");
+                emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                break;
+            case 3:
+                var paymentType = paymentTypePageControl.GetActiveTabIndex();
+                if (paymentType == 0)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "CreditCard");
+                else if (paymentType == 1)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Cash");
+                else if (paymentType == 2)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "PayPal");
+                break;
+        }
+        if (valid) {
+            bookingPageControl.GetTab(step).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(step);
+        }
+    };
+
+    export function onAccountCaptchaHiddenFieldInit(s: ASPxClientHiddenField, e: ASPxClientEventArgs): void {
+        if (s.Get("IsCaptchaValid")) {
+            bookingPageControl.GetTab(1).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(1);
+        }
+    };
+
+    export function onFinishBookingStepButtonClick(): void {
+        showAboutWindow();
+    };
+
+    export function OnPrintInvoiceButtonClick(): void {
+        showPage("PrintInvoice", getCurrentQueryParams());
+    };
+
+    export function onOfferClick(offerID: string): void {
+        offerFormPopup.SetContentHtml("");
+        offerFormPopup.PerformCallback(offerID);
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + offerID);
+        var panelElement = <HTMLElement>panel.GetMainElement();
+        if (panelElement.offsetWidth < 330 || panelElement.offsetHeight < 250) {
+            offerFormPopup.SetWidth(400);
+            offerFormPopup.SetHeight(280);
+            offerFormPopup.ShowAtElementByID("SpecialOffersContainer");
+        }
+        else {
+            offerFormPopup.SetWidth(panelElement.offsetWidth);
+            offerFormPopup.SetHeight(panelElement.offsetHeight);
+            offerFormPopup.ShowAtElement(panelElement);
+        }
+    };
+
+    export function onSpecialOfferCheckButtonClick(hotelID: string, locationID: string): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var queryParams: { [key: string]: any } = {
+                location: locationID,
+                hotelID: hotelID,
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsSpinEdit.GetValue() || 1,
+                adults: adultsSpinEdit.GetValue() || 1,
+                children: childrenSpinEdit.GetValue() || 0
+            };
+            showPage("ShowRooms", queryParams);
+        }
+    };
+
+    export function onIndexOfferClick(): void {
+        showPage("SpecialOffers", {});
+    };
+
+    export function onControlsInit(): void {
+        ASPxClientUtils.AttachEventToElement(window, 'popstate', onHistoryPopState);
+        var pathParts = document.location.href.split("/");
+        var url = pathParts[pathParts.length - 1];
+        try {
+            if (window.history)
+                window.history.replaceState(url, "");
+        } catch (e) { }
+        ASPxClientUtils.AttachEventToElement(window, "resize", onWindowResize);
+        if (ASPxClientUtils.iOSPlatform) {
+            // animate
+        }
+    };
+
+    export function updateRatingLabels(ratingControl: ASPxClientTrackBar) {
+        var start = ratingControl.GetPositionStart().toString();
+        var end = ratingControl.GetPositionEnd().toString();
+        document.getElementById("cpLeftLabelID").innerHTML = start + " " + end;
+    };
+
+    export function onRatingControlItemClick(s: ASPxClientRatingControl, e: ASPxClientRatingControlItemClickEventArgs): void {
+        hotelDetailsCallbackPanel.PerformCallback(s.GetValue().toString());
+    };
+
+    export function onInputKeyDown(s: ASPxClientTextBox, e: ASPxClientEditKeyEventArgs): void {
+        var keyCode = ASPxClientUtils.GetKeyCode(e.htmlEvent);
+        if (keyCode == 13)
+            (<HTMLElement>s.GetInputElement()).blur();
+    };
+
+    function getCurrentPage(): string {
+        var hfPage = <string>hiddenField.Get("page");
+        if (hfPage)
+            return hfPage;
+        var pathParts = document.location.pathname.split("/");
+        return pathParts[pathParts.length - 1];
+    };
+
+    function showAboutWindow(): void {
+        aboutWindow.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    function hideMenu(): void {
+        leftPanel.Collapse();
+        if (menuButton.GetMainElement() && menuButton.GetChecked())
+            menuButton.SetChecked(false);
+    };
+
+    function showMenu(): void {
+        leftPanel.Expand();
+    };
+
+    var _resizeSpecialOffersTimeoutID = -1;
+    function onWindowResize(): void {
+        switch (<string>hiddenField.Get("page")) {
+            case "SpecialOffers":
+                if (_resizeSpecialOffersTimeoutID == -1)
+                    _resizeSpecialOffersTimeoutID = setTimeout(resizeSpecialOffers, 200);
+                break;
+        }
+        hidePopups("AboutWindow", "StartFilterPopupControl", "LoginPopup", "OfferFormPopup", "ImagePopupControl");
+    };
+
+    function hidePopups(...names: string[]): void {
+        for (var i = 0; i < names.length; i++) {
+            var popupControl = <ASPxClientPopupControl>ASPxClientControl.GetControlCollection().GetByName(names[i]);
+            popupControl.Hide();
+        }
+    };
+
+    function resizeSpecialOffers(): void {
+        for (var i = 1; i <= 4; i++) {
+            var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + i);
+            if (panel && panel.IsVisible()) {
+                var zone = panel.GetOwnerZone();
+                zone.SetWidth((<HTMLElement>(<HTMLElement>zone.GetMainElement()).parentNode).offsetWidth)
+            }
+        }
+        _resizeSpecialOffersTimeoutID = -1;
+    };
+
+    function getFormattedDate(date: Date): string {
+        return (date.getMonth() + 1) + "-" + date.getDate() + "-" + date.getFullYear();
+    };
+
+    function getCurrentQueryParams(): { [key:string]: any } {
+        var hfParams = <string>hiddenField.Get("parameters");
+        if (hfParams)
+            return getParamsByQueryString(hfParams);
+        var query = document.location.search;
+        if (query[0] === "?")
+            query = query.substr(1);
+        return getParamsByQueryString(query);
+    };
+
+    function getQueryString(params: { [key:string]: any }): string {
+        var queryItems: any[] = [];
+        for (var key in params) {
+            if (!params.hasOwnProperty(key)) continue;
+            queryItems.push(key + "=" + params[key]);
+        }
+        if (queryItems.length > 0)
+            return queryItems.join("&");
+        return "";
+    };
+
+    function getParamsByQueryString(queryString: string): { [key: string]: string } {
+        var result: { [key: string]: any } = {};
+        if (queryString) {
+            var queryStringArray = queryString.split("&");
+            for (var i = 0; i < queryStringArray.length; i++) {
+                var part = queryStringArray[i].split('=');
+                if (part.length != 2) continue;
+                result[part[0]] = decodeURIComponent(part[1].replace(/\+/g, " "));
+            }
+        }
+        return result;
+    };
+
+    function onHistoryPopState(evt: any): void {
+        if (evt.state !== null && evt.state !== undefined) {
+            var uriParts = evt.state.split("?");
+            showPage(uriParts[0], getParamsByQueryString(uriParts[1]), true);
+        }
+    };
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v162/index.d.ts b/types/devexpress-web/v162/index.d.ts
new file mode 100644
index 0000000000..89d0b0d657
--- /dev/null
+++ b/types/devexpress-web/v162/index.d.ts
@@ -0,0 +1,28635 @@
+// Type definitions for DevExpress ASP.NET v162.7
+// Project: http://devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * A client-side counterpart of the DashboardViewer extension.
+ */
+interface MVCxClientDashboardViewer extends ASPxClientDashboardViewer {
+}
+/**
+ * Represents a list of records from the dashboard data source.
+ */
+interface ASPxClientDashboardItemUnderlyingData {
+    /**
+     * Gets the number of rows in the underlying data set.
+     */
+    GetRowCount(): number;
+    /**
+     * Returns the value of the specified cell within the underlying data set.
+     * @param rowIndex An integer value that specifies the zero-based index of the required row.
+     * @param dataMember A String that specifies the required data member.
+     */
+    GetRowValue(rowIndex: number, dataMember: string): Object;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Returns whether or not a request for underlying data was successful.
+     */
+    IsDataReceived(): boolean;
+    /**
+     * Returns a callstack containing the error caused by an unsuccessful request for underlying data.
+     */
+    GetRequestDataError(): string;
+}
+/**
+ * Contains parameters used to obtain the underlying data for the dashboard item.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataParameters {
+    /**
+     * Gets or sets an array of data member identifiers used to obtain underlying data.
+     * Value: An array of String objects that specify data member identifiers.
+     */
+    DataMembers: string[];
+    /**
+     * Gets or sets axis points used to obtain the underlying data.
+     * Value: An array of ASPxClientDashboardItemDataAxisPoint objects that represent axis points.
+     */
+    AxisPoints: ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets or sets the dimension value used to obtain the underlying data.
+     * Value: The dimension value.
+     */
+    ValuesByAxisName: Object;
+    /**
+     * Gets or sets the unique dimension value used to obtain the underlying data.
+     * Value: The unique dimension value.
+     */
+    UniqueValuesByAxisName: Object;
+}
+/**
+ * References a method executed after an asynchronous request is complete.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataCompleted {
+    /**
+     * References a method executed after an asynchronous request is completed.
+     * @param data An ASPxClientDashboardItemUnderlyingData object that represents a list of records from the dashboard data source.
+     */
+    (data: ASPxClientDashboardItemUnderlyingData): void;
+}
+/**
+ * References a method that will handle the ItemClick events.
+ */
+interface ASPxClientDashboardItemClickEventHandler<S> {
+    /**
+     * References a method that will handle the ItemClick events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick events.
+ */
+interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item for which the event has been raised.
+     * Value: A String that is the dashboard item name.
+     */
+    ItemName: string;
+    /**
+     * Gets the dashboard item's client data.
+     */
+    GetData(): ASPxClientDashboardItemData;
+    /**
+     * Returns the axis point corresponding to the clicked visual element.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Gets measures corresponding to the clicked visual element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets deltas corresponding to the clicked visual element.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Requests underlying data corresponding to the clicked visual element.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     * @param dataMembers An array of String values that specify data members used to obtain underlying data.
+     */
+    RequestUnderlyingData(onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted, dataMembers: string[]): void;
+}
+/**
+ * References a method that will handle the ItemVisualInteractivity events.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventHandler<S> {
+    /**
+     * References a method that will handle the ItemVisualInteractivity events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemVisualInteractivityEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemVisualInteractivityEventArgs): void;
+}
+/**
+ * Provides data for the ItemVisualInteractivity events.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets the selection mode for dashboard item elements.
+     */
+    GetSelectionMode(): string;
+    /**
+     * Sets the selection mode for dashboard item elements.
+     * @param selectionMode A String that specifies the selection mode.
+     */
+    SetSelectionMode(selectionMode: string): void;
+    /**
+     * Returns whether or not highlighting is enabled for the current dashboard item.
+     */
+    IsHighlightingEnabled(): boolean;
+    /**
+     * Enables highlighting for the current dashboard item.
+     * @param enableHighlighting true, to enable highlighting; otherwise, false.
+     */
+    EnableHighlighting(enableHighlighting: boolean): void;
+    /**
+     * Gets data axes used to perform custom interactivity actions.
+     */
+    GetTargetAxes(): string[];
+    /**
+     * Sets data axes used to perform custom interactivity actions.
+     * @param targetAxes An array of String objects that specify names of data axes.
+     */
+    SetTargetAxes(targetAxes: string[]): void;
+    /**
+     * Gets the default selection for the current dashboard item.
+     */
+    GetDefaultSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Sets the default selection for the current dashboard item.
+     * @param values An array of ASPxClientDashboardItemDataAxisPointTuple objects specifying axis point tuples used to select default elements.
+     */
+    SetDefaultSelection(values: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+}
+/**
+ * References a method that will handle the ItemSelectionChanged events.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemSelectionChanged events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemSelectionChangedEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemSelectionChanged events.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets currently selected elements.
+     */
+    GetCurrentSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+}
+/**
+ * References a method that will handle the ItemElementCustomColor event.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventHandler<S> {
+    /**
+     * References a method that will handle the ItemElementCustomColor events.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemElementCustomColorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemElementCustomColorEventArgs): void;
+}
+/**
+ * Provides data for the ItemElementCustomColor events.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item for which the event was raised.
+     */
+    ItemName: string;
+    /**
+     * Gets the axis point tuple that corresponds to the current dashboard item element.
+     */
+    GetTargetElement(): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Gets the color of the current dashboard item element.
+     */
+    GetColor(): string;
+    /**
+     * Sets the color of the current dashboard item element.
+     * @param color A String that specifies the color of the current dashboard item element.
+     */
+    SetColor(color: string): void;
+    /**
+     * Gets measures corresponding to the current dashboard item element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+}
+/**
+ * References a method that will handle the ItemWidgetCreated events.
+ */
+interface ASPxClientDashboardItemWidgetCreatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetCreated events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdating event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatingEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdating event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdated event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdated event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemBeforeWidgetDisposed events.
+ */
+interface ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemBeforeWidgetDisposed events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * Provides data for events related to client widgets used to visualize data in dashboard items.
+ */
+interface ASPxClientDashboardItemWidgetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A String that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns an underlying widget corresponding to the current dashboard item.
+     */
+    GetWidget(): Object;
+}
+/**
+ * Represents multidimensional data visualized in the dashboard item.
+ */
+interface ASPxClientDashboardItemData {
+    /**
+     * Gets the names of the axes that constitute the current ASPxClientDashboardItemData.
+     */
+    GetAxisNames(): string[];
+    /**
+     * Returns the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxis(axisName: string): ASPxClientDashboardItemDataAxis;
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the measures for the current ASPxClientDashboardItemData object.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets the deltas for the current ASPxClientDashboardItemData object.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point tuple.
+     * @param tuple A ASPxClientDashboardItemDataAxisPointTuple object that is a tuple of axis points.
+     */
+    GetSlice(tuple: ASPxClientDashboardItemDataAxisPointTuple): ASPxClientDashboardItemData;
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point.
+     * @param axisPoint An ASPxClientDashboardItemDataAxisPoint object that is the data point in a multidimensional space.
+     */
+    GetSlice(axisPoint: ASPxClientDashboardItemDataAxisPoint): ASPxClientDashboardItemData;
+    /**
+     * Returns a total summary value for the specified measure.
+     * @param measureId A String that is the measure identifier.
+     */
+    GetMeasureValue(measureId: string): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the summary value for the specified delta.
+     * @param deltaId A String that is the data item identifier.
+     */
+    GetDeltaValue(deltaId: string): ASPxClientDashboardItemDataDeltaValue;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Creates a tuple based on the specified axes names and corresponding values.
+     * @param values An array of name-value pairs containing the axis name and corresponding values.
+     */
+    CreateTuple(values: Object[]): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Creates a tuple based on the specified axis points.
+     * @param axisPoints An array of ASPxClientDashboardItemDataAxisPoint objects that specify axis points belonging to different data axes.
+     */
+    CreateTuple(axisPoints: ASPxClientDashboardItemDataAxisPoint[]): ASPxClientDashboardItemDataAxisPointTuple;
+}
+/**
+ * An axis that contains data points corresponding to the specified value hierarchy.
+ */
+interface ASPxClientDashboardItemDataAxis {
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points belonging to the current axis.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the root axis point belonging to the current ASPxClientDashboardItemDataAxis.
+     */
+    GetRootPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns axis points corresponding to values of the last-level dimension.
+     */
+    GetPoints(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns axis points corresponding to the specified dimension.
+     * @param dimensionId A String that is the dimension identifier.
+     */
+    GetPointsByDimension(dimensionId: string): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns the data point for the specified axis by unique values.
+     * @param uniqueValues A hierarchy of unique values identifying the required data point.
+     */
+    GetPointByUniqueValues(uniqueValues: Object[]): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Contains the dimension metadata.
+ */
+interface ASPxClientDashboardItemDataDimension {
+    /**
+     * Gets the dimension identifier.
+     * Value: A String that is the dimension identifier.
+     */
+    Id: string;
+    /**
+     * Gets or sets the name of the dimension.
+     * Value: A String that is the name of the dimension.
+     */
+    Name: string;
+    /**
+     * Gets the data member identifier for the current dimension.
+     * Value: A String value that identifies a data member.
+     */
+    DataMember: string;
+    /**
+     * Gets the group interval for date-time values for the current dimension.
+     * Value: A String value that represents how date-time values are grouped.
+     */
+    DateTimeGroupInterval: string;
+    /**
+     * Gets the group interval for string values.
+     * Value: A String value that specifies the group interval for string values.
+     */
+    TextGroupInterval: string;
+    /**
+     * Formats the specified value using format settings of the current dimension.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the measure metadata.
+ */
+interface ASPxClientDashboardItemDataMeasure {
+    /**
+     * Gets the measure identifier.
+     * Value: A String that is the measure identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the measure.
+     * Value: A String that is the name of the measure.
+     */
+    Name: string;
+    /**
+     * Gets the data member that identifies the data source list used to provide data for the current measure.
+     * Value: A String value that identifies the data source list used to provide data for the current measure.
+     */
+    DataMember: string;
+    /**
+     * Gets the type of summary function calculated against the current measure.
+     * Value: A String value that identifies the type of summary function calculated against the current measure.
+     */
+    SummaryType: string;
+    /**
+     * Formats the specified value using format settings of the current measure.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the delta metadata.
+ */
+interface ASPxClientDashboardItemDataDelta {
+    /**
+     * Gets the data item identifier.
+     * Value: A String that is the data item identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the data item container.
+     * Value: A String value that is the name of the data item container.
+     */
+    Name: string;
+    /**
+     * Gets the identifier for the measure that provides actual values.
+     * Value: A String value that is the measure identifier.
+     */
+    ActualMeasureId: string;
+    /**
+     * Gets the identifier for the measure that provides target values.
+     * Value: A String value that is the measure identifier.
+     */
+    TargetMeasureId: string;
+}
+/**
+ * Provides dimension values at the specified axis point.
+ */
+interface ASPxClientDashboardItemDataDimensionValue {
+    /**
+     * Gets the current dimension value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the unique value for the current dimension value.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the display text for the current dimension value.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides the measure value and display text.
+ */
+interface ASPxClientDashboardItemDataMeasureValue {
+    /**
+     * Gets the measure value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the measure display text.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides delta element values.
+ */
+interface ASPxClientDashboardItemDataDeltaValue {
+    /**
+     * Provides access to the actual value displayed within the delta element.
+     */
+    GetActualValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the target value.
+     */
+    GetTargetValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the absolute difference between the actual and target values.
+     */
+    GetAbsoluteVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percent of variation between the actual and target values.
+     */
+    GetPercentVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percentage of the actual value in the target value.
+     */
+    GetPercentOfTarget(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the main delta value.
+     */
+    GetDisplayValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the first additional delta value.
+     */
+    GetDisplaySubValue1(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the second additional delta value.
+     */
+    GetDisplaySubValue2(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the value specifying the condition for displaying the delta indication.
+     */
+    GetIsGood(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the type of delta indicator.
+     */
+    GetIndicatorType(): ASPxClientDashboardItemDataMeasureValue;
+}
+/**
+ * A point on the data axis.
+ */
+interface ASPxClientDashboardItemDataAxisPoint {
+    /**
+     * Gets the name of the axis to which the current axis point belongs.
+     */
+    GetAxisName(): string;
+    /**
+     * Gets the last level dimension corresponding to the current axis point.
+     */
+    GetDimension(): ASPxClientDashboardItemDataDimension;
+    /**
+     * Gets the collection of dimensions used to create a hierarchy of axis points from the root point to the current axis point.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the value corresponding to the current axis point.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the display text corresponding to the current axis point.
+     */
+    GetDisplayText(): string;
+    /**
+     * Gets the unique value corresponding to the current axis point.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the dimension values at the specified axis point.
+     */
+    GetDimensionValue(): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the dimension value at the current axis point.
+     * @param dimensionId A String value that specifies the dimension identifier.
+     */
+    GetDimensionValue(dimensionId: string): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the child axis points for the current axis point.
+     */
+    GetChildren(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets the parent axis point for the current axis point.
+     */
+    GetParent(): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Represents a tuple of axis points.
+ */
+interface ASPxClientDashboardItemDataAxisPointTuple {
+    /**
+     * Returns the axis point belonging to the default data axis.
+     */
+    GetAxisPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns the axis point belonging to the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * A range in the Range Filter dashboard item.
+ */
+interface ASPxClientDashboardRangeFilterSelection {
+    /**
+     * Gets or sets a maximum value in the range of the Range Filter dashboard item.
+     * Value: A maximum value in the range of the Range Filter dashboard item.
+     */
+    Maximum: Object;
+    /**
+     * Gets or sets a minimum value in the range of the Range Filter dashboard item.
+     * Value: A minimum value in the range of the Range Filter dashboard item.
+     */
+    Minimum: Object;
+}
+/**
+ * A collection of ASPxClientDashboardParameter objects.
+ */
+interface ASPxClientDashboardParameters {
+    /**
+     * Returns an array of dashboard parameters from the ASPxClientDashboardParameters collection.
+     */
+    GetParameterList(): ASPxClientDashboardParameter[];
+    /**
+     * Returns a dashboard parameter by its name.
+     * @param name A String object that specifies the parameter name.
+     */
+    GetParameterByName(name: string): ASPxClientDashboardParameter;
+    /**
+     * Returns a dashboard parameter by its index in the ASPxClientDashboardParameters collection.
+     * @param index An integer value that specifies the parameter index.
+     */
+    GetParameterByIndex(index: number): ASPxClientDashboardParameter;
+}
+/**
+ * A client-side dashboard parameter.
+ */
+interface ASPxClientDashboardParameter {
+    /**
+     * Gets the dashboard parameter name on the client side.
+     * Value: A String that is the dashboard parameter name on the client side.
+     */
+    Name: string;
+    /**
+     * Gets the dashboard parameter value on the client side.
+     * Value: A String that specifies the dashboard parameter value on the client side.
+     */
+    Value: Object;
+    /**
+     * Returns a parameter name.
+     */
+    GetName(): string;
+    /**
+     * Returns a current parameter value(s).
+     */
+    GetValue(): Object;
+    /**
+     * Specifies the current parameter value(s).
+     * @param value The current parameter value(s).
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a default parameter value.
+     */
+    GetDefaultValue(): Object;
+    /**
+     * Returns the parameter's description displayed to an end-user.
+     */
+    GetDescription(): string;
+    /**
+     * Returns a parameter type.
+     */
+    GetType(): string;
+    /**
+     * Returns possible parameter values.
+     */
+    GetValues(): ASPxClientDashboardParameterValue[];
+}
+/**
+ * Provides access to the parameter value and display text.
+ */
+interface ASPxClientDashboardParameterValue {
+    /**
+     * Returns the parameter display text.
+     */
+    GetDisplayText(): string;
+    /**
+     * Returns a parameter value.
+     */
+    GetValue(): Object;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+ */
+interface ImageFormatOptions {
+    /**
+     * Gets or sets an image format in which the dashboard (dashboard item) is exported.
+     * Value: A value returned by the DashboardExportImageFormat class that specifies an image format in which the dashboard (dashboard item) is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     */
+    Resolution: number;
+}
+/**
+ * Contains options which define how the dashboard item is exported to Excel format.
+ */
+interface ExcelFormatOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A value returned by the DashboardExportExcelFormat class that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A String value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the Grid dashboard item is exported.
+ */
+interface GridExportOptions {
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    FitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to print column headers of the Grid dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pivot dashboard item is exported.
+ */
+interface PivotExportOptions {
+    /**
+     * Gets or sets whether to print the column headers of the Pivot dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pie dashboard item is exported.
+ */
+interface PieExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Gauge dashboard item is exported.
+ */
+interface GaugeExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Card dashboard item is exported.
+ */
+interface CardExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Range Filter dashboard item is exported.
+ */
+interface RangeFilterExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Range Filter dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A value returned by the RangeFilterExportSizeMode class that specifies the export size mode for the Range Filter dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Chart dashboard items are exported.
+ */
+interface ChartExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Chart dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A value returned by the ChartExportSizeMode class that specifies the export size mode for the Chart dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Map dashboard items are exported.
+ */
+interface MapExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a map dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the map dashboard item.
+     * Value: A value returned by the MapExportSizeMode class that specifies specifies the export size mode for the map dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard (dashboard item) is exported.
+ */
+interface ASPxClientDashboardExportOptions {
+    /**
+     * Gets or sets the standard paper size.
+     * Value: A string value returned by the DashboardExportPaperKind class that specifies the standard paper size.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportPageLayout class that specifies the page orientation used to export a dashboard (dashboard item).
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling when exporting a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportScaleMode class that specifies the mode for scaling when exporting a dashboard (dashboard item).
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1) by which a dashboard (dashboard item) is scaled.
+     * Value: A Single value that specifies the scale factor by which a dashboard (dashboard item) is scaled.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A String value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A DefaultBoolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets the filter state's location on the exported document.
+     * Value: A string value returned by the DashboardExportFilterState class that specifies the filter state's location on the exported document.
+     */
+    FilterState: string;
+    /**
+     * Provides access to options for exporting a dashboard or individual items in Image format.
+     * Value: An ImageFormatOptions object containing settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+     */
+    ImageOptions: ImageFormatOptions;
+    /**
+     * Provides access to options for exporting individual dashboard items in Excel format.
+     * Value: An ExcelFormatOptions object containing settings that specify parameters affecting how the dashboard item is exported in Excel format.
+     */
+    ExcelOptions: ExcelFormatOptions;
+    /**
+     * Provides access to options for exporting a Grid dashboard item.
+     * Value: A GridExportOptions object containing settings that specify parameters that affect how Grid dashboard items are exported.
+     */
+    GridOptions: GridExportOptions;
+    /**
+     * Provides access to options for exporting a Pivot dashboard item.
+     * Value: A PivotExportOptions object containing settings that specify parameters that affect how Pivot dashboard items are exported.
+     */
+    PivotOptions: PivotExportOptions;
+    /**
+     * Provides access to options for exporting a Pie dashboard item.
+     * Value: A PieExportOptions object containing settings that specify parameters that affect how Pie dashboard items are exported.
+     */
+    PieOptions: PieExportOptions;
+    /**
+     * Provides access to options for exporting a Gauge dashboard item.
+     * Value: A GaugeExportOptions object containing settings that specify parameters that affect how Gauge dashboard items are exported.
+     */
+    GaugeOptions: GaugeExportOptions;
+    /**
+     * Provides access to options for exporting a Card dashboard item.
+     * Value: A CardExportOptions object containing settings that specify parameters that affect how Card dashboard items are exported.
+     */
+    CardOptions: CardExportOptions;
+    /**
+     * Provides access to options for exporting a Range Filter dashboard item.
+     * Value: A RangeFilterExportOptions object containing settings that specify parameters affecting how the Range Filter dashboard item is exported.
+     */
+    RangeFilterOptions: RangeFilterExportOptions;
+    /**
+     * Provides access to options for exporting a Chart dashboard item.
+     * Value: A ChartExportOptions object containing settings that specify parameters that affect how Chart dashboard items are exported.
+     */
+    ChartOptions: ChartExportOptions;
+    /**
+     * Provides access to options for exporting map dashboard items.
+     * Value: A MapExportOptions object containing settings that specify parameters that affect how map dashboard items are exported.
+     */
+    MapOptions: MapExportOptions;
+}
+/**
+ * A client-side equivalent of the ASPxDashboard control.
+ */
+interface ASPxClientDashboard extends ASPxClientControl {
+    /**
+     * Fires when a round trip to the server has been initiated by a call to the client PerformDataCallback method.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the state of the dashboard displayed in the ASPxClientDashboard is changed.
+     */
+    DashboardStateChanged: ASPxClientEvent<ASPxClientDashboardStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after a new dashboard is displayed in the ASPxClientDashboard.
+     */
+    DashboardChanged: ASPxClientEvent<ASPxClientDashboardChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * For internal use.
+     */
+    CustomizeMenuItems: ASPxClientEvent<ASPxClientDashboardCustomizeMenuItemsEventHandler<ASPxClientDashboard>>;
+    /**
+     * For internal use.
+     */
+    BeforeRender: ASPxClientEvent<ASPxClientDashboardBeforeRenderEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a master filter state is changed.
+     */
+    ItemMasterFilterStateChanged: ASPxClientEvent<ASPxClientDashboardItemMasterFilterStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a drill-down/drill-up is performed.
+     */
+    ItemDrillDownStateChanged: ASPxClientEvent<ASPxClientDashboardItemDrillDownStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Switches the ASPxClientDashboard to the viewer mode.
+     */
+    SwitchToViewer(): void;
+    /**
+     * Switches the ASPxClientDashboard to the designer mode.
+     */
+    SwitchToDesigner(): void;
+    /**
+     * Gets the current working mode of the Web Dashboard.
+     */
+    GetWorkingMode(): string;
+    /**
+     * Gets the identifier of the dashboard that is displayed in the ASPxClientDashboard.
+     */
+    GetDashboardId(): string;
+    /**
+     * Gets the name of the dashboard that is displayed in the ASPxClientDashboard.
+     */
+    GetDashboardName(): string;
+    /**
+     * Gets the state of the dashboard displayed in the ASPxClientDashboard.
+     */
+    GetDashboardState(): string;
+    /**
+     * Loads a dashboard with the specified identifier.
+     * @param dashboardId A String value that specifies the dashboard identifier.
+     */
+    LoadDashboard(dashboardId: string): void;
+    /**
+     * Saves a current dashboard to the dashboard storage.
+     */
+    SaveDashboard(): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Invokes the dialog that allows end-users to export the entire dashboard to the specified format.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF' or 'Image'.
+     */
+    ShowExportDashboardDialog(format: string): void;
+    /**
+     * Invokes the dialog that allows end-users to export the dashboard item to the specified format.
+     * @param itemComponentName A string value that specifies the component name of the dashboard item to export.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF, 'Image' or 'Excel'.
+     */
+    ShowExportDashboardItemDialog(itemComponentName: string, format: string): void;
+    /**
+     * Hides the dialog that allows end-users to export the dashboard/dashboard item.
+     */
+    HideExportDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Returns whether or not master filtering  can be applied in the current state of the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down into the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down into the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+    /**
+     * Refreshes an entire dashboard displayed in the Web Dashboard control.
+     */
+    Refresh(): void;
+    /**
+     * Refreshes the specific item from the dashboard displayed in the Web Dashboard control.
+     * @param itemName A string value that specifies the component name of the dashboard item to be refreshed.
+     */
+    Refresh(itemName: string): void;
+    /**
+     * Refreshes specific items from the dashboard displayed in the Web Dashboard control.
+     * @param itemName An array of string values that specify the component names of the dashboard items to be refreshed.
+     */
+    Refresh(itemName: string[]): void;
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
+     */
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+}
+/**
+ * References a method that will handle the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardStateChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the current state of the dashboard.
+     * Value: A String that is the current state of the dashboard.
+     */
+    DashboardState: string;
+}
+/**
+ * References a method that will handle the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of a newly opened dashboard.
+     * Value: A String values that is an identifier of newly opened dashboard.
+     */
+    DashboardId: string;
+    /**
+     * Gets the name of a newly opened dashboard.
+     * Value: A string value that is the name of newly opened dashboard.
+     */
+    DashboardName: string;
+}
+interface ASPxClientDashboardCustomizeMenuItemsEventHandler<S> {
+    (source: S, e: ASPxClientDashboardCustomizeMenuItemsEventArgs): void;
+}
+interface ASPxClientDashboardMenuItem {
+    id: string;
+    title: string;
+    template: string;
+    selected: boolean;
+    disabled: boolean;
+    hasSeparator: boolean;
+    click: Function;
+    hotKey: number;
+}
+interface ASPxClientDashboardCustomizeMenuItemsEventArgs extends ASPxClientEventArgs {
+    Items: ASPxClientDashboardMenuItem[];
+    FindById(itemId: string): ASPxClientDashboardMenuItem;
+}
+interface ASPxClientDashboardBeforeRenderEventHandler<S> {
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * Serves as the base class for classes that provide data for client-side events related to dashboard items.
+ */
+interface ASPxClientDashboardItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns whether or not the specified value is null.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is 'others'.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemMasterFilterStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemMasterFilterStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemMasterFilterStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the currently selected values.
+     * Value: An array of objects that are the currently selected values.
+     */
+    Values: Object[][];
+}
+/**
+ * References a method that will handle the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemDrillDownStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemDrillDownStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemDrillDownStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the drill-down action performed in the dashboard item.
+     * Value: A string value that is the drill-down action performed in the dashboard item.
+     */
+    Action: string;
+    /**
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
+     */
+    Values: Object[];
+}
+/**
+ * A client-side equivalent of the ASPxDashboardViewer control.
+ */
+interface ASPxClientDashboardViewer extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the available interactivity actions have changed.
+     */
+    ActionAvailabilityChanged: ASPxClientEvent<ASPxClientDashboardActionAvailabilityChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user changes the state of the master filter.
+     */
+    MasterFilterSet: ASPxClientEvent<ASPxClientDashboardMasterFilterSetEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clears the selection in the master filter item.
+     */
+    MasterFilterCleared: ASPxClientEvent<ASPxClientDashboardMasterFilterClearedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Provides the capability to handle data loading errors in the ASPxClientDashboardViewer.
+     */
+    DataLoadingError: ASPxClientEvent<ASPxClientDashboardDataLoadingErrorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-down is performed.
+     */
+    DrillDownPerformed: ASPxClientEvent<ASPxClientDashboardDrillDownPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-up is performed.
+     */
+    DrillUpPerformed: ASPxClientEvent<ASPxClientDashboardDrillUpPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the ASPxClientDashboardViewer is loaded.
+     */
+    Loaded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Reloads data in the data sources.
+     */
+    ReloadData(): void;
+    /**
+     * Reloads data in the data sources.
+     * @param parameters An array of ASPxClientDashboardParameter objects that specify dashboard parameters on the client side.
+     */
+    ReloadData(parameters: ASPxClientDashboardParameter[]): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Locks the EndUpdateParameters method call.
+     */
+    BeginUpdateParameters(): void;
+    /**
+     * Unlocks the BeginUpdateParameters method and applies changes made to the parameter settings.
+     */
+    EndUpdateParameters(): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
+     */
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Returns the dashboard width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the dashboard height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the dashboard width.
+     * @param width An integer value that specifies the dashboard width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the dashboard height.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Specifies the dashboard size.
+     * @param width An integer value that specifies the dashboard width.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down for the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down for the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns whether or not the specified master filter item allows selecting one or more elements.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+}
+/**
+ * References a method that will handle the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ActionAvailabilityChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardActionAvailabilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardActionAvailabilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets whether or not data reloading is available in the current state of dashboard item.
+     * Value: true, if data reloading is available in the current state of dashboard item; otherwise, false.
+     */
+    IsReloadDataAvailable: boolean;
+    /**
+     * Gets interactivity actions currently available for the dashboard item.
+     * Value: An array of ASPxClientDashboardItemAction objects that represent interactivity actions currently available for the dashboard item.
+     */
+    ItemActions: ASPxClientDashboardItemAction[];
+}
+/**
+ * References a method that will handle the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventHandler<S> {
+    /**
+     * References a method that will handle the DataLoadingError event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDataLoadingErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDataLoadingErrorEventArgs): void;
+}
+/**
+ * Provides data for the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Allows you to determine whether or not the error message will be shown.
+     */
+    IsErrorMessageShown(): boolean;
+    /**
+     * Allows you to specify whether to show the error message.
+     * @param value true, to show the error message; otherwise, false.
+     */
+    ShowErrorMessage(value: boolean): void;
+    /**
+     * Allows you to obtain the displayed error message.
+     */
+    GetError(): string;
+    /**
+     * Allows you to specify the displayed error message.
+     * @param value A string value that specifies the displayed error message.
+     */
+    SetError(value: string): void;
+}
+/**
+ * Represents an interactivity action in the dashboard item.
+ */
+interface ASPxClientDashboardItemAction {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets interactivity actions performed on a dashboard item.
+     * Value: An array of ASPxClientDashboardAction values that specify interactivity actions performed on a dashboard item.
+     */
+    Actions: any[];
+}
+declare enum ASPxClientDashboardAction {
+    SetMasterFilter=0,
+    ClearMasterFilter=1,
+    DrillDown=2,
+    DrillUp=3
+}
+/**
+ * References a method that will handle the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterSet event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterSetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterSetEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets values of currently selected elements in the master filter item.
+     * Value: Values of currently selected elements in the master filter item.
+     */
+    Values: Object[][];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterCleared event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterClearedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterClearedEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A String that is the name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillDownPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillDownPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillDownPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
+     */
+    Values: Object[];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillUpPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillUpPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillUpPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that is the name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * Serves as the base object for all the editors included in the client-side object model.
+ */
+interface ASPxClientEditBase extends ASPxClientControl {
+    /**
+     * Returns the editor's value.
+     */
+    GetValue(): Object;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the text displayed in the editor caption.
+     */
+    GetCaption(): string;
+    /**
+     * Specifies the text displayed in the editor caption.
+     * @param caption A string value specifying the editor caption.
+     */
+    SetCaption(caption: string): void;
+}
+/**
+ * Serves as the base object for all the editors that support validation.
+ */
+interface ASPxClientEdit extends ASPxClientEditBase {
+    /**
+     * Fires on the client side when the editor receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires on the client side when the editor loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Allows you to specify whether the value entered into the editor is valid, and whether the editor is allowed to lose focus.
+     */
+    Validation: ASPxClientEvent<ASPxClientEditValidationEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires after the editor's value has been changed by end-user interactions.
+     */
+    ValueChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientEdit>>;
+    /**
+     * Returns an HTML element that represents the control's input element.
+     */
+    GetInputElement(): Object;
+    /**
+     * Sets input focus to the editor.
+     */
+    Focus(): void;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value is valid.
+     * @param isValid True if the editor's value is valid; otherwise, False.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs the editor's validation.
+     */
+    Validate(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxBinaryImage control.
+ */
+interface ASPxClientBinaryImage extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after an image is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Fires on the client side if any server error occurs during server-side processing of a callback sent by the ASPxClientBinaryImage.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Sets the size of the image editor.
+     * @param width An integer value that specifies the control's width.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * For internal use only.
+     */
+    GetValue(): Object;
+    /**
+     * For internal use only.
+     * @param value 
+     */
+    SetValue(value: Object): void;
+    /**
+     * Removes an image from the editor content.
+     */
+    Clear(): void;
+    /**
+     * Returns a name of the last uploaded file.
+     */
+    GetUploadedFileName(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxButton control.
+ */
+interface ASPxClientButton extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the button's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Occurs on the client side after a button is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientButtonClickEventHandler<ASPxClientButton>>;
+    /**
+     * Simulates a mouse click action on the button control.
+     */
+    DoClick(): void;
+    /**
+     * Returns a value indicating whether the button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value that specifies the button's checked status.
+     * @param value true if the button is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the button.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL pointing to the image displayed within the button.
+     * @param value A string value that is the URL to the image displayed within the button.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Sets a value specifying whether the button is enabled.
+     * @param value true to enable the button; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns a value indicating whether the button is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets input focus to the button.
+     */
+    Focus(): void;
+}
+/**
+ * A method that will handle the client Click event.
+ */
+interface ASPxClientButtonClickEventHandler<S> {
+    /**
+     * A method that will handle the client Click event.
+     * @param source An object that is the event's source.
+     * @param e An ASPxClientButtonClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonClickEventArgs): void;
+}
+/**
+ * Provides data for the Click event.
+ */
+interface ASPxClientButtonClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Specifies whether both the event's default action and the event's bubbling upon the hierarchy of event handlers should be canceled.
+     * Value: true to cancel the event's default action and the event's bubbling upon the hierarchy of event handlers; otherwise, false.
+     */
+    cancelEventAndBubble: boolean;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCalendar control.
+ */
+interface ASPxClientCalendar extends ASPxClientEdit {
+    /**
+     * Fires on the client side after the selected date has been changed within the calendar.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side when the month displayed within the calendar is changed.
+     */
+    VisibleMonthChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side after the callback server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCalendar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCalendar>>;
+    /**
+     * Tests whether the specified date is selected.
+     * @param date A date-time value that specifies the date to test.
+     */
+    IsDateSelected(date: Date): boolean;
+    /**
+     * Sets the date that specifies the month and year to be displayed in the calendar.
+     * @param date The date that specifies calendar's visible month and year.
+     */
+    SetVisibleDate(date: Date): void;
+    /**
+     * Sets the calendar's selected date.
+     * @param date A date object that specifies the calendar's selected date.
+     */
+    SetSelectedDate(date: Date): void;
+    /**
+     * Returns the calendar's selected date.
+     */
+    GetSelectedDate(): Date;
+    /**
+     * Gets the date that determines the month and year that are currently displayed in the calendar.
+     */
+    GetVisibleDate(): Date;
+    /**
+     * Selects the specified date within the calendar.
+     * @param date A date-time value that specifies the selected date.
+     */
+    SelectDate(date: Date): void;
+    /**
+     * Selects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    SelectRange(start: Date, end: Date): void;
+    /**
+     * Deselects the specified date within the calendar.
+     * @param date A date-time value that specifies the date to deselect.
+     */
+    DeselectDate(date: Date): void;
+    /**
+     * Deselects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    DeselectRange(start: Date, end: Date): void;
+    /**
+     * Deselects all the selected dates within the calendar.
+     */
+    ClearSelection(): void;
+    /**
+     * Returns a list of dates which are selected within the calendar.
+     */
+    GetSelectedDates(): Date[];
+    /**
+     * Gets the minimum date on the calendar.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the calendar.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date on the calendar.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the calendar.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the date processed in the calendar.
+     * Value: A DateTime value containing processed data.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether selection of the processed calendar date is disabled.
+     * Value: true, if the date is disabled; otherwise, false.
+     */
+    isDisabled: boolean;
+}
+/**
+ * A method that will handle the client CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDisabledDate event.
+     * @param source The event source.
+     * @param e An ASPxClientCalendarCustomDisabledDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCalendarCustomDisabledDateEventArgs): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCaptcha control.
+ */
+interface ASPxClientCaptcha extends ASPxClientControl {
+    /**
+     * Sets input focus to the control's text box.
+     */
+    Focus(): void;
+    /**
+     * Refreshes the code displayed within the editor's challenge image.
+     */
+    Refresh(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCheckBox control.
+ */
+interface ASPxClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked true if the check box editor is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState A string value matches one of the CheckState enumeration values.
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButton control.
+ */
+interface ASPxClientRadioButton extends ASPxClientCheckBox {
+    /**
+     * Returns a value indicating whether the radio button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the radio button's checked status.
+     * @param isChecked true if the radio button is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+}
+/**
+ * Represents a base for client-side objects which allow single-line text input.
+ */
+interface ASPxClientTextEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Fires on the client side when the editor's text is changed and focus moves out of the editor by end-user interactions.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+    /**
+     * Selects all text in the text editor.
+     */
+    SelectAll(): void;
+    /**
+     * Sets the caret position within the edited text.
+     * @param position An integer value that specifies the zero-based index of a text character that shall precede the caret.
+     */
+    SetCaretPosition(position: number): void;
+    /**
+     * Selects the specified portion of the editor's text.
+     * @param startPos A zero-based integer value specifying the selection's starting position.
+     * @param endPos A zero-based integer value specifying the selection's ending position.
+     * @param scrollToSelection true to scroll the editor's contents to make the selection visible; otherwise, false.
+     */
+    SetSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying and editing text data in their edit regions.
+ */
+interface ASPxClientTextBoxBase extends ASPxClientTextEdit {
+}
+/**
+ * Represents a base for client button editor objects.
+ */
+interface ASPxClientButtonEditBase extends ASPxClientTextBoxBase {
+    /**
+     * Occurs on the client side after an editor button is clicked.
+     */
+    ButtonClick: ASPxClientEvent<ASPxClientButtonEditClickEventHandler<ASPxClientButtonEditBase>>;
+    /**
+     * Specifies whether the button is visible.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     * @param value true, to make the button visible; otherwise, false.
+     */
+    SetButtonVisible(number: number, value: boolean): void;
+    /**
+     * Returns a value specifying whether a button is displayed.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     */
+    GetButtonVisible(number: number): boolean;
+}
+/**
+ * Represents a base class for the editors that contain a drop down window.
+ */
+interface ASPxClientDropDownEditBase extends ASPxClientButtonEditBase {
+    /**
+     * Occurs on the client-side when the drop down window is opened.
+     */
+    DropDown: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side when the drop down window is closed.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side before the drop down window is closed and allows you to cancel the operation.
+     */
+    QueryCloseUp: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Modifies the size of the drop down window in accordance with its content.
+     */
+    AdjustDropDownWindow(): void;
+    /**
+     * Invokes the editor's drop down window.
+     */
+    ShowDropDown(): void;
+    /**
+     * Closes the opened drop down window of the editor.
+     */
+    HideDropDown(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxColorEdit control.
+ */
+interface ASPxClientColorEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected color has been changed within the color editor via end-user interaction.
+     */
+    ColorChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientColorEdit. Use the ColorChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * Returns the color editor's value.
+     */
+    GetColor(): string;
+    /**
+     * Specifies the color value for the color editor.
+     * @param value A string value specifying the editor color.
+     */
+    SetColor(value: string): void;
+    /**
+     * Indicates whether the automatic color item is selected.
+     */
+    IsAutomaticColorSelected(): boolean;
+}
+/**
+ * Represent the client-side equivalent of the ASPxComboBox control.
+ */
+interface ASPxClientComboBox extends ASPxClientDropDownEditBase {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientComboBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientComboBox>>;
+    /**
+     * Specifies the text displayed within the editor's edit box.
+     * @param text A string value specifying the editor's text.
+     */
+    SetText(text: string): void;
+    /**
+     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Removes all items from the client combo box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Prevents the client combobox editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Returns an item specified by its index within the combo box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the index of the selected item within the combo box editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the combobox editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+    /**
+     * Returns the combo box editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Gets the text displayed in the editor's edit box.
+     */
+    GetText(): string;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Determines whether the drop-down content is loaded; if not - loads the content.
+     * @param callbackFunction An object that is the JavaScript function that receives the callback data as a parameter. The function is performed after the combo box content is loaded.
+     */
+    EnsureDropDownLoaded(callbackFunction: Object): void;
+    /**
+     * Defines the HTML content for the specified combo box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the combo box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified combo box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxDateEdit control.
+ */
+interface ASPxClientDateEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected date has been changed within the date editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Enables you to convert the value entered by an end user into the value that will be stored by the date editor.
+     */
+    ParseDate: ASPxClientEvent<ASPxClientParseDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CalendarCustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientDateEdit. Use the DateChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Returns the calendar of the date editor.
+     */
+    GetCalendar(): ASPxClientCalendar;
+    /**
+     * Returns the built-in time edit control.
+     */
+    GetTimeEdit(): ASPxClientTimeEdit;
+    /**
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
+     */
+    SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
+    GetDate(): Date;
+    /**
+     * Returns the number of days in a range selected within a date edit.
+     */
+    GetRangeDayCount(): number;
+    /**
+     * Gets the minimum date of the editor.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the editor.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date of the editor.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the editor.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the ParseDate client-side event that parses a string entered into a date editor.
+ */
+interface ASPxClientParseDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value entered into the date editor by an end user.
+     * Value: The string value entered into the date editor by an end user.
+     */
+    value: string;
+    /**
+     * Gets or sets the edit value of the date editor.
+     * Value: A date/time value representing the edit value of the date editor.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the client ParseDate event, that parses a date editor's value when entered.
+ */
+interface ASPxClientParseDateEventHandler<S> {
+    /**
+     * A method that will handle the ParseDate event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientParseDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientParseDateEventArgs): void;
+}
+/**
+ * Represents a base for client editor objects realizing the dropdown editor functionality.
+ */
+interface ASPxClientDropDownEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Obtains the key value associated with the text displayed within the editor's edit box.
+     */
+    GetKeyValue(): string;
+    /**
+     * Specifies the key value associated with the text displayed within the editor's edit box.
+     * @param keyValue A string specifying the key value associated with the editor's value (displayed text).
+     */
+    SetKeyValue(keyValue: string): void;
+}
+/**
+ * A method that will handle the client events involving a keyboard key being pressed or released.
+ */
+interface ASPxClientEditKeyEventHandler<S> {
+    /**
+     * A method that will handle the client events concerning a keyboard key being pressed.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientEditKeyEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditKeyEventArgs): void;
+}
+/**
+ * Provides data for the client events involved with a key being pressed or released.
+ */
+interface ASPxClientEditKeyEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle client validation events.
+ */
+interface ASPxClientEditValidationEventHandler<S> {
+    /**
+     * A method that will handle client validation events.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientEditValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditValidationEventArgs): void;
+}
+/**
+ * Provides data for the client events that are related to data validation (see Validate).
+ */
+interface ASPxClientEditValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the error description.
+     * Value: A string representing the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the value is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the editor's value being validated.
+     * Value: An object that represents the validated value.
+     */
+    value: string;
+}
+/**
+ * Represents the client ASPxFilterControl.
+ */
+interface ASPxClientFilterControl extends ASPxClientControl {
+    /**
+     * Occurs after a new filter expression has been applied.
+     */
+    Applied: ASPxClientEvent<ASPxClientFilterAppliedEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFilterControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Returns the filter expression.
+     */
+    GetFilterExpression(): string;
+    /**
+     * Returns the applied filter expression.
+     */
+    GetAppliedFilterExpression(): string;
+    /**
+     * Returns the editor used to edit operand values for the specified filter column.
+     * @param editorIndex An integer value that identifies the filter column by its index within the collection.
+     */
+    GetEditor(editorIndex: number): ASPxClientEditBase;
+    /**
+     * Returns a value indicating whether the filter expression being currently composed on the client side is valid - all expression conditions are filled.
+     */
+    IsFilterExpressionValid(): boolean;
+    /**
+     * Applies a filter constructed by an end-user.
+     */
+    Apply(): void;
+    /**
+     * Resets the current filter expression to a previously applied filter expression.
+     */
+    Reset(): void;
+}
+/**
+ * A method that will handle the Applied event.
+ */
+interface ASPxClientFilterAppliedEventHandler<S> {
+    /**
+     * A method that will handle the Applied event.
+     * @param source The event source.
+     * @param e An ASPxClientFilterAppliedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFilterAppliedEventArgs): void;
+}
+/**
+ * Provides data for the Applied event.
+ */
+interface ASPxClientFilterAppliedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the filter expression currently being applied.
+     * Value: A string value that specifies the filter expression currently being applied.
+     */
+    filterExpression: string;
+}
+/**
+ * Represents a base for client editor objects that display a list of items.
+ */
+interface ASPxClientListEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientListEdit>>;
+    /**
+     * Returns the list editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Returns the index of the selected item within the list editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Sets the list editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ListEditItem object.
+ */
+interface ASPxClientListEditItem {
+    /**
+     * Gets a value that indicates whether a list edit item is selected.
+     * Value: true if a list edit item is selected; otherwise, false.
+     */
+    selected: boolean;
+    /**
+     * Gets an editor to which the current item belongs.
+     * Value: An ASPxClientListEdit object that represents the item's owner editor.
+     */
+    listEditBase: ASPxClientListEdit;
+    /**
+     * Gets the item's index.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets the item's associated image.
+     * Value: A string value that represents the path to the image displayed by the item.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that represents the item's display text.
+     */
+    text: string;
+    /**
+     * Gets the item's associated value.
+     * Value: An object that represents the value associated with the item.
+     */
+    value: Object;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its index.
+     * @param columnIndex An integer value that specifies the column's index within the editor's Columns collection.
+     */
+    GetColumnText(columnIndex: number): string;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its field name.
+     * @param columnName A string value that specifies the column's field name defined via the FieldName property.
+     */
+    GetColumnText(columnName: string): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxListBox control.
+ */
+interface ASPxClientListBox extends ASPxClientListEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientListBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a different item in the list box has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client when the editor's item is double clicked.
+     */
+    ItemDoubleClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientListBox>>;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns an item specified by its index within the list box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns an array of the list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all list box items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all list box items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects the items with the specified indices within a list box.
+     * @param indices An array of integer values that represent the items indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Unselects an array of the list box items with the specified indices.
+     * @param indices An array of integer values that represent the indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a list box.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Select the items with the specified values within a list box.
+     * @param values An array of Object[] objects that represent the item's values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects an array of the list box items with the specified values.
+     * @param values An array of Object[] objects that represent the values.
+     */
+    UnselectValues(values: Object[]): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Initializes the ASPxClientListBox client object when its parent container becomes visible dynamically, on the client side.
+     */
+    InitOnContainerMadeVisible(): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Prevents the client list box editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method, and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Removes all items from the client list box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Returns a list box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a list box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Defines the HTML content for the specified list box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the list box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified list box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+}
+/**
+ * Serves as the base type for the ASPxClientRadioButtonList objects.
+ */
+interface ASPxClientCheckListBase extends ASPxClientListEdit {
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButtonList control.
+ */
+interface ASPxClientRadioButtonList extends ASPxClientCheckListBase {
+}
+/**
+ * A client-side equivalent of the ASPxCheckBoxList object.
+ */
+interface ASPxClientCheckBoxList extends ASPxClientCheckListBase {
+    /**
+     * Occurs on the client side after a different item in the check box list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientCheckBoxList>>;
+    /**
+     * Returns an array of the check box list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the check box list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the check box list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all check box list items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all check box list items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Selects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Unselects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    UnselectValues(values: Object[]): void;
+}
+/**
+ * A method that will handle the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedIndexChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientListEditItemSelectedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientListEditItemSelectedChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the item is selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxProgressBar control.
+ */
+interface ASPxClientProgressBar extends ASPxClientEditBase {
+    /**
+     * Sets the position of the operation's progress.
+     * @param position An integer value specifying the progress position.
+     */
+    SetPosition(position: number): void;
+    /**
+     * Gets the position of the operation's progress.
+     */
+    GetPosition(): number;
+    /**
+     * Sets the pattern used to format the displayed text for the progress bar.
+     * @param text A  value that is the format pattern.
+     */
+    SetCustomDisplayFormat(text: string): void;
+    /**
+     * Returns the text displayed within the progress bar.
+     */
+    GetDisplayText(): string;
+    /**
+     * Sets the percentage representation of the progress position.
+     */
+    GetPercent(): number;
+    /**
+     * Sets the minimum range value of the progress bar.
+     * @param min An integer value specifying the minimum value of the progress bar range.
+     */
+    SetMinimum(min: number): void;
+    /**
+     * Sets the maximum range value of the progress bar.
+     * @param max An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMaximum(max: number): void;
+    /**
+     * Gets the minimum range value of the progress bar.
+     */
+    GetMinimum(): number;
+    /**
+     * Gets the maximum range value of the progress bar.
+     */
+    GetMaximum(): number;
+    /**
+     * Sets the minimum and maximum range values of the progress bar.
+     * @param minValue An integer value specifying the minimum value of the progress bar range.
+     * @param maxValue An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMinMaxValues(minValue: number, maxValue: number): void;
+}
+/**
+ * Represents a base class for the ASPxClientSpinEdit object.
+ */
+interface ASPxClientSpinEditBase extends ASPxClientButtonEditBase {
+    /**
+     * This event is not in effect for the ASPxClientSpinEditBase. Use the ASPxClientTimeEdit.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEditBase>>;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpinEdit control.
+ */
+interface ASPxClientSpinEdit extends ASPxClientSpinEditBase {
+    /**
+     * Occurs on the client side when the editor's value is altered in any way.
+     */
+    NumberChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEdit>>;
+    /**
+     * Specifies the value of the spin edit control on the client side.
+     * @param number A Decimal value specifying the control value.
+     */
+    SetValue(number: number): void;
+    /**
+     * Sets the spin editor's value.
+     * @param number A decimal number specifying the value to assign to the spin editor.
+     */
+    SetNumber(number: number): void;
+    /**
+     * Gets a number which represents the spin editor's value.
+     */
+    GetNumber(): number;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the minimum value of the editor.
+     * @param value A decimal value specifying the minimum value of the editor.
+     */
+    SetMinValue(value: number): void;
+    /**
+     * Gets the minimum value of the editor.
+     */
+    GetMinValue(): number;
+    /**
+     * Sets the maximum value of the editor.
+     * @param value A decimal value specifying the maximum value of the editor.
+     */
+    SetMaxValue(value: number): void;
+    /**
+     * Gets the maximum value of the editor.
+     */
+    GetMaxValue(): number;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTimeEdit control.
+ */
+interface ASPxClientTimeEdit extends ASPxClientSpinEditBase {
+    /**
+     * Fires after the selected date has been changed within the time editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimeEdit>>;
+    /**
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
+     */
+    SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
+    GetDate(): Date;
+}
+/**
+ * Represents a base for client-side static editors whose values cannot be visually changed by end users.
+ */
+interface ASPxClientStaticEdit extends ASPxClientEditBase {
+    /**
+     * Occurs on the client side after an end-user clicks within a static editor.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientStaticEdit>>;
+}
+/**
+ * A method that will handle client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditEventHandler<S> {
+    /**
+     * A method that will handle client-side events which concern clicking within editors.
+     * @param source An object representing the event source. Identifies the editor that raised the event.
+     * @param e An ASPxClientEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditClickEventArgs): void;
+}
+/**
+ * Provides data for the client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the HTML element related to the event.
+     * Value: An object that represents the clicked HTML element.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHyperLink control.
+ */
+interface ASPxClientHyperLink extends ASPxClientStaticEdit {
+    /**
+     * Gets an URL which defines the navigation location for the editor's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies an URL which defines the navigation location for the editor's hyperlink.
+     * @param url A string value which specifies an URL to where the client web browser will navigate when a hyperlink in the editor is clicked.
+     */
+    SetNavigateUrl(url: string): void;
+    /**
+     * Gets the text caption displayed for the hyperlink in the hyperlink editor.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text caption displayed for the hyperlink in the hyperlink editor.
+     * @param text A string value specifying the text caption for the hyperlink in the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying images.
+ */
+interface ASPxClientImageBase extends ASPxClientStaticEdit {
+    /**
+     * Sets the size of the image displayed within the image editor.
+     * @param width An integer value that specifies the image's width.
+     * @param height An integer value that specifies the image's height.
+     */
+    SetSize(width: number, height: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxImage control.
+ */
+interface ASPxClientImage extends ASPxClientImageBase {
+    /**
+     * Returns the URL pointing to the image displayed within the image editor.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the image editor.
+     * @param url A string value specifying the URL to the image displayed within the editor.
+     */
+    SetImageUrl(url: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxLabel control.
+ */
+interface ASPxClientLabel extends ASPxClientStaticEdit {
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTextBox control.
+ */
+interface ASPxClientTextBox extends ASPxClientTextBoxBase {
+}
+/**
+ * Represents the client-side equivalent of the ASPxMemo control.
+ */
+interface ASPxClientMemo extends ASPxClientTextEdit {
+}
+/**
+ * Represents the client-side equivalent of the ASPxButtonEdit control.
+ */
+interface ASPxClientButtonEdit extends ASPxClientButtonEditBase {
+}
+/**
+ * A method that will handle the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventHandler<S> {
+    /**
+     * A method that will handle the ButtonClick event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientButtonEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonEditClickEventArgs): void;
+}
+/**
+ * Provides data for the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the clicked button.
+     * Value: An integer value representing the index of the clicked button within the editor's Buttons collection.
+     */
+    buttonIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxTokenBox object.
+ */
+interface ASPxClientTokenBox extends ASPxClientComboBox {
+    /**
+     * Fires on the client side after the token collection has been changed.
+     */
+    TokensChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTokenBox>>;
+    /**
+     * Adds a new token with the specified text to the end of the control's token collection.
+     * @param text A string value specifying the token's text.
+     */
+    AddToken(text: string): void;
+    /**
+     * Removes a token specified by its text from the client token box.
+     * @param text A string value that is the text of the token to be removed.
+     */
+    RemoveTokenByText(text: string): void;
+    /**
+     * Removes a token specified by its index from the client token box.
+     * @param index An integer value that is the index of the token to be removed.
+     */
+    RemoveToken(index: number): void;
+    /**
+     * Returns an HTML span element that corresponds to the specified token.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's text.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenTextHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's remove button.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenRemoveButtonHtmlElement(index: number): Object;
+    /**
+     * Returns a collection of tokens.
+     */
+    GetTokenCollection(): string[];
+    /**
+     * Sets a collection of tokens.
+     * @param collection A  object that is the collection of tokens.
+     */
+    SetTokenCollection(collection: string[]): void;
+    /**
+     * Removes all tokens contained in the token box.
+     */
+    ClearTokenCollection(): void;
+    /**
+     * Returns the index of a token specified by its text.
+     * @param text A string value that specifies the text of the token.
+     */
+    GetTokenIndexByText(text: string): number;
+    /**
+     * Gets the token texts, separated with a sign, specified by the TextSeparator property.
+     */
+    GetText(): string;
+    /**
+     * Sets the token texts, separated with a sign, specified by the TextSeparator property.
+     * @param text A string value that is the token texts separated with a text separator.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the editor value.
+     */
+    GetValue(): string;
+    /**
+     * Sets the editor value.
+     * @param value A string that is the editor value.
+     */
+    SetValue(value: string): void;
+    /**
+     * Returns a value that indicates if the specified token (string) is a custom token.
+     * @param text A string value that is a token.
+     * @param caseSensitive true, if tokens are case sensitive; otherwise, false.
+     */
+    IsCustomToken(text: string, caseSensitive: boolean): boolean;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * The client-side equivalent of the ASPxTrackBar control.
+ */
+interface ASPxClientTrackBar extends ASPxClientEdit {
+    /**
+     * Fires on the client side before a track bar position is changed and allows you to cancel the action.
+     */
+    PositionChanging: ASPxClientEvent<ASPxClientTrackBarPositionChangingEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Fires after the editor's position has been changed.
+     */
+    PositionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user moves a cursor while the drag handle is held down.
+     */
+    Track: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a drag handle and moves it.
+     */
+    TrackStart: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a drag handle after moving it.
+     */
+    TrackEnd: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Returns a track bar item index by the item's value.
+     * @param value An object that specifies the item's value.
+     */
+    GetItemIndexByValue(value: Object): number;
+    /**
+     * Returns a track bar item's associated value.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemValue(index: number): Object;
+    /**
+     * Returns a track bar item text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemText(index: number): string;
+    /**
+     * Returns a track bar item's tooltip text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemToolTip(index: number): string;
+    /**
+     * Returns the number of the track bar items that are maintained by the item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Specifies the secondary drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionEnd(position: number): void;
+    /**
+     * Specifies the main drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionStart(position: number): void;
+    /**
+     * Returns the secondary drag handle position.
+     */
+    GetPositionEnd(): number;
+    /**
+     * Returns the main drag handle position.
+     */
+    GetPositionStart(): number;
+    /**
+     * Gets a drag handle position.
+     */
+    GetPosition(): number;
+    /**
+     * Specifies a drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPosition(position: number): void;
+}
+/**
+ * A method that will handle the client PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventHandler<S> {
+    /**
+     * A method that will handle the PositionChanging event.
+     * @param source The event source. Identifies the ASPxTrackBar control that raised the event.
+     * @param e A ASPxClientTrackBarPositionChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTrackBarPositionChangingEventArgs): void;
+}
+/**
+ * Provides data for the PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+    /**
+     * Gets the current drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPosition: number;
+    /**
+     * Gets the current secondary drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionEnd: number;
+    /**
+     * Gets the current main drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionStart: number;
+    /**
+     * Gets a position where the drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPosition: number;
+    /**
+     * Gets a position where the secondary drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionEnd: number;
+    /**
+     * Gets a position where the main drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionStart: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxValidationSummary control.
+ */
+interface ASPxClientValidationSummary extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the validation summary's visibility is changed.
+     */
+    VisibilityChanged: ASPxClientEvent<ASPxClientValidationSummaryVisibilityChangedEventHandler<ASPxClientValidationSummary>>;
+}
+/**
+ * A method that will handle the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventHandler<S> {
+    /**
+     * A method that will handle the VisibilityChanged client event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientValidationSummaryVisibilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationSummaryVisibilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the editor is visible on the client.
+     * Value: true if the editor is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client ASPxGaugeControl.
+ */
+interface ASPxClientGaugeControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Fires when errors have occurred during callback processing.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Lists values that specify the position relative to the target column in which a moved column should be placed.
+ */
+interface ASPxClientGridColumnMovingTargetPosition {
+    /**
+     * A moved column should be placed to the right of the target column.
+     */
+    Right: number;
+    /**
+     * A moved column should be placed to the left of the target column.
+     */
+    Left: number;
+    /**
+     * A moved column should be placed at the top of the target column.
+     */
+    Top: number;
+    /**
+     * A moved column should be placed at the bottom of the target column.
+     */
+    Bottom: number;
+}
+/**
+ * Represents the client ASPxGridView.
+ */
+interface ASPxClientGridBase extends ASPxClientControl {
+}
+/**
+ * Serves as a base object implementing the client column functionality.
+ */
+interface ASPxClientGridColumnBase {
+}
+/**
+ * The client-side equivalent of the ASPxGridLookup control.
+ */
+interface ASPxClientGridLookup extends ASPxClientDropDownEditBase {
+    /**
+     * Fires on the client when a data row is clicked within the built-in dropdown grid.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Returns a client object representing the built-in dropdown grid.
+     */
+    GetGridView(): ASPxClientGridView;
+    /**
+     * Confirms the current selection made by an end-user within the editor's dropdown grid.
+     */
+    ConfirmCurrentSelection(): void;
+    /**
+     * Cancels the current selection made by an end-user within the editor's dropdown grid and rolls back to the last confirmed selection. The selection can be confirmed by either pressing the Enter key or calling the ConfirmCurrentSelection method.
+     */
+    RollbackToLastConfirmedSelection(): void;
+}
+/**
+ * Represents the client ASPxCardView.
+ */
+interface ASPxClientCardView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientCardViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientCardViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientCardViewCustomButtonEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientCardViewSelectionEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientCardViewColumnCancelEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientCardViewBatchEditStartEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid leaves batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientCardViewBatchEditEndEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientCardViewBatchEditConfirmShowingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to specify whether card data is valid and provide an error text.
+     */
+    BatchEditCardValidating: ASPxClientEvent<ASPxClientCardViewBatchEditCardValidatingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientCardViewBatchEditChangesSavingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientCardViewBatchEditChangesCancelingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is inserted in batch edit mode.
+     */
+    BatchEditCardInserting: ASPxClientEvent<ASPxClientCardViewBatchEditCardInsertingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is deleted in batch edit mode.
+     */
+    BatchEditCardDeleting: ASPxClientEvent<ASPxClientCardViewBatchEditCardDeletingEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is clicked.
+     */
+    CardClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is double clicked.
+     */
+    CardDblClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires in response to changing card focus.
+     */
+    FocusedCardChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientCardView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the customization window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientCardView>>;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientCardViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientCardViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientCardViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param cardVisibleIndex An  value that specifies the visible index of the card.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(cardVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientCardViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientCardViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A string value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the CardView.
+     * @param moveBefore true, to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Returns the key value of the specified card.
+     * @param visibleIndex An integer value that specifies the card's visible index.
+     */
+    GetCardKey(visibleIndex: number): string;
+    /**
+     * Switches the CardView to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a card to be edited.
+     */
+    StartEditCard(visibleIndex: number): void;
+    /**
+     * Switches the ASPxCardView to edit mode.
+     * @param key An object that uniquely identifies a card to be edited.
+     */
+    StartEditCardByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new card is being edited.
+     */
+    IsNewCardEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewCard(): void;
+    /**
+     * Deletes the specified card.
+     * @param visibleIndex An integer value that identifies the card.
+     */
+    DeleteCard(visibleIndex: number): void;
+    /**
+     * Deletes a card with the specified key value.
+     * @param key An object that uniquely identifies the card.
+     */
+    DeleteCardByKey(key: Object): void;
+    /**
+     * Returns the focused card's index.
+     */
+    GetFocusedCardIndex(): number;
+    /**
+     * Moves focus to the specified card.
+     * @param visibleIndex An integer value that specifies the focused card's index.
+     */
+    SetFocusedCardIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected cards within the CardView.
+     */
+    SelectCards(): void;
+    /**
+     * Selects the specified card displayed within the CardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCards(visibleIndex: number): void;
+    /**
+     * Selects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    SelectCards(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCards(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified card within the GridView.
+     * @param visibleIndex An integer zero-based index that identifies the data card within the grid.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCards(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCardsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified card displayed within the CardView.
+     * @param key An object that uniquely identifies the card.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    SelectCardsByKey(keys: Object[]): void;
+    /**
+     * Selects a card displayed within the CardView by its key.
+     * @param key An object that uniquely identifies the card.
+     */
+    SelectCardsByKey(key: Object): void;
+    /**
+     * Deselects the specified cards displayed within the ASPxCardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    UnselectCardsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified card displayed within the ASPxCardView.
+     * @param key An object that uniquely identifies the card.
+     */
+    UnselectCardsByKey(key: Object): void;
+    /**
+     * Deselects all the selected cards within the ASPxCardView.
+     */
+    UnselectCards(): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    UnselectCards(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCards(visibleIndex: number): void;
+    /**
+     * Deselects all grid cards that match the filter criteria currently applied to the CardView.
+     */
+    UnselectFilteredCards(): void;
+    /**
+     * Selects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified cards (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected cards displayed on the current page.
+     */
+    SelectAllCardsOnPage(): void;
+    /**
+     * Allows you to select or deselect all cards displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected cards displayed on the current page; false to deselect all selected cards on the page.
+     */
+    SelectAllCardsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected cards displayed on the current page.
+     */
+    UnselectAllCardsOnPage(): void;
+    /**
+     * Returns the number of selected cards.
+     */
+    GetSelectedCardCount(): number;
+    /**
+     * Indicates whether or not the specified card is selected within the current page.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsCardSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the grid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client CardView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first card displayed within the grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the CardView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the customization window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the customization window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the customization window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the customization window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client grid.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the card values displayed within all selected cards.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected cards are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns key values of selected cards displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified card.
+     * @param visibleIndex An integer value that identifies the data card.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified card are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetCardValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the card values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetPageCardValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the number of cards actually displayed within the active page.
+     */
+    GetVisibleCardsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientCardViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientCardViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientCardViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientCardViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientCardViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientCardViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of card values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxCardView column.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientCardViewColumn object that represents the processed column.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A method that will handle the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventHandler<S> {
+    /**
+     * A method that will handle the CardClick event.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCardClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCardClickEventArgs): void;
+}
+/**
+ * Provides data for the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the CardClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the card whose custom button has been clicked.
+     * Value: An integer value that identifies the card whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the card whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the card has been selected.
+     * Value: true if the card has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all cards displayed within a page have been selected or unselected.
+     * Value: true if all cards displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the CardView column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the focused CardView column.
+     */
+    focusedColumn: ASPxClientCardViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditCardValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer value that specifies the processed card's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a card currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientCardViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardDeleting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    cardValues: Object;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientCardViewBatchEditApi {
+    /**
+     * Performs validation of CardView data contained in the cards when the CardView operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified cards should be validated; otherwise, false.
+     */
+    ValidateCards(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of CardView data contained in the specified card when the CardView operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated card.
+     */
+    ValidateCard(visibleIndex: number): boolean;
+    /**
+     * Returns an array of card visible indices.
+     * @param includeDeleted true, to include visible indices of deleted cards to the returned array; otherwise, false.
+     */
+    GetCardVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted card visible indices.
+     */
+    GetDeletedCardIndices(): number[];
+    /**
+     * Returns an array of the inserted card visible indices.
+     */
+    GetInsertedCardIndices(): number[];
+    /**
+     * Indicates if the card with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsDeletedCard(visibleIndex: number): boolean;
+    /**
+     * Indicates if the card with the specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsNewCard(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the card
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the card.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientCardViewCellInfo;
+    /**
+     * Returns a value that indicates whether the card view has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified card has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified card.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or card editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientCardViewCellInfo {
+    /**
+     * Gets the visible index of the card that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    cardVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A client-side equivalent of the ASPxGridView object.
+ */
+interface ASPxClientGridView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientGridViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientGridViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientGridViewCustomButtonEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientGridViewSelectionEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires in response to changing row focus.
+     */
+    FocusedRowChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to cancel data grouping.
+     */
+    ColumnGrouping: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires when an end-user starts dragging the column's header and enables you to cancel this operation.
+     */
+    ColumnStartDragging: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientGridViewColumnProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to control column movement.
+     */
+    ColumnMoving: ASPxClientEvent<ASPxClientGridViewColumnMovingEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is expanded.
+     */
+    RowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is collapsed.
+     */
+    RowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is expanded.
+     */
+    DetailRowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is collapsed.
+     */
+    DetailRowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is clicked.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is double clicked.
+     */
+    RowDblClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after an end-user right clicks in the GridView, and enables you to provide a custom context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientGridViewContextMenuEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client side when a context menu item has been clicked.
+     */
+    ContextMenuItemClick: ASPxClientEvent<ASPxClientGridViewContextMenuItemClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to specify whether row data is valid and provide an error text.
+     */
+    BatchEditRowValidating: ASPxClientEvent<ASPxClientGridViewBatchEditRowValidatingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientGridViewBatchEditConfirmShowingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientGridViewBatchEditStartEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientGridViewBatchEditEndEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientGridViewBatchEditChangesSavingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientGridViewBatchEditChangesCancelingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is inserted in batch edit mode.
+     */
+    BatchEditRowInserting: ASPxClientEvent<ASPxClientGridViewBatchEditRowInsertingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is deleted in batch edit mode.
+     */
+    BatchEditRowDeleting: ASPxClientEvent<ASPxClientGridViewBatchEditRowDeletingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientGridView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGridView>>;
+    /**
+     * Deselects the specified rows (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    UnselectRows(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified row (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRows(visibleIndex: number): void;
+    /**
+     * Deselects all grid rows that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRows(): void;
+    /**
+     * Selects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRowOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified row (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRowOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected rows displayed on the current page.
+     */
+    SelectAllRowsOnPage(): void;
+    /**
+     * Allows you to select or deselect all rows displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected rows displayed on the current page; false to deselect all selected rows on the page.
+     */
+    SelectAllRowsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected rows displayed on the current page.
+     */
+    UnselectAllRowsOnPage(): void;
+    /**
+     * Returns the number of selected rows.
+     */
+    GetSelectedRowCount(): number;
+    /**
+     * Indicates whether or not the specified row is selected within the current page.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsRowSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a group row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsGroupRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a data row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDataRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified group row is expanded.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    IsGroupRowExpanded(visibleIndex: number): boolean;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVertScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorzScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVertScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorzScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Sets the scrollability of various types of grid rows when the grid displays fixed columns.
+     * @param scrollableRowSettings An object specifying which types of grid rows should or should not be scrollable.
+     */
+    SetFixedColumnScrollableRows(scrollableRowSettings: Object): void;
+    /**
+     * Applies a filter specified in the filter row to the GridView.
+     */
+    ApplyOnClickRowFilter(): void;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data colum within the ASPxGridView.
+     */
+    GetAutoFilterEditor(column: ASPxClientGridViewColumn): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnIndex An integer value that identifies the data column by its index.
+     */
+    GetAutoFilterEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's name or its data base field name.
+     */
+    GetAutoFilterEditor(columnFieldNameOrId: string): Object;
+    /**
+     * Applies a filter to the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client GridView.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(column: ASPxClientGridViewColumn, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnIndex: number, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnFieldNameOrId: string, val: string): void;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the GridView.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client GridView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first data row displayed within the GridView's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the GridView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnsCount(): number;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the row values displayed within all selected rows.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected rows are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns key values of selected rows displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified row.
+     * @param visibleIndex An integer value that identifies the data row.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified row are returned.
+     * @param onCallback An ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetRowValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the row values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetPageRowValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the number of rows actually displayed within the active page.
+     */
+    GetVisibleRowsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientGridViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientGridViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientGridViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientGridViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientGridViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientGridViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientGridViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param rowVisibleIndex An integer value that specifies the visible index of the row.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A String value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the ASPxGridView's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the ASPxGridView's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     */
+    GroupBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GroupBy(columnIndex: number): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GroupBy(columnFieldNameOrId: string): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnIndex: number, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnIndex: number, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number, sortOrder: string): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the ASPxGridView.
+     */
+    UnGroup(column: ASPxClientGridViewColumn): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    UnGroup(columnIndex: number): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    UnGroup(columnFieldNameOrId: string): void;
+    /**
+     * Expands all group rows.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all group rows.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all detail rows.
+     */
+    ExpandAllDetailRows(): void;
+    /**
+     * Collapses all detail rows.
+     */
+    CollapseAllDetailRows(): void;
+    /**
+     * Expands the specified group row preserving the collapsed state of any child group row.
+     * @param visibleIndex An integer value that identifies the group row.
+     */
+    ExpandRow(visibleIndex: number): void;
+    /**
+     * Expands the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row.
+     * @param recursive true to expand any child group rows at all nesting levels; false to preserve the collapsed state of any child group rows.
+     */
+    ExpandRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Collapses the specified group row preserving the expanded state of child group rows.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    CollapseRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     * @param recursive true to collapse child group rows at all nesting levels; false to preserve the expanded state of any child group row.
+     */
+    CollapseRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Scrolls the view to the specified row.
+     * @param visibleIndex An integer value that identifies a row by its visible index.
+     */
+    MakeRowVisible(visibleIndex: number): void;
+    /**
+     * Expands the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    ExpandDetailRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    CollapseDetailRow(visibleIndex: number): void;
+    /**
+     * Returns the key value of the specified data row.
+     * @param visibleIndex An integer value that specifies the row's visible index.
+     */
+    GetRowKey(visibleIndex: number): string;
+    /**
+     * Switches the grid to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a data row to be edited.
+     */
+    StartEditRow(visibleIndex: number): void;
+    /**
+     * Switches the grid to edit mode.
+     * @param key An object that uniquely identifies a data row to be edited.
+     */
+    StartEditRowByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new row is being edited.
+     */
+    IsNewRowEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewRow(): void;
+    /**
+     * Deletes the specified row.
+     * @param visibleIndex An integer value that identifies the row.
+     */
+    DeleteRow(visibleIndex: number): void;
+    /**
+     * Deletes a row with the specified key value.
+     * @param key An object that uniquely identifies the row.
+     */
+    DeleteRowByKey(key: Object): void;
+    /**
+     * Returns the focused row's index.
+     */
+    GetFocusedRowIndex(): number;
+    /**
+     * Moves focus to the specified row.
+     * @param visibleIndex An integer value that specifies the focused row's index.
+     */
+    SetFocusedRowIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected rows within the grid.
+     */
+    SelectRows(): void;
+    /**
+     * Selects the specified row displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRows(visibleIndex: number): void;
+    /**
+     * Selects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    SelectRows(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRows(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified row within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the data row within the grid.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRows(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRowsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    SelectRowsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid row by its key.
+     * @param key An object that uniquely identifies the row.
+     */
+    SelectRowsByKey(key: Object): void;
+    /**
+     * Deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    UnselectRowsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     */
+    UnselectRowsByKey(key: Object): void;
+    /**
+     * Deselects all the selected rows within the grid.
+     */
+    UnselectRows(): void;
+}
+/**
+ * A client grid column.
+ */
+interface ASPxClientGridViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the column's unique identifier.
+     * Value: A string value that specifies the column's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientGridViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxGridView column.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientGridViewColumn object that represents the processed column.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the client events concerned with column processing.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with column processing.
+     * @param source The event source.
+     * @param e A ASPxClientGridViewColumnProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events  concerned with column processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a grid column related to the event.
+     * Value: An ASPxClientGridViewColumn object representing the column related to the event.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the RowExpanding events.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer zero-based index that identifies the processed row.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the row whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the row has been selected.
+     * Value: true if the row has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all rows displayed within a page have been selected or unselected.
+     * Value: true if all rows displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowClick events.
+ */
+interface ASPxClientGridViewRowClickEventHandler<S> {
+    /**
+     * A method that will handle the RowClick event.
+     * @param source The event source. This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewRowClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowClickEventArgs): void;
+}
+/**
+ * Provides data for the RowClick event.
+ */
+interface ASPxClientGridViewRowClickEventArgs extends ASPxClientGridViewRowCancelEventArgs {
+    /**
+     * Provides access to the parameters associated with the RowClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies grid element.
+     */
+    objectType: string;
+    /**
+     * Identifies the grid element being right clicked by the user.
+     * Value: A zero-based integer index that identifies the grid element being clicked by the user.
+     */
+    index: number;
+    /**
+     * Provides access to the parameters associated with the ContextMenu event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets the currently processed menu object.
+     * Value: An object that is the currently processed menu.
+     */
+    menu: Object;
+    /**
+     * Specifies whether a browser context menu should be displayed.
+     * Value: true, to display a browser context menu; otherwise, false.    The default is false.
+     */
+    showBrowserMenu: boolean;
+}
+/**
+ * A method that will handle the client ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the clicked context menu item.
+     * Value: An <see cref="ASPxClientMenuItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies the grid element.
+     */
+    objectType: string;
+    /**
+     * Returns the processed element index.
+     * Value: An integer value that specifies the processed element index.
+     */
+    elementIndex: number;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+    /**
+     * Specifies whether default context menu item click is handled manually, so no default processing is required.
+     * Value: true if no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the row whose custom button has been clicked.
+     * Value: An integer value that identifies the row whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnMoving event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnMovingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnMovingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether a column is allowed to be moved.
+     * Value: true to allow column moving; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets the column currently being dragged by an end-user.
+     * Value: An ASPxClientGridViewColumn object that represents the column currently being dragged by an end-user.
+     */
+    sourceColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets the target column, before or after which the source column will be inserted (if dropped).
+     * Value: An ASPxClientGridViewColumn object that represents the target column. null (Nothing in Visual Basic) if the source column isn't over the column header panel.
+     */
+    destinationColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets whether the source column will be inserted before the target column (if dropped).
+     * Value: true if the source column will be inserted before the target column (if dropped); otherwise, false.
+     */
+    isDropBefore: boolean;
+    /**
+     * Gets whether the source column is currently over the Group Panel.
+     * Value: true if the source column is currently over the Group Panel; otherwise, false.
+     */
+    isGroupPanel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the focused grid column.
+     */
+    focusedColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells has been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditRowValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a row currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: A <see cref="ASPxClientGridViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientGridViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowDeleting event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    rowValues: Object;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientGridViewCellInfo {
+    /**
+     * Gets the visible index of the row that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    rowVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientGridViewBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all rows when the grid operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified rows should be validated; otherwise, false.
+     */
+    ValidateRows(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified row when the grid operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated row.
+     */
+    ValidateRow(visibleIndex: number): boolean;
+    /**
+     * Returns an array of row visible indices.
+     * @param includeDeleted true, to include visible indices of deleted rows to the returned array; otherwise, false.
+     */
+    GetRowVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted row visible indices.
+     */
+    GetDeletedRowIndices(): number[];
+    /**
+     * Returns an array of the inserted row visible indices.
+     */
+    GetInsertedRowIndices(): number[];
+    /**
+     * Indicates if the row with specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDeletedRow(visibleIndex: number): boolean;
+    /**
+     * Indicates if the row with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsNewRow(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the row.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the row.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientGridViewCellInfo;
+    /**
+     * Returns a value that indicates whether the grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified row has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     * @param columnFieldNameOrId A string value that identifies the column by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified row.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or row editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * A client-side equivalent of the ASPxVerticalGrid object.
+ */
+interface ASPxClientVerticalGrid extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientVerticalGridBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientVerticalGridBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientVerticalGridCustomButtonEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientVerticalGridSelectionEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditStartEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditEndEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesSavingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is inserted in batch edit mode.
+     */
+    BatchEditRecordInserting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is deleted in batch edit mode.
+     */
+    BatchEditRecordDeleting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to specify whether record data is valid and provide an error text.
+     */
+    BatchEditRecordValidating: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent rows from being sorted.
+     */
+    RowSorting: ASPxClientEvent<ASPxClientVerticalGridRowCancelEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side before the expansion state of a row is changed by end-user interaction.
+     */
+    RowExpandedChanging: ASPxClientEvent<ASPxClientVerticalGridRowExpandingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side after a row's expansion state has been changed by end-user interaction.
+     */
+    RowExpandedChanged: ASPxClientEvent<ASPxClientVerticalGridRowExpandedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is clicked.
+     */
+    RecordClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is double clicked.
+     */
+    RecordDblClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientVerticalGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     */
+    SortBy(rowIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    SortBy(rowFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true, to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param row An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Returns the key value of the specified data row (record in the vertical grid).
+     * @param visibleIndex An integer value that specifies the record's visible index.
+     */
+    GetRecordKey(visibleIndex: number): string;
+    /**
+     * Adds a new record.
+     */
+    AddNewRecord(): void;
+    /**
+     * Deletes the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     */
+    DeleteRecord(visibleIndex: number): void;
+    /**
+     * Deletes a record with the specified key value.
+     * @param key An object that uniquely identifies the record.
+     */
+    DeleteRecordByKey(key: Object): void;
+    /**
+     * Selects all the unselected records within the grid.
+     */
+    SelectRecords(): void;
+    /**
+     * Selects the specified record displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecords(visibleIndex: number): void;
+    /**
+     * Selects the specified rercords within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    SelectRecords(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified records within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecords(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified record within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the record within the grid.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecords(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecordsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    SelectRecordsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid record by its key.
+     * @param key An object that uniquely identifies the record.
+     */
+    SelectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all the selected records within the grid.
+     */
+    UnselectRecords(): void;
+    /**
+     * Deselects the specified records (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    UnselectRecords(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified record (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecords(visibleIndex: number): void;
+    /**
+     * Deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    UnselectRecordsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     */
+    UnselectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all grid records that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRecords(): void;
+    /**
+     * Selects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified record (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected records displayed on the current page.
+     */
+    SelectAllRecordsOnPage(): void;
+    /**
+     * Allows you to select or deselect all records displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected records displayed on the current page; false to deselect all selected records on the page.
+     */
+    SelectAllRecordsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected records displayed on the current page.
+     */
+    UnselectAllRecordsOnPage(): void;
+    /**
+     * Returns the number of selected records.
+     */
+    GetSelectedRecordCount(): number;
+    /**
+     * Indicates whether or not the specified record is selected within the current page.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsRecordSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Returns the values of the specified data source fields within the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     * @param fieldNames The names of data source fields separated using a semicolon, whose values within the specified record are returned.
+     * @param onCallback An ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetRecordValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the record values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetPageRecordValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the number of records actually displayed within the active page.
+     */
+    GetVisibleRecordsOnPage(): number;
+    /**
+     * Returns the number of rows within the client vertical grid.
+     */
+    GetRowCount(): number;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the ASPxVerticalGrid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client vertical grid.
+     */
+    ClearFilter(): void;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first record displayed within the vertical grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxVerticalGrid to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Returns the record values displayed within all selected records.
+     * @param fieldNames The names of data source fields separated by a semicolon, whose values within the selected records are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns key values of selected records displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     */
+    GetEditor(row: ASPxClientVerticalGridRow): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowIndex An integer value that specifies the row's position within the rows collection.
+     */
+    GetEditor(rowIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    GetEditor(rowFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the client row that resides at the specified position within the row collection.
+     * @param rowIndex A zero-based index that identifies the row within the row collection (the row's Index property value).
+     */
+    GetRow(rowIndex: number): ASPxClientVerticalGridRow;
+    /**
+     * Returns the row with the specified unique identifier.
+     * @param rowId A string value that specifies the row's unique identifier (the row's Name property value).
+     */
+    GetRowById(rowId: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the client row which is bound to the specified data source field.
+     * @param rowFieldName A string value that specifies the name of the data source field to which the row is bound (the row's fieldName property value).
+     */
+    GetRowByField(rowFieldName: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Gets the value that specifies whether the required row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the row.
+     */
+    GetRowExpanded(row: ASPxClientVerticalGridRow): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified index is expanded.
+     * @param rowIndex An integer value specifying the row's index.
+     */
+    GetRowExpanded(rowIndex: number): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified field name or ID is expanded.
+     * @param rowFieldNameOrId A string value specifying the row's field name or ID.
+     */
+    GetRowExpanded(rowFieldNameOrId: string): boolean;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(row: ASPxClientVerticalGridRow, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowIndex An integer value specifying the index of the row.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowIndex: number, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowFieldNameOrId: string, value: boolean): void;
+}
+/**
+ * A client grid row.
+ */
+interface ASPxClientVerticalGridRow extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the row.
+     * Value: A string value assigned to the row's Name property.
+     */
+    name: string;
+    /**
+     * Gets the row's position within the collection.
+     * Value: An integer zero-bazed index that specifies the row's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current row.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the row is visible.
+     * Value: true, to display the row; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientVerticalGridValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of record values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxVerticalGrid row.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxVerticalGrid row.
+ */
+interface ASPxClientVerticalGridRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client row.
+     * Value: An ASPxClientVerticalGridRow object that represents the processed row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventHandler<S> {
+    /**
+     * A method that will handle the RecordClick event.
+     * @param source The event source. This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridRecordClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRecordClickEventArgs): void;
+}
+/**
+ * Provides data for the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the RecordClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the record whose custom button has been clicked.
+     * Value: An integer value that identifies the record whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the record whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the record has been selected.
+     * Value: true, if the record has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all records displayed within a page have been selected or unselected.
+     * Value: true if all records displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandedEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the expanded row.
+     * Value: An ASPxClientVerticalGridRow object that represents the expanded row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandingEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventArgs extends ASPxClientVerticalGridRowExpandedEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid row that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the focused grid row.
+     */
+    focusedRow: ASPxClientVerticalGridRow;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: Gets a hashtable that maintains information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditRecordValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information on the record currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed row.
+     * Value: A <see cref="ASPxClientVerticalGridRow" /> object that is the client-side row object.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordInserting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordDeleting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Contains information on a cell that is being edited.
+ */
+interface ASPxClientVerticalGridCellInfo {
+    /**
+     * Gets the row that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the row which contains the processed cell.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets the visible index of the record that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    recordVisibleIndex: number;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientVerticalGridBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all records when the grid operates in batch edit mode.
+     * @param validateOnlyModified true, if only modified records should be validated; otherwise, false.
+     */
+    ValidateRecords(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified record when the grid operates in batch edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated record.
+     */
+    ValidateRecord(visibleIndex: number): boolean;
+    /**
+     * Returns an array of record visible indices.
+     * @param includeDeleted true, to include visible indices of deleted records to the returned array; otherwise, false.
+     */
+    GetRecordVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted record visible indices.
+     */
+    GetDeletedRecordIndices(): number[];
+    /**
+     * Returns an array of the inserted record visible indices.
+     */
+    GetInsertedRecordIndices(): number[];
+    /**
+     * Indicates if the record with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsDeletedRecord(visibleIndex: number): boolean;
+    /**
+     * Indicates if the record with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsNewRecord(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the record.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the record.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, rowFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientVerticalGridCellInfo;
+    /**
+     * Returns a value that indicates whether the vertical grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified record has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     * @param rowFieldNameOrId A string value that identifies the row by the name of the data source field to which the row is bound, or by the row's name.
+     */
+    HasChanges(visibleIndex: number, rowFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified record.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Switches the specified cell to batch edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A zero-based integer value that identifies the row which contains the processed cell in the rows collection.
+     */
+    StartEdit(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Ends the cell(s) editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains style settings related to media elements in ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorCommandStyleSettings {
+    /**
+     * Gets or sets a media element's CSS class name.
+     * Value: A string that specifies a class name.
+     */
+    className: string;
+    /**
+     * Gets or sets an element's width.
+     * Value: A string that specifies an element's width <a href="http://www.w3schools.com/cssref/pr_dim_width.asp">in any correct format</a>.
+     */
+    width: string;
+    /**
+     * Gets or sets an element's height.
+     * Value: A string that specifies an element's height <a href="http://www.w3schools.com/cssref/pr_dim_height.asp">in any correct format</a>.
+     */
+    height: string;
+    /**
+     * Gets or sets a media element's border width.
+     * Value: A string that specifies a border width <a href="http://www.w3schools.com/cssref/pr_border-width.asp">in any correct format</a>.
+     */
+    borderWidth: string;
+    /**
+     * Gets or sets a media element's border color.
+     * Value: A string that specifies a border color <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    borderColor: string;
+    /**
+     * Gets or sets a media element's border style.
+     * Value: A string that specifies a border style <a href="http://www.w3schools.com/cssref/pr_border-style.asp">in any correct format</a>.
+     */
+    borderStyle: string;
+    /**
+     * Gets or sets an element's top margin.
+     * Value: A string that specifies an element's top margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginTop: string;
+    /**
+     * Gets or sets an element's right margin.
+     * Value: A string that specifies an element's right margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginRight: string;
+    /**
+     * Gets or sets an element's bottom margin.
+     * Value: A string that specifies an element's bottom margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginBottom: string;
+    /**
+     * Gets or sets an element's left margin.
+     * Value: A string that specifies an element's left margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginLeft: string;
+    backgroundColor: string;
+    textAlign: string;
+    verticalAlign: string;
+}
+/**
+ * The base class for parameters used in the ASPxHtmlEditor's client-side commands.
+ */
+interface ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Gets the currently selected element in the ASPxHtmlEditor.
+     * Value: An HTML object which is the currently selected element.
+     */
+    selectedElement: Object;
+}
+/**
+ * Contains settings related to the INSERTIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertImageCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the source of the target image.
+     * Value: A string specifying the source of the target image.
+     */
+    src: string;
+    /**
+     * Creates an alternate text for the target image.
+     * Value: A string that specifies an alternate text for the target image.
+     */
+    alt: string;
+    /**
+     * Determines if the target image is wrapped with text.
+     * Value: true, if the target image is wrapped with text; otherwise, false.
+     */
+    useFloat: boolean;
+    /**
+     * Determines the position of the target image.
+     * Value: A string value defining the position of the target image.
+     */
+    align: string;
+    /**
+     * Contains the style settings specifying the appearance of the target image.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings specifying the appearance of the target image.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * Contains settings related to the CHANGEIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeImageCommandArguments extends ASPxClientHtmlEditorInsertImageCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTLINK_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertLinkCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the url of the page the target link goes to.
+     * Value: A string value specifying the target link url.
+     */
+    url: string;
+    /**
+     * Specifiies the text of the target link.
+     * Value: A string value specifying the text of the target link.
+     */
+    text: string;
+    /**
+     * Determines where to open the target link.
+     * Value: A string that specifies where to open the target link <a href="http://www.w3schools.com/tags/att_a_target.asp">in any correct format</a>.
+     */
+    target: string;
+    /**
+     * Defines the title of the target link.
+     * Value: A string value defining the title of the target link.
+     */
+    title: string;
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * The base class for parameters related to inserting or changing media elements in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeMediaElementCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Defines the <a href="http://www.w3schools.com/tags/att_global_id.asp">HTML "id"</a> attribute of the target media element.
+     * Value: A string value which is a unique identifier for the element.
+     */
+    id: string;
+    /**
+     * Defines the source of the target media element.
+     * Value: A string defining the source of the target media element.
+     */
+    src: string;
+    /**
+     * Determines the position of the target media element.
+     * Value: A string value indicating the position of the target media element.
+     */
+    align: string;
+    /**
+     * Contains the style settings defining the appearance of the target media element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target media element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Returns the name of the client-side command corresponding to the parameter.
+     */
+    GetCommandName(): string;
+}
+/**
+ * The base class for parameters related to inserting or changing HTML5 media elements (Audio and Video) in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if a media file will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Determines if a media file repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the media player controls should be displayed.
+     * Value: true, if media player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+    /**
+     * Determines how a media file should be loaded when the page loads.
+     * Value: One of the ASPxClientHtmlEditorMediaPreloadMode enumeration values.
+     */
+    preloadMode: string;
+}
+/**
+ * Contains settings related to the INSERTAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertAudioCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+}
+/**
+ * Contains settings related to the CHANGEAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeAudioCommandArguments extends ASPxClientHtmlEditorInsertAudioCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertVideoCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+    /**
+     * Defines the URL of an image that is shown while the video file is downloading, or until an end-user clicks the play button.
+     * Value: A string value that specifies the poster image URL.
+     */
+    posterUrl: string;
+}
+/**
+ * Contains settings related to the CHANGEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeVideoCommandArguments extends ASPxClientHtmlEditorInsertVideoCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertFlashCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if the target flash element will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Defines if the target flash element repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the flash related items are displayed in the context menu of the target flash element.
+     * Value: true, if the specific context menu items are displayed; otherwise, false
+     */
+    enableFlashMenu: boolean;
+    /**
+     * Determines if the target flash element can be displayed in the fullscreen mode.
+     * Value: true, if the fullscreen mode is allowed; otherwise, false.
+     */
+    allowFullscreen: boolean;
+    /**
+     * Defines the rendering quality level used for the target flash element.
+     * Value: A string value that specifies the target flash element rendering quality.
+     */
+    quality: string;
+}
+/**
+ * Contains settings related to the CHANGEFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeFlashCommandArguments extends ASPxClientHtmlEditorInsertFlashCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if suggested videos are shown after the target YouTube video finishes.
+     * Value: true, to show suggested videos; otherwise, false
+     */
+    showRelatedVideos: boolean;
+    /**
+     * Determines if the target YouTube video title and player actions (Watch later, Share) are shown.
+     * Value: true, to display the title and player actions; otherwise, false.
+     */
+    showVideoInfo: boolean;
+    /**
+     * Determines if the privacy-enhanced mode is enabled for the target YouTube video.
+     * Value: true, if the privace-enhanced mode is enabled; otherwise, false
+     */
+    enablePrivacyEnhancedMode: boolean;
+    /**
+     * Determines if the player controls are displayed for the target YouTube video.
+     * Value: true, if the player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+}
+/**
+ * Contains settings related to the CHANGEYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeYouTubeVideoCommandArguments extends ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments {
+}
+interface ASPxClientHtmlEditorTablePropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    align: string;
+    cellPadding: number;
+    cellSpacing: number;
+    caption: string;
+    headers: string;
+    summary: string;
+}
+interface ASPxClientHtmlEditorInsertTableCommandArguments extends ASPxClientHtmlEditorTablePropertiesCommandArguments {
+    columns: number;
+    rows: number;
+    isEqualColumnWidth: boolean;
+}
+interface ASPxClientHtmlEditorTableCellPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    applyForAll: boolean;
+}
+interface ASPxClientHtmlEditorTableRowPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+interface ASPxClientHtmlEditorTableColumnPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * A method that will handle the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client DialogInitialized event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorDialogInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogInitializedEventArgs): void;
+}
+/**
+ * Provides data for the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dialog that has been initialized.
+     * Value: A string value that is the name of the initialized dialog.
+     */
+    dialogName: string;
+}
+/**
+ * A method that will handle the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventHandler<S> {
+    /**
+     * A method that will handle the client CommandExecuted event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorCommandExecutingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandExecutingEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value specifying the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: An object containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events related to command processing.
+ */
+interface ASPxClientHtmlEditorCommandEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientHtmlEditorCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to command processing (CustomCommand).
+ */
+interface ASPxClientHtmlEditorCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogOpened event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed custom dialog.
+     * Value: A string value that represents the value assigned to the processed custom dialog's Name property.
+     */
+    name: string;
+}
+/**
+ * Provides data for client events that relate to closing a custom dialog.
+ */
+interface ASPxClientHtmlEditorCustomDialogCloseEventArgsBase extends ASPxClientHtmlEditorCustomDialogEventArgs {
+    /**
+     * Gets the status of the closed custom dialog.
+     * Value: An object representing a custom dialog's closing status. By default, it's the "cancel" string if the dialog operation is canceled, or the "ok" string if a dialog is closed by submitting a file. You can also provide your custom status, if your dialog contains additional buttons.
+     */
+    status: Object;
+}
+/**
+ * A method that will handle the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosing event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosingEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosed event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosedEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets an object associated with the closed dialog.
+     * Value: An object containing custom data associated with dialog closing.
+     */
+    data: Object;
+}
+/**
+ * A method that will handle the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventHandler<S> {
+    /**
+     * A method that will handle the client Validation event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorValidationEventArgs): void;
+}
+/**
+ * Provides data for the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the HTML markup that is the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to validate.
+     */
+    html: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientHtmlEditorTabEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanged event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies an editor tab.
+     * Value: A string value that is the tab name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the ActiveTabChanging event.
+ */
+interface ASPxClientHtmlEditorTabCancelEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanging event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancellable ActiveTabChanging event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabCancelEventArgs extends ASPxClientHtmlEditorTabEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventHandler<S> {
+    /**
+     * A method that will handle the BeforePaste event.
+     * @param source The event source. This parameter identifies the HTML editor object that raised the event.
+     * @param e An ASPxClientHtmlEditorBeforePasteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorBeforePasteEventArgs): void;
+}
+/**
+ * Provides data for the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value identifying the command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the HTML markup that is about to be pasted to the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to paste.
+     */
+    html: string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHtmlEditor control.
+ */
+interface ASPxClientHtmlEditor extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a dialog has been initialized.
+     */
+    DialogInitialized: ASPxClientEvent<ASPxClientHtmlEditorDialogInitializedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before a default or custom command has been executed and allows you to cancel the action.
+     */
+    CommandExecuting: ASPxClientEvent<ASPxClientHtmlEditorCommandExecutingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Enables you to implement a custom command's logic.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs after a default or custom command has been executed on the client side.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client when a selection is changed within the ASPxHtmlEditor.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side when the content of the editor changes.
+     */
+    HtmlChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is opened.
+     */
+    CustomDialogOpened: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before a custom dialog is closed.
+     */
+    CustomDialogClosing: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is closed.
+     */
+    CustomDialogClosed: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Allows you to specify whether the value entered into the ASPxHtmlEditor is valid.
+     */
+    Validation: ASPxClientEvent<ASPxClientHtmlEditorValidationEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side before a context menu is shown.
+     */
+    ContextMenuShowing: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHtmlEditor.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires after a callback, sent by the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after the editor content is spell checked.
+     */
+    SpellingChecked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientHtmlEditorTabEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before the active tab is changed within a control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientHtmlEditorTabCancelEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before an HTML code is pasted to editor content, and allows you to modify it.
+     */
+    BeforePaste: ASPxClientEvent<ASPxClientHtmlEditorBeforePasteEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Returns the document object generated by an iframe element within a design view area.
+     */
+    GetDesignViewDocument(): Object;
+    /**
+     * Returns the document object generated by an iframe element within a preview area.
+     */
+    GetPreviewDocument(): Object;
+    /**
+     * Returns a collection of client context menu objects.
+     */
+    GetContextMenu(): ASPxClientPopupMenu;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Sets input focus to the ASPxHtmlEditor's edit region.
+     */
+    Focus(): void;
+    /**
+     * Gets the HTML markup that represents the editor's content.
+     */
+    GetHtml(): string;
+    /**
+     * Specifies the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetHtml(html: string): void;
+    /**
+     * Sets the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     * @param clearUndoHistory true to clear the undo stack; otherwise, false.
+     */
+    SetHtml(html: string, clearUndoHistory: boolean): void;
+    /**
+     * Replaces placeholders with the specified values.
+     * @param html A string value that specifies the HTML code to process.
+     * @param placeholders An array of objects that specify the placeholders and values to replace them.
+     */
+    ReplacePlaceholders(html: string, placeholders: Object[]): string;
+    /**
+     * Creates a parameter for ASPxHtmlEditor's client-side commands related to changing media elements.
+     * @param element An element that is being changed.
+     */
+    CreateChangeMediaElementCommandArguments(element: Object): ASPxClientHtmlEditorChangeMediaElementCommandArguments;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     * @param parameter A string value specifying additional information about the command to perform.
+     * @param addToUndoHistory true, to add the specified command to the undo stack; otherwise, false.
+     */
+    ExecuteCommand(commandName: string, parameter: Object, addToUndoHistory: boolean): boolean;
+    /**
+     * Adds the current editor state to the undo/redo history.
+     */
+    SaveToUndoHistory(): void;
+    /**
+     * Returns the selection in the ASPxHtmlEditor.
+     */
+    GetSelection(): ASPxClientHtmlEditorSelection;
+    /**
+     * Restores the selection within the ASPxHtmlEditor.
+     */
+    RestoreSelection(): boolean;
+    /**
+     * Sets the value of the combo box within the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the combo box's command name within the HtmlEditor's control collection.
+     * @param value A string value that specifies the combo box's new value.
+     */
+    SetToolbarComboBoxValue(commandName: string, value: string): void;
+    /**
+     * Sets the value of the dropdown item picker in the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the dropdown item picker by its command name. This value is contained in the CommandName property.
+     * @param value A string value that specifies the dropdown item picker's new value, i.e., the ToolbarItemPickerItem object.
+     */
+    SetToolbarDropDownItemPickerValue(commandName: string, value: string): void;
+    /**
+     * Specifies the visibility of a ribbon context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param active true to make a category visible; false to make it hidden.
+     */
+    SetRibbonContextTabCategoryVisible(categoryName: string, active: string): void;
+    /**
+     * Provides access to an object implementing the HtmlEditor's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value passes validation.
+     * @param isValid true if the editor's value passes validation; otherwise, false.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs validation of the editor's content.
+     */
+    Validate(): void;
+    /**
+     * Set an active tab specified by its name.
+     * @param name A string value that is the name of the tab.
+     */
+    SetActiveTabByName(name: string): void;
+    /**
+     * Returns the name of the active HTML editor tab.
+     */
+    GetActiveTabName(): string;
+    /**
+     * Reconnect the control to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * A selection in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorSelection {
+    /**
+     * Returns a DOM element that relates to the current selection.
+     */
+    GetSelectedElement(): Object;
+    /**
+     * Returns the HTML markup specifying the currently selected ASPxHtmlEditor content.
+     */
+    GetHtml(): string;
+    /**
+     * Returns the text within the currently selected ASPxHtmlEditor content.
+     */
+    GetText(): string;
+    /**
+     * Returns an array of the currently selected elements.
+     */
+    GetElements(): Object[];
+    /**
+     * Sets the new HTML markup in place of the currently selected within ASPxHtmlEditor content.
+     * @param html A string value specifying the new HTML markup.
+     * @param addToHistory true to add this operation to the history; otherwise, false.
+     */
+    SetHtml(html: string, addToHistory: boolean): void;
+}
+/**
+ * The client-side equivalent of the ASPxPivotGrid control.
+ */
+interface ASPxClientPivotGrid extends ASPxClientControl {
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientPivotGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires after a callback that has been processed on the server returns back to the client.
+     */
+    AfterCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires before a callback is sent to the server for server-side processing.
+     */
+    BeforeCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client side after the customization form's visible state has been changed.
+     */
+    CustomizationFieldsVisibleChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is clicked.
+     */
+    CellClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is double clicked.
+     */
+    CellDblClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a custom menu item has been clicked.
+     */
+    PopupMenuItemClick: ASPxClientEvent<ASPxClientPivotMenuItemClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Indicates whether the Defer Layout Update check box is enabled.
+     */
+    IsDeferUpdatesChecked(): boolean;
+    /**
+     * Indicates whether the Filter Editor (Prefilter) is visible.
+     */
+    IsPrefilterVisible(): boolean;
+    /**
+     * Shows the Filter Editor.
+     */
+    ShowPrefilter(): void;
+    /**
+     * Hides the Filter Editor.
+     */
+    HidePrefilter(): void;
+    /**
+     * Clears the filter expression applied using the Prefilter (Filter Editor).
+     */
+    ClearPrefilter(): void;
+    /**
+     * Enables or disables the current filter applied by the Filter Editor (Prefilter).
+     */
+    ChangePrefilterEnabled(): void;
+    /**
+     * Returns a value that specifies whether the customization form is visible.
+     */
+    GetCustomizationFieldsVisibility(): boolean;
+    /**
+     * Specifies the visibility of the customization form.
+     * @param value true to display the customization form; false to hide the customization form.
+     */
+    SetCustomizationFieldsVisibility(value: boolean): void;
+    /**
+     * Switches the customization form's visible state.
+     */
+    ChangeCustomizationFieldsVisibility(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the CellDblClick event.
+ */
+interface ASPxClientClickEventHandler<S> {
+    /**
+     * A method that will handle the CellDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientClickEventArgs): void;
+}
+/**
+ * Provides data for the CellDblClick client events.
+ */
+interface ASPxClientClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the parameters associated with the CellDblClick events.
+     * Value: An object that contains parameters associated with the CellDblClick events.
+     */
+    HtmlEvent: Object;
+    /**
+     * Gets the processed cell's value.
+     * Value: An object that represents the processed cell's value.
+     */
+    Value: Object;
+    /**
+     * Gets the index of a column that owns the processed cell.
+     * Value: An integer value that identifies a column.
+     */
+    ColumnIndex: number;
+    /**
+     * Gets the index of a row that owns the processed cell.
+     * Value: An integer value that identifies a row.
+     */
+    RowIndex: number;
+    /**
+     * Gets a column field value.
+     * Value: An object that represents a column field value.
+     */
+    ColumnValue: Object;
+    /**
+     * Gets a row field value.
+     * Value: An object that represents a row field value.
+     */
+    RowValue: Object;
+    /**
+     * Gets a column field name.
+     * Value: A String value that represents a column field name.
+     */
+    ColumnFieldName: string;
+    /**
+     * Gets a row field name.
+     * Value: A String value that represents a row field name.
+     */
+    RowFieldName: string;
+    /**
+     * Gets a column value type.
+     * Value: A String value that represents a column value type.
+     */
+    ColumnValueType: string;
+    /**
+     * Gets a row value type.
+     * Value: A String value that represents a row value type.
+     */
+    RowValueType: string;
+    /**
+     * Gets the index of the data field which corresponds to the clicked summary value.
+     * Value: An integer value that identifies the data field.
+     */
+    DataIndex: number;
+}
+/**
+ * A method that will handle the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientPivotMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPivotMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the context menu's type.
+     * Value: A PivotGridPopupMenuType enumeration value that identifies the context menu.
+     */
+    MenuType: string;
+    /**
+     * Gets the name of the menu item currently being clicked.
+     * Value: A String value that identifies the clicked item by its name.
+     */
+    MenuItemName: string;
+    /**
+     * Gets the field's unique indentifier.
+     * Value: A string which specifies the field's unique indentifier.
+     */
+    FieldID: string;
+    /**
+     * Gets the index of the field value for which the popup menu has been invoked.
+     * Value: An integer value that identifies the field value.
+     */
+    FieldValueIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxPivotCustomizationControl control.
+ */
+interface ASPxClientPivotCustomization extends ASPxClientControl {
+    /**
+     * Returns an HTML element that represents the root of the control's hierarchy.
+     */
+    GetMainContainer(): Object;
+    /**
+     * Returns a client-side equivalent of the owner Pivot Grid Control.
+     */
+    GetPivotGrid(): ASPxClientPivotGrid;
+    /**
+     * Specifies the Customization Control's height.
+     * @param value An integer value that specifies the Customization Control's height.
+     */
+    SetHeight(value: number): void;
+    /**
+     * Specifies the Customization Control's width.
+     * @param value An integer value that specifies the Customization Control's width.
+     */
+    SetWidth(value: number): void;
+    /**
+     * Recalculates the Customization Control height.
+     */
+    UpdateHeight(): void;
+    /**
+     * Specifies the Customization Control's layout.
+     * @param layout A string that specifies the Customization Control's layout.
+     */
+    SetLayout(layout: string): void;
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the RichEdit that raised the event.
+     * @param e A ASPxClientRichEditCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A client-side equivalent of the ASPxRichEdit object.
+ */
+interface ASPxClientRichEdit extends ASPxClientControl {
+    /**
+     * Provides access to document structural elements.
+     * Value: A <see cref="RichEditDocument" /> object that lists RichEdit's document structural elements.
+     */
+    document: RichEditDocument;
+    /**
+     * Provides access to RichEdit's client-side commands.
+     * Value: A <see cref="RichEditCommands" /> object that lists RichEdit's client-side commands.
+     */
+    commands: RichEditCommands;
+    /**
+     * Provides access to the client methods that changes the selection.
+     * Value: A <see cref="RichEditSelection" /> object that lists methods to work with the selection.
+     */
+    selection: RichEditSelection;
+    unitConverter: RichEditUnitConverter;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientRichEditCustomCommandExecutedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the RichEdit.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires if any change is made to the RichEdit's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a hyperlink is clicked within the document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientRichEditHyperlinkClickEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the selection is changed within the document.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Enables you to switch the full-screen mode of the Rich Text Editor.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Provides access to an object implementing the RichEdit's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Sets input focus to the RichEdit.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Reconnects the RichEdit to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * Contains a set of the available client commands.
+ */
+interface RichEditCommands {
+    /**
+     * Gets a command to create a new empty document.
+     * Value: A <see cref="FileNewCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileNew: FileNewCommand;
+    /**
+     * Gets a command to open the file, specifying its path.
+     * Value: A <see cref="FileOpenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpen: FileOpenCommand;
+    /**
+     * Gets a command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+     * Value: A <see cref="FileOpenDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpenDialog: FileOpenDialogCommand;
+    /**
+     * Gets a command to save the document to a file.
+     * Value: A <see cref="FileSaveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSave: FileSaveCommand;
+    /**
+     * Gets a command to download the document file, specifying its extension.
+     * Value: A <see cref="FileDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileDownload: FileDownloadCommand;
+    /**
+     * Gets a command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+     * Value: A <see cref="FileSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSaveAs: FileSaveAsCommand;
+    fileSaveAsDialog: FileSaveAsDialogCommand;
+    /**
+     * Gets a command to invoke a browser-specific Print dialog allowing one to print the current document.
+     * Value: A <see cref="FilePrintCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    filePrint: FilePrintCommand;
+    /**
+     * Gets a command to cancel changes caused by the previous command.
+     * Value: A <see cref="UndoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    undo: UndoCommand;
+    /**
+     * Gets a command to reverse actions of the previous undo command.
+     * Value: A <see cref="RedoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    redo: RedoCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the clipboard.
+     * Value: A <see cref="CopyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copy: CopyCommand;
+    /**
+     * Gets a command to paste the text from the clipboard over the selection.
+     * Value: A <see cref="PasteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    paste: PasteCommand;
+    /**
+     * Gets a command to cut the selected text and place it to the clipboard.
+     * Value: A <see cref="CutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    cut: CutCommand;
+    /**
+     * Gets a command to change the font name of characters in a selected range.
+     * Value: A <see cref="ChangeFontNameCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontName: ChangeFontNameCommand;
+    /**
+     * Gets a command to change the font size of characters in a selected range.
+     * Value: A <see cref="ChangeFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSize: ChangeFontSizeCommand;
+    /**
+     * Gets a command to increase the font size of characters in a selected range to the closest larger predefined value.
+     * Value: A <see cref="IncreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseFontSize: IncreaseFontSizeCommand;
+    /**
+     * Gets a command to decrease the selected range's font size to the closest smaller predefined value.
+     * Value: A <see cref="DecreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseFontSize: DecreaseFontSizeCommand;
+    /**
+     * Gets a command to convert selected text to upper case.
+     * Value: A <see cref="MakeTextUpperCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextUpperCase: MakeTextUpperCaseCommand;
+    /**
+     * Gets a command to convert selected text to lower case.
+     * Value: A <see cref="MakeTextLowerCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextLowerCase: MakeTextLowerCaseCommand;
+    /**
+     * Gets a command to capitalize each word in the selected sentence.
+     * Value: A <see cref="CapitalizeEachWordTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    capitalizeEachWordTextCase: CapitalizeEachWordTextCaseCommand;
+    /**
+     * Gets a command to toggle case for each character - upper case becomes lower, lower case becomes upper.
+     * Value: A <see cref="ToggleTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTextCase: ToggleTextCaseCommand;
+    /**
+     * Gets a command to change the bold formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontBoldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBold: ChangeFontBoldCommand;
+    /**
+     * Gets a command to change the italic formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontItalicCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontItalic: ChangeFontItalicCommand;
+    /**
+     * Gets a command to change the underline formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontUnderlineCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontUnderline: ChangeFontUnderlineCommand;
+    /**
+     * Gets a command to change the strikeout formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontStrikeoutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontStrikeout: ChangeFontStrikeoutCommand;
+    /**
+     * Gets a command to change the superscript formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontSuperscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSuperscript: ChangeFontSuperscriptCommand;
+    /**
+     * Gets a command to change the subscript formatting of characters in the selected range.
+     * Value: A <see cref="ChangeFontSubscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSubscript: ChangeFontSubscriptCommand;
+    /**
+     * Gets a command to change the font color of characters in a selected range.
+     * Value: A <see cref="ChangeFontForeColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontForeColor: ChangeFontForeColorCommand;
+    /**
+     * Gets a command to change the background color of characters in a selected range.
+     * Value: A <see cref="ChangeFontBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBackColor: ChangeFontBackColorCommand;
+    /**
+     * Gets a command to reset the selected text's formatting to default.
+     * Value: A <see cref="ClearFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    clearFormatting: ClearFormattingCommand;
+    /**
+     * Gets a command to change the selected range's style.
+     * Value: A <see cref="ChangeStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeStyle: ChangeStyleCommand;
+    /**
+     * Gets a command to toggle between the bulleted paragraph and normal text.
+     * Value: A <see cref="ToggleBulletedListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleBulletedList: ToggleBulletedListCommand;
+    /**
+     * Gets a command to toggle between the numbered paragraph and normal text.
+     * Value: A <see cref="ToggleNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleNumberingList: ToggleNumberingListCommand;
+    /**
+     * Gets a command to toggle between the multilevel list style and normal text.
+     * Value: A <see cref="ToggleMultilevelListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleMultilevelList: ToggleMultilevelListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected range.
+     * Value: A <see cref="IncreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseIndent: IncreaseIndentCommand;
+    /**
+     * Gets a command to decrement the indent level of paragraphs in a selected range.
+     * Value: A <see cref="DecreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseIndent: DecreaseIndentCommand;
+    /**
+     * Gets a command to toggle hidden symbol visibility.
+     * Value: A <see cref="ShowHiddenSymbolsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHiddenSymbols: ShowHiddenSymbolsCommand;
+    /**
+     * Gets a command to toggle left paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentLeft: ToggleParagraphAlignmentLeftCommand;
+    /**
+     * Gets a command to toggle centered paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentCenter: ToggleParagraphAlignmentCenterCommand;
+    /**
+     * Gets a command to toggle right paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentRight: ToggleParagraphAlignmentRightCommand;
+    /**
+     * Gets a command to toggle justified paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentJustifyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentJustify: ToggleParagraphAlignmentJustifyCommand;
+    /**
+     * Gets a command to format a current paragraph with single line spacing.
+     * Value: A <see cref="SetSingleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSingleParagraphSpacing: SetSingleParagraphSpacingCommand;
+    /**
+     * Gets a command to format a current paragraph with one and a half line spacing.
+     * Value: A <see cref="SetSesquialteralParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSesquialteralParagraphSpacing: SetSesquialteralParagraphSpacingCommand;
+    /**
+     * Gets a command to format a selected paragraph with double line spacing.
+     * Value: A <see cref="SetDoubleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDoubleParagraphSpacing: SetDoubleParagraphSpacingCommand;
+    /**
+     * Gets a command to add spacing before a paragraph.
+     * Value: A <see cref="AddSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingBeforeParagraph: AddSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to add spacing after a paragraph.
+     * Value: A <see cref="AddSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingAfterParagraph: AddSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to remove spacing before the selected paragraph.
+     * Value: A <see cref="RemoveSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingBeforeParagraph: RemoveSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to remove spacing after the selected paragraph.
+     * Value: A <see cref="RemoveSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingAfterParagraph: RemoveSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to change the background color of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphBackColor: ChangeParagraphBackColorCommand;
+    /**
+     * Gets a command to invoke the Font dialog window.
+     * Value: A <see cref="OpenFontFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFontFormattingDialog: OpenFontFormattingDialogCommand;
+    /**
+     * Gets a command to change the font formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontFormatting: ChangeFontFormattingCommand;
+    /**
+     * Gets a command to invoke the Indents And Spacing tab of the Paragraph dialog window.
+     * Value: A <see cref="OpenParagraphFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openParagraphFormattingDialog: OpenParagraphFormattingDialogCommand;
+    /**
+     * Gets a command to change the formatting of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphFormatting: ChangeParagraphFormattingCommand;
+    /**
+     * Gets a command to insert a page break at the current position in the document.
+     * Value: A <see cref="InsertPageBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPageBreak: InsertPageBreakCommand;
+    /**
+     * Gets a command to invoke the Insert Table dialog window.
+     * Value: A <see cref="OpenInsertTableDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertTableDialog: OpenInsertTableDialogCommand;
+    /**
+     * Gets a command to invoke the Insert Table dialog window.
+     * Value: A <see cref="InsertTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTable: InsertTableCommand;
+    /**
+     * Gets a command to invoke the Insert Image dialog window.
+     * Value: A <see cref="OpenInsertPictureDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertPictureDialog: OpenInsertPictureDialogCommand;
+    /**
+     * Gets a command to insert a picture from a file.
+     * Value: A <see cref="InsertPictureCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPicture: InsertPictureCommand;
+    /**
+     * Gets a command to invoke the Bookmark dialog window.
+     * Value: A <see cref="OpenInsertBookmarkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertBookmarkDialog: OpenInsertBookmarkDialogCommand;
+    /**
+     * Gets a command to insert a new bookmark that references the current selection.
+     * Value: A <see cref="InsertBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertBookmark: InsertBookmarkCommand;
+    /**
+     * A command to delete a specific bookmark.
+     * Value: A <see cref="DeleteBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteBookmark: DeleteBookmarkCommand;
+    /**
+     * Gets a command to navigate to the specified bookmark.
+     * Value: A <see cref="GoToBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToBookmark: GoToBookmarkCommand;
+    /**
+     * Gets a command to invoke the Hyperlink dialog window.
+     * Value: A <see cref="OpenInsertHyperlinkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertHyperlinkDialog: OpenInsertHyperlinkDialogCommand;
+    /**
+     * Gets a command to insert a hyperlink at the current position in the document.
+     * Value: A <see cref="InsertHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHyperlink: InsertHyperlinkCommand;
+    /**
+     * Gets a command to delete the selected hyperlink.
+     * Value: A <see cref="DeleteHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlink: DeleteHyperlinkCommand;
+    /**
+     * Gets a command to delete all hyperlinks in the selected range.
+     * Value: A <see cref="DeleteHyperlinksCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlinks: DeleteHyperlinksCommand;
+    /**
+     * Gets a command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+     * Value: A <see cref="OpenHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openHyperlink: OpenHyperlinkCommand;
+    /**
+     * Gets a command to invoke the Symbols dialog window.
+     * Value: A <see cref="OpenInsertSymbolDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertSymbolDialog: OpenInsertSymbolDialogCommand;
+    /**
+     * Gets a command to insert a character into a document.
+     * Value: A <see cref="InsertSymbolCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSymbol: InsertSymbolCommand;
+    /**
+     * Gets a command to change page margin settings.
+     * Value: A <see cref="ChangePageMarginsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageMargins: ChangePageMarginsCommand;
+    /**
+     * Gets a command to invoke the Margins tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPageMarginsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPageMarginsDialog: OpenPageMarginsDialogCommand;
+    /**
+     * Gets a command to change the page orientation.
+     * Value: A <see cref="ChangePageOrientationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageOrientation: ChangePageOrientationCommand;
+    /**
+     * Gets a command to define the page size dialog's settings.
+     * Value: A <see cref="SetPageSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setPageSizeDialog: SetPageSizeDialogCommand;
+    /**
+     * Gets a command to invoke the Paper tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPagePaperSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPagePaperSizeDialog: OpenPagePaperSizeDialogCommand;
+    /**
+     * Gets a command to change the page size.
+     * Value: A <see cref="ChangePageSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageSize: ChangePageSizeCommand;
+    /**
+     * Gets a command to change the number of section columns having the same width.
+     * Value: A <see cref="ChangeSectionEqualColumnCountCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionEqualColumnCount: ChangeSectionEqualColumnCountCommand;
+    /**
+     * Gets a command to invoke the Columns dialog window.
+     * Value: A <see cref="OpenSectionColumnsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSectionColumnsDialog: OpenSectionColumnsDialogCommand;
+    /**
+     * Gets a command to change the settings of individual section columns.
+     * Value: A <see cref="ChangeSectionColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionColumns: ChangeSectionColumnsCommand;
+    /**
+     * Gets a command to insert a column break at the current position in the document.
+     * Value: A <see cref="InsertColumnBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertColumnBreak: InsertColumnBreakCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next page.
+     * Value: A <see cref="InsertSectionBreakNextPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakNextPage: InsertSectionBreakNextPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next even-numbered page.
+     * Value: A <see cref="InsertSectionBreakEvenPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakEvenPage: InsertSectionBreakEvenPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next odd-numbered page.
+     * Value: A <see cref="InsertSectionBreakOddPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakOddPage: InsertSectionBreakOddPageCommand;
+    /**
+     * Gets a command to set the background color of the page.
+     * Value: A <see cref="ChangePageColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageColor: ChangePageColorCommand;
+    /**
+     * Gets a command to toggle the horizontal ruler's visibility.
+     * Value: A <see cref="ShowHorizontalRulerCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHorizontalRuler: ShowHorizontalRulerCommand;
+    /**
+     * Gets a command to toggle the fullscreen mode.
+     * Value: A <see cref="SetFullscreenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setFullscreen: SetFullscreenCommand;
+    /**
+     * Gets a command to invoke the Bulleted and Numbering dialog window.
+     * Value: A <see cref="OpenNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openNumberingListDialog: OpenNumberingListDialogCommand;
+    /**
+     * Gets a command to insert a paragraph break at the current position in the document.
+     * Value: A <see cref="InsertParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertParagraph: InsertParagraphCommand;
+    /**
+     * Gets a command to insert text at the current position in a document.
+     * Value: A <see cref="InsertTextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertText: InsertTextCommand;
+    /**
+     * Gets a command to delete the text in a selected range.
+     * Value: A <see cref="DeleteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    delete: DeleteCommand;
+    /**
+     * Gets a command to remove the previous word.
+     * Value: A <see cref="RemovePrevWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removePrevWord: RemovePrevWordCommand;
+    /**
+     * Gets a command to remove the next word.
+     * Value: A <see cref="RemoveNextWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNextWord: RemoveNextWordCommand;
+    /**
+     * Gets a command to move the cursor backwards and erase the character in that space.
+     * Value: A <see cref="BackspaceCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    backspace: BackspaceCommand;
+    /**
+     * Gets a command to insert the line break at the current position in the document.
+     * Value: A <see cref="InsertLineBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertLineBreak: InsertLineBreakCommand;
+    /**
+     * Gets a command to scale pictures in a selected range.
+     * Value: A <see cref="ChangePictureScaleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePictureScale: ChangePictureScaleCommand;
+    /**
+     * Gets a command to increment the left indentation of paragraphs in a selected range.
+     * Value: A <see cref="IncrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementParagraphLeftIndent: IncrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to decrement the paragraph's left indent position.
+     * Value: A <see cref="DecrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementParagraphLeftIndent: DecrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to move the selected range.
+     * Value: A <see cref="MoveContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    moveContent: MoveContentCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the specified position.
+     * Value: A <see cref="CopyContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copyContent: CopyContentCommand;
+    /**
+     * Gets a command to insert a tab character at the current position in the document.
+     * Value: A <see cref="InsertTabCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTab: InsertTabCommand;
+    /**
+     * Gets a command to invoke the Tabs dialog window.
+     * Value: A <see cref="OpenTabsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTabsDialog: OpenTabsDialogCommand;
+    /**
+     * Gets a command to change paragraph tab stops.
+     * Value: A <see cref="ChangeTabsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTabs: ChangeTabsCommand;
+    /**
+     * Gets a command to invoke the Customize Numbered List dialog window.
+     * Value: A <see cref="OpenCustomNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openCustomNumberingListDialog: OpenCustomNumberingListDialogCommand;
+    /**
+     * Gets a command to customize the numbered list parameters.
+     * Value: A <see cref="ChangeCustomNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeCustomNumberingList: ChangeCustomNumberingListCommand;
+    /**
+     * Gets a command to restart the numbering list.
+     * Value: A <see cref="RestartNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    restartNumberingList: RestartNumberingListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="IncrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementNumberingIndent: IncrementNumberingIndentCommand;
+    /**
+     * Gets a command to decrement the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="DecrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementNumberingIndent: DecrementNumberingIndentCommand;
+    /**
+     * Gets a command to create an empty field in the document.
+     * Value: A <see cref="CreateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createField: CreateFieldCommand;
+    /**
+     * Gets a command to update the field's result.
+     * Value: A <see cref="UpdateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateField: UpdateFieldCommand;
+    /**
+     * Gets a command to display the selected field's codes.
+     * Value: A <see cref="ShowFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showFieldCodes: ShowFieldCodesCommand;
+    /**
+     * Get a command to display all field codes in place of the fields in the document.
+     * Value: A <see cref="ShowAllFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showAllFieldCodes: ShowAllFieldCodesCommand;
+    /**
+     * Gets a command to continue the list's numbering.
+     * Value: A <see cref="ContinueNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    continueNumberingList: ContinueNumberingListCommand;
+    /**
+     * Gets a command to insert numeration to a paragraph making it a numbering list item.
+     * Value: A <see cref="InsertNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertNumeration: InsertNumerationCommand;
+    /**
+     * Gets a command to remove the selected numeration.
+     * Value: A <see cref="RemoveNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNumeration: RemoveNumerationCommand;
+    /**
+     * Gets a command to update all fields in the selected range.
+     * Value: A <see cref="UpdateAllFieldsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateAllFields: UpdateAllFieldsCommand;
+    /**
+     * Gets a command to insert a DATE field displaying the current date.
+     * Value: A <see cref="CreateDateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createDateField: CreateDateFieldCommand;
+    /**
+     * Gets a command to insert a TIME field displaying the current time.
+     * Value: A <see cref="CreateTimeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createTimeField: CreateTimeFieldCommand;
+    /**
+     * A command to insert a PAGE field displaying the current page number.
+     * Value: A <see cref="CreatePageFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageField: CreatePageFieldCommand;
+    /**
+     * Gets a command to convert the text of all selected sentences to sentence case.
+     * Value: A <see cref="MakeTextSentenceCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextSentenceCase: MakeTextSentenceCaseCommand;
+    /**
+     * Gets a command to switch the text case at the current position in the document.
+     * Value: A <see cref="SwitchTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    switchTextCase: SwitchTextCaseCommand;
+    /**
+     * Gets a command to navigate to the first data record.
+     * Value: A <see cref="GoToFirstDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFirstDataRecord: GoToFirstDataRecordCommand;
+    /**
+     * Gets a command to navigate to the previous data record of the bound data source.
+     * Value: A <see cref="GoToPreviousDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousDataRecord: GoToPreviousDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record of the bound data source.
+     * Value: A <see cref="GoToNextDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextDataRecord: GoToNextDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record.
+     * Value: A <see cref="GoToDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToDataRecord: GoToDataRecordCommand;
+    /**
+     * Gets a command to navigate to the last data record of the bound data source.
+     * Value: A <see cref="GoToLastDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToLastDataRecord: GoToLastDataRecordCommand;
+    /**
+     * Gets a command to display or hide actual data in MERGEFIELD fields.
+     * Value: A <see cref="ShowMergedDataCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showMergedData: ShowMergedDataCommand;
+    /**
+     * Gets a command to invoke the Insert Merge Field dialog window.
+     * Value: A <see cref="MergeFieldDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeFieldDialog: MergeFieldDialogCommand;
+    /**
+     * Gets a command to insert a MERGEFIELD field (with a data source column name) at the current position in the document.
+     * Value: A <see cref="CreateMergeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createMergeField: CreateMergeFieldCommand;
+    /**
+     * Gets a command to invoke the Export Range dialog window to start a mail merge.
+     * Value: A <see cref="MailMergeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeDialog: MailMergeDialogCommand;
+    /**
+     * Gets a command to perform a mail merge and download the merged document.
+     * Value: A <see cref="MailMergeAndDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndDownload: MailMergeAndDownloadCommand;
+    /**
+     * Gets a command to perform a mail merge and save the merged document to the server.
+     * Value: A <see cref="MailMergeAndSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndSaveAs: MailMergeAndSaveAsCommand;
+    /**
+     * Gets a command to activate the page header and begin editing.
+     * Value: A <see cref="InsertHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHeader: InsertHeaderCommand;
+    /**
+     * Gets a command to activate the page footer and begin editing.
+     * Value: A <see cref="InsertFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertFooter: InsertFooterCommand;
+    /**
+     * Gets a command to link a header/footer to the previous section, so it has the same content.
+     * Value: A <see cref="LinkHeaderFooterToPreviousCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    linkHeaderFooterToPrevious: LinkHeaderFooterToPreviousCommand;
+    /**
+     * Gets a command to navigate to the page footer from the page header in the header/footer editing mode.
+     * Value: A <see cref="GoToFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFooter: GoToFooterCommand;
+    /**
+     * Gets a command to navigate to the page header from the page footer in the header/footer editing mode.
+     * Value: A <see cref="GoToHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToHeader: GoToHeaderCommand;
+    /**
+     * Gets a command to navigate to the next page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToNextHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextHeaderFooter: GoToNextHeaderFooterCommand;
+    /**
+     * Gets a command to navigate to the previous page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToPreviousHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousHeaderFooter: GoToPreviousHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+     * Value: A <see cref="SetDifferentFirstPageHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentFirstPageHeaderFooter: SetDifferentFirstPageHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+     * Value: A <see cref="SetDifferentOddAndEvenPagesHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentOddAndEvenPagesHeaderFooter: SetDifferentOddAndEvenPagesHeaderFooterCommand;
+    /**
+     * Gets a command to finish header/footer editing.
+     * Value: A <see cref="CloseHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    closeHeaderFooter: CloseHeaderFooterCommand;
+    /**
+     * Gets a command to insert a NUMPAGES field displaying the total number of pages.
+     * Value: A <see cref="CreatePageCountFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageCountField: CreatePageCountFieldCommand;
+    /**
+     * Gets a command to invoke the Table tab of the Table Properties dialog window.
+     * Value: A <see cref="OpenTableFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableFormattingDialog: OpenTableFormattingDialogCommand;
+    /**
+     * Gets a command to change the selected table's formatting.
+     * Value: A <see cref="ChangeTableFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableFormatting: ChangeTableFormattingCommand;
+    /**
+     * Gets a command to change the selected table rows' preferred height.
+     * Value: A <see cref="ChangeTableRowPreferredHeightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableRowPreferredHeight: ChangeTableRowPreferredHeightCommand;
+    /**
+     * Gets a command to change the preferred cell width of the selected table rows.
+     * Value: A <see cref="ChangeTableCellPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellPreferredWidth: ChangeTableCellPreferredWidthCommand;
+    /**
+     * Gets a command to toggle inside borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideBorders: ToggleTableCellInsideBordersCommand;
+    /**
+     * Gets a command to change the selected table columns' preferred width.
+     * Value: A <see cref="ChangeTableColumnPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableColumnPreferredWidth: ChangeTableColumnPreferredWidthCommand;
+    /**
+     * Gets a command to change the cell formatting of the selected table elements.
+     * Value: A <see cref="ChangeTableCellFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellFormatting: ChangeTableCellFormattingCommand;
+    /**
+     * Gets a command to insert a table column to the left of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheLeft: InsertTableColumnToTheLeftCommand;
+    /**
+     * Gets a command to insert a table column to the right of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheRight: InsertTableColumnToTheRightCommand;
+    /**
+     * Gets a command to insert a row in the table below the selected row.
+     * Value: A <see cref="InsertTableRowBelowCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowBelow: InsertTableRowBelowCommand;
+    /**
+     * Gets a command to insert a row in the table above the selected row.
+     * Value: A <see cref="InsertTableRowAboveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowAbove: InsertTableRowAboveCommand;
+    /**
+     * Gets a command to delete the selected rows in the table.
+     * Value: A <see cref="DeleteTableRowsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableRows: DeleteTableRowsCommand;
+    /**
+     * Gets a command to delete the selected columns in the table.
+     * Value: A <see cref="DeleteTableColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableColumns: DeleteTableColumnsCommand;
+    /**
+     * Gets a command to insert table cells with a horizontal shift into the selected table.
+     * Value: A <see cref="InsertTableCellWithShiftToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellWithShiftToTheLeft: InsertTableCellWithShiftToTheLeftCommand;
+    /**
+     * Gets a command to delete the selected table cells with a horizontal shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftHorizontallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftHorizontally: DeleteTableCellsWithShiftHorizontallyCommand;
+    /**
+     * Gets a command to delete the selected table cells with a vertical shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftVertically: DeleteTableCellsWithShiftVerticallyCommand;
+    /**
+     * Gets a command to delete the selected table.
+     * Value: A <see cref="DeleteTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTable: DeleteTableCommand;
+    /**
+     * Gets a command to invoke the Insert Cells dialog window.
+     * Value: A <see cref="InsertTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsDialog: InsertTableCellsDialogCommand;
+    /**
+     * Gets a command to invoke the Delete Cells dialog window.
+     * Value: A <see cref="DeleteTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsDialog: DeleteTableCellsDialogCommand;
+    /**
+     * Gets a command to merge the selected cells.
+     * Value: A <see cref="MergeTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeTableCells: MergeTableCellsCommand;
+    /**
+     * Gets a command to invoke the Split Cells dialog window.
+     * Value: A <see cref="SplitTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCellsDialog: SplitTableCellsDialogCommand;
+    /**
+     * Gets a command to split the selected table cells.
+     * Value: A <see cref="SplitTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCells: SplitTableCellsCommand;
+    /**
+     * Gets a command to insert table cells with a vertical shift into the selected table.
+     * Value: A <see cref="InsertTableCellsWithShiftToTheVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsWithShiftToTheVertically: InsertTableCellsWithShiftToTheVerticallyCommand;
+    /**
+     * Gets a command to invoke the Borders tab of the Borders and Shading dialog window.
+     * Value: A <see cref="OpenTableBordersAndShadingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableBordersAndShadingDialog: OpenTableBordersAndShadingDialogCommand;
+    /**
+     * Gets a command to change the selected table's borders and shading.
+     * Value: A <see cref="ChangeTableBordersAndShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBordersAndShading: ChangeTableBordersAndShadingCommand;
+    /**
+     * Gets a command to apply top-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopLeft: ToggleTableCellAlignTopLeftCommand;
+    /**
+     * Gets a command to apply top-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopCenter: ToggleTableCellAlignTopCenterCommand;
+    /**
+     * Gets a command to apply top-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopRight: ToggleTableCellAlignTopRightCommand;
+    /**
+     * Gets a command to apply middle-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleLeft: ToggleTableCellAlignMiddleLeftCommand;
+    /**
+     * Gets a command to apply middle-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleCenter: ToggleTableCellAlignMiddleCenterCommand;
+    /**
+     * Gets a command to apply middle-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleRight: ToggleTableCellAlignMiddleRightCommand;
+    /**
+     * Gets a command to apply bottom-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomLeft: ToggleTableCellAlignBottomLeftCommand;
+    /**
+     * Gets a command to apply bottom-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomCenter: ToggleTableCellAlignBottomCenterCommand;
+    /**
+     * Gets a command to apply bottom-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomRight: ToggleTableCellAlignBottomRightCommand;
+    /**
+     * Gets a command to change the selected table's style.
+     * Value: A <see cref="ChangeTableStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableStyle: ChangeTableStyleCommand;
+    /**
+     * Gets a command to toggle top borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellTopBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellTopBorder: ToggleTableCellTopBorderCommand;
+    /**
+     * Gets a command to toggle right borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellRightBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellRightBorder: ToggleTableCellRightBorderCommand;
+    /**
+     * Gets a command to toggle bottom borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellBottomBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellBottomBorder: ToggleTableCellBottomBorderCommand;
+    /**
+     * Gets a command to toggle left borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellLeftBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellLeftBorder: ToggleTableCellLeftBorderCommand;
+    /**
+     * Gets a command to remove the borders of the selected table cells.
+     * Value: A <see cref="RemoveTableCellBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeTableCellBorders: RemoveTableCellBordersCommand;
+    /**
+     * Gets a command to toggle all borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellAllBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAllBorders: ToggleTableCellAllBordersCommand;
+    /**
+     * Gets a command to toggle inner horizontal borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideHorizontalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideHorizontalBorders: ToggleTableCellInsideHorizontalBordersCommand;
+    /**
+     * Gets a command to toggle inner vertical borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideVerticalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideVerticalBorders: ToggleTableCellInsideVerticalBordersCommand;
+    /**
+     * Gets a command to toggle outer borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellOutsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellOutsideBorders: ToggleTableCellOutsideBordersCommand;
+    /**
+     * Gets a command to change the selected table's style options.
+     * Value: A <see cref="ChangeTableLookCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableLook: ChangeTableLookCommand;
+    /**
+     * Gets a command to change the repository item's table border style.
+     * Value: A <see cref="ChangeTableBorderRepositoryItemCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBorderRepositoryItem: ChangeTableBorderRepositoryItemCommand;
+    /**
+     * Gets a command to change cell shading in the selected table elements.
+     * Value: A <see cref="ChangeTableCellShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellShading: ChangeTableCellShadingCommand;
+    /**
+     * Gets a command to toggle the display of grid lines for a table with no borders applied - on/off.
+     * Value: A <see cref="ShowTableGridLinesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showTableGridLines: ShowTableGridLinesCommand;
+    /**
+     * Gets a command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+     * Value: A <see cref="OpenFindPanelCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindPanel: OpenFindPanelCommand;
+    /**
+     * Gets a command to invoke the Find and Replace dialog window.
+     * Value: A <see cref="OpenFindAndReplaceDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindAndReplaceDialog: OpenFindAndReplaceDialogCommand;
+    /**
+     * Gets a command to find all matches of the specified text in the document.
+     * Value: A <see cref="FindAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    findAll: FindAllCommand;
+    /**
+     * Gets a command to hide the results of the search.
+     * Value: A <see cref="HideFindResultsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    hideFindResults: HideFindResultsCommand;
+    /**
+     * Gets a command to search for a specific text and replace all matches in the document with the specified string.
+     * Value: A <see cref="ReplaceAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceAll: ReplaceAllCommand;
+    /**
+     * Gets a command to search for a specific text and replace the next match in the document with the specified string.
+     * Value: A <see cref="ReplaceNextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceNext: ReplaceNextCommand;
+    /**
+     * Gets a command to invoke the Spelling dialog window.
+     * Value: A <see cref="OpenSpellingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSpellingDialog: OpenSpellingDialogCommand;
+    /**
+     * Gets a command to assign a shortcut to the specified client command.
+     * Value: A <see cref="AssignShortcutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    assignShortcut: AssignShortcutCommand;
+}
+/**
+ * Serves as a base for objects that implement different client command functionalities.
+ */
+interface CommandBase {
+}
+/**
+ * Serves as a base for commands with a simple common command state.
+ */
+interface CommandWithSimpleStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): SimpleCommandState;
+}
+/**
+ * Serves as a base for commands with the Boolean state.
+ */
+interface CommandWithBooleanStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Defines a simple state common to most of the client commands.
+ */
+interface SimpleCommandState {
+    /**
+     * Gets a value indicating whether the command's UI element is enabled (within the ribbon and context menu).
+     * Value: true, if the command's related UI element is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets a value indicating whether the command's UI element is visible.
+     * Value: true, if the command's related UI element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Defines the state of a command.
+ */
+interface CommandState<T> extends SimpleCommandState {
+    /**
+     * Gets the command state value.
+     * Value: A T object specifying the command state value.
+     */
+    value: T;
+}
+/**
+ * Contains a set properties providing the current information about certain document structural elements.
+ */
+interface RichEditDocument {
+    /**
+     * Provides the information about the active sub-document.
+     * Value: A <see cref="SubDocument" /> object storing information about the essential document functionality.
+     */
+    activeSubDocument: SubDocument;
+    /**
+     * Provides information about sections in the current document.
+     * Value: An array of Section objects storing information about sections.
+     */
+    sectionsInfo: Section[];
+    /**
+     * Provides information about paragraph styles in the current document.
+     * Value: An array of ParagraphStyle objects storing information about paragraph styles.
+     */
+    paragraphStylesInfo: ParagraphStyle[];
+    /**
+     * Provides information about character styles in the current document.
+     * Value: An array of CharacterStyle objects storing information about character styles.
+     */
+    characterStylesInfo: CharacterStyle[];
+    /**
+     * Provides information about numbered paragraphs in the document.
+     * Value: An array of AbstractNumberingList objects storing the information about numbered paragraphs.
+     */
+    abstractNumberingListsInfo: AbstractNumberingList[];
+    /**
+     * Provides information about table styles in the current document.
+     * Value: An array of TableStyle objects storing information about table styles.
+     */
+    tableStylesInfo: TableStyle[];
+    /**
+     * Provides information about spell checking in the current document.
+     * Value: A <see cref="SpellingInfo" /> object.
+     */
+    spellingInfo: SpellingInfo;
+}
+/**
+ * An abstract numbering list definition that defines the appearance and behavior of numbered paragraphs in a document.
+ */
+interface AbstractNumberingList {
+    deleted: boolean;
+}
+/**
+ * Defines a paragraph in the document.
+ */
+interface Paragraph {
+    /**
+     * Gets the paragraph's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the paragraph's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    interval: Interval;
+    /**
+     * Gets the name of the paragraph style applied to the current paragraph (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+    /**
+     * Gets the index of a list applied to the paragraph.
+     * Value: An integer that is the index of a list to which the paragraph belongs.
+     */
+    listIndex: number;
+    /**
+     * Gets the index of the list level applied to the current paragraph in the numbering list.
+     * Value: An integer that is the index of the list level of the current paragraph.
+     */
+    listLevelIndex: number;
+}
+/**
+ * Defines a field in the document.
+ */
+interface Field {
+    /**
+     * Gets the field's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the field length in a document.
+     * Value: An integer value specifying the field length.
+     */
+    length: number;
+    codeInterval: Interval;
+    resultInterval: Interval;
+    interval: Interval;
+    /**
+     * Gets or sets a URI to navigate to when the hyperlink (represented by the current field) is activated.
+     * Value: A string representing an URI.
+     */
+    hyperlinkUri: string;
+    /**
+     * Gets or sets the text for the tooltip displayed when the mouse hovers over a hyperlink field.
+     * Value: A string containing the tooltip text.
+     */
+    hyperlinkTip: string;
+    /**
+     * Gets or sets the name of a bookmark (or a hyperlink) in the current document which shall be the target of the hyperlink field.
+     * Value: A string representing the bookmark's name.
+     */
+    hyperlinkAnchor: string;
+    /**
+     * Gets a value specifying whether a field's code or result is dispalyed.
+     * Value: true, if the field code is displayed; false, if the field result is displayed.
+     */
+    showCode: boolean;
+}
+/**
+ * Defines a bookmark in the document.
+ */
+interface Bookmark {
+    /**
+     * Gets the bookmark's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the bookmark's length.
+     * Value: An integer value specifying the length of the bookmark.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Gets the name of a bookmark in the document.
+     * Value: A string that is the unique bookmark's name.
+     */
+    name: string;
+}
+/**
+ * Defines a section in the document.
+ */
+interface Section {
+    /**
+     * Gets the section's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the section's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides access to the section's headers.
+     * Value: An array of HeaderFooter objects storing information about the section's headers.
+     */
+    headers: HeaderFooter[];
+    /**
+     * Provides access to the section's footers.
+     * Value: An array of HeaderFooter objects storing information about the section's footers.
+     */
+    footers: HeaderFooter[];
+}
+/**
+ * Contains settings defining a header or footer in a document.
+ */
+interface HeaderFooter {
+    /**
+     * Gets the type of the header (footer).
+     * Value: One of the <see cref="HeaderFooterType" /> values.
+     */
+    type: any;
+    /**
+     * Provides access to an object implementing the basic document functionality that is common to the header, footer and the main document body.
+     * Value: A <see cref="SubDocument" /> object exposing the basic document functionality.
+     */
+    subDocument: SubDocument;
+}
+interface InlinePictureInfo {
+    id: number;
+    position: number;
+    initialWidth: number;
+    initialHeight: number;
+    scaleX: number;
+    scaleY: number;
+    /**
+     * Gets the actual image width.
+     */
+    actualWidth: number;
+    /**
+     * Gets the actual image height.
+     */
+    actualHeight: number;
+}
+declare enum HeaderFooterType {
+    First=0,
+    Odd=1,
+    Primary=1,
+    Even=2
+}
+interface RichEditFileInfo {
+    folderPath: string;
+    fileName: string;
+    documentFormat: any;
+}
+declare enum DocumentFormat {
+    Undefined=0,
+    PlainText=1,
+    Rtf=2,
+    Html=3,
+    OpenXml=4,
+    Mht=5,
+    WordML=6,
+    OpenDocument=7,
+    ePub=9,
+    Doc=10
+}
+/**
+ * Contains a set of methods and properties to work with the document selection.
+ */
+interface RichEditSelection {
+    /**
+     * Gets or sets an array of document interval in the selection.
+     * Value: An array of Interval objects.
+     */
+    intervals: Interval[];
+    /**
+     * Gets or sets a value specifying whether the current selection is collapsed (and represents the cursor position).
+     * Value: true, if the selection is collapsed; otherwise, false.
+     */
+    collapsed: boolean;
+    getIntervalMaxPosition(): number;
+    /**
+     * Moves the cursor to the next line.
+     */
+    goToNextLine(): void;
+    /**
+     * Moves the cursor to the next line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located.
+     */
+    goToLineEnd(): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located.
+     */
+    goToLineStart(): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous line.
+     */
+    goToPreviousLine(): void;
+    /**
+     * Moves the cursor to the previous line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next character.
+     */
+    goToNextCharacter(): void;
+    /**
+     * Moves the cursor to the next character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextCharacter(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous character.
+     */
+    goToPreviousCharacter(): void;
+    /**
+     * Moves the cursor to the previous character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousCharacter(extendSelection: boolean): void;
+    /**
+     * Selects the line in which the cursor is located.
+     */
+    selectLine(): void;
+    /**
+     * Selects the line in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the next page.
+     */
+    goToNextPage(): void;
+    /**
+     * Moves the cursor to the beginning of the next page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the previous page.
+     */
+    goToPreviousPage(): void;
+    /**
+     * Moves the cursor to the beginning of the previous page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the document.
+     */
+    goToDocumentStart(): void;
+    /**
+     * Moves the cursor to the start of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the document.
+     */
+    goToDocumentEnd(): void;
+    /**
+     * Moves the cursor to the end of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next word.
+     */
+    goToNextWord(): void;
+    /**
+     * Moves the cursor to the next word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous word.
+     */
+    goToPrevWord(): void;
+    /**
+     * Moves the cursor to the previous word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPrevWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located.
+     */
+    goToParagraphStart(): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located.
+     */
+    goToParagraphEnd(): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphEnd(extendSelection: boolean): void;
+    /**
+     * Selects the paragraph in which the cursor is located.
+     */
+    selectParagraph(): void;
+    /**
+     * Moves the cursor to the next page break mark.
+     */
+    goToStartNextPageCommand(): void;
+    /**
+     * Moves the cursor to the next page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartNextPageCommand(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous page break mark.
+     */
+    goToStartPrevPageCommand(): void;
+    /**
+     * Moves the cursor to the previous page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartPrevPageCommand(extendSelection: boolean): void;
+    /**
+     * Selects the table cell in which the cursor is located.
+     */
+    selectTableCell(): void;
+    /**
+     * Selects the table cell in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableCell(extendSelection: boolean): void;
+    /**
+     * Selects the table row in which the cursor is located.
+     */
+    selectTableRow(): void;
+    /**
+     * Selects the table row in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableRow(extendSelection: boolean): void;
+    /**
+     * Selects the entire table in which the cursor is located.
+     */
+    selectTable(): void;
+    /**
+     * Selects the entire table in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTable(extendSelection: boolean): void;
+    /**
+     * Selects the editor's entire content.
+     */
+    selectAll(): void;
+    /**
+     * Makes the main sub-document active and moves the cursor to its beginning.
+     */
+    setMainSubDocumentAsActive(): void;
+    /**
+     * Creates a footer sub-document (if it was not created before) and sets the footer as the active sub-document. Moves the cursor to the footer's start position.
+     * @param pageIndex An integer value specifying the active page's index.
+     */
+    setFooterSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+    /**
+     * Creates a header sub-document (if it was not created before) and sets the header as the active sub-document. Moves the cursor to the header's start position.
+     * @param pageIndex An integer value specifying the active page's index.
+     */
+    setHeaderSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+}
+/**
+ * Defines a document's interval.
+ */
+interface Interval {
+    /**
+     * Gets the interval's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the interval's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+}
+interface SpellingInfo {
+    spellCheckerState: any;
+    misspelledIntervals: MisspelledInterval[];
+}
+declare enum SpellCheckerState {
+    Disabled=0,
+    InProgress=1,
+    Done=2
+}
+interface MisspelledInterval {
+    start: number;
+    length: number;
+    interval: Interval;
+    errorType: any;
+    word: string;
+    suggestions: string[];
+}
+declare enum SpellingErrorType {
+    Misspelling=0,
+    Repeating=1
+}
+/**
+ * Serves as a base for objects implementing different element styles.
+ */
+interface StyleBase {
+    /**
+     * Gets or sets the name of the style.
+     * Value: A string specifying the style name.
+     */
+    name: string;
+    /**
+     * Gets whether the specified style is marked as deleted.
+     * Value: true, if the style is deleted; otherwise, false.
+     */
+    isDeleted: boolean;
+}
+/**
+ * Defines the paragraph style settings.
+ */
+interface ParagraphStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="CharacterStyle" /> object representing a character style linked to a current style.
+     */
+    linkedStyle: CharacterStyle;
+    /**
+     * Gets or sets the default style for a paragraph that immediately follows the current paragraph.
+     * Value: A <see cref="ParagraphStyle" /> object specifying the style for the next paragraph.
+     */
+    nextStyle: ParagraphStyle;
+    /**
+     * Gets the index of the list item associated with the paragraph formatted with the current style.
+     * Value: An integer value specifying the list item index.
+     */
+    listIndex: number;
+    /**
+     * Gets the index of the list level applied to the paragraph formatted with the current style.
+     * Value: An integer that is the list level index.
+     */
+    listLevelIndex: number;
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="ParagraphStyle" /> object representing the parent style.
+     */
+    parent: ParagraphStyle;
+}
+/**
+ * Contains characteristics of a character style in a document.
+ */
+interface CharacterStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="ParagraphStyle" /> object representing a paragraph style linked to a current style.
+     */
+    linkedStyle: ParagraphStyle;
+    /**
+     * Gets the style form which the current style inherits.
+     * Value: A <see cref="CharacterStyle" /> object representing the parent style.
+     */
+    parent: CharacterStyle;
+}
+/**
+ * Defines the table style settings.
+ */
+interface TableStyle extends StyleBase {
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="TableStyle" /> object that is the parent style.
+     */
+    parent: TableStyle;
+}
+/**
+ * Exposes the settings providing the information about the essential document functionality.
+ */
+interface SubDocument {
+    id: number;
+    type: any;
+    /**
+     * Provides information about paragraphs contained in the document.
+     * Value: An array of Paragraph objects storing information about document paragraphs.
+     */
+    paragraphsInfo: Paragraph[];
+    /**
+     * Provides information about fields in the current document.
+     * Value: An array of Field objects storing information about document fields.
+     */
+    fieldsInfo: Field[];
+    /**
+     * Provides information about tables contained in the document.
+     * Value: An array of Table objects storing information about document tables.
+     */
+    tablesInfo: Table[];
+    /**
+     * Provides information about document bookmarks.
+     * Value: An array of Bookmark objects storing information about document bookmarks.
+     */
+    bookmarksInfo: Bookmark[];
+    inlinePicturesInfo: InlinePictureInfo[];
+    /**
+     * Gets the document's textual representation.
+     * Value: A string value specifying the document's text.
+     */
+    text: string;
+    /**
+     * Gets the character length of the document.
+     * Value: An integer that is the number of character positions in the document.
+     */
+    length: number;
+}
+declare enum SubDocumentType {
+    Main=0,
+    Header=1,
+    Footer=2,
+    TextBox=3
+}
+/**
+ * Defines a table in the document.
+ */
+interface Table {
+    /**
+     * Gets the table's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table length in characters.
+     * Value: A integer value specifying the character length of the table.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides access to a collection of table rows.
+     * Value: An array of TableRow objects storing information about individual table rows.
+     */
+    rows: TableRow[];
+    /**
+     * Gets the name of the style applied to the table (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+}
+/**
+ * Defines a table row in the document.
+ */
+interface TableRow {
+    /**
+     * Gets the table row's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table row's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+    /**
+     * Provides information about the table row's cells.
+     * Value: An array of TableCell objects storing information about cells.
+     */
+    cells: TableCell[];
+}
+/**
+ * Defines a table cell in the document.
+ */
+interface TableCell {
+    /**
+     * Gets the table cell's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table cell's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    interval: Interval;
+}
+interface RichEditUnitConverter {
+    /**
+     * 
+     * @param value 
+     */
+    pixelsToTwips(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    inchesToTwips(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    pointsToTwips(value: number): number;
+    /**
+     * Converts a value on centimeters to twips.
+     * @param value 
+     */
+    centimetersToTwips(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    twipsToCentimeters(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    pixelsToCentimeters(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    twipsToInches(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    pixelsToInches(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    pixelsToPoints(value: number): number;
+    /**
+     * 
+     * @param value 
+     */
+    twipsToPoints(value: number): number;
+}
+/**
+ * A command to invoke the Bookmark dialog.
+ */
+interface OpenInsertBookmarkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertBookmarkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a new bookmark that references the current selection.
+ */
+interface InsertBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertBookmarkCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying name of creating bookmark.
+     * @param start An integer value specifying the start position of bookmark's range.
+     * @param length An integer value specifying the length of bookmark's range.
+     */
+    execute(name: string, start: number, length: number): boolean;
+}
+/**
+ * A command to delete a specific bookmark.
+ */
+interface DeleteBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying name of the deleted bookmark.
+     */
+    execute(name: string): boolean;
+}
+/**
+ * Gets a command to navigate to the specified bookmark in the document.
+ */
+interface GoToBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name 
+     */
+    execute(name: string): boolean;
+}
+/**
+ * A command to paste the text from the clipboard over the selection.
+ */
+interface PasteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the PasteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the clipboard.
+ */
+interface CopyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to cut the selected text and place it to the clipboard.
+ */
+interface CutCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert an empty document field at the current position in the document.
+ */
+interface CreateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update the field's result.
+ */
+interface UpdateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display the selected field's field codes.
+ */
+interface ShowFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display all field codes in place of the fields in the document.
+ */
+interface ShowAllFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowAllFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowAllFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update all fields in the selected range.
+ */
+interface UpdateAllFieldsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateAllFieldsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a DATE field displaying the current date.
+ */
+interface CreateDateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateDateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a TIME field displaying the current time.
+ */
+interface CreateTimeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateTimeFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a PAGE field displaying the current page number.
+ */
+interface CreatePageFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToDataRecordCommand extends CommandBase {
+    /**
+     * Executes the GoToDataRecordCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param activeRecordIndex An integer value specifying index of the next data record.
+     */
+    execute(activeRecordIndex: number): boolean;
+    getState(): any;
+}
+interface DataRecordOptions {
+    /**
+     * Gets or sets the index of the active data record.
+     */
+    activeRecordIndex: number;
+    recordCount: number;
+}
+/**
+ * A command to navigate to the first data record of the bound data source.
+ */
+interface GoToFirstDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFirstDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous data record of the bound data source.
+ */
+interface GoToPreviousDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToNextDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the last data record of the bound data source.
+ */
+interface GoToLastDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToLastDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display or hide actual data in MERGEFIELD fields.
+ */
+interface ShowMergedDataCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowMergedDataCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowMergedDataCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showMergedData true to display merged data, false to hide merged data.
+     */
+    execute(showMergedData: boolean): boolean;
+}
+/**
+ * A command to invoke the Insert Merge Field dialog.
+ */
+interface MergeFieldDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeFieldDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a MERGEFIELD field (with a data source column name) at the current position in the document.
+ */
+interface CreateMergeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateMergeFieldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fieldName A string value specifying the name of the merge field.
+     */
+    execute(fieldName: string): boolean;
+}
+/**
+ * Gets a command to invoke the Export Range dialog to start a mail merge.
+ */
+interface MailMergeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MailMergeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to start the mail merge process and download the resulting document containing the merged information.
+ */
+interface MailMergeAndDownloadCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     */
+    execute(documentFormat: any): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     * @param settings A MailMergeSettings object containing settings to set up mail merge operations.
+     */
+    execute(fileExtension: string, settings: MailMergeSettings): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     * @param settings 
+     */
+    execute(documentFormat: any, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to start the mail merge process and save the resulting merged document to the server.
+ */
+interface MailMergeAndSaveAsCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param filePath A string value specifying path to the saving file on the server.
+     */
+    execute(filePath: string): boolean;
+    /**
+     * 
+     * @param fileInfo 
+     * @param settings 
+     */
+    execute(fileInfo: RichEditFileInfo, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a NUMPAGES field displaying the total number of pages.
+ */
+interface CreatePageCountFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageCountFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to set up mail merge operations.
+ */
+interface MailMergeSettings {
+    /**
+     * Gets or sets a value specifying which data rows should be exported into a merged document.
+     * Value: One of the <see cref="MailMergeExportRange" /> values.
+     */
+    range: any;
+    /**
+     * Gets or sets the index of the row from which the exported range starts.
+     * Value: An integer value specifying the row index.
+     */
+    exportFrom: number;
+    /**
+     * Gets or sets the number of data rows in the exported mail-merge range.
+     * Value: An integer value specifying the row count.
+     */
+    exportRecordsCount: number;
+    /**
+     * Gets or sets the merge mode.
+     * Value: One of the <see cref="MergeMode" /> values.
+     */
+    mergeMode: any;
+}
+declare enum MergeMode {
+    NewParagraph=0,
+    NewSection=1,
+    JoinTables=2
+}
+declare enum MailMergeExportRange {
+    AllRecords=0,
+    CurrentRecord=1,
+    Range=2
+}
+/**
+ * A command to create a new empty document.
+ */
+interface FileNewCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileNewCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to open the file, specifying its path.
+ */
+interface FileOpenCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the opening file.
+     */
+    execute(path: string): boolean;
+}
+/**
+ * A command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+ */
+interface FileOpenDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to save the document to a file.
+ */
+interface FileSaveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+ */
+interface FileSaveAsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the saving file.
+     */
+    execute(path: string): boolean;
+    /**
+     * 
+     * @param fileInfo 
+     */
+    execute(fileInfo: RichEditFileInfo): boolean;
+}
+interface FileSaveAsDialogCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to download the document file, specifying its extension.
+ */
+interface FileDownloadCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the extension of the downloading file.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * 
+     * @param documentFormat 
+     */
+    execute(documentFormat: any): boolean;
+}
+/**
+ * A command to invoke a browser-specific Print dialog allowing one to print the current document.
+ */
+interface FilePrintCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FilePrintCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+ */
+interface OpenFindPanelCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindPanelCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Find and Replace dialog.
+ */
+interface OpenFindAndReplaceDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindAndReplaceDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to find all matches of the specified text in the document.
+ */
+interface FindAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying finding text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean): boolean;
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to find.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     * @param results An array of Interval objects containing the results of search.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean, results: Interval[]): boolean;
+}
+/**
+ * A command to hide the search results.
+ */
+interface HideFindResultsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the HideFindResultsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to search for a specific text and replace all matches in the document with the specified string.
+ */
+interface ReplaceAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to replace.
+     * @param replaceText A string value specifying replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+/**
+ * A command to search for a specific text and replace the next match in the document with the specified string.
+ */
+interface ReplaceNextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceNextCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to replace.
+     * @param replaceText A string value specifying replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+/**
+ * A command to cancel changes caused by the previous command.
+ */
+interface UndoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UndoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to reverse actions of the previous undo command.
+ */
+interface RedoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RedoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Hyperlink dialog.
+ */
+interface OpenInsertHyperlinkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertHyperlinkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a hyperlink at the current position in the document.
+ */
+interface InsertHyperlinkCommand extends CommandBase {
+    /**
+     * Executes the InsertHyperlinkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A HyperLinkSettings object specifying hyperlink settings.
+     */
+    execute(settings: HyperlinkSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to delete the selected hyperlink.
+ */
+interface DeleteHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete all hyperlinks in a selected range.
+ */
+interface DeleteHyperlinksCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinksCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+ */
+interface OpenHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define hyperlinks.
+ */
+interface HyperlinkSettings {
+    /**
+     * Gets or sets a text displayed for a hyperlink.
+     * Value: A string value specifying the hyperlink display text.
+     */
+    text: string;
+    /**
+     * Gets or sets a text for the tooltip displayed when the mouse hovers over a hyperlink.
+     * Value: A string containing the tooltip text.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the hyperlink destination.
+     * Value: A string value that specifies the destination to which a hyperlink refers.
+     */
+    url: string;
+    /**
+     * Gets or sets the associated bookmak.
+     * Value: A string value specifying the bookmark name.
+     */
+    bookmark: string;
+}
+/**
+ * A command to insert a page break at the current position in the document.
+ */
+interface InsertPageBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPageBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a column break at the current position in the document.
+ */
+interface InsertColumnBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertColumnBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next page.
+ */
+interface InsertSectionBreakNextPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakNextPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next even-numbered page.
+ */
+interface InsertSectionBreakEvenPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakEvenPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next odd-numbered page.
+ */
+interface InsertSectionBreakOddPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakOddPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert the line break at the current position in the document.
+ */
+interface InsertLineBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertLineBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the bulleted paragraph and normal text.
+ */
+interface ToggleBulletedListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleBulletedListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the numbered paragraph and normal text.
+ */
+interface ToggleNumberingListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the multilevel list style and normal text.
+ */
+interface ToggleMultilevelListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleMultilevelListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Bulleted and Numbering dialog.
+ */
+interface OpenNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenNumberingListDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Customize Numbered List dialog.
+ */
+interface OpenCustomNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenCustomNumberingListDialogCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+}
+/**
+ * A command to customize the numbered list parameters.
+ */
+interface ChangeCustomNumberingListCommand extends CommandBase {
+    /**
+     * Executes the ChangeCustomNumberingListCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying the numbering list index.
+     * @param listLevelSettings An array of ListLevelSettings objects defining settings for list levels.
+     */
+    execute(abstractNumberingListIndex: number, listLevelSettings: ListLevelSettings[]): boolean;
+    /**
+     * Gets information about the command state.
+     * @param abstractNumberingListIndex An integer value specifying the index of the abstract numbering list item whose state to return.
+     */
+    getState(abstractNumberingListIndex: number): any;
+}
+/**
+ * A command to restart the numbering list.
+ */
+interface RestartNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RestartNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected numbered list.
+ */
+interface IncrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected numbered list.
+ */
+interface DecrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to continue the list's numbering.
+ */
+interface ContinueNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ContinueNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert numeration to a paragraph making it a numbering list item.
+ */
+interface InsertNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param numberingListIndex An integer value specifying index of numbering list.
+     * @param isAbstractNumberingList true, to insert an abstract numbering list; otherwise, false.
+     */
+    execute(numberingListIndex: number, isAbstractNumberingList: boolean): boolean;
+}
+/**
+ * A command to remove the selected numeration.
+ */
+interface RemoveNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveNumerationCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define individual bulleted or numbered list levels.
+ */
+interface ListLevelSettings {
+    /**
+     * Gets or sets the pattern used to format the list level for display purposes.
+     * Value: A string value specifying the format pattern.
+     */
+    displayFormatString: string;
+    /**
+     * Gets or sets the numbering format used for the current list level's paragraph.
+     * Value: One of the <see cref="ListLevelFormat" /> values.
+     */
+    format: any;
+    /**
+     * Gets the list level item's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets or sets the paragraph text alignment within numbered list levels.
+     * Value: One of the <see cref="ListLevelNumberAlignment" /> values.
+     */
+    alignment: any;
+    separator: string;
+    /**
+     * Gets or sets the left indent for text within the current list level's paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a value specifying the indent of the first line of the current list level's paragraph.
+     * Value: An integer value specifying the indent.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets a value specifying whether and how the first line of the current list level's paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets the font name of the current list level's paragraph.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the font color of the current list level's paragraph.
+     * Value: A string value specifying the font color.
+     */
+    fontColor: string;
+    /**
+     * Gets or sets the font size of the current list level's paragraph.
+     * Value: An integer value specifying the font size.
+     */
+    fontSize: number;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is bold.
+     * Value: true, if the font formatting is bold; otherwise, false.
+     */
+    fontBold: boolean;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is italic.
+     * Value: true, if the font formatting is italic; otherwise, false.
+     */
+    fontItalic: boolean;
+}
+declare enum ListLevelFormat {
+    Decimal=0,
+    AIUEOHiragana=1,
+    AIUEOFullWidthHiragana=2,
+    ArabicAbjad=3,
+    ArabicAlpha=4,
+    Bullet=5,
+    CardinalText=6,
+    Chicago=7,
+    ChineseCounting=8,
+    ChineseCountingThousand=9,
+    ChineseLegalSimplified=10,
+    Chosung=11,
+    DecimalEnclosedCircle=12,
+    DecimalEnclosedCircleChinese=13,
+    DecimalEnclosedFullstop=14,
+    DecimalEnclosedParentheses=15,
+    DecimalFullWidth=16,
+    DecimalFullWidth2=17,
+    DecimalHalfWidth=18,
+    DecimalZero=19,
+    Ganada=20,
+    Hebrew1=21,
+    Hebrew2=22,
+    Hex=23,
+    HindiConsonants=24,
+    HindiDescriptive=25,
+    HindiNumbers=26,
+    HindiVowels=27,
+    IdeographDigital=28,
+    IdeographEnclosedCircle=29,
+    IdeographLegalTraditional=30,
+    IdeographTraditional=31,
+    IdeographZodiac=32,
+    IdeographZodiacTraditional=33,
+    Iroha=34,
+    IrohaFullWidth=35,
+    JapaneseCounting=36,
+    JapaneseDigitalTenThousand=37,
+    JapaneseLegal=38,
+    KoreanCounting=39,
+    KoreanDigital=40,
+    KoreanDigital2=41,
+    KoreanLegal=42,
+    LowerLetter=43,
+    LowerRoman=44,
+    None=45,
+    NumberInDash=46,
+    Ordinal=47,
+    OrdinalText=48,
+    RussianLower=49,
+    RussianUpper=50,
+    TaiwaneseCounting=51,
+    TaiwaneseCountingThousand=52,
+    TaiwaneseDigital=53,
+    ThaiDescriptive=54,
+    ThaiLetters=55,
+    ThaiNumbers=56,
+    UpperLetter=57,
+    UpperRoman=58,
+    VietnameseDescriptive=59
+}
+declare enum ListLevelNumberAlignment {
+    Left=0,
+    Center=1,
+    Right=2
+}
+/**
+ * A command to invoke the Insert Image dialog.
+ */
+interface OpenInsertPictureDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertPictureDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a picture from a file.
+ */
+interface InsertPictureCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPictureCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param imageUrl A string value specifying picture's Url.
+     */
+    execute(imageUrl: string): boolean;
+}
+/**
+ * A command to invoke the Symbols dialog.
+ */
+interface OpenInsertSymbolDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertSymbolDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a character into the document.
+ */
+interface InsertSymbolCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSymbolCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param symbol A string value specifying symbols to insert.
+     * @param fontName A string value specifying font of symbols to insert.
+     */
+    execute(symbol: string, fontName: string): boolean;
+}
+/**
+ * A command to insert a paragraph break at the current position in the document.
+ */
+interface InsertParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert text at the current position in the document.
+ */
+interface InsertTextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTextCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to insert.
+     */
+    execute(text: string): boolean;
+}
+/**
+ * A command to delete the text in a selected range.
+ */
+interface DeleteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+interface RemovePrevWordCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+interface RemoveNextWordCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to move the cursor backwards and erase the character in that space.
+ */
+interface BackspaceCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the BackspaceCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to scale pictures in a selected range.
+ */
+interface ChangePictureScaleCommand extends CommandBase {
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param scale A Scale object specifying scaling of the picture.
+     */
+    execute(scale: Scale): boolean;
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param x An interger number specifying width of the picture
+     * @param y An interger number specifying height of the picture
+     */
+    execute(x: number, y: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to move the selected range to a specific position in the document.
+ */
+interface MoveContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MoveContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer value specifying position to insert selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the specified position.
+ */
+interface CopyContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer number value specifying position for pasting selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to insert a tab character at the current position in the document.
+ */
+interface InsertTabCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTabCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines the scaling settings.
+ */
+interface Scale {
+    x: number;
+    y: number;
+}
+/**
+ * A command to change page margin settings.
+ */
+interface ChangePageMarginsCommand extends CommandBase {
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param left An integer number specifying left margin of the page.
+     * @param top An integer number specifying top margin of the page.
+     * @param right An integer number specifying right margin of the page.
+     * @param bottom An integer number specifying bottom margin of the page.
+     */
+    execute(left: number, top: number, right: number, bottom: number): boolean;
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param margins A Margins object specifying page margin settings.
+     */
+    execute(margins: Margins): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Margins tab of the Page Setup dialog.
+ */
+interface OpenPageMarginsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPageMarginsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page orientation.
+ */
+interface ChangePageOrientationCommand extends CommandBase {
+    /**
+     * 
+     * @param isPortrait 
+     */
+    execute(isPortrait: any): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paper tab of the Page Setup dialog.
+ */
+interface OpenPagePaperSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPagePaperSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to set the page size.
+ */
+interface SetPageSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SetPageSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page size.
+ */
+interface ChangePageSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param width An integer number specifying width of the page.
+     * @param height An integer number specifying height of the page.
+     */
+    execute(width: number, height: number): boolean;
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param size A Size object specifying the page size settings.
+     */
+    execute(size: Size): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the number of section columns having the same width.
+ */
+interface ChangeSectionEqualColumnCountCommand extends CommandBase {
+    /**
+     * Executes the ChangeSectionEqualColumnCountCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An interger number specifying the number of section columns having the same width.
+     */
+    execute(columnCount: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Columns dialog.
+ */
+interface OpenSectionColumnsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenSectionColumnsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the settings of individual section columns.
+ */
+interface ChangeSectionColumnsCommand extends CommandBase {
+    /**
+     * 
+     * @param columns 
+     */
+    execute(columns: SectionColumn[]): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of the page.
+ */
+interface ChangePageColorCommand extends CommandBase {
+    /**
+     * Executes the ChangePageColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying background color of the page. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to activate the page header and begin editing.
+ */
+interface InsertHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to activate the page footer and begin editing.
+ */
+interface InsertFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to link a header/footer to the previous section, so it has the same content.
+ */
+interface LinkHeaderFooterToPreviousCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the LinkHeaderFooterToPreviousCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page footer from the page header in the header/footer editing mode.
+ */
+interface GoToFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page header from the page footer in the header/footer editing mode.
+ */
+interface GoToHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next page header or footer in the header/footer editing mode.
+ */
+interface GoToNextHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous page header or footer in the header/footer editing mode.
+ */
+interface GoToPreviousHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+ */
+interface SetDifferentFirstPageHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentFirstPage true to apply different text for first page's header and footer, false to remove difference.
+     */
+    execute(differentFirstPage: boolean): boolean;
+}
+/**
+ * A command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+ */
+interface SetDifferentOddAndEvenPagesHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentOddAndEvenPages true to apply different text for odd and even pages' header and footer, false to remove difference.
+     */
+    execute(differentOddAndEvenPages: boolean): boolean;
+}
+/**
+ * A command to finish header/footer editing.
+ */
+interface CloseHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CloseHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines a section column in the document.
+ */
+interface SectionColumn {
+    /**
+     * Gets or sets the width of the section column.
+     * Value: An integer value specifying the section column width.
+     */
+    width: number;
+    /**
+     * Gets or sets the amount of space between adjacent section columns.
+     * Value: An integer value specifying the spacing between section columns.
+     */
+    spacing: number;
+}
+/**
+ * Defines the size settings.
+ */
+interface Size {
+    /**
+     * Gets or sets the width value.
+     * Value: An integer value specifying the width.
+     */
+    width: number;
+    /**
+     * Gets or sets the height value.
+     * Value: An integer value specifying the height.
+     */
+    height: number;
+}
+/**
+ * Defines the margin settings.
+ */
+interface Margins {
+    /**
+     * Gets or sets the left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    left: number;
+    /**
+     * Gets or sets the top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    top: number;
+    /**
+     * Gets or sets the right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    right: number;
+    /**
+     * Gets or sets the bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    bottom: number;
+}
+declare enum Orientation {
+    Landscape=0,
+    Portrait=1
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected range.
+ */
+interface IncreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected range.
+ */
+interface DecreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the visibility of hidden symbols.
+ */
+interface ShowHiddenSymbolsCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display hidden symbols; otherwise, false.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle left paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle centered paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle justified paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentJustifyCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentJustifyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with single line spacing.
+ */
+interface SetSingleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSingleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with one and a half line spacing.
+ */
+interface SetSesquialteralParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSesquialteralParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with double line spacing.
+ */
+interface SetDoubleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDoubleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing before a paragraph.
+ */
+interface AddSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing after a paragraph.
+ */
+interface AddSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing before the selected paragraph.
+ */
+interface RemoveSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing after the selected paragraph.
+ */
+interface RemoveSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the background color of paragraphs in a selected range.
+ */
+interface ChangeParagraphBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying highlighting color of the paragraphs in a selected range. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paragraph dialog allowing end-users to set paragraph formatting.
+ */
+interface OpenParagraphFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenParagraphFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the formatting of paragraphs in a selected range.
+ */
+interface ChangeParagraphFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A ParagraphFormattingSettings object specifying paragraph formatting settings.
+     */
+    execute(settings: ParagraphFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increment the left indentation of paragraphs in a selected range.
+ */
+interface IncrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the left indentation of paragraphs in a selected range.
+ */
+interface DecrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Tabs paragraph dialog.
+ */
+interface OpenTabsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTabsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change paragraph tab stops.
+ */
+interface ChangeTabsCommand extends CommandBase {
+    /**
+     * Executes the ChangeTabsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TabsSettings object maintaining the information about tab stops.
+     */
+    execute(settings: TabsSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains the information about tab stops.
+ */
+interface TabsSettings {
+    /**
+     * Gets or sets the default tab stop value.
+     * Value: An integer value specifying the default tab stop.
+     */
+    defaultTabStop: number;
+    /**
+     * Gets or sets a list of tab stops.
+     * Value: An array of TabSettings objects containing individual tab stop settings.
+     */
+    tabs: TabSettings[];
+}
+/**
+ * Contains settings of a tab stop.
+ */
+interface TabSettings {
+    /**
+     * Gets or sets the alignment type, specifying how any text after the tab will be lined up.
+     * Value: One of the <see cref="TabAlign" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the tab leader style, i.e., the symbol used as a tab leader.
+     * Value: One of the <see cref="TabLeaderType" /> values.
+     */
+    leader: any;
+    /**
+     * Gets or sets the position of the tab stop.
+     * Value: A number representing the distance from the left edge of the text area.
+     */
+    position: number;
+    /**
+     * Gets or sets whether the individual tab stop is in effect.
+     * Value: true to switch off this tab stop; otherwise, false.
+     */
+    deleted: boolean;
+}
+declare enum TabAlign {
+    Left=0,
+    Center=1,
+    Right=2,
+    Decimal=3
+}
+declare enum TabLeaderType {
+    None=0,
+    Dots=1,
+    MiddleDots=2,
+    Hyphens=3,
+    Underline=4,
+    ThickLine=5,
+    EqualSign=6
+}
+/**
+ * Contains settings to define the paragraph formatting.
+ */
+interface ParagraphFormattingSettings {
+    /**
+     * Gets or sets the paragraph alignment.
+     * Value: One of the <see cref="ParagraphAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the outline level of a paragraph.
+     * Value: An integer specifying the level number.
+     */
+    outlineLevel: number;
+    /**
+     * Gets or sets the right indent value for the specified paragraph.
+     * Value: An integer value specifying the right indent.
+     */
+    rightIndent: number;
+    /**
+     * Gets or sets the spacing before the current paragraph.
+     * Value: An integer value specifying the spacing before the paragraph.
+     */
+    spacingBefore: number;
+    /**
+     * Gets or sets the spacing after the current paragraph.
+     * Value: An integer value specifying the spacing after the paragraph.
+     */
+    spacingAfter: number;
+    /**
+     * Gets or sets a value which determines the spacing between lines in a paragraph.
+     * Value: One of the <see cref="ParagraphLineSpacingType" /> values.
+     */
+    lineSpacingType: any;
+    /**
+     * Gets or sets a value specifying whether and how the first line of a paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets a value specifying the indent of the first line of a paragraph.
+     * Value: An integer value specifying the indent of the first line.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets whether to suppress addition of additional space (contextual spacing) between paragraphs of the same style.
+     * Value: true to remove extra spacing between paragraphs, false to add extra space.
+     */
+    contextualSpacing: boolean;
+    /**
+     * Gets or sets whether to prevent all page breaks that interrupt a paragraph.
+     * Value: true, to keep paragraph lines together; otherwise, false.
+     */
+    keepLinesTogether: boolean;
+    /**
+     * Gets or sets whether a page break is inserted automatically before a specified paragraph(s).
+     * Value: true, if a page break is inserted automatically before a paragraph(s); otherwise, false.
+     */
+    pageBreakBefore: boolean;
+    /**
+     * Gets or sets the left indent for text within a paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a line spacing value.
+     * Value: An integer value specifying the line spacing.
+     */
+    lineSpacing: number;
+    /**
+     * Gets or sets the paragraph background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+}
+declare enum ParagraphAlignment {
+    Left=0,
+    Right=1,
+    Center=2,
+    Justify=3
+}
+declare enum ParagraphLineSpacingType {
+    Single=0,
+    Sesquialteral=1,
+    Double=2,
+    Multiple=3,
+    Exactly=4,
+    AtLeast=5
+}
+declare enum ParagraphFirstLineIndent {
+    None=0,
+    Indented=1,
+    Hanging=2
+}
+interface AssignShortcutCommand extends CommandWithSimpleStateBase {
+    /**
+     * 
+     * @param keyCode 
+     * @param callback 
+     */
+    execute(keyCode: number, callback: (arg1: string) => void): boolean;
+}
+interface OpenSpellingDialogCommand extends CommandWithSimpleStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface OpenInsertTableDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertTableDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface InsertTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An integer value specifying number of columns in a generated table.
+     * @param rowCount An integer value specifying number of rows in a generated table.
+     */
+    execute(columnCount: number, rowCount: number): boolean;
+}
+/**
+ * A command to invoke the Table Properties dialog.
+ */
+interface OpenTableFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's formatting.
+ */
+interface ChangeTableFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object containing the settings to format a table.
+     */
+    execute(settings: TableFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred row height.
+ */
+interface ChangeTableRowPreferredHeightCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableRowPreferredHeightCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredHeight A TableHeightUnit object specifying preferred height of the selected table rows.
+     */
+    execute(preferredHeight: TableHeightUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the preferred cell width of the selected table rows.
+ */
+interface ChangeTableCellPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table rows.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred column width.
+ */
+interface ChangeTableColumnPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableColumnPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table columns.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the cell formatting of the selected table elements.
+ */
+interface ChangeTableCellFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object specifying cell formatting of the selected table elements.
+     */
+    execute(settings: TableCellFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a table column to the left of the current position in the table.
+ */
+interface InsertTableColumnToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a table column to the right of the current position in the table.
+ */
+interface InsertTableColumnToTheRightCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table below the selected row.
+ */
+interface InsertTableRowBelowCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowBelowCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table above the selected row.
+ */
+interface InsertTableRowAboveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowAboveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table rows.
+ */
+interface DeleteTableRowsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableRowsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table columns.
+ */
+interface DeleteTableColumnsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableColumnsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert table cells with a horizontal shift into the selected table.
+ */
+interface InsertTableCellWithShiftToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellWithShiftToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a horizontal shift.
+ */
+interface DeleteTableCellsWithShiftHorizontallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftHorizontallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a vertical shift.
+ */
+interface DeleteTableCellsWithShiftVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table.
+ */
+interface DeleteTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Cells dialog.
+ */
+interface InsertTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Delete Cells dialog.
+ */
+interface DeleteTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to merge the selected table cells.
+ */
+interface MergeTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeTableCellsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Split Cells dialog.
+ */
+interface SplitTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to split the selected table cells based on the specified options.
+ */
+interface SplitTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param rowCount An integer value specifying number of rows in the splitted table cells.
+     * @param columnCount An integer value specifying number of columns in the splitted table cells.
+     * @param mergeBeforeSplit true to merge the selected cells before splitting; otherwise, false.
+     */
+    execute(rowCount: number, columnCount: number, mergeBeforeSplit: boolean): boolean;
+}
+/**
+ * A command to insert table cells with a vertical shift into the selected table.
+ */
+interface InsertTableCellsWithShiftToTheVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsWithShiftToTheVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Borders and Shading table dialog.
+ */
+interface OpenTableBordersAndShadingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableBordersAndShadingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change borders and shading of the selected table elements.
+ */
+interface ChangeTableBordersAndShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBordersAndShadingCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object with settings specifying table borders.
+     * @param applyToWholeTable true to apply the border settings to the whole table, false to apply the border settings to the selected cells.
+     */
+    execute(settings: TableBordersSettings, applyToWholeTable: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to apply top-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style.
+ */
+interface ChangeTableStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A TableStyle object specifying the style applying to the table.
+     */
+    execute(style: TableStyle): boolean;
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the name of style applying to the table.
+     */
+    execute(styleName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle top borders for selected cells on/off.
+ */
+interface ToggleTableCellTopBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellTopBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right borders for selected cells on/off.
+ */
+interface ToggleTableCellRightBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellRightBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle bottom borders for selected cells on/off.
+ */
+interface ToggleTableCellBottomBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellBottomBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+interface ToggleTableCellLeftBorderCommand extends CommandWithBooleanStateBase {
+    execute(): boolean;
+}
+/**
+ * A command to remove the borders of the selected table cells.
+ */
+interface RemoveTableCellBordersCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveTableCellBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle all borders for selected cells on/off.
+ */
+interface ToggleTableCellAllBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAllBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner horizontal borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideHorizontalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideHorizontalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner vertical borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideVerticalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideVerticalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle outer borders for selected cells on/off.
+ */
+interface ToggleTableCellOutsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellOutsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style options.
+ */
+interface ChangeTableLookCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableLookCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableLookSettings object containing the settings that modify the table appearance.
+     */
+    execute(settings: TableLookSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the repository item's table border style.
+ */
+interface ChangeTableBorderRepositoryItemCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBorderRepositoryItemCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object specifying the repository item's table border style.
+     */
+    execute(settings: TableBorderSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change cell shading in the selected table elements.
+ */
+interface ChangeTableCellShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellShadingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying color of the selected cells' shading. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle the display of grid lines for a table with no borders applied - on/off.
+ */
+interface ShowTableGridLinesCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowTableGridLinesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowTableGridLinesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showTableGridLines true to display grid lines of the table, false to hide grid lines of the table.
+     */
+    execute(showTableGridLines: boolean): boolean;
+}
+/**
+ * Contains the table style settings that modify the table appearance.
+ */
+interface TableLookSettings {
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether row banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyRowBanding: boolean;
+    /**
+     * Gets or sets a value specifying whether column banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyColumnBanding: boolean;
+}
+/**
+ * Contains settings to define table borders.
+ */
+interface TableBordersSettings {
+    /**
+     * Gets or sets the top border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    top: TableBorderSettings;
+    /**
+     * Gets or sets the right border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    right: TableBorderSettings;
+    /**
+     * Gets or sets the bottom border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    bottom: TableBorderSettings;
+    /**
+     * Gets or sets the left border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    left: TableBorderSettings;
+    /**
+     * Gets or sets the inside horizontal border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideHorizontal: TableBorderSettings;
+    /**
+     * Gets or sets the inside vertical border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideVertical: TableBorderSettings;
+    /**
+     * Gets or sets the background color of table borders.
+     * Value: A string value specifying the background color.
+     */
+    backgroundColor: string;
+}
+/**
+ * Contains settings to define a table border.
+ */
+interface TableBorderSettings {
+    /**
+     * Gets or sets the border color.
+     * Value: A string value specifying the border color.
+     */
+    color: string;
+    /**
+     * Gets or sets the border line width.
+     * Value: An integer value defining the border line width.
+     */
+    width: number;
+    /**
+     * Gets or sets the border line style.
+     * Value: A <see cref="BorderLineStyle" /> object defining the border line style.
+     */
+    style: any;
+}
+declare enum BorderLineStyle {
+    None=0,
+    Single=1,
+    Thick=2,
+    Double=3,
+    Dotted=4,
+    Dashed=5,
+    DotDash=6,
+    DotDotDash=7,
+    Triple=8,
+    ThinThickSmallGap=9,
+    ThickThinSmallGap=10,
+    ThinThickThinSmallGap=11,
+    ThinThickMediumGap=12,
+    ThickThinMediumGap=13,
+    ThinThickThinMediumGap=14,
+    ThinThickLargeGap=15,
+    ThickThinLargeGap=16,
+    ThinThickThinLargeGap=17,
+    Wave=18,
+    DoubleWave=19,
+    DashSmallGap=20,
+    DashDotStroked=21,
+    ThreeDEmboss=22,
+    ThreeDEngrave=23,
+    Outset=24,
+    Inset=25,
+    Apples=26,
+    ArchedScallops=27,
+    BabyPacifier=28,
+    BabyRattle=29,
+    Balloons3Colors=30,
+    BalloonsHotAir=31,
+    BasicBlackDashes=32,
+    BasicBlackDots=33,
+    BasicBlackSquares=34,
+    BasicThinLines=35,
+    BasicWhiteDashes=36,
+    BasicWhiteDots=37,
+    BasicWhiteSquares=38,
+    BasicWideInline=39,
+    BasicWideMidline=40,
+    BasicWideOutline=41,
+    Bats=42,
+    Birds=43,
+    BirdsFlight=44,
+    Cabins=45,
+    CakeSlice=46,
+    CandyCorn=47,
+    CelticKnotwork=48,
+    CertificateBanner=49,
+    ChainLink=50,
+    ChampagneBottle=51,
+    CheckedBarBlack=52,
+    CheckedBarColor=53,
+    Checkered=54,
+    ChristmasTree=55,
+    CirclesLines=56,
+    CirclesRectangles=57,
+    ClassicalWave=58,
+    Clocks=59,
+    Compass=60,
+    Confetti=61,
+    ConfettiGrays=62,
+    ConfettiOutline=63,
+    ConfettiStreamers=64,
+    ConfettiWhite=65,
+    CornerTriangles=66,
+    CouponCutoutDashes=67,
+    CouponCutoutDots=68,
+    CrazyMaze=69,
+    CreaturesButterfly=70,
+    CreaturesFish=71,
+    CreaturesInsects=72,
+    CreaturesLadyBug=73,
+    CrossStitch=74,
+    Cup=75,
+    DecoArch=76,
+    DecoArchColor=77,
+    DecoBlocks=78,
+    DiamondsGray=79,
+    DoubleD=80,
+    DoubleDiamonds=81,
+    Earth1=82,
+    Earth2=83,
+    EclipsingSquares1=84,
+    EclipsingSquares2=85,
+    EggsBlack=86,
+    Fans=87,
+    Film=88,
+    Firecrackers=89,
+    FlowersBlockPrint=90,
+    FlowersDaisies=91,
+    FlowersModern1=92,
+    FlowersModern2=93,
+    FlowersPansy=94,
+    FlowersRedRose=95,
+    FlowersRoses=96,
+    FlowersTeacup=97,
+    FlowersTiny=98,
+    Gems=99,
+    GingerbreadMan=100,
+    Gradient=101,
+    Handmade1=102,
+    Handmade2=103,
+    HeartBalloon=104,
+    HeartGray=105,
+    Hearts=106,
+    HeebieJeebies=107,
+    Holly=108,
+    HouseFunky=109,
+    Hypnotic=110,
+    IceCreamCones=111,
+    LightBulb=112,
+    Lightning1=113,
+    Lightning2=114,
+    MapleLeaf=115,
+    MapleMuffins=116,
+    MapPins=117,
+    Marquee=118,
+    MarqueeToothed=119,
+    Moons=120,
+    Mosaic=121,
+    MusicNotes=122,
+    Northwest=123,
+    Ovals=124,
+    Packages=125,
+    PalmsBlack=126,
+    PalmsColor=127,
+    PaperClips=128,
+    Papyrus=129,
+    PartyFavor=130,
+    PartyGlass=131,
+    Pencils=132,
+    People=133,
+    PeopleHats=134,
+    PeopleWaving=135,
+    Poinsettias=136,
+    PostageStamp=137,
+    Pumpkin1=138,
+    PushPinNote1=139,
+    PushPinNote2=140,
+    Pyramids=141,
+    PyramidsAbove=142,
+    Quadrants=143,
+    Rings=144,
+    Safari=145,
+    Sawtooth=146,
+    SawtoothGray=147,
+    ScaredCat=148,
+    Seattle=149,
+    ShadowedSquares=150,
+    SharksTeeth=151,
+    ShorebirdTracks=152,
+    Skyrocket=153,
+    SnowflakeFancy=154,
+    Snowflakes=155,
+    Sombrero=156,
+    Southwest=157,
+    Stars=158,
+    Stars3d=159,
+    StarsBlack=160,
+    StarsShadowed=161,
+    StarsTop=162,
+    Sun=163,
+    Swirligig=164,
+    TornPaper=165,
+    TornPaperBlack=166,
+    Trees=167,
+    TriangleParty=168,
+    Triangles=169,
+    Tribal1=170,
+    Tribal2=171,
+    Tribal3=172,
+    Tribal4=173,
+    Tribal5=174,
+    Tribal6=175,
+    TwistedLines1=176,
+    TwistedLines2=177,
+    Vine=178,
+    Waveline=179,
+    WeavingAngles=180,
+    WeavingBraid=181,
+    WeavingRibbon=182,
+    WeavingStrips=183,
+    WhiteFlowers=184,
+    Woodwork=185,
+    XIllusions=186,
+    ZanyTriangles=187,
+    ZigZag=188,
+    ZigZagStitch=189,
+    Nil=-1
+}
+/**
+ * Contains the settings to define the table cell formatting.
+ */
+interface TableCellFormattingSettings {
+    /**
+     * Gets or sets a table cell's preferred width.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the preferred cell width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the vertical alignment of a table cell's content.
+     * Value: One the <see cref="TableCellVerticalAlignment" /> values.
+     */
+    verticalAlignment: any;
+    /**
+     * Gets or sets a value specifying whether text is wrapped in a table cell.
+     * Value: true if text is wrapped; false if text is not wrapped.
+     */
+    noWrap: boolean;
+    /**
+     * Gets or sets a table cell's left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    marginLeft: number;
+    /**
+     * Gets or sets a table cell's right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    marginRight: number;
+    /**
+     * Gets or sets a table cell's top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    marginTop: number;
+    /**
+     * Gets or sets a table cell's bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    marginBottom: number;
+    /**
+     * Gets or sets a value specifying whether a table cell's margins are inherited from the table level settings.
+     * Value: true to inherit table level margins; false to use a table cell's own margin settings.
+     */
+    marginsSameAsTable: boolean;
+}
+declare enum TableCellVerticalAlignment {
+    Top=0,
+    Both=1,
+    Center=2,
+    Bottom=3
+}
+/**
+ * Contains the settings to format a table.
+ */
+interface TableFormattingSettings {
+    /**
+     * Gets or sets the preferred width of cells in the table.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the alignment of table rows.
+     * Value: One of the <see cref="TableRowAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the table's left indent.
+     * Value: An integer value specifying the indent.
+     */
+    indent: number;
+    /**
+     * Gets or sets the spacing between table cells.
+     * Value: An integer value specifying the spacing.
+     */
+    spacingBetweenCells: number;
+    /**
+     * Gets or sets a value specifying whether spacing is allowed between table cells.
+     * Value: true, to allow spacing; otherwise, false.
+     */
+    allowSpacingBetweenCells: boolean;
+    /**
+     * Gets or sets a value that specifying whether to allow automatic resizing of table cells to fit their contents.
+     * Value: true, to allow automatic resizing; otherwise, false.
+     */
+    resizeToFitContent: boolean;
+    /**
+     * Gets or sets the default left margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginLeft: number;
+    /**
+     * Gets or sets the default right margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginRight: number;
+    /**
+     * Gets or sets the default top margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginTop: number;
+    /**
+     * Gets or sets the default bottom margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginBottom: number;
+}
+/**
+ * Contains settings defining the table width's measurement units and value.
+ */
+interface TableWidthUnit {
+    /**
+     * Gets or sets the table width value.
+     * Value: An integer value specifying the table width.
+     */
+    value: number;
+    /**
+     * Gets or sets the unit type for the table width.
+     * Value: One of the <see cref="TableWidthUnitType" /> values.
+     */
+    type: any;
+}
+/**
+ * Contains settings defining the table height's measurement units and value.
+ */
+interface TableHeightUnit {
+    /**
+     * Gets or sets the table height value.
+     * Value: An integer value specifying the table height.
+     */
+    value: number;
+    type: any;
+}
+declare enum TableHeightUnitType {
+    Minimum=0,
+    Auto=1,
+    Exact=2
+}
+declare enum TableRowAlignment {
+    Both=0,
+    Center=1,
+    Distribute=2,
+    Left=3,
+    NumTab=4,
+    Right=5
+}
+declare enum TableWidthUnitType {
+    Nil=0,
+    Auto=1,
+    FiftiethsOfPercent=2,
+    ModelUnits=3
+}
+/**
+ * A command to change the font name of characters in a selected range.
+ */
+interface ChangeFontNameCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontNameCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontName A string specifying font name.
+     */
+    execute(fontName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the font size of characters in a selected range.
+ */
+interface ChangeFontSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSize An integer number specifying font size.
+     */
+    execute(fontSize: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increase the font size of characters in a selected range to the closest larger predefined value.
+ */
+interface IncreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrease the font size of characters in a selected range to the closest smaller predefined value.
+ */
+interface DecreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to upper case.
+ */
+interface MakeTextUpperCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextUpperCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to lower case.
+ */
+interface MakeTextLowerCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextLowerCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to capitalize each word in the selected sentence.
+ */
+interface CapitalizeEachWordTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CapitalizeEachWordTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the case for each character - upper case becomes lower, lower case becomes upper.
+ */
+interface ToggleTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ToggleTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the bold formatting of characters in a selected range.
+ */
+interface ChangeFontBoldCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontBoldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontBoldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontBold true to apply bold formatting to the text, false to remove bold formatting.
+     */
+    execute(fontBold: boolean): boolean;
+}
+/**
+ * A command to change the italic formatting of characters in a selected range.
+ */
+interface ChangeFontItalicCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontItalicCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontItalicCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontItalic true to apply italic formatting to the text, false to remove italic formatting.
+     */
+    execute(fontItalic: boolean): boolean;
+}
+/**
+ * A command to change the underline formatting of characters in a selected range.
+ */
+interface ChangeFontUnderlineCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontUnderlineCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontUnderlineCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontUnderline true to apply underline formatting to the text, false to remove underline formatting.
+     */
+    execute(fontUnderline: boolean): boolean;
+}
+/**
+ * A command to change the strikeout formatting of characters in a selected range.
+ */
+interface ChangeFontStrikeoutCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontStrikeout true to apply strikeout formatting to the text, false to remove strikeout formatting.
+     */
+    execute(fontStrikeout: boolean): boolean;
+}
+/**
+ * A command to change the superscript formatting of characters in a selected range.
+ */
+interface ChangeFontSuperscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSuperscript true to apply superscript formatting to the text, false to remove superscript formatting.
+     */
+    execute(fontSuperscript: boolean): boolean;
+}
+/**
+ * A command to change the subscript formatting of characters in the selected range.
+ */
+interface ChangeFontSubscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSubscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSubscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSubscript true to apply subscript formatting to the text, false to remove subscript formatting.
+     */
+    execute(fontSubscript: boolean): boolean;
+}
+/**
+ * A command to change the font color of characters in a selected range.
+ */
+interface ChangeFontForeColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontForeColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying font color. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of characters in a selected range.
+ */
+interface ChangeFontBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying highlighting color. May be specified as color name or hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to reset the selected text's formatting to default.
+ */
+interface ClearFormattingCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ClearFormattingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected range's style.
+ */
+interface ChangeStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A StyleBase object specifying the selected range's style.
+     */
+    execute(style: StyleBase): boolean;
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the name of applying style.
+     * @param isParagraphStyle true to apply style to paragraph, false to apply style to character.
+     */
+    execute(styleName: string, isParagraphStyle: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Font dialog allowing end-users to change the font, size and style of the selected text.
+ */
+interface OpenFontFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFontFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the text of all selected sentences to sentence case.
+ */
+interface MakeTextSentenceCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextSentenceCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to switch the text case at the current position in the document.
+ */
+interface SwitchTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SwitchTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the font formatting of characters in a selected range.
+ */
+interface ChangeFontFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A  FontFormattingSettings object specifying font formatting settings.
+     */
+    execute(settings: FontFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains settings to define the font formatting.
+ */
+interface FontFormattingSettings {
+    /**
+     * Gets or sets the character(s) font name.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the character(s) font size.
+     * Value: An integer value specifying the font size.
+     */
+    size: number;
+    /**
+     * Gets or sets the foreground color of characters.
+     * Value: A string value specifying the foreground color.
+     */
+    foreColor: string;
+    /**
+     * Gets or sets the character background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+    /**
+     * Gets or sets the type of underline applied to the character(s).
+     * Value: true, if characters are underlined; otherwise, false.
+     */
+    underline: boolean;
+    /**
+     * Gets or sets the color of the underline for the specified characters.
+     * Value: A string value specifying the underline color.
+     */
+    underlineColor: string;
+    /**
+     * Gets or sets whether the character formatting is bold.
+     * Value: true, if characters are bold; otherwise, false.
+     */
+    bold: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is italicized.
+     * Value: true, if characters are italicized; otherwise, false.
+     */
+    italic: boolean;
+    strikeout: boolean;
+    /**
+     * Gets or sets whether only word characters are underlined.
+     * Value: true to underline only characters in words; false to underline all characters.
+     */
+    underlineWordsOnly: boolean;
+    /**
+     * Gets or sets a value specifying character script formatting.
+     * Value: One of the <see cref="CharacterFormattingScript" /> values.
+     */
+    script: any;
+    /**
+     * Gets or sets a value indicating whether all characters are capital letters.
+     * Value: true, if all characters are capitalized; otherwise, false.
+     */
+    allCaps: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is hidden.
+     * Value: true, if characters are hidden; otherwise, false.
+     */
+    hidden: boolean;
+}
+declare enum CharacterFormattingScript {
+    Normal=0,
+    Subscript=1,
+    Superscript=2
+}
+/**
+ * A command to toggle the horizontal ruler's visibility.
+ */
+interface ShowHorizontalRulerCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHorizontalRulerCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHorizontalRulerCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display the horizontal ruler, false to hide the horizontal ruler.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle the fullscreen mode.
+ */
+interface SetFullscreenCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetFullscreenCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetFullscreenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fullscreen true to apply fullscreen mode, false to remove fullscreen mode.
+     */
+    execute(fullscreen: boolean): boolean;
+}
+/**
+ * Holds the information that determines what action types can be performed for appointments.
+ */
+interface ASPxClientAppointmentFlags {
+    /**
+     * Gets a value that specifies whether an end-user is allowed to delete appointments.
+     * Value: true if an end-user can delete appointments; otherwise, false. Default is true.
+     */
+    allowDelete: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to edit appointments.
+     * Value: true if the end-user can edit appointments; otherwise, false.
+     */
+    allowEdit: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to change the time boundaries of appointments.
+     * Value: true if appointment resizing is allowed; otherwise, false. Default is true.
+     */
+    allowResize: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to copy appointments.
+     * Value: true if a user can copy appointments; otherwise, false. Default is true.
+     */
+    allowCopy: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments to another time slot or date.
+     * Value: true if the user can drag and drop appointments; otherwise, false.
+     */
+    allowDrag: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments between resources.
+     * Value: true if the end-user can drag appointment from one resource to another; otherwise, false.
+     */
+    allowDragBetweenResources: boolean;
+    /**
+     * Gets a value that specifies whether an inplace editor can be activated for an appointment.
+     * Value: true if an inplace editor is activated; otherwise, false. Default is true.
+     */
+    allowInplaceEditor: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to share the schedule time between two or more appointments.
+     * Value: true if appointments with the same schedule time are allowed; otherwise, false. Default is true.
+     */
+    allowConflicts: boolean;
+}
+/**
+ * Represents a client-side equivalent of the Appointment class.
+ */
+interface ASPxClientAppointment {
+    /**
+     * Gets the time interval of the appointment for client-side scripting.
+     * Value: An ASPxClientTimeInterval object, representing the interval assigned to an appointment.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the identifiers of resources associated with the appointment for client-side scripting.
+     * Value: An array of string representations for resource identifiers.
+     */
+    resources: string[];
+    /**
+     * Gets the ID of an appointment for use in client-side scripts.
+     * Value: A string representation of the appointment ID.
+     */
+    appointmentId: string;
+    /**
+     * Gets the type of appointment for use in client-side scripts.
+     * Value: An ASPxAppointmentType enumeration member, representing the appointment's type.
+     */
+    appointmentType: ASPxAppointmentType;
+    /**
+     * Gets the index of the availability status object associated with the appointment.
+     * Value: An integer value that specifies the index of the corresponding Statuses collection.
+     */
+    statusIndex: number;
+    /**
+     * Gets  the index of the label object associated with the appointment for client-side scripting.
+     * Value: An integer value that specifies the index of the corresponding Labels collection.
+     */
+    labelIndex: number;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Subject property.
+     * Value: A string representing the appointment subject.
+     */
+    subject: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Description property.
+     * Value: A string, representing the description for an appointment.
+     */
+    description: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Location property.
+     * Value: A string representing the appointment location.
+     */
+    location: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the AllDay property.
+     * Value: true indicates the all-day appointment; otherwise, false.
+     */
+    allDay: boolean;
+    /**
+     * Adds a resource to the collection of resources associated with the client appointment.
+     * @param resourceId An object, representing the resource id.
+     */
+    AddResource(resourceId: Object): void;
+    /**
+     * Gets the resource associated with the client-side appointment by its index.
+     * @param index An integer, representing an index of a resource in a resource collection associated with the current appointment.
+     */
+    GetResource(index: number): Object;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Start appointment property.
+     * @param start A JavaScript Date object representing the appointment start.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Start appointment property.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the End appointment property.
+     * @param end A JavaScript Date object representing the end of the appointment.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the End appointment property.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Duration appointment property.
+     * @param duration A TimeSpan object representing the appointment duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Duration appointment property.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the ID of the client appointment.
+     * @param id An object representing the appointment identifier.
+     */
+    SetId(id: Object): void;
+    /**
+     * Gets the ID of the client appointment.
+     */
+    GetId(): Object;
+    /**
+     * Specifies the type of the current client appointment.
+     * @param type An ASPxAppointmentType enumeration value indicating the appointment type.
+     */
+    SetAppointmentType(type: ASPxAppointmentType): void;
+    /**
+     * Gets the type of the client appointment.
+     */
+    GetAppointmentType(): ASPxAppointmentType;
+    /**
+     * Sets the property value of the client appointment, corresponding to the StatusId appointment property.
+     * @param statusId An integer representing the index in the AppointmentStatusCollection.
+     */
+    SetStatusId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the StatusId appointment property.
+     */
+    GetStatusId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the LabelId appointment property.
+     * @param statusId An integer representing the index of the label in the Labels label collection.
+     */
+    SetLabelId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the LabelId appointment property.
+     */
+    GetLabelId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Subject appointment property.
+     * @param subject A string containing the appointment subject.
+     */
+    SetSubject(subject: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Subject appointment property.
+     */
+    GetSubject(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Description appointment property.
+     * @param description A string representing the appointment description.
+     */
+    SetDescription(description: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Description appointment property.
+     */
+    GetDescription(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Location appointment property.
+     * @param location A string representing the appointment location.
+     */
+    SetLocation(location: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Location appointment property.
+     */
+    GetLocation(): string;
+    /**
+     * Specifies the property value of the client appointment corresponding to the AllDay appointment property.
+     * @param allDay true to indicate the all-day appointment; otherwise, false.
+     */
+    SetAllDay(allDay: boolean): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the AllDay appointment property.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Gets the appointment that is the RecurrencePattern for the current appointment.
+     */
+    GetRecurrencePattern(): ASPxClientAppointment;
+    /**
+     * Sets the property value of the client appointment, corresponding to the RecurrenceInfo appointment property.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object representing the recurrence information.
+     */
+    SetRecurrenceInfo(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the RecurrenceInfo appointment property.
+     */
+    GetRecurrenceInfo(): ASPxClientRecurrenceInfo;
+}
+/**
+ * A client point object.
+ */
+interface ASPxClientPoint {
+    /**
+     * Gets the point's X-coordinate.
+     */
+    GetX(): number;
+    /**
+     * Gets the point's Y-coordinate.
+     */
+    GetY(): number;
+}
+/**
+ * A client rectangle object.
+ */
+interface ASPxClientRect {
+    /**
+     * Gets the X-coordinate of the rectangle's left edge.
+     */
+    GetLeft(): number;
+    /**
+     * Gets the X-coordinate of the rectangle's right edge.
+     */
+    GetRight(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's top edge.
+     */
+    GetTop(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's bottom edge.
+     */
+    GetBottom(): number;
+    /**
+     * Gets the rectangle's width.
+     */
+    GetWidth(): number;
+    /**
+     * Gets the rectangle's height.
+     */
+    GetHeight(): number;
+}
+/**
+ * Contains information defining the occurrences of a recurring client appointment.
+ */
+interface ASPxClientRecurrenceInfo {
+    /**
+     * Sets the recurrence start date.
+     * @param start A JavaScript date object value that specifies the start date for the recurrence.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the recurrence start date.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the recurrence end date.
+     * @param end A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the duration of the recurrence.
+     * @param duration A TimeSpan object representing the duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the duration of the recurrence.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the time base for the frequency of the corresponding appointment occurrences.
+     * @param type An ASPxClientRecurrenceType enumeration value that specifies the recurrence's frequency type.
+     */
+    SetRecurrenceType(type: ASPxClientRecurrenceType): void;
+    /**
+     * Gets the time base for the frequency of the corresponding appointment reoccurrence.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the day/days in a week that the corresponding appointment recurs on.
+     * @param weekDays The ASPxClientWeekDays enumeration value specifying the day/days in a week.
+     */
+    SetWeekDays(weekDays: ASPxClientWeekDays): void;
+    /**
+     * Gets the day/days in a week on which the corresponding appointment occurs.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Sets the frequency with which the corresponding appointment occurs (dependent on the recurrence Type).
+     * @param periodicity An integer value that specifies the frequency with which the corresponding appointment occurs.
+     */
+    SetPeriodicity(periodicity: number): void;
+    /**
+     * Gets the frequency with which the corresponding appointment reoccurs (dependent on the recurrence Type).
+     */
+    GetPeriodicity(): number;
+    /**
+     * Sets the ordinal number of a day within a defined month.
+     * @param dayNumber A positive integer value that specifies the day number within a month.
+     */
+    SetDayNumber(dayNumber: number): void;
+    /**
+     * Gets the ordinal number of a day within a defined month.
+     */
+    GetDayNumber(): number;
+    /**
+     * Sets the occurrence number of the week in a month for the recurrence pattern.
+     * @param weekOfMonth A ASPxClientWeekOfMonth enumeration value that specifies a particular week in every month.
+     */
+    SetWeekOfMonth(weekOfMonth: ASPxClientWeekOfMonth): void;
+    /**
+     * Gets the occurrence number of the week in a month for the recurrence pattern.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+    /**
+     * Sets the month (as a number) on which the corresponding appointment occurs.
+     * @param month A positive integer value that specifies the month's number.
+     */
+    SetMonth(month: number): void;
+    /**
+     * Gets the month (as a number) on which the corresponding appointment recurs.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+}
+/**
+ * Contains types of the recurrence range.
+ */
+interface ASPxClientRecurrenceRange {
+    /**
+     * A recurring appointment will not have an end date, i.e. infinite recurrence
+     * Value: The "NoEndDate" string.
+     */
+    NoEndDate: string;
+    /**
+     * A recurring appointment will end after its recurrence count exceeds the value specified by the SetOccurrenceCount method.
+     * Value: The "OccurrenceCount" string.
+     */
+    OccurrenceCount: string;
+    /**
+     * A recurring appointment will end after the date specified by the SetEnd method.
+     * Value: The "EndByDate" string.
+     */
+    EndByDate: string;
+}
+/**
+ * Contains recurrence types.
+ */
+interface ASPxClientRecurrenceType {
+    /**
+     * The recurring appointment occurs on a daily basis.
+     * Value: The "Daily" string.
+     */
+    Daily: string;
+    /**
+     * The recurring appointment reoccurs on a weekly basis.
+     * Value: The "Weekly" string.
+     */
+    Weekly: string;
+    /**
+     * The recurring appointment reoccurs on a monthly basis.
+     * Value: The "Monthly" string.
+     */
+    Monthly: string;
+    /**
+     * The recurring appointment reoccurs on an yearly basis.
+     * Value: The "Yearly" string.
+     */
+    Yearly: string;
+    /**
+     * The recurring appointment occurs on an hourly base.
+     * Value: The "Hourly" string.
+     */
+    Hourly: string;
+}
+/**
+ * Contains days and groups of days for use in recurrence patterns.
+ */
+interface ASPxClientWeekDays {
+    /**
+     * Specifies Sunday.
+     * Value: The integer 1 value.
+     */
+    Sunday: number;
+    /**
+     * Specifies Monday.
+     * Value: The integer 2 value.
+     */
+    Monday: number;
+    /**
+     * Specifies Tuesday.
+     * Value: The integer 4 value.
+     */
+    Tuesday: number;
+    /**
+     * Specifies Wednesday.
+     * Value: The integer 8 value.
+     */
+    Wednesday: number;
+    /**
+     * Specifies Thursday.
+     * Value: The integer 16 value.
+     */
+    Thursday: number;
+    /**
+     * Specifies Friday.
+     * Value: The integer 32 value.
+     */
+    Friday: number;
+    /**
+     * Specifies Saturday.
+     * Value: The integer 64 value.
+     */
+    Saturday: number;
+    /**
+     * Specifies Saturday and Sunday.
+     * Value: The integer 65 value.
+     */
+    WeekendDays: number;
+    /**
+     * Specifies work days (Monday, Tuesday, Wednesday, Thursday and Friday).
+     * Value: The integer 62 value.
+     */
+    WorkDays: number;
+    /**
+     * Specifies every day of the week.
+     * Value: The integer 127 value.
+     */
+    EveryDay: number;
+}
+/**
+ * Contains number of weeks in a month in which the event occurs.
+ */
+interface ASPxClientWeekOfMonth {
+    /**
+     * There isn't any recurrence rule based on the weeks in a month.
+     * Value: The integer 0 value.
+     */
+    None: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the first week in the month.
+     * Value: The integer 1 value.
+     */
+    First: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the second week in the month.
+     * Value: The integer 2 value.
+     */
+    Second: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the third week in the month.
+     * Value: The integer 3 value.
+     */
+    Third: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the fourth week in the month.
+     * Value: The integer 4 value;
+     */
+    Fourth: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the last week in the month.
+     * Value: The integer 5 value;
+     */
+    Last: number;
+}
+/**
+ * Represents a client-side equivalent of the WeekDaysCheckEdit control.
+ */
+interface ASPxClientWeekDaysCheckEdit extends ASPxClientControl {
+    /**
+     * Gets the selection state of the week day check boxes.
+     */
+    GetValue(): ASPxClientWeekDays;
+    /**
+     * Gets the selection state of the week day check boxes.
+     * @param value An ASPxClientWeekDays object specifying the selection state of the week day check boxes.
+     */
+    SetValue(value: ASPxClientWeekDays): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceRangeControl.
+ */
+interface ASPxClientRecurrenceRangeControl extends ASPxClientControl {
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEndDate(): Date;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Sets the recurrence end date.
+     * @param date A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEndDate(date: Date): void;
+}
+/**
+ * A base for client equivalents of recurrence controls available in the XtraScheduler library.
+ */
+interface ASPxClientRecurrenceControlBase extends ASPxClientControl {
+    /**
+     * Returns an object providing access to the ASPxClientRecurrenceControlBase control's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientRecurrenceControlBase control.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the DailyRecurrenceControl - a control for specifying the daily recurrence.
+ */
+interface ASPxClientDailyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientDailyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientDailyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the WeeklyRecurrenceControl.
+ */
+interface ASPxClientWeeklyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientWeeklyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientWeeklyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the MonthlyRecurrenceControl.
+ */
+interface ASPxClientMonthlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientMonthlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientMonthlyRecurrenceControll.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the YearlyRecurrenceControl.
+ */
+interface ASPxClientYearlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientYearlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientYearlyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * An object providing access to an ASPxClientRecurrenceControlBase control's editor values.
+ */
+interface DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Get the frequency with which the appointment occurs with respect to the appointment's recurrence type.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the number of the month's day in which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientDailyRecurrenceControl's editor values.
+ */
+interface DailyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of days between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week to which a daily recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientWeeklyRecurrenceControl's editor values.
+ */
+interface WeeklyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of weeks between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientMonthlyRecurrenceControl's editor values.
+ */
+interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the day of the month on which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets the number of months between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week on which a monthly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientYearlyRecurrenceControl's editor values.
+ */
+interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the day of the month on which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week on which a yearly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets or sets the number of a week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * Provides base functionality for ASPxClientScheduler's forms.
+ */
+interface ASPxClientFormBase {
+    /**
+     * Occurs when the form has been closed.
+     */
+    FormClosed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientFormBase>>;
+    /**
+     * Closes the form.
+     */
+    Close(): void;
+    /**
+     * Sets the visibility state of the specified form element.
+     * @param element An object specifying the element whose visibility state should be changed.
+     * @param isVisible true to display the element; false to hide the element.
+     */
+    SetVisibleCore(element: Object, isVisible: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceTypeEdit.
+ */
+interface ASPxClientRecurrenceTypeEdit extends ASPxClientRadioButtonList {
+    /**
+     * Gets the selected recurrence type.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the selected recurrence type.
+     * @param recurrenceType An ASPxClientRecurrenceType enumeration value.
+     */
+    SetRecurrenceType(recurrenceType: ASPxClientRecurrenceType): void;
+}
+/**
+ * Contains lists of property names for different appointment types.
+ */
+interface AppointmentPropertyNames {
+    /**
+     * Gets the list of properties characteristic for appointments of the Normal type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Normal: string;
+    /**
+     * Gets the list of properties characteristic for appointments of the Pattern type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Pattern: string;
+}
+/**
+ * Represents the client-side equivalent of the TimeInterval class.
+ */
+interface ASPxClientTimeInterval {
+    /**
+     * Gets a value indicating if the time interval is All-Day.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Sets a value specifying if the time interval is All-Day.
+     * @param allDayValue true, if this is an all-day time interval; otherwise, false.
+     */
+    SetAllDay(allDayValue: boolean): void;
+    /**
+     * Client-side function that returns the start time of the interval.
+     */
+    GetStart(): Date;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     */
+    GetDuration(): number;
+    /**
+     * Client-side function that returns the end time of the interval.
+     */
+    GetEnd(): Date;
+    /**
+     * Client-side function that sets the start time of the interval.
+     * @param value A DateTime value, representing the beginning of the interval.
+     */
+    SetStart(value: Date): void;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     * @param value A TimeSpan  object, representing the duration of the time period.
+     */
+    SetDuration(value: any): void;
+    /**
+     * Client-side function that sets the end time of the interval.
+     * @param value A DateTime value, representing the end of the interval.
+     */
+    SetEnd(value: Date): void;
+    /**
+     * Determines whether the specified object is equal to the current ASPxClientTimeInterval instance.
+     * @param interval The object to compare with the current object.
+     */
+    Equals(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWith(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval. The boundaries of the time intervals are excluded from the check.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWithExcludingBounds(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Client-side function that determines whether the specified interval is contained within the current one.
+     * @param interval An ASPxClientTimeInterval object, representing the time interval to check.
+     */
+    Contains(interval: ASPxClientTimeInterval): boolean;
+}
+/**
+ * Holds action types for the client-side Refresh method.
+ */
+interface ASPxClientSchedulerRefreshAction {
+    /**
+     * Gets the value of the action parameter which initiates a simple reload of the control.
+     * Value: An integer representing the action parameter value.
+     */
+    None: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its data-dependent satellites.
+     * Value: An integer representing the action parameter value.
+     */
+    VisibleIntervalChanged: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its satellite View controls.
+     * Value: An integer representing the action parameter value.
+     */
+    ActiveViewTypeChanged: number;
+}
+/**
+ * Contains methods allowing you to perform or cancel an operation.
+ */
+interface ASPxClientAppointmentOperation {
+    /**
+     * Passes parameters to the corresponding callback function to accomplish the operation.
+     */
+    Apply(): void;
+    /**
+     * Cancels the operation.
+     */
+    Cancel(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxScheduler control.
+ */
+interface ASPxClientScheduler extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientScheduler.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the Scheduler control is about to change its active view.
+     */
+    ActiveViewChanging: ASPxClientEvent<ActiveViewChangingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event. Occurs after the active view of the ASPxScheduler has been changed.
+     */
+    ActiveViewChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user clicks an appointment.
+     */
+    AppointmentClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user double clicks on an appointment.
+     */
+    AppointmentDoubleClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the user selects an appointment.
+     */
+    AppointmentsSelectionChanged: ASPxClientEvent<AppointmentsSelectionEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the time cell selection is changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the time cell selection is about to change.
+     */
+    SelectionChanging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the  time interval of the scheduling area is changed.
+     */
+    VisibleIntervalChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when one of  More Buttons is clicked.
+     */
+    MoreButtonClicked: ASPxClientEvent<MoreButtonClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when a popup menu item is clicked.
+     */
+    MenuItemClicked: ASPxClientEvent<MenuItemClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs after an appointment has been dragged and dropped.
+     */
+    AppointmentDrop: ASPxClientEvent<AppointmentDropEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being dragged.
+     */
+    AppointmentDrag: ASPxClientEvent<AppointmentDragEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being resized.
+     */
+    AppointmentResizing: ASPxClientEvent<AppointmentResizingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when an appointment is resized.
+     */
+    AppointmentResize: ASPxClientEvent<AppointmentResizeEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that fires before an appointment is deleted.
+     */
+    AppointmentDeleting: ASPxClientEvent<ASPxClientAppointmentDeletingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side scripting  method that gets the active View.
+     */
+    GetActiveViewType(): ASPxSchedulerViewType;
+    /**
+     * Client-side scripting  method to change the ASPxScheduler's active View.
+     * @param value A ASPxSchedulerViewType enumeration value, representing a view type to set.
+     */
+    SetActiveViewType(value: ASPxSchedulerViewType): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the control will be reloaded using the specified refresh action.
+     * @param refreshAction An ASPxClientSchedulerRefreshAction enumeration value, specifying the refresh action.
+     */
+    Refresh(refreshAction: ASPxClientSchedulerRefreshAction): void;
+    /**
+     * Client-side function that returns the type of grouping applied to the appointments displayed in the scheduler.
+     */
+    GetGroupType(): ASPxSchedulerGroupType;
+    /**
+     * Client-side scripting method which raises the callback command to set the GroupType.
+     * @param value An ASPxSchedulerGroupType enumeration value, which specifies how appointments are grouped.
+     */
+    SetGroupType(value: ASPxSchedulerGroupType): void;
+    /**
+     * Client-side method that navigates the scheduler to the current system date.
+     */
+    GotoToday(): void;
+    /**
+     * Client-side scripting method which raises the GotoDate callback command.
+     * @param date A DateTime value specifying the destination time.
+     */
+    GotoDate(date: Date): void;
+    /**
+     * Client-side function which slides the visible interval one time span back.
+     */
+    NavigateBackward(): void;
+    /**
+     * Client-side function which slides the visible interval one time span forward.
+     */
+    NavigateForward(): void;
+    /**
+     * Client-side method which raises the callback command to change the ClientTimeZoneId of the scheduler.
+     * @param timeZoneId A string, a time zone identifier which is valid for the System.TimeZoneInfo.Id property.
+     */
+    ChangeTimeZoneId(timeZoneId: string): void;
+    /**
+     * Displays a Selection ToolTip on a position given by the specified coordinates.
+     * @param x An integer representing the X-coordinate.
+     * @param y An integer representing the Y-coordinate.
+     */
+    ShowSelectionToolTip(x: number, y: number): void;
+    /**
+     * Client-side function that returns the time interval, selected in the scheduler.
+     */
+    GetSelectedInterval(): ASPxClientTimeInterval;
+    /**
+     * Client-side function that returns the ResourceId of selected time cell's resource.
+     */
+    GetSelectedResource(): string;
+    /**
+     * Client-side function that returns an appointment with the specified ID.
+     * @param id An appointment's identifier.
+     */
+    GetAppointmentById(id: Object): ASPxClientAppointment;
+    /**
+     * Client-side function that returns the id's of selected appointments.
+     */
+    GetSelectedAppointmentIds(): string[];
+    /**
+     * Client-side function that removes the appointment specified by its client ID from a collection of selected appointments.
+     * @param aptId An appointment's identifier.
+     */
+    DeselectAppointmentById(aptId: Object): void;
+    /**
+     * Client-side function that selects an appointment with the specified ID.
+     * @param aptId An appointment's identifier.
+     */
+    SelectAppointmentById(aptId: Object): void;
+    /**
+     * Enables obtaining appointment property values in a client-side script. Executes the callback command with the AppointmentData identifier.
+     * @param aptId An integer, representing the appointment ID.
+     * @param propertyNames An array of strings, representing the appointment properties to query.
+     * @param onCallBack A handler of a function which will receive and process the properties' values.
+     */
+    GetAppointmentProperties(aptId: number, propertyNames: string[], onCallBack: Object): string[];
+    /**
+     * Initiates a callback to retrieve and apply the values for the specified list of properties to the specified appointment, and transfer control to the specified function.
+     * @param clientAppointment An ASPxClientAppointment object that is the client appointment for which the data is retrieved.
+     * @param propertyNames An array of strings, that are the names of appointment properties to query.
+     * @param onCallBack A handler of a function executed after a callback.
+     */
+    RefreshClientAppointmentProperties(clientAppointment: ASPxClientAppointment, propertyNames: string[], onCallBack: Object): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its client ID.
+     * @param aptClientId A string, representing the appointment client identifier.
+     */
+    ShowAppointmentFormByClientId(aptClientId: string): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its storage identifier.
+     * @param aptServerId A string, representing the appointment identifier.
+     */
+    ShowAppointmentFormByServerId(aptServerId: string): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either 'Day' or 'WorkWeek'.
+     */
+    SetTopRowTime(duration: number, viewType: ASPxSchedulerViewType): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     */
+    SetTopRowTime(duration: number): void;
+    /**
+     * Gets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either "Day" or  "WorkWeek", otherwise the result is undefined.
+     */
+    GetTopRowTime(viewType: ASPxSchedulerViewType): number;
+    /**
+     * Gets the time of day corresponding to the start of the topmost displayed time cell row.
+     */
+    GetTopRowTime(): number;
+    /**
+     * Client-side scripting method which displays the Loading Panel.
+     */
+    ShowLoadingPanel(): void;
+    /**
+     * Client-side scripting method which hides the Loading Panel from view.
+     */
+    HideLoadingPanel(): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     * @param resourceId An object representing the identifier of a resource associated with the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date, resourceId: string): void;
+    /**
+     * Client-side scripting  method to insert the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    InsertAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to update the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    UpdateAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to delete the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    DeleteAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side method that allows retrieving a collection of time intervals displayed by the ASPxScheduler.
+     */
+    GetVisibleIntervals(): ASPxClientTimeInterval[];
+    /**
+     * Changes the container that the ASPxScheduler tooltip belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangeToolTipContainer(container: Object): void;
+    /**
+     * Changes the container that the ASPxScheduler pop-up menu belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangePopupMenuContainer(container: Object): void;
+    /**
+     * Returns focus to the form if the ASPxScheduler control is not visible when the reminder fires.
+     * @param container A DIV object that is located in such a way that it is visible on the page in situations when the ASPxScheduler control is hidden.
+     */
+    ChangeFormContainer(container: Object): void;
+    /**
+     * Client-side scripting method that saves appointment modifications and closes the form.
+     */
+    AppointmentFormSave(): void;
+    /**
+     * Client-side scripting method that deletes the appointment being edited.
+     */
+    AppointmentFormDelete(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the appointment editing form.
+     */
+    AppointmentFormCancel(): void;
+    /**
+     * Client-side scripting method that navigates the scheduler to the date selected in the GotoDate form and closes the form.
+     */
+    GoToDateFormApply(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the GotoDate form.
+     */
+    GoToDateFormCancel(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormSave(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormCancel(): void;
+    /**
+     * Client-side scripting method that invokes the appointment editing form for the appointment being edited in the inplace editor.
+     */
+    InplaceEditFormShowMore(): void;
+    /**
+     * Client-side scripting method that closes the Reminder form.
+     */
+    ReminderFormCancel(): void;
+    /**
+     * Client-side scripting method that calls the Dismiss method for the selected reminder.
+     */
+    ReminderFormDismiss(): void;
+    /**
+     * Client-side scripting method that dismisses all reminders shown in the Reminder form.
+     */
+    ReminderFormDismissAll(): void;
+    /**
+     * Client-side scripting method that changes the alert time for the selected reminder to the specified interval.
+     */
+    ReminderFormSnooze(): void;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerViewType object.
+ */
+interface ASPxSchedulerViewType {
+    /**
+     * Gets a string representation equivalent of Day enumeration for use in client scripts.
+     * Value: A string "Day", indicating the DayView.
+     */
+    Day: string;
+    /**
+     * Gets a string representation equivalent of WorkWeek enumeration for use in client scripts.
+     * Value: A string "WorkWeek", indicating the WorkWeekView.
+     */
+    WorkWeek: string;
+    /**
+     * Gets a string representation equivalent of Week enumeration for use in client scripts.
+     * Value: A string "Week", indicating the WeekView.
+     */
+    Week: string;
+    /**
+     * Gets a string representation equivalent of Month enumeration for use in client scripts.
+     * Value: A string "Month", indicating the MonthView.
+     */
+    Month: string;
+    /**
+     * Gets a string representation equivalent of Timeline enumeration for use in client scripts.
+     * Value: A string "Timeline", indicating the TimelineView.
+     */
+    Timeline: string;
+    /**
+     * Gets a string representation equivalent of FullWeek enumeration for use in client scripts.
+     * Value: A string "FullWeek", indicating the FullWeekView.
+     */
+    FullWeek: string;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerGroupType enumeration.
+ */
+interface ASPxSchedulerGroupType {
+    /**
+     * Gets a string representation equivalent of None enumeration for use in client scripts.
+     * Value: A "None" string value.
+     */
+    None: string;
+    /**
+     * Gets a string representation equivalent of Date enumeration for use in client scripts.
+     * Value: A "Date" string value.
+     */
+    Date: string;
+    /**
+     * Gets a string representation equivalent of Resource enumeration for use in client scripts.
+     * Value: A "Resource" string value.
+     */
+    Resource: string;
+}
+/**
+ * Represents a client-side equivalent of the AppointmentType enumeration.
+ */
+interface ASPxAppointmentType {
+    /**
+     * Gets a string representation equivalent of Normal enumeration for use in client scripts.
+     * Value: A "Normal" string value.
+     */
+    Normal: string;
+    /**
+     * Gets a string representation equivalent of Pattern enumeration for use in client scripts.
+     * Value: A "Pattern" string value.
+     */
+    Pattern: string;
+    /**
+     * Gets a string representation equivalent of Occurrence enumeration for use in client scripts.
+     * Value: An "Occurrence" string value.
+     */
+    Occurrence: string;
+    /**
+     * Gets a string representation equivalent of ChangedOccurrence enumeration for use in client scripts.
+     * Value: A "ChangedOccurrence" string value.
+     */
+    ChangedOccurrence: string;
+    /**
+     * Gets a string representation equivalent of DeletedOccurrence enumeration for use in client scripts.
+     * Value: A "DeletedOccurrence" string value.
+     */
+    DeletedOccurrence: string;
+}
+interface ASPxClientAppointmentDeletingEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDeleting event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDeletingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDeleting event.
+ */
+interface ASPxClientAppointmentDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets client IDs of the appointments that are intended to be removed.
+     * Value: An array of client appointment identifiers, representing appointments passed for deletion.
+     */
+    appointmentIds: Object[];
+}
+interface AppointmentClickEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentClick event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A AppointmentClickEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentClickEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDoubleClick events.
+ */
+interface AppointmentClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the client appointment ID for the appointment being clicked.
+     * Value: A string, representing the client ID of the appointment.
+     */
+    appointmentId: string;
+    /**
+     * Gets the HTML element that the event was triggered on.
+     * Value: An object containing event data.
+     */
+    htmlElement: Object;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentsSelectionChanged event.
+     * @param source The ASPxScheduler control which fires the event.
+     * @param e A AppointmentsSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentsSelectionEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets identifiers of the selected appointments.
+     * Value: A comma separated list of string values, representing appointment IDs.
+     */
+    appointmentIds: string[];
+}
+/**
+ * A method that will handle the ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventHandler<S> {
+    /**
+     * A method that will handle the ActiveViewChanging event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e An ActiveViewChangingEventArgs object that contains event data
+     */
+    (source: S, e: ActiveViewChangingEventArgs): void;
+}
+/**
+ * Provides data for the client-side ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value of the ActiveView property before modification.
+     * Value: A SchedulerViewType enumeration.
+     */
+    oldView: ASPxSchedulerViewType;
+    /**
+     * Gets the new value of the ActiveView property.
+     * Value: A string, which is the SchedulerViewType enumeration value.
+     */
+    newView: ASPxSchedulerViewType;
+    /**
+     * Gets or sets whether the change of active view should be canceled.
+     * Value: true to cancel the operation; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the MoreButtonClicked event.
+ */
+interface MoreButtonClickedEventHandler<S> {
+    /**
+     * A method that will handle MoreButtonClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MoreButtonClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MoreButtonClickedEventArgs): void;
+}
+/**
+ * Provides data for the MoreButtonClicked client-side event.
+ */
+interface MoreButtonClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the Start or End values of the target appointment.
+     * Value: A DateTime value representing the target appointment's boundary.
+     */
+    targetDateTime: Date;
+    /**
+     * Gets the time interval of the cell where the button is located.
+     * Value: An ASPxClientTimeInterval object representing the time interval of the cell which holds the button.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the resource identifier associated with the cell where the button is located.
+     * Value: A string, corresponding to ResourceId.
+     */
+    resource: string;
+    /**
+     * Gets or sets whether an event is handled. If it is handled, default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the MenuItemClicked event.
+ */
+interface MenuItemClickedEventHandler<S> {
+    /**
+     * A method that will handle the MenuItemClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MenuItemClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MenuItemClickedEventArgs): void;
+}
+/**
+ * Provides data for the MenuItemClicked event.
+ */
+interface MenuItemClickedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the menu item which is clicked.
+     * Value: A string, containing the menu item name.
+     */
+    itemName: string;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+interface AppointmentDragEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientAppointmentDragEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrag event.
+ */
+interface ASPxClientAppointmentDragEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not appointments can be dropped into the intervals over which they are currently dragged.
+     * Value: true to allow dropping appointments; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current drag operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Provides information about dragged appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dragged appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+interface AppointmentDropEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientAppointmentDropEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrop event.
+ */
+interface ASPxClientAppointmentDropEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Provides information about dropped appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dropped appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+interface AppointmentResizeEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentResize event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentResizeEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResize event.
+ */
+interface ASPxClientAppointmentResizeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether default event processing is required.
+     * Value: true to process an event using only custom code; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
+interface AppointmentResizingEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientAppointmentResizingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResizing event.
+ */
+interface ASPxClientAppointmentResizingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not an appointment can be resized to the new time interval.
+     * Value: true to allow resizing the appointment; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current appointment resizing operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
+/**
+ * Stores information about an appointment drag operation.
+ */
+interface ASPxClientAppointmentDragInfo {
+    /**
+     * Gets the dragged appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources that were associated with the appointment before the drag operation.
+     * Value: A array of strings containing resource identifiers.
+     */
+    oldResources: string[];
+    /**
+     * Gets the appointment's interval after the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources associated with the appointment after the drag operation.
+     * Value: An array of strings containing resource identifiers.
+     */
+    newResources: string[];
+}
+/**
+ * Contains information about a client tooltip.
+ */
+interface ASPxClientSchedulerToolTipData {
+    /**
+     * Returns the client appointment for which the tooltip is displayed.
+     */
+    GetAppointment(): ASPxClientAppointment;
+    /**
+     * Returns the client time interval for which the tooltip is displayed.
+     */
+    GetInterval(): ASPxClientTimeInterval;
+    /**
+     * Returns the resources associated with the appointment for which the tooltip is displayed.
+     */
+    GetResources(): Object[];
+}
+/**
+ * A client-side equivalent of the ASPxSchedulerToolTipBase control.
+ */
+interface ASPxClientToolTipBase {
+    /**
+     * Returns the value that indicates whether or not the tooltip can be displayed.
+     */
+    CanShowToolTip(): boolean;
+    /**
+     * Ends updating the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    FinalizeUpdate(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Updates the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    Update(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Closes the tooltip.
+     */
+    Close(): void;
+    /**
+     * 
+     * @param bounds 
+     */
+    CalculatePosition(bounds: Object): ASPxClientPoint;
+    /**
+     * Displays the Appointment Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowAppointmentMenu(eventObject: Object): void;
+    /**
+     * Displays the View Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowViewMenu(eventObject: Object): void;
+    /**
+     * Returns the string representation of the specified interval.
+     * @param interval An ASPxClientTimeInterval object to convert.
+     */
+    ConvertIntervalToString(interval: ASPxClientTimeInterval): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpellChecker class.
+ */
+interface ASPxClientSpellChecker extends ASPxClientControl {
+    /**
+     * Client-side event that occurs before the spell check starts.
+     */
+    BeforeCheck: ASPxClientEvent<ASPxClientBeforeCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs before a message box informing about process completion is shown.
+     */
+    CheckCompleteFormShowing: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs when a spell check is finished.
+     */
+    AfterCheck: ASPxClientEvent<ASPxClientAfterCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Occurs after a word is changed in a checked text.
+     */
+    WordChanged: ASPxClientEvent<ASPxClientWordChangedEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Starts the spelling check of the text contained within the element specified by the CheckedElementID value.
+     */
+    Check(): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param element An object representing the element being checked.
+     */
+    CheckElement(element: Object): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param id A string representing the identifier of the element being checked.
+     */
+    CheckElementById(id: string): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerElement An object representing a control which contains elements being checked.
+     */
+    CheckElementsInContainer(containerElement: Object): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerId A string, specifying the control's identifier.
+     */
+    CheckElementsInContainerById(containerId: string): void;
+}
+/**
+ * Represents an object that will handle the client-side BeforeCheck event.
+ */
+interface ASPxClientBeforeCheckEventHandler<S> {
+    /**
+     * A method that will handle the BeforeCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerBeforeCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerBeforeCheckEventArgs): void;
+}
+/**
+ * Provides data for an event that occurs before a spelling check is started. Represents the client-side equivalent of the BeforeCheckEventArgs class.
+ */
+interface ASPxClientSpellCheckerBeforeCheckEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which is going to be checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+}
+/**
+ * Represents an object that will handle the client-side AfterCheck event.
+ */
+interface ASPxClientAfterCheckEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerAfterCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+/**
+ * Provides data for the client event that occurs after a spelling check is complete.
+ */
+interface ASPxClientSpellCheckerAfterCheckEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which has been checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+    /**
+     * Gets the text that has been checked.
+     * Value: A string, containing checked text.
+     */
+    checkedText: string;
+    reason: string;
+}
+/**
+ * Represents an object that will handle the client-side WordChanged event.
+ */
+interface ASPxClientWordChangedEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The event source.
+     * @param e An ASPxClientSpellCheckerAfterCheckEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+    item: ASPxClientRibbonItem;
+}
+/**
+ * A method that will handle the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventHandler<S> {
+    /**
+     * A method that will handle the DocumentChanged event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetDocumentChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetDocumentChangedEventArgs): void;
+}
+/**
+ * Provides data for the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventHandler<S> {
+    /**
+     * A method that will handle the EndSynchronization events.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetSynchronizationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSynchronizationEventArgs): void;
+}
+/**
+ * Provides data for the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e An ASPxClientSpreadsheetHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A client-side equivalent of the ASPxSpreadsheet object.
+ */
+interface ASPxClientSpreadsheet extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientSpreadsheet.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client when a selection is changed in the ASPxSpreadsheet.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientSpreadsheetSelectionChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientSpreadsheetCustomCommandExecutedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires if any change is made to the Spreadsheet's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientSpreadsheetDocumentChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a hyperlink is clicked within the Spreadsheet's document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientSpreadsheetHyperlinkClickEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Sets input focus to the Spreadsheet.
+     */
+    Focus(): void;
+    /**
+     * Gets access to the client ribbon object.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Enables you to switch the full-screen mode of the Spreadsheet.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Returns the current selection made in a Spreadsheet.
+     */
+    GetSelection(): ASPxClientSpreadsheetSelection;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Gets the value of the specified cell.
+     * @param colModelIndex An integer value specifying the cell's column index.
+     * @param rowModelIndex An integer value specifying the cell's row index.
+     */
+    GetCellValue(colModelIndex: number, rowModelIndex: number): Object;
+    /**
+     * Gets the value of the currently active cell.
+     */
+    GetActiveCellValue(): Object;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side DocumentCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side DocumentCallback event.
+     */
+    PerformDocumentCallback(parameter: string): void;
+    /**
+     * Reconnects the Spreadsheet to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientSpreadsheetSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object that determines the currently selected region within the Spreadsheet.
+     * Value: A <see cref="ASPxClientSpreadsheetSelection" /> object defining the current selection.
+     */
+    selection: ASPxClientSpreadsheetSelection;
+}
+/**
+ * Represents the selection in the Spreadsheet.
+ */
+interface ASPxClientSpreadsheetSelection {
+    /**
+     * Gets the column index of the active cell.
+     * Value: An integer value specifying the active cell column index.
+     */
+    activeCellColumnIndex: number;
+    /**
+     * Gets the row index of the active cell.
+     * Value: An integer value specifying the active cell row index.
+     */
+    activeCellRowIndex: number;
+    /**
+     * Gets the index of the selection's left column.
+     * Value: An integer value specifying the index of the left column within the selection.
+     */
+    leftColumnIndex: number;
+    /**
+     * Gets the index of the selection's top row.
+     * Value: An integer value specifying the index of the top row within the selection.
+     */
+    topRowIndex: number;
+    /**
+     * Gets the index of the selection's right column.
+     * Value: An integer value specifying the index of the right column within the selection.
+     */
+    rightColumnIndex: number;
+    /**
+     * Gets the index of the selection's bottom row.
+     * Value: An integer value specifying the index of the bottom row within the selection.
+     */
+    bottomRowIndex: number;
+}
+/**
+ * Represents the client ASPxTreeList.
+ */
+interface ASPxClientTreeList extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientTreeList.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to display a context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientTreeListContextMenuEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientTreeListCustomButtonEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before the focused node has been changed.
+     */
+    NodeFocusing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires in response to changing node focus.
+     */
+    FocusedNodeChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the selection has been changed via end-user interaction.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the callback has been processed in the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientTreeListCustomDataCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is double clicked.
+     */
+    NodeDblClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is expanded.
+     */
+    NodeExpanding: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is collapsed.
+     */
+    NodeCollapsing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs before a node is dragged by an end-user.
+     */
+    StartDragNode: ASPxClientEvent<ASPxClientTreeListStartDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a node drag and drop operation is completed.
+     */
+    EndDragNode: ASPxClientEvent<ASPxClientTreeListEndDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientTreeListColumnResizingEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientTreeListColumnResizedEventHandler<ASPxClientTreeList>>;
+    /**
+     * Sets input focus to the ASPxTreeList.
+     */
+    Focus(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Returns the focused node's key value.
+     */
+    GetFocusedNodeKey(): string;
+    /**
+     * Moves focus to the specified node.
+     * @param key A String value that uniquely identifies the node.
+     */
+    SetFocusedNodeKey(key: string): void;
+    /**
+     * Indicates whether the specified node is selected.
+     * @param nodeKey A String value that identifies the node by its key value.
+     */
+    IsNodeSelected(nodeKey: string): any;
+    /**
+     * Selects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    SelectNode(nodeKey: string): void;
+    /**
+     * Selects or deselects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     * @param state true to select the node; otherwise, false.
+     */
+    SelectNode(nodeKey: string, state: boolean): void;
+    /**
+     * Obtains key values of selected nodes that are displayed within the current page.
+     */
+    GetVisibleSelectedNodeKeys(): string[];
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param htmlElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(htmlElement: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCustomCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames A string value that contains the names of data source fields whose values within the specified node are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames The names of data source fields whose values within the specified node are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within visible nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within visible nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Selects the specified page.
+     * @param index An integer value that specifies the active page's index.
+     */
+    GoToPage(index: number): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the ASPxTreeList's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Returns the specified node's state.
+     * @param nodeKey A String value that identifies the node.
+     */
+    GetNodeState(nodeKey: string): string;
+    /**
+     * Expands all nodes.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all Node.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands the specified node preserving the collapsed state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    ExpandNode(key: string): void;
+    /**
+     * Collapses the specified node preserving the expanded state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    CollapseNode(key: string): void;
+    /**
+     * Obtains key values of nodes that are displayed within the current page.
+     */
+    GetVisibleNodeKeys(): string[];
+    /**
+     * Returns an HTML table row that represents the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    GetNodeHtmlElement(nodeKey: string): Object;
+    /**
+     * Returns the number of visible columns within the client ASPxTreeList.
+     */
+    GetVisibleColumnCount(): number;
+    /**
+     * Returns the number of columns within the client ASPxTreeList.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the column located at the specified position within the Columns collection.
+     * @param index An integer value that identifies the column within the collection (the column's Index property value).
+     */
+    GetColumnByIndex(index: number): ASPxClientTreeListColumn;
+    /**
+     * Returns the column with the specified name.
+     * @param name A string value that specifies the column's name (the column's Name property value).
+     */
+    GetColumnByName(name: string): ASPxClientTreeListColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param fieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByFieldName(fieldName: string): ASPxClientTreeListColumn;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     */
+    SortBy(nameOrFieldName: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientTreeListColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Switches the ASPxTreeList to edit mode.
+     * @param nodeKey A string value that identifies the node by its key value.
+     */
+    StartEdit(nodeKey: string): void;
+    /**
+     * Saves all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Indicates whether the ASPxTreeList is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Gets the key value of the node currently being edited.
+     */
+    GetEditingNodeKey(): string;
+    /**
+     * Moves the specified node to a new position.
+     * @param nodeKey A string value that identifies the target node by its key value.
+     * @param parentNodeKey A string value that identifies the node to whose child collection the target node is moved. An empty string to display the target node within the root.
+     */
+    MoveNode(nodeKey: string, parentNodeKey: string): void;
+    /**
+     * Deletes the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    DeleteNode(nodeKey: string): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new root node values to be edited.
+     */
+    StartEditNewNode(): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new node values to be edited.
+     * @param parentNodeKey A String value that identifies the parent node, which owns a new node.
+     */
+    StartEditNewNode(parentNodeKey: string): void;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditor(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that identifies the column by its position within the column collection.
+     */
+    GetEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditor(columnNameOrFieldName: string): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditValue(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     */
+    GetEditValue(columnIndex: number): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditValue(columnNameOrFieldName: string): Object;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientTreeListColumn, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnNameOrFieldName: string, value: Object): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param column A ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    FocusEditor(column: ASPxClientTreeListColumn): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnIndex An integer value that identifies the data column.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnNameOrFieldName A String value that specifies the column's name or field name.
+     */
+    FocusEditor(columnNameOrFieldName: string): void;
+    /**
+     * Scrolls the tree list so that the specified node becomes visible.
+     * @param nodeKey An integer value that specifies the node index within the tree list's client item list.
+     */
+    MakeNodeVisible(nodeKey: string): void;
+    /**
+     * Returns the current vertical scroll position of the tree list's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the tree list's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the tree list's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the tree list's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientTreeListColumn {
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A String value that specifies the name of a data field.
+     */
+    fieldName: string;
+}
+/**
+ * Provides data for the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the information that has been collected on the client-side and sent to the  server-side CustomDataCallback event.
+     * Value: A string value that represents the information that has been collected on the client-side and sent to the server-side CustomDataCallback event.
+     */
+    arg: string;
+    /**
+     * Gets the information passed from the server-side CustomDataCallback event.
+     * Value: An object that represents the information passed from the server-side CustomDataCallback event.
+     */
+    result: Object;
+}
+/**
+ * A method that will handle the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the CustomDataCallback event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomDataCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the NodeDblClick events.
+ */
+interface ASPxClientTreeListNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed node's key value.
+     * Value: A String value that identifies the processed node.
+     */
+    nodeKey: string;
+    /**
+     * Provides access to the parameters associated with the NodeDblClick events.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the NodeDblClick event.
+ */
+interface ASPxClientTreeListNodeEventHandler<S> {
+    /**
+     * A method that will handle the NodeDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListNodeEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Identifies which tree list element has been right-clicked.
+     * Value: A string value that identifies which tree list element ('Header' or 'Node') has been right-clicked.
+     */
+    objectType: string;
+    /**
+     * Gets a value that identifies the right-clicked object.
+     * Value: The right-clicked object's identifier.
+     */
+    objectKey: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that relates to the processed event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets whether to invoke the browser's context menu.
+     * Value: true to hide the browser's context menu; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event sender.
+     * @param e An ASPxClientTreeListContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets an array of targets where a node can be dragged.
+     * Value: An array of objects that represent targets for the dragged node.
+     */
+    targets: Object[];
+}
+/**
+ * A method that will handle the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the StartDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListStartDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListStartDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets the target element.
+     * Value: An object that represents the target element to which the dragged node has been dropped.
+     */
+    targetElement: Object;
+}
+/**
+ * A method that will handle the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the EndDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListEndDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListEndDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the key value of the node whose custom button has been clicked.
+     * Value: A string value that uniquely identifies the node whose custom button has been clicked.
+     */
+    nodeKey: string;
+    /**
+     * Gets the button's index.
+     * Value: An integer value that specifies the button's position within the CustomButtons collection.
+     */
+    buttonIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A String value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomButtonEventArgs): void;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+ */
+interface ASPxClientTreeListValuesCallback {
+    /**
+     * A JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * Provides data for the ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResizing event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResized event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizedEventArgs): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapAccordion control.
+ */
+interface BootstrapClientAccordion extends ASPxClientNavBar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButton control.
+ */
+interface BootstrapClientButton extends ASPxClientButton {
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCalendar control.
+ */
+interface BootstrapClientCalendar extends ASPxClientCalendar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCheckBox control.
+ */
+interface BootstrapClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<BootstrapClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked 
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState 
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text 
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapRadioButton control.
+ */
+interface BootstrapClientRadioButton extends BootstrapClientCheckBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapComboBox control.
+ */
+interface BootstrapClientComboBox extends ASPxClientComboBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDateEdit control.
+ */
+interface BootstrapClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDropDownEdit control.
+ */
+interface BootstrapClientDropDownEdit extends ASPxClientDropDownEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapFormLayout control.
+ */
+interface BootstrapClientFormLayout extends ASPxClientFormLayout {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapGridView control.
+ */
+interface BootstrapClientGridView extends ASPxClientGridView {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapHyperLink control.
+ */
+interface BootstrapClientHyperLink extends ASPxClientHyperLink {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapListBox control.
+ */
+interface BootstrapClientListBox extends ASPxClientListBox {
+}
+interface BootstrapClientCheckBoxList extends ASPxClientCheckBoxList {
+}
+interface BootstrapClientRadioButtonList extends ASPxClientRadioButtonList {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMenu control.
+ */
+interface BootstrapClientMenu extends ASPxClientMenu {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupControl control.
+ */
+interface BootstrapClientPopupControl extends ASPxClientPopupControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupMenu control.
+ */
+interface BootstrapClientPopupMenu extends ASPxClientPopupMenu {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapProgressBar control.
+ */
+interface BootstrapClientProgressBar extends ASPxClientProgressBar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapSpinEdit control.
+ */
+interface BootstrapClientSpinEdit extends ASPxClientSpinEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTabControl control.
+ */
+interface BootstrapClientTabControl extends ASPxClientTabControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPageControl control.
+ */
+interface BootstrapClientPageControl extends ASPxClientPageControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTextBox control.
+ */
+interface BootstrapClientTextBox extends ASPxClientTextBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMemo control.
+ */
+interface BootstrapClientMemo extends ASPxClientMemo {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButtonEdit control.
+ */
+interface BootstrapClientButtonEdit extends ASPxClientButtonEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTreeView control.
+ */
+interface BootstrapClientTreeView extends ASPxClientTreeView {
+}
+/**
+ * A client-side counterpart of the Calendar and CalendarFor extensions.
+ */
+interface MVCxClientCalendar extends ASPxClientCalendar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCalendar>>;
+}
+/**
+ * A client-side counterpart of the CallbackPanel extension.
+ */
+interface MVCxClientCallbackPanel extends ASPxClientCallbackPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCallbackPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the CardView extension.
+ */
+interface MVCxClientCardView extends ASPxClientCardView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCardView>>;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the CardView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the CardView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the Chart extension.
+ */
+interface MVCxClientChart extends ASPxClientWebChartControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientChart>>;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ComboBox and ComboBoxFor extensions.
+ */
+interface MVCxClientComboBox extends ASPxClientComboBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientComboBox>>;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the DataView extension.
+ */
+interface MVCxClientDataView extends ASPxClientDataView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDataView>>;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DateEdit extension.
+ */
+interface MVCxClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * A client-side counterpart of the DockManager extension.
+ */
+interface MVCxClientDockManager extends ASPxClientDockManager {
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DockPanel extension.
+ */
+interface MVCxClientDockPanel extends ASPxClientDockPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDockPanel>>;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the FileManager extension.
+ */
+interface MVCxClientFileManager extends ASPxClientFileManager {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientFileManager>>;
+    /**
+     * Sends a callback with a parameter to update the FileManager by processing the passed information on the server, in an Action specified via the extension's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the file manager's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param data A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the GridView extension.
+ */
+interface MVCxClientGridView extends ASPxClientGridView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientGridView>>;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the GridView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the GridView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the HtmlEditor extension.
+ */
+interface MVCxClientHtmlEditor extends ASPxClientHtmlEditor {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientHtmlEditor>>;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformDataCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback An ASPxClientDataCallback object that is the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(data: Object, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * A client-side counterpart of the ImageGallery extension.
+ */
+interface MVCxClientImageGallery extends ASPxClientImageGallery {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientImageGallery>>;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ListBox and ListBoxFor extensions.
+ */
+interface MVCxClientListBox extends ASPxClientListBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientListBox>>;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the NavBar extension.
+ */
+interface MVCxClientNavBar extends ASPxClientNavBar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientNavBar>>;
+}
+/**
+ * A client-side counterpart of the PivotGrid extension.
+ */
+interface MVCxClientPivotGrid extends ASPxClientPivotGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPivotGrid>>;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Passes PivotGrid callback parameters to the specified object.
+     * @param obj An object that receives PivotGrid callback parameters.
+     */
+    FillStateObject(obj: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PopupControl extension.
+ */
+interface MVCxClientPopupControl extends ASPxClientPopupControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPopupControl>>;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameters to update the popup window by processing the related popup window and the passed information on the server, in an Action specified by the PopupControl's CallbackRouteValues property.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, data: Object): void;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side equivalent of the MVCxDocumentViewer class.
+ */
+interface MVCxClientDocumentViewer extends ASPxClientDocumentViewer {
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientDocumentViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDocumentViewer>>;
+}
+/**
+ * Obsolete. Use the MVCxClientDocumentViewer class instead.
+ */
+interface MVCxClientReportViewer extends ASPxClientReportViewer {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportViewer>>;
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientReportViewer>>;
+}
+/**
+ * A method that will handle the BeforeExportRequest event.
+ */
+interface MVCxClientBeforeExportRequestEventHandler<S> {
+    /**
+     * A method that will handle the BeforeExportRequest event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeforeExportRequestEventArgs): void;
+}
+/**
+ * Provides data for client BeforeExportRequest events.
+ */
+interface MVCxClientBeforeExportRequestEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A client-side equivalent of the MVCxReportDesigner class.
+ */
+interface MVCxClientReportDesigner extends ASPxClientReportDesigner {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Occurs after executing the Save command on the client.
+     */
+    SaveCommandExecuted: ASPxClientEvent<MVCxClientReportDesignerSaveCommandExecutedEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A Object value, specifying the callback argument.
+     */
+    PerformCallback(arg: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecuted event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientReportDesignerSaveCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the operation result.
+     * Value: A String value, specifying the operation result.
+     */
+    Result: string;
+}
+/**
+ * A client-side counterpart of the RichEdit extension.
+ */
+interface MVCxClientRichEdit extends ASPxClientRichEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRichEdit>>;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the RoundPanel extension.
+ */
+interface MVCxClientRoundPanel extends ASPxClientRoundPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRoundPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the Scheduler extension.
+ */
+interface MVCxClientScheduler extends ASPxClientScheduler {
+    ToolTipDisplaying: ASPxClientEvent<MVCxClientSchedulerToolTipDisplayingEventHandler<MVCxClientScheduler>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientScheduler>>;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A template that is rendered to display a tooltip.
+ */
+interface MVCxClientSchedulerTemplateToolTip extends ASPxClientToolTipBase {
+    type: MVCxSchedulerToolTipType;
+}
+/**
+ * A delegate method that enables you to adjust the tooltip content before displaying.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventHandler<S> {
+    /**
+     * A method that will handle the ToolTipDisplaying event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientSchedulerToolTipDisplayingEventArgs object that contains the related arguments.
+     */
+    (source: S, e: MVCxClientSchedulerToolTipDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ToolTipDisplaying event.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventArgs extends ASPxClientEventArgs {
+    toolTip: MVCxClientSchedulerTemplateToolTip;
+    data: ASPxClientSchedulerToolTipData;
+}
+/**
+ * Lists available tooltip types.
+ */
+interface MVCxSchedulerToolTipType {
+}
+/**
+ * A client-side counterpart of the Spreadsheet extension.
+ */
+interface MVCxClientSpreadsheet extends ASPxClientSpreadsheet {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientSpreadsheet>>;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PageControl extension.
+ */
+interface MVCxClientPageControl extends ASPxClientPageControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPageControl>>;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the TokenBox and TokenBoxFor extensions.
+ */
+interface MVCxClientTokenBox extends ASPxClientTokenBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTokenBox>>;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the TreeList extension.
+ */
+interface MVCxClientTreeList extends ASPxClientTreeList {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeList>>;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the TreeList's CustomDataCallback event. This method does not update the TreeList.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformCustomDataCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+}
+/**
+ * A client-side counterpart of the TreeView extension.
+ */
+interface MVCxClientTreeView extends ASPxClientTreeView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeView>>;
+}
+/**
+ * A client-side counterpart of the UploadControl extension.
+ */
+interface MVCxClientUploadControl extends ASPxClientUploadControl {
+}
+/**
+ * A method that will handle client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientGlobalBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventArgs extends ASPxClientGlobalBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * An ASP.NET MVC equivalent of the client ASPxClientGlobalEvents component.
+ */
+interface MVCxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress MVC extensions contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientGlobalBeginCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a DevExpress MVC extension.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<MVCxClientGlobalEvents>>;
+}
+/**
+ * A client-side counterpart of the VerticalGrid extension.
+ */
+interface MVCxClientVerticalGrid extends ASPxClientVerticalGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientVerticalGrid>>;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the VerticalGrid's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the VerticalGrid.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * 
+     * @param args 
+     * @param onSuccess 
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+}
+/**
+ * A client-side equivalent of the MVCxWebDocumentViewer class.
+ */
+interface MVCxClientWebDocumentViewer extends ASPxClientWebDocumentViewer {
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControlBase {
+    /**
+     * Gets the unique, hierarchically-qualified identifier for the control.
+     * Value: The fully-qualified identifier for the control.
+     */
+    name: string;
+    /**
+     * Occurs on the client side after the control has been initialized.
+     */
+    Init: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlBase>>;
+    /**
+     * Returns an HTML element that is the root of the control's hierarchy.
+     */
+    GetMainElement(): Object;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetClientVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible 
+     */
+    SetClientVisible(visible: boolean): void;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible true to make a control visible; false to make it hidden.
+     */
+    SetVisible(visible: boolean): void;
+    /**
+     * Returns a value that determines whether a callback request sent by a web control is being currently processed on the server side.
+     */
+    InCallback(): boolean;
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControl extends ASPxClientControlBase {
+    /**
+     * Returns the control's width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the control's height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the control's width.
+     * @param width An integer value that specifies the control's width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the control's height.   Note that this method is not in effect for some controls.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Modifies the control's size against the control's container.
+     */
+    AdjustControl(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallback control.
+ */
+interface ASPxClientCallback extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallback.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client side when a callback initiated by the client Callback event's handler returns back to the client.
+     */
+    CallbackComplete: ASPxClientEvent<ASPxClientCallbackCompleteEventHandler<ASPxClientCallback>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    SendCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the client events related to completion of callback server-side processing.
+ */
+interface ASPxClientCallbackCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client events related to completion of callback server-side processing.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCallbackCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackCompleteEventArgs): void;
+}
+/**
+ * Serves as the base class for arguments of the web controls' client-side events.
+ */
+interface ASPxClientEventArgs {
+}
+/**
+ * Provides data for events concerning the final processing of a callback.
+ */
+interface ASPxClientCallbackCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) passed from the client side for server-side processing.
+     * Value: A string value representing specific information passed from the client to the server side.
+     */
+    parameter: string;
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * Serves as the base class for controls that implement panel functionality.
+ */
+interface ASPxClientPanelBase extends ASPxClientControl {
+    /**
+     * Returns the HTML code that is the content of the panel.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML content for the panel.
+     * @param html A string value that is the HTML code defining the content of the panel.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the panel is enabled.
+     * @param enabled true to enable the panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxPanel control.
+ */
+interface ASPxClientPanel extends ASPxClientPanelBase {
+    /**
+     * Occurs when the expanded panel is closed.
+     */
+    Collapsed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Occurs when an end-user opens the expand panel.
+     */
+    Expanded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Expands or collapses the client panel.
+     */
+    Toggle(): void;
+    /**
+     * Returns a value specifying whether the panel can be expanded.
+     */
+    IsExpandable(): boolean;
+    /**
+     * Returns a value specifying whether the panel is expanded.
+     */
+    IsExpanded(): boolean;
+    /**
+     * Expands the collapsed panel.
+     */
+    Expand(): void;
+    /**
+     * Collapses the expanded panel.
+     */
+    Collapse(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallbackPanel control.
+ */
+interface ASPxClientCallbackPanel extends ASPxClientPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallbackPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the control's loading panel.
+     */
+    GetLoadingPanelText(): string;
+    /**
+     * Sets the text to be displayed within the control's loading panel.
+     * @param loadingPanelText A string value specifying the text to be displayed within the loading panel.
+     */
+    SetLoadingPanelText(loadingPanelText: string): void;
+    /**
+     * Sets a value specifying whether the callback panel is enabled.
+     * @param enabled true, to enable the callback panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a callback panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents the event object used for client-side events.
+ */
+interface ASPxClientEvent<T> {
+    /**
+     * Dynamically connects the event with an appropriate event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    AddHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from the associated event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    RemoveHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from all the associated event handler functions.
+     */
+    ClearHandlers(): void;
+    /**
+     * For internal use only.
+     * @param source 
+     * @param e 
+     */
+    FireEvent(source: Object, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the client-side events of a web control's client-side equivalent.
+ */
+interface ASPxClientEventHandler<S> {
+    /**
+     * A method that will handle the client-side events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the control that raised the event.
+     * @param e An ASPxClientEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the cancelable events of a web control's client-side equivalent.
+ */
+interface ASPxClientCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCancelEventArgs): void;
+}
+/**
+ * Provides data for cancelable client events.
+ */
+interface ASPxClientCancelEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents a JavaScript function which receives callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+ */
+interface ASPxClientDataCallback {
+    /**
+     * A JavaScript function which receives a callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+     * @param sender An object whose client method generated a callback.
+     * @param result A string value that represents the result of server-side callback processing.
+     */
+    (sender: Object, result: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCloudControl control.
+ */
+interface ASPxClientCloudControl extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientCloudControlItemEventHandler<ASPxClientCloudControl>>;
+}
+/**
+ * A method that will handle client events involving manipulations with the control's items.
+ */
+interface ASPxClientCloudControlItemEventHandler<S> {
+    /**
+     * A method that will handle client events concerning manipulations with items.
+     * @param source The event source. This parameter identifies the cloud control object which raised the event.
+     * @param e An ASPxClientCloudControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCloudControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which involve clicking on the control's items.
+ */
+interface ASPxClientCloudControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the client events related to the begining of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the beginning of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command name that identifies which client action forced a callback to be occurred.
+     * Value: A string value that represents the name of the command which initiated a callback.
+     */
+    command: string;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle client EndCallback events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle the EndCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventArgs extends ASPxClientEndCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle a CustomCallback client event exposed by some DevExpress web controls.
+ */
+interface ASPxClientCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the client CustomCallback event of some controls.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientCustomDataCallbackEventHandler object that contains event data.
+     */
+    (source: S, e: ASPxClientCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the CustomCallback event.
+ */
+interface ASPxClientCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing, related to the CustomCallback event.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * A method that will handle client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle client CallbackError events.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientCallbackErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error message that describes the server error that occurred.
+     * Value: A string value that represents the error message.
+     */
+    message: string;
+    /**
+     * Gets or sets whether the event is handled and the default error handling actions are not required.
+     * Value: true if the error is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle the CallbackError event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventArgs extends ASPxClientCallbackErrorEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the ValidationCompleted client event.
+ */
+interface ASPxClientValidationCompletedEventHandler<S> {
+    /**
+     * A method that will handle the ValidationCompleted event.
+     * @param source An object representing the event source. Identifies the ASPxClientGlobalEvents object that raised the event.
+     * @param e An ASPxClientValidationCompletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationCompletedEventArgs): void;
+}
+/**
+ * Provides data for the ValidationCompleted client event that allows you to centrally validate user input within all DevExpress web controls to which validation is applied.
+ */
+interface ASPxClientValidationCompletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a container object that holds the validated control(s).
+     * Value: An object that represents a container of the validated control(s).
+     */
+    container: Object;
+    /**
+     * Gets the name of the validation group name to which validation has been applied.
+     * Value: A string value that represents the name of the validation group that has been validated.
+     */
+    validationGroup: string;
+    /**
+     * Gets a value that indicates whether validation has been applied to both visible and invisible controls.
+     * Value: true if validation has been applied to both visible and invisible controls; false if only visible controls have been validated.
+     */
+    invisibleControlsValidated: boolean;
+    /**
+     * Gets a value specifying whether the validation has been completed successfully.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the first control (either visible or invisible) that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first invalid control.
+     */
+    firstInvalidControl: ASPxClientControl;
+    /**
+     * Gets the first visible control that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first visible invalid control.
+     */
+    firstVisibleInvalidControl: ASPxClientControl;
+}
+/**
+ * A method that will handle the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client ControlsInitialized event.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientControlsInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientControlsInitializedEventArgs): void;
+}
+/**
+ * Provides data for the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value that specifies whether a callback is sent during a controls initialization.
+     * Value: true if a callback is sent; otherwise, false.
+     */
+    isCallback: boolean;
+}
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
+interface ASPxClientControlPredicate {
+    /**
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param control An object to compare against the criteria defined within the method.
+     */
+    (control: Object): boolean;
+}
+/**
+ * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+ */
+interface ASPxClientControlAction {
+    /**
+     * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+     * @param control An object that specifies a control.
+     */
+    (control: Object): void;
+}
+/**
+ * A collection object used on the client side to maintain particular client control objects
+ */
+interface ASPxClientControlCollection {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any DevExpress web control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Returns a collection item identified by its unique hierarchically-qualified identifier.
+     * @param name A string value representing the hierarchically-qualified identifier of the required control.
+     */
+    Get(name: Object): Object;
+    /**
+     * Returns a DevExpress client control object identified by its unique hierarchically-qualified identifier (either ClientInstanceName or ClientID property value).
+     * @param name A string value that is the hierarchically-qualified identifier of the required DevExpress control.
+     */
+    GetByName(name: string): Object;
+    /**
+     * Returns all controls in the collection that satisfy the specified predicate.
+     * @param predicate An ASPxClientControlPredicate object that is a predicate used to search for controls in the collection.
+     */
+    GetControlsByPredicate(predicate: ASPxClientControlPredicate): Object[];
+    /**
+     * Returns all controls of the specified type.
+     * @param type The object specifying the client control type.
+     */
+    GetControlsByType(type: Object): Object[];
+    /**
+     * Performs the specified action for each control in the collection.
+     * @param action An ASPxClientControlAction object specifying an action to perform.
+     */
+    ForEachControl(action: ASPxClientControlAction): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxDataView object.
+ */
+interface ASPxClientDataView extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDataView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDataView>>;
+    /**
+     * Activates the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page that is currently active.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the size of a single ASPxDataView's page.
+     */
+    GetPageSize(): number;
+    /**
+     * Sets the size of a single ASPxDataView's page.
+     * @param pageSize An integer value that specifies the page size.
+     */
+    SetPageSize(pageSize: number): void;
+    /**
+     * Gets the number of pages into which the ASPxDataView's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the first page.
+     */
+    FirstPage(): void;
+    /**
+     * Activates the last page.
+     */
+    LastPage(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
+interface ASPxClientDockingFilterPredicate {
+    /**
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param item An object to compare against the criteria defined within the method.
+     */
+    (item: Object): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockManager   object.
+ */
+interface ASPxClientDockManager extends ASPxClientControl {
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side before a panel is closed, and allows you to cancel the action.
+     */
+    PanelClosing: ASPxClientEvent<ASPxClientDockManagerCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel is closed.
+     */
+    PanelCloseUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel pops up.
+     */
+    PanelPopUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been invoked.
+     */
+    PanelShown: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been resized.
+     */
+    PanelResize: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns a zone specified by its unique identifier (zoneUID).
+     * @param zoneUID A string value specifying the unique identifier of the zone.
+     */
+    GetZoneByUID(zoneUID: string): ASPxClientDockZone;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels contained in a page.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+    /**
+     * Returns an array of zones contained in a page.
+     */
+    GetZones(): ASPxClientDockZone[];
+    /**
+     * Returns an array of zones that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a zone meets those criteria.
+     */
+    GetZones(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockZone[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle client-side events concerning manipulations with panels.
+ */
+interface ASPxClientDockManagerEventHandler<S> {
+    /**
+     * A method that will handle client-side events concerning manipulations with panels.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on panels.
+ */
+interface ASPxClientDockManagerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventHandler<S> {
+    /**
+     * A method that will handle the PanelClosing event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Serves as a base class for the ASPxClientPopupControl classes.
+ */
+interface ASPxClientPopupControlBase extends ASPxClientControl {
+    /**
+     * Occurs on the client side when window resizing initiates.
+     */
+    BeforeResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when window resizing completes.
+     */
+    AfterResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window closes or hides.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientPopupWindowCloseUpEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Enables you to cancel window closing on the client side.
+     */
+    Closing: ASPxClientEvent<ASPxClientPopupWindowCancelEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window is invoked.
+     */
+    PopUp: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a window has been resized.
+     */
+    Resize: ASPxClientEvent<ASPxClientPopupWindowResizeEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a control's window has been invoked.
+     */
+    Shown: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when the window pin state is changed.
+     */
+    PinnedChanged: ASPxClientEvent<ASPxClientPopupWindowPinnedChangedEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Modifies a control's window size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Brings the window to the front of the z-order.
+     */
+    BringToFront(): void;
+    /**
+     * Returns a value indicating whether the window is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Returns the HTML code that specifies the contents of the control's window.
+     */
+    GetContentHtml(): string;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrameWindow(): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's window.
+     */
+    GetContentUrl(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer by default.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Gets the width of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentWidth(): number;
+    /**
+     * Gets the height of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentHeight(): number;
+    /**
+     * Returns a value indicating whether the window is maximized.
+     */
+    GetMaximized(): boolean;
+    /**
+     * Returns a value indicating whether the window is pinned.
+     */
+    GetPinned(): boolean;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's window.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Sets a value indicating whether the window is collapsed.
+     * @param value true, to collapse the window; otherwise, false.
+     */
+    SetCollapsed(value: boolean): void;
+    /**
+     * Sets the HTML markup specifying the contents of the control's window.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets the URL to point to the web page that should be loaded into, and displayed within the control's window.
+     * @param url A string value specifying the URL to the web page displayed within the control's window.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer by default.
+     * @param value A string value that is the URL for the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's footer.
+     * @param value A string value that specifies a window's footer text.
+     */
+    SetFooterText(value: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's header.
+     * @param value A string value that specifies a window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Sets a value indicating whether the window is maximized.
+     * @param value true. to maximize the window; otherwise, false.
+     */
+    SetMaximized(value: boolean): void;
+    /**
+     * Sets a value indicating whether the window is pinned.
+     * @param value true, to pin the window; otherwise, false.
+     */
+    SetPinned(value: boolean): void;
+    /**
+     * Invokes the control's window.
+     */
+    Show(): void;
+    /**
+     * Invokes the control's window at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the control's window and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the control's window and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the control's window at the specified position.
+     * @param x A integer value specifying the x-coordinate of the window's display position.
+     * @param y A integer value specifying the y-coordinate of the window's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Closes the control's window.
+     */
+    Hide(): void;
+    /**
+     * Returns a value that specifies whether the control's window is displayed.
+     */
+    IsVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockPanel object.
+ */
+interface ASPxClientDockPanel extends ASPxClientPopupControlBase {
+    /**
+     * Gets or sets the unique identifier of a panel on a page.
+     * Value: A string that is the unique identifier of a panel.
+     */
+    panelUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Retrieves a zone that owns the current panel.
+     */
+    GetOwnerZone(): ASPxClientDockZone;
+    /**
+     * Docks the current panel in the specified zone.
+     * @param zone An ASPxClientDockZone object specifying the zone.
+     */
+    Dock(zone: ASPxClientDockZone): void;
+    /**
+     * Docks the current panel in a zone at the specified position.
+     * @param zone An ASPxClientDockZone object specifying the zone, where the panel is docked
+     * @param visibleIndex An integer value specifying the visible index position.
+     */
+    Dock(zone: ASPxClientDockZone, visibleIndex: number): void;
+    /**
+     * Undocks the current panel.
+     */
+    MakeFloat(): void;
+    /**
+     * Undocks the current panel and place it at the specified position.
+     * @param x An integer value that specifies the X-coordinate of the panel's display position.
+     * @param y An integer value that specifies the Y-coordinate of the panel's display position.
+     */
+    MakeFloat(x: number, y: number): void;
+    /**
+     * Gets or sets a value specifying the position of the current panel, amongst the visible panels within a zone.
+     */
+    GetVisibleIndex(): number;
+    /**
+     * Sets a value specifying the position of the current panel, amongst the visible panels in a zone.
+     * @param visibleIndex An integer value specifying the zero-based index of the panel amongst visible panels in the zone.
+     */
+    SetVisibleIndex(visibleIndex: number): void;
+    /**
+     * Returns a value indicating whether the panel is docked.
+     */
+    IsDocked(): boolean;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterFloat event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterFloat event.
+ */
+interface ASPxClientDockPanelProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A client-side equivalent of the ASPxDockZone object.
+ */
+interface ASPxClientDockZone extends ASPxClientControl {
+    /**
+     * Gets or sets the unique identifier of a zone on a page.
+     * Value: A string that is the unique identifier of a zone.
+     */
+    zoneUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockZoneCancelEventHandler<ASPxClientDockZone>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockZoneProcessingModeEventHandler<ASPxClientDockZone>>;
+    /**
+     * Returns a value that indicates the orientation in which panels are stacked in the current zone.
+     */
+    IsVertical(): boolean;
+    /**
+     * Gets a value that indicates whether the zone can enlarge its size.
+     */
+    GetAllowGrowing(): boolean;
+    /**
+     * Gets the number of panels contained in the zone.
+     */
+    GetPanelCount(): number;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns a panel specified by its visible index.
+     * @param visibleIndex An integer value specifying the panel's position among the visible panels within the current zone.
+     */
+    GetPanelByVisibleIndex(visibleIndex: number): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels docked in the current zone.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are docked in the current zone and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e A ASPxClientDockZoneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e An  ASPxClientDockZoneProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Represents the client-side equivalent of the ASPxFileManager control.
+ */
+interface ASPxClientFileManager extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFileManager.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the selected file has been changed.
+     */
+    SelectedFileChanged: ASPxClientEvent<ASPxClientFileManagerFileEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when an end-user opens a file by double-clicking it or pressing the Enter key.
+     */
+    SelectedFileOpened: ASPxClientEvent<ASPxClientFileManagerFileOpenedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the focused item has been changed.
+     */
+    FocusedItemChanged: ASPxClientEvent<ASPxClientFileManagerFocusedItemChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientFileManagerSelectionChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the current folder has been changed within a file manager.
+     */
+    CurrentFolderChanged: ASPxClientEvent<ASPxClientFileManagerCurrentFolderChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the folder is created, and allows you to cancel the action.
+     */
+    FolderCreating: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a folder has been created.
+     */
+    FolderCreated: ASPxClientEvent<ASPxClientFileManagerItemCreatedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is renamed and allows you to cancel the action.
+     */
+    ItemRenaming: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been renamed.
+     */
+    ItemRenamed: ASPxClientEvent<ASPxClientFileManagerItemRenamedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is deleted and allows you to cancel the action.
+     */
+    ItemDeleting: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been deleted.
+     */
+    ItemDeleted: ASPxClientEvent<ASPxClientFileManagerItemDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been deleted.
+     */
+    ItemsDeleted: ASPxClientEvent<ASPxClientFileManagerItemsDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is moved and allows you to cancel the action.
+     */
+    ItemMoving: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been moved.
+     */
+    ItemMoved: ASPxClientEvent<ASPxClientFileManagerItemMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been moved .
+     */
+    ItemsMoved: ASPxClientEvent<ASPxClientFileManagerItemsMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is copied and allows you to cancel the action.
+     */
+    ItemCopying: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager item has been copied.
+     */
+    ItemCopied: ASPxClientEvent<ASPxClientFileManagerItemCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been copied.
+     */
+    ItemsCopied: ASPxClientEvent<ASPxClientFileManagerItemsCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any error occurs while editing an item.
+     */
+    ErrorOccurred: ASPxClientEvent<ASPxClientFileManagerErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to display the alert with the result error description.
+     */
+    ErrorAlertDisplaying: ASPxClientEvent<ASPxClientFileManagerErrorAlertDisplayingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires when a custom item is clicked, allowing you to perform custom actions.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientFileManagerCustomCommandEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when the file manager updates the state of toolbar or context menu items.
+     */
+    ToolbarUpdating: ASPxClientEvent<ASPxClientFileManagerToolbarUpdatingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to highlight the search text, which is specified using the filter box, in templates.
+     */
+    HighlightItemTemplate: ASPxClientEvent<ASPxClientFileManagerHighlightItemTemplateEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file upload starts, and allows you to cancel the action.
+     */
+    FileUploading: ASPxClientEvent<ASPxClientFileManagerFileUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the selected items are uploaded and allows you to cancel the action.
+     */
+    FilesUploading: ASPxClientEvent<ASPxClientFileManagerFilesUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file has been uploaded.
+     */
+    FileUploaded: ASPxClientEvent<ASPxClientFileManagerFileUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after upload of all selected files has been completed.
+     */
+    FilesUploaded: ASPxClientEvent<ASPxClientFileManagerFilesUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file download starts, and allows you to cancel the action.
+     */
+    FileDownloading: ASPxClientEvent<ASPxClientFileManagerFileDownloadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Gets the name of the currently active file manager area.
+     */
+    GetActiveAreaName(): string;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     */
+    ExecuteCommand(commandName: string): boolean;
+    /**
+     * Returns the selected file within the ASPxFileManager control's file container.
+     */
+    GetSelectedFile(): ASPxClientFileManagerFile;
+    /**
+     * Returns an array of the file manager's selected items.
+     */
+    GetSelectedItems(): ASPxClientFileManagerFile[];
+    /**
+     * Returns a list of files that are loaded on the current page.
+     */
+    GetItems(): ASPxClientFileManagerFile[];
+    /**
+     * Sends a callback to the server and returns a list of files that are contained within the current folder.
+     * @param onCallback A  object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetAllItems(onCallback: ASPxClientFileManagerAllItemsCallback): void;
+    /**
+     * Returns a toolbar item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetToolbarItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Returns a context menu item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetContextMenuItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Gets the current folder's path.
+     */
+    GetCurrentFolderPath(): string;
+    /**
+     * Gets the current folder's path with the specified separator.
+     * @param separator A string value that specifies the separator between the folder's name within a path.
+     */
+    GetCurrentFolderPath(separator: string): string;
+    /**
+     * Gets the current folder's path with the specified settings.
+     * @param separator A string value that specifies the separator between the folder's name within the path.
+     * @param skipRootFolder true to skip the root folder; otherwise, false.
+     */
+    GetCurrentFolderPath(separator: string, skipRootFolder: boolean): string;
+    /**
+     * Sets the current folder's path.
+     * @param path A String value that is the relative path to the folder (without the root folder).
+     * @param onCallback A ASPxClientFileManagerCallback object that is the JavaScript function that receives the callback data as a parameter.
+     */
+    SetCurrentFolderPath(path: string, onCallback: ASPxClientFileManagerCallback): void;
+    /**
+     * Gets the current folder's ID.
+     */
+    GetCurrentFolderId(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which receives callback data obtained via a call to the client SetCurrentFolderPath method.
+ */
+interface ASPxClientFileManagerCallback {
+    /**
+     * A JavaScript function that receives callback data obtained via a call to the SetCurrentFolderPath method.
+     * @param result An object that contains a callback data.
+     */
+    (result: Object): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerItem object and serves as a base class for client file and folder objects.
+ */
+interface ASPxClientFileManagerItem {
+    /**
+     * Gets the name of the current item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the item's unique identifier.
+     * Value: A String value that specifies the item's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets a value that indicates if the current file manager item is a folder.
+     * Value: true if the current item is a folder or parent folder; false if the current item is a file.
+     */
+    isFolder: boolean;
+    /**
+     * Specifies whether the file manager item is selected.
+     * @param selected true, to select the item; otherwise, false.
+     */
+    SetSelected(selected: boolean): void;
+    /**
+     * Gets a value indicating whether the item is selected in the file manager.
+     */
+    IsSelected(): boolean;
+    /**
+     * Gets the current item's full name.
+     */
+    GetFullName(): string;
+    /**
+     * Gets the current item's full name with the specified separator.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     */
+    GetFullName(separator: string): string;
+    /**
+     * Gets the current item's full name with the specified settings.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     * @param skipRootFolder true, to skip the root folder; otherwise, false.
+     */
+    GetFullName(separator: string, skipRootFolder: boolean): string;
+}
+/**
+ * Represents the client-side equivalent of the FileManagerFile object.
+ */
+interface ASPxClientFileManagerFile extends ASPxClientFileManagerItem {
+    /**
+     * Downloads a file from a file manager.
+     */
+    Download(): void;
+}
+/**
+ * A client-side equivalent of the FileManagerFolder object.
+ */
+interface ASPxClientFileManagerFolder extends ASPxClientFileManagerItem {
+    /**
+     * Gets a value specifying whether an item is a parent folder.
+     * Value: true if an item is a parent folder; false if an item is a file or folder.
+     */
+    isParentFolder: boolean;
+}
+/**
+ * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+ */
+interface ASPxClientFileManagerAllItemsCallback {
+    /**
+     * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+     * @param items An array of ASPxClientFileManagerItem objects that are items contained in the current folder.
+     */
+    (items: ASPxClientFileManagerItem[]): void;
+}
+/**
+ * A method that will handle the client SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened events.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerFileEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a file related to the event.
+     * Value: An ASPxClientFileManagerFile object that represents a file currently being processed.
+     */
+    file: ASPxClientFileManagerFile;
+}
+/**
+ * A method that will handle the client SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened event.
+     * @param source The event source. This parameter identifies the file manager object which raised the event.
+     * @param e An ASPxClientFileManagerFileOpenedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileOpenedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * Serves as a base for classes that are used as arguments for events generated on the client side.
+ */
+interface ASPxClientFileManagerActionEventArgsBase extends ASPxClientEventArgs {
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+    /**
+     * Gets the name of the currently processed item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets a value specifying whether the current processed item is a folder.
+     * Value: true if the processed  item is a folder; false if the processed item is a file.
+     */
+    isFolder: boolean;
+}
+/**
+ * A method that will handle the client ItemRenaming events.
+ */
+interface ASPxClientFileManagerItemEditingEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenaming events.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemEditingEventArgs): void;
+}
+/**
+ * Provides data for the item editing event.
+ */
+interface ASPxClientFileManagerItemEditingEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenamed event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemRenamedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemRenamedEventArgs): void;
+}
+/**
+ * Provides data for the ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the previous name of the renamed item.
+     * Value: A  string value that specifies the item name.
+     */
+    oldName: string;
+}
+/**
+ * A method that will handle the client ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+}
+/**
+ * A method that will handle the client ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventHandler<S> {
+    /**
+     * A method that will handle the FolderCreated event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCreatedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCreatedEventArgs): void;
+}
+/**
+ * Provides data for the FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventHandler<S> {
+    /**
+     * A method that will handle the client ErrorOccurred event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorEventArgs): void;
+}
+/**
+ * Provides data for the ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the error description.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an event error message is sent to the ErrorAlertDisplaying event.
+     * Value: true to sent an error message; otherwise, false.
+     */
+    showAlert: boolean;
+    /**
+     * Gets a specifically generated code that uniquely identifies an error, which occurs while editing an item.
+     * Value: An integer value that specifies the code uniquely identifying an error.
+     */
+    errorCode: number;
+}
+/**
+ * A method that will handle the client ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventHandler<S> {
+    /**
+     * A method that will handle the ErrorAlertDisplaying event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerErrorAlertDisplayingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorAlertDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the errors description.
+     * Value: A string that is the errors description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an alert message is displayed when the event fires.
+     * Value: true to display an alert message; otherwise, false.
+     */
+    showAlert: boolean;
+}
+/**
+ * A method that will handle the client FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FileUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is being uploaded.
+     * Value: A string value specifying the path where a file is being uploaded.
+     */
+    folder: string;
+    /**
+     * Gets the name of a file selected for upload.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are being uploaded.
+     * Value: A string value specifying the folder path.
+     */
+    folder: string;
+    /**
+     * Gets the names of files selected for upload.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FileUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is uploaded.
+     * Value: A string value specifying the uploaded file path.
+     */
+    folder: string;
+    /**
+     * Gets the name of the uploaded file.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+}
+/**
+ * A method that will handle the client FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are uploaded.
+     * Value: A string value specifying the uploaded files path.
+     */
+    folder: string;
+    /**
+     * Gets an array of uploaded file names.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+}
+/**
+ * A method that will handle the client FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventHandler<S> {
+    /**
+     * A method that will handle the FileDownloading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileDownloadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileDownloadingEventArgs): void;
+}
+/**
+ * Provides data for the FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventHandler<S> {
+    /**
+     * A method that will handle the FocusedItemChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFocusedItemChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFocusedItemChangedEventArgs): void;
+}
+/**
+ * Provides data for the FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the focused item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventHandler<S> {
+    /**
+     * A method that will handle the CurrentFolderChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerCurrentFolderChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCurrentFolderChangedEventArgs): void;
+}
+/**
+ * Provides data for the CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently processed folder.
+     * Value: A string value that specifies the folder's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the folder currently being processed.
+     * Value: A string value that is the folder's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the currently processed file.
+     * Value: A string value that specifies the file's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the file currently being processed.
+     * Value: A string value that is the file's full name.
+     */
+    fullName: string;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the file has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * A method that will handle the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommand event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerCustomCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCustomCommandEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+}
+/**
+ * A method that will handle the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarUpdating event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerToolbarUpdatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerToolbarUpdatingEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently active file manager area.
+     * Value: A string value that identifies the active area.
+     */
+    activeAreaName: string;
+}
+/**
+ * A method that will handle the client HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventHandler<S> {
+    /**
+     * A method that will handle the HighlightItemTemplate event.
+     * @param source The event source. This parameter identifies the file manager object that raised the event.
+     * @param e An ASPxClientFileManagerHighlightItemTemplateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerHighlightItemTemplateEventArgs): void;
+}
+/**
+ * Provides data for the HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that is a filter value specified by the filter box.
+     * Value: A string that is a filter value.
+     */
+    filterValue: string;
+    /**
+     * Gets the name of the item currently being processed.
+     * Value: A string that is the item name.
+     */
+    itemName: string;
+    /**
+     * Gets an element containing the item template.
+     * Value: An object that is an element containing the item template.
+     */
+    templateElement: string;
+    /**
+     * Get the name of the cascading style sheet (CSS) class associated with an item in the highlighted state.
+     * Value: A string that is the name of a CSS class.
+     */
+    highlightCssClassName: string;
+}
+/**
+ * Represents a client-side equivalent of the menu's MenuItem object.
+ */
+interface ASPxClientMenuItem {
+    /**
+     * Gets the menu object to which the current item belongs.
+     * Value: An ASPxClientMenuBase object representing the menu to which the item belongs.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * Gets the immediate parent item to which the current item belongs.
+     * Value: An ASPxClientMenuItem object representing the item's immediate parent.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * Gets the item's index within the parent's collection of items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the parent object (a menu or item) to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the menu item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * For internal use only.
+     */
+    indexPath: string;
+    /**
+     * Returns the number of the current menu item's immediate child items.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the current menu item's immediate subitem specified by its index.
+     * @param index An integer value specifying the zero-based index of the submenu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns the current menu item's subitem specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Indicates whether the menu item is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Specifies whether the menu item is checked.
+     * @param value true if the menu item is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value specifying whether a menu item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the menu item is enabled.
+     * @param value true to enable the menu item; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the menu item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the menu item.
+     * @param value A string value specifying the URL to the image displayed within the menu item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets a URL which defines the navigation location for the menu item.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the menu item.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the menu item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the menu item.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the menu item.
+     * @param value A string value specifying the text to be displayed within the menu item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a menu item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the menu item's visibility.
+     * @param value true if the menu item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerToolbarItemBase object.
+ */
+interface ASPxClientFileManagerToolbarItem extends ASPxClientMenuItem {
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    index: number;
+}
+/**
+ * A client-side equivalent of the ASPxFormLayout's LayoutItem object.
+ */
+interface ASPxClientLayoutItem {
+    /**
+     * Gets the form layout object to which the current item belongs.
+     * Value: An <see cref="ASPxClientFormLayout" /> object representing the form layout to which the item belongs.
+     */
+    formLayout: ASPxClientFormLayout;
+    /**
+     * Gets the name that uniquely identifies the layout item.
+     * Value: A string value that represents the value assigned to the layout item's Name property.
+     */
+    name: string;
+    /**
+     * Gets the immediate parent layout item to which the current layout item belongs.
+     * Value: An <see cref="ASPxClientLayoutItem" /> object representing the item's immediate parent.
+     */
+    parent: ASPxClientLayoutItem;
+    /**
+     * Returns the current layout item's subitem specified by its name.
+     * @param name A string value specifying the name of the layout item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+    /**
+     * Returns a value specifying whether a layout item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the layout item's visibility.
+     * @param value true, if the layout item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Specifies the text displayed in the layout item caption.
+     * @param caption A string value specifying the item caption.
+     */
+    SetCaption(caption: string): void;
+    /**
+     * Returns the text displayed in the layout item caption.
+     */
+    GetCaption(): string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxFormLayout object.
+ */
+interface ASPxClientFormLayout extends ASPxClientControl {
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+}
+/**
+ * Represents a client-side equivalent of the ASPxGlobalEvents component.
+ */
+interface ASPxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any of DevExpress web controls.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientGlobalEvents>>;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHiddenField control.
+ */
+interface ASPxClientHiddenField extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHiddenField.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the value of the specified property.
+     */
+    Add(propertyName: string, propertyValue: Object): void;
+    /**
+     * Returns the value with the specified property name.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Get(propertyName: string): Object;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the property value.
+     */
+    Set(propertyName: string, propertyValue: Object): void;
+    /**
+     * Removes the specified value from the ASPxHiddenField collection.
+     * @param propertyName A string value representing the property name.
+     */
+    Remove(propertyName: string): void;
+    /**
+     * Clears the ASPxHiddenField's value collection.
+     */
+    Clear(): void;
+    /**
+     * Returns a value indicating whether the value with the specified property name is contained within the ASPxHiddenField control's value collection.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Contains(propertyName: string): boolean;
+}
+/**
+ * The client-side equivalent of the ASPxImageGallery control.
+ */
+interface ASPxClientImageGallery extends ASPxClientDataView {
+    /**
+     * Fires on the client side before the fullscreen viewer is shown and allows you to cancel the action.
+     */
+    FullscreenViewerShowing: ASPxClientEvent<ASPxClientImageGalleryCancelEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Occurs on the client side after an active item has been changed within the fullscreen viewer.
+     */
+    FullscreenViewerActiveItemIndexChanged: ASPxClientEvent<ASPxClientImageGalleryFullscreenViewerEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Shows the fullscreen viewer with the specified active item.
+     * @param index An Int32 value that is an index of the active item.
+     */
+    ShowFullscreenViewer(index: number): void;
+    /**
+     * Hides the fullscreen viewer.
+     */
+    HideFullscreenViewer(): void;
+    /**
+     * Makes the specified item active within the fullscreen viewer on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetFullscreenViewerActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetFullscreenViewerItemCount(): number;
+    /**
+     * Returns the index of the active item within the fullscreen viewer.
+     */
+    GetFullscreenViewerActiveItemIndex(): number;
+    /**
+     * Plays a slide show within a fullscreen viewer.
+     */
+    PlaySlideShow(): void;
+    /**
+     * Pauses a slide show within a fullscreen viewer.
+     */
+    PauseSlideShow(): void;
+}
+/**
+ * A method that will handle the client FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerShowing event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryCancelEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the client FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerActiveItemIndexChanged event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryFullscreenViewerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryFullscreenViewerEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A client-side equivalent of the ASPxImageSlider object.
+ */
+interface ASPxClientImageSlider extends ASPxClientControl {
+    /**
+     * Occurs after the active image, displayed within the image area, is changed.
+     */
+    ActiveItemChanged: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Fires after an image item has been clicked within the image area.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Occurs on the client side when a thumbnail is clicked.
+     */
+    ThumbnailItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Returns an item specified by its index within the image slider's item collection.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientImageSliderItem;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientImageSliderItem;
+    /**
+     * Returns the index of the active item within the image slider control.
+     */
+    GetActiveItemIndex(): number;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Returns the active item within the ASPxImageSlider control.
+     */
+    GetActiveItem(): ASPxClientImageSliderItem;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param item An ASPxClientImageSliderItem object specifying the item to select.
+     * @param preventAnimation true to prevent animation effect; false to enable animation.
+     */
+    SetActiveItem(item: ASPxClientImageSliderItem, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Sets input focus to the ASPxImageSlider control.
+     */
+    Focus(): void;
+    /**
+     * Plays a slide show within an image slider.
+     */
+    Play(): void;
+    /**
+     * Pauses a slide show within image slider.
+     */
+    Pause(): void;
+    /**
+     * Gets a value indicating whether the slide show is playing.
+     */
+    IsSlideShowPlaying(): boolean;
+}
+/**
+ * A method that will handle the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventHandler<S> {
+    /**
+     * A method that will handle the ItemClick events.
+     * @param source The event source. Identifies the ASPxImageSlider control that raised the event.
+     * @param e An ASPxClientImageSliderItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageSliderItemEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientImageSliderItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientImageSliderItem;
+}
+/**
+ * A client-side equivalent of the image slider's ImageSliderItem object.
+ */
+interface ASPxClientImageSliderItem {
+    /**
+     * Gets an image slider to which the current item belongs.
+     * Value: An <see cref="ASPxClientImageSlider" /> object that is the item's owner.
+     */
+    imageSlider: ASPxClientImageSlider;
+    /**
+     * Gets the item's index within an items collection.
+     * Value: An integer value is the item's zero-based index within the Items collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the image slider item.
+     * Value: A string value that is the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Gets or sets the path to the image displayed within the ASPxClientImageSliderItem.
+     * Value: A <see cref="String" /> value specifying the path to the image.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that is the item's display text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxImageZoomNavigator object.
+ */
+interface ASPxClientImageZoomNavigator extends ASPxClientImageSlider {
+}
+/**
+ * A client-side equivalent of the ASPxImageZoom object.
+ */
+interface ASPxClientImageZoom extends ASPxClientControl {
+    /**
+     * Sets the properties on an image displayed in the image zoom control.
+     * @param imageUrl A string value specifying the path to the preview image displayed in the preview image.
+     * @param largeImageUrl A string value specifying the path to the preview image displayed in the zoom window and the expand window.
+     * @param zoomWindowText A string value specifying the text displayed in the zoom window.
+     * @param expandWindowText A string value specifying the text displayed in the expand window.
+     * @param alternateText A string value that specifies the alternate text displayed instead of the image.
+     */
+    SetImageProperties(imageUrl: string, largeImageUrl: string, zoomWindowText: string, expandWindowText: string, alternateText: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxLoadingPanel control.
+ */
+interface ASPxClientLoadingPanel extends ASPxClientControl {
+    /**
+     * Invokes the loading panel.
+     */
+    Show(): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified HTML element.
+     * @param htmlElement An object that specifies the required HTML element.
+     */
+    ShowInElement(htmlElement: Object): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified element.
+     * @param id A string that specifies the required element's identifier.
+     */
+    ShowInElementByID(id: string): void;
+    /**
+     * Invokes the loading panel at the specified position.
+     * @param x An integer value specifying the x-coordinate of the loading panel's display position.
+     * @param y An integer value specifying the y-coordinate of the loaidng panel's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Sets the text to be displayed within the ASPxLoadingPanel.
+     * @param text A string value specifying the text to be displayed within the ASPxLoadingPanel.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the text displayed within the ASPxLoadingPanel.
+     */
+    GetText(): string;
+    /**
+     * Hides the loading panel.
+     */
+    Hide(): void;
+}
+/**
+ * Serves as the base type for the ASPxClientPopupMenu objects.
+ */
+interface ASPxClientMenuBase extends ASPxClientControl {
+    /**
+     * Fires after a menu item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientMenuItemClickEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a menu item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a menu item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu pops up.
+     */
+    PopUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu closes.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Returns the number of menu items at the root menu level.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the menu's root menu item specified by its index.
+     * @param index An integer value specifying the zero-based index of the root menu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns a menu item specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Returns the selected item within the menu control.
+     */
+    GetSelectedItem(): ASPxClientMenuItem;
+    /**
+     * Selects the specified menu item within a menu control on the client side.
+     * @param item An ASPxClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: ASPxClientMenuItem): void;
+    /**
+     * Returns a root menu item.
+     */
+    GetRootItem(): ASPxClientMenuItem;
+}
+/**
+ * Represents a client collection that maintains client menu objects.
+ */
+interface ASPxClientMenuCollection extends ASPxClientControlCollection {
+    /**
+     * Recalculates the position of visible sub menus.
+     */
+    RecalculateAll(): void;
+    /**
+     * Hides all menus maitained by the collection.
+     */
+    HideAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxMenu object.
+ */
+interface ASPxClientMenu extends ASPxClientMenuBase {
+    /**
+     * Gets a value specifying the menu orientation.
+     */
+    GetOrientation(): string;
+    /**
+     * Sets the menu orientation.
+     * @param orientation 'Vertical' to orient the menu vertically; 'Horizontal' to orient the menu horizontally.
+     */
+    SetOrientation(orientation: string): void;
+}
+/**
+ * A method that will handle the menu's client events concerning manipulations with an item.
+ */
+interface ASPxClientMenuItemEventHandler<S> {
+    /**
+     * A method that will handle the menu's client events concerning manipulations with an item.
+     * @param source The event source. This parameter identifies the menu object which raised the event.
+     * @param e An ASPxClientMenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on menu items.
+ */
+interface ASPxClientMenuItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+}
+/**
+ * A method that will handle client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemMouseEventArgs): void;
+}
+/**
+ * Provides data for client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventArgs extends ASPxClientMenuItemEventArgs {
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An HTML object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's items.
+ */
+interface ASPxClientMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle client ItemClick events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's items.
+ */
+interface ASPxClientMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Contains options affecting the touch scrolling functionality.
+ */
+interface ASPxClientTouchUIOptions {
+    /**
+     * Gets or sets a value that specifies whether or not the horizontal scroll bar should be displayed.
+     * Value: true to display the horizontal scroll bar; otherwise, false. The default value is true.
+     */
+    showHorizontalScrollbar: boolean;
+    /**
+     * Gets or sets a value that specifies whether or not the vertical scroll bar should be displayed.
+     * Value: true to display the vertical scroll bar; otherwise, false. The default value is true.
+     */
+    showVerticalScrollbar: boolean;
+    /**
+     * Gets or sets the name of the CSS class defining the vertical scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    vScrollClassName: string;
+    /**
+     * Gets or sets the name of the CSS class defining the horizontal scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    hScrollClassName: string;
+}
+/**
+ * Contains a method allowing you to apply the current scroll extender to a specific element.
+ */
+interface ScrollExtender {
+    /**
+     * Applies the current scroll extender to the element specified by the ID.
+     * @param id A string value specifying the element's ID.
+     */
+    ChangeElement(id: string): void;
+    /**
+     * Applies the current scroll extender to the specified DOM element.
+     * @param element An object specifying the required DOM element.
+     */
+    ChangeElement(element: Object): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNavBar control.
+ */
+interface ASPxClientNavBar extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientNavBarItemEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side after a group's expansion state has been changed.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientNavBarGroupEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side before the expansion state of a group is changed.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientNavBarGroupCancelEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires when a group header is clicked.
+     */
+    HeaderClick: ASPxClientEvent<ASPxClientNavBarGroupClickEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientNavBar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientNavBar>>;
+    /**
+     * Returns the number of groups in the navbar.
+     */
+    GetGroupCount(): number;
+    /**
+     * Returns a group specified by its index.
+     * @param index An integer value specifying the zero-based index of the group object to retrieve.
+     */
+    GetGroup(index: number): ASPxClientNavBarGroup;
+    /**
+     * Returns a group specified by its name.
+     * @param name A string value specifying the name of the group.
+     */
+    GetGroupByName(name: string): ASPxClientNavBarGroup;
+    /**
+     * Returns the navbar's active group.
+     */
+    GetActiveGroup(): ASPxClientNavBarGroup;
+    /**
+     * Makes the specified group active.
+     * @param group A ASPxClientNavBarGroup object that specifies the active group.
+     */
+    SetActiveGroup(group: ASPxClientNavBarGroup): void;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+    /**
+     * Returns the selected item within the navbar control.
+     */
+    GetSelectedItem(): ASPxClientNavBarItem;
+    /**
+     * Selects the specified item within the navbar control on the client side.
+     * @param item An ASPxClientNavBarItem object specifying the item to select.
+     */
+    SetSelectedItem(item: ASPxClientNavBarItem): void;
+    /**
+     * Collapses all groups of the navbar.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all groups of the navbar.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarGroup object.
+ */
+interface ASPxClientNavBarGroup {
+    /**
+     * Gets the navbar to which the current group belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the group belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group's index within a collection of a navbar's groups.
+     * Value: An integer value representing the group's zero-based index within the Groups collection of the navbar to which the group belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the group.
+     * Value: A string value that represents the value assigned to the group's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a group is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether the group is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets the group's expansion state.
+     * @param value true to expand the group; false to collapse the group.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value specifying whether a group is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Returns text displayed within a group.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within a group.
+     * @param text A string value that is the text displayed within the navbar group.
+     */
+    SetText(text: string): void;
+    /**
+     * Specifies whether the group is visible.
+     * @param value true if the group is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Returns the number of items in the group.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the group's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientNavBarItem;
+    /**
+     * Returns a group item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarItem object.
+ */
+interface ASPxClientNavBarItem {
+    /**
+     * Gets the navbar to which the current item belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the item belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group to which the current item belongs.
+     * Value: An ASPxClientNavBarGroup object representing the group to which the item belongs.
+     */
+    group: ASPxClientNavBarGroup;
+    /**
+     * Gets the item's index within a collection of a group's items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the group to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value indicating whether an item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the item is enabled.
+     * @param value true if the item is enabled; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL which points to the image displayed within the item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the item.
+     * @param value A string value that specifies the URL to the image displayed within the item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the item's navigation location.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the item's navigation location.
+     * @param value A string value which represents the URL to where the client web browser will navigate when the item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the item.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the item.
+     * @param value A string value that represents the text displayed within the item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether an item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the item is visible.
+     * @param value true is the item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with an item.
+ */
+interface ASPxClientNavBarItemEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on items.
+ */
+interface ASPxClientNavBarItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the item object related to the event.
+     * Value: An ASPxClientNavBarItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientNavBarItem;
+    /**
+     * Gets the HTML object that contains the processed navbar item.
+     * Value: An object representing a container for the navbar item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object, manipulations on which forced the event to be raised.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupCancelEventHandler<S> {
+    /**
+     * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object representing the group manipulations on which forced the navbar to raise the event.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning clicks on groups.
+     * @param source The event source. This parameter identifies the navbar object which raised the event.
+     * @param e An ASPxClientNavBarGroupClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventArgs extends ASPxClientNavBarGroupCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed group.
+     * Value: An object representing a container for the group related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNewsControl object.
+ */
+interface ASPxClientNewsControl extends ASPxClientDataView {
+    /**
+     * Fires after an item's tail has been clicked.
+     */
+    TailClick: ASPxClientEvent<ASPxClientNewsControlItemEventHandler<ASPxClientNewsControl>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientNewsControlItemEventHandler<S> {
+    /**
+     * A method that will handle the news control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the news control object that raised the event.
+     * @param e An ASPxClientNewsControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNewsControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern tail clicking within the control's items.
+ */
+interface ASPxClientNewsControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxObjectContainer control.
+ */
+interface ASPxClientObjectContainer extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the FSCommand action is called within the associated flash object's action script.
+     */
+    FlashScriptCommand: ASPxClientEvent<ASPxClientFlashScriptCommandEventHandler<ASPxClientObjectContainer>>;
+    /**
+     * Play the Flash movie backwards.
+     */
+    Back(): void;
+    /**
+     * Returns the value of the Flash variable specified.
+     * @param name A string value that specifies the Flash variable.
+     */
+    GetVariable(name: string): string;
+    /**
+     * Play the Flash movie forwards.
+     */
+    Forward(): void;
+    /**
+     * Activates the specified frame in the Flash movie.
+     * @param frameNumber An integer value that specifies the requested frame.
+     */
+    GotoFrame(frameNumber: number): void;
+    /**
+     * Indicates whether the Flash movie is currently playing.
+     */
+    IsPlaying(): boolean;
+    /**
+     * Loads the Flash movie to the specified layer.
+     * @param layerNumber An integer value that identifies a layer in which to load the movie.
+     * @param url A string value that specifies the movie's URL.
+     */
+    LoadMovie(layerNumber: number, url: string): void;
+    /**
+     * Pans a zoomed-in Flash movie to the specified coordinates.
+     * @param x An integer value that specifies the X-coordinate.
+     * @param y An integer value that specifies the Y-coordinate.
+     * @param mode 0 the coordinates are pixels; 1 the coordinates are a percentage of the window.
+     */
+    Pan(x: number, y: number, mode: number): void;
+    /**
+     * Returns the percent of the Flash Player movie that has streamed into the browser so far.
+     */
+    PercentLoaded(): string;
+    /**
+     * Starts playing the Flash movie.
+     */
+    Play(): void;
+    /**
+     * Rewinds the Flash movie to the first frame.
+     */
+    Rewind(): void;
+    /**
+     * Sets the value of the specified Flash variable.
+     * @param name A string value that specifies the Flash variable.
+     * @param value A string value that represents a new value.
+     */
+    SetVariable(name: string, value: string): void;
+    /**
+     * Zooms in on the specified rectangular area of the Flash movie.
+     * @param left An integer value that specifies the x-coordinate of the rectangle's left side, in twips.
+     * @param top An integer value that specifies the y-coordinate of the rectangle's top side, in twips.
+     * @param right An integer value that specifies the x-coordinate of the rectangle's right side, in twips.
+     * @param bottom An integer value that specifies the y-coordinate of the rectangle's bottom side, in twips.
+     */
+    SetZoomRect(left: number, top: number, right: number, bottom: number): void;
+    /**
+     * Stops playing the Flash movie.
+     */
+    StopPlay(): void;
+    /**
+     * Returns the total number of frames in the Flash movie.
+     */
+    TotalFrames(): number;
+    /**
+     * Zooms the Flash view by a relative scale factor.
+     * @param percent An integer value that specifies the relative scale factor, as a  percentage.
+     */
+    Zoom(percent: number): void;
+    /**
+     * Starts playing a Quick Time movie.
+     */
+    QTPlay(): void;
+    /**
+     * Stops playing a Quick Time movie.
+     */
+    QTStopPlay(): void;
+    /**
+     * Rewinds a Quick Time movie to the first frame.
+     */
+    QTRewind(): void;
+    /**
+     * Steps through a Quick Time video stream by a specified number of frames.
+     * @param count An integer value that specifies the number of frames to step.
+     */
+    QTStep(count: number): void;
+}
+/**
+ * A method that will handle the FlashScriptCommand event.
+ */
+interface ASPxClientFlashScriptCommandEventHandler<S> {
+    /**
+     * A method that will handle the FlashScriptCommand event.
+     * @param source The event source.
+     * @param e A ASPxClientFlashScriptCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFlashScriptCommandEventArgs): void;
+}
+/**
+ * Provides data for the FlashScriptCommand client event.
+ */
+interface ASPxClientFlashScriptCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's command parameter.
+     */
+    command: string;
+    /**
+     * Gets arguments passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's args parameter.
+     */
+    args: string;
+}
+/**
+ * Lists the available link types within office documents.
+ */
+interface ASPxClientOfficeDocumentLinkType {
+}
+interface ASPxClientPager extends ASPxClientControl {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupControl control.
+ */
+interface ASPxClientPopupControl extends ASPxClientPopupControlBase {
+    /**
+     * Occurs when a popup window's close button is clicked.
+     */
+    CloseButtonClick: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControl>>;
+    /**
+     * This method is not in effect for a ASPxClientPopupControl object.
+     */
+    GetMainElement(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked a default popup window.
+     */
+    GetPopUpReasonMouseEvent(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked the specified popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowPopUpReasonMouseEvent(window: ASPxClientPopupWindow): Object;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Specifies the default popup window's size.
+     * @param width An integer value that specifies the default popup window's width.
+     * @param height An integer value that specifies the default popup window's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Gets the width of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Gets the height of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the height of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the width of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Specifies the size of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param width An integer value that specifies the required popup window's width.
+     * @param height An integer value that specifies the required popup window's height.
+     */
+    SetWindowSize(window: ASPxClientPopupWindow, width: number, height: number): void;
+    /**
+     * Returns the HTML code that is the content of the popup control's default popup window.
+     */
+    GetContentHTML(): string;
+    /**
+     * Defines the HTML content for the popup control's default popup window.
+     * @param html A string value that is the HTML code defining the content of the popup window.
+     */
+    SetContentHTML(html: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control's window is associated.
+     * @param window An ASPxClientPopupWindow object representing a popup control's window.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup control's window is associated.
+     */
+    SetWindowPopupElementID(window: ASPxClientPopupWindow, popupElementId: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element to which the popup control is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the default window within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an index of the object that invoked the specified popup window, within the window's PopupElementID list.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElementIndex(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns an object that invoked the default window.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Returns an object that invoked the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElement(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns a value that specifies whether the popup control's specific window is displayed.
+     * @param window A ASPxClientPopupWindow object representing the popup window whose visibility is checked.
+     */
+    IsWindowVisible(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Returns a popup window specified by its index.
+     * @param index An integer value specifying the zero-based index of the popup window object to be retrieved.
+     */
+    GetWindow(index: number): ASPxClientPopupWindow;
+    /**
+     * Returns a popup window specified by its name.
+     * @param name A string value specifying the name of the popup window.
+     */
+    GetWindowByName(name: string): ASPxClientPopupWindow;
+    /**
+     * Returns the number of popup windows in the popup control.
+     */
+    GetWindowCount(): number;
+    /**
+     * Invokes the popup control's specific window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     */
+    ShowWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Invokes the specified popup window at the popup element with the specified index.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element within the window's PopupElementID list.
+     */
+    ShowWindow(window: ASPxClientPopupWindow, popupElementIndex: number): void;
+    /**
+     * Invokes the popup control's specific window and displays it over the specified HTML element.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param htmlElement An object specifying the HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Invokes the popup control's specific window and displays it over an HTML element specified by its unique identifier.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElementByID(window: ASPxClientPopupWindow, id: string): void;
+    /**
+     * Invokes the popup control's specific popup window at the specified position.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param x A integer value specifying the x-coordinate of the popup window's display position.
+     * @param y A integer value specifying the y-coordinate of the popup window's display position.
+     */
+    ShowWindowAtPos(window: ASPxClientPopupWindow, x: number, y: number): void;
+    /**
+     * Brings the specified popup window to the front of the z-order.
+     * @param window A ASPxClientPopupWindow object representing the popup window.
+     */
+    BringWindowToFront(window: ASPxClientPopupWindow): void;
+    /**
+     * Closes the popup control's specified window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to close.
+     */
+    HideWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Returns the HTML code that represents the contents of the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHtml(window: ASPxClientPopupWindow): string;
+    /**
+     * Defines the HTML content for a specific popup window within the popup control.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param html A string value that represents the HTML code defining the content of the specified popup window.
+     */
+    SetWindowContentHtml(window: ASPxClientPopupWindow, html: string): void;
+    /**
+     * Returns an iframe object containing a web page specified via the specified popup window's SetWindowContentUrl client method).
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentIFrame(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentUrl(window: ASPxClientPopupWindow): string;
+    /**
+     * Sets the URL pointing to the web page that should be loaded into and displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param url A string value specifying the URL to the web page to be displayed within the specified popup window.
+     */
+    SetWindowContentUrl(window: ASPxClientPopupWindow, url: string): void;
+    /**
+     * Returns a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowPinned(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to pin the window; otherwise, false.
+     */
+    SetWindowPinned(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowMaximized(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to maximize the window; otherwise, false.
+     */
+    SetWindowMaximized(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowCollapsed(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to collapse the window; otherwise, false.
+     */
+    SetWindowCollapsed(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    RefreshWindowContentUrl(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     */
+    UpdatePosition(): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at the specified HTML element.
+     * @param htmlElement An object specifying the HTML element to which the default popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdatePositionAtElement(htmlElement: Object): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    UpdateWindowPosition(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at the specified HTML element.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param htmlElement An object specifying the HTML element to which the specified popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdateWindowPositionAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Refreshes the connection between the ASPxPopupControl and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+}
+/**
+ * Represents a client-side equivalent of a popup control's PopupWindow object.
+ */
+interface ASPxClientPopupWindow {
+    /**
+     * Gets the popup control to which the current popup window belongs.
+     * Value: An ASPxClientPopupControl object representing the popup control to which the window belongs.
+     */
+    popupControl: ASPxClientPopupControl;
+    /**
+     * Gets the index of the current popup window within the popup control's Windows collection.
+     * Value: An integer value representing the zero-based index of the current popup window within the Windows collection of the popup control to which the window belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current popup window.
+     * Value: A string value that represents a value assigned to the popup window's Name property.
+     */
+    name: string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer.
+     * @param value A string value that is the URL to the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Returns the text displayed within the window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed within the window's header.
+     * @param value A string value that specifies the window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Returns the text displayed within the popup window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Specifies the text displayed within the window's footer.
+     * @param value A string value that specifies the window's footer text.
+     */
+    SetFooterText(value: string): void;
+}
+/**
+ * A method that will handle the popup control's client events invoked in response to manipulating a popup window.
+ */
+interface ASPxClientPopupWindowEventHandler<S> {
+    /**
+     * A method that will handle the popup control's client events when a popup window is manipulated.
+     * @param source An object representing the event's source. Identifies the popup control object (ASPxClientPopupControl) that raised the event.
+     * @param e An ASPxClientPopupWindowEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowEventArgs): void;
+}
+/**
+ * Provides data for events concerning client manipulations on popup windows.
+ */
+interface ASPxClientPopupWindowEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+}
+/**
+ * A method that will handle the popup window's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventHandler<S> {
+    /**
+     * A method that will handle the popup window's cancelable client events.
+     * @param source An object representing the event's source. Identifies the popup window object that raised the event.
+     * @param e An ASPxClientPopupWindowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCancelEventArgs): void;
+}
+/**
+ * Provides data for the popup control's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+    /**
+     * Gets the value that identifies the reason the popup window is about to close.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventHandler<S> {
+    /**
+     * A method that will handle the CloseUp event.
+     * @param source The event source.
+     * @param e An ASPxClientPopupWindowCloseUpEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCloseUpEventArgs): void;
+}
+/**
+ * Provides data for the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets the value that identifies the reason the popup window closes.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventHandler<S> {
+    /**
+     * A method that will handle the Resize event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowResizeEventArgs): void;
+}
+/**
+ * Provides data for the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Returns the value indicating the window state after resizing.
+     * Value: The integer value indicating the window resize state.
+     */
+    resizeState: number;
+}
+/**
+ * A method that will handle the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventHandler<S> {
+    /**
+     * A method that will handle the PinnedChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowPinnedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowPinnedChangedEventArgs): void;
+}
+/**
+ * Provides data for the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets a value indicating whether the processed popup window has been pinned.
+     * Value: true, if the window has been pinned; otherwise, false.
+     */
+    pinned: boolean;
+}
+/**
+ * Represents a client collection that maintains client popup control objects.
+ */
+interface ASPxClientPopupControlCollection extends ASPxClientControlCollection {
+    /**
+     * Hides all popup windows maintained by the collection.
+     */
+    HideAllWindows(): void;
+}
+/**
+ * Declares client constants that identify the reason the popup window closes.
+ */
+interface ASPxClientPopupControlCloseReason {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupMenu object.
+ */
+interface ASPxClientPopupMenu extends ASPxClientMenuBase {
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup menu is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup menu is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the popup menu within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an object that invoked the popup menu.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Refreshes the connection between the ASPxPopupMenu and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+    /**
+     * Hides the popup menu.
+     */
+    Hide(): void;
+    /**
+     * Invokes the popup menu.
+     */
+    Show(): void;
+    /**
+     * Invokes the popup menu at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the popup menu and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the popup menu and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the popup menu at the specified position.
+     * @param x An integer value specifying the x-coordinate of the popup menu's display position.
+     * @param y An integer value specifying the y-coordinate of the popup menu's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRatingControl control.
+ */
+interface ASPxClientRatingControl extends ASPxClientControl {
+    /**
+     * Fires on the server after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientRatingControlItemClickEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a rating control item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a rating control item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Gets the item tooltip title specified by the item index.
+     * @param index An integer value specifying the item index.
+     */
+    GetTitle(index: number): string;
+    /**
+     * Returns a value indicating whether the control's status is read-only.
+     */
+    GetReadOnly(): boolean;
+    /**
+     * Specifies whether the control's status is read-only.
+     * @param value true to make the control read-only; otherwise, false.
+     */
+    SetReadOnly(value: boolean): void;
+    /**
+     * Returns the value of the ASPxRatingControl.
+     */
+    GetValue(): number;
+    /**
+     * Modifies the value of the ASPxRatingControl on the client side.
+     * @param value A decimal value representing the value of the control.
+     */
+    SetValue(value: number): void;
+}
+/**
+ * A method that will handle the client ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventHandler<S> {
+    /**
+     * A method that will handle the client ItemClick event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientRatingControlItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the clicked item's index.
+     */
+    index: number;
+}
+/**
+ * A method that will handle the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source The event source.
+     * @param e An ASPxClientRatingControlItemMouseEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemMouseEventArgs): void;
+}
+/**
+ * Provides data for the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the related item's index.
+     */
+    index: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRibbon control.
+ */
+interface ASPxClientRibbon extends ASPxClientControl {
+    /**
+     * Occurs after an end-user executes an action on a ribbon item.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientRibbonCommandExecutedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a ribbon control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientRibbonTabEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs on the client side when the ribbon minimization state is changed by end-user actions.
+     */
+    MinimizationStateChanged: ASPxClientEvent<ASPxClientRibbonMinimizationStateEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs when the file tab is clicked.
+     */
+    FileTabClicked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after a dialog box launcher has been clicked.
+     */
+    DialogBoxLauncherClicked: ASPxClientEvent<ASPxClientRibbonDialogBoxLauncherClickedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires after key tips are closed by pressing Esc.
+     */
+    KeyTipsClosedOnEscape: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Specifies whether the ribbon control is enabled.
+     * @param enabled true to enable the ribbon; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the ribbon is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientRibbonTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientRibbonTab;
+    /**
+     * Returns the number of tabs in the ribbon Tabs collection.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns the active tab within the ribbon control.
+     */
+    GetActiveTab(): ASPxClientRibbonTab;
+    /**
+     * Makes the specified tab active in the ribbon control on the client side.
+     * @param tab A ASPxClientRibbonTab object specifying the tab selection.
+     */
+    SetActiveTab(tab: ASPxClientRibbonTab): void;
+    /**
+     * Makes a tab active within the ribbon control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns a ribbon item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientRibbonItem;
+    /**
+     * Returns a value of item with the specified name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemValueByName(name: string): Object;
+    /**
+     * Sets the value of the item with the specified name.
+     * @param name A string value specifying the name of the item.
+     * @param value An object that is the new item value.
+     */
+    SetItemValueByName(name: string, value: Object): void;
+    /**
+     * Specifies whether the ribbon is minimized.
+     * @param minimized true to set the ribbon state to minimized; false to set the ribbon state to normal.
+     */
+    SetMinimized(minimized: boolean): void;
+    /**
+     * Gets a value specifying whether the ribbon is minimized.
+     */
+    GetMinimized(): boolean;
+    /**
+     * Specifies the visibility of a context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param visible true to make a category visible; false to make it hidden.
+     */
+    SetContextTabCategoryVisible(categoryName: string, visible: boolean): void;
+    /**
+     * Shows ribbon key tips.
+     */
+    ShowKeyTips(): void;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonTab object.
+ */
+interface ASPxClientRibbonTab {
+    /**
+     * Gets the client ribbon object to which the current tab belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the tab belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets or sets the tab's index within the collection.
+     * Value: An integer value that is the zero-based index of the tab within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon tab.
+     * Value: A string value that is the tab's name.
+     */
+    name: string;
+    /**
+     * Returns the text displayed in the tab.
+     */
+    GetText(): string;
+    /**
+     * Sets a value specifying whether the tab is enabled.
+     * @param enabled true to enable the tab; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether a ribbon tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether a ribbon tab is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonGroup object.
+ */
+interface ASPxClientRibbonGroup {
+    /**
+     * Gets the client ribbon object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the group belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets the client tab object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object to which the group belongs.
+     */
+    tab: ASPxClientRibbonTab;
+    /**
+     * Gets or sets the group's index within the collection.
+     * Value: An integer value that is the zero-based index of the group within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon group.
+     * Value: A string value that is the group's name.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a ribbon group is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonItemBase object.
+ */
+interface ASPxClientRibbonItem {
+    /**
+     * Gets the client group object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the item belongs.
+     */
+    group: ASPxClientRibbonGroup;
+    /**
+     * Gets or sets the item's index within the collection.
+     * Value: An integer value that is the zero-based index of the item within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the client ribbon object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the item belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Returns a value indicating whether a ribbon item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the item is enabled.
+     * @param enabled true to enable the item; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns the item value.
+     */
+    GetValue(): Object;
+    /**
+     * Sets the item value.
+     * @param value An  that specifies the item value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value specifying whether a ribbon item is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A method that will handle the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CommandExecuted event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientRibbonItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientRibbonItem;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventHandler<S> {
+    /**
+     * A method that will handle the ActiveTabChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e A ASPxClientRibbonTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object that is the tab, manipulations on which forced the ribbon control to raise the event.
+     */
+    tab: ASPxClientRibbonTab;
+}
+/**
+ * A method that will handle the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventHandler<S> {
+    /**
+     * A method that will handle the MinimizationStateChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonMinimizationStateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonMinimizationStateEventArgs): void;
+}
+/**
+ * Provides data for the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the value indicating the new ribbon state.
+     * Value: The integer value indicating the ribbon minimization state.
+     */
+    ribbonState: number;
+}
+/**
+ * A method that will handle the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventHandler<S> {
+    /**
+     * A method that will handle the DialogBoxLauncherClicked event.
+     * @param source The event source. This parameter identifies the ribbon object which raised the event.
+     * @param e An ASPxClientRibbonDialogBoxLauncherClickedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonDialogBoxLauncherClickedEventArgs): void;
+}
+/**
+ * Provides data for the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the client group object to which the clicked dialog box launcher belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the dialog box launcher belongs.
+     */
+    group: ASPxClientRibbonGroup;
+}
+/**
+ * Represents a client-side equivalent of the ASPxRoundPanel control.
+ */
+interface ASPxClientRoundPanel extends ASPxClientPanelBase {
+    /**
+     * Fires on the client side after a panel has been expanded or collapsed via end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client side before a panel is expanded or collapsed by end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanging: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientRoundPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the panel's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed in the panel's header.
+     * @param text A string value that specifies the panel header's text.
+     */
+    SetHeaderText(text: string): void;
+    /**
+     * Returns a value indicating whether the panel is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Sets a value indicating whether the panel is collapsed.
+     * @param collapsed true, to collapse the panel; otherwise, false.
+     */
+    SetCollapsed(collapsed: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxSplitter object.
+ */
+interface ASPxClientSplitter extends ASPxClientControl {
+    /**
+     * Fires before a pane is resized.
+     */
+    PaneResizing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been resized.
+     */
+    PaneResized: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is collapsed.
+     */
+    PaneCollapsing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been collapsed.
+     */
+    PaneCollapsed: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is expanded.
+     */
+    PaneExpanding: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been expanded.
+     */
+    PaneExpanded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Occurs when a pane resize operation has been completed.
+     */
+    PaneResizeCompleted: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a specific web page has been loaded into a pane.
+     */
+    PaneContentUrlLoaded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Returns the number of panes at the root level of a splitter.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the splitter's root pane specified by its index within the Panes collection.
+     * @param index An integer value specifying the zero-based index of the root pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns a pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Specifies whether the control's panes can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Returns a string value that represents the client state of splitter panes.
+     */
+    GetLayoutData(): string;
+}
+/**
+ * Represents a client-side equivalent of the splitter's SplitterPane object.
+ */
+interface ASPxClientSplitterPane {
+    /**
+     * Gets the index of the current pane within the pane collection to which it belongs.
+     * Value: An integer value representing the zero-based index of the current pane within the SplitterPaneCollection collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current splitter pane.
+     * Value: A string value that represents the value assigned to the pane's Name property.
+     */
+    name: string;
+    /**
+     * Returns a client splitter object that contains the current pane.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Returns the immediate parent of the current pane.
+     */
+    GetParentPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the previous sibling pane of the current pane.
+     */
+    GetPrevPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the next sibling pane of the current pane.
+     */
+    GetNextPane(): ASPxClientSplitterPane;
+    /**
+     * Determines whether the current pane is the first pane within the SplitterPaneCollection.
+     */
+    IsFirstPane(): boolean;
+    /**
+     * Determines whether the current pane is the last pane within the SplitterPaneCollection.
+     */
+    IsLastPane(): boolean;
+    /**
+     * Returns a value that indicates the orientation in which the current pane and its sibling panes are stacked.
+     */
+    IsVertical(): boolean;
+    /**
+     * Returns the number of the current pane's immediate child panes.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the current pane's immediate child pane specified by its index.
+     * @param index An integer value specifying the zero-based index of the child pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns the current pane's child pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Gets the width of the pane's content area.
+     */
+    GetClientWidth(): number;
+    /**
+     * Gets the height of the pane's content area.
+     */
+    GetClientHeight(): number;
+    /**
+     * Collapses the current pane and occupies its space by maximizing the specified pane.
+     * @param maximizedPane A ASPxClientSplitterPane object specifying the pane to be maximized to occupy the freed space.
+     */
+    Collapse(maximizedPane: ASPxClientSplitterPane): boolean;
+    /**
+     * Collapses the current pane in a forward direction and occupies its space by maximizing the previous adjacent pane.
+     */
+    CollapseForward(): boolean;
+    /**
+     * Collapses the current pane in a backward direction, and occupies its space by maximizing the next adjacent pane.
+     */
+    CollapseBackward(): boolean;
+    /**
+     * Expands the current pane object on the client side.
+     */
+    Expand(): boolean;
+    /**
+     * Returns whether the pane is collapsed.
+     */
+    IsCollapsed(): boolean;
+    /**
+     * Returns whether the pane's content is loaded from an external web page.
+     */
+    IsContentUrlPane(): boolean;
+    /**
+     * Gets the URL of a web page displayed as a pane's content.
+     */
+    GetContentUrl(): string;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane, but should not be cached by a client browser.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     * @param preventBrowserCaching true to prevent the browser to cache the loaded content; false to allow browser caching.
+     */
+    SetContentUrl(url: string, preventBrowserCaching: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the current pane.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Returns an iframe object containing a web page specified via the pane's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Specifies whether the current pane can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Forces the client PaneResized event to be generated.
+     */
+    RaiseResizedEvent(): void;
+    /**
+     * Returns an HTML element representing a splitter pane object.
+     */
+    GetElement(): Object;
+    /**
+     * Specifies the splitter pane's size in pixels.
+     * @param size An integer value that specifies the splitter pane's size.
+     */
+    SetSize(size: number): void;
+    /**
+     * Specifies the splitter pane's size, in pixels or percents.
+     * @param size A string value that specifies the splitter pane's size, in pixels or percents.
+     */
+    SetSize(size: string): void;
+    /**
+     * Returns the splitter pane's size, in pixels or percents.
+     */
+    GetSize(): string;
+    /**
+     * Returns the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     */
+    GetScrollTop(): number;
+    /**
+     * Specifies the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollTop(value: number): void;
+    /**
+     * Returns the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     */
+    GetScrollLeft(): number;
+    /**
+     * Specifies the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollLeft(value: number): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventHandler<S> {
+    /**
+     * A method that will handle the splitter's client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter object that raised the event.
+     * @param e An ASPxClientSplitterPaneEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneEventArgs): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the pane object related to the event.
+     * Value: An ASPxClientSplitterPane object, manipulations on which forced the event to be raised.
+     */
+    pane: ASPxClientSplitterPane;
+}
+/**
+ * A method that will handle a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventHandler<S> {
+    /**
+     * A method that will handle a splitter control's cancelable client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter control object that raised the event.
+     * @param e An ASPxClientSplitterPaneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneCancelEventArgs): void;
+}
+/**
+ * Provides data for a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventArgs extends ASPxClientSplitterPaneEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents a base for the ASPxClientPageControl objects.
+ */
+interface ASPxClientTabControlBase extends ASPxClientControl {
+    /**
+     * Fires when a tab is clicked.
+     */
+    TabClick: ASPxClientEvent<ASPxClientTabControlTabClickEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a tab control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientTabControlTabEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side before the active tab is changed within a tab control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientTabControlTabCancelEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a client tab control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Modifies a tab page's size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Returns the active tab within the tab control.
+     */
+    GetActiveTab(): ASPxClientTab;
+    /**
+     * Makes the specified tab active within the tab control on the client side.
+     * @param tab An ASPxClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: ASPxClientTab): void;
+    /**
+     * Returns the index of the active tab within the tab control.
+     */
+    GetActiveTabIndex(): number;
+    /**
+     * Makes a tab active within the tab control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns the number of tabs in the ASPxTabControl.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientTab;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTabControl object.
+ */
+interface ASPxClientTabControl extends ASPxClientTabControlBase {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPageControl object.
+ */
+interface ASPxClientPageControl extends ASPxClientTabControlBase {
+    /**
+     * Returns the HTML code that represents the contents of the specified page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required page.
+     */
+    GetTabContentHTML(tab: ASPxClientTab): string;
+    /**
+     * Defines the HTML content for a specific tab page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required tab page.
+     * @param html A string value that represents the HTML code defining the content of the specified page.
+     */
+    SetTabContentHTML(tab: ASPxClientTab, html: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents a client-side equivalent of a tab control's TabPage object.
+ */
+interface ASPxClientTab {
+    /**
+     * Gets the tab control to which the current tab belongs.
+     * Value: An ASPxClientTabControlBase object representing the control to which the tab belongs.
+     */
+    tabControl: ASPxClientTabControlBase;
+    /**
+     * Gets the index of the current tab (tabbed page) within the control's collection of tabs (tabbed pages).
+     * Value: An integer value representing the zero-based index of the current tab (tabbed page) within the TabPages) collection of the control to which the tab belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current tab.
+     * Value: A string value that represents the value assigned to the tab's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the tab is enabled.
+     * @param value true to enable the tab; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the tab.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the tab.
+     * @param value A string value that is the URL to the image displayed within the tab.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the active tab.
+     */
+    GetActiveImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the active tab.
+     * @param value A string value that is the URL to the image displayed within the active tab.
+     */
+    SetActiveImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the tab.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the tab.
+     * @param value A string value which is a URL to where the client web browser will navigate when the tab is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the tab.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the tab.
+     * @param value A string value that is the text displayed within the tab.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a tab is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the tab is visible.
+     * @param value true is the tab is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle a tab control's client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabEventHandler<S> {
+    /**
+     * A method that will handle a tab control's client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object, manipulations on which forced the event to be raised.
+     */
+    tab: ASPxClientTab;
+}
+/**
+ * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabCancelEventHandler<S> {
+    /**
+     * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object representing the tab manipulations on which forced the tab control to raise the event.
+     */
+    tab: ASPxClientTab;
+    /**
+     * Gets or sets a value specifying whether a callback should be sent to the server to reload the content of the page being activated.
+     * Value: true to reload the page's content; otherwise, false.
+     */
+    reloadContentOnCallback: boolean;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventHandler<S> {
+    /**
+     * A method that will handle client events concerning clicks on tabs.
+     * @param source The event source. This parameter identifies the tab control object which raised the event.
+     * @param e An ASPxClientTabControlTabClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventArgs extends ASPxClientTabControlTabCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed tab.
+     * Value: An object representing a container for the tab related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTimer object.
+ */
+interface ASPxClientTimer extends ASPxClientControl {
+    /**
+     * Fires on the client side when the specified timer interval has elapsed, and the timer is enabled.
+     */
+    Tick: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimer>>;
+    /**
+     * Returns a value indicating whether the timer is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Enables the timer.
+     * @param enabled true to turn the timer on; false, to turn the timer off.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Gets the time before the Tick event.
+     */
+    GetInterval(): number;
+    /**
+     * Specifies the time before the Tick event.
+     * @param interval An integer value that specifies the number of milliseconds before the Tick event is raised relative to the last occurrence of the Tick event. The value cannot be less than one.
+     */
+    SetInterval(interval: number): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTitleIndex object.
+ */
+interface ASPxClientTitleIndex extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientTitleIndexItemEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTitleIndex.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTitleIndex>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientTitleIndexItemEventHandler<S> {
+    /**
+     * A method that will handle the title index control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the title index control object that raised the event.
+     * @param e An ASPxClientTitleIndexItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTitleIndexItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on the control's items.
+ */
+interface ASPxClientTitleIndexItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView object.
+ */
+interface ASPxClientTreeView extends ASPxClientControl {
+    /**
+     * Fires on the client side after a node has been clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeViewNodeClickEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side after a node's expansion state has been changed by end-user interaction.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientTreeViewNodeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side before the expansion state of a node is changed via end-user interaction.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientTreeViewNodeCancelEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side when the node's checked state is changed by clicking on a check box.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientTreeViewNodeProcessingModeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTreeView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeView>>;
+    /**
+     * Returns a node specified by its index within the ASPxTreeView's node collection.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the number of nodes at the ASPxTreeView's zero level.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the selected node within the ASPxTreeView control on the client side.
+     */
+    GetSelectedNode(): ASPxClientTreeViewNode;
+    /**
+     * Selects the specified node within the ASPxTreeView control on the client side.
+     * @param node An ASPxClientTreeViewNode object specifying the node to select.
+     */
+    SetSelectedNode(node: ASPxClientTreeViewNode): void;
+    /**
+     * Gets the root node of the ASPxTreeView object.
+     */
+    GetRootNode(): ASPxClientTreeViewNode;
+    /**
+     * Collapses all nodes in the ASPxTreeView on the client side.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all nodes in the ASPxTreeView on the client side.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView's TreeViewNode object.
+ */
+interface ASPxClientTreeViewNode {
+    /**
+     * Gets the client representation of the ASPxTreeView control to which the current node belongs.
+     * Value: An ASPxClientTreeView object representing the control to which the node belongs.
+     */
+    treeView: ASPxClientTreeView;
+    /**
+     * Gets the current node's parent node.
+     * Value: An ASPxClientTreeViewNode object representing the node's immediate parent.
+     */
+    parent: ASPxClientTreeViewNode;
+    /**
+     * Gets the node's index within the parent's collection of nodes.
+     * Value: An integer value representing the node's zero-based index within the Nodes collection of the node to which the node belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the node.
+     * Value: A string value that represents the value assigned to the node's Name property.
+     */
+    name: string;
+    /**
+     * Returns the number of the current node's immediate child nodes.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the current node's immediate child node specified by its index.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a value indicating whether the node is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets a value which specifies the node's expansion state.
+     * @param value true if the node is expanded; otherwise, false.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value indicating whether the node is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value indicating whether the node is checked.
+     * @param value true if the node is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value which specifies the node's check state.
+     */
+    GetCheckState(): string;
+    /**
+     * Returns a value specifying whether the node is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the node is enabled.
+     * @param value true to make the node enabled; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the node.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the node.
+     * @param value A string value specifying the URL to the image displayed within the node.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the node's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the node's navigate URL.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the node is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Gets the text, displayed within the node.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text, displayed within the node.
+     * @param value A string value that represents the text displayed within the node.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a node is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the node is visible.
+     * @param value true if the node is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Gets the HTML object that contains the current node.
+     */
+    GetHtmlElement(): Object;
+}
+/**
+ * A method that will handle the client events concerned with node processing.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with node processing.
+     * @param source An object representing the event source. Identifies the ASPxClientTreeView control that raised the event.
+     * @param e An ASPxClientTreeViewNodeProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events concerned with node processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxClientTreeView.ItemClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventHandler<S> {
+    /**
+     * A method that will handle the NodeClick event.
+     * @param source The ASPxClientTreeView control which fires the event.
+     * @param e An ASPxClientTreeViewNodeClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeClickEventArgs): void;
+}
+/**
+ * Provides data for the NodeClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventArgs extends ASPxClientTreeViewNodeProcessingModeEventArgs {
+    /**
+     * Gets the HTML object that contains the processed node.
+     * Value: An object representing a container for the node related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ASPxTreeView control's client events concerning manipulations with a node.
+ */
+interface ASPxClientTreeViewNodeEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView control's client events, concerning manipulations with a node.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView control object that raised the event.
+     * @param e An ASPxClientTreeViewNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanged events.
+ */
+interface ASPxClientTreeViewNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+ */
+interface ASPxClientTreeViewNodeCancelEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView object that raised the event.
+     * @param e An ASPxClientTreeViewNodeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeCancelEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanging event.
+ */
+interface ASPxClientTreeViewNodeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * Represents a client-side equivalent of the ASPxUploadControl control.
+ */
+interface ASPxClientUploadControl extends ASPxClientControl {
+    /**
+     * Occurs on the client after a file has been uploaded.
+     */
+    FileUploadComplete: ASPxClientEvent<ASPxClientUploadControlFileUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client after upload of all selected files has been completed.
+     */
+    FilesUploadComplete: ASPxClientEvent<ASPxClientUploadControlFilesUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before upload of the specified files starts.
+     */
+    FileUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before file upload is started.
+     */
+    FilesUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires on the client side when the text within the control's edit box is changed while the control has focus.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientUploadControlTextChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the progress bar indicator position is changed.
+     */
+    UploadingProgressChanged: ASPxClientEvent<ASPxClientUploadControlUploadingProgressChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the file input elements count is changed.
+     */
+    FileInputCountChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse enters a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneEnter: ASPxClientEvent<ASPxClientUploadControlDropZoneEnterEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse leaves a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneLeave: ASPxClientEvent<ASPxClientUploadControlDropZoneLeaveEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Initiates uploading of the specified file to the web server's memory.
+     */
+    UploadFile(): void;
+    /**
+     * Adds a new file input element to the ASPxUploadControl.
+     */
+    AddFileInput(): void;
+    /**
+     * Removes a file input element from the ASPxUploadControl.
+     * @param index An integer value that represents a file input element's index.
+     */
+    RemoveFileInput(index: number): void;
+    /**
+     * Removes a file with the specified index from the selected file list.
+     * @param fileIndex An integer value that is the zero-based index of an item in the file list.
+     */
+    RemoveFileFromSelection(fileIndex: number): void;
+    /**
+     * Gets the text displayed within the edit box of the specified file input element.
+     * @param index An integer value that specifies the required file input element's index.
+     */
+    GetText(index: number): string;
+    /**
+     * Gets the number of file input elements contained within the ASPxUploadControl.
+     */
+    GetFileInputCount(): number;
+    /**
+     * Specifies the count of the file input elements within the upload control.
+     * @param count An integer value that specifies the file input elements count.
+     */
+    SetFileInputCount(count: number): void;
+    /**
+     * Specifies whether the upload control is enabled.
+     * @param enabled true, to enable the upload control; otherwise, false.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the upload control is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Initiates uploading of the specified file(s) to the web server's memory.
+     */
+    Upload(): void;
+    /**
+     * Cancels the initiated file uploading process.
+     */
+    Cancel(): void;
+    /**
+     * Clears the file selection in the upload control.
+     */
+    ClearText(): void;
+    /**
+     * Sets the text to be displayed within the add button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetAddButtonText(text: string): void;
+    /**
+     * Sets the text to be displayed within the upload button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetUploadButtonText(text: string): void;
+    /**
+     * Returns the text displayed within the add button.
+     */
+    GetAddButtonText(): string;
+    /**
+     * Returns the text displayed within the upload button.
+     */
+    GetUploadButtonText(): string;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs), a click on which invokes file upload dialog.
+     * @param ids A string value specifying the ID or a list of IDs separated by the semicolon (;).
+     */
+    SetDialogTriggerID(ids: string): void;
+}
+/**
+ * A method that will handle the client FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploadStart event.
+     * @param source The event source. Identifies the ASPxUploadControl control that raised the event.
+     * @param e A ASPxClientUploadControlFilesUploadStartEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadStartEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that handles the FileUploadComplete client event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlFileUploadCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFileUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FileUploadComplete event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+    /**
+     * Gets or sets a value indicating whether the uploaded file passes validation.
+     * Value: true if the file is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the error text to be displayed within the ASPxUploadControl's error frame.
+     * Value: A string value that represents the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value representing callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the FilesUploadComplete client event.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client FilesUploadComplete event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e A  object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadComplete client event, which enables you to perform specific actions after all selected files have been uploaded.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error text to be displayed within the upload control's error frame.
+     * Value: A string value that is the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value that is the callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the TextChanged client event.
+ */
+interface ASPxClientUploadControlTextChangedEventHandler<S> {
+    /**
+     * A method that will handle the TextChanged client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlTextChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlTextChangedEventArgs): void;
+}
+/**
+ * Provides data for the TextChanged client event that allows you to respond to an end-user changing an edit box's text.
+ */
+interface ASPxClientUploadControlTextChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+}
+/**
+ * A method that will handle the ASPxUploadControl's client event, concerned with changes in upload progress.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventHandler<S> {
+    /**
+     * A method that will handle the ASPxUploadControl's client event concerning the uploading process being changed.
+     * @param source An object representing the event's source. Identifies the ASPxUploadControl object that raised the event.
+     * @param e An ASPxClientUploadControlUploadingProgressChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlUploadingProgressChangedEventArgs): void;
+}
+/**
+ * Provides data for the UploadingProgressChanged event.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the number of the files selected for upload.
+     * Value: An integer value that represents the total number of selected files.
+     */
+    fileCount: number;
+    /**
+     * Gets the name of the file being currently uploaded.
+     * Value: A string value that represents the file name.
+     */
+    currentFileName: string;
+    /**
+     * Gets the content length of the currently uploaded file.
+     * Value: An integer value specifying the content length.
+     */
+    currentFileContentLength: number;
+    /**
+     * Gets the content length of the current file already uploaded to the server.
+     * Value: An integer value that is the content length.
+     */
+    currentFileUploadedContentLength: number;
+    /**
+     * Gets the position of the current file upload progress.
+     * Value: An <see cref="Int32" /> value specifying the upload progress position.
+     */
+    currentFileProgress: number;
+    /**
+     * Gets the content length of the files selected for upload.
+     * Value: An integer value specifying the total content length of the selected files.
+     */
+    totalContentLength: number;
+    /**
+     * Gets the content length of the files already uploaded to the server.
+     * Value: An integer value that represents the content length.
+     */
+    uploadedContentLength: number;
+    /**
+     * Gets the current position of total upload progress.
+     * Value: An <see cref="Int32" /> value specifying the total upload progress position.
+     */
+    progress: number;
+}
+/**
+ * A method that will handle the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneEnter event.
+     * @param source The event source. This parameter identifies the upload control object which raised the event.
+     * @param e An ASPxClientUploadControlDropZoneEnterEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneEnterEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * A method that will handle the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneLeave event.
+     * @param source The event source. Identifies the upload control object that raised the event.
+     * @param e A ASPxClientUploadControlDropZoneLeaveEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneLeaveEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * The JavaScript equivalent of the ASPxChartDesigner class.
+ */
+interface ASPxClientChartDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientChartDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientChartDesignerSaveCommandExecuteEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Enables you to customize the menu actions of a Client Chart Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientChartDesignerCustomizeMenuActionsEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientChartDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the model of the Client Chart Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * For internal use.
+     */
+    GetJsonChartModel(): string;
+}
+/**
+ * A method that will handle the SaveCommandExecute  event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * Represents a method that will handle the SaveCommandExecute event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e A ASPxClientChartDesignerSaveCommandExecuteEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for a chart control's SaveCommandExecute event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value specifying whether an event has been handled.
+     * Value: true, if the event hasn't been handled by a control; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * Represents a method that will handle the CustomizeMenuActions events.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * Represents a method that will handle the CustomizeMenuActions event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e An ASPxClientChartDesignerCustomizeMenuActionsEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * An action of the Client Chart Designer's menu.
+ */
+interface ASPxClientChartDesignerMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when the Client Chart Designer's button is clicked.
+     * Value: The specific action implementation.
+     */
+    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;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the designer user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for a chart control's CustomizeMenuActions event on the client side.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns an array of the Client Chart Designer's menu actions.
+     * Value: An array of the ASPxClientChartDesignerMenuAction objects.
+     */
+    actions: ASPxClientChartDesignerMenuAction[];
+}
+/**
+ * A class which provides access to the entire hierarchy of chart elements on the client side.
+ */
+interface ASPxClientWebChartControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientWebChartControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is hot-tracked.
+     */
+    ObjectHotTracked: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs before crosshair items are drawn when the chart's contents are being drawn.
+     */
+    CustomDrawCrosshair: ASPxClientEvent<ASPxClientWebChartControlCustomDrawCrosshairEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is selected.
+     */
+    ObjectSelected: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Returns an ASPxClientWebChart object, which contains information about the hierarchy of a chart control, and provides access to the main properties of chart elements  on the client side.
+     */
+    GetChart(): ASPxClientWebChart;
+    /**
+     * Returns the printing options of the chart control.
+     */
+    GetPrintOptions(): ASPxClientChartPrintOptions;
+    /**
+     * Changes the mouse pointer, which is shown when the mouse is over the chart control, to the pointer with the specified name.
+     * @param cursor A string value representing the name of the desired cursor.
+     */
+    SetCursor(cursor: string): void;
+    /**
+     * Returns the specific chart element which is located under the test point.
+     * @param x An integer value that specifies the x coordinate of the test point.
+     * @param y An integer value that specifies the y coordinate of the test point.
+     */
+    HitTest(x: number, y: number): ASPxClientHitObject[];
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Prints the current chart on the client side.
+     */
+    Print(): void;
+    /**
+     * Loads a chart which should be customized from its object model.
+     * @param serializedChartObjectModel A String object representing the chart model.
+     */
+    LoadFromObjectModel(serializedChartObjectModel: string): void;
+    /**
+     * Exports a chart to the file of the specified format, and saves it to the disk.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Exports a chart to a file in the specified format, and saves it to disk, using the specified file name.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     * @param filename A string value specifying the file name, to which a chart should be exported. If this parameter is missing or set to an empty string, then the created file will be named using the client-side name of a chart.
+     */
+    SaveToDisk(format: string, filename: string): void;
+    /**
+     * Exports a report to the file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string  value specifying a format in which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Gets the main DOM (Document Object Model) element on a Web Page representing this ASPxClientWebChartControl object.
+     */
+    GetMainDOMElement(): Object;
+}
+/**
+ * A method that will handle the CustomDrawCrosshair  event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventHandler<S> {
+    /**
+     * A method that will handle the CustomDrawCrosshair event.
+     * @param source The event source. This parameter identifies the chartControl which raised the event.
+     * @param e An ASPxClientWebChartControlCustomDrawCrosshairEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlCustomDrawCrosshairEventArgs): void;
+}
+/**
+ * Provides data for a chart control's CustomDrawCrosshair event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets crosshair elements settings  to custom draw a crosshair cursor.
+     * Value: An  ASPxClientCrosshairElement object.
+     */
+    crosshairElements: ASPxClientCrosshairElement;
+    /**
+     * Gets the settings of crosshair axis label elements to customize their appearance.
+     * Value: An ASPxClientCrosshairAxisLabelElement object.
+     */
+    cursorCrosshairAxisLabelElements: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets crosshair line element settings that are used to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object that contains crosshair line element settings.
+     */
+    cursorCrosshairLineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Gets the settings of crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairGroupHeaderElement object.
+     */
+    crosshairGroupHeaderElements: ASPxClientCrosshairGroupHeaderElement;
+    /**
+     * Provides access to the settings of crosshair elements and crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairElementGroup object.
+     */
+    crosshairElementGroups: ASPxClientCrosshairElementGroup;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElement class.
+ */
+interface ASPxClientCrosshairElement {
+    /**
+     * Gets a series that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeries object which represents the series currently being painted.
+     */
+    Series: ASPxClientSeries;
+    /**
+     * Gets the series point that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeriesPoint object, representing the series point that a crosshair element hovers over.
+     */
+    Point: ASPxClientSeriesPoint;
+    /**
+     * Gets or sets the crosshair line element to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object, representing the crosshair line element.
+     */
+    LineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Provides access to the crosshair axis label element.
+     * Value: An ASPxClientCrosshairAxisLabelElement object, representing the crosshair axis label element.
+     */
+    AxisLabelElement: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets the crosshair label element.
+     * Value: An ASPxClientCrosshairSeriesLabelElement object, representing the crosshair label element.
+     */
+    LabelElement: ASPxClientCrosshairSeriesLabelElement;
+    /**
+     * Specifies whether the crosshair element is visible when implementing custom drawing in the crosshair cursor.
+     * Value: true, if the crosshair element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairLineElement class.
+ */
+interface ASPxClientCrosshairLineElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairAxisLabelElement class.
+ */
+interface ASPxClientCrosshairAxisLabelElement {
+}
+/**
+ * The client-side equivalent of the CrosshairGroupHeaderElement class.
+ */
+interface ASPxClientCrosshairGroupHeaderElement {
+}
+/**
+ * The client-side equivalent of the CrosshairLabelElement class.
+ */
+interface ASPxClientCrosshairSeriesLabelElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElementGroup class.
+ */
+interface ASPxClientCrosshairElementGroup {
+}
+/**
+ * Represents a method that will handle the ObjectSelected events.
+ */
+interface ASPxClientWebChartControlHotTrackEventHandler<S> {
+    /**
+     * Represents a method that will handle the ObjectSelected events.
+     * @param source The event source. This parameter identifies the ASPxClientWebChartControl which raised the event.
+     * @param e An ASPxClientWebChartControlHotTrackEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlHotTrackEventArgs): void;
+}
+/**
+ * Provides data for a chart control's ObjectSelected events on the client side.
+ */
+interface ASPxClientWebChartControlHotTrackEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Provides access on the client side to the chart element, for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, which represents the chart element for which the event was raised.
+     */
+    hitObject: ASPxClientWebChartElement;
+    /**
+     * Provides access on the client side to the object, which is in some way related to the object being hit. The returned value depends on the hitObject type and hit point location.
+     * Value: An ASPxClientWebChartElement object representing an additional object that relates to the one being hit.
+     */
+    additionalHitObject: ASPxClientWebChartElement;
+    /**
+     * Gets details on the chart elements located at the point where an end-user has clicked when hot-tracking or selecting a chart element on the client side.
+     * Value: An ASPxClientWebChartHitInfo object, which contains information about the chart elements located at the point where an end-user has clicked.
+     */
+    hitInfo: ASPxClientWebChartHitInfo;
+    /**
+     * Provides access on the client side to the chart and all its elements.
+     * Value: An ASPxClientWebChart object, which provides access to chart properties.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    absoluteX: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    absoluteY: number;
+    /**
+     * Gets a value indicating whether the hot-tracking or object selection should be canceled.
+     * Value: true to cancel the hot-tracking or selection of an object; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object under the hit test point within a chart control, on the client side.
+ */
+interface ASPxClientHitObject {
+    /**
+     * Gets the chart element for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, representing the chart element for which the event was raised.
+     */
+    Object: ASPxClientWebChartElement;
+    /**
+     * Provides access to an object, which is in some way related to the object being hit. The returned value depends on the Object type and hit point location.
+     * Value: An ASPxClientWebChartElement object that represents an additional object related to the one being hit.
+     */
+    AdditionalObject: ASPxClientWebChartElement;
+}
+/**
+ * Contains information about a specific test point within a chart control, on the client side.
+ */
+interface ASPxClientWebChartHitInfo {
+    /**
+     * Gets a value indicating whether the test point is within the chart.
+     * Value: true if the test point is within a chart; otherwise, false.
+     */
+    inChart: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the chart title.
+     * Value: true if the test point is within a chart title; otherwise, false.
+     */
+    inChartTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis.
+     * Value: true if the test point is within an axis; otherwise, false.
+     */
+    inAxis: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis label item.
+     * Value: true if the test point is within an axis label item; otherwise, false.
+     */
+    inAxisLabelItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis title.
+     * Value: true if the test point is within an axis title; otherwise, false.
+     */
+    inAxisTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the constant line.
+     * Value: true if the test point is within a constant line; otherwise, false.
+     */
+    inConstantLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the diagram.
+     * Value: true if the test point is within a diagram; otherwise, false.
+     */
+    inDiagram: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the non-default pane.
+     * Value: true if the test point is within a non-default pane; otherwise, false.
+     */
+    inNonDefaultPane: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the legend.
+     * Value: true if the test point is within a legend; otherwise, false.
+     */
+    inLegend: boolean;
+    /**
+     * Gets the value indicating whether or not the test point is within a custom legend item.
+     * Value: true if the test point is within a custom legend item; otherwise, false.
+     */
+    inCustomLegendItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series.
+     * Value: true if the test point is within a series; otherwise, false.
+     */
+    inSeries: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series label.
+     * Value: true if the test point is within a series label; otherwise, false.
+     */
+    inSeriesLabel: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series point.
+     * Value: true if the test point is within a series point; otherwise, false.
+     */
+    inSeriesPoint: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series title.
+     * Value: true if the test point is within a series title; otherwise, false.
+     */
+    inSeriesTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the trendline.
+     * Value: true if the test point is within a trendline; otherwise, false.
+     */
+    inTrendLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the Fibonacci Indicator.
+     * Value: true if the test point is within a Fibonacci Indicator; otherwise, false.
+     */
+    inFibonacciIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the regression line.
+     * Value: true if the test point is within a regression line; otherwise, false.
+     */
+    inRegressionLine: boolean;
+    /**
+     * Gets a value specifying whether the test point is within an indicator.
+     * Value: true if the test point is within an indicator; otherwise, false.
+     */
+    inIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within an annotation.
+     * Value: true if the test point is within an annotation; otherwise, false.
+     */
+    inAnnotation: boolean;
+    /**
+     * Gets a value indicating whether the test point is within a hyperlink.
+     * Value: true, if the test point is within a hyperlink; otherwise, false.
+     */
+    inHyperlink: boolean;
+    /**
+     * Gets the client-side chart instance from under the test point.
+     * Value: An ASPxClientWebChart object.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the client-side chart title instance from under the test point.
+     * Value: An ASPxClientChartTitle object.
+     */
+    chartTitle: ASPxClientChartTitle;
+    /**
+     * Gets the client-side axis instance from under the test point.
+     * Value: An ASPxClientAxisBase descendant.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the client-side constant line instance from under the test point.
+     * Value: An ASPxClientConstantLine object.
+     */
+    constantLine: ASPxClientConstantLine;
+    /**
+     * Gets the client-side diagram instance from under the test point.
+     * Value: An ASPxClientXYDiagramBase descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Gets the client-side non-default pane instance from under the test point.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    nonDefaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the client-side legend instance from under the test point.
+     * Value: An ASPxClientLegend object.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Gets a custom legend item which is located under the test point.
+     * Value: An ASPxClientCustomLegendItem object which represents the item located under the test point.
+     */
+    customLegendItem: ASPxClientCustomLegendItem;
+    /**
+     * Gets the client-side series instance from under the test point.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the client-side series label instance from under the test point.
+     * Value: An ASPxClientSeriesLabel object.
+     */
+    seriesLabel: ASPxClientSeriesLabel;
+    /**
+     * Gets the client-side series title instance from under the test point.
+     * Value: An ASPxClientSeriesTitle object.
+     */
+    seriesTitle: ASPxClientSeriesTitle;
+    /**
+     * Gets the client-side trendline instance from under the test point.
+     * Value: An ASPxClientTrendLine object.
+     */
+    trendLine: ASPxClientTrendLine;
+    /**
+     * Gets the client-side Fibonacci indicator instance from under the test point.
+     * Value: An ASPxClientFibonacciIndicator object.
+     */
+    fibonacciIndicator: ASPxClientFibonacciIndicator;
+    /**
+     * Gets the client-side regression line instance from under the test point.
+     * Value: An ASPxClientRegressionLine object.
+     */
+    regressionLine: ASPxClientRegressionLine;
+    /**
+     * Gets the client-side indicator instance from under the test point.
+     * Value: An ASPxClientIndicator descendant.
+     */
+    indicator: ASPxClientIndicator;
+    /**
+     * Gets the client-side annotation instance from under the test point.
+     * Value: An ASPxClientAnnotation object.
+     */
+    annotation: ASPxClientAnnotation;
+    /**
+     * Gets the client-side series point instance from under the test point.
+     * Value: An ASPxClientSeriesPoint object.
+     */
+    seriesPoint: ASPxClientSeriesPoint;
+    /**
+     * Gets the client-side axis label item instance from under the test point.
+     * Value: An ASPxClientAxisLabelItem object.
+     */
+    axisLabelItem: ASPxClientAxisLabelItem;
+    /**
+     * Gets the client-side axis title instance from under the test point.
+     * Value: An ASPxClientAxisTitle object.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Returns a hyperlink which is located under the test point.
+     * Value: A String object representing a hyperlink.
+     */
+    hyperlink: string;
+}
+/**
+ * Represents the client-side equivalent of the DiagramCoordinates class.
+ */
+interface ASPxClientDiagramCoordinates {
+    /**
+     * Gets the type of the argument scale.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets the type of the value scale.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the argument of the data point as a text string.
+     * Value: A string object, representing a data point's argument.
+     */
+    qualitativeArgument: string;
+    /**
+     * Gets the numerical representation of the data point's argument.
+     * Value: A Double value, representing the data point's argument.
+     */
+    numericalArgument: number;
+    /**
+     * Gets the date-time representation of the data point's argument.
+     * Value: A date object, representing the point's argument.
+     */
+    dateTimeArgument: Date;
+    /**
+     * Gets the numerical representation of the data point's value.
+     * Value: A Double value, representing the data point's value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the date-time representation of the data point's value.
+     * Value: A date object, representing the point's value.
+     */
+    dateTimeValue: Date;
+    /**
+     * Gets the X-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of arguments (X-axis).
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of values (Y-axis).
+     */
+    axisY: ASPxClientAxisBase;
+    /**
+     * Gets the pane of the diagram point.
+     * Value: An ASPxClientXYDiagramPane descendant, representing the pane.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Checks whether the current object represents a point outside the diagram area.
+     */
+    IsEmpty(): boolean;
+    /**
+     * Gets the value of the client-side axis instance.
+     * @param axis An ASPxClientAxisBase class descendant, representing the axis that contains the requested value.
+     */
+    GetAxisValue(axis: ASPxClientAxisBase): ASPxClientAxisValue;
+}
+/**
+ * Contains the information about an axis value.
+ */
+interface ASPxClientAxisValue {
+    /**
+     * Gets the axis scale type.
+     * Value: A String value, specifying the axis scale type.
+     */
+    scaleType: string;
+    /**
+     * Gets the axis value, if the axis scale type is qualitative.
+     * Value: A String value, specifying the axis value.
+     */
+    qualitativeValue: string;
+    /**
+     * Gets the axis value, if the axis scale type is numerical.
+     * Value: A Double value, specifying the axis value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the axis value, if the axis scale type is date-time.
+     * Value: A DateTime value, specifying the axis value.
+     */
+    dateTimeValue: Date;
+}
+/**
+ * Represents the client-side equivalent of the ControlCoordinates class.
+ */
+interface ASPxClientControlCoordinates {
+    /**
+     * Gets the point's pane.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the point's X-coordinate, in pixels.
+     * Value: An integer value, specifying the X-coordinate (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the point's Y-coordinate, in pixels.
+     * Value: An integer value, specifying the Y-coordinate (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the point's visibility state.
+     * Value: "Visible", "Hidden", or "Undefined".
+     */
+    visibility: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartElement class.
+ */
+interface ASPxClientWebChartElement {
+    /**
+     * Gets the chart that owns the current chart element.
+     * Value: An ASPxClientWebChart object, to which the chart element belongs.
+     */
+    chart: ASPxClientWebChart;
+}
+/**
+ * Represents a base class for chart elements, which are not necessarily required to be present on the client side.
+ */
+interface ASPxClientWebChartEmptyElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents a base class for chart elements, which are required to be present on the client side.
+ */
+interface ASPxClientWebChartRequiredElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents the client-side equivalent of the ChartElementNamed class.
+ */
+interface ASPxClientWebChartElementNamed extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the name of the chart element.
+     * Value: A string object representing the name of the chart element.
+     */
+    name: string;
+}
+/**
+ * Represents the client-side equivalent of the WebChartControl control.
+ */
+interface ASPxClientWebChart extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the client-side Chart Control that owns the current chart.
+     * Value: An ASPxClientWebChartControl object, to which the chart belongs.
+     */
+    chartControl: ASPxClientWebChartControl;
+    /**
+     * Gets the chart's diagram and provides access to its settings.
+     * Value: An ASPxClientRadarDiagram),  that represents the chart's diagram.
+     */
+    diagram: ASPxClientWebChartElement;
+    /**
+     * Provides access to the chart's collection of series.
+     * Value: An array of ASPxClientSeries objects that represent the collection of series.
+     */
+    series: ASPxClientSeries[];
+    /**
+     * Provides access to the collection of chart titles.
+     * Value: An array of ASPxClientChartTitle objects, that represent the collection of chart titles.
+     */
+    titles: ASPxClientChartTitle[];
+    /**
+     * Provides access to the chart's collection of annotations.
+     * Value: An array of ASPxClientAnnotation objects, representing the collection of annotations.
+     */
+    annotations: ASPxClientAnnotation[];
+    /**
+     * Gets the chart's legend and provides access to its settings.
+     * Value: An ASPxClientLegend object that represents the chart's legend.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Returns the collection of legends.
+     * Value: An array of ASPxClientLegend objects.
+     */
+    legends: ASPxClientLegend[];
+    /**
+     * Gets the name of the appearance, which is currently used to draw the chart's elements.
+     * Value: A string value that represents the appearance name.
+     */
+    appearanceName: string;
+    /**
+     * Gets the name of the palette currently used to draw the chart's series.
+     * Value: A string value that represents the palette name.
+     */
+    paletteName: string;
+    /**
+     * Gets a value indicating whether series tooltips should be shown.
+     * Value: true to show tooltips for series; otherwise, false.
+     */
+    showSeriesToolTip: boolean;
+    /**
+     * Gets a value indicating whether point tooltips should be shown.
+     * Value: true to show tooltips for series points; otherwise, false.
+     */
+    showPointToolTip: boolean;
+    /**
+     * Gets a value indicating whether a crosshair cursor should be shown.
+     * Value: true to show a crosshair cursor; otherwise, false.
+     */
+    showCrosshair: boolean;
+    /**
+     * Gets a value that contains information on how the tooltip position is defined, for example, relative to a mouse pointer or chart element.
+     * Value: An ASPxClientToolTipPosition class descendant that defines the tooltip position type.
+     */
+    toolTipPosition: ASPxClientToolTipPosition;
+    /**
+     * Returns the tooltip controller that shows tooltips for chart elements.
+     * Value: An ASPxClientToolTipController object.
+     */
+    toolTipController: ASPxClientToolTipController;
+    /**
+     * Gets the settings for a crosshair cursor concerning its position and appearance on a diagram.
+     * Value: An ASPxClientCrosshairOptions object descendant which provides access to crosshair cursor options on a diagram.
+     */
+    crosshairOptions: ASPxClientCrosshairOptions;
+    /**
+     * Gets a css postfix for a chart.
+     * Value: A string value.
+     */
+    cssPostfix: string;
+    /**
+     * Gets or sets a value which specifies how the chart elements are selected.
+     * Value: A String object representing the name of the selection mode.
+     */
+    selectionMode: string;
+}
+/**
+ * Represents the client-side equivalent of the SimpleDiagram class.
+ */
+interface ASPxClientSimpleDiagram extends ASPxClientWebChartEmptyElement {
+}
+/**
+ * Represents the base class for all diagram classes, which have X and Y axes.
+ */
+interface ASPxClientXYDiagramBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the X-axis.
+     * Value: An ASPxClientAxisBase object which represents the X-axis.
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis.
+     * Value: An ASPxClientAxisBase object which represents the Y-axis.
+     */
+    axisY: ASPxClientAxisBase;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram2D class.
+ */
+interface ASPxClientXYDiagram2D extends ASPxClientXYDiagramBase {
+    /**
+     * Provides access to a collection of secondary X-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesX: ASPxClientAxis[];
+    /**
+     * Provides access to a collection of secondary Y-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesY: ASPxClientAxis[];
+    /**
+     * Provides access to a default pane object.
+     * Value: An ASPxClientXYDiagramPane object which represents the default pane of a chart.
+     */
+    defaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Provides access to an array of a diagram's panes.
+     * Value: An array of ASPxClientXYDiagramPane objects.
+     */
+    panes: ASPxClientXYDiagramPane[];
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     * @param axisX An ASPxClientAxis2D descendant, representing the X-axis.
+     * @param axisY An ASPxClientAxis2D descendant, representing the Y-axis.
+     * @param pane An ASPxClientXYDiagramPane object, representing the pane.
+     */
+    DiagramToPoint(argument: Object, value: Object, axisX: ASPxClientAxis2D, axisY: ASPxClientAxis2D, pane: ASPxClientXYDiagramPane): ASPxClientControlCoordinates;
+    /**
+     * Shows the Crosshair Cursor at the point with the specified coordinates.
+     * @param screenX The horizontal coordinate that is related to the top-left angle of the chart.
+     * @param screenY The vertical coordinate that is related to the top-left angle of the chart.
+     */
+    ShowCrosshair(screenX: number, screenY: number): void;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram class.
+ */
+interface ASPxClientXYDiagram extends ASPxClientXYDiagram2D {
+    /**
+     * Gets a value indicating whether the diagram is rotated.
+     * Value: true if the diagram is rotated; otherwise, false.
+     */
+    rotated: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagram class.
+ */
+interface ASPxClientSwiftPlotDiagram extends ASPxClientXYDiagram2D {
+}
+/**
+ * Represents the client-side equivalent of the XYDiagramPane class.
+ */
+interface ASPxClientXYDiagramPane extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the diagram that owns the current pane object.
+     * Value: An ASPxClientXYDiagram object, to which the pane belongs.
+     */
+    diagram: ASPxClientXYDiagram;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram3D class.
+ */
+interface ASPxClientXYDiagram3D extends ASPxClientXYDiagramBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarDiagram class.
+ */
+interface ASPxClientRadarDiagram extends ASPxClientXYDiagramBase {
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     */
+    DiagramToPoint(argument: Object, value: Object): ASPxClientControlCoordinates;
+}
+/**
+ * Represents the client-side equivalent of the AxisBase class.
+ */
+interface ASPxClientAxisBase extends ASPxClientWebChartElementNamed {
+    /**
+     * Provides access to the XY-diagram which contains the current axis.
+     * Value: An ASPxClientXYDiagramBase class descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Provides acess to the range of the axis coordinates.
+     * Value: An ASPxClientAxisRange object, which contains the common range settings of the axis coordinates.
+     */
+    range: ASPxClientAxisRange;
+}
+/**
+ * Represents the client-side equivalent of the Axis2D class.
+ */
+interface ASPxClientAxis2D extends ASPxClientAxisBase {
+    /**
+     * Provides access to an axis title object.
+     * Value: An ASPxClientAxisTitle object which represents the axis title.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Provides access to the axis strips collection.
+     * Value: An array of ASPxClientStrip objects.
+     */
+    strips: ASPxClientStrip[];
+    /**
+     * Provides access to the collection of the axis constant lines.
+     * Value: An array of ASPxClientConstantLine objects which represent constant lines that belong to this axis.
+     */
+    constantLines: ASPxClientConstantLine[];
+}
+/**
+ * Represents the client-side equivalent of the Axis class.
+ */
+interface ASPxClientAxis extends ASPxClientAxis2D {
+    /**
+     * Gets a value indicating whether the axis is reversed.
+     * Value: true if the axis is reversed; otherwise, false.
+     */
+    reverse: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagramAxis class.
+ */
+interface ASPxClientSwiftPlotDiagramAxis extends ASPxClientAxis2D {
+}
+/**
+ * Represents the client-side equivalent of the Axis3D class.
+ */
+interface ASPxClientAxis3D extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarAxis class.
+ */
+interface ASPxClientRadarAxis extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the AxisTitle class.
+ */
+interface ASPxClientAxisTitle extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which the axis title belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of the axis title.
+     * Value: A string object which contains the axis title's text.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the AxisLabelItem class.
+ */
+interface ASPxClientAxisLabelItem extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which an axis label item belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of an axis label item.
+     * Value: A string object which contains the axis label item's text.
+     */
+    text: string;
+    /**
+     * Gets the axis value to which an axis label item corresponds.
+     * Value: An object that specifies the axis value.
+     */
+    axisValue: Object;
+    /**
+     * Gets the internal representation of the axis value to which an axis label item corresponds.
+     * Value: A Double value which specifies the internal representation of the axis value.
+     */
+    axisValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the AxisRange class.
+ */
+interface ASPxClientAxisRange extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis that owns the current axis range object.
+     * Value: An ASPxClientAxisBase object, to which the axis range belongs.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the minimum value to display on an axis.
+     * Value: An object representing the minimum value of the axis range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value to display on an axis.
+     * Value: An object representing the maximum value of the axis range.
+     */
+    maxValue: Object;
+    /**
+     * Gets the internal float representation of the range minimum value.
+     * Value: A Double value which specifies the internal representation of the range minimum value.
+     */
+    minValueInternal: number;
+    /**
+     * Gets the internal float representation of the range maximum value.
+     * Value: A Double value which specifies the internal representation of the range maximum value.
+     */
+    maxValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the Strip class.
+ */
+interface ASPxClientStrip extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current strip object.
+     * Value: An ASPxClientAxis object, to which the strip belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the minimum value of the strip's range.
+     * Value: An object that represents the minimum value of the strip's range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value of the strip's range.
+     * Value: An object that represents the maximum value of the strip's range.
+     */
+    maxValue: Object;
+}
+/**
+ * Represents the client-side equivalent of the ConstantLine class.
+ */
+interface ASPxClientConstantLine extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current constant line object.
+     * Value: An ASPxClientAxis object, to which the constant line belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the constant line's position along the axis.
+     * Value: An object that specifies the constant line's position.
+     */
+    value: Object;
+    /**
+     * Gets the constant line title.
+     * Value: A string object, representing the title's text.
+     */
+    title: string;
+}
+/**
+ * Represents the client-side equivalent of the Series class.
+ */
+interface ASPxClientSeries extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets a value that specifies the view type of the series.
+     * Value: A string object which contains the current view type.
+     */
+    viewType: string;
+    /**
+     * Gets a value that specifies the scale type for the argument data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets a value that specifies the scale type for the value data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the X-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the X-axis name.
+     */
+    axisX: string;
+    /**
+     * Gets the Y-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Gets the pane that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the pane's name.
+     */
+    pane: string;
+    /**
+     * Gets a value indicating whether the series is visible.
+     * Value: true if the series is visible; otherwise, false.
+     */
+    visible: boolean;
+    /**
+     * Gets a value that specifies whether or not a tooltip is enabled for a chart.
+     * Value: true - a tooltip is enabled for a chart; false - a tooltip is disabled.
+     */
+    toolTipEnabled: boolean;
+    /**
+     * Gets the text to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets an image to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipImage: string;
+    /**
+     * Gets the settings of series labels.
+     * Value: An ASPxClientSeriesLabel object, which provides the series label settings.
+     */
+    label: ASPxClientSeriesLabel;
+    /**
+     * Gets the series' collection of data points.
+     * Value: An array of ASPxClientSeriesPoint objects, that represent the series' data points.
+     */
+    points: ASPxClientSeriesPoint[];
+    /**
+     * Provides access to the collection of series titles.
+     * Value: An array of ASPxClientSeriesTitle objects, that represent the collection of series titles.
+     */
+    titles: ASPxClientSeriesTitle[];
+    /**
+     * Gets the series' collection of indicators.
+     * Value: An array of ASPxClientIndicator objects, that belong to the series.
+     */
+    indicators: ASPxClientIndicator[];
+    /**
+     * Provides access to the collection of regression lines.
+     * Value: An array of ASPxClientRegressionLine objects which represent regression lines available for the series.
+     */
+    regressionLines: ASPxClientRegressionLine[];
+    /**
+     * Provides access to the collection of trendlines.
+     * Value: An array of ASPxClientTrendLine objects, that represent the collection of trendlines.
+     */
+    trendLines: ASPxClientTrendLine[];
+    /**
+     * Provides access to the collection of Fibonacci Indicators.
+     * Value: An array of ASPxClientFibonacciIndicator objects, that represent the collection of Fibonacci Indicators.
+     */
+    fibonacciIndicators: ASPxClientFibonacciIndicator[];
+    /**
+     * Gets the color of a series.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets a value that defines a group for stacked series.
+     * Value: A string value.
+     */
+    stackedGroup: string;
+    /**
+     * Gets a string which represents the pattern specifying the text to be displayed within a crosshair label for the current Series  type.
+     * Value: A Empty.
+     */
+    crosshairLabelPattern: string;
+    /**
+     * This property is intended for internal use only.
+     * Value: A String value.
+     */
+    groupedElementsPattern: string;
+    /**
+     * Returns a collection of crosshair value items.
+     * Value: An array of ASPxClientCrosshairValueItem objects.
+     */
+    crosshairValueItems: ASPxClientCrosshairValueItem[];
+    /**
+     * Gets a value indicating whether a crosshair cursor is enabled.
+     * Value: true if a crosshair cursor is enabled; otherwise, false.
+     */
+    actualCrosshairEnabled: boolean;
+    /**
+     * Gets a value indicating whether a crosshair label should be shown for this series.
+     * Value: true if crosshair labels are visible; otherwise, false.
+     */
+    actualCrosshairLabelVisibility: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SeriesLabelBase class.
+ */
+interface ASPxClientSeriesLabel extends ASPxClientWebChartElement {
+    /**
+     * Gets the series that owns the current series label object.
+     * Value: An ASPxClientSeries object, to which the series label belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the common text for all series point labels.
+     * Value: Returns an empty string object.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the SeriesPoint class.
+ */
+interface ASPxClientSeriesPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the series that owns the current series point object.
+     * Value: An ASPxClientSeries object, to which the series point belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the data point's argument.
+     * Value: An object that specifies the data point's argument.
+     */
+    argument: Object;
+    /**
+     * Gets the point's data value(s).
+     * Value: An array of objects that represent the data value(s) of the series data point.
+     */
+    values: Object[];
+    /**
+     * Gets the text to be displayed within series points tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets the color of a series point.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets the percent value of a series point.
+     * Value: A float value.
+     */
+    percentValue: number;
+    /**
+     * Gets a hint that is shown in series points tooltips.
+     * Value: A string value.
+     */
+    toolTipHint: string;
+}
+/**
+ * Represents the client-side equivalent of the Legend class.
+ */
+interface ASPxClientLegend extends ASPxClientWebChartEmptyElement {
+    /**
+     * Returns a value which determines whether to use checkboxes instead of markers on a chart legend for all legend items.
+     * Value: true, if legend checkboxes are shown instead of markers for all legend items; otherwise, false.
+     */
+    useCheckBoxes: boolean;
+    /**
+     * Returns a collection of custom legend items of the legend.
+     * Value: A collection of ASPxClientCustomLegendItem objects.
+     */
+    customItems: ASPxClientCustomLegendItem[];
+    /**
+     * Returns the name of the legend.
+     * Value: The string value representing the name of the legend.
+     */
+    name: string;
+}
+/**
+ * Represents the base for ASPxClientSeriesTitle classes.
+ */
+interface ASPxClientTitleBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the lines of text within a title.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+    /**
+     * Gets the alignment of the title.
+     * Value: A string value containing the text, which specifies the alignment of a title.
+     */
+    alignment: string;
+    /**
+     * Gets a value that specifies to which edges of a parent element the title should be docked.
+     * Value: A string value.
+     */
+    dock: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartTitle class.
+ */
+interface ASPxClientChartTitle extends ASPxClientTitleBase {
+}
+/**
+ * Represents the client-side equivalent of the SeriesTitle class.
+ */
+interface ASPxClientSeriesTitle extends ASPxClientTitleBase {
+    /**
+     * Gets the series that owns the current title object.
+     * Value: An ASPxClientSeries object, to which the series title belongs.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the Indicator class.
+ */
+interface ASPxClientIndicator extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the indicator's associated series.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicator class.
+ */
+interface ASPxClientFinancialIndicator extends ASPxClientIndicator {
+    /**
+     * Gets the first point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's first point.
+     */
+    point1: ASPxClientFinancialIndicatorPoint;
+    /**
+     * Gets the second point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's second point.
+     */
+    point2: ASPxClientFinancialIndicatorPoint;
+}
+/**
+ * Represents the client-side equivalent of the TrendLine class.
+ */
+interface ASPxClientTrendLine extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FibonacciIndicator class.
+ */
+interface ASPxClientFibonacciIndicator extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicatorPoint class.
+ */
+interface ASPxClientFinancialIndicatorPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the financial indicator that owns the current financial indicator point.
+     * Value: An ASPxClientFinancialIndicator object, to which the point belongs.
+     */
+    financialIndicator: ASPxClientFinancialIndicator;
+    /**
+     * Gets the argument of the financial indicator's point.
+     * Value: An object that specifies the point argument.
+     */
+    argument: Object;
+    /**
+     * Gets a value, indicating how the value of a financial indicator's point is obtained.
+     * Value: A string value, which indicates how to obtain a financial indicator point's value.
+     */
+    valueLevel: string;
+}
+/**
+ * The client-side equivalent of the SingleLevelIndicator class.
+ */
+interface ASPxClientSingleLevelIndicator extends ASPxClientIndicator {
+    /**
+     * Gets a value specifying the value level to which the single-level indicator corresponds.
+     * Value: A string value.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RegressionLine class.
+ */
+interface ASPxClientRegressionLine extends ASPxClientSingleLevelIndicator {
+}
+/**
+ * The client-side equivalent of the MovingAverage class.
+ */
+interface ASPxClientMovingAverage extends ASPxClientSingleLevelIndicator {
+    /**
+     * Gets the number of data points used to calculate the moving average.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value specifying whether to display a Moving Average, Envelope, or both.
+     * Value: A string value.
+     */
+    kind: string;
+    /**
+     * Gets a value specifying the Envelope percent.
+     * Value: A double value which specifies the Envelope percent.
+     */
+    envelopePercent: number;
+}
+/**
+ * The client-side equivalent of the SimpleMovingAverage class.
+ */
+interface ASPxClientSimpleMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the ExponentialMovingAverage class.
+ */
+interface ASPxClientExponentialMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the WeightedMovingAverage class.
+ */
+interface ASPxClientWeightedMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the TriangularMovingAverage class.
+ */
+interface ASPxClientTriangularMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTema class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTema extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the BollingerBands class.
+ */
+interface ASPxClientBollingerBands extends ASPxClientIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MedianPrice class.
+ */
+interface ASPxClientMedianPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the TypicalPrice class.
+ */
+interface ASPxClientTypicalPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the WeightedClose class.
+ */
+interface ASPxClientWeightedClose extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the SeparatePaneIndicator class.
+ */
+interface ASPxSeparatePaneIndicator extends ASPxClientIndicator {
+    /**
+     * Returns the name of the Y-axis that is used to plot the current indicator on a ASPxClientXYDiagram.
+     * Value: A string value specifying the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Returns the name of a pane, used to plot the separate pane indicator on an XYDiagram.
+     * Value: A string that is the name of a pane.
+     */
+    pane: string;
+}
+/**
+ * Represents the client-side equivalent of the AverageTrueRange class.
+ */
+interface ASPxClientAverageTrueRange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the ChaikinsVolatility class.
+ */
+interface ASPxClientChaikinsVolatility extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the CommodityChannelIndex class.
+ */
+interface ASPxClientCommodityChannelIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the DetrendedPriceOscillator class.
+ */
+interface ASPxClientDetrendedPriceOscillator extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MassIndex class.
+ */
+interface ASPxClientMassIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the count of points used to calculate the exponential moving average (EMA).
+     * Value: An integer value, specifying the count of points used to calculate EMA.
+     */
+    movingAveragePointsCount: number;
+    /**
+     * Returns the count of summable values.
+     * Value: An integer value specifying the count of summable ratios.
+     */
+    sumPointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the MovingAverageConvergenceDivergence class.
+ */
+interface ASPxClientMovingAverageConvergenceDivergence extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the short period value required to calculate the indicator.
+     * Value: An integer value specifying the short period value.
+     */
+    shortPeriod: number;
+    /**
+     * Returns the long period value required to calculate the indicator.
+     * Value: An integer value specifying the long period.
+     */
+    longPeriod: number;
+    /**
+     * Returns the smoothing period value required to calculate the indicator.
+     * Value: An integer value specifying the smoothing period value.
+     */
+    signalSmoothingPeriod: number;
+}
+/**
+ * Represents the client-side equivalent of the RateOfChange class.
+ */
+interface ASPxClientRateOfChange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RelativeStrengthIndex class.
+ */
+interface ASPxClientRelativeStrengthIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviation class.
+ */
+interface ASPxClientStandardDeviation extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTrix class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTrix extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the WilliamsR class.
+ */
+interface ASPxClientWilliamsR extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the FixedValueErrorBars class.
+ */
+interface ASPxClientFixedValueErrorBars extends ASPxClientIndicator {
+    /**
+     * Gets or sets the fixed positive error value.
+     * Value: A double value specifying the positive error value.
+     */
+    positiveError: number;
+    /**
+     * Returns the fixed negative error value.
+     * Value: A double value specifying the negative error value.
+     */
+    negativeError: number;
+}
+/**
+ * Represents the client-side equivalent of the PercentageErrorBars class.
+ */
+interface ASPxClientPercentageErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the value specifying the percentage of error values of series point values.
+     * Value: A double value specifying the percentage. Values less than or equal to 0 are not allowed.
+     */
+    percent: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviationErrorBars class.
+ */
+interface ASPxClientStandardDeviationErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the multiplier on which the standard deviation value is multiplied before display.
+     * Value: A double value specifying the multiplier. Values less than 0 are not allowed.
+     */
+    multiplier: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardErrorBars class.
+ */
+interface ASPxClientStandardErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the DataSourceBasedErrorBars class.
+ */
+interface ASPxClientDataSourceBasedErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the Annotation class.
+ */
+interface ASPxClientAnnotation extends ASPxClientWebChartElementNamed {
+}
+/**
+ * Represents the client-side equivalent of the TextAnnotation class.
+ */
+interface ASPxClientTextAnnotation extends ASPxClientAnnotation {
+    /**
+     * Gets the lines of text within an annotation.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+}
+/**
+ * Represents the client-side equivalent of the ImageAnnotation class.
+ */
+interface ASPxClientImageAnnotation extends ASPxClientAnnotation {
+}
+/**
+ * The client-side equivalent of the CrosshairValueItem class.
+ */
+interface ASPxClientCrosshairValueItem {
+    /**
+     * Gets the value that is displayed in a crosshair label.
+     * Value: A float value.
+     */
+    value: number;
+    /**
+     * Gets an index of a point for which this crosshair value item is displayed.
+     * Value: An integer value.
+     */
+    pointIndex: number;
+}
+/**
+ * The client-side equivalent of the ChartToolTipController class.
+ */
+interface ASPxClientToolTipController extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether an image should be shown in tooltips.
+     * Value: true to show an image in tooltips; otherwise, false.
+     */
+    showImage: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show text in tooltips.
+     * Value: true to show text in tooltips; otherwise, false.
+     */
+    showText: boolean;
+    /**
+     * Gets a value that defines the position of an image within a tooltip.
+     * Value: A string value.
+     */
+    imagePosition: string;
+    /**
+     * Gets a value that defines when tooltips should be invoked.
+     * Value: A string value.
+     */
+    openMode: string;
+}
+/**
+ * The client-side equivalent of the ToolTipPosition class.
+ */
+interface ASPxClientToolTipPosition {
+}
+/**
+ * The client-side equivalent of the ToolTipRelativePosition class.
+ */
+interface ASPxClientToolTipRelativePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the ToolTipFreePosition class.
+ */
+interface ASPxClientToolTipFreePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+    /**
+     * Gets the ID of a pane.
+     * Value: An integer value.
+     */
+    paneID: number;
+    /**
+     * Gets an object containing settings that define how a tooltip should be docked.
+     * Value: A string value.
+     */
+    dockPosition: string;
+}
+/**
+ * The client-side equivalent of the CrosshairLabelPosition class.
+ */
+interface ASPxClientCrosshairPosition {
+    /**
+     * Gets the horizontal offset of a crosshair cursor.
+     * Value: An integer value that is the X-offset.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a crosshair cursor.
+     * Value: An integer value that is the Y-offset.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the CrosshairMousePosition class.
+ */
+interface ASPxClientCrosshairMousePosition extends ASPxClientCrosshairPosition {
+}
+/**
+ * The client-side equivalent of the CrosshairFreePosition class.
+ */
+interface ASPxClientCrosshairFreePosition extends ASPxClientCrosshairPosition {
+    /**
+     * Gets a Pane's ID when the crosshair cursor is in the free position mode.
+     * Value: An integer value that is the pane's ID.
+     */
+    paneID: number;
+    /**
+     * Gets a string containing information on a crosshair label's dock position when the crosshair cursor is in the free position mode.
+     * Value: A string value containing information on a crosshair label's dock position.
+     */
+    dockPosition: string;
+}
+/**
+ * Defines line style settings.
+ */
+interface ASPxClientLineStyle extends ASPxClientWebChartElement {
+    /**
+     * Gets the dash style used to paint the line.
+     * Value: A string value that contains information about the style used to paint the line.
+     */
+    dashStyle: string;
+    /**
+     * Gets the thickness that corresponds to the value of the current ASPxClientLineStyle object.
+     * Value: An integer value which specifies the thickness, in pixels.
+     */
+    thickness: number;
+    /**
+     * Returns the join style for the ends of consecutive lines.
+     * Value: A string representing the name of the line join type.
+     */
+    lineJoin: string;
+}
+/**
+ * The client-side equivalent of the CrosshairOptions class.
+ */
+interface ASPxClientCrosshairOptions extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the X-axis.
+     * Value: true to show a crosshair label for the X-axis; otherwise, false.
+     */
+    showAxisXLabels: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the Y-axis.
+     * Value: true to show the crosshair label for the Y-axis; otherwise, false.
+     */
+    showAxisYLabels: boolean;
+    /**
+     * Gets a value that defines whether a crosshair label of a series point indicated by a crosshair cursor is shown on a diagram.
+     * Value: true if a crosshair label indicated by a crosshair cursor is shown on a diagram; otherwise, false.
+     */
+    showCrosshairLabels: boolean;
+    /**
+     * Gets a value that indicates whether a crosshair cursor argument line is shown for a series point on a diagram.
+     * Value: true if a crosshair cursor argument line is displayed on a diagram;  otherwise, false.
+     */
+    showArgumentLine: boolean;
+    /**
+     * Specifies whether to show a value line of a series point indicated by a crosshair cursor on a diagram.
+     * Value: true to display a value line indicated by a crosshair cursor on a diagram; otherwise, false.
+     */
+    showValueLine: boolean;
+    /**
+     * Gets a value that specifies whether to show a crosshair cursor in a focused pane only.
+     * Value: true to display a crosshair cursor in a focused pane; otherwise, false.
+     */
+    showOnlyInFocusedPane: boolean;
+    /**
+     * Specifies the current snap mode of a crosshair cursor.
+     * Value: A string value.
+     */
+    snapMode: string;
+    /**
+     * Specifies the way in which the crosshair label is shown for a series on a diagram.
+     * Value: A string value that specifies how the crosshair label is shown for a series.
+     */
+    crosshairLabelMode: string;
+    /**
+     * Gets a value that indicates whether to show a header for each series group in crosshair cursor labels.
+     * Value: true, to show a group header in crosshair cursor labels; otherwise, false.
+     */
+    showGroupHeaders: boolean;
+    /**
+     * Gets a string which represents the  pattern specifying the group header text to be displayed within the crosshair label.
+     * Value: A String, which represents the group header's pattern.
+     */
+    groupHeaderPattern: string;
+    /**
+     * Gets a value that specifies whether the Crosshair cursor should show points that are out of visual range.
+     * Value: true if the out of visual range points should be shown in the Crosshair label; otherwise false.
+     */
+    showOutOfRangePoints: boolean;
+    /**
+     * Gets the identifier specifying the behavior of the selection of points shown in the crosshair label.
+     * Value: The selection behavior identifier.
+     */
+    valueSelectionMode: string;
+    /**
+     * Gets the color of a crosshair argument line.
+     * Value: A String value, specifying the color of a crosshair argument line.
+     */
+    argumentLineColor: string;
+    /**
+     * Gets the color of a crosshair value line.
+     * Value: A String value, specifying the color of a crosshair value line.
+     */
+    valueLineColor: string;
+}
+/**
+ * The chart print options storage.
+ */
+interface ASPxClientChartPrintOptions {
+    /**
+     * Gets the size mode used to print a chart.
+     */
+    GetSizeMode(): string;
+    /**
+     * Sets the size mode used to print a chart.
+     * @param sizeMode A System.String object, specifying the name of the size mode.
+     */
+    SetSizeMode(sizeMode: string): void;
+    /**
+     * Gets a value indicating that the landscape orientation will be used to print a chart.
+     */
+    GetLandscape(): boolean;
+    /**
+     * Sets a value indicating that the landscape orientation will be used to print a chart.
+     * @param landscape A Boolean value, specifying that the landscape orientation will be used to print a chart.
+     */
+    SetLandscape(landscape: boolean): void;
+    /**
+     * Gets the left margin which will be used to print a chart.
+     */
+    GetMarginLeft(): number;
+    /**
+     * Sets the left margin which will be used to print a chart.
+     * @param marginLeft A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginLeft(marginLeft: number): void;
+    /**
+     * Gets the top margin which will be used to print a chart.
+     */
+    GetMarginTop(): number;
+    /**
+     * Sets the top margin which will be used to print a chart.
+     * @param marginTop A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginTop(marginTop: number): void;
+    /**
+     * Gets the right margin which will be used to print a chart.
+     */
+    GetMarginRight(): number;
+    /**
+     * Sets the right margin which will be used to print a chart.
+     * @param marginRight A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginRight(marginRight: number): void;
+    /**
+     * Gets the bottom margin which will be used to print a chart.
+     */
+    GetMarginBottom(): number;
+    /**
+     * Sets the bottom margin which will be used to print a chart.
+     * @param marginBottom A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginBottom(marginBottom: number): void;
+    /**
+     * Gets the predefined size ratio of the paper which will be used to print a chart.
+     */
+    GetPaperKind(): string;
+    /**
+     * Sets the predefined size ratio of the paper which will be used to print a chart.
+     * @param paperKind A System.String object, specifying the name of a size ratio.
+     */
+    SetPaperKind(paperKind: string): void;
+    /**
+     * Gets the custom paper width which will be used to print a chart.
+     */
+    GetCustomPaperWidth(): number;
+    /**
+     * Sets the custom paper width which will be used to print a chart.
+     * @param customPaperWidth A System.Int32 object, specifying the width in hundredths of an inch.
+     */
+    SetCustomPaperWidth(customPaperWidth: number): void;
+    /**
+     * Gets the custom paper height which will be used to print a chart.
+     */
+    GetCustomPaperHeight(): number;
+    /**
+     * Sets the custom paper height which will be used to print a chart.
+     * @param customPaperHeight A System.Int32 object, specifying the height in hundredths of an inch.
+     */
+    SetCustomPaperHeight(customPaperHeight: number): void;
+    /**
+     * Gets the name of the custom paper width-height ratio used to print the chart.
+     */
+    GetCustomPaperName(): string;
+    /**
+     * Sets the name of the custom paper width-height ratio used to print a chart.
+     * @param customPaperName A String object, specifying the name of the custom paper width-height ratio.
+     */
+    SetCustomPaperName(customPaperName: string): void;
+}
+/**
+ * Represents the client-side equivalent of the CustomLegendItem class.
+ */
+interface ASPxClientCustomLegendItem extends ASPxClientWebChartElementNamed {
+    /**
+     * Returns the text displayed by the custom legend item.
+     * Value: A string value that specifies legend item text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxDocumentViewer control.
+ */
+interface ASPxClientDocumentViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDocumentViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when the value of an item within the Document Viewer's report toolbar is changed.
+     */
+    ToolbarItemValueChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when an item within the Document Viewer's report toolbar is clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client side when a report page is loaded into this ASPxClientDocumentViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Provides access to the Splitter of the ASPxClientDocumentViewer.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Provides access to the ASPxClientDocumentViewer's preview that exposes methods to print and export the document.
+     */
+    GetViewer(): ASPxClientReportViewer;
+    /**
+     * Provides access to the Document Viewer toolbar on the client.
+     */
+    GetToolbar(): ASPxClientReportToolbar;
+    /**
+     * Provides access to the Ribbon of the ASPxClientDocumentViewer.
+     */
+    GetRibbonToolbar(): ASPxClientRibbon;
+    /**
+     * Provides access to the parameters panel of the ASPxClientDocumentViewer.
+     */
+    GetParametersPanel(): ASPxClientReportParametersPanel;
+    /**
+     * Provides access to the document of the ASPxClientDocumentViewer.
+     */
+    GetDocumentMap(): ASPxClientReportDocumentMap;
+    /**
+     * Sets focus on the report control specified by its bookmark.
+     * @param pageIndex An integer value, specifying the page index.
+     * @param bookmarkPath A String value, specifying the path to the bookmark.
+     */
+    GotoBookmark(pageIndex: number, bookmarkPath: string): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified page index.
+     * @param pageIndex A Int32 representing the index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays the specified report page.
+     * @param pageIndex An integer value, identifying the report page.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+}
+/**
+ * A method that will handle the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemValueChanged event.
+     * @param source A Object that is the event source.
+     * @param e An ASPxClientToolbarItemValueChangedEventArgs object, containing the event arguments.
+     */
+    (source: S, e: ASPxClientToolbarItemValueChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Provides access to the toolbar's value editor on the client.
+     * Value: An ASPxClientControl descendant.
+     */
+    editor: ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ASPxQueryBuilder control.
+ */
+interface ASPxClientQueryBuilder extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientQueryBuilder.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Enables you to customize the menu actions of a Query Builder.
+     */
+    CustomizeToolbarActions: ASPxClientEvent<ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientQueryBuilderSaveCommandExecuteEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientQueryBuilder properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Query Builder.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Gets a client-side model of the currently opened query serialized to Json.
+     */
+    GetJsonQueryModel(): string;
+    /**
+     * Saves the current query.
+     */
+    Save(): void;
+    /**
+     * Invokes a Data Preview for the current query.
+     */
+    ShowPreview(): void;
+    /**
+     * Specifies whether or not the current query is a valid SQL string.
+     */
+    IsQueryValid(): boolean;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientQueryBuilderSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientQueryBuilderSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomizeToolbarActions event.
+ */
+interface ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * The client-side equivalent of the Web Report Designer control.
+ */
+interface ASPxClientReportDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientReportDesignerSaveCommandExecuteEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the menu actions of a Web Report Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientReportDesignerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client side when the Report Designer is being closed.
+     */
+    ExitDesigner: ASPxClientEvent<ASPxClientReportDesignerExitDesignerEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientReportDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Web Report Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Gets a client-side model of the currently opened report serialized to Json.
+     */
+    GetJsonReportModel(): string;
+    /**
+     * Returns serialization information for the specific property of the specific control type.
+     * @param controlType A string that identifies the name of the control type for which serialization information is to be returned.
+     * @param propertyDisplayName A string that identifies the name of the property for which serialization information is to be returned.
+     */
+    GetPropertyInfo(controlType: string, propertyDisplayName: string): ASPxDesignerElementSerializationInfo;
+    /**
+     * Indicates whether or not the current ASPxClientReportDesigner instance has been modified.
+     */
+    IsModified(): boolean;
+    /**
+     * Resets the value returned by the IsModified method.
+     */
+    ResetIsModified(): void;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientReportDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * Provides data for the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the CustomizeParameterLookUpSource event.
+ */
+interface ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+/**
+ * A method that will handle the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventHandler<S> {
+    /**
+     * A method that will handle the ExitDesigner event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerExitDesignerEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerExitDesignerEventArgs): void;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Document Map.
+ */
+interface ASPxClientReportDocumentMap extends ASPxClientControl {
+    /**
+     * Occurs after the content of the Document Viewer's document map is updated.
+     */
+    ContentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientReportDocumentMap>>;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Parameters Panel.
+ */
+interface ASPxClientReportParametersPanel extends ASPxClientControl {
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param parametersInfo An array of ASPxClientReportParameterInfo values specifying parameters and values to assign.
+     */
+    AssignParameters(parametersInfo: ASPxClientReportParameterInfo[]): void;
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param path A System.String specifying the parameter's path.
+     * @param value An object specifying the parameter value.
+     */
+    AssignParameter(path: string, value: Object): void;
+    /**
+     * Returns an array storing the names of parameters available in a report.
+     */
+    GetParameterNames(): string[];
+    /**
+     * Returns a value editor that is associated with a parameter with the specified name.
+     * @param parameterName A String value, specifying the parameter name.
+     */
+    GetEditorByParameterName(parameterName: string): ASPxClientControl;
+}
+/**
+ * Provides information about a report parameter on the client side.
+ */
+interface ASPxClientReportParameterInfo {
+    /**
+     * Specifies the parameter path, relative to its parent container (e.g., "subreport1.subreportParameter1" for a subreport's parameter, or "parameter1" for a report's parameter).
+     * Value: A String value, specifying the parameter path (e.g., "subreport1.subreportParameter1").
+     */
+    Path: string;
+    /**
+     * Provides access to a parameter value on the client.
+     * Value: A Object value.
+     */
+    Value: Object;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's toolbar.
+ */
+interface ASPxClientReportToolbar extends ASPxClientControl {
+    /**
+     * Provides access to the control template assigned for the specified menu item.
+     * @param name A String value, specifying the menu item name.
+     */
+    GetItemTemplateControl(name: string): ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ReportViewer.
+ */
+interface ASPxClientReportViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client side when another report page is loaded into this ASPxClientReportViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Submits the values of the specified parameters.
+     * @param parameters A dictionary containing the parameter names, along with their Object values.
+     */
+    SubmitParameters(parameters: { [key: string]: Object; }): void;
+    /**
+     * Prints a report shown in the ReportViewer.
+     */
+    Print(): void;
+    /**
+     * Prints a report page with the specified page index.
+     * @param pageIndex An integer value which specifies an index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays a report page with the specified page index in the ReportViewer.
+     * @param pageIndex An integer value which specifies the index of a page to be displayed.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+}
+/**
+ * A method that will handle the PageLoad events.
+ */
+interface ASPxClientReportViewerPageLoadEventHandler<S> {
+    /**
+     * A method that will handle the PageLoad event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportViewerPageLoadEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportViewerPageLoadEventArgs): void;
+}
+/**
+ * Provides data for the PageLoad events on the client side.
+ */
+interface ASPxClientReportViewerPageLoadEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value specifying a zero-based index of a page to be displayed in a report viewer.
+     * Returns: $
+     */
+    PageIndex: number;
+    /**
+     * Gets a value specifying the total number of pages displayed in a report viewer.
+     * Returns: $
+     */
+    PageCount: number;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the first page of a report.
+     */
+    IsFirstPage(): boolean;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the last page of a report.
+     */
+    IsLastPage(): boolean;
+}
+/**
+ * Provides data for the CustomizeParameterEditors events.
+ */
+interface ASPxClientCustomizeParameterEditorsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object.
+     */
+    parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to an object that stores information required to serialize a parameter editor.
+     * Value: An ASPxDesignerElementSerializationInfo object.
+     */
+    info: ASPxDesignerElementSerializationInfo;
+}
+/**
+ * Provides data for the CustomizeParameterLookUpSource events.
+ */
+interface ASPxClientCustomizeParameterLookUpSourceEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object that stores information about the parameter.
+     */
+    parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to the collection of look-up parameter values.
+     * Value: An array of ASPxDesignerElementEditorItem objects that store information about look-up parameter values.
+     */
+    items: ASPxDesignerElementEditorItem[];
+    /**
+     * Specifies the data source that provides look-up values for the parameter editor.
+     * Value: An Object specifying the data source that provides look-up values to the parameter editor.
+     */
+    dataSource: Object;
+}
+interface ASPxClientCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    Actions: ASPxClientMenuAction[];
+    GetById(actionId: string): ASPxClientMenuAction;
+}
+interface ASPxClientMenuAction {
+    text: string;
+    imageClassName: string;
+    clickAction: Function;
+    disabled: boolean;
+    visible: boolean;
+    hotKey: ASPxClientMenuActionHotKey;
+    hasSeparator: string;
+    container: string;
+}
+interface ASPxClientMenuActionHotKey {
+    keyCode: number;
+    ctrlKey: boolean;
+}
+/**
+ * Provides general information about a report parameter.
+ */
+interface ASPxDesignerElementParameterDescriptor {
+    /**
+     * Provides access to the parameter description.
+     * Value: A String value, specifying the parameter description.
+     */
+    description: string;
+    /**
+     * Provides access to the parameter name.
+     * Value: A String value, specifying the parameter name.
+     */
+    name: string;
+    /**
+     * Provides access to the parameter type.
+     * Value: A String value, specifying the parameter type.
+     */
+    type: string;
+    /**
+     * Provides access to the parameter value.
+     * Value: A Object, specifying the parameter value.
+     */
+    value: Object;
+    /**
+     * Provides access to the parameter visibility state.
+     * Value: true if the parameter is visible; otherwise false.
+     */
+    visible: boolean;
+}
+/**
+ * Provides information required to serialize an element.
+ */
+interface ASPxDesignerElementSerializationInfo {
+    /**
+     * Gets the property name that will be used in the model to store the property value.
+     * Value: A String value.
+     */
+    propertyName: string;
+    /**
+     * Gets the property name in the model that is displayed in the Property grid.
+     * Value: A String value.
+     */
+    displayName: string;
+    /**
+     * Gets the property name that will be used during serialization to store the property value.
+     * Value: A String value.
+     */
+    modelName: string;
+    /**
+     * Gets the default property value used for serialization.
+     * Value: A Object value.
+     */
+    defaultVal: Object;
+    /**
+     * Gets the information about a complex object's content.
+     * Value: An array of ASPxDesignerElementSerializationInfo objects.
+     */
+    info: ASPxDesignerElementSerializationInfo[];
+    /**
+     * Gets a value indicating whether or not the property returns an array.
+     * Value: true if the property returns an array; otherwise false.
+     */
+    array: boolean;
+    /**
+     * Gets a value indicating whether an object should be serialized to the ComponentStorage property.
+     * Value: true to serialize an object to the ObjectStorage; otherwise false.
+     */
+    link: boolean;
+    /**
+     * Gets a value specifying the type of value editor for the Property Grid.
+     * Value: An ASPxDesignerElementEditor object.
+     */
+    editor: ASPxDesignerElementEditor;
+    /**
+     * Gets the collection of values displayed in the Property grid.
+     * Value: An array of ASPxDesignerElementEditorItem objects.
+     */
+    valuesArray: ASPxDesignerElementEditorItem[];
+    /**
+     * Gets the rules for validating the property value entered into its editor.
+     * Value: An array of Object values.
+     */
+    validationRules: Object[];
+    /**
+     * Gets the visibility state of the value editor in the Property Grid.
+     * Value: A Object value.
+     */
+    visible: Object;
+    /**
+     * Gets a value, indicating whether or not the property value can be edited.
+     * Value: true to disable the property editing; otherwise false.
+     */
+    disabled: Object;
+}
+/**
+ * Provides information about a serialized property's value editor used in the Property Grid.
+ */
+interface ASPxDesignerElementEditor {
+    /**
+     * Gets the name of an HTML template specifying the editor and header of a complex object (i.e., an object having its content properties specified).
+     * Value: A String value.
+     */
+    header: string;
+    /**
+     * Gets a nullable value, specifying the name of an HTML template used by a complex object's editor.
+     * Value: A String value.
+     */
+    content: string;
+    extendedOptions: Object;
+    /**
+     * Gets a nullable value, specifying the type of the editor's model.
+     * Value: A Object value.
+     */
+    editorType: Object;
+}
+/**
+ * Provides information about property values.
+ */
+interface ASPxDesignerElementEditorItem {
+    /**
+     * Gets an actual property value.
+     * Value: A Object value.
+     */
+    value: Object;
+    /**
+     * Gets a value displayed by a property editor.
+     * Value: A String value.
+     */
+    displayValue: string;
+}
+/**
+ * A client-side equivalent of the ASPxWebDocumentViewer class.
+ */
+interface ASPxClientWebDocumentViewer extends ASPxClientControl {
+    /**
+     * Enables you to customize the menu actions of a Web Document Viewer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Provides access to the preview model of the ASPxClientWebDocumentViewer.
+     */
+    GetPreviewModel(): Object;
+    /**
+     * Opens the specified report in the HTML5 Document Viewer.
+     */
+    OpenReport(): Object;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified index.
+     * @param pageIndex An index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Exports the document to a PDF file.
+     */
+    ExportTo(): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'txt', 'xls', and 'xlsx'.
+     */
+    ExportTo(format: string): void;
+    /**
+     * Updates the localization settings of the ASPxClientWebDocumentViewer properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * 
+     * @param source 
+     * @param e 
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterLookUpSource event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+
+interface MVCxClientDashboardViewerStatic extends ASPxClientDashboardViewerStatic {
+}
+interface DashboardDataAxisNamesStatic {
+    /**
+     * Identifies a default axis in all data-bound dashboard items.
+     */
+    DefaultAxis: string;
+    /**
+     * Identifies a series axis in a chart and pie.
+     */
+    ChartSeriesAxis: string;
+    /**
+     * Identifies an argument axis in a chart, scatter chart and pie.
+     */
+    ChartArgumentAxis: string;
+    /**
+     * Identifies a sparkline axis in a grid and cards.
+     */
+    SparklineAxis: string;
+    /**
+     * Identifies a pivot column axis.
+     */
+    PivotColumnAxis: string;
+    /**
+     * Identifies a pivot row axis.
+     */
+    PivotRowAxis: string;
+}
+interface DashboardSpecialValuesStatic {
+    /**
+     * Represents a null value.
+     */
+    NullValue: string;
+    /**
+     * Represents a null value in OLAP mode.
+     */
+    OlapNullValue: string;
+    /**
+     * Represents an Others value.
+     */
+    OthersValue: string;
+    /**
+     * Represents an error value for calculated fields.
+     */
+    ErrorValue: string;
+    /**
+     * Returns whether or not the specified value is an NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OlapNullValue.
+     * @param value The specified value.
+     */
+    IsOlapNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an ErrorValue.
+     * @param value The specified value.
+     */
+    IsErrorValue(value: Object): boolean;
+}
+interface DashboardExportPageLayoutStatic {
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is portrait.
+     */
+    Portrait: string;
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is landscape.
+     */
+    Landscape: string;
+}
+interface DashboardExportPaperKindStatic {
+    /**
+     * Letter paper (8.5 in. by 11 in.).
+     */
+    Letter: string;
+    /**
+     * Legal paper (8.5 in. by 14 in.).
+     */
+    Legal: string;
+    /**
+     * Executive paper (7.25 in. by 10.5 in.).
+     */
+    Executive: string;
+    /**
+     * A5 paper (148 mm by 210 mm).
+     */
+    A5: string;
+    /**
+     * A4 paper (210 mm by 297 mm).
+     */
+    A4: string;
+    /**
+     * A3 paper (297 mm by 420 mm).
+     */
+    A3: string;
+}
+interface DashboardExportScaleModeStatic {
+    /**
+     * The dashboard (dashboard item) on the exported page retains its original size.
+     */
+    None: string;
+    /**
+     * The size of the dashboard (dashboard item) on the exported page is changed according to the scale factor value.
+     */
+    UseScaleFactor: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed according to the width of the exported page.
+     */
+    AutoFitToPageWidth: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed to fit its content on a single page.
+     */
+    AutoFitWithinOnePage: string;
+}
+interface DashboardExportFilterStateStatic {
+    /**
+     * The filter state is not included in the exported document.
+     */
+    None: string;
+    /**
+     * The filter state is placed below the dashboard (dashboard item) in the exported document.
+     */
+    Below: string;
+    /**
+     * The filter state is placed on a separate page in the exported document.
+     */
+    SeparatePage: string;
+}
+interface DashboardExportImageFormatStatic {
+    /**
+     * The PNG image format.
+     */
+    Png: string;
+    /**
+     * The GIF image format.
+     */
+    Gif: string;
+    /**
+     * The JPG image format.
+     */
+    Jpg: string;
+}
+interface DashboardExportExcelFormatStatic {
+    /**
+     * The Excel 97 - Excel 2003 (XLS) file format.
+     */
+    Xls: string;
+    /**
+     * The Office Excel 2007 XML-based (XLSX) file format.
+     */
+    Xlsx: string;
+    /**
+     * A comma-separated values (CSV) file format.
+     */
+    Csv: string;
+}
+interface ChartExportSizeModeStatic {
+    /**
+     * A chart dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A chart dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A chart dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface MapExportSizeModeStatic {
+    /**
+     * A map dashboard item is exported in a size identical to that shown on the dashboard
+     */
+    None: string;
+    /**
+     * A map dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface RangeFilterExportSizeModeStatic {
+    /**
+     * A Range Filter dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A Range Filter dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A Range Filter dashboard item is resized proportionally to best fit the printed page.
+     */
+    Zoom: string;
+}
+interface DashboardSelectionModeStatic {
+    None: string;
+    Single: string;
+    Multiple: string;
+}
+interface ASPxClientDashboardStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDashboardViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDashboardViewer;
+}
+interface ASPxClientEditBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientEditStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Assigns a null value to all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container, and belonging to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ClearEditorsInContainer(container: Object): void;
+    /**
+     * Assigns a null value to all editors which are located within the specified container object, and belonging to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object, and belonging to a specific validation group.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object.
+     * @param containerId A string value specifying the editor container's identifier.
+     */
+    ClearEditorsInContainerById(containerId: string): void;
+    /**
+     * Assigns a null value to all editors which belong to a specific validation group, dependent on the visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified validation group; false to clear only visible editors.
+     */
+    ClearGroup(validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors which belong to a specific validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearGroup(validationGroup: string): void;
+    /**
+     * Performs validation of all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ValidateEditorsInContainer(container: Object): boolean;
+    /**
+     * Performs validation of the editors which are located within the specified container and belong to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors which are located within the specified container.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    ValidateEditorsInContainerById(containerId: string): boolean;
+    /**
+     * Performs validation of editors contained within the specified validation group, dependent on the editor visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified validation group; false to validate only visible editors.
+     */
+    ValidateGroup(validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors contained within the specified validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ValidateGroup(validationGroup: string): boolean;
+    /**
+     * Verifies whether the editors in a specified visibility state, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(container: Object, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(container: Object, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors located in a specified container are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    AreEditorsValid(container: Object): boolean;
+    /**
+     * Verifies whether the editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    AreEditorsValid(containerId: string): boolean;
+    /**
+     * Verifies whether visible editors on a page are valid.
+     */
+    AreEditorsValid(): boolean;
+}
+interface ASPxClientBinaryImageStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientBinaryImage;
+}
+interface ASPxClientButtonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButton;
+}
+interface ASPxClientCalendarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCalendar;
+}
+interface ASPxClientCaptchaStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCaptcha;
+}
+interface ASPxClientCheckBoxStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBox;
+}
+interface ASPxClientRadioButtonStatic extends ASPxClientCheckBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButton;
+}
+interface ASPxClientTextEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientTextBoxBaseStatic extends ASPxClientTextEditStatic {
+}
+interface ASPxClientButtonEditBaseStatic extends ASPxClientTextBoxBaseStatic {
+}
+interface ASPxClientDropDownEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientColorEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientColorEdit;
+}
+interface ASPxClientComboBoxStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientComboBox;
+}
+interface ASPxClientDateEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDateEdit;
+}
+interface ASPxClientDropDownEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDropDownEdit;
+}
+interface ASPxClientFilterControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFilterControl;
+}
+interface ASPxClientListEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientListBoxStatic extends ASPxClientListEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientListBox;
+}
+interface ASPxClientCheckListBaseStatic extends ASPxClientListEditStatic {
+}
+interface ASPxClientRadioButtonListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButtonList;
+}
+interface ASPxClientCheckBoxListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBoxList;
+}
+interface ASPxClientProgressBarStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientProgressBar;
+}
+interface ASPxClientSpinEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientSpinEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpinEdit;
+}
+interface ASPxClientTimeEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimeEdit;
+}
+interface ASPxClientStaticEditStatic extends ASPxClientEditBaseStatic {
+}
+interface ASPxClientHyperLinkStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHyperLink;
+}
+interface ASPxClientImageBaseStatic extends ASPxClientStaticEditStatic {
+}
+interface ASPxClientImageStatic extends ASPxClientImageBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImage;
+}
+interface ASPxClientLabelStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLabel;
+}
+interface ASPxClientTextBoxStatic extends ASPxClientTextBoxBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTextBox;
+}
+interface ASPxClientMemoStatic extends ASPxClientTextEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMemo;
+}
+interface ASPxClientButtonEditStatic extends ASPxClientButtonEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButtonEdit;
+}
+interface ASPxClientTokenBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTokenBox;
+}
+interface ASPxClientTrackBarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTrackBar;
+}
+interface ASPxClientValidationSummaryStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGaugeControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGaugeControl;
+}
+interface ASPxClientGridBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGridViewCallbackCommandStatic {
+    /**
+     * Default value: "NEXTPAGE"
+     */
+    NextPage: string;
+    /**
+     * Default value: "PREVPAGE"
+     */
+    PreviousPage: string;
+    /**
+     * Default value: "GOTOPAGE"
+     */
+    GotoPage: string;
+    /**
+     * Default value: "SELECTROWS"
+     */
+    SelectRows: string;
+    /**
+     * Default value: "SELECTROWSKEY"
+     */
+    SelectRowsKey: string;
+    /**
+     * Default value: "SELECTION"
+     */
+    Selection: string;
+    /**
+     * Default value: "FOCUSEDROW"
+     */
+    FocusedRow: string;
+    /**
+     * Default value: "GROUP"
+     */
+    Group: string;
+    /**
+     * Default value: "UNGROUP"
+     */
+    UnGroup: string;
+    /**
+     * Default value: "SORT"
+     */
+    Sort: string;
+    /**
+     * Default value: "COLUMNMOVE"
+     */
+    ColumnMove: string;
+    /**
+     * Default value: "COLLAPSEALL"
+     */
+    CollapseAll: string;
+    /**
+     * Default value: "EXPANDALL"
+     */
+    ExpandAll: string;
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+    /**
+     * Default value: "COLLAPSEROW"
+     */
+    CollapseRow: string;
+    /**
+     * Default value: "HIDEALLDETAIL"
+     */
+    HideAllDetail: string;
+    /**
+     * Default value: "SHOWALLDETAIL"
+     */
+    ShowAllDetail: string;
+    /**
+     * Default value: "SHOWDETAILROW"
+     */
+    ShowDetailRow: string;
+    /**
+     * Default value: "HIDEDETAILROW"
+     */
+    HideDetailRow: string;
+    /**
+     * Default value: "PAGERONCLICK"
+     */
+    PagerOnClick: string;
+    /**
+     * Default value: "APPLYFILTER"
+     */
+    ApplyFilter: string;
+    /**
+     * Default value: "APPLYCOLUMNFILTER"
+     */
+    ApplyColumnFilter: string;
+    /**
+     * Default value: "APPLYMULTICOLUMNFILTER"
+     */
+    ApplyMultiColumnFilter: string;
+    /**
+     * Default value: "APPLYHEADERCOLUMNFILTER"
+     */
+    ApplyHeaderColumnFilter: string;
+    /**
+     * Default value: "APPLYSEARCHPANELFILTER"
+     */
+    ApplySearchPanelFilter: string;
+    /**
+     * Default value: "FILTERROWMENU"
+     */
+    FilterRowMenu: string;
+    /**
+     * Default value: "STARTEDIT"
+     */
+    StartEdit: string;
+    /**
+     * Default value: "CANCELEDIT"
+     */
+    CancelEdit: string;
+    /**
+     * Default value: "UPDATEEDIT"
+     */
+    UpdateEdit: string;
+    /**
+     * Default value: "ADDNEWROW"
+     */
+    AddNewRow: string;
+    /**
+     * Default value: "DELETEROW"
+     */
+    DeleteRow: string;
+    /**
+     * Default value: "CUSTOMBUTTON"
+     */
+    CustomButton: string;
+    /**
+     * Default value: "CUSTOMCALLBACK"
+     */
+    CustomCallback: string;
+    /**
+     * Default value: "SHOWFILTERCONTROL"
+     */
+    ShowFilterControl: string;
+    /**
+     * Default value: "CLOSEFILTERCONTROL"
+     */
+    CloseFilterControl: string;
+    /**
+     * Default value: "SETFILTERENABLED"
+     */
+    SetFilterEnabled: string;
+    /**
+     * Default value: "REFRESH"
+     */
+    Refresh: string;
+    /**
+     * Default value: "SELFIELDVALUES"
+     */
+    SelFieldValues: string;
+    /**
+     * Default value: "ROWVALUES"
+     */
+    RowValues: string;
+    /**
+     * Default value: "PAGEROWVALUES"
+     */
+    PageRowValues: string;
+    /**
+     * Default value: "FILTERPOPUP"
+     */
+    FilterPopup: string;
+    /**
+     * Default value: "CONTEXTMENU"
+     */
+    ContextMenu: string;
+    /**
+     * Default value: "CUSTOMVALUES"
+     */
+    CustomValues: string;
+}
+interface ASPxClientGridLookupStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridLookup;
+}
+interface ASPxClientCardViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCardView;
+}
+interface ASPxClientGridViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridView;
+}
+interface ASPxClientVerticalGridStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientVerticalGrid;
+}
+interface ASPxClientVerticalGridCallbackCommandStatic {
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+}
+interface ASPxClientCommandConstsStatic {
+    /**
+     * Identifies a command that shows a search panel.
+     * Value: "showsearchpanel"
+     */
+    SHOWSEARCHPANEL_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Find and Replace dialog.
+     * Value: "findandreplacedialog"
+     */
+    FINDANDREPLACE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that applies the bold text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "bold"
+     */
+    BOLD_COMMAND: string;
+    /**
+     * Identifies a command that makes the selected text italic or regular type depending on the current state.
+     * Value: "italic"
+     */
+    ITALIC_COMMAND: string;
+    /**
+     * Identifies a command that applies the underline text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "underline"
+     */
+    UNDERLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the strike through text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "strikethrough"
+     */
+    STRIKETHROUGH_COMMAND: string;
+    /**
+     * Identifies a command that applies the superscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "superscript"
+     */
+    SUPERSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that applies the subscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "subscript"
+     */
+    SUBSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that centers the content of the currently focused paragraph.
+     * Value: "justifycenter"
+     */
+    JUSTIFYCENTER_COMMAND: string;
+    /**
+     * Identifies a command that left justifies the content of the currently focused paragraph.
+     * Value: "justifyleft"
+     */
+    JUSTIFYLEFT_COMMAND: string;
+    /**
+     * Identifies a command that creates an indent for the selected paragarph.
+     * Value: "indent"
+     */
+    INDENT_COMMAND: string;
+    /**
+     * Identifies a command that creates an outdent for the focused paragarph.
+     * Value: "outdent"
+     */
+    OUTDENT_COMMAND: string;
+    /**
+     * Identifies a command that right justifies the content of the currently focused paragraph.
+     * Value: "justifyright"
+     */
+    JUSTIFYRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that fully justifies the content of the currently focused paragraph (aligned with both the left and right margines).
+     * Value: "justifyfull"
+     */
+    JUSTIFYFULL_COMMAND: string;
+    /**
+     * Identifies a command that changes the size of the selected text.
+     * Value: "fontsize"
+     */
+    FONTSIZE_COMMAND: string;
+    /**
+     * Identifies a command that changes the font of the selected text.
+     * Value: "fontname"
+     */
+    FONTNAME_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a fore color pickers and sets the selected text fore color.
+     * Value: "forecolor"
+     */
+    FONTCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a back color pickers and sets the selected text back color.
+     * Value: "backcolor"
+     */
+    BACKCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that wraps the selected paragraph in the specified html tag.
+     * Value: "formatblock"
+     */
+    FORMATBLOCK_COMMAND: string;
+    /**
+     * Identifies a command that wraps the currently selected text content in a specific html tag with a css class assigned to it.
+     * Value: "applycss"
+     */
+    APPLYCSS_COMMAND: string;
+    /**
+     * Identifies a command that removes all formatting from the selected content.
+     * Value: "removeformat"
+     */
+    REMOVEFORMAT_COMMAND: string;
+    /**
+     * Identifies a command that cancels the last action.
+     * Value: "undo"
+     */
+    UNDO_COMMAND: string;
+    /**
+     * Identifies a command that returns a previously canceled action.
+     * Value: "redo"
+     */
+    REDO_COMMAND: string;
+    /**
+     * Identifies a command that copies the selected content.
+     * Value: "copy"
+     */
+    COPY_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard at the current cursor position.
+     * Value: "paste"
+     */
+    PASTE_COMMAND: string;
+    /**
+     * Identifies a command that pastes a specified content taking into account that it was copied from Word.
+     * Value: "pastefromword"
+     */
+    PASTEFROMWORD_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Paste from Word dialog.
+     * Value: "pastefromworddialog"
+     */
+    PASTEFROMWORDDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that cuts the selected content.
+     * Value: "cut"
+     */
+    CUT_COMMAND: string;
+    /**
+     * Identifies a command that selects all content inside the html editor.
+     * Value: "selectall"
+     */
+    SELECT_ALL: string;
+    /**
+     * Identifies a command that deletes the selected content.
+     * Value: "delete"
+     */
+    DELETE_COMMAND: string;
+    /**
+     * Identifies a command that can be used to correctly insert HTML code into the editor.
+     * Value: "pastehtml"
+     */
+    PASTEHTML_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new ordered list.
+     * Value: "insertorderedlist"
+     */
+    INSERTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new unordered list.
+     * Value: "insertunorderedlist"
+     */
+    INSERTUNORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that restarts the current ordered list.
+     * Value: "restartorderedlist"
+     */
+    RESTARTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that continues a disrupted ordered list.
+     * Value: "continueorderedlist"
+     */
+    CONTINUEORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that removes a hyperlink from the selected text or image.
+     * Value: "unlink"
+     */
+    UNLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new hyperlink.
+     * Value: "insertlink"
+     */
+    INSERTLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new image.
+     * Value: "insertimage"
+     */
+    INSERTIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected image.
+     * Value: "changeimage"
+     */
+    CHANGEIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that initiates spell checking.
+     * Value: "checkspelling"
+     */
+    CHECKSPELLING_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Image dialog.
+     * Value: "insertimagedialog"
+     */
+    INSERTIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Image dialog.
+     * Value: "changeimagedialog"
+     */
+    CHANGEIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Link dialog.
+     * Value: "insertlinkdialog"
+     */
+    INSERTLINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Link dialog.
+     * Value: "changelinkdialog"
+     */
+    CHANGELINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Table dialog.
+     * Value: "inserttabledialog"
+     */
+    INSERTTABLE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Table Properties dialog.
+     * Value: "tablepropertiesdialog"
+     */
+    TABLEPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Cell Properties dialog.
+     * Value: "tablecellpropertiesdialog"
+     */
+    TABLECELLPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Column Properties dialog.
+     * Value: "tablecolumnpropertiesdialog"
+     */
+    TABLECOLUMNPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Row Properties dialog.
+     * Value: "tablerowpropertiesdialog"
+     */
+    TABLEROWPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes a default browser Print dialog, allowing an end-user to print the content of the html editor.
+     * Value: "print"
+     */
+    PRINT_COMMAND: string;
+    /**
+     * Identifies a command that toggles the full-screen mode.
+     * Value: "fullscreen"
+     */
+    FULLSCREEN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new table.
+     * Value: "inserttable"
+     */
+    INSERTTABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table.
+     * Value: "changetable"
+     */
+    CHANGETABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table cell.
+     * Value: "changetablecell"
+     */
+    CHANGETABLECELL_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table row.
+     * Value: "changetablerow"
+     */
+    CHANGETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table column.
+     * Value: "changetablecolumn"
+     */
+    CHANGETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table.
+     * Value: "deletetable"
+     */
+    DELETETABLE_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table row.
+     * Value: "deletetablerow"
+     */
+    DELETETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table column.
+     * Value: "deletetablecolumn"
+     */
+    DELETETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the left from the currently focused one.
+     * Value: "inserttablecolumntoleft"
+     */
+    INSERTTABLECOLUMNTOLEFT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the right from the currently focused one.
+     * Value: "inserttablecolumntoright"
+     */
+    INSERTTABLECOLUMNTORIGHT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row below the currently focused one.
+     * Value: "inserttablerowbelow"
+     */
+    INSERTTABLEROWBELOW_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row above the currently focused one.
+     * Value: "inserttablerowabove"
+     */
+    INSERTTABLEROWABOVE_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell horizontally.
+     * Value: "splittablecellhorizontally"
+     */
+    SPLITTABLECELLHORIZONTALLY_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell vertically.
+     * Value: "splittablecellvertically"
+     */
+    SPLITTABLECELLVERTICALLY_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one to the right.
+     * Value: "mergetablecellright"
+     */
+    MERGETABLECELLRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one below.
+     * Value: "mergetablecelldown"
+     */
+    MERGETABLECELLDOWN_COMMAND: string;
+    /**
+     * Identifies a command that invokes a custom dialog.
+     * Value: "customdialog"
+     */
+    CUSTOMDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that exports the html editor content.
+     * Value: "export"
+     */
+    EXPORT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new audio element.
+     * Value: "insertaudio"
+     */
+    INSERTAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new video.
+     * Value: "insertvideo"
+     */
+    INSERTVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new flash element.
+     * Value: "insertflash"
+     */
+    INSERTFLASH_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new YouTube video.
+     * Value: "insertyoutubevideo"
+     */
+    INSERTYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected audio element.
+     * Value: "changeaudio"
+     */
+    CHANGEAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected video element.
+     * Value: "changevideo"
+     */
+    CHANGEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected flash element.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected YouTube video element.
+     * Value: "changeyoutubevideo"
+     */
+    CHANGEYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Audio dialog.
+     * Value: "insertaudiodialog"
+     */
+    INSERTAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Video dialog.
+     * Value: "insertvideodialog"
+     */
+    INSERTVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Flash dialog.
+     * Value: "insertflashdialog"
+     */
+    INSERTFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert YouTube Video dialog.
+     * Value: "insertyoutubevideodialog"
+     */
+    INSERTYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Audio dialog.
+     * Value: "changeaudiodialog"
+     */
+    CHANGEAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Video dialog.
+     * Value: "changevideodialog"
+     */
+    CHANGEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Flash dialog.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change YouTube Video dialog.
+     * Value: "changeyoutubevideodialog"
+     */
+    CHANGEYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to SourceFormatting.
+     * Value: "pastehtmlsourceformatting"
+     */
+    PASTEHTMLSOURCEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to PlainText.
+     * Value: "pastehtmlplaintext"
+     */
+    PASTEHTMLPLAINTEXT_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to MergeFormatting.
+     * Value: "pastehtmlmergeformatting"
+     */
+    PASTEHTMLMERGEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new placeholder.
+     * Value: "insertplaceholder"
+     */
+    INSERTPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected placeholder.
+     * Value: "changeplaceholder"
+     */
+    CHANGEPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Placeholder dialog.
+     * Value: "insertplaceholderdialog"
+     */
+    INSERTPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Placeholder dialog.
+     * Value: "changeplaceholderdialog"
+     */
+    CHANGEPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that updates the editor content.
+     * Value: "updatedocument"
+     */
+    UPDATEDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that changes properties of the element selected in the tag inspector.
+     * Value: "changeelementproperties"
+     */
+    CHANGEELEMENTPROPERTIES_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Element Properties dialog.
+     * Value: "changeelementpropertiesdialog"
+     */
+    CHANGEELEMENTPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that comments the selected HTML code. If no code is selected, it comments the focused tag.
+     * Value: "comment"
+     */
+    COMMENT_COMMAND: string;
+    /**
+     * Identifies a command that uncomments the selected HTML code. If no code is selected, the command uncomments the currently focused tag.
+     * Value: "uncomment"
+     */
+    UNCOMMENTHTML_COMMAND: string;
+    /**
+     * Identifies a command that formats the current HTML document.
+     * Value: "formatdocument"
+     */
+    FORMATDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that applies the indent formatting to the selected content.
+     * Value: "indent"
+     */
+    INDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the outdent formatting to the focused content.
+     * Value: "outdent"
+     */
+    OUTDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that collapses the selected HTML tag.
+     * Value: "collapsetag"
+     */
+    COLLAPSETAG_COMMAND: string;
+    /**
+     * Identifies a command that expands the selected HTML tag.
+     * Value: "expandtag"
+     */
+    EXPANDTAG_COMMAND: string;
+    /**
+     * Identifies a command that shows intellisense for the HTML code editor.
+     * Value: "showintellisense"
+     */
+    SHOWINTELLISENSE_COMMAND: string;
+}
+interface ASPxClientHtmlEditorStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHtmlEditor;
+    /**
+     * Programmatically closes a custom dialog, supplying it with specific parameters.
+     * @param status An object representing a custom dialog's closing status.
+     * @param data An object representing custom data associated with a custom dialog.
+     */
+    CustomDialogComplete(status: Object, data: Object): void;
+}
+interface ASPxClientHtmlEditorMediaPreloadModeStatic {
+    /**
+     * The browser does not load a media file when the page loads.
+     */
+    None: string;
+    /**
+     * The browser loads the entire video when the page loads.
+     */
+    Auto: string;
+    /**
+     * The browser loads only metadata when the page loads.
+     */
+    Metadata: string;
+}
+interface ASPxClientPivotGridStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPivotGrid;
+}
+interface ASPxClientPivotCustomizationStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRichEditStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRichEdit;
+}
+interface ASPxSchedulerDateTimeHelperStatic {
+    /**
+     * Returns the date part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the date.
+     */
+    TruncToDate(date: Date): Date;
+    /**
+     * Returns the day time part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the day time.
+     */
+    ToDayTime(date: Date): any;
+    /**
+     * Adds the specified number of days to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add days.
+     * @param dayCount The number of days to add.
+     */
+    AddDays(date: Date, dayCount: number): Date;
+    /**
+     * Adds the specified timespan to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add a timespan.
+     * @param timeSpan A TimeSpan object specifying the timespan to add.
+     */
+    AddTimeSpan(date: Date, timeSpan: any): Date;
+    /**
+     * Rounds a DateTime value up to the nearest interval.
+     * @param date A DateTime object containing a value to round.
+     * @param spanInMs A TimeSpan object specifying an interval to which to round.
+     */
+    CeilDateTime(date: Date, spanInMs: any): Date;
+}
+interface ASPxClientWeekDaysCheckEditStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceRangeControlStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDailyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientWeeklyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientMonthlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientYearlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientRecurrenceTypeEditStatic extends ASPxClientRadioButtonListStatic {
+}
+interface ASPxClientTimeIntervalStatic {
+    /**
+     * Gets the duration of a time interval between two points in time.
+     * @param start A DateTime object specifying the starting point of the time interval.
+     * @param end A DateTime object specifying the ending point of the time interval.
+     */
+    CalculateDuration(start: Date, end: Date): number;
+}
+interface ASPxClientSchedulerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientScheduler;
+}
+interface ASPxClientSpellCheckerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpellChecker;
+}
+interface ASPxClientSpellCheckerStopCheckingReasonStatic {
+    Default: string;
+    User: string;
+}
+interface ASPxClientSpreadsheetStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpreadsheet;
+}
+interface ASPxClientTreeListStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeList;
+}
+interface BootstrapClientAccordionStatic extends ASPxClientNavBarStatic {
+}
+interface BootstrapClientButtonStatic extends ASPxClientButtonStatic {
+}
+interface BootstrapClientCalendarStatic extends ASPxClientCalendarStatic {
+}
+interface BootstrapClientCheckBoxStatic extends ASPxClientEditStatic {
+}
+interface BootstrapClientRadioButtonStatic extends BootstrapClientCheckBoxStatic {
+}
+interface BootstrapClientComboBoxStatic extends ASPxClientComboBoxStatic {
+}
+interface BootstrapClientDateEditStatic extends ASPxClientDateEditStatic {
+}
+interface BootstrapClientDropDownEditStatic extends ASPxClientDropDownEditStatic {
+}
+interface BootstrapClientFormLayoutStatic extends ASPxClientFormLayoutStatic {
+}
+interface BootstrapClientGridViewStatic extends ASPxClientGridViewStatic {
+}
+interface BootstrapClientHyperLinkStatic extends ASPxClientHyperLinkStatic {
+}
+interface BootstrapClientListBoxStatic extends ASPxClientListBoxStatic {
+}
+interface BootstrapClientCheckBoxListStatic extends ASPxClientCheckBoxListStatic {
+}
+interface BootstrapClientRadioButtonListStatic extends ASPxClientRadioButtonListStatic {
+}
+interface BootstrapClientMenuStatic extends ASPxClientMenuStatic {
+}
+interface BootstrapClientPopupControlStatic extends ASPxClientPopupControlStatic {
+}
+interface BootstrapClientPopupMenuStatic extends ASPxClientPopupMenuStatic {
+}
+interface BootstrapClientProgressBarStatic extends ASPxClientProgressBarStatic {
+}
+interface BootstrapClientSpinEditStatic extends ASPxClientSpinEditStatic {
+}
+interface BootstrapClientTabControlStatic extends ASPxClientTabControlStatic {
+}
+interface BootstrapClientPageControlStatic extends ASPxClientPageControlStatic {
+}
+interface BootstrapClientTextBoxStatic extends ASPxClientTextBoxStatic {
+}
+interface BootstrapClientMemoStatic extends ASPxClientMemoStatic {
+}
+interface BootstrapClientButtonEditStatic extends ASPxClientButtonEditStatic {
+}
+interface BootstrapClientTreeViewStatic extends ASPxClientTreeViewStatic {
+}
+interface MVCxClientCalendarStatic extends ASPxClientCalendarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCalendar;
+}
+interface MVCxClientCallbackPanelStatic extends ASPxClientCallbackPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCallbackPanel;
+}
+interface MVCxClientCardViewStatic extends ASPxClientCardViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCardView;
+}
+interface MVCxClientChartStatic extends ASPxClientWebChartControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientChart;
+}
+interface MVCxClientComboBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientComboBox;
+}
+interface MVCxClientDataViewStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDataView;
+}
+interface MVCxClientDateEditStatic extends ASPxClientDateEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDateEdit;
+}
+interface MVCxClientDockManagerStatic extends ASPxClientDockManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockManager;
+}
+interface MVCxClientDockPanelStatic extends ASPxClientDockPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockPanel;
+}
+interface MVCxClientFileManagerStatic extends ASPxClientFileManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientFileManager;
+}
+interface MVCxClientGridViewStatic extends ASPxClientGridViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientGridView;
+}
+interface MVCxClientHtmlEditorStatic extends ASPxClientHtmlEditorStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientHtmlEditor;
+}
+interface MVCxClientImageGalleryStatic extends ASPxClientImageGalleryStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientImageGallery;
+}
+interface MVCxClientListBoxStatic extends ASPxClientListBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientListBox;
+}
+interface MVCxClientNavBarStatic extends ASPxClientNavBarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientNavBar;
+}
+interface MVCxClientPivotGridStatic extends ASPxClientPivotGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPivotGrid;
+}
+interface MVCxClientPopupControlStatic extends ASPxClientPopupControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPopupControl;
+}
+interface MVCxClientDocumentViewerStatic extends ASPxClientDocumentViewerStatic {
+}
+interface MVCxClientReportViewerStatic extends ASPxClientReportViewerStatic {
+}
+interface MVCxClientReportDesignerStatic extends ASPxClientReportDesignerStatic {
+}
+interface MVCxClientRichEditStatic extends ASPxClientRichEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRichEdit;
+}
+interface MVCxClientRoundPanelStatic extends ASPxClientRoundPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRoundPanel;
+}
+interface MVCxClientSchedulerStatic extends ASPxClientSchedulerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientScheduler;
+}
+interface MVCxSchedulerToolTipTypeStatic {
+    /**
+     * The tooltip is displayed for a selected appointment.
+     */
+    Appointment: number;
+    /**
+     * The tooltip is displayed for a dragged appointment.
+     */
+    AppointmentDrag: number;
+    /**
+     * The tooltip is displayed for a selected time interval.
+     */
+    Selection: number;
+}
+interface MVCxClientSpreadsheetStatic extends ASPxClientSpreadsheetStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientSpreadsheet;
+}
+interface MVCxClientPageControlStatic extends ASPxClientPageControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPageControl;
+}
+interface MVCxClientTokenBoxStatic extends ASPxClientTokenBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTokenBox;
+}
+interface MVCxClientTreeListStatic extends ASPxClientTreeListStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeList;
+}
+interface MVCxClientTreeViewStatic extends ASPxClientTreeViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeView;
+}
+interface MVCxClientUploadControlStatic extends ASPxClientUploadControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientUploadControl;
+}
+interface MVCxClientUtilsStatic {
+    /**
+     * Loads service resources (such as scripts, CSS files, etc.) required for DevExpress functionality to work properly after a non DevExpress callback has been processed on the server and returned back to the client.
+     */
+    FinalizeCallback(): void;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object): Object;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     * @param processInvisibleEditors true to process both visible and invisible editors that belong to the specified container; false to process only visible editors.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object, processInvisibleEditors: boolean): Object;
+}
+interface MVCxClientGlobalEventsStatic {
+    /**
+     * Dynamically connects the ControlsInitialized client event with an appropriate event handler function.
+     * @param handler A object representing the event handling function's content.
+     */
+    AddControlsInitializedEventHandler(handler: ASPxClientControlsInitializedEventHandler<any>): void;
+    /**
+     * Dynamically connects the BeginCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddBeginCallbackEventHandler(handler: MVCxClientBeginCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the EndCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddEndCallbackEventHandler(handler: ASPxClientEndCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the CallbackError client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddCallbackErrorHandler(handler: ASPxClientCallbackErrorEventHandler<any>): void;
+}
+interface MVCxClientVerticalGridStatic extends ASPxClientVerticalGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientVerticalGrid;
+}
+interface MVCxClientWebDocumentViewerStatic extends ASPxClientWebDocumentViewerStatic {
+}
+interface ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControlBase;
+}
+interface ASPxClientControlStatic extends ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControl;
+    /**
+     * Modifies the controls size on the page.
+     */
+    AdjustControls(): void;
+    /**
+     * Modifies the controls size within the specified container.
+     * @param container An HTML element that is the container of the controls.
+     */
+    AdjustControls(container: Object): void;
+    /**
+     * Returns a collection of client web control objects.
+     */
+    GetControlCollection(): ASPxClientControlCollection;
+}
+interface ASPxClientCallbackStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallback;
+}
+interface ASPxClientPanelBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanelBase;
+}
+interface ASPxClientPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanel;
+}
+interface ASPxClientCallbackPanelStatic extends ASPxClientPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallbackPanel;
+}
+interface ASPxClientCloudControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCloudControl;
+}
+interface ASPxClientDataViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDataView;
+}
+interface ASPxClientDockManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockManager;
+}
+interface ASPxClientPopupControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDockPanelStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockPanel;
+}
+interface ASPxClientDockZoneStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockZone;
+}
+interface ASPxClientFileManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFileManager;
+}
+interface ASPxClientFileManagerCommandConstsStatic {
+    /**
+     * The name of a command that is executed when an end-user renames an item.
+     */
+    Rename: string;
+    /**
+     * The name of a command that is executed when an end-user moves an item.
+     */
+    Move: string;
+    /**
+     * The name of a command that is executed when an end-user deletes an item.
+     */
+    Delete: string;
+    /**
+     * The name of a command that is executed when an end-user creates a folder.
+     */
+    Create: string;
+    /**
+     * The name of a command that is executed when an end-user uploads a file.
+     */
+    Upload: string;
+    /**
+     * The name of a command that is executed when an end-user downloads an item.
+     */
+    Download: string;
+    /**
+     * The name of a command that is executed when an end-user copies an item.
+     */
+    Copy: string;
+    /**
+     * The name of a command that is executed when an end-user opens an item.
+     */
+    Open: string;
+}
+interface ASPxClientFileManagerErrorConstsStatic {
+    /**
+     * The specified file is not found.    Return Value: 0
+     */
+    FileNotFound: number;
+    /**
+     * The specified folder is not found.    Return Value: 1
+     */
+    FolderNotFound: number;
+    /**
+     * Access is denied.    Return Value: 2
+     */
+    AccessDenied: number;
+    /**
+     * Unspecified IO error occurs.    Return Value: 3
+     */
+    UnspecifiedIO: number;
+    /**
+     * Unspecified error occurs.    Return Value: 4
+     */
+    Unspecified: number;
+    /**
+     * The file/folder name is empty.    Return Value: 5
+     */
+    EmptyName: number;
+    /**
+     * The operation was canceled.    Return Value: 6
+     */
+    CanceledOperation: number;
+    /**
+     * The specified name contains invalid characters.    Return Value: 7
+     */
+    InvalidSymbols: number;
+    /**
+     * The specified file extension is not allowed.    Return Value: 8
+     */
+    WrongExtension: number;
+    /**
+     * The file/folder is being used by another process.    Return Value: 9
+     */
+    UsedByAnotherProcess: number;
+    /**
+     * The specified file/folder already exists.    Return Value: 10
+     */
+    AlreadyExists: number;
+}
+interface ASPxClientFormLayoutStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFormLayout;
+}
+interface ASPxClientHiddenFieldStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHiddenField;
+}
+interface ASPxClientImageGalleryStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageGallery;
+}
+interface ASPxClientImageSliderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageSlider;
+}
+interface ASPxClientImageZoomNavigatorStatic extends ASPxClientImageSliderStatic {
+}
+interface ASPxClientImageZoomStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientLoadingPanelStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLoadingPanel;
+}
+interface ASPxClientMenuBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Returns a collection of client menu objects.
+     */
+    GetMenuCollection(): ASPxClientMenuCollection;
+}
+interface ASPxClientMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMenu;
+}
+interface ASPxClientTouchUIStatic {
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param id A string value specifying the element's ID.
+     */
+    MakeScrollable(id: string): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param element An object that specifies the required DOM element.
+     */
+    MakeScrollable(element: Object): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with  scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param id A string value specifying the name of a DOM element that should be extended with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(id: string, options: ASPxClientTouchUIOptions): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param element An object specifying the DOM element to extend with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(element: Object, options: ASPxClientTouchUIOptions): ScrollExtender;
+}
+interface ASPxClientNavBarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNavBar;
+}
+interface ASPxClientNewsControlStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNewsControl;
+}
+interface ASPxClientObjectContainerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientObjectContainer;
+}
+interface ASPxClientPagerStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientPopupControlStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupControl;
+    /**
+     * Returns a collection of client popup control objects.
+     */
+    GetPopupControlCollection(): ASPxClientPopupControlCollection;
+}
+interface ASPxClientPopupControlResizeStateStatic {
+    /**
+     * A window has been resized. Returns 0.
+     */
+    Resized: number;
+    /**
+     * A window has been collapsed. Returns 1.
+     */
+    Collapsed: number;
+    /**
+     * A window has been expanded. Returns 2.
+     */
+    Expanded: number;
+    /**
+     * A window has been maximized. Returns 3.
+     */
+    Maximized: number;
+    /**
+     * A window has been restored after maximizing. Returns 4.
+     */
+    RestoredAfterMaximized: number;
+}
+interface ASPxClientPopupControlCloseReasonStatic {
+    /**
+     * The window has been closed by an API.
+     */
+    API: string;
+    /**
+     * An end-user clicks the close header button.
+     */
+    CloseButton: string;
+    /**
+     * An end-user clicks outside the window's region
+     */
+    OuterMouseClick: string;
+    /**
+     * An end-user moves the mouse pointer out of the window region.
+     */
+    MouseOut: string;
+    /**
+     * An end-user presses the ESC key.
+     */
+    Escape: string;
+}
+interface ASPxClientPopupMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupMenu;
+}
+interface ASPxClientRatingControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRatingControl;
+}
+interface ASPxClientRibbonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRibbon;
+}
+interface ASPxClientRibbonStateStatic {
+    /**
+     * A ribbon is in the normal state. Returns 0
+     */
+    Normal: number;
+    /**
+     * A ribbon is minimized. Returns 1
+     */
+    Minimized: number;
+    /**
+     * A ribbon is temporarily shown. Returns 2
+     */
+    TemporaryShown: number;
+}
+interface ASPxClientRoundPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRoundPanel;
+}
+interface ASPxClientSplitterStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSplitter;
+}
+interface ASPxClientTabControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientTabControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTabControl;
+}
+interface ASPxClientPageControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPageControl;
+}
+interface ASPxClientTimerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimer;
+}
+interface ASPxClientTitleIndexStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTitleIndex;
+}
+interface ASPxClientTreeViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeView;
+}
+interface ASPxClientUploadControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientUploadControl;
+}
+interface ASPxClientUtilsStatic {
+    /**
+     * Gets the user-agent string, which identifies the client browser and provides certain system details of the client computer.
+     * Value: A string value representing the browser's user-agent string.
+     */
+    agent: string;
+    /**
+     * Gets a value that specifies whether the client browser is Opera.
+     * Value: true if the client browser is Opera; otherwise, false.
+     */
+    opera: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Opera version 9.
+     * Value: true if the client browser is Opera version 9; otherwise, false.
+     */
+    opera9: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari.
+     * Value: true if the client browser is Safari; otherwise, false.
+     */
+    safari: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari version 3.
+     * Value: true if the client browser is Safari version 3; otherwise, false.
+     */
+    safari3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari, running under a MacOS operating system.
+     * Value: true if the client browser is Safari, running under a MacOS operating system; otherwise, false.
+     */
+    safariMacOS: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Google Chrome.
+     * Value: true if the client browser is Google Chrome; otherwise, false.
+     */
+    chrome: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer.
+     * Value: true if the client browser is Intenet Explorer; otherwise, false.
+     */
+    ie: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer version 7.
+     * Value: true if the client browser is Intenet Explorer version 7; otherwise, false.
+     */
+    ie7: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox.
+     * Value: true if the client browser is Firefox; otherwise, false.
+     */
+    firefox: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox version 3.
+     * Value: true if the client browser is Firefox version 3; otherwise, false.
+     */
+    firefox3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Mozilla.
+     * Value: true if the client browser is Mozilla; otherwise, false.
+     */
+    mozilla: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Netscape.
+     * Value: true if the client browser is Netscape; otherwise, false.
+     */
+    netscape: boolean;
+    /**
+     * Gets a value that specifies a client browser's full version.
+     * Value: A double precision floating-point value that specifies a client browser's version.
+     */
+    browserVersion: number;
+    /**
+     * Gets a value that specifies a client browser's major version.
+     * Value: An integer value that specifies a client browser's major version.
+     */
+    browserMajorVersion: number;
+    /**
+     * Gets a value that specifies whether the application is run under a MacOS platform.
+     * Value: true if the application is run under the MacOS platform; otherwise, false.
+     */
+    macOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Windows platform.
+     * Value: true if the application is run under the Windows platform; otherwise, false.
+     */
+    windowsPlatform: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on WebKit.
+     * Value: true if the client browser is based on WebKit; otherwise, false.
+     */
+    webKitFamily: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on Netscape.
+     * Value: true if client browser is based on Netscape; otherwise, false.
+     */
+    netscapeFamily: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports touch.
+     * Value: true if the client browser supports touch; otherwise, false.
+     */
+    touchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the WebKit touch user interface.
+     * Value: true if the client browser supports the WebKit touch user interface; otherwise, false.
+     */
+    webKitTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the Microsoft touch user interface.
+     * Value: true if the client browser supports the Microsoft touch user interface; otherwise, false.
+     */
+    msTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under an iOS platform.
+     * Value: true if the application is run under the iOS platform; otherwise, false.
+     */
+    iOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Android platform.
+     * Value: true if the application is run under the Android platform; otherwise, false.
+     */
+    androidPlatform: boolean;
+    /**
+     * Inserts the specified item into the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to insert.
+     */
+    ArrayInsert(array: Object[], element: Object): void;
+    /**
+     * Removes the specified item from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to remove.
+     */
+    ArrayRemove(array: Object[], element: Object): void;
+    /**
+     * Removes an item at the specified index location from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param index The zero-based index location of the array item to remove.
+     */
+    ArrayRemoveAt(array: Object[], index: number): void;
+    /**
+     * Removes all items from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     */
+    ArrayClear(array: Object[]): void;
+    /**
+     * Searches for the specified array item and returns the zero-based index of its first occurrence within the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to locate.
+     */
+    ArrayIndexOf(array: Object[], element: Object): number;
+    /**
+     * Binds the specified function to a specific element's event, so that the function gets called whenever the event fires on the element.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name without the "on" prefix.
+     * @param method An object that specifies the event's handling function.
+     */
+    AttachEventToElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Unbinds the specified function from a specific element's event, so that the function stops receiving notifications when the event fires.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name.
+     * @param method An object that specifies the event's handling function.
+     */
+    DetachEventFromElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Returns the object that fired the event.
+     * @param htmlEvent An object that represents the current event.
+     */
+    GetEventSource(htmlEvent: Object): Object;
+    /**
+     * Gets the x-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventX(htmlEvent: Object): number;
+    /**
+     * Gets the y-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventY(htmlEvent: Object): number;
+    /**
+     * Gets the keyboard code for the specified event.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetKeyCode(htmlEvent: Object): number;
+    /**
+     * Cancels the default action of the specified event.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEvent(htmlEvent: Object): boolean;
+    /**
+     * Cancels both the specified event's default action and the event's bubbling upon the hierarchy of event handlers.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEventAndBubble(htmlEvent: Object): boolean;
+    /**
+     * Removes mouse capture from the specified event's source object.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventDragStart(htmlEvent: Object): boolean;
+    /**
+     * Clears any text selection made within the window's client region.
+     */
+    ClearSelection(): void;
+    /**
+     * Gets a value that indicates whether the specified object exists on the client side.
+     * @param obj The object to test.
+     */
+    IsExists(obj: Object): boolean;
+    /**
+     * Gets a value that indicates whether the specified object is a function.
+     * @param obj The object to test.
+     */
+    IsFunction(obj: Object): boolean;
+    /**
+     * Gets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteX(element: Object): number;
+    /**
+     * Gets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteY(element: Object): number;
+    /**
+     * Sets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param x An integer value specifying the required element's x-coordinate, in pixels.
+     */
+    SetAbsoluteX(element: Object, x: number): void;
+    /**
+     * Sets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param y An integer value specifying the required element's y-coordinate, in pixels.
+     */
+    SetAbsoluteY(element: Object, y: number): void;
+    /**
+     * Returns the distance between the top edge of the document and the topmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollTop(): number;
+    /**
+     * Returns the distance between the left edge of the document and the leftmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollLeft(): number;
+    /**
+     * Gets the width of the window's client region.
+     */
+    GetDocumentClientWidth(): number;
+    /**
+     * Gets the height of the window's client region.
+     */
+    GetDocumentClientHeight(): number;
+    /**
+     * Gets a value indicating whether the object passed via the parentElement parameter is a parent of the object passed via the element parameter.
+     * @param parentElement An object specifying the parent HTML element.
+     * @param element An object specifying the child HTML element.
+     */
+    GetIsParent(parentElement: Object, element: Object): boolean;
+    /**
+     * Returns a reference to the specified HTML element's first parent object which has an ID that matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param id A string specifying the required parent's ID.
+     */
+    GetParentById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose element name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     */
+    GetParentByTagName(element: Object, tagName: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose class name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param className A string value specifying the class name of the desired HTML element.
+     */
+    GetParentByClassName(element: Object, className: string): Object;
+    /**
+     * Returns a reference to the first element that has the specified ID in the parent HTML element specified.
+     * @param element An object identifying the parent HTML element to search.
+     * @param id A string specifying the ID attribute value of the desired child element.
+     */
+    GetChildById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the particular element that has the specified element name and is contained within the specified parent HTML element.
+     * @param element An object specifying the parent HTML element to search.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     * @param index An integer value specifying the zero-based index of the desired element amongst all the matching elements found.
+     */
+    GetChildByTagName(element: Object, tagName: string, index: number): Object;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     */
+    SetCookie(name: string, value: string): void;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     * @param expirationDate A date-time object that represents the expiration date and time for the cookie.
+     */
+    SetCookie(name: string, value: string, expirationDate: Date): void;
+    /**
+     * Retrieves a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    GetCookie(name: string): string;
+    /**
+     * Deletes a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    DeleteCookie(name: string): void;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameters.
+     * @param keyCode An integer value that specifies the code of the key.
+     * @param isCtrlKey true if the CTRL key should be included into the key combination; otherwise, false.
+     * @param isShiftKey true if the SHIFT key should be included into the key combination; otherwise, false.
+     * @param isAltKey true if the ALT key should be included into the key combination; otherwise, false.
+     */
+    GetShortcutCode(keyCode: number, isCtrlKey: boolean, isShiftKey: boolean, isAltKey: boolean): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the pressed key combination, which is specified by the related HTML event.
+     * @param htmlEvent A DHTML event object that relates to a key combination being pressed.
+     */
+    GetShortcutCodeByEvent(htmlEvent: Object): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameter.
+     * @param shortcutString A string value that specifies the key combination.
+     */
+    StringToShortcutCode(shortcutString: string): number;
+    /**
+     * Trims all leading and trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    Trim(str: string): string;
+    /**
+     * Trims all leading whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimStart(str: string): string;
+    /**
+     * Trims all trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimEnd(str: string): string;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
+}
+interface ASPxClientChartDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientChartDesigner;
+}
+interface ASPxClientWebChartControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebChartControl;
+}
+interface ASPxClientDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDocumentViewer;
+}
+interface ASPxClientQueryBuilderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientQueryBuilder;
+}
+interface ASPxClientReportDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportDesigner;
+}
+interface ASPxClientReportDocumentMapStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportParametersPanelStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportToolbarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportToolbar;
+}
+interface ASPxClientReportViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportViewer;
+}
+interface ASPxClientWebDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebDocumentViewer;
+}
+
+declare var MVCxClientDashboardViewer: MVCxClientDashboardViewerStatic;
+declare var DashboardDataAxisNames: DashboardDataAxisNamesStatic;
+declare var DashboardSpecialValues: DashboardSpecialValuesStatic;
+declare var DashboardExportPageLayout: DashboardExportPageLayoutStatic;
+declare var DashboardExportPaperKind: DashboardExportPaperKindStatic;
+declare var DashboardExportScaleMode: DashboardExportScaleModeStatic;
+declare var DashboardExportFilterState: DashboardExportFilterStateStatic;
+declare var DashboardExportImageFormat: DashboardExportImageFormatStatic;
+declare var DashboardExportExcelFormat: DashboardExportExcelFormatStatic;
+declare var ChartExportSizeMode: ChartExportSizeModeStatic;
+declare var MapExportSizeMode: MapExportSizeModeStatic;
+declare var RangeFilterExportSizeMode: RangeFilterExportSizeModeStatic;
+declare var DashboardSelectionMode: DashboardSelectionModeStatic;
+declare var ASPxClientDashboard: ASPxClientDashboardStatic;
+declare var ASPxClientDashboardViewer: ASPxClientDashboardViewerStatic;
+declare var ASPxClientEditBase: ASPxClientEditBaseStatic;
+declare var ASPxClientEdit: ASPxClientEditStatic;
+declare var ASPxClientBinaryImage: ASPxClientBinaryImageStatic;
+declare var ASPxClientButton: ASPxClientButtonStatic;
+declare var ASPxClientCalendar: ASPxClientCalendarStatic;
+declare var ASPxClientCaptcha: ASPxClientCaptchaStatic;
+declare var ASPxClientCheckBox: ASPxClientCheckBoxStatic;
+declare var ASPxClientRadioButton: ASPxClientRadioButtonStatic;
+declare var ASPxClientTextEdit: ASPxClientTextEditStatic;
+declare var ASPxClientTextBoxBase: ASPxClientTextBoxBaseStatic;
+declare var ASPxClientButtonEditBase: ASPxClientButtonEditBaseStatic;
+declare var ASPxClientDropDownEditBase: ASPxClientDropDownEditBaseStatic;
+declare var ASPxClientColorEdit: ASPxClientColorEditStatic;
+declare var ASPxClientComboBox: ASPxClientComboBoxStatic;
+declare var ASPxClientDateEdit: ASPxClientDateEditStatic;
+declare var ASPxClientDropDownEdit: ASPxClientDropDownEditStatic;
+declare var ASPxClientFilterControl: ASPxClientFilterControlStatic;
+declare var ASPxClientListEdit: ASPxClientListEditStatic;
+declare var ASPxClientListBox: ASPxClientListBoxStatic;
+declare var ASPxClientCheckListBase: ASPxClientCheckListBaseStatic;
+declare var ASPxClientRadioButtonList: ASPxClientRadioButtonListStatic;
+declare var ASPxClientCheckBoxList: ASPxClientCheckBoxListStatic;
+declare var ASPxClientProgressBar: ASPxClientProgressBarStatic;
+declare var ASPxClientSpinEditBase: ASPxClientSpinEditBaseStatic;
+declare var ASPxClientSpinEdit: ASPxClientSpinEditStatic;
+declare var ASPxClientTimeEdit: ASPxClientTimeEditStatic;
+declare var ASPxClientStaticEdit: ASPxClientStaticEditStatic;
+declare var ASPxClientHyperLink: ASPxClientHyperLinkStatic;
+declare var ASPxClientImageBase: ASPxClientImageBaseStatic;
+declare var ASPxClientImage: ASPxClientImageStatic;
+declare var ASPxClientLabel: ASPxClientLabelStatic;
+declare var ASPxClientTextBox: ASPxClientTextBoxStatic;
+declare var ASPxClientMemo: ASPxClientMemoStatic;
+declare var ASPxClientButtonEdit: ASPxClientButtonEditStatic;
+declare var ASPxClientTokenBox: ASPxClientTokenBoxStatic;
+declare var ASPxClientTrackBar: ASPxClientTrackBarStatic;
+declare var ASPxClientValidationSummary: ASPxClientValidationSummaryStatic;
+declare var ASPxClientGaugeControl: ASPxClientGaugeControlStatic;
+declare var ASPxClientGridBase: ASPxClientGridBaseStatic;
+declare var ASPxClientGridViewCallbackCommand: ASPxClientGridViewCallbackCommandStatic;
+declare var ASPxClientGridLookup: ASPxClientGridLookupStatic;
+declare var ASPxClientCardView: ASPxClientCardViewStatic;
+declare var ASPxClientGridView: ASPxClientGridViewStatic;
+declare var ASPxClientVerticalGrid: ASPxClientVerticalGridStatic;
+declare var ASPxClientVerticalGridCallbackCommand: ASPxClientVerticalGridCallbackCommandStatic;
+declare var ASPxClientCommandConsts: ASPxClientCommandConstsStatic;
+declare var ASPxClientHtmlEditor: ASPxClientHtmlEditorStatic;
+declare var ASPxClientHtmlEditorMediaPreloadMode: ASPxClientHtmlEditorMediaPreloadModeStatic;
+declare var ASPxClientPivotGrid: ASPxClientPivotGridStatic;
+declare var ASPxClientPivotCustomization: ASPxClientPivotCustomizationStatic;
+declare var ASPxClientRichEdit: ASPxClientRichEditStatic;
+declare var ASPxSchedulerDateTimeHelper: ASPxSchedulerDateTimeHelperStatic;
+declare var ASPxClientWeekDaysCheckEdit: ASPxClientWeekDaysCheckEditStatic;
+declare var ASPxClientRecurrenceRangeControl: ASPxClientRecurrenceRangeControlStatic;
+declare var ASPxClientRecurrenceControlBase: ASPxClientRecurrenceControlBaseStatic;
+declare var ASPxClientDailyRecurrenceControl: ASPxClientDailyRecurrenceControlStatic;
+declare var ASPxClientWeeklyRecurrenceControl: ASPxClientWeeklyRecurrenceControlStatic;
+declare var ASPxClientMonthlyRecurrenceControl: ASPxClientMonthlyRecurrenceControlStatic;
+declare var ASPxClientYearlyRecurrenceControl: ASPxClientYearlyRecurrenceControlStatic;
+declare var ASPxClientRecurrenceTypeEdit: ASPxClientRecurrenceTypeEditStatic;
+declare var ASPxClientTimeInterval: ASPxClientTimeIntervalStatic;
+declare var ASPxClientScheduler: ASPxClientSchedulerStatic;
+declare var ASPxClientSpellChecker: ASPxClientSpellCheckerStatic;
+declare var ASPxClientSpellCheckerStopCheckingReason: ASPxClientSpellCheckerStopCheckingReasonStatic;
+declare var ASPxClientSpreadsheet: ASPxClientSpreadsheetStatic;
+declare var ASPxClientTreeList: ASPxClientTreeListStatic;
+declare var BootstrapClientAccordion: BootstrapClientAccordionStatic;
+declare var BootstrapClientButton: BootstrapClientButtonStatic;
+declare var BootstrapClientCalendar: BootstrapClientCalendarStatic;
+declare var BootstrapClientCheckBox: BootstrapClientCheckBoxStatic;
+declare var BootstrapClientRadioButton: BootstrapClientRadioButtonStatic;
+declare var BootstrapClientComboBox: BootstrapClientComboBoxStatic;
+declare var BootstrapClientDateEdit: BootstrapClientDateEditStatic;
+declare var BootstrapClientDropDownEdit: BootstrapClientDropDownEditStatic;
+declare var BootstrapClientFormLayout: BootstrapClientFormLayoutStatic;
+declare var BootstrapClientGridView: BootstrapClientGridViewStatic;
+declare var BootstrapClientHyperLink: BootstrapClientHyperLinkStatic;
+declare var BootstrapClientListBox: BootstrapClientListBoxStatic;
+declare var BootstrapClientCheckBoxList: BootstrapClientCheckBoxListStatic;
+declare var BootstrapClientRadioButtonList: BootstrapClientRadioButtonListStatic;
+declare var BootstrapClientMenu: BootstrapClientMenuStatic;
+declare var BootstrapClientPopupControl: BootstrapClientPopupControlStatic;
+declare var BootstrapClientPopupMenu: BootstrapClientPopupMenuStatic;
+declare var BootstrapClientProgressBar: BootstrapClientProgressBarStatic;
+declare var BootstrapClientSpinEdit: BootstrapClientSpinEditStatic;
+declare var BootstrapClientTabControl: BootstrapClientTabControlStatic;
+declare var BootstrapClientPageControl: BootstrapClientPageControlStatic;
+declare var BootstrapClientTextBox: BootstrapClientTextBoxStatic;
+declare var BootstrapClientMemo: BootstrapClientMemoStatic;
+declare var BootstrapClientButtonEdit: BootstrapClientButtonEditStatic;
+declare var BootstrapClientTreeView: BootstrapClientTreeViewStatic;
+declare var MVCxClientCalendar: MVCxClientCalendarStatic;
+declare var MVCxClientCallbackPanel: MVCxClientCallbackPanelStatic;
+declare var MVCxClientCardView: MVCxClientCardViewStatic;
+declare var MVCxClientChart: MVCxClientChartStatic;
+declare var MVCxClientComboBox: MVCxClientComboBoxStatic;
+declare var MVCxClientDataView: MVCxClientDataViewStatic;
+declare var MVCxClientDateEdit: MVCxClientDateEditStatic;
+declare var MVCxClientDockManager: MVCxClientDockManagerStatic;
+declare var MVCxClientDockPanel: MVCxClientDockPanelStatic;
+declare var MVCxClientFileManager: MVCxClientFileManagerStatic;
+declare var MVCxClientGridView: MVCxClientGridViewStatic;
+declare var MVCxClientHtmlEditor: MVCxClientHtmlEditorStatic;
+declare var MVCxClientImageGallery: MVCxClientImageGalleryStatic;
+declare var MVCxClientListBox: MVCxClientListBoxStatic;
+declare var MVCxClientNavBar: MVCxClientNavBarStatic;
+declare var MVCxClientPivotGrid: MVCxClientPivotGridStatic;
+declare var MVCxClientPopupControl: MVCxClientPopupControlStatic;
+declare var MVCxClientDocumentViewer: MVCxClientDocumentViewerStatic;
+declare var MVCxClientReportViewer: MVCxClientReportViewerStatic;
+declare var MVCxClientReportDesigner: MVCxClientReportDesignerStatic;
+declare var MVCxClientRichEdit: MVCxClientRichEditStatic;
+declare var MVCxClientRoundPanel: MVCxClientRoundPanelStatic;
+declare var MVCxClientScheduler: MVCxClientSchedulerStatic;
+declare var MVCxSchedulerToolTipType: MVCxSchedulerToolTipTypeStatic;
+declare var MVCxClientSpreadsheet: MVCxClientSpreadsheetStatic;
+declare var MVCxClientPageControl: MVCxClientPageControlStatic;
+declare var MVCxClientTokenBox: MVCxClientTokenBoxStatic;
+declare var MVCxClientTreeList: MVCxClientTreeListStatic;
+declare var MVCxClientTreeView: MVCxClientTreeViewStatic;
+declare var MVCxClientUploadControl: MVCxClientUploadControlStatic;
+declare var MVCxClientUtils: MVCxClientUtilsStatic;
+declare var MVCxClientGlobalEvents: MVCxClientGlobalEventsStatic;
+declare var MVCxClientVerticalGrid: MVCxClientVerticalGridStatic;
+declare var MVCxClientWebDocumentViewer: MVCxClientWebDocumentViewerStatic;
+declare var ASPxClientControlBase: ASPxClientControlBaseStatic;
+declare var ASPxClientControl: ASPxClientControlStatic;
+declare var ASPxClientCallback: ASPxClientCallbackStatic;
+declare var ASPxClientPanelBase: ASPxClientPanelBaseStatic;
+declare var ASPxClientPanel: ASPxClientPanelStatic;
+declare var ASPxClientCallbackPanel: ASPxClientCallbackPanelStatic;
+declare var ASPxClientCloudControl: ASPxClientCloudControlStatic;
+declare var ASPxClientDataView: ASPxClientDataViewStatic;
+declare var ASPxClientDockManager: ASPxClientDockManagerStatic;
+declare var ASPxClientPopupControlBase: ASPxClientPopupControlBaseStatic;
+declare var ASPxClientDockPanel: ASPxClientDockPanelStatic;
+declare var ASPxClientDockZone: ASPxClientDockZoneStatic;
+declare var ASPxClientFileManager: ASPxClientFileManagerStatic;
+declare var ASPxClientFileManagerCommandConsts: ASPxClientFileManagerCommandConstsStatic;
+declare var ASPxClientFileManagerErrorConsts: ASPxClientFileManagerErrorConstsStatic;
+declare var ASPxClientFormLayout: ASPxClientFormLayoutStatic;
+declare var ASPxClientHiddenField: ASPxClientHiddenFieldStatic;
+declare var ASPxClientImageGallery: ASPxClientImageGalleryStatic;
+declare var ASPxClientImageSlider: ASPxClientImageSliderStatic;
+declare var ASPxClientImageZoomNavigator: ASPxClientImageZoomNavigatorStatic;
+declare var ASPxClientImageZoom: ASPxClientImageZoomStatic;
+declare var ASPxClientLoadingPanel: ASPxClientLoadingPanelStatic;
+declare var ASPxClientMenuBase: ASPxClientMenuBaseStatic;
+declare var ASPxClientMenu: ASPxClientMenuStatic;
+declare var ASPxClientTouchUI: ASPxClientTouchUIStatic;
+declare var ASPxClientNavBar: ASPxClientNavBarStatic;
+declare var ASPxClientNewsControl: ASPxClientNewsControlStatic;
+declare var ASPxClientObjectContainer: ASPxClientObjectContainerStatic;
+declare var ASPxClientPager: ASPxClientPagerStatic;
+declare var ASPxClientPopupControl: ASPxClientPopupControlStatic;
+declare var ASPxClientPopupControlResizeState: ASPxClientPopupControlResizeStateStatic;
+declare var ASPxClientPopupControlCloseReason: ASPxClientPopupControlCloseReasonStatic;
+declare var ASPxClientPopupMenu: ASPxClientPopupMenuStatic;
+declare var ASPxClientRatingControl: ASPxClientRatingControlStatic;
+declare var ASPxClientRibbon: ASPxClientRibbonStatic;
+declare var ASPxClientRibbonState: ASPxClientRibbonStateStatic;
+declare var ASPxClientRoundPanel: ASPxClientRoundPanelStatic;
+declare var ASPxClientSplitter: ASPxClientSplitterStatic;
+declare var ASPxClientTabControlBase: ASPxClientTabControlBaseStatic;
+declare var ASPxClientTabControl: ASPxClientTabControlStatic;
+declare var ASPxClientPageControl: ASPxClientPageControlStatic;
+declare var ASPxClientTimer: ASPxClientTimerStatic;
+declare var ASPxClientTitleIndex: ASPxClientTitleIndexStatic;
+declare var ASPxClientTreeView: ASPxClientTreeViewStatic;
+declare var ASPxClientUploadControl: ASPxClientUploadControlStatic;
+declare var ASPxClientUtils: ASPxClientUtilsStatic;
+declare var ASPxClientChartDesigner: ASPxClientChartDesignerStatic;
+declare var ASPxClientWebChartControl: ASPxClientWebChartControlStatic;
+declare var ASPxClientDocumentViewer: ASPxClientDocumentViewerStatic;
+declare var ASPxClientQueryBuilder: ASPxClientQueryBuilderStatic;
+declare var ASPxClientReportDesigner: ASPxClientReportDesignerStatic;
+declare var ASPxClientReportDocumentMap: ASPxClientReportDocumentMapStatic;
+declare var ASPxClientReportParametersPanel: ASPxClientReportParametersPanelStatic;
+declare var ASPxClientReportToolbar: ASPxClientReportToolbarStatic;
+declare var ASPxClientReportViewer: ASPxClientReportViewerStatic;
+declare var ASPxClientWebDocumentViewer: ASPxClientWebDocumentViewerStatic;
+
diff --git a/types/devexpress-web/v162/tsconfig.json b/types/devexpress-web/v162/tsconfig.json
new file mode 100644
index 0000000000..7014b0435c
--- /dev/null
+++ b/types/devexpress-web/v162/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "devexpress-web": ["devexpress-web/v162"],
+            "devexpress-web/*": ["devexpress-web/v162/*"]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "devexpress-web-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/df-visible/index.d.ts b/types/df-visible/index.d.ts
index f7303a46ae..5b26722151 100644
--- a/types/df-visible/index.d.ts
+++ b/types/df-visible/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/customd/jquery-visible
 // Definitions by: Andrey Lipatkin <https://github.com/Litee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/docopt/docopt-tests.ts b/types/docopt/docopt-tests.ts
index e4850d4ea1..8d68355b27 100644
--- a/types/docopt/docopt-tests.ts
+++ b/types/docopt/docopt-tests.ts
@@ -1,5 +1,4 @@
-
-/// <reference types="node" />
+import docopt = require("docopt");
 
 var doc = `
 Usage:
@@ -7,5 +6,4 @@ Usage:
   quick_example.coffee serial <port> [--baud=9600] [--timeout=<seconds>]
   quick_example.coffee -h | --help | --version
 `;
-var {docopt} = require('docopt');
-console.log(docopt(doc, { version: '0.1.1rc' }));
+docopt(doc, { version: '0.1.1rc' });
diff --git a/types/dot/dot-tests.ts b/types/dot/dot-tests.ts
index 507f63e81d..43ff610d91 100644
--- a/types/dot/dot-tests.ts
+++ b/types/dot/dot-tests.ts
@@ -23,6 +23,8 @@ const data = {
 	name: "My name"
 };
 
+doT.templateSettings.varname = 'test';
+
 let pagefn = doT.template(pagetmpl, undefined, def);
 const content = pagefn(data);
 
diff --git a/types/dot/index.d.ts b/types/dot/index.d.ts
index 9ecd61b7ab..3594381fff 100644
--- a/types/dot/index.d.ts
+++ b/types/dot/index.d.ts
@@ -8,8 +8,8 @@ export as namespace doT;
 /** Version number */
 export const version: string;
 
-/** Default template settings */
-export const templateSettings: TemplateSettings;
+/** Template settings */
+export let templateSettings: TemplateSettings;
 
 export type RenderFunction = (...args: any[]) => string;
 
diff --git a/types/dotdotdot/index.d.ts b/types/dotdotdot/index.d.ts
index 3ab0f52945..f8b4b4b5f4 100644
--- a/types/dotdotdot/index.d.ts
+++ b/types/dotdotdot/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://dotdotdot.frebsite.nl/
 // Definitions by: Milan Jaros <https://github.com/milanjaros>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface JQuery {
     /**
diff --git a/types/dottie/dottie-tests.ts b/types/dottie/dottie-tests.ts
index 366d2e32d9..35b02946eb 100644
--- a/types/dottie/dottie-tests.ts
+++ b/types/dottie/dottie-tests.ts
@@ -12,6 +12,7 @@ const nestedObject = {
 
 dottie.exists(nestedObject, 'some.nested');
 dottie.default(nestedObject, 'some.nested.value', 'b');
+dottie.get<string>(nestedObject, 'some.nested.value');
 dottie.get<string>(nestedObject, 'some.nested.value', 'b');
 dottie.set(nestedObject, 'some.nested.value', 'b');
 dottie.transform({ 'foo.bar': 'baz' });
diff --git a/types/dottie/index.d.ts b/types/dottie/index.d.ts
index 66fb81df5f..1c9f601380 100644
--- a/types/dottie/index.d.ts
+++ b/types/dottie/index.d.ts
@@ -76,7 +76,7 @@ declare namespace dottie {
          * dottie.get<string>(values, 'some.undefined.key', 'defaultval'); // 'defaultval'
          * dottie.get<string>(values, ['some.dot.included', 'key']); // 'barfoo'
          */
-        get<T>(obj: object, path: DottiePath, defaultValue: T): T;
+        get<T>(obj: object, path: DottiePath, defaultValue?: T): T;
 
         /**
          * Sets nested value, creates nested structure if needed
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 1ac3c622a0..4315611765 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -2,24 +2,85 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import {Map} from "immutable";
 
-import {Editor, EditorState, RichUtils, DefaultDraftBlockRenderMap, ContentBlock} from 'draft-js';
+import {
+  ContentBlock,
+  DefaultDraftBlockRenderMap,
+  Editor,
+  EditorState,
+  Modifier,
+  RichUtils,
+  SelectionState,
+  getDefaultKeyBinding,
+  ContentState,
+  convertFromHTML
+} from 'draft-js';
+
+const SPLIT_HEADER_BLOCK = 'split-header-block';
+
+export type KeyName =
+  'ENTER';
+
+export type KeyCode = number;
+
+export const KEYCODES: Record<KeyName, KeyCode> = {
+  ENTER: 13,
+};
+
+type SyntheticKeyboardEvent = React.KeyboardEvent<{}>;
 
 class RichEditorExample extends React.Component<{}, { editorState: EditorState }> {
   constructor() {
     super();
 
-    this.state = { editorState: EditorState.createEmpty() };
-    }
+    const sampleMarkup =
+      '<b>Bold text</b>, <i>Italic text</i><br/ ><br />' +
+      '<a href="http://www.facebook.com">Example link</a><br /><br/ >' +
+      '<img src="image.png" height="112" width="200" />';
+    const blocksFromHTML = convertFromHTML(sampleMarkup);
+    const state = ContentState.createFromBlockArray(
+      blocksFromHTML.contentBlocks,
+      blocksFromHTML.entityMap,
+    );
+
+    this.state = { editorState: EditorState.createWithContent(state) };
+  }
 
   onChange: (editorState: EditorState) => void = (editorState: EditorState) => this.setState({ editorState });
 
+  keyBindingFn(e: SyntheticKeyboardEvent): string {
+    if (e.keyCode === KEYCODES.ENTER) {
+      const { editorState } = this.state;
+      const contentState = editorState.getCurrentContent();
+      const selectionState = editorState.getSelection();
+
+      // only split headers into header and unstyled if we press 'Enter'
+      // at the end of a header (without text selected)
+      if (selectionState.isCollapsed()) {
+        const endKey = selectionState.getEndKey();
+        const endOffset = selectionState.getEndOffset();
+        const endBlock = contentState.getBlockForKey(endKey);
+        if (isHeaderBlock(endBlock) && endOffset === endBlock.getText().length) {
+          return SPLIT_HEADER_BLOCK;
+        }
+      }
+    }
+
+    return getDefaultKeyBinding(e);
+  }
+
   handleKeyCommand = (command: string) => {
+    if (command === SPLIT_HEADER_BLOCK) {
+      this.onChange(this.splitHeaderToNewBlock());
+      return 'handled';
+    }
+
     const {editorState} = this.state;
     const newState = RichUtils.handleKeyCommand(editorState, command);
+
     if (newState) {
       this.onChange(newState);
       return "handled";
-        }
+    }
 
     return "not-handled";
     }
@@ -32,6 +93,40 @@ class RichEditorExample extends React.Component<{}, { editorState: EditorState }
     this.onChange(RichUtils.toggleInlineStyle(this.state.editorState, inlineStyle));
   }
 
+  splitHeaderToNewBlock(): EditorState {
+      const { editorState } = this.state;
+      const selection = editorState.getSelection();
+
+      // Add a new block after the cursor
+      const contentWithBlock = Modifier.splitBlock(
+        editorState.getCurrentContent(),
+        selection,
+      );
+
+      // Change the new block type to be normal 'unstyled' text,
+      const newBlock = contentWithBlock.getBlockAfter(selection.getEndKey());
+      const contentWithUnstyledBlock = Modifier.setBlockType(
+        contentWithBlock,
+        SelectionState.createEmpty(newBlock.getKey()),
+        'unstyled',
+      );
+
+      // push the new state with 'insert-characters' to preserve the undo/redo stack
+      const stateWithNewline = EditorState.push(
+        editorState,
+        contentWithUnstyledBlock,
+        'insert-characters'
+      );
+
+      // manually move the cursor to the next line (as expected)
+      const nextState = EditorState.forceSelection(
+        stateWithNewline,
+        SelectionState.createEmpty(newBlock.getKey()),
+      );
+
+      return nextState;
+  }
+
   render(): React.ReactElement<{}> {
     // If the user changes block type before entering any text, we can
     // either style the placeholder or hide it. Let's just hide it now.
@@ -58,6 +153,7 @@ class RichEditorExample extends React.Component<{}, { editorState: EditorState }
             blockStyleFn={getBlockStyle}
             customStyleMap={styleMap}
             editorState={this.state.editorState}
+            keyBindingFn={this.keyBindingFn}
             handleKeyCommand={this.handleKeyCommand}
             onChange={this.onChange}
             placeholder="Tell a story..."
@@ -87,7 +183,7 @@ function getBlockStyle(block: ContentBlock) {
   }
 }
 
-class StyleButton extends React.Component<{key: string, active: boolean, label: string, onToggle: (blockType: string) => void, style: string}, {}> {
+class StyleButton extends React.Component<{key: string, active: boolean, label: string, onToggle: (blockType: string) => void, style: string}> {
   constructor() {
     super();
   }
@@ -125,6 +221,20 @@ const BLOCK_TYPES = [
   { label: 'Code Block', style: 'code-block' },
 ];
 
+const isHeaderBlock = (block: ContentBlock): boolean => {
+  switch (block.getType()) {
+    case 'header-one':
+    case 'header-two':
+    case 'header-three':
+    case 'header-four':
+    case 'header-five':
+    case 'header-six': {
+      return true;
+    }
+    default: return false;
+  }
+}
+
 const BlockStyleControls = (props: {editorState: EditorState, onToggle: (blockType: string) => void}) => {
   const {editorState} = props;
   const selection = editorState.getSelection();
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index c0086319a3..a3c14b73b4 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -1,8 +1,11 @@
 // Type definitions for Draft.js v0.10.0
 // Project: https://facebook.github.io/draft-js/
-// Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>, Eelco Lempsink <https://github.com/eelco>
+// Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
+//                 Eelco Lempsink <https://github.com/eelco>
+//                 Yale Cason <https://github.com/ghotiphud>
+//                 Ryan Schwers <https://github.com/schwers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import * as Immutable from 'immutable';
@@ -27,12 +30,14 @@ declare namespace Draft {
 
             type DraftBlockRenderMap = Immutable.Map<DraftBlockType, DraftBlockRenderConfig>;
 
+            type EditorCommand = DraftEditorCommand | string;
+
             /**
              * `DraftEditor` is the root editor component. It composes a `contentEditable`
              * div, and provides a wide variety of useful function props for managing the
              * state of the editor. See `DraftEditorProps` for details.
              */
-            class DraftEditor extends React.Component<DraftEditorProps, any> {
+            class DraftEditor extends React.Component<DraftEditorProps> {
                 // Force focus back onto the editor node.
                 focus(): void;
                 // Remove focus from the editor node.
@@ -78,8 +83,7 @@ declare namespace Draft {
                 // A function that accepts a synthetic key event and returns
                 // the matching DraftEditorCommand constant, or null if no command should
                 // be invoked.
-                keyBindingFn?(e: SyntheticKeyboardEvent): DraftEditorCommand;
-                keyBindingFn?(e: SyntheticKeyboardEvent): string;
+                keyBindingFn?(e: SyntheticKeyboardEvent): EditorCommand | null;
 
                 // Set whether the `DraftEditor` component should be editable. Useful for
                 // temporarily disabling edit behavior or allowing `DraftEditor` rendering
@@ -118,9 +122,7 @@ declare namespace Draft {
 
                 // Map a key command string provided by your key binding function to a
                 // specified behavior.
-                handleKeyCommand?(command: DraftEditorCommand): DraftHandleValue,
-                handleKeyCommand?(command: string): DraftHandleValue,
-
+                handleKeyCommand?(command: EditorCommand): DraftHandleValue,
 
                 // Handle intended text insertion before the insertion occurs. This may be
                 // useful in cases where the user has entered characters that you would like
@@ -160,7 +162,7 @@ declare namespace Draft {
         }
 
         namespace Components {
-            class DraftEditorBlock extends React.Component<any, any> {
+            class DraftEditorBlock extends React.Component<any> {
             }
         }
 
@@ -201,8 +203,7 @@ declare namespace Draft {
             /**
              * Retrieve a bound key command for the given event.
              */
-            function getDefaultKeyBinding(e: SyntheticKeyboardEvent): DraftEditorCommand;
-            function getDefaultKeyBinding(e: SyntheticKeyboardEvent): string;
+            function getDefaultKeyBinding(e: SyntheticKeyboardEvent): DraftEditorCommand | null;
         }
     }
 
@@ -458,7 +459,7 @@ declare namespace Draft {
                 entityMap: { [key: string]: RawDraftEntity };
             }
 
-            function convertFromHTMLtoContentBlocks(html: string, DOMBuilder?: Function, blockRenderMap?: DraftBlockRenderMap): Array<ContentBlock>;
+            function convertFromHTMLtoContentBlocks(html: string, DOMBuilder?: Function, blockRenderMap?: DraftBlockRenderMap): { contentBlocks: Array<ContentBlock>, entityMap: any };
             function convertFromRawToDraftState(rawState: RawDraftContentState): ContentState;
             function convertFromDraftStateToRaw(contentState: ContentState): RawDraftContentState;
         }
@@ -701,7 +702,7 @@ declare namespace Draft {
             }
 
             class ContentState extends Record {
-                static createFromBlockArray(blocks: Array<ContentBlock>): ContentState;
+                static createFromBlockArray(blocks: Array<ContentBlock>, entityMap: any): ContentState;
                 static createFromText(text: string, delimiter?: string): ContentState;
 
                 createEntity(type: DraftEntityType, mutability: DraftEntityMutability, data?: Object): ContentState;
diff --git a/types/dropzone/index.d.ts b/types/dropzone/index.d.ts
index 905fa53ab9..703172072f 100644
--- a/types/dropzone/index.d.ts
+++ b/types/dropzone/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.dropzonejs.com/
 // Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Vasya Aksyonov <https://github.com/outring>, Simon Huber <https://github.com/renuo>, Sebastiaan de Rooij <https://github.com/Hikariii>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/dts-bundle/dts-bundle-tests.ts b/types/dts-bundle/dts-bundle-tests.ts
index ef8fae6044..29ce2e359c 100644
--- a/types/dts-bundle/dts-bundle-tests.ts
+++ b/types/dts-bundle/dts-bundle-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="node"/>
 import dts = require("dts-bundle");
-import os = require("os");
 
 var opts = {
-
     // Required
 
     // name of module likein package.json
@@ -34,7 +31,7 @@ var opts = {
     // - default: false
     removeSource: false,
     // newline to use in output file
-    newline: os.EOL,
+    newline: "\n",
     // indentation to use in output file
     // - default 4 spaces
     indent: '   ',
diff --git a/types/durandal/index.d.ts b/types/durandal/index.d.ts
index b95bcb1271..85dbb86e93 100644
--- a/types/durandal/index.d.ts
+++ b/types/durandal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://durandaljs.com
 // Definitions by: Blue Spire <https://github.com/BlueSpire>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * Durandal 2.1.0 Copyright (c) 2012 Blue Spire Consulting, Inc. All Rights Reserved.
diff --git a/types/durandal/v1/index.d.ts b/types/durandal/v1/index.d.ts
index 92896b61b5..2b8ae5db1f 100644
--- a/types/durandal/v1/index.d.ts
+++ b/types/durandal/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://durandaljs.com
 // Definitions by: Evan Larsen <http://nouvosoft.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="knockout" />
diff --git a/types/dw-bxslider-4/index.d.ts b/types/dw-bxslider-4/index.d.ts
index eb33295767..c7003dcf46 100644
--- a/types/dw-bxslider-4/index.d.ts
+++ b/types/dw-bxslider-4/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/stevenwanderski/bxslider-4
 // Definitions by: Piotr Sałkowski <https://github.com/namerci>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery"/>
 
@@ -620,4 +621,4 @@ interface JQuery {
      * @param options
      */
     bxSlider(options?:bxSliderOptions): bxSlider;
-}
\ No newline at end of file
+}
diff --git a/types/dygraphs/index.d.ts b/types/dygraphs/index.d.ts
index 6d2cedf9d2..fb6f4b997d 100644
--- a/types/dygraphs/index.d.ts
+++ b/types/dygraphs/index.d.ts
@@ -1266,5 +1266,5 @@ declare class Dygraph {
 }
 
 declare module "dygraphs" {
-    export = Dygraph;
-}
\ No newline at end of file
+    export default Dygraph;
+}
diff --git a/types/dynatable/index.d.ts b/types/dynatable/index.d.ts
index 774b617674..b9e1be607f 100644
--- a/types/dynatable/index.d.ts
+++ b/types/dynatable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.dynatable.com/
 // Definitions by: François Massart <https://github.com/francoismassart/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/each/each-tests.ts b/types/each/each-tests.ts
index 89f5e81ccb..55f257925a 100644
--- a/types/each/each-tests.ts
+++ b/types/each/each-tests.ts
@@ -1,5 +1,4 @@
-
-/// <reference types="node" />
+import EachReq = require("each");
 
 function testEach() {
 	var EachStaticClass: EachStatic = function (array: any[]) {
@@ -36,6 +35,5 @@ function testEach() {
 
 	var each: Each = EachStaticClass([1, 2, 3]);
 
-	var EachReq: EachStatic = require("each");
 	var each: Each = EachReq([4, 5, 6]);
 }
diff --git a/types/easy-jsend/easy-jsend-tests.ts b/types/easy-jsend/easy-jsend-tests.ts
index 705fe5b7e1..0ea41f4418 100644
--- a/types/easy-jsend/easy-jsend-tests.ts
+++ b/types/easy-jsend/easy-jsend-tests.ts
@@ -1,14 +1,15 @@
 
 
-import mongoose = require('mongoose');
+// import mongoose = require('mongoose');
 import express = require('express');
 import jSend = require('easy-jsend');
 
-var schema = new mongoose.Schema({
-    name: {type: String}
-});
+// var schema = new mongoose.Schema({
+//     name: {type: String}
+// });
 
-var Model = mongoose.model('model', schema);
+// var Model = mongoose.model('model', schema);
+var Model = {};
 
 jSend.init({partial: true});
 
diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index cae7001218..c7d5521f1c 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,5 +1,7 @@
 /* tslint:disable */
 
+import $ = require('jquery');
+
 module AccordionComponent {
     $(function () {
         var sample = new ej.Accordion($("#basicAccordion"), {
@@ -596,7 +598,7 @@ module GridComponent {
 
 
 
-var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fl�temysost"]
+var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fløtemysost"]
 var itemSource: any[] = [];
 for (var i = 0; i < columns.length; i++) {
     for (var j = 0; j < 6; j++) {
@@ -760,7 +762,7 @@ var world_map=
             { "type": "Feature", "properties": { "admin": "Switzerland", "name": "Switzerland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.594226108446346, 47.525058091820256], [9.632931756232974, 47.347601223329974], [9.479969516649019, 47.102809963563367], [9.932448357796657, 46.920728054382948], [10.442701450246627, 46.893546250997424], [10.36337812667861, 46.483571275409851], [9.922836541390378, 46.314899400409182], [9.182881707403054, 46.440214748716976], [8.966305779667804, 46.036931871111186], [8.489952426801322, 46.005150865251672], [8.316629672894377, 46.163642483090847], [7.755992058959832, 45.824490057959302], [7.273850945676655, 45.776947740250769], [6.843592970414504, 45.991146552100595], [6.500099724970424, 46.429672756529428], [6.022609490593537, 46.272989813820466], [6.037388950229, 46.725778713561859], [6.768713820023605, 47.287708238303686], [6.736571079138058, 47.541801255882838], [7.192202182655505, 47.449765529971003], [7.466759067422228, 47.620581976911794], [8.31730146651415, 47.613579820336255], [8.522611932009765, 47.830827541691285], [9.594226108446346, 47.525058091820256]]] } },
             { "type": "Feature", "properties": { "admin": "Chile", "name": "Chile", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-68.634010227583147, -52.636370458874353], [-68.633349999999879, -54.8695], [-67.56244, -54.87001], [-66.95992, -54.89681], [-67.291029999999878, -55.30124], [-68.148629999999841, -55.61183], [-68.639990810811796, -55.580017999086877], [-69.2321, -55.49906], [-69.95809, -55.19843], [-71.00568, -55.05383], [-72.2639, -54.49514], [-73.2852, -53.957519999999874], [-74.66253, -52.83749], [-73.8381, -53.04743], [-72.43418, -53.7154], [-71.10773, -54.07433], [-70.591779999999787, -53.61583], [-70.26748, -52.93123], [-69.345649999999878, -52.5183], [-68.634010227583147, -52.636370458874353]]], [[[-68.219913092711224, -21.49434661223183], [-67.828179897722634, -22.872918796482178], [-67.106673550063604, -22.735924574476392], [-66.985233934177629, -22.986348565362825], [-67.328442959244128, -24.025303236590908], [-68.417652960876111, -24.518554782816874], [-68.386001146097342, -26.185016371365229], [-68.594799770772667, -26.50690886811126], [-68.295541551370391, -26.899339694935787], [-69.001234910748266, -27.521213881136127], [-69.656130337183143, -28.459141127233686], [-70.013550381129861, -29.367922865518544], [-69.919008348251921, -30.336339206668306], [-70.535068935819439, -31.365010267870279], [-70.074399380153622, -33.09120981214803], [-69.814776984319209, -33.273886000299839], [-69.817309129501453, -34.193571465798279], [-70.388049485949082, -35.169687595359441], [-70.364769253201658, -36.005088799789931], [-71.121880662709771, -36.65812387466233], [-71.118625047475419, -37.576827487947192], [-70.814664272734703, -38.552995293940732], [-71.413516608349042, -38.916022230791107], [-71.680761277946445, -39.808164157878061], [-71.915734015577542, -40.832339369470716], [-71.746803758415453, -42.051386407235988], [-72.148898078078517, -42.254888197601375], [-71.915423956983901, -43.408564548517404], [-71.464056159130493, -43.787611179378324], [-71.793622606071935, -44.207172133156099], [-71.329800788036195, -44.407521661151677], [-71.222778896759721, -44.784242852559409], [-71.659315558545316, -44.973688653341434], [-71.552009446891233, -45.560732924177117], [-71.917258470330196, -46.884838148791786], [-72.44735531278026, -47.738532810253517], [-72.331160854771937, -48.244238376661819], [-72.648247443314929, -48.878618259476774], [-73.415435757120022, -49.318436374712952], [-73.328050910114456, -50.378785088909865], [-72.975746832964617, -50.741450290734299], [-72.309973517532342, -50.677009779666342], [-72.329403856074023, -51.425956312872394], [-71.914803839796321, -52.009022305865912], [-69.498362189396076, -52.142760912637236], [-68.571545376241332, -52.299443855346247], [-69.461284349226617, -52.291950772663924], [-69.94277950710611, -52.537930590373243], [-70.8451016913545, -52.899200528525711], [-71.006332160105217, -53.833252042201345], [-71.429794684520928, -53.856454760300373], [-72.557942877884855, -53.531410001184447], [-73.702756720662862, -52.835069268607249], [-73.702756720662862, -52.835070076051487], [-74.946763475225154, -52.262753588419017], [-75.260026007778507, -51.62935475037321], [-74.976632453089806, -51.043395684615675], [-75.47975419788348, -50.378371677451547], [-75.608015102831942, -48.673772881871784], [-75.182769741502128, -47.711919447623153], [-74.126580980104677, -46.939253431995084], [-75.644395311165439, -46.647643324572016], [-74.69215369332305, -45.76397633238097], [-74.351709357384252, -44.10304412208788], [-73.240356004515192, -44.454960625995611], [-72.717803921179765, -42.383355808278985], [-73.388899909138232, -42.117532240569567], [-73.701335618774834, -43.365776462579738], [-74.33194312203257, -43.224958184584395], [-74.017957119427152, -41.794812920906828], [-73.677099372029943, -39.942212823243111], [-73.217592536090663, -39.258688653318508], [-73.505559455037044, -38.282882582351064], [-73.588060879191076, -37.156284681956016], [-73.166717088499283, -37.123780206044351], [-72.553136969681717, -35.508840020491022], [-71.861732143832555, -33.909092706031522], [-71.438450486929895, -32.418899428030819], [-71.668720669222424, -30.920644626592516], [-71.370082567007714, -30.095682061484997], [-71.48989437527645, -28.861442152625909], [-70.905123867461569, -27.640379734001193], [-70.724953986275963, -25.705924167587209], [-70.403965827095035, -23.628996677344542], [-70.091245897080668, -21.393319187101223], [-70.164419725205974, -19.756468194256183], [-70.372572394477714, -18.347975355708879], [-69.858443569605797, -18.092693780187027], [-69.590423753523979, -17.580011895419286], [-69.100246955019401, -18.260125420812653], [-68.966818406841824, -18.981683444904089], [-68.442225104430918, -19.405068454671419], [-68.757167121033703, -20.37265797290447], [-68.219913092711224, -21.49434661223183]]]] } },
             { "type": "Feature", "properties": { "admin": "China", "name": "China", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[110.339187860151526, 18.678395087147603], [109.475209588663702, 18.19770091396861], [108.655207961056135, 18.507681993071397], [108.626217482540426, 19.367887885001974], [109.119055617308007, 19.821038519769385], [110.211598748822837, 20.101253973872073], [110.786550734502228, 20.077534491450077], [111.01005130416462, 19.695929877190732], [110.570646600386794, 19.255879218009305], [110.339187860151526, 18.678395087147603]]], [[[127.657407261262378, 49.760270494172929], [129.397817824420429, 49.440600084015429], [130.58229332898236, 48.729687404976112], [130.987281528853828, 47.790132351261391], [132.506671991099495, 47.788969631534876], [133.373595819228001, 48.183441677434914], [135.026311476786702, 48.478229885443902], [134.500813836810607, 47.578439846377833], [134.112362095272601, 47.212467352886719], [133.76964399631288, 46.116926988299056], [133.097126906466428, 45.14406647397216], [131.883454217659562, 45.32116160743643], [131.025212030156069, 44.967953192721573], [131.288555129115537, 44.111519680348252], [131.144687941614848, 42.929989732426932], [130.633866408409801, 42.903014634770543], [130.640015903852429, 42.39500946712527], [129.994267205933227, 42.985386867843793], [129.596668735879462, 42.424981797854592], [128.05221520397231, 41.994284572917984], [128.208433058790717, 41.466771552082534], [127.343782993683021, 41.503151760415953], [126.869083286649854, 41.816569322266155], [126.18204511932943, 41.107336127276362], [125.079941847840587, 40.569823716792449], [124.265624627785314, 39.928493353834135], [122.86757042856101, 39.637787583976255], [122.131387974130917, 39.170451768544623], [121.054554478032856, 38.89747101496291], [121.585994907722466, 39.360853583324136], [121.376757033372641, 39.750261338859524], [122.168595005381007, 40.422442531896046], [121.640358514493528, 40.946389878903304], [120.768628778161954, 40.593388169917596], [119.639602085449056, 39.898055935214209], [119.023463983233015, 39.252333075511096], [118.042748651197897, 39.204273993479674], [117.532702264477052, 38.73763580988409], [118.05969852098967, 38.061475531561051], [118.878149855628351, 37.897325344385898], [118.911636183753501, 37.448463853498723], [119.702802362142037, 37.156388658185072], [120.823457472823648, 37.870427761377968], [121.711258579597938, 37.481123358707165], [122.357937453298462, 37.454484157860684], [122.519994744965814, 36.930614325501828], [121.104163853033029, 36.651329047180432], [120.63700890511457, 36.111439520811125], [119.66456180224607, 35.609790554337728], [119.151208123858567, 34.909859117160458], [120.227524855633717, 34.360331936168613], [120.620369093916565, 33.37672272392512], [121.229014113450219, 32.460318711877186], [121.908145786630044, 31.692174384074683], [121.891919386890336, 30.949351508095098], [121.264257440273298, 30.676267401648712], [121.503519321784722, 30.14291494396425], [122.092113885589086, 29.832520453403156], [121.93842817595305, 29.018022365834803], [121.684438511238469, 28.225512600206677], [121.125661248866436, 28.135673122667178], [120.395473260582307, 27.053206895449385], [119.585496860839555, 25.740780544532605], [118.656871372554519, 24.547390855400234], [117.281606479970833, 23.624501451099714], [115.890735304835118, 22.782873236578094], [114.763827345846209, 22.668074042241663], [114.152546828265656, 22.223760077396204], [113.806779819800752, 22.548339748621423], [113.241077915501592, 22.051367499270462], [111.843592157032447, 21.550493679281512], [110.78546552942413, 21.39714386645533], [110.444039341271662, 20.34103261970639], [109.88986128137357, 20.282457383703441], [109.627655063924635, 21.008227037026725], [109.864488153118316, 21.395050970947516], [108.522812941524421, 21.715212307211821], [108.050180291782979, 21.552379869060101], [107.043420037872636, 21.8118989120299], [106.567273390735352, 22.21820486092474], [106.725403273548466, 22.794267889898375], [105.811247186305209, 22.976892401617899], [105.329209425886631, 23.352063300056976], [104.476858351664475, 22.819150092046918], [103.504514601660503, 22.703756618739217], [102.706992222100155, 22.708795070887696], [102.170435825613552, 22.464753119389336], [101.652017856861576, 22.318198757409554], [101.803119744882906, 21.174366766845051], [101.27002566936001, 21.201651923095167], [101.180005324307558, 21.436572984294052], [101.150032993578236, 21.849984442629015], [100.416537713627349, 21.558839423096654], [99.983489211021549, 21.742936713136451], [99.240898878987196, 22.118314317304559], [99.53199222208741, 22.949038804612591], [98.898749220782804, 23.142722072842581], [98.66026248575578, 24.063286037690002], [97.604719679762027, 23.897404690033049], [97.724609002679131, 25.083637193293036], [98.671838006589212, 25.91870250091349], [98.712093947344556, 26.743535874940243], [98.682690057370507, 27.508812160750658], [98.246230910233351, 27.747221381129172], [97.91198774616943, 28.335945136014367], [97.327113885490007, 28.261582749946339], [96.248833449287829, 28.411030992134467], [96.586590610747521, 28.830979519154361], [96.117678664131006, 29.452802028922513], [95.404802280664626, 29.031716620392157], [94.565990431702929, 29.27743805593996], [93.413347609432662, 28.640629380807233], [92.503118931043616, 27.896876329046442], [91.696656528696693, 27.771741848251615], [91.258853794319876, 28.040614325466343], [90.730513950567797, 28.064953925075738], [90.015828891971182, 28.296438503527177], [89.475810174521158, 28.042758897406365], [88.814248488320573, 27.299315904239389], [88.730325962278528, 28.086864732367552], [88.120440708369941, 27.876541652939572], [86.954517043000635, 27.974261786403524], [85.823319940131526, 28.203575954698742], [85.011638218123053, 28.642773952747369], [84.23457970575015, 28.839893703724691], [83.89899295444674, 29.320226141877633], [83.337115106137176, 29.463731594352193], [82.327512648450877, 30.115268052688204], [81.525804477874786, 30.422716986608659], [81.111256138029276, 30.183480943313402], [79.721366815107118, 30.882714748654728], [78.738894484374001, 31.515906073527045], [78.458446486326025, 32.61816437431272], [79.176128777995544, 32.483779812137747], [79.208891636068543, 32.994394639613738], [78.811086460285722, 33.506198025032397], [78.912268914713209, 34.321936346975768], [77.83745079947461, 35.494009507787794], [76.192848341785705, 35.89840342868785], [75.896897414050173, 36.666806138651872], [75.158027785140987, 37.133030910789152], [74.980002475895404, 37.419990139305888], [74.829985792952144, 37.990007025701445], [74.864815708316783, 38.378846340481587], [74.25751427602269, 38.606506862943476], [73.928852166646394, 38.505815334622717], [73.675379266254836, 39.431236884105566], [73.960013055318427, 39.660008449861714], [73.822243686828315, 39.893973497063136], [74.776862420556043, 40.366425279291619], [75.467827996730719, 40.56207225194867], [76.526368035797432, 40.427946071935132], [76.90448449087711, 41.066485907549648], [78.187196893226044, 41.185315863604799], [78.543660923175253, 41.582242540038713], [80.119430373051401, 42.12394074153822], [80.259990268885318, 42.34999929459908], [80.180150180994374, 42.920067857426844], [80.866206496101213, 43.180362046881008], [79.966106398441426, 44.917516994804622], [81.947070753918084, 45.317027492853143], [82.458925815769035, 45.539649563166499], [83.180483839860543, 47.330031236350735], [85.164290399113213, 47.000955715516099], [85.720483839870667, 47.452969468773077], [85.76823286330837, 48.455750637396896], [86.59877648310335, 48.549181626980605], [87.359970330762692, 49.214980780629148], [87.751264276076668, 49.297197984405464], [88.013832228551678, 48.599462795600594], [88.854297723346747, 48.069081732773007], [90.280825636763893, 47.693549099307901], [90.970809360724957, 46.88814606382293], [90.585768263718307, 45.719716091487491], [90.945539585334316, 45.286073309910243], [92.133890822318222, 45.115075995456429], [93.480733677141316, 44.97547211362], [94.688928664125356, 44.352331854828456], [95.306875441471504, 44.241330878265458], [95.762454868556688, 43.319449164394619], [96.349395786527808, 42.725635280928643], [97.451757440177971, 42.74888967546007], [99.515817498779995, 42.524691473961688], [100.845865513108279, 42.663804429691417], [101.833040399179936, 42.51487295182627], [103.312278273534787, 41.907468166667613], [104.522281935649005, 41.90834666601662], [104.964993931093431, 41.597409572916334], [106.129315627061658, 42.134327704428891], [107.744772576937976, 42.481515814781908], [109.243595819131428, 42.519446316084149], [110.412103306115299, 42.871233628911014], [111.129682244920218, 43.406834011400171], [111.82958784388137, 43.743118394539486], [111.667737257943202, 44.073175767587706], [111.348376906379428, 44.457441718110047], [111.87330610560025, 45.102079372735112], [112.436062453258842, 45.01164561622425], [113.463906691544196, 44.808893134127111], [114.46033165899604, 45.339816799493875], [115.985096470200133, 45.727235012386004], [116.717868280098855, 46.38820241961524], [117.421701287914246, 46.67273285581421], [118.874325799638711, 46.805412095723646], [119.663269891438745, 46.692679958678944], [119.772823927897562, 47.048058783550132], [118.866574334794947, 47.747060044946195], [118.064142694166719, 48.06673045510373], [117.295507440257438, 47.697709052107385], [116.308952671373234, 47.853410142602812], [115.742837355615734, 47.726544501326273], [115.485282017073018, 48.135382595403442], [116.191802199367601, 49.134598090199056], [116.67880089728618, 49.888531399121398], [117.879244419426371, 49.510983384796944], [119.288460728025839, 50.142882798862033], [119.279365675942358, 50.582907619827282], [120.182049595216924, 51.64356639261802], [120.738191359541972, 51.964115302124547], [120.725789015791975, 52.516226304730814], [120.177088657716865, 52.753886216841195], [121.003084751470226, 53.251401068731226], [122.245747918792858, 53.431725979213681], [123.571506789240843, 53.458804429734627], [125.068211297710434, 53.161044826868832], [125.946348911646169, 52.792798570356936], [126.564399041856959, 51.784255479532689], [126.939156528837657, 51.353894151405896], [127.287455682484904, 50.739797268265434], [127.657407261262378, 49.760270494172929]]]] } },
-            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "C�te d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
+            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "Côte d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
             { "type": "Feature", "properties": { "admin": "Cameroon", "name": "Cameroon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[13.07582238124675, 2.267097072759014], [12.951333855855605, 2.321615708826939], [12.359380323952218, 2.19281220133945], [11.751665480199787, 2.326757513839993], [11.276449008843711, 2.261050930180871], [9.649158155972627, 2.283866075037735], [9.795195753629455, 3.073404445809117], [9.404366896205998, 3.734526882335202], [8.948115675501068, 3.904128933117135], [8.744923943729416, 4.352215277519959], [8.488815545290889, 4.495617377129917], [8.500287713259693, 4.771982937026847], [8.757532993208626, 5.47966583904791], [9.233162876023043, 6.444490668153334], [9.522705926154398, 6.453482367372116], [10.118276808318255, 7.038769639509879], [10.497375115611417, 7.055357774275562], [11.058787876030349, 6.644426784690593], [11.745774366918509, 6.981382961449753], [11.839308709366801, 7.397042344589434], [12.063946160539556, 7.799808457872301], [12.218872104550597, 8.305824082874322], [12.753671502339214, 8.717762762888993], [12.955467970438971, 9.417771714714702], [13.1675997249971, 9.64062632897341], [13.308676385153914, 10.160362046748926], [13.572949659894558, 10.798565985553564], [14.415378859116682, 11.572368882692071], [14.468192172918974, 11.90475169519341], [14.57717776862253, 12.085360826053501], [14.181336297266792, 12.483656927943112], [14.213530714584634, 12.802035427293344], [14.495787387762842, 12.859396267137326], [14.893385857816522, 12.219047756392582], [14.960151808337598, 11.555574042197222], [14.923564894274955, 10.891325181517471], [15.467872755605269, 9.982336737503429], [14.909353875394713, 9.99212942142273], [14.627200555081057, 9.920919297724536], [14.171466098699025, 10.021378282099928], [13.954218377344002, 9.549494940626685], [14.544466586981766, 8.965861314322266], [14.979995558337688, 8.796104234243471], [15.120865512765331, 8.382150173369423], [15.436091749745765, 7.692812404811971], [15.279460483469107, 7.421924546737968], [14.776545444404572, 6.408498033062044], [14.536560092841111, 6.22695872642069], [14.459407179429345, 5.451760565610299], [14.558935988023501, 5.03059764243153], [14.478372430080466, 4.732605495620446], [14.950953403389658, 4.21038930909492], [15.036219516671249, 3.851367295747123], [15.405395948964379, 3.335300604664339], [15.862732374747479, 3.013537298998982], [15.907380812247649, 2.557389431158612], [16.01285241055535, 2.267639675298084], [15.940918816805061, 1.727672634280295], [15.14634199388524, 1.964014797367184], [14.337812534246577, 2.22787466064949], [13.07582238124675, 2.267097072759014]]] } },
             { "type": "Feature", "properties": { "admin": "Democratic Republic of the Congo", "name": "Dem. Rep. Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.833859897593801, 3.50916596111034], [30.773346795380036, 2.339883327642127], [31.174149204235807, 2.204465236821263], [30.852670118948048, 1.849396470543809], [30.468507521290292, 1.58380544677972], [30.086153598762703, 1.062312730306288], [29.875778842902488, 0.597379868976304], [29.819503208136634, -0.205310153813372], [29.587837762172164, -0.58740569417948], [29.579466180140876, -1.341313164885626], [29.29188683443661, -1.620055840667987], [29.254834832483336, -2.215109958508911], [29.117478875451546, -2.292211195488384], [29.02492638521678, -2.839257907730157], [29.276383904749046, -3.293907159034063], [29.339997592900342, -4.499983412294092], [29.519986606572925, -5.419978936386313], [29.41999271008816, -5.939998874539432], [29.620032179490003, -6.520015150583424], [30.199996779101692, -7.079980970898161], [30.740015496551781, -8.340007419470913], [30.34608605319081, -8.238256524288216], [29.002912225060467, -8.40703175215347], [28.734866570762495, -8.526559340044576], [28.449871046672818, -9.164918308146083], [28.673681674928922, -9.605924981324931], [28.496069777141763, -10.789883721564044], [28.372253045370421, -11.793646742401389], [28.642417433392346, -11.971568698782312], [29.341547885869087, -12.36074391037241], [29.616001417771223, -12.178894545137307], [29.699613885219485, -13.257226657771827], [28.934285922976834, -13.248958428605132], [28.52356163912102, -12.698604424696679], [28.15510867687998, -12.272480564017894], [27.38879886242378, -12.132747491100663], [27.164419793412456, -11.608748467661071], [26.55308759939961, -11.924439792532125], [25.752309604604726, -11.784965101776356], [25.418118116973197, -11.330935967659958], [24.783169793402948, -11.238693536018962], [24.314516228947948, -11.262826429899269], [24.257155389103982, -10.951992689663655], [23.912215203555714, -10.926826267137512], [23.456790805767433, -10.867863457892481], [22.837345411884733, -11.017621758674329], [22.402798292742371, -10.99307545333569], [22.155268182064304, -11.084801120653768], [22.208753289486388, -9.894796237836507], [21.87518191904234, -9.523707777548564], [21.801801385187897, -8.908706556842978], [21.949130893652036, -8.305900974158275], [21.746455926203303, -7.920084730667147], [21.728110792739695, -7.2908724910813], [20.514748162526498, -7.299605808138629], [20.601822950938292, -6.93931772219968], [20.091621534920645, -6.943090101756993], [20.037723016040214, -7.116361179231644], [19.417502475673157, -7.155428562044297], [19.166613396896107, -7.738183688999753], [19.016751743249664, -7.988245944860132], [18.464175652752683, -7.847014255406442], [18.134221632569048, -7.98767750410492], [17.472970004962232, -8.068551120641699], [17.089995965247166, -7.545688978712525], [16.860190870845198, -7.222297865429984], [16.573179965896141, -6.622644545115087], [16.326528354567042, -5.877470391466267], [13.375597364971892, -5.864241224799548], [13.02486941900696, -5.984388929878157], [12.735171339578695, -5.965682061388497], [12.322431674863507, -6.100092461779658], [12.182336866920249, -5.789930515163837], [12.436688266660866, -5.684303887559245], [12.468004184629734, -5.248361504745003], [12.631611769265788, -4.991271254092935], [12.995517205465173, -4.781103203961883], [13.258240187237044, -4.882957452009165], [13.600234816144676, -4.500138441590969], [14.144956088933295, -4.510008640158715], [14.209034864975219, -4.793092136253597], [14.582603794013179, -4.970238946150139], [15.170991652088441, -4.3435071753143], [15.753540073314749, -3.855164890156096], [16.006289503654298, -3.535132744972528], [15.972803175529149, -2.712392266453612], [16.407091912510051, -1.740927015798682], [16.86530683764212, -1.225816338713287], [17.523716261472853, -0.743830254726987], [17.638644646889983, -0.424831638189246], [17.663552687254676, -0.058083998213817], [17.826540154703245, 0.288923244626105], [17.774191928791563, 0.855658677571085], [17.89883548347958, 1.741831976728278], [18.09427575040743, 2.365721543788055], [18.39379235197114, 2.90044342692822], [18.453065219809925, 3.504385891123348], [18.542982211997778, 4.201785183118317], [18.932312452884755, 4.709506130385973], [19.467783644293146, 5.031527818212779], [20.290679152108932, 4.691677761245287], [20.927591180106273, 4.322785549329736], [21.659122755630019, 4.224341945813719], [22.405123732195531, 4.02916006104732], [22.704123569436284, 4.633050848810156], [22.841479526468103, 4.710126247573483], [23.297213982850135, 4.609693101414221], [24.41053104014625, 5.108784084489129], [24.805028924262409, 4.897246608902349], [25.128833449003274, 4.927244777847789], [25.278798455514302, 5.170408229997191], [25.650455356557465, 5.256087754737123], [26.402760857862535, 5.150874538590869], [27.044065382604703, 5.127852688004835], [27.374226108517483, 5.233944403500059], [27.979977247842807, 4.408413397637373], [28.428993768026906, 4.287154649264493], [28.696677687298795, 4.455077215996936], [29.159078403446497, 4.38926727947323], [29.715995314256013, 4.600804755060024], [29.953500197069467, 4.173699042167683], [30.833859897593801, 3.50916596111034]]] } },
             { "type": "Feature", "properties": { "admin": "Republic of Congo", "name": "Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[12.995517205465173, -4.781103203961883], [12.620759718484491, -4.438023369976135], [12.318607618873923, -4.606230157086187], [11.914963006242086, -5.037986748884789], [11.093772820691923, -3.978826592630546], [11.855121697648114, -3.42687061932105], [11.478038771214299, -2.765618991714241], [11.820963575903189, -2.514161472181982], [12.495702752338159, -2.391688327650242], [12.575284458067639, -1.948511244315134], [13.109618767965626, -2.428740329603513], [13.992407260807706, -2.470804945489099], [14.299210239324564, -1.998275648612213], [14.425455763413593, -1.333406670744971], [14.316418491277741, -0.552627455247048], [13.843320753645653, 0.038757635901149], [14.276265903386953, 1.196929836426619], [14.026668735417214, 1.395677395021153], [13.282631463278816, 1.31418366129688], [13.003113641012074, 1.830896307783319], [13.07582238124675, 2.267097072759014], [14.337812534246577, 2.22787466064949], [15.14634199388524, 1.964014797367184], [15.940918816805061, 1.727672634280295], [16.01285241055535, 2.267639675298084], [16.537058139724135, 3.198254706226278], [17.133042433346297, 3.728196519379451], [17.809900343505259, 3.560196437998569], [18.453065219809925, 3.504385891123348], [18.39379235197114, 2.90044342692822], [18.09427575040743, 2.365721543788055], [17.89883548347958, 1.741831976728278], [17.774191928791563, 0.855658677571085], [17.826540154703245, 0.288923244626105], [17.663552687254676, -0.058083998213817], [17.638644646889983, -0.424831638189246], [17.523716261472853, -0.743830254726987], [16.86530683764212, -1.225816338713287], [16.407091912510051, -1.740927015798682], [15.972803175529149, -2.712392266453612], [16.006289503654298, -3.535132744972528], [15.753540073314749, -3.855164890156096], [15.170991652088441, -4.3435071753143], [14.582603794013179, -4.970238946150139], [14.209034864975219, -4.793092136253597], [14.144956088933295, -4.510008640158715], [13.600234816144676, -4.500138441590969], [13.258240187237044, -4.882957452009165], [12.995517205465173, -4.781103203961883]]] } },
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index e304a73863..ed36a800f6 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -3,11 +3,9 @@
 // Definitions by: Syncfusion <https://github.com/syncfusion/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 15.2.0.40
+*  version : 15.2.0.43
 *  Copyright Syncfusion Inc. 2001 - 2017. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing
@@ -239,6 +237,7 @@ declare namespace ej {
 		convertToQueryString(req: any, query: ej.Query, dm: ej.DataManager): JQueryParam;
 		processResponse(data: any, ds: any, query: ej.Query, xhr: JQueryXHR, request?: any, changes?: Changes): any;
 		onGroup(e: any): void;
+		onAggregates(e: any): void;
 		batchRequest(dm: ej.DataManager, changes: Changes, e: any): void;
 		beforeSend(dm: ej.DataManager, request: any, settings?: any): void;
 		insert(dm: ej.DataManager, data: any, tableName: string): { url: string; data: any };
@@ -246,14 +245,12 @@ declare namespace ej {
 		update(dm: ej.DataManager, keyField: string, value: any, tableName: string): { type: string; url: string; data: any };
 		getFiltersFrom(data: any, query: ej.Query): ej.Predicate;
 	}
-
 	class WebMethodAdaptor extends ej.UrlAdaptor {
 		constructor();
 		processQuery(dm: ej.DataManager, query: ej.Query, hierarchyFilters?: any): {
 			type: string; url: string; ejPvtData: any; contentType?: string; data?: any;
 		};
 	}
-
 	class CacheAdaptor extends ej.UrlAdaptor {
 		constructor();
 		init(adaptor: any, timeStamp: number, pageSize: number): void;
@@ -266,7 +263,6 @@ declare namespace ej {
 		batchRequest(dm: ej.DataManager, changes: Changes, e: any): { url: string; type: string; data: any; contentType: string };
 
 	}
-
 	class ODataAdaptor extends ej.UrlAdaptor {
 		constructor();
 		options: UrlAdaptorOptions;
@@ -280,6 +276,7 @@ declare namespace ej {
 		onSortBy(e: any): string;
 		onGroup(e: any): string;
 		onSelect(e: any): string;
+		onAggregates(e: any): string;
 		onCount(e: any): string;
 		beforeSend(dm: ej.DataManager, request: any, settings?: any): void;
 		processResponse(data: any, ds: any, query: ej.Query, xhr: any, request: any, changes: Changes): {
@@ -313,6 +310,7 @@ declare namespace ej {
 		changeSetContent?: string;
 		batchChangeSetContentType?: string;
 	}
+
 	class WebApiAdaptor extends ej.ODataAdaptor {
 		constructor();
 		insert(dm: ej.DataManager, data: any, tableName?: string): { url: string; type: string; data: any; };
@@ -322,6 +320,7 @@ declare namespace ej {
 			result: any; count: number
 		};
 	}
+
 	class ODataV4Adaptor extends ej.ODataAdaptor {
 		constructor();
 		options: ODataAdaptorOptions;
@@ -329,9 +328,13 @@ declare namespace ej {
 		onEachSearch(e: any): void;
 		onSearch(e: any): string;
 		beforeSend(dm: ej.DataManager, request: any, settings?: any): void;
+		processQuery(ds: any, query: ej.Query): {
+			type: string; url: string; ejPvtData: any; contentType?: string; data?: any;
+		};
 		processResponse(data: any, ds: any, query: ej.Query, xhr: any, request: any, changes: Changes): {
 			result: any; count: number
 		};
+
 	}
 	interface ODataAdaptorOptions {
 		requestType?: string;
@@ -359,6 +362,7 @@ declare namespace ej {
 		processQuery(ds: any, query: ej.Query): string;
 		batchRequest(dm: ej.DataManager, changes: Changes, e: any): Changes;
 		onWhere(ds: any, e: any): any;
+		onAggregates(ds: any, e: any): any;
 		onSearch(ds: any, e: any): any;
 		onSortBy(ds: any, e: any, query: ej.Query): any;
 		onGroup(ds: any, e: any, query: ej.Query): any;
@@ -367,10 +371,16 @@ declare namespace ej {
 		onTake(ds: any, e: any): any;
 		onSkip(ds: any, e: any): any;
 		onSelect(ds: any, e: any): any;
-		insert(dm: ej.DataManager, data: any): any;
+		insert(dm: ej.DataManager, data: any, tableName?: string): any;
 		remove(dm: ej.DataManager, keyField: string, value: any, tableName: string): any;
 		update(dm: ej.DataManager, keyField: string, value: any, tableName: string): any;
 	}
+	class ForeignKeyAdaptor extends ej.JsonAdaptor {
+		constructor();
+		processQuery(ds: any, query: ej.Query): any;
+		insert(dm: ej.DataManager, data: any, tableName: string): { url: string; data: any };
+		update(dm: ej.DataManager, keyField: string, value: any, tableName: string): { url: string; type: string; data: any };
+	}
 	class remoteSaveAdaptor extends ej.UrlAdaptor {
 		constructor();
 		batchRequest(dm: ej.DataManager, changes: Changes, e: any): void;
@@ -740,7 +750,7 @@ declare namespace ej {
 
 			/** returns the element which accepts the droppable element.
 			 */
-			targetElement?: any;
+			target?: any;
 		}
 
 		export interface OutEventArgs {
@@ -759,7 +769,7 @@ declare namespace ej {
 
 			/** returns the mouse out over the element
 			 */
-			targetElement?: any;
+			target?: any;
 		}
 
 		export interface OverEventArgs {
@@ -778,7 +788,7 @@ declare namespace ej {
 
 			/** returns the mouse over the element
 			 */
-			targetElement?: any;
+			target?: any;
 		}
 	}
 
@@ -3267,7 +3277,10 @@ declare namespace ej {
 			 * @Default {false}
 			 */
 			showRoundedCorner?: boolean;
-
+			/** Set to sort ListBox items either by Ascending or Descending order. By default sortOrder is set as enum type of &quot;None&quot;.You can use only below mentioned type for sorting purpose.
+			 * @Default {ej.SortOrder.None}
+			 */
+			sortOrder?: ej.ListBox.SortOrder | string;
 			/** The template to display the ListBox widget with customized appearance.
 			 * @Default {null}
 			 */
@@ -3864,6 +3877,14 @@ declare namespace ej {
 			 */
 			value?: string;
 		}
+		enum SortOrder {
+			/// The items are not sorted.
+			None,
+			/// To sort items in Ascending order.
+			Ascending,
+			/// To sort items in Descending order.
+			Descending
+		}
 	}
 
 	class Calculate {
@@ -6868,8 +6889,8 @@ declare namespace ej {
 
 		export interface TimeDrillDown {
 
-			/** This is the field to show/hide the timeDrillDown in DateTimePicker.
-			 */
+            /** This is the field to show/hide the timeDrillDown in DateTimePicker.
+             */
 			enabled?: boolean;
 
 			/** Sets the interval time of minutes on selected date.
@@ -7342,6 +7363,10 @@ declare namespace ej {
 			 */
 			animation?: any;
 
+			/** To Enable or disable the scrolling for background element of the modal dialog. This will work only with modal dialog.
+			 */
+			backgroundScroll?: boolean;
+
 			/** Closes the dialog widget on pressing the ESC key when it is set to true.
 			 */
 			closeOnEscape?: boolean;
@@ -9002,6 +9027,10 @@ declare namespace ej {
 			 */
 			target?: string;
 
+			/** defines Tooltip size and gap between tooltip against the target element.
+			 */
+			tip?: Tip;
+
 			/** The title text to be displayed in the Tooltip header.
 			 * @Default {null}
 			 */
@@ -9936,6 +9965,26 @@ declare namespace ej {
 			 */
 			width?: string | number;
 
+			/** Specifies the number of items to be fetched on each scroll. Note: This property works only with Virtual scrolling.
+			 * @Default {5}
+			 */
+			itemRequestCount?: number;
+
+			/** Specifies the maximum number of items to be fetched. Note: This will work only with Virtual scrolling
+			 * @Default {null}
+			 */
+			totalItemsCount?: number;
+
+			/** Loads the list data on demand via scrolling behavior to improve the application’s performance. There are two ways to load data which can be defined using virtualScrollMode property.
+			 * @Default {false}
+			 */
+			allowVirtualScrolling?: boolean;
+
+			/** Specifies the virtual scroll mode to load the list data on demand via scrolling behavior. There are two types of mode.
+			 * @Default {ej.VirtualScrollMode.Normal}
+			 */
+			virtualScrollMode?: ej.VirtualScrollMode | string;
+
 			/** Event triggers before the AJAX request happens. */
 			ajaxBeforeLoad?(e: AjaxBeforeLoadEventArgs): void;
 
@@ -10712,6 +10761,11 @@ declare namespace ej {
 			 */
 			contextMenuTarget?: string;
 
+			/** Specifies the container element selectors for submenu’s collision. The submenu gets displayed based on spacing available with respect to container element.
+			 * @Default {null}
+			 */
+			container?: string;
+
 			/** Specify the CSS class to achieve custom theme.
 			 */
 			cssClass?: string;
@@ -11990,8 +12044,8 @@ declare namespace ej {
 
 		export interface MouseoverEventArgs {
 
-			/** returns the current value.
-			 */
+            /** returns the current value.
+             */
 			value?: number;
 
 			/** if the event should be canceled; otherwise, false.
@@ -13609,6 +13663,9 @@ declare namespace ej {
 			/** Triggered initial load. */
 			load?(e: LoadEventArgs): void;
 
+			/** Triggers before swim lane expand or collapse icon is clicked. */
+			swimlaneClick?(e: SwimlaneClickEventArgs): void;
+
 			/** Triggered every time a single card rendered request is made to access particular card information. */
 			queryCellInfo?(e: QueryCellInfoEventArgs): void;
 
@@ -14304,6 +14361,37 @@ declare namespace ej {
 			type?: string;
 		}
 
+		export interface SwimlaneClickEventArgs {
+
+			/** Current Action name while swim lane clicked. Actions are "expand" or "collapse"
+			 */
+			action?: string;
+
+			/** Returns the kanban model.
+			 */
+			model?: any;
+
+			/** Returns the cancel option value.
+			 */
+			cancel?: boolean;
+
+			/** Returns the name of the event.
+			 */
+			type?: string;
+
+			/** Returns the swim lane group data's.
+			 */
+			data?: any;
+
+			/** Returns current swim lane row index.
+			 */
+			rowIndex?: number;
+
+			/** Returns current target element.
+			 */
+			target?: any;
+		}
+
 		export interface QueryCellInfoEventArgs {
 
 			/** Returns Kanban card.
@@ -14330,8 +14418,8 @@ declare namespace ej {
 			 */
 			model?: any;
 
-			/** Returns the name of the event.
-			 */
+            /** Returns the name of the event.
+             */
 			type?: string;
 		}
 
@@ -15447,6 +15535,11 @@ declare namespace ej {
 			 */
 			autoHeight?: boolean;
 
+			/** This API holds configuration setting for paste clenaup behavior.
+			 * @Default {{ listConversion: false, cleanCSS: false,	removeStyles: false, cleanElements: false }}
+			 */
+			pasteCleanupSettings?: PasteCleanupSettings;
+
 			/** Sets the colorCode to display the color of the fontColor and backgroundColor in the font tools of the RTE.
 			 * @Default {[000000, FFFFFF, C4C4C4, ADADAD, 595959, 262626, 4f81bd, dbe5f1, b8cce4, 95b3d7, 366092, 244061, c0504d, f2dcdb, e5b9b7, d99694, 953734,632423, 9bbb59,
 			 * ebf1dd, d7e3bc, c3d69b, 76923c, 4f6128, 8064a2, e5e0ec, ccc1d9, b2a2c7, 5f497a, 3f3151, f79646, fdeada, fbd5b5, fac08f,e36c09, 974806]}
@@ -15695,6 +15788,11 @@ declare namespace ej {
 			 */
 			toolsList?: any[];
 
+			/** Specifies the overflow mode for RTE responsive toolbar
+			 * @Default {Popup}
+			 */
+			toolbarOverflowMode?: ej.RTE.ToolbarOverflowMode | string;
+
 			/** Display the hints for the tools in the Toolbar.
 			 * @Default {{ associate: mouseenter, showShadow: true, position: { stem: { horizontal: left, vertical: top }  }, tip: { size: { width: 5, height: 5 }, isBalloon: false }}
 			 */
@@ -15897,6 +15995,29 @@ declare namespace ej {
 			event?: any;
 		}
 
+		export interface PasteCleanupSettings {
+
+			/** This API is used to convert the list elements pasted from word document to editor.
+			 * @Default {false}
+			 */
+			listConversion?: boolean;
+
+			/** This API is used to clean the unwanted css in the elements pasted from word document to editor.
+			 * @Default {false}
+			 */
+			cleanCSS?: boolean;
+
+			/** This API is used to remove all styles in the elements pasted from word document to editor.
+			 * @Default {false}
+			 */
+			removeStyles?: boolean;
+
+			/** This API is used to clean the unwanted elements pasted from word document to editor.
+			 * @Default {false}
+			 */
+			cleanElements?: boolean;
+		}
+
 		export interface ExportToPdfSettings {
 
 			/** This API is used to receive the server-side handler for export related operations.
@@ -16096,6 +16217,16 @@ declare namespace ej {
 			 */
 			customUnorderedList?: ToolsCustomUnorderedList[];
 		}
+
+		enum ToolbarOverflowMode {
+
+			///To display the RTE toolbar overflow items as popup
+			Popup,
+
+			///To display the RTE toolbar overflow items as inline toolbar
+			Inline
+		}
+
 	}
 
 	class Slider extends ej.Widget {
@@ -16125,6 +16256,7 @@ declare namespace ej {
 		 */
 		setValue(): void;
 	}
+
 	export namespace Slider {
 
 		export interface Model {
@@ -16418,6 +16550,7 @@ declare namespace ej {
 			cancel?: boolean;
 		}
 	}
+
 	namespace slider {
 		enum sliderType {
 			//Shows default slider
@@ -17233,8 +17366,8 @@ declare namespace ej {
 			 */
 			activeIndex?: number;
 
-			/** returns, is it triggered by interaction or not.
-			 */
+            /** returns, is it triggered by interaction or not.
+             */
 			isInteraction?: boolean;
 		}
 
@@ -21193,6 +21326,12 @@ declare namespace ej {
 		 */
 		addIgnoreOnExport(propertyNames: any[]): void;
 
+		/** Adds a grid model property which is to be ignored upon OnServerToolbarClick.
+		 * @param {Array<any>} Pass the array of parameters which need to be ignored on OnServerToolbarClick
+		 * @returns {void}
+		 */
+		addIgnoreOnToolbarServerClick(propertyNames: any[]): void;
+
 		/** Add a new record in grid control when allowAdding is set as true.
 		 * @returns {void}
 		 */
@@ -23581,6 +23720,21 @@ declare namespace ej {
 			type?: string;
 		}
 
+		export interface MergeHeaderCellInfoEventArgs {
+
+			/** Method to merge the header cells.
+			 */
+			headerCellMerge?: any;
+
+			/** Returns the column headers.
+			 */
+			columnHeaders?: any;
+
+			/** Returns the grid model.
+			 */
+			model?: any;
+		}
+
 		export interface MergeCellInfoEventArgs {
 
 			/** Returns grid cell.
@@ -23593,7 +23747,7 @@ declare namespace ej {
 
 			/** Returns current row record object (JSON).
 			 */
-			data?: any;
+			rowData?: any;
 
 			/** Returns the text value in the cell.
 			 */
@@ -23636,7 +23790,7 @@ declare namespace ej {
 
 			/** Returns current row record object (JSON).
 			 */
-			data?: any;
+			rowData?: any;
 
 			/** Returns the text value in the cell.
 			 */
@@ -24068,7 +24222,7 @@ declare namespace ej {
 
 			/** Returns the current row data.
 			 */
-			data?: any;
+			rowData?: any;
 
 			/** Returns the grid model.
 			 */
@@ -24630,6 +24784,10 @@ declare namespace ej {
 			 * @Default {null}
 			 */
 			dropMapper?: string;
+			/** Gets or sets a value that indicates whether to define the behavior for drag.
+			 * @Default {ej.Grid.DragBehavior.Move}
+			 */
+			dragBehavior?: ej.Grid.DragBehavior | string;
 		}
 
 		export interface SearchSettings {
@@ -24872,6 +25030,17 @@ declare namespace ej {
 			wrapMode?: ej.Grid.WrapMode | string;
 		}
 
+		export interface ToolbarSettingsCustomToolbarItem {
+
+			/** Gets or sets a value that indicates whether to add custom toolbar item as a template element.
+			 */
+			templateID?: string;
+
+			/** Gets or sets a value that indicates whether to add custom toolbar item with a custom tooltip.
+			 */
+			tooltip?: string;
+		}
+
 		export interface ToolbarSettings {
 
 			/** Gets or sets a value that indicates whether to add custom toolbar items within the toolbar to perform any action in the grid
@@ -25058,6 +25227,16 @@ declare namespace ej {
 		}
 
 
+		enum DragBehavior {
+
+			///Moves a dragged row from one grid to another
+			Move,
+
+			///Copies a dragged row from one grid to another
+			Copy
+		}
+
+
 		enum SelectionType {
 
 			///Specifies the selection type as single.
@@ -25225,6 +25404,11 @@ declare namespace ej {
 			 */
 			rangeBandSettings?: RangeBandSettings;
 
+			/** Name of the culture based on which sparkline should be localized.
+			 * @Default {en-US}
+			 */
+			locale?: string;
+
 			/** Name of a field in data source, where the fill color for all the data points is generated.
 			 */
 			palette?: string;
@@ -25239,6 +25423,11 @@ declare namespace ej {
 			 */
 			enableCanvasRendering?: boolean;
 
+			/** Specify to convert the date object to string, using locale settings.
+			 * @Default {false}
+			 */
+			enableGroupSeparator?: boolean;
+
 			/** Specifies the dataSource for the series. It can be an array of JSON objects or an instance of ej.DataManager.
 			 * @Default {null}
 			 */
@@ -25377,8 +25566,8 @@ declare namespace ej {
 			 */
 			cancel?: boolean;
 
-			/** Instance of the sparkline model object
-			 */
+            /** Instance of the sparkline model object
+             */
 			model?: any;
 
 			/** Name of the event
@@ -27022,6 +27211,16 @@ declare namespace ej {
 			 */
 			frozenHeaderSettings?: FrozenHeaderSettings;
 
+			/** Allows user to display header name in PivotGrid control.
+			 * @Default {{}}
+			 */
+			headerSettings?: HeaderSettings;
+
+			/** Allows user to show appropriate unique name on Pivot button.
+			 * @Default {false}
+			 */
+			showUniqueNameOnPivotButton?: boolean;
+
 			/** Object utilized to pass additional information between client-end and service-end on operating the control in server mode.
 			 * @Default {null}
 			 */
@@ -27865,6 +28064,24 @@ declare namespace ej {
 			 * @Default {false}
 			 */
 			enableFrozenHeaders?: boolean;
+
+			/** Allows user to set the size of the scrollbar (horizontal and vertical) visible in PivotGrid.
+			 * @Default {18}
+			 */
+			scrollerSize?: number;
+		}
+
+		export interface HeaderSettings {
+
+			/** Allows user to enable/disable row header names in PivotGrid control.
+			 * @Default {false}
+			 */
+			showRowItems?: boolean;
+
+			/** Allows user to enable/disable column header names in PivotGrid control.
+			 * @Default {false}
+			 */
+			showColumnItems?: boolean;
 		}
 
 		export interface HyperlinkSettings {
@@ -28441,6 +28658,11 @@ declare namespace ej {
 			 */
 			enableRTL?: boolean;
 
+			/** Allows user to render complete PivotChart on drill operation, that is, when expanding and collapsing members which are shown in multi-level labels.
+			 * @Default {false}
+			 */
+			enableMultiLevelLabels?: boolean;
+
 			/** Allows the user to enable PivotChart’s responsiveness in the browser layout.
 			 * @Default {false}
 			 */
@@ -29005,6 +29227,16 @@ declare namespace ej {
 			 */
 			displaySettings?: DisplaySettings;
 
+			/** Allows user to set visibility of icons in toolbar panel.
+			 * @Default {{}}
+			 */
+			toolbarIconSettings?: ToolbarIconSettings;
+
+			/** Allows user to show unique name on pivotbutton.
+			 * @Default {false}
+			 */
+			showUniqueNameOnPivotButton?: boolean;
+
 			/** Enables the splitter option for resizing the elements inside the control.
 			 * @Default {false}
 			 */
@@ -29626,6 +29858,89 @@ declare namespace ej {
 			mode?: ej.PivotClient.DisplayMode | string;
 		}
 
+		export interface ToolbarIconSettings {
+
+			/** Allows user to set the visibility of Add Report icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableAddReport?: boolean;
+
+			/** Allows user to set the visibility of New Report icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableNewReport?: boolean;
+
+			/** Allows user to set the visibility of Rename Report icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableRenameReport?: boolean;
+
+			/** Allows user to set the visibility of DB Manipulation icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableDBManipulation?: boolean;
+
+			/** Allows user to set the visibility of Word Export icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableWordExport?: boolean;
+
+			/** Allows user to set the visibility of Excel Export icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableExcelExport?: boolean;
+
+			/** Allows user to set the visibility of PDF Export icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enablePdfExport?: boolean;
+
+			/** Allows user to set the visibility of MDX Query icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableMDXQuery?: boolean;
+
+			/** Allows user to set the visibility of Defer Update icon in toolbar panel.
+			 * @Default {false}
+			 */
+			enableDeferUpdate?: boolean;
+
+			/** Allows user to set the visibility of Full Screen icon in toolbar panel.
+			 * @Default {false}
+			 */
+			enableFullScreen?: boolean;
+
+			/** Allows user to set the visibility of Sort/Filter Column icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableSortOrFilterColumn?: boolean;
+
+			/** Allows user to set the visibility of Sort/Filter Row icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableSortOrFilterRow?: boolean;
+
+			/** Allows user to set the visibility of Toggle Axis icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableToggleAxis?: boolean;
+
+			/** Allows user to set the visibility of Chart Types icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableChartTypes?: boolean;
+
+			/** Allows user to set the visibility of Remove Report icon in toolbar panel.
+			 * @Default {true}
+			 */
+			enableRemoveReport?: boolean;
+
+			/** Allows user to set the visibility of Calculated Member icon in toolbar panel.
+			 * @Default {false}
+			 */
+			enableCalculatedMember?: boolean;
+		}
+
 		export interface ServiceMethodSettings {
 
 			/** Allows the user to set the custom name for the service method responsible for updating the entire report and widget, while changing the Cube.
@@ -29887,9 +30202,9 @@ declare namespace ej {
 			 */
 			showHeaderLabel?: boolean;
 
-			/** Connects the service using the specified URL for any server updates on server mode operation.
-			 * @Default {“”}
-			 */
+            /** Connects the service using the specified URL for any server updates on server mode operation.
+             * @Default {“”}
+             */
 			url?: string;
 
 			/** Sets the mode for the PivotGauge widget for binding either OLAP or Relational data source.
@@ -30843,6 +31158,11 @@ declare namespace ej {
 			 */
 			showAllDayRow?: boolean;
 
+			/** When set to false, hides the weekend days on all the Scheduler views.
+			 * @Default {true}
+			 */
+			showWeekend?: boolean;
+
 			/** When set to true, displays the current time indicator on the Schedule.
 			 * @Default {true}
 			 */
@@ -32455,6 +32775,13 @@ declare namespace ej {
 		 */
 		setSplitterIndex(index: number): void;
 
+		/** To sort the column in required direction
+		 * @param {string} Defines the column's mapping name in which sorting have to be performed
+		 * @param {string} Defines the sort direction whether the column has to sorted in ascending/descending order. By default it is sorting in an ascending order
+		 * @returns {void}
+		 */
+		sortColumn(mappingName: string, columnSortDirection: string): void;
+
 		/** To cancel the edited state of an item in Gantt
 		 * @returns {void}
 		 */
@@ -32486,6 +32813,14 @@ declare namespace ej {
 		 */
 		expandCollapseRecord(taskId: number): void;
 
+		/** Export the Gantt content to excel or PDF document.
+		 * @param {string} Pass the controller action name corresponding to exporting
+		 * @param {string} optionalASP server event name corresponding to exporting
+		 * @param {boolean} optionalPass the multiple exporting value as true/false
+		 * @returns {void}
+		 */
+		export(action: string, serverEvent?: string, multipleExport?: boolean): void;
+
 		/** To hide the column by using header text
 		 * @param {string} you can pass a header text of a column to hide
 		 * @returns {void}
@@ -32594,6 +32929,14 @@ declare namespace ej {
 			 */
 			baselineColor?: string;
 
+			/** Specifies the mapping property path for the work field of a task in the data source. When it is mapped the end date and duration for a task will be calculated automatically.
+			 */
+			workMapping?: string;
+
+			/** Specifies the mapping property path for the expand status of a record in data source.
+			 */
+			expandStateMapping?: string;
+
 			/** Specifies the mapping property path for baseline end date in datasource
 			 */
 			baselineEndDateMapping?: string;
@@ -32643,6 +32986,11 @@ declare namespace ej {
 			 */
 			dateFormat?: string;
 
+			/** Specifies the customized working time for tasks in Gantt
+			 * @Default {[{ from: 08:00 AM, to: 12:00 PM }, { from: 01:00 PM, to: 05:00 PM }]}
+			 */
+			dayWorkingTime?: any[];
+
 			/** Specifies the mapping property path for duration of a task in datasource
 			 */
 			durationMapping?: string;
@@ -32978,6 +33326,11 @@ declare namespace ej {
 			 */
 			taskbarEditingTooltipTemplateId?: string;
 
+			/** Specifies the height of taskBar in Gantt.
+			 * @Default {20}
+			 */
+			taskbarHeight?: number;
+
 			/** Specifies the template for tooltip on mouse action on taskbars
 			 */
 			taskbarTooltipTemplate?: string;
@@ -33790,6 +34143,17 @@ declare namespace ej {
 			type?: string;
 		}
 
+		export interface AddDialogField {
+
+			/** Specifies mapping name to include required fields in Gantt
+			 */
+			field?: string;
+
+			/** Specifies editType of fields to be included in the add dialog in Gantt
+			 */
+			editType?: string;
+		}
+
 		export interface DragTooltip {
 
 			/** Specifies option to enable/disable tooltip while drag and drop a row.
@@ -33808,6 +34172,17 @@ declare namespace ej {
 			tooltipTemplate?: string;
 		}
 
+		export interface EditDialogField {
+
+			/** Specifies mapping name to include required fields in Gantt
+			 */
+			field?: string;
+
+			/** Specifies editType of fields to be included in the edit dialog in Gantt
+			 */
+			editType?: string;
+		}
+
 		export interface SplitterSettings {
 
 			/** Specifies position of the splitter in Gantt , splitter can be placed either based on percentage values or pixel values.
@@ -33862,6 +34237,21 @@ declare namespace ej {
 			rowPosition?: ej.Gantt.RowPosition | string;
 		}
 
+		export interface Holiday {
+
+			/** Specifies holiday date to be displayed in Gantt
+			 */
+			day?: string;
+
+			/** Specifies the background color for holiday date in Gantt Schedule
+			 */
+			background?: string;
+
+			/** Specifies the label to be displayed for rendered holiday in Gantt
+			 */
+			label?: string;
+		}
+
 		export interface ScheduleHeaderSettings {
 
 			/** Specified the format for day view in schedule header
@@ -33899,9 +34289,9 @@ declare namespace ej {
 			 */
 			weekendBackground?: string;
 
-			/** Specified the format for week view in schedule header
-			 * @Default {ddd}
-			 */
+            /** Specified the format for week view in schedule header
+             * @Default {MMM dd , yyyy}
+             */
 			weekHeaderFormat?: string;
 
 			/** Specified the format for year view in schedule header
@@ -33945,12 +34335,61 @@ declare namespace ej {
 			cellIndex?: number;
 		}
 
+		export interface SortSettingsSortedColumn {
+
+			/** Specifies the field to be sorted in Gantt
+			 */
+			field?: string;
+
+			/** Specifies the sort direction in Gantt
+			 */
+			direction?: string;
+		}
+
 		export interface SortSettings {
 
 			/** Specifies the sorted columns for Gantt
 			 * @Default {[]}
 			 */
-			sortedColumns?: any[];
+			sortedColumns?: SortSettingsSortedColumn[];
+		}
+
+		export interface StripLine {
+
+			/** Specifies date to render striplines in Gantt
+			 */
+			day?: string;
+
+			/** Specifies label to be displayed for striplines in Gantt
+			 */
+			label?: string;
+
+			/** Specifies line style for rendered striplines in Gantt
+			 */
+			lineStyle?: string;
+
+			/** Specifies the line color for rendered striplines in Gantt
+			 */
+			lineColor?: string;
+
+			/** Specifies the width of the stripline in Gantt
+			 */
+			lineWidth?: string;
+		}
+
+		export interface ToolbarSettingsCustomToolbarItem {
+
+			/** Allows the user to insert the custom icons in toolbar using CSS class name selector.
+			 */
+			text?: string;
+
+			/** Allows the user to insert the custom icons in toolbar using script templates. Using this property we can bind HTML elements and other EJ controls to Gantt toolbar.
+			 */
+			templateID?: string;
+
+			/** Allows the user to display custom tooltip text for Gantt custom toolbar items.
+			 */
+			tooltipText?: string;
 		}
 
 		export interface ToolbarSettings {
@@ -33964,6 +34403,10 @@ declare namespace ej {
 			 * @Default {[]}
 			 */
 			toolbarItems?: any[];
+
+			/** Allows the user to insert custom toolbar items.
+			 */
+			customToolbarItems?: ToolbarSettingsCustomToolbarItem[];
 		}
 
 		enum DurationUnit {
@@ -34856,12 +35299,6 @@ declare namespace ej {
 		 */
 		saveCell(): void;
 
-		/** To search an item with search string provided at the run time
-		 * @param {string} you can pass a searchString to search the tree grid
-		 * @returns {void}
-		 */
-		search(searchString: string): void;
-
 		/** To show the column by using header text
 		 * @param {string} you can pass a header text of a column to show.
 		 * @returns {void}
@@ -34873,7 +35310,7 @@ declare namespace ej {
 		 * @param {string} you can pass a sort direction to sort the column.
 		 * @returns {void}
 		 */
-		sortColumn(columnName: string, columnSortDirection: string): void;
+		sortColumn(fieldName: string, columnSortDirection: string): void;
 
 		/** To reorder the column with field name and target index values
 		 * @param {string} you can pass a name of column to reorder.
@@ -34936,6 +35373,10 @@ declare namespace ej {
 			 */
 			altRowTemplateID?: string;
 
+			/** Specifies the mapping property path for the expand status of a record in data source.
+			 */
+			expandStateMapping?: string;
+
 			/** Specifies the mapping property path for sub tasks in datasource
 			 */
 			childMapping?: string;
@@ -34963,9 +35404,9 @@ declare namespace ej {
 			dataSource?: any[];
 
 			/** Specifies whether to wrap the header text when it is overflown i.e., when it exceeds the header width.
-			 * @Default {none}
+			 * @Default {ej.TreeGrid.HeaderTextOverflow.None}
 			 */
-			headerTextOverflow?: string;
+			headerTextOverflow?: ej.TreeGrid.HeaderTextOverflow | string;
 
 			/** Options for displaying and customizing the tooltip. This tooltip will show the preview of the row that is being dragged.
 			 */
@@ -34999,6 +35440,11 @@ declare namespace ej {
 			 */
 			columnResizeSettings?: ColumnResizeSettings;
 
+			/** Defines the common width for all the columns in TreeGrid
+			 * @Default {150}
+			 */
+			commonWidth?: number;
+
 			/** Options for filtering and customizing filter actions.
 			 */
 			filterSettings?: FilterSettings;
@@ -35054,6 +35500,10 @@ declare namespace ej {
 			 */
 			selectedRowIndex?: number;
 
+			/** Specifies the selected cell information on rendering TreeGrid.
+			 */
+			selectedCellIndexes?: SelectedCellIndex[];
+
 			/** Specifies the settings for row and cell selection.
 			 */
 			selectionSettings?: SelectionSettings;
@@ -35172,6 +35622,15 @@ declare namespace ej {
 			/** Triggered when TreeGrid is rendered completely */
 			create?(e: CreateEventArgs): void;
 
+			/** Triggered while rendering details template in TreeGrid */
+			detailsDataBound?(e: DetailsDataBoundEventArgs): void;
+
+			/** Triggered when details template pop-up is shown. */
+			detailsShown?(e: DetailsShownEventArgs): void;
+
+			/** Triggered when details template pop-up is hidden. */
+			detailsHidden?(e: DetailsHiddenEventArgs): void;
+
 			/** Triggered after saved the modified cellValue in TreeGrid */
 			endEdit?(e: EndEditEventArgs): void;
 
@@ -35621,6 +36080,79 @@ declare namespace ej {
 			type?: string;
 		}
 
+		export interface DetailsDataBoundEventArgs {
+
+			/** Returns the cancel option value.
+			 */
+			cancel?: boolean;
+
+			/** Returns the data collection of selected row.
+			 */
+			data?: any;
+
+			/** Returns the details element of selected row.
+			 */
+			detailsElement?: any;
+
+			/** Returns the rowIndex of selected row.
+			 */
+			rowIndex?: number;
+
+			/** Returns the TreeGrid model
+			 */
+			model?: any;
+
+			/** Returns the name of the event.
+			 */
+			type?: string;
+		}
+
+		export interface DetailsShownEventArgs {
+
+			/** Returns the cancel option value.
+			 */
+			cancel?: boolean;
+
+			/** Returns the data collection of selected row.
+			 */
+			data?: any;
+
+			/** Returns the details element of selected row.
+			 */
+			detailsElement?: any;
+
+			/** Returns the rowIndex of selected row.
+			 */
+			rowIndex?: number;
+
+			/** Returns the TreeGrid model
+			 */
+			model?: any;
+
+			/** Returns the name of the event.
+			 */
+			type?: string;
+		}
+
+		export interface DetailsHiddenEventArgs {
+
+			/** Returns the cancel option value.
+			 */
+			cancel?: boolean;
+
+			/** Returns the TreeGrid model
+			 */
+			model?: any;
+
+			/** Returns the data collection of hidden details Template
+			 */
+			rowData?: any;
+
+			/** Returns the name of the event.
+			 */
+			type?: string;
+		}
+
 		export interface EndEditEventArgs {
 
 			/** Returns the cancel option value.
@@ -36018,6 +36550,11 @@ declare namespace ej {
 			 */
 			allowFiltering?: boolean;
 
+			/** Enables the blanks option in ejDropDownList mapped in TreeGrid column
+			 * @Default {true}
+			 */
+			allowFilteringBlankContent?: boolean;
+
 			/** Enables or disables the ability to sort the rows based on this column/field.
 			 * @Default {false}
 			 */
@@ -36028,15 +36565,35 @@ declare namespace ej {
 			 */
 			allowCellSelection?: boolean;
 
+			/** To customize the ej controls defined in TreeGrid column with their native property.
+			 */
+			editParams?: any;
+
 			/** Specifies the edit type of the column.
 			 * @Default {ej.TreeGrid.EditingType.String}
 			 */
 			editType?: ej.TreeGrid.EditingType | string;
 
+			/** To bind the dropdown data for TreeGrid column mapped with ejDropDownList
+			 */
+			dropdownData?: string;
+
 			/** Specifies the name of the field from the dataSource to bind with this column.
 			 */
 			field?: string;
 
+			/** Specifies the template string of the script element to enable column template for a column.
+			 */
+			template?: string;
+
+			/** Specifies the template ID of the script element to enable column template for a column.
+			 */
+			templateID?: string;
+
+			/** Specifies the template ID or the template string of the AngularJS script element to enable column template for a column.
+			 */
+			angularTemplate?: string;
+
 			/** Specifies the type of the editor control to be used to filter the rows.
 			 * @Default {ej.TreeGrid.EditingType.String}
 			 */
@@ -36050,6 +36607,11 @@ declare namespace ej {
 			/** Enables or disables the checkbox visibility in a column to make it as a checkbox column
 			 * @Default {false}
 			 */
+			displayAsCheckbox?: boolean;
+
+			/** Enables or disables the checkbox visibility in a column for checkbox selection.
+			 * @Default {false}
+			 */
 			showCheckbox?: boolean;
 
 			/** Controls the visibility of the column.
@@ -36090,15 +36652,35 @@ declare namespace ej {
 			 */
 			textAlign?: ej.TextAlign | string;
 
-			/** Specifies the template for the TreeGrid column
-			 */
-			templateID?: string;
-
 			/** Enables or disables the ability to edit a row or cell.
 			 * @Default {false}
 			 */
 			allowEditing?: boolean;
 
+			/** We can include or exclude particular column from column visibility list in column menu.
+			 * @Default {true}
+			 */
+			showInColumnChooser?: boolean;
+
+			/** Sets the clip mode for TreeGrid cell as ellipsis or clipped content(both header and content)
+			 * @Default {ej.TreeGrid.ClipMode.Clip}
+			 */
+			clipMode?: ej.TreeGrid.ClipMode | string;
+
+			/** Sets the tooltip template for the specific column.
+			 * @Default {null}
+			 */
+			tooltip?: string;
+
+			/** Sets the tooltip template for the column header
+			 * @Default {null}
+			 */
+			headerTooltip?: string;
+
+			/** specifies the conditions for saving data to the database while adding or editing the fields.
+			 */
+			validationRules?: any;
+
 			/** Enables or disables the ability to freeze/unfreeze the columns
 			 * @Default {false}
 			 */
@@ -36167,14 +36749,37 @@ declare namespace ej {
 			 * @Default {top}
 			 */
 			rowPosition?: ej.TreeGrid.RowPosition | string;
+			/** Specifies the template ID for the custom dialog.
+			 * @Default {null}
+			 */
+			dialogEditorTemplateID?: string;
 		}
 
 		export interface ColumnResizeSettings {
 
 			/** Specifies the mode for column resizing
-			 * @Default {normal}
+			 * @Default {ej.TreeGrid.ColumnResizeMode.Normal}
 			 */
-			columnResizeMode?: string;
+			columnResizeMode?: ej.TreeGrid.ColumnResizeMode | string;
+		}
+
+		export interface FilterSettingsFilteredColumn {
+
+			/** Specifies the value to be filtered in TreeGrid.
+			 */
+			value?: string;
+
+			/** Specifies the field where filtering has to be performed.
+			 */
+			field?: string;
+
+			/** Specifies the predicate(and/or) value to perform filtering.
+			 */
+			predicate?: string;
+
+			/** Specifies the filter condition to filtered column. See operator
+			 */
+			operator?: string;
 		}
 
 		export interface FilterSettings {
@@ -36185,9 +36790,9 @@ declare namespace ej {
 			filterBarMode?: string;
 
 			/** Specifies the type of column filtering.
-			 * @Default {filterbar}
+			 * @Default {ej.TreeGrid.FilterType.FilterBar}
 			 */
-			filterType?: string;
+			filterType?: ej.TreeGrid.FilterType | string;
 
 			/** Specifies the column collection for filtering the TreeGrid content on initial load
 			 * @Default {[]}
@@ -36228,6 +36833,18 @@ declare namespace ej {
 			template?: string;
 		}
 
+		export interface SelectedCellIndex {
+
+			/** Specifies the row index of the cell to be selected in TreeGrid control
+			 */
+			rowIndex?: number;
+
+			/** Specifies the cell index to be selected in the row.
+			 * @Default { }
+			 */
+			cellIndex?: number;
+		}
+
 		export interface SelectionSettings {
 
 			/** Specifies the type of selection whether to select row or cell.
@@ -36251,6 +36868,44 @@ declare namespace ej {
 			enableSelectAll?: boolean;
 		}
 
+		export interface SummaryRowsSummaryColumn {
+
+			/** Specifies the summary type to perform calculations in a corresponding summary column. See summaryType.
+			 */
+			summaryType?: ej.TreeGrid.SummaryType | string;
+
+			/** Specifies summary column used to perform the summary calculation.
+			 */
+			dataMember?: string;
+
+			/** Specifies the required column to display the summary.
+			 */
+			displayColumn?: string;
+
+			/** Specifies the text to be displayed before the summary column value.
+			 */
+			prefix?: string;
+
+			/** Specifies the text to be displayed after the summary column value.
+			 */
+			suffix?: string;
+
+			/** Specifies the format to be applied on the summary column value.
+			 */
+			format?: string;
+		}
+
+		export interface SummaryRow {
+
+			/** Specifies the title for summary row collection in TreeGrid
+			 */
+			title?: string;
+
+			/** Specifies the summary columns in the summary rows.
+			 */
+			summaryColumns?: SummaryRowsSummaryColumn[];
+		}
+
 		export interface SizeSettings {
 
 			/** Height of the TreeGrid.
@@ -36264,12 +36919,38 @@ declare namespace ej {
 			width?: string;
 		}
 
+		export interface SortSettingsSortedColumn {
+
+			/** Specifies the field to be sorted in TreeGrid
+			 */
+			field?: string;
+
+			/** Specifies the sort direction in TreeGrid
+			 */
+			direction?: string;
+		}
+
 		export interface SortSettings {
 
 			/** Option to add columns based on which the rows have to be sorted recursively.
 			 * @Default {[]}
 			 */
-			sortedColumns?: any[];
+			sortedColumns?: SortSettingsSortedColumn[];
+		}
+
+		export interface ToolbarSettingsCustomToolbarItem {
+
+			/** Allows the user to insert the custom icons in toolbar using CSS class name selector.
+			 */
+			text?: string;
+
+			/** Allows the user to insert the custom icons in toolbar using script templates. Using this property we can bind HTML elements and other EJ controls to TreeGrid toolbar.
+			 */
+			templateID?: string;
+
+			/** Allows the user to display custom tooltip text for TreeGrid custom toolbar items.
+			 */
+			tooltipText?: string;
 		}
 
 		export interface ToolbarSettings {
@@ -36283,6 +36964,10 @@ declare namespace ej {
 			 * @Default {[]}
 			 */
 			toolbarItems?: any[];
+
+			/** Allows the user to insert custom toolbar items.
+			 */
+			customToolbarItems?: ToolbarSettingsCustomToolbarItem[];
 		}
 
 		enum EditingType {
@@ -36310,6 +36995,26 @@ declare namespace ej {
 		}
 
 
+		enum ClipMode {
+
+			///Shows ellipsis for the overflown cell.
+			Ellipsis,
+
+			///Truncate the text in the cell.
+			Clip
+		}
+
+
+		enum HeaderTextOverflow {
+
+			///You can disable the word wrap
+			None,
+
+			///You can wrap the header content
+			Wrap
+		}
+
+
 		enum BeginEditAction {
 
 			///you can begin the editing at double click
@@ -36349,6 +37054,29 @@ declare namespace ej {
 		}
 
 
+		enum ColumnResizeMode {
+
+			///At load time column are rendered with given width value, while resizing the column only current column width is changed
+			FixedColumns,
+
+			///At load time columns are stretched with control width,while resizing the column, current column width updated based on next column
+			Normal,
+
+			///In this mode columns are stretched with control width in load time and on resizing action.
+			NextColumn
+		}
+
+
+		enum FilterType {
+
+			///Enables the filterbar filtering
+			FilterBar,
+
+			///Enables the menu filtering
+			Menu
+		}
+
+
 		enum PageSizeMode {
 
 			///To count all the parent and child records.
@@ -36381,6 +37109,37 @@ declare namespace ej {
 			Checkbox
 		}
 
+
+		enum SummaryType {
+
+			///Displays the sum of summary column
+			Sum,
+
+			///Displays the average of summary column
+			Average,
+
+			///Displays the maximum value of summary column
+			Maximum,
+
+			///Displays the minimum value of summary column
+			Minimum,
+
+			///Displays the total count of summary column
+			Count,
+
+			///Displays the minimum date value in summary column
+			MinimumDate,
+
+			///Displays the maximum date value in summary column
+			MaximumDate,
+
+			///Displays the true count value for boolean summary columns
+			TrueCount,
+
+			///Displays the false count value for boolean summary columns
+			FalseCount
+		}
+
 	}
 
 	class GroupButton extends ej.Widget {
@@ -38233,6 +38992,11 @@ declare namespace ej {
 		 */
 		gotoPage(sheetIdx: number, newSheet: boolean): void;
 
+		/** This method is used to hide the pivot table activationPanel in the Spreadsheet.
+		 * @returns {void}
+		 */
+		hideActivationPanel(): void;
+
 		/** This method is used to hide the entire columns from the specified range (startCol, endCol) in Spreadsheet.
 		 * @param {number} Index of the start column.
 		 * @param {number} Optional. Index of the end column.
@@ -38952,6 +39716,12 @@ declare namespace ej {
 
 		export interface XLFormat {
 
+			/** This method is used to add the font to the Ribbon font family dropdown.
+			 * @param {string} Font name which needs to add into the font family option.
+			 * @returns {void}
+			 */
+			addFontFamily(fontName: string): void;
+
 			/** This method is used to convert table range to normal range.
 			 * @param {any} Pass the sheet index and table id.
 			 * @returns {void}
@@ -38972,6 +39742,12 @@ declare namespace ej {
 			 */
 			format(formatObj: any, range: string): void;
 
+			/** This method is used to remove the font from the Ribbon font family dropdown.
+			 * @param {string} Font name which needs to remove from the font family drop down.
+			 * @returns {void}
+			 */
+			removeFontFamily(fontName: string): void;
+
 			/** This method is used to remove the style in the specified range.
 			 * @param {Array<any>|string} Pass the cell range .
 			 * @param {any} Optional. Pass the options for which the style gets removed.
@@ -38986,7 +39762,7 @@ declare namespace ej {
 			removeTable(tableId: number): void;
 
 			/** This method is used to update the decimal places for numeric value for the selected range of cells in the Spreadsheet.
-			 * @param {string} Pass the decimal places type in increment/decrement.
+			 * @param {string} Pass the decimal places type in IncreaseDecimal/DecreaseDecimal.
 			 * @param {string|Array<any>} Pass the range.
 			 * @returns {void}
 			 */
@@ -39475,9 +40251,9 @@ declare namespace ej {
 			 */
 			allowFormulaBar?: boolean;
 
-			/** Gets or sets a value that indicates whether to enable or disable freeze pane support in Spreadsheet. After enabling this feature,
-			 * you can use freeze top row, freeze first column and freeze panes options.
-			 * @Default {false}
+			/** Gets or sets a value that indicates whether to enable or disable freeze pane support in Spreadsheet. By enabling this feature, you can use freeze top row,
+			 * freeze first column and freeze panes options.
+			 * @Default {true}
 			 */
 			allowFreezing?: boolean;
 
@@ -39620,6 +40396,10 @@ declare namespace ej {
 			 */
 			locale?: string;
 
+			/** Gets or sets a value that indicates name manager in Spreadsheet.
+			 */
+			nameManager?: NameManager[];
+
 			/** Gets or sets an object that indicates to customize the picture behavior in the Spreadsheet.
 			 */
 			pictureSettings?: PictureSettings;
@@ -41012,6 +41792,17 @@ declare namespace ej {
 			password?: string;
 		}
 
+		export interface NameManager {
+
+			/** Specifies the name for the cell or a range.
+			 */
+			name?: string;
+
+			/** Specifies the address for the cell or a range.
+			 */
+			refersto?: string;
+		}
+
 		export interface PictureSettings {
 
 			/** Gets or sets a value that indicates whether to enable or disable picture feature in Spreadsheet. By enabling this, you can add pictures in Spreadsheet.
@@ -42238,6 +43029,11 @@ declare namespace ej {
 			 */
 			isResponsive?: boolean;
 
+			/** Gets or sets a value that indicates whether to enable the spellcheck operation on Enter/Space key-press.
+			 * @Default {false}
+			 */
+			enableValidateOnType?: boolean;
+
 			/** It allows to spell check the multiple target HTML element's texts and correct its error words.
 			 * @Default {null}
 			 */
@@ -42802,6 +43598,7 @@ declare namespace ej {
 	}
 
 }
+
 declare namespace ej.datavisualization {
 
 	class SymbolPalette extends ej.Widget {
@@ -43401,6 +44198,16 @@ declare namespace ej.datavisualization {
 			 */
 			isResponsive?: boolean;
 
+			/** Used to Convert the date object to  string while using the  locale settings
+			 * @Default {false}
+			 */
+			enableGroupSeparator?: boolean;
+
+			/** Responsiveness of the linear gauge is controlled
+			 * @Default {false}
+			 */
+			enableResize?: boolean;
+
 			/** Specify frame of linear gauge
 			 * @Default {null}
 			 */
@@ -43415,6 +44222,10 @@ declare namespace ej.datavisualization {
 			 * @Default {null}
 			 */
 			labelColor?: string;
+			/** Set the  localization culture  for the Linear gauge
+			 * @Default {en-US}
+			 */
+			locale?: string;
 
 			/** Specifies the maximum value of Linear gauge.
 			 * @Default {100}
@@ -45412,6 +46223,16 @@ declare namespace ej.datavisualization {
 			 */
 			enableAnimation?: boolean;
 
+			/** Specify to convert the  date object to  string, using locale settings.
+			 * @Default {false}
+			 */
+			enableGroupSeparator?: boolean;
+
+			/** Controls whether circular gauge has to be responsive while resizing.
+			 * @Default {false}
+			 */
+			enableResize?: boolean;
+
 			/** Specify the frame of circular gauge
 			 * @Default {Object}
 			 */
@@ -45442,6 +46263,11 @@ declare namespace ej.datavisualization {
 			 */
 			isResponsive?: boolean;
 
+			/** Name of the culture based on which circular gauge should be localized.
+			 * @Default {en-US}
+			 */
+			locale?: string;
+
 			/** Specifies the maximum value of circular gauge.
 			 * @Default {100}
 			 */
@@ -45477,6 +46303,10 @@ declare namespace ej.datavisualization {
 			 */
 			theme?: string;
 
+			/** Options to customize the legend.
+			 */
+			legend?: Legend;
+
 			/** Specify tooltip option of circular gauge
 			 * @Default {object}
 			 */
@@ -45492,6 +46322,15 @@ declare namespace ej.datavisualization {
 			 */
 			width?: number;
 
+			/** Fires before rendering the legend item. This event is fired for each legend item in CircularGauge. You can use this event to customize legend item shape or add custom text to legend item. */
+			legendItemRender?(e: LegendItemRenderEventArgs): void;
+
+			/** Fires on clicking the legend item. */
+			legendItemClick?(e: LegendItemClickEventArgs): void;
+
+			/** Fires when mouse moving on ranges. */
+			rangeMouseMove?(e: RangeMouseMoveEventArgs): void;
+
 			/** Triggers while the custom labels are being drawn on the gauge. */
 			drawCustomLabel?(e: DrawCustomLabelEventArgs): void;
 
@@ -45529,6 +46368,63 @@ declare namespace ej.datavisualization {
 			renderComplete?(e: RenderCompleteEventArgs): void;
 		}
 
+		export interface LegendItemRenderEventArgs {
+
+			/** Set this option to true to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** Instance of the circulargauge model object
+			 */
+			model?: any;
+
+			/** Name of the event
+			 */
+			type?: string;
+
+			/** Instance of the legend item object that is about to be rendered
+			 */
+			data?: any;
+		}
+
+		export interface LegendItemClickEventArgs {
+
+			/** Set this option to true to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** Instance of the circulargauge model object
+			 */
+			model?: any;
+
+			/** Name of the event
+			 */
+			type?: string;
+
+			/** Instance of the legend item object that is about to be rendered
+			 */
+			data?: any;
+		}
+
+		export interface RangeMouseMoveEventArgs {
+
+			/** Set this option to true to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** Instance of the circulargauge model object
+			 */
+			model?: any;
+
+			/** Name of the event
+			 */
+			type?: string;
+
+			/** Region of ranges
+			 */
+			data?: any;
+		}
+
 		export interface DrawCustomLabelEventArgs {
 
 			/** returns the object of the gauge.
@@ -46171,10 +47067,20 @@ declare namespace ej.datavisualization {
 			 */
 			position?: ScalesCustomLabelsPosition;
 
+			/** Specify angle for the rotation of the custom labels in degrees.
+			 * @Default {0}
+			 */
+			textAngle?: number;
+
 			/** Specify font for custom labels
 			 * @Default {Object}
 			 */
 			font?: ScalesCustomLabelsFont;
+
+			/** Specifies the position of the  custom labels. See CustomLabelPositionType
+			 * @Default {inner}
+			 */
+			positionType?: ej.datavisualization.CircularGauge.CustomLabelPositionType | string;
 		}
 
 		export interface ScalesIndicatorsPosition {
@@ -46540,6 +47446,11 @@ declare namespace ej.datavisualization {
 			 */
 			backgroundColor?: string;
 
+			/** Specify text for the ranges of circular gauge
+			 * @Default {null}
+			 */
+			legendText?: string;
+
 			/** Specify border for ranges of circular gauge
 			 * @Default {Object}
 			 */
@@ -46798,6 +47709,144 @@ declare namespace ej.datavisualization {
 			ticks?: ScalesTick[];
 		}
 
+		export interface LegendBorder {
+
+			/** Border color of the legend.
+			 * @Default {transparent}
+			 */
+			color?: string;
+
+			/** Border width of the legend.
+			 * @Default {1}
+			 */
+			width?: number;
+		}
+
+		export interface LegendItemStyleBorder {
+
+			/** Border color of the legend items.
+			 * @Default {transparent}
+			 */
+			color?: string;
+
+			/** Border width of the legend items.
+			 * @Default {1}
+			 */
+			width?: number;
+		}
+
+		export interface LegendItemStyle {
+
+			/** Options for customizing the border of legend items.
+			 */
+			border?: LegendItemStyleBorder;
+
+			/** Specifies the height of the  legend item shapes.
+			 * @Default {10}
+			 */
+			height?: number;
+
+			/** Specifies the width of the  legend item shapes.
+			 * @Default {10}
+			 */
+			width?: number;
+		}
+
+		export interface LegendSize {
+
+			/** Specify the height of the legend. Height can be specified in pixel.
+			 * @Default {null}
+			 */
+			height?: string;
+
+			/** Specify the width of the legend. Width can be specified in pixel.
+			 * @Default {null}
+			 */
+			width?: string;
+		}
+
+		export interface LegendFont {
+
+			/** Font family for legend item text.
+			 * @Default {Segoe UI}
+			 */
+			fontFamily?: string;
+
+			/** Font style for legend item text.
+			 * @Default {Normal}
+			 */
+			fontStyle?: string;
+
+			/** Font weight for legend item text.
+			 * @Default {Regular}
+			 */
+			fontWeight?: string;
+
+			/** Font size for legend item text.
+			 * @Default {12px}
+			 */
+			size?: string;
+
+			/** Font color of the text for legend items.
+			 * @Default {null}
+			 */
+			color?: string;
+		}
+
+		export interface Legend {
+
+			/** Toggles the visibility of the legend.
+			 * @Default {false}
+			 */
+			visible?: boolean;
+
+			/** Specifies the alignment of the legend.
+			 * @Default {Center. See Alignment}
+			 */
+			alignment?: ej.datavisualization.CircularGauge.LegendAlignment | string;
+
+			/** Options for customizing the legend border.
+			 */
+			border?: LegendBorder;
+
+			/** Fill color for the legend items. By using this property, it displays all legend item shapes in same color.Legend items representing invisible ranges is displayed in gray color.
+			 * @Default {null}
+			 */
+			fill?: string;
+
+			/** Gap or padding between the legend items.
+			 * @Default {20}
+			 */
+			itemPadding?: number;
+
+			/** Options to customize the style of legend items.
+			 */
+			itemStyle?: LegendItemStyle;
+
+			/** Opacity of the legend.
+			 * @Default {1}
+			 */
+			opacity?: number;
+
+			/** Places the legend at specified position. Legend can be placed at left, right, top or bottom of the circular gauge.
+			 * @Default {Bottom. See Position}
+			 */
+			position?: ej.datavisualization.CircularGauge.LegendPosition | string;
+
+			/** Shape of the legend items.
+			 * @Default {Circle. See Shape}
+			 */
+			shape?: ej.datavisualization.CircularGauge.LegendShape | string;
+
+			/** Options to customize the size of the legend.
+			 */
+			size?: LegendSize;
+
+			/** Options to customize the font used for legend item text.
+			 */
+			font?: LegendFont;
+		}
+
 		export interface Tooltip {
 
 			/** enable showCustomLabelTooltip of circular gauge
@@ -46955,6 +48004,53 @@ declare namespace ej.datavisualization {
 		}
 	}
 
+	namespace CircularGauge {
+		enum LegendAlignment {
+			//string
+			Center,
+			//string
+			Near,
+			//string
+			Far,
+		}
+	}
+
+	namespace CircularGauge {
+		enum LegendPosition {
+			//string
+			Left,
+			//string
+			Right,
+			//string
+			Top,
+			//string
+			Bottom,
+		}
+	}
+
+	namespace CircularGauge {
+		enum LegendShape {
+			//string
+			Rectangle,
+			//string
+			Circle,
+			//string
+			Triangle,
+			//string
+			Ellipse,
+			//string
+			Diamond,
+			//string
+			Pentagon,
+			//string
+			Slider,
+			//string
+			Trapezoid,
+			//string
+			Line,
+		}
+	}
+
 	class DigitalGauge extends ej.Widget {
 		static fn: DigitalGauge;
 		constructor(element: JQuery | Element, options?: DigitalGauge.Model);
@@ -47024,6 +48120,11 @@ declare namespace ej.datavisualization {
 			 */
 			isResponsive?: boolean;
 
+			/** Specifies the responsiveness of the Digital gauge
+			 * @Default {false}
+			 */
+			enableResize?: boolean;
+
 			/** Specifies the items for the DigitalGauge.
 			 * @Default {null}
 			 */
@@ -47384,6 +48485,11 @@ declare namespace ej.datavisualization {
 		 */
 		animate(options: any): void;
 
+		/** Prints the rendered chart.
+		 * @returns {void}
+		 */
+		print(): void;
+
 		/** Exports chart as an image or to an excel file. Chart can be exported as an image only when exportCanvasRendering option is set to true.
 		 * @param {string} Type of the export operation to be performed. Following are the two export types that are supported now,1. 'image'2. 'excel'Example
 		 * @param {string} URL of the service, where the chart will be exported to excel.Example,
@@ -47599,6 +48705,9 @@ declare namespace ej.datavisualization {
 			/** Fires before loading the chart. */
 			load?(e: LoadEventArgs): void;
 
+			/** Fires while performing rectangle zooming in chart. */
+			zoomed?(e: ZoomedEventArgs): void;
+
 			/** Fires after selected the data in chart. */
 			rangeSelected?(e: RangeSelectedEventArgs): void;
 
@@ -47694,15 +48803,15 @@ declare namespace ej.datavisualization {
 
 			/** Instance of the corresponding axis.
 			 */
-			Axis?: any;
+			axis?: any;
 
 			/** Formatted text of the respective label. You can also add custom text to the label.
 			 */
-			LabelText?: string;
+			Text?: string;
 
 			/** Actual value of the label.
 			 */
-			LabelValue?: string;
+			Value?: string;
 
 			/** Set this option to true to cancel the event.
 			 */
@@ -48056,6 +49165,42 @@ declare namespace ej.datavisualization {
 			 */
 			type?: string;
 		}
+		export interface ZoomedEventArgs {
+
+			/** Set this option to true to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** Instance of the chart model object
+			 */
+			model?: any;
+
+			/** Name of the event
+			 */
+			type?: string;
+
+			/** Selected data collection of object
+			 */
+			data?: any;
+		}
+		export interface RangeSelectedEventArgs {
+
+			/** Set this option to true to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** Instance of the chart model object
+			 */
+			model?: any;
+
+			/** Name of the event
+			 */
+			type?: string;
+
+			/** Selected data collection of object
+			 */
+			data?: any;
+		}
 
 		export interface RangeSelectedEventArgs {
 
@@ -49765,6 +50910,11 @@ declare namespace ej.datavisualization {
 			 */
 			labelPosition?: ej.datavisualization.Chart.LabelPosition | string;
 
+			/** Specifies the mode for splitting the data points in pieOfPie series.
+			 * @Default {value. See SplitMode}
+			 */
+			splitMode?: ej.datavisualization.Chart.SplitMode | string;
+
 			/** Quartile calculation has been performed in three different formulas to render the box and whisker series.
 			 * @Default {exclusive}
 			 */
@@ -49802,6 +50952,21 @@ declare namespace ej.datavisualization {
 			 */
 			pieCoefficient?: number;
 
+			/** Controls the size of the second pie in pieOfPie series. Value ranges from 0 to 1.
+			 * @Default {0.6}
+			 */
+			pieOfPieCoefficient?: number;
+
+			/** Split Value of pieofpie series.
+			 * @Default {null}
+			 */
+			splitValue?: string;
+
+			/** Distance between the two pie's in pieOfPie series.
+			 * @Default {50}
+			 */
+			gapWidth?: number;
+
 			/** Name of the property in the datasource that contains fill color for the series.
 			 * @Default {null}
 			 */
@@ -51141,6 +52306,11 @@ declare namespace ej.datavisualization {
 			 */
 			multiLevelLabels?: PrimaryXAxisMultiLevelLabel[];
 
+			/** Specifies whether the axis elements need to be placed nearby the axis line, while crossing.
+			 * @Default {true}
+			 */
+			showNextToAxisLine?: boolean;
+
 			/** Options for customizing the strip lines.
 			 * @Default {[ ]}
 			 */
@@ -51818,6 +52988,11 @@ declare namespace ej.datavisualization {
 			 */
 			multiLevelLabels?: AxesMultiLevelLabel[];
 
+			/** Specifies whether the axis elements need to be placed nearby the axis line, while crossing.
+			 * @Default {true}
+			 */
+			showNextToAxisLine?: boolean;
+
 			/** Options for customizing the strip lines.
 			 * @Default {[ ]}
 			 */
@@ -52491,6 +53666,11 @@ declare namespace ej.datavisualization {
 			 */
 			multiLevelLabels?: PrimaryYAxisMultiLevelLabel[];
 
+			/** Specifies whether the axis elements need to be placed nearby the axis line, while crossing.
+			 * @Default {true}
+			 */
+			showNextToAxisLine?: boolean;
+
 			/** Options for customizing the strip lines.
 			 * @Default {[ ]}
 			 */
@@ -53719,6 +54899,11 @@ declare namespace ej.datavisualization {
 			 */
 			labelPosition?: ej.datavisualization.Chart.LabelPosition | string;
 
+			/** Specifies the mode for splitting the data points in pieOfPie series.
+			 * @Default {value. See SplitMode}
+			 */
+			splitMode?: ej.datavisualization.Chart.SplitMode | string;
+
 			/** Quartile calculation has been performed in three different formulas to render the boxplot series .
 			 * @Default {exclusive}
 			 */
@@ -53761,6 +54946,21 @@ declare namespace ej.datavisualization {
 			 */
 			pieCoefficient?: number;
 
+			/** Controls the size of the second pie in pieOfPie series. Value ranges from 0 to 1.
+			 * @Default {0.6}
+			 */
+			pieOfPieCoefficient?: number;
+
+			/** Split Value of pieofpie series.
+			 * @Default {null}
+			 */
+			splitValue?: string;
+
+			/** Distance between the two pie's in pieOfPie series.
+			 * @Default {50}
+			 */
+			gapWidth?: number;
+
 			/** Options for customizing the empty point in the series.
 			 */
 			emptyPointSettings?: SeriesEmptyPointSettings;
@@ -54223,6 +55423,19 @@ declare namespace ej.datavisualization {
 			OutsideExtended,
 		}
 	}
+
+	namespace Chart {
+		enum SplitMode {
+			//string
+			Position,
+			//string
+			Value,
+			//string
+			Percentage,
+			//string
+			Indexes,
+		}
+	}
 	namespace Chart {
 		enum boxPlotMode {
 			//string
@@ -54719,6 +55932,11 @@ declare namespace ej.datavisualization {
 			 */
 			enableScrollbar?: boolean;
 
+			/** Enable the resize option in the rangenavigator.
+			 * @Default {false}
+			 */
+			enableAutoResizing?: boolean;
+
 			/** Toggles the direction of rendering the range navigator control.
 			 * @Default {false}
 			 */
@@ -54813,6 +56031,12 @@ declare namespace ej.datavisualization {
 			/** Fires on when starting to change the scrollbar position of range navigator. */
 			scrollStart?(e: ScrollStartEventArgs): void;
 
+			/** Fires on when starting to change the  slider position of range navigator. */
+			selectedRangeStart?(e: SelectedRangeStartEventArgs): void;
+
+			/** Fires when the selection  ends in the range navigator */
+			selectedRangeEnd?(e: SelectedRangeEndEventArgs): void;
+
 			/** Fires on changes ending the scrollbar position of range navigator. */
 			scrollEnd?(e: ScrollEndEventArgs): void;
 		}
@@ -54928,6 +56152,19 @@ declare namespace ej.datavisualization {
 			type?: string;
 		}
 
+		export interface SelectedRangeStartEventArgs {
+
+			/** if the event should be canceled; otherwise, false.
+			 */
+			cancel?: boolean;
+		}
+
+		export interface SelectedRangeEndEventArgs {
+
+			/** if the event should be canceled; otherwise, false.
+			 */
+			cancel?: boolean;
+		}
 		export interface ScrollEndEventArgs {
 
 			/** parameters from RangeNavigator
@@ -55644,6 +56881,24 @@ declare namespace ej.datavisualization {
 			width?: number;
 		}
 
+		export interface ValueAxisSettingsRange {
+
+			/** Default Value
+			 * @Default {null}
+			 */
+			min?: number;
+
+			/** Default Value
+			 * @Default {null}
+			 */
+			max?: number;
+
+			/** Default Value
+			 * @Default {null}
+			 */
+			interval?: number;
+		}
+
 		export interface ValueAxisSettings {
 
 			/** Options for customizing the axis line.
@@ -55662,6 +56917,10 @@ declare namespace ej.datavisualization {
 			 */
 			majorTickLines?: ValueAxisSettingsMajorTickLines;
 
+			/** You can customize the range of the axis by setting minimum , maximum and interval.
+			 */
+			range?: ValueAxisSettingsRange;
+
 			/** If the range is not given explicitly, range will be calculated automatically. You can customize the automatic range calculation using rangePadding.
 			 * @Default {none}
 			 */
@@ -55827,6 +57086,11 @@ declare namespace ej.datavisualization {
 			 */
 			enableAnimation?: boolean;
 
+			/** Controls whether bullet graph has to be responsive while resizing.
+			 * @Default {true}
+			 */
+			enableResizing?: boolean;
+
 			/** Specifies the direction of flow in bullet graph. Neither it may be backward nor forward.
 			 * @Default {forward}
 			 */
@@ -55842,6 +57106,16 @@ declare namespace ej.datavisualization {
 			 */
 			isResponsive?: boolean;
 
+			/** Specifies to convert the date object to string, using locale settings.
+			 * @Default {false}
+			 */
+			enableGroupSeparator?: boolean;
+
+			/** Name of the culture based on which bulletgraph should be localized.
+			 * @Default {en-US}
+			 */
+			locale?: string;
+
 			/** Bullet graph will render in the specified orientation.
 			 * @Default {horizontal}
 			 */
@@ -55902,6 +57176,9 @@ declare namespace ej.datavisualization {
 			/** Fires on rendering the labels. */
 			drawLabels?(e: DrawLabelsEventArgs): void;
 
+			/** Fires on rendering the ticks. */
+			drawTicks?(e: DrawTicksEventArgs): void;
+
 			/** Fires on rendering the qualitative ranges. */
 			drawQualitativeRanges?(e: DrawQualitativeRangesEventArgs): void;
 
@@ -56023,6 +57300,11 @@ declare namespace ej.datavisualization {
 			labelType?: string;
 		}
 
+		export interface DrawTicksEventArgs {
+			/** Returns the cancel option value.
+			 */
+			cancel?: boolean;
+		}
 		export interface DrawQualitativeRangesEventArgs {
 
 			/** returns the object of the bullet graph.
@@ -57952,6 +59234,15 @@ declare namespace ej.datavisualization {
 
 			/** Triggers on treemap item selected. */
 			treeMapItemSelected?(e: TreeMapItemSelectedEventArgs): void;
+
+			/** Triggers when drilldown is started */
+			drillStarted?(e: DrillStartedEventArgs): void;
+
+			/** Triggers on treemap  drilldown  item  selected. */
+			drillDownItemSelected?(e: DrillDownItemSelectedEventArgs): void;
+
+			/** Triggers after refreshing the treemap items. */
+			refreshed?(e: RefreshedEventArgs): void;
 		}
 
 		export interface TreeMapItemSelectedEventArgs {
@@ -57961,6 +59252,27 @@ declare namespace ej.datavisualization {
 			originalEvent?: any;
 		}
 
+		export interface DrillStartedEventArgs {
+
+			/** Returns selected drilled treeMap object.
+			 */
+			originalEvent?: any;
+		}
+
+		export interface DrillDownItemSelectedEventArgs {
+
+			/** Returns selected drilldown treeMap object.
+			 */
+			originalEvent?: any;
+		}
+
+		export interface RefreshedEventArgs {
+
+			/** Refresh and load the treemap.
+			 */
+			originalEvent?: any;
+		}
+
 		export interface UniColorMapping {
 
 			/** Specifies the uniform color mapping of the treemap
@@ -58085,6 +59397,11 @@ declare namespace ej.datavisualization {
 			 */
 			borderThickness?: number;
 
+			/** Specifies the space between the leaf items.
+			 * @Default {0}
+			 */
+			gap?: number;
+
 			/** Specifies the label template of the leaf item.
 			 * @Default {null}
 			 */
@@ -58392,13 +59709,13 @@ declare namespace ej.datavisualization {
 		 */
 		findNode(name: string): any;
 
-		/** Fit the diagram content into diagram viewport
-		 * @param {string} to set the mode of fit to command. See [Fit Mode](/api/js/global#fitmode)
-		 * @param {string} to set whether the region to be fit will be based on diagram elements or page settings [Region](/api/js/global#region)
-		 * @param {any} to set the required margin
-		 * @returns {void}
-		 */
-		fitToPage(mode?: string, region?: string, margin?: any): void;
+        /** Fit the diagram content into diagram viewport
+         * @param {ej.datavisualization.Diagram.FitMode} to set the mode of fit to command.
+         * @param {ej.datavisualization.Diagram.Region} to set whether the region to be fit will be based on diagram elements or page settings.
+         * @param {any} to set the required margin
+         * @returns {void}
+         */
+		fitToPage(mode?: ej.datavisualization.Diagram.FitMode, region?: ej.datavisualization.Diagram.Region, margin?: any): void;
 
 		/** Group the selected nodes and connectors
 		 * @returns {void}
@@ -58617,17 +59934,17 @@ declare namespace ej.datavisualization {
 			 */
 			fileName?: string;
 
-			/** format of the exported file/data. See [File Formats](/api/js/global#fileformats).
+			/** format of the exported file/data.
 			 */
-			format?: string;
+			format?: ej.datavisualization.Diagram.FileFormats;
 
-			/** to set whether to export diagram as a file or as raw data. See [Export Modes](/api/js/global#exportmodes).
+			/** to set whether to export diagram as a file or as raw data.
 			 */
-			mode?: string;
+			mode?: ej.datavisualization.Diagram.ExportModes;
 
-			/** to set the region of the diagram to be exported. See [Region](/api/js/global#region).
+			/** to set the region of the diagram to be exported.
 			 */
-			region?: string;
+			region?: ej.datavisualization.Diagram.Region;
 
 			/** to export any custom region of diagram.
 			 */
@@ -58637,9 +59954,9 @@ declare namespace ej.datavisualization {
 			 */
 			margin?: any;
 
-			/** to set stretch to the exported data.
+			/** to resize the diagram content to fill its allocated space.
 			 */
-			stretch?: string;
+			stretch?: ej.datavisualization.Diagram.Stretch;
 		}
 
 		export interface Zoom {
@@ -58925,6 +60242,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter to specify whether or not to cancel the event
+			 */
+			cancel?: boolean;
 		}
 
 		export interface ConnectionChangeEventArgs {
@@ -59052,6 +60373,17 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
+
+			/** parameter returns the actual click event arguments that explains which button is clicked
+			 */
+			model?: any;
+
+			/** parameter returns the type of the event triggered
+			 */
+			type?: string;
 		}
 
 		export interface ContextMenuClickEventArgs {
@@ -59083,6 +60415,22 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter to specify whether or not to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** parameter returns the elementof the object that was clicked
+			 */
+			element?: any;
+
+			/** parameter returns the object that is selected
+			 */
+			selectedItem?: any;
+
+			/** parameter returns the model of the diagram
+			 */
+			events?: any;
 		}
 
 		export interface DoubleClickEventArgs {
@@ -59098,6 +60446,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter to specify whether or not to cancel the event
+			 */
+			cancel?: boolean;
 		}
 
 		export interface DragEventArgs {
@@ -59125,6 +60477,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter returns the offset of the selecteditems
+			 */
+			offset?: any;
 		}
 
 		export interface DragEnterEventArgs {
@@ -59148,6 +60504,10 @@ declare namespace ej.datavisualization {
 			 */
 			element?: any;
 
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
+
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
@@ -59204,7 +60564,7 @@ declare namespace ej.datavisualization {
 
 			/** parameter returns the enum which defines the type of the source
 			 */
-			sourceType?: string;
+			objectType?: string;
 
 			/** parameter returns the id of the diagram
 			 */
@@ -59212,7 +60572,7 @@ declare namespace ej.datavisualization {
 		}
 
 		export interface EditorFocusChangeEventArgs {
-			/** Returns the cancel option value.
+			/** parameter to specify whether or not to cancel the event
 			 */
 			cancel?: boolean;
 		}
@@ -59253,6 +60613,14 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter to specify whether or not to cancel the event
+			 */
+			cancel?: boolean;
+
+			/** parameter returns the model of the diagram
+			 */
+			cause?: boolean;
 		}
 
 		export interface ItemClickEventArgs {
@@ -59269,7 +60637,7 @@ declare namespace ej.datavisualization {
 			 */
 			cancel?: boolean;
 
-			/** parameter returns the actual click event arguments that explains which button is clicked
+			/** parameter returns the model of the diagram
 			 */
 			event?: any;
 
@@ -59295,6 +60663,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
 		}
 
 		export interface MouseLeaveEventArgs {
@@ -59311,6 +60683,10 @@ declare namespace ej.datavisualization {
 			 */
 			target?: any;
 
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
+
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
@@ -59330,6 +60706,10 @@ declare namespace ej.datavisualization {
 			 */
 			target?: any;
 
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
+
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
@@ -59383,6 +60763,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter defines whether to cancel the property change or not
+			 */
+			cancel?: boolean;
 		}
 
 		export interface RotationChangeEventArgs {
@@ -59406,6 +60790,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter returns the actual click event arguments that explains which button is clicked
+			 */
+			cause?: string;
 		}
 
 		export interface ScrollChangeEventArgs {
@@ -59418,9 +60806,17 @@ declare namespace ej.datavisualization {
 			 */
 			oldValues?: any;
 
+			/** parameter returns whether or not to cancel the dragOver event
+			 */
+			cancel?: boolean;
+
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** Parameter returns the new zoom value, horizontal and vertical scroll offsets.
+			 */
+			cause?: string;
 		}
 
 		export interface SegmentChangeEventArgs {
@@ -59472,14 +60868,18 @@ declare namespace ej.datavisualization {
 			 */
 			cancel?: boolean;
 
-			/** triggers before and after adding the selection to the object in the diagram which can be differentiated through `state` argument.
-			 * We can cancel the event only before the selection of the object.
+			/** triggers before and after adding the selection to the object in the diagram which can be differentiated through `state` argument. We can cancel the event only
+			 * before the selection of the object.
 			 */
 			state?: string;
 
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter returns the actual cause of the event
+			 */
+			cause?: string;
 		}
 
 		export interface SizeChangeEventArgs {
@@ -59511,6 +60911,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter returns the direction of the node is resized
+			 */
+			direction?: string;
 		}
 
 		export interface TextChangeEventArgs {
@@ -59530,6 +60934,10 @@ declare namespace ej.datavisualization {
 			/** parameter returns the id of the diagram
 			 */
 			diagramId?: string;
+
+			/** parameter to specify whether or not to cancel the event
+			 */
+			cancel?: boolean;
 		}
 
 		export interface CreateEventArgs {
@@ -60173,6 +61581,105 @@ declare namespace ej.datavisualization {
 			showCustomMenuItemsOnly?: boolean;
 		}
 
+		export interface DataSourceSettingsCrudAction {
+
+			/** Specifies the create method which is used to get the nodes to be added from client side to the server side
+			 * @Default {null}
+			 */
+			create?: string;
+
+			/** Specifies the update method which is used to get the updated data from client side to the server side
+			 * @Default {null}
+			 */
+			update?: string;
+
+			/** Specifies the destroy method which is used to get the deleted items data from client side to the server side
+			 * @Default {null}
+			 */
+			destroy?: string;
+
+			/** Specifies the read method to get the created nodes from client side to the server side
+			 * @Default {null}
+			 */
+			read?: string;
+		}
+
+		export interface DataSourceSettingsConnectionDataSourceCrudAction {
+
+			/** Specifies the create method which is used to get the connectors to be added from client side to the server side
+			 * @Default {null}
+			 */
+			create?: string;
+
+			/** Specifies the update method which is used to get the updated connectors from client side to the server side
+			 * @Default {null}
+			 */
+			update?: string;
+
+			/** Specifies the destroy method which is used to get the deleted items data from client side to the server side
+			 * @Default {null}
+			 */
+			destroy?: string;
+
+			/** Specifies the read method which is used to get the data from client side to the server side
+			 * @Default {null}
+			 */
+			read?: string;
+		}
+
+		export interface DataSourceSettingsConnectionDataSource {
+
+			/** Sets the datasource for the connection datasource settings items.
+			 * @Default {null}
+			 */
+			dataSource?: string;
+
+			/** Sets the unique id of the connection data source item
+			 * @Default {null}
+			 */
+			id?: string;
+
+			/** Sets the sourcenode of the connection data source item
+			 * @Default {null}
+			 */
+			sourceNode?: string;
+
+			/** Sets the targetnode of the connection data source item
+			 * @Default {null}
+			 */
+			targetNode?: string;
+
+			/** Sets the sourcepoint-x value of the connection data source item
+			 * @Default {null}
+			 */
+			sourcePointX?: string;
+
+			/** Sets the sourcePoint-y value of the connection data source item
+			 * @Default {null}
+			 */
+			sourcePointY?: string;
+
+			/** Sets the targetPoint-x value of the connection data source item
+			 * @Default {null}
+			 */
+			targetPointX?: string;
+
+			/** Sets the targetPoint-y value of the connection data source item
+			 * @Default {null}
+			 */
+			targetPointY?: string;
+
+			/** Specifies the method name which is used to get updated connectors from client side to the server side
+			 * @Default {null}
+			 */
+			crudAction?: DataSourceSettingsConnectionDataSourceCrudAction;
+
+			/** Specifies the customfields to get the updated data from client side to the server side
+			 * @Default {[]}
+			 */
+			customFields?: any[];
+		}
+
 		export interface DataSourceSettings {
 
 			/** Defines the data source either as a collection of objects or as an instance of ej.DataManager
@@ -60202,6 +61709,21 @@ declare namespace ej.datavisualization {
 			 * @Default {null}
 			 */
 			tableName?: string;
+
+			/** Specifies the method name which is used to get the updated data from client side to the server side
+			 * @Default {null}
+			 */
+			crudAction?: DataSourceSettingsCrudAction;
+
+			/** Specifies the customfields to get the updated data from client side to the server side
+			 * @Default {[]}
+			 */
+			customFields?: any[];
+
+			/** Defines the data source either as a collection of objects or as an instance of ej.DataManager
+			 * @Default {null}
+			 */
+			connectionDataSource?: DataSourceSettingsConnectionDataSource;
 		}
 
 		export interface DefaultSettings {
@@ -60285,6 +61807,11 @@ declare namespace ej.datavisualization {
 			 */
 			getLayoutInfo?: any;
 
+			/** Defines a method to customize the segments based on source and target nodes.
+			 * @Default {null}
+			 */
+			getConnectorSegments?: any;
+
 			/** Sets the space to be horizontally left between nodes
 			 * @Default {30}
 			 */
@@ -61534,6 +63061,10 @@ declare namespace ej.datavisualization {
 
 		export interface SelectedItemsUserHandle {
 
+			/** Defines the name of the user handle
+			 */
+			name?: string;
+
 			/** Defines the background color of the user handle
 			 * @Default {#2382c3}
 			 */
@@ -62691,6 +64222,57 @@ declare namespace ej.datavisualization {
 			Mouse,
 		}
 	}
+	namespace Diagram {
+		enum FileFormats {
+			//Used to export the diagram into JPG format.
+			JPG,
+			//Used to export the diagram into PNG format.
+			PNG,
+			//Used to export the diagram into BMP format.
+			BMP,
+			//Used to export the diagram into SVG format.
+			SVG,
+		}
+	}
+	namespace Diagram {
+		enum ExportModes {
+			//Used to export the diagram as a file.
+			Download,
+			//Used to export the diagram as raw data.
+			Data,
+		}
+	}
+	namespace Diagram {
+		enum Region {
+			//Used to export the content of the diagram only.
+			Content,
+			//Used to export the page region of the diagram.
+			PageSettings,
+		}
+	}
+	namespace Diagram {
+		enum Stretch {
+			//The diagram content preserves its original size.
+			None,
+			//The diagram content is resized to fill the destination dimensions. The aspect ratio is not preserved.
+			Fill,
+			//The diagram content is resized to fit in the destination dimensions while it preserves its native aspect ratio.
+			Uniform,
+			//The diagram content is resized to fill the destination dimensions while it preserves its native aspect ratio. If the aspect ratio of the destination rectangle differs from the source,
+			//the source content is clipped to fit in the destination dimensions.
+			UniformToFill,
+		}
+	}
+	namespace Diagram {
+		enum FitMode {
+			//Used to fit the diagram content based on page size.
+			Page,
+			//Used to fit the diagram content based on diagram width.
+			Width,
+			//Used to fit the diagram content based on diagram height.
+			Height,
+		}
+	}
 	namespace Diagram {
 		enum ZoomCommand {
 			//Used to zoom in the Diagram
@@ -63378,6 +64960,11 @@ declare namespace ej.datavisualization {
 			 */
 			rangeBandSettings?: RangeBandSettings;
 
+			/** Name of the culture based on which sparkline should be localized.
+			 * @Default {en-US}
+			 */
+			locale?: string;
+
 			/** Name of a field in data source, where the fill color for all the data points is generated.
 			 */
 			palette?: string;
@@ -63392,6 +64979,11 @@ declare namespace ej.datavisualization {
 			 */
 			enableCanvasRendering?: boolean;
 
+			/** Specify to convert the date object to string, using locale settings.
+			 * @Default {false}
+			 */
+			enableGroupSeparator?: boolean;
+
 			/** Specifies the dataSource for the series. It can be an array of JSON objects or an instance of ej.DataManager.
 			 * @Default {null}
 			 */
@@ -65079,6 +66671,7 @@ declare namespace ej.datavisualization {
 
 }
 
+
 interface JQueryXHR {
 	/**
 	 * Returns the cancel option value.
@@ -65243,6 +66836,9 @@ interface JQuery {
 	ejPivotTreeMap(options?: ej.PivotTreeMap.Model): JQuery;
 	ejPivotTreeMap(memberName: any, value?: any, param?: any): any;
 
+	ejPrint(options?: ej.Print.Model): JQuery;
+	ejPrint(memberName: any, value?: any, param?: any): any;
+
 	ejProgressBar(options?: ej.ProgressBar.Model): JQuery;
 	ejProgressBar(memberName: any, value?: any, param?: any): any;
 
@@ -65401,6 +66997,7 @@ interface JQuery {
 	data(key: "ejPivotPager"): ej.PivotPager;
 	data(key: "ejPivotSchemaDesigner"): ej.PivotSchemaDesigner;
 	data(key: "ejPivotTreeMap"): ej.PivotTreeMap;
+	data(key: "ejPrint"): ej.Print;
 	data(key: "ejProgressBar"): ej.ProgressBar;
 	data(key: "ejRadialMenu"): ej.RadialMenu;
 	data(key: "ejRadialSlider"): ej.RadialSlider;
diff --git a/types/ej.web.all/tsconfig.json b/types/ej.web.all/tsconfig.json
index 3a1cd27967..0dad85ed26 100644
--- a/types/ej.web.all/tsconfig.json
+++ b/types/ej.web.all/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "ej.web.all-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/electron-config/electron-config-tests.ts b/types/electron-config/electron-config-tests.ts
index bf1ad2087b..a5ac9e9ec3 100644
--- a/types/electron-config/electron-config-tests.ts
+++ b/types/electron-config/electron-config-tests.ts
@@ -13,7 +13,7 @@ const electronConfig = new ElectronConfig();
 electronConfig.set('foo', 'bar');
 electronConfig.set({
     foo: 'bar',
-    'foo2': 'bar2',
+    foo2: 'bar2',
 });
 electronConfig.delete('foo');
 electronConfig.get('foo');
diff --git a/types/electron-config/tslint.json b/types/electron-config/tslint.json
index 3db14f85ea..e830836d23 100644
--- a/types/electron-config/tslint.json
+++ b/types/electron-config/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+     "extends": "dtslint/dt.json" ,
+     "rules": {
+         "no-namespace":false,
+         "object-literal-key-quotes": false
+     }
+}
diff --git a/types/electron-settings/v2/electron-settings-tests.ts b/types/electron-settings/v2/electron-settings-tests.ts
new file mode 100644
index 0000000000..25404c90b3
--- /dev/null
+++ b/types/electron-settings/v2/electron-settings-tests.ts
@@ -0,0 +1,123 @@
+import settings = require('electron-settings');
+
+function test_configure() {
+    settings.configure({
+        atomicSaving: false,
+        prettify: true
+    }) === undefined;
+}
+
+function test_defaults() {
+    settings.defaults({
+        a: 1,
+        b: '',
+        c: false,
+        d: {
+            d1: 'd1',
+            d2: true
+        },
+        e: ['e1', 'e2']
+    }) === undefined;
+}
+
+async function test_has() {
+    await settings.has('a') === true;
+}
+
+function test_hasSync() {
+    settings.hasSync('a') === true;
+}
+
+async function test_get() {
+    await settings.get('b') === '';
+}
+
+function test_getSync() {
+    settings.getSync('b') === '';
+}
+
+async function test_set() {
+    await settings.set('c', true) === undefined;
+}
+
+function test_setSync() {
+    settings.setSync('c', true) === undefined;
+}
+
+async function test_delete() {
+    await settings.delete('d') === undefined;
+}
+
+function test_deleteSync() {
+    settings.deleteSync('d') === undefined;
+}
+
+async function test_clear() {
+    await settings.clear() === undefined;
+}
+
+function test_clearSync() {
+    settings.clearSync() === undefined;
+}
+
+async function test_applyDefaults() {
+    await settings.applyDefaults({ overwrite: true }) === undefined;
+}
+
+function test_applyDefaultsSync() {
+    settings.applyDefaultsSync({ overwrite: true }) === undefined;
+}
+
+async function test_resetToDefaults() {
+    await settings.resetToDefaults() === undefined;
+}
+
+function test_resetToDefaultsSync() {
+    settings.resetToDefaultsSync() === undefined;
+}
+
+function test_observe() {
+    const observer = settings.observe('b', evt => {
+        if (evt.oldValue !== evt.newValue) {
+            console.log(evt.newValue);
+        }
+    });
+
+    observer.dispose();
+}
+
+function test_getSettingsFilePath() {
+    settings.getSettingsFilePath() === __filename;
+}
+
+function test_on_create() {
+    settings.on('create', pathToSettings => {
+        pathToSettings === __dirname;
+    }) === settings;
+}
+
+function test_on_write() {
+    settings.on('write', () => {
+        console.log();
+    }) === settings;
+}
+
+function test_settings_type_annotation(s: typeof settings) {
+    s.getSettingsFilePath();
+}
+
+function test_observer_type_annotation(observer: settings.Observer) {
+    observer.dispose();
+}
+
+function test_options_type_annotation(options: settings.Options) {
+    options.atomicSaving;
+}
+
+function test_applyDefaultOptions_type_annotation(options: settings.ApplyDefaultsOptions) {
+    options.overwrite;
+}
+
+function test_changeEvent_type_annotation(e: settings.ChangeEvent) {
+    e.oldValue === e.newValue;
+}
diff --git a/types/electron-settings/v2/index.d.ts b/types/electron-settings/v2/index.d.ts
new file mode 100644
index 0000000000..71677cb0df
--- /dev/null
+++ b/types/electron-settings/v2/index.d.ts
@@ -0,0 +1,252 @@
+// Type definitions for electron-settings 2.2
+// Project: https://github.com/nathanbuchar/electron-settings
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+declare const SettingsInstance: Settings;
+export = SettingsInstance;
+
+/**
+ * The Settings class.
+ */
+declare class Settings extends EventEmitter {
+    /**
+     * Globally configures default options.
+     *
+     * @throws if options is not an object.
+     */
+    configure(options: ElectronSettings.Options.Param): void;
+
+    /**
+     * Globally configures default settings.
+     *
+     * If the settings file has not been created yet, these defaults will be applied,
+     * but only if settings.defaults is called before making any other calls that
+     * interact with the file system, such as has(), get(), or set().
+     *
+     * @param defaults The defaults object.
+     * @throws if defaults is not an object.
+     */
+    defaults(defaults: any): void;
+
+    /**
+     * Returns a promise whose first argument is a boolean indicating if the key path exists within the settings object.
+     * For synchronous operation, use hasSync().
+     *
+     * @param keyPath The path to the key that we wish to check exists within the settings object.
+     * @throws if key path is not a string.
+     * @see hasSync
+     */
+    has(keyPath: string): Promise<boolean>;
+
+    /**
+     * The synchronous version of has().
+     *
+     * @see has
+     */
+    hasSync(keyPath: string): boolean;
+
+    /**
+     * Returns a promise whose first argument is the value at the chosen key path.
+     * If no key path is chosen, the entire settings object will be returned instead.
+     * For synchronous operation, use getSync().
+     *
+     * @param keyPath The path to the key that we wish to get the value of.
+     * @see getSync
+     */
+    get(keyPath?: string): Promise<any>;
+
+    /**
+     * The synchronous version of get().
+     *
+     * @see get
+     */
+    getSync(keyPath?: string): any;
+
+    /**
+     * Sets the value of the key at the chosen key path.
+     * For synchronous operation, use setSync().
+     *
+     * @param keyPath The path to the key whose value we wish to set. This key need not already exist.
+     * @param value The value to set the key at the chosen key path to. This must be a data type supported by JSON: object, array, string, number, boolean, or null.
+     * @param options
+     * @throws if key path is not a string.
+     * @throws if options is not an object.
+     * @see setSync
+     */
+    set(keyPath: string, value: any, options?: ElectronSettings.Options.Param): Promise<void>;
+
+    /**
+     * The synchronous version of set().
+     *
+     * @see set
+     */
+    setSync(keyPath: string, value: any, options?: ElectronSettings.Options.Param): void;
+
+    /**
+     * Deletes the key and value at the chosen key path.
+     *
+     * @param keyPath The path to the key we wish to unset.
+     * @param options
+     * @throws if keyPath is not a string.
+     * @throws if options is not an object.
+     * @see deleteSync
+     */
+    delete(keyPath: string, options?: ElectronSettings.Options.Param): Promise<void>;
+
+    /**
+     * The synchronous version of delete().
+     *
+     * @see delete
+     */
+    deleteSync(keyPath: string, options?: ElectronSettings.Options.Param): void;
+
+    /**
+     * Clears the entire settings object.
+     * For synchronous operation, use clearSync().
+     *
+     * @throws if options is not an object.
+     * @see clearSync
+     */
+    clear(options?: ElectronSettings.Options.Param): Promise<void>;
+
+    /**
+     * The synchronous version of clear().
+     *
+     * @see clear
+     */
+    clearSync(options?: ElectronSettings.Options.Param): void;
+
+    /**
+     * Applies defaults to the current settings object (deep).
+     * Settings that already exist will not be overwritten, but keys that exist within the defaults
+     * that don't exist within the setting object will be added.
+     * To configure defaults, use defaults().
+     * For synchronous operation, use applyDefaultsSync().
+     *
+     * @throws if options is not an object.
+     * @see defaults
+     * @see applyDefaultsSync
+     */
+    applyDefaults(options?: ElectronSettings.ApplyDefaultsOptions.Param): Promise<void>;
+
+    /**
+     * The synchronous version of applyDefaults().
+     *
+     * @see applyDefaults
+     */
+    applyDefaultsSync(options?: ElectronSettings.ApplyDefaultsOptions.Param): void;
+
+    /**
+     * Resets all settings to defaults.
+     * To configure defaults, use defaults().
+     * For synchronous operation, use resetToDefaultsSync().
+     *
+     * @throws if options is not an object.
+     * @see defaults
+     * @see resetToDefaultsSync
+     */
+    resetToDefaults(options?: ElectronSettings.Options.Param): Promise<void>;
+
+    /**
+     * The synchronous version of resetToDefaults().
+     *
+     * @see resetToDefaults
+     */
+    resetToDefaultsSync(options?: ElectronSettings.Options.Param): void;
+
+    /**
+     * Observes the chosen key path for changes and calls the handler if the value changes.
+     * Returns an Observer instance which has a dispose method.
+     * To unsubscribe, simply call dispose() on the returned key path observer.
+     *
+     * @param keyPath The path to the key that we wish to observe.
+     * @param handler The callback that will be invoked if the value at the chosen key path changes.
+     * @throws if key path is not a string.
+     * @throws if handler is not a function.
+     */
+    observe(keyPath: string, handler: (evt: ElectronSettings.ChangeEvent) => void): ElectronSettings.Observer;
+
+    /**
+     * Returns the path to the config file. Typically found in your application's user data directory:
+     * ~/Library/Application Support/YourApp on MacOS.
+     * %APPDATA%/YourApp on Windows.
+     * $XDG_CONFIG_HOME/YourApp or ~/.config/YourApp on Linux.
+     */
+    getSettingsFilePath(): string;
+
+    /**
+     * Emitted when the settings file has been created.
+     */
+    on(event: 'create', listener: (pathToSettings: string) => void): this;
+    /**
+     * Emitted when the settings have been written to disk.
+     */
+    on(event: 'write', listener: () => void): this;
+}
+
+declare namespace SettingsInstance {
+    type Observer = ElectronSettings.Observer;
+    type Options = ElectronSettings.Options;
+    type ApplyDefaultsOptions = ElectronSettings.ApplyDefaultsOptions;
+    type ChangeEvent = ElectronSettings.ChangeEvent;
+}
+
+declare namespace ElectronSettings {
+    /**
+     * The Observer class.
+     */
+    class Observer {
+        /**
+         * Disposes of the key path observer by unbinding the event listener and
+         * nullifying all internal references.
+         */
+        dispose(): void;
+    }
+
+    interface Options extends Pick<Options._Impl, keyof Options._Impl> { }
+
+    namespace Options {
+        type Param = Options | object;
+
+        interface _Impl {
+            /**
+             * Whether electron-settings should create a tmp file during save to ensure data-write consistency.
+             *
+             * @default true
+             */
+            atomicSaving: boolean;
+            /**
+             * Prettify the JSON output.
+             *
+             * @default false
+             */
+            prettify: boolean;
+        }
+    }
+
+    interface ApplyDefaultsOptions extends Pick<ApplyDefaultsOptions._Impl, keyof ApplyDefaultsOptions._Impl> { }
+
+    namespace ApplyDefaultsOptions {
+        type Param = ApplyDefaultsOptions | object;
+
+        interface _Impl extends Options._Impl {
+            /**
+             * Overwrite pre-existing settings with their respective default values.
+             *
+             * @default false
+             */
+            overwrite: boolean;
+        }
+    }
+
+    interface ChangeEvent {
+        oldValue: any;
+        newValue: any;
+    }
+}
diff --git a/types/electron-settings/v2/tsconfig.json b/types/electron-settings/v2/tsconfig.json
new file mode 100644
index 0000000000..3a5b7b152c
--- /dev/null
+++ b/types/electron-settings/v2/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "electron-settings": [
+                "electron-settings/v2"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "electron-settings-tests.ts"
+    ]
+}
diff --git a/types/electron-settings/v2/tslint.json b/types/electron-settings/v2/tslint.json
new file mode 100644
index 0000000000..4f44991c3c
--- /dev/null
+++ b/types/electron-settings/v2/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/electron/.editorconfig b/types/electron/.editorconfig
deleted file mode 100644
index 2d98d905de..0000000000
--- a/types/electron/.editorconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[*.ts]
-indent_style = tab
diff --git a/types/electron/index.d.ts b/types/electron/index.d.ts
deleted file mode 100644
index 6905671344..0000000000
--- a/types/electron/index.d.ts
+++ /dev/null
@@ -1,6147 +0,0 @@
-// Type definitions for Electron v1.4.8
-// Project: http://electron.atom.io/
-// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>, aliib <https://github.com/aliib>, Daniel Perez Alvarez <https://github.com/unindented>, Markus Olsson <https://github.com/niik>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-declare namespace Electron {
-
-	interface Event {
-		preventDefault: Function;
-		sender: NodeJS.EventEmitter;
-	}
-
-	type Point = {
-		x: number;
-		y: number;
-	}
-
-	type Size = {
-		width: number;
-		height: number;
-	}
-
-	type Rectangle = {
-		x: number;
-		y: number;
-		width: number;
-		height: number;
-	}
-
-	interface Destroyable {
-		/**
-		 * Destroys the object.
-		 */
-		destroy(): void;
-		/**
-		 * @returns Whether the object is destroyed.
-		 */
-		isDestroyed(): boolean;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/app.md
-
-	type VibrancyType = 'appearance-based' | 'light' | 'dark' | 'titlebar' | 'selection' | 'menu' | 'popover' | 'sidebar' | 'medium-light' | 'ultra-dark';
-
-	/**
-	 * The app module is responsible for controlling the application's lifecycle.
-	 */
-	interface App extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the application has finished basic startup.
-		 * On Windows and Linux, the will-finish-launching event
-		 * is the same as the ready event; on macOS, this event represents
-		 * the applicationWillFinishLaunching notification of NSApplication.
-		 * You would usually set up listeners for the open-file and open-url events here,
-		 * and start the crash reporter and auto updater.
-		 *
-		 * In most cases, you should just do everything in the ready event handler.
-		 */
-		on(event: 'will-finish-launching', listener: Function): this;
-		/**
-		 * Emitted when Electron has finished initialization.
-		 */
-		on(event: 'ready', listener: (event: Event, launchInfo: Object) => void): this;
-		/**
-		 * Emitted when all windows have been closed.
-		 *
-		 * If you do not subscribe to this event and all windows are closed,
-		 * the default behavior is to quit the app; however, if you subscribe,
-		 * you control whether the app quits or not.
-		 * If the user pressed Cmd + Q, or the developer called app.quit(),
-		 * Electron will first try to close all the windows and then emit the will-quit event,
-		 * and in this case the window-all-closed event would not be emitted.
-		 */
-		on(event: 'window-all-closed', listener: Function): this;
-		/**
-		 * Emitted before the application starts closing its windows.
-		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
-		 */
-		on(event: 'before-quit', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when all windows have been closed and the application will quit.
-		 * Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
-		 */
-		on(event: 'will-quit', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when the application is quitting.
-		 */
-		on(event: 'quit', listener: (event: Event, exitCode: number) => void): this;
-		/**
-		 * Emitted when the user wants to open a file with the application.
-		 * The open-file event is usually emitted when the application is already open
-		 * and the OS wants to reuse the application to open the file.
-		 * open-file is also emitted when a file is dropped onto the dock and the application
-		 * is not yet running. Make sure to listen for the open-file event very early
-		 * in your application startup to handle this case (even before the ready event is emitted).
-		 *
-		 * You should call event.preventDefault() if you want to handle this event.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'open-file', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the user wants to open a URL with the application.
-		 * The URL scheme must be registered to be opened by your application.
-		 *
-		 * You should call event.preventDefault() if you want to handle this event.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'open-url', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the application is activated, which usually happens when clicks on the applications’s dock icon.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'activate', listener: Function): this;
-		/**
-		 * Emitted during Handoff when an activity from a different device wants to be resumed.
-		 * You should call event.preventDefault() if you want to handle this event.
-		 */
-		on(event: 'continue-activity', listener: (event: Event, type: string, userInfo: Object) => void): this;
-		/**
-		 * Emitted when a browserWindow gets blurred.
-		 */
-		on(event: 'browser-window-blur', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when a browserWindow gets focused.
-		 */
-		on(event: 'browser-window-focus', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when a new browserWindow is created.
-		 */
-		on(event: 'browser-window-created', listener: (event: Event, browserWindow: BrowserWindow) => void): this;
-		/**
-		 * Emitted when a new webContents is created.
-		 */
-		on(event: 'web-contents-created', listener: (event: Event, webContents: WebContents) => void): this;
-		/**
-		 * Emitted when failed to verify the certificate for url, to trust the certificate
-		 * you should prevent the default behavior with event.preventDefault() and call callback(true).
-		 */
-		on(event: 'certificate-error', listener: (event: Event,
-			webContents: WebContents,
-			url: string,
-			error: string,
-			certificate: Certificate,
-			callback: (trust: boolean) => void
-		) => void): this;
-		/**
-		 * Emitted when a client certificate is requested.
-		 *
-		 * The url corresponds to the navigation entry requesting the client certificate
-		 * and callback needs to be called with an entry filtered from the list.
-		 * Using event.preventDefault() prevents the application from using the first certificate from the store.
-		 */
-		on(event: 'select-client-certificate', listener: (event: Event,
-			webContents: WebContents,
-			url: string,
-			certificateList: Certificate[],
-			callback: (certificate: Certificate) => void
-		) => void): this;
-		/**
-		 * Emitted when webContents wants to do basic auth.
-		 *
-		 * The default behavior is to cancel all authentications, to override this
-		 * you should prevent the default behavior with event.preventDefault()
-		 * and call callback(username, password) with the credentials.
-		 */
-		on(event: 'login', listener: (event: Event,
-			webContents: WebContents,
-			request: LoginRequest,
-			authInfo: LoginAuthInfo,
-			callback: (username: string, password: string) => void
-		) => void): this;
-		/**
-		 * Emitted when the gpu process crashes.
-		 */
-		on(event: 'gpu-process-crashed', listener: (event: Event, killed: boolean) => void): this;
-		/**
-		 * Emitted when Chrome's accessibility support changes.
-		 *
-		 * Note: This API is only available on macOS and Windows.
-		 */
-		on(event: 'accessibility-support-changed', listener: (event: Event, accessibilitySupportEnabled: boolean) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Try to close all windows. The before-quit event will first be emitted.
-		 * If all windows are successfully closed, the will-quit event will be emitted
-		 * and by default the application would be terminated.
-		 *
-		 * This method guarantees all beforeunload and unload handlers are correctly
-		 * executed. It is possible that a window cancels the quitting by returning
-		 * false in beforeunload handler.
-		 */
-		quit(): void;
-		/**
-		 * Exits immediately with exitCode.
-		 * All windows will be closed immediately without asking user
-		 * and the before-quit and will-quit events will not be emitted.
-		 */
-		exit(exitCode?: number): void;
-		/**
-		 * Relaunches the app when current instance exits.
-		 *
-		 * By default the new instance will use the same working directory
-		 * and command line arguments with current instance.
-		 * When args is specified, the args will be passed as command line arguments instead.
-		 * When execPath is specified, the execPath will be executed for relaunch instead of current app.
-		 *
-		 * Note that this method does not quit the app when executed, you have to call app.quit
-		 * or app.exit after calling app.relaunch to make the app restart.
-		 *
-		 * When app.relaunch is called for multiple times, multiple instances
-		 * will be started after current instance exited.
-		 */
-		relaunch(options?: {
-			args?: string[],
-			execPath?: string
-		}): void;
-		/**
-		 * @returns Whether Electron has finished initializing.
-		 */
-		isReady(): boolean;
-		/**
-		 * On Linux, focuses on the first visible window.
-		 * On macOS, makes the application the active app.
-		 * On Windows, focuses on the application’s first window.
-		 */
-		focus(): void;
-		/**
-		 * Hides all application windows without minimizing them.
-		 * Note: This is only implemented on macOS.
-		 */
-		hide(): void;
-		/**
-		 * Shows application windows after they were hidden. Does not automatically focus them.
-		 * Note: This is only implemented on macOS.
-		 */
-		show(): void;
-		/**
-		 * Returns the current application directory.
-		 */
-		getAppPath(): string;
-		/**
-		 * @returns The path to a special directory or file associated with name.
-		 * On failure an Error would throw.
-		 */
-		getPath(name: AppPathName): string;
-		/**
-		 * Overrides the path to a special directory or file associated with name.
-		 * If the path specifies a directory that does not exist, the directory will
-		 * be created by this method. On failure an Error would throw.
-		 *
-		 * You can only override paths of names defined in app.getPath.
-		 *
-		 * By default web pages' cookies and caches will be stored under userData
-		 * directory, if you want to change this location, you have to override the
-		 * userData path before the ready event of app module gets emitted.
-		 */
-		setPath(name: AppPathName, path: string): void;
-		/**
-		 * @returns The version of loaded application, if no version is found in
-		 * application's package.json, the version of current bundle or executable.
-		 */
-		getVersion(): string;
-		/**
-		 * @returns The current application's name, the name in package.json would be used.
-		 * Usually the name field of package.json is a short lowercased name, according to
-		 * the spec of npm modules. So usually you should also specify a productName field,
-		 * which is your application's full capitalized name, and it will be preferred over
-		 * name by Electron.
-		 */
-		getName(): string;
-		/**
-		 * Overrides the current application's name.
-		 */
-		setName(name: string): void;
-		/**
-		  * @returns The current application locale.
-		  */
-		getLocale(): string;
-		/**
-		 * Adds path to recent documents list.
-		 *
-		 * This list is managed by the system, on Windows you can visit the list from
-		 * task bar, and on macOS you can visit it from dock menu.
-		 *
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		addRecentDocument(path: string): void;
-		/**
-		 * Clears the recent documents list.
-		 *
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		clearRecentDocuments(): void;
-		/**
-		 * Sets the current executable as the default handler for a protocol (aka URI scheme).
-		 * Once registered, all links with your-protocol:// will be opened with the current executable.
-		 * The whole link, including protocol, will be passed to your application as a parameter.
-		 *
-		 * On Windows you can provide optional parameters path, the path to your executable,
-		 * and args, an array of arguments to be passed to your executable when it launches.
-		 *
-		 * @param protocol The name of your protocol, without ://.
-		 * @param path Defaults to process.execPath.
-		 * @param args Defaults to an empty array.
-		 *
-		 * Note: This is only implemented on macOS and Windows.
-		 *       On macOS, you can only register protocols that have been added to your app's info.plist.
-		 */
-		setAsDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
-		/**
-		 * Removes the current executable as the default handler for a protocol (aka URI scheme).
-		 *
-		 * @param protocol The name of your protocol, without ://.
-		 * @param path Defaults to process.execPath.
-		 * @param args Defaults to an empty array.
-		 *
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		removeAsDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
-		/**
-		 * @param protocol The name of your protocol, without ://.
-		 * @param path Defaults to process.execPath.
-		 * @param args Defaults to an empty array.
-		 *
-		 * @returns Whether the current executable is the default handler for a protocol (aka URI scheme).
-		 *
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		isDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
-		/**
-		 * Adds tasks to the Tasks category of JumpList on Windows.
-		 *
-		 * Note: This API is only available on Windows.
-		 */
-		setUserTasks(tasks: Task[]): boolean;
-		/**
-		 * Note: This API is only available on Windows.
-		 */
-		getJumpListSettings(): JumpListSettings;
-		/**
-		 * Sets or removes a custom Jump List for the application.
-		 *
-		 * If categories is null the previously set custom Jump List (if any) will be replaced
-		 * by the standard Jump List for the app (managed by Windows).
-		 *
-		 * Note: This API is only available on Windows.
-		 */
-		setJumpList(categories: JumpListCategory[]): SetJumpListResult;
-		/**
-		 * This method makes your application a Single Instance Application instead of allowing
-		 * multiple instances of your app to run, this will ensure that only a single instance
-		 * of your app is running, and other instances signal this instance and exit.
-		 */
-		makeSingleInstance(callback: (args: string[], workingDirectory: string) => void): boolean;
-		/**
-		 * Releases all locks that were created by makeSingleInstance. This will allow
-		 * multiple instances of the application to once again run side by side.
-		 */
-		releaseSingleInstance(): void;
-		/**
-		 * Creates an NSUserActivity and sets it as the current activity.
-		 * The activity is eligible for Handoff to another device afterward.
-		 *
-		 * @param type Uniquely identifies the activity. Maps to NSUserActivity.activityType.
-		 * @param userInfo App-specific state to store for use by another device.
-		 * @param webpageURL The webpage to load in a browser if no suitable app is
-		 * 					 installed on the resuming device. The scheme must be http or https.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		setUserActivity(type: string, userInfo: Object, webpageURL?: string): void;
-		/**
-		 * @returns The type of the currently running activity.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		getCurrentActivityType(): string;
-		/**
-		 * Changes the Application User Model ID to id.
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		setAppUserModelId(id: string): void;
-		/**
-		 * Imports the certificate in pkcs12 format into the platform certificate store.
-		 * @param callback Called with the result of import operation, a value of 0 indicates success
-		 * while any other value indicates failure according to chromium net_error_list.
-		 *
-		 * Note: This API is only available on Linux.
-		 */
-		importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
-		/**
-		 * Disables hardware acceleration for current app.
-		 * This method can only be called before app is ready.
-		 */
-		disableHardwareAcceleration(): void;
-		/**
-		 * Sets the counter badge for current app. Setting the count to 0 will hide the badge.
-		 *
-		 * @returns True when the call succeeded, otherwise returns false.
-		 *
-		 * Note: This API is only available on macOS and Linux.
-		 */
-		setBadgeCount(count: number): boolean;
-		/**
-		 * @returns The current value displayed in the counter badge.
-		 *
-		 * Note: This API is only available on macOS and Linux.
-		 */
-		getBadgeCount(): number;
-		/**
-		 * @returns whether current desktop environment is Unity launcher. (Linux)
-		 *
-		 * Note: This API is only available on Linux.
-		 */
-		isUnityRunning(): boolean;
-		/**
-		 * Returns a Boolean, true if Chrome's accessibility support is enabled, false otherwise.
-		 * This API will return true if the use of assistive technologies, such as screen readers,
-		 * has been detected.
-		 * See https://www.chromium.org/developers/design-documents/accessibility for more details.
-		 *
-		 * Note: This API is only available on macOS and Windows.
-		 */
-		isAccessibilitySupportEnabled(): boolean;
-		/**
-		 * @returns an Object with the login item settings of the app.
-		 *
-		 * Note: This API is only available on macOS and Windows.
-		 */
-		getLoginItemSettings(): LoginItemSettings;
-		/**
-		 * Set the app's login item settings.
-		 *
-		 * Note: This API is only available on macOS and Windows.
-		 */
-		setLoginItemSettings(settings: LoginItemSettings): void;
-		/**
-		 * Set the about panel options. This will override the values defined in the app's .plist file.
-		 * See the Apple docs for more details.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		setAboutPanelOptions(options: AboutPanelOptions): void;
-		commandLine: CommandLine;
-		/**
-		 * Note: This API is only available on macOS.
-		 */
-		dock: Dock;
-	}
-
-	type AppPathName = 'home'|'appData'|'userData'|'temp'|'exe'|'module'|'desktop'|'documents'|'downloads'|'music'|'pictures'|'videos'|'pepperFlashSystemPlugin';
-
-	interface ImportCertificateOptions {
-		/**
-		 * Path for the pkcs12 file.
-		 */
-		certificate: string;
-		/**
-		 * Passphrase for the certificate.
-		 */
-		password: string;
-	}
-
-	interface CommandLine {
-		/**
-		 * Append a switch [with optional value] to Chromium's command line.
-		 *
-		 * Note: This will not affect process.argv, and is mainly used by developers
-		 * to control some low-level Chromium behaviors.
-		 */
-		appendSwitch(_switch: string, value?: string): void;
-		/**
-		 * Append an argument to Chromium's command line. The argument will quoted properly.
-		 *
-		 * Note: This will not affect process.argv.
-		 */
-		appendArgument(value: string): void;
-	}
-
-	interface Dock {
-		/**
-		 * When critical is passed, the dock icon will bounce until either the
-		 * application becomes active or the request is canceled.
-		 *
-		 * When informational is passed, the dock icon will bounce for one second.
-		 * However, the request remains active until either the application becomes
-		 * active or the request is canceled.
-		 *
-		 * @param type The default is informational.
-		 * @returns An ID representing the request.
-		 */
-		bounce(type?: 'critical' | 'informational'): number;
-		/**
-		 * Cancel the bounce of id.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		cancelBounce(id: number): void;
-		/**
-		 * Bounces the Downloads stack if the filePath is inside the Downloads folder.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		downloadFinished(filePath: string): void;
-		/**
-		 * Sets the string to be displayed in the dock’s badging area.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		setBadge(text: string): void;
-		/**
-		 * Returns the badge string of the dock.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		getBadge(): string;
-		/**
-		 * Hides the dock icon.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		hide(): void;
-		/**
-		 * Shows the dock icon.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		show(): void;
-		/**
-		 * @returns Whether the dock icon is visible.
-		 * The app.dock.show() call is asynchronous so this method might not return true immediately after that call.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		isVisible(): boolean;
-		/**
-		 * Sets the application dock menu.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		setMenu(menu: Menu): void;
-		/**
-		 * Sets the image associated with this dock icon.
-		 *
-		 * Note: This API is only available on macOS.
-		 */
-		setIcon(icon: NativeImage | string): void;
-	}
-
-	interface Task {
-		/**
-		 * Path of the program to execute, usually you should specify process.execPath
-		 * which opens current program.
-		 */
-		program: string;
-		/**
-		 * The arguments of command line when program is executed.
-		 */
-		arguments: string;
-		/**
-		 * The string to be displayed in a JumpList.
-		 */
-		title: string;
-		/**
-		 * Description of this task.
-		 */
-		description?: string;
-		/**
-		 * The absolute path to an icon to be displayed in a JumpList, it can be
-		 * arbitrary resource file that contains an icon, usually you can specify
-		 * process.execPath to show the icon of the program.
-		 */
-		iconPath: string;
-		/**
-		 * The icon index in the icon file. If an icon file consists of two or more
-		 * icons, set this value to identify the icon. If an icon file consists of
-		 * one icon, this value is 0.
-		 */
-		iconIndex?: number;
-	}
-
-	/**
-	 * ok - Nothing went wrong.
-	 * error - One or more errors occured, enable runtime logging to figure out the likely cause.
-	 * invalidSeparatorError - An attempt was made to add a separator to a custom category in the Jump List.
-	 *                         Separators are only allowed in the standard Tasks category.
-	 * fileTypeRegistrationError - An attempt was made to add a file link to the Jump List
-	 *                             for a file type the app isn't registered to handle.
-	 * customCategoryAccessDeniedError - Custom categories can't be added to the Jump List
-	 *                                   due to user privacy or group policy settings.
-	 */
-	type SetJumpListResult = 'ok' | 'error' | 'invalidSeparatorError' | 'fileTypeRegistrationError' | 'customCategoryAccessDeniedError';
-
-	interface JumpListSettings {
-		/**
-		 * The minimum number of items that will be shown in the Jump List.
-		 */
-		minItems: number;
-		/**
-		 * Items that the user has explicitly removed from custom categories in the Jump List.
-		 */
-		removedItems: JumpListItem[];
-	}
-
-	interface JumpListCategory {
-		/**
-		 * tasks - Items in this category will be placed into the standard Tasks category.
-		 * frequent - Displays a list of files frequently opened by the app, the name of the category and its items are set by Windows.
-		 * recent - Displays a list of files recently opened by the app, the name of the category and its items are set by Windows.
-		 * custom - Displays tasks or file links, name must be set by the app.
-		 */
-		type?: 'tasks' | 'frequent' | 'recent' | 'custom';
-		/**
-		 * Must be set if type is custom, otherwise it should be omitted.
-		 */
-		name?: string;
-		/**
-		 * Array of JumpListItem objects if type is tasks or custom, otherwise it should be omitted.
-		 */
-		items?: JumpListItem[];
-	}
-
-	interface JumpListItem {
-		/**
-		 * task - A task will launch an app with specific arguments.
-		 * separator - Can be used to separate items in the standard Tasks category.
-		 * file - A file link will open a file using the app that created the Jump List.
-		 */
-		type: 'task' | 'separator' | 'file';
-		/**
-		 * Path of the file to open, should only be set if type is file.
-		 */
-		path?: string;
-		/**
-		 * Path of the program to execute, usually you should specify process.execPath which opens the current program.
-		 * Should only be set if type is task.
-		 */
-		program?: string;
-		/**
-		 * The command line arguments when program is executed. Should only be set if type is task.
-		 */
-		args?: string;
-		/**
-		 * The text to be displayed for the item in the Jump List. Should only be set if type is task.
-		 */
-		title?: string;
-		/**
-		 * Description of the task (displayed in a tooltip). Should only be set if type is task.
-		 */
-		description?: string;
-		/**
-		 * The absolute path to an icon to be displayed in a Jump List, which can be an arbitrary
-		 * resource file that contains an icon (e.g. .ico, .exe, .dll).
-		 * You can usually specify process.execPath to show the program icon.
-		 */
-		iconPath?: string;
-		/**
-		 * The index of the icon in the resource file. If a resource file contains multiple icons
-		 * this value can be used to specify the zero-based index of the icon that should be displayed
-		 * for this task. If a resource file contains only one icon, this property should be set to zero.
-		 */
-		iconIndex?: number;
-	}
-
-	interface LoginItemSettings {
-		/**
-		 * True if the app is set to open at login.
-		 */
-		openAtLogin: boolean;
-		/**
-		 * True if the app is set to open as hidden at login. This setting is only supported on macOS.
-		 */
-		openAsHidden: boolean;
-		/**
-		 * True if the app was opened at login automatically. This setting is only supported on macOS.
-		 */
-		wasOpenedAtLogin?: boolean;
-		/**
-		 * True if the app was opened as a hidden login item. This indicates that the app should not
-		 * open any windows at startup. This setting is only supported on macOS.
-		 */
-		wasOpenedAsHidden?: boolean;
-		/**
-		 * True if the app was opened as a login item that should restore the state from the previous session.
-		 * This indicates that the app should restore the windows that were open the last time the app was closed.
-		 * This setting is only supported on macOS.
-		 */
-		restoreState?: boolean;
-	}
-
-	interface AboutPanelOptions {
-		/**
-		 * The app's name.
-		 */
-		applicationName?: string;
-		/**
-		 * The app's version.
-		 */
-		applicationVersion?: string;
-		/**
-		 * Copyright information.
-		 */
-		copyright?: string;
-		/**
-		 * Credit information.
-		 */
-		credits?: string;
-		/**
-		 * The app's build version number.
-		 */
-		version?: string;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/auto-updater.md
-
-	/**
-	 * This module provides an interface for the Squirrel auto-updater framework.
-	 */
-	interface AutoUpdater extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when there is an error while updating.
-		 */
-		on(event: 'error', listener: (error: Error) => void): this;
-		/**
-		 * Emitted when checking if an update has started.
-		 */
-		on(event: 'checking-for-update', listener: Function): this;
-		/**
-		 * Emitted when there is an available update. The update is downloaded automatically.
-		 */
-		on(event: 'update-available', listener: Function): this;
-		/**
-		 * Emitted when there is no available update.
-		 */
-		on(event: 'update-not-available', listener: Function): this;
-		/**
-		 * Emitted when an update has been downloaded.
-		 * Note: On Windows only releaseName is available.
-		 */
-		on(event: 'update-downloaded', listener: (event: Event, releaseNotes: string, releaseName: string, releaseDate: Date, updateURL: string) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Set the url and initialize the auto updater.
-		 */
-		setFeedURL(url: string, requestHeaders?: Headers): void;
-		/**
-		 * @returns The current update feed URL.
-		 */
-		getFeedURL(): string;
-		/**
-		 * Ask the server whether there is an update, you have to call setFeedURL
-		 * before using this API
-		 */
-		checkForUpdates(): void;
-		/**
-		 * Restarts the app and installs the update after it has been downloaded.
-		 * It should only be called after update-downloaded has been emitted.
-		 */
-		quitAndInstall(): void;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/browser-window.md
-
-	/**
-	 * The BrowserWindow class gives you ability to create a browser window.
-	 * You can also create a window without chrome by using Frameless Window API.
-	 */
-	class BrowserWindow extends NodeJS.EventEmitter implements Destroyable {
-		/**
-		 * Emitted when the document changed its title,
-		 * calling event.preventDefault() would prevent the native window’s title to change.
-		 */
-		on(event: 'page-title-updated', listener: (event: Event, title: string) => void): this;
-		/**
-		 * Emitted when the window is going to be closed. It’s emitted before the beforeunload
-		 * and unload event of the DOM. Calling event.preventDefault() will cancel the close.
-		 */
-		on(event: 'close', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when the window is closed. After you have received this event
-		 * you should remove the reference to the window and avoid using it anymore.
-		 */
-		on(event: 'closed', listener: Function): this;
-		/**
-		 * Emitted when the web page becomes unresponsive.
-		 */
-		on(event: 'unresponsive', listener: Function): this;
-		/**
-		 * Emitted when the unresponsive web page becomes responsive again.
-		 */
-		on(event: 'responsive', listener: Function): this;
-		/**
-		 * Emitted when the window loses focus.
-		 */
-		on(event: 'blur', listener: Function): this;
-		/**
-		 * Emitted when the window gains focus.
-		 */
-		on(event: 'focus', listener: Function): this;
-		/**
-		 * Emitted when the window is shown.
-		 */
-		on(event: 'show', listener: Function): this;
-		/**
-		 * Emitted when the window is hidden.
-		 */
-		on(event: 'hide', listener: Function): this;
-		/**
-		 * Emitted when the web page has been rendered and window can be displayed without visual flash.
-		 */
-		on(event: 'ready-to-show', listener: Function): this;
-		/**
-		 * Emitted when window is maximized.
-		 */
-		on(event: 'maximize', listener: Function): this;
-		/**
-		 * Emitted when the window exits from maximized state.
-		 */
-		on(event: 'unmaximize', listener: Function): this;
-		/**
-		 * Emitted when the window is minimized.
-		 */
-		on(event: 'minimize', listener: Function): this;
-		/**
-		 * Emitted when the window is restored from minimized state.
-		 */
-		on(event: 'restore', listener: Function): this;
-		/**
-		 * Emitted when the window is getting resized.
-		 */
-		on(event: 'resize', listener: Function): this;
-		/**
-		 * Emitted when the window is getting moved to a new position.
-		 */
-		on(event: 'move', listener: Function): this;
-		/**
-		 * Emitted when the window enters full screen state.
-		 */
-		on(event: 'enter-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window leaves full screen state.
-		 */
-		on(event: 'leave-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window enters full screen state triggered by HTML API.
-		 */
-		on(event: 'enter-html-full-screen', listener: Function): this;
-		/**
-		 * Emitted when the window leaves full screen state triggered by HTML API.
-		 */
-		on(event: 'leave-html-full-screen', listener: Function): this;
-		/**
-		 * Emitted when an App Command is invoked. These are typically related
-		 * to keyboard media keys or browser commands, as well as the "Back" /
-		 * "Forward" buttons built into some mice on Windows.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'app-command', listener: (event: Event, command: string) => void): this;
-		/**
-		 * Emitted when scroll wheel event phase has begun.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'scroll-touch-begin', listener: Function): this;
-		/**
-		 * Emitted when scroll wheel event phase has ended.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'scroll-touch-end', listener: Function): this;
-		/**
-		 * Emitted when scroll wheel event phase filed upon reaching the edge of element.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'scroll-touch-edge', listener: Function): this;
-		/**
-		 * Emitted on 3-finger swipe.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'swipe', listener: (event: Event, direction: SwipeDirection) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Creates a new BrowserWindow with native properties as set by the options.
-		 */
-		constructor(options?: BrowserWindowOptions);
-		/**
-		 * @returns All opened browser windows.
-		 */
-		static getAllWindows(): BrowserWindow[];
-		/**
-		 * @returns The window that is focused in this application.
-		 */
-		static getFocusedWindow(): BrowserWindow;
-		/**
-		 * Find a window according to the webContents it owns.
-		 */
-		static fromWebContents(webContents: WebContents): BrowserWindow;
-		/**
-		 * Find a window according to its ID.
-		 */
-		static fromId(id: number): BrowserWindow;
-		/**
-		 * Adds devtools extension located at path. The extension will be remembered
-		 * so you only need to call this API once, this API is not for programming use.
-		 * @returns The extension's name.
-		 *
-		 * Note: This API cannot be called before the ready event of the app module is emitted.
-		 */
-		static addDevToolsExtension(path: string): string;
-		/**
-		 * Remove a devtools extension.
-		 * @param name The name of the devtools extension to remove.
-		 *
-		 * Note: This API cannot be called before the ready event of the app module is emitted.
-		 */
-		static removeDevToolsExtension(name: string): void;
-		/**
-		 * @returns devtools extensions.
-		 *
-		 * Note: This API cannot be called before the ready event of the app module is emitted.
-		 */
-		static getDevToolsExtensions(): DevToolsExtensions;
-		/**
-		 * The WebContents object this window owns, all web page related events and
-		 * operations would be done via it.
-		 * Note: Users should never store this object because it may become null when
-		 * the renderer process (web page) has crashed.
-		 */
-		webContents: WebContents;
-		/**
-		 * Get the unique ID of this window.
-		 */
-		id: number;
-		/**
-		 * Force closing the window, the unload and beforeunload event won't be emitted
-		 * for the web page, and close event would also not be emitted for this window,
-		 * but it would guarantee the closed event to be emitted.
-		 * You should only use this method when the renderer process (web page) has crashed.
-		 */
-		destroy(): void;
-		/**
-		 * Try to close the window, this has the same effect with user manually clicking
-		 * the close button of the window. The web page may cancel the close though,
-		 * see the close event.
-		 */
-		close(): void;
-		/**
-		 * Focus on the window.
-		 */
-		focus(): void;
-		/**
-		 * Remove focus on the window.
-		 */
-		blur(): void;
-		/**
-		 * @returns Whether the window is focused.
-		 */
-		isFocused(): boolean;
-		/**
-		 * @returns Whether the window is destroyed.
-		 */
-		isDestroyed(): boolean;
-		/**
-		 * Shows and gives focus to the window.
-		 */
-		show(): void;
-		/**
-		 * Shows the window but doesn't focus on it.
-		 */
-		showInactive(): void;
-		/**
-		 * Hides the window.
-		 */
-		hide(): void;
-		/**
-		 * @returns Whether the window is visible to the user.
-		 */
-		isVisible(): boolean;
-		/**
-		 * @returns Whether the window is a modal window.
-		 */
-		isModal(): boolean;
-		/**
-		 * Maximizes the window.
-		 */
-		maximize(): void;
-		/**
-		 * Unmaximizes the window.
-		 */
-		unmaximize(): void;
-		/**
-		 * @returns Whether the window is maximized.
-		 */
-		isMaximized(): boolean;
-		/**
-		 * Minimizes the window. On some platforms the minimized window will be
-		 * shown in the Dock.
-		 */
-		minimize(): void;
-		/**
-		 * Restores the window from minimized state to its previous state.
-		 */
-		restore(): void;
-		/**
-		 * @returns Whether the window is minimized.
-		 */
-		isMinimized(): boolean;
-		/**
-		 * Sets whether the window should be in fullscreen mode.
-		 */
-		setFullScreen(flag: boolean): void;
-		/**
-		 * @returns Whether the window is in fullscreen mode.
-		 */
-		isFullScreen(): boolean;
-		/**
-		 * This will have a window maintain an aspect ratio.
-		 * The extra size allows a developer to have space, specified in pixels,
-		 * not included within the aspect ratio calculations.
-		 * This API already takes into account the difference between a window’s size and its content size.
-		 *
-		 * Note: This API is available only on macOS.
-		 */
-		setAspectRatio(aspectRatio: number, extraSize?: Size): void;
-		/**
-		 * Uses Quick Look to preview a file at a given path.
-		 *
-		 * @param path The absolute path to the file to preview with QuickLook.
-		 * @param displayName The name of the file to display on the Quick Look modal view.
-		 * Note: This API is available only on macOS.
-		 */
-		previewFile(path: string, displayName?: string): void;
-		/**
-		 * Resizes and moves the window to width, height, x, y.
-		 */
-		setBounds(options: Rectangle, animate?: boolean): void;
-		/**
-		 * @returns The window's width, height, x and y values.
-		 */
-		getBounds(): Rectangle;
-		/**
-		 * Resizes and moves the window's client area (e.g. the web page) to width, height, x, y.
-		 */
-		setContentBounds(options: Rectangle, animate?: boolean): void;
-		/**
-		 * @returns The window's client area (e.g. the web page) width, height, x and y values.
-		 */
-		getContentBounds(): Rectangle;
-		/**
-		 * Resizes the window to width and height.
-		 */
-		setSize(width: number, height: number, animate?: boolean): void;
-		/**
-		 * @returns The window's width and height.
-		 */
-		getSize(): number[];
-		/**
-		 * Resizes the window's client area (e.g. the web page) to width and height.
-		 */
-		setContentSize(width: number, height: number, animate?: boolean): void;
-		/**
-		 * @returns The window's client area's width and height.
-		 */
-		getContentSize(): number[];
-		/**
-		 * Sets the minimum size of window to width and height.
-		 */
-		setMinimumSize(width: number, height: number): void;
-		/**
-		 * @returns The window's minimum width and height.
-		 */
-		getMinimumSize(): number[];
-		/**
-		 * Sets the maximum size of window to width and height.
-		 */
-		setMaximumSize(width: number, height: number): void;
-		/**
-		 * @returns The window's maximum width and height.
-		 */
-		getMaximumSize(): number[];
-		/**
-		 * Sets whether the window can be manually resized by user.
-		 */
-		setResizable(resizable: boolean): void;
-		/**
-		 * @returns Whether the window can be manually resized by user.
-		 */
-		isResizable(): boolean;
-		/**
-		 * Sets whether the window can be moved by user. On Linux does nothing.
-		 * Note: This API is available only on macOS and Windows.
-		 */
-		setMovable(movable: boolean): void;
-		/**
-		 * Note: This API is available only on macOS and Windows.
-		 * @returns Whether the window can be moved by user. On Linux always returns true.
-		 */
-		isMovable(): boolean;
-		/**
-		 * Sets whether the window can be manually minimized by user. On Linux does nothing.
-		 * Note: This API is available only on macOS and Windows.
-		 */
-		setMinimizable(minimizable: boolean): void;
-		/**
-		 * Note: This API is available only on macOS and Windows.
-		 * @returns Whether the window can be manually minimized by user. On Linux always returns true.
-		 */
-		isMinimizable(): boolean;
-		/**
-		 * Sets whether the window can be manually maximized by user. On Linux does nothing.
-		 * Note: This API is available only on macOS and Windows.
-		 */
-		setMaximizable(maximizable: boolean): void;
-		/**
-		 * Note: This API is available only on macOS and Windows.
-		 * @returns Whether the window can be manually maximized by user. On Linux always returns true.
-		 */
-		isMaximizable(): boolean;
-		/**
-		 * Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
-		 */
-		setFullScreenable(fullscreenable: boolean): void;
-		/**
-		 * @returns Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
-		 */
-		isFullScreenable(): boolean;
-		/**
-		 * Sets whether the window can be manually closed by user. On Linux does nothing.
-		 * Note: This API is available only on macOS and Windows.
-		 */
-		setClosable(closable: boolean): void;
-		/**
-		 * Note: This API is available only on macOS and Windows.
-		 * @returns Whether the window can be manually closed by user. On Linux always returns true.
-		 */
-		isClosable(): boolean;
-		/**
-		 * Sets whether the window should show always on top of other windows. After
-		 * setting this, the window is still a normal window, not a toolbox window
-		 * which can not be focused on.
-		 */
-		setAlwaysOnTop(flag: boolean, level?: WindowLevel): void;
-		/**
-		 * @returns Whether the window is always on top of other windows.
-		 */
-		isAlwaysOnTop(): boolean;
-		/**
-		 * Moves window to the center of the screen.
-		 */
-		center(): void;
-		/**
-		 * Moves window to x and y.
-		 */
-		setPosition(x: number, y: number, animate?: boolean): void;
-		/**
-		 * @returns The window's current position.
-		 */
-		getPosition(): number[];
-		/**
-		 * Changes the title of native window to title.
-		 */
-		setTitle(title: string): void;
-		/**
-		 * Note: The title of web page can be different from the title of the native window.
-		 * @returns The title of the native window.
-		 */
-		getTitle(): string;
-		/**
-		 * Changes the attachment point for sheets on macOS.
-		 * Note: This API is available only on macOS.
-		 */
-		setSheetOffset(offsetY: number, offsetX?: number): void;
-		/**
-		 * Starts or stops flashing the window to attract user's attention.
-		 */
-		flashFrame(flag: boolean): void;
-		/**
-		 * Makes the window do not show in Taskbar.
-		 */
-		setSkipTaskbar(skip: boolean): void;
-		/**
-		 * Enters or leaves the kiosk mode.
-		 */
-		setKiosk(flag: boolean): void;
-		/**
-		 * @returns Whether the window is in kiosk mode.
-		 */
-		isKiosk(): boolean;
-		/**
-		 * The native type of the handle is HWND on Windows, NSView* on macOS,
-		 * and Window (unsigned long) on Linux.
-		 * @returns The platform-specific handle of the window as Buffer.
-		 */
-		getNativeWindowHandle(): Buffer;
-		/**
-		 * Hooks a windows message. The callback is called when the message is received in the WndProc.
-		 * Note: This API is available only on Windows.
-		 */
-		hookWindowMessage(message: number, callback: Function): void;
-		/**
-		 * @returns Whether the message is hooked.
-		 */
-		isWindowMessageHooked(message: number): boolean;
-		/**
-		 * Unhook the window message.
-		 */
-		unhookWindowMessage(message: number): void;
-		/**
-		 * Unhooks all of the window messages.
-		 */
-		unhookAllWindowMessages(): void;
-		/**
-		 * Sets the pathname of the file the window represents, and the icon of the
-		 * file will show in window's title bar.
-		 * Note: This API is available only on macOS.
-		 */
-		setRepresentedFilename(filename: string): void;
-		/**
-		 * Note: This API is available only on macOS.
-		 * @returns The pathname of the file the window represents.
-		 */
-		getRepresentedFilename(): string;
-		/**
-		 * Specifies whether the window’s document has been edited, and the icon in
-		 * title bar will become grey when set to true.
-		 * Note: This API is available only on macOS.
-		 */
-		setDocumentEdited(edited: boolean): void;
-		/**
-		 * Note: This API is available only on macOS.
-		 * @returns Whether the window's document has been edited.
-		 */
-		isDocumentEdited(): boolean;
-		focusOnWebView(): void;
-		blurWebView(): void;
-		/**
-		 * Captures the snapshot of page within rect, upon completion the callback
-		 * will be called. Omitting the rect would capture the whole visible page.
-		 * Note: Be sure to read documents on remote buffer in remote if you are going
-		 * to use this API in renderer process.
-		 * @param callback Supplies the image that stores data of the snapshot.
-		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
-		/**
-		 * Captures the snapshot of page within rect, upon completion the callback
-		 * will be called. Omitting the rect would capture the whole visible page.
-		 * Note: Be sure to read documents on remote buffer in remote if you are going
-		 * to use this API in renderer process.
-		 * @param callback Supplies the image that stores data of the snapshot.
-		 */
-		capturePage(callback: (image: NativeImage) => void): void;
-		/**
-		 * Same as webContents.loadURL(url).
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * Same as webContents.reload.
-		 */
-		reload(): void;
-		/**
-		 * Sets the menu as the window top menu.
-		 * Note: This API is not available on macOS.
-		 */
-		setMenu(menu: Menu | null): void;
-		/**
-		 * Sets the progress value in the progress bar.
-		 * On Linux platform, only supports Unity desktop environment, you need to
-		 * specify the *.desktop file name to desktopName field in package.json.
-		 * By default, it will assume app.getName().desktop.
-		 * @param progress Valid range is [0, 1.0]. If < 0, the progress bar is removed.
-		 * If greater than 0, it becomes indeterminate.
-		 */
-		setProgressBar(progress: number, options?: {
-			/**
-			 * Mode for the progress bar.
-			 * Note: This is only implemented on Windows.
-			 */
-			mode: 'none' | 'normal' | 'indeterminate' | 'error' | 'paused'
-		}): void;
-		/**
-		 * Sets a 16px overlay onto the current Taskbar icon, usually used to convey
-		 * some sort of application status or to passively notify the user.
-		 * Note: This API is only available on Windows 7 or above.
-		 * @param overlay The icon to display on the bottom right corner of the Taskbar
-		 * icon. If this parameter is null, the overlay is cleared
-		 * @param description Provided to Accessibility screen readers.
-		 */
-		setOverlayIcon(overlay: NativeImage, description: string): void;
-		/**
-		 * Sets whether the window should have a shadow. On Windows and Linux does nothing.
-		 * Note: This API is available only on macOS.
-		 */
-		setHasShadow(hasShadow: boolean): void;
-		/**
-		 * Note: This API is available only on macOS.
-		 * @returns whether the window has a shadow. On Windows and Linux always returns true.
-		 */
-		hasShadow(): boolean;
-		/**
-		 * Add a thumbnail toolbar with a specified set of buttons to the thumbnail image
-		 * of a window in a taskbar button layout.
-		 * @returns Whether the thumbnail has been added successfully.
-		 *
-		 * Note: This API is available only on Windows.
-		 */
-		setThumbarButtons(buttons: ThumbarButton[]): boolean;
-		/**
-		 * Sets the region of the window to show as the thumbnail image displayed when hovering
-		 * over the window in the taskbar. You can reset the thumbnail to be the entire window
-		 * by specifying an empty region: {x: 0, y: 0, width: 0, height: 0}.
-		 *
-		 * Note: This API is available only on Windows.
-		 */
-		setThumbnailClip(region: Rectangle): boolean;
-		/**
-		 * Sets the toolTip that is displayed when hovering over the window thumbnail in the taskbar.
-		 * Note: This API is available only on Windows.
-		 */
-		setThumbnailToolTip(toolTip: string): boolean;
-		/**
-		 * Same as webContents.showDefinitionForSelection().
-		 * Note: This API is available only on macOS.
-		 */
-		showDefinitionForSelection(): void;
-		/**
-		 * Changes window icon.
-		 * Note: This API is not available on macOS.
-		 */
-		setIcon(icon: NativeImage): void;
-		/**
-		 * Sets whether the window menu bar should hide itself automatically. Once set
-		 * the menu bar will only show when users press the single Alt key.
-		 * If the menu bar is already visible, calling setAutoHideMenuBar(true) won't
-		 * hide it immediately.
-		 */
-		setAutoHideMenuBar(hide: boolean): void;
-		/**
-		 * @returns Whether menu bar automatically hides itself.
-		 */
-		isMenuBarAutoHide(): boolean;
-		/**
-		 * Sets whether the menu bar should be visible. If the menu bar is auto-hide,
-		 * users can still bring up the menu bar by pressing the single Alt key.
-		 */
-		setMenuBarVisibility(visibile: boolean): void;
-		/**
-		 * @returns Whether the menu bar is visible.
-		 */
-		isMenuBarVisible(): boolean;
-		/**
-		 * Sets whether the window should be visible on all workspaces.
-		 * Note: This API does nothing on Windows.
-		 */
-		setVisibleOnAllWorkspaces(visible: boolean): void;
-		/**
-		 * Note: This API always returns false on Windows.
-		 * @returns Whether the window is visible on all workspaces.
-		 */
-		isVisibleOnAllWorkspaces(): boolean;
-		/**
-		 * Makes the window ignore all mouse events.
-		 *
-		 * All mouse events happened in this window will be passed to the window below this window,
-		 * but if this window has focus, it will still receive keyboard events.
-		 */
-		setIgnoreMouseEvents(ignore: boolean): void;
-		/**
-		 * Prevents the window contents from being captured by other apps.
-		 *
-		 * On macOS it sets the NSWindow's sharingType to NSWindowSharingNone.
-		 * On Windows it calls SetWindowDisplayAffinity with WDA_MONITOR.
-		 */
-		setContentProtection(enable: boolean): void;
-		/**
-		 * Changes whether the window can be focused.
-		 * Note: This API is available only on Windows.
-		 */
-		setFocusable(focusable: boolean): void;
-		/**
-		 * Sets parent as current window's parent window,
-		 * passing null will turn current window into a top-level window.
-		 * Note: This API is not available on Windows.
-		 */
-		setParentWindow(parent: BrowserWindow): void;
-		/**
-		 * @returns The parent window.
-		 */
-		getParentWindow(): BrowserWindow;
-		/**
-		 * @returns All child windows.
-		 */
-		getChildWindows(): BrowserWindow[];
-		/**
-		 * Adds a vibrancy effect to the browser window. Passing null or
-		 * an empty string will remove the vibrancy effect on the window.
-		 *
-		 * Note: This API is available only on macOS.
-		 */
-		setVibrancy(type: VibrancyType): void;
-	}
-
-	type WindowLevel = 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver' | 'dock';
-	type SwipeDirection = 'up' | 'right' | 'down' | 'left';
-	type ThumbarButtonFlags = 'enabled' | 'disabled' | 'dismissonclick' | 'nobackground' | 'hidden' | 'noninteractive';
-
-	interface ThumbarButton {
-		icon: NativeImage | string;
-		click: Function;
-		tooltip?: string;
-		flags?: ThumbarButtonFlags[];
-	}
-
-	interface DevToolsExtensions {
-		[name: string]: {
-			name: string;
-			value: string;
-		}
-	}
-
-	interface WebPreferences {
-		/**
-		 * Whether to enable DevTools.
-		 * If it is set to false, can not use BrowserWindow.webContents.openDevTools() to open DevTools.
-		 * Default: true.
-		 */
-		devTools?: boolean;
-		/**
-		 * Whether node integration is enabled.
-		 * Default: true.
-		 */
-		nodeIntegration?: boolean;
-		/**
-		 * Specifies a script that will be loaded before other scripts run in the page.
-		 * This script will always have access to node APIs no matter whether node integration is turned on or off.
-		 * The value should be the absolute file path to the script.
-		 * When node integration is turned off, the preload script can reintroduce
-		 * Node global symbols back to the global scope.
-		 */
-		preload?: string;
-		/**
-		 * Sets the session used by the page. Instead of passing the Session object directly,
-		 * you can also choose to use the partition option instead, which accepts a partition string.
-		 * When both session and partition are provided, session would be preferred.
-		 * Default: the default session.
-		 */
-		session?: Session;
-		/**
-		 * Sets the session used by the page according to the session’s partition string.
-		 * If partition starts with persist:, the page will use a persistent session available
-		 * to all pages in the app with the same partition. if there is no persist: prefix,
-		 * the page will use an in-memory session. By assigning the same partition,
-		 * multiple pages can share the same session.
-		 * Default: the default session.
-		 */
-		partition?: string;
-		/**
-		 * The default zoom factor of the page, 3.0 represents 300%.
-		 * Default: 1.0.
-		 */
-		zoomFactor?: number;
-		/**
-		 * Enables JavaScript support.
-		 * Default: true.
-		 */
-		javascript?: boolean;
-		/**
-		 * When setting false, it will disable the same-origin policy (Usually using testing
-		 * websites by people), and set allowDisplayingInsecureContent and allowRunningInsecureContent
-		 * to true if these two options are not set by user.
-		 * Default: true.
-		 */
-		webSecurity?: boolean;
-		/**
-		 * Allow an https page to display content like images from http URLs.
-		 * Default: false.
-		 */
-		allowDisplayingInsecureContent?: boolean;
-		/**
-		 * Allow a https page to run JavaScript, CSS or plugins from http URLs.
-		 * Default: false.
-		 */
-		allowRunningInsecureContent?: boolean;
-		/**
-		 * Enables image support.
-		 * Default: true.
-		 */
-		images?: boolean;
-		/**
-		 * Make TextArea elements resizable.
-		 * Default: true.
-		 */
-		textAreasAreResizable?: boolean;
-		/**
-		 * Enables WebGL support.
-		 * Default: true.
-		 */
-		webgl?: boolean;
-		/**
-		 * Enables WebAudio support.
-		 * Default: true.
-		 */
-		webaudio?: boolean;
-		/**
-		 * Whether plugins should be enabled.
-		 * Default: false.
-		 */
-		plugins?: boolean;
-		/**
-		 * Enables Chromium’s experimental features.
-		 * Default: false.
-		 */
-		experimentalFeatures?: boolean;
-		/**
-		 * Enables Chromium’s experimental canvas features.
-		 * Default: false.
-		 */
-		experimentalCanvasFeatures?: boolean;
-		/**
-		 * Enables DirectWrite font rendering system on Windows.
-		 * Default: true.
-		 */
-		directWrite?: boolean;
-		/**
-		 * Enables scroll bounce (rubber banding) effect on macOS.
-		 * Default: false.
-		 */
-		scrollBounce?: boolean;
-		/**
-		 * A list of feature strings separated by ",", like CSSVariables,KeyboardEventKey to enable.
-		 */
-		blinkFeatures?: string;
-		/**
-		 * A list of feature strings separated by ",", like CSSVariables,KeyboardEventKey to disable.
-		 */
-		disableBlinkFeatures?: string;
-		/**
-		 * Sets the default font for the font-family.
-		 */
-		defaultFontFamily?: {
-			/**
-			 * Default: Times New Roman.
-			 */
-			standard?: string;
-			/**
-			 * Default: Times New Roman.
-			 */
-			serif?: string;
-			/**
-			 * Default: Arial.
-			 */
-			sansSerif?: string;
-			/**
-			 * Default: Courier New.
-			 */
-			monospace?: string;
-		};
-		/**
-		 * Default: 16.
-		 */
-		defaultFontSize?: number;
-		/**
-		 * Default: 13.
-		 */
-		defaultMonospaceFontSize?: number;
-		/**
-		 * Default: 0.
-		 */
-		minimumFontSize?: number;
-		/**
-		 * Default: ISO-8859-1.
-		 */
-		defaultEncoding?: string;
-		/**
-		 * Whether to throttle animations and timers when the page becomes background.
-		 * Default: true.
-		 */
-		backgroundThrottling?: boolean;
-		/**
-		 * Whether to enable offscreen rendering for the browser window.
-		 * Default: false.
-		 */
-		offscreen?: boolean;
-		/**
-		 * Whether to enable Chromium OS-level sandbox.
-		 * Default: false.
-		 */
-		sandbox?: boolean;
-	}
-
-	interface BrowserWindowOptions {
-		/**
-		 * Window’s width in pixels.
-		 * Default: 800.
-		 */
-		width?: number;
-		/**
-		 * Window’s height in pixels.
-		 * Default: 600.
-		 */
-		height?: number;
-		/**
-		 * Window’s left offset from screen.
-		 * Default: center the window.
-		 */
-		x?: number;
-		/**
-		 * Window’s top offset from screen.
-		 * Default: center the window.
-		 */
-		y?: number;
-		/**
-		 * The width and height would be used as web page’s size, which means
-		 * the actual window’s size will include window frame’s size and be slightly larger.
-		 * Default: false.
-		 */
-		useContentSize?: boolean;
-		/**
-		 * Show window in the center of the screen.
-		 * Default: true
-		 */
-		center?: boolean;
-		/**
-		 * Window’s minimum width.
-		 * Default: 0.
-		 */
-		minWidth?: number;
-		/**
-		 * Window’s minimum height.
-		 * Default: 0.
-		 */
-		minHeight?: number;
-		/**
-		 * Window’s maximum width.
-		 * Default: no limit.
-		 */
-		maxWidth?: number;
-		/**
-		 * Window’s maximum height.
-		 * Default: no limit.
-		 */
-		maxHeight?: number;
-		/**
-		 * Whether window is resizable.
-		 * Default: true.
-		 */
-		resizable?: boolean;
-		/**
-		 * Whether window is movable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		movable?: boolean;
-		/**
-		 * Whether window is minimizable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		minimizable?: boolean;
-		/**
-		 * Whether window is maximizable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		maximizable?: boolean;
-		/**
-		 * Whether window is closable.
-		 * Note: This is not implemented on Linux.
-		 * Default: true.
-		 */
-		closable?: boolean;
-		/**
-		 * Whether the window can be focused.
-		 * On Windows setting focusable: false also implies setting skipTaskbar: true.
-		 * On Linux setting focusable: false makes the window stop interacting with wm,
-		 * so the window will always stay on top in all workspaces.
-		 * Default: true.
-		 */
-		focusable?: boolean;
-		/**
-		 * Whether the window should always stay on top of other windows.
-		 * Default: false.
-		 */
-		alwaysOnTop?: boolean;
-		/**
-		 * Whether the window should show in fullscreen.
-		 * When explicitly set to false the fullscreen button will be hidden or disabled on macOS.
-		 * Default: false.
-		 */
-		fullscreen?: boolean;
-		/**
-		 * Whether the window can be put into fullscreen mode.
-		 * On macOS, also whether the maximize/zoom button should toggle full screen mode or maximize window.
-		 * Default: true.
-		 */
-		fullscreenable?: boolean;
-		/**
-		 * Whether to show the window in taskbar.
-		 * Default: false.
-		 */
-		skipTaskbar?: boolean;
-		/**
-		 * The kiosk mode.
-		 * Default: false.
-		 */
-		kiosk?: boolean;
-		/**
-		 * Default window title.
-		 * Default: "Electron".
-		 */
-		title?: string;
-		/**
-		 * The window icon, when omitted on Windows the executable’s icon would be used as window icon.
-		 */
-		icon?: NativeImage|string;
-		/**
-		 * Whether window should be shown when created.
-		 * Default: true.
-		 */
-		show?: boolean;
-		/**
-		 * Specify false to create a Frameless Window.
-		 * Default: true.
-		 */
-		frame?: boolean;
-		/**
-		 * Specify parent window.
-		 * Default: null.
-		 */
-		parent?: BrowserWindow;
-		/**
-		 * Whether this is a modal window. This only works when the window is a child window.
-		 * Default: false.
-		 */
-		modal?: boolean;
-		/**
-		 * Whether the web view accepts a single mouse-down event that simultaneously activates the window.
-		 * Default: false.
-		 */
-		acceptFirstMouse?: boolean;
-		/**
-		 * Whether to hide cursor when typing.
-		 * Default: false.
-		 */
-		disableAutoHideCursor?: boolean;
-		/**
-		 * Auto hide the menu bar unless the Alt key is pressed.
-		 * Default: true.
-		 */
-		autoHideMenuBar?: boolean;
-		/**
-		 * Enable the window to be resized larger than screen.
-		 * Default: false.
-		 */
-		enableLargerThanScreen?: boolean;
-		/**
-		 * Window’s background color as Hexadecimal value, like #66CD00 or #FFF or #80FFFFFF (alpha is supported).
-		 * Default: #FFF (white).
-		 */
-		backgroundColor?: string;
-		/**
-		 * Whether window should have a shadow.
-		 * Note: This is only implemented on macOS.
-		 * Default: true.
-		 */
-		hasShadow?: boolean;
-		/**
-		 * Forces using dark theme for the window.
-		 * Note: Only works on some GTK+3 desktop environments.
-		 * Default: false.
-		 */
-		darkTheme?: boolean;
-		/**
-		 * Makes the window transparent.
-		 * Default: false.
-		 */
-		transparent?: boolean;
-		/**
-		 * The type of window, default is normal window.
-		 */
-		type?: BrowserWindowType;
-		/**
-		 * The style of window title bar.
-		 */
-		titleBarStyle?: 'default' | 'hidden' | 'hidden-inset';
-		/**
-		 * Use WS_THICKFRAME style for frameless windows on Windows
-		 */
-		thickFrame?: boolean;
-		/**
-		 * Add a type of vibrancy effect to the window, only on macOS
-		 */
-		vibrancy?: VibrancyType;
-		/**
-		 * Settings of web page’s features.
-		 */
-		webPreferences?: WebPreferences;
-	}
-
-	type BrowserWindowType = BrowserWindowTypeLinux | BrowserWindowTypeMac | BrowserWindowTypeWindows;
-	type BrowserWindowTypeLinux = 'desktop' | 'dock' | 'toolbar' | 'splash' | 'notification';
-	type BrowserWindowTypeMac = 'desktop' | 'textured';
-	type BrowserWindowTypeWindows = 'toolbar';
-
-	// https://github.com/electron/electron/blob/master/docs/api/clipboard.md
-
-	/**
-	 * The clipboard module provides methods to perform copy and paste operations.
-	 */
-	interface Clipboard {
-		/**
-		 * @returns The contents of the clipboard as plain text.
-		 */
-		readText(type?: ClipboardType): string;
-		/**
-		 * Writes the text into the clipboard as plain text.
-		 */
-		writeText(text: string, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as markup.
-		 */
-		readHTML(type?: ClipboardType): string;
-		/**
-		 * Writes markup to the clipboard.
-		 */
-		writeHTML(markup: string, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as a NativeImage.
-		 */
-		readImage(type?: ClipboardType): NativeImage;
-		/**
-		 * Writes the image into the clipboard.
-		 */
-		writeImage(image: NativeImage, type?: ClipboardType): void;
-		/**
-		 * @returns The contents of the clipboard as RTF.
-		 */
-		readRTF(type?: ClipboardType): string;
-		/**
-		 * Writes the text into the clipboard in RTF.
-		 */
-		writeRTF(text: string, type?: ClipboardType): void;
-		/**
-		 * Clears everything in clipboard.
-		 */
-		clear(type?: ClipboardType): void;
-		/**
-		 * @returns Array available formats for the clipboard type.
-		 */
-		availableFormats(type?: ClipboardType): string[];
-		/**
-		 * Returns whether the clipboard supports the format of specified data.
-		 * Note: This API is experimental and could be removed in future.
-		 * @returns Whether the clipboard has data in the specified format.
-		 */
-		has(format: string, type?: ClipboardType): boolean;
-		/**
-		 * Reads the data in the clipboard of the specified format.
-		 * Note: This API is experimental and could be removed in future.
-		 */
-		read(format: string, type?: ClipboardType): string | NativeImage;
-		/**
-		 * Writes data to the clipboard.
-		 */
-		write(data: { text: string; bookmark?: string; } | { rtf: string; } | { html: string; } | { image: NativeImage; }, type?: ClipboardType): void;
-		/**
-		 * @returns An Object containing title and url keys representing the bookmark in the clipboard.
-		 *
-		 * Note: This API is available on macOS and Windows.
-		 */
-		readBookmark(): Bookmark;
-		/**
-		 * Writes the title and url into the clipboard as a bookmark.
-		 *
-		 * Note: This API is available on macOS and Windows.
-		 */
-		writeBookmark(title: string, url: string, type?: ClipboardType): void;
-		/**
-		 * The text on the find pasteboard. This method uses synchronous IPC when called from the renderer process.
-		 * The cached value is reread from the find pasteboard whenever the application is activated.
-		 *
-		 * Note: This API is available on macOS.
-		 */
-		readFindText(): string;
-		/**
-		 * Writes the text into the find pasteboard as plain text.
-		 * This method uses synchronous IPC when called from the renderer process.
-		 *
-		 * Note: This API is available on macOS.
-		 */
-		writeFindText(text: string): void;
-	}
-
-	type ClipboardType = '' | 'selection';
-
-	interface Bookmark {
-		title: string;
-		url: string;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/content-tracing.md
-
-	/**
-	 * The content-tracing module is used to collect tracing data generated by the underlying Chromium content module.
-	 * This module does not include a web interface so you need to open chrome://tracing/
-	 * in a Chrome browser and load the generated file to view the result.
-	 */
-	interface ContentTracing {
-		/**
-		 * Get a set of category groups. The category groups can change as new code paths are reached.
-		 *
-		 * @param callback Called once all child processes have acknowledged the getCategories request.
-		 */
-		getCategories(callback: (categoryGroups: string[]) => void): void;
-		/**
-		 * Start recording on all processes. Recording begins immediately locally and asynchronously
-		 * on child processes as soon as they receive the EnableRecording request.
-		 *
-		 * @param callback Called once all child processes have acknowledged the startRecording request.
-		 */
-		startRecording(options: ContentTracingOptions, callback: Function): void;
-		/**
-		 * Stop recording on all processes. Child processes typically are caching trace data and
-		 * only rarely flush and send trace data back to the main process. That is because it may
-		 * be an expensive operation to send the trace data over IPC, and we would like to avoid
-		 * much runtime overhead of tracing. So, to end tracing, we must asynchronously ask all
-		 * child processes to flush any pending trace data.
-		 *
-		 * @param resultFilePath Trace data will be written into this file if it is not empty,
-		 * or into a temporary file.
-		 * @param callback Called once all child processes have acknowledged the stopRecording request.
-		 */
-		stopRecording(resultFilePath: string, callback: (filePath: string) => void): void;
-		/**
-		 * Start monitoring on all processes. Monitoring begins immediately locally and asynchronously
-		 * on child processes as soon as they receive the startMonitoring request.
-		 *
-		 * @param callback Called once all child processes have acked to the startMonitoring request.
-		 */
-		startMonitoring(options: ContentTracingOptions, callback: Function): void;
-		/**
-		 * Stop monitoring on all processes.
-		 *
-		 * @param callback Called once all child processes have acknowledged the stopMonitoring request.
-		 */
-		stopMonitoring(callback: Function): void;
-		/**
-		 * Get the current monitoring traced data. Child processes typically are caching trace data
-		 * and only rarely flush and send trace data back to the main process. That is because it may
-		 * be an expensive operation to send the trace data over IPC, and we would like to avoid much
-		 * runtime overhead of tracing. So, to end tracing, we must asynchronously ask all child
-		 * processes to flush any pending trace data.
-		 *
-		 * @param callback Called once all child processes have acknowledged the captureMonitoringSnapshot request.
-		 */
-		captureMonitoringSnapshot(resultFilePath: string, callback: (filePath: string) => void): void;
-		/**
-		 * Get the maximum usage across processes of trace buffer as a percentage of the full state.
-		 *
-		 * @param callback Called when the TraceBufferUsage value is determined.
-		 */
-		getTraceBufferUsage(callback: Function): void;
-		/**
-		 * @param callback Called every time the given event occurs on any process.
-		 */
-		setWatchEvent(categoryName: string, eventName: string, callback: Function): void;
-		/**
-		 * Cancel the watch event. This may lead to a race condition with the watch event callback if tracing is enabled.
-		 */
-		cancelWatchEvent(): void;
-	}
-
-	interface ContentTracingOptions {
-		/**
-		 * Filter to control what category groups should be traced.
-		 * A filter can have an optional - prefix to exclude category groups
-		 * that contain a matching category. Having both included and excluded
-		 * category patterns in the same list is not supported.
-		 *
-		 * Examples:
-		 *   test_MyTest*
-		 *   test_MyTest*,test_OtherStuff
-		 *   -excluded_category1,-excluded_category2
-		 */
-		categoryFilter: string;
-		/**
-		 * Controls what kind of tracing is enabled, it is a comma-delimited list.
-		 *
-		 * Possible options are:
-		 *   record-until-full
-		 *   record-continuously
-		 *   trace-to-console
-		 *   enable-sampling
-		 *   enable-systrace
-		 *
-		 * The first 3 options are trace recoding modes and hence mutually exclusive.
-		 * If more than one trace recording modes appear in the traceOptions string,
-		 * the last one takes precedence. If none of the trace recording modes are specified,
-		 * recording mode is record-until-full.
-		 *
-		 * The trace option will first be reset to the default option (record_mode set
-		 * to record-until-full, enable_sampling and enable_systrace set to false)
-		 * before options parsed from traceOptions are applied on it.
-		 */
-		traceOptions: string;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/crash-reporter.md
-
-	/**
-	 * The crash-reporter module enables sending your app's crash reports.
-	 */
-	interface CrashReporter {
-		/**
-		 * You are required to call this method before using other crashReporter APIs.
-		 *
-		 * Note: On macOS, Electron uses a new crashpad client, which is different from breakpad
-		 * on Windows and Linux. To enable the crash collection feature, you are required to call
-		 * the crashReporter.start API to initialize crashpad in the main process and in each
-		 * renderer process from which you wish to collect crash reports.
-		 */
-		start(options: CrashReporterStartOptions): void;
-		/**
-		 * @returns The crash report. When there was no crash report
-		 * sent or the crash reporter is not started, null will be returned.
-		 */
-		getLastCrashReport(): CrashReport;
-		/**
-		 * @returns All uploaded crash reports.
-		 */
-		getUploadedReports(): CrashReport[];
-	}
-
-	interface CrashReporterStartOptions {
-		/**
-		 * Default: app.getName()
-		 */
-		productName?: string;
-		companyName: string;
-		/**
-		 * URL that crash reports would be sent to as POST.
-		 */
-		submitURL: string;
-		/**
-		 * Send the crash report without user interaction.
-		 * Default: true.
-		 */
-		autoSubmit?: boolean;
-		/**
-		 * Default: false.
-		 */
-		ignoreSystemCrashHandler?: boolean;
-		/**
-		 * An object you can define that will be sent along with the report.
-		 * Only string properties are sent correctly, nested objects are not supported.
-		 */
-		extra?: {[prop: string]: string};
-	}
-
-	interface CrashReport {
-		id: string;
-		date: Date;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/desktop-capturer.md
-
-	/**
-	 * The desktopCapturer module can be used to get available sources
-	 * that can be used to be captured with getUserMedia.
-	 */
-	interface DesktopCapturer {
-		/**
-		 * Starts a request to get all desktop sources.
-		 *
-		 * Note: There is no guarantee that the size of source.thumbnail is always
-		 * the same as the thumnbailSize in options. It also depends on the scale of the screen or window.
-		 */
-		getSources(options: DesktopCapturerOptions, callback: (error: Error, sources: DesktopCapturerSource[]) => any): void;
-	}
-
-	interface DesktopCapturerOptions {
-		/**
-		 * The types of desktop sources to be captured.
-		 */
-		types?: ('screen' | 'window')[];
-		/**
-		 * The suggested size that thumbnail should be scaled.
-		 * Default: {width: 150, height: 150}
-		 */
-		thumbnailSize?: Size;
-	}
-
-	interface DesktopCapturerSource {
-		/**
-		 * The id of the captured window or screen used in navigator.webkitGetUserMedia.
-		 * The format looks like window:XX or screen:XX where XX is a random generated number.
-		 */
-		id: string;
-		/**
-		 * The described name of the capturing screen or window.
-		 * If the source is a screen, the name will be Entire Screen or Screen <index>;
-		 * if it is a window, the name will be the window’s title.
-		 */
-		name: string;
-		/**
-		 * A thumbnail image.
-		 */
-		thumbnail: NativeImage;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/dialog.md
-
-	/**
-	 * The dialog module provides APIs to show native system dialogs, such as opening files or alerting,
-	 * so web applications can deliver the same user experience as native applications.
-	 */
-	interface Dialog {
-		/**
-		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
-		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
-		 *
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns an array of file paths chosen by the user,
-		 * otherwise returns undefined.
-		 */
-		showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
-		/**
-		 * Note: On Windows and Linux an open dialog can not be both a file selector and a directory selector,
-		 * so if you set properties to ['openFile', 'openDirectory'] on these platforms, a directory selector will be shown.
-		 *
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns an array of file paths chosen by the user,
-		 * otherwise returns undefined.
-		 */
-		showOpenDialog(options: OpenDialogOptions, callback?: (fileNames: string[]) => void): string[];
-		/**
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns the path of file chosen by the user, otherwise
-		 * returns undefined.
-		 */
-		showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions, callback?: (fileName: string) => void): string;
-		/**
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns On success, returns the path of file chosen by the user, otherwise
-		 * returns undefined.
-		 */
-		showSaveDialog(options: SaveDialogOptions, callback?: (fileName: string) => void): string;
-		/**
-		 * Shows a message box. It will block until the message box is closed.
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns The index of the clicked button.
-		 */
-		showMessageBox(browserWindow: BrowserWindow, options: ShowMessageBoxOptions, callback?: (response: number) => void): number;
-		/**
-		 * Shows a message box. It will block until the message box is closed.
-		 * @param callback If supplied, the API call will be asynchronous.
-		 * @returns The index of the clicked button.
-		 */
-		showMessageBox(options: ShowMessageBoxOptions, callback?: (response: number) => void): number;
-		/**
-		 * Displays a modal dialog that shows an error message.
-		 *
-		 * This API can be called safely before the ready event the app module emits,
-		 * it is usually used to report errors in early stage of startup.
-		 * If called before the app readyevent on Linux, the message will be emitted to stderr,
-		 * and no GUI dialog will appear.
-		 */
-		showErrorBox(title: string, content: string): void;
-	}
-
-	interface OpenDialogOptions {
-		title?: string;
-		defaultPath?: string;
-		/**
-		 * Custom label for the confirmation button, when left empty the default label will be used.
-		 */
-		buttonLabel?: string;
-		/**
-		 * File types that can be displayed or selected.
-		 */
-		filters?: {
-			name: string;
-			/**
-			 * Extensions without wildcards or dots (e.g. 'png' is good but '.png' and '*.png' are bad).
-			 * To show all files, use the '*' wildcard (no other wildcard is supported).
-			 */
-			extensions: string[];
-		}[];
-		/**
-		 * Contains which features the dialog should use.
-		 */
-		properties?: ('openFile' | 'openDirectory' | 'multiSelections' | 'createDirectory' | 'showHiddenFiles' | 'promptToCreate' | 'noResolveAliases')[];
-		/**
-		 * Normalize the keyboard access keys across platforms.
-		 */
-		normalizeAccessKeys?: boolean;
-		/**
-		 * Message to display above input boxes.
-		 */
-		message?: string;
-	}
-
-	interface SaveDialogOptions {
-		title?: string;
-		defaultPath?: string;
-		/**
-		 * Custom label for the confirmation button, when left empty the default label will be used.
-		 */
-		buttonLabel?: string;
-		/**
-		 * File types that can be displayed, see dialog.showOpenDialog for an example.
-		 */
-		filters?: {
-			name: string;
-			extensions: string[];
-		}[];
-		/**
-		 * macOS - Message to display above text fields.
-		 */
-		message?: string;
-		/**
-		 * macOS - Custom label for the text displayed in front of the filename text field.
-		 */
-		nameFieldLabel?: string;
-		/**
-		 * macOS - Show the tags input box, defaults to true.
-		 */
-		showsTagField?: boolean;
-	}
-
-	interface ShowMessageBoxOptions {
-		/**
-		 * On Windows, "question" displays the same icon as "info", unless you set an icon using the "icon" option.
-		 */
-		type?: 'none' | 'info' | 'error' | 'question' | 'warning';
-		/**
-		 * Texts for buttons. On Windows, an empty array will result in one button labeled "OK".
-		 */
-		buttons?: string[];
-		/**
-		 * Index of the button in the buttons array which will be selected by default when the message box opens.
-		 */
-		defaultId?: number;
-		/**
-		 * Title of the message box (some platforms will not show it).
-		 */
-		title?: string;
-		/**
-		 * Contents of the message box.
-		 */
-		message?: string;
-		/**
-		 * Extra information of the message.
-		 */
-		detail?: string;
-		icon?: NativeImage;
-		/**
-		 * The value will be returned when user cancels the dialog instead of clicking the buttons of the dialog.
-		 * By default it is the index of the buttons that have "cancel" or "no" as label,
-		 * or 0 if there is no such buttons. On macOS and Windows the index of "Cancel" button
-		 * will always be used as cancelId, not matter whether it is already specified.
-		 */
-		cancelId?: number;
-		/**
-		 * On Windows Electron will try to figure out which one of the buttons are common buttons
-		 * (like "Cancel" or "Yes"), and show the others as command links in the dialog.
-		 * This can make the dialog appear in the style of modern Windows apps.
-		 * If you don’t like this behavior, you can set noLink to true.
-		 */
-		noLink?: boolean;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/download-item.md
-
-	/**
-	 * DownloadItem represents a download item in Electron.
-	 */
-	interface DownloadItem extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the download has been updated and is not done.
-		 */
-		on(event: 'updated', listener: (event: Event, state: 'progressing' | 'interrupted') => void): this;
-		/**
-		 * Emits when the download is in a terminal state. This includes a completed download,
-		 * a cancelled download (via downloadItem.cancel()), and interrupted download that can’t be resumed.
-		 */
-		on(event: 'done', listener: (event: Event, state: 'completed' | 'cancelled' | 'interrupted') => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Set the save file path of the download item.
-		 * Note: The API is only available in session’s will-download callback function.
-		 * If user doesn’t set the save path via the API, Electron will use the original
-		 * routine to determine the save path (Usually prompts a save dialog).
-		 */
-		setSavePath(path: string): void;
-		/**
-		 * @returns The save path of the download item.
-		 * This will be either the path set via downloadItem.setSavePath(path) or the path selected from the shown save dialog.
-		 */
-		getSavePath(): string;
-		/**
-		 * Pauses the download.
-		 */
-		pause(): void;
-		/**
-		 * @returns Whether the download is paused.
-		 */
-		isPaused(): boolean;
-		/**
-		 * Resumes the download that has been paused.
-		 */
-		resume(): void;
-		/**
-		 * @returns Whether the download can resume.
-		 */
-		canResume(): boolean;
-		/**
-		 * Cancels the download operation.
-		 */
-		cancel(): void;
-		/**
-		 * @returns The origin url where the item is downloaded from.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The mime type.
-		 */
-		getMimeType(): string;
-		/**
-		 * @returns Whether the download has user gesture.
-		 */
-		hasUserGesture(): boolean;
-		/**
-		 * @returns The file name of the download item.
-		 * Note: The file name is not always the same as the actual one saved in local disk.
-		 * If user changes the file name in a prompted download saving dialog,
-		 * the actual name of saved file will be different.
-		 */
-		getFilename(): string;
-		/**
-		 * @returns The total size in bytes of the download item. If the size is unknown, it returns 0.
-		 */
-		getTotalBytes(): number;
-		/**
-		 * @returns The received bytes of the download item.
-		 */
-		getReceivedBytes(): number;
-		/**
-		 * @returns The Content-Disposition field from the response header.
-		 */
-		getContentDisposition(): string;
-		/**
-		 * @returns The current state.
-		 */
-		getState(): 'progressing' | 'completed' | 'cancelled' | 'interrupted';
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/global-shortcut.md
-
-	/**
-	 * The globalShortcut module can register/unregister a global keyboard shortcut
-	 * with the operating system so that you can customize the operations for various shortcuts.
-	 * Note: The shortcut is global; it will work even if the app does not have the keyboard focus.
-	 * You should not use this module until the ready event of the app module is emitted.
-	 */
-	interface GlobalShortcut {
-		/**
-		 * Registers a global shortcut of accelerator.
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 * @param callback Called when the registered shortcut is pressed by the user.
-		 */
-		register(accelerator: string, callback: Function): void;
-		/**
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 * @returns Whether the accelerator is registered.
-		 */
-		isRegistered(accelerator: string): boolean;
-		/**
-		 * Unregisters the global shortcut of keycode.
-		 * @param accelerator Represents a keyboard shortcut. It can contain modifiers
-		 * and key codes, combined by the "+" character.
-		 */
-		unregister(accelerator: string): void;
-		/**
-		 * Unregisters all the global shortcuts.
-		 */
-		unregisterAll(): void;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/ipc-main.md
-
-	/**
-	 * The ipcMain module handles asynchronous and synchronous messages
-	 * sent from a renderer process (web page).
-	 * Messages sent from a renderer will be emitted to this module.
-	 */
-	interface IpcMain extends NodeJS.EventEmitter {
-		addListener(channel: string, listener: IpcMainEventListener): this;
-		on(channel: string, listener: IpcMainEventListener): this;
-		once(channel: string, listener: IpcMainEventListener): this;
-		removeListener(channel: string, listener: IpcMainEventListener): this;
-		removeAllListeners(channel?: string): this;
-	}
-
-	type IpcMainEventListener = (event: IpcMainEvent, ...args: any[]) => void;
-
-	interface IpcMainEvent {
-		/**
-		 * Set this to the value to be returned in a synchronous message.
-		 */
-		returnValue?: any;
-		/**
-		 * Returns the webContents that sent the message, you can call sender.send
-		 * to reply to the asynchronous message.
-		 */
-		sender: WebContents;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/ipc-renderer.md
-
-	/**
-	 * The ipcRenderer module provides a few methods so you can send synchronous
-	 * and asynchronous messages from the render process (web page) to the main process.
-	 * You can also receive replies from the main process.
-	 */
-	interface IpcRenderer extends NodeJS.EventEmitter {
-		addListener(channel: string, listener: IpcRendererEventListener): this;
-		on(channel: string, listener: IpcRendererEventListener): this;
-		once(channel: string, listener: IpcRendererEventListener): this;
-		removeListener(channel: string, listener: IpcRendererEventListener): this;
-		removeAllListeners(channel?: string): this;
-		/**
-		 * Send ...args to the renderer via channel in asynchronous message, the main
-		 * process can handle it by listening to the channel event of ipc module.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Send ...args to the renderer via channel in synchronous message, and returns
-		 * the result sent from main process. The main process can handle it by listening
-		 * to the channel event of ipc module, and returns by setting event.returnValue.
-		 * Note: Usually developers should never use this API, since sending synchronous
-		 * message would block the whole renderer process.
-		 * @returns The result sent from the main process.
-		 */
-		sendSync(channel: string, ...args: any[]): any;
-		/**
-		 * Like ipc.send but the message will be sent to the host page instead of the main process.
-		 * This is mainly used by the page in <webview> to communicate with host page.
-		 */
-		sendToHost(channel: string, ...args: any[]): void;
-	}
-
-	type IpcRendererEventListener = (event: IpcRendererEvent, ...args: any[]) => void;
-
-	interface IpcRendererEvent {
-		/**
-		 * You can call sender.send to reply to the asynchronous message.
-		 */
-		sender: IpcRenderer;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/menu-item.md
-	// https://github.com/electron/electron/blob/master/docs/api/accelerator.md
-
-	/**
-	 * The MenuItem allows you to add items to an application or context menu.
-	 */
-	class MenuItem {
-		/**
-		 * Create a new menu item.
-		 */
-		constructor(options: MenuItemOptions);
-
-		/**
-		 * A function that is fired when the MenuItem receives a click event
-		 */
-		click: (event: Event, browserWindow: BrowserWindow, webContents: WebContents) => void;
-
-		/**
-		 * Read-only property.
-		 */
-		type: MenuItemType;
-		/**
-		 * Read-only property.
-		 */
-		role: MenuItemRole | MenuItemRoleMac;
-		/**
-		 * Read-only property.
-		 */
-		accelerator: string;
-		/**
-		 * Read-only property.
-		 */
-		icon: NativeImage | string;
-		/**
-		 * Read-only property.
-		 */
-		submenu: Menu | MenuItemOptions[];
-
-		label: string;
-		sublabel: string;
-		enabled: boolean;
-		visible: boolean;
-		checked: boolean;
-	}
-
-	type MenuItemType = 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio';
-	type MenuItemRole = 'undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteandmatchstyle' | 'selectall' | 'delete' | 'minimize' | 'close' | 'quit' | 'togglefullscreen' | 'resetzoom' | 'zoomin' | 'zoomout' | 'editMenu' | 'windowMenu' | 'reload' | 'forcereload' | 'toggledevtools';
-	type MenuItemRoleMac = 'about' | 'hide' | 'hideothers' | 'unhide' | 'startspeaking' | 'stopspeaking' | 'front' | 'zoom' | 'window' | 'help' | 'services';
-
-	interface MenuItemOptions {
-		/**
-		 * Callback when the menu item is clicked.
-		 */
-		click?: (menuItem: MenuItem, browserWindow: BrowserWindow, event: Event) => void;
-		/**
-		 * Can be normal, separator, submenu, checkbox or radio.
-		 */
-		type?: MenuItemType;
-		label?: string;
-		sublabel?: string;
-		/**
-		 * An accelerator is string that represents a keyboard shortcut, it can contain
-		 * multiple modifiers and key codes, combined by the + character.
-		 *
-		 * Examples:
-		 *   CommandOrControl+A
-		 *   CommandOrControl+Shift+Z
-		 *
-		 * Platform notice:
-		 *   On Linux and Windows, the Command key would not have any effect,
-		 *   you can use CommandOrControl which represents Command on macOS and Control on
-		 *   Linux and Windows to define some accelerators.
-		 *
-		 *   Use Alt instead of Option. The Option key only exists on macOS, whereas
-		 *   the Alt key is available on all platforms.
-		 *
-		 *   The Super key is mapped to the Windows key on Windows and Linux and Cmd on macOS.
-		 *
-		 * Available modifiers:
-		 *   Command (or Cmd for short)
-		 *   Control (or Ctrl for short)
-		 *   CommandOrControl (or CmdOrCtrl for short)
-		 *   Alt
-		 *   Option
-		 *   AltGr
-		 *   Shift
-		 *   Super
-		 *
-		 * Available key codes:
-		 *   0 to 9
-		 *   A to Z
-		 *   F1 to F24
-		 *   Punctuations like ~, !, @, #, $, etc.
-		 *   Plus
-		 *   Space
-		 *   Tab
-		 *   Backspace
-		 *   Delete
-		 *   Insert
-		 *   Return (or Enter as alias)
-		 *   Up, Down, Left and Right
-		 *   Home and End
-		 *   PageUp and PageDown
-		 *   Escape (or Esc for short)
-		 *   VolumeUp, VolumeDown and VolumeMute
-		 *   MediaNextTrack, MediaPreviousTrack, MediaStop and MediaPlayPause
-		 *   PrintScreen
-		 */
-		accelerator?: string;
-		/**
-		 * In Electron for the APIs that take images, you can pass either file paths
-		 * or NativeImage instances. When passing null, an empty image will be used.
-		 */
-		icon?: NativeImage|string;
-		/**
-		 * If false, the menu item will be greyed out and unclickable.
-		 */
-		enabled?: boolean;
-		/**
-		 * If false, the menu item will be entirely hidden.
-		 */
-		visible?: boolean;
-		/**
-		 * Should only be specified for 'checkbox' or 'radio' type menu items.
-		 */
-		checked?: boolean;
-		/**
-		 * Should be specified for submenu type menu item, when it's specified the
-		 * type: 'submenu' can be omitted for the menu item
-		 */
-		submenu?: Menu|MenuItemOptions[];
-		/**
-		 * Unique within a single menu. If defined then it can be used as a reference
-		 * to this item by the position attribute.
-		 */
-		id?: string;
-		/**
-		 * This field allows fine-grained definition of the specific location within
-		 * a given menu.
-		 */
-		position?: string;
-		/**
-		 * Define the action of the menu item, when specified the click property will be ignored
-		 */
-		role?: MenuItemRole | MenuItemRoleMac;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/menu.md
-
-	/**
-	 * The Menu class is used to create native menus that can be used as application
-	 * menus and context menus. This module is a main process module which can be used
-	 * in a render process via the remote module.
-	 *
-	 * Each menu consists of multiple menu items, and each menu item can have a submenu.
-	 */
-	class Menu extends NodeJS.EventEmitter {
-		/**
-		 * Creates a new menu.
-		 */
-		constructor();
-		/**
-		 * Sets menu as the application menu on macOS. On Windows and Linux, the
-		 * menu will be set as each window's top menu.
-		 *
-		 * Passing null will remove the menu bar on Windows and Linux but has no
-		 * effect on macOS.
-		 */
-		static setApplicationMenu(menu: Menu | null): void;
-		/**
-		 * @returns The application menu if set, or null if not set.
-		 */
-		static getApplicationMenu(): Menu | null;
-		/**
-		 * Sends the action to the first responder of application.
-		 * This is used for emulating default Cocoa menu behaviors,
-		 * usually you would just use the role property of MenuItem.
-		 *
-		 * Note: This method is macOS only.
-		 */
-		static sendActionToFirstResponder(action: string): void;
-		/**
-		 * @param template Generally, just an array of options for constructing MenuItem.
-		 * You can also attach other fields to element of the template, and they will
-		 * become properties of the constructed menu items.
-		 */
-		static buildFromTemplate(template: MenuItemOptions[]): Menu;
-		/**
-		 * Pops up this menu as a context menu in the browserWindow. You can optionally
-		 * provide a (x,y) coordinate to place the menu at, otherwise it will be placed
-		 * at the current mouse cursor position.
-		 * @param x Horizontal coordinate where the menu will be placed.
-		 * @param y Vertical coordinate where the menu will be placed.
-		 */
-		popup(browserWindow?: BrowserWindow, x?: number, y?: number): void;
-		/**
-		 * Appends the menuItem to the menu.
-		 */
-		append(menuItem: MenuItem): void;
-		/**
-		 * Inserts the menuItem to the pos position of the menu.
-		 */
-		insert(position: number, menuItem: MenuItem): void;
-		/**
-		 * @returns an array containing the menu’s items.
-		 */
-		items: MenuItem[];
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/native-image.md
-
-	/**
-	 * This class is used to represent an image.
-	 */
-	class NativeImage {
-		/**
-		 * Creates an empty NativeImage instance.
-		 */
-		static createEmpty(): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from file located at path.
-		 * This method returns an empty image if the path does not exist, cannot be read, or is not a valid image.
-		 */
-		static createFromPath(path: string): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from buffer.
-		 * @param scaleFactor 1.0 by default.
-		 */
-		static createFromBuffer(buffer: Buffer, scaleFactor?: number): NativeImage;
-		/**
-		 * Creates a new NativeImage instance from dataURL
-		 */
-		static createFromDataURL(dataURL: string): NativeImage;
-		/**
-		 * @returns Buffer that contains the image's PNG encoded data.
-		 */
-		toPNG(): Buffer;
-		/**
-		 * @returns Buffer that contains the image's JPEG encoded data.
-		 */
-		toJPEG(quality: number): Buffer;
-		/**
-		 * @returns Buffer that contains a copy of the image's raw bitmap pixel data.
-		 */
-		toBitmap(): Buffer;
-		/**
-		 * @returns Buffer that contains the image's raw bitmap pixel data.
-		 *
-		 * The difference between getBitmap() and toBitmap() is, getBitmap() does not copy the bitmap data,
-		 * so you have to use the returned Buffer immediately in current event loop tick,
-		 * otherwise the data might be changed or destroyed.
-		 */
-		getBitmap(): Buffer;
-		/**
-		 * @returns The data URL of the image.
-		 */
-		toDataURL(): string;
-		/**
-		 * The native type of the handle is NSImage* on macOS.
-		 * Note: This is only implemented on macOS.
-		 * @returns The platform-specific handle of the image as Buffer.
-		 */
-		getNativeHandle(): Buffer;
-		/**
-		 * @returns Whether the image is empty.
-		 */
-		isEmpty(): boolean;
-		/**
-		 * @returns The size of the image.
-		 */
-		getSize(): Size;
-		/**
-		 * Marks the image as template image.
-		 */
-		setTemplateImage(option: boolean): void;
-		/**
-		 * Returns a boolean whether the image is a template image.
-		 */
-		isTemplateImage(): boolean;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/net.md
-
-	/**
-	 * The net module is a client-side API for issuing HTTP(S) requests.
-	 * It is similar to the HTTP and HTTPS modules of Node.js but uses Chromium’s native
-	 * networking library instead of the Node.js implementation, offering better support
-	 * for web proxies.
-	 * The following is a non-exhaustive list of why you may consider using the net module
-	 * instead of the native Node.js modules:
-	 * - Automatic management of system proxy configuration, support of the wpad protocol
-	 * and proxy pac configuration files.
-	 * - Automatic tunneling of HTTPS requests.
-	 * - Support for authenticating proxies using basic, digest, NTLM, Kerberos or negotiate
-	 * authentication schemes.
-	 * - Support for traffic monitoring proxies: Fiddler-like proxies used for access control
-	 * and monitoring.
-	 *
-	 * The net module API has been specifically designed to mimic, as closely as possible,
-	 * the familiar Node.js API. The API components including classes, methods,
-	 * properties and event names are similar to those commonly used in Node.js.
-	 *
-	 * The net API can be used only after the application emits the ready event.
-	 * Trying to use the module before the ready event will throw an error.
-	 */
-	interface Net extends NodeJS.EventEmitter {
-		/**
-		 * @param options The ClientRequest constructor options.
-		 * @param callback A one time listener for the response event.
-		 *
-		 * @returns a ClientRequest instance using the provided options which are directly
-		 * forwarded to the ClientRequest constructor.
-		 */
-		request(options: string | RequestOptions, callback?: (response: IncomingMessage) => void): ClientRequest;
-	}
-
-	/**
-	 * The RequestOptions interface allows to define various options for an HTTP request.
-	 */
-	interface RequestOptions {
-		/**
-		 * The HTTP request method. Defaults to the GET method.
-		 */
-		method?: string;
-		/**
-		 * The request URL. Must be provided in the absolute form with the protocol
-		 * scheme specified as http or https.
-		 */
-		url?: string;
-		/**
-		 * The Session instance with which the request is associated.
-		 */
-		session?: Session;
-		/**
-		 * The name of the partition with which the request is associated.
-		 * Defaults to the empty string. The session option prevails on partition.
-		 * Thus if a session is explicitly specified, partition is ignored.
-		 */
-		partition?: string;
-		/**
-		 * The protocol scheme in the form ‘scheme:’. Currently supported values are ‘http:’ or ‘https:’.
-		 * Defaults to ‘http:’.
-		 */
-		protocol?: 'http:' | 'https:';
-		/**
-		 * The server host provided as a concatenation of the hostname and the port number ‘hostname:port’.
-		 */
-		host?: string;
-		/**
-		 * The server host name.
-		 */
-		hostname?: string;
-		/**
-		 * The server’s listening port number.
-		 */
-		port?: number;
-		/**
-		 * The path part of the request URL.
-		 */
-		path?: string;
-		/**
-		 * A map specifying extra HTTP header name/value.
-		 */
-		headers?: { [key: string]: any };
-	}
-
-	/**
-	 * The ClientRequest class represents an HTTP request.
-	 */
-	class ClientRequest extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when an HTTP response is received for the request.
-		 */
-		on(event: 'response', listener: (response: IncomingMessage) => void): this;
-		/**
-		 * Emitted when an authenticating proxy is asking for user credentials.
-		 * The callback function is expected to be called back with user credentials.
-		 * Providing empty credentials will cancel the request and report an authentication
-		 * error on the response object.
-		 */
-		on(event: 'login', listener: (authInfo: LoginAuthInfo, callback: (username?: string, password?: string) => void) => void): this;
-		/**
-		 * Emitted just after the last chunk of the request’s data has been written into
-		 * the request object.
-		 */
-		on(event: 'finish', listener: () => void): this;
-		/**
-		 * Emitted when the request is aborted. The abort event will not be fired if the
-		 * request is already closed.
-		 */
-		on(event: 'abort', listener: () => void): this;
-		/**
-		 * Emitted when the net module fails to issue a network request.
-		 * Typically when the request object emits an error event, a close event will
-		 * subsequently follow and no response object will be provided.
-		 */
-		on(event: 'error', listener: (error: Error) => void): this;
-		/**
-		 * Emitted as the last event in the HTTP request-response transaction.
-		 * The close event indicates that no more events will be emitted on either the
-		 * request or response objects.
-		 */
-		on(event: 'close', listener: () => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * A Boolean specifying whether the request will use HTTP chunked transfer encoding or not.
-		 * Defaults to false. The property is readable and writable, however it can be set only before
-		 * the first write operation as the HTTP headers are not yet put on the wire.
-		 * Trying to set the chunkedEncoding property after the first write will throw an error.
-		 *
-		 * Using chunked encoding is strongly recommended if you need to send a large request
-		 * body as data will be streamed in small chunks instead of being internally buffered
-		 * inside Electron process memory.
-		 */
-		chunkedEncoding: boolean;
-		/**
-		 * @param options If options is a String, it is interpreted as the request URL.
-		 * If it is an object, it is expected to be a RequestOptions.
-		 * @param callback A one time listener for the response event.
-		 */
-		constructor(options: string | RequestOptions, callback?: (response: IncomingMessage) => void);
-		/**
-		 * Adds an extra HTTP header. The header name will issued as it is without lowercasing.
-		 * It can be called only before first write. Calling this method after the first write
-		 * will throw an error.
-		 * @param name An extra HTTP header name.
-		 * @param value An extra HTTP header value.
-		 */
-		setHeader(name: string, value: string): void;
-		/**
-		 * @param name Specify an extra header name.
-		 * @returns The value of a previously set extra header name.
-		 */
-		getHeader(name: string): string;
-		/**
-		 * Removes a previously set extra header name. This method can be called only before first write.
-		 * Trying to call it after the first write will throw an error.
-		 * @param name Specify an extra header name.
-		 */
-		removeHeader(name: string): void;
-		/**
-		 * Adds a chunk of data to the request body. The first write operation may cause the
-		 * request headers to be issued on the wire.
-		 * After the first write operation, it is not allowed to add or remove a custom header.
-		 * @param chunk A chunk of the request body’s data. If it is a string, it is converted
-		 * into a Buffer using the specified encoding.
-		 * @param encoding Used to convert string chunks into Buffer objects. Defaults to ‘utf-8’.
-		 * @param callback Called after the write operation ends.
-		 */
-		write(chunk: string | Buffer, encoding?: string, callback?: Function): boolean;
-		/**
-		 * Sends the last chunk of the request data. Subsequent write or end operations will not be allowed.
-		 * The finish event is emitted just after the end operation.
-		 * @param chunk A chunk of the request body’s data. If it is a string, it is converted into
-		 * a Buffer using the specified encoding.
-		 * @param encoding Used to convert string chunks into Buffer objects. Defaults to ‘utf-8’.
-		 * @param callback Called after the write operation ends.
-		 *
-		 */
-		end(chunk?: string | Buffer, encoding?: string, callback?: Function): boolean;
-		/**
-		 * Cancels an ongoing HTTP transaction. If the request has already emitted the close event,
-		 * the abort operation will have no effect.
-		 * Otherwise an ongoing event will emit abort and close events.
-		 * Additionally, if there is an ongoing response object,it will emit the aborted event.
-		 */
-		abort(): void
-	}
-
-	/**
-	 * An IncomingMessage represents an HTTP response.
-	 */
-	interface IncomingMessage extends NodeJS.ReadableStream {
-		/**
-		 * The data event is the usual method of transferring response data into applicative code.
-		 */
-		on(event: 'data', listener: (chunk: Buffer) => void): this;
-		/**
-		 * Indicates that response body has ended.
-		 */
-		on(event: 'end', listener: () => void): this;
-		/**
-		 * Emitted when a request has been canceled during an ongoing HTTP transaction.
-		 */
-		on(event: 'aborted', listener: () => void): this;
-		/**
-		 * Emitted when an error was encountered while streaming response data events.
-		 * For instance, if the server closes the underlying while the response is still
-		 * streaming, an error event will be emitted on the response object and a close
-		 * event will subsequently follow on the request object.
-		 */
-		on(event: 'error', listener: (error: Error) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * An Integer indicating the HTTP response status code.
-		 */
-		statusCode: number;
-		/**
-		 * A String representing the HTTP status message.
-		 */
-		statusMessage: string;
-		/**
-		 * An object representing the response HTTP headers. The headers object is formatted as follows:
-		 * - All header names are lowercased.
-		 * - Each header name produces an array-valued property on the headers object.
-		 * - Each header value is pushed into the array associated with its header name.
-		 */
-		headers: {
-			[key: string]: string[]
-		};
-		/**
-		 * A string indicating the HTTP protocol version number. Typical values are ‘1.0’ or ‘1.1’.
-		 */
-		httpVersion: string;
-		/**
-		 * An integer-valued read-only property that returns the HTTP major version number.
-		 */
-		httpVersionMajor: number;
-		/**
-		 * An integer-valued read-only property that returns the HTTP minor version number.
-		 */
-		httpVersionMinor: number;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/power-monitor.md
-
-	/**
-	 * The power-monitor module is used to monitor power state changes.
-	 * You should not use this module until the ready event of the app module is emitted.
-	 */
-	interface PowerMonitor extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the system is suspending.
-		 */
-		on(event: 'suspend', listener: Function): this;
-		/**
-		 * Emitted when system is resuming.
-		 */
-		on(event: 'resume', listener: Function): this;
-		/**
-		 * Emitted when the system changes to AC power.
-		 */
-		on(event: 'on-ac', listener: Function): this;
-		/**
-		 * Emitted when system changes to battery power.
-		 */
-		on(event: 'on-battery', listener: Function): this;
-		on(event: string, listener: Function): this;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/power-save-blocker.md
-
-	/**
-	 * The powerSaveBlocker module is used to block the system from entering
-	 * low-power (sleep) mode and thus allowing the app to keep the system and screen active.
-	 */
-	interface PowerSaveBlocker {
-		/**
-		 * Starts preventing the system from entering lower-power mode.
-		 * @returns The blocker ID that is assigned to this power blocker.
-		 * Note: prevent-display-sleep has higher has precedence over prevent-app-suspension.
-		 */
-		start(type: 'prevent-app-suspension' | 'prevent-display-sleep'): number;
-		/**
-		 * @param id The power save blocker id returned by powerSaveBlocker.start.
-		 * Stops the specified power save blocker.
-		 */
-		stop(id: number): void;
-		/**
-		 * @param id The power save blocker id returned by powerSaveBlocker.start.
-		 * @returns Whether the corresponding powerSaveBlocker has started.
-		 */
-		isStarted(id: number): boolean;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/protocol.md
-
-	/**
-	 * The protocol module can register a custom protocol or intercept an existing protocol.
-	 */
-	interface Protocol {
-		/**
-		 * Registers custom schemes as standard schemes.
-		 */
-		registerStandardSchemes(schemes: string[]): void;
-		/**
-		 * Registers custom schemes to handle service workers.
-		 */
-		registerServiceWorkerSchemes(schemes: string[]): void;
-		/**
-		 * Registers a protocol of scheme that will send the file as a response.
-		 */
-		registerFileProtocol(scheme: string, handler: FileProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send a Buffer as a response.
-		 */
-		registerBufferProtocol(scheme: string, handler: BufferProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send a String as a response.
-		 */
-		registerStringProtocol(scheme: string, handler: StringProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Registers a protocol of scheme that will send an HTTP request as a response.
-		 */
-		registerHttpProtocol(scheme: string, handler: HttpProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Unregisters the custom protocol of scheme.
-		 */
-		unregisterProtocol(scheme: string, completion?: (error: Error) => void): void;
-		/**
-		 * The callback will be called with a boolean that indicates whether there is already a handler for scheme.
-		 */
-		isProtocolHandled(scheme: string, callback: (handled: boolean) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a file as a response.
-		 */
-		interceptFileProtocol(scheme: string, handler: FileProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a Buffer as a response.
-		 */
-		interceptBufferProtocol(scheme: string, handler: BufferProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a String as a response.
-		 */
-		interceptStringProtocol(scheme: string, handler: StringProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Intercepts scheme protocol and uses handler as the protocol’s new handler which sends a new HTTP request as a response.
-		 */
-		interceptHttpProtocol(scheme: string, handler: HttpProtocolHandler, completion?: (error: Error) => void): void;
-		/**
-		 * Remove the interceptor installed for scheme and restore its original handler.
-		 */
-		uninterceptProtocol(scheme: string, completion?: (error: Error) => void): void;
-	}
-
-	type FileProtocolHandler = (request: ProtocolRequest, callback: FileProtocolCallback) => void;
-	type BufferProtocolHandler = (request: ProtocolRequest, callback: BufferProtocolCallback) => void;
-	type StringProtocolHandler = (request: ProtocolRequest, callback: StringProtocolCallback) => void;
-	type HttpProtocolHandler = (request: ProtocolRequest, callback: HttpProtocolCallback) => void;
-
-	interface ProtocolRequest {
-		url: string;
-		referrer: string;
-		method: string;
-		uploadData?: {
-			/**
-			 * Content being sent.
-			 */
-			bytes: Buffer,
-			/**
-			 * Path of file being uploaded.
-			 */
-			file: string,
-			/**
-			 * UUID of blob data. Use session.getBlobData method to retrieve the data.
-			 */
-			blobUUID: string;
-		}[];
-	}
-
-	interface ProtocolCallback {
-		(error: number): void;
-		(obj: {
-			error: number
-		}): void;
-		(): void;
-	}
-
-	interface FileProtocolCallback extends ProtocolCallback {
-		(filePath: string): void;
-		(obj: {
-			path: string
-		}): void;
-	}
-
-	interface BufferProtocolCallback extends ProtocolCallback {
-		(buffer: Buffer): void;
-		(obj: {
-			data: Buffer,
-			mimeType: string,
-			charset?: string
-		}): void;
-	}
-
-	interface StringProtocolCallback extends ProtocolCallback {
-		(str: string): void;
-		(obj: {
-			data: string,
-			mimeType: string,
-			charset?: string
-		}): void;
-	}
-
-	interface HttpProtocolCallback extends ProtocolCallback {
-		(redirectRequest: {
-			url: string;
-			method: string;
-			session?: Object;
-			uploadData?: {
-				contentType: string;
-				data: string;
-			};
-		}): void;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/remote.md
-
-	/**
-	 * The remote module provides a simple way to do inter-process communication (IPC)
-	 * between the renderer process (web page) and the main process.
-	 */
-	interface Remote extends CommonElectron {
-		/**
-		 * @returns The object returned by require(module) in the main process.
-		 */
-		require(module: string): any;
-		/**
-		 * @returns The BrowserWindow object which this web page belongs to.
-		 */
-		getCurrentWindow(): BrowserWindow;
-		/**
-		 * @returns The WebContents object of this web page.
-		 */
-		getCurrentWebContents(): WebContents;
-		/**
-		 * @returns The global variable of name (e.g. global[name]) in the main process.
-		 */
-		getGlobal(name: string): any;
-		/**
-		 * Returns the process object in the main process. This is the same as
-		 * remote.getGlobal('process'), but gets cached.
-		 */
-		process: NodeJS.Process;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/screen.md
-
-	/**
-	 * The Display object represents a physical display connected to the system.
-	 * A fake Display may exist on a headless system, or a Display may correspond to a remote, virtual display.
-	 */
-	interface Display {
-		/**
-		 * Unique identifier associated with the display.
-		 */
-		id: number;
-		bounds: Rectangle;
-		workArea: Rectangle;
-		size: Size;
-		workAreaSize: Size;
-		/**
-		 * Output device’s pixel scale factor.
-		 */
-		scaleFactor: number;
-		/**
-		 * Can be 0, 90, 180, 270, represents screen rotation in clock-wise degrees.
-		 */
-		rotation: number;
-		touchSupport: 'available' | 'unavailable' | 'unknown';
-	}
-
-	type DisplayMetrics = 'bounds' | 'workArea' | 'scaleFactor' | 'rotation';
-
-	/**
-	 * The screen module retrieves information about screen size, displays, cursor position, etc.
-	 * You can not use this module until the ready event of the app module is emitted.
-	 */
-	interface Screen extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when newDisplay has been added.
-		 */
-		on(event: 'display-added', listener: (event: Event, newDisplay: Display) => void): this;
-		/**
-		 * Emitted when oldDisplay has been removed.
-		 */
-		on(event: 'display-removed', listener: (event: Event, oldDisplay: Display) => void): this;
-		/**
-		 * Emitted when one or more metrics change in a display.
-		 */
-		on(event: 'display-metrics-changed', listener: (event: Event, display: Display, changedMetrics: DisplayMetrics[]) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * @returns The current absolute position of the mouse pointer.
-		 */
-		getCursorScreenPoint(): Point;
-		/**
-		 * @returns The primary display.
-		 */
-		getPrimaryDisplay(): Display;
-		/**
-		 * @returns An array of displays that are currently available.
-		 */
-		getAllDisplays(): Display[];
-		/**
-		 * @returns The display nearest the specified point.
-		 */
-		getDisplayNearestPoint(point: Point): Display;
-		/**
-		 * @returns The display that most closely intersects the provided bounds.
-		 */
-		getDisplayMatching(rect: Rectangle): Display;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/session.md
-
-	/**
-	 * The session module can be used to create new Session objects.
-	 * You can also access the session of existing pages by using
-	 * the session property of webContents which is a property of BrowserWindow.
-	 */
-	class Session extends NodeJS.EventEmitter {
-		/**
-		 * @returns a new Session instance from partition string.
-		 */
-		static fromPartition(partition: string, options?: FromPartitionOptions): Session;
-		/**
-		 * @returns the default session object of the app.
-		 */
-		static defaultSession: Session;
-		/**
-		 * Emitted when Electron is about to download item in webContents.
-		 * Calling event.preventDefault() will cancel the download
-		 * and item will not be available from next tick of the process.
-		 */
-		on(event: 'will-download', listener: (event: Event, item: DownloadItem, webContents: WebContents) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * The cookies gives you ability to query and modify cookies.
-		 */
-		cookies: SessionCookies;
-		/**
-		 * @returns the session’s current cache size.
-		 */
-		getCacheSize(callback: (size: number) => void): void;
-		/**
-		 * Clears the session’s HTTP cache.
-		 */
-		clearCache(callback: Function): void;
-		/**
-		 * Clears the data of web storages.
-		 */
-		clearStorageData(callback: Function): void;
-		/**
-		 * Clears the data of web storages.
-		 */
-		clearStorageData(options: ClearStorageDataOptions, callback: Function): void;
-		/**
-		 * Writes any unwritten DOMStorage data to disk.
-		 */
-		flushStorageData(): void;
-		/**
-		 * Sets the proxy settings.
-		 */
-		setProxy(config: ProxyConfig, callback: Function): void;
-		/**
-		 * Resolves the proxy information for url.
-		 */
-		resolveProxy(url: URL, callback: (proxy: string) => void): void;
-		/**
-		 * Sets download saving directory.
-		 * By default, the download directory will be the Downloads under the respective app folder.
-		 */
-		setDownloadPath(path: string): void;
-		/**
-		 * Emulates network with the given configuration for the session.
-		 */
-		enableNetworkEmulation(options: NetworkEmulationOptions): void;
-		/**
-		 * Disables any network emulation already active for the session.
-		 * Resets to the original network configuration.
-		 */
-		disableNetworkEmulation(): void;
-		/**
-		 * Sets the certificate verify proc for session, the proc will be called
-		 * whenever a server certificate verification is requested.
-		 *
-		 * Calling setCertificateVerifyProc(null) will revert back to default certificate verify proc.
-		 */
-		setCertificateVerifyProc(proc: ((hostname: string, cert: Certificate, callback: (accepted: boolean) => void) => void) | null): void;
-		/**
-		 * Sets the handler which can be used to respond to permission requests for the session.
-		 */
-		setPermissionRequestHandler(handler: (webContents: WebContents, permission: Permission, callback: (allow: boolean) => void) => void): void;
-		/**
-		 * Clears the host resolver cache.
-		 */
-		clearHostResolverCache(callback: Function): void;
-		/**
-		 * Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate authentication.
-		 * @param domains Comma-seperated list of servers for which integrated authentication is enabled.
-		 */
-		allowNTLMCredentialsForDomains(domains: string): void;
-		/**
-		 * Overrides the userAgent and acceptLanguages for this session.
-		 * The acceptLanguages must a comma separated ordered list of language codes, for example "en-US,fr,de,ko,zh-CN,ja".
-		 * This doesn't affect existing WebContents, and each WebContents can use webContents.setUserAgent to override the session-wide user agent.
-		 */
-		setUserAgent(userAgent: string, acceptLanguages?: string): void;
-		/**
-		 * @returns The user agent for this session.
-		 */
-		getUserAgent(): string;
-		/**
-		 * Returns the blob data associated with the identifier.
-		 */
-		getBlobData(identifier: string, callback: (result: Buffer) => void): void;
-		/**
-		 * The webRequest API set allows to intercept and modify contents of a request at various stages of its lifetime.
-		 */
-		webRequest: WebRequest;
-		/**
-		 * @returns An instance of protocol module for this session.
-		 */
-		protocol: Protocol;
-	}
-
-	type Permission = 'media' | 'geolocation' | 'notifications' | 'midiSysex' | 'pointerLock' | 'fullscreen' | 'openExternal';
-
-	interface FromPartitionOptions {
-		/**
-		 * Whether to enable cache.
-		 */
-		cache?: boolean;
-	}
-
-	interface ClearStorageDataOptions {
-		/**
-		 * Should follow window.location.origin’s representation scheme://host:port.
-		 */
-		origin?: string;
-		/**
-		 *  The types of storages to clear.
-		 */
-		storages?: ('appcache' | 'cookies' | 'filesystem' | 'indexdb' | 'localstorage' | 'shadercache' | 'websql' | 'serviceworkers')[];
-		/**
-		 * The types of quotas to clear.
-		 */
-		quotas?: ('temporary' | 'persistent' | 'syncable')[];
-	}
-
-	interface ProxyConfig {
-		/**
-		 * The URL associated with the PAC file.
-		 */
-		pacScript: string;
-		/**
-		 * Rules indicating which proxies to use.
-		 */
-		proxyRules: string;
-		/**
-		 * Rules indicating which URLs should bypass the proxy settings.
-		 */
-		proxyBypassRules: string;
-	}
-
-	interface NetworkEmulationOptions {
-		/**
-		 * Whether to emulate network outage.
-		 * Default: false.
-		 */
-		offline?: boolean;
-		/**
-		 * RTT in ms.
-		 * Default: 0, which will disable latency throttling.
-		 */
-		latency?: number;
-		/**
-		 * Download rate in Bps.
-		 * Default: 0, which will disable download throttling.
-		 */
-		downloadThroughput?: number;
-		/**
-		 * Upload rate in Bps.
-		 * Default: 0, which will disable upload throttling.
-		 */
-		uploadThroughput?: number;
-	}
-
-	interface CookieFilter {
-		/**
-		 * Retrieves cookies which are associated with url. Empty implies retrieving cookies of all urls.
-		 */
-		url?: string;
-		/**
-		 * Filters cookies by name.
-		 */
-		name?: string;
-		/**
-		 * Retrieves cookies whose domains match or are subdomains of domains.
-		 */
-		domain?: string;
-		/**
-		 * Retrieves cookies whose path matches path.
-		 */
-		path?: string;
-		/**
-		 * Filters cookies by their Secure property.
-		 */
-		secure?: boolean;
-		/**
-		 * Filters out session or persistent cookies.
-		 */
-		session?: boolean;
-	}
-
-	interface Cookie {
-		/**
-		 * Emitted when a cookie is changed because it was added, edited, removed, or expired.
-		 */
-		on(event: 'changed', listener: (event: Event, cookie: Cookie, cause: CookieChangedCause) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * The name of the cookie.
-		 */
-		name: string;
-		/**
-		 * The value of the cookie.
-		 */
-		value: string;
-		/**
-		 * The domain of the cookie.
-		 */
-		domain: string;
-		/**
-		 * Whether the cookie is a host-only cookie.
-		 */
-		hostOnly: string;
-		/**
-		 * The path of the cookie.
-		 */
-		path: string;
-		/**
-		 * Whether the cookie is marked as secure.
-		 */
-		secure: boolean;
-		/**
-		 * Whether the cookie is marked as HTTP only.
-		 */
-		httpOnly: boolean;
-		/**
-		 * Whether the cookie is a session cookie or a persistent cookie with an expiration date.
-		 */
-		session: boolean;
-		/**
-		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
-		 * Not provided for session cookies.
-		 */
-		expirationDate?: number;
-	}
-
-	type CookieChangedCause = 'explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite';
-
-	interface CookieDetails {
-		/**
-		 * The URL associated with the cookie.
-		 */
-		url: string;
-		/**
-		 * The name of the cookie.
-		 * Default: empty.
-		 */
-		name?: string;
-		/**
-		 * The value of the cookie.
-		 * Default: empty.
-		 */
-		value?: string;
-		/**
-		 * The domain of the cookie.
-		 * Default: empty.
-		 */
-		domain?: string;
-		/**
-		 * The path of the cookie.
-		 * Default: empty.
-		 */
-		path?: string;
-		/**
-		 * Whether the cookie should be marked as secure.
-		 * Default: false.
-		 */
-		secure?: boolean;
-		/**
-		 * Whether the cookie should be marked as HTTP only.
-		 * Default: false.
-		 */
-		httpOnly?: boolean;
-		/**
-		 * The expiration date of the cookie as the number of seconds since the UNIX epoch.
-		 * If omitted, the cookie becomes a session cookie.
-		 */
-		expirationDate?: number;
-	}
-
-	interface SessionCookies {
-		/**
-		 * Sends a request to get all cookies matching filter.
-		 */
-		get(filter: CookieFilter, callback: (error: Error, cookies: Cookie[]) => void): void;
-		/**
-		 * Sets the cookie with details.
-		 */
-		set(details: CookieDetails, callback: (error: Error) => void): void;
-		/**
-		 * Removes the cookies matching url and name.
-		 */
-		remove(url: string, name: string, callback: (error: Error) => void): void;
-	}
-
-	/**
-	 * Each API accepts an optional filter and a listener, the listener will be called when the API's event has happened.
-	 * Passing null as listener will unsubscribe from the event.
-	 *
-	 * The filter will be used to filter out the requests that do not match the URL patterns.
-	 * If the filter is omitted then all requests will be matched.
-	 *
-	 * For certain events the listener is passed with a callback,
-	 * which should be called with an response object when listener has done its work.
-	 */
-	interface WebRequest {
-		/**
-		 * The listener will be called when a request is about to occur.
-		 */
-		onBeforeRequest(listener: (details: WebRequest.BeforeRequestDetails, callback: WebRequest.BeforeRequestCallback) => void): void;
-		/**
-		 * The listener will be called when a request is about to occur.
-		 */
-		onBeforeRequest(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeRequestDetails, callback: WebRequest.BeforeRequestCallback) => void): void;
-		/**
-		 * The listener will be called before sending an HTTP request, once the request headers are available.
-		 * This may occur after a TCP connection is made to the server, but before any http data is sent.
-		 */
-		onBeforeSendHeaders(listener: (details: WebRequest.BeforeSendHeadersDetails, callback: WebRequest.BeforeSendHeadersCallback) => void): void;
-		/**
-		 * The listener will be called before sending an HTTP request, once the request headers are available.
-		 * This may occur after a TCP connection is made to the server, but before any http data is sent.
-		 */
-		onBeforeSendHeaders(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeSendHeadersDetails, callback: WebRequest.BeforeSendHeadersCallback) => void): void;
-		/**
-		 * The listener will be called just before a request is going to be sent to the server,
-		 * modifications of previous onBeforeSendHeaders response are visible by the time this listener is fired.
-		 */
-		onSendHeaders(listener: (details: WebRequest.SendHeadersDetails) => void): void;
-		/**
-		 * The listener will be called just before a request is going to be sent to the server,
-		 * modifications of previous onBeforeSendHeaders response are visible by the time this listener is fired.
-		 */
-		onSendHeaders(filter: WebRequest.Filter, listener: (details: WebRequest.SendHeadersDetails) => void): void;
-		/**
-		 * The listener will be called when HTTP response headers of a request have been received.
-		 */
-		onHeadersReceived(listener: (details: WebRequest.HeadersReceivedDetails, callback: WebRequest.HeadersReceivedCallback) => void): void;
-		/**
-		 * The listener will be called when HTTP response headers of a request have been received.
-		 */
-		onHeadersReceived(filter: WebRequest.Filter, listener: (details: WebRequest.HeadersReceivedDetails, callback: WebRequest.HeadersReceivedCallback) => void): void;
-		/**
-		 * The listener will be called when first byte of the response body is received.
-		 * For HTTP requests, this means that the status line and response headers are available.
-		 */
-		onResponseStarted(listener: (details: WebRequest.ResponseStartedDetails) => void): void;
-		/**
-		 * The listener will be called when first byte of the response body is received.
-		 * For HTTP requests, this means that the status line and response headers are available.
-		 */
-		onResponseStarted(filter: WebRequest.Filter, listener: (details: WebRequest.ResponseStartedDetails) => void): void;
-		/**
-		 * The listener will be called when a server initiated redirect is about to occur.
-		 */
-		onBeforeRedirect(listener: (details: WebRequest.BeforeRedirectDetails) => void): void;
-		/**
-		 * The listener will be called when a server initiated redirect is about to occur.
-		 */
-		onBeforeRedirect(filter: WebRequest.Filter, listener: (details: WebRequest.BeforeRedirectDetails) => void): void;
-		/**
-		 * The listener will be called when a request is completed.
-		 */
-		onCompleted(listener: (details: WebRequest.CompletedDetails) => void): void;
-		/**
-		 * The listener will be called when a request is completed.
-		 */
-		onCompleted(filter: WebRequest.Filter, listener: (details: WebRequest.CompletedDetails) => void): void;
-		/**
-		 * The listener will be called when an error occurs.
-		 */
-		onErrorOccurred(listener: (details: WebRequest.ErrorOccurredDetails) => void): void;
-		/**
-		 * The listener will be called when an error occurs.
-		 */
-		onErrorOccurred(filter: WebRequest.Filter, listener: (details: WebRequest.ErrorOccurredDetails) => void): void;
-	}
-
-	namespace WebRequest {
-		interface Filter {
-			urls: string[];
-		}
-
-		interface Details {
-			id: number;
-			url: string;
-			method: string;
-			resourceType: string;
-			timestamp: number;
-		}
-
-		interface UploadData {
-			/**
-			 * Content being sent.
-			 */
-			bytes: Buffer;
-			/**
-			 * Path of file being uploaded.
-			 */
-			file: string;
-			/**
-			 * UUID of blob data. Use session.getBlobData method to retrieve the data.
-			 */
-			blobUUID: string;
-		}
-
-		interface BeforeRequestDetails extends Details {
-			uploadData?: UploadData[];
-		}
-
-		type BeforeRequestCallback = (response: {
-			cancel?: boolean;
-			/**
-			 * The original request is prevented from being sent or completed, and is instead redirected to the given URL.
-			 */
-			redirectURL?: string;
-		}) => void;
-
-		interface BeforeSendHeadersDetails extends Details {
-			requestHeaders: Headers;
-		}
-
-		type BeforeSendHeadersCallback = (response: {
-			cancel?: boolean;
-			/**
-			 * When provided, request will be made with these headers.
-			 */
-			requestHeaders?: Headers;
-		}) => void;
-
-		interface SendHeadersDetails extends Details {
-			requestHeaders: Headers;
-		}
-
-		interface HeadersReceivedDetails extends Details {
-			statusLine: string;
-			statusCode: number;
-			responseHeaders: Headers;
-		}
-
-		type HeadersReceivedCallback = (response: {
-			cancel?: boolean;
-			/**
-			 * When provided, the server is assumed to have responded with these headers.
-			 */
-			responseHeaders?: Headers;
-			/**
-			 * Should be provided when overriding responseHeaders to change header status
-			 * otherwise original response header's status will be used.
-			 */
-			statusLine?: string;
-		}) => void;
-
-		interface ResponseStartedDetails extends Details {
-			responseHeaders: Headers;
-			fromCache: boolean;
-			statusCode: number;
-			statusLine: string;
-		}
-
-		interface BeforeRedirectDetails extends Details {
-			redirectURL: string;
-			statusCode: number;
-			ip?: string;
-			fromCache: boolean;
-			responseHeaders: Headers;
-		}
-
-		interface CompletedDetails extends Details {
-			responseHeaders: Headers;
-			fromCache: boolean;
-			statusCode: number;
-			statusLine: string;
-		}
-
-		interface ErrorOccurredDetails extends Details {
-			fromCache: boolean;
-			error: string;
-		}
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/shell.md
-
-	/**
-	 * The shell module provides functions related to desktop integration.
-	 */
-	interface Shell {
-		/**
-		 * Show the given file in a file manager. If possible, select the file.
-		 * @returns Whether the item was successfully shown.
-		 */
-		showItemInFolder(fullPath: string): boolean;
-		/**
-		 * Open the given file in the desktop's default manner.
-		 * @returns Whether the item was successfully shown.
-		 */
-		openItem(fullPath: string): boolean;
-		/**
-		 * Open the given external protocol URL in the desktop's default manner
-		 * (e.g., mailto: URLs in the default mail user agent).
-		 * @returns Whether an application was available to open the URL.
-		 */
-		openExternal(url: string, options?: {
-			/**
-			 * Bring the opened application to the foreground.
-			 * Default: true.
-			 */
-			activate: boolean;
-		}): boolean;
-		/**
-		 * Move the given file to trash.
-		 * @returns Whether the item was successfully moved to the trash.
-		 */
-		moveItemToTrash(fullPath: string): boolean;
-		/**
-		 * Play the beep sound.
-		 */
-		beep(): void;
-		/**
-		 * Creates or updates a shortcut link at shortcutPath.
-		 *
-		 * Note: This API is available only on Windows.
-		 */
-		writeShortcutLink(shortcutPath: string, options: ShortcutLinkOptions): boolean;
-		/**
-		 * Creates or updates a shortcut link at shortcutPath.
-		 *
-		 * Note: This API is available only on Windows.
-		 */
-		writeShortcutLink(shortcutPath: string, operation: 'create' | 'update' | 'replace', options: ShortcutLinkOptions): boolean;
-		/**
-		 * Resolves the shortcut link at shortcutPath.
-		 * An exception will be thrown when any error happens.
-		 *
-		 * Note: This API is available only on Windows.
-		 */
-		readShortcutLink(shortcutPath: string): ShortcutLinkOptions;
-	}
-
-	interface ShortcutLinkOptions {
-		/**
-		 * The target to launch from this shortcut.
-		 */
-		target: string;
-		/**
-		 * The working directory.
-		 * Default: empty.
-		 */
-		cwd?: string;
-		/**
-		 * The arguments to be applied to target when launching from this shortcut.
-		 * Default: empty.
-		 */
-		args?: string;
-		/**
-		 * The description of the shortcut.
-		 * Default: empty.
-		 */
-		description?: string;
-		/**
-		 * The path to the icon, can be a DLL or EXE. icon and iconIndex have to be set together.
-		 * Default: empty, which uses the target's icon.
-		 */
-		icon?: string;
-		/**
-		 * The resource ID of icon when icon is a DLL or EXE.
-		 * Default: 0.
-		 */
-		iconIndex?: number;
-		/**
-		 * The Application User Model ID.
-		 * Default: empty.
-		 */
-		appUserModelId?: string;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/system-preferences.md
-
-	type SystemColor =
-		'3d-dark-shadow' |            // Dark shadow for three-dimensional display elements.
-		'3d-face' |                   // Face color for three-dimensional display elements and for dialog box backgrounds.
-		'3d-highlight' |              // Highlight color for three-dimensional display elements.
-		'3d-light' |                  // Light color for three-dimensional display elements.
-		'3d-shadow' |                 // Shadow color for three-dimensional display elements.
-		'active-border' |             // Active window border.
-		'active-caption' |            // Active window title bar. Specifies the left side color in the color gradient of an active window's title bar if the gradient effect is enabled.
-		'active-caption-gradient' |   // Right side color in the color gradient of an active window's title bar.
-		'app-workspace' |             // Background color of multiple document interface (MDI) applications.
-		'button-text' |               // Text on push buttons.
-		'caption-text' |              // Text in caption, size box, and scroll bar arrow box.
-		'desktop' |                   // Desktop background color.
-		'disabled-text' |             // Grayed (disabled) text.
-		'highlight' |                 // Item(s) selected in a control.
-		'highlight-text' |            // Text of item(s) selected in a control.
-		'hotlight' |                  // Color for a hyperlink or hot-tracked item.
-		'inactive-border' |           // Inactive window border.
-		'inactive-caption' |          // Inactive window caption. Specifies the left side color in the color gradient of an inactive window's title bar if the gradient effect is enabled.
-		'inactive-caption-gradient' | // Right side color in the color gradient of an inactive window's title bar.
-		'inactive-caption-text' |     // Color of text in an inactive caption.
-		'info-background' |           // Background color for tooltip controls.
-		'info-text' |                 // Text color for tooltip controls.
-		'menu' |                      // Menu background.
-		'menu-highlight' |            // The color used to highlight menu items when the menu appears as a flat menu.
-		'menubar' |                   // The background color for the menu bar when menus appear as flat menus.
-		'menu-text' |                 // Text in menus.
-		'scrollbar' |                 // Scroll bar gray area.
-		'window' |                    // Window background.
-		'window-frame' |              // Window frame.
-		'window-text'; // Text in windows.
-
-	/**
-	 * Get system preferences.
-	 */
-	interface SystemPreferences {
-		/**
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'accent-color-changed', listener: (event: Event, newColor: string) => void): this;
-		/**
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'color-changed', listener: (event: Event) => void): this;
-		/**
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'inverted-color-scheme-changed', listener: (
-			event: Event,
-			/**
-			 * @param invertedColorScheme true if an inverted color scheme, such as a high contrast theme, is being used, false otherwise.
-			 */
-			invertedColorScheme: boolean
-		) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * @returns Whether the system is in Dark Mode.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		isDarkMode(): boolean;
-		/**
-		 * @returns Whether the Swipe between pages setting is on.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		isSwipeTrackingFromScrollEventsEnabled(): boolean;
-		/**
-		 * Posts event as native notifications of macOS.
-		 * The userInfo contains the user information dictionary sent along with the notification.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		postNotification(event: string, userInfo: Object): void;
-		/**
-		 * Posts event as native notifications of macOS.
-		 * The userInfo contains the user information dictionary sent along with the notification.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		postLocalNotification(event: string, userInfo: Object): void;
-		/**
-		 * Subscribes to native notifications of macOS, callback will be called when the corresponding event happens.
-		 * The id of the subscriber is returned, which can be used to unsubscribe the event.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		subscribeNotification(event: string, callback: (event: Event, userInfo: Object) => void): number;
-		/**
-		 * Removes the subscriber with id.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		unsubscribeNotification(id: number): void;
-		/**
-		 * Same as subscribeNotification, but uses NSNotificationCenter for local defaults.
-		 */
-		subscribeLocalNotification(event: string, callback: (event: Event, userInfo: Object) => void): number;
-		/**
-		 * Same as unsubscribeNotification, but removes the subscriber from NSNotificationCenter.
-		 */
-		unsubscribeLocalNotification(id: number): void;
-		/**
-		 * Get the value of key in system preferences.
-		 *
-		 * Note: This is only implemented on macOS.
-		 */
-		getUserDefault(key: string, type: 'string' | 'boolean' | 'integer' | 'float' | 'double' | 'url' | 'array' | 'dictionary'): any;
-		/**
-		 * @returns Whether DWM composition (Aero Glass) is enabled.
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		isAeroGlassEnabled(): boolean;
-		/**
-		 * @returns The users current system wide color preference in the form of an RGBA hexadecimal string.
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		getAccentColor(): string;
-		/**
-		 * @returns true if an inverted color scheme, such as a high contrast theme, is active, false otherwise.
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		isInvertedColorScheme(): boolean;
-		/**
-		 * @returns The system color setting in RGB hexadecimal form (#ABCDEF). See the Windows docs for more details.
-		 *
-		 * Note: This is only implemented on Windows.
-		 */
-		getColor(color: SystemColor): string;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/tray.md
-
-	/**
-	 * A Tray represents an icon in an operating system's notification area.
-	 */
-	class Tray extends NodeJS.EventEmitter implements Destroyable {
-		/**
-		 * Emitted when the tray icon is clicked.
-		 * Note: The bounds payload is only implemented on macOS and Windows.
-		 */
-		on(event: 'click', listener: (modifiers: Modifiers, bounds: Rectangle) => void): this;
-		/**
-		 * Emitted when the tray icon is right clicked.
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		on(event: 'right-click', listener: (modifiers: Modifiers, bounds: Rectangle) => void): this;
-		/**
-		 * Emitted when the tray icon is double clicked.
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		on(event: 'double-click', listener: (modifiers: Modifiers, bounds: Rectangle) => void): this;
-		/**
-		 * Emitted when the tray balloon shows.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-show', listener: Function): this;
-		/**
-		 * Emitted when the tray balloon is clicked.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-click', listener: Function): this;
-		/**
-		 * Emitted when the tray balloon is closed because of timeout or user manually closes it.
-		 * Note: This is only implemented on Windows.
-		 */
-		on(event: 'balloon-closed', listener: Function): this;
-		/**
-		 * Emitted when any dragged items are dropped on the tray icon.
-		 * Note: This is only implemented on macOS.
-		 */
-		on(event: 'drop', listener: Function): this;
-		/**
-		 * Emitted when dragged files are dropped in the tray icon.
-		 * Note: This is only implemented on macOS
-		 */
-		on(event: 'drop-files', listener: (event: Event, files: string[]) => void): this;
-		/**
-		 * Emitted when dragged text is dropped in the tray icon.
-		 * Note: This is only implemented on macOS
-		 */
-		on(event: 'drop-text', listener: (event: Event, text: string) => void): this;
-		/**
-		 * Emitted when a drag operation enters the tray icon.
-		 * Note: This is only implemented on macOS
-		 */
-		on(event: 'drag-enter', listener: Function): this;
-		/**
-		 * Emitted when a drag operation exits the tray icon.
-		 * Note: This is only implemented on macOS
-		 */
-		on(event: 'drag-leave', listener: Function): this;
-		/**
-		 * Emitted when a drag operation ends on the tray or ends at another location.
-		 * Note: This is only implemented on macOS
-		 */
-		on(event: 'drag-end', listener: Function): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Creates a new tray icon associated with the image.
-		 */
-		constructor(image: NativeImage|string);
-		/**
-		 * Destroys the tray icon immediately.
-		 */
-		destroy(): void;
-		/**
-		 * Sets the image associated with this tray icon.
-		 */
-		setImage(image: NativeImage|string): void;
-		/**
-		 * Sets the image associated with this tray icon when pressed.
-		 */
-		setPressedImage(image: NativeImage): void;
-		/**
-		 * Sets the hover text for this tray icon.
-		 */
-		setToolTip(toolTip: string): void;
-		/**
-		 * Sets the title displayed aside of the tray icon in the status bar.
-		 * Note: This is only implemented on macOS.
-		 */
-		setTitle(title: string): void;
-		/**
-		 * Sets when the tray's icon background becomes highlighted.
-		 * Note: This is only implemented on macOS.
-		 */
-		setHighlightMode(mode: 'selection' | 'always' | 'never'): void;
-		/**
-		 * Displays a tray balloon.
-		 * Note: This is only implemented on Windows.
-		 */
-		displayBalloon(options?: {
-			icon?: NativeImage;
-			title?: string;
-			content?: string;
-		}): void;
-		/**
-		 * Pops up the context menu of tray icon. When menu is passed,
-		 * the menu will showed instead of the tray's context menu.
-		 * The position is only available on Windows, and it is (0, 0) by default.
-		 * Note: This is only implemented on macOS and Windows.
-		 */
-		popUpContextMenu(menu?: Menu, position?: Point): void;
-		/**
-		 * Sets the context menu for this icon.
-		 */
-		setContextMenu(menu: Menu): void;
-		/**
-		 * @returns The bounds of this tray icon.
-		 */
-		getBounds(): Rectangle;
-		/**
-		 * @returns Whether the tray icon is destroyed.
-		 */
-		isDestroyed(): boolean;
-	}
-
-	interface Modifiers {
-		altKey: boolean;
-		shiftKey: boolean;
-		ctrlKey: boolean;
-		metaKey: boolean;
-	}
-
-	interface DragItem {
-		/**
-		* The absolute path of the file to be dragged
-		*/
-		file: string;
-		/**
-		* The image showing under the cursor when dragging.
-		*/
-		icon: NativeImage;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/web-contents.md
-
-	interface WebContentsStatic {
-		/**
-		 * @returns An array of all WebContents instances. This will contain web contents for all windows,
-		 * webviews, opened devtools, and devtools extension background pages.
-		 */
-		getAllWebContents(): WebContents[];
-		/**
-		 * @returns The web contents that is focused in this application, otherwise returns null.
-		 */
-		getFocusedWebContents(): WebContents;
-		/**
-		 * Find a WebContents instance according to its ID.
-		 */
-		fromId(id: number): WebContents;
-	}
-
-	/**
-	 * A WebContents is responsible for rendering and controlling a web page.
-	 */
-	interface WebContents extends NodeJS.EventEmitter {
-		/**
-		 * Emitted when the navigation is done, i.e. the spinner of the tab has stopped spinning,
-		 * and the onload event was dispatched.
-		 */
-		on(event: 'did-finish-load', listener: Function): this;
-		/**
-		 * This event is like did-finish-load but emitted when the load failed or was cancelled,
-		 * e.g. window.stop() is invoked.
-		 */
-		on(event: 'did-fail-load', listener: (event: Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => void): this;
-		/**
-		 * Emitted when a frame has done navigation.
-		 */
-		on(event: 'did-frame-finish-load', listener: (event: Event, isMainFrame: boolean) => void): this;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab started spinning.
-		 */
-		on(event: 'did-start-loading', listener: Function): this;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab stopped spinning.
-		 */
-		on(event: 'did-stop-loading', listener: Function): this;
-		/**
-		 * Emitted when details regarding a requested resource are available.
-		 * status indicates the socket connection to download the resource.
-		 */
-		on(event: 'did-get-response-details', listener: (event: Event,
-			status: boolean,
-			newURL: string,
-			originalURL: string,
-			httpResponseCode: number,
-			requestMethod: string,
-			referrer: string,
-			headers: Headers,
-			resourceType: string
-		) => void): this;
-		/**
-		 * Emitted when a redirect is received while requesting a resource.
-		 */
-		on(event: 'did-get-redirect-request', listener: (event: Event,
-			oldURL: string,
-			newURL: string,
-			isMainFrame: boolean,
-			httpResponseCode: number,
-			requestMethod: string,
-			referrer: string,
-			headers: Headers
-		) => void): this;
-		/**
-		 * Emitted when the document in the given frame is loaded.
-		 */
-		on(event: 'dom-ready', listener: (event: Event) => void): this;
-		/**
-		 * Emitted when page receives favicon URLs.
-		 */
-		on(event: 'page-favicon-updated', listener: (event: Event, favicons: string[]) => void): this;
-		/**
-		 * Emitted when the page requests to open a new window for a url.
-		 * It could be requested by window.open or an external link like <a target='_blank'>.
-		 *
-		 * By default a new BrowserWindow will be created for the url.
-		 *
-		 * Calling event.preventDefault() will prevent creating new windows.
-		 */
-		on(event: 'new-window', listener: (event: Event,
-			url: string,
-			frameName: string,
-			disposition: NewWindowDisposition,
-			options: BrowserWindowOptions
-		) => void): this;
-		/**
-		 * Emitted when a user or the page wants to start navigation.
-		 * It can happen when the window.location object is changed or a user clicks a link in the page.
-		 *
-		 * This event will not emit when the navigation is started programmatically with APIs like
-		 * webContents.loadURL and webContents.back.
-		 *
-		 * It is also not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 *
-		 * Calling event.preventDefault() will prevent the navigation.
-		 */
-		on(event: 'will-navigate', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when a navigation is done.
-		 *
-		 * This event is not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 */
-		on(event: 'did-navigate', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when an in-page navigation happened.
-		 *
-		 * When in-page navigation happens, the page URL changes but does not cause
-		 * navigation outside of the page. Examples of this occurring are when anchor links
-		 * are clicked or when the DOM hashchange event is triggered.
-		 */
-		on(event: 'did-navigate-in-page', listener: (event: Event, url: string, isMainFrame: boolean) => void): this;
-		/**
-		 * Emitted when the renderer process has crashed.
-		 */
-		on(event: 'crashed', listener: (event: Event, killed: boolean) => void): this;
-		/**
-		 * Emitted when a plugin process has crashed.
-		 */
-		on(event: 'plugin-crashed', listener: (event: Event, name: string, version: string) => void): this;
-		/**
-		 * Emitted when webContents is destroyed.
-		 */
-		on(event: 'destroyed', listener: Function): this;
-		/**
-		 * Emitted when DevTools is opened.
-		 */
-		on(event: 'devtools-opened', listener: Function): this;
-		/**
-		 * Emitted when DevTools is closed.
-		 */
-		on(event: 'devtools-closed', listener: Function): this;
-		/**
-		 * Emitted when DevTools is focused / opened.
-		 */
-		on(event: 'devtools-focused', listener: Function): this;
-		/**
-		 * Emitted when failed to verify the certificate for url.
-		 * The usage is the same with the "certificate-error" event of app.
-		 */
-		on(event: 'certificate-error', listener: (event: Event,
-			url: string,
-			error: string,
-			certificate: Certificate,
-			callback: (trust: boolean) => void
-		) => void): this;
-		/**
-		 * Emitted when a client certificate is requested.
-		 * The usage is the same with the "select-client-certificate" event of app.
-		 */
-		on(event: 'select-client-certificate', listener: (event: Event,
-			url: string,
-			certificateList: Certificate[],
-			callback: (certificate: Certificate) => void
-		) => void): this;
-		/**
-		 * Emitted when webContents wants to do basic auth.
-		 * The usage is the same with the "login" event of app.
-		 */
-		on(event: 'login', listener: (event: Event,
-			request: LoginRequest,
-			authInfo: LoginAuthInfo,
-			callback: (username: string, password: string) => void
-		) => void): this;
-		/**
-		 * Emitted when a result is available for webContents.findInPage request.
-		 */
-		on(event: 'found-in-page', listener: (event: Event, result: FoundInPageResult) => void): this;
-		/**
-		 * Emitted when media starts playing.
-		 */
-		on(event: 'media-started-playing', listener: Function): this;
-		/**
-		 * Emitted when media is paused or done playing.
-		 */
-		on(event: 'media-paused', listener: Function): this;
-		/**
-		 * Emitted when a page’s theme color changes. This is usually due to encountering a meta tag:
-		 * <meta name='theme-color' content='#ff0000'>
-		 */
-		on(event: 'did-change-theme-color', listener: Function): this;
-		/**
-		 * Emitted when mouse moves over a link or the keyboard moves the focus to a link.
-		 */
-		on(event: 'update-target-url', listener: (event: Event, url: string) => void): this;
-		/**
-		 * Emitted when the cursor’s type changes.
-		 * If the type parameter is custom, the image parameter will hold the custom cursor image
-		 * in a NativeImage, and scale, size and hotspot will hold additional information about the custom cursor.
-		 */
-		on(event: 'cursor-changed', listener: (event: Event, type: CursorType, image?: NativeImage, scale?: number, size?: Size, hotspot?: Point) => void): this;
-		/**
-		 * Emitted when there is a new context menu that needs to be handled.
-		 */
-		on(event: 'context-menu', listener: (event: Event, params: ContextMenuParams) => void): this;
-		/**
-		 * Emitted when bluetooth device needs to be selected on call to navigator.bluetooth.requestDevice.
-		 * To use navigator.bluetooth api webBluetooth should be enabled.
-		 * If event.preventDefault is not called, first available device will be selected.
-		 * callback should be called with deviceId to be selected,
-		 * passing empty string to callback will cancel the request.
-		 */
-		on(event: 'select-bluetooth-device', listener: (event: Event, deviceList: BluetoothDevice[], callback: (deviceId: string) => void) => void): this;
-		/**
-		 * Emitted when a new frame is generated. Only the dirty area is passed in the buffer.
-		 */
-		on(event: 'paint', listener: (event: Event, dirtyRect: Rectangle, image: NativeImage) => void): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Loads the url in the window.
-		 * @param url Must contain the protocol prefix (e.g., the http:// or file://).
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * Initiates a download of the resource at url without navigating.
-		 * The will-download event of session will be triggered.
-		 */
-		downloadURL(url: string): void;
-		/**
-		 * @returns The URL of current web page.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The title of web page.
-		 */
-		getTitle(): string;
-		/**
-		 * @returns Whether the web page is destroyed.
-		 */
-		isDestroyed(): boolean;
-		/**
-		 * @returns Whether the web page is focused.
-		 */
-		isFocused(): boolean;
-		/**
-		 * @returns Whether web page is still loading resources.
-		 */
-		isLoading(): boolean;
-		/**
-		 * @returns Whether the main frame (and not just iframes or frames within it) is still loading.
-		 */
-		isLoadingMainFrame(): boolean;
-		/**
-		 * @returns Whether web page is waiting for a first-response for the main
-		 * resource of the page.
-		 */
-		isWaitingForResponse(): boolean;
-		/**
-		 * Stops any pending navigation.
-		 */
-		stop(): void;
-		/**
-		 * Reloads current page.
-		 */
-		reload(): void;
-		/**
-		 * Reloads current page and ignores cache.
-		 */
-		reloadIgnoringCache(): void;
-		/**
-		 * @returns Whether the web page can go back.
-		 */
-		canGoBack(): boolean;
-		/**
-		 * @returns Whether the web page can go forward.
-		 */
-		canGoForward(): boolean;
-		/**
-		 * @returns Whether the web page can go to offset.
-		 */
-		canGoToOffset(offset: number): boolean;
-		/**
-		 * Clears the navigation history.
-		 */
-		clearHistory(): void;
-		/**
-		 * Makes the web page go back.
-		 */
-		goBack(): void;
-		/**
-		 * Makes the web page go forward.
-		 */
-		goForward(): void;
-		/**
-		 * Navigates to the specified absolute index.
-		 */
-		goToIndex(index: number): void;
-		/**
-		 * Navigates to the specified offset from the "current entry".
-		 */
-		goToOffset(offset: number): void;
-		/**
-		 * @returns Whether the renderer process has crashed.
-		 */
-		isCrashed(): boolean;
-		/**
-		 * Overrides the user agent for this page.
-		 */
-		setUserAgent(userAgent: string): void;
-		/**
-		 * @returns The user agent for this web page.
-		 */
-		getUserAgent(): string;
-		/**
-		 * Injects CSS into this page.
-		 */
-		insertCSS(css: string): void;
-		/**
-		 * Evaluates code in page.
-		 * @param code Code to evaluate.
-		 *
-		 * @returns Promise
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
-		/**
-		 * Mute the audio on the current web page.
-		 */
-		setAudioMuted(muted: boolean): void;
-		/**
-		 * @returns Whether this page has been muted.
-		 */
-		isAudioMuted(): boolean;
-		/**
-		 * Changes the zoom factor to the specified factor.
-		 * Zoom factor is zoom percent divided by 100, so 300% = 3.0.
-		 */
-		setZoomFactor(factor: number): void;
-		/**
-		 * Sends a request to get current zoom factor.
-		 */
-		getZoomFactor(callback: (zoomFactor: number) => void): void;
-		/**
-		 * Changes the zoom level to the specified level.
-		 * 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): void;
-		/**
-		 * Sends a request to get current zoom level.
-		 */
-		getZoomLevel(callback: (zoomLevel: number) => void): void;
-		/**
-		 * Sets the maximum and minimum zoom level.
-		 */
-		setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
-		/**
-		 * Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-		 */
-		setLayoutZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
-		/**
-		 * Executes the editing command undo in web page.
-		 */
-		undo(): void;
-		/**
-		 * Executes the editing command redo in web page.
-		 */
-		redo(): void;
-		/**
-		 * Executes the editing command cut in web page.
-		 */
-		cut(): void;
-		/**
-		 * Executes the editing command copy in web page.
-		 */
-		copy(): void;
-		/**
-		 * Copy the image at the given position to the clipboard.
-		 */
-		copyImageAt(x: number, y: number): void;
-		/**
-		 * Executes the editing command paste in web page.
-		 */
-		paste(): void;
-		/**
-		 * Executes the editing command pasteAndMatchStyle in web page.
-		 */
-		pasteAndMatchStyle(): void;
-		/**
-		 * Executes the editing command delete in web page.
-		 */
-		delete(): void;
-		/**
-		 * Executes the editing command selectAll in web page.
-		 */
-		selectAll(): void;
-		/**
-		 * Executes the editing command unselect in web page.
-		 */
-		unselect(): void;
-		/**
-		 * Executes the editing command replace in web page.
-		 */
-		replace(text: string): void;
-		/**
-		 * Executes the editing command replaceMisspelling in web page.
-		 */
-		replaceMisspelling(text: string): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Starts a request to find all matches for the text in the web page.
-		 * The result of the request can be obtained by subscribing to found-in-page event.
-		 * @returns The request id used for the request.
-		 */
-		findInPage(text: string, options?: FindInPageOptions): number;
-		/**
-		 * Stops any findInPage request for the webContents with the provided action.
-		 */
-		stopFindInPage(action: StopFindInPageAtion): void;
-		/**
-		 * Checks if any serviceworker is registered.
-		 */
-		hasServiceWorker(callback: (hasServiceWorker: boolean) => void): void;
-		/**
-		 * Unregisters any serviceworker if present.
-		 */
-		unregisterServiceWorker(callback: (isFulfilled: boolean) => void): void;
-		/**
-		 * Prints window's web page. When silent is set to false, Electron will pick up system's default printer and default settings for printing.
-		 * Calling window.print() in web page is equivalent to call WebContents.print({silent: false, printBackground: false}).
-		 * Note: On Windows, the print API relies on pdf.dll. If your application doesn't need print feature, you can safely remove pdf.dll in saving binary size.
-		 */
-		print(options?: PrintOptions): void;
-		/**
-		 * Prints windows' web page as PDF with Chromium's preview printing custom settings.
-		 */
-		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
-		/**
-		 * Adds the specified path to DevTools workspace.
-		 */
-		addWorkSpace(path: string): void;
-		/**
-		 * Removes the specified path from DevTools workspace.
-		 */
-		removeWorkSpace(path: string): void;
-		/**
-		 * Opens the developer tools.
-		 */
-		openDevTools(options?: {
-			/**
-			 * Opens the devtools with specified dock state. Defaults to last used dock state.
-			 */
-			mode?: 'right' | 'bottom' | 'undocked' | 'detach'
-		}): void;
-		/**
-		 * Closes the developer tools.
-		 */
-		closeDevTools(): void;
-		/**
-		 * Returns whether the developer tools are opened.
-		 */
-		isDevToolsOpened(): boolean;
-		/**
-		 * Returns whether the developer tools are focussed.
-		 */
-		isDevToolsFocused(): boolean;
-		/**
-		 * Toggle the developer tools.
-		 */
-		toggleDevTools(): void;
-		/**
-		 * Starts inspecting element at position (x, y).
-		 */
-		inspectElement(x: number, y: number): void;
-		/**
-		 * Opens the developer tools for the service worker context.
-		 */
-		inspectServiceWorker(): void;
-		/**
-		 * Send args.. to the web page via channel in asynchronous message, the web page
-		 * can handle it by listening to the channel event of ipc module.
-		 * Note:
-		 *   1. The IPC message handler in web pages do not have a event parameter,
-		 *      which is different from the handlers on the main process.
-		 *   2. There is no way to send synchronous messages from the main process
-		 *      to a renderer process, because it would be very easy to cause dead locks.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Enable device emulation with the given parameters.
-		 */
-		enableDeviceEmulation(parameters: DeviceEmulationParameters): void;
-		/**
-		 * Disable device emulation.
-		 */
-		disableDeviceEmulation(): void;
-		/**
-		 * Sends an input event to the page.
-		 */
-		sendInputEvent(event: SendInputEvent): void;
-		/**
-		 * Begin subscribing for presentation events and captured frames,
-		 * The callback will be called when there is a presentation event.
-		 */
-		beginFrameSubscription(onlyDirty: boolean, callback: BeginFrameSubscriptionCallback): void;
-		/**
-		 * Begin subscribing for presentation events and captured frames,
-		 * The callback will be called when there is a presentation event.
-		 */
-		beginFrameSubscription(callback: BeginFrameSubscriptionCallback): void;
-		/**
-		 * End subscribing for frame presentation events.
-		 */
-		endFrameSubscription(): void;
-		/**
-		 * @returns If the process of saving page has been initiated successfully.
-		 */
-		savePage(fullPath: string, saveType: 'HTMLOnly' | 'HTMLComplete' | 'MHTML', callback?: (eror: Error) => void): boolean;
-		/**
-		 * Shows pop-up dictionary that searches the selected word on the page.
-		 * Note: This API is available only on macOS.
-		 */
-		showDefinitionForSelection(): void;
-		/**
-		 * @returns Whether offscreen rendering is enabled.
-		 */
-		isOffscreen(): boolean;
-		/**
-		 * If offscreen rendering is enabled and not painting, start painting.
-		 */
-		startPainting(): void;
-		/**
-		 * If offscreen rendering is enabled and painting, stop painting.
-		 */
-		stopPainting(): void;
-		/**
-		 * If offscreen rendering is enabled returns whether it is currently painting.
-		 */
-		isPainting(): boolean;
-		/**
-		 * If offscreen rendering is enabled sets the frame rate to the specified number.
-		 * Only values between 1 and 60 are accepted.
-		 */
-		setFrameRate(fps: number): void;
-		/**
-		 * If offscreen rendering is enabled returns the current frame rate.
-		 */
-		getFrameRate(): number;
-		/**
-		 * If offscreen rendering is enabled invalidates the frame and generates a new one through the 'paint' event.
-		 */
-		invalidate(): void;
-		/**
-		 * Sets the item as dragging item for current drag-drop operation.
-		 */
-		startDrag(item: DragItem): void;
-		/**
-		 * Captures a snapshot of the page within rect.
-		 */
-		capturePage(callback: (image: NativeImage) => void): void;
-		/**
-		 * Captures a snapshot of the page within rect.
-		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
-		/**
-		 * @returns The unique ID of this WebContents.
-		 */
-		id: number;
-		/**
-		 * @returns The session object used by this webContents.
-		 */
-		session: Session;
-		/**
-		 * @returns The WebContents that might own this WebContents.
-		 */
-		hostWebContents: WebContents;
-		/**
-		 * @returns The WebContents of DevTools for this WebContents.
-		 * Note: Users should never store this object because it may become null
-		 * when the DevTools has been closed.
-		 */
-		devToolsWebContents: WebContents;
-		/**
-		 * @returns Debugger API
-		 */
-		debugger: Debugger;
-	}
-
-	interface BeginFrameSubscriptionCallback {
-		(
-			/**
-			 * The frameBuffer is a Buffer that contains raw pixel data.
-			 * On most machines, the pixel data is effectively stored in 32bit BGRA format,
-			 * but the actual representation depends on the endianness of the processor
-			 * (most modern processors are little-endian, on machines with big-endian
-			 * processors the data is in 32bit ARGB format).
-			 */
-			frameBuffer: Buffer,
-			/**
-			 * The dirtyRect is an object with x, y, width, height properties that describes which part of the page was repainted.
-			 * If onlyDirty is set to true, frameBuffer will only contain the repainted area. onlyDirty defaults to false.
-			 */
-			dirtyRect?: Rectangle
-		): void
-	}
-
-	interface ContextMenuParams {
-		/**
-		 * x coordinate
-		 */
-		x: number;
-		/**
-		 * y coordinate
-		 */
-		y: number;
-		/**
-		 * URL of the link that encloses the node the context menu was invoked on.
-		 */
-		linkURL: string;
-		/**
-		 * Text associated with the link. May be an empty string if the contents of the link are an image.
-		 */
-		linkText: string;
-		/**
-		 * URL of the top level page that the context menu was invoked on.
-		 */
-		pageURL: string;
-		/**
-		 * URL of the subframe that the context menu was invoked on.
-		 */
-		frameURL: string;
-		/**
-		 * Source URL for the element that the context menu was invoked on.
-		 * Elements with source URLs are images, audio and video.
-		 */
-		srcURL: string;
-		/**
-		 * Type of the node the context menu was invoked on.
-		 */
-		mediaType: 'none' | 'image' | 'audio' | 'video' | 'canvas' | 'file' | 'plugin';
-		/**
-		 * Parameters for the media element the context menu was invoked on.
-		 */
-		mediaFlags: {
-			/**
-			 * Whether the media element has crashed.
-			 */
-			inError: boolean;
-			/**
-			 * Whether the media element is paused.
-			 */
-			isPaused: boolean;
-			/**
-			 * Whether the media element is muted.
-			 */
-			isMuted: boolean;
-			/**
-			 * Whether the media element has audio.
-			 */
-			hasAudio: boolean;
-			/**
-			 * Whether the media element is looping.
-			 */
-			isLooping: boolean;
-			/**
-			 * Whether the media element's controls are visible.
-			 */
-			isControlsVisible: boolean;
-			/**
-			 * Whether the media element's controls are toggleable.
-			 */
-			canToggleControls: boolean;
-			/**
-			 * Whether the media element can be rotated.
-			 */
-			canRotate: boolean;
-		}
-		/**
-		 * Whether the context menu was invoked on an image which has non-empty contents.
-		 */
-		hasImageContents: boolean;
-		/**
-		 * Whether the context is editable.
-		 */
-		isEditable: boolean;
-		/**
-		 * These flags indicate whether the renderer believes it is able to perform the corresponding action.
-		 */
-		editFlags: {
-			/**
-			 * Whether the renderer believes it can undo.
-			 */
-			canUndo: boolean;
-			/**
-			 * Whether the renderer believes it can redo.
-			 */
-			canRedo: boolean;
-			/**
-			 * Whether the renderer believes it can cut.
-			 */
-			canCut: boolean;
-			/**
-			 * Whether the renderer believes it can copy
-			 */
-			canCopy: boolean;
-			/**
-			 * Whether the renderer believes it can paste.
-			 */
-			canPaste: boolean;
-			/**
-			 * Whether the renderer believes it can delete.
-			 */
-			canDelete: boolean;
-			/**
-			 * Whether the renderer believes it can select all.
-			 */
-			canSelectAll: boolean;
-		}
-		/**
-		 * Text of the selection that the context menu was invoked on.
-		 */
-		selectionText: string;
-		/**
-		 * Title or alt text of the selection that the context was invoked on.
-		 */
-		titleText: string;
-		/**
-		 * The misspelled word under the cursor, if any.
-		 */
-		misspelledWord: string;
-		/**
-		 * The character encoding of the frame on which the menu was invoked.
-		 */
-		frameCharset: string;
-		/**
-		 * If the context menu was invoked on an input field, the type of that field.
-		 */
-		inputFieldType: 'none' | 'plainText' | 'password' | 'other';
-		/**
-		 * Input source that invoked the context menu.
-		 */
-		menuSourceType: 'none' | 'mouse' | 'keyboard' | 'touch' | 'touchMenu';
-	}
-
-	interface BluetoothDevice {
-		deviceName: string;
-		deviceId: string;
-	}
-
-	interface Headers {
-		[key: string]: string;
-	}
-
-	type NewWindowDisposition = 'default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other';
-
-	/**
-	 * Specifies the action to take place when ending webContents.findInPage request.
-	 * 'clearSelection' - Clear the selection.
-	 * 'keepSelection' - Translate the selection into a normal selection.
-	 * 'activateSelection' - Focus and click the selection node.
-	 */
-	type StopFindInPageAtion = 'clearSelection' | 'keepSelection' | 'activateSelection';
-
-	type CursorType = 'default' | 'crosshair' | 'pointer' | 'text' | 'wait' | 'help' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ns-resize' | 'ew-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'm-panning' | 'e-panning' | 'n-panning' | 'ne-panning' | 'nw-panning' | 's-panning' | 'se-panning' |'sw-panning' | 'w-panning' | 'move' | 'vertical-text' | 'cell' | 'context-menu' | 'alias' | 'progress' | 'nodrop' | 'copy' | 'none' | 'not-allowed' | 'zoom-in' | 'zoom-out' | 'grab' | 'grabbing' | 'custom';
-
-	interface LoadURLOptions {
-		/**
-		 * HTTP Referrer URL.
-		 */
-		httpReferrer?: string;
-		/**
-		 * User agent originating the request.
-		 */
-		userAgent?: string;
-		/**
-		 * Extra headers separated by "\n"
-		 */
-		extraHeaders?: string;
-		/**
-		 * POST data
-		 */
-		postData?: (UploadRawData | UploadFileSystem | UploadBlob)[];
-	}
-
-	interface UploadRawData {
-		/**
-		 * rawData
-		 */
-		type: 'rawData';
-		/**
-		 * Data to be uploaded.
-		 */
-		bytes: Buffer;
-	}
-
-	interface UploadFileSystem {
-		/**
-		 * fileSystem
-		 */
-		type: 'fileSystem';
-		/**
-		 * FileSystem url to read data for upload.
-		 */
-		fileSystemURL: string;
-		/**
-		 * Defaults to 0.
-		 */
-		offset: number;
-		/**
-		 * Number of bytes to read from offset. Defaults to 0.
-		 */
-		length: number;
-		/**
-		 * Last Modification time in number of seconds sine the UNIX epoch.
-		 */
-		modificationTime: number;
-	}
-
-	interface UploadBlob {
-		/**
-		 * blob
-		 */
-		type: 'blob';
-		/**
-		 * UUID of blob data to upload.
-		 */
-		blobUUID: string;
-	}
-
-	interface PrintOptions {
-		/**
-		 * Don't ask user for print settings.
-		 * Defaults: false.
-		 */
-		silent?: boolean;
-		/**
-		 * Also prints the background color and image of the web page.
-		 * Defaults: false.
-		 */
-		printBackground?: boolean;
-	}
-
-	interface PrintToPDFOptions {
-		/**
-		 * Specify the type of margins to use.
-		 *   0 - default
-		 *   1 - none
-		 *   2 - minimum
-		 * Default: 0
-		 */
-		marginsType?: number;
-		/**
-		 * Specify page size of the generated PDF.
-		 * Default: A4.
-		 */
-		pageSize?: 'A3' | 'A4' | 'A5' | 'Legal' | 'Letter' | 'Tabloid' | Size;
-		/**
-		 * Whether to print CSS backgrounds.
-		 * Default: false.
-		 */
-		printBackground?: boolean;
-		/**
-		 * Whether to print selection only.
-		 * Default: false.
-		 */
-		printSelectionOnly?: boolean;
-		/**
-		 * true for landscape, false for portrait.
-		 * Default: false.
-		 */
-		landscape?: boolean;
-	}
-
-	interface Certificate {
-		/**
-		 * PEM encoded data.
-		 */
-		data: string;
-		/**
-		 * Issuer principal
-		 */
-		issuer: CertificatePrincipal;
-		/**
-		 * Issuer's Common Name.
-		 */
-		issuerName: string;
-		/**
-		 * Issuer certificate (if not self-signed)
-		 */
-		issuerCert: Certificate;
-		/**
-		 * Subject principal
-		 */
-		subject: CertificatePrincipal;
-		/**
-		 * Subject's Common Name.
-		 */
-		subjectName: string;
-		/**
-		 * Hex value represented string.
-		 */
-		serialNumber: string;
-		/**
-		 * Start date of the certificate being valid in seconds.
-		 */
-		validStart: number;
-		/**
-		 * End date of the certificate being valid in seconds.
-		 */
-		validExpiry: number;
-		/**
-		 * Fingerprint of the certificate.
-		 */
-		fingerprint: string;
-	}
-
-	interface CertificatePrincipal {
-		/**
-		 * Common Name
-		 */
-		commonName: string;
-		/**
-		 * Organization names
-		 */
-		organizations: string[];
-		/**
-		 * Organization Unit names
-		 */
-		organizationUnits: string[];
-		/**
-		 * Locality
-		 */
-		locality: string;
-		/**
-		 * State or province
-		 */
-		state: string;
-		/**
-		 * Country or region
-		 */
-		country: string;
-	}
-
-	interface LoginRequest {
-		method: string;
-		url: string;
-		referrer: string;
-	}
-
-	interface LoginAuthInfo {
-		isProxy: boolean;
-		scheme: string;
-		host: string;
-		port: number;
-		realm: string;
-	}
-
-	interface FindInPageOptions {
-		/**
-		 * Whether to search forward or backward, defaults to true
-		 */
-		forward?: boolean;
-		/**
-		 * Whether the operation is first request or a follow up, defaults to false.
-		 */
-		findNext?: boolean;
-		/**
-		 * Whether search should be case-sensitive, defaults to false.
-		 */
-		matchCase?: boolean;
-		/**
-		 * Whether to look only at the start of words. defaults to false.
-		 */
-		wordStart?: boolean;
-		/**
-		 * When combined with wordStart, accepts a match in the middle of a word
-		 * if the match begins with an uppercase letter followed by a lowercase
-		 * or non-letter. Accepts several other intra-word matches, defaults to false.
-		 */
-		medialCapitalAsWordStart?: boolean;
-	}
-
-	interface FoundInPageResult {
-		requestId: number;
-		/**
-		 * Indicates if more responses are to follow.
-		 */
-		finalUpdate: boolean;
-		/**
-		 * Position of the active match.
-		 */
-		activeMatchOrdinal?: number;
-		/**
-		 * Number of Matches.
-		 */
-		matches?: number;
-		/**
-		 * Coordinates of first match region.
-		 */
-		selectionArea?: Rectangle;
-	}
-
-	interface DeviceEmulationParameters {
-		/**
-		 * Specify the screen type to emulated
-		 * Default: desktop
-		 */
-		screenPosition?: 'desktop' | 'mobile';
-		/**
-		 * Set the emulated screen size (screenPosition == mobile)
-		 */
-		screenSize?: Size;
-		/**
-		 * Position the view on the screen (screenPosition == mobile)
-		 * Default: {x: 0, y: 0}
-		 */
-		viewPosition?: Point;
-		/**
-		 * Set the device scale factor (if zero defaults to original device scale factor)
-		 * Default: 0
-		 */
-		deviceScaleFactor: number;
-		/**
-		 * Set the emulated view size (empty means no override).
-		 */
-		viewSize?: Size;
-		/**
-		 * Whether emulated view should be scaled down if necessary to fit into available space
-		 * Default: false
-		 */
-		fitToView?: boolean;
-		/**
-		 * Offset of the emulated view inside available space (not in fit to view mode)
-		 * Default: {x: 0, y: 0}
-		 */
-		offset?: Point;
-		/**
-		 * Scale of emulated view inside available space (not in fit to view mode)
-		 * Default: 1
-		 */
-		scale: number;
-	}
-
-	interface SendInputEvent {
-		type: 'mouseDown' | 'mouseUp' | 'mouseEnter' | 'mouseLeave' | 'contextMenu' | 'mouseWheel' | 'mouseMove' | 'keyDown' | 'keyUp' | 'char';
-		modifiers: ('shift' | 'control' | 'alt' | 'meta' | 'isKeypad' | 'isAutoRepeat' | 'leftButtonDown' | 'middleButtonDown' | 'rightButtonDown' | 'capsLock' | 'numLock' | 'left' | 'right')[];
-	}
-
-	interface SendInputKeyboardEvent extends SendInputEvent {
-		keyCode: string;
-	}
-
-	interface SendInputMouseEvent extends SendInputEvent {
-		x: number;
-		y: number;
-		button?: 'left' | 'middle' | 'right';
-		globalX?: number;
-		globalY?: number;
-		movementX?: number;
-		movementY?: number;
-		clickCount?: number;
-	}
-
-	interface SendInputMouseWheelEvent extends SendInputEvent {
-		deltaX?: number;
-		deltaY?: number;
-		wheelTicksX?: number;
-		wheelTicksY?: number;
-		accelerationRatioX?: number;
-		accelerationRatioY?: number;
-		hasPreciseScrollingDeltas?: boolean;
-		canScroll?: boolean;
-	}
-
-	/**
-	 * Debugger API serves as an alternate transport for remote debugging protocol.
-	 */
-	interface Debugger extends NodeJS.EventEmitter {
-		/**
-		 * Attaches the debugger to the webContents.
-		 * @param protocolVersion Requested debugging protocol version.
-		 */
-		attach(protocolVersion?: string): void;
-		/**
-		 * @returns Whether a debugger is attached to the webContents.
-		 */
-		isAttached(): boolean;
-		/**
-		 * Detaches the debugger from the webContents.
-		 */
-		detach(): void;
-		/**
-		 * Send given command to the debugging target.
-		 * @param method Method name, should be one of the methods defined by the remote debugging protocol.
-		 * @param commandParams JSON object with request parameters.
-		 * @param callback Response defined by the ‘returns’ attribute of the command description in the remote debugging protocol.
-		 */
-		sendCommand(method: string, commandParams?: any, callback?: (error: Error, result: any) => void): void;
-		/**
-		 * Emitted when debugging session is terminated. This happens either when
-		 * webContents is closed or devtools is invoked for the attached webContents.
-		 */
-		on(event: 'detach', listener: (event: Event, reason: string) => void): this;
-		/**
-		 * Emitted whenever debugging target issues instrumentation event.
-		 * Event parameters defined by the ‘parameters’ attribute in the remote debugging protocol.
-		 */
-		on(event: 'message', listener: (event: Event, method: string, params: any) => void): this;
-		on(event: string, listener: Function): this;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/web-frame.md
-
-	/**
-	 * The web-frame module allows you to customize the rendering of the current web page.
-	 */
-	interface WebFrame {
-		/**
-		 * Changes the zoom factor to the specified factor, zoom factor is
-		 * zoom percent / 100, so 300% = 3.0.
-		 */
-		setZoomFactor(factor: number): void;
-		/**
-		 * @returns The current zoom factor.
-		 */
-		getZoomFactor(): number;
-		/**
-		 * Changes the zoom level to the specified level, 0 is "original size", 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): void;
-		/**
-		 * @returns The current zoom level.
-		 */
-		getZoomLevel(): number;
-		/**
-		 * Sets the maximum and minimum zoom level.
-		 */
-		setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
-		/**
-		 * Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
-		 */
-		setLayoutZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
-		/**
-		 * Sets a provider for spell checking in input fields and text areas.
-		 */
-		setSpellCheckProvider(language: string, autoCorrectWord: boolean, provider: {
-			/**
-			 * @returns Whether the word passed is correctly spelled.
-			 */
-			spellCheck: (text: string) => boolean;
-		}): void;
-		/**
-		 * Sets the scheme as secure scheme. Secure schemes do not trigger mixed content
-		 * warnings. For example, https and data are secure schemes because they cannot be
-		 * corrupted by active network attackers.
-		 */
-		registerURLSchemeAsSecure(scheme: string): void;
-		/**
-		 * Resources will be loaded from this scheme regardless of the current page’s Content Security Policy.
-		 */
-		registerURLSchemeAsBypassingCSP(scheme: string): void;
-		/**
-		 * Registers the scheme as secure, bypasses content security policy for resources,
-		 * allows registering ServiceWorker and supports fetch API.
-		 */
-		registerURLSchemeAsPrivileged(scheme: string, options?: RegisterURLSchemeOptions): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Evaluates `code` in page.
-		 * In the browser window some HTML APIs like `requestFullScreen` can only be
-		 * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
-		 * this limitation.
-		 *
-		 * @returns Promise
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
-		/**
-		 * @returns Object describing usage information of Blink’s internal memory caches.
-		 */
-		getResourceUsage(): ResourceUsages;
-		/**
-		 * Attempts to free memory that is no longer being used (like images from a previous navigation).
-		 */
-		clearCache(): void;
-	}
-
-	interface ResourceUsages {
-		fonts: ResourceUsage;
-		images: ResourceUsage;
-		cssStyleSheets: ResourceUsage;
-		xslStyleSheets: ResourceUsage;
-		scripts: ResourceUsage;
-		other: ResourceUsage;
-	}
-
-	interface ResourceUsage {
-		count: number;
-		decodedSize: number;
-		liveSize: number;
-		purgeableSize: number;
-		purgedSize: number;
-		size: number;
-	}
-
-	interface RegisterURLSchemeOptions {
-		secure?: boolean;
-		bypassCSP?: boolean;
-		allowServiceWorkers?: boolean;
-		supportFetchAPI?: boolean;
-		corsEnabled?: boolean;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/web-view-tag.md
-
-	/**
-	 * Use the webview tag to embed 'guest' content (such as web pages) in your Electron app.
-	 * The guest content is contained within the webview container.
-	 * An embedded page within your app controls how the guest content is laid out and rendered.
-	 *
-	 * Unlike an iframe, the webview runs in a separate process than your app.
-	 * It doesn't have the same permissions as your web page and all interactions between your app
-	 * and embedded content will be asynchronous. This keeps your app safe from the embedded content.
-	 */
-	interface WebViewElement extends HTMLElement {
-		/**
-		 * Returns the visible URL. Writing to this attribute initiates top-level navigation.
-		 * Assigning src its own value will reload the current page.
-		 * The src attribute can also accept data URLs, such as data:text/plain,Hello, world!.
-		 */
-		src: string;
-		/**
-		 * If "on", the webview container will automatically resize within the bounds specified
-		 * by the attributes minwidth, minheight, maxwidth, and maxheight.
-		 * These constraints do not impact the webview unless autosize is enabled.
-		 * When autosize is enabled, the webview container size cannot be less than
-		 * the minimum values or greater than the maximum.
-		 */
-		autosize: string;
-		/**
-		 * If "on", the guest page in webview will have node integration and can use node APIs
-		 * like require and process to access low level system resources.
-		 */
-		nodeintegration: string;
-		/**
-		 * If "on", the guest page in webview will be able to use browser plugins.
-		 */
-		plugins: string;
-		/**
-		 * Specifies a script that will be loaded before other scripts run in the guest page.
-		 * The protocol of script's URL must be either file: or asar:,
-		 * because it will be loaded by require in guest page under the hood.
-		 *
-		 * When the guest page doesn't have node integration this script will still have access to all Node APIs,
-		 * but global objects injected by Node will be deleted after this script has finished executing.
-		 */
-		preload: string;
-		/**
-		 * Sets the referrer URL for the guest page.
-		 */
-		httpreferrer: string;
-		/**
-		 * Sets the user agent for the guest page before the page is navigated to.
-		 * Once the page is loaded, use the setUserAgent method to change the user agent.
-		 */
-		useragent: string;
-		/**
-		 * If "on", the guest page will have web security disabled.
-		 */
-		disablewebsecurity: string;
-		/**
-		 * Sets the session used by the page. If partition starts with persist:,
-		 * the page will use a persistent session available to all pages in the app with the same partition.
-		 * If there is no persist: prefix, the page will use an in-memory session.
-		 * By assigning the same partition, multiple pages can share the same session.
-		 * If the partition is unset then default session of the app will be used.
-		 *
-		 * This value can only be modified before the first navigation,
-		 * since the session of an active renderer process cannot change.
-		 * Subsequent attempts to modify the value will fail with a DOM exception.
-		 */
-		partition: string;
-		/**
-		 * If "on", the guest page will be allowed to open new windows.
-		 */
-		allowpopups: string;
-		/**
-		 * A list of strings which specifies the web preferences to be set on the webview, separated by ,.
-		 */
-		webpreferences: string;
-		/**
-		 * A list of strings which specifies the blink features to be enabled separated by ,.
-		 */
-		blinkfeatures: string;
-		/**
-		 * A list of strings which specifies the blink features to be disabled separated by ,.
-		 */
-		disableblinkfeatures: string;
-		/**
-		 * A value that links the webview to a specific webContents.
-		 * When a webview first loads a new webContents is created and this attribute is set
-		 * to its instance identifier. Setting this attribute on a new or existing webview connects
-		 * it to the existing webContents that currently renders in a different webview.
-		 *
-		 * The existing webview will see the destroy event and will then create a new webContents when a new url is loaded.
-		 */
-		guestinstance: string;
-		/**
-		 * Loads the url in the webview, the url must contain the protocol prefix, e.g. the http:// or file://.
-		 */
-		loadURL(url: string, options?: LoadURLOptions): void;
-		/**
-		 * @returns URL of guest page.
-		 */
-		getURL(): string;
-		/**
-		 * @returns The title of guest page.
-		 */
-		getTitle(): string;
-		/**
-		 * @returns Whether the web page is destroyed.
-		 */
-		isDestroyed(): boolean;
-		/**
-		 * @returns Whether the web page is focused.
-		 */
-		isFocused(): boolean;
-		/**
-		 * @returns Whether guest page is still loading resources.
-		 */
-		isLoading(): boolean;
-		/**
-		 * Returns a boolean whether the guest page is waiting for a first-response for the main resource of the page.
-		 */
-		isWaitingForResponse(): boolean;
-		/**
-		 * Stops any pending navigation.
-		 */
-		stop(): void;
-		/**
-		 * Reloads the guest page.
-		 */
-		reload(): void;
-		/**
-		 * Reloads the guest page and ignores cache.
-		 */
-		reloadIgnoringCache(): void;
-		/**
-		 * @returns Whether the guest page can go back.
-		 */
-		canGoBack(): boolean;
-		/**
-		 * @returns Whether the guest page can go forward.
-		 */
-		canGoForward(): boolean;
-		/**
-		 * @returns Whether the guest page can go to offset.
-		 */
-		canGoToOffset(offset: number): boolean;
-		/**
-		 * Clears the navigation history.
-		 */
-		clearHistory(): void;
-		/**
-		 * Makes the guest page go back.
-		 */
-		goBack(): void;
-		/**
-		 * Makes the guest page go forward.
-		 */
-		goForward(): void;
-		/**
-		 * Navigates to the specified absolute index.
-		 */
-		goToIndex(index: number): void;
-		/**
-		 * Navigates to the specified offset from the "current entry".
-		 */
-		goToOffset(offset: number): void;
-		/**
-		 * @returns Whether the renderer process has crashed.
-		 */
-		isCrashed(): boolean;
-		/**
-		 * Overrides the user agent for the guest page.
-		 */
-		setUserAgent(userAgent: string): void;
-		/**
-		 * @returns The user agent for guest page.
-		 */
-		getUserAgent(): string;
-		/**
-		 * Injects CSS into the guest page.
-		 */
-		insertCSS(css: string): void;
-		/**
-		 * Evaluates code in page. If userGesture is set, it will create the user gesture context in the page.
-		 * HTML APIs like requestFullScreen, which require user action, can take advantage of this option for automation.
-		 *
-		 * @returns Promise
-		 */
-		executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): Promise<any>;
-		/**
-		 * Opens a DevTools window for guest page.
-		 */
-		openDevTools(): void;
-		/**
-		 * Closes the DevTools window of guest page.
-		 */
-		closeDevTools(): void;
-		/**
-		 * @returns Whether guest page has a DevTools window attached.
-		 */
-		isDevToolsOpened(): boolean;
-		/**
-		 * @returns Whether DevTools window of guest page is focused.
-		 */
-		isDevToolsFocused(): boolean;
-		/**
-		 * Starts inspecting element at position (x, y) of guest page.
-		 */
-		inspectElement(x: number, y: number): void;
-		/**
-		 * Opens the DevTools for the service worker context present in the guest page.
-		 */
-		inspectServiceWorker(): void;
-		/**
-		 * Set guest page muted.
-		 */
-		setAudioMuted(muted: boolean): void;
-		/**
-		 * @returns Whether guest page has been muted.
-		 */
-		isAudioMuted(): boolean;
-		/**
-		 * Executes editing command undo in page.
-		 */
-		undo(): void;
-		/**
-		 * Executes editing command redo in page.
-		 */
-		redo(): void;
-		/**
-		 * Executes editing command cut in page.
-		 */
-		cut(): void;
-		/**
-		 * Executes editing command copy in page.
-		 */
-		copy(): void;
-		/**
-		 * Executes editing command paste in page.
-		 */
-		paste(): void;
-		/**
-		 * Executes editing command pasteAndMatchStyle in page.
-		 */
-		pasteAndMatchStyle(): void;
-		/**
-		 * Executes editing command delete in page.
-		 */
-		delete(): void;
-		/**
-		 * Executes editing command selectAll in page.
-		 */
-		selectAll(): void;
-		/**
-		 * Executes editing command unselect in page.
-		 */
-		unselect(): void;
-		/**
-		 * Executes editing command replace in page.
-		 */
-		replace(text: string): void;
-		/**
-		 * Executes editing command replaceMisspelling in page.
-		 */
-		replaceMisspelling(text: string): void;
-		/**
-		 * Inserts text to the focused element.
-		 */
-		insertText(text: string): void;
-		/**
-		 * Starts a request to find all matches for the text in the web page.
-		 * The result of the request can be obtained by subscribing to found-in-page event.
-		 * @returns The request id used for the request.
-		 */
-		findInPage(text: string, options?: FindInPageOptions): number;
-		/**
-		 * Stops any findInPage request for the webview with the provided action.
-		 */
-		stopFindInPage(action: StopFindInPageAtion): void;
-		/**
-		 * Prints webview's web page. Same with webContents.print([options]).
-		 */
-		print(options?: PrintOptions): void;
-		/**
-		 * Prints webview's web page as PDF, Same with webContents.printToPDF(options, callback)
-		 */
-		printToPDF(options: PrintToPDFOptions, callback: (error: Error, data: Buffer) => void): void;
-		/**
-		 * Send an asynchronous message to renderer process via channel, you can also send arbitrary arguments.
-		 * The renderer process can handle the message by listening to the channel event with the ipcRenderer module.
-		 * See webContents.send for examples.
-		 */
-		send(channel: string, ...args: any[]): void;
-		/**
-		 * Sends an input event to the page.
-		 * See webContents.sendInputEvent for detailed description of event object.
-		 */
-		sendInputEvent(event: SendInputEvent): void
-		/**
-		 * Changes the zoom factor to the specified factor.
-		 * Zoom factor is zoom percent divided by 100, so 300% = 3.0.
-		 */
-		setZoomFactor(factor: number): void;
-		/**
-		 * Changes the zoom level to the specified level.
-		 * 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): void;
-		/**
-		 * Shows pop-up dictionary that searches the selected word on the page.
-		 * Note: This API is available only on macOS.
-		 */
-		showDefinitionForSelection(): void;
-		/**
-		 * @returns The WebContents associated with this webview.
-		 */
-		getWebContents(): WebContents;
-		/**
-		 * Captures a snapshot of the webview's page. Same as webContents.capturePage([rect, ]callback).
-		 */
-		capturePage(callback: (image: NativeImage) => void): void;
-		/**
-		 * Captures a snapshot of the webview's page. Same as webContents.capturePage([rect, ]callback).
-		 */
-		capturePage(rect: Rectangle, callback: (image: NativeImage) => void): void;
-		/**
-		 * Fired when a load has committed. This includes navigation within the current document
-		 * as well as subframe document-level loads, but does not include asynchronous resource loads.
-		 */
-		addEventListener(type: 'load-commit', listener: (event: WebViewElement.LoadCommitEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the navigation is done, i.e. the spinner of the tab will stop spinning, and the onload event is dispatched.
-		 */
-		addEventListener(type: 'did-finish-load', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * This event is like did-finish-load, but fired when the load failed or was cancelled, e.g. window.stop() is invoked.
-		 */
-		addEventListener(type: 'did-fail-load', listener: (event: WebViewElement.DidFailLoadEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a frame has done navigation.
-		 */
-		addEventListener(type: 'did-frame-finish-load', listener: (event: WebViewElement.DidFrameFinishLoadEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab starts spinning.
-		 */
-		addEventListener(type: 'did-start-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Corresponds to the points in time when the spinner of the tab stops spinning.
-		 */
-		addEventListener(type: 'did-stop-loading', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when details regarding a requested resource is available.
-		 * status indicates socket connection to download the resource.
-		 */
-		addEventListener(type: 'did-get-response-details', listener: (event: WebViewElement.DidGetResponseDetails) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a redirect was received while requesting a resource.
-		 */
-		addEventListener(type: 'did-get-redirect-request', listener: (event: WebViewElement.DidGetRedirectRequestEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when document in the given frame is loaded.
-		 */
-		addEventListener(type: 'dom-ready', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page title is set during navigation. explicitSet is false when title is synthesized from file URL.
-		 */
-		addEventListener(type: 'page-title-updated', listener: (event: WebViewElement.PageTitleUpdatedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page receives favicon URLs.
-		 */
-		addEventListener(type: 'page-favicon-updated', listener: (event: WebViewElement.PageFaviconUpdatedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page enters fullscreen triggered by HTML API.
-		 */
-		addEventListener(type: 'enter-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when page leaves fullscreen triggered by HTML API.
-		 */
-		addEventListener(type: 'leave-html-full-screen', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest window logs a console message.
-		 */
-		addEventListener(type: 'console-message', listener: (event: WebViewElement.ConsoleMessageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a result is available for webview.findInPage request.
-		 */
-		addEventListener(type: 'found-in-page', listener: (event: WebViewElement.FoundInPageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page attempts to open a new browser window.
-		 */
-		addEventListener(type: 'new-window', listener: (event: WebViewElement.NewWindowEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a user or the page wants to start navigation.
-		 * It can happen when the window.location object is changed or a user clicks a link in the page.
-		 *
-		 * This event will not emit when the navigation is started programmatically with APIs
-		 * like <webview>.loadURL and <webview>.back.
-		 *
-		 * It is also not emitted during in-page navigation, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 *
-		 * Calling event.preventDefault() does NOT have any effect.
-		 */
-		addEventListener(type: 'will-navigate', listener: (event: WebViewElement.WillNavigateEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a navigation is done.
-		 *
-		 * This event is not emitted for in-page navigations, such as clicking anchor links
-		 * or updating the window.location.hash. Use did-navigate-in-page event for this purpose.
-		 */
-		addEventListener(type: 'did-navigate', listener: (event: WebViewElement.DidNavigateEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when an in-page navigation happened.
-		 *
-		 * When in-page navigation happens, the page URL changes but does not cause
-		 * navigation outside of the page. Examples of this occurring are when anchor links
-		 * are clicked or when the DOM hashchange event is triggered.
-		 */
-		addEventListener(type: 'did-navigate-in-page', listener: (event: WebViewElement.DidNavigateInPageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page attempts to close itself.
-		 */
-		addEventListener(type: 'close', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the guest page has sent an asynchronous message to embedder page.
-		 */
-		addEventListener(type: 'ipc-message', listener: (event: WebViewElement.IpcMessageEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the renderer process is crashed.
-		 */
-		addEventListener(type: 'crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the gpu process is crashed.
-		 */
-		addEventListener(type: 'gpu-crashed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when a plugin process is crashed.
-		 */
-		addEventListener(type: 'plugin-crashed', listener: (event: WebViewElement.PluginCrashedEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Fired when the WebContents is destroyed.
-		 */
-		addEventListener(type: 'destroyed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when media starts playing.
-		 */
-		addEventListener(type: 'media-started-playing', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when media is paused or done playing.
-		 */
-		addEventListener(type: 'media-paused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when a page's theme color changes. This is usually due to encountering a meta tag:
-		 * <meta name='theme-color' content='#ff0000'>
-		 */
-		addEventListener(type: 'did-change-theme-color', listener: (event: WebViewElement.DidChangeThemeColorEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when mouse moves over a link or the keyboard moves the focus to a link.
-		 */
-		addEventListener(type: 'update-target-url', listener: (event: WebViewElement.UpdateTargetUrlEvent) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is opened.
-		 */
-		addEventListener(type: 'devtools-opened', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is closed.
-		 */
-		addEventListener(type: 'devtools-closed', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		/**
-		 * Emitted when DevTools is focused / opened.
-		 */
-		addEventListener(type: 'devtools-focused', listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-		addEventListener(type: string, listener: (event: WebViewElement.Event) => void, useCapture?: boolean): void;
-	}
-
-	namespace WebViewElement {
-		type Event = ElectronPrivate.GlobalEvent;
-
-		interface LoadCommitEvent extends Event  {
-			url: string;
-			isMainFrame: boolean;
-		}
-
-		interface DidFailLoadEvent extends Event  {
-			errorCode: number;
-			errorDescription: string;
-			validatedURL: string;
-			isMainFrame: boolean;
-		}
-
-		interface DidFrameFinishLoadEvent extends Event  {
-			isMainFrame: boolean;
-		}
-
-		interface DidGetResponseDetails extends Event  {
-			status: boolean;
-			newURL: string;
-			originalURL: string;
-			httpResponseCode: number;
-			requestMethod: string;
-			referrer: string;
-			headers: Headers;
-			resourceType: string;
-		}
-
-		interface DidGetRedirectRequestEvent extends Event {
-			oldURL: string;
-			newURL: string;
-			isMainFrame: boolean;
-			httpResponseCode: number;
-			requestMethod: string;
-			referrer: string;
-			headers: Headers;
-		}
-
-		interface PageTitleUpdatedEvent extends Event {
-			title: string;
-			explicitSet: string;
-		}
-
-		interface PageFaviconUpdatedEvent extends Event {
-			favicons: string[];
-		}
-
-		interface ConsoleMessageEvent extends Event {
-			level: number;
-			message: string;
-			line: number;
-			sourceId: string;
-		}
-
-		interface FoundInPageEvent extends Event {
-			result: FoundInPageResult;
-		}
-
-		interface NewWindowEvent extends Event {
-			url: string;
-			frameName: string;
-			disposition: NewWindowDisposition;
-			options: BrowserWindowOptions;
-		}
-
-		interface WillNavigateEvent extends Event {
-			url: string;
-		}
-
-		interface DidNavigateEvent extends Event {
-			url: string;
-		}
-
-		interface DidNavigateInPageEvent extends Event {
-			url: string;
-			isMainFrame: boolean;
-		}
-
-		interface IpcMessageEvent extends Event {
-			channel: string;
-			args: any[];
-		}
-
-		interface PluginCrashedEvent extends Event {
-			name: string;
-			version: string;
-		}
-
-		interface DidChangeThemeColorEvent extends Event {
-			themeColor: string;
-		}
-
-		interface UpdateTargetUrlEvent extends Event {
-			url: string;
-		}
-	}
-
-	/**
-	 * The BrowserWindowProxy object is returned from window.open and provides limited functionality with the child window.
-	 */
-	interface BrowserWindowProxy {
-		/**
-		 * Removes focus from the child window.
-		 */
-		blur(): void;
-		/**
-		 * Forcefully closes the child window without calling its unload event.
-		 */
-		close(): void;
-		/**
-		 * Set to true after the child window gets closed.
-		 */
-		closed: boolean;
-		/**
-		 * Evaluates the code in the child window.
-		 */
-		eval(code: string): void;
-		/**
-		 * Focuses the child window (brings the window to front).
-		 */
-		focus(): void;
-		/**
-		 * Sends a message to the child window with the specified origin or * for no origin preference.
-		 * In addition to these methods, the child window implements window.opener object with no
-		 * properties and a single method.
-		 */
-		postMessage(message: string, targetOrigin: string): void;
-		/**
-		 * Invokes the print dialog on the child window.
-		 */
-		print(): void;
-	}
-
-	// https://github.com/electron/electron/blob/master/docs/api/synopsis.md
-
-	interface CommonElectron {
-		clipboard: Electron.Clipboard;
-		crashReporter: Electron.CrashReporter;
-		nativeImage: typeof Electron.NativeImage;
-		shell: Electron.Shell;
-
-		app: Electron.App;
-		autoUpdater: Electron.AutoUpdater;
-		BrowserWindow: typeof Electron.BrowserWindow;
-		contentTracing: Electron.ContentTracing;
-		dialog: Electron.Dialog;
-		ipcMain: Electron.IpcMain;
-		globalShortcut: Electron.GlobalShortcut;
-		Menu: typeof Electron.Menu;
-		MenuItem: typeof Electron.MenuItem;
-		net: Electron.Net;
-		powerMonitor: Electron.PowerMonitor;
-		powerSaveBlocker: Electron.PowerSaveBlocker;
-		protocol: Electron.Protocol;
-		screen: Electron.Screen;
-		session: typeof Electron.Session;
-		systemPreferences: Electron.SystemPreferences;
-		Tray: typeof Electron.Tray;
-		webContents: Electron.WebContentsStatic;
-	}
-
-	interface ElectronMainAndRenderer extends CommonElectron {
-		desktopCapturer: Electron.DesktopCapturer;
-		ipcRenderer: Electron.IpcRenderer;
-		remote: Electron.Remote;
-		webFrame: Electron.WebFrame;
-	}
-}
-
-declare namespace ElectronPrivate {
-	type GlobalEvent = Event;
-}
-
-interface Document {
-	createElement(tagName: 'webview'): Electron.WebViewElement;
-}
-
-// https://github.com/electron/electron/blob/master/docs/api/window-open.md
-
-interface Window {
-	/**
-	 * Creates a new window.
-	 */
-	open(url: string, frameName?: string, features?: string): Electron.BrowserWindowProxy;
-}
-
-// https://github.com/electron/electron/blob/master/docs/api/file-object.md
-
-interface File {
-	/**
-	 * Exposes the real path of the filesystem.
-	 */
-	path: string;
-}
-
-// https://github.com/electron/electron/blob/master/docs/api/process.md
-
-declare namespace NodeJS {
-
-	interface ProcessVersions {
-		/**
-		 * Electron's version string.
-		 */
-		electron: string;
-		/**
-		 * Chrome's version string.
-		 */
-		chrome: string;
-	}
-
-	interface Process {
-		/**
-		 * Setting this to true can disable the support for asar archives in Node's built-in modules.
-		 */
-		noAsar?: boolean;
-		/**
-		 * Process's type
-		 */
-		type: 'browser' | 'renderer';
-		/**
-		 * Path to JavaScript source code.
-		 */
-		resourcesPath: string;
-		/**
-		 * For Mac App Store build, this value is true, for other builds it is undefined.
-		 */
-		mas?: boolean;
-		/**
-		 * If the app is running as a Windows Store app (appx), this value is true, for other builds it is undefined.
-		 */
-		windowsStore?: boolean;
-		/**
-		 * When app is started by being passed as parameter to the default app,
-		 * this value is true in the main process, otherwise it is undefined.
-		 */
-		defaultApp?: boolean;
-		/**
-		 * Emitted when Electron has loaded its internal initialization script
-		 * and is beginning to load the web page or the main script.
-		 */
-		on(event: 'loaded', listener: Function): this;
-		on(event: string, listener: Function): this;
-		/**
-		 * Causes the main thread of the current process crash;
-		 */
-		crash(): void;
-		/**
-		 * Causes the main thread of the current process hang.
-		 */
-		hang(): void;
-		/**
-		 * Sets the file descriptor soft limit to maxDescriptors or the OS hard limit,
-		 * whichever is lower for the current process.
-		 *
-		 * Note: This API is only available on macOS and Linux.
-		 */
-		setFdLimit(maxDescriptors: number): void;
-		/**
-		 * @returns Object giving memory usage statistics about the current process.
-		 * Note: All statistics are reported in Kilobytes.
-		 */
-		getProcessMemoryInfo(): ProcessMemoryInfo;
-		/**
-		 * @returns Object giving memory usage statistics about the entire system.
-		 * Note: All statistics are reported in Kilobytes.
-		 */
-		getSystemMemoryInfo(): SystemMemoryInfo;
-	}
-
-	interface ProcessMemoryInfo {
-		/**
-		 * The amount of memory currently pinned to actual physical RAM.
-		 */
-		workingSetSize: number;
-		/**
-		 * The maximum amount of memory that has ever been pinned to actual physical RAM.
-		 */
-		peakWorkingSetSize: number;
-		/**
-		 * The amount of memory not shared by other processes, such as JS heap or HTML content.
-		 */
-		privateBytes: number;
-		/**
-		 * The amount of memory shared between processes, typically memory consumed by the Electron code itself.
-		 */
-		sharedBytes: number;
-	}
-
-	interface SystemMemoryInfo {
-		/**
-		 * The total amount of physical memory available to the system.
-		 */
-		total: number;
-		/**
-		 * The total amount of memory not being used by applications or disk cache.
-		 */
-		free: number;
-		/**
-		 * The total amount of swap memory available to the system.
-		 */
-		swapTotal: number;
-		/**
-		 * The free amount of swap memory available to the system.
-		 */
-		swapFree: number;
-	}
-}
-
-declare module 'electron' {
-	var electron: Electron.ElectronMainAndRenderer;
-	export = electron;
-}
-
-interface NodeRequireFunction {
-	(moduleName: 'electron'): Electron.ElectronMainAndRenderer;
-}
diff --git a/types/electron/test/index.ts b/types/electron/test/index.ts
deleted file mode 100644
index 8ae462139a..0000000000
--- a/types/electron/test/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import electron = require('electron');
-import child_process = require('child_process');
-
-// TODO
-child_process.spawn(electron as any);
diff --git a/types/electron/test/main.ts b/types/electron/test/main.ts
deleted file mode 100644
index 0f3f17ca33..0000000000
--- a/types/electron/test/main.ts
+++ /dev/null
@@ -1,1138 +0,0 @@
-
-import {
-	app,
-	autoUpdater,
-	BrowserWindow,
-	contentTracing,
-	dialog,
-	globalShortcut,
-	ipcMain,
-	Menu,
-	MenuItem,
-	net,
-	powerMonitor,
-	powerSaveBlocker,
-	protocol,
-	Tray,
-	clipboard,
-	crashReporter,
-	nativeImage,
-	screen,
-	shell,
-	session,
-	systemPreferences,
-	webContents
-} from 'electron';
-
-import * as path from 'path';
-
-// Quick start
-// https://github.com/atom/electron/blob/master/docs/tutorial/quick-start.md
-
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the javascript object is GCed.
-var mainWindow: Electron.BrowserWindow = null;
-
-// Quit when all windows are closed.
-app.on('window-all-closed', () => {
-	if (process.platform !== 'darwin')
-		app.quit();
-});
-
-// Check single instance app
-var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
-  // Someone tried to run a second instance, we should focus our window
-  if (mainWindow) {
-	if (mainWindow.isMinimized()) mainWindow.restore();
-	mainWindow.focus();
-  }
-});
-
-if (shouldQuit) {
-  app.quit();
-  process.exit(0);
-}
-
-// This method will be called when Electron has done everything
-// initialization and ready for creating browser windows.
-app.on('ready', () => {
-	// Create the browser window.
-	mainWindow = new BrowserWindow({ width: 800, height: 600 });
-
-	// and load the index.html of the app.
-	mainWindow.loadURL(`file://${__dirname}/index.html`);
-	mainWindow.loadURL('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
-	mainWindow.webContents.loadURL('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'});
-	mainWindow.webContents.loadURL('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer', postData: [{type: 'blob', blobUUID: 'hogefuga'}]});
-
-	mainWindow.webContents.openDevTools();
-	mainWindow.webContents.toggleDevTools();
-	mainWindow.webContents.openDevTools({mode: 'detach'});
-	mainWindow.webContents.closeDevTools();
-	mainWindow.webContents.addWorkSpace('/path/to/workspace');
-	mainWindow.webContents.removeWorkSpace('/path/to/workspace');
-	var opened: boolean = mainWindow.webContents.isDevToolsOpened()
-	var focused = mainWindow.webContents.isDevToolsFocused();
-	// Emitted when the window is closed.
-	mainWindow.on('closed', () => {
-		// Dereference the window object, usually you would store windows
-		// in an array if your app supports multi windows, this is the time
-		// when you should delete the corresponding element.
-		mainWindow = null;
-	});
-
-	mainWindow.webContents.setVisualZoomLevelLimits(50, 200);
-	mainWindow.webContents.setLayoutZoomLevelLimits(50, 200);
-
-	mainWindow.webContents.print({silent: true, printBackground: false});
-	mainWindow.webContents.print();
-
-	mainWindow.webContents.printToPDF({
-		marginsType: 1,
-		pageSize: 'A3',
-		printBackground: true,
-		printSelectionOnly: true,
-		landscape: true,
-	}, (error: Error, data: Buffer) => {});
-
-	mainWindow.webContents.printToPDF({}, (err, data) => {});
-
-	mainWindow.webContents.executeJavaScript('return true;').then((v: boolean) => console.log(v));
-	mainWindow.webContents.executeJavaScript('return true;', true);
-	mainWindow.webContents.executeJavaScript('return true;', true, (result: boolean) => console.log(result));
-	mainWindow.webContents.insertText('blah, blah, blah');
-	mainWindow.webContents.startDrag({file: '/path/to/img.png', icon: nativeImage.createFromPath('/path/to/icon.png')});
-	mainWindow.webContents.findInPage('blah');
-	mainWindow.webContents.findInPage('blah', {
-		forward: true,
-		matchCase: false,
-	});
-	mainWindow.webContents.stopFindInPage('clearSelection');
-	mainWindow.webContents.stopFindInPage('keepSelection');
-	mainWindow.webContents.stopFindInPage('activateSelection');
-
-	mainWindow.loadURL('https://github.com');
-
-	mainWindow.webContents.on('did-finish-load', function() {
-		mainWindow.webContents.savePage('/tmp/test.html', 'HTMLComplete', function(error) {
-		if (!error)
-			console.log("Save page successfully");
-		});
-	});
-
-	try {
-		mainWindow.webContents.debugger.attach("1.1");
-	} catch(err) {
-		console.log("Debugger attach failed : ", err);
-	};
-
-	mainWindow.webContents.debugger.on('detach', function(event, reason) {
-		console.log("Debugger detached due to : ", reason);
-	});
-
-	mainWindow.webContents.debugger.on('message', function(event, method, params) {
-		if (method == "Network.requestWillBeSent") {
-			if (params.request.url == "https://www.github.com") {
-				win.webContents.debugger.detach();
-			}
-		}
-	});
-
-	mainWindow.webContents.debugger.sendCommand("Network.enable");
-	mainWindow.webContents.capturePage(image => {
-		console.log(image.toDataURL());
-	});
-	mainWindow.webContents.capturePage({x: 0, y: 0, width: 100, height: 200}, image => {
-		console.log(image.toPNG());
-	});
-
-	mainWindow.setMenu(null);
-	mainWindow.setMenu(Menu.buildFromTemplate([]));
-});
-
-app.commandLine.appendSwitch('enable-web-bluetooth');
-
-app.on('ready', () => {
-	mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
-		event.preventDefault();
-
-		let result = (() => {
-			for (let device of deviceList) {
-				if (device.deviceName === 'test') {
-					return device;
-				}
-			}
-			return null;
-		})();
-
-		if (!result) {
-			callback('');
-		} else {
-			callback(result.deviceId);
-		}
-	});
-});
-
-// Locale
-app.getLocale();
-
-// Desktop environment integration
-// https://github.com/atom/electron/blob/master/docs/tutorial/desktop-environment-integration.md
-
-app.addRecentDocument('/Users/USERNAME/Desktop/work.type');
-app.clearRecentDocuments();
-var dockMenu = Menu.buildFromTemplate([
-	<Electron.MenuItemOptions>{
-		label: 'New Window',
-		click: () => {
-			console.log('New Window');
-		}
-	},
-	<Electron.MenuItemOptions>{
-		label: 'New Window with Settings',
-		submenu: [
-			<Electron.MenuItemOptions>{ label: 'Basic' },
-			<Electron.MenuItemOptions>{ label: 'Pro' }
-		]
-	},
-	<Electron.MenuItemOptions>{ label: 'New Command...' },
-	<Electron.MenuItemOptions>{
-		label: 'Edit',
-		submenu: [
-			{
-				label: 'Undo',
-				accelerator: 'CmdOrCtrl+Z',
-				role: 'undo'
-			},
-			{
-				label: 'Redo',
-				accelerator: 'Shift+CmdOrCtrl+Z',
-				role: 'redo'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Cut',
-				accelerator: 'CmdOrCtrl+X',
-				role: 'cut'
-			},
-			{
-				label: 'Copy',
-				accelerator: 'CmdOrCtrl+C',
-				role: 'copy'
-			},
-			{
-				label: 'Paste',
-				accelerator: 'CmdOrCtrl+V',
-				role: 'paste'
-			},
-		]
-	},
-]);
-app.dock.setMenu(dockMenu);
-app.dock.setBadge('foo');
-var id = app.dock.bounce('informational');
-app.dock.cancelBounce(id);
-app.dock.setIcon('/path/to/icon.png');
-
-app.setBadgeCount(app.getBadgeCount() + 1);
-
-app.setUserTasks([
-	<Electron.Task>{
-		program: process.execPath,
-		arguments: '--new-window',
-		iconPath: process.execPath,
-		iconIndex: 0,
-		title: 'New Window',
-		description: 'Create a new window'
-	}
-]);
-app.setUserTasks([]);
-
-app.setJumpList([
-	{
-		type: 'custom',
-		name: 'Recent Projects',
-		items: [
-			{ type: 'file', path: 'C:\\Projects\\project1.proj' },
-			{ type: 'file', path: 'C:\\Projects\\project2.proj' }
-		]
-	},
-	{ // has a name so type is assumed to be "custom"
-		name: 'Tools',
-		items: [
-		{
-			type: 'task',
-			title: 'Tool A',
-			program: process.execPath,
-			args: '--run-tool-a',
-			iconPath: process.execPath,
-			iconIndex: 0,
-			description: 'Runs Tool A'
-		},
-		{
-			type: 'task',
-			title: 'Tool B',
-			program: process.execPath,
-			args: '--run-tool-b',
-			iconPath: process.execPath,
-			iconIndex: 0,
-			description: 'Runs Tool B'
-		}]
-	},
-	{
-		type: 'frequent'
-	},
-	{ // has no name and no type so type is assumed to be "tasks"
-		items: [
-		{
-			type: 'task',
-			title: 'New Project',
-			program: process.execPath,
-			args: '--new-project',
-			description: 'Create a new project.'
-		},
-		{
-			type: 'separator'
-		},
-		{
-			type: 'task',
-			title: 'Recover Project',
-			program: process.execPath,
-			args: '--recover-project',
-			description: 'Recover Project'
-		}]
-	}
-]);
-
-if (app.isUnityRunning()) {
-}
-if (app.isAccessibilitySupportEnabled()) {
-}
-app.setLoginItemSettings({openAtLogin: true, openAsHidden: false});
-console.log(app.getLoginItemSettings().wasOpenedAtLogin);
-app.setAboutPanelOptions({
-	applicationName: 'Test',
-	version: '1.2.3'
-});
-
-var window = new BrowserWindow();
-window.setProgressBar(0.5);
-window.setRepresentedFilename('/etc/passwd');
-window.setDocumentEdited(true);
-window.previewFile('/path/to/file');
-window.previewFile('/path/to/file', 'Displayed Name');
-window.setVibrancy('light');
-window.setVibrancy('titlebar');
-
-// Online/Offline Event Detection
-// https://github.com/atom/electron/blob/master/docs/tutorial/online-offline-events.md
-
-var onlineStatusWindow: Electron.BrowserWindow;
-
-app.on('ready', () => {
-	onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false, vibrancy: 'sidebar' });
-	onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
-});
-app.on('accessibility-support-changed', (_, enabled) => console.log('accessibility: ' + enabled));
-
-ipcMain.on('online-status-changed', (event: any, status: any) => {
-	console.log(status);
-});
-
-// Synopsis
-// https://github.com/atom/electron/blob/master/docs/api/synopsis.md
-
-app.on('ready', () => {
-	window = new BrowserWindow({
-		width: 800,
-		height: 600,
-		titleBarStyle: 'hidden-inset',
-	});
-	window.loadURL('https://github.com');
-});
-
-// Supported Chrome command line switches
-// https://github.com/atom/electron/blob/master/docs/api/chrome-command-line-switches.md
-
-app.commandLine.appendSwitch('remote-debugging-port', '8315');
-app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1');
-app.commandLine.appendSwitch('vmodule', 'console=0');
-
-// systemPreferences
-// https://github.com/electron/electron/blob/master/docs/api/system-preferences.md
-
-var browserOptions = {
-	width: 1000,
-	height: 800,
-	transparent: false,
-	frame: true
-};
-
-// Make the window transparent only if the platform supports it.
-if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
-	browserOptions.transparent = true;
-	browserOptions.frame = false;
-}
-
-if (process.platform === 'win32') {
-	systemPreferences.on('color-changed', () => { console.log('color changed'); });
-	systemPreferences.on('inverted-color-scheme-changed', (_, inverted) => console.log(inverted ? 'inverted' : 'not inverted'));
-	console.log('Color for menu is', systemPreferences.getColor('menu'));
-}
-
-// Create the window.
-var win = new BrowserWindow(browserOptions);
-
-// Navigate.
-if (browserOptions.transparent) {
-	win.loadURL('file://' + __dirname + '/index.html');
-} else {
-  	// No transparency, so we load a fallback that uses basic styles.
-  	win.loadURL('file://' + __dirname + '/fallback.html');
-}
-
-// app
-// https://github.com/atom/electron/blob/master/docs/api/app.md
-
-app.on('certificate-error', function(event, webContents, url, error, certificate, callback) {
-	if (url == "https://github.com") {
-		// Verification logic.
-		event.preventDefault();
-		callback(true);
-	} else {
-		callback(false);
-	}
-});
-
-app.on('select-client-certificate', function(event, webContents, url, list, callback) {
-	event.preventDefault();
-	callback(list[0]);
-});
-
-app.on('login', function(event, webContents, request, authInfo, callback) {
-	event.preventDefault();
-	callback('username', 'secret');
-});
-
-var win = new BrowserWindow({show: false})
-win.once('ready-to-show', () => {
-	win.show();
-});
-
-app.relaunch({args: process.argv.slice(1).concat(['--relaunch'])});
-app.exit(0);
-
-// auto-updater
-// https://github.com/atom/electron/blob/master/docs/api/auto-updater.md
-
-autoUpdater.setFeedURL('http://mycompany.com/myapp/latest?version=' + app.getVersion());
-autoUpdater.checkForUpdates();
-autoUpdater.quitAndInstall();
-
-autoUpdater.on('error', (error) => {
-	console.log('error', error);
-});
-
-autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName, releaseDate, updateURL) => {
-	console.log('update-downloaded', releaseNotes, releaseName, releaseDate, updateURL);
-});
-
-// browser-window
-// https://github.com/atom/electron/blob/master/docs/api/browser-window.md
-
-var win = new BrowserWindow({ width: 800, height: 600, show: false });
-win.on('closed', () => {
-	win = null;
-});
-
-win.loadURL('https://github.com');
-win.show();
-
-var toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
-win.setSheetOffset(toolbarRect.height);
-
-var installed = BrowserWindow.getDevToolsExtensions().hasOwnProperty('devtron');
-
-// content-tracing
-// https://github.com/atom/electron/blob/master/docs/api/content-tracing.md
-
-const options = {
-	categoryFilter: '*',
-	traceOptions: 'record-until-full,enable-sampling'
-}
-
-contentTracing.startRecording(options, function() {
-	console.log('Tracing started');
-	setTimeout(function() {
-		contentTracing.stopRecording('', function(path) {
-			console.log('Tracing data recorded to ' + path);
-		});
-	}, 5000);
-});
-
-// dialog
-// https://github.com/atom/electron/blob/master/docs/api/dialog.md
-
-// variant without browserWindow
-var openDialogResult: string[] = dialog.showOpenDialog({
-  title: 'Testing showOpenDialog',
-  defaultPath: '/var/log/syslog',
-  filters: [{name: '', extensions: ['']}],
-	properties: ['openFile', 'openDirectory', 'multiSelections']
-});
-
-// variant with browserWindow
-openDialogResult = dialog.showOpenDialog(win, {
-  title: 'Testing showOpenDialog',
-  defaultPath: '/var/log/syslog',
-  filters: [{name: '', extensions: ['']}],
-	properties: ['openFile', 'openDirectory', 'multiSelections']
-});
-
-// global-shortcut
-// https://github.com/atom/electron/blob/master/docs/api/global-shortcut.md
-
-// Register a 'ctrl+x' shortcut listener.
-var ret = globalShortcut.register('ctrl+x', () => {
-	console.log('ctrl+x is pressed');
-});
-if (!ret)
-	console.log('registerion fails');
-
-// Check whether a shortcut is registered.
-console.log(globalShortcut.isRegistered('ctrl+x'));
-
-// Unregister a shortcut.
-globalShortcut.unregister('ctrl+x');
-
-// Unregister all shortcuts.
-globalShortcut.unregisterAll();
-
-// ipcMain
-// https://github.com/atom/electron/blob/master/docs/api/ipc-main-process.md
-
-ipcMain.on('asynchronous-message', (event: Electron.IpcMainEvent, arg: any) => {
-	console.log(arg);  // prints "ping"
-	event.sender.send('asynchronous-reply', 'pong');
-});
-
-ipcMain.on('synchronous-message', (event: Electron.IpcMainEvent, arg: any) => {
-	console.log(arg);  // prints "ping"
-	event.returnValue = 'pong';
-});
-
-var winWindows = new BrowserWindow({
-	width: 800,
-	height: 600,
-	show: false,
-	thickFrame: false,
-	type: 'toolbar',
-});
-
-// menu-item
-// https://github.com/atom/electron/blob/master/docs/api/menu-item.md
-
-var menuItem = new MenuItem({
-	click: (menuItem: Electron.MenuItem, browserWindow: Electron.BrowserWindow, event: Electron.Event) => {
-		console.log('click', menuItem, browserWindow, event);
-	}
-});
-
-const fakeEvent: Electron.Event = {
-	preventDefault: () => { },
-	sender: winWindows.webContents,
-}
-
-menuItem.label = 'Hello World!';
-menuItem.click(fakeEvent, winWindows, winWindows.webContents)
-
-// menu
-// https://github.com/atom/electron/blob/master/docs/api/menu.md
-
-var menu = new Menu();
-menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));
-menu.append(new MenuItem({ type: 'separator' }));
-menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }));
-menu.insert(0, menuItem);
-
-console.log(menu.items);
-
-var pos = screen.getCursorScreenPoint();
-menu.popup(null, pos.x, pos.y);
-
-// main.js
-var template = <Electron.MenuItemOptions[]>[
-	{
-		label: 'Electron',
-		submenu: [
-			{
-				label: 'About Electron',
-				role: 'about'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Services',
-				role: 'services',
-				submenu: []
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Hide Electron',
-				accelerator: 'Command+H',
-				role: 'hide'
-			},
-			{
-				label: 'Hide Others',
-				accelerator: 'Command+Shift+H',
-				role: 'hideothers'
-			},
-			{
-				label: 'Show All',
-				role: 'unhide'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Quit',
-				accelerator: 'Command+Q',
-				click: () => { app.quit(); }
-			}
-		]
-	},
-	{
-		label: 'Edit',
-		submenu: [
-			{
-				label: 'Undo',
-				accelerator: 'Command+Z',
-				role: 'undo'
-			},
-			{
-				label: 'Redo',
-				accelerator: 'Shift+Command+Z',
-				role: 'redo'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Cut',
-				accelerator: 'Command+X',
-				role: 'cut'
-			},
-			{
-				label: 'Copy',
-				accelerator: 'Command+C',
-				role: 'copy'
-			},
-			{
-				label: 'Paste',
-				accelerator: 'Command+V',
-				role: 'paste'
-			},
-			{
-				label: 'Select All',
-				accelerator: 'Command+A',
-				role: 'selectall'
-			}
-		]
-	},
-	{
-		label: 'View',
-		submenu: [
-			{
-				label: 'Reload',
-				accelerator: 'Command+R',
-				click: (item, focusedWindow) => {
-					if (focusedWindow) {
-						focusedWindow.webContents.reloadIgnoringCache();
-					}
-				}
-			},
-			{
-				label: 'Toggle DevTools',
-				accelerator: 'Alt+Command+I',
-				click: (item, focusedWindow) => {
-					if (focusedWindow) {
-						focusedWindow.webContents.toggleDevTools();
-					}
-				}
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Actual Size',
-				accelerator: 'CmdOrCtrl+0',
-				click: (item, focusedWindow) => {
-					if (focusedWindow) {
-						focusedWindow.webContents.setZoomLevel(0)
-					}
-				}
-			},
-			{
-				label: 'Zoom In',
-				accelerator: 'CmdOrCtrl+Plus',
-				click: (item, focusedWindow) => {
-					if (focusedWindow) {
-						const { webContents } = focusedWindow;
-						webContents.getZoomLevel((zoomLevel) => {
-							webContents.setZoomLevel(zoomLevel + 0.5)
-						});
-					}
-				}
-			},
-			{
-				label: 'Zoom Out',
-				accelerator: 'CmdOrCtrl+-',
-				click: (item, focusedWindow) => {
-					if (focusedWindow) {
-						const { webContents } = focusedWindow;
-						webContents.getZoomLevel((zoomLevel) => {
-							webContents.setZoomLevel(zoomLevel - 0.5)
-						});
-					}
-				}
-			}
-		]
-	},
-	{
-		label: 'Window',
-		submenu: [
-			{
-				label: 'Minimize',
-				accelerator: 'Command+M',
-				role: 'minimize'
-			},
-			{
-				label: 'Close',
-				accelerator: 'Command+W',
-				role: 'close'
-			},
-			{
-				type: 'separator'
-			},
-			{
-				label: 'Bring All to Front',
-				role: 'front'
-			}
-		]
-	},
-	{
-		label: 'Help',
-		submenu: []
-	}
-];
-
-menu = Menu.buildFromTemplate(template);
-
-Menu.setApplicationMenu(menu); // Must be called within app.on('ready', function(){ ... });
-Menu.setApplicationMenu(null);
-
-Menu.buildFromTemplate([
-	{ label: '4', id: '4' },
-	{ label: '5', id: '5' },
-	{ label: '1', id: '1', position: 'before=4' },
-	{ label: '2', id: '2' },
-	{ label: '3', id: '3' }
-]);
-
-Menu.buildFromTemplate([
-	{ label: 'a', position: 'endof=letters' },
-	{ label: '1', position: 'endof=numbers' },
-	{ label: 'b', position: 'endof=letters' },
-	{ label: '2', position: 'endof=numbers' },
-	{ label: 'c', position: 'endof=letters' },
-	{ label: '3', position: 'endof=numbers' }
-]);
-
-// net
-// https://github.com/electron/electron/blob/master/docs/api/net.md
-
-app.on('ready', () => {
-	const request = net.request('https://github.com')
-	request.setHeader('Some-Custom-Header-Name', 'Some-Custom-Header-Value');
-	let header = request.getHeader('Some-Custom-Header-Name');
-	request.removeHeader('Some-Custom-Header-Name');
-	request.on('response', (response) => {
-		console.log(`Status code: ${response.statusCode}`);
-		console.log(`Status message: ${response.statusMessage}`);
-		console.log(`Headers: ${JSON.stringify(response.headers)}`);
-		console.log(`Http version: ${response.httpVersion}`);
-		console.log(`Major Http version: ${response.httpVersionMajor}`);
-		console.log(`Minor Http version: ${response.httpVersionMinor}`);
-		response.on('data', (chunk) => {
-			console.log(`BODY: ${chunk}`);
-		})
-		response.on('end', () => {
-			console.log('No more data in response.');
-		})
-		response.on('error', () => {
-			console.log('"error" event emitted');
-		});
-		response.on('aborted', () => {
-			console.log('"aborted" event emitted');
-		});
-	})
-	request.on('login', (authInfo, callback) => {
-		callback('username', 'password');
-	});
-	request.on('finish', () => {
-		console.log('"finish" event emitted');
-	});
-	request.on('abort', () => {
-		console.log('"abort" event emitted');
-	});
-	request.on('error', () => {
-		console.log('"error" event emitted');
-	});
-	request.write('Hello World!', 'utf-8', () => { });
-	request.end('Hello World!', 'utf-8', () => { });
-	request.abort();
-})
-
-// power-monitor
-// https://github.com/atom/electron/blob/master/docs/api/power-monitor.md
-
-app.on('ready', () => {
-	powerMonitor.on('suspend', () => {
-		console.log('The system is going to sleep');
-	});
-	powerMonitor.on('resume', () => {
-		console.log('The system has resumed from sleep');
-	});
-	powerMonitor.on('on-ac', () => {
-		console.log('The system changed to AC power')
-	});
-	powerMonitor.on('on-battery', () => {
-		console.log('The system changed to battery power');
-	});
-});
-
-// power-save-blocker
-// https://github.com/atom/electron/blob/master/docs/api/power-save-blocker.md
-
-var id = powerSaveBlocker.start('prevent-display-sleep');
-console.log(powerSaveBlocker.isStarted(id));
-
-powerSaveBlocker.stop(id);
-
-// protocol
-// https://github.com/atom/electron/blob/master/docs/api/protocol.md
-
-app.on('ready', () => {
-	protocol.registerStandardSchemes(['https']);
-	protocol.registerServiceWorkerSchemes(['https']);
-
-	protocol.registerFileProtocol('atom', (request, callback) => {
-		callback(`${__dirname}/${request.url}`);
-	});
-
-	protocol.registerBufferProtocol('atom', (request, callback) => {
-		callback({mimeType: 'text/html', data: new Buffer('<h5>Response</h5>')});
-	});
-
-	protocol.registerStringProtocol('atom', (request, callback) => {
-		callback('Hello World!');
-	});
-
-	protocol.registerHttpProtocol('atom', (request, callback) => {
-		callback({url: request.url, method: request.method});
-	});
-
-	protocol.unregisterProtocol('atom', (error) => {
-		console.log(error ? error.message : 'ok');
-	});
-
-	protocol.isProtocolHandled('atom', (handled) => {
-		console.log(handled);
-	});
-});
-
-// tray
-// https://github.com/atom/electron/blob/master/docs/api/tray.md
-
-var appIcon: Electron.Tray = null;
-app.on('ready', () => {
-	appIcon = new Tray('/path/to/my/icon');
-	var contextMenu = Menu.buildFromTemplate([
-		{ label: 'Item1', type: 'radio' },
-		{ label: 'Item2', type: 'radio' },
-		{ label: 'Item3', type: 'radio', checked: true },
-		{ label: 'Item4', type: 'radio' },
-	]);
-	appIcon.setToolTip('This is my application.');
-	appIcon.setContextMenu(contextMenu);
-	appIcon.setImage('/path/to/new/icon');
-	appIcon.popUpContextMenu(contextMenu, {x: 100, y: 100});
-
-	appIcon.on('click', (event, bounds) => {
-		console.log('click', event, bounds);
-	});
-
-	appIcon.on('ballon-show', () => {
-		console.log('ballon-show');
-	});
-
-	appIcon.displayBalloon({
-		title: 'Hello World!'
-	});
-});
-
-// clipboard
-// https://github.com/atom/electron/blob/master/docs/api/clipboard.md
-
-{
-    let str: string;
-    clipboard.writeText('Example String');
-    clipboard.writeText('Example String', 'selection');
-    clipboard.writeBookmark('foo', 'http://example.com');
-    clipboard.writeBookmark('foo', 'http://example.com', 'selection');
-    clipboard.writeFindText('foo');
-    str = clipboard.readText('selection');
-    str = clipboard.readFindText();
-    console.log(clipboard.availableFormats());
-    console.log(clipboard.readBookmark().title);
-    clipboard.clear();
-
-    clipboard.write({
-        html: '<html></html>',
-        text: 'Hello World!',
-        image: clipboard.readImage()
-    });
-}
-
-// crash-reporter
-// https://github.com/atom/electron/blob/master/docs/api/crash-reporter.md
-
-crashReporter.start({
-	productName: 'YourName',
-	companyName: 'YourCompany',
-	submitURL: 'https://your-domain.com/url-to-submit',
-	autoSubmit: true,
-	extra: {
-		someKey: "value"
-	}
-});
-
-console.log(crashReporter.getLastCrashReport());
-console.log(crashReporter.getUploadedReports());
-
-// nativeImage
-// https://github.com/atom/electron/blob/master/docs/api/native-image.md
-
-var appIcon2 = new Tray('/Users/somebody/images/icon.png');
-var window2 = new BrowserWindow({ icon: '/Users/somebody/images/window.png' });
-var image = clipboard.readImage();
-var appIcon3 = new Tray(image);
-var appIcon4 = new Tray('/Users/somebody/images/icon.png');
-
-let image2 = nativeImage.createFromPath('/Users/somebody/images/icon.png');
-
-// process
-// https://github.com/electron/electron/blob/master/docs/api/process.md
-
-console.log(process.versions.electron);
-console.log(process.versions.chrome);
-console.log(process.type);
-console.log(process.resourcesPath);
-console.log(process.mas);
-console.log(process.windowsStore);
-process.noAsar = true;
-process.crash();
-process.hang();
-process.setFdLimit(8192);
-
-// screen
-// https://github.com/atom/electron/blob/master/docs/api/screen.md
-
-app.on('ready', () => {
-	var size = screen.getPrimaryDisplay().workAreaSize;
-	mainWindow = new BrowserWindow({ width: size.width, height: size.height });
-});
-
-app.on('ready', () => {
-	var displays = screen.getAllDisplays();
-	var externalDisplay: any = null;
-	for (var i in displays) {
-		if (displays[i].bounds.x > 0 || displays[i].bounds.y > 0) {
-			externalDisplay = displays[i];
-			break;
-		}
-	}
-
-	if (externalDisplay) {
-		mainWindow = new BrowserWindow({
-			x: externalDisplay.bounds.x + 50,
-			y: externalDisplay.bounds.y + 50,
-		});
-	}
-
-	screen.on('display-added', (event, display) => {
-		console.log('display-added', display);
-	});
-
-	screen.on('display-removed', (event, display) => {
-		console.log('display-removed', display);
-	});
-
-	screen.on('display-metrics-changed', (event, display, changes) => {
-		console.log('display-metrics-changed', display, changes);
-	});
-});
-
-// shell
-// https://github.com/atom/electron/blob/master/docs/api/shell.md
-
-shell.showItemInFolder('/home/user/Desktop/test.txt');
-shell.openItem('/home/user/Desktop/test.txt');
-shell.moveItemToTrash('/home/user/Desktop/test.txt');
-
-shell.openExternal('https://github.com', {
-	activate: false
-});
-
-shell.beep();
-
-shell.writeShortcutLink('/home/user/Desktop/shortcut.lnk', 'update', shell.readShortcutLink('/home/user/Desktop/shortcut.lnk'));
-
-// session
-// https://github.com/atom/electron/blob/master/docs/api/session.md
-
-session.defaultSession.on('will-download', (event, item, webContents) => {
-	event.preventDefault();
-	require('request')(item.getURL(), (data: any) => {
-		require('fs').writeFileSync('/somewhere', data);
-	});
-});
-
-// Query all cookies.
-session.defaultSession.cookies.get({}, (error, cookies) => {
-	console.log(cookies);
-});
-
-// Query all cookies associated with a specific url.
-session.defaultSession.cookies.get({ url : "http://www.github.com" }, (error, cookies) => {
-	console.log(cookies);
-});
-
-// Set a cookie with the given cookie data;
-// may overwrite equivalent cookies if they exist.
-var cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
-session.defaultSession.cookies.set(cookie, (error) => {
-	if (error) {
-		console.error(error);
-	}
-});
-
-// In the main process.
-session.defaultSession.on('will-download', (event, item, webContents) => {
-	// Set the save path, making Electron not to prompt a save dialog.
-	item.setSavePath('/tmp/save.pdf');
-	console.log(item.getSavePath());
-	console.log(item.getMimeType());
-	console.log(item.getFilename());
-	console.log(item.getTotalBytes());
-
-	item.on('updated', (event, state) => {
-		if (state === 'interrupted') {
-			console.log('Download is interrupted but can be resumed');
-		} else if (state === 'progressing') {
-			if (item.isPaused()) {
-				console.log('Download is paused');
-			} else {
-				console.log(`Received bytes: ${item.getReceivedBytes()}`);
-			}
-		}
-	});
-
-	item.on('done', function(e, state) {
-		if (state == "completed") {
-			console.log("Download successfully");
-		} else {
-			console.log(`Download failed: ${state}`)
-		}
-	});
-});
-
-// To emulate a GPRS connection with 50kbps throughput and 500 ms latency.
-session.defaultSession.enableNetworkEmulation({
-	latency: 500,
-	downloadThroughput: 6400,
-	uploadThroughput: 6400
-});
-
-// To emulate a network outage.
-session.defaultSession.enableNetworkEmulation({
-	offline: true
-});
-
-session.defaultSession.setCertificateVerifyProc((hostname, cert, callback) => {
-	callback((hostname === 'github.com') ? true : false);
-	console.log(cert.issuer.commonName);
-});
-
-session.defaultSession.setPermissionRequestHandler(function(webContents, permission, callback) {
-	if (webContents.getURL() === 'github.com') {
-		if (permission == "notifications") {
-			callback(false);
-			return;
-		}
-	}
-
-	callback(true);
-});
-
-// consider any url ending with `example.com`, `foobar.com`, `baz`
-// for integrated authentication.
-session.defaultSession.allowNTLMCredentialsForDomains('*example.com, *foobar.com, *baz')
-
-// consider all urls for integrated authentication.
-session.defaultSession.allowNTLMCredentialsForDomains('*')
-
-// Modify the user agent for all requests to the following urls.
-var filter = {
-	urls: ["https://*.github.com/*", "*://electron.github.io"]
-};
-
-session.defaultSession.webRequest.onBeforeSendHeaders(filter, function(details, callback) {
-	details.requestHeaders['User-Agent'] = "MyAgent";
-	callback({cancel: false, requestHeaders: details.requestHeaders});
-});
-
-app.on('ready', function () {
-	const protocol = session.defaultSession.protocol
-	protocol.registerFileProtocol('atom', function (request, callback) {
-		var url = request.url.substr(7);
-		callback({path: path.normalize(__dirname + '/' + url)});
-	}, function (error) {
-		if (error) {
-			console.error('Failed to register protocol');
-		}
-	})
-});
-
-// webContents
-// https://github.com/electron/electron/blob/master/docs/api/web-contents.md
-
-console.log(webContents.getAllWebContents());
-console.log(webContents.getFocusedWebContents());
-
-var win = new BrowserWindow({
-	webPreferences: {
-		offscreen: true
-	}
-});
-
-win.webContents.on('paint', (event, dirty, image) => {
-	console.log(dirty, image.getBitmap());
-});
-
-win.loadURL('http://github.com');
diff --git a/types/electron/test/renderer.ts b/types/electron/test/renderer.ts
deleted file mode 100644
index 8394f59d24..0000000000
--- a/types/electron/test/renderer.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-
-import {
-	ipcRenderer,
-	remote,
-	webFrame,
-	clipboard,
-	crashReporter,
-	nativeImage,
-	screen,
-	shell
-} from 'electron';
-
-import * as fs from 'fs';
-
-// In renderer process (web page).
-// https://github.com/atom/electron/blob/master/docs/api/ipc-renderer.md
-console.log(ipcRenderer.sendSync('synchronous-message', 'ping')); // prints "pong"
-
-ipcRenderer.on('asynchronous-reply', (event: Electron.IpcRendererEvent, arg: any) => {
-	console.log(arg); // prints "pong"
-	event.sender.send('another-message', 'Hello World!');
-});
-
-ipcRenderer.send('asynchronous-message', 'ping');
-
-// remote
-// https://github.com/atom/electron/blob/master/docs/api/remote.md
-
-var BrowserWindow = remote.BrowserWindow;
-var win = new BrowserWindow({ width: 800, height: 600 });
-win.loadURL('https://github.com');
-
-remote.getCurrentWindow().on('close', () => {
-	// blabla...
-});
-
-remote.getCurrentWindow().capturePage(buf => {
-	fs.writeFile('/tmp/screenshot.png', buf, err => {
-		console.log(err);
-	});
-});
-
-remote.getCurrentWebContents().print();
-
-remote.getCurrentWindow().capturePage(buf => {
-	remote.require('fs').writeFile('/tmp/screenshot.png', buf, (err: Error) => {
-		console.log(err);
-	});
-});
-
-// web-frame
-// https://github.com/atom/electron/blob/master/docs/api/web-frame.md
-
-webFrame.setZoomFactor(2);
-console.log(webFrame.getZoomFactor());
-
-webFrame.setZoomLevel(200);
-console.log(webFrame.getZoomLevel());
-
-webFrame.setVisualZoomLevelLimits(50, 200);
-webFrame.setLayoutZoomLevelLimits(50, 200);
-
-webFrame.setSpellCheckProvider('en-US', true, {
-	spellCheck: text => {
-		return !(require('spellchecker').isMisspelled(text));
-	}
-});
-
-webFrame.registerURLSchemeAsSecure('app');
-webFrame.registerURLSchemeAsBypassingCSP('app');
-webFrame.registerURLSchemeAsPrivileged('app');
-webFrame.registerURLSchemeAsPrivileged('app', {
-	secure: true,
-	supportFetchAPI: true,
-});
-
-webFrame.insertText('text');
-
-webFrame.executeJavaScript('JSON.stringify({})', false, (result) => {
-    console.log(result);
-}).then((result: string) => console.log('OK:' + result));
-
-console.log(webFrame.getResourceUsage());
-webFrame.clearCache();
-
-// clipboard
-// https://github.com/atom/electron/blob/master/docs/api/clipboard.md
-
-clipboard.writeText('Example String');
-clipboard.writeText('Example String', 'selection');
-console.log(clipboard.readText('selection'));
-console.log(clipboard.availableFormats());
-clipboard.clear();
-
-clipboard.write({
-	html: '<html></html>',
-	text: 'Hello World!',
-	bookmark: "Bookmark name",
-	image: clipboard.readImage()
-});
-
-// crash-reporter
-// https://github.com/atom/electron/blob/master/docs/api/crash-reporter.md
-
-crashReporter.start({
-	productName: 'YourName',
-	companyName: 'YourCompany',
-	submitURL: 'https://your-domain.com/url-to-submit',
-	autoSubmit: true
-});
-
-// desktopCapturer
-// https://github.com/atom/electron/blob/master/docs/api/desktop-capturer.md
-
-var desktopCapturer = require('electron').desktopCapturer;
-
-desktopCapturer.getSources({types: ['window', 'screen']}, function(error, sources) {
-	if (error) throw error;
-	for (var i = 0; i < sources.length; ++i) {
-		if (sources[i].name == "Electron") {
-				(navigator as any).webkitGetUserMedia({
-				audio: false,
-				video: {
-					mandatory: {
-						chromeMediaSource: 'desktop',
-						chromeMediaSourceId: sources[i].id,
-						minWidth: 1280,
-						maxWidth: 1280,
-						minHeight: 720,
-						maxHeight: 720
-					}
-				}
-			}, gotStream, getUserMediaError);
-			return;
-		}
-	}
-});
-
-function gotStream(stream: any) {
-	(document.querySelector('video') as HTMLVideoElement).src = URL.createObjectURL(stream);
-}
-
-function getUserMediaError(error: Error) {
-	console.log('getUserMediaError', error);
-}
-
-// File object
-// https://github.com/atom/electron/blob/master/docs/api/file-object.md
-
-/*
-<div id="holder">
-  Drag your file here
-</div>
-*/
-
-var holder = document.getElementById('holder');
-
-holder.ondragover = function () {
-    return false;
-};
-
-holder.ondragleave = holder.ondragend = function () {
-    return false;
-};
-
-holder.ondrop = function (e) {
-    e.preventDefault();
-    var file = e.dataTransfer.files[0];
-    console.log('File you dragged here is', file.path);
-    return false;
-};
-
-// nativeImage
-// https://github.com/atom/electron/blob/master/docs/api/native-image.md
-
-var Tray = remote.Tray;
-var appIcon2 = new Tray('/Users/somebody/images/icon.png');
-var window2 = new BrowserWindow({ icon: '/Users/somebody/images/window.png' });
-var image = clipboard.readImage();
-var appIcon3 = new Tray(image);
-var appIcon4 = new Tray('/Users/somebody/images/icon.png');
-
-// https://github.com/electron/electron/blob/master/docs/api/process.md
-
-// preload.js
-var _setImmediate = setImmediate;
-var _clearImmediate = clearImmediate;
-process.once('loaded', function() {
-	global.setImmediate = _setImmediate;
-	global.clearImmediate = _clearImmediate;
-});
-
-// screen
-// https://github.com/atom/electron/blob/master/docs/api/screen.md
-
-var app = remote.app;
-
-var mainWindow: Electron.BrowserWindow = null;
-
-app.on('ready', () => {
-	var size = screen.getPrimaryDisplay().workAreaSize;
-	mainWindow = new BrowserWindow({ width: size.width, height: size.height });
-});
-
-app.on('ready', () => {
-	var displays = screen.getAllDisplays();
-	var externalDisplay: any = null;
-	for (var i in displays) {
-		if (displays[i].bounds.x > 0 || displays[i].bounds.y > 0) {
-			externalDisplay = displays[i];
-			break;
-		}
-	}
-
-	if (externalDisplay) {
-		mainWindow = new BrowserWindow({
-			x: externalDisplay.bounds.x + 50,
-			y: externalDisplay.bounds.y + 50,
-		});
-	}
-});
-
-// shell
-// https://github.com/atom/electron/blob/master/docs/api/shell.md
-
-shell.openExternal('https://github.com');
-
-// <webview>
-// https://github.com/atom/electron/blob/master/docs/api/web-view-tag.md
-
-var webview = document.createElement('webview');
-webview.loadURL('https://github.com');
-
-webview.addEventListener('console-message', function(e) {
-	console.log('Guest page logged a message:', e.message);
-});
-
-webview.addEventListener('found-in-page', function(e) {
-	if (e.result.finalUpdate) {
-		webview.stopFindInPage("keepSelection");
-	}
-});
-
-var requestId = webview.findInPage("test");
-
-webview.addEventListener('new-window', function(e) {
-	require('electron').shell.openExternal(e.url);
-});
-
-webview.addEventListener('close', function() {
-	webview.src = 'about:blank';
-});
-
-// In embedder page.
-webview.addEventListener('ipc-message', function(event) {
-	console.log(event.channel); // Prints "pong"
-});
-webview.send('ping');
-webview.capturePage((image) => { console.log(image); });
-
-{
-    const opened: boolean = webview.isDevToolsOpened();
-    const focused: boolean = webview.isDevToolsFocused();
-    const focused2: boolean = webview.getWebContents().isFocused();
-}
-
-// In guest page.
-ipcRenderer.on('ping', function() {
-	ipcRenderer.sendToHost('pong');
-});
-
-
-// showOpenDialog
-// https://electron.atom.io/docs/api/dialog/#dialogshowopendialogbrowserwindow-options-callback
-
-remote.dialog.showOpenDialog(win);
-remote.dialog.showOpenDialog(win, {}, fileNames => fileNames);
-remote.dialog.showOpenDialog(win, {
-	title: 'foo',
-	defaultPath: '/bar',
-	buttonLabel: 'foo bar',
-	filters: [
-		{name: 'Images', extensions: ['jpg', 'png', 'gif']},
-		{name: 'Movies', extensions: ['mkv', 'avi', 'mp4']},
-		{name: 'Custom File Type', extensions: ['as']},
-		{name: 'All Files', extensions: ['*']}
-	],
-	properties: ['openFile', 'openDirectory', 'multiSelections', 'showHiddenFiles', 'createDirectory', 'promptToCreate', 'noResolveAliases'],
-	normalizeAccessKeys: true,
-	message: 'foo message',
-});
-
-// showSaveDialog
-// https://electron.atom.io/docs/api/dialog/#dialogshowsavedialogbrowserwindow-options-callback
-
-remote.dialog.showSaveDialog(win);
-remote.dialog.showSaveDialog(win, {}, fileNames => fileNames);
-remote.dialog.showSaveDialog(win, {
-	title: 'foo',
-	defaultPath: '/bar',
-	buttonLabel: 'foo bar',
-	filters: [
-		{name: 'Images', extensions: ['jpg', 'png', 'gif']},
-		{name: 'Movies', extensions: ['mkv', 'avi', 'mp4']},
-		{name: 'Custom File Type', extensions: ['as']},
-		{name: 'All Files', extensions: ['*']}
-	],
-	message: 'foo message',
-	nameFieldLabel: 'foo name',
-	showsTagField: true
-});
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 201f14f156..07a8a0d54f 100644
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Jed Mao <https://github.com/jedmao>
 //                 bttf <https://github.com/bttf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="handlebars" />
diff --git a/types/ember/v1/index.d.ts b/types/ember/v1/index.d.ts
index 095c31a176..91e117f016 100644
--- a/types/ember/v1/index.d.ts
+++ b/types/ember/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://emberjs.com/
 // Definitions by: Jed Mao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="handlebars"/>
diff --git a/types/enhanced-resolve/index.d.ts b/types/enhanced-resolve/index.d.ts
index d773f52b16..aa85a8336f 100644
--- a/types/enhanced-resolve/index.d.ts
+++ b/types/enhanced-resolve/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for enhanced-resolve v3.0.0
 // Project: http://github.com/webpack/enhanced-resolve.git
-// Definitions by: e-cloud <https://github.com/e-cloud>
+// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -8,7 +8,6 @@
 
 import fs = require('fs');
 import {
-    ResolveResult,
     LoggingCallbackWrapper,
     ResolverRequest,
     ResolveContext,
@@ -19,31 +18,35 @@ import Resolver = require('./lib/Resolver');
 import Tapable = require('tapable');
 
 declare namespace Resolve {
-    function sync(path: string, request: string): ResolveResult;
-    function sync(context: ResolveContext, path: string, request: string): ResolveResult;
+    function sync(path: string, request: string): string;
+    function sync(context: ResolveContext, path: string, request: string): string;
 
     function context(path: string, request: string, callback: LoggingCallbackWrapper): void;
     function context(context: ResolveContext, path: string, request: string, callback: LoggingCallbackWrapper): void;
 
     namespace context {
-        function sync(path: string, request: string): ResolveResult;
-        function sync(context: ResolveContext, path: string, request: string): ResolveResult;
+        function sync(path: string, request: string): string;
+        function sync(context: ResolveContext, path: string, request: string): string;
     }
 
     function loader(path: string, request: string, callback: LoggingCallbackWrapper): void;
     function loader(context: ResolveContext, path: string, request: string, callback: LoggingCallbackWrapper): void;
 
-    namespace context {
-        function sync(path: string, request: string): ResolveResult;
-        function sync(context: ResolveContext, path: string, request: string): ResolveResult;
+    namespace loader {
+        function sync(path: string, request: string): string;
+        function sync(context: ResolveContext, path: string, request: string): string;
     }
 
-    function create(path: string, request: string, callback: LoggingCallbackWrapper): void;
-    function create(context: ResolveContext, path: string, request: string, callback: LoggingCallbackWrapper): void;
+    function create(options: ResolverFactory.ResolverOption): {
+        (path: string, request: string, callback: LoggingCallbackWrapper): void;
+        (context: ResolveContext, path: string, request: string, callback: LoggingCallbackWrapper): void;
+    }
 
     export namespace create {
-        function sync(path: string, request: string): ResolveResult;
-        function sync(context: ResolveContext, path: string, request: string): ResolveResult;
+        function sync(options: ResolverFactory.ResolverOption): {
+            (path: string, request: string): string;
+            (context: ResolveContext, path: string, request: string): string;
+        }
     }
 
     export namespace ResolverFactory {
@@ -54,8 +57,8 @@ declare namespace Resolve {
             descriptionFiles?: string[];
             enforceExtension?: boolean;
             enforceModuleExtension?: boolean;
-            extensions: string[];
-            fileSystem: AbstractInputFileSystem;
+            extensions?: string[];
+            fileSystem?: AbstractInputFileSystem;
             mainFields?: string[];
             mainFiles?: string[];
             moduleExtensions?: string[];
@@ -70,7 +73,7 @@ declare namespace Resolve {
         interface AliasItem {
             alias: string;
             name: string;
-            onlyModule: boolean;
+            onlyModule?: boolean;
         }
         function createResolver(options: ResolverOption): Resolver;
     }
diff --git a/types/enhanced-resolve/lib/Resolver.d.ts b/types/enhanced-resolve/lib/Resolver.d.ts
index 20fc1c0914..1799fba39b 100644
--- a/types/enhanced-resolve/lib/Resolver.d.ts
+++ b/types/enhanced-resolve/lib/Resolver.d.ts
@@ -2,7 +2,6 @@
 import Tapable = require('tapable');
 import {
     ResolveParseResult,
-    ResolveResult,
     ResolverRequest,
     LoggingCallbackWrapper,
     AbstractInputFileSystem,
@@ -14,7 +13,7 @@ declare class Resolver extends Tapable {
 
     constructor(fileSystem: AbstractInputFileSystem);
 
-    resolveSync(context: ResolveContext, path: string, request: string): ResolveResult;
+    resolveSync(context: ResolveContext, path: string, request: string): string;
 
     resolve(context: ResolveContext, path: string, request: string, callback: LoggingCallbackWrapper): any;
 
diff --git a/types/enhanced-resolve/lib/common-types.d.ts b/types/enhanced-resolve/lib/common-types.d.ts
index 6607dee64f..b0ec925c0b 100644
--- a/types/enhanced-resolve/lib/common-types.d.ts
+++ b/types/enhanced-resolve/lib/common-types.d.ts
@@ -23,11 +23,6 @@ export interface ResolveContext {
     issuer?: string;
 }
 
-export interface ResolveResult {
-    path: boolean | string;
-    query: string;
-}
-
 export interface ResolverRequest {
     context: ResolveContext;
     descriptionFileData?: DescriptionFileData;
diff --git a/types/enhanced-resolve/test/index.ts b/types/enhanced-resolve/test/index.ts
index dfd5087be4..aeec1d57d8 100644
--- a/types/enhanced-resolve/test/index.ts
+++ b/types/enhanced-resolve/test/index.ts
@@ -1,5 +1,5 @@
 import resolve = require('enhanced-resolve');
-import { ResolveResult, AbstractInputFileSystem } from 'enhanced-resolve/lib/common-types'
+import { AbstractInputFileSystem } from 'enhanced-resolve/lib/common-types'
 import Resolver = require('enhanced-resolve/lib/Resolver')
 
 resolve('lib', 'string', function (err) { });
@@ -20,19 +20,30 @@ const nfs = new resolve.NodeJsInputFileSystem();
 
 const cfs = new resolve.CachedInputFileSystem(nfs, 4);
 
-let result: ResolveResult
+let result: string
 
 result = resolve.sync(context, 'path', 'string');
 result = resolve.sync('path', 'string');
 
+
+// Context
+
 resolve.context('lib', 'string', function (err) { });
 resolve.context(context, 'path', 'string', function () { });
 
 result = resolve.context.sync(context, 'path', 'string');
 result = resolve.context.sync('path', 'string');
 
-resolve.create('lib', 'string', function (err) { });
-resolve.create(context, 'path', 'string', function () { });
+// Loader
 
-result = resolve.create.sync(context, 'path', 'string');
-result = resolve.create.sync('path', 'string');
+resolve.loader('lib', 'string', function (err) { });
+resolve.loader(context, 'path', 'string', function () { });
+
+result = resolve.loader.sync(context, 'path', 'string');
+result = resolve.loader.sync('path', 'string');
+
+// Create
+
+resolve.create({extensions: [".js", ".json", ".node"]})(context, 'path', 'string', function () { });
+
+result = resolve.create.sync({mainFields: ["loader", "main"]})(context, 'path', 'string');
diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index 2dc9e98c87..083cee54b2 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -70,7 +70,7 @@ function ShallowWrapperTest() {
         shallowWrapper = shallowWrapper.filter(MyComponent);
         statelessWrapper = statelessWrapper.filter(MyStatelessComponent);
         shallowWrapper = shallowWrapper.filter({ numberProp: 12 });
-        elementWrapper = shallowWrapper.filter('.selector');
+        shallowWrapper = shallowWrapper.filter('.selector');
     }
 
     function test_filterWhere() {
@@ -422,7 +422,7 @@ function ReactWrapperTest() {
         reactWrapper = reactWrapper.filter(MyComponent);
         statelessWrapper = statelessWrapper.filter(MyStatelessComponent);
         reactWrapper = reactWrapper.filter({ numberProp: 12 });
-        elementWrapper = reactWrapper.filter('.selector');
+        reactWrapper = reactWrapper.filter('.selector');
     }
 
     function test_filterWhere() {
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index 721895e522..2a7142d9b3 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -8,14 +8,14 @@
 //                 huhuanming <https://github.com/huhuanming>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="cheerio" />
 import { ReactElement, Component, HTMLAttributes as ReactHTMLAttributes, SVGAttributes as ReactSVGAttributes } from "react";
 
 export type HTMLAttributes = ReactHTMLAttributes<{}> & ReactSVGAttributes<{}>;
 
-export class ElementClass extends Component<any, any> {
+export class ElementClass extends Component<any> {
 }
 
 /* These are purposefully stripped down versions of React.ComponentClass and React.StatelessComponent.
@@ -23,7 +23,7 @@ export class ElementClass extends Component<any, any> {
  * all specified in the implementation. TS chooses the EnzymePropSelector overload and loses the generics
  */
 export interface ComponentClass<Props> {
-    new (props?: Props, context?: any): Component<Props, any>;
+    new (props?: Props, context?: any): Component<Props>;
 }
 
 export type StatelessComponent<Props> = (props: Props, context?: any) => JSX.Element;
diff --git a/types/eonasdan-bootstrap-datetimepicker/index.d.ts b/types/eonasdan-bootstrap-datetimepicker/index.d.ts
index 71f973bbe9..63938275b1 100644
--- a/types/eonasdan-bootstrap-datetimepicker/index.d.ts
+++ b/types/eonasdan-bootstrap-datetimepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://eonasdan.github.io/bootstrap-datetimepicker
 // Definitions by: Markus Peloso <https://github.com/ToastHawaii>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/eq.js/index.d.ts b/types/eq.js/index.d.ts
index 4f48c092d5..d4b571368c 100644
--- a/types/eq.js/index.d.ts
+++ b/types/eq.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Snugug/eq.js
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var eqjs: eq.EqjsStatic;
 
diff --git a/types/es6-shim/es6-shim-tests.ts b/types/es6-shim/es6-shim-tests.ts
index ed89d2ac35..87f6fba0e5 100644
--- a/types/es6-shim/es6-shim-tests.ts
+++ b/types/es6-shim/es6-shim-tests.ts
@@ -1,31 +1,37 @@
-
+declare const require: (module: string) => Object;
+if (require !== null) {
+  require('es6-shim');
+}
 
 interface Point { x: number; y: number; }
 interface Point3D extends Point { z: number; }
 
 let a: any;
-let s: string;
-let i: number;
+let s: string = '';
+let i: number = 2;
+let iOrUndef: number | undefined;
 let b: boolean;
-let f: () => void;
+let f: () => void = () => {};
 let o: Object;
-let r: RegExp;
-let sym: symbol;
-let e: Error;
+let r: RegExp = /a/;
+let sym: symbol = {} as symbol;
+let e: Error = new Error();
 let date: Date;
 let key: PropertyKey;
-let point: Point;
-let point3d: Point3D;
-let arrayOfPoint: Point[];
+let point: Point = { x: 1, y: 2 };
+let point3d: Point3D = { x: 1, y: 2, z: 3 };
+let point3dOrUndef: Point3D | undefined;
+let pointOrUndef: Point | undefined;
+let arrayOfPoint: Point[] = [];
 let arrayOfPoint3D: Point3D[];
 let arrayOfSymbol: symbol[];
 let arrayOfPropertyKey: PropertyKey[];
 let arrayOfAny: any[];
 let arrayOfStringAny: [string, any][];
-let arrayLikeOfAny: ArrayLike<any>;
-let iterableOfPoint: IterableShim<Point>;
-let iterableOfStringPoint: IterableShim<[string, Point]>;
-let iterableOfPointPoint3D: IterableShim<[Point, Point3D]>;
+let arrayLikeOfAny: ArrayLike<any> = [];
+let iterableOfPoint: IterableShim<Point> = [];
+let iterableOfStringPoint: IterableShim<[string, Point]> = [];
+let iterableOfPointPoint3D: IterableShim<[Point, Point3D]> = [];
 let iterableIteratorOfPoint: IterableIteratorShim<Point>;
 let iterableIteratorOfNumberPoint: IterableIteratorShim<[number, Point]>;
 let iterableIteratorOfNumber: IterableIteratorShim<number>;
@@ -37,23 +43,23 @@ let iterableIteratorOfAny: IterableIteratorShim<any>;
 let iterableIteratorOfPropertyKey: IterableIteratorShim<PropertyKey>;
 let iterableIteratorOfPropertyKeyPoint: IterableIteratorShim<[PropertyKey, Point]>;
 let nodeList: NodeList;
-let pd: PropertyDescriptor;
-let pdm: PropertyDescriptorMap;
-let map: Map<string, Point>;
-let set: Set<Point>;
-let weakMap: WeakMap<Point, Point3D>;
-let weakSet: WeakSet<Point>;
-let promiseLikeOfPoint: PromiseLike<Point>;
-let promiseLikeOfPoint3D: PromiseLike<Point3D>;
-let promiseOfPoint: Promise<Point>;
-let promiseOfPoint3D: Promise<Point3D>;
+let pd: PropertyDescriptor = {};
+let pdm: PropertyDescriptorMap = {};
+let map: Map<string, Point> = new Map<string, Point>();
+let set: Set<Point> = new Set<Point>();
+let weakMap: WeakMap<Point, Point3D> = new WeakMap<Point, Point3D>();
+let weakSet: WeakSet<Point> = new WeakSet<Point>();
+let promiseLikeOfPoint: PromiseLike<Point> = Promise.resolve(point);
+let promiseLikeOfPoint3D: PromiseLike<Point3D> = Promise.resolve(point3d);
+let promiseOfPoint: Promise<Point> = Promise.resolve(point);
+let promiseOfPoint3D: Promise<Point3D> = Promise.resolve(point3d);
 let promiseOfArrayOfPoint: Promise<Point[]>;
 let promiseOfVoid: Promise<void>;
 
 point = Object.assign(point, point);
 b = Object.is(point, point);
-Object.setPrototypeOf(point, point);
-point = arrayOfPoint.find(p => b);
+Object.setPrototypeOf(point, {});
+pointOrUndef = arrayOfPoint.find(p => b);
 i = arrayOfPoint.findIndex(p => b);
 arrayOfPoint = arrayOfPoint.fill(point, i, arrayOfPoint.length);
 arrayOfPoint = arrayOfPoint.copyWithin(i, i, i);
@@ -69,7 +75,7 @@ b = s.includes(s, i);
 b = s.endsWith(s, i);
 s = s.repeat(i);
 b = s.startsWith(s, i);
-s = String.fromCodePoint(i, i);
+s = String.fromCodePoint(2 as number, 3 as number);
 s = String.raw`abc`;
 s = r.flags;
 i = Number.EPSILON;
@@ -102,7 +108,7 @@ i = Math.cbrt(i);
 map.clear();
 map.delete(s);
 map.forEach((value: Point, key: string) => { });
-point = map.get(s);
+pointOrUndef = map.get(s);
 b = map.has(s);
 map = map.set(s, point);
 i = map.size;
@@ -117,7 +123,7 @@ i = set.size;
 set = new Set<Point>();
 set = new Set(iterableOfPoint);
 weakMap.delete(point);
-point3d = weakMap.get(point);
+point3dOrUndef = weakMap.get(point);
 b = weakMap.has(point);
 weakMap = weakMap.set(point, point3d);
 weakMap = new WeakMap<Point, Point3D>();
@@ -177,13 +183,15 @@ promiseOfPoint = promiseOfPoint.catch(e => point);
 promiseOfPoint = promiseOfPoint.catch(e => promiseOfPoint);
 promiseOfPoint = promiseOfPoint.catch(e => promiseLikeOfPoint);
 promiseOfPoint = promiseOfPoint.catch(e => { });
-promiseOfPoint3D = promiseOfPoint.catch(e => point3d);
-promiseOfPoint3D = promiseOfPoint.catch(e => promiseOfPoint3D);
-promiseOfPoint3D = promiseOfPoint.catch(e => promiseLikeOfPoint3D);
+promiseOfPoint3D = promiseOfPoint3D.catch(e => point3d);
+promiseOfPoint3D = promiseOfPoint3D.catch(e => promiseOfPoint3D);
+promiseOfPoint3D = promiseOfPoint3D.catch(e => promiseLikeOfPoint3D);
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(point));
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(promiseOfPoint));
 promiseOfPoint = new Promise<Point>((resolve, reject) => resolve(promiseLikeOfPoint));
 promiseOfPoint = new Promise<Point>((resolve, reject) => reject(e));
+// To prevent UnhandledPromiseRejectionWarning
+promiseOfPoint.catch(() => {});
 promiseOfArrayOfPoint = Promise.all(arrayOfPoint);
 promiseOfArrayOfPoint = Promise.all(iterableOfPoint);
 promiseOfPoint = Promise.race(arrayOfPoint);
@@ -193,7 +201,11 @@ promiseOfPoint = Promise.resolve(point3d);
 promiseOfPoint = Promise.resolve(promiseOfPoint);
 promiseOfPoint = Promise.resolve(promiseLikeOfPoint);
 promiseOfVoid = Promise.reject(e);
+// To prevent UnhandledPromiseRejectionWarning
+promiseOfVoid.catch(() => {});
 promiseOfPoint = Promise.reject<Point>(e);
+// To prevent UnhandledPromiseRejectionWarning
+promiseOfPoint.catch(() => {});
 a = Reflect.apply(f, a, arrayLikeOfAny);
 a = Reflect.construct(f, arrayLikeOfAny);
 b = Reflect.defineProperty(a, s, pd);
@@ -203,9 +215,9 @@ b = Reflect.deleteProperty(a, s);
 b = Reflect.deleteProperty(a, i);
 b = Reflect.deleteProperty(a, sym);
 iterableIteratorOfAny = Reflect.enumerate(a);
-a = Reflect.get(a, s, a);
-a = Reflect.get(a, i, a);
-a = Reflect.get(a, sym, a);
+Reflect.get(a, s, a);
+Reflect.get(a, i, a);
+Reflect.get(a, sym, a);
 pd = Reflect.getOwnPropertyDescriptor(a, s);
 pd = Reflect.getOwnPropertyDescriptor(a, i);
 pd = Reflect.getOwnPropertyDescriptor(a, sym);
@@ -219,4 +231,4 @@ b = Reflect.preventExtensions(a);
 b = Reflect.set(a, s, a, a);
 b = Reflect.set(a, i, a, a);
 b = Reflect.set(a, sym, a, a);
-b = Reflect.setPrototypeOf(a, a);
\ No newline at end of file
+b = Reflect.setPrototypeOf(a, a);
diff --git a/types/es6-shim/index.d.ts b/types/es6-shim/index.d.ts
index 483f4357e0..4c03fc8b9e 100644
--- a/types/es6-shim/index.d.ts
+++ b/types/es6-shim/index.d.ts
@@ -185,11 +185,10 @@ interface Array<T> {
       * @param thisArg If provided, it will be used as the this value for each invocation of
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T | undefined;
 
     /**
-      * Returns the index of the first element in the array where predicate is true, and undefined
-      * otherwise.
+      * Returns the index of the first element in the array where predicate is true, and -1 otherwise.
       * @param predicate find calls predicate once for each element of the array, in ascending
       * order, until it finds one where predicate returns true. If such an element is found, find
       * immediately returns that element value. Otherwise, find returns undefined.
@@ -556,9 +555,9 @@ interface Map<K, V> {
     clear(): void;
     delete(key: K): boolean;
     forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
+    get(key: K): V | undefined;
     has(key: K): boolean;
-    set(key: K, value?: V): Map<K, V>;
+    set(key: K, value: V): Map<K, V>;
     size: number;
     entries(): IterableIteratorShim<[K, V]>;
     keys(): IterableIteratorShim<K>;
@@ -596,9 +595,9 @@ declare var Set: SetConstructor;
 
 interface WeakMap<K extends object, V> {
     delete(key: K): boolean;
-    get(key: K): V;
+    get(key: K): V | undefined;
     has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
+    set(key: K, value: V): WeakMap<K, V>;
 }
 
 interface WeakMapConstructor {
diff --git a/types/es6-shim/tsconfig.json b/types/es6-shim/tsconfig.json
index 1243a36ddb..02c35aee5a 100644
--- a/types/es6-shim/tsconfig.json
+++ b/types/es6-shim/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "es6-shim-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/execa/execa-tests.ts b/types/execa/execa-tests.ts
new file mode 100644
index 0000000000..fd7428d1ae
--- /dev/null
+++ b/types/execa/execa-tests.ts
@@ -0,0 +1,124 @@
+import * as assert from 'assert';
+import * as execa from 'execa';
+import { PassThrough } from "stream";
+
+execa('unicorns')
+    .then(result => {
+        assert(result.cmd === 'unicorns');
+        assert(result.code === 0);
+        assert(result.failed === false);
+        assert(result.killed === false);
+        assert(result.signal === null);
+        assert(result.stderr === 'bad unicorns');
+        assert(result.stdout === 'good unicorns');
+        assert(result.timedOut === false);
+    });
+
+execa('foo')
+    .catch(error => {
+        assert(error.cmd === 'foo');
+        assert(error.code === 128);
+        assert(error.failed === true);
+        assert(error.killed === false);
+        assert(error.signal === 'SIGINT');
+        assert(error.stderr === 'stderr');
+        assert(error.stdout === 'stdout');
+        assert(error.timedOut === false);
+    });
+
+execa('noop', ['foo'])
+    .then(result => result.stderr.toLocaleLowerCase());
+
+execa.stdout('unicorns')
+    .then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('echo', ['unicorns'])
+    .then(stdout => stdout.toLocaleLowerCase());
+
+execa.stderr('unicorns')
+    .then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('echo', ['unicorns'])
+    .then(stderr => stderr.toLocaleLowerCase());
+
+execa.shell('echo unicorns')
+    .then(result => result.stdout.toLocaleLowerCase());
+
+{
+    let result: string;
+    result = execa.shellSync('foo').stderr;
+    result = execa.shellSync('noop', { cwd: 'foo' }).stdout;
+
+    result = execa.shellSync('foo').stderr;
+    result = execa.shellSync('noop foo').stdout;
+}
+
+execa('echo', ['unicorns']).stdout.pipe(process.stdout);
+execa('echo', ['unicorns']).stderr.pipe(process.stderr);
+
+async () => {
+    const { stdout } = await execa('noop', ['foo'], { stripEof: false });
+    assert(stdout === 'foo\n');
+};
+
+async () => {
+    const { stdout } = await execa('foo', { preferLocal: false });
+    assert(stdout === 'global foo');
+};
+
+async () => {
+    const { stdout } = await execa('stdin', { input: 'foobar' });
+    assert(stdout === 'foobar');
+};
+
+async () => {
+    const { stdout } = await execa('stdin', { input: new Buffer('foobar') });
+    assert(stdout === 'foobar');
+};
+
+async () => {
+    const s = new PassThrough();
+    s.write('howdy');
+    s.end();
+    const { stdout } = await execa('stdin', { input: s });
+    assert(stdout === 'foobar');
+};
+
+async () => {
+    const child = execa('stdin');
+    child.stdin.end('unicorns');
+    const { stdout } = await child;
+    assert(stdout === 'unicorns');
+};
+
+async () => {
+    const { stdout } = await execa('stdin', {
+        input: 'hello',
+        stdio: [null, 'ignore', null]
+    });
+    assert(stdout === null);
+};
+
+{
+    const child = execa('stdin', {
+        input: 'hello',
+        stdio: [null, 'ignore', null]
+    });
+
+    child.stdout.setEncoding('utf8');
+
+    assert(child.pid === 0);
+    child.kill();
+}
+
+async () => {
+    const { timedOut, code } = await execa('delay', ['3000', '22'], { timeout: 9000 });
+    assert(timedOut === true);
+    assert(code === 22);
+};
+
+async () => {
+    const { stdout } = await execa.shell('noop foo', {
+        shell: process.platform === 'win32' ? 'cmd.exe' : '/bin/bash'
+    });
+
+    assert(stdout === 'foo');
+};
diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
new file mode 100644
index 0000000000..df868e4d15
--- /dev/null
+++ b/types/execa/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for execa 0.6
+// Project: https://github.com/sindresorhus/execa#readme
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { ExecOptions, SpawnOptions, SpawnSyncOptions, SpawnSyncReturns, ChildProcess } from "child_process";
+import { Stream } from 'stream';
+
+interface ExecaOptions {
+    input: string | Buffer | Stream;
+    preferLocal: boolean;
+    stripEof: boolean;
+}
+
+type Options = SpawnOptions & ExecaOptions & ExecOptions;
+
+interface ExecaReturns {
+    cmd: string;
+    code: number;
+    failed: boolean;
+    killed: boolean;
+    signal: string | null;
+    stderr: string;
+    stdout: string;
+    timedOut: boolean;
+}
+
+type ExecaError = Error & ExecaReturns;
+
+interface ExecaChildPromise {
+    catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | undefined | null): Promise<ExecaReturns | TResult>;
+}
+type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
+
+declare function execa(file: string, options?: Partial<Options>): ExecaChildProcess;
+declare function execa(file: string, args?: string[], options?: Partial<Options>): ExecaChildProcess;
+declare namespace execa {
+    function stdout(file: string, options?: Partial<Options>): Promise<string>;
+    function stdout(file: string, args?: string[], options?: Partial<Options>): Promise<string>;
+    function stderr(file: string, options?: Partial<Options>): Promise<string>;
+    function stderr(file: string, args?: string[], options?: Partial<Options>): Promise<string>;
+    function shell(command: string, options?: SpawnOptions): ExecaChildProcess;
+    function sync<T = string>(file: string, options?: SpawnSyncOptions): ExecaReturns;
+    function sync<T = string>(file: string, args?: string[], options?: SpawnSyncOptions): ExecaReturns;
+    function shellSync(command: string, options?: SpawnOptions): ExecaReturns;
+}
+
+export = execa;
diff --git a/types/execa/tsconfig.json b/types/execa/tsconfig.json
new file mode 100644
index 0000000000..276a55194a
--- /dev/null
+++ b/types/execa/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "execa-tests.ts"
+    ]
+}
diff --git a/types/execa/tslint.json b/types/execa/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/execa/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-brute-mongo/index.d.ts b/types/express-brute-mongo/index.d.ts
index cf248f8883..9714fedd5d 100644
--- a/types/express-brute-mongo/index.d.ts
+++ b/types/express-brute-mongo/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/auth0/express-brute-mongo
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-
-
+import { Collection } from "mongodb";
 
 /**
  * @summary MongoDB store adapter.
@@ -17,5 +17,5 @@ export = class MongoStore {
      * @param {Function} getCollection The collection.
      * @param {Object}   options       The otpions.
      */
-    constructor(getCollection: (collection: any) => void, options?: Object);
+    constructor(getCollection: (collection: (c: Collection) => void) => void, options?: Object);
 }
diff --git a/types/express-enforces-ssl/express-enforces-ssl-tests.ts b/types/express-enforces-ssl/express-enforces-ssl-tests.ts
new file mode 100644
index 0000000000..50dab42cdf
--- /dev/null
+++ b/types/express-enforces-ssl/express-enforces-ssl-tests.ts
@@ -0,0 +1,6 @@
+import express = require('express');
+import expressEnforcesSsl = require('express-enforces-ssl');
+
+let app: express.Express = express();
+
+app.use(expressEnforcesSsl());
diff --git a/types/express-enforces-ssl/index.d.ts b/types/express-enforces-ssl/index.d.ts
new file mode 100644
index 0000000000..f4c1d424a4
--- /dev/null
+++ b/types/express-enforces-ssl/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for express-enforces-ssl 1.1
+// Project: https://github.com/aredo/express-enforces-ssl
+// Definitions by: Kevin Stubbs <https://github.com/kevinstubbs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Request, Response, NextFunction } from 'express';
+
+/**
+ * Enforces HTTPS connections on any incoming requests.
+ */
+declare function enforceHTTPS(): (req: Request, res: Response, next: NextFunction) => void;
+
+export = enforceHTTPS;
diff --git a/types/express-enforces-ssl/tsconfig.json b/types/express-enforces-ssl/tsconfig.json
new file mode 100644
index 0000000000..2fdb6a3472
--- /dev/null
+++ b/types/express-enforces-ssl/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-enforces-ssl-tests.ts"
+    ]
+}
diff --git a/types/express-enforces-ssl/tslint.json b/types/express-enforces-ssl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-enforces-ssl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-handlebars/express-handlebars-tests.ts b/types/express-handlebars/express-handlebars-tests.ts
index 4251c985fe..e923542a65 100644
--- a/types/express-handlebars/express-handlebars-tests.ts
+++ b/types/express-handlebars/express-handlebars-tests.ts
@@ -1,7 +1,3 @@
-/// <reference types="node" />
-
-
-
 import express = require('express');
 import exphbs = require('express-handlebars');
 
diff --git a/types/express-jwt/index.d.ts b/types/express-jwt/index.d.ts
index 4b6883a258..d75dfa9adf 100644
--- a/types/express-jwt/index.d.ts
+++ b/types/express-jwt/index.d.ts
@@ -34,7 +34,7 @@ declare namespace jwt {
         [property: string]: any;
     }
     export interface RequestHandler extends express.RequestHandler {
-        unless?: typeof unless;
+        unless: typeof unless;
     }
 }
 declare global {
diff --git a/types/express-rate-limit/index.d.ts b/types/express-rate-limit/index.d.ts
index 54bdacb936..86b8d497b0 100644
--- a/types/express-rate-limit/index.d.ts
+++ b/types/express-rate-limit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for express-rate-limit 2.6
+// Type definitions for express-rate-limit 2.8
 // Project: https://github.com/nfriedly/express-rate-limit
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,14 +17,15 @@ declare namespace RateLimit {
     interface Options {
         delayAfter?: number;
         delayMs?: number;
-        handlers?(): any;
+        handlers?(req?: express.Request, res?: express.Response, next?: express.NextFunction): any;
         headers?: boolean;
-        keyGenerator?(): string;
+        keyGenerator?(req?: express.Request, res?: express.Response): string;
         max?: number;
         message?: string;
-        skip?(): boolean;
+        skip?(req?: express.Request, res?: express.Response): boolean;
         statusCode?: number;
         store?: Store;
+        onLimitReached?(req?: express.Request, res?: express.Response, optionsUsed?: Options): void;
         windowMs?: number;
     }
 }
diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 8e1f075f03..bd8647aa77 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Express 4.x
 // Project: http://expressjs.com
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Michał Lytek <https://github.com/19majkel94>
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Michał Lytek <https://github.com/19majkel94>, Kacper Polak <https://github.com/kacepe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // This extracts the core definitions from express to prevent a circular dependency between express and serve-static
 /// <reference types="node" />
@@ -197,11 +197,9 @@ interface Request extends http.IncomingMessage, Express.Request {
         *
         * @param name
         */
-    get(name: string): string;
+    get(name: string): string | undefined;
 
-    header(name: string): string;
-
-    headers: { [key: string]: string; };
+    header(name: string): string | undefined;
 
     /**
         * Check if the given `type(s)` is acceptable, returning
@@ -475,7 +473,6 @@ interface MediaType {
 }
 
 interface Send {
-    (status: number, body?: any): Response;
     (body?: any): Response;
 }
 
diff --git a/types/express-serve-static-core/tsconfig.json b/types/express-serve-static-core/tsconfig.json
index 40ee779963..cdb77c3573 100644
--- a/types/express-serve-static-core/tsconfig.json
+++ b/types/express-serve-static-core/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/express-useragent/express-useragent-tests.ts b/types/express-useragent/express-useragent-tests.ts
index b959c4e0c2..7ab7b3d20d 100644
--- a/types/express-useragent/express-useragent-tests.ts
+++ b/types/express-useragent/express-useragent-tests.ts
@@ -18,7 +18,7 @@ app.get("/", function(req, res) {
 });
 
 app.get("/parse", function(req, res) {
-    var source = req.headers['user-agent'],
+    var source = req.headers['user-agent'] as string,
     ua = useragent.parse(source);
     res.writeHead(200, {'Content-Type': 'text/plain'});
     res.end(JSON.stringify(ua));
diff --git a/types/express-validator/express-validator-tests.ts b/types/express-validator/express-validator-tests.ts
deleted file mode 100644
index 9c374d9948..0000000000
--- a/types/express-validator/express-validator-tests.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Usage Example from https://github.com/ctavan/express-validator */
-
-import util = require('util')
-import express = require('express')
-import expressValidator = require('express-validator')
-var app = express();
-
-app.use(expressValidator());
-
-app.post('/:urlparam', function(req: express.Request, res: express.Response) {
-
-  // checkBody only checks req.body; none of the other req parameters
-  // Similarly checkParams only checks in req.params (URL params) and
-  // checkQuery only checks req.query (GET params).
-  req.checkBody('postparam', 'Invalid postparam').notEmpty().isInt();
-  req.checkParams('urlparam', 'Invalid urlparam').isAlpha().matches(/test?/i).matches('test?', 'i');
-  req.checkQuery('getparam', 'Invalid getparam').isInt();
-  req.checkHeaders('testHeader', 'Invalid testHeader').isLowercase().isUppercase();
-  req.checkFiles('testFiles', 'Invalid testFiles').isURL();
-
-  // OR assert can be used to check on all 3 types of params.
-  // req.assert('postparam', 'Invalid postparam').notEmpty().isInt();
-  // req.assert('urlparam', 'Invalid urlparam').isAlpha();
-  // req.assert('getparam', 'Invalid getparam').isInt();
-
-  req.filter('postparam').toBoolean();
-  req.sanitize('postparam').blacklist('t').blacklist(['<script', '</script>']).whitelist('hello').whitelist(['h', 'e', 'l']);
-  req.sanitizeBody('postvar').trim().stripLow().escape();
-  req.sanitizeQuery('queryvar').toDate();
-  req.sanitizeParams('urlparam').toFloat().toInt().toInt(10);
-  req.sanitizeHeaders('header').normalizeEmail();
-  
-
-  var errors = req.validationErrors();
-  var mappedErrors = req.validationErrors(true);
-
-  if (errors) {
-    res.status(400).send('There have been validation errors: ' + util.inspect(errors));
-    return;
-  }
-  res.json({
-    urlparam: req.param('urlparam'),
-    getparam: req.param('getparam'),
-    postparam: req.param('postparam')
-  });
-});
-
-app.listen(8888);
diff --git a/types/express-validator/index.d.ts b/types/express-validator/index.d.ts
deleted file mode 100644
index 0416b4db44..0000000000
--- a/types/express-validator/index.d.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-// Type definitions for express-validator 2.20.4
-// Project: https://github.com/ctavan/express-validator
-// Definitions by: Nathan Ridley <https://github.com/axefrog/>, Jonathan Häberle <http://dreampulse.de>, Peter Harris <https://github.com/codeanimal/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="express" />
-
-// Add RequestValidation Interface on to Express's Request Interface.
-declare namespace Express {
-	interface Request extends ExpressValidator.RequestValidation {}
-}
-
-// External express-validator module.
-declare module "express-validator" {
-	import express = require('express');
-
-	/**
-	 *
-	 * @middlewareOptions see: https://github.com/ctavan/express-validator#middleware-options
-	 */
-	function ExpressValidator(middlewareOptions?:any):express.RequestHandler;
-
-	export = ExpressValidator;
-}
-
-// Internal Module.
-declare namespace ExpressValidator {
-
-	export interface ValidationError {
-		msg: string;
-		param: string;
-	}
-
-	interface ValidatorFunction { (item: string | {}, message?: string): Validator; }
-	interface ValidatorExtraFunction extends ValidatorFunction { (matchIndex: number, message?: string): Validator; }
-	interface SanitizerFunction { (item: string): Sanitizer; }
-	interface Dictionary<T> { [key: string]: T; }
-
-	export interface RequestValidation {
-		assert: ValidatorExtraFunction;
-		validate: ValidatorExtraFunction;
-		check: ValidatorExtraFunction;
-		checkBody: ValidatorFunction;
-		checkFiles: ValidatorFunction;
-		checkHeaders: ValidatorFunction;
-		checkParams: ValidatorFunction;
-		checkQuery: ValidatorFunction;
-		
-		filter: SanitizerFunction;
-		sanitize: SanitizerFunction;
-		sanitizeBody: SanitizerFunction;
-		sanitizeQuery: SanitizerFunction;
-		sanitizeParams: SanitizerFunction;
-		sanitizeHeaders: SanitizerFunction;
-		
-		onValidationError(errback: (msg: string) => void): void;
-		validationErrors(mapped?: boolean): Dictionary<MappedError> | MappedError[];
-		validationErrors<T>(mapped?: boolean): Dictionary<T> | T[];
-		asyncValidationErrors(mapped?: boolean): Promise<MappedError[] | Dictionary<MappedError>>;
-		asyncValidationErrors<T>(mapped?: boolean): Promise<T[] | Dictionary<T>>;
-	}
-
-	export interface Validator {
-		/**
-		 * Alias for regex()
-		 */
-		is(): Validator;
-		/**
-		 * Alias for notRegex()
-		 */
-		not(): Validator;
-		isEmail(options?:{}): Validator;
-		/**
-		 * Accepts http, https, ftp
-		 */
-		isURL(): Validator;
-		isFQDN(options?: MinMaxOptions): Validator;
-		
-		/**
-		 * Combines isIPv4 and isIPv6
-		 */
-		isIP(): Validator;
-		isIPv4(): Validator;
-		isIPv6(): Validator;
-		isMACAddress(): Validator;
-		isISBN(version?: number): Validator;
-		isISIN(): Validator;
-		isISO8601(): Validator;
-		isMobilePhone(locale: string): Validator;
-		isMongoId(): Validator;
-		isMultibyte(): Validator;
-		isAlpha(locale?: string): Validator;
-		isAlphanumeric(locale?: string): Validator;
-		isAscii(): Validator;
-		isBase64(): Validator;
-		isBoolean(): Validator;
-		isByteLength(options: MinMaxOptions): Validator;
-		isCurrency(options: {}): Validator;
-		isDataURI(): Validator;
-		isDivisibleBy(num: number): Validator;
-		isNumeric(): Validator;
-		isHexadecimal(): Validator;
-		/**
-		 * Accepts valid hexcolors with or without # prefix
-		 */
-		isHexColor(): Validator;
-		/**
-		 * isNumeric accepts zero padded numbers, e.g. '001', isInt doesn't
-		 */
-		isInt(options?: MinMaxOptions): Validator;
-		isLowercase(): Validator;
-		isUppercase(): Validator;
-		isDecimal(): Validator;
-		/**
-		 * Alias for isDecimal
-		 */
-		isFloat(): Validator;
-		isFullWidth(): Validator;
-		isHalfWidth(): Validator;
-		isVariableWidth(): Validator;
-		/**
-		 * Check if length is 0
-		 */
-		isNull(): Validator;
-		/**
-		 * Not just whitespace (input.trim().length !== 0)
-		 */
-		notEmpty(): Validator;
-		equals(equals:any): Validator;
-		contains(str:string): Validator;
-
-		/**
-		 * Usage: matches(/[a-z]/i) or matches('[a-z]','i')
-		 */
-		matches(pattern:string, modifiers?:string): Validator;
-		matches(pattern: RegExp): Validator;
-		
-		/**
-		 * max is optional
-		 */
-		len(min:number, max?:number): Validator;
-		/**
-		 * Version can be 3, 4 or 5 or empty, see http://en.wikipedia.org/wiki/Universally_unique_identifier
-		 */
-		isUUID(version?:number): Validator;
-		/**
-		 * Alias for isUUID(3)
-		 */
-		isUUIDv3(): Validator;
-		/**
-		 * Alias for isUUID(4)
-		 */
-		isUUIDv4(): Validator;
-		/**
-		 * Alias for isUUID(5)
-		 */
-		isUUIDv5(): Validator;
-		/**
-		 * Uses Date.parse() - regex is probably a better choice
-		 */
-		isDate(): Validator;
-		/**
-		 * Argument is optional and defaults to today. Comparison is non-inclusive
-		 */
-		isAfter(date?:Date): Validator;
-		/**
-		 * Argument is optional and defaults to today. Comparison is non-inclusive
-		 */
-		isBefore(date?:Date): Validator;
-		isIn(options:string): Validator;
-		isIn(options:string[]): Validator;
-		notIn(options:string): Validator;
-		notIn(options:string[]): Validator;
-		max(val:string): Validator;
-		min(val:string): Validator;
-		isJSON(): Validator;
-		isLength(options: MinMaxOptions): Validator;
-		isWhitelisted(chars: string): Validator;
-		/**
-		 * Will work against Visa, MasterCard, American Express, Discover, Diners Club, and JCB card numbering formats
-		 */
-		isCreditCard(): Validator;
-		/**
-		 * Check an input only when the input exists
-		 */
-		isSurrogatePar(): Validator;
-		
-		optional(options?: { checkFalsy?: boolean }): Validator;
-		withMessage(message: string): Validator;
-	}
-
-	interface Sanitizer {
-		/**
-		 * Trim optional `chars`, default is to trim whitespace (\r\n\t )
-		 */
-		trim(...chars:string[]): Sanitizer;
-		ltrim(...chars:string[]): Sanitizer;
-		rtrim(...chars:string[]): Sanitizer;
-		stripLow(keep_new_lines?: boolean): Sanitizer;
-		toFloat(): Sanitizer;
-		toInt(radix?: number): Sanitizer;
-		/**
-		 * True unless str = '0', 'false', or str.length == 0. In strict mode only '1' and 'true' return true.
-		 */
-		toBoolean(strict?: boolean): Sanitizer;
-		
-		/**
-		* Convert the input string to a date, or null if the input is not a date.
-		*/
-		toDate(): Sanitizer;
-		
-		/**
-		 * Escape &, <, >, and "
-		 */
-		escape(): Sanitizer;
-		
-		/**
-		 * Replaces HTML encoded entities with <, >, &, ', " and /.
-		 */
-		unescape(): Sanitizer;
-		
-		blacklist(chars: string): Sanitizer;
-		blacklist(chars: string[]): Sanitizer;
-		whitelist(chars: string): Sanitizer;
-		whitelist(chars: string[]): Sanitizer;
-		
-		normalizeEmail(options?: { lowercase?: boolean; remove_dots?: boolean; remove_extensions?: boolean }): Sanitizer;
-		
-		/**
-		 * !!! XSS sanitization was removed from the library (see: https://github.com/chriso/validator.js#xss-sanitization)
-		 */
-	}
-	
-	interface MappedError {
-		param: string;
-		msg: string;
-		value: string;
-	}
-	
-	interface MinMaxOptions {
-		min?: number;
-		max?: number;
-	}
-}
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 04165d5e09..3270a3f391 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as express from 'express';
 
 namespace express_tests {
@@ -71,6 +70,15 @@ namespace express_tests {
         language = req.acceptsLanguages(['en', 'ja']);
         language = req.acceptsLanguages('en', 'ja');
 
+        let existingHeader1 = req.get('existingHeader') as string;
+        let nonExistingHeader1 = req.get('nonExistingHeader') as undefined;
+
+        let existingHeader2 = req.header('existingHeader') as string;
+        let nonExistingHeader2 = req.header('nonExistingHeader') as undefined;
+
+        let existingHeader3 = req.headers.existingHeader as string;
+        let nonExistingHeader3 = req.headers.nonExistingHeader as any as undefined;
+
         res.send(req.query['token']);
     });
 
diff --git a/types/express/index.d.ts b/types/express/index.d.ts
index 9b913db473..d48d58c0c9 100644
--- a/types/express/index.d.ts
+++ b/types/express/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /* =================== USAGE ===================
 
diff --git a/types/express/tsconfig.json b/types/express/tsconfig.json
index 0fc87c2800..009cb9ec00 100644
--- a/types/express/tsconfig.json
+++ b/types/express/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/extend/extend-tests.ts b/types/extend/extend-tests.ts
index 12a3147d2a..38e816f020 100644
--- a/types/extend/extend-tests.ts
+++ b/types/extend/extend-tests.ts
@@ -1,7 +1,5 @@
-/// <reference types="node" />
-
-import assert = require('assert');
 import extend = require('extend');
+declare function assert(cond: boolean): void;
 
 var objectBase = {
     test: 'base'
diff --git a/types/extended-listbox/extended-listbox-tests.ts b/types/extended-listbox/extended-listbox-tests.ts
index dfa51ffebf..e3dcba4735 100644
--- a/types/extended-listbox/extended-listbox-tests.ts
+++ b/types/extended-listbox/extended-listbox-tests.ts
@@ -12,7 +12,7 @@ options.multiple = true;
 options.searchBar = false;
 options.searchBarWatermark = "Search";
 options.searchBarButton = { icon: "fa fa-search", visible: true, onClick: function () { alert(); } };
-options.getItems = function (): any[] {
+options.getItems = (): (string|ListboxItem)[] => {
     return ["Test1"];
 };
 options.onItemsChanged = (event: ListboxEvent): void => {
@@ -23,13 +23,13 @@ options.onItemsChanged = (event: ListboxEvent): void => {
 options.onFilterChanged = (event: ListboxEvent): void => {
     console.log(event.args);
 };
-options.onValueChanged = function (event: ListboxEvent): void {
+options.onValueChanged = (event: ListboxEvent): void => {
     console.log(event.args);
 };
-options.onItemDoubleClicked = function (event: ListboxEvent): void {
+options.onItemDoubleClicked = (event: ListboxEvent): void => {
     console.log(event.args);
 };
-options.onItemEnterPressed = function (event: ListboxEvent): void {
+options.onItemEnterPressed = (event: ListboxEvent): void => {
     console.log(event.args);
 };
 
@@ -39,14 +39,14 @@ instance = <ExtendedListboxInstance>$test.listbox(options);
 /////// NEW API ///////
 
 // Add string item
-var id = instance.addItem("Test2");
+var id: string = instance.addItem("Test2");
 
 
 // Add item
 var item: ListboxItem = <ListboxItem>{};
 item.selected = true;
 item.disabled = false;
-item.childItems = ["Test4"];
+item.childItems = [{ text: "Test4" }];
 item.groupHeader = false;
 item.id = "ouetioreit";
 item.index = 0;
@@ -54,10 +54,18 @@ item.text = "Test3";
 id = instance.addItem(item);
 
 
+// Add string items
+var ids: string[] = instance.addItems(["Test2", "Test1"]);
+
+
 // Remove item
 instance.removeItem(id);
 
 
+// Remove items
+instance.removeItems([id, ids[0]]);
+
+
 // Get item
 var i: ListboxItem = instance.getItem(id);
 
diff --git a/types/extended-listbox/index.d.ts b/types/extended-listbox/index.d.ts
index 3f3527b903..e5062510f9 100644
--- a/types/extended-listbox/index.d.ts
+++ b/types/extended-listbox/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for extended-listbox 2.0.x
+// Type definitions for extended-listbox 3.0.x
 // Project: https://github.com/code-chris/extended-listbox
 // Definitions by: Christian Kotzbauer <https://github.com/code-chris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface ListboxItem {
     /** display text */
@@ -26,7 +27,7 @@ interface ListboxItem {
     parentGroupId?: string;
 
     /** list of childItems */
-    childItems?: any[];
+    childItems?: ListboxItem[];
 }
 
 interface ListboxSearchBarButtonOptions {
@@ -54,7 +55,7 @@ interface ListBoxOptions {
     multiple?: boolean;
 
     /** function which returns a array of items */
-    getItems?: () => any;
+    getItems?: () => (string|ListboxItem)[];
 
     /** callback for selection changes */
     onValueChanged?: (event: ListboxEvent) => void;
@@ -90,9 +91,15 @@ interface ExtendedListboxInstance {
     /** Adds a new item to the list */
     addItem(item: string|ListboxItem): string;
 
+    /** Adds new items to the list */
+    addItems(item: (string|ListboxItem)[]): string[];
+
     /** Removes a item from the list */
     removeItem(identifier: string): void;
 
+    /** Removes items from the list */
+    removeItems(identifiers: string[]): void;
+
     /** Reverts all changes from the DOM */
     destroy(): void;
 
diff --git a/types/eyes/eyes-tests.ts b/types/eyes/eyes-tests.ts
index 2775aff7c4..c0ca4bc846 100644
--- a/types/eyes/eyes-tests.ts
+++ b/types/eyes/eyes-tests.ts
@@ -27,7 +27,7 @@ var options = {
     maxLength: 120
 }
 
-var result = eyes.inspector(testObj)
+var result = eyes.inspector(options)
 
 
 
diff --git a/types/eyes/index.d.ts b/types/eyes/index.d.ts
index 3307d9d484..219d13c0fe 100644
--- a/types/eyes/index.d.ts
+++ b/types/eyes/index.d.ts
@@ -43,7 +43,7 @@ export interface EyesOptions {
     /** Don't output functions at all */
     hideFunctions?: boolean;
     /** Stream to write to, or null */
-    stream?: stream.Writable;
+    stream?: NodeJS.WritableStream;
     /** Truncate output if longer */
     maxLength?: number;
 }
diff --git a/types/fabric/fabric-tests.ts b/types/fabric/fabric-tests.ts
index 770467590c..5e51bb8035 100644
--- a/types/fabric/fabric-tests.ts
+++ b/types/fabric/fabric-tests.ts
@@ -259,18 +259,16 @@ function sample4() {
   });
 }
 
-namespace myfabric {
-  export interface CircleWithLineInfos extends fabric.Circle {
+interface CircleWithLineInfos extends fabric.Circle {
     line1?: fabric.Line;
     line2?: fabric.Line;
     line3?: fabric.Line;
     line4?: fabric.Line;
-  }
 }
 
 function sample5() {
   const makeCircle = (left: number, top: number, line1?: fabric.Line, line2?: fabric.Line, line3?: fabric.Line, line4?: fabric.Line): fabric.Circle => {
-    const c = <myfabric.CircleWithLineInfos> new fabric.Circle({
+    const c = <CircleWithLineInfos> new fabric.Circle({
       left,
       top,
       strokeWidth: 5,
@@ -317,11 +315,11 @@ function sample5() {
     );
 
   canvas.on('object:moving', e => {
-    const p = <myfabric.CircleWithLineInfos> e.target;
-    p.line1 && p.line1.set({ 'x2': p.left, 'y2': p.top });
-    p.line2 && p.line2.set({ 'x1': p.left, 'y1': p.top });
-    p.line3 && p.line3.set({ 'x1': p.left, 'y1': p.top });
-    p.line4 && p.line4.set({ 'x1': p.left, 'y1': p.top });
+    const p = <CircleWithLineInfos> e.target;
+    p.line1 && p.line1.set({ x2: p.left, y2: p.top });
+    p.line2 && p.line2.set({ x1: p.left, y1: p.top });
+    p.line3 && p.line3.set({ x1: p.left, y1: p.top });
+    p.line4 && p.line4.set({ x1: p.left, y1: p.top });
     canvas.renderAll();
   });
 }
@@ -351,10 +349,8 @@ function sample6() {
   });
 }
 
-namespace myfabric {
-  export interface ImageWithInfo extends fabric.Image {
+interface ImageWithInfo extends fabric.Image {
     movingLeft: boolean;
-  }
 }
 
 function sample7() {
@@ -362,7 +358,7 @@ function sample7() {
 
   setInterval(() => {
     fabric.Image.fromURL('../assets/ladybug.png', obj => {
-      const img = <myfabric.ImageWithInfo> obj;
+      const img = <ImageWithInfo> obj;
       img.set('left', fabric.util.getRandomInt(200, 600)).set('top', -50);
       img.movingLeft = !!Math.round(Math.random());
       canvas.add(img);
@@ -371,7 +367,7 @@ function sample7() {
 
   const animate = (function animate() {
     canvas.forEachObject(obj => {
-      const img = <myfabric.ImageWithInfo> obj;
+      const img = <ImageWithInfo> obj;
       img.left += (img.movingLeft ? -1 : 1);
       img.top += 1;
       if (img.left > 900 || img.top > 500) {
@@ -551,7 +547,7 @@ function sample8() {
     if (!fabric.Canvas.supports('toDataURL')) {
       alert('This browser doesn\'t provide means to serialize canvas to an image');
     } else {
-      window.open(canvas.toDataURL('png'));
+      window.open(canvas.toDataURL({ format: 'png' }));
     }
   };
 
diff --git a/types/facebook-js-sdk/facebook-js-sdk-tests.ts b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
index 56fc91cd02..f919e3290f 100644
--- a/types/facebook-js-sdk/facebook-js-sdk-tests.ts
+++ b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
@@ -107,4 +107,5 @@ FB.ui({
     method: 'share',
     mobile_iframe: true,
     href: 'https://developers.facebook.com/docs/',
+    picture: 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/Google_2015_logo.svg/2000px-Google_2015_logo.svg.png',
 }, response => {});
diff --git a/types/facebook-js-sdk/index.d.ts b/types/facebook-js-sdk/index.d.ts
index cb1981580a..300eeb3ec0 100644
--- a/types/facebook-js-sdk/index.d.ts
+++ b/types/facebook-js-sdk/index.d.ts
@@ -113,6 +113,7 @@ declare namespace facebook {
     interface ShareDialogParams extends DialogParams {
         method: 'share';
         href: string;
+        picture?: string;
         hashtag?: string;
         quote?: string;
         mobile_iframe?: boolean;
diff --git a/types/facebook-pixel/facebook-pixel-tests.ts b/types/facebook-pixel/facebook-pixel-tests.ts
index c26c8b109d..7a3ab59df1 100644
--- a/types/facebook-pixel/facebook-pixel-tests.ts
+++ b/types/facebook-pixel/facebook-pixel-tests.ts
@@ -13,7 +13,10 @@ fbq('track', 'Purchase', purchaseParam);
 
 // Custom event (can only be used for audience building)
 
-var custom_params = {custom_param: 'custom_value'};
+var custom_params = {
+    custom_param: 'custom_value',
+    content_type: 'product'
+};
 fbq('trackCustom', 'MyCustomEvent', custom_params);
 
 // Reach customers that viewed a product in the 'Shoes' category
diff --git a/types/fancybox/index.d.ts b/types/fancybox/index.d.ts
index 736d096279..cb37de2098 100644
--- a/types/fancybox/index.d.ts
+++ b/types/fancybox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/fancyapps/fancyBox
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/farbtastic/index.d.ts b/types/farbtastic/index.d.ts
index c6cf10437b..8cb248a874 100644
--- a/types/farbtastic/index.d.ts
+++ b/types/farbtastic/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mattfarina/farbtastic
 // Definitions by: Matt Brooks <https://github.com/EnableSoftware>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/featherlight/index.d.ts b/types/featherlight/index.d.ts
index 80763aa429..bdedafe36f 100644
--- a/types/featherlight/index.d.ts
+++ b/types/featherlight/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://noelboss.github.io/featherlight/
 // Definitions by: Kaur Kuut <https://github.com/xStrom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/fetch.io/fetch.io-tests.ts b/types/fetch.io/fetch.io-tests.ts
index 538da8e74b..67c2612fdc 100644
--- a/types/fetch.io/fetch.io-tests.ts
+++ b/types/fetch.io/fetch.io-tests.ts
@@ -57,3 +57,8 @@ request
   .post('')
   .send({})
   .json();
+
+request
+  .post('')
+  .append('key', 'value')
+  .append({key: 'value'});
diff --git a/types/fetch.io/index.d.ts b/types/fetch.io/index.d.ts
index 8258cbf8da..fabbbc4b52 100644
--- a/types/fetch.io/index.d.ts
+++ b/types/fetch.io/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for fetch.io 3.1
+// Type definitions for fetch.io 4.0
 // Project: https://github.com/haoxins/fetch.io
 // Definitions by: newraina <https://github.com/newraina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -95,7 +95,9 @@ export class Request {
   /**
    * ppend formData
    */
-  append(key: string, value: string): this;
+  append(key: string, value: any): this;
+
+  append(object: {[key: string]: any}): this;
 
   /**
    * Get Response directly
diff --git a/types/ffmpeg-static/ffmpeg-static-tests.ts b/types/ffmpeg-static/ffmpeg-static-tests.ts
new file mode 100644
index 0000000000..319a5e27f8
--- /dev/null
+++ b/types/ffmpeg-static/ffmpeg-static-tests.ts
@@ -0,0 +1,3 @@
+import * as ffmpegStatic from 'ffmpeg-static';
+
+ffmpegStatic.path;
diff --git a/types/ffmpeg-static/index.d.ts b/types/ffmpeg-static/index.d.ts
new file mode 100644
index 0000000000..dfd9ce0906
--- /dev/null
+++ b/types/ffmpeg-static/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ffmpeg-static 2.0
+// Project: https://github.com/eugeneware/ffmpeg-static#readme
+// Definitions by: Steve Tran <https://github.com/iamstevetran>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ You can declare properties of the module using const, let, or var */
+/**
+ * Binary location
+ */
+export const path: string;
diff --git a/types/ffmpeg-static/tsconfig.json b/types/ffmpeg-static/tsconfig.json
new file mode 100644
index 0000000000..94c7a336b8
--- /dev/null
+++ b/types/ffmpeg-static/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ffmpeg-static-tests.ts"
+    ]
+}
diff --git a/types/ffmpeg-static/tslint.json b/types/ffmpeg-static/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ffmpeg-static/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ffprobe-static/ffprobe-static-tests.ts b/types/ffprobe-static/ffprobe-static-tests.ts
new file mode 100644
index 0000000000..6565fd2ae1
--- /dev/null
+++ b/types/ffprobe-static/ffprobe-static-tests.ts
@@ -0,0 +1,3 @@
+import * as ffprobeStatic from 'ffmpeg-static';
+
+ffprobeStatic.path;
diff --git a/types/ffprobe-static/index.d.ts b/types/ffprobe-static/index.d.ts
new file mode 100644
index 0000000000..b337d85e38
--- /dev/null
+++ b/types/ffprobe-static/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ffprobe-static 2.0
+// Project: https://github.com/joshwnj/ffprobe-static
+// Definitions by: Steve Tran <https://github.com/iamstevetran>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ You can declare properties of the module using const, let, or var */
+/**
+ * Binary location
+ */
+export const path: string;
diff --git a/types/ffprobe-static/tsconfig.json b/types/ffprobe-static/tsconfig.json
new file mode 100644
index 0000000000..726a8e0feb
--- /dev/null
+++ b/types/ffprobe-static/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ffprobe-static-tests.ts"
+    ]
+}
diff --git a/types/ffprobe-static/tslint.json b/types/ffprobe-static/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ffprobe-static/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/findup-sync/findup-sync-tests.ts b/types/findup-sync/findup-sync-tests.ts
index 86e34040ef..789190dcce 100644
--- a/types/findup-sync/findup-sync-tests.ts
+++ b/types/findup-sync/findup-sync-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import findup = require('findup-sync');
 
 var str: string;
diff --git a/types/fingerprintjs2/fingerprintjs2-tests.ts b/types/fingerprintjs2/fingerprintjs2-tests.ts
new file mode 100644
index 0000000000..88cc9f337a
--- /dev/null
+++ b/types/fingerprintjs2/fingerprintjs2-tests.ts
@@ -0,0 +1,123 @@
+function defaultCallback(result: string, components: [{ key: string, value: string }]) {
+    console.log(`res: ${result}; components: ${components}`);
+}
+
+function test_default_settings() {
+    let fingerprint = new Fingerprint2().get( defaultCallback);
+}
+
+function test_get_exclude_swfContainerId() {
+    let fingerprint = new Fingerprint2({ swfContainerId: 'swfContainerId' }).get(defaultCallback);
+}
+
+function test_get_exclude_swfPath() {
+    let fingerprint = new Fingerprint2({swfPath: 'pathToSwf'}).get(defaultCallback);
+}
+
+function test_get_exclude_userDefinedFonts() {
+    let fingerprint = new Fingerprint2({ userDefinedFonts: ['font1', 'font2']}).get(defaultCallback);
+}
+
+function test_get_excludeUserAgent() {
+    let fingerprint = new Fingerprint2({ excludeUserAgent: true }).get(defaultCallback);
+}
+
+function test_get_excludeLanguage() {
+    let fingerprint = new Fingerprint2({ excludeLanguage: true }).get(defaultCallback);
+}
+
+function test_get_excludeColorDepth() {
+    let fingerprint = new Fingerprint2({ excludeColorDepth: true }).get(defaultCallback);
+}
+
+function test_get_excludeScreenResolution() {
+    let fingerprint = new Fingerprint2({ excludeScreenResolution: true }).get(defaultCallback);
+}
+
+function test_get_excludeTimezoneOffset() {
+    let fingerprint = new Fingerprint2({ excludeTimezoneOffset: true }).get(defaultCallback);
+}
+
+function test_get_excludeSessionStorage() {
+    let fingerprint = new Fingerprint2({ excludeSessionStorage: true }).get(defaultCallback);
+}
+
+function test_get_excludeIndexedDB() {
+    let fingerprint = new Fingerprint2({ excludeIndexedDB: true }).get(defaultCallback);
+}
+
+function test_get_excludeAddBehavior() {
+    let fingerprint = new Fingerprint2({ excludeAddBehavior: true }).get(defaultCallback);
+}
+
+function test_get_excludeOpenDatabase() {
+    let fingerprint = new Fingerprint2({ excludeOpenDatabase: true }).get(defaultCallback);
+}
+
+function test_get_excludeCpuClass() {
+    let fingerprint = new Fingerprint2({ excludeCpuClass: true }).get(defaultCallback);
+}
+
+function test_get_excludePlatform() {
+    let fingerprint = new Fingerprint2({ excludePlatform: true }).get(defaultCallback);
+}
+
+function test_get_excludeDoNotTrack() {
+    let fingerprint = new Fingerprint2({ excludeDoNotTrack: true }).get(defaultCallback);
+}
+
+function test_get_excludeCanvas() {
+    let fingerprint = new Fingerprint2({ excludeCanvas: true }).get(defaultCallback);
+}
+
+function test_get_excludeWebGL() {
+    let fingerprint = new Fingerprint2({ excludeWebGL: true }).get(defaultCallback);
+}
+
+function test_get_excludeAdBlock() {
+    let fingerprint = new Fingerprint2({ excludeAdBlock: true }).get(defaultCallback);
+}
+
+function test_get_excludeHasLiedLanguages() {
+    let fingerprint = new Fingerprint2({ excludeHasLiedLanguages: true }).get(defaultCallback);
+}
+
+function test_get_excludeHasLiedResolution() {
+    let fingerprint = new Fingerprint2({ excludeHasLiedResolution: true }).get(defaultCallback);
+}
+
+function test_get_excludeHasLiedOs() {
+    let fingerprint = new Fingerprint2({ excludeHasLiedOs: true }).get(defaultCallback);
+}
+
+function test_get_excludeHasLiedBrowser() {
+    let fingerprint = new Fingerprint2({ excludeHasLiedBrowser: true }).get(defaultCallback);
+}
+
+function test_get_excludeJsFonts() {
+    let fingerprint = new Fingerprint2({ excludeJsFonts: true }).get(defaultCallback);
+}
+
+function test_get_excludeFlashFonts() {
+    let fingerprint = new Fingerprint2({ excludeFlashFonts: true }).get(defaultCallback);
+}
+
+function test_get_excludePlugins() {
+    let fingerprint = new Fingerprint2({ excludePlugins: true }).get(defaultCallback);
+}
+
+function test_get_excludeIEPlugins() {
+    let fingerprint = new Fingerprint2({ excludeIEPlugins: true }).get(defaultCallback);
+}
+
+function test_get_excludeTouchSupport() {
+    let fingerprint = new Fingerprint2({ excludeTouchSupport: true }).get(defaultCallback);
+}
+
+function test_get_excludePixelRatio() {
+    let fingerprint = new Fingerprint2({ excludePixelRatio: true }).get(defaultCallback);
+}
+
+function test_get_excludeHardwareConcurrency() {
+    let fingerprint = new Fingerprint2({ excludeHardwareConcurrency: true }).get(defaultCallback);
+}
diff --git a/types/fingerprintjs2/index.d.ts b/types/fingerprintjs2/index.d.ts
new file mode 100644
index 0000000000..c9fc9b2a39
--- /dev/null
+++ b/types/fingerprintjs2/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for fingerprintjs2 1.5
+// Project: https://github.com/Valve/fingerprintjs2
+// Definitions by: Curt Mullin <https://github.com/curtstate>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Fingerprint2 {
+    static VERSION: string;
+    constructor(options?: Fingerprint2Options);
+
+    get(callback: (result: string, components: [{ key: string, value: string }]) => void): number;
+}
+
+interface Fingerprint2Options {
+    swfContainerId?: string;
+    swfPath?: string;
+    userDefinedFonts?: [string];
+    excludeUserAgent?: boolean;
+    excludeLanguage?: boolean;
+    excludeColorDepth?: boolean;
+    excludeScreenResolution?: boolean;
+    excludeTimezoneOffset?: boolean;
+    excludeSessionStorage?: boolean;
+    excludeIndexedDB?: boolean;
+    excludeAddBehavior?: boolean;
+    excludeOpenDatabase?: boolean;
+    excludeCpuClass?: boolean;
+    excludePlatform?: boolean;
+    excludeDoNotTrack?: boolean;
+    excludeCanvas?: boolean;
+    excludeWebGL?: boolean;
+    excludeAdBlock?: boolean;
+    excludeHasLiedLanguages?: boolean;
+    excludeHasLiedResolution?: boolean;
+    excludeHasLiedOs?: boolean;
+    excludeHasLiedBrowser?: boolean;
+    excludeJsFonts?: boolean;
+    excludeFlashFonts?: boolean;
+    excludePlugins?: boolean;
+    excludeIEPlugins?: boolean;
+    excludeTouchSupport?: boolean;
+    excludePixelRatio?: boolean;
+    excludeHardwareConcurrency?: boolean;
+}
diff --git a/types/fingerprintjs2/tsconfig.json b/types/fingerprintjs2/tsconfig.json
new file mode 100644
index 0000000000..30131c07dc
--- /dev/null
+++ b/types/fingerprintjs2/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fingerprintjs2-tests.ts"
+    ]
+}
diff --git a/types/fingerprintjs2/tslint.json b/types/fingerprintjs2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fingerprintjs2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/firebird/firebird-tests.ts b/types/firebird/firebird-tests.ts
new file mode 100644
index 0000000000..4a6bd59c05
--- /dev/null
+++ b/types/firebird/firebird-tests.ts
@@ -0,0 +1,122 @@
+import * as fb from "firebird";
+
+/* createConnection */
+let con: fb.Connection = fb.createConnection();
+
+/* Connection */
+con = new fb.Connection();
+
+con.connectSync('test.fdb', 'sysdba', 'masterkey', '');
+con.connect('test.fdb', 'sysdba', 'masterkey', '', (err: Error | null) => {});
+
+if (con.connected === true) {
+    console.log('connected');
+}
+
+con.querySync("insert into test (id,name) values (5, 'new one')");
+const res: fb.FBResult = con.querySync("select * from test");
+con.query("select * from test", (err: Error | null, res: fb.FBResult) => {});
+
+con.commitSync();
+con.commit((err: Error | null) => {});
+
+con.rollbackSync();
+con.rollback((err: Error | null) => {});
+
+con.startSync();
+con.start((err: Error | null) => {});
+
+let stmt: fb.FBStatement = con.prepareSync("select * from test where name = ?");
+
+if (con.inTransaction === true) {
+    console.log('in transaction');
+}
+
+let blob: fb.FBBlob = con.newBlobSync();
+
+let tx: fb.Transaction = con.startNewTransactionSync();
+con.startNewTransaction((err: Error | null, tx: fb.Transaction) => {});
+
+/* DataType */
+let column: fb.DataType = <any> {};
+if (typeof (column) === "number") {
+    column * 10;
+} else if (typeof (column) === "string") {
+    column.substring(0, 1);
+} else if (column instanceof Date) {
+    column.toISOString();
+} else {
+    let _: fb.FBBlob = column;
+}
+
+/* FBResult */
+interface MyRow {
+    id: number;
+    name: string;
+}
+
+let rowsArray: fb.DataType[][] = res.fetchSync("all", false);
+rowsArray = res.fetchSync(1, false);
+res.fetch("all", false, (row: fb.DataType[]) => {}, (err: Error | null, eof: boolean) => {});
+res.fetch(1, false, (row: fb.DataType[]) => {}, (err: Error | null, eof: boolean) => {});
+let rowsObject: Array<{[colmn: string]: fb.DataType}> = res.fetchSync("all", true);
+rowsObject = res.fetchSync(1, true);
+res.fetch("all", true, (row: {[colmn: string]: fb.DataType}) => {}, (err: Error | null, eof: boolean) => {});
+res.fetch(1, true, (row: {[colmn: string]: fb.DataType}) => {}, (err: Error | null, eof: boolean) => {});
+let rowsTyped: MyRow[] = res.fetchSync<MyRow>("all", true);
+rowsTyped = res.fetchSync<MyRow>(1, true);
+res.fetch<MyRow>("all", true, (row: MyRow) => {}, (err: Error | null, eof: boolean) => {});
+res.fetch<MyRow>(1, true, (row: MyRow) => {}, (err: Error | null, eof: boolean) => {});
+
+/* Transaction */
+tx.querySync("insert into test (id,name) values (5, 'new one')");
+tx.query("select * from test", (err: Error | null, res: fb.FBResult) => {});
+
+tx.commitSync();
+tx.commit((err: Error | null) => {});
+
+tx.rollbackSync();
+tx.rollback((err: Error | null) => {});
+
+tx.startSync();
+tx.start((error: Error | null) => {});
+stmt = tx.prepareSync("select * from test where name = ?");
+
+if (tx.inTransaction === true) {
+    console.log('in transaction');
+}
+
+/* FBStatement */
+let asFBResult: fb.FBResult = stmt;
+stmt.execSync("John");
+stmt.execSync(1, "Mary");
+stmt.execInTransSync(tx, "John");
+stmt.execInTransSync(tx, 1, "Mary");
+stmt.exec("John");
+stmt.exec(1, "Mary");
+stmt.execInTrans(tx, "John");
+stmt.execInTrans(tx, 1, "Mary");
+
+/* FBBlob */
+blob._openSync();
+
+blob._closeSync();
+
+let buffer: Buffer = <any> {};
+let readBytes: number = blob._readSync(buffer);
+blob._read(buffer, (err: Error | null, buffer: Buffer, len: number) => {});
+
+blob._readAll();
+blob._readAll(10);
+blob._readAll(10, 20);
+blob._readAll(10, (err: Error | null, buffer: Buffer, len: number) => {});
+blob._readAll(10, 20, (err: Error | null, buffer: Buffer, len: number) => {});
+
+let writtenBytes = blob._writeSync(buffer);
+writtenBytes = blob._writeSync(buffer, 10);
+blob._write(buffer);
+blob._write(buffer, 10);
+blob._write(buffer, 10, (err: Error | null) => {});
+
+/* Stream */
+let strm: NodeJS.ReadWriteStream = new fb.Stream(blob);
diff --git a/types/firebird/index.d.ts b/types/firebird/index.d.ts
new file mode 100644
index 0000000000..6506762408
--- /dev/null
+++ b/types/firebird/index.d.ts
@@ -0,0 +1,501 @@
+// Type definitions for firebird 0.1
+// Project: https://github.com/xdenser/node-firebird-libfbclient
+// Definitions by: Yasushi Kato <http://github.com//karak/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node"/>
+
+/**
+ * This is a type declaration file for 'firebird' package.
+ *
+ * Original document is [here](https://www.npmjs.com/package/firebird).
+ */
+declare module 'firebird' {
+    /**
+     * @see createConnection() method will create Firebird Connection object for you
+     */
+    function createConnection(): Connection;
+
+    /**
+     * Handles database connection and queries. Supports Synchronous and Asynchronous operation.
+     */
+    class Connection {
+        constructor();
+
+        /**
+         * Connects you to database,
+         *
+         * @param database a database name in Firebird notation, i.e. <hostname>:<path to database file | alias>
+         * @param username user name
+         * @param pasword
+         * @param role
+         *
+         * @throws raises exception on error (try to catch it).
+         */
+        connectSync(db: string, user: string, pass: string, role: string): void;
+
+        /**
+         * Asynchronously connects you to Database.
+         *
+         * @param database a database name in Firebird notation, i.e. <hostname>:<path to database file | alias>
+         * @param username user name
+         * @param pasword
+         * @param role
+         * @param callback function(err), where err is error object in case of error.
+         */
+        connect(db: string, user: string, pass: string, role: string, callback: (err: Error | null) => void): void;
+
+        /**
+         * A boolean readonly property indicating if Connection object is connected to database
+         */
+        connected: boolean;
+
+        /**
+         * Executes SQL query.
+         * @param sql an SQL query to execute.
+         * @return object in case of success.
+         * @throws Raises error otherwise.
+         */
+        querySync(sql: string): FBResult;
+
+        /**
+         * Asynchronously executes query.
+         *
+         * @param sql an SQL query to execute.
+         * @param callback function(err,res), err - is error object or null, res - FBResult object.
+         */
+        query(sql: string, callback: (err: Error | null, res: FBResult) => void): void;
+
+        /**
+         * Registers connection to listen for firebird event name, called from PL\SQL (in stored procedures or triggers) with post_event 'name'.
+         *
+         * @desc
+         * You may set callback for event with
+         * @code connection.on('fbevent', function(name, count){ <your code>));.
+         * Where name is event name, and count is number of times event were posted.
+         *
+         * @param name Firebird Event Name.
+         */
+        addFBevent(name: string): void;
+
+        /**
+         * Unsubscribes connection from getting events for name.
+         *
+         * @param name Firebird Event Name.
+         */
+        deleteFBevent(name: string): void;
+
+        /**
+         * @summary
+         * Synchronously commits current transaction.
+         *
+         * @desc
+         * Notes:
+         * There is only one transaction associated with connection.
+         * Transacation is automatically started before any query if connection does not have active transaction (check @see inTransaction property).
+         * You also should note that DDL statements (altering database structure) are commited automatically.
+         * To run quieries in context of other transaction use @see Transaction object.
+         */
+        commitSync(): void;
+
+        /**
+         * Asynchronous commit transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        commit(callback: (err: Error | null) => void): void;
+
+        /**
+         * Synchronously rollbacks current transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         */
+        rollbackSync(): void;
+
+        /**
+         * Asynchronously rollbacks current transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        rollback(callback: (err: Error | null) => void): void;
+
+        /**
+         * Synchronously starts new default transaction.
+         *
+         * @desc
+         * The default transaction should be not in started state before call to this method.
+         * Read notes in @see commitSync() .
+         */
+        startSync(): void;
+
+        /**
+         * Asynchronously starts new default transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        start(callback: (err: Error | null) => void): void;
+
+        /**Synchronously prepares SQL statement and returns FBStatement object.
+         *
+         * @param sql an SQL query to prepare.
+         */
+        prepareSync(sql: string): FBStatement;
+
+        /**
+         * A boolean readonly property indicating if connection is in started transaction state.
+         */
+        inTransaction: boolean;
+
+        /**
+         * Creates new FBblob object and opens it for write.
+         * After finishing write operation and closing blob one may insert it in database passing as parameter to exec,
+         * execSync methods of @see FBStatement object.
+         */
+        newBlobSync(): FBBlob;
+
+        /**
+         * Creates new Transaction object and starts new transaction.
+         * @returns created object.
+         */
+        startNewTransactionSync(): Transaction;
+
+        /**
+         * Creates new Transaction object and starts new transaction.
+         *
+         * @param callback function(err, transaction), where err is error object in case of error, transaction - newly created transaction.
+         */
+        startNewTransaction(callback: (err: Error | null, transaction: Transaction) => void): void;
+    }
+
+    /**
+     * @desc
+     * Here is Firebird to Node data type accordance:
+     *
+     * | Firebird  | Node      |
+     * | :-------  | :-------- |
+     * | DATE	   |	Date   |
+     * | TIME	   |	Date   |
+     * | TIMESTAMP | 	Date   |
+     * | CHAR      | 	String |
+     * | VARCHAR   | 	String |
+     * | SMALLINT  | 	Integer|
+     * | INTEGER   | 	Integer|
+     * | NUMERIC   | 	Number |
+     * | DECIMAL   | 	Number |
+     * | FLOAT     | 	Number |
+     * | DOUBLE    | 	Number |
+     * | BLOB      | 	FBblob |
+     */
+    type DataType = Date | string /*| Integer*/ | number | FBBlob;
+
+    /**
+     * Represents results of SQL query if any.
+     * You should use this object to fetch rows from database.
+     * Each row may be represented as array of field values or as object with named fields.
+     *
+     * @see DataType
+     */
+    class FBResult {
+        /**
+         * @summary
+         * Synchronously fetches result rows.
+         *
+         * @desc
+         * If you pass "all" as rowCount - it will fetch all result rows.
+         * If you pass less rowCount than are actually in result, it will return specified number of rows.
+         * You may call fetchSync multiple times until all rows will be fetched.
+         * If you specify more rowCount than available it will return only actual number of rows.
+         *
+         * @param rowCount number of rows to fetch from results;
+         * @param asObject format of returned rows. When false - methods returns array of array, when true - array of objects.
+         */
+        fetchSync(rowCount: number | "all", asObject: boolean): DataType[][] | Array<{[column: string]: DataType}>;
+        fetchSync(rowCount: number | "all", asObject: false): DataType[][];
+        fetchSync(rowCount: number | "all", asObject: true): Array<{[column: string]: DataType}>;
+        fetchSync<T extends {}>(rowCount: number | "all", asObject: true): T[];
+
+        /**
+         * Asynchronously fetches rows one by one.
+         *
+         * @param rowCount number of rows to fetch from results
+         * @param asObject format of returned rows. When false - methods returns array of array, when true - array of objects
+         * @param rowCallback function(row), row - Array or Object (depends on asObject parameter) representing single row from result; called for each fetched row.
+         * @param eofCallback function(err,eof), err - Error object in case of error, or null; eof - true | false. called when whole operation is complete.
+         */
+        fetch(rowCount: number | "all", asObject: boolean, rowCallback: (row: DataType[]| {[column: string]: DataType}) => void, eofCallback: (err: Error | null, eof: boolean) => void): void;
+        fetch(rowCount: number | "all", asObject: false, rowCallback: (row: DataType[]) => void, eofCallback: (err: Error | null, eof: boolean) => void): void;
+        fetch(rowCount: number | "all", asObject: true, rowCallback: (row: {[column: string]: DataType}) => void, eofCallback: (err: Error | null, eof: boolean) => void): void;
+        fetch<T extends {}>(rowCount: number | "all", asObject: true, rowCallback: (row: T) => void, eofCallback: (err: Error | null, eof: boolean) => void): void;
+    }
+
+    /**
+     * Represents SQL transaction.
+     *
+     * @desc
+     * To get instance of this object call @see startNewTransactionSync or @see startNewTransaction methods of @see Connection object.
+     * Transaction objects may be reused after commit or rollback.
+     */
+    interface Transaction {
+        /**
+         * Executes SQL query in context of this transaction. Returns FBResult object in case of success. Raises error otherwise.
+         *
+         * @param sql an SQL query to execute.
+         */
+        querySync(sql: string): void;
+
+        /**
+         * Asynchronously executes query in context of this transaction.
+         *
+         * @param sql an SQL query to execute.
+         * @param callback err - is error object or null, res - FBResult object.
+         */
+        query(sql: string, callback: (err: Error | null, res: FBResult) => void): void;
+
+        /**
+         * Synchronously commits this transaction.
+         *
+         * @desc
+         * Notes:
+         * Transacation is automatically started before any query in context of this object
+         * if this object does not have active transaction (check inTransaction property).
+         * You also should note that DDL statements (altering database structure) are commited automatically.
+         */
+        commitSync(): void;
+
+        /**
+         * Asynchronous commit transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        commit(callback: (err: Error | null) => void): void;
+
+         /**
+          * Synchronously rollbacks transaction.
+          *
+          * @desc
+          * Read notes in @see commitSync() .
+          */
+        rollbackSync(): void;
+
+        /**
+         * Asynchronously rollbacks transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        rollback(callback: (err: Error | null) => void): void;
+
+        /**
+         * Synchronously starts transaction.
+         *
+         * @desc
+         * The transaction should be not in started state before call to this method.
+         * Read notes in @see commitSync() .
+         * See @see inTransaction property.
+         */
+        startSync(): void;
+
+        /**
+         * Asynchronously starts new transaction.
+         *
+         * @desc
+         * Read notes in @see commitSync() .
+         *
+         * @param callback function(err), where err is error object in case of error.
+         */
+        start(callback: (err: Error | null) => void): void;
+
+        /**
+         * Synchronously prepares SQL statement
+         *
+         * @param sql an SQL query to prepare.
+         * @returns @see FBStatement object in context of this transaction.
+         */
+        prepareSync(sql: string): FBStatement;
+
+        /*
+         * A boolean readonly property indicating if this transaction is in started state.
+         */
+        inTransaction: boolean;
+    }
+
+    /**
+     * Represents prepared SQL query (returned by @see Connection.prepare() and @see Connection.prepareSync()).
+     *
+     * @see FBStatement is derived form @see FBResult class.
+     * So it can fetch rows just like @see FBresult object after call to @see execSync, exec methods.
+     */
+    class FBStatement extends FBResult {
+        /**
+         * Synchronously executes prepared statement with given parameters.
+         *
+         * @desc
+         * You may fetch rows with methods inherited from @see FBResult.
+         * @see Statement is executed in context of default connection transaction.
+         *
+         * @param params parameters of prepared statement in the same order as in SQL and with appropriate types.
+         */
+        execSync(...params: DataType[]): void;
+
+        /**
+         * Same as @see execSync but executes statement in context of given @see Transaction obejct.
+         *
+         * @param transaction
+         * @param params
+         */
+        execInTransSync(transaction: Transaction, ...params: DataType[]): void;
+
+        /**
+         * Asynchronously executes prepared statement with given parameters.
+         *
+         * @desc
+         * @see FBStatement emits 'result' or 'error' event.
+         * You may fetch rows with methods inherited from @see FBResult after 'result' event emitted.
+         * Statement is executed in context of default connection transaction.
+         *
+         * @param params parameters of prepared statement in the same order as in SQL and with appropriate types.
+         */
+         exec(...params: DataType[]): void;
+
+         /**
+          * Same as @see exec but executes statement in context of given @see Transaction obejct.
+          *
+          * @param transaction
+          * @param params
+          */
+         execInTrans(transaction: Transaction, ...params: DataType[]): void;
+    }
+
+    /**
+     * Represents BLOB data type.
+     */
+    interface FBBlob {
+        /**
+         * Synchronously opens blob for reading.
+         */
+        _openSync(): void;
+
+        /**
+         * Synchronously closes previously opened blob.
+         */
+        _closeSync(): void;
+
+        /**
+         * Synchronously reads BLOB segment (chunk) into buffer. Tries to fill whole buffer with data.
+         *
+         * @param buffer Node buffer to fill with data.
+         * @returns actual number of bytes read.
+         */
+         _readSync(buffer: Buffer): number;
+
+         /**
+          * Asynchronously reads BLOB segment (chunk) into buffer. Tries to fill whole buffer with data.
+          *
+          * @param buffer Node buffer to fill with data.
+          * @param callback function(err,buffer,len), err - Error object in case of error, or null;buffer - buffer filled with data; len - actual data length.
+          */
+         _read(buffer: Buffer, callback: (err: Error | null, buffer: Buffer, len: number) => void): void;
+
+         /**
+          * Asynchronously reads all data from BLOB field.
+          * Object emits events while reading data error, drain',end`.
+          *
+          * @param initialSize - optional, initial result buffer to allocate, default = 0
+          * @param chunkSize - optional, size of chunk used to read data, default = 1024
+          * @param callback - optional, function (err, buffer, len), err - Error object in case of error, or null;buffer - buffer filled with data; len - actual data length.
+          */
+          _readAll(initialSize?: number, chunkSize?: number, callback?: (err: Error | null, buffer: Buffer, len: number) => void): void;
+          _readAll(initialSize: number, callback: (err: Error | null, buffer: Buffer, len: number) => void): void;
+          _readAll(callback: (err: Error | null, buffer: Buffer, len: number) => void): void;
+
+          /**
+           * Synchronously writes BLOB segment (chunk) from buffer.
+           *
+           * @param buffer Node buffer to write from to blob;
+           * @param len optional length parameter, if specified only len bytes from buffer will be writen.
+           * @returns number of bytes actually writen.
+           */
+          _writeSync(buffer: Buffer, len?: number): number;
+
+          /**
+           * Asynchronously writes BLOB segment (chunk) from buffer and calls callback function if any.
+           *
+           * @param buffer Node buffer to write from to blob;
+           * @param len optional length parameter, if specified only len bytes from buffer will be writen.
+           * @param callback function(err), err - Error object in case of error, or null;
+           */
+          _write(buffer: Buffer, len?: number, callback?: (err: Error | null) => void): void;
+    }
+
+    /**
+     * Represents BLOB stream.
+     *
+     * @desc
+     * Create BLOB stream using
+     * @code var strm = new fb.Stream(FBblob);.
+     *
+     * You may pipe strm to/from NodeJS Stream objects (fs or socket).
+     * You may also look at [NodeJS Streams reference](https://nodejs.org/api/stream.html).
+     */
+    class Stream implements NodeJS.ReadWriteStream {
+        constructor(blob: FBBlob);
+
+        /* Following lines is JUST AS NodeJS.ReadStream, NodeJS.WriteStream, and NodeJS.Emmiter */
+        /* tslint:disable */
+
+        /* NodeJS.ReadStream */
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string | null): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream;
+
+        /* NodeJS.WriteStream */
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+
+        /* EventEmitter */
+        addListener(event: string | symbol, listener: Function): this;
+        on(event: string | symbol, listener: Function): this;
+        once(event: string | symbol, listener: Function): this;
+        removeListener(event: string | symbol, listener: Function): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        prependListener(event: string | symbol, listener: Function): this;
+        prependOnceListener(event: string | symbol, listener: Function): this;
+        eventNames(): (string | symbol)[];
+
+        /* tslint:enable */
+    }
+}
diff --git a/types/firebird/tsconfig.json b/types/firebird/tsconfig.json
new file mode 100644
index 0000000000..705913437a
--- /dev/null
+++ b/types/firebird/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "scripthost"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "firebird-tests.ts"
+    ]
+}
diff --git a/types/firebird/tslint.json b/types/firebird/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/firebird/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index 64b622b21f..96c17a4a9a 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import {Table, Cell, Column, CellProps} from "fixed-data-table";
 
 // create your Table
-class MyTable1 extends React.Component<{}, {}> {
+class MyTable1 extends React.Component {
     render(): React.ReactElement<any> {
         return (
             <Table
@@ -17,7 +17,7 @@ class MyTable1 extends React.Component<{}, {}> {
 }
 
 // create your Columns
-class MyTable2 extends React.Component<{}, {}> {
+class MyTable2 extends React.Component {
     render(): React.ReactElement<any> {
         return (
             <Table
@@ -88,7 +88,7 @@ interface MyCellProps extends CellProps {
     myData: RowData[];
 }
 
-class MyTextCell extends React.Component<MyCellProps, {}> {
+class MyTextCell extends React.Component<MyCellProps> {
     render(): React.ReactElement<any> {
         const {rowIndex, field, myData} = this.props;
 
@@ -104,7 +104,7 @@ class MyTextCell extends React.Component<MyCellProps, {}> {
     }
 }
 
-class MyLinkCell extends React.Component<MyCellProps, {}> {
+class MyLinkCell extends React.Component<MyCellProps> {
     render(): React.ReactElement<any> {
         const {rowIndex, field, myData} = this.props;
         const link: string = myData[rowIndex][field];
@@ -168,7 +168,7 @@ class MyTable4 extends React.Component<{}, MyTable4State> {
 }
 
 // Listen for events
-class MyTable5 extends React.Component<{}, {}> {
+class MyTable5 extends React.Component {
     render(): React.ReactElement<any> {
         return (
             <Table
diff --git a/types/fixed-data-table/index.d.ts b/types/fixed-data-table/index.d.ts
index a131501348..9eef731cf9 100644
--- a/types/fixed-data-table/index.d.ts
+++ b/types/fixed-data-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/fixed-data-table
 // Definitions by: Petar Paar <https://github.com/pepaar>, Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
@@ -489,12 +489,12 @@ declare namespace FixedDataTable {
         columnKey?: string | number;
     }
 
-    export class Table extends React.Component<TableProps, {}> {
+    export class Table extends React.Component<TableProps> {
     }
-    export class Column extends React.Component<ColumnProps, {}> {
+    export class Column extends React.Component<ColumnProps> {
     }
-    export class ColumnGroup extends React.Component<ColumnGroupProps, {}> {
+    export class ColumnGroup extends React.Component<ColumnGroupProps> {
     }
-    export class Cell extends React.Component<CellProps, {}> {
+    export class Cell extends React.Component<CellProps> {
     }
 }
diff --git a/types/flatbuffers/flatbuffers-tests.ts b/types/flatbuffers/flatbuffers-tests.ts
index 87593106c7..cdcabac25b 100644
--- a/types/flatbuffers/flatbuffers-tests.ts
+++ b/types/flatbuffers/flatbuffers-tests.ts
@@ -1,3 +1,5 @@
+import { flatbuffers } from "flatbuffers";
+
 enum Color {
   Red= 1,
   Green= 2,
@@ -303,9 +305,9 @@ class Stat {
 }
 
 class Monster {
-    bb: flatbuffers.ByteBuffer= null;
+  bb: flatbuffers.ByteBuffer= null;
 
-    bb_pos: number = 0;
+  bb_pos: number = 0;
 
   __init(i: number, bb: flatbuffers.ByteBuffer): Monster {
     this.bb_pos = i;
diff --git a/types/flatbuffers/index.d.ts b/types/flatbuffers/index.d.ts
index 1342acdf15..4f75a7cc30 100644
--- a/types/flatbuffers/index.d.ts
+++ b/types/flatbuffers/index.d.ts
@@ -3,625 +3,629 @@
 // Definitions by: Kamil Rojewski <kamil.rojewski@gmail.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace flatbuffers {
-  /**
-   * @typedef {number}
-   */
-  type Offset = number;
+export { flatbuffers };
 
-  /**
-   * @typedef {{
-   *   bb: flatbuffers.ByteBuffer,
-   *   bb_pos: number
-   * }}
-   */
-  interface Table {
-    bb: ByteBuffer;
-    bb_pos: number;
-  }
-
-  /**
-   * @type {number}
-   * @const
-   */
-  const SIZEOF_SHORT: number;
-
-  /**
-   * @type {number}
-   * @const
-   */
-  const SIZEOF_INT: number;
-
-  /**
-   * @type {number}
-   * @const
-   */
-  const FILE_IDENTIFIER_LENGTH: number;
-
-  /**
-   * @enum {number}
-   */
-  enum Encoding { UTF8_BYTES, UTF16_STRING }
-
-  /**
-   * @type {Int32Array}
-   * @const
-   */
-  const int32: Int32Array;
-
-  /**
-   * @type {Float32Array}
-   * @const
-   */
-  const float32: Float32Array;
-
-  /**
-   * @type {Float64Array}
-   * @const
-   */
-  const float64: Float64Array;
-
-  /**
-   * @type {boolean}
-   * @const
-   */
-  const isLittleEndian: boolean;
-
-  ////////////////////////////////////////////////////////////////////////////////
-
-  class Long {
+declare global {
+  namespace flatbuffers {
     /**
-     * @type {number}
-     * @const
+     * @typedef {number}
      */
-    low: number;
+    type Offset = number;
+
+    /**
+     * @typedef {{
+     *   bb: flatbuffers.ByteBuffer,
+     *   bb_pos: number
+     * }}
+     */
+    interface Table {
+      bb: ByteBuffer;
+      bb_pos: number;
+    }
 
     /**
      * @type {number}
      * @const
      */
-    high: number;
+    const SIZEOF_SHORT: number;
 
     /**
-     * @type {flatbuffers.Long}
+     * @type {number}
      * @const
      */
-    static ZERO: Long;
+    const SIZEOF_INT: number;
 
     /**
-     * @constructor
-     * @param {number} high
-     * @param {number} low
+     * @type {number}
+     * @const
      */
-    constructor(low: number, high: number);
+    const FILE_IDENTIFIER_LENGTH: number;
 
     /**
-     * @returns {number}
+     * @enum {number}
      */
-    toFloat64(): number;
+    enum Encoding { UTF8_BYTES, UTF16_STRING }
 
     /**
-     * @param {flatbuffers.Long} other
-     * @returns {boolean}
+     * @type {Int32Array}
+     * @const
      */
-    equals(other: any): boolean;
+    const int32: Int32Array;
 
     /**
-     * @param {number} low
-     * @param {number} high
+     * @type {Float32Array}
+     * @const
      */
-    static create(low: number, high: number): Long;
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-
-  class Builder {
-    /**
-     * @constructor
-     * @param {number=} initial_size
-     */
-    constructor(initial_size?: number);
-
-    /**
-     * In order to save space, fields that are set to their default value
-     * don't get serialized into the buffer. Forcing defaults provides a
-     * way to manually disable this optimization.
-     *
-     * @param {boolean} forceDefaults true always serializes default values
-     */
-    forceDefaults(forceDefaults: boolean): void;
-
-    /**
-     * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
-     * called finish(). The actual data starts at the ByteBuffer's current position,
-     * not necessarily at 0.
-     *
-     * @returns {flatbuffers.ByteBuffer}
-     */
-    dataBuffer(): ByteBuffer;
-
-    /**
-     * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
-     * called finish(). The actual data starts at the ByteBuffer's current position,
-     * not necessarily at 0.
-     *
-     * @returns {Uint8Array}
-     */
-    asUint8Array(): Uint8Array;
-
-    /**
-     * Prepare to write an element of `size` after `additional_bytes` have been
-     * written, e.g. if you write a string, you need to align such the int length
-     * field is aligned to 4 bytes, and the string data follows it directly. If all
-     * you need to do is alignment, `additional_bytes` will be 0.
-     *
-     * @param {number} size This is the of the new element to write
-     * @param {number} additional_bytes The padding size
-     */
-    prep(size: number, additional_bytes: number): void;
-
-    /**
-     * @param {number} byte_size
-     */
-    pad(byte_size: number): void;
-
-    /**
-     * @param {number} value
-     */
-    writeInt8(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    writeInt16(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    writeInt32(value: number): void;
-
-    /**
-     * @param {flatbuffers.Long} value
-     */
-    writeInt64(value: Long): void;
-
-    /**
-     * @param {number} value
-     */
-    writeFloat32(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    writeFloat64(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    addInt8(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    addInt16(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    addInt32(value: number): void;
-
-    /**
-     * @param {flatbuffers.Long} value
-     */
-    addInt64(value: Long): void;
-
-    /**
-     * @param {number} value
-     */
-    addFloat32(value: number): void;
-
-    /**
-     * @param {number} value
-     */
-    addFloat64(value: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {number} value
-     * @param {number} defaultValue
-     */
-    addFieldInt8(voffset: number, value: number, defaultValue: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {number} value
-     * @param {number} defaultValue
-     */
-    addFieldInt16(voffset: number, value: number, defaultValue: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {number} value
-     * @param {number} defaultValue
-     */
-    addFieldInt32(voffset: number, value: number, defaultValue: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {flatbuffers.Long} value
-     * @param {flatbuffers.Long} defaultValue
-     */
-    addFieldInt64(voffset: number, value: Long, defaultValue: Long): void;
-
-    /**
-     * @param {number} voffset
-     * @param {number} value
-     * @param {number} defaultValue
-     */
-    addFieldFloat32(voffset: number, value: number, defaultValue: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {number} value
-     * @param {number} defaultValue
-     */
-    addFieldFloat64(voffset: number, value: number, defaultValue: number): void;
-
-    /**
-     * @param {number} voffset
-     * @param {flatbuffers.Offset} value
-     * @param {flatbuffers.Offset} defaultValue
-     */
-    addFieldOffset(voffset: number, value: Offset, defaultValue: Offset): void;
-
-    /**
-     * Structs are stored inline, so nothing additional is being added. `d` is always 0.
-     *
-     * @param {number} voffset
-     * @param {flatbuffers.Offset} value
-     * @param {flatbuffers.Offset} defaultValue
-     */
-    addFieldStruct(voffset: number, value: Offset, defaultValue: Offset): void;
-
-    /**
-     * Structures are always stored inline, they need to be created right
-     * where they're used.  You'll get this assertion failure if you
-     * created it elsewhere.
-     *
-     * @param {flatbuffers.Offset} obj The offset of the created object
-     */
-    nested(obj: Offset): void;
-
-    /**
-     * Should not be creating any other object, string or vector
-     * while an object is being constructed
-     */
-    notNested(): void;
-
-    /**
-     * Set the current vtable at `voffset` to the current location in the buffer.
-     *
-     * @param {number} voffset
-     */
-    slot(voffset: number): void;
+    const float32: Float32Array;
 
     /**
-     * @returns {flatbuffers.Offset} Offset relative to the end of the buffer.
+     * @type {Float64Array}
+     * @const
      */
-    offset(): Offset;
+    const float64: Float64Array;
 
     /**
-     * Doubles the size of the backing ByteBuffer and copies the old data towards
-     * the end of the new buffer (since we build the buffer backwards).
-     *
-     * @param {flatbuffers.ByteBuffer} bb The current buffer with the existing data
-     * @returns {flatbuffers.ByteBuffer} A new byte buffer with the old data copied
-     * to it. The data is located at the end of the buffer.
+     * @type {boolean}
+     * @const
      */
-    static growByteBuffer(bb: ByteBuffer): ByteBuffer;
+    const isLittleEndian: boolean;
 
-    /**
-     * Adds on offset, relative to where it will be written.
-     *
-     * @param {flatbuffers.Offset} offset The offset to add
-     */
-    addOffset(offset: Offset): void;
+    ////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * Start encoding a new object in the buffer.  Users will not usually need to
-     * call this directly. The FlatBuffers compiler will generate helper methods
-     * that call this method internally.
-     *
-     * @param {number} numfields
-     */
-    startObject(numfields: number): void;
-
-    /**
-     * Finish off writing the object that is under construction.
-     *
-     * @returns {flatbuffers.Offset} The offset to the object inside `dataBuffer`
-     */
-    endObject(): Offset;
+    class Long {
+      /**
+       * @type {number}
+       * @const
+       */
+      low: number;
 
-    /**
-     * @param {flatbuffers.Offset} root_table
-     * @param {string=} file_identifier
-     */
-    finish(root_table: Offset, file_identifier?: string): void;
-
-    /**
-     * This checks a required field has been set in a given table that has
-     * just been constructed.
-     *
-     * @param {flatbuffers.Offset} table
-     * @param {number} field
-     */
-    requiredField(table: Offset, field: number): void;
-
-    /**
-     * Start a new array/vector of objects.  Users usually will not call
-     * this directly. The FlatBuffers compiler will create a start/end
-     * method for vector types in generated code.
-     *
-     * @param {number} elem_size The size of each element in the array
-     * @param {number} num_elems The number of elements in the array
-     * @param {number} alignment The alignment of the array
-     */
-    startVector(elem_size: number, num_elems: number, alignment: number): void;
-
-    /**
-     * Finish off the creation of an array and all its elements. The array must be
-     * created with `startVector`.
-     *
-     * @returns {flatbuffers.Offset} The offset at which the newly created array
-     * starts.
-     */
-    endVector(): Offset;
-
-    /**
-     * Encode the string `s` in the buffer using UTF-8. If a Uint8Array is passed
-     * instead of a string, it is assumed to contain valid UTF-8 encoded data.
-     *
-     * @param {string|Uint8Array} s The string to encode
-     * @return {flatbuffers.Offset} The offset in the buffer where the encoded string starts
-     */
-    createString(s: string|Uint8Array): Offset;
-
-    /**
-     * Conveniance function for creating Long objects.
-     *
-     * @param {number} low
-     * @param {number} high
-     * @returns {Long}
-     */
-    createLong(low: number, high: number): Long;
-  }
-
-  ////////////////////////////////////////////////////////////////////////////////
-
-  class ByteBuffer {
-    /**
-     * @constructor
-     * @param {Uint8Array} bytes
-     */
-    constructor(bytes: Uint8Array);
-
-    /**
-     * @param {number} byte_size
-     * @returns {flatbuffers.ByteBuffer}
-     */
-    static allocate(byte_size: number): ByteBuffer;
-
-    /**
-     * @returns {Uint8Array}
-     */
-    bytes(): Uint8Array;
-
-    /**
-     * @returns {number}
-     */
-    position(): number;
-
-    /**
-     * @param {number} position
-     */
-    setPosition(position: number): void;
-
-    /**
-     * @returns {number}
-     */
-    capacity(): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readInt8(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readUint8(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readInt16(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readUint16(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readInt32(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readUint32(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {flatbuffers.Long}
-     */
-    readInt64(offset: number): Long;
-
-    /**
-     * @param {number} offset
-     * @returns {flatbuffers.Long}
-     */
-    readUint64(offset: number): Long;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readFloat32(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @returns {number}
-     */
-    readFloat64(offset: number): number;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeInt8(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeUint8(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeInt16(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeUint16(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeInt32(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeUint32(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {flatbuffers.Long} value
-     */
-    writeInt64(offset: number, value: Long): void;
-
-    /**
-     * @param {number} offset
-     * @param {flatbuffers.Long} value
-     */
-    writeUint64(offset: number, value: Long): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeFloat32(offset: number, value: number): void;
-
-    /**
-     * @param {number} offset
-     * @param {number} value
-     */
-    writeFloat64(offset: number, value: number): void;
-
-    /**
-     * Look up a field in the vtable, return an offset into the object, or 0 if the
-     * field is not present.
-     *
-     * @param {number} bb_pos
-     * @param {number} vtable_offset
-     * @returns {number}
-     */
-    __offset(bb_pos: number, vtable_offset: number): number;
-
-    /**
-     * Initialize any Table-derived type to point to the union at the given offset.
-     *
-     * @param {flatbuffers.Table} t
-     * @param {number} offset
-     * @returns {flatbuffers.Table}
-     */
-    __union<T extends flatbuffers.Table>(t: T, offset: number): T;
-
-    /**
-     * Create a JavaScript string from UTF-8 data stored inside the FlatBuffer.
-     * This allocates a new string and converts to wide chars upon each access.
-     *
-     * To avoid the conversion to UTF-16, pass flatbuffers.Encoding.UTF8_BYTES as
-     * the "optionalEncoding" argument. This is useful for avoiding conversion to
-     * and from UTF-16 when the data will just be packaged back up in another
-     * FlatBuffer later on.
-     *
-     * @param {number} offset
-     * @param {flatbuffers.Encoding=} optionalEncoding Defaults to UTF16_STRING
-     * @returns {string|Uint8Array}
-     */
-    __string(offset: number, optionalEncoding?: Encoding): string|Uint8Array;
-
-    /**
-     * Retrieve the relative offset stored at "offset"
-     * @param {number} offset
-     * @returns {number}
-     */
-    __indirect(offset: number): number;
-
-    /**
-     * Get the start of data of a vector whose offset is stored at "offset" in this object.
-     *
-     * @param {number} offset
-     * @returns {number}
-     */
-    __vector(offset: number): number;
-
-    /**
-     * Get the length of a vector whose offset is stored at "offset" in this object.
-     *
-     * @param {number} offset
-     * @returns {number}
-     */
-    __vector_len(offset: number): number;
-
-    /**
-     * @param {string} ident
-     * @returns {boolean}
-     */
-    __has_identifier(ident: string): boolean;
-
-    /**
-     * Conveniance function for creating Long objects.
-     *
-     * @param {number} low
-     * @param {number} high
-     * @returns {Long}
-     */
-    createLong(low: number, high: number): Long;
+      /**
+       * @type {number}
+       * @const
+       */
+      high: number;
+
+      /**
+       * @type {flatbuffers.Long}
+       * @const
+       */
+      static ZERO: Long;
+
+      /**
+       * @constructor
+       * @param {number} high
+       * @param {number} low
+       */
+      constructor(low: number, high: number);
+
+      /**
+       * @returns {number}
+       */
+      toFloat64(): number;
+
+      /**
+       * @param {flatbuffers.Long} other
+       * @returns {boolean}
+       */
+      equals(other: any): boolean;
+
+      /**
+       * @param {number} low
+       * @param {number} high
+       */
+      static create(low: number, high: number): Long;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+
+    class Builder {
+      /**
+       * @constructor
+       * @param {number=} initial_size
+       */
+      constructor(initial_size?: number);
+
+      /**
+       * In order to save space, fields that are set to their default value
+       * don't get serialized into the buffer. Forcing defaults provides a
+       * way to manually disable this optimization.
+       *
+       * @param {boolean} forceDefaults true always serializes default values
+       */
+      forceDefaults(forceDefaults: boolean): void;
+
+      /**
+       * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
+       * called finish(). The actual data starts at the ByteBuffer's current position,
+       * not necessarily at 0.
+       *
+       * @returns {flatbuffers.ByteBuffer}
+       */
+      dataBuffer(): ByteBuffer;
+
+      /**
+       * Get the ByteBuffer representing the FlatBuffer. Only call this after you've
+       * called finish(). The actual data starts at the ByteBuffer's current position,
+       * not necessarily at 0.
+       *
+       * @returns {Uint8Array}
+       */
+      asUint8Array(): Uint8Array;
+
+      /**
+       * Prepare to write an element of `size` after `additional_bytes` have been
+       * written, e.g. if you write a string, you need to align such the int length
+       * field is aligned to 4 bytes, and the string data follows it directly. If all
+       * you need to do is alignment, `additional_bytes` will be 0.
+       *
+       * @param {number} size This is the of the new element to write
+       * @param {number} additional_bytes The padding size
+       */
+      prep(size: number, additional_bytes: number): void;
+
+      /**
+       * @param {number} byte_size
+       */
+      pad(byte_size: number): void;
+
+      /**
+       * @param {number} value
+       */
+      writeInt8(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      writeInt16(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      writeInt32(value: number): void;
+
+      /**
+       * @param {flatbuffers.Long} value
+       */
+      writeInt64(value: Long): void;
+
+      /**
+       * @param {number} value
+       */
+      writeFloat32(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      writeFloat64(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      addInt8(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      addInt16(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      addInt32(value: number): void;
+
+      /**
+       * @param {flatbuffers.Long} value
+       */
+      addInt64(value: Long): void;
+
+      /**
+       * @param {number} value
+       */
+      addFloat32(value: number): void;
+
+      /**
+       * @param {number} value
+       */
+      addFloat64(value: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {number} value
+       * @param {number} defaultValue
+       */
+      addFieldInt8(voffset: number, value: number, defaultValue: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {number} value
+       * @param {number} defaultValue
+       */
+      addFieldInt16(voffset: number, value: number, defaultValue: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {number} value
+       * @param {number} defaultValue
+       */
+      addFieldInt32(voffset: number, value: number, defaultValue: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {flatbuffers.Long} value
+       * @param {flatbuffers.Long} defaultValue
+       */
+      addFieldInt64(voffset: number, value: Long, defaultValue: Long): void;
+
+      /**
+       * @param {number} voffset
+       * @param {number} value
+       * @param {number} defaultValue
+       */
+      addFieldFloat32(voffset: number, value: number, defaultValue: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {number} value
+       * @param {number} defaultValue
+       */
+      addFieldFloat64(voffset: number, value: number, defaultValue: number): void;
+
+      /**
+       * @param {number} voffset
+       * @param {flatbuffers.Offset} value
+       * @param {flatbuffers.Offset} defaultValue
+       */
+      addFieldOffset(voffset: number, value: Offset, defaultValue: Offset): void;
+
+      /**
+       * Structs are stored inline, so nothing additional is being added. `d` is always 0.
+       *
+       * @param {number} voffset
+       * @param {flatbuffers.Offset} value
+       * @param {flatbuffers.Offset} defaultValue
+       */
+      addFieldStruct(voffset: number, value: Offset, defaultValue: Offset): void;
+
+      /**
+       * Structures are always stored inline, they need to be created right
+       * where they're used.  You'll get this assertion failure if you
+       * created it elsewhere.
+       *
+       * @param {flatbuffers.Offset} obj The offset of the created object
+       */
+      nested(obj: Offset): void;
+
+      /**
+       * Should not be creating any other object, string or vector
+       * while an object is being constructed
+       */
+      notNested(): void;
+
+      /**
+       * Set the current vtable at `voffset` to the current location in the buffer.
+       *
+       * @param {number} voffset
+       */
+      slot(voffset: number): void;
+
+      /**
+       * @returns {flatbuffers.Offset} Offset relative to the end of the buffer.
+       */
+      offset(): Offset;
+
+      /**
+       * Doubles the size of the backing ByteBuffer and copies the old data towards
+       * the end of the new buffer (since we build the buffer backwards).
+       *
+       * @param {flatbuffers.ByteBuffer} bb The current buffer with the existing data
+       * @returns {flatbuffers.ByteBuffer} A new byte buffer with the old data copied
+       * to it. The data is located at the end of the buffer.
+       */
+      static growByteBuffer(bb: ByteBuffer): ByteBuffer;
+
+      /**
+       * Adds on offset, relative to where it will be written.
+       *
+       * @param {flatbuffers.Offset} offset The offset to add
+       */
+      addOffset(offset: Offset): void;
+
+      /**
+       * Start encoding a new object in the buffer.  Users will not usually need to
+       * call this directly. The FlatBuffers compiler will generate helper methods
+       * that call this method internally.
+       *
+       * @param {number} numfields
+       */
+      startObject(numfields: number): void;
+
+      /**
+       * Finish off writing the object that is under construction.
+       *
+       * @returns {flatbuffers.Offset} The offset to the object inside `dataBuffer`
+       */
+      endObject(): Offset;
+
+      /**
+       * @param {flatbuffers.Offset} root_table
+       * @param {string=} file_identifier
+       */
+      finish(root_table: Offset, file_identifier?: string): void;
+
+      /**
+       * This checks a required field has been set in a given table that has
+       * just been constructed.
+       *
+       * @param {flatbuffers.Offset} table
+       * @param {number} field
+       */
+      requiredField(table: Offset, field: number): void;
+
+      /**
+       * Start a new array/vector of objects.  Users usually will not call
+       * this directly. The FlatBuffers compiler will create a start/end
+       * method for vector types in generated code.
+       *
+       * @param {number} elem_size The size of each element in the array
+       * @param {number} num_elems The number of elements in the array
+       * @param {number} alignment The alignment of the array
+       */
+      startVector(elem_size: number, num_elems: number, alignment: number): void;
+
+      /**
+       * Finish off the creation of an array and all its elements. The array must be
+       * created with `startVector`.
+       *
+       * @returns {flatbuffers.Offset} The offset at which the newly created array
+       * starts.
+       */
+      endVector(): Offset;
+
+      /**
+       * Encode the string `s` in the buffer using UTF-8. If a Uint8Array is passed
+       * instead of a string, it is assumed to contain valid UTF-8 encoded data.
+       *
+       * @param {string|Uint8Array} s The string to encode
+       * @return {flatbuffers.Offset} The offset in the buffer where the encoded string starts
+       */
+      createString(s: string|Uint8Array): Offset;
+
+      /**
+       * Conveniance function for creating Long objects.
+       *
+       * @param {number} low
+       * @param {number} high
+       * @returns {Long}
+       */
+      createLong(low: number, high: number): Long;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+
+    class ByteBuffer {
+      /**
+       * @constructor
+       * @param {Uint8Array} bytes
+       */
+      constructor(bytes: Uint8Array);
+
+      /**
+       * @param {number} byte_size
+       * @returns {flatbuffers.ByteBuffer}
+       */
+      static allocate(byte_size: number): ByteBuffer;
+
+      /**
+       * @returns {Uint8Array}
+       */
+      bytes(): Uint8Array;
+
+      /**
+       * @returns {number}
+       */
+      position(): number;
+
+      /**
+       * @param {number} position
+       */
+      setPosition(position: number): void;
+
+      /**
+       * @returns {number}
+       */
+      capacity(): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readInt8(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readUint8(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readInt16(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readUint16(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readInt32(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readUint32(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {flatbuffers.Long}
+       */
+      readInt64(offset: number): Long;
+
+      /**
+       * @param {number} offset
+       * @returns {flatbuffers.Long}
+       */
+      readUint64(offset: number): Long;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readFloat32(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @returns {number}
+       */
+      readFloat64(offset: number): number;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeInt8(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeUint8(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeInt16(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeUint16(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeInt32(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeUint32(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {flatbuffers.Long} value
+       */
+      writeInt64(offset: number, value: Long): void;
+
+      /**
+       * @param {number} offset
+       * @param {flatbuffers.Long} value
+       */
+      writeUint64(offset: number, value: Long): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeFloat32(offset: number, value: number): void;
+
+      /**
+       * @param {number} offset
+       * @param {number} value
+       */
+      writeFloat64(offset: number, value: number): void;
+
+      /**
+       * Look up a field in the vtable, return an offset into the object, or 0 if the
+       * field is not present.
+       *
+       * @param {number} bb_pos
+       * @param {number} vtable_offset
+       * @returns {number}
+       */
+      __offset(bb_pos: number, vtable_offset: number): number;
+
+      /**
+       * Initialize any Table-derived type to point to the union at the given offset.
+       *
+       * @param {flatbuffers.Table} t
+       * @param {number} offset
+       * @returns {flatbuffers.Table}
+       */
+      __union<T extends flatbuffers.Table>(t: T, offset: number): T;
+
+      /**
+       * Create a JavaScript string from UTF-8 data stored inside the FlatBuffer.
+       * This allocates a new string and converts to wide chars upon each access.
+       *
+       * To avoid the conversion to UTF-16, pass flatbuffers.Encoding.UTF8_BYTES as
+       * the "optionalEncoding" argument. This is useful for avoiding conversion to
+       * and from UTF-16 when the data will just be packaged back up in another
+       * FlatBuffer later on.
+       *
+       * @param {number} offset
+       * @param {flatbuffers.Encoding=} optionalEncoding Defaults to UTF16_STRING
+       * @returns {string|Uint8Array}
+       */
+      __string(offset: number, optionalEncoding?: Encoding): string|Uint8Array;
+
+      /**
+       * Retrieve the relative offset stored at "offset"
+       * @param {number} offset
+       * @returns {number}
+       */
+      __indirect(offset: number): number;
+
+      /**
+       * Get the start of data of a vector whose offset is stored at "offset" in this object.
+       *
+       * @param {number} offset
+       * @returns {number}
+       */
+      __vector(offset: number): number;
+
+      /**
+       * Get the length of a vector whose offset is stored at "offset" in this object.
+       *
+       * @param {number} offset
+       * @returns {number}
+       */
+      __vector_len(offset: number): number;
+
+      /**
+       * @param {string} ident
+       * @returns {boolean}
+       */
+      __has_identifier(ident: string): boolean;
+
+      /**
+       * Conveniance function for creating Long objects.
+       *
+       * @param {number} low
+       * @param {number} high
+       * @returns {Long}
+       */
+      createLong(low: number, high: number): Long;
+    }
   }
 }
diff --git a/types/flatbuffers/tslint.json b/types/flatbuffers/tslint.json
index e013b93508..3db14f85ea 100644
--- a/types/flatbuffers/tslint.json
+++ b/types/flatbuffers/tslint.json
@@ -1,6 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-      "align": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/flatpickr/index.d.ts b/types/flatpickr/index.d.ts
index 9a98beabaa..535ec0145e 100644
--- a/types/flatpickr/index.d.ts
+++ b/types/flatpickr/index.d.ts
@@ -1,22 +1,25 @@
-// Type definitions for flatpickr 2.2
+// Type definitions for flatpickr 3.0
 // Project: https://github.com/chmln/flatpickr
 // Definitions by: James Birtles <https://github.com/UnwrittenFun>
+//                 Rowell Heria <https://github.com/rowellx68>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class Flatpickr {
-    constructor(element: string | Element, options?: Flatpickr.Options);
+declare function flatpickr(element: string | Element | HTMLElement, options?: Flatpickr.Options): Flatpickr;
 
-    changeMonth(month: number, isOffset: boolean): void;
+declare class Flatpickr {
+    constructor(element: string | Element | HTMLElement, options?: Flatpickr.Options);
+
+    changeMonth(month: number, isOffset?: boolean): void;
     clear(): void;
     close(): void;
     destroy(): void;
-    formatDate(format: string, date: Date): string;
+    formatDate(date: Date, format: string): string;
     jumpToDate(date?: Flatpickr.DateString): void;
     open(): void;
-    parseDate(date: string): Date;
+    parseDate(date: string, format: string): Date;
     redraw(): void;
     set(option: string, value: any): void;
-    setDate(date: Flatpickr.DateString | Flatpickr.DateString[]): void;
+    setDate(date: Flatpickr.DateString | Flatpickr.DateString[], triggerChange?: boolean, dateFormat?: string): void;
     toggle(): void;
 }
 
@@ -29,7 +32,10 @@ declare namespace Flatpickr {
         clickOpens?: boolean;
         dateFormat?: string | null;
         defaultDate?: DateString | DateString[];
+        defaultHour?: number;
+        defaultMinute?: number;
         disable?: DateRange[];
+        disableMobile?: boolean;
         enable?: DateRange[];
         enableTime?: boolean;
         enableSeconds?: boolean;
diff --git a/types/flatpickr/v2/flatpickr-tests.ts b/types/flatpickr/v2/flatpickr-tests.ts
new file mode 100644
index 0000000000..f6800e38b7
--- /dev/null
+++ b/types/flatpickr/v2/flatpickr-tests.ts
@@ -0,0 +1,14 @@
+import * as Flatpickr from 'flatpickr';
+
+const picker1 = new Flatpickr('input');
+
+const input = document.querySelector('input');
+if (input != null) {
+    const picker2 = new Flatpickr(input, {
+        mode: 'range',
+        onChange: dates => null
+    });
+    picker2.setDate(['2016-11-15T00:00:00.000Z', new Date()]);
+}
+
+picker1.destroy();
diff --git a/types/flatpickr/v2/index.d.ts b/types/flatpickr/v2/index.d.ts
new file mode 100644
index 0000000000..9a98beabaa
--- /dev/null
+++ b/types/flatpickr/v2/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for flatpickr 2.2
+// Project: https://github.com/chmln/flatpickr
+// Definitions by: James Birtles <https://github.com/UnwrittenFun>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Flatpickr {
+    constructor(element: string | Element, options?: Flatpickr.Options);
+
+    changeMonth(month: number, isOffset: boolean): void;
+    clear(): void;
+    close(): void;
+    destroy(): void;
+    formatDate(format: string, date: Date): string;
+    jumpToDate(date?: Flatpickr.DateString): void;
+    open(): void;
+    parseDate(date: string): Date;
+    redraw(): void;
+    set(option: string, value: any): void;
+    setDate(date: Flatpickr.DateString | Flatpickr.DateString[]): void;
+    toggle(): void;
+}
+
+declare namespace Flatpickr {
+    interface Options {
+        altFormat?: string;
+        altInput?: boolean;
+        altInputClass?: string;
+        allowInput?: boolean;
+        clickOpens?: boolean;
+        dateFormat?: string | null;
+        defaultDate?: DateString | DateString[];
+        disable?: DateRange[];
+        enable?: DateRange[];
+        enableTime?: boolean;
+        enableSeconds?: boolean;
+        hourIncrement?: number;
+        inline?: boolean;
+        maxDate?: DateString;
+        minDate?: DateString;
+        minuteIncrement?: number;
+        mode?: Mode;
+        nextArrow?: string;
+        noCalendar?: boolean;
+        onChange?: EventCallback | EventCallback[];
+        onClose?: EventCallback | EventCallback[];
+        onOpen?: EventCallback | EventCallback[];
+        onReady?: EventCallback | EventCallback[];
+        onMonthChange?: EventCallback | EventCallback[];
+        onYearChange?: EventCallback | EventCallback[];
+        onValueUpdate?: EventCallback | EventCallback[];
+        onDayCreate?: EventCallback | EventCallback[];
+        parseDate?(date: string): Date;
+        prevArrow?: string;
+        shorthandCurrentMonth?: boolean;
+        static?: boolean;
+        time_24hr?: boolean;
+        utc?: boolean;
+        weekNumbers?: boolean;
+        wrap?: boolean;
+    }
+
+    type DateString = Date | string;
+    type DateRange = DateString | { from: DateString, to: DateString } | ((date: Date) => boolean);
+    type Mode = 'single' | 'multiple' | 'range';
+    type EventCallback = (selectedDates: Date[], dateStr: string, instance: Flatpickr, elem: HTMLElement) => void;
+}
+
+export = Flatpickr;
diff --git a/types/flatpickr/v2/tsconfig.json b/types/flatpickr/v2/tsconfig.json
new file mode 100644
index 0000000000..704678c0fd
--- /dev/null
+++ b/types/flatpickr/v2/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+          "flatpickr": [ "flatpickr/v2" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "flatpickr-tests.ts"
+    ]
+}
diff --git a/types/flatpickr/v2/tslint.json b/types/flatpickr/v2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/flatpickr/v2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/flexslider/flexslider-tests.ts b/types/flexslider/flexslider-tests.ts
index 591e874262..967a351604 100644
--- a/types/flexslider/flexslider-tests.ts
+++ b/types/flexslider/flexslider-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 // Can also be used with $(document).ready()
 $(window).load(function() {
 	$('.flexslider').flexslider({
@@ -73,10 +75,10 @@ $(window).load(function() {
 	function ready(player_id: any) {
 		var froogaloop = $(player_id);
 		froogaloop.on('play', function(data) {
-			$('.flexslider').flexslider("pause");
+			$('.flexslider').flexslider({ pauseText: "pause" });
 		});
 		froogaloop.on('pause', function(data) {
-			$('.flexslider').flexslider("play");
+			$('.flexslider').flexslider({ playText: "play" });
 		});
 	}
-});
\ No newline at end of file
+});
diff --git a/types/flexslider/index.d.ts b/types/flexslider/index.d.ts
index 9767744919..cf38995f94 100644
--- a/types/flexslider/index.d.ts
+++ b/types/flexslider/index.d.ts
@@ -2,8 +2,7 @@
 // Project: https://github.com/woothemes/FlexSlider
 // Definitions by: Diullei Gomes <https://github.com/diullei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="jquery"/>
+// TypeScript Version: 2.3
 
 interface SliderObject { //Object: The slider element itself
 	container: Object;              //Object: The ul.slides within the slider
diff --git a/types/flexslider/tsconfig.json b/types/flexslider/tsconfig.json
index f8ba67625d..a2425d596e 100644
--- a/types/flexslider/tsconfig.json
+++ b/types/flexslider/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "flexslider-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 16b5b7c96f..24a873761d 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://flickity.metafizzy.co/
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
 // Definitions: https://github.com/clmcgrath/
+// TypeScript Version: 2.3
 
 
 interface JQuery {
diff --git a/types/flight/index.d.ts b/types/flight/index.d.ts
index c46ddd0bfa..da88eaa53d 100644
--- a/types/flight/index.d.ts
+++ b/types/flight/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://flightjs.github.com/flight/
 // Definitions by: Jonathan Hedrén <https://github.com/jonathanhedren/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/flot/index.d.ts b/types/flot/index.d.ts
index e4fed6a246..84ab0daeb8 100644
--- a/types/flot/index.d.ts
+++ b/types/flot/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.flotcharts.org/
 // Definitions by: Matt Burland <https://github.com/burlandm>, Timo Mühlbach <https://github.com/Anticom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts b/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
index b4beb14ef7..e45f8ff855 100644
--- a/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
+++ b/types/fluent-ffmpeg/fluent-ffmpeg-tests.ts
@@ -1,7 +1,52 @@
-import * as ffmpeg from "fluent-ffmpeg";
+import ffmpeg = require('fluent-ffmpeg');
+import { createWriteStream } from 'fs';
 
-let source: string;
-let format: string;
-let output: string;
+const stream = createWriteStream('outputfile.divx');
 
-ffmpeg({ source }).format(format).save(output);
+ffmpeg('/path/to/file.avi')
+    .output('outputfile.mp4')
+    .output(stream);
+
+ffmpeg('/path/to/file.avi')
+    // You may pass a pipe() options object when using a stream
+    .output(stream, { end: true });
+
+// Output-related methods apply to the last output added
+ffmpeg('/path/to/file.avi')
+
+    .output('outputfile.mp4')
+    .audioCodec('libfaac')
+    .videoCodec('libx264')
+    .size('320x200')
+
+    .output(stream)
+    .preset('divx')
+    .size('640x480');
+
+// Use the run() method to run commands with multiple outputs
+ffmpeg('/path/to/file.avi')
+    .output('outputfile.mp4')
+    .output(stream)
+    .on('end', () => {
+        console.log('Finished processing');
+    })
+    .run();
+
+// Create a command to convert source.avi to MP4
+const command = ffmpeg('/path/to/source.avi')
+    .audioCodec('libfaac')
+    .videoCodec('libx264')
+    .format('mp4');
+
+// Create a clone to save a small resized version
+command.clone()
+    .size('320x200')
+    .save('/path/to/output-small.mp4');
+
+// Create a clone to save a medium resized version
+command.clone()
+    .size('640x400')
+    .save('/path/to/output-medium.mp4');
+
+// Save a converted version with the original size
+command.save('/path/to/output-original-size.mp4');
diff --git a/types/fluent-ffmpeg/index.d.ts b/types/fluent-ffmpeg/index.d.ts
index 1e44422789..86004caec1 100644
--- a/types/fluent-ffmpeg/index.d.ts
+++ b/types/fluent-ffmpeg/index.d.ts
@@ -216,6 +216,7 @@ declare namespace Ffmpeg {
         map(spec: string): FfmpegCommand;
         updateFlvMetadata(): FfmpegCommand;
         flvmeta(): FfmpegCommand;
+        preset(format: string): FfmpegCommand;
 
         // options/custom
         addInputOption(options: string[]): FfmpegCommand;
@@ -296,6 +297,8 @@ declare namespace Ffmpeg {
         mergeToFile(target: string | stream.Writable, options?: { end?: boolean }): FfmpegCommand;
         concatenate(target: string | stream.Writable, options?: { end?: boolean }): FfmpegCommand;
         concat(target: string | stream.Writable, options?: { end?: boolean }): FfmpegCommand;
+        clone(): FfmpegCommand;
+        run(): void;
     }
 }
 declare function Ffmpeg(options?: Ffmpeg.FfmpegCommandOptions): Ffmpeg.FfmpegCommand;
diff --git a/types/fluent-ffmpeg/tsconfig.json b/types/fluent-ffmpeg/tsconfig.json
index 27024331f1..03dae683d6 100644
--- a/types/fluent-ffmpeg/tsconfig.json
+++ b/types/fluent-ffmpeg/tsconfig.json
@@ -1,22 +1,22 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fluent-ffmpeg-tests.ts"
-    ]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "fluent-ffmpeg-tests.ts"
+  ]
+}
diff --git a/types/flux/index.d.ts b/types/flux/index.d.ts
index 7380613ce7..096c9516e6 100644
--- a/types/flux/index.d.ts
+++ b/types/flux/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Steve Baker <https://github.com/stkb/>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Dispatcher from "./lib/Dispatcher";
 
diff --git a/types/fluxxor/fluxxor-tests.ts b/types/fluxxor/fluxxor-tests.ts
index ef6a8c707a..38522b1e1b 100644
--- a/types/fluxxor/fluxxor-tests.ts
+++ b/types/fluxxor/fluxxor-tests.ts
@@ -1,5 +1,5 @@
-import React = require('react');
-import Fluxxor = require('fluxxor');
+import * as React from 'react';
+import * as Fluxxor from 'fluxxor';
 
 class DispatcherTest {
     v: Fluxxor.Dispatcher;
diff --git a/types/fluxxor/index.d.ts b/types/fluxxor/index.d.ts
index c091186aaa..d5389f9cde 100644
--- a/types/fluxxor/index.d.ts
+++ b/types/fluxxor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/BinaryMuse/fluxxor
 // Definitions by: Yuichi Murata <https://github.com/mrk21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as EventEmitter3 from 'eventemitter3';
 import * as React from "react";
diff --git a/types/form-data/form-data-tests.ts b/types/form-data/form-data-tests.ts
index 6d1b9d6cb9..93457df3be 100644
--- a/types/form-data/form-data-tests.ts
+++ b/types/form-data/form-data-tests.ts
@@ -18,7 +18,7 @@ import * as ImportUsingES6Syntax from 'form-data';
 () => {
     var form = new FormData();
 
-    http.request('http://nodejs.org/images/logo.png', function (response) {
+    http.request({ path: 'http://nodejs.org/images/logo.png' }, function (response) {
         form.append('my_field', 'my value');
         form.append('my_buffer', new Buffer(10));
         form.append('my_logo', response);
diff --git a/types/form-serializer/index.d.ts b/types/form-serializer/index.d.ts
index 20ebb2223f..64c4880b39 100644
--- a/types/form-serializer/index.d.ts
+++ b/types/form-serializer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/macek/jquery-serialize-object
 // Definitions by: Florian Wagner <https://github.com/flqw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/foundation-sites/index.d.ts b/types/foundation-sites/index.d.ts
index 2357b612b1..0bafdd6ae1 100644
--- a/types/foundation-sites/index.d.ts
+++ b/types/foundation-sites/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://foundation.zurb.com/
 // Definitions by: Sam Vloeberghs <https://github.com/samvloeberghs/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // please also see the typings project and prefer to use it!
 // typings project: https://github.com/typings/typings
diff --git a/types/foundation/index.d.ts b/types/foundation/index.d.ts
index 49e9876130..73608604b5 100644
--- a/types/foundation/index.d.ts
+++ b/types/foundation/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://foundation.zurb.com/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts b/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
index 46e623207a..b17cb07e32 100644
--- a/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
+++ b/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
@@ -1,47 +1,48 @@
 import fs = require('fs-extra-promise-es6');
 import stream = require('stream');
 
-var stats: fs.Stats;
-var str: string;
-var strArr: string[];
-var bool: boolean;
-var num: number;
-var src: string;
-var dest: string;
-var file: string;
-var filename: string;
-var dir: string;
-var path: string;
-var data: any;
-var object: Object;
-var buffer: NodeBuffer;
-var modeNum: number;
-var modeStr: string;
-var encoding: string;
-var type: string;
-var flags: string;
-var srcpath: string;
-var dstpath: string;
-var oldPath: string;
-var newPath: string;
-var cache: string;
-var offset: number;
-var length: number;
-var position: number;
-var cacheBool: boolean;
-var cacheStr: string;
-var fd: number;
-var len: number;
-var uid: number;
-var gid: number;
-var atime: number;
-var mtime: number;
-var statsCallback: (err: Error, stats: fs.Stats) => void;
-var errorCallback: (err: Error) => void;
-var openOpts: fs.OpenOptions;
-var watcher: fs.FSWatcher;
-var readStreeam: stream.Readable;
-var writeStream: stream.Writable;
+let stats: fs.Stats;
+let str: string;
+let strArr: string[];
+let bool: boolean;
+let num: number;
+let src: string;
+let dest: string;
+let file: string;
+let filename: string;
+let dir: string;
+let path: string;
+let data: any;
+let object: any;
+let buffer: NodeBuffer;
+let modeNum: number;
+let modeStr: string;
+let encoding: string;
+let type: string;
+let flags: string;
+let srcpath: string;
+let dstpath: string;
+let oldPath: string;
+let newPath: string;
+let cache: string;
+let offset: number;
+let length: number;
+let position: number;
+let cacheBool: boolean;
+let cacheStr: string;
+let fd: number;
+let len: number;
+let uid: number;
+let gid: number;
+let atime: number;
+let mtime: number;
+let statsCallback: (err: Error, stats: fs.Stats) => void;
+let errorCallback: (err: Error) => void;
+let openOpts: fs.OpenOptions;
+let watcher: fs.FSWatcher;
+let readStreeam: stream.Readable;
+let writeStream: stream.Writable;
+let isDirectory: boolean;
 
 fs.copy(src, dest, errorCallback);
 fs.copy(src, dest, (src: string) => {
@@ -119,13 +120,10 @@ fs.linkSync(srcpath, dstpath);
 fs.symlink(srcpath, dstpath, type, errorCallback);
 fs.symlinkSync(srcpath, dstpath, type);
 fs.readlink(path, (err: Error, linkString: string) => {
-
 });
 fs.realpath(path, (err: Error, resolvedPath: string) => {
-
 });
 fs.realpath(path, cache, (err: Error, resolvedPath: string) => {
-
 });
 str = fs.realpathSync(path, cacheBool);
 fs.unlink(path, errorCallback);
@@ -137,13 +135,11 @@ fs.mkdir(path, modeStr, errorCallback);
 fs.mkdirSync(path, modeNum);
 fs.mkdirSync(path, modeStr);
 fs.readdir(path, (err: Error, files: string[]) => {
-
 });
 strArr = fs.readdirSync(path);
 fs.close(fd, errorCallback);
 fs.closeSync(fd);
 fs.open(path, flags, modeStr, (err: Error, fd: number) => {
-
 });
 num = fs.openSync(path, flags, modeStr);
 fs.utimes(path, atime, mtime, errorCallback);
@@ -153,24 +149,18 @@ fs.futimesSync(fd, atime, mtime);
 fs.fsync(fd, errorCallback);
 fs.fsyncSync(fd);
 fs.write(fd, buffer, offset, length, position, (err: Error, written: number, buffer: NodeBuffer) => {
-
 });
 num = fs.writeSync(fd, buffer, offset, length, position);
 fs.read(fd, buffer, offset, length, position, (err: Error, bytesRead: number, buffer: NodeBuffer) => {
-
 });
 num = fs.readSync(fd, buffer, offset, length, position);
 fs.readFile(filename, (err: Error, data: NodeBuffer) => {
-
 });
 fs.readFile(filename, encoding, (err: Error, data: string) => {
-
 });
 fs.readFile(filename, openOpts, (err: Error, data: string) => {
-
 });
 fs.readFile(filename, (err: Error, data: NodeBuffer) => {
-
 });
 buffer = fs.readFileSync(filename);
 str = fs.readFileSync(filename, encoding);
@@ -203,10 +193,8 @@ fs.watchFile(filename, {
 });
 fs.unwatchFile(filename);
 watcher = fs.watch(filename, { persistent: bool }, (event: string, filename: string) => {
-
 });
 fs.exists(path, (exists: boolean) => {
-
 });
 bool = fs.existsSync(path);
 
@@ -222,3 +210,10 @@ writeStream = fs.createWriteStream(path, {
 	flags: str,
 	encoding: str
 });
+
+let isDirectoryCallback = (err: Error, isDirectory: boolean) => {
+};
+fs.isDirectory(path, isDirectoryCallback);
+fs.isDirectory(path);
+isDirectory = fs.isDirectorySync(path);
+fs.isDirectoryAsync(path);
diff --git a/types/fs-extra-promise-es6/index.d.ts b/types/fs-extra-promise-es6/index.d.ts
index 85055636dc..db262c1460 100644
--- a/types/fs-extra-promise-es6/index.d.ts
+++ b/types/fs-extra-promise-es6/index.d.ts
@@ -1,158 +1,194 @@
-// Type definitions for fs-extra-promise-es6
+// Type definitions for fs-extra-promise-es6 0.1
 // Project: https://github.com/vinsonchuong/fs-extra-promise-es6
-// Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>, Joshua DeVinney <https://github.com/geoffreak>
+// Definitions by: midknight41 <https://github.com/midknight41>
+//                 Jason Swearingen <https://github.com/jasonswearingen>
+//                 Joshua DeVinney <https://github.com/geoffreak>
+//                 Hiromi Shikata <https://github.com/HiromiShikata>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: fs-extra-promise typings (minus Bluebird)
 
-///<reference types="node"/>
-
+/// <reference types="node"/>
 
 import stream = require("stream");
 import fs = require("fs");
 
-export type Stats = fs.Stats
+export type Stats = fs.Stats;
 
 export interface FSWatcher {
     close(): void;
 }
 
-export declare class ReadStream extends stream.Readable { }
-export declare class WriteStream extends stream.Writable { }
+export class ReadStream extends stream.Readable { }
+export class WriteStream extends stream.Writable { }
 
-//extended methods
-export declare function copy(src: string, dest: string, callback?: (err: Error) => void): void;
-export declare function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
+// extended methods
+export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
+export function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
 
-export declare function copySync(src: string, dest: string): void;
-export declare function copySync(src: string, dest: string, filter: (src: string) => boolean): void;
+export function copySync(src: string, dest: string, filter?: (src: string) => boolean): void;
 
-export declare function createFile(file: string, callback?: (err: Error) => void): void;
-export declare function createFileSync(file: string): void;
+export function createFile(file: string, callback?: (err: Error) => void): void;
+export function createFileSync(file: string): void;
 
-export declare function mkdirs(dir: string, callback?: (err: Error) => void): void;
-export declare function mkdirp(dir: string, callback?: (err: Error) => void): void;
-export declare function mkdirsSync(dir: string): void;
-export declare function mkdirpSync(dir: string): void;
+export function mkdirs(dir: string, callback?: (err: Error) => void): void;
+export function mkdirp(dir: string, callback?: (err: Error) => void): void;
+export function mkdirsSync(dir: string): void;
+export function mkdirpSync(dir: string): void;
 
-export declare function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
-export declare function outputFileSync(file: string, data: any): void;
+export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
+export function outputFileSync(file: string, data: any): void;
 
-export declare function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
-export declare function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
-export declare function outputJsonSync(file: string, data: any): void;
-export declare function outputJSONSync(file: string, data: any): void;
+export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
+export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
+export function outputJsonSync(file: string, data: any): void;
+export function outputJSONSync(file: string, data: any): void;
 
-export declare function readJson(file: string, callback?: (err: Error) => void): void;
-export declare function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
-export declare function readJSON(file: string, callback?: (err: Error) => void): void;
-export declare function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+export function readJson(file: string, callback?: (err: Error) => void): void;
+export function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+export function readJSON(file: string, callback?: (err: Error) => void): void;
+export function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
 
-export declare function readJsonSync(file: string, options?: OpenOptions): void;
-export declare function readJSONSync(file: string, options?: OpenOptions): void;
+export function readJsonSync(file: string, options?: OpenOptions): void;
+export function readJSONSync(file: string, options?: OpenOptions): void;
 
-export declare function remove(dir: string, callback?: (err: Error) => void): void;
-export declare function removeSync(dir: string): void;
+export function remove(dir: string, callback?: (err: Error) => void): void;
+export function removeSync(dir: string): void;
 // export function delete(dir: string, callback?: (err: Error) => void): void;
 // export function deleteSync(dir: string): void;
 
-export declare function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
-export declare function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-export declare function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
-export declare function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
+export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
+export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
 
-export declare function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
-export declare function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
+export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
+export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
 
-export declare function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
-export declare function renameSync(oldPath: string, newPath: string): void;
-export declare function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
-export declare function truncateSync(fd: number, len: number): void;
-export declare function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-export declare function chownSync(path: string, uid: number, gid: number): void;
-export declare function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
-export declare function fchownSync(fd: number, uid: number, gid: number): void;
-export declare function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-export declare function lchownSync(path: string, uid: number, gid: number): void;
-export declare function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
-export declare function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
-export declare function chmodSync(path: string, mode: number): void;
-export declare function chmodSync(path: string, mode: string): void;
-export declare function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
-export declare function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
-export declare function fchmodSync(fd: number, mode: number): void;
-export declare function fchmodSync(fd: number, mode: string): void;
-export declare function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
-export declare function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
-export declare function lchmodSync(path: string, mode: number): void;
-export declare function lchmodSync(path: string, mode: string): void;
-export declare function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-export declare function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-export declare function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
-export declare function statSync(path: string): Stats;
-export declare function lstatSync(path: string): Stats;
-export declare function fstatSync(fd: number): Stats;
-export declare function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
-export declare function linkSync(srcpath: string, dstpath: string): void;
-export declare function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-export declare function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-export declare function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
-export declare function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
-export declare function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
-export declare function realpathSync(path: string, cache?: boolean): string;
-export declare function unlink(path: string, callback?: (err: Error) => void): void;
-export declare function unlinkSync(path: string): void;
-export declare function rmdir(path: string, callback?: (err: Error) => void): void;
-export declare function rmdirSync(path: string): void;
-export declare function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
-export declare function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
-export declare function mkdirSync(path: string, mode?: number): void;
-export declare function mkdirSync(path: string, mode?: string): void;
-export declare function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
-export declare function readdirSync(path: string): string[];
-export declare function close(fd: number, callback?: (err: Error) => void): void;
-export declare function closeSync(fd: number): void;
-export declare function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
-export declare function openSync(path: string, flags: string, mode?: string): number;
-export declare function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
-export declare function utimesSync(path: string, atime: number, mtime: number): void;
-export declare function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
-export declare function futimesSync(fd: number, atime: number, mtime: number): void;
-export declare function fsync(fd: number, callback?: (err: Error) => void): void;
-export declare function fsyncSync(fd: number): void;
-export declare function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
-export declare function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-export declare function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
-export declare function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-export declare function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
-export declare function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
-export declare function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
-export declare function readFileSync(filename: string): NodeBuffer;
-export declare function readFileSync(filename: string, encoding: string): string;
-export declare function readFileSync(filename: string, options: OpenOptions): string;
-export declare function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-export declare function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-export declare function writeFileSync(filename: string, data: any, encoding?: string): void;
-export declare function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
-export declare function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-export declare function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
-export declare function appendFileSync(filename: string, data: any, encoding?: string): void;
-export declare function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
-export declare function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
-export declare function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
-export declare function unwatchFile(filename: string, listener?: Stats): void;
-export declare function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-export declare function exists(path: string, callback?: (exists: boolean) => void): void;
-export declare function existsSync(path: string): boolean;
-export declare function ensureDir(path: string, cb: (err: Error) => void): void;
-export declare function ensureDirSync(path: string): void;
+export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+export function renameSync(oldPath: string, newPath: string): void;
+export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
+export function truncateSync(fd: number, len: number): void;
+export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export function chownSync(path: string, uid: number, gid: number): void;
+export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
+export function fchownSync(fd: number, uid: number, gid: number): void;
+export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+export function lchownSync(path: string, uid: number, gid: number): void;
+export function chmod(path: string, mode: number | string, callback?: (err: Error) => void): void;
+export function chmodSync(path: string, mode: number | string): void;
+export function fchmod(fd: number, mode: number | string, callback?: (err: Error) => void): void;
+export function fchmodSync(fd: number, mode: number | string): void;
+export function lchmod(path: string, mode: number | string, callback?: (err: Error) => void): void;
+export function lchmodSync(path: string, mode: number | string): void;
+export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
+export function statSync(path: string): Stats;
+export function lstatSync(path: string): Stats;
+export function fstatSync(fd: number): Stats;
+export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
+export function linkSync(srcpath: string, dstpath: string): void;
+export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
+export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
+export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
+export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
+export function realpathSync(path: string, cache?: boolean): string;
+export function unlink(path: string, callback?: (err: Error) => void): void;
+export function unlinkSync(path: string): void;
+export function rmdir(path: string, callback?: (err: Error) => void): void;
+export function rmdirSync(path: string): void;
+export function mkdir(path: string, mode?: number | string, callback?: (err: Error) => void): void;
+export function mkdirSync(path: string, mode?: number | string): void;
+export function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
+export function readdirSync(path: string): string[];
+export function close(fd: number, callback?: (err: Error) => void): void;
+export function closeSync(fd: number): void;
+export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
+export function openSync(path: string, flags: string, mode?: string): number;
+export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export function utimesSync(path: string, atime: number, mtime: number): void;
+export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
+export function futimesSync(fd: number, atime: number, mtime: number): void;
+export function fsync(fd: number, callback?: (err: Error) => void): void;
+export function fsyncSync(fd: number): void;
+export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
+export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
+export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+/**
+ * readFile
+ * @param filename
+ * @param options
+ *          string: encoding
+ *          OpenOptions: options
+ * @param callback
+ */
+export function readFile(filename: string, options: OpenOptions | string, callback: (err: Error, data: string) => void): void;
+export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
+export function readFileSync(filename: string): NodeBuffer;
+/**
+ * readFileSync
+ * @param filename
+ * @param options
+ *          string: encoding
+ *          OpenOptions: options
+ */
+export function readFileSync(filename: string, options: OpenOptions | string): string;
+/**
+ * writeFile
+ * @param filename
+ * @param data
+ * @param options
+ *          string: encoding
+ *          OpenOptions: options
+ * @param callback
+ */
+export function writeFile(filename: string, data: any, options?: OpenOptions | string, callback?: (err: Error) => void): void;
+/**
+ * writeFileSync
+ * @param filename
+ * @param data
+ * @param option
+ *          string: encoding
+ *          OpenOptions: options
+ */
+export function writeFileSync(filename: string, data: any, option?: OpenOptions | string): void;
+/**
+ * appendFile
+ * @param filename
+ * @param data
+ * @param option:
+ *          string: encoding
+ *          OpenOptions: options
+ * @param callback
+ */
+export function appendFile(filename: string, data: any, option?: OpenOptions | string, callback?: (err: Error) => void): void;
+/**
+ * appendFileSync
+ * @param filename
+ * @param data
+ * @param option
+ *          string: encoding
+ *          OpenOptions: options
+ */
+export function appendFileSync(filename: string, data: any, option?: OpenOptions | string): void;
+export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
+export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
+export function unwatchFile(filename: string, listener?: Stats): void;
+export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+export function exists(path: string, callback?: (exists: boolean) => void): void;
+export function existsSync(path: string): boolean;
+export function ensureDir(path: string, cb: (err: Error) => void): void;
+export function ensureDirSync(path: string): void;
 
 export interface OpenOptions {
     encoding?: string;
     flag?: string;
 }
 
-export declare function createReadStream(path: string | Buffer, options?: {
+export function createReadStream(path: string | Buffer, options?: {
     flags?: string;
     encoding?: string;
     fd?: number;
@@ -161,81 +197,90 @@ export declare function createReadStream(path: string | Buffer, options?: {
     start?: number;
     end?: number;
 }): ReadStream;
-export declare function createWriteStream(path: string | Buffer, options?: {
+export function createWriteStream(path: string | Buffer, options?: {
     flags?: string;
     encoding?: string;
     fd?: number;
     mode?: number;
 }): WriteStream;
 
+// promisified versions
+export function copyAsync(src: string, dest: string, filter?: (src: string) => boolean): Promise<void>;
 
+export function createFileAsync(file: string): Promise<void>;
 
-//promisified versions
-export declare function copyAsync(src: string, dest: string): Promise<void>;
-export declare function copyAsync(src: string, dest: string, filter: (src: string) => boolean): Promise<void>;
+export function mkdirsAsync(dir: string): Promise<void>;
+export function mkdirpAsync(dir: string): Promise<void>;
 
-export declare function createFileAsync(file: string): Promise<void>;
+export function outputFileAsync(file: string, data: any): Promise<void>;
 
-export declare function mkdirsAsync(dir: string): Promise<void>;
-export declare function mkdirpAsync(dir: string): Promise<void>;
+export function outputJSONAsync(file: string, data: any): Promise<void>;
 
-export declare function outputFileAsync(file: string, data: any): Promise<void>;
+export function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
 
-export declare function outputJsonAsync(file: string, data: any): Promise<void>;
-export declare function outputJSONAsync(file: string, data: any): Promise<void>;
-
-export declare function readJsonAsync(file: string): Promise<void>;
-export declare function readJsonAsync(file: string, options?: OpenOptions): Promise<void>;
-export declare function readJSONAsync(file: string): Promise<void>;
-export declare function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
-
-
-export declare function removeAsync(dir: string): Promise<void>;
+export function removeAsync(dir: string): Promise<void>;
 // export function deleteAsync(dir: string):Promise<void>;
 
-export declare function writeJsonAsync(file: string, object: any): Promise<void>;
-export declare function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
-export declare function writeJSONAsync(file: string, object: any): Promise<void>;
-export declare function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+export function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+export function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
 
-export declare function renameAsync(oldPath: string, newPath: string): Promise<void>;
-export declare function truncateAsync(fd: number, len: number): Promise<void>;
-export declare function chownAsync(path: string, uid: number, gid: number): Promise<void>;
-export declare function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
-export declare function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
-export declare function chmodAsync(path: string, mode: number): Promise<void>;
-export declare function chmodAsync(path: string, mode: string): Promise<void>;
-export declare function fchmodAsync(fd: number, mode: number): Promise<void>;
-export declare function fchmodAsync(fd: number, mode: string): Promise<void>;
-export declare function lchmodAsync(path: string, mode: string): Promise<void>;
-export declare function lchmodAsync(path: string, mode: number): Promise<void>;
-export declare function statAsync(path: string): Promise<Stats>;
-export declare function lstatAsync(path: string): Promise<Stats>;
-export declare function fstatAsync(fd: number): Promise<Stats>;
-export declare function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-export declare function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
-export declare function readlinkAsync(path: string): Promise<string>;
-export declare function realpathAsync(path: string): Promise<string>;
-export declare function realpathAsync(path: string, cache: string): Promise<string>;
-export declare function unlinkAsync(path: string): Promise<void>;
-export declare function rmdirAsync(path: string): Promise<void>;
-export declare function mkdirAsync(path: string, mode?: number): Promise<void>;
-export declare function mkdirAsync(path: string, mode?: string): Promise<void>;
-export declare function readdirAsync(path: string): Promise<string[]>;
-export declare function closeAsync(fd: number): Promise<void>;
-export declare function openAsync(path: string, flags: string, mode?: string): Promise<number>;
-export declare function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
-export declare function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
-export declare function fsyncAsync(fd: number): Promise<void>;
-export declare function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-export declare function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-export declare function readFileAsync(filename: string, encoding: string): Promise<string>;
-export declare function readFileAsync(filename: string, options: OpenOptions): Promise<string>;
-export declare function readFileAsync(filename: string): Promise<NodeBuffer>;
-export declare function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-export declare function writeFileAsync(filename: string, data: any, options?: OpenOptions): Promise<void>;
-export declare function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-export declare function appendFileAsync(filename: string, data: any, option?: OpenOptions): Promise<void>;
+export function renameAsync(oldPath: string, newPath: string): Promise<void>;
+export function truncateAsync(fd: number, len: number): Promise<void>;
+export function chownAsync(path: string, uid: number, gid: number): Promise<void>;
+export function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
+export function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
+export function chmodAsync(path: string, mode: number | string): Promise<void>;
+export function fchmodAsync(fd: number, mode: number | string): Promise<void>;
+export function lchmodAsync(path: string, mode: number | string): Promise<void>;
+export function statAsync(path: string): Promise<Stats>;
+export function lstatAsync(path: string): Promise<Stats>;
+export function fstatAsync(fd: number): Promise<Stats>;
+export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
+export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+export function readlinkAsync(path: string): Promise<string>;
+export function realpathAsync(path: string, cache?: string): Promise<string>;
+export function unlinkAsync(path: string): Promise<void>;
+export function rmdirAsync(path: string): Promise<void>;
+export function mkdirAsync(path: string, mode?: number | string): Promise<void>;
+export function readdirAsync(path: string): Promise<string[]>;
+export function closeAsync(fd: number): Promise<void>;
+export function openAsync(path: string, flags: string, mode?: string): Promise<number>;
+export function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
+export function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
+export function fsyncAsync(fd: number): Promise<void>;
+export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+/**
+ * readFileAsync
+ * @param filename
+ * @param options:
+ *          string: encoding
+ *          OpenOptions: options
+ */
+export function readFileAsync(filename: string, options: OpenOptions | string): Promise<string>;
+export function readFileAsync(filename: string): Promise<NodeBuffer>;
+/**
+ * writeFileAsync
+ * @param filename
+ * @param data
+ * @param options:
+ *          string: encoding
+ *          OpenOptions: options
+ */
+export function writeFileAsync(filename: string, data: any, options?: OpenOptions | string): Promise<void>;
+/**
+ * appendFileAsync
+ * @param filename
+ * @param data
+ * @param option:
+ *          string: encoding
+ *          OpenOptions: option
+ */
+export function appendFileAsync(filename: string, data: any, option?: OpenOptions | string): Promise<void>;
 
-export declare function existsAsync(path: string): Promise<boolean>;
-export declare function ensureDirAsync(path: string): Promise<void>;
+export function existsAsync(path: string): Promise<boolean>;
+export function ensureDirAsync(path: string): Promise<void>;
+
+export function isDirectory(path: string, callback?: (err: Error, isDirectory: boolean) => void): void;
+export function isDirectorySync(path: string): boolean;
+export function isDirectoryAsync(path: string): Promise<boolean>;
diff --git a/types/fs-extra-promise-es6/tslint.json b/types/fs-extra-promise-es6/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/fs-extra-promise-es6/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/fs-extra-promise/fs-extra-promise-tests.ts b/types/fs-extra-promise/fs-extra-promise-tests.ts
index cd17429fe4..9f5a8b32bf 100644
--- a/types/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/types/fs-extra-promise/fs-extra-promise-tests.ts
@@ -1,48 +1,49 @@
 import fs = require('fs-extra-promise');
 import stream = require('stream');
 
-var stats: fs.Stats;
-var str: string;
-var strArr: string[];
-var bool: boolean;
-var num: number;
-var src: string;
-var dest: string;
-var file: string;
-var filename: string;
-var dir: string;
-var path: string;
-var data: any;
-var object: Object;
-var buf: Buffer;
-var buffer: NodeBuffer;
-var modeNum: number;
-var modeStr: string;
-var encoding: string;
-var type: string;
-var flags: string;
-var srcpath: string;
-var dstpath: string;
-var oldPath: string;
-var newPath: string;
-var cache: { [path: string]: string; };
-var offset: number;
-var length: number;
-var position: number;
-var fd: number;
-var len: number;
-var uid: number;
-var gid: number;
-var atime: number;
-var mtime: number;
-var watchListener: (curr: fs.Stats, prev: fs.Stats) => void;
-var statsCallback: (err: Error, stats: fs.Stats) => void;
-var errorCallback: (err: Error) => void;
-var openOpts: fs.ReadOptions;
-var writeOpts: fs.WriteOptions;
-var watcher: fs.FSWatcher;
-var readStream: stream.Readable;
-var writeStream: stream.Writable;
+let stats: fs.Stats;
+let str: string;
+let strArr: string[];
+let bool: boolean;
+let num: number;
+let src: string;
+let dest: string;
+let file: string;
+let filename: string;
+let dir: string;
+let path: string;
+let data: any;
+let object: object;
+let buf: Buffer;
+let buffer: NodeBuffer;
+let modeNum: number;
+let modeStr: string;
+let encoding: string;
+let type: string;
+let flags: string;
+let srcpath: string;
+let dstpath: string;
+let oldPath: string;
+let newPath: string;
+let cache: { [path: string]: string; };
+let offset: number;
+let length: number;
+let position: number;
+let fd: number;
+let len: number;
+let uid: number;
+let gid: number;
+let atime: number;
+let mtime: number;
+let watchListener: (curr: fs.Stats, prev: fs.Stats) => void;
+let statsCallback: (err: Error, stats: fs.Stats) => void;
+let errorCallback: (err: Error) => void;
+let openOpts: fs.ReadOptions;
+let writeOpts: fs.WriteOptions;
+let watcher: fs.FSWatcher;
+let readStream: stream.Readable;
+let writeStream: stream.Writable;
+let isDirectory: boolean;
 
 fs.copy(src, dest, errorCallback);
 fs.copy(src, dest, (src: string) => {
@@ -122,13 +123,10 @@ fs.linkSync(srcpath, dstpath);
 fs.symlink(srcpath, dstpath, type, errorCallback);
 fs.symlinkSync(srcpath, dstpath, type);
 fs.readlink(path, (err: Error, linkString: string) => {
-
 });
 fs.realpath(path, (err: Error, resolvedPath: string) => {
-
 });
 fs.realpath(path, cache, (err: Error, resolvedPath: string) => {
-
 });
 str = fs.realpathSync(path, cache);
 fs.unlink(path, errorCallback);
@@ -140,13 +138,11 @@ fs.mkdir(path, modeStr, errorCallback);
 fs.mkdirSync(path, modeNum);
 fs.mkdirSync(path, modeStr);
 fs.readdir(path, (err: Error, files: string[]) => {
-
 });
 strArr = fs.readdirSync(path);
 fs.close(fd, errorCallback);
 fs.closeSync(fd);
 fs.open(path, flags, modeNum, (err: Error, fd: number) => {
-
 });
 num = fs.openSync(path, flags, modeNum);
 fs.utimes(path, atime, mtime, errorCallback);
@@ -156,41 +152,35 @@ fs.futimesSync(fd, atime, mtime);
 fs.fsync(fd, errorCallback);
 fs.fsyncSync(fd);
 fs.write(fd, buffer, offset, length, position, (err: Error, written: number, buffer: NodeBuffer) => {
-
 });
 num = fs.writeSync(fd, buffer, offset, length, position);
 fs.read(fd, buffer, offset, length, position, (err: Error, bytesRead: number, buffer: NodeBuffer) => {
-
 });
 num = fs.readSync(fd, buffer, offset, length, position);
 fs.readFile(filename, (err: Error, data: NodeBuffer) => {
-
 });
 fs.readFile(filename, encoding, (err: Error, data: string) => {
-
 });
 fs.readFile(filename, openOpts, (err: NodeJS.ErrnoException, data: Buffer) => {
-
 });
 fs.readFile(filename, (err: Error, data: NodeBuffer) => {
-
 });
 buffer = fs.readFileSync(filename);
 str = fs.readFileSync(filename, encoding);
 buf = fs.readFileSync(filename, openOpts);
 
 fs.writeFile(filename, data, errorCallback);
-fs.writeFile(filename, data, encoding, errorCallback);
+fs.writeFile(filename, data, { encoding }, errorCallback);
 fs.writeFile(filename, data, writeOpts, errorCallback);
 fs.writeFileSync(filename, data);
-fs.writeFileSync(filename, data, encoding);
+fs.writeFileSync(filename, data, { encoding });
 fs.writeFileSync(filename, data, writeOpts);
 
 fs.appendFile(filename, data, errorCallback);
-fs.appendFile(filename, data, encoding, errorCallback);
+fs.appendFile(filename, data, { encoding }, errorCallback);
 fs.appendFile(filename, data, writeOpts, errorCallback);
 fs.appendFileSync(filename, data);
-fs.appendFileSync(filename, data, encoding);
+fs.appendFileSync(filename, data, { encoding });
 fs.appendFileSync(filename, data, writeOpts);
 
 fs.watchFile(filename, watchListener);
@@ -200,10 +190,8 @@ fs.watchFile(filename, {
 }, watchListener);
 fs.unwatchFile(filename);
 watcher = fs.watch(filename, { persistent: bool }, (event: string, filename: string) => {
-
 });
 fs.exists(path, (exists: boolean) => {
-
 });
 bool = fs.existsSync(path);
 
@@ -219,3 +207,10 @@ writeStream = fs.createWriteStream(path, {
 	flags: str,
 	encoding: str
 });
+
+let isDirectoryCallback = (err: Error, isDirectory: boolean) => {
+};
+fs.isDirectory(path, isDirectoryCallback);
+fs.isDirectory(path);
+isDirectory = fs.isDirectorySync(path);
+fs.isDirectoryAsync(path);
diff --git a/types/fs-extra-promise/index.d.ts b/types/fs-extra-promise/index.d.ts
index b4c9a648ac..9d174f791f 100644
--- a/types/fs-extra-promise/index.d.ts
+++ b/types/fs-extra-promise/index.d.ts
@@ -1,12 +1,10 @@
 // Type definitions for fs-extra-promise 1.0
 // Project: https://github.com/overlookmotel/fs-extra-promise
-// Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>
+// Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>, Hiromi Shikata <https://github.com/HiromiShikata>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
-/// <reference types="bluebird" />
-/// <reference types="fs-extra" />
 
 import * as stream from 'stream';
 import { Stats } from 'fs';
@@ -20,73 +18,94 @@ export interface MkdirOptions {
     mode?: number;
 }
 
-//promisified versions
-export declare function copyAsync(src: string, dest: string): Promise<void>;
-export declare function copyAsync(src: string, dest: string, filter: CopyFilter): Promise<void>;
-export declare function copyAsync(src: string, dest: string, options: CopyOptions): Promise<void>;
+// promisified versions
+/**
+ * copyAsync
+ * @param src
+ * @param dest
+ * @param options
+ *              CopyFilter: filter
+ *              CopyOptions: options
+ */
+export function copyAsync(src: string, dest: string, options?: CopyFilter | CopyOptions): Promise<void>;
 
-export declare function createFileAsync(file: string): Promise<void>;
+export function createFileAsync(file: string): Promise<void>;
 
-export declare function mkdirsAsync(dir: string, options?: MkdirOptions): Promise<void>;
-export declare function mkdirpAsync(dir: string, options?: MkdirOptions): Promise<void>;
+export function mkdirsAsync(dir: string, options?: MkdirOptions): Promise<void>;
+export function mkdirpAsync(dir: string, options?: MkdirOptions): Promise<void>;
 
-export declare function moveAsync(src: string, dest: string, options?: MoveOptions): Promise<void>;
+export function moveAsync(src: string, dest: string, options?: MoveOptions): Promise<void>;
 
-export declare function outputFileAsync(file: string, data: any): Promise<void>;
+export function outputFileAsync(file: string, data: any): Promise<void>;
 
-export declare function outputJsonAsync(file: string, data: any): Promise<void>;
-export declare function outputJSONAsync(file: string, data: any): Promise<void>;
+export function outputJsonAsync(file: string, data: any): Promise<void>;
+export function outputJSONAsync(file: string, data: any): Promise<void>;
 
-export declare function readJsonAsync(file: string): Promise<any>;
-export declare function readJsonAsync(file: string, options?: ReadOptions): Promise<any>;
-export declare function readJSONAsync(file: string): Promise<any>;
-export declare function readJSONAsync(file: string, options?: ReadOptions): Promise<any>;
+export function readJsonAsync(file: string, options?: ReadOptions): Promise<any>;
+export function readJSONAsync(file: string, options?: ReadOptions): Promise<any>;
 
-export declare function removeAsync(dir: string): Promise<void>;
+export function removeAsync(dir: string): Promise<void>;
 
-export declare function writeJsonAsync(file: string, object: any): Promise<void>;
-export declare function writeJsonAsync(file: string, object: any, options?: WriteOptions): Promise<void>;
-export declare function writeJSONAsync(file: string, object: any): Promise<void>;
-export declare function writeJSONAsync(file: string, object: any, options?: WriteOptions): Promise<void>;
+export function writeJsonAsync(file: string, object: any, options?: WriteOptions): Promise<void>;
+export function writeJSONAsync(file: string, object: any, options?: WriteOptions): Promise<void>;
 
-export declare function renameAsync(oldPath: string, newPath: string): Promise<void>;
-export declare function truncateAsync(fd: number, len: number): Promise<void>;
-export declare function chownAsync(path: string, uid: number, gid: number): Promise<void>;
-export declare function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
-export declare function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
-export declare function chmodAsync(path: string, mode: number): Promise<void>;
-export declare function chmodAsync(path: string, mode: string): Promise<void>;
-export declare function fchmodAsync(fd: number, mode: number): Promise<void>;
-export declare function fchmodAsync(fd: number, mode: string): Promise<void>;
-export declare function lchmodAsync(path: string, mode: string): Promise<void>;
-export declare function lchmodAsync(path: string, mode: number): Promise<void>;
-export declare function statAsync(path: string): Promise<Stats>;
-export declare function lstatAsync(path: string): Promise<Stats>;
-export declare function fstatAsync(fd: number): Promise<Stats>;
-export declare function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-export declare function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
-export declare function readlinkAsync(path: string): Promise<string>;
-export declare function realpathAsync(path: string): Promise<string>;
-export declare function realpathAsync(path: string, cache: { [path: string]: string }): Promise<string>;
-export declare function unlinkAsync(path: string): Promise<void>;
-export declare function rmdirAsync(path: string): Promise<void>;
-export declare function mkdirAsync(path: string, mode?: number): Promise<void>;
-export declare function mkdirAsync(path: string, mode?: string): Promise<void>;
-export declare function readdirAsync(path: string): Promise<string[]>;
-export declare function closeAsync(fd: number): Promise<void>;
-export declare function openAsync(path: string, flags: string, mode?: string): Promise<number>;
-export declare function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
-export declare function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
-export declare function fsyncAsync(fd: number): Promise<void>;
-export declare function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-export declare function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-export declare function readFileAsync(filename: string, encoding: string): Promise<string>;
-export declare function readFileAsync(filename: string, options: ReadOptions): Promise<string>;
-export declare function readFileAsync(filename: string): Promise<NodeBuffer>;
-export declare function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-export declare function writeFileAsync(filename: string, data: any, options?: WriteOptions): Promise<void>;
-export declare function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-export declare function appendFileAsync(filename: string, data: any, option?: WriteOptions): Promise<void>;
+export function renameAsync(oldPath: string, newPath: string): Promise<void>;
+export function truncateAsync(fd: number, len: number): Promise<void>;
+export function chownAsync(path: string, uid: number, gid: number): Promise<void>;
+export function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
+export function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
+export function chmodAsync(path: string, mode: number | string): Promise<void>;
+export function fchmodAsync(fd: number, mode: number | string): Promise<void>;
+export function lchmodAsync(path: string, mode: number | string): Promise<void>;
+export function statAsync(path: string): Promise<Stats>;
+export function lstatAsync(path: string): Promise<Stats>;
+export function fstatAsync(fd: number): Promise<Stats>;
+export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
+export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+export function readlinkAsync(path: string): Promise<string>;
+export function realpathAsync(path: string, cache?: { [path: string]: string }): Promise<string>;
+export function unlinkAsync(path: string): Promise<void>;
+export function rmdirAsync(path: string): Promise<void>;
+export function mkdirAsync(path: string, mode?: number | string): Promise<void>;
+export function readdirAsync(path: string): Promise<string[]>;
+export function closeAsync(fd: number): Promise<void>;
+export function openAsync(path: string, flags: string, mode?: string): Promise<number>;
+export function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
+export function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
+export function fsyncAsync(fd: number): Promise<void>;
+export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+/**
+ * readFileAsync
+ * @param filename
+ * @param options:
+ *              string: encoding
+ *              ReadOptions: options
+ */
+export function readFileAsync(filename: string, options: string | ReadOptions): Promise<string>;
+export function readFileAsync(filename: string): Promise<NodeBuffer>;
+/**
+ * writeFileAsync
+ * @param filename
+ * @param data
+ * @param options:
+ *              string: encoding
+ *              WriteOptions: options
+ */
+export function writeFileAsync(filename: string, data: any, options?: string | WriteOptions): Promise<void>;
+/**
+ * appendFileAsync
+ * @param filename
+ * @param data
+ * @param options:
+ *              string: encoding
+ *              WriteOptions: options
+ */
+export function appendFileAsync(filename: string, data: any, option?: string | WriteOptions): Promise<void>;
 
-export declare function existsAsync(path: string): Promise<boolean>;
-export declare function ensureDirAsync(path: string): Promise<void>;
+export function existsAsync(path: string): Promise<boolean>;
+export function ensureDirAsync(path: string): Promise<void>;
+
+export function isDirectory(path: string, callback?: (err: Error, isDirectory: boolean) => void): void;
+export function isDirectorySync(path: string): boolean;
+export function isDirectoryAsync(path: string): Promise<boolean>;
diff --git a/types/fs-extra-promise/tslint.json b/types/fs-extra-promise/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/fs-extra-promise/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/fs-extra/fs-extra-tests.ts b/types/fs-extra/fs-extra-tests.ts
index f24eaa4b1c..39f3a9d37a 100644
--- a/types/fs-extra/fs-extra-tests.ts
+++ b/types/fs-extra/fs-extra-tests.ts
@@ -62,7 +62,7 @@ fs.copy(src, dest,
 );
 fs.copySync(src, dest);
 fs.copySync(src, dest, (src: string) => false);
-fs.copySync(src, dest, /.*/);
+fs.copySync(src, dest, { filter: /.*/ });
 fs.copySync(src, dest,
 	{
 		overwrite: true,
@@ -167,16 +167,16 @@ fs.ensureFile(path).then(() => {
 });
 fs.ensureFile(path, errorCallback);
 fs.ensureFileSync(path);
-fs.ensureLink(path).then(() => {
+fs.ensureLink(path, path).then(() => {
 	// stub
 });
-fs.ensureLink(path, errorCallback);
-fs.ensureLinkSync(path);
-fs.ensureSymlink(path).then(() => {
+fs.ensureLink(path, path, errorCallback);
+fs.ensureLinkSync(path, path);
+fs.ensureSymlink(path, path, "file").then(() => {
 	// stub
 });
-fs.ensureSymlink(path, errorCallback);
-fs.ensureSymlinkSync(path);
+fs.ensureSymlink(path, path, errorCallback);
+fs.ensureSymlinkSync(path, path);
 fs.emptyDir(path).then(() => {
 	// stub
 });
diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index 960f2362b9..49a056bce7 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for fs-extra 3.0
 // Project: https://github.com/jprichardson/node-fs-extra
-// Definitions by: Alan Agius <https://github.com/alan-agius4>
-//                 midknight41 <https://github.com/midknight41>
-//                 Brendan Forster <https://github.com/shiftkey>
+// Definitions by: Alan Agius <https://github.com/alan-agius4>,
+//                 midknight41 <https://github.com/midknight41>,
+//                 Brendan Forster <https://github.com/shiftkey>,
 //                 Mees van Dijk <https://github.com/mees->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
@@ -79,13 +79,14 @@ export function ensureFile(path: string): Promise<void>;
 export function ensureFile(path: string, callback: (err: Error) => void): void;
 export function ensureFileSync(path: string): void;
 
-export function ensureLink(path: string): Promise<void>;
-export function ensureLink(path: string, callback: (err: Error) => void): void;
-export function ensureLinkSync(path: string): void;
+export function ensureLink(src: string, dest: string): Promise<void>;
+export function ensureLink(src: string, dest: string, callback: (err: Error) => void): void;
+export function ensureLinkSync(src: string, dest: string): void;
 
-export function ensureSymlink(path: string): Promise<void>;
-export function ensureSymlink(path: string, callback: (err: Error) => void): void;
-export function ensureSymlinkSync(path: string): void;
+export function ensureSymlink(src: string, dest: string, type?: SymlinkType): Promise<void>;
+export function ensureSymlink(src: string, dest: string, type: SymlinkType, callback: (err: Error) => void): void;
+export function ensureSymlink(src: string, dest: string, callback: (err: Error) => void): void;
+export function ensureSymlinkSync(src: string, dest: string, type?: SymlinkType): void;
 
 export function emptyDir(path: string): Promise<void>;
 export function emptyDir(path: string, callback: (err: Error) => void): void;
@@ -257,9 +258,9 @@ export interface PathEntryStream {
     read(): PathEntry | null;
 }
 
-export type CopyFilterFunction = (src: string) => boolean;
+export type CopyFilter = ((src: string) => boolean) | RegExp;
 
-export type CopyFilter = CopyFilterFunction | RegExp;
+export type SymlinkType = "dir" | "file";
 
 export interface CopyOptions {
     dereference?: boolean;
diff --git a/types/fullcalendar/fullcalendar-tests.ts b/types/fullcalendar/fullcalendar-tests.ts
index ca456013af..c0a53a59f1 100644
--- a/types/fullcalendar/fullcalendar-tests.ts
+++ b/types/fullcalendar/fullcalendar-tests.ts
@@ -622,11 +622,8 @@ $('#calendar').fullCalendar({
     eventColor: '#378006'
 });
 
-interface EventWithDescription extends FullCalendar.EventObject {
-    description: string;
-}
-interface JQuery {
-    qtip: any; // dummy plugin interface
+interface JQueryQTip extends JQuery {
+    qtip(options: Object): JQuery; // dummy plugin interface
 }
 
 $('#calendar').fullCalendar({
@@ -638,7 +635,7 @@ $('#calendar').fullCalendar({
         }
         // more events here
     ],
-    eventRender(event: EventWithDescription, element: any, view: any) {
+    eventRender(event: FullCalendar.EventObject, element: JQueryQTip, view: FullCalendar.ViewObject) {
         element.qtip({
             content: event.description
         });
diff --git a/types/fullcalendar/index.d.ts b/types/fullcalendar/index.d.ts
index 2fedd216c6..bed6396214 100644
--- a/types/fullcalendar/index.d.ts
+++ b/types/fullcalendar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://fullcalendar.io/
 // Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>, Patrick Niemann <https://github.com/panic175>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -57,7 +58,7 @@ export interface Options extends AgendaOptions, EventDraggingResizingOptions, Dr
     views?: ViewSpecificOptions;
     viewRender?(view: ViewObject, element: JQuery): void;
     viewDestroy?(view: ViewObject, element: JQuery): void;
-    dayRender?(date: Date, cell: HTMLTableDataCellElement): void;
+    dayRender?(date: Date, cell: JQuery): void;
     windowResize?(view: ViewObject): void;
 
     // Timezone
@@ -130,8 +131,8 @@ export interface Options extends AgendaOptions, EventDraggingResizingOptions, Dr
     eventBackgroundColor?: string;
     eventBorderColor?: string;
     eventTextColor?: string;
-    eventRender?(event: EventObject, element: HTMLDivElement, view: ViewObject): void;
-    eventAfterRender?(event: EventObject, element: HTMLDivElement, view: ViewObject): void;
+    eventRender?(event: EventObject, element: JQuery, view: ViewObject): void;
+    eventAfterRender?(event: EventObject, element: JQuery, view: ViewObject): void;
     eventAfterAllRender?(view: ViewObject): void;
     eventDestroy?(event: EventObject, element: JQuery, view: ViewObject): void;
 
@@ -184,7 +185,7 @@ export interface EventDraggingResizingOptions {
 */
 export interface SelectionOptions {
     selectable?: boolean;
-    selectHelper?: boolean | ((start: moment.Moment, end: moment.Moment) => HTMLElement);
+    selectHelper?: boolean;
     unselectAuto?: boolean;
     unselectCancel?: string;
     selectOverlap?: boolean | ((event: EventObject) => boolean);
@@ -229,6 +230,8 @@ export interface EventObject extends Timespan {
     backgroundColor?: string;
     borderColor?: string;
     textColor?: string;
+    // non-standard fields, see https://fullcalendar.io/docs/event_data/Event_Object/ and https://fullcalendar.io/docs/event_rendering/eventRender/
+    [x: string]: any;
 }
 
 export interface ViewObject extends Timespan {
diff --git a/types/fullcalendar/tsconfig.json b/types/fullcalendar/tsconfig.json
index ceb59668c7..e57ff2b39c 100644
--- a/types/fullcalendar/tsconfig.json
+++ b/types/fullcalendar/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "fullcalendar-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/fullcalendar/v1/index.d.ts b/types/fullcalendar/v1/index.d.ts
index 4c8a5dc65a..63b70c9cc7 100644
--- a/types/fullcalendar/v1/index.d.ts
+++ b/types/fullcalendar/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://arshaw.com/fullcalendar/
 // Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 import * as moment from "moment";
diff --git a/types/fullcalendar/v1/tsconfig.json b/types/fullcalendar/v1/tsconfig.json
index 810979b7a3..2389638d1c 100644
--- a/types/fullcalendar/v1/tsconfig.json
+++ b/types/fullcalendar/v1/tsconfig.json
@@ -25,4 +25,4 @@
         "index.d.ts",
         "fullcalendar-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/fullpage.js/index.d.ts b/types/fullpage.js/index.d.ts
index 7716a3bca8..869a64d6e8 100644
--- a/types/fullpage.js/index.d.ts
+++ b/types/fullpage.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://alvarotrigo.com/fullPage/
 // Definitions by: Andrew Roberts <http://www.atroberts.org>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/gamequery/index.d.ts b/types/gamequery/index.d.ts
index 4d78bf23df..e45e7f761c 100644
--- a/types/gamequery/index.d.ts
+++ b/types/gamequery/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://gamequeryjs.com/
 // Definitions by: David Laubreiter <https://github.com/Laubi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/gapi.analytics/gapi.analytics-tests.ts b/types/gapi.analytics/gapi.analytics-tests.ts
index 2c35403d10..767a3f8657 100644
--- a/types/gapi.analytics/gapi.analytics-tests.ts
+++ b/types/gapi.analytics/gapi.analytics-tests.ts
@@ -19,19 +19,19 @@ function test_namespace() {
 		"enumDescriptions"  ?: string[];
 		"location"          ?: string;
 	}
-    var kBI : AnalyticsParameter = gapi.client.analytics.kB.parameters.alt;
+    var kBI : AnalyticsParameter = new gapi.client.analytics.kB.parameters.alt();
 	var kB = !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.fields;
+    kBI = new gapi.client.analytics.kB.parameters.fields();
 	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.key;
+    kBI = new gapi.client.analytics.kB.parameters.key();
 	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.oauth_token;
+    kBI = new gapi.client.analytics.kB.parameters.oauth_token();
 	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.prettyPrint;
+    kBI = new gapi.client.analytics.kB.parameters.prettyPrint();
 	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.quotaUser;
+    kBI = new gapi.client.analytics.kB.parameters.quotaUser();
 	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.userIP;
+    kBI = new gapi.client.analytics.kB.parameters.userIP();
 	kB = kB && !!kBI;
 	analytics = analytics && kB;
 
diff --git a/types/gapi.analytics/index.d.ts b/types/gapi.analytics/index.d.ts
index 31bbd1a83b..e70b05ae55 100644
--- a/types/gapi.analytics/index.d.ts
+++ b/types/gapi.analytics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
 // Definitions by: César Costas <https://github.com/gatsbimantico>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
@@ -47,13 +48,20 @@ declare namespace gapi.client.analytics.kB.parameters {
 		"enumDescriptions"  ?: string[];
 		"location"          ?: string;
 	}
-	export class alt implements AnalyticsParameter {}
-	export class fields implements AnalyticsParameter {}
-	export class key implements AnalyticsParameter {}
-	export class oauth_token implements AnalyticsParameter {}
-	export class prettyPrint implements AnalyticsParameter {}
-	export class quotaUser implements AnalyticsParameter {}
-	export class userIP implements AnalyticsParameter {}
+        export interface alt extends AnalyticsParameter {}
+	export class alt {}
+        export interface fields extends AnalyticsParameter {}
+	export class fields {}
+        export interface key extends AnalyticsParameter {}
+	export class key {}
+        export interface oauth_token extends AnalyticsParameter {}
+	export class oauth_token {}
+        export interface prettyPrint extends AnalyticsParameter {}
+	export class prettyPrint {}
+        export interface quotaUser extends AnalyticsParameter {}
+	export class quotaUser {}
+        export interface userIP extends AnalyticsParameter {}
+	export class userIP {}
 }
 
 interface View {
diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index 830abe3b0c..04dfe32c2d 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/identity/sign-in/web/
 // Definitions by: Derek Lawless <https://github.com/flawless2011>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
@@ -175,7 +176,7 @@ declare namespace gapi.auth2 {
      * Forces a refresh of the access token, and then returns a Promise for the new AuthResponse.
      */
     reloadAuthResponse(): Promise<AuthResponse>;
-    
+
     /**
      * Returns true if the user granted the specified scopes.
      */
diff --git a/types/gapi.calendar/index.d.ts b/types/gapi.calendar/index.d.ts
index bd0e3b0d17..e066ebfad4 100644
--- a/types/gapi.calendar/index.d.ts
+++ b/types/gapi.calendar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/google-apps/calendar/
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi.drive/gapi.drive-tests.ts b/types/gapi.drive/gapi.drive-tests.ts
new file mode 100644
index 0000000000..6e6f9d1db1
--- /dev/null
+++ b/types/gapi.drive/gapi.drive-tests.ts
@@ -0,0 +1,92 @@
+/* Example taken from Google Drive API JavaScript Quickstart https://developers.google.com/drive/v2/web/quickstart/js */
+
+{
+    // Client ID and API key from the Developer Console
+    var CLIENT_ID = '<YOUR_CLIENT_ID>';
+
+    // Authorization scopes required by the API; multiple scopes can be
+    // included, separated by spaces.
+    var SCOPES = ['https://www.googleapis.com/auth/drive.metadata.readonly'];
+
+    /**
+     * Check if current user has authorized this application.
+     */
+    function checkAuth() {
+        gapi.auth.authorize(
+            {
+                'client_id': CLIENT_ID,
+                'scope': SCOPES.join(' '),
+                'immediate': true
+            }, handleAuthResult);
+    }
+
+    /**
+     * Handle response from authorization server.
+     *
+     * @param {Object} authResult Authorization result.
+     */
+    function handleAuthResult(authResult: GoogleApiOAuth2TokenObject) {
+        var authorizeDiv = document.getElementById('authorize-div')!;
+        if (authResult && !authResult.error) {
+            // Hide auth UI, then load client library.
+            authorizeDiv.style.display = 'none';
+            loadDriveApi();
+        } else {
+            // Show auth UI, allowing the user to initiate authorization by
+            // clicking authorize button.
+            authorizeDiv.style.display = 'inline';
+        }
+    }
+
+    /**
+     * Initiate auth flow in response to user clicking authorize button.
+     *
+     * @param {Event} event Button click event.
+     */
+    function handleAuthClick(event: MouseEvent) {
+        gapi.auth.authorize(
+            {client_id: CLIENT_ID, scope: SCOPES, immediate: false},
+            handleAuthResult);
+        return false;
+    }
+
+
+    /**
+     * Load Google Drive client library.
+     */
+    function loadDriveApi() {
+        gapi.client.load('drive', 'v2', () => null);
+    }
+
+    /**
+     * Append a pre element to the body containing the given message
+     * as its text node. Used to display the results of the API call.
+     *
+     * @param {string} message Text to be placed in pre element.
+     */
+    function appendPre(message: string) {
+        var pre = document.getElementById('content')!;
+        var textContent = document.createTextNode(message + '\n');
+        pre.appendChild(textContent);
+    }
+
+    /**
+     * Print files.
+     */
+    function listFiles() {
+        gapi.client.drive.files.list({
+            'maxResults': 10
+        }).then(function(response: any) {
+            appendPre('Files:');
+            var files = response.result.items;
+            if (files && files.length > 0) {
+                for (var i = 0; i < files.length; i++) {
+                    var file = files[i];
+                    appendPre(file.title + ' (' + file.id + ')');
+                }
+            } else {
+                appendPre('No files found.');
+            }
+        });
+    }
+}
diff --git a/types/gapi.drive/index.d.ts b/types/gapi.drive/index.d.ts
new file mode 100644
index 0000000000..ad8c64aa50
--- /dev/null
+++ b/types/gapi.drive/index.d.ts
@@ -0,0 +1,336 @@
+// Type definitions for Google Drive API v2
+// Project: https://developers.google.com/drive/
+// Definitions by: Sam Baxter <https://github.com/baxtersa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="gapi" />
+
+declare namespace gapi.client.drive {
+    export namespace files {
+        interface GetParameters {
+            fileId: string;
+            acknowledgeAbuse?: boolean;
+            projection?: string;
+            revisionId?: string;
+            supportsTeamDrives?: boolean;
+            updateViewedDate?: boolean;
+        }
+
+        export function get(parameters: GetParameters): HttpRequest<FileResource>;
+
+        interface PatchParameters {
+            fileId: string;
+            resource?: FileResource
+            convert?: boolean;
+            modifiedDateBehavior?: string;
+            newRevision?: boolean;
+            ocr?: boolean;
+            ocrLanguage?: string;
+            pinned?: boolean;
+            removeParents?: string;
+            setModifiedDate?: boolean;
+            supportsTeamDrives?: boolean;
+            timedTextLanguage?: string;
+            timedTextTrackName?: string;
+            updateViewedData?: boolean;
+            useContentAsIndexableText?: boolean;
+        }
+
+        export function patch(parameters: PatchParameters): HttpRequest<FileResource>;
+
+        interface CopyParameters {
+            fileId: string;
+            resource?: FileResource;
+            convert?: boolean;
+            ocr?: boolean;
+            ocrLanguage?: string;
+            pinned?: boolean;
+            supportsTeamDrives?: boolean;
+            timedTextLanguage?: string;
+            timedTextTrackName?: string;
+            visibility?: string;
+        }
+
+        export function copy(parameters: CopyParameters): HttpRequest<FileResource>;
+
+        interface ListParameters {
+            corpora?: string;
+            corpus?: string;
+            includeTeamDriveItems?: boolean;
+            maxResults: number;
+            orderBy?: string;
+            pageToken?: string;
+            projection?: string;
+            q?: string;
+            spaces?: string;
+            supportsTeamDrives?: boolean;
+            teamDriveId?: string;
+        }
+
+        export function list(parameters: ListParameters): HttpRequest<FileListResource>;
+
+        interface TouchParameters {
+            fileId: string;
+            supportsTeamDrives?: boolean;
+        }
+
+        export function touch(parameters: TouchParameters): HttpRequest<FileResource>;
+
+        interface TrashParameters {
+            fileId: string;
+            supportsTeamDrives?: boolean;
+        }
+
+        export function trash(parameters: TrashParameters): HttpRequest<FileResource>;
+
+        interface UntrashParameters {
+            fileId: string;
+            supportsTeamDrives?: boolean;
+        }
+
+        export function untrash(parameters: UntrashParameters): HttpRequest<FileResource>;
+
+        interface WatchParameters {
+            fileId: string;
+            resource?: WatchResource;
+            revisionId?: string;
+            supportsTeamDrives?: boolean;
+        }
+
+        export function watch(parameters: WatchParameters): HttpRequest<ChannelResource>;
+    }
+
+    export interface FileResource {
+        kind: 'drive#file';
+        id?: string;
+        // etag
+        selfLink?: string;
+        webContentLink?: string;
+        webViewLink?: string;
+        alternateLink?: string;
+        embedLink?: string;
+        // openWithLinks
+        defaultOpenWithLink?: string;
+        iconLink?: string;
+        hasThumbnail?: boolean;
+        thumbnailLink?: string;
+        thumbnail?: {
+            image: Uint8Array;
+            mimType: string;
+        };
+        title?: string;
+        mimeType?: string;
+        description?: string;
+        labels?: {
+            starred?: boolean;
+            hidden?: boolean;
+            trashed?: boolean;
+            restricted?: boolean;
+            viewed?: boolean;
+            modified?: boolean;
+        };
+        createdDate?: Date;
+        modifiedDate?: Date;
+        modifiedByMeDate?: Date;
+        lastViewedByMeDate?: Date;
+        markedViewedByMeDate?: Date;
+        sharedWithMeDate?: Date;
+        version?: number;
+        sharingUser?: {
+            kind: 'drive#user';
+            displayName?: string;
+            picture?: {
+                url: string;
+            };
+            isAuthenticatedUser?: boolean;
+            permissionId?: string;
+            emailAddress?: string;
+        };
+        parents?: ParentResource[];
+        downloadUrl?: string;
+        // exportLinks
+        indexableText?: {
+            text: string;
+        };
+        userPermission?: PermissionResource;
+        permissions?: PermissionResource[];
+        hasAugmentedPermissions?: boolean;
+        originalFilename?: string;
+        fileExtension?: string;
+        fullFileExtension?: string;
+        md5Checksum?: string;
+        fileSize?: number;
+        quotaBytesUsed?: number;
+        ownerNames?: string[];
+        owners?: {
+            kind: 'drive#user';
+            displayName?: string;
+            picture?: {
+                url: string;
+            };
+            isAuthenticatedUser?: boolean;
+            permissionId?: string;
+            emailAddress?: string;
+        }[];
+        teamDriveId?: string;
+        lastModifyingUserName?: string;
+        lastModifyingUser?: {
+            kind: 'drive#user';
+            displayName?: string;
+            picture?: {
+                url: string;
+            };
+            isAuthenticatedUser?: boolean;
+            permissionId?: string;
+            emailAddress?: string;
+        };
+        ownedByMe?: boolean;
+        capabilities?: {
+            canAddChildren?: boolean;
+            canChangeRestrictedDownload?: boolean;
+            canComment?: boolean;
+            canCopy?: boolean;
+            canDelete?: boolean;
+            canDownload?: boolean;
+            canEdit?: boolean;
+            canListChildren?: boolean;
+            canMoveItemIntoTeamDrive?: boolean;
+            canMoveTeamDriveItem?: boolean;
+            canReadRevisions?: boolean;
+            canReadTeamDrive?: boolean;
+            canRemoveChildren?: boolean;
+            canRename?: boolean;
+            canShare?: boolean;
+            canTrash?: boolean;
+            canUntrash?: boolean;
+        };
+        editable?: boolean;
+        canComment?: boolean;
+        canReadRevisions?: boolean;
+        shareable?: boolean;
+        copyable?: boolean;
+        writersCanShare?: boolean;
+        shared?: boolean;
+        explicitlyTrashed?: boolean;
+        trashingUser?: {
+            kind: 'drive#user';
+            displayName?: string;
+            picture?: {
+                url: string;
+            };
+            isAuthenticatedUser?: boolean;
+            permissionId?: string;
+            emailAddress?: string;
+        };
+        trashedDate?: Date;
+        appDataContents?: boolean;
+        headRevisionId?: string;
+        properties?: PropertiesResource[];
+        folderColorRgb?: string;
+        imageMediaMetadata?: {
+            width?: number;
+            height?: number;
+            rotation?: number;
+            location?: {
+                latitude?: number;
+                longitude?: number;
+                altitude?: number;
+            };
+            date?: string;
+            cameraMake?: string;
+            cameraModel?: string;
+            exposureTime?: number;
+            aperture?: number;
+            flashUsed?: boolean;
+            focalLength?: number;
+            isoSpeed?: number;
+            meteringMode?: string;
+            sensor?: string;
+            exposureMode?: string;
+            colorSpace?: string;
+            whiteBalance?: string;
+            exposureBias?: number;
+            maxApertureValue?: number;
+            subjectDistance?: number;
+            lens?: string;
+        };
+        videoMediaMetadata?: {
+            width?: number;
+            height?: number;
+            durationMillis?: number;
+        };
+        spaces?: string[];
+        isAppAuthorized?: boolean;
+    }
+
+    export interface FileListResource {
+        kind: 'drive#fileList';
+        // etag
+        selfLink?: string;
+        nextPageToken?: string;
+        nextLink?: string;
+        incompleteSearch?: boolean;
+        items: FileResource[];
+    }
+
+    export interface ParentResource {
+        kind: 'drive#parentReference';
+        id?: string;
+        selfLink?: string;
+        parentLink?: string;
+        isRoot?: boolean;
+    }
+
+    export interface PermissionResource {
+        kind: 'drive#permission';
+        // etag
+        id?: string;
+        selfLink?: string;
+        name?: string;
+        emailAddress?: string;
+        domain?: string;
+        role?: string;
+        additionalRoles?: string[];
+        type?: string;
+        value?: string;
+        authKey?: string;
+        withLink?: boolean;
+        photoLink?: string;
+        expirationDate?: Date;
+        teamDrivePermissionDetails?: {
+            teamDrivePermissionType?: string;
+            role?: string;
+            additionalRoles?: string[];
+            inheritedFrom?: string;
+            inherited?: boolean;
+        }[];
+        deleted?: boolean;
+    }
+
+    export interface PropertiesResource {
+        kind: 'drive$property';
+        // etag
+        selfLink?: string;
+        key?: string;
+        visibility?: string;
+        value?: string;
+    }
+
+    export interface WatchResource {
+        id?: string;
+        expiration?: number;
+        token?: string;
+        type?: string;
+        address?: string;
+    }
+
+    export interface ChannelResource {
+        kind: 'api#channel';
+        id?: string;
+        resourceId?: string;
+        resourceUri?: string;
+        token?: string;
+        expiration?: number;
+    }
+}
diff --git a/types/gapi.drive/tsconfig.json b/types/gapi.drive/tsconfig.json
new file mode 100644
index 0000000000..b66df1103c
--- /dev/null
+++ b/types/gapi.drive/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gapi.drive-tests.ts"
+    ]
+}
diff --git a/types/gapi.pagespeedonline/index.d.ts b/types/gapi.pagespeedonline/index.d.ts
index 2da0bdca15..f6a19ff6f6 100644
--- a/types/gapi.pagespeedonline/index.d.ts
+++ b/types/gapi.pagespeedonline/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/speed/pagespeed/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="gapi" />
 
diff --git a/types/gapi.people/index.d.ts b/types/gapi.people/index.d.ts
index 894dd8a0d1..851eab2c0b 100644
--- a/types/gapi.people/index.d.ts
+++ b/types/gapi.people/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/people/
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
@@ -117,7 +118,7 @@ declare namespace gapi.client.people {
     value: string;
     type: NicknameType;
   }
-  
+
   interface CoverPhoto {
     metadata: FieldMetadata;
     url: string;
diff --git a/types/gapi.plus/index.d.ts b/types/gapi.plus/index.d.ts
index 3e24b79ce1..62daa0cfee 100644
--- a/types/gapi.plus/index.d.ts
+++ b/types/gapi.plus/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/+/web/people/
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi.translate/index.d.ts b/types/gapi.translate/index.d.ts
index 66bb1719ae..cbf337589d 100644
--- a/types/gapi.translate/index.d.ts
+++ b/types/gapi.translate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/translate/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi.urlshortener/index.d.ts b/types/gapi.urlshortener/index.d.ts
index a7cdcb1364..f870da021f 100644
--- a/types/gapi.urlshortener/index.d.ts
+++ b/types/gapi.urlshortener/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/url-shortener/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi.youtube/index.d.ts b/types/gapi.youtube/index.d.ts
index 2bbacb9668..5f3aef616a 100644
--- a/types/gapi.youtube/index.d.ts
+++ b/types/gapi.youtube/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://developers.google.com/youtube/v3/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi.youtubeanalytics/index.d.ts b/types/gapi.youtubeanalytics/index.d.ts
index 6595cad721..3391aa1b32 100644
--- a/types/gapi.youtubeanalytics/index.d.ts
+++ b/types/gapi.youtubeanalytics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developers.google.com/youtube/analytics/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="gapi" />
 
diff --git a/types/gapi/index.d.ts b/types/gapi/index.d.ts
index 9af6258966..26202fe24e 100644
--- a/types/gapi/index.d.ts
+++ b/types/gapi/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://code.google.com/p/google-api-javascript-client/
 // Definitions by: Frank M <https://github.com/sgtfrankieboy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /**
  * The OAuth 2.0 token object represents the OAuth 2.0 token and any associated data.
@@ -237,17 +237,14 @@ declare namespace gapi.client {
     /**
      * HttpRequest supports promises.
      * See Google API Client JavaScript Using Promises https://developers.google.com/api-client-library/javascript/features/promises
-     *
-     * TODO This should be updated when TypeScript 2.3 is released
-     * See https://github.com/Microsoft/TypeScript/issues/12409
-     * See https://github.com/Microsoft/TypeScript/blob/65da012527937a3074c62655d60ee08fee809f7f/lib/lib.es5.d.ts#L1339
      */
      class HttpRequestPromise<T> {
-        then<TResult>(
-             opt_onFulfilled?: ((response: HttpRequestFulfilled<T>) => void) | null,
-             opt_onRejected?: ((reason: HttpRequestRejected) => void) | null,
-             opt_context?: any
-        ): Promise<TResult>;
+        // Taken and adapted from https://github.com/Microsoft/TypeScript/blob/v2.3.1/lib/lib.es5.d.ts#L1343
+        then<TResult1 = T, TResult2 = never>(
+            onfulfilled?: ((response: HttpRequestFulfilled<T>) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+            onrejected?: ((reason: HttpRequestRejected) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+            opt_context?: any
+        ): Promise<TResult1 | TResult2>;
     }
 
     /**
diff --git a/types/geokdbush/geokdbush-tests.ts b/types/geokdbush/geokdbush-tests.ts
new file mode 100644
index 0000000000..f2fa9d54c3
--- /dev/null
+++ b/types/geokdbush/geokdbush-tests.ts
@@ -0,0 +1,10 @@
+import * as kdbush from 'kdbush';
+import * as geokdbush from 'geokdbush';
+
+const points = [
+  {lon: 0, lat: 0},
+  {lon: 20, lat: 10},
+  {lon: -10, lat: 30},
+];
+const index = kdbush(points, p => p.lon, p => p.lat);
+const nearest = geokdbush.around(index, -119.7051, 34.4363, 1000);
diff --git a/types/geokdbush/index.d.ts b/types/geokdbush/index.d.ts
new file mode 100644
index 0000000000..4ece8ff98d
--- /dev/null
+++ b/types/geokdbush/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for geokdbush 1.1
+// Project: https://github.com/mourner/geokdbush
+// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import {KDBush} from 'kdbush';
+
+export function around<T>(
+  index: KDBush<T>,
+  longitude: number,
+  latitude: number,
+  maxResults?: number,
+  maxDistance?: number,
+  filterFn?: any): T[];
+
+export function distance(
+  longitude1: number,
+  latitude1: number,
+  longitude2: number,
+  latitude2: number): number;
diff --git a/types/geokdbush/tsconfig.json b/types/geokdbush/tsconfig.json
new file mode 100644
index 0000000000..9f00c027da
--- /dev/null
+++ b/types/geokdbush/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "geokdbush-tests.ts"
+    ]
+}
diff --git a/types/geokdbush/tslint.json b/types/geokdbush/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/geokdbush/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/geopattern/index.d.ts b/types/geopattern/index.d.ts
index edd08ad035..5756fbda93 100644
--- a/types/geopattern/index.d.ts
+++ b/types/geopattern/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/btmills/geopattern
 // Definitions by: Gaelan <https://github.com/Gaelan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <references types="jquery" />
 
diff --git a/types/get-stream/get-stream-tests.ts b/types/get-stream/get-stream-tests.ts
new file mode 100644
index 0000000000..065c0a3c97
--- /dev/null
+++ b/types/get-stream/get-stream-tests.ts
@@ -0,0 +1,12 @@
+import getStream = require("get-stream");
+
+import * as fs from 'fs';
+
+getStream(fs.createReadStream('foo'))
+    .then(str => str.toLowerCase());
+
+getStream.array<string>(fs.createReadStream('foo'))
+    .then(values => values.join(', '));
+
+getStream.buffer(fs.createReadStream('foo'))
+    .then(buffer => buffer.byteLength);
diff --git a/types/get-stream/index.d.ts b/types/get-stream/index.d.ts
new file mode 100644
index 0000000000..9dafe344ae
--- /dev/null
+++ b/types/get-stream/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for get-stream 3.0
+// Project: https://github.com/sindresorhus/get-stream#readme
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import {Stream} from 'stream';
+
+interface Options {
+    /**
+     * Encoding of the incoming stream.
+     * @default 'utf8'
+     */
+    encoding?: string;
+    /**
+     * Maximum length of the returned string. If it exceeds this value before
+     * the stream ends, the promise will be rejected.
+     * @default Infinity
+     */
+    maxBuffer?: number;
+}
+
+/**
+ * Get the stream as a string.
+ * The methods returns a promise that resolves when the end event fires on the
+ * stream, indicating that there is no more data to be read.
+ * The stream is switched to flowing mode.
+ */
+declare function getStrem(stream: Stream, options?: Options): Promise<string>;
+declare namespace getStrem {
+    /**
+     * Get the `stream` as an array of values.
+     *
+     * It honors both the `maxBuffer` and `encoding` options.
+     * The behavior changes slightly based on the encoding chosen:
+     *
+     * - When `encoding` is unset, it assumes an [object mode stream](https://nodesource.com/blog/understanding-object-streams/)
+     *   and collects values emitted from `stream` unmodified.
+     *   In this case `maxBuffer` refers to the number of items in the array
+     *   (not the sum of their sizes).
+     *
+     * - When `encoding` is set to `buffer`, it collects an array of buffers.
+     *   `maxBuffer` refers to the summed byte lengths of every buffer in the array.
+     *
+     * - When `encoding` is set to anything else, it collects an array of strings.
+     *   `maxBuffer` refers to the summed character lengths of every string in the array.
+     *
+     */
+    function array<T>(stream: Stream, options?: Options): Promise<T[]>;
+
+    /**
+     * Get the stream as a buffer.
+     *
+     * It honors the maxBuffer option as above, but it refers to byte length
+     * rather than string length.
+     */
+    function buffer(stream: Stream, options?: Options): Promise<Buffer>;
+}
+
+export = getStrem;
diff --git a/types/get-stream/tsconfig.json b/types/get-stream/tsconfig.json
new file mode 100644
index 0000000000..766ce0ae4a
--- /dev/null
+++ b/types/get-stream/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "get-stream-tests.ts"
+    ]
+}
diff --git a/types/get-stream/tslint.json b/types/get-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/get-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index 2f9604bbef..a76d98dd7f 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://gijgo.com
 // Definitions by: Atanas Atanasov <https://github.com/atatanasov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare module Gijgo {
 
diff --git a/types/giraffe/index.d.ts b/types/giraffe/index.d.ts
index f9198a7d8b..6b88b5d4b8 100644
--- a/types/giraffe/index.d.ts
+++ b/types/giraffe/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/barc/backbone.giraffe
 // Definitions by: Matt McCray <https://github.com/darthapo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="backbone" />
 /// <reference types="jquery" />
diff --git a/types/gldatepicker/index.d.ts b/types/gldatepicker/index.d.ts
index 1f96e15395..c5b881a0bb 100644
--- a/types/gldatepicker/index.d.ts
+++ b/types/gldatepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://glad.github.com/glDatePicker/
 // Definitions by: Dániel Tar <https://github.com/qcz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/glidejs/index.d.ts b/types/glidejs/index.d.ts
index 530cd41247..d6ceea389a 100644
--- a/types/glidejs/index.d.ts
+++ b/types/glidejs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://glide.jedrzejchalubek.com/
 // Definitions by: Milan Jaros <https://github.com/milanjaros/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface JQuery {
     /**
diff --git a/types/gm/gm-tests.ts b/types/gm/gm-tests.ts
index e8bf5787cd..50c124ffc5 100644
--- a/types/gm/gm-tests.ts
+++ b/types/gm/gm-tests.ts
@@ -346,3 +346,13 @@ var imageMagick = gm.subClass({ imageMagick: true });
 var readStream = imageMagick(src)
 	.adjoin()
 	.stream();
+
+var passStream = imageMagick(readStream).stream();
+
+var buffers: Buffer[] = [];
+var buffer: Buffer;
+passStream.on('data', (chunk) => buffers.push(chunk as Buffer)).on('close', () => {
+	buffer = Buffer.concat(buffers);
+	var readstream = imageMagick(buffer).stream();
+})
+
diff --git a/types/gm/index.d.ts b/types/gm/index.d.ts
index 7fd419ede3..8da081ffd5 100644
--- a/types/gm/index.d.ts
+++ b/types/gm/index.d.ts
@@ -615,6 +615,9 @@ declare namespace m {
 
     export interface SubClass {
         (image: string): State;
+        (stream: NodeJS.ReadableStream, image?: string): State;
+        (buffer: Buffer, image?: string): State;
+        (width: number, height: number, color?: string): State;
     }
 
     export function compare(filename1: string, filename2: string, callback: CompareCallback): void;
diff --git a/types/google-apps-script/google-apps-script-tests.ts b/types/google-apps-script/google-apps-script-tests.ts
index 5160a5fdae..17de10a2fc 100644
--- a/types/google-apps-script/google-apps-script-tests.ts
+++ b/types/google-apps-script/google-apps-script-tests.ts
@@ -25,3 +25,9 @@ function createAndSendDocument() {
   // Send yourself an email with a link to the document.
   GmailApp.sendEmail(email, subject, body);
 }
+
+// Regression
+
+ScriptApp.getService().getUrl();
+
+CalendarApp.GuestStatus.NO;
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 538883cb19..82f92078dd 100644
--- a/types/google-apps-script/google-apps-script.base.d.ts
+++ b/types/google-apps-script/google-apps-script.base.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Base {
@@ -58,6 +58,8 @@ declare namespace GoogleAppsScript {
      *
      * JdbcClobA JDBC Clob.
      *
+     * PositionedImageFixed position image anchored to a Paragraph.
+     *
      * SpreadsheetThis class allows users to access and modify Google Sheets files.
      *
      * StaticMapAllows for the creation and decoration of static map images.
@@ -68,7 +70,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * This class provides access to Google Apps specific dialog boxes.
+     * This class provides access to G Suite specific dialog boxes.
      *
      *  The methods in this class are only available for use in the context of a Google Spreadsheet.
      * See also
@@ -76,7 +78,7 @@ declare namespace GoogleAppsScript {
      * ButtonSet
      */
     export interface Browser {
-      Buttons: ButtonSet
+      Buttons: typeof ButtonSet;
       inputBox(prompt: string): string;
       inputBox(prompt: string, buttons: ButtonSet): string;
       inputBox(title: string, prompt: string, buttons: ButtonSet): string;
@@ -219,6 +221,7 @@ declare namespace GoogleAppsScript {
       getActiveUserLocale(): string;
       getEffectiveUser(): User;
       getScriptTimeZone(): string;
+      getTemporaryActiveUserKey(): string;
       getTimeZone(): string;
       getUser(): User;
     }
@@ -244,8 +247,8 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface Ui {
-      Button: Button
-      ButtonSet: ButtonSet
+      Button: typeof Button;
+      ButtonSet: typeof ButtonSet;
       alert(prompt: string): Button;
       alert(prompt: string, buttons: ButtonSet): Button;
       alert(title: string, prompt: string, buttons: ButtonSet): Button;
diff --git a/types/google-apps-script/google-apps-script.cache.d.ts b/types/google-apps-script/google-apps-script.cache.d.ts
index bdeee152ba..c0cf592b43 100644
--- a/types/google-apps-script/google-apps-script.cache.d.ts
+++ b/types/google-apps-script/google-apps-script.cache.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Cache {
@@ -16,7 +16,7 @@ declare namespace GoogleAppsScript {
      *  to speed up access on an average request.
      *
      *      function getRssFeed() {
-     *        var cache = CacheService.getPublicCache();
+     *        var cache = CacheService.getScriptCache();
      *        var cached = cache.get("rss-feed-contents");
      *        if (cached != null) {
      *          return cached;
diff --git a/types/google-apps-script/google-apps-script.calendar.d.ts b/types/google-apps-script/google-apps-script.calendar.d.ts
index c217e67a07..d94ec25ad3 100644
--- a/types/google-apps-script/google-apps-script.calendar.d.ts
+++ b/types/google-apps-script/google-apps-script.calendar.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Calendar {
@@ -51,11 +51,12 @@ declare namespace GoogleAppsScript {
      *  that the user owns or is subscribed to.
      */
     export interface CalendarApp {
-      Color: Color
-      GuestStatus: GuestStatus
-      Month: Base.Month
-      Visibility: Visibility
-      Weekday: Base.Weekday
+      Color: typeof Color;
+      EventColor: typeof EventColor;
+      GuestStatus: typeof GuestStatus;
+      Month: typeof Base.Month;
+      Visibility: typeof Visibility;
+      Weekday: typeof Base.Weekday;
       createAllDayEvent(title: string, date: Date): CalendarEvent;
       createAllDayEvent(title: string, date: Date, options: Object): CalendarEvent;
       createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence): CalendarEventSeries;
@@ -113,6 +114,7 @@ declare namespace GoogleAppsScript {
       getAllDayEndDate(): Date;
       getAllDayStartDate(): Date;
       getAllTagKeys(): String[];
+      getColor(): string;
       getCreators(): String[];
       getDateCreated(): Date;
       getDescription(): string;
@@ -144,6 +146,7 @@ declare namespace GoogleAppsScript {
       resetRemindersToDefault(): CalendarEvent;
       setAllDayDate(date: Date): CalendarEvent;
       setAnyoneCanAddSelf(anyoneCanAddSelf: boolean): CalendarEvent;
+      setColor(color: string): CalendarEvent;
       setDescription(description: string): CalendarEvent;
       setGuestsCanInviteOthers(guestsCanInviteOthers: boolean): CalendarEvent;
       setGuestsCanModify(guestsCanModify: boolean): CalendarEvent;
@@ -168,6 +171,7 @@ declare namespace GoogleAppsScript {
       deleteEventSeries(): void;
       deleteTag(key: string): CalendarEventSeries;
       getAllTagKeys(): String[];
+      getColor(): string;
       getCreators(): String[];
       getDateCreated(): Date;
       getDescription(): string;
@@ -193,6 +197,7 @@ declare namespace GoogleAppsScript {
       removeGuest(email: string): CalendarEventSeries;
       resetRemindersToDefault(): CalendarEventSeries;
       setAnyoneCanAddSelf(anyoneCanAddSelf: boolean): CalendarEventSeries;
+      setColor(color: string): CalendarEventSeries;
       setDescription(description: string): CalendarEventSeries;
       setGuestsCanInviteOthers(guestsCanInviteOthers: boolean): CalendarEventSeries;
       setGuestsCanModify(guestsCanModify: boolean): CalendarEventSeries;
@@ -211,6 +216,11 @@ declare namespace GoogleAppsScript {
      */
     export enum Color { BLUE, BROWN, CHARCOAL, CHESTNUT, GRAY, GREEN, INDIGO, LIME, MUSTARD, OLIVE, ORANGE, PINK, PLUM, PURPLE, RED, RED_ORANGE, SEA_BLUE, SLATE, TEAL, TURQOISE, YELLOW }
 
+    /**
+     * An enum representing the named event colors available in the Calendar service.
+     */
+    export enum EventColor { PALE_BLUE, PALE_GREEN, MAUVE, PALE_RED, YELLOW, ORANGE, CYAN, GRAY, BLUE, GREEN, RED }
+
     /**
      * Represents a guest of an event.
      */
diff --git a/types/google-apps-script/google-apps-script.charts.d.ts b/types/google-apps-script/google-apps-script.charts.d.ts
index 2e1b65290a..de6de7b767 100644
--- a/types/google-apps-script/google-apps-script.charts.d.ts
+++ b/types/google-apps-script/google-apps-script.charts.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.ui.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Charts {
@@ -232,7 +232,7 @@ declare namespace GoogleAppsScript {
     /**
      * Chart types supported by the Charts service.
      */
-    export enum ChartType { AREA, BAR, COLUMN, LINE, PIE, SCATTER, TABLE }
+    export enum ChartType { AREA, BAR, COLUMN, COMBO, HISTOGRAM, LINE, PIE, SCATTER, TABLE }
 
     /**
      * Entry point for creating Charts in scripts.
@@ -265,14 +265,14 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface Charts {
-      ChartType: ChartType
-      ColumnType: ColumnType
-      CurveStyle: CurveStyle
-      MatchType: MatchType
-      Orientation: Orientation
-      PickerValuesLayout: PickerValuesLayout
-      PointStyle: PointStyle
-      Position: Position
+      ChartType: typeof ChartType;
+      ColumnType: typeof ColumnType;
+      CurveStyle: typeof CurveStyle;
+      MatchType: typeof MatchType;
+      Orientation: typeof Orientation;
+      PickerValuesLayout: typeof PickerValuesLayout;
+      PointStyle: typeof PointStyle;
+      Position: typeof Position;
       newAreaChart(): AreaChartBuilder;
       newBarChart(): BarChartBuilder;
       newCategoryFilter(): CategoryFilterBuilder;
@@ -446,10 +446,10 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface DashboardPanel {
-      add(widget: UI.Widget): DashboardPanel;
       getId(): string;
       getType(): string;
       setId(id: string): DashboardPanel;
+      add(widget: UI.Widget): DashboardPanel;
     }
 
     /**
diff --git a/types/google-apps-script/google-apps-script.contacts.d.ts b/types/google-apps-script/google-apps-script.contacts.d.ts
index 389951d563..46337d87d5 100644
--- a/types/google-apps-script/google-apps-script.contacts.d.ts
+++ b/types/google-apps-script/google-apps-script.contacts.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Contacts {
@@ -136,12 +136,12 @@ declare namespace GoogleAppsScript {
      *  contacts listed therein.
      */
     export interface ContactsApp {
-      ExtendedField: ExtendedField
-      Field: Field
-      Gender: Gender
-      Month: Base.Month
-      Priority: Priority
-      Sensitivity: Sensitivity
+      ExtendedField: typeof ExtendedField;
+      Field: typeof Field;
+      Gender: typeof Gender;
+      Month: typeof Base.Month;
+      Priority: typeof Priority;
+      Sensitivity: typeof Sensitivity;
       createContact(givenName: string, familyName: string, email: string): Contact;
       createContactGroup(name: string): ContactGroup;
       deleteContact(contact: Contact): void;
@@ -197,6 +197,11 @@ declare namespace GoogleAppsScript {
 
     /**
      * A date field in a Contact.
+     *
+     * This class is only used by the Contacts service, and dates used elsewhere in App Script use
+     *  JavaScript's standard
+     *
+     *  Date object.
      */
     export interface DateField {
       deleteDateField(): void;
diff --git a/types/google-apps-script/google-apps-script.content.d.ts b/types/google-apps-script/google-apps-script.content.d.ts
index afd34deca1..eaa3057a49 100644
--- a/types/google-apps-script/google-apps-script.content.d.ts
+++ b/types/google-apps-script/google-apps-script.content.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Content {
@@ -17,7 +17,7 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface ContentService {
-      MimeType: MimeType
+      MimeType: typeof MimeType;
       createTextOutput(): TextOutput;
       createTextOutput(content: string): TextOutput;
     }
@@ -37,7 +37,7 @@ declare namespace GoogleAppsScript {
      *  You can return text content like this:
      *
      *      function doGet() {
-     *        return ContentService.createPlainTextOutput("hello world!");
+     *        return ContentService.createTextOutput("hello world!");
      *      }
      *
      * ContentService
diff --git a/types/google-apps-script/google-apps-script.document.d.ts b/types/google-apps-script/google-apps-script.document.d.ts
index 7477261602..bee604636a 100644
--- a/types/google-apps-script/google-apps-script.document.d.ts
+++ b/types/google-apps-script/google-apps-script.document.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Document {
@@ -64,6 +64,7 @@ declare namespace GoogleAppsScript {
       getAttributes(): Object;
       getChild(childIndex: Integer): Element;
       getChildIndex(child: Element): Integer;
+      getHeadingAttributes(paragraphHeading: ParagraphHeading): Object;
       getImages(): InlineImage[];
       getListItems(): ListItem[];
       getMarginBottom(): Number;
@@ -94,6 +95,7 @@ declare namespace GoogleAppsScript {
       removeChild(child: Element): Body;
       replaceText(searchPattern: string, replacement: string): Element;
       setAttributes(attributes: Object): Body;
+      setHeadingAttributes(paragraphHeading: ParagraphHeading, attributes: Object): Body;
       setMarginBottom(marginBottom: Number): Body;
       setMarginLeft(marginLeft: Number): Body;
       setMarginRight(marginRight: Number): Body;
@@ -230,14 +232,15 @@ declare namespace GoogleAppsScript {
      *      doc = DocumentApp.create('Document Name');
      */
     export interface DocumentApp {
-      Attribute: Attribute
-      ElementType: ElementType
-      FontFamily: FontFamily
-      GlyphType: GlyphType
-      HorizontalAlignment: HorizontalAlignment
-      ParagraphHeading: ParagraphHeading
-      TextAlignment: TextAlignment
-      VerticalAlignment: VerticalAlignment
+      Attribute: typeof Attribute;
+      ElementType: typeof ElementType;
+      FontFamily: typeof FontFamily;
+      GlyphType: typeof GlyphType;
+      HorizontalAlignment: typeof HorizontalAlignment;
+      ParagraphHeading: typeof ParagraphHeading;
+      PositionedLayout: typeof PositionedLayout;
+      TextAlignment: typeof TextAlignment;
+      VerticalAlignment: typeof VerticalAlignment;
       create(name: string): Document;
       getActiveDocument(): Document;
       getUi(): Base.Ui;
@@ -737,6 +740,8 @@ declare namespace GoogleAppsScript {
      */
     export interface InlineDrawing {
       copy(): InlineDrawing;
+      getAltDescription(): string;
+      getAltTitle(): string;
       getAttributes(): Object;
       getNextSibling(): Element;
       getParent(): ContainerElement;
@@ -745,6 +750,8 @@ declare namespace GoogleAppsScript {
       isAtDocumentEnd(): boolean;
       merge(): InlineDrawing;
       removeFromParent(): InlineDrawing;
+      setAltDescription(description: string): InlineDrawing;
+      setAltTitle(title: string): InlineDrawing;
       setAttributes(attributes: Object): InlineDrawing;
     }
 
@@ -757,6 +764,8 @@ declare namespace GoogleAppsScript {
      */
     export interface InlineImage {
       copy(): InlineImage;
+      getAltDescription(): string;
+      getAltTitle(): string;
       getAs(contentType: string): Base.Blob;
       getAttributes(): Object;
       getBlob(): Base.Blob;
@@ -770,6 +779,8 @@ declare namespace GoogleAppsScript {
       isAtDocumentEnd(): boolean;
       merge(): InlineImage;
       removeFromParent(): InlineImage;
+      setAltDescription(description: string): InlineImage;
+      setAltTitle(title: string): InlineImage;
       setAttributes(attributes: Object): InlineImage;
       setHeight(height: Integer): InlineImage;
       setLinkUrl(url: string): InlineImage;
@@ -810,6 +821,7 @@ declare namespace GoogleAppsScript {
      *      item2.setListId(item1);
      */
     export interface ListItem {
+      addPositionedImage(image: Base.BlobSource): PositionedImage;
       appendHorizontalRule(): HorizontalRule;
       appendInlineImage(image: Base.BlobSource): InlineImage;
       appendInlineImage(image: InlineImage): InlineImage;
@@ -840,6 +852,8 @@ declare namespace GoogleAppsScript {
       getNextSibling(): Element;
       getNumChildren(): Integer;
       getParent(): ContainerElement;
+      getPositionedImage(id: string): PositionedImage;
+      getPositionedImages(): PositionedImage[];
       getPreviousSibling(): Element;
       getSpacingAfter(): Number;
       getSpacingBefore(): Number;
@@ -858,6 +872,7 @@ declare namespace GoogleAppsScript {
       merge(): ListItem;
       removeChild(child: Element): ListItem;
       removeFromParent(): ListItem;
+      removePositionedImage(id: string): boolean;
       replaceText(searchPattern: string, replacement: string): Element;
       setAlignment(alignment: HorizontalAlignment): ListItem;
       setAttributes(attributes: Object): ListItem;
@@ -945,6 +960,7 @@ declare namespace GoogleAppsScript {
      *      body.appendParagraph("This is a typical paragraph.");
      */
     export interface Paragraph {
+      addPositionedImage(image: Base.BlobSource): PositionedImage;
       appendHorizontalRule(): HorizontalRule;
       appendInlineImage(image: Base.BlobSource): InlineImage;
       appendInlineImage(image: InlineImage): InlineImage;
@@ -972,6 +988,8 @@ declare namespace GoogleAppsScript {
       getNextSibling(): Element;
       getNumChildren(): Integer;
       getParent(): ContainerElement;
+      getPositionedImage(id: string): PositionedImage;
+      getPositionedImages(): PositionedImage[];
       getPreviousSibling(): Element;
       getSpacingAfter(): Number;
       getSpacingBefore(): Number;
@@ -990,6 +1008,7 @@ declare namespace GoogleAppsScript {
       merge(): Paragraph;
       removeChild(child: Element): Paragraph;
       removeFromParent(): Paragraph;
+      removePositionedImage(id: string): boolean;
       replaceText(searchPattern: string, replacement: string): Element;
       setAlignment(alignment: HorizontalAlignment): Paragraph;
       setAttributes(attributes: Object): Paragraph;
@@ -1059,6 +1078,54 @@ declare namespace GoogleAppsScript {
       insertText(text: string): Text;
     }
 
+    /**
+     * Fixed position image anchored to a Paragraph.
+     *  Unlike an InlineImage,
+     *  a PositionedImage is not an
+     *  Element.
+     *  It does not have a parent or sibling
+     *  Element.
+     *  Instead, it is anchored to a Paragraph
+     *  or ListItem,
+     *  and is placed via offsets from that anchor. A PositionedImage
+     *  has an ID that can be used to reference it.
+     *
+     *      var body = DocumentApp.getActiveDocument().getBody();
+     *
+     *      // Append a new paragraph.
+     *      var paragraph = body.appendParagraph("New paragraph to anchor the image to.");
+     *
+     *      // Get an image in Drive from its ID.
+     *      var image = DriveApp.getFileById('ENTER_IMAGE_FILE_ID_HERE').getBlob();
+     *
+     *      // Add the PositionedImage with offsets (in points).
+     *      var posImage = paragraph.addPositionedImage(image)
+     *          .setTopOffset(60)
+     *          .setLeftOffset(40);
+     */
+    export interface PositionedImage {
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
+      getHeight(): Integer;
+      getId(): string;
+      getLayout(): PositionedLayout;
+      getLeftOffset(): Number;
+      getParagraph(): Paragraph;
+      getTopOffset(): Number;
+      getWidth(): Integer;
+      setHeight(height: Integer): PositionedImage;
+      setLayout(layout: PositionedLayout): PositionedImage;
+      setLeftOffset(offset: Number): PositionedImage;
+      setTopOffset(offset: Number): PositionedImage;
+      setWidth(width: Integer): PositionedImage;
+    }
+
+    /**
+     * An enumeration that specifies how to lay out a PositionedImage in
+     *  relation to surrounding text.
+     */
+    export enum PositionedLayout { ABOVE_TEXT, BREAK_BOTH, BREAK_LEFT, BREAK_RIGHT, WRAP_TEXT }
+
     /**
      * A range of elements in a document. The user's selection is represented as a
      *  Range, among other uses. Scripts can only access the selection of the user who is running
@@ -1215,6 +1282,7 @@ declare namespace GoogleAppsScript {
       getBackgroundColor(): string;
       getChild(childIndex: Integer): Element;
       getChildIndex(child: Element): Integer;
+      getColSpan(): Integer;
       getLinkUrl(): string;
       getNextSibling(): Element;
       getNumChildren(): Integer;
@@ -1226,6 +1294,7 @@ declare namespace GoogleAppsScript {
       getParentRow(): TableRow;
       getParentTable(): Table;
       getPreviousSibling(): Element;
+      getRowSpan(): Integer;
       getText(): string;
       getTextAlignment(): TextAlignment;
       getType(): ElementType;
diff --git a/types/google-apps-script/google-apps-script.drive.d.ts b/types/google-apps-script/google-apps-script.drive.d.ts
index d0fba208f8..36693eaf9f 100644
--- a/types/google-apps-script/google-apps-script.drive.d.ts
+++ b/types/google-apps-script/google-apps-script.drive.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Drive {
@@ -14,8 +14,7 @@ declare namespace GoogleAppsScript {
      *  DriveApp.Access.
      *
      *      // Creates a folder that anyone on the Internet can read from and write to. (Domain
-     *      // administrators can prohibit this setting for users of Google Apps for Business, Google Apps
-     *      // for Education, or Google Apps for Your Domain.)
+     *      // administrators can prohibit this setting for users of a G Suite domain.)
      *      var folder = DriveApp.createFolder('Shared Folder');
      *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
      */
@@ -32,8 +31,8 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface DriveApp {
-      Access: Access
-      Permission: Permission
+      Access: typeof Access;
+      Permission: typeof Permission;
       addFile(child: File): Folder;
       addFolder(child: Folder): Folder;
       continueFileIterator(continuationToken: string): FileIterator;
@@ -234,12 +233,11 @@ declare namespace GoogleAppsScript {
      *  DriveApp.Permission.
      *
      *      // Creates a folder that anyone on the Internet can read from and write to. (Domain
-     *      // administrators can prohibit this setting for users of Google Apps for Business, Google Apps
-     *      // for Education, or Google Apps for Your Domain.)
+     *      // administrators can prohibit this setting for users of a G Suite domain.)
      *      var folder = DriveApp.createFolder('Shared Folder');
      *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
      */
-    export enum Permission { VIEW, EDIT, COMMENT, OWNER, NONE }
+    export enum Permission { VIEW, EDIT, COMMENT, OWNER, ORGANIZER, NONE }
 
     /**
      * A user associated with a file in Google Drive. Users can be accessed from
diff --git a/types/google-apps-script/google-apps-script.forms.d.ts b/types/google-apps-script/google-apps-script.forms.d.ts
index 3ce3e41672..e10c47b169 100644
--- a/types/google-apps-script/google-apps-script.forms.d.ts
+++ b/types/google-apps-script/google-apps-script.forms.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Forms {
@@ -22,8 +22,9 @@ declare namespace GoogleAppsScript {
     export enum Alignment { LEFT, CENTER, RIGHT }
 
     /**
-     * A question item that allows the respondent to select one or more checkboxes, as well as an
-     *  optional "other" field. Items can be accessed or created from a Form.
+     * A question item that allows the respondent to select one or more checkboxes, as well
+     *  as an optional "other" field. Items can be accessed or created from a Form. When used in
+     *  a quiz, these items are autograded.
      *
      *      // Open a form by ID and add a new checkbox item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -37,25 +38,81 @@ declare namespace GoogleAppsScript {
      *          .showOtherOption(true);
      */
     export interface CheckboxItem {
+      clearValidation(): CheckboxItem;
       createChoice(value: string): Choice;
+      createChoice(value: string, isCorrect: boolean): Choice;
       createResponse(responses: String[]): ItemResponse;
       duplicate(): CheckboxItem;
       getChoices(): Choice[];
+      getFeedbackForCorrect(): QuizFeedback;
+      getFeedbackForIncorrect(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       hasOtherOption(): boolean;
       isRequired(): boolean;
       setChoiceValues(values: String[]): CheckboxItem;
       setChoices(choices: Choice[]): CheckboxItem;
+      setFeedbackForCorrect(feedback: QuizFeedback): CheckboxItem;
+      setFeedbackForIncorrect(feedback: QuizFeedback): CheckboxItem;
       setHelpText(text: string): CheckboxItem;
+      setPoints(points: Integer): CheckboxItem;
       setRequired(enabled: boolean): CheckboxItem;
       setTitle(title: string): CheckboxItem;
+      setValidation(validation: CheckboxValidation): CheckboxItem;
       showOtherOption(enabled: boolean): CheckboxItem;
     }
 
+    /**
+     * A DataValidation for a CheckboxItem.
+     *
+     *      // Add a checkBox item to a form and require exactly two selections.
+     *      var checkBoxItem = form.addCheckboxItem();
+     *      checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
+     *      checkBoxItem.setChoices([
+     *        checkBoxItem.createChoice('Ketchup'),
+     *        checkBoxItem.createChoice('Mustard'),
+     *        checkBoxItem.createChoice('Relish')
+     *      ]);
+     *      var checkBoxValidation = FormApp.createCheckboxValidation()
+     *        .setHelpText(“Select two condiments.”)
+     *        .requireSelectExactly(2)
+     *        .build();
+     *      checkBoxItem.setValidation(checkBoxValidation);
+     */
+    export interface CheckboxValidation {
+      getHelpText(): string;
+    }
+
+    /**
+     * A DataValidationBuilder for a CheckboxValidation.
+     *
+     *      // Add a checkBox item to a form and require exactly two selections.
+     *      var checkBoxItem = form.addCheckboxItem();
+     *      checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
+     *      checkBoxItem.setChoices([
+     *        checkBoxItem.createChoice('Ketchup'),
+     *        checkBoxItem.createChoice('Mustard'),
+     *        checkBoxItem.createChoice('Relish')
+     *      ]);
+     *      var checkBoxValidation = FormApp.createCheckboxValidation()
+     *        .setHelpText(“Select two condiments.”)
+     *        .requireSelectExactly(2)
+     *        .build();
+     *      checkBoxItem.setValidation(checkBoxValidation);
+     */
+    export interface CheckboxValidationBuilder {
+      build(): CheckboxValidation;
+      copy(): CheckboxValidationBuilder;
+      requireSelectAtLeast(number: Integer): CheckboxValidationBuilder;
+      requireSelectAtMost(number: Integer): CheckboxValidationBuilder;
+      requireSelectExactly(number: Integer): CheckboxValidationBuilder;
+      setHelpText(text: string): CheckboxValidationBuilder;
+    }
+
     /**
      * A single choice associated with a type of Item that supports choices, like
      *  CheckboxItem, ListItem, or MultipleChoiceItem.
@@ -84,11 +141,45 @@ declare namespace GoogleAppsScript {
       getGotoPage(): PageBreakItem;
       getPageNavigationType(): PageNavigationType;
       getValue(): string;
+      isCorrectAnswer(): boolean;
     }
 
     /**
-     * A question item that allows the respondent to indicate a date. Items can be accessed or created
-     *  from a Form.
+     * The base DataValidation that contains properties common to all validations, such as help text.
+     *  Validations can be added to certain Form items.
+     *
+     *      // Add a text item to a form and require it to be a number within a range.
+     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *      var textValidation = FormApp.createTextValidation()
+     *        .setHelpText(“Input was not a number between 1 and 100.”)
+     *        .requireNumberBetween(1, 100);
+     *      textItem.setValidation(textValidation);
+     */
+    export interface DataValidation {
+      getHelpText(): string;
+    }
+
+    /**
+     * The base DataValidationBuilder that contains setters for properties common to all validations,
+     *  such as help text. Used to build DataValadation objects.
+     *
+     *      // Add a text item to a form and require it to be a number within a range.
+     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *      var textValidation = FormApp.createTextValidation()
+     *        .setHelpText(“Input was not a number between 1 and 100.”)
+     *        .requireNumberBetween(1, 100)
+     *        .build();
+     *      textItem.setValidation(textValidation);
+     */
+    export interface DataValidationBuilder {
+      build(): DataValidation;
+      copy(): DataValidationBuilder;
+      setHelpText(text: string): DataValidationBuilder;
+    }
+
+    /**
+     * A question item that allows the respondent to indicate a date. Items can be accessed or
+     *  created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new date item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -98,22 +189,26 @@ declare namespace GoogleAppsScript {
     export interface DateItem {
       createResponse(response: Date): ItemResponse;
       duplicate(): DateItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       includesYear(): boolean;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): DateItem;
       setHelpText(text: string): DateItem;
       setIncludesYear(enableYear: boolean): DateItem;
+      setPoints(points: Integer): DateItem;
       setRequired(enabled: boolean): DateItem;
       setTitle(title: string): DateItem;
     }
 
     /**
-     * A question item that allows the respondent to indicate a date and time. Items can be accessed or
-     *  created from a Form.
+     * A question item that allows the respondent to indicate a date and time. Items can be
+     *  accessed or created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new date-time item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -123,15 +218,19 @@ declare namespace GoogleAppsScript {
     export interface DateTimeItem {
       createResponse(response: Date): ItemResponse;
       duplicate(): DateTimeItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       includesYear(): boolean;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): DateTimeItem;
       setHelpText(text: string): DateTimeItem;
       setIncludesYear(enableYear: boolean): DateTimeItem;
+      setPoints(points: Integer): DateTimeItem;
       setRequired(enabled: boolean): DateTimeItem;
       setTitle(title: string): DateTimeItem;
     }
@@ -153,8 +252,8 @@ declare namespace GoogleAppsScript {
     export enum DestinationType { SPREADSHEET }
 
     /**
-     * A question item that allows the respondent to indicate a length of time. Items can be accessed or
-     *  created from a Form.
+     * A question item that allows the respondent to indicate a length of time. Items can be
+     *  accessed or created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new duration item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -164,21 +263,44 @@ declare namespace GoogleAppsScript {
     export interface DurationItem {
       createResponse(hours: Integer, minutes: Integer, seconds: Integer): ItemResponse;
       duplicate(): DurationItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): DurationItem;
       setHelpText(text: string): DurationItem;
+      setPoints(points: Integer): DurationItem;
       setRequired(enabled: boolean): DurationItem;
       setTitle(title: string): DurationItem;
     }
 
     /**
-     * A form that contains overall properties (such as title, settings, and where responses are stored)
-     *  and items (which includes question items like checkboxes and layout items like page breaks).
-     *  Forms can be accessed or created from FormApp.
+     * An enum representing the supported types of feedback. Feedback types can be accessed from
+     *  FormApp.FeedbackType.
+     *
+     *      // Open a form by ID and add a new list item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addListItem();
+     *      item.setTitle('Do you prefer cats or dogs?');
+     *      // Set "Dogs" as the correct answer to this question.
+     *      item.setChoices([
+     *        item.createChoice('Dogs', true),
+     *        item.createChoice('Cats', false)]);
+     *      // Add feedback which will be shown for correct responses; ie "Dogs".
+     *      item.setFeedbackForCorrect(
+     *          FormApp.createFeedback().setDisplayText("Dogs rule, cats drool.").build());
+     */
+    export enum FeedbackType { CORRECT, INCORRECT, GENERAL }
+
+    /**
+     * A form that contains overall properties and items.  Properties include title, settings, and
+     *  where responses are stored.  Items include question items like checkboxes or radio items, while
+     *  layout items refer to things like page breaks. Forms can be accessed or created from
+     *  FormApp.
      *
      *      // Open a form by ID and create a new spreadsheet.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -242,6 +364,7 @@ declare namespace GoogleAppsScript {
       hasRespondAgainLink(): boolean;
       isAcceptingResponses(): boolean;
       isPublishingSummary(): boolean;
+      isQuiz(): boolean;
       moveItem(from: Integer, to: Integer): Item;
       moveItem(item: Item, toIndex: Integer): Item;
       removeDestination(): Form;
@@ -255,6 +378,7 @@ declare namespace GoogleAppsScript {
       setCustomClosedFormMessage(message: string): Form;
       setDescription(description: string): Form;
       setDestination(type: DestinationType, id: string): Form;
+      setIsQuiz(enabled: boolean): Form;
       setLimitOneResponsePerUser(enabled: boolean): Form;
       setProgressBar(enabled: boolean): Form;
       setPublishingSummary(enabled: boolean): Form;
@@ -263,10 +387,11 @@ declare namespace GoogleAppsScript {
       setShuffleQuestions(shuffle: boolean): Form;
       setTitle(title: string): Form;
       shortenFormUrl(url: string): string;
+      submitGrades(responses: FormResponse[]): Form;
     }
 
     /**
-     * Allows a script to open existing Forms or create new ones.
+     * Allows a script to open an existing Form or create a new one.
      *
      *      // Open a form by ID.
      *      var existingForm = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -275,11 +400,17 @@ declare namespace GoogleAppsScript {
      *      var newForm = FormApp.create('Form Name');
      */
     export interface FormApp {
-      Alignment: Alignment
-      DestinationType: DestinationType
-      ItemType: ItemType
-      PageNavigationType: PageNavigationType
+      Alignment: typeof Alignment;
+      DestinationType: typeof DestinationType;
+      FeedbackType: typeof FeedbackType;
+      ItemType: typeof ItemType;
+      PageNavigationType: typeof PageNavigationType;
       create(title: string): Form;
+      createCheckboxValidation(): CheckboxValidationBuilder;
+      createFeedback(): QuizFeedbackBuilder;
+      createGridValidation(): GridValidationBuilder;
+      createParagraphTextValidation(): ParagraphTextValidationBuilder;
+      createTextValidation(): TextValidationBuilder;
       getActiveForm(): Form;
       getUi(): Base.Ui;
       openById(id: string): Form;
@@ -287,11 +418,11 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A response to the form as a whole. Form responses have three main uses: they contain the answers
-     *  submitted by a respondent (see getItemResponses(), they can be used to programmatically
-     *  respond to the form (see withItemResponse(response) and submit()), and they
-     *  can be used as a template to create a URL for the form with pre-filled answers. Form responses
-     *  can be created or accessed from a Form.
+     * A response to the form as a whole. A FormResponse can be used in three ways: to
+     *  access the answers submitted by a respondent (see getItemResponses()), to
+     *  programmatically submit a response to the form (see withItemResponse(response) and
+     *  submit()), and to generate a URL for the form which pre-fills fields using the
+     *  provided answers. FormResponses can be created or accessed from a Form.
      *
      *      // Open a form by ID and log the responses to each question.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -310,6 +441,8 @@ declare namespace GoogleAppsScript {
      */
     export interface FormResponse {
       getEditResponseUrl(): string;
+      getGradableItemResponses(): ItemResponse[];
+      getGradableResponseForItem(item: Item): ItemResponse;
       getId(): string;
       getItemResponses(): ItemResponse[];
       getRespondentEmail(): string;
@@ -317,13 +450,14 @@ declare namespace GoogleAppsScript {
       getTimestamp(): Date;
       submit(): FormResponse;
       toPrefilledUrl(): string;
+      withItemGrade(gradedResponse: ItemResponse): FormResponse;
       withItemResponse(response: ItemResponse): FormResponse;
     }
 
     /**
      * A question item, presented as a grid of columns and rows, that allows the respondent to select
      *  one choice per row from a sequence of radio buttons. Items can be accessed or created from a
-     *  Form.
+     *   Form.
      *
      *      // Open a form by ID and add a new grid item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -333,6 +467,7 @@ declare namespace GoogleAppsScript {
      *          .setColumns(['Boring', 'So-so', 'Interesting']);
      */
     export interface GridItem {
+      clearValidation(): GridItem;
       createResponse(responses: String[]): ItemResponse;
       duplicate(): GridItem;
       getColumns(): String[];
@@ -348,6 +483,46 @@ declare namespace GoogleAppsScript {
       setRequired(enabled: boolean): GridItem;
       setRows(rows: String[]): GridItem;
       setTitle(title: string): GridItem;
+      setValidation(validation: GridValidation): GridItem;
+    }
+
+    /**
+     * A DataValidation for a GridItem.
+     *
+     *      // Add a grid item to a form and require one response per column.
+     *      var gridItem = form.addGridItem();
+     *      gridItem.setTitle('Rate your interests')
+     *        .setRows(['Cars', 'Computers', 'Celebrities'])
+     *        .setColumns(['Boring', 'So-so', 'Interesting']);
+     *      var gridValidation = FormApp.createGridValidation()
+     *        .setHelpText(“Select one item per column.”)
+     *        .requireLimitOneResponsePerColumn()
+     *        .build();
+     *      gridItem.setValidation(gridValidation);
+     */
+    export interface GridValidation {
+      getHelpText(): string;
+    }
+
+    /**
+     * A DataValidationBuilder for a GridValidation.
+     *
+     *      // Add a grid item to a form and require one response per column.
+     *      var gridItem = form.addGridItem();
+     *      gridItem.setTitle('Rate your interests')
+     *        .setRows(['Cars', 'Computers', 'Celebrities'])
+     *        .setColumns(['Boring', 'So-so', 'Interesting']);
+     *      var gridValidation = FormApp.createGridValidation()
+     *        .setHelpText(“Select one item per column.”)
+     *        .requireLimitOneResponsePerColumn()
+     *        .build();
+     *      gridItem.setValidation(gridValidation);
+     */
+    export interface GridValidationBuilder {
+      build(): GridValidation;
+      copy(): GridValidationBuilder;
+      requireLimitOneResponsePerColumn(): GridValidationBuilder;
+      setHelpText(text: string): GridValidationBuilder;
     }
 
     /**
@@ -447,8 +622,12 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface ItemResponse {
+      getFeedback(): Object;
       getItem(): Item;
       getResponse(): Object;
+      getScore(): Object;
+      setFeedback(feedback: Object): ItemResponse;
+      setScore(score: Object): ItemResponse;
     }
 
     /**
@@ -482,27 +661,35 @@ declare namespace GoogleAppsScript {
      */
     export interface ListItem {
       createChoice(value: string): Choice;
+      createChoice(value: string, isCorrect: boolean): Choice;
       createChoice(value: string, navigationItem: PageBreakItem): Choice;
       createChoice(value: string, navigationType: PageNavigationType): Choice;
       createResponse(response: string): ItemResponse;
       duplicate(): ListItem;
       getChoices(): Choice[];
+      getFeedbackForCorrect(): QuizFeedback;
+      getFeedbackForIncorrect(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
       setChoiceValues(values: String[]): ListItem;
       setChoices(choices: Choice[]): ListItem;
+      setFeedbackForCorrect(feedback: QuizFeedback): ListItem;
+      setFeedbackForIncorrect(feedback: QuizFeedback): ListItem;
       setHelpText(text: string): ListItem;
+      setPoints(points: Integer): ListItem;
       setRequired(enabled: boolean): ListItem;
       setTitle(title: string): ListItem;
     }
 
     /**
-     * A question item that allows the respondent to select one choice from a list of radio buttons or
-     *  an optional "other" field. Items can be accessed or created from a Form.
+     * A question item that allows the respondent to select one choice from a list of radio
+     *  buttons or an optional "other" field. Items can be accessed or created from a Form.
+     *  When used in a quiz, these items are autograded.
      *
      *      // Open a form by ID and add a new multiple choice item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -516,21 +703,28 @@ declare namespace GoogleAppsScript {
      */
     export interface MultipleChoiceItem {
       createChoice(value: string): Choice;
+      createChoice(value: string, isCorrect: boolean): Choice;
       createChoice(value: string, navigationItem: PageBreakItem): Choice;
       createChoice(value: string, navigationType: PageNavigationType): Choice;
       createResponse(response: string): ItemResponse;
       duplicate(): MultipleChoiceItem;
       getChoices(): Choice[];
+      getFeedbackForCorrect(): QuizFeedback;
+      getFeedbackForIncorrect(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       hasOtherOption(): boolean;
       isRequired(): boolean;
       setChoiceValues(values: String[]): MultipleChoiceItem;
       setChoices(choices: Choice[]): MultipleChoiceItem;
+      setFeedbackForCorrect(feedback: QuizFeedback): MultipleChoiceItem;
+      setFeedbackForIncorrect(feedback: QuizFeedback): MultipleChoiceItem;
       setHelpText(text: string): MultipleChoiceItem;
+      setPoints(points: Integer): MultipleChoiceItem;
       setRequired(enabled: boolean): MultipleChoiceItem;
       setTitle(title: string): MultipleChoiceItem;
       showOtherOption(enabled: boolean): MultipleChoiceItem;
@@ -593,8 +787,8 @@ declare namespace GoogleAppsScript {
     export enum PageNavigationType { CONTINUE, GO_TO_PAGE, RESTART, SUBMIT }
 
     /**
-     * A question item that allows the respondent to enter a block of text. Items can be accessed or
-     *  created from a Form.
+     * A question item that allows the respondent to enter a block of text. Items can be
+     *  accessed or created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new paragraph text item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -602,22 +796,107 @@ declare namespace GoogleAppsScript {
      *      item.setTitle('What is your address?');
      */
     export interface ParagraphTextItem {
+      clearValidation(): ParagraphTextItem;
       createResponse(response: string): ItemResponse;
       duplicate(): ParagraphTextItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): ParagraphTextItem;
       setHelpText(text: string): ParagraphTextItem;
+      setPoints(points: Integer): ParagraphTextItem;
       setRequired(enabled: boolean): ParagraphTextItem;
       setTitle(title: string): ParagraphTextItem;
+      setValidation(validation: ParagraphTextValidation): ParagraphTextItem;
     }
 
     /**
-     * A question item that allows the respondent to choose one option from a numbered sequence of radio
-     *  buttons. Items can be accessed or created from a Form.
+     * A DataValidation for a ParagraphTextItem.
+     *
+     *      // Add a paragraph text item to a form and require the answer to be at least 100 characters.
+     *      var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
+     *      var paragraphtextValidation = FormApp.createParagraphTextValidation()
+     *        .setHelpText(“Answer must be more than 100 characters.”)
+     *        .requireTextLengthGreatherThan(100);
+     *      paragraphTextItem.setValidation(paragraphtextValidation);
+     */
+    export interface ParagraphTextValidation {
+      getHelpText(): string;
+    }
+
+    /**
+     * A DataValidationBuilder for a ParagraphTextValidation.
+     *
+     *      // Add a paragraph text item to a form and require the answer to be at least 100 characters.
+     *      var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
+     *      var paragraphtextValidation = FormApp.createParagraphTextValidation()
+     *        .setHelpText(“Answer must be more than 100 characters.”)
+     *        .requireTextLengthGreatherThan(100);
+     *      paragraphTextItem.setValidation(paragraphtextValidation);
+     */
+    export interface ParagraphTextValidationBuilder {
+      build(): ParagraphTextValidation;
+      copy(): ParagraphTextValidationBuilder;
+      requireTextContainsPattern(pattern: string): ParagraphTextValidationBuilder;
+      requireTextDoesNotContainPattern(pattern: string): ParagraphTextValidationBuilder;
+      requireTextDoesNotMatchPattern(pattern: string): ParagraphTextValidationBuilder;
+      requireTextLengthGreaterThanOrEqualTo(number: Integer): ParagraphTextValidationBuilder;
+      requireTextLengthLessThanOrEqualTo(number: Integer): ParagraphTextValidationBuilder;
+      requireTextMatchesPattern(pattern: string): ParagraphTextValidationBuilder;
+      setHelpText(text: string): ParagraphTextValidationBuilder;
+    }
+
+    /**
+     * The bean implementation of a Feedback, which contains properties common to all feedback, such as
+     *  display text or links.
+     *
+     *  Feedback can be added to gradeable Form items.
+     *
+     *      // Setting feedback which should be automatically shown when a user responds to a question
+     *      // incorrectly.
+     *      var textItem = form.addTextItem().setTitle('Re-hydrating dried fruit is an example of what?');
+     *      var feedback = FormApp.createFeedback()
+     *        .setDisplayText(
+     *            “Good answer, but not quite right.  Please review chapter 4 before next time.”)
+     *        .addLink("http://wikipedia.com/osmosis");
+     *      textItem.setFeedbackForIncorrect(feedback);
+     */
+    export interface QuizFeedback {
+      getLinkUrls(): String[];
+      getText(): string;
+    }
+
+    /**
+     * The base FeedbackBuilder that contains setters for properties common to all feedback,
+     *  such as display text. Used to build Feedback objects.
+     *
+     *      // Open a form by ID and add a new list item.
+     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *      var item = form.addListItem();
+     *      item.setTitle('Do you prefer cats or dogs?');
+     *      item.setChoices([
+     *        item.createChoice('Dogs', true),
+     *        item.createChoice('Cats', false)]);
+     *      // Add feedback which will be shown for correct responses; ie "Dogs".
+     *      item.setFeedbackForCorrect(FormApp.createFeedback().setText("Dogs rule, cats drool.").build());
+     */
+    export interface QuizFeedbackBuilder {
+      addLink(url: string): QuizFeedbackBuilder;
+      addLink(url: string, displayText: string): QuizFeedbackBuilder;
+      build(): QuizFeedback;
+      copy(): QuizFeedbackBuilder;
+      setText(text: string): QuizFeedbackBuilder;
+    }
+
+    /**
+     * A question item that allows the respondent to choose one option from a numbered sequence
+     *  of radio buttons. Items can be accessed or created from a Form. When used in a quiz,
+     *  these items are graded.
      *
      *      // Open a form by ID and add a new scale item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -628,19 +907,23 @@ declare namespace GoogleAppsScript {
     export interface ScaleItem {
       createResponse(response: Integer): ItemResponse;
       duplicate(): ScaleItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
       getLeftLabel(): string;
       getLowerBound(): Integer;
+      getPoints(): Integer;
       getRightLabel(): string;
       getTitle(): string;
       getType(): ItemType;
       getUpperBound(): Integer;
       isRequired(): boolean;
       setBounds(lower: Integer, upper: Integer): ScaleItem;
+      setGeneralFeedback(feedback: QuizFeedback): ScaleItem;
       setHelpText(text: string): ScaleItem;
       setLabels(lower: string, upper: string): ScaleItem;
+      setPoints(points: Integer): ScaleItem;
       setRequired(enabled: boolean): ScaleItem;
       setTitle(title: string): ScaleItem;
     }
@@ -666,8 +949,8 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A question item that allows the respondent to enter a single line of text. Items can be accessed
-     *  or created from a Form.
+     * A question item that allows the respondent to enter a single line of text. Items can be
+     *  accessed or created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new text item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -675,22 +958,77 @@ declare namespace GoogleAppsScript {
      *      item.setTitle('What is your name?');
      */
     export interface TextItem {
+      clearValidation(): TextItem;
       createResponse(response: string): ItemResponse;
       duplicate(): TextItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): TextItem;
       setHelpText(text: string): TextItem;
+      setPoints(points: Integer): TextItem;
       setRequired(enabled: boolean): TextItem;
       setTitle(title: string): TextItem;
+      setValidation(validation: TextValidation): TextItem;
     }
 
     /**
-     * A question item that allows the respondent to indicate a time of day. Items can be accessed or
-     *  created from a Form.
+     * A DataValidation for a TextItem.
+     *
+     *      // Add a text item to a form and require it to be a number within a range.
+     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *      var textValidation = FormApp.createTextValidation()
+     *        .setHelpText(“Input was not a number between 1 and 100.”)
+     *        .requireNumberBetween(1, 100)
+     *        .build();
+     *      textItem.setValidation(textValidation);
+     */
+    export interface TextValidation {
+      getHelpText(): string;
+    }
+
+    /**
+     * A DataValidationBuilder for a TextValidation.
+     *
+     *      // Add a text item to a form and require it to be a number within a range.
+     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *      var textValidation = FormApp.createTextValidation()
+     *        .setHelpText(“Input was not a number between 1 and 100.”)
+     *        .requireNumberBetween(1, 100);
+     *      textItem.setValidation(textValidation);
+     */
+    export interface TextValidationBuilder {
+      build(): TextValidation;
+      copy(): TextValidationBuilder;
+      requireNumber(): TextValidationBuilder;
+      requireNumberBetween(start: Number, end: Number): TextValidationBuilder;
+      requireNumberEqualTo(number: Number): TextValidationBuilder;
+      requireNumberGreaterThan(number: Number): TextValidationBuilder;
+      requireNumberGreaterThanOrEqualTo(number: Number): TextValidationBuilder;
+      requireNumberLessThan(number: Number): TextValidationBuilder;
+      requireNumberLessThanOrEqualTo(number: Number): TextValidationBuilder;
+      requireNumberNotBetween(start: Number, end: Number): TextValidationBuilder;
+      requireNumberNotEqualTo(number: Number): TextValidationBuilder;
+      requireTextContainsPattern(pattern: string): TextValidationBuilder;
+      requireTextDoesNotContainPattern(pattern: string): TextValidationBuilder;
+      requireTextDoesNotMatchPattern(pattern: string): TextValidationBuilder;
+      requireTextIsEmail(): TextValidationBuilder;
+      requireTextIsUrl(): TextValidationBuilder;
+      requireTextLengthGreaterThanOrEqualTo(number: Integer): TextValidationBuilder;
+      requireTextLengthLessThanOrEqualTo(number: Integer): TextValidationBuilder;
+      requireTextMatchesPattern(pattern: string): TextValidationBuilder;
+      requireWholeNumber(): TextValidationBuilder;
+      setHelpText(text: string): TextValidationBuilder;
+    }
+
+    /**
+     * A question item that allows the respondent to indicate a time of day. Items can be
+     *  accessed or created from a Form. When used in a quiz, these items are graded.
      *
      *      // Open a form by ID and add a new time item.
      *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
@@ -700,13 +1038,17 @@ declare namespace GoogleAppsScript {
     export interface TimeItem {
       createResponse(hour: Integer, minute: Integer): ItemResponse;
       duplicate(): TimeItem;
+      getGeneralFeedback(): QuizFeedback;
       getHelpText(): string;
       getId(): Integer;
       getIndex(): Integer;
+      getPoints(): Integer;
       getTitle(): string;
       getType(): ItemType;
       isRequired(): boolean;
+      setGeneralFeedback(feedback: QuizFeedback): TimeItem;
       setHelpText(text: string): TimeItem;
+      setPoints(points: Integer): TimeItem;
       setRequired(enabled: boolean): TimeItem;
       setTitle(title: string): TimeItem;
     }
diff --git a/types/google-apps-script/google-apps-script.gmail.d.ts b/types/google-apps-script/google-apps-script.gmail.d.ts
index d76f0f1895..fd0bda2b13 100644
--- a/types/google-apps-script/google-apps-script.gmail.d.ts
+++ b/types/google-apps-script/google-apps-script.gmail.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Gmail {
diff --git a/types/google-apps-script/google-apps-script.groups.d.ts b/types/google-apps-script/google-apps-script.groups.d.ts
index dfcf7d79a5..e6833bb840 100644
--- a/types/google-apps-script/google-apps-script.groups.d.ts
+++ b/types/google-apps-script/google-apps-script.groups.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Groups {
@@ -46,7 +46,7 @@ declare namespace GoogleAppsScript {
      *        Logger.log('You belong to ' + groups.length + ' groups.');
      */
     export interface GroupsApp {
-      Role: Role
+      Role: typeof Role;
       getGroupByEmail(email: string): Group;
       getGroups(): Group[];
     }
diff --git a/types/google-apps-script/google-apps-script.html.d.ts b/types/google-apps-script/google-apps-script.html.d.ts
index 3b62ffcb08..f471d23eb3 100644
--- a/types/google-apps-script/google-apps-script.html.d.ts
+++ b/types/google-apps-script/google-apps-script.html.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module HTML {
@@ -22,6 +22,7 @@ declare namespace GoogleAppsScript {
      * guide to restrictions in HTML service
      */
     export interface HtmlOutput {
+      addMetaTag(name: string, content: string): HtmlOutput;
       append(addedContent: string): HtmlOutput;
       appendUntrusted(addedContent: string): HtmlOutput;
       asTemplate(): HtmlTemplate;
@@ -29,14 +30,33 @@ declare namespace GoogleAppsScript {
       getAs(contentType: string): Base.Blob;
       getBlob(): Base.Blob;
       getContent(): string;
+      getFaviconUrl(): string;
       getHeight(): Integer;
+      getMetaTags(): HtmlOutputMetaTag[];
       getTitle(): string;
       getWidth(): Integer;
       setContent(content: string): HtmlOutput;
+      setFaviconUrl(iconUrl: string): HtmlOutput;
       setHeight(height: Integer): HtmlOutput;
       setSandboxMode(mode: SandboxMode): HtmlOutput;
       setTitle(title: string): HtmlOutput;
       setWidth(width: Integer): HtmlOutput;
+      setXFrameOptionsMode(mode: XFrameOptionsMode): HtmlOutput;
+    }
+
+    /**
+     * An object that represents a meta tag added to the page by calling
+     *  HtmlOutput.addMetaTag(name, content).
+     *
+     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *      output.addMetaTag('viewport', 'width=device-width, initial-scale=1');
+     *
+     *      var tags = output.getMetaTags();
+     *      Logger.log('<meta name="%s" content="%s"/>', tags[0].getName(), tags[0].getContent());
+     */
+    export interface HtmlOutputMetaTag {
+      getContent(): string;
+      getName(): string;
     }
 
     /**
@@ -47,7 +67,8 @@ declare namespace GoogleAppsScript {
      *  HtmlOutput for what limitations this implies on what can be returned.
      */
     export interface HtmlService {
-      SandboxMode: SandboxMode
+      SandboxMode: typeof SandboxMode;
+      XFrameOptionsMode: typeof XFrameOptionsMode;
       createHtmlOutput(): HtmlOutput;
       createHtmlOutput(blob: Base.BlobSource): HtmlOutput;
       createHtmlOutput(html: string): HtmlOutput;
@@ -74,24 +95,17 @@ declare namespace GoogleAppsScript {
      *  scripts. These values can be accessed from HtmlService.SandboxMode, and set by calling
      *  HtmlOutput.setSandboxMode(mode).
      *
+     * The NATIVE and EMULATED modes were
+     *  deprecated on October 13, 2015 and both are
+     *  now sunset.
+     *  Only IFRAME mode is now supported.
      * To protect users from being served malicious HTML or JavaScript, client-side code served from
      *  HTML service executes in a security sandbox that imposes restrictions on the code. The method
-     *  HtmlOutput.setSandboxMode(mode) allows script authors to choose between
-     *  different versions of the sandbox. For more information, see the
+     *  HtmlOutput.setSandboxMode(mode) previously allowed script authors to choose
+     *  between different versions of the sandbox, but now has no effect. For more information, see the
      *  guide to restrictions in HTML service.
-     * If a script does not set a sandbox mode, Apps Script uses NATIVE mode as the default.
-     *  Prior to February 2014, the default was EMULATED. The default is subject to change.
      * The IFRAME mode imposes many fewer restrictions than the other sandbox modes and runs
-     *  fastest, but does not work at all in certain older browsers, including Internet Explorer 9. By
-     *  contrast, EMULATED mode is more likely to work in
-     *  older browsers that do not support ECMAScript 5 strict
-     *  mode, most notably Internet Explorer 9. NATIVE mode is the middle ground. If
-     *  NATIVE mode is set but not supported in the user's browser, the sandbox mode falls back
-     *  to EMULATED mode for that user.
-     *
-     *      // Serve HTML with a defined sandbox mode (in Apps Script server-side code).
-     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
-     *      output.setSandboxMode(HtmlService.SandboxMode.IFRAME);
+     *  fastest, but does not work at all in certain older browsers, including Internet Explorer 9.
      *
      * google.script.sandbox.mode
      *
@@ -102,6 +116,23 @@ declare namespace GoogleAppsScript {
      */
     export enum SandboxMode { EMULATED, IFRAME, NATIVE }
 
+    /**
+     * An enum representing the X-Frame-Options modes that can be used for client-side
+     *  HtmlService scripts. These values can be accessed from
+     *  HtmlService.XFrameOptionsMode, and set by calling
+     *  HtmlOutput.setXFrameOptionsMode(mode).
+     *
+     * Setting XFrameOptionsMode.ALLOWALL will let any site iframe the page, so the developer
+     *  should implement their own protection against clickjacking.
+     * If a script does not set an X-Frame-Options mode, Apps Script uses DEFAULT
+     *  mode as the default.
+     *
+     *      // Serve HTML with no X-Frame-Options header (in Apps Script server-side code).
+     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *      output.setXFrameOptionsMode(HtmlService.XFrameOptionsMode.ALLOWALL);
+     */
+    export enum XFrameOptionsMode { ALLOWALL, DEFAULT }
+
   }
 }
 
diff --git a/types/google-apps-script/google-apps-script.jdbc.d.ts b/types/google-apps-script/google-apps-script.jdbc.d.ts
index 16950cff32..ff1a0baf13 100644
--- a/types/google-apps-script/google-apps-script.jdbc.d.ts
+++ b/types/google-apps-script/google-apps-script.jdbc.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module JDBC {
diff --git a/types/google-apps-script/google-apps-script.language.d.ts b/types/google-apps-script/google-apps-script.language.d.ts
index c820f7620e..488568feec 100644
--- a/types/google-apps-script/google-apps-script.language.d.ts
+++ b/types/google-apps-script/google-apps-script.language.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Language {
diff --git a/types/google-apps-script/google-apps-script.lock.d.ts b/types/google-apps-script/google-apps-script.lock.d.ts
index 65891f2844..f255efbc14 100644
--- a/types/google-apps-script/google-apps-script.lock.d.ts
+++ b/types/google-apps-script/google-apps-script.lock.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Lock {
diff --git a/types/google-apps-script/google-apps-script.mail.d.ts b/types/google-apps-script/google-apps-script.mail.d.ts
index 11c97f80fa..2cb8b3cb5f 100644
--- a/types/google-apps-script/google-apps-script.mail.d.ts
+++ b/types/google-apps-script/google-apps-script.mail.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Mail {
diff --git a/types/google-apps-script/google-apps-script.maps.d.ts b/types/google-apps-script/google-apps-script.maps.d.ts
index 02e4ac0195..e9620ee144 100644
--- a/types/google-apps-script/google-apps-script.maps.d.ts
+++ b/types/google-apps-script/google-apps-script.maps.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Maps {
@@ -93,8 +93,8 @@ declare namespace GoogleAppsScript {
      * A collection of enums used by DirectionFinder.
      */
     export interface DirectionFinderEnums {
-      Avoid: Avoid
-      Mode: Mode
+      Avoid: typeof Avoid;
+      Mode: typeof Mode;
     }
 
     /**
@@ -200,8 +200,8 @@ declare namespace GoogleAppsScript {
      *  images.
      */
     export interface Maps {
-      DirectionFinder: DirectionFinderEnums
-      StaticMap: StaticMapEnums
+      DirectionFinder: DirectionFinderEnums;
+      StaticMap: StaticMapEnums;
       decodePolyline(polyline: string): Number[];
       encodePolyline(points: Number[]): string;
       newDirectionFinder(): DirectionFinder;
@@ -299,10 +299,10 @@ declare namespace GoogleAppsScript {
      * A collection of enums used by StaticMap.
      */
     export interface StaticMapEnums {
-      Color: Color
-      Format: Format
-      MarkerSize: MarkerSize
-      Type: Type
+      Color: typeof Color;
+      Format: typeof Format;
+      MarkerSize: typeof MarkerSize;
+      Type: typeof Type;
     }
 
     /**
diff --git a/types/google-apps-script/google-apps-script.optimization.d.ts b/types/google-apps-script/google-apps-script.optimization.d.ts
index 0217618a25..8ac192c1e6 100644
--- a/types/google-apps-script/google-apps-script.optimization.d.ts
+++ b/types/google-apps-script/google-apps-script.optimization.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Optimization {
@@ -86,6 +86,7 @@ declare namespace GoogleAppsScript {
       addConstraint(lowerBound: Number, upperBound: Number): LinearOptimizationConstraint;
       addVariable(name: string, lowerBound: Number, upperBound: Number): LinearOptimizationEngine;
       addVariable(name: string, lowerBound: Number, upperBound: Number, type: VariableType): LinearOptimizationEngine;
+      addVariable(name: string, lowerBound: Number, upperBound: Number, type: VariableType, objectiveCoefficient: Number): LinearOptimizationEngine;
       setMaximization(): LinearOptimizationEngine;
       setMinimization(): LinearOptimizationEngine;
       setObjectiveCoefficient(variableName: string, coefficient: Number): LinearOptimizationEngine;
@@ -146,8 +147,8 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface LinearOptimizationService {
-      Status: Status
-      VariableType: VariableType
+      Status: typeof Status;
+      VariableType: typeof VariableType;
       createEngine(): LinearOptimizationEngine;
     }
 
diff --git a/types/google-apps-script/google-apps-script.properties.d.ts b/types/google-apps-script/google-apps-script.properties.d.ts
index 9ceb24608e..5622fec6f8 100644
--- a/types/google-apps-script/google-apps-script.properties.d.ts
+++ b/types/google-apps-script/google-apps-script.properties.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Properties {
diff --git a/types/google-apps-script/google-apps-script.script.d.ts b/types/google-apps-script/google-apps-script.script.d.ts
index bd1a5340d9..209feaa0a1 100644
--- a/types/google-apps-script/google-apps-script.script.d.ts
+++ b/types/google-apps-script/google-apps-script.script.d.ts
@@ -1,13 +1,13 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
-
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.document.d.ts" />
+/// <reference path="google-apps-script.forms.d.ts" />
+/// <reference path="google-apps-script.spreadsheet.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Script {
@@ -118,18 +118,18 @@ declare namespace GoogleAppsScript {
      *  triggers and control publishing the script as a service.
      */
     export interface ScriptApp {
-      AuthMode: AuthMode
-      AuthorizationStatus: AuthorizationStatus
-      EventType: EventType
-      InstallationSource: InstallationSource
-      TriggerSource: TriggerSource
-      WeekDay: Base.Weekday
+      AuthMode: typeof AuthMode;
+      AuthorizationStatus: typeof AuthorizationStatus;
+      EventType: typeof EventType;
+      InstallationSource: typeof InstallationSource;
+      TriggerSource: typeof TriggerSource;
+      WeekDay: typeof Base.Weekday;
       deleteTrigger(trigger: Trigger): void;
       getAuthorizationInfo(authMode: AuthMode): AuthorizationInfo;
       getInstallationSource(): InstallationSource;
       getOAuthToken(): string;
-      getProjectKey(): string;
       getProjectTriggers(): Trigger[];
+      getScriptId(): string;
       getService(): Service;
       getUserTriggers(document: Document.Document): Trigger[];
       getUserTriggers(form: Forms.Form): Trigger[];
@@ -137,13 +137,27 @@ declare namespace GoogleAppsScript {
       invalidateAuth(): void;
       newStateToken(): StateTokenBuilder;
       newTrigger(functionName: string): TriggerBuilder;
+      getProjectKey(): string;
       getScriptTriggers(): Trigger[];
     }
 
+    /**
+     * Access and manipulate script publishing.
+     */
+    export interface Service {
+      Restriction: typeof Service.Restriction;
+      disable(): void;
+      getUrl(): string;
+      isEnabled(): boolean;
+      enable(restriction: Service.Restriction): void;
+    }
+
     /**
      *
      */
-    export enum Service { MYSELF, DOMAIN, ALL }
+    namespace Service {
+    export enum Restriction { MYSELF, DOMAIN, ALL }
+    }
 
     /**
      * Builder for spreadsheet triggers.
diff --git a/types/google-apps-script/google-apps-script.sites.d.ts b/types/google-apps-script/google-apps-script.sites.d.ts
index acf1f8d6dc..6b21ffe529 100644
--- a/types/google-apps-script/google-apps-script.sites.d.ts
+++ b/types/google-apps-script/google-apps-script.sites.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Sites {
@@ -12,6 +12,12 @@ declare namespace GoogleAppsScript {
      * A Sites Attachment such as a file attached to a page.
      *
      *  Note that an Attachment is a Blob and can be used anywhere Blob input is expected.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      *
      *      var filesPage = SitesApp.getSite('example.com', 'mysite').getChildByName("files");
      *      var attachments = filesPage.getAttachments();
@@ -42,11 +48,23 @@ declare namespace GoogleAppsScript {
 
     /**
      * A typesafe enum for sites attachment type.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export enum AttachmentType { WEB, HOSTED }
 
     /**
      * A Sites Column - a column from a Sites List page.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface Column {
       deleteColumn(): void;
@@ -57,6 +75,12 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Comment attached to any Sites page.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface Comment {
       deleteComment(): void;
@@ -72,6 +96,12 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Sites ListItem - a list element from a Sites List page.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface ListItem {
       deleteListItem(): void;
@@ -87,6 +117,12 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Page on a Google Site.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface Page {
       addColumn(name: string): Column;
@@ -113,8 +149,6 @@ declare namespace GoogleAppsScript {
       getChildren(): Page[];
       getChildren(options: Object): Page[];
       getColumns(): Column[];
-      getComments(): Comment[];
-      getComments(optOptions: Object): Comment[];
       getDatePublished(): Date;
       getHtmlContent(): string;
       getIsDraft(): boolean;
@@ -139,17 +173,31 @@ declare namespace GoogleAppsScript {
       setParent(parent: Page): Page;
       setTitle(title: string): Page;
       addComment(content: string): Comment;
+      getComments(): Comment[];
+      getComments(optOptions: Object): Comment[];
       getPageName(): string;
       getSelfLink(): string;
     }
 
     /**
      * A typesafe enum for sites page type.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export enum PageType { WEB_PAGE, LIST_PAGE, ANNOUNCEMENT, ANNOUNCEMENTS_PAGE, FILE_CABINET_PAGE }
 
     /**
      * An object representing a Google Site.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface Site {
       addEditor(emailAddress: string): Site;
@@ -215,10 +263,16 @@ declare namespace GoogleAppsScript {
 
     /**
      * Create and access Google Sites.
+     *  A
+     *  rebuilt
+     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     *  modify Sites made with this version, but script can still access
+     *
+     *    classic Sites.
      */
     export interface SitesApp {
-      AttachmentType: AttachmentType
-      PageType: PageType
+      AttachmentType: typeof AttachmentType;
+      PageType: typeof PageType;
       copySite(domain: string, name: string, title: string, summary: string, site: Site): Site;
       createSite(domain: string, name: string, title: string, summary: string): Site;
       getActivePage(): Page;
diff --git a/types/google-apps-script/google-apps-script.spreadsheet.d.ts b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
index a8f554e4bc..e710fcfb4a 100644
--- a/types/google-apps-script/google-apps-script.spreadsheet.d.ts
+++ b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -1,15 +1,26 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.charts.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.drive.d.ts" />
 
 declare namespace GoogleAppsScript {
+  /**
+   * This service allows scripts to create, access, and modify Google Sheets files. See also the guide to storing data in spreadsheets.
+   * 
+   * https://developers.google.com/apps-script/guides/sheets
+   */
   export module Spreadsheet {
+    /**
+     * Styles that can be set on a range using
+     *  Range.setBorder(top, left, bottom, right, vertical, horizontal, color, style).
+     */
+    export enum BorderStyle { DOTTED, DASHED, SOLID }
+
     /**
      * The chart's position within a sheet.  Can be updated using the EmbeddedChart.modify()
      *  function.
@@ -18,9 +29,25 @@ declare namespace GoogleAppsScript {
      *      sheet.updateChart(chart);
      */
     export interface ContainerInfo {
+      /**
+       * The chart's left side will be anchored to this column.
+       * @returns {Integer}  1-indexed column (i.e. column C will be 3)
+       */
       getAnchorColumn(): Integer;
+      /**
+       * The chart's top side will be anchored to this row.
+       * @returns {Integer}  1-indexed row (i.e. row 5 will return 5)
+       */
       getAnchorRow(): Integer;
+      /**
+       * The chart's upper left hand corner will be offset from the anchor column by this many pixels.
+       * @returns {Integer} the horizontal offset in pixels for the upper left hand corner of the chart
+       */
       getOffsetX(): Integer;
+      /**
+       * Chart's upper left hand corner will be offset from the anchor row by this many pixels.
+       * @returns {Integer} the vertical offset in pixels for the upper left hand corner of the chart
+       */
       getOffsetY(): Integer;
     }
 
@@ -135,6 +162,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -175,6 +204,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -265,6 +296,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -288,6 +321,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -318,6 +353,88 @@ declare namespace GoogleAppsScript {
       useLogScale(): EmbeddedColumnChartBuilder;
     }
 
+    /**
+     * Builder for combo charts. For more details, see the Gviz
+     *  documentation.
+     */
+    export interface EmbeddedComboChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedComboChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedComboChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedComboChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedComboChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedComboChartBuilder;
+      setStacked(): EmbeddedComboChartBuilder;
+      setTitle(chartTitle: string): EmbeddedComboChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setXAxisTitle(title: string): EmbeddedComboChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setYAxisTitle(title: string): EmbeddedComboChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      useLogScale(): EmbeddedComboChartBuilder;
+    }
+
+    /**
+     * Builder for histogram charts. For more details, see the Gviz
+     *  documentation.
+     */
+    export interface EmbeddedHistogramChartBuilder {
+      addRange(range: Range): EmbeddedChartBuilder;
+      asAreaChart(): EmbeddedAreaChartBuilder;
+      asBarChart(): EmbeddedBarChartBuilder;
+      asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
+      asLineChart(): EmbeddedLineChartBuilder;
+      asPieChart(): EmbeddedPieChartBuilder;
+      asScatterChart(): EmbeddedScatterChartBuilder;
+      asTableChart(): EmbeddedTableChartBuilder;
+      build(): EmbeddedChart;
+      getChartType(): Charts.ChartType;
+      getContainer(): ContainerInfo;
+      getRanges(): Range[];
+      removeRange(range: Range): EmbeddedChartBuilder;
+      reverseCategories(): EmbeddedHistogramChartBuilder;
+      setBackgroundColor(cssValue: string): EmbeddedHistogramChartBuilder;
+      setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setColors(cssValues: String[]): EmbeddedHistogramChartBuilder;
+      setLegendPosition(position: Charts.Position): EmbeddedHistogramChartBuilder;
+      setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setOption(option: string, value: Object): EmbeddedChartBuilder;
+      setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setRange(start: Number, end: Number): EmbeddedHistogramChartBuilder;
+      setStacked(): EmbeddedHistogramChartBuilder;
+      setTitle(chartTitle: string): EmbeddedHistogramChartBuilder;
+      setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setXAxisTitle(title: string): EmbeddedHistogramChartBuilder;
+      setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setYAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setYAxisTitle(title: string): EmbeddedHistogramChartBuilder;
+      setYAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      useLogScale(): EmbeddedHistogramChartBuilder;
+    }
+
     /**
      * Builder for line charts. For more details, see the Gviz
      *  documentation.
@@ -327,6 +444,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -367,6 +486,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -398,6 +519,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -438,6 +561,8 @@ declare namespace GoogleAppsScript {
       asAreaChart(): EmbeddedAreaChartBuilder;
       asBarChart(): EmbeddedBarChartBuilder;
       asColumnChart(): EmbeddedColumnChartBuilder;
+      asComboChart(): EmbeddedComboChartBuilder;
+      asHistogramChart(): EmbeddedHistogramChartBuilder;
       asLineChart(): EmbeddedLineChartBuilder;
       asPieChart(): EmbeddedPieChartBuilder;
       asScatterChart(): EmbeddedScatterChartBuilder;
@@ -463,8 +588,37 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     *
-     * Deprecated. For spreadsheets created in the newer version of Google Sheets, use the more powerful
+     * Create, access and modify named ranges in a spreadsheet.
+     *  Named ranges are ranges that have associated string aliases.
+     *  They can be viewed and edited via the Sheets UI under the
+     *  Data > Named ranges... menu.
+     */
+    export interface NamedRange {
+      /**
+       * Gets the name of this named range.
+       */
+      getName(): string;
+      /**
+       * Gets teh range referenced by this named range.
+       */
+      getRange(): Range;
+      /**
+       * Deletes this named range.
+       */
+      remove(): void;
+      /**
+       * Sets/updates the name of this named range.
+       */
+      setName(name: string): NamedRange;
+      /**
+       * Sets/updates the range for this named range.
+       */
+      setRange(range: Range): NamedRange;
+    }
+
+    /**
+     * @deprecated
+     * For spreadsheets created in the newer version of Google Sheets, use the more powerful
      *      Protection class instead. Although this class is deprecated, it will remain
      *      available for compatibility with the older version of Sheets.
      * Access and modify protected sheets in the older version of Google Sheets.
@@ -539,6 +693,7 @@ declare namespace GoogleAppsScript {
       removeEditors(emailAddresses: String[]): Protection;
       setDescription(description: string): Protection;
       setDomainEdit(editable: boolean): Protection;
+      setNamedRange(namedRange: NamedRange): Protection;
       setRange(range: Range): Protection;
       setRangeName(rangeName: string): Protection;
       setUnprotectedRanges(ranges: Range[]): Protection;
@@ -594,11 +749,14 @@ declare namespace GoogleAppsScript {
       getBackgrounds(): String[][];
       getCell(row: Integer, column: Integer): Range;
       getColumn(): Integer;
+      getColumnIndex(): Integer;
       getDataSourceUrl(): string;
       getDataTable(): Charts.DataTable;
       getDataTable(firstRowIsHeader: boolean): Charts.DataTable;
       getDataValidation(): DataValidation;
       getDataValidations(): DataValidation[][];
+      getDisplayValue(): string;
+      getDisplayValues(): String[][];
       getFontColor(): string;
       getFontColors(): String[][];
       getFontFamilies(): String[][];
@@ -621,6 +779,7 @@ declare namespace GoogleAppsScript {
       getHorizontalAlignments(): String[][];
       getLastColumn(): Integer;
       getLastRow(): Integer;
+      getMergedRanges(): Range[];
       getNote(): string;
       getNotes(): String[][];
       getNumColumns(): Integer;
@@ -640,6 +799,7 @@ declare namespace GoogleAppsScript {
       isBlank(): boolean;
       isEndColumnBounded(): boolean;
       isEndRowBounded(): boolean;
+      isPartOfMerge(): boolean;
       isStartColumnBounded(): boolean;
       isStartRowBounded(): boolean;
       merge(): Range;
@@ -654,6 +814,7 @@ declare namespace GoogleAppsScript {
       setBackgroundRGB(red: Integer, green: Integer, blue: Integer): Range;
       setBackgrounds(color: String[][]): Range;
       setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean): Range;
+      setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean, color: string, style: BorderStyle): Range;
       setDataValidation(rule: DataValidation): Range;
       setDataValidations(rules: DataValidation[][]): Range;
       setFontColor(color: string): Range;
@@ -718,6 +879,7 @@ declare namespace GoogleAppsScript {
       getMaxColumns(): Integer;
       getMaxRows(): Integer;
       getName(): string;
+      getNamedRanges(): NamedRange[];
       getParent(): Spreadsheet;
       getProtections(type: ProtectionType): Protection[];
       getRange(row: Integer, column: Integer): Range;
@@ -728,6 +890,7 @@ declare namespace GoogleAppsScript {
       getSheetId(): Integer;
       getSheetName(): string;
       getSheetValues(startRow: Integer, startColumn: Integer, numRows: Integer, numColumns: Integer): Object[][];
+      getTabColor(): string;
       hideColumn(column: Range): void;
       hideColumns(columnIndex: Integer): void;
       hideColumns(columnIndex: Integer, numColumns: Integer): void;
@@ -764,6 +927,7 @@ declare namespace GoogleAppsScript {
       setFrozenRows(rows: Integer): void;
       setName(name: string): Sheet;
       setRowHeight(rowPosition: Integer, height: Integer): Sheet;
+      setTabColor(color: string): Sheet;
       showColumns(columnIndex: Integer): void;
       showColumns(columnIndex: Integer, numColumns: Integer): void;
       showRows(rowIndex: Integer): void;
@@ -815,6 +979,7 @@ declare namespace GoogleAppsScript {
       getLastColumn(): Integer;
       getLastRow(): Integer;
       getName(): string;
+      getNamedRanges(): NamedRange[];
       getNumSheets(): Integer;
       getOwner(): Base.User;
       getProtections(type: ProtectionType): Protection[];
@@ -893,26 +1058,85 @@ declare namespace GoogleAppsScript {
      *  the parent class for the Spreadsheet service.
      */
     export interface SpreadsheetApp {
-      DataValidationCriteria: DataValidationCriteria
-      ProtectionType: ProtectionType
+      /**
+       * An enumeration of the valid styles for setting borders on a Range.
+       */
+      BorderStyle: typeof BorderStyle;
+      /**
+       * An enumeration representing the data-validation criteria that can be set on a range.
+       */
+      DataValidationCriteria: typeof DataValidationCriteria;
+      /**
+       * An enumeration representing the parts of a spreadsheet that can be protected from edits.
+       */
+      ProtectionType: typeof ProtectionType;
+      /**
+       * Creates a new spreadsheet with the given name.
+       */
       create(name: string): Spreadsheet;
+      /**
+       * Creates a new spreadsheet with the given name and the specified number of rows and columns.
+       */
       create(name: string, rows: Integer, columns: Integer): Spreadsheet;
+      /**
+       * Applies all pending Spreadsheet changes.
+       */
       flush(): void;
+      /**
+       * Returns the currently active spreadsheet, or null if there is none.
+       */
       getActive(): Spreadsheet;
+      /**
+       * Returns the range of cells that is currently considered active.
+       */
       getActiveRange(): Range;
+      /**
+       * Gets the active sheet in a spreadsheet.
+       */
       getActiveSheet(): Sheet;
+      /**
+       * Returns the currently active spreadsheet, or null if there is none.
+       */
       getActiveSpreadsheet(): Spreadsheet;
+      /**
+       * Returns an instance of the spreadsheet's user-interface environment that allows the script to add features like menus, dialogs, and sidebars.
+       */
       getUi(): Base.Ui;
+      /**
+       * Creates a builder for a data-validation rule.
+       */
       newDataValidation(): DataValidationBuilder;
+      /**
+       * Opens the spreadsheet that corresponds to the given File object.
+       */
       open(file: Drive.File): Spreadsheet;
+      /**
+       * 	Opens the spreadsheet with the given ID.
+       */
       openById(id: string): Spreadsheet;
+      /**
+       * 	Opens the spreadsheet with the given url.
+       */
       openByUrl(url: string): Spreadsheet;
+      /**
+       * 	Sets the active range for the application.
+       */
       setActiveRange(range: Range): Range;
+      /**
+       * 	Sets the active sheet in a spreadsheet.
+       */
       setActiveSheet(sheet: Sheet): Sheet;
+      /**
+       * 	Sets the active spreadsheet.
+       */
       setActiveSpreadsheet(newActiveSpreadsheet: Spreadsheet): void;
     }
 
   }
 }
 
+/**
+ * This class allows users to open Google Sheets files and to create new ones. This class is
+ *  the parent class for the Spreadsheet service.
+ */
 declare var SpreadsheetApp: GoogleAppsScript.Spreadsheet.SpreadsheetApp;
diff --git a/types/google-apps-script/google-apps-script.types.d.ts b/types/google-apps-script/google-apps-script.types.d.ts
index d5d2989b5c..3c7bfb550c 100644
--- a/types/google-apps-script/google-apps-script.types.d.ts
+++ b/types/google-apps-script/google-apps-script.types.d.ts
@@ -3,10 +3,11 @@
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace GoogleAppsScript {
+declare module GoogleAppsScript {
   type BigNumber = any;
   type Byte = number;
   type Integer = number;
   type Char = string;
+  type String = string;
   type JdbcSQL_XML = any;
 }
diff --git a/types/google-apps-script/google-apps-script.ui.d.ts b/types/google-apps-script/google-apps-script.ui.d.ts
index 6d08082dc8..bd4424351e 100644
--- a/types/google-apps-script/google-apps-script.ui.d.ts
+++ b/types/google-apps-script/google-apps-script.ui.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module UI {
@@ -3263,13 +3263,13 @@ declare namespace GoogleAppsScript {
      *
      *      deprecated on December 11, 2014. To create user interfaces, use the
      *      HTML service instead.
-     * Create user interfaces for use inside Google Apps or as standalone services.
+     * Create user interfaces for use inside G Suite or as standalone services.
      */
     export interface UiApp {
-      DateTimeFormat: DateTimeFormat
-      FileType: FileType
-      HorizontalAlignment: HorizontalAlignment
-      VerticalAlignment: VerticalAlignment
+      DateTimeFormat: typeof DateTimeFormat;
+      FileType: typeof FileType;
+      HorizontalAlignment: typeof HorizontalAlignment;
+      VerticalAlignment: typeof VerticalAlignment;
       createApplication(): UiInstance;
       getActiveApplication(): UiInstance;
       getUserAgent(): string;
diff --git a/types/google-apps-script/google-apps-script.url-fetch.d.ts b/types/google-apps-script/google-apps-script.url-fetch.d.ts
index 94db3c3a7c..b9ede5163e 100644
--- a/types/google-apps-script/google-apps-script.url-fetch.d.ts
+++ b/types/google-apps-script/google-apps-script.url-fetch.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module URL_Fetch {
@@ -25,30 +25,6 @@ declare namespace GoogleAppsScript {
       getResponseCode(): Integer;
     }
 
-    /**
-     *
-     * Deprecated. This class is deprecated and should not be used in new scripts.
-     * Represents configuration settings for an OAuth-enabled remote service.
-     * See also
-     *
-     * UrlFetchApp
-     */
-    export interface OAuthConfig {
-      getAccessTokenUrl(): string;
-      getAuthorizationUrl(): string;
-      getMethod(): string;
-      getParamLocation(): string;
-      getRequestTokenUrl(): string;
-      getServiceName(): string;
-      setAccessTokenUrl(url: string): void;
-      setAuthorizationUrl(url: string): void;
-      setConsumerKey(consumerKey: string): void;
-      setConsumerSecret(consumerSecret: string): void;
-      setMethod(method: string): void;
-      setParamLocation(location: string): void;
-      setRequestTokenUrl(url: string): void;
-    }
-
     /**
      * Fetch resources and communicate with other hosts over the Internet.
      *
@@ -58,8 +34,6 @@ declare namespace GoogleAppsScript {
      *  and scaling purposes.
      * See also
      *
-     * OAuthConfig
-     *
      * HTTPResponse
      */
     export interface UrlFetchApp {
@@ -67,8 +41,6 @@ declare namespace GoogleAppsScript {
       fetch(url: string, params: Object): HTTPResponse;
       getRequest(url: string): Object;
       getRequest(url: string, params: Object): Object;
-      addOAuthService(serviceName: string): OAuthConfig;
-      removeOAuthService(serviceName: string): void;
     }
 
   }
diff --git a/types/google-apps-script/google-apps-script.utilities.d.ts b/types/google-apps-script/google-apps-script.utilities.d.ts
index 3deb1734f4..2beda0bfc1 100644
--- a/types/google-apps-script/google-apps-script.utilities.d.ts
+++ b/types/google-apps-script/google-apps-script.utilities.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module Utilities {
@@ -28,9 +28,9 @@ declare namespace GoogleAppsScript {
      *  and other miscellaneous tasks.
      */
     export interface Utilities {
-      Charset: Charset
-      DigestAlgorithm: DigestAlgorithm
-      MacAlgorithm: MacAlgorithm
+      Charset: typeof Charset;
+      DigestAlgorithm: typeof DigestAlgorithm;
+      MacAlgorithm: typeof MacAlgorithm;
       base64Decode(encoded: string): Byte[];
       base64Decode(encoded: string, charset: Charset): Byte[];
       base64DecodeWebSafe(encoded: string): Byte[];
@@ -51,6 +51,7 @@ declare namespace GoogleAppsScript {
       computeRsaSha256Signature(value: string, key: string, charset: Charset): Byte[];
       formatDate(date: Date, timeZone: string, format: string): string;
       formatString(template: string, ...args: Object[]): string;
+      getUuid(): string;
       newBlob(data: Byte[]): Base.Blob;
       newBlob(data: Byte[], contentType: string): Base.Blob;
       newBlob(data: Byte[], contentType: string, name: string): Base.Blob;
diff --git a/types/google-apps-script/google-apps-script.xml-service.d.ts b/types/google-apps-script/google-apps-script.xml-service.d.ts
index d45d4d16a8..664fbfc2b9 100644
--- a/types/google-apps-script/google-apps-script.xml-service.d.ts
+++ b/types/google-apps-script/google-apps-script.xml-service.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for Google Apps Script 2015-11-12
+// Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
+/// <reference path="google-apps-script.types.d.ts" />
 
 declare namespace GoogleAppsScript {
   export module XML_Service {
@@ -283,9 +283,9 @@ declare namespace GoogleAppsScript {
     /**
      * This service allows scripts to parse, navigate, and programmatically create XML documents.
      *
-     *      // Log the title and labels for the first page of blog posts on the Google Apps Developer blog.
+     *      // Log the title and labels for the first page of blog posts on the G Suite Developer blog.
      *      function parseXml() {
-     *        var url = 'http://googleappsdeveloper.blogspot.com/atom.xml';
+     *        var url = 'https://gsuite-developers.googleblog.com/atom.xml';
      *        var xml = UrlFetchApp.fetch(url).getContentText();
      *        var document = XmlService.parse(xml);
      *        var root = document.getRootElement();
@@ -320,7 +320,7 @@ declare namespace GoogleAppsScript {
      *      }
      */
     export interface XmlService {
-      ContentTypes: ContentType
+      ContentTypes: typeof ContentType;
       createCdata(text: string): Cdata;
       createComment(text: string): Comment;
       createDocType(elementName: string): DocType;
diff --git a/types/google-cloud__storage/google-cloud__storage-tests.ts b/types/google-cloud__storage/google-cloud__storage-tests.ts
index e701fe5681..a301aa063c 100644
--- a/types/google-cloud__storage/google-cloud__storage-tests.ts
+++ b/types/google-cloud__storage/google-cloud__storage-tests.ts
@@ -38,7 +38,7 @@ export class TestStorage {
   };
 
   // import Storage class
-  static gcs: Storage;
+  static gcs: Storage = new Storage();
 
   // the bucket
   private buckets: Bucket[] = [];
diff --git a/types/google-cloud__storage/index.d.ts b/types/google-cloud__storage/index.d.ts
index e97249be24..84f4329601 100644
--- a/types/google-cloud__storage/index.d.ts
+++ b/types/google-cloud__storage/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for @google-cloud/storage 0.6
+// Type definitions for @google-cloud/storage 1.1
 // Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/storage
-// Definitions by: Brian Love <http://brianflove.com>
+// Definitions by: Brian Love <https://github.com/blove>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -301,6 +301,21 @@ declare module "@google-cloud/storage/storage" {
     updated?: string;
   }
 
+  interface Credentials {
+    client_email?: string;
+    private_key?: string;
+  }
+
+  interface ConfigurationObject {
+    autoRetry?: boolean;
+    credentials?: Credentials;
+    email?: string;
+    keyFilename?: string;
+    maxRetries?: number;
+    projectId?: string;
+    promise?: PromiseLibrary<any>;
+  }
+
   /**
    * The options when downloading a file.
    */
@@ -343,6 +358,7 @@ declare module "@google-cloud/storage/storage" {
    * The Storage class allows you interact with Google Cloud Storage.
    */
   class Storage {
+    constructor(options?: ConfigurationObject);
     acl: Acl;
     bucket(name: string|Bucket): Bucket;
     channel(id: string, resourceId: string): Channel;
@@ -350,4 +366,6 @@ declare module "@google-cloud/storage/storage" {
     getBuckets(query?: BucketQuery): Promise<[Bucket[]]>;
     getBucketsStream(query?: BucketQuery): Promise<[ReadStream]>;
   }
+
+  type PromiseLibrary<T> = () => PromiseLike<T>;
 }
diff --git a/types/google-libphonenumber/index.d.ts b/types/google-libphonenumber/index.d.ts
index 13659182a9..1fc2d321aa 100644
--- a/types/google-libphonenumber/index.d.ts
+++ b/types/google-libphonenumber/index.d.ts
@@ -26,7 +26,71 @@ declare namespace libphonenumber {
         UNKNOWN = -1
     }
 
-    interface PhoneNumber {
+    export module PhoneNumber {
+        export enum CountryCodeSource {
+            FROM_NUMBER_WITH_PLUS_SIGN = 1,
+            FROM_NUMBER_WITH_IDD = 5,
+            FROM_NUMBER_WITHOUT_PLUS_SIGN = 10,
+            FROM_DEFAULT_COUNTRY = 20,
+        }
+    }
+
+    export interface PhoneNumber {
+        getCountryCode(): number | undefined;
+        getCountryCodeOrDefault(): number;
+        setCountryCode(value: number): void;
+        hasCountryCode(): boolean;
+        countryCodeCount(): number;
+        clearCountryCode(): void;
+
+        getNationalNumber(): number | undefined;
+        getNationalNumberOrDefault(): number;
+        setNationalNumber(value: number): number;
+        hasNationalNumber(): boolean;
+        nationalNumberCount(): number;
+        clearNationalNumber(): void;
+
+        getExtension(): string | undefined;
+        getExtensionOrDefault(): string;
+        setExtension(value: string): void;
+        hasExtension(): boolean;
+        extensionCount(): number;
+        clearExtension(): void;
+
+        getItalianLeadingZero(): boolean | undefined;
+        getItalianLeadingZeroOrDefault(): boolean;
+        setItalianLeadingZero(value: boolean): void;
+        hasItalianLeadingZero(): boolean;
+        italianLeadingZeroCount(): number;
+        clearItalianLeadingZero(): void;
+
+        getNumberOfLeadingZeros(): number | undefined;
+        getNumberOfLeadingZerosOrDefault(): number;
+        setNumberOfLeadingZeros(value: number): void;
+        hasNumberOfLeadingZeros(): boolean;
+        numberOfLeadingZerosCount(): number;
+        clearNumberOfLeadingZeros(): void;
+
+        getRawInput(): string | undefined;
+        getRawInputOrDefault(): string;
+        setRawInput(value: string): void;
+        hasRawInput(): boolean;
+        rawInputCount(): number;
+        clearRawInput(): void;
+
+        getCountryCodeSource(): PhoneNumber.CountryCodeSource | undefined;
+        getCountryCodeSourceOrDefault(): PhoneNumber.CountryCodeSource;
+        setCountryCodeSource(value: PhoneNumber.CountryCodeSource): void;
+        hasCountryCodeSource(): boolean;
+        countryCodeSourceCount(): number;
+        clearCountryCodeSource(): void;
+
+        getPreferredDomesticCarrierCode(): string | undefined;
+        getPreferredDomesticCarrierCodeOrDefault(): string;
+        setPreferredDomesticCarrierCode(value: string): void;
+        hasPreferredDomesticCarrierCode(): boolean;
+        preferredDomesticCarrierCodeCount(): number;
+        clearPreferredDomesticCarrierCode(): void;
     }
 
     export module PhoneNumberUtil {
@@ -40,16 +104,26 @@ declare namespace libphonenumber {
 
     export class PhoneNumberUtil {
         static getInstance(): PhoneNumberUtil
-        parse(number: string, region: string): PhoneNumber;
-        isValidNumber(phoneNumber: PhoneNumber): boolean;
-        isPossibleNumber(phoneNumber: PhoneNumber): boolean;
-        isPossibleNumberWithReason(phoneNumber: PhoneNumber): PhoneNumberUtil.ValidationResult;
-        isValidNumberForRegion(phoneNumber: PhoneNumber, region: string): boolean;
-        getNumberType(phoneNumber: PhoneNumber): PhoneNumberType; 
-        getRegionCodeForNumber(phoneNumber: PhoneNumber): string;
-        isNANPACountry(regionCode: string): boolean;
         format(phoneNumber: PhoneNumber, format: PhoneNumberFormat): string;
-        parseAndKeepRawInput(number: string, regionCode: string): PhoneNumber;
+        getNddPrefixForRegion(regionCode?: string, stripNonDigits?: boolean): string | undefined;
+        getNumberType(phoneNumber: PhoneNumber): PhoneNumberType;
+        getRegionCodeForCountryCode(countryCallingCode: number): string;
+        getRegionCodeForNumber(phoneNumber: PhoneNumber): string | undefined;
+        isAlphaNumber(number: string): boolean;
+        isLeadingZeroPossible(countryCallingCode: number): boolean;
+        isNANPACountry(regionCode?: string): boolean;
+        isPossibleNumber(number: PhoneNumber): boolean;
+        isPossibleNumber(phoneNumber: PhoneNumber): boolean;
+        isPossibleNumberForType(number: PhoneNumber, type: PhoneNumberType): boolean;
+        isPossibleNumberForTypeWithReason(number: PhoneNumber, type: PhoneNumberType): PhoneNumberUtil.ValidationResult;
+        isPossibleNumberString(number: string, regionDialingFrom: string): boolean;
+        isPossibleNumberWithReason(number: PhoneNumber): PhoneNumberUtil.ValidationResult;
+        isPossibleNumberWithReason(phoneNumber: PhoneNumber): PhoneNumberUtil.ValidationResult;
+        isValidNumber(phoneNumber: PhoneNumber): boolean;
+        isValidNumberForRegion(phoneNumber: PhoneNumber, region?: string): boolean;
+        parse(number?: string, region?: string): PhoneNumber;
+        parseAndKeepRawInput(number: string, regionCode?: string): PhoneNumber;
+        truncateTooLongNumber(number: PhoneNumber): boolean;
     }
 
     export class AsYouTypeFormatter {
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index 080dbe5762..c1898a9e3f 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/istarkov/google-map-react
 // Definitions by: Honza Brecka <https://github.com/honzabrecka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -102,7 +102,7 @@ export interface Props {
   yesIWantToUseGoogleMapApiInternals?: boolean;
 }
 
-export default class GoogleMapReact extends React.Component<Props, void> {}
+export default class GoogleMapReact extends React.Component<Props> {}
 
 export interface ChildComponentProps extends Coords {
   $hover?: boolean;
diff --git a/types/google-protobuf/index.d.ts b/types/google-protobuf/index.d.ts
index 5ff6b6259d..bb1d2fb3a5 100644
--- a/types/google-protobuf/index.d.ts
+++ b/types/google-protobuf/index.d.ts
@@ -70,12 +70,12 @@ export abstract class Message {
   static computeOneofCase(msg: Message, oneof: number[]): number;
   static getWrapperField<T extends Message>(
     msg: Message,
-    ctor: {new() : T},
+    ctor: { new(): T },
     fieldNumber: number,
     required?: number): T;
   static getRepeatedWrapperField<T extends Message>(
     msg: Message,
-    ctor: {new() : T},
+    ctor: { new(): T },
     fieldNumber: number): T[];
   static setWrapperField<T extends Message>(
     msg: Message,
@@ -94,7 +94,7 @@ export abstract class Message {
     msg: Message,
     fieldNumber: number,
     value: T | undefined,
-    ctor: {new() : T},
+    ctor: { new(): T },
     index?: number): T;
   static toMap(
     field: any[],
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 0e12a8e643..e2017523ad 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -32,7 +32,7 @@ declare namespace google.maps {
     export class Map extends MVCObject {
         constructor(mapDiv: Element|null, opts?: MapOptions);
         fitBounds(bounds: LatLngBounds|LatLngBoundsLiteral): void;
-        getBounds(): LatLngBounds;
+        getBounds(): LatLngBounds|null|undefined;
         getCenter(): LatLng;
         getDiv(): Element;
         getHeading(): number;
@@ -1375,9 +1375,19 @@ declare namespace google.maps {
     }
 
     export interface DirectionsResult {
+        geocoded_waypoints: DirectionsGeocodedWaypoint[];
         routes: DirectionsRoute[];
     }
 
+    /**
+     * A single geocoded waypoint.
+     */
+    export interface DirectionsGeocodedWaypoint {
+        partial_match: boolean;
+        place_id: string;
+        types: string[];
+    }
+
     /**
      * A single route containing a set of legs in a DirectionsResult.
      * Note that though this object is "JSON-like," it is not strictly JSON,
@@ -2464,6 +2474,7 @@ declare namespace google.maps {
             placeIdOnly?: boolean;
             strictBounds?: boolean;
             types?: string[];
+            type?: string;
         }
 
         export interface AutocompletePrediction {
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index 0f02cd78af..01bd3b1ca5 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -49,8 +49,8 @@ export class GraphQLSchema {
     constructor(config: GraphQLSchemaConfig)
 
     getQueryType(): GraphQLObjectType;
-    getMutationType(): GraphQLObjectType;
-    getSubscriptionType(): GraphQLObjectType;
+    getMutationType(): GraphQLObjectType|null|undefined;
+    getSubscriptionType(): GraphQLObjectType|null|undefined;
     getTypeMap(): { [typeName: string]: GraphQLNamedType };
     getType(name: string): GraphQLType;
     getPossibleTypes(abstractType: GraphQLAbstractType): Array<GraphQLObjectType>;
diff --git a/types/griddle-react/index.d.ts b/types/griddle-react/index.d.ts
index e8f817b5a1..ea40fb2130 100644
--- a/types/griddle-react/index.d.ts
+++ b/types/griddle-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/griddlegriddle/griddle
 // Definitions by: David Hara <https://github.com/hodavidhara>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /*
 The MIT License (MIT)
@@ -162,7 +162,7 @@ export interface GriddleProps<T> {
   onRowClick?(): void;
 }
 
-declare class Griddle<T> extends React.Component<GriddleProps<T>, any> {
+declare class Griddle<T> extends React.Component<GriddleProps<T>> {
 }
 
 export default Griddle;
diff --git a/types/griddle-react/test/CustomColumnComponent.tsx b/types/griddle-react/test/CustomColumnComponent.tsx
index fff018dcfb..6e81453e95 100644
--- a/types/griddle-react/test/CustomColumnComponent.tsx
+++ b/types/griddle-react/test/CustomColumnComponent.tsx
@@ -12,7 +12,7 @@ interface MyCustomResult {
   test: string;
 }
 
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>, any> {
+class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
   render() {
     const url = "speakers/" + this.props.rowData.test + "/" + this.props.data;
     return <a href={url}>{this.props.data}</a>;
@@ -50,7 +50,7 @@ const rowMetaData = {
   }
 };
 
-class CustomColumnComponentGrid extends React.Component<any, any> {
+class CustomColumnComponentGrid extends React.Component {
   render() {
     type TypedGriddle = new () => Griddle<MyCustomResult>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/CustomFilterComponent.tsx b/types/griddle-react/test/CustomFilterComponent.tsx
index 3de40132f1..b045281868 100644
--- a/types/griddle-react/test/CustomFilterComponent.tsx
+++ b/types/griddle-react/test/CustomFilterComponent.tsx
@@ -22,7 +22,7 @@ const CustomFilterFunction = (items: ResultType[], query: string): ResultType[]
   });
 };
 
-class CustomFilterComponent extends React.Component<CustomFilterComponentProps, any> {
+class CustomFilterComponent extends React.Component<CustomFilterComponentProps> {
   query: string = '';
 
   searchChange(event: React.FormEvent<HTMLInputElement>) {
@@ -73,7 +73,7 @@ const someData: ResultType[] = [
   }
 ];
 
-class CustomFilterComponentGrid extends React.Component<any, any> {
+class CustomFilterComponentGrid extends React.Component {
   render() {
     type TypedGriddle = new () => Griddle<ResultType>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/CustomHeaderComponent.tsx b/types/griddle-react/test/CustomHeaderComponent.tsx
index af9d1d6ea3..c5256956fc 100644
--- a/types/griddle-react/test/CustomHeaderComponent.tsx
+++ b/types/griddle-react/test/CustomHeaderComponent.tsx
@@ -11,7 +11,7 @@ interface MoreCustomHeaderComponentProps extends CustomHeaderComponentProps {
   color: string;
 }
 
-class HeaderComponent extends React.Component<MoreCustomHeaderComponentProps, any> {
+class HeaderComponent extends React.Component<MoreCustomHeaderComponentProps> {
   textOnClick(e: React.FormEvent<HTMLInputElement>) {
     e.stopPropagation();
   }
@@ -80,7 +80,7 @@ const  columnMeta: Array<ColumnMetaData<ResultType>> = [
   }
 ];
 
-class CustomHeaderComponentGrid extends React.Component<any, any> {
+class CustomHeaderComponentGrid extends React.Component {
   render() {
     type TypedGriddle = new () => Griddle<ResultType>;
     const TypedGriddle = Griddle as TypedGriddle;
diff --git a/types/griddle-react/test/index.tsx b/types/griddle-react/test/index.tsx
index 3e0b1c76ff..4c977c0f97 100644
--- a/types/griddle-react/test/index.tsx
+++ b/types/griddle-react/test/index.tsx
@@ -16,7 +16,7 @@ interface MyCustomResult {
   test: string;
 }
 
-class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>, any> {
+class LinkComponent extends React.Component<CustomColumnComponentProps<MyCustomResult>> {
   render() {
     const url = "speakers/" + this.props.rowData.test + "/" + this.props.data;
     return <a href={url}>{this.props.data}</a>;
diff --git a/types/gridfs-stream/index.d.ts b/types/gridfs-stream/index.d.ts
index 1c803348ad..80f87bb6c5 100644
--- a/types/gridfs-stream/index.d.ts
+++ b/types/gridfs-stream/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/aheckmann/gridfs-stream
 // Definitions by: Lior Mualem <https://github.com/liorm/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/gridstack/gridstack-tests.ts b/types/gridstack/gridstack-tests.ts
index 9330d2019e..0ef4a7691b 100644
--- a/types/gridstack/gridstack-tests.ts
+++ b/types/gridstack/gridstack-tests.ts
@@ -17,6 +17,8 @@ var gsFromElement: GridStack = element.data("gridstack");
 if (gridstack !== gsFromElement) throw Error('These should match!');
 
 gridstack.addWidget("test", 1, 2, 3, 4, true);
+gridstack.addWidget(document.createElement('div'), 1, 2, 3, 4, true);
+gridstack.addWidget($(document.createElement('div')), 1, 2, 3, 4, true);
 gridstack.batchUpdate();
 gridstack.cellHeight();;
 gridstack.cellHeight(2);
diff --git a/types/gridstack/index.d.ts b/types/gridstack/index.d.ts
index 8d912e3a33..2406f5e08b 100644
--- a/types/gridstack/index.d.ts
+++ b/types/gridstack/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://troolee.github.io/gridstack.js/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn/>, Ricky Blankenaufulland <https://github.com/ZoolWay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface JQuery {
     gridstack (options: IGridstackOptions): JQuery;
@@ -14,14 +15,14 @@ interface GridStack {
      *
      *   Widget will be always placed even if result height is more than actual grid height. You need to use willItFit method before calling addWidget for additional check.
      *
-     * @param {string} el widget to add
+     * @param {string | HTMLElement | JQuery} el widget to add
      * @param {number} x widget position x
      * @param {number} y widget position y
      * @param {number} width  widget dimension width
      * @param {number} height widget dimension height
      * @param {boolean} autoPosition if true then x, y parameters will be ignored and widget will be places on the first available position
      */
-    addWidget(el: string, x?: number, y?: number, width?: number, height?: number, autoPosition?: boolean, minWidth?: number, maxWidth?: number, minHeight?: number, maxHeight?: number, id?: number): JQuery
+    addWidget(el: string | HTMLElement | JQuery, x?: number, y?: number, width?: number, height?: number, autoPosition?: boolean, minWidth?: number, maxWidth?: number, minHeight?: number, maxHeight?: number, id?: number): JQuery
     /**
     * Initializes batch updates. You will see no changes until commit method is called.
     */
diff --git a/types/gulp-coffeeify/index.d.ts b/types/gulp-coffeeify/index.d.ts
index 161eb9376d..2fe2e1d497 100644
--- a/types/gulp-coffeeify/index.d.ts
+++ b/types/gulp-coffeeify/index.d.ts
@@ -26,15 +26,15 @@ declare namespace coffeeify {
         transforms?: Transforms;
     }
 
-    interface Aliases {
+    type Aliases = Array<{
         cwd?: string;
         base?: string;
-    }
+    }>;
 
-    interface Transforms {
+    type Transforms = Array<{
         ext?: string;
         transform?(data: string): string;
-    }
+    }>;
 }
 
 declare var coffeeify: coffeeify.Coffeeify;
diff --git a/types/gulp-istanbul/gulp-istanbul-tests.ts b/types/gulp-istanbul/gulp-istanbul-tests.ts
index a57932419d..af15f5df54 100644
--- a/types/gulp-istanbul/gulp-istanbul-tests.ts
+++ b/types/gulp-istanbul/gulp-istanbul-tests.ts
@@ -5,7 +5,7 @@ function testFramework(): NodeJS.ReadWriteStream {
     return null;
 }
 
-gulp.task('test', function (cb: Function) {
+gulp.task('test', function (cb: () => void) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul()) // Covering files
         .pipe(gulp.dest('test-tmp/'))
@@ -17,7 +17,7 @@ gulp.task('test', function (cb: Function) {
         });
 });
 
-gulp.task('test', function (cb: Function) {
+gulp.task('test', function (cb: () => void) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul({includeUntested: true})) // Covering files
         .pipe(istanbul.hookRequire())
@@ -29,7 +29,7 @@ gulp.task('test', function (cb: Function) {
         });
 });
 
-gulp.task('test', function (cb: Function) {
+gulp.task('test', function (cb: () => void) {
     gulp.src(['lib/**/*.js', 'main.js'])
         .pipe(istanbul({includeUntested: true})) // Covering files
         .pipe(istanbul.hookRequire())
diff --git a/types/gulp-rev-replace/gulp-rev-replace-tests.ts b/types/gulp-rev-replace/gulp-rev-replace-tests.ts
index e20839ab99..2d7e5a3580 100644
--- a/types/gulp-rev-replace/gulp-rev-replace-tests.ts
+++ b/types/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -17,21 +17,21 @@ var opt = {
     distFolder: 'dist'
 }
 
-gulp.task("revision", ["dist:css", "dist:js"], () =>
+gulp.task("revision", gulp.parallel("dist:css", "dist:js", () =>
     gulp.src(["dist/**/*.css", "dist/**/*.js"])
         .pipe(rev())
         .pipe(gulp.dest(opt.distFolder))
         .pipe(rev.manifest())
         .pipe(gulp.dest(opt.distFolder))
-);
+));
 
-gulp.task("revreplace", ["revision"], () => {
+gulp.task("revreplace", gulp.parallel("revision", () => {
     var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
 
     return gulp.src(opt.srcFolder + "/index.html")
-        .pipe(revReplace({manifest: manifest}))
+        .pipe(revReplace({ manifest: manifest }))
         .pipe(gulp.dest(opt.distFolder));
-});
+}));
 
 
 function replaceJsIfMap(filename: string): string {
@@ -41,7 +41,7 @@ function replaceJsIfMap(filename: string): string {
     return filename;
 }
 
-gulp.task("revreplace", ["revision"], () => {
+gulp.task("revreplace", gulp.parallel("revision", () => {
     var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
 
     return gulp.src(opt.distFolder + '**/*.js')
@@ -51,4 +51,4 @@ gulp.task("revreplace", ["revision"], () => {
             modifyReved: replaceJsIfMap
         }))
         .pipe(gulp.dest(opt.distFolder));
-});
+}));
diff --git a/types/gulp-shell/gulp-shell-tests.ts b/types/gulp-shell/gulp-shell-tests.ts
index 3bd6d906fc..17357d6c70 100644
--- a/types/gulp-shell/gulp-shell-tests.ts
+++ b/types/gulp-shell/gulp-shell-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import shell = require('gulp-shell');
 import gulp = require('gulp');
 
@@ -29,14 +26,14 @@ var paths: any = {
 
 gulp.task('test', shell.task('mocha -R spec'));
 
-gulp.task('coverage', ['test'], shell.task('istanbul cover _mocha -- -R spec'));
-
-gulp.task('coveralls', ['coverage'], shell.task('cat coverage/lcov.info | coveralls'));
+gulp.task('coverage', gulp.parallel('test', shell.task('istanbul cover _mocha -- -R spec')));
+ 		
+gulp.task('coveralls', gulp.parallel('coverage', shell.task('cat coverage/lcov.info | coveralls')));
 
 gulp.task('lint', shell.task('eslint ' + paths.js.join(' ')));
 
-gulp.task('default', ['coverage', 'lint']);
+gulp.task('default', gulp.parallel('coverage', 'lint'));
 
 gulp.task('watch', function () {
-    gulp.watch(paths.js, ['default'])
+    gulp.watch(paths.js)
 });
diff --git a/types/gulp-sourcemaps/gulp-sourcemaps-tests.ts b/types/gulp-sourcemaps/gulp-sourcemaps-tests.ts
index 9ea2849f1e..f41612c4a5 100644
--- a/types/gulp-sourcemaps/gulp-sourcemaps-tests.ts
+++ b/types/gulp-sourcemaps/gulp-sourcemaps-tests.ts
@@ -94,4 +94,26 @@ gulp.task('javascript', function() {
             }
         }))
         .pipe(gulp.dest('public/scripts'));
+});
+
+gulp.task('javascript', function() {
+    var stream = gulp.src('src/**/*.js')
+        .pipe(sourcemaps.init())
+        .pipe(plugin1())
+        .pipe(plugin2())
+        .pipe(sourcemaps.write('../maps', {
+            clone: true
+        }))
+        .pipe(gulp.dest('public/scripts'));
+});
+
+gulp.task('javascript', function() {
+    var stream = gulp.src('src/**/*.js')
+        .pipe(sourcemaps.init())
+        .pipe(plugin1())
+        .pipe(plugin2())
+        .pipe(sourcemaps.write('../maps', {
+            clone: { contents: false }
+        }))
+        .pipe(gulp.dest('public/scripts'));
 });
\ No newline at end of file
diff --git a/types/gulp-sourcemaps/index.d.ts b/types/gulp-sourcemaps/index.d.ts
index 107c6560c1..8a038af6ec 100644
--- a/types/gulp-sourcemaps/index.d.ts
+++ b/types/gulp-sourcemaps/index.d.ts
@@ -15,11 +15,17 @@ interface WriteMapper {
     (file: string): string;
 }
 
+interface CloneOptions {
+    contents?: boolean;
+    deep?: boolean;
+}
+
 interface WriteOptions {
     addComment?: boolean;
     includeContent?: boolean;
     sourceRoot?: string | WriteMapper;
     sourceMappingURLPrefix?: string | WriteMapper;
+    clone?: boolean | CloneOptions;
 }
 
 export declare function init(opts?: InitOptions): NodeJS.ReadWriteStream;
diff --git a/types/gulp-watch/gulp-watch-tests.ts b/types/gulp-watch/gulp-watch-tests.ts
index 56a676bc65..de531257a5 100644
--- a/types/gulp-watch/gulp-watch-tests.ts
+++ b/types/gulp-watch/gulp-watch-tests.ts
@@ -7,7 +7,7 @@ gulp.task('stream', () =>
         .pipe(gulp.dest('build'))
 );
 
-gulp.task('callback', (cb: Function) =>
+gulp.task('callback', (cb: () => void) =>
     watch('css/**/*.css', () =>
         gulp.src('css/**/*.css')
             .pipe(watch('css/**/*.css'))
@@ -25,3 +25,15 @@ gulp.task('build', () => {
     gulp.src(files, { base: '..' })
         .pipe(watch(files, { base: '..' }));
 });
+
+gulp.task('build', () => {
+    var files = [
+        'app/**/*.ts',
+        'lib/**/*.ts',
+        'components/**/*.ts',
+    ];
+
+    gulp.src(files, { cwd: '..' })
+        .pipe(watch(files, { base: '..' }));
+});
+
diff --git a/types/gulp-watch/index.d.ts b/types/gulp-watch/index.d.ts
index de56633491..f9855f09a6 100644
--- a/types/gulp-watch/index.d.ts
+++ b/types/gulp-watch/index.d.ts
@@ -5,8 +5,9 @@
 
 /// <reference types="node" />
 
+import {SrcOptions} from "vinyl-fs";
 
-interface IOptions {
+interface IOptions extends SrcOptions {
     ignoreInitial?: boolean;
     events?: Array<string>;
     base?: string;
diff --git a/types/gulp/index.d.ts b/types/gulp/index.d.ts
index 2a7579ec1f..465cceb4e5 100644
--- a/types/gulp/index.d.ts
+++ b/types/gulp/index.d.ts
@@ -1,377 +1,82 @@
-// Type definitions for Gulp v4.0.x
+// Type definitions for Gulp 4.0
 // Project: http://gulpjs.com
-// Definitions by: Drew Noakes <https://drewnoakes.com>, Juan Arroyave <http://jarroyave.co>
+// Definitions by: Drew Noakes <https://drewnoakes.com>
+//                 Juan Arroyave <http://jarroyave.co>
+//                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="node" />
-/// <reference types="orchestrator" />
-/// <reference types="vinyl" />
+import * as vfs from "vinyl-fs";
+import * as chokidar from "chokidar";
+import * as Undertaker from "undertaker";
+import * as fs from "fs";
+import { Duplex } from "stream";
 
+declare namespace GulpClient {
+    type Globs = string | string[];
 
-import Orchestrator = require("orchestrator");
-import VinylFile = require("vinyl");
-declare type Strings = string|string[];
+    type TaskFunction = Undertaker.TaskFunction;
 
-declare namespace gulp {
-    interface Gulp extends Orchestrator {
-        task(name: string): never;
-        /**
-         * Define a task
-         * @param name The name of the task.
-         * @param deps An array of task names to be executed and completed before your task will run.
-         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-         * <ul>
-         *     <li>Take in a callback</li>
-         *     <li>Return a stream or a promise</li>
-         * </ul>
-         */
-        task(name: string, fn?: Orchestrator.TaskFunc): Gulp;
-        /**
-         * Define a task
-         * @param name The name of the task.
-         * @param deps An array of task names to be executed and completed before your task will run.
-         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-         * <ul>
-         *     <li>Take in a callback</li>
-         *     <li>Return a stream or a promise</li>
-         * </ul>
-         */
-        task(name: string, deps?: string[], fn?: Orchestrator.TaskFunc): Gulp;
+    /**
+     * @deprecated - Now use `TaskFunction`.
+     */
+    type TaskCallback = TaskFunction;
 
+    interface Gulp extends Undertaker {
         /**
-         * Takes a number of task names or functions and returns a function of the composed tasks or functions
-         * When the returned function is executed, the tasks or functions will be executed in series,
-         * each waiting for the prior to finish. If an error occurs, execution will stop.
-         * @param A task name, a function or an array of either.
-         * <ul>
-         *     <li>Take in a callback</li>
-         *     <li>Return a stream or a promise</li>
-         * </ul>
-         */
-        series: SeriesMethod;
-        /**
-         * Takes a number of task names or functions and returns a function of the composed tasks or functions
-         * When the returned function is executed, the tasks or functions will be executed in parallel,
-         * all being executed at the same time. If an error occurs, all execution will complete.
-         * @param A task name, a function or an array of either.
-         * <ul>
-         *     <li>Take in a callback</li>
-         *     <li>Return a stream or a promise</li>
-         * </ul>
-         */
-        parallel: ParallelMethod;
-        /**
-         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-         * @param glob Glob or array of globs to read.
-         * @param opt Options to pass to node-glob through glob-stream.
+         * Emits files matching provided glob or array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param globs Glob or array of globs to read.
+         * @param options Options to pass to node-glob through glob-stream.
          */
         src: SrcMethod;
+
         /**
          * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
          * Folders that don't exist will be created.
-         *
-         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-         * @param opt
+         * @param path The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param options
          */
         dest: DestMethod;
+
         /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param opt options, that are passed to the gaze library.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         * Functions exactly like gulp.dest, but will create symlinks instead of copying a directory.
+         * @param folder A folder path or a function that receives in a file and returns a folder path.
+         * @param options
+         */
+        symlink: typeof vfs.symlink;
+
+        /**
+         * Takes a path string, an array of path strings, a glob string or an array of glob strings as globs to watch on the filesystem.
+         * Also optionally takes options to configure the watcher and a fn to execute when a file changes.
+         * @globs A path string, an array of path strings, a glob string or an array of glob strings that indicate which files to watch for changes.
+         * @opts Options that are passed to chokidar.
+         * @fn Once async completion is signalled, if another run is queued, it will be executed.
          */
         watch: WatchMethod;
     }
 
-    interface GulpPlugin {
-        (...args: any[]): NodeJS.ReadWriteStream;
+    interface WatchOptions extends chokidar.WatchOptions {
+        /**
+         * The delay to wait before triggering the fn.
+         * Useful for waiting on many changes before doing the work on changed files, e.g. find-and-replace on many files.
+         * @default 200
+         */
+        delay?: number;
+        /**
+         * Whether or not a file change should queue the fn execution if the fn is already running. Useful for a long running fn.
+         * @default true
+         */
+        queue?: boolean;
     }
 
     interface WatchMethod {
-        /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-         */
-        (glob: string|string[], fn: (WatchCallback|string)): NodeJS.EventEmitter;
-        /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-         */
-        (glob: string|string[], fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-        /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param opt options, that are passed to the gaze library.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-         */
-        (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)): NodeJS.EventEmitter;
-        /**
-         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-         *
-         * @param glob a single glob or array of globs that indicate which files to watch for changes.
-         * @param opt options, that are passed to the gaze library.
-         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-         */
-        (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-
+        (globs: Globs, fn?: Undertaker.TaskFunction): fs.FSWatcher;
+        (globs: Globs, opts?: WatchOptions, fn?: Undertaker.TaskFunction): fs.FSWatcher;
     }
 
-    interface DestMethod {
-        /**
-         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-         * Folders that don't exist will be created.
-         *
-         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-         * @param opt
-         */
-        (outFolder: string|((file: VinylFile) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
-    }
+    type SrcMethod = typeof vfs.src;
 
-    interface SrcMethod {
-        /**
-         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-         * @param glob Glob or array of globs to read.
-         * @param opt Options to pass to node-glob through glob-stream.
-         */
-        (glob: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
-    }
-    interface SeriesMethod {
-        /**
-         * Takes a number of task names or functions and returns a function of the composed tasks or functions.
-         * When using task names, the task should already be registered.
-         * When the returned function is executed, the tasks or functions will be executed in series,
-         * each waiting for the prior to finish. If an error occurs, execution will stop.
-         * @param tasks, string, function or array of both.
-         */
-        (...tasks: string[]): NodeJS.EventEmitter;
-
-        (...tasks: Function[]): NodeJS.EventEmitter;
-
-        (task: string|string[], ...fn: Function[]): NodeJS.EventEmitter;
-
-        //TODO: TypeScript cannot express varargs followed by callback as a last argument...
-        (task1: Strings, task2: Strings, cb?: (error?: any) => any): Function;
-        (task1: Strings, task2: Strings, task3: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, task6: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-
-    }
-
-    interface ParallelMethod {
-        /**
-         * Takes a number of task names or functions and returns a function of the composed tasks or functions.
-         * When using task names, the task should already be registered.
-         * When the returned function is executed, the tasks or functions will be executed in parallel,
-         * all being executed at the same time. If an error occurs, all execution will complete.
-         * @param tasks, string, function or array of both.
-         */
-        (...tasks: string[]): NodeJS.EventEmitter;
-
-        (...tasks: Function[]): NodeJS.EventEmitter;
-
-        (task: string|string[], ...fn: Function[]): NodeJS.EventEmitter;
-
-        //TODO: TypeScript cannot express varargs followed by callback as a last argument...
-        (task1: Strings, task2: Strings, cb?: (error?: any) => any): Function;
-        (task1: Strings, task2: Strings, task3: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-        (task1: Strings, task2: Strings, task3: Strings, task4: Strings, task5: Strings, task6: Strings, cb?: (error?: any) => any): NodeJS.EventEmitter;
-
-    }
-
-    /**
-     * Options to pass to node-glob through glob-stream.
-     * Specifies two options in addition to those used by node-glob:
-     * https://github.com/isaacs/node-glob#options
-     */
-    interface SrcOptions {
-        /**
-         * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
-         * and not read the file at all.
-         * Default: <code>true</code>.
-         */
-        read?: boolean;
-
-        /**
-         * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
-         * This is useful when working with large files.
-         * Note: Plugins might not implement support for streams.
-         * Default: <code>true</code>.
-         */
-        buffer?: boolean;
-
-        /**
-         * The base path of a glob.
-         *
-         * Default is everything before a glob starts.
-         */
-        base?: string;
-
-        /**
-         * The current working directory in which to search.
-         * Defaults to process.cwd().
-         */
-        cwd?: string;
-
-        /**
-         * The place where patterns starting with / will be mounted onto.
-         * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
-         */
-        root?: string;
-
-        /**
-         * Include .dot files in normal matches and globstar matches.
-         * Note that an explicit dot in a portion of the pattern will always match dot files.
-         */
-        dot?: boolean;
-
-        /**
-         * Set to match only fles, not directories. Set this flag to prevent copying empty directories
-         */
-        nodir?: boolean;
-
-        /**
-         * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
-         * filesystem path is returned. Set this flag to disable that behavior.
-         */
-        nomount?: boolean;
-
-        /**
-         * Add a / character to directory matches. Note that this requires additional stat calls.
-         */
-        mark?: boolean;
-
-        /**
-         * Don't sort the results.
-         */
-        nosort?: boolean;
-
-        /**
-         * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
-         * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
-         * level sooner in the case of cyclical symbolic links.
-         */
-        stat?: boolean;
-
-        /**
-         * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
-         * Set the silent option to true to suppress these warnings.
-         */
-        silent?: boolean;
-
-        /**
-         * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
-         * search of other matches. Set the strict option to raise an error in these cases.
-         */
-        strict?: boolean;
-
-        /**
-         * See cache property above. Pass in a previously generated cache object to save some fs calls.
-         */
-        cache?: boolean;
-
-        /**
-         * A cache of results of filesystem information, to prevent unnecessary stat calls.
-         * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
-         * options object of another, if you know that the filesystem will not change between calls.
-         */
-        statCache?: boolean;
-
-        /**
-         * Perform a synchronous glob search.
-         */
-        sync?: boolean;
-
-        /**
-         * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
-         * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
-         */
-        nounique?: boolean;
-
-        /**
-         * Set to never return an empty set, instead returning a set containing the pattern itself.
-         * This is the default in glob(3).
-         */
-        nonull?: boolean;
-
-        /**
-         * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
-         * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
-         */
-        nocase?: boolean;
-
-        /**
-         * Set to enable debug logging in minimatch and glob.
-         */
-        debug?: boolean;
-
-        /**
-         * Set to enable debug logging in glob, but not minimatch.
-         */
-        globDebug?: boolean;
-    }
-
-    interface DestOptions {
-        /**
-         * The output folder. Only has an effect if provided output folder is relative.
-         * Default: process.cwd()
-         */
-        cwd?: string;
-
-        /**
-         * Octal permission string specifying mode for any folders that need to be created for output folder.
-         * Default: 0777.
-         */
-        mode?: string;
-    }
-
-    /**
-     * Options that are passed to <code>gaze</code>.
-     * https://github.com/shama/gaze
-     */
-    interface WatchOptions {
-        /** Interval to pass to fs.watchFile. */
-        interval?: number;
-        /** Delay for events called in succession for the same file/event. */
-        debounceDelay?: number;
-        /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
-        mode?: string;
-        /** The current working directory to base file patterns from. Default is process.cwd().. */
-        cwd?: string;
-    }
-
-    interface WatchEvent {
-        /** The type of change that occurred, either added, changed or deleted. */
-        type: string;
-        /** The path to the file that triggered the event. */
-        path: string;
-    }
-
-    /**
-     * Callback to be called on each watched file change.
-     */
-    interface WatchCallback {
-        (event: WatchEvent): void;
-    }
-
-    interface TaskCallback {
-        /**
-         * Defines a task.
-         * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
-         * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
-         */
-        (cb?: (err?: any) => void): any;
-    }
+    type DestMethod = typeof vfs.dest;
 }
 
-declare var gulp: gulp.Gulp;
-
-export = gulp;
+declare const GulpClient: GulpClient.Gulp;
+export = GulpClient;
diff --git a/types/gulp/test/index.ts b/types/gulp/test/index.ts
new file mode 100644
index 0000000000..40807f890a
--- /dev/null
+++ b/types/gulp/test/index.ts
@@ -0,0 +1,181 @@
+import * as gulp from 'gulp';
+import * as undertaker from 'undertaker';
+import * as registry from 'undertaker-registry';
+import * as del from "del";
+
+const minify: () => any = () => { };
+const jade: () => any = () => { };
+const someplugin: () => any = () => { };
+const promisedDel: (list: string[]) => any = (list) => { };
+
+gulp.src('client/templates/*.jade')
+    .pipe(jade())
+    .pipe(minify())
+    .pipe(gulp.dest('build/minified_templates'));
+
+// exclude every JS file that starts with a b except bad.js
+gulp.src(['*.js', '!b*.js', 'bad.js']);
+
+// Matches 'client/js/somedir/somefile.js' and resolves `base` to `client/js/`
+gulp.src('client/js/**/*.js')
+    .pipe(minify())
+    .pipe(gulp.dest('build'));  // Writes 'build/somedir/somefile.js'
+
+gulp.src('client/js/**/*.js', { base: 'client' })
+    .pipe(minify())
+    .pipe(gulp.dest('build'));  // Writes 'build/js/somedir/somefile.js'
+
+// Emits an error if app/scripts.js doesn't exist
+gulp.src('app/scripts.js');
+
+// Won't emit an error
+gulp.src('app/scripts.js', { allowEmpty: true });
+
+gulp.src('./client/templates/*.jade')
+    .pipe(jade())
+    .pipe(gulp.dest('./build/templates'))
+    .pipe(minify())
+    .pipe(gulp.dest('./build/minified_templates'));
+
+gulp.task(() => {
+    // Do stuff
+});
+
+// someTask will be the registered task function
+const someTask = gulp.task('someTask');
+
+const someNextTask = () => {
+    return gulp.src(['some/glob/**/*.ext']).pipe(someplugin());
+};
+
+gulp.task(someTask);
+
+let foo: gulp.TaskFunction = () => { };
+foo.name === 'foo'; // true
+
+const bar: gulp.TaskFunction = () => { };
+bar.name === ''; // true
+
+bar.name = 'bar';
+bar.name === ''; // true
+
+let test: gulp.TaskFunction = (done) => {
+    done();
+};
+
+gulp.task(test);
+
+gulp.task('clean', (done) => {
+    del(['.build/'], done);
+});
+
+gulp.task('somename', () => {
+    return gulp.src('client/**/*.js')
+        .pipe(minify())
+        .pipe(gulp.dest('build'));
+});
+
+gulp.task('clean', () => {
+    return new Promise((resolve, reject) => {
+        del(['.build/'], (err: any) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve();
+            }
+        });
+    });
+});
+
+gulp.task('clean', () => {
+    return promisedDel(['.build/']);
+});
+
+gulp.task('one', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('two', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('default', gulp.parallel('one', 'two', (done) => {
+    // do more stuff
+    done();
+}));
+
+gulp.task('one', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('two', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('default', gulp.series('one', 'two', (done) => {
+    // do more stuff
+    done();
+}));
+
+gulp.watch('js/**/*.js', gulp.parallel('concat', 'uglify'));
+
+const watcher = gulp.watch('js/**/*.js', gulp.parallel('concat', 'uglify'));
+// watcher.close
+watcher.on('change', (path, stats) => {
+    console.log('File ' + path + ' was changed');
+});
+
+watcher.on('unlink', (path: string) => {
+    console.log('File ' + path + ' was removed');
+});
+
+gulp.task('one', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('two', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('three', (done) => {
+    // do stuff
+    done();
+});
+
+gulp.task('four', gulp.series('one', 'two'));
+
+gulp.task('five',
+    gulp.series('four',
+        gulp.parallel('three', (done) => {
+            // do more stuff
+            done();
+        })
+    )
+);
+
+gulp.tree();
+
+gulp.tree({ deep: true });
+
+// gulpfile.js
+
+const companyTasks = {} as registry;
+
+gulp.registry(companyTasks);
+
+gulp.task('one', gulp.parallel('someCompanyTask', (done) => {
+    console.log('in task one');
+    done();
+}));
+
+gulp.symlink("path/to/dir");
+
+gulp.symlink(() => {
+    return "resolved/path/to/dir";
+});
diff --git a/types/gulp/tsconfig.json b/types/gulp/tsconfig.json
index 01afedbf29..08bee78c82 100644
--- a/types/gulp/tsconfig.json
+++ b/types/gulp/tsconfig.json
@@ -2,24 +2,23 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
-        "paths": {
-            "q": [ "q/v0" ]
-        },
+        "jsx": "react",
         "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
     },
     "files": [
         "index.d.ts",
-        "gulp-tests.ts"
+        "test/index.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/gulp/tslint.json b/types/gulp/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/gulp/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/gulp/gulp-tests.ts b/types/gulp/v3/gulp-tests.ts
similarity index 82%
rename from types/gulp/gulp-tests.ts
rename to types/gulp/v3/gulp-tests.ts
index 09aad27a7a..9660b0658a 100644
--- a/types/gulp/gulp-tests.ts
+++ b/types/gulp/v3/gulp-tests.ts
@@ -1,31 +1,32 @@
 import gulp = require("gulp");
+import browserSync = require("browser-sync");
 
 var typescript: gulp.GulpPlugin = null; // this would be the TypeScript compiler
 var jasmine: gulp.GulpPlugin = null; // this would be the jasmine test runner
 
-gulp.task('compile', function() {
+gulp.task('compile', function()
+{
     gulp.src("**/*.ts")
         .pipe(typescript())
         .pipe(gulp.dest('out'))
 });
 
-gulp.task('compile2', function(callback: (err?: any) => void) {
+gulp.task('compile2', function(callback: (err?: any) => void)
+{
     gulp.src("**/*.ts")
         .pipe(typescript())
         .pipe(gulp.dest('out'))
         .on('end', callback);
 });
 
-gulp.task('test', ['compile', 'compile2'], function() {
+gulp.task('test', ['compile', 'compile2'], function()
+{
     gulp.src("out/test/**/*.js")
         .pipe(jasmine());
 });
 
 gulp.task('default', ['compile', 'test']);
 
-gulp.task('another', ['with1', 'with2'])
-    .task('some', ['other1', 'other2'], function(cb) { cb(null); })
-    .task('last', function() { });
 
 
 var opts = {};
@@ -60,7 +61,8 @@ var watcher = gulp.watch('*.html', event => {
 });
 
 gulp.task('serve', ['compile'], () => {
-    gulp.watch(['*.html', '*.ts'], ['compile', () => { return "data"; }]);
+    var browser = browserSync.create();
+    gulp.watch(['*.html', '*.ts'], ['compile', browser.reload]);
 });
 
 gulp.start('test', 'compile');
diff --git a/types/gulp/v3/index.d.ts b/types/gulp/v3/index.d.ts
new file mode 100644
index 0000000000..4abdba21ed
--- /dev/null
+++ b/types/gulp/v3/index.d.ts
@@ -0,0 +1,308 @@
+// Type definitions for Gulp 3.8
+// Project: http://gulpjs.com
+// Definitions by: Drew Noakes <https://drewnoakes.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="orchestrator" />
+/// <reference types="vinyl" />
+
+import Orchestrator = require('orchestrator');
+import VinylFile = require('vinyl');
+
+declare namespace gulp {
+    interface Gulp extends Orchestrator {
+        task(name: string): never;
+        /**
+         * Define a task
+         * @param name The name of the task.
+         * @param deps An array of task names to be executed and completed before your task will run.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
+         */
+        task(name: string, fn?: Orchestrator.TaskFunc): Gulp;
+        /**
+         * Define a task
+         * @param name The name of the task.
+         * @param deps An array of task names to be executed and completed before your task will run.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
+         */
+        task(name: string, deps?: string[], fn?: Orchestrator.TaskFunc): Gulp;
+
+        /**
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
+         */
+        src: SrcMethod;
+        /**
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
+         */
+        dest: DestMethod;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        watch: WatchMethod;
+    }
+
+    interface GulpPlugin {
+        (...args: any[]): NodeJS.ReadWriteStream;
+    }
+
+    interface WatchMethod {
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+
+    }
+
+    interface DestMethod {
+        /**
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
+         */
+        (outFolder: string | ((file: VinylFile) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
+    }
+
+    interface SrcMethod {
+        /**
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
+         */
+        (glob: string | string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+    }
+
+    /**
+     * Options to pass to node-glob through glob-stream.
+     * Specifies two options in addition to those used by node-glob:
+     * https://github.com/isaacs/node-glob#options
+     */
+    interface SrcOptions {
+        /**
+         * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
+         * and not read the file at all.
+         * Default: <code>true</code>.
+         */
+        read?: boolean;
+
+        /**
+         * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
+         * This is useful when working with large files.
+         * Note: Plugins might not implement support for streams.
+         * Default: <code>true</code>.
+         */
+        buffer?: boolean;
+
+        /**
+         * The base path of a glob.
+         *
+         * Default is everything before a glob starts.
+         */
+        base?: string;
+
+        /**
+         * The current working directory in which to search.
+         * Defaults to process.cwd().
+         */
+        cwd?: string;
+
+        /**
+         * The place where patterns starting with / will be mounted onto.
+         * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
+         */
+        root?: string;
+
+        /**
+         * Include .dot files in normal matches and globstar matches.
+         * Note that an explicit dot in a portion of the pattern will always match dot files.
+         */
+        dot?: boolean;
+
+        /**
+         * Set to match only fles, not directories. Set this flag to prevent copying empty directories
+         */
+        nodir?: boolean;
+
+        /**
+         * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
+         * filesystem path is returned. Set this flag to disable that behavior.
+         */
+        nomount?: boolean;
+
+        /**
+         * Add a / character to directory matches. Note that this requires additional stat calls.
+         */
+        mark?: boolean;
+
+        /**
+         * Don't sort the results.
+         */
+        nosort?: boolean;
+
+        /**
+         * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
+         * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
+         * level sooner in the case of cyclical symbolic links.
+         */
+        stat?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
+         * Set the silent option to true to suppress these warnings.
+         */
+        silent?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
+         * search of other matches. Set the strict option to raise an error in these cases.
+         */
+        strict?: boolean;
+
+        /**
+         * See cache property above. Pass in a previously generated cache object to save some fs calls.
+         */
+        cache?: boolean;
+
+        /**
+         * A cache of results of filesystem information, to prevent unnecessary stat calls.
+         * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
+         * options object of another, if you know that the filesystem will not change between calls.
+         */
+        statCache?: boolean;
+
+        /**
+         * Perform a synchronous glob search.
+         */
+        sync?: boolean;
+
+        /**
+         * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
+         * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
+         */
+        nounique?: boolean;
+
+        /**
+         * Set to never return an empty set, instead returning a set containing the pattern itself.
+         * This is the default in glob(3).
+         */
+        nonull?: boolean;
+
+        /**
+         * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
+         * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
+         */
+        nocase?: boolean;
+
+        /**
+         * Set to enable debug logging in minimatch and glob.
+         */
+        debug?: boolean;
+
+        /**
+         * Set to enable debug logging in glob, but not minimatch.
+         */
+        globDebug?: boolean;
+    }
+
+    interface DestOptions {
+        /**
+         * The output folder. Only has an effect if provided output folder is relative.
+         * Default: process.cwd()
+         */
+        cwd?: string;
+
+        /**
+         * Octal permission string specifying mode for any folders that need to be created for output folder.
+         * Default: 0777.
+         */
+        mode?: string;
+    }
+
+    /**
+     * Options that are passed to <code>gaze</code>.
+     * https://github.com/shama/gaze
+     */
+    interface WatchOptions {
+        /** Interval to pass to fs.watchFile. */
+        interval?: number;
+        /** Delay for events called in succession for the same file/event. */
+        debounceDelay?: number;
+        /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
+        mode?: string;
+        /** The current working directory to base file patterns from. Default is process.cwd().. */
+        cwd?: string;
+    }
+
+    interface WatchEvent {
+        /** The type of change that occurred, either added, changed or deleted. */
+        type: string;
+        /** The path to the file that triggered the event. */
+        path: string;
+    }
+
+    /**
+     * Callback to be called on each watched file change.
+     */
+    interface WatchCallback {
+        (event: WatchEvent): void;
+    }
+
+    interface TaskCallback {
+        /**
+         * Defines a task.
+         * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
+         * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
+         */
+        (cb?: (err?: any) => void): any;
+    }
+}
+
+declare var gulp: gulp.Gulp;
+
+export = gulp;
diff --git a/types/gulp/v3/tsconfig.json b/types/gulp/v3/tsconfig.json
new file mode 100644
index 0000000000..242192adaa
--- /dev/null
+++ b/types/gulp/v3/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "gulp": [
+                "gulp/v3"
+            ],
+            "q": [
+                "q/v0"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-tests.ts"
+    ]
+}
diff --git a/types/h2o2/h2o2-tests.ts b/types/h2o2/h2o2-tests.ts
index f8e88c5c9b..48b05b8aa3 100644
--- a/types/h2o2/h2o2-tests.ts
+++ b/types/h2o2/h2o2-tests.ts
@@ -95,7 +95,7 @@ server.route({
                 Wreck.read(res, { json: true }, function (err, payload) {
 
                     console.log('some payload manipulation if you want to.')
-                    reply(payload).headers = res.headers;
+                    reply(payload).headers = res.headers as any;
                 });
             }
         }
@@ -157,7 +157,7 @@ server.route({
                 Wreck.read(res, { json: true }, function (err: null | Boom.BoomError, payload: any) {
 
                     console.log('some payload manipulation if you want to.')
-                    reply(payload).headers = res.headers;
+                    reply(payload).headers = res.headers as any;
                 });
             }
         }
diff --git a/types/h2o2/index.d.ts b/types/h2o2/index.d.ts
index a1a3680e5c..7ca3ccb85f 100644
--- a/types/h2o2/index.d.ts
+++ b/types/h2o2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/catbox
 // Definitions by: Jason Swearingen <http://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/halogen/index.d.ts b/types/halogen/index.d.ts
index 35337e7e9f..216281972e 100644
--- a/types/halogen/index.d.ts
+++ b/types/halogen/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yuanyan/halogen
 // Definitions by: Vincent Rouffiat <https://github.com/steller>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as react from "react";
 
@@ -34,50 +34,50 @@ export interface RadiusLoaderProps extends MarginLoaderProps<string> {
 /**
  * React components
  */
-export type PulseLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type PulseLoader = react.Component<MarginLoaderProps<string>>;
 export const PulseLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type RotateLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type RotateLoader = react.Component<MarginLoaderProps<string>>;
 export const RotateLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type BeatLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type BeatLoader = react.Component<MarginLoaderProps<string>>;
 export const BeatLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type RiseLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type RiseLoader = react.Component<MarginLoaderProps<string>>;
 export const RiseLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type SyncLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type SyncLoader = react.Component<MarginLoaderProps<string>>;
 export const SyncLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type GridLoader = react.Component<MarginLoaderProps<string>, {}>;
+export type GridLoader = react.Component<MarginLoaderProps<string>>;
 export const GridLoader: react.ComponentClass<MarginLoaderProps<string>>;
 
-export type ClipLoader = react.Component<SizeLoaderProps, {}>;
+export type ClipLoader = react.Component<SizeLoaderProps>;
 export const ClipLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type SquareLoader = react.Component<SizeLoaderProps, {}>;
+export type SquareLoader = react.Component<SizeLoaderProps>;
 export const SquareLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type DotLoader = react.Component<SizeLoaderProps, {}>;
+export type DotLoader = react.Component<SizeLoaderProps>;
 export const DotLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type PacmanLoader = react.Component<MarginLoaderProps<number>, {}>;
+export type PacmanLoader = react.Component<MarginLoaderProps<number>>;
 export const PacmanLoader: react.ComponentClass<MarginLoaderProps<number>>;
 
-export type MoonLoader = react.Component<SizeLoaderProps, {}>;
+export type MoonLoader = react.Component<SizeLoaderProps>;
 export const MoonLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type RingLoader = react.Component<SizeLoaderProps, {}>;
+export type RingLoader = react.Component<SizeLoaderProps>;
 export const RingLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type BounceLoader = react.Component<SizeLoaderProps, {}>;
+export type BounceLoader = react.Component<SizeLoaderProps>;
 export const BounceLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type SkewLoader = react.Component<SizeLoaderProps, {}>;
+export type SkewLoader = react.Component<SizeLoaderProps>;
 export const SkewLoader: react.ComponentClass<SizeLoaderProps>;
 
-export type FadeLoader = react.Component<RadiusLoaderProps, {}>;
+export type FadeLoader = react.Component<RadiusLoaderProps>;
 export const FadeLoader: react.ComponentClass<RadiusLoaderProps>;
 
-export type ScaleLoader = react.Component<RadiusLoaderProps, {}>;
+export type ScaleLoader = react.Component<RadiusLoaderProps>;
 export const ScaleLoader: react.ComponentClass<RadiusLoaderProps>;
diff --git a/types/halogen/test/clip-loader.tsx b/types/halogen/test/clip-loader.tsx
index 02f0dd232c..af3a72762f 100644
--- a/types/halogen/test/clip-loader.tsx
+++ b/types/halogen/test/clip-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.ClipLoader />
@@ -9,7 +9,7 @@ class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}
   }
 }
 
-class HalogenTests_ClipLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_ClipLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.ClipLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="bottom" size="200px" />
diff --git a/types/halogen/test/fade-loader.tsx b/types/halogen/test/fade-loader.tsx
index deeae1ce95..23fb8fa3ca 100644
--- a/types/halogen/test/fade-loader.tsx
+++ b/types/halogen/test/fade-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.FadeLoader />
@@ -9,7 +9,7 @@ class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}
   }
 }
 
-class HalogenTests_FadeLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_FadeLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.FadeLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle"
diff --git a/types/halogen/test/pacman-loader.tsx b/types/halogen/test/pacman-loader.tsx
index 7852026580..86aeda7172 100644
--- a/types/halogen/test/pacman-loader.tsx
+++ b/types/halogen/test/pacman-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.PacmanLoader />
@@ -9,7 +9,7 @@ class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<
   }
 }
 
-class HalogenTests_PacmanLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_PacmanLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.PacmanLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin={10} size={200} />
diff --git a/types/halogen/test/rotate-loader.tsx b/types/halogen/test/rotate-loader.tsx
index a5325a4962..38274aefea 100644
--- a/types/halogen/test/rotate-loader.tsx
+++ b/types/halogen/test/rotate-loader.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Halogen from "halogen";
 
-class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.RotateLoader />
@@ -9,7 +9,7 @@ class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<
   }
 }
 
-class HalogenTests_RotateLoader_withAllProps extends React.Component<React.Props<{}>, {}> {
+class HalogenTests_RotateLoader_withAllProps extends React.Component<React.Props<{}>> {
   render() {
     return (
       <Halogen.RotateLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin="10px" size="100px" />
diff --git a/types/hammerjs/v1/index.d.ts b/types/hammerjs/v1/index.d.ts
index e01ea87384..690d079041 100644
--- a/types/hammerjs/v1/index.d.ts
+++ b/types/hammerjs/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://eightmedia.github.com/hammer.js/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Drew Noakes <https://drewnoakes.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/handlebars/index.d.ts b/types/handlebars/index.d.ts
index d3ab2c80e3..71cc0a2cfe 100644
--- a/types/handlebars/index.d.ts
+++ b/types/handlebars/index.d.ts
@@ -15,6 +15,7 @@ declare namespace Handlebars {
 
     export function K(): void;
     export function createFrame(object: any): any;
+    export function blockParams(obj: any[], ids: any[]): any[];
     export function Exception(message: string): void;
     export function log(level: number, obj: any): void;
     export function parse(input: string): hbs.AST.Program;
@@ -142,7 +143,8 @@ declare namespace hbs {
 
     namespace Utils {
         function escapeExpression(str: string): string;
-        function createFrame(obj: Object): Object;
+        function createFrame(object: any): any;
+        function blockParams(obj: any[], ids: any[]): any[];
         function isEmpty(obj: any) : boolean;
         function extend(obj: any, ...source: any[]): any;
         function toString(obj: any): string;
diff --git a/types/hapi-auth-basic/index.d.ts b/types/hapi-auth-basic/index.d.ts
index 23b06de111..07c3c8cc20 100644
--- a/types/hapi-auth-basic/index.d.ts
+++ b/types/hapi-auth-basic/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/hapi-auth-basic
 // Definitions by: AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Hapi from 'hapi';
 
diff --git a/types/hapi-decorators/index.d.ts b/types/hapi-decorators/index.d.ts
index 2933945e64..e4d7c40991 100644
--- a/types/hapi-decorators/index.d.ts
+++ b/types/hapi-decorators/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/knownasilya/hapi-decorators
 // Definitions by: Ken Howard <http://github.com/kenhowardpdx>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as hapi from 'hapi';
 import * as Joi from 'joi';
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 8dca27d66e..f0ed602864 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/hapi
 // Definitions by: Jason Swearingen <http://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +                                                                           +
@@ -678,6 +678,10 @@ export interface CatboxServerCacheConfiguration extends Catbox.PolicyOptions {
      * [See docs](https://hapijs.com/api/16.1.1#servercacheprovisionoptions-callback) example code includes use of `name` option.  But server.cache.provision of `options` says "same as the server cache configuration options.".
      */
     name?: string;
+    /**
+     * Additional options to be passed to the Catbox strategy
+     */
+    [s: string]: any;
 }
 
 /**
@@ -1256,13 +1260,14 @@ export interface RoutingTableEntry {
 
 /**
  * [See docs](https://hapijs.com/api/16.1.1#servertablehost) > return value
+ * For source [See source](https://github.com/hapijs/hapi/blob/v16.1.1/lib/route.js#L71)
  */
 export interface Route {
     /**
      * the route config with defaults applied.
      * TODO check type of RouteConfiguration here is correct
      */
-    settings: RouteConfiguration;
+    settings: RouteAdditionalConfigurationOptions;
     /**
      * the HTTP method in lower case.
      * TODO, check if it can contain 'head' or not.
@@ -1270,6 +1275,18 @@ export interface Route {
     method: HTTP_METHODS_PARTIAL_lowercase;
     /** the route path. */
     path: string;
+
+    params: string[];
+
+    connection: ServerConnection;
+
+    fingerprint: string;
+
+    plugin?: any;
+
+    public: RoutePublicInterface;
+
+    server: Server;
 }
 
 /**
@@ -1310,7 +1327,7 @@ export interface RoutePrerequisiteObjects {
 /**
  * For context see RouteAdditionalConfigurationOptions > response
  */
-export interface RouteResponseConfigurationObject {
+export interface RouteResponseConfigurationObject<ValidationOptions = JoiValidationOptions> {
     /** the default HTTP status code when the payload is empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time or response transmission (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
     emptyStatusCode?: number;
     /**
@@ -1326,16 +1343,20 @@ export interface RouteResponseConfigurationObject {
     failAction?: 'error' | 'log' | ((request: Request, reply: ReplyWithContinue, source: string, error: Boom.BoomError) => void);
     /** if true, applies the validation rule changes to the response payload. Defaults to false. */
     modify?: boolean;
-    /** options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is available [here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback) ). Defaults to no options. */
-    options?: JoiValidationOptions;
+    /**
+     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is available [here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback) ).
+     * If a custom validation function (see `schema` or `status` below) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
+     * Defaults to no options.
+     */
+    options?: ValidationOptions;
     /** if false, payload range support is disabled. Defaults to true. */
     ranges?: boolean;
     /** the percent of response payloads validated (0 - 100). Set to 0 to disable all validation. Defaults to 100 (all response payloads). */
     sample?: number;
     /** the default response payload validation rules (for all non-error responses) */
-    schema?: RouteResponseConfigurationScheme;
+    schema?: RouteResponseConfigurationScheme<ValidationOptions>;
     /** HTTP status-code-specific payload validation rules. The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema. If a response status code is not present in the status object, the schema definition is used, except for errors which are not validated by default. */
-    status?: Dictionary<RouteResponseConfigurationScheme>;
+    status?: Dictionary<RouteResponseConfigurationScheme<ValidationOptions>>;
 }
 
 /**
@@ -1343,27 +1364,54 @@ export interface RouteResponseConfigurationObject {
  *  * true - any payload allowed (no validation performed). This is the default.
  *  * false - no payload allowed.
  *  * a Joi validation object. This will receive the request's headers, params, query, payload, and auth credentials and isAuthenticated flags as context.
- *  * a validation function using the signature function(value, options, next) where:
- *      * value - the object containing the response object.
- *      * options - the server validation options, merged with an object containing the request's headers, params, payload, and auth credentials object and isAuthenticated flag.
- *      * next(err) - the callback function called when validation is completed.
+ *  * a validation function
+ *
  * TODO check JoiValidationObject is correct for "a Joi validation object"
  *
  * For context see RouteAdditionalConfigurationOptions > response > schema
  * and
  * For context see RouteAdditionalConfigurationOptions > response > status
  */
-export type RouteResponseConfigurationScheme = boolean | JoiValidationObject | ValidationFunctionForRouteResponse;
+export type RouteResponseConfigurationScheme<ValidationOptions> = boolean | JoiValidationObject | ValidationFunctionForRouteResponse<ValidationOptions>;
 
 /**
  * see RouteResponseConfigurationScheme
  *
- * TODO check `value: Response` is correct as it says "**the object containing** the response object." not just "the response object".
- * TODO check `options: JoiValidationOptions` is correct
- * Also see ValidationFunctionForRouteValidate
+ * a validation function using the signature function(value, options, next) where:
+ *  * value - the value of the response passed to `reply(value)` in the handler.
+ *  * options - the server validation options, merged with an object containing the request's headers, params, payload, and auth credentials object and `isAuthenticated` flag.
+ *  * next([err, [value]]) - the callback function called when validation is completed.  `value` will be used as the response value when `err` is falsy, when `value` is not `undefined`, and when `route.settings.response.modify` is `true`.   If the response is already a `Boom` error it will be set as its `message` value.
  */
-export interface ValidationFunctionForRouteResponse {
-    (value: Response, options: JoiValidationOptions, next: ContinuationFunction): void;
+export interface ValidationFunctionForRouteResponse<ValidationOptions = {}> {
+    (value: any, options: RouteResponseValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
+}
+
+/**
+ * A context for route input validation via a Joi schema or validation function.
+ *
+ * This object is merged with the route response options and passed into the validation function.
+ *
+ * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L217
+ */
+export interface RouteResponseValidationContext {
+    context: {
+        /** The request headers */
+        headers: Dictionary<string>;
+        /** The request path parameters */
+        params: any;
+        /** The request query parameters */
+        query: any;
+        /** The request payload parameters */
+        payload: any;
+
+        /** Partial request authentication information */
+        auth: {
+            /** true if the request has been successfully authenticated, otherwise false. */
+            isAuthenticated: boolean;
+            /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+            credentials: AuthenticatedCredentials;
+        };
+    }
 }
 
 /**
@@ -1399,7 +1447,7 @@ export interface RouteSecurityConfigurationObject {
  * For context see RouteAdditionalConfigurationOptions > validate
  * TODO check JoiValidationObject is correct for "a Joi validation object"
  */
-export interface RouteValidationConfigurationObject {
+export interface RouteValidationConfigurationObject<ValidationOptions = JoiValidationOptions> {
     /**
      * validation rules for incoming request headers (note that all header field names must be in lowercase to match the headers normalized by node). Values allowed:
      *  * true - any headers allowed (no validation performed). This is the default.
@@ -1408,25 +1456,25 @@ export interface RouteValidationConfigurationObject {
      *  * a validation function using the signature function(value, options, next) where:
      *      * value - the object containing the request headers.
      *      * options - the server validation options.
-     *      * next(err, value) - the callback function called when validation is completed.
+     *      * next(err, value) - the callback function called when validation is completed.  `value` will be used as the `headers` value when `err` is falsy.  If `next` is called with `undefined` or no arguments then the original value of `value` will be used.
      */
-    headers?: boolean | JoiValidationObject | ValidationFunctionForRouteValidate;
+    headers?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
     /**
      * validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params. Values allowed:
      * Same as `headers`, see above.
      */
-    params?: boolean | JoiValidationObject | ValidationFunctionForRouteValidate;
+    params?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
     /**
      * validation rules for an incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs and stored in request.query prior to validation. Values allowed:
      * Same as `headers`, see above.
      */
-    query?: boolean | JoiValidationObject | ValidationFunctionForRouteValidate;
+    query?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
     /**
      * validation rules for an incoming request payload (request body). Values allowed:
      * Same as `headers`, see above, with the addition that:
      *  * a Joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are supported, it must be explicitly defined by setting the payload value to a joi schema with null allowed (e.g. Joi.object({ /* keys here  * / }).allow(null)).
      */
-    payload?: boolean | JoiValidationObject | ValidationFunctionForRouteValidate;
+    payload?: boolean | JoiValidationObject | ValidationFunctionForRouteInput<ValidationOptions>;
     /** an optional object with error fields copied into every validation error response. */
     errorFields?: any;
     /**
@@ -1437,24 +1485,46 @@ export interface RouteValidationConfigurationObject {
      *  * a custom error handler function with the signature function(request, reply, source, error) see RouteFailFunction
      */
     failAction?: 'error' | 'log' | 'ignore' | RouteFailFunction;
-    /** options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is [available here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback)). Defaults to no options. */
-    options?: JoiValidationOptions;
+    /**
+     * options to pass to Joi. Useful to set global options such as stripUnknown or abortEarly (the complete list is [available here](https://github.com/hapijs/joi/blob/master/API.md#validatevalue-schema-options-callback)).
+     * If a custom validation function (see `headers`, `params`, `query`, or `payload` above) is defined then `options` can an arbitrary object that will be passed to this function as the second parameter.
+     * Defaults to no options.
+     */
+    options?: ValidationOptions;
 }
 
 /**
  * a validation function using the signature function(value, options, next) where:
- * For context see RouteAdditionalConfigurationOptions > validate (IRouteValidationConfigurationObject)
+ * For context see RouteAdditionalConfigurationOptions > validate (RouteValidationConfigurationObject)
  *
- * TODO check `value: Response` is correct as it says "**the object containing** the response object." not just "the response object".
- * TODO check `options: JoiValidationOptions` is correct
- * TODO type of the returned value?
  * Also see ValidationFunctionForRouteResponse
- * @param value - the object containing the request headers.
+ * @param value - the object containing the request headers, query, path params or payload.
  * @param options - the server validation options.
- * @param next(err, value) - the callback function called when validation is completed.
+ * @param next([err, [value]]) - the callback function called when validation is completed.
  */
-export interface ValidationFunctionForRouteValidate {
-    (value: Response, options: JoiValidationOptions, next: ContinuationValueFunction): void;
+export interface ValidationFunctionForRouteInput<ValidationOptions = {}> {
+    (value: any, options: RouteInputValidationContext & ValidationOptions, next: ContinuationValueFunction): void;
+}
+
+/**
+ * A context for route input validation via a Joi schema or validation function.
+ *
+ * This object is merged with the route validation options and passed into the validation function.
+ *
+ * See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L122
+ */
+export interface RouteInputValidationContext {
+    context: {
+        // These are only set when *not* validating the respective source (e.g. params, query and payload are set when validating headers):
+        // See https://github.com/hapijs/hapi/blob/v16.1.1/lib/validation.js#L132
+        headers?: Dictionary<string>;
+        params?: any;
+        query?: any;
+        payload?: any;
+
+        /** The request authentication information */
+        auth: RequestAuthenticationInformation;
+    }
 }
 
 /**
@@ -1565,8 +1635,8 @@ export interface ServerConnection {
     /** Described in server.inject [See docs](https://hapijs.com/api/16.1.1#serverinjectoptions-callback) */
     inject(options: string | InjectedRequestOptions, callback: (res: InjectedResponseObject) => void): void;
     inject(options: string | InjectedRequestOptions, ): Promise<InjectedResponseObject>;
-    /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#servertablehost) */
-    table(host?: string): RoutingTableEntry;
+    /** Mentioned but not documented under server.connections [See docs](https://hapijs.com/api/16.1.1#serverconnections) */
+    table(host?: string): Route[];
     /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#serverlookupid) */
     lookup(id: string): RoutePublicInterface | null;
     /** Described in server.table [See docs](https://hapijs.com/api/16.1.1#servermatchmethod-path-host) */
@@ -1795,18 +1865,7 @@ export class Request extends Podium {
     /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name]. */
     app: any;
     /** authentication information */
-    auth: {
-        /** true if the request has been successfully authenticated, otherwise false. */
-        isAuthenticated: boolean;
-        /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
-        credentials: any;
-        /** an artifact object received from the authentication strategy and used in authentication-related actions. */
-        artifacts: any;
-        /** the route authentication mode. */
-        mode: string;
-        /** the authentication error is failed and mode set to 'try'. */
-        error: Error;
-    };
+    auth: RequestAuthenticationInformation;
     /** the connection the request was received by. */
     connection: ServerConnection;
     /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains. Set to null when the server useDomains options is false. */
@@ -1964,6 +2023,19 @@ export class Request extends Podium {
     // [index: string]: any;
 }
 
+export interface RequestAuthenticationInformation {
+    /** true if the request has been successfully authenticated, otherwise false. */
+    isAuthenticated: boolean;
+    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+    credentials: any;
+    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
+    artifacts: any;
+    /** the route authentication mode. */
+    mode: string;
+    /** the authentication error is failed and mode set to 'try'. */
+    error: Error;
+}
+
 export type HTTP_METHODS_PARTIAL_lowercase = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
 export type HTTP_METHODS_PARTIAL = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | HTTP_METHODS_PARTIAL_lowercase;
 export type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
@@ -2049,7 +2121,7 @@ export interface RequestHandler<T> {
 
 /**
  * Used by server extension points
- * err can be BoomError or Error that will be wrapped as a BoomError
+ * err can be `Boom` error or Error that will be wrapped as a `Boom` error
  * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/reply.js#L109-L118)
  * For source [See code](https://github.com/hapijs/hapi/blob/v16.1.1/lib/response.js#L60-L65)
  */
@@ -2061,7 +2133,9 @@ export interface ContinuationFunction {
  * TODO Can value be typed with a useful generic?
  */
 export interface ContinuationValueFunction {
-    (err: Boom.BoomError, value: any): void;
+    (err: Boom.BoomError): void;
+    (err: null | undefined, value: any): void;
+    (): void;
 }
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/types/hapi/test/connection/table.ts b/types/hapi/test/connection/table.ts
index dee4741b07..24eaa28ddc 100644
--- a/types/hapi/test/connection/table.ts
+++ b/types/hapi/test/connection/table.ts
@@ -18,3 +18,5 @@ const table = connection.table();
         }
     ]
 */
+
+table.map(({method, path, settings: {description}}) => { });
diff --git a/types/hapi/test/continuation/errors.ts b/types/hapi/test/continuation/errors.ts
new file mode 100644
index 0000000000..165e5214df
--- /dev/null
+++ b/types/hapi/test/continuation/errors.ts
@@ -0,0 +1,57 @@
+
+import * as Hapi from 'hapi';
+import * as Boom from 'boom';
+
+// Assignment of a typical function to ContinuationValueFunction is possible
+const handleError: Hapi.ContinuationValueFunction = (err?: Boom.BoomError | null, value?: any) => {
+    if (!err || !err.data.isCustom === true) {
+        return;
+    }
+
+    // assignment is possible due to default generic Data = any
+    const customError: Boom.BoomError<CustomData> = err;
+
+    // Discriminated union type works:
+    switch (customError.data.customType) {
+        case 'Custom1':
+            customError.data.custom1;
+            break;
+        case 'Custom2':
+            customError.data.custom2;
+            break;
+    }
+};
+
+// Accepts a simple Boom error
+handleError(Boom.badData());
+
+// Accepts an error with custom data
+const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: <'Custom1'>'Custom1', isCustom: <true>true });
+handleError(errorWithData);
+
+// Accepts an error with a more explicit type
+const errorWithExplicitType: Boom.BoomError<CustomData> = errorWithData;
+handleError(errorWithExplicitType);
+
+// Accepts an error with an even more explicit type
+const errorWithConcreteCustomData: Boom.BoomError<CustomData1> = errorWithData; // assignment to CustomData2 would not be possible
+handleError(errorWithConcreteCustomData);
+
+/**
+ * Some complex error data types:
+ */
+interface CustomDataBase {
+    isCustom: true;
+}
+
+interface CustomData1 extends CustomDataBase {
+    customType: 'Custom1';
+    custom1: string;
+}
+
+interface CustomData2 extends CustomDataBase {
+    customType: 'Custom2';
+    custom2: string;
+}
+
+type CustomData = CustomData1 | CustomData2;
diff --git a/types/hapi/test/route/validate.ts b/types/hapi/test/route/validate.ts
index f160641016..cb5c5527ee 100644
--- a/types/hapi/test/route/validate.ts
+++ b/types/hapi/test/route/validate.ts
@@ -13,8 +13,52 @@ const validate: Hapi.RouteValidationConfigurationObject = {
     query: {
         providerId: Joi.string(),
     },
+    options: {
+        abortEarly: true,
+    },
 };
 
-const config: Hapi.RouteAdditionalConfigurationOptions = {
+let config: Hapi.RouteAdditionalConfigurationOptions = {
     validate,
+    response: {
+        schema: Joi.object(),
+    },
+};
+
+interface CustomValidationOptions extends Joi.ValidationOptions {
+    myOption: number;
+}
+
+const inputValidationFunction: Hapi.ValidationFunctionForRouteInput<CustomValidationOptions> = (value, options, next) => {
+    options.myOption; // check custom options
+    options.context.auth.artifacts; // check context
+    next(null, value); // check with value
+    next(); // check without value
+};
+
+const validateWithFunctions: Hapi.RouteValidationConfigurationObject<CustomValidationOptions> = {
+    params: inputValidationFunction,
+    headers: inputValidationFunction,
+    payload: inputValidationFunction,
+    query: inputValidationFunction,
+    options: {
+        myOption: 18
+    }
+};
+
+const responseValidationFunction: Hapi.ValidationFunctionForRouteResponse<CustomValidationOptions> = (value, options, next) => {
+    options.myOption; // check custom options
+    options.context.auth.isAuthenticated; // check context
+    next(null, value); // check with value
+    next(); // check without value
+};
+
+config = {
+    validate: validateWithFunctions,
+    response: <Hapi.RouteResponseConfigurationObject<CustomValidationOptions>>{
+        schema: responseValidationFunction,
+        options: {
+            myOption: 18
+        }
+    }
 };
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index ef8e454667..01c5a12c89 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -18,6 +18,7 @@
     "files": [
         "index.d.ts",
         "test/connection/table.ts",
+        "test/continuation/errors.ts",
         "test/getting-started/01-creating-a-server.ts",
         "test/getting-started/02-adding-routes.ts",
         "test/getting-started/03-serving-static-content.ts",
diff --git a/types/hapi/v8/hapi-tests.ts b/types/hapi/v8/hapi-tests.ts
index 585e58e100..ee8af0d335 100644
--- a/types/hapi/v8/hapi-tests.ts
+++ b/types/hapi/v8/hapi-tests.ts
@@ -124,15 +124,5 @@ server.route([{
 	}
 }]);
 
-// Implict handler
-server.route({
-	method: 'GET',
-	path: '/hello6',
-	handler: function (request, reply) {
-		request.log('info', { route: '/hello' }, Date.now());
-		reply('hello world');
-	}
-});
-
 // Start the server
 server.start();
diff --git a/types/heredatalens/heredatalens-tests.ts b/types/heredatalens/heredatalens-tests.ts
new file mode 100644
index 0000000000..40e68902c5
--- /dev/null
+++ b/types/heredatalens/heredatalens-tests.ts
@@ -0,0 +1,161 @@
+/**
+ * Typescript definition tests for heredatalens
+ *
+ * Note: These tests are intended to test the definitions only
+ * in the sense of typing and call signature consistency. They
+ * are not intended as functional tests.
+ */
+
+let serviceOptions: H.datalens.Service.Options = {
+  subDomain: 'sub',
+  version: 'version',
+  access_token: 'token',
+  refresh_token: 'token',
+  domainSharding: ['a', 'b'],
+  baseUrl: 'url'
+};
+
+let queryTileProviderTileParamNames: H.datalens.QueryTileProvider.TileParamNames = {
+  x: 'x',
+  y: 'y',
+  z: 'z'
+};
+
+let queryTileProviderOptions: H.datalens.QueryTileProvider.Options = {
+  queryId: 'id',
+  queryParams: 'params',
+  tileParamNames: queryTileProviderTileParamNames
+};
+
+let service: H.datalens.Service = new H.datalens.Service(serviceOptions);
+service.request('method', 'endpoint', 'params', 'body', (result: any) => {}, (error: any) => {}).then((data: any) => {});
+service.fetchQueryData('id', 'params', (result: any) => {}, (error: any) => {}).then((data: any) => {});
+service.fetchQueryStats('id', 'query', (result: any) => {}, (error: any) => {}).then((data: any) => {});
+service.fetchLayer('name', 'params', (result: any) => {}, (error: any) => {}).then((data: any) => {});
+service.fetchLayerTile('name', 1, 2, 3, 'params', (result: any) => {}, (error: any) => {}).then((data: any) => {});
+service.setTokens('token', 'refresh_token');
+service.configure('app_id', 'app_code', true, true, new H.service.Url('scheme', 'host'));
+
+let queryTileProvider = new H.datalens.QueryTileProvider(service, queryTileProviderOptions);
+queryTileProvider.setQueryId('some id');
+queryTileProvider.setQueryParams('some params');
+queryTileProvider.setTileParamNames(queryTileProviderTileParamNames);
+
+let provider = new H.datalens.Provider({ columns: ['1', '2'], rows: [[], []]});
+provider.getData();
+provider.setData({ columns: ['3', '4'], rows: [[], []]});
+
+let queryProviderOptions: H.datalens.QueryProvider.Options = {
+  queryId: 'id',
+  queryParams: 'params'
+};
+let queryProvider = new H.datalens.QueryProvider({ columns: ['1', '2'], rows: [[], []]}, queryProviderOptions);
+queryProvider.setQueryId('id');
+queryProvider.setQueryParams('params');
+queryProvider.reload();
+queryProvider.getData();
+queryProvider.setData({ columns: ['3', '4'], rows: [[], []]});
+
+let rasterLayerOptions: H.datalens.RasterLayer.Options = {
+  dataToRows: (): H.datalens.RasterLayer.Row[] => [],
+  rowToTilePoint: (): H.datalens.RasterLayer.TilePoint => ({ x: 1, y: 2 }),
+  buffer: (): number => 1,
+  renderTile: () => {}
+};
+
+let rasterLayer = new H.datalens.RasterLayer();
+rasterLayer.redraw();
+
+let heatmapLayerOptions: H.datalens.HeatmapLayer.Options = {
+  dataToRows: (): H.datalens.HeatmapLayer.Row[] => [],
+  rowToTilePoint: (): H.datalens.HeatmapLayer.TilePoint => ({ x: 1, y: 2, value: 5, count: 5 }),
+  bandwidth: 5,
+  valueRange: (): number[] => [],
+  countRange: (): number[] => [],
+  colorScale: (): string => '2',
+  alphaScale: (): number => 1,
+  aggregation: H.datalens.HeatmapLayer.Aggregation.SUM,
+  inputScale: H.datalens.HeatmapLayer.InputScale.LINEAR
+};
+
+let heatmapLayer = new H.datalens.HeatmapLayer(queryTileProvider, heatmapLayerOptions);
+heatmapLayer.getOptionsPerZoom(5);
+heatmapLayer.dispose();
+heatmapLayer.redraw();
+
+let objectLayerOptions: H.datalens.ObjectLayer.Options = {
+  dataToRows: (): H.datalens.ObjectLayer.Row[] => [],
+  rowToMapObject: (): H.map.Object => new H.map.Object(),
+  rowToStyle: (): H.datalens.ObjectLayer.ObjectStyleOptions => ({ icon: new H.map.Icon('x'), style: {}, arrows: {}, zIndex: 1 }),
+  dataDomains: 2,
+  clustering: { rowToDataPoint: (): H.clustering.DataPoint => ({ lat: 12.1, lng: 1.12, alt: 5, ctx: H.geo.AltitudeContext.GL, wt: 2, data: {} }),
+                options: (): H.clustering.Provider.ClusteringOptions => ({}) }
+};
+
+let objectLayer = new H.datalens.ObjectLayer(provider, objectLayerOptions);
+objectLayer.redraw();
+objectLayer.updateObjectStyle(new H.map.Object(), { icon: new H.map.Icon('x'), style: {}, arrows: {}, zIndex: 1 });
+
+let rawDataProviderOptions: H.datalens.RawDataProvider.Options = {
+  dataUrl: 'url',
+  dataToFeatures: (): H.datalens.RawDataProvider.Feature[] => [],
+  featuresToRows: (): H.datalens.ObjectLayer.Row[] => []
+};
+
+let rawDataProvider = new H.datalens.RawDataProvider(rawDataProviderOptions);
+
+let spatialTileProviderOptions: H.datalens.SpatialTileProvider.Options = {
+  layerName: 'name',
+  queryParams: 'params'
+};
+
+let spatialProvider: H.datalens.SpatialTileProvider = new H.datalens.SpatialTileProvider(service, spatialTileProviderOptions);
+
+let spatialLayerOptions: H.datalens.SpatialLayer.Options = {
+  dataToRows: (): H.datalens.SpatialLayer.Row[] => [],
+  rowToSpatialId: (): string => 'asd',
+  featureToSpatialId: (): string => 'asd',
+  rowToStyle: (): any => { return; },
+  defaultStyle: (): any => { return; },
+  transformFeature: 1
+};
+
+let spatialLayer = new H.datalens.SpatialLayer(provider, spatialProvider, spatialLayerOptions);
+
+let layer = new H.datalens.ObjectLayer(
+  provider,
+  {
+    rowToMapObject: (cluster) => {
+      return new H.map.Marker(cluster.getPosition());
+    },
+    clustering: {
+      rowToDataPoint: (row) => {
+        return new H.clustering.DataPoint(row.lat, row.lng, 1);
+      },
+      options: () => {
+        return {
+          eps: 25 * devicePixelRatio, // px
+          minWeight: 20
+        };
+      }
+    },
+    rowToStyle: (cluster) => {
+      const size = 32;
+
+      let icon = H.datalens.ObjectLayer.createIcon([
+        'svg',
+        {
+          viewBox: [-size, -size, 2 * size, 2 * size]
+        },
+        ['circle', {
+          cx: 0,
+          cy: 0,
+          r: size,
+          fill: cluster.isCluster() ? 'orange' : 'transparent'
+        }]
+      ], { size, crossOrigin: false });
+
+      return { icon };
+    }
+  }
+);
diff --git a/types/heredatalens/index.d.ts b/types/heredatalens/index.d.ts
new file mode 100644
index 0000000000..b01014ba1e
--- /dev/null
+++ b/types/heredatalens/index.d.ts
@@ -0,0 +1,948 @@
+// Type definitions for 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
+
+/// <reference types="heremaps" />
+
+declare namespace H {
+    /**
+     * Data Lens REST API connector for HERE Maps API
+     * Data Lens JavaScript API is a module for HERE Maps API.
+     * It connects Data Lens REST API and provides data-driven styling of data on a map.
+     */
+    namespace datalens {
+        /**
+         * HERE Maps API and Data Lens JavaScript API can be used to visualize data from different network sources.
+         * For each network source type, a service class is required. The service also stores API connection credentials.
+         * The service instance must be configured with a H.service.Platform instance.
+         */
+        class Service implements H.service.IConfigurable {
+            /**
+             * Constructor
+             * @param options {H.datalens.Service.Options=} - Overrides the configuration from the H.service.Platform instance
+             */
+            constructor(options?: H.datalens.Service.Options);
+
+            /**
+             * This method makes an HTTP request to the Data Lens REST API.
+             * It makes any CRUD request (GET, PUT, POST, DELETE).
+             * This method can be used when implementing a custom provider or implementing data management.
+             * Otherwise existing providers are used to get data from the Data Lens REST API.
+             * @param method {string} - Any HTTP method (GET, PUT, POST, etc.)
+             * @param endpoint {string} - The REST API endpoint
+             * @param params {any=} - URL parameters
+             * @param body {any=} - The payload of the request
+             * @param onResult {function(any)=} - Callback called on a successful request with response data
+             * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
+             * @returns {Promise<any>} - Response Promise
+             */
+            request(method: string, endpoint: string, params?: any, body?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
+
+            /**
+             * This method fetches query data for a given query ID.
+             * This method can be used when implementing a custom provider.
+             * Otherwise existing providers are used to get data from the Data Lens REST API.
+             * @param queryId {string} - The ID of the Data Lens REST API query
+             * @param params {any=} - Query dynamic parameters
+             * @param onResult {function(any)=} - Callback called on a successful request with response data
+             * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
+             * @returns {Promise<any>} - Response Promise
+             */
+            fetchQueryData(queryId: string, params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
+
+            /**
+             * This method fetches statistical data for the Data Lens query (eg minimum and maximum values for the query metric).
+             * It can be used to define visualization boundaries, scales and legends.
+             * @param queryId {string} - The ID of the Data Lens REST API query
+             * @param statsQuery {any} - A JSON object which defines a statistics query for the Data Lens query
+             * @param onResult {function(any)=} - Callback called on a successful request with response data
+             * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
+             * @returns {Promise<any>} - Response Promise
+             */
+            fetchQueryStats(queryId: string, statsQuery: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
+
+            /**
+             * This method fetches a layer of geometries (eg buildings or administrative boundaries).
+             * @param layerName {string} - The name of the layer
+             * @param params {any=} - URL parameters (eg bounding box)
+             * @param onResult {function(any)=} - Callback called on a successful request with response data
+             * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
+             * @returns {Promise<any>} - Response Promise
+             */
+            fetchLayer(layerName: string, params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<any>;
+
+            /**
+             * This method fetches vector tile data from the layer.
+             * @param layerName {string}
+             * @param x {H.datalens.QueryTileProvider.X} - Tile columns
+             * @param y {H.datalens.QueryTileProvider.Y} - Tile row
+             * @param z {H.datalens.QueryTileProvider.Zoom} - zoom level
+             * @param params {any=} - URL parameters (eg bounding box)
+             * @param onResult {function(any)=} - Callback called on a successful request with response data
+             * @param onError {function(Error)=} - Callback called on an unsuccessful request with the Error object
+             * @returns {Promise<Uint8Array>} - Typed array with tile data
+             */
+            fetchLayerTile(layerName: string, x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, z: H.datalens.QueryTileProvider.Zoom,
+                           params?: any, onResult?: (result: any) => void, onError?: (error: any) => void): Promise<Uint8Array>;
+
+            /**
+             * Sets the access and refresh tokens used to authenticate all requests against the Data Lens REST API.
+             * Use this method to implement custom authentication to the Data Lens REST API.
+             * @param accessToken {string} - The token used to authenticate all requests
+             * @param refreshToken {string} - The token used to fetch a new access token after the previous access token has expired.
+             * When refreshToken is provided, Service will automatically update the expired accessToken.
+             */
+            setTokens(accessToken: string, refreshToken: string): void;
+
+            /**
+             * This method implements H.service.IConfigurable interface. It is called by the H.service.Platform instance.
+             * @param appId {string} - The appId
+             * @param appCode {string} - The appCode
+             * @param useHTTPS {boolean} - A flag to use HTTPS or not
+             * @param useCIT {boolean} - A flag to use the staging server (CIT) or not
+             * @param baseUrl {H.service.Url=} - The base URL for all requests to the Data Lens REST API
+             * @returns {H.datalens.Service}
+             */
+            configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, baseUrl?: H.service.Url): H.datalens.Service;
+        }
+
+        namespace Service {
+            /**
+             * Overrides the H.datalens.Service configuration
+             * Normally the H.datalens.Service instance is configured with the H.service.Platform instance.
+             * This configuration can be overridden by specifying these options.
+             * It can be useful when the Data Lens environment is different from the HERE Platform environment.
+             * @property subDomain {string=} - Subdomain of the Data Lens REST API URL
+             * @property version {string=} - Pathname prefix of the Data Lens REST API endpoints
+             * @property access_token {string=} - The token used to authenticate all requests
+             * @property refresh_token {string=} - The token used to fetch a new access token after the previous access token has expired.
+             * When refresh_token is provided, Service will automatically update the expired access_token.
+             * @property domainSharding {string[]=} - To increase the number of simultaneous requests to the Data Lens REST API, domain sharding is used.
+             * This option can be used when the Data Lens environment does not support domain sharding.
+             * @property baseUrl {string=} - Defines an alternative host for the Data Lens REST API URL
+             */
+            interface Options {
+                subDomain?: string;
+                version?: string;
+                access_token?: string;
+                refresh_token?: string;
+                domainSharding?: string[];
+                baseUrl?: string;
+            }
+
+            /**
+             * The format of Data Lens query data.
+             * The Data Lens query data has a table-like structure with named columns and rows.
+             * @property columns {string[]} - Column names
+             * @property rows {Array<Array>} - Rows of data
+             */
+            interface Data {
+                columns: string[];
+                rows: [any[]]; // rows : { Array.<Array> }
+            }
+        }
+
+        /**
+         * Providers define interfaces for layers to access data.
+         * The input data can be stored locally or loaded from the network. Data can be loaded by tiles or in one chunk.
+         * This provider allows you to supply data stored locally or fetched using external tools.
+         */
+        class Provider extends H.map.provider.Provider {
+            /**
+             * Constructor
+             * @param data {H.datalens.Service.Data=} - JSON object
+             * @param options {H.map.provider.Provider.Options=} - Configures data accessibility parameters
+             */
+            constructor(data?: H.datalens.Service.Data, options?: H.map.provider.Provider.Options);
+
+            /**
+             * Updates the provider data. When data is updated, the update event is triggered so that the consuming layers are redrawn.
+             * @param data {H.datalens.Service.Data} - JSON object
+             */
+            setData(data: H.datalens.Service.Data): void;
+
+            /**
+             * Retrieves the provider data.
+             * @returns {H.datalens.Service.Data} - JSON object
+             */
+            getData(): H.datalens.Service.Data;
+        }
+
+        /**
+         * Defines the source of the data for layers from a Data Lens query.
+         * Providers define interfaces for layers to access data.  The input data can be stored locally or loaded from the network.
+         * Data can be loaded by tiles or in one chunk. This provider loads query data with the Data Lens REST API.
+         * Note that this provider must be used only for non-tiled queries.
+         */
+        class QueryProvider extends H.datalens.Provider {
+            /**
+             * Constructor
+             * @param service {H.datalens.Service} - Data Lens REST API service
+             * @param options {H.datalens.QueryProvider.Options=} - Configures source query and data accessibility parameters
+             */
+            constructor(data: H.datalens.Service.Data, options?: H.datalens.QueryProvider.Options);
+
+            /**
+             * Updates the query ID to be used in the next call of the Data Lens REST API.
+             * Note that new data will be fetched only after the reload method is called.
+             * @param queryId {string}
+             */
+            setQueryId(queryId: string): void;
+
+            /**
+             * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API.
+             * Note that new data will be fetched only after the reload method is called.
+             * This method is normally used when updating your visualization.
+             * @param queryParams {any|null} - Query dynamic parameters
+             */
+            setQueryParams(queryParams: any|null): void;
+
+            /**
+             * Fetches new data from the Data Lens REST API.
+             * When data is fetched, the update event is triggered so that the consuming layers are redrawn.
+             */
+            reload(): void;
+
+            /**
+             * Updates the provider data.
+             * When data is updated, the update event is triggered so that the consuming layers are redrawn.
+             * @param data {H.datalens.Service.Data} - JSON object
+             */
+            setData(data: H.datalens.Service.Data): void;
+
+            /**
+             * Retrieves the provider data.
+             * @returns {H.datalens.Service.Data} - JSON object
+             */
+            getData(): H.datalens.Service.Data;
+        }
+
+        namespace QueryProvider {
+            /**
+             * Configures source query and data accessibility parameters for H.datalens.QueryProvider
+             * Specifies the query credentials and dynamic parameters required for fetching query data with the Data Lens REST API. Other options from H.datalens.Provider.Options are available.
+             * @property queryId {string} - The ID of the Data Lens REST API query
+             * @property queryParams {any=} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
+             */
+            interface Options {
+                queryId: string;
+                queryParams?: any;
+            }
+        }
+
+        /**
+         * Providers define interfaces for layers to access data.
+         * The input data can be stored locally or loaded from the network. Data can be loaded by tiles or in one chunk.
+         * This provider loads tiled query data with the Data Lens REST API. Tiled queries are used to load data only for the current viewport.
+         * This optimizes memory and network usage and enables progressive rendering.
+         */
+        class QueryTileProvider extends H.map.provider.RemoteTileProvider {
+            /**
+             * Constructor
+             * @param service {H.datalens.Service} - Data Lens REST API service
+             * @param options {H.datalens.QueryTileProvider.Options} - Configures source query and data accessibility parameters
+             */
+            constructor(service: H.datalens.Service, options: H.datalens.QueryTileProvider.Options);
+
+            /**
+             * Updates the query ID to be used in the next call of the Data Lens REST API.
+             * Note that new data will be fetched only after the reload method is called.
+             * @param queryId {string}
+             */
+            setQueryId(queryId: string): void;
+
+            /**
+             * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API.
+             * Note that new data will be fetched only after the reload method is called. This method is normally used when updating your visualization.
+             * @param queryParams {any|null}
+             */
+            setQueryParams(queryParams: any|null): void;
+
+            /**
+             * Updates the names of the dynamic parameters that defines tiles. This method is only needed when the query ID is updated.
+             * Note that new data will be fetched only after the reload method is called.
+             * @param tileParamNames {H.datalens.QueryTileProvider.TileParamNames} - Names of the URI parameters that control the x/y/z of a tiled query
+             */
+            setTileParamNames(tileParamNames: H.datalens.QueryTileProvider.TileParamNames): void;
+        }
+
+        namespace QueryTileProvider {
+            /**
+             * Represents the names of the URI parameters that control the x/y/z of tiled query.
+             * When defining the Data Lens query, dynamic parameters that control tiling can be arbitrarily named.
+             * Names of these parameters must be specified to fetch tiles.
+             * @property x {string} - Name of the dynamic parameter that defines tile column
+             * @property y {string} - Name of the dynamic parameter that defines tile row
+             * @property z {string} - Name of the dynamic parameter that defines zoom level
+             */
+            interface TileParamNames {
+                x: string;
+                y: string;
+                z: string;
+            }
+
+            /**
+             * Configures source query and data accessibility parameters for H.datalens.QueryTileProvider
+             * Specifies the query credentials and dynamic parameters required for fetching tiled query data with the Data Lens REST API.
+             * Other options from H.datalens.Provider.Options are available.
+             * @property tileParamNames {H.datalens.QueryTileProvider.TileParamNames=} - Names of the URI parameters that control the x/y/z of a tiled query
+             * @property queryId {string} - The ID for the Data Lens REST API query
+             * @property queryParams {any=} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
+             */
+            interface Options {
+                tileParamNames: H.datalens.QueryTileProvider.TileParamNames;
+                queryId: string;
+                queryParams?: string;
+            }
+
+            /**
+             * Tile X coordinate (column)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type X = number;
+
+            /**
+             * Tile Y coordinate (row)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type Y = number;
+
+            /**
+             * Zoom level
+             * Coordinate in XYZ tile numbering scheme. May vary within range 1 to 20.
+             */
+            type Zoom = number;
+        }
+
+        /**
+         * Provides pixel-wise rendering of data.
+         * Layer used when you need to visualize more than 10k points. The layer requires source data to be located in pixel coordinates.
+         * The rendering is implemented by drawing directly on a canvas.  The layer is often used together with a Data Lens query which groups rows by pixels.
+         * This reduces the amount of data delivered to the client.
+         */
+        class RasterLayer extends H.map.layer.TileLayer {
+            /**
+             * Constructor
+             */
+            constructor();
+
+            /**
+             * Default value for dataToRows callback option.
+             * It represents each row as an object where property names correspond to data column names.
+             */
+            static defaultDataToRows: any;
+
+            /**
+             * Force re-rendering of the layer.
+             * In the case where the callbacks passed to the layer options are not pure functions, you can call this method to force re-rendering.
+             */
+            redraw(): void;
+
+            /**
+             * This is a default implementation of renderTile callback. This method represents each point as a black 1x1 pixel square.
+             * @param points {Array<H.datalens.RasterLayer.TilePoint>} - Input data points within a tile
+             * @param canvas {HTMLCanvasElement} - The target canvas
+             */
+            static defaultRenderTile(points: H.datalens.RasterLayer.TilePoint[], canvas: HTMLCanvasElement): void;
+        }
+
+        namespace RasterLayer {
+            /**
+             * Defines data processing and rendering options for RasterLayer.
+             * The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
+             * By default this step is processed with H.datalens.RasterLayer.defaultDataToRows.
+             * This behavior can be changed by defining the dataToRows callback.
+             * To collect the rows for a tile including buffer, the rows must be translated to H.datalens.RasterLayer.TilePoint.
+             * This translation must be specified with the rowToTilePoint callback. The final rendering on the tile canvas must be defined in renderTile.
+             * @property dataToRows {function(H.datalens.Service.Data, H.datalens.QueryTileProvider.X, H.datalens.QueryTileProvider.Y, H.datalens.QueryTileProvider.Zoom)=} -
+             * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
+             * @property rowToTilePoint {function(H.datalens.RasterLayer.Row, H.datalens.RasterLayer.X, H.datalens.RasterLayer.Y)=} -
+             * Defines how the row is translated to the H.datalens.RasterLayer.TilePoint. This callback is called for each row that is returned from dataToRows.
+             * @property buffer {function(H.datalens.QueryTileProvider.Zoom)=} - Defines the buffer as a function of the zoom level.
+             * The buffer is a value (in pixels) that defines an extra area around each tile to capture data points from.
+             * This is done to avoid drawing edges between tiles. For example, if data points represented with circles with a maximum radius of 10 pixels, then the buffer must be 10 pixels.
+             * @property renderTile {function(Array<H.datalens.RasterLayer.TilePoint>, HTMLCanvasElement, H.datalens.QueryTileProvider.Zoom)=} -
+             * Defines how tile data is represented on a canvas. Input points for each tile are collected with respect to the buffer.
+             * For progressive rendering this callback may be called more than once for the tile.
+             */
+            interface Options {
+                dataToRows?(data: H.datalens.Service.Data, x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, zoom: H.datalens.QueryTileProvider.Zoom):
+                    H.datalens.RasterLayer.Row[];
+                rowToTilePoint?(row: H.datalens.RasterLayer.Row, x: H.datalens.RasterLayer.X, y: H.datalens.RasterLayer.Y): H.datalens.RasterLayer.TilePoint;
+                buffer?(zoom: H.datalens.QueryTileProvider.Zoom): number;
+                renderTile?(points: H.datalens.RasterLayer.TilePoint[], canvas: HTMLCanvasElement, zoom: H.datalens.QueryTileProvider.Zoom): void;
+            }
+
+            /**
+             * Defines the input data format for heat map rendering.
+             * To collect data rows for each tile with respect to the buffer, each row must be represented as a point within the map tile.
+             * @property x {number} - Row relative to tile
+             * @property y {number} - Column relative to tile
+             * @property data {H.datalens.RasterLayer.Row=} - Reference to source data row
+             */
+            interface TilePoint {
+                x: number;
+                y: number;
+                data?: H.datalens.RasterLayer.Row;
+            }
+
+            /**
+             * Tile X coordinate (column)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type X = number;
+
+            /**
+             * Tile Y coordinate (row)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type Y = number;
+
+            /**
+             * Slice of data (eg Data Lens query data row) that represents a data point.
+             * Each row is transformed into TilePoint and passed to renderTile callback. By default each row is an Object where property names correspond to data column names.
+             * This representation can be changed with the dataToRows callback.
+             */
+            type Row = number;
+        }
+
+        /**
+         * Provides functionality of value-based heat map with density alpha mask.
+         * Layer support different types of blending, including weighted average. Also it allows to apply alpha mask calculated by density.
+         * In most cases, the layer consumes data grouped by 1x1 pixels buckets. For proper averaging it requires aggregated value and count (number of rows in bucket) for each bucket.
+         * Blending of buckets is implemented via kernel density estimation (KDE) with a Gaussian kernel.
+         */
+        class HeatmapLayer extends H.datalens.RasterLayer {
+            /**
+             * Constructor
+             * @param provider {H.datalens.QueryTileProvider} - Source of tiled data
+             * @param options {H.datalens.HeatmapLayer.Options} - Configuration for data processing and rendering
+             */
+            constructor(provider: H.datalens.QueryTileProvider, options: H.datalens.HeatmapLayer.Options);
+
+            /**
+             * Default value for dataToRows callback option. It represents each row as an object where property names correspond to data column names.
+             * @param data {H.datalens.Service.Data}
+             * @param x {H.datalens.QueryTileProvider.X}
+             * @param y {H.datalens.QueryTileProvider.Y}
+             * @param zoom {H.datalens.QueryTileProvider.Zoom}
+             * @returns {Array<H.datalens.HeatmapLayer.Row>}
+             */
+            static defaultDataToRows: (data: H.datalens.Service.Data, x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, zoom: H.datalens.QueryTileProvider.Zoom) =>
+                H.datalens.HeatmapLayer.Row[];
+
+            /**
+             * Set of possible values for the inputScale option
+             * @type {H.datalens.HeatmapLayer.InputScale}
+             */
+            static inputScale: H.datalens.HeatmapLayer.InputScale;
+
+            /**
+             * Set of possible values for the aggregation option
+             * @type {H.datalens.HeatmapLayer.Aggregation}
+             */
+            static aggregation: H.datalens.HeatmapLayer.Aggregation;
+
+            /**
+             * @param zoom {number} - zoom level
+             * @return {H.datalens.HeatmapLayer.Options}
+             */
+            getOptionsPerZoom(zoom: number): H.datalens.HeatmapLayer.Options;
+
+            /**
+             * Removes listeners, and references to memory consuming objects, from this layer. Call this method when you no longer need the layer.
+             */
+            dispose(): void;
+
+            /**
+             * Force re-rendering of the layer. In the case where the callbacks passed to the layer options are not pure functions, you can call this method to force re-rendering.
+             */
+            redraw(): void;
+        }
+
+        namespace HeatmapLayer {
+            /**
+             * Defines data processing and rendering options for HeatmapLayer.
+             * The data processing flow of HeatmapLayer is similar to RasterLayer. The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
+             * By default this step is processed with H.datalens.HeatmapLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
+             * To collect the rows for a tile including buffer, the rows must be translated to H.datalens.HeatmapLayer.TilePoint. This translation must be specified with the rowToTilePoint callback.
+             * Other options define the blending options for the heat map.
+             * @property dataToRows {function(H.datalens.Service.Data, H.datalens.QueryTileProvider.X, H.datalens.QueryTileProvider.Y, H.datalens.QueryTileProvider.Zoom)=} -
+             * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
+             * @property rowToTilePoint {function(H.datalens.HeatmapLayer.Row, H.datalens.HeatmapLayer.X, H.datalens.HeatmapLayer.Y)=} -
+             * Defines how the row is translated to the H.datalens.HeatmapLayer.TilePoint. This callback is called for each row that is returned from dataToRows.
+             * @property bandwidth {H.datalens.HeatmapLayer~Bandwidth | H.datalens.HeatmapLayer~BandwidthStop | Array.<H.datalens.HeatmapLayer~BandwidthStop> |
+             * H.datalens.HeatmapLayer~BandwidthCallback=} - Describes the bandwidth behavior in relation to current zoom level A numeric value sets it static across all levels
+             * An Object with zoom, value and optional zoomIncrementFactor (1 equals doubling on every zoom increment) defines a behavior across all zoom levels
+             * An Array of one or more zoom, value objects describes the behavior between the two defined levels and extrapolates the implied change outside of the defined range
+             * Alternatively defines the level of smoothing as a function of the zoom level. The callback must return a value in pixels.
+             * The cut-off of the Gaussian kernel is defined as 3 * bandwidth , a multiple (default 3) of bandwidth.
+             * @property valueRange {function(H.datalens.QueryTileProvider.Zoom)} - Defines the range for the color scale as a function of the zoom level.
+             * The returned value must be an array of 2 numbers.
+             * @property countRange {function(H.datalens.QueryTileProvider.Zoom)} - Defines the range for the density alpha mask as a function of the zoom level.
+             * When defined, the density alpha mask is applied. The returned value must be an array of 2 numbers.
+             * @property colorScale {function(number)} - Defines a color palette as a function of the normalized value. You can use D3.js library scale functions with the domain [0, 1].
+             * @property alphaScale {function(number)} - Defines the alpha mask value as a function of the normalized count.
+             * You can use D3.js library scale functions with the domain [0, 1] and the range [0, 1].
+             * @property aggregation {H.datalens.HeatmapLayer.Aggregation} - Specifies which type of aggregation was applied (eg. type of aggregation function for bucket in the Data Lens query).
+             * Possible values are SUM or AVERAGE. If the aggregation type is AVERAGE , then an averaged heat map is rendered.
+             * @property inputScale {H.datalens.HeatmapLayer.InputScale} - Defines the scale (eg logarithmic scale) of the TilePoint value.
+             * Note: if the value is not in a linear scale, then the aggregation in the source query must be defined with respect to the scale type.
+             * For example, before applying the average aggregation function in a query, the value must be transformed to the linear scale. This guarantees correct linear averaging of values.
+             */
+            interface Options {
+                dataToRows?(data: H.datalens.Service.Data, x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, zoom: H.datalens.QueryTileProvider.Zoom):
+                    H.datalens.HeatmapLayer.Row[];
+                rowToTilePoint(row: H.datalens.HeatmapLayer.Row, x: H.datalens.HeatmapLayer.X, y: H.datalens.HeatmapLayer.Y): H.datalens.HeatmapLayer.TilePoint;
+                bandwidth?: H.datalens.HeatmapLayer.Bandwidth | H.datalens.HeatmapLayer.BandwidthStop | H.datalens.HeatmapLayer.BandwidthStop[] | H.datalens.HeatmapLayer.BandwidthCallback;
+                valueRange?(zoom: H.datalens.QueryTileProvider.Zoom): number[];
+                countRange?(zoom: H.datalens.QueryTileProvider.Zoom): number[];
+                colorScale?(scale: number): string;
+                alphaScale?(scale: number): number;
+                aggregation?: H.datalens.HeatmapLayer.Aggregation;
+                inputScale?: H.datalens.HeatmapLayer.InputScale;
+            }
+
+            /**
+             * Tile X coordinate (column)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type X = number;
+
+            /**
+             * Tile Y coordinate (row)
+             * Coordinate in XYZ tile numbering scheme.
+             */
+            type Y = number;
+
+            /**
+             * Slice of data (eg Data Lens query data row) that represents a data point.
+             * Each row is transformed into TilePoint and then rendered on a heat map. By default each row is an Object where property names correspond to data column names.
+             * This representation can be changed with the dataToRows callback.
+             */
+            interface Row {
+                tx?: number;
+                ty?: number;
+                count?: number;
+            }
+
+            /**
+             * Defines a constant for the bandwidth
+             * A number that sets a constant for the bandwidth across all zoom levels.
+             */
+            type Bandwidth = number;
+
+            /**
+             * Sets the bandwidth for a given zoom level and uses this to calculate the increment or decrement of the bandwidth at other zoom levels
+             * This object defines the behavior of the bandwidth value across all zoom levels, initialized by a reference zoom level and its value at that level.
+             * The default behavior with zoomIncrementFactor = 1 doubles the bandwidth with every increasing zoom level and halves it on every decrease in zoom level.
+             * For example, a bandwidth of 10@zoom1 turns to 20@zoom2 and 5@zoom0. A zoomIncrementFactor of 0 effectively equals the bandwidth number, ignoring the provided zoom level.
+             * A zoomIncrementFactor of 0.5 mean a bandwidth increase of 50% compared to a factor of 1. So a bandwidth of 10@zoom1 computes to 15@zoom2.
+             */
+            interface BandwidthStop {
+                zoom: number;
+                value: number;
+                zoomIncrementFactor?: number;
+            }
+
+            /**
+             * TODO: this is missing in the documentation: https://developer.here.com/visualization/documentation/datalens/h-datalens-heatmaplayer-options.html
+             */
+            type BandwidthCallback = () => void;
+
+            /**
+             * Defines the input data format for heat map rendering.
+             * For heat map rendering, each row of data must be represented as a point within the map tile.
+             * @property x {number} - Row relative to tile
+             * @property y {number} - Column relative to tile
+             * @property value {number} - Value at the point (eg aggregated bucket value)
+             * @property count {number} - Number of contributors to the value at the point (eg number of rows in a bucket)
+             * @property data {H.datalens.HeatmapLayer.Row} - Reference to source data row
+             */
+            interface TilePoint {
+                x: number;
+                y: number;
+                value: number;
+                count: number;
+                data?: H.datalens.HeatmapLayer.Row;
+            }
+
+            /**
+             * Set of possible values for the aggregation option.
+             * If the heat map input data is buckets, then different types of aggregation can be applied to the rows in a bucket.
+             * The aggregation type is required for proper blending mode of the heat map. For the AVERAGE aggregation type, an averaged heat map is rendered.
+             * @property SUM {string} - Specifies that the sum aggregation was applied to the bucket value
+             * @property AVERAGE {string} - Specifies that the average aggregation was applied to the bucket value
+             */
+            enum Aggregation {
+                SUM,
+                AVERAGE
+            }
+
+            /**
+             * Set of possible values for the inputScale option.
+             * The input scale is required for proper heat map blending. If the input scale is not linear, then the TilePoint.value is converted to linear scale before calculating the sum or average.
+             * @property DB {string} - Decibel (dB) scale
+             * @property LINEAR {string} - Linear scale
+             * @property LOG {string} - Logarithmic scale
+             */
+            enum InputScale {
+                DB,
+                LINEAR,
+                LOG
+            }
+        }
+
+        /**
+         * Presents data as points or spatial map objects with data-driven styles and client-side clustering.
+         * Applicable for drawing interactive map objects like markers, polygons, circles and other instances of H.map.Object. Source of data can be either tiled or not tiled.
+         * Styles for objects can be parametrized with data rows and zoom level. Allows to create data-driven icons for markers like donuts or bars.
+         * Also enables clustering and data domains for visualizing up to 100k points or more.
+         */
+        class ObjectLayer extends H.map.layer.ObjectLayer {
+            /**
+             * Constructor
+             * @param provider {H.map.provider.RemoteTileProvider | H.datalens.Provider | H.datalens.QueryProvider | H.datalens.QueryTileProvider} - Data source (tiled or not)
+             * @param options {H.datalens.ObjectLayer.Options} - Defines data processing, clustering and data-driven styling
+             */
+            constructor(provider: H.map.provider.RemoteTileProvider | H.datalens.Provider | H.datalens.QueryProvider | H.datalens.QueryTileProvider, options: H.datalens.ObjectLayer.Options);
+
+            /**
+             * Default value for dataToRows callback option. It represents each row as an object where property names correspond to data column names.
+             * @property data {H.datalens.Service.Data}
+             * @returns {Array<H.datalens.ObjectLayer.Row>}
+             */
+            static defaultDataToRows(data: H.datalens.Service.Data): H.datalens.ObjectLayer.Row[];
+
+            /**
+             * A factory method for data-driven icons. The method allows you to build an icon from SVG markup or JsonML object. Provides caching of icons with the same markup.
+             * @param svg {string | Array} - SVG presented as markup or JsonML Array
+             * @param options {H.map.Icon.Options=} - Icon options (eg size and anchor). Note that the default anchor is in the middle.
+             * @param options.size {H.math.ISize | number} - When the icon is a square, you can define the size as a number in pixels
+             * @returns {H.map.Icon} - Icon which can be used for marker or cluster
+             */
+            static createIcon(svg: string | any[], options?: H.map.Icon.Options): H.map.Icon;
+
+            /**
+             * Returns cache of icons created with the createIcon method. Can be used to clean the icon cache.
+             * @return {H.util.Cache} - Icon cache
+             */
+            static getIconCache(): H.util.Cache;
+
+            /**
+             * Force re-rendering of the layer. In the case where the callbacks passed to the layer options are not pure functions, you can call this method to force re-rendering.
+             */
+            redraw(): void;
+
+            /**
+             * Recalculates the style and applies it to the map object based on the new StyleState
+             * @param object {H.map.Object} - Map object
+             * @param state {H.datalens.ObjectLayer.StyleState} - New state
+             */
+            updateObjectStyle(any: H.map.Object, state: H.datalens.ObjectLayer.StyleState): void;
+        }
+
+        namespace ObjectLayer {
+            /**
+             * Defines data processing and data-driven styling for ObjectLayer
+             * The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
+             * By default this step is processed with H.datalens.ObjectLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
+             * In the next step each row must be presented as a map object with the rowToMapObject callback. Data-driven styling can be provided with the rowToStyle callback.
+             * @property dataToRows {function(H.datalens.Service.Data)=} - Defines how the input data is split by rows. You can specify this callback to define client-side aggregation and filtering.
+             * @property rowToMapObject {function(H.datalens.ObjectLayer.Row, H.datalens.QueryTileProvider.Zoom)} - Defines how each row is presented on the map (eg marker, polygon)
+             * @property rowToStyle {function(H.datalens.ObjectLayer.Row, H.datalens.QueryTileProvider.Zoom, H.datalens.ObjectLayer.StyleState)=} -
+             * Defines map object style and icon according to data row and zoom level. Also it can define different styles depending on the StyleState (eg hovered, selected).
+             * @property dataDomains {H.datalens.ObjectLayer.DataDomains=} - Defines quantization of data for improving data-driven styling performance
+             * @property clustering {H.datalens.ObjectLayer.Clustering=} - When present, client-side clustering is applied
+             */
+            interface Options {
+                dataToRows?(data: H.datalens.Service.Data): H.datalens.ObjectLayer.Row[];
+                rowToMapObject(row: H.datalens.ObjectLayer.Row, z: H.datalens.QueryTileProvider.Zoom): H.map.Object;
+                rowToStyle?(row: H.datalens.ObjectLayer.Row, z: H.datalens.QueryTileProvider.Zoom, styleState: H.datalens.ObjectLayer.StyleState): H.datalens.ObjectLayer.ObjectStyleOptions;
+                dataDomains?: H.datalens.ObjectLayer.DataDomains;
+                clustering?: H.datalens.ObjectLayer.Clustering;
+            }
+
+            /**
+             * Defines client-side clustering in the ObjectLayer.
+             * When the clustering option is provided, rows returned from dataToRows go to the clustering.rowToDataPoint callback to be transformed to data points.
+             * Then, the data points are clustered according to clustering.options. Clustering produces clusters and noise points (data points that are not clustered).
+             * Clusters and noise points must be presented as map objects with the rowToMapObject callback and can be styled with the rowToStyle callback.
+             * @property rowToDataPoint {H.datalens.ObjectLayer.Row} - Defines data points from rows
+             * @property options {function(H.datalens.QueryTileProvider.Zoom)} - Defines clustering options as a function of the zoom level
+             */
+            interface Clustering {
+                rowToDataPoint(row: H.datalens.ObjectLayer.Row): H.clustering.DataPoint;
+                options(zoom: H.datalens.QueryTileProvider.Zoom): H.clustering.Provider.ClusteringOptions;
+            }
+
+            /**
+             * Slice of data (eg Data Lens query data row) that represents a data point.
+             * Each row is translated to map objects with the rowToMapObject callback. By default each row is an Object where property names correspond to data column names.
+             * This representation can be changed with the dataToRows callback.
+             */
+            interface Row {
+                getPosition(): H.geo.Point;
+                isCluster(): boolean;
+                lat: number;
+                lng: number;
+            }
+
+            /**
+             * User defined modification of a data-driven style
+             * StyleState appears as a parameter in the rowToStyle callback. By default it is 'DEFAULT_STATE'. To change StyleState, use the ObjectLayer.updateObjectStyle method.
+             */
+            type StyleState = any;
+
+            /**
+             * Output from the rowToStyle callback.
+             * Defines the styles or the icon that is applied to the map object.
+             * @property icon {H.map.Icon} - Marker icon
+             * @property style {H.map.SpatialStyle.Options} - Spatial style
+             * @property arrows {H.map.ArrowStyle.Options} - Style of arrows to render along a polyline
+             * @property zIndex {number} - The z-index value of the map object, default is 0
+             */
+            interface ObjectStyleOptions {
+                icon: H.map.Icon;
+                style?: H.map.SpatialStyle.Options;
+                arrows?: H.map.ArrowStyle.Options;
+                zIndex?: number;
+            }
+
+            /**
+             * Input data quantization domain, used to optimize styling performance.
+             * The option must have properties corresponding to the properties of H.datalens.ObjectLayer.Row. Values must be represented as an Array of Numbers that defines the quantization domain.
+             * When provided, the input data will be quantized, and rowToStyle will be called only for quantized values.
+             */
+            type DataDomains = any;
+        }
+
+        /**
+         * Defines how to load data from a raw data file
+         * This provider defines the interface for loading data, such as geometries or coordinates, from a local or remote data file in GeoJSON or CSV format
+         */
+        class RawDataProvider extends H.map.provider.RemoteTileProvider {
+            /**
+             * Constructor
+             * @param options {H.datalens.RawDataProvider.Options} - Configures options
+             */
+            constructor(options: H.datalens.RawDataProvider.Options);
+
+            /**
+             * Updates the data url. Note that new data will be fetched only after the reload method is called.
+             * @param dataUrl {string}
+             */
+            setDataUrl(dataUrl: string): void;
+        }
+
+        namespace RawDataProvider {
+            /**
+             * Defines options for RawDataProvider
+             * Options for RawDataProvider
+             * @property dataUrl - The data url to fetch
+             * @property dataToFeatures {function(any)=} - Defines how the input data is mapped to an array of GeoJSON features
+             * @property featuresToRows {function(Array<H.datalens.RawDataProvider.Feature>, H.datalens.QueryTileProvider.X, H.datalens.QueryTileProvider.Y, H.datalens.QueryTileProvider.Zoom,
+             * H.datalens.RawDataProvider.TileSize, H.datalens.RawDataProvider.Helpers)=} -
+             * Defines how GeoJSON features on a tile should be mapped to data rows, which are inputs to layers such as ObjectLayer and HeatmapLayer
+             */
+            interface Options {
+                dataUrl?: string;
+                dataToFeatures?(obj: any): H.datalens.RawDataProvider.Feature[];
+                featuresToRows?(features: H.datalens.RawDataProvider.Feature[], x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, z: H.datalens.QueryTileProvider.Zoom,
+                                tileSize: H.datalens.RawDataProvider.TileSize, helpers: H.datalens.RawDataProvider.Helpers): H.datalens.ObjectLayer.Row[];
+            }
+
+            /**
+             * A GeoJSON feature
+             * A GeoJSON feature object which conforms to the standard GeoJSON spec
+             */
+            type Feature = any;
+
+            /**
+             * Tile size
+             * The tile size in pixels.
+             */
+            type TileSize = any;
+
+            /**
+             * A helper class used in the worker thread
+             * This helper class provides convenience functions you can use in the worker thread
+             * @property latLngToPixel {function(H.datalens.RawDataProvider.Latitude, H.datalens.RawDataProvider.Longitude, H.datalens.QueryTileProvider.Zoom, H.datalens.RawDataProvider.TileSize)=} -
+             * Translates geographical coordinates (latitude, longitude) to world pixel coordinates.
+             * @property pixelToLatLng {function(H.datalens.RawDataProvider.PX, H.datalens.RawDataProvider.PY, H.datalens.QueryTileProvider.Zoom, H.datalens.RawDataProvider.TileSize)=} -
+             * Translates world pixel coordinates to geographical coordinates (latitude, longitude).
+             * @property parseCSV {function(any)=} - Takes CSV data as input, parses it, and return the parsed result.
+             */
+            interface Helpers {
+                latLngToPixel?(latitude: H.datalens.RawDataProvider.Latitude, longitude: H.datalens.RawDataProvider.Longitude, z: H.datalens.QueryTileProvider.Zoom,
+                               tileSize: H.datalens.RawDataProvider.TileSize): H.datalens.RawDataProvider.PixelCoordinates;
+                pixelToLatLng?(x: H.datalens.RawDataProvider.PX, y: H.datalens.RawDataProvider.PY, z: H.datalens.QueryTileProvider.Zoom, tileSize: H.datalens.RawDataProvider.TileSize):
+                    H.datalens.RawDataProvider.GeoCoordinates;
+                parseCSV?(obj: any): any[];
+            }
+
+            /**
+             * Geographic coordinates
+             * A geographic coordinates pair [lat, lng]
+             */
+            type GeoCoordinates = [number, number];
+
+            /**
+             * Latitude coordinate
+             * The latitude in the geographic coordinates pair
+             */
+            type Latitude = number;
+
+            /**
+             * Longitude coordinate
+             * The longitude in the geographic coordinates pair
+             */
+            type Longitude = number;
+
+            /**
+             * Pixel coordinates
+             * Pixel coordinates [px, py] pair
+             */
+            type PixelCoordinates = [number, number];
+
+            /**
+             * Pixel coordinate in the x direction
+             * The x coordinate of the pixel coordinates pair [px, py]
+             */
+            type PX = number;
+
+            /**
+             * Pixel coordinate in the y direction
+             * The y coordinate of the pixel coordinates pair [px, py]
+             */
+            type PY = number;
+        }
+
+        /**
+         * Renders vector tiles using data-driven styles
+         * This layer binds the spatial data and user data, all provided by the Data Lens REST API. The layer renders geometry features using data-driven styles.
+         */
+        class SpatialLayer extends H.map.layer.TileLayer {
+            /**
+             * Constructor
+             * @param dataProvider {H.datalens.Provider} - Source of tiled data (pass in null if data come from feature properties)
+             * @param spatialProvider {H.datalens.SpatialTileProvider} - Source of geometry data
+             * @param options {H.datalens.SpatialLayer.Options} - Configuration for data processing and rendering
+             */
+            constructor(dataProvider: H.datalens.Provider, spatialProvider: H.datalens.SpatialTileProvider, options: H.datalens.SpatialLayer.Options);
+
+            static DEFAULT_STATE: any;
+            static Spatial: any;
+
+            /**
+             * Default value for dataToRows callback option. It represents each row as an object where property names correspond to data column names.
+             */
+            static defaultDataToRows: any;
+
+            /**
+             * Forces re-rendering of the layer. When the callbacks passed to the layer options are not pure functions, you can call this method to force re-rendering.
+             */
+            redraw(): void;
+
+            /**
+             * This method changes the state of a map object; for example, style on mouse event.
+             * @param {H.map.Object} spatial
+             * @param {H.datalens.SpatialLayer.StyleState} state
+             */
+            updateSpatialStyle(spatial: H.map.Object, state: H.datalens.SpatialLayer.StyleState): void;
+        }
+
+        namespace SpatialLayer {
+            /**
+             * Defines data processing and rendering options for SpatialLayer
+             * The initial step of rendering is to split the tile data by rows, where each row represents a bucket.
+             * By default this step is processed with H.datalens.SpatialLayer.defaultDataToRows. This behavior can be changed by defining the dataToRows callback.
+             * @property dataToRows {function(H.datalens.Service.Data, H.datalens.QueryTileProvider.X, H.datalens.QueryTileProvider.Y, H.datalens.QueryTileProvider.Zoom)=} -
+             * Defines how the input tile data is split by rows. You can specify this callback to define client-side aggregation and filtering. This callback is called for each tile.
+             * @property rowToSpatialId {function(H.datalens.SpatialLayer.Row)} -
+             * Defines how to get the spatial ID from a data row. This callback is called for each row that is returned from dataToRows.
+             * @property featureToSpatialId {function(H.datalens.SpatialLayer.Feature)} -
+             * Defines how to get the spatial ID from a geometry feature. This callback is called for each geometry feature in the vector tile.
+             * @property rowToStyle {function(H.datalens.SpatialLayer.Row, H.datalens.QueryTileProvider.Zoom, H.datalens.SpatialLayer.StyleState)} -
+             * Defines how the row is translated to map object style. This callback is called for each row that is returned from dataToRows.
+             * @property defaultStyle {function(H.datalens.QueryTileProvider.Zoom, H.datalens.SpatialLayer.StyleState)} - Defines the default map object style.
+             * @property transformFeature {H.datalens.SpatialLayer.transformFeature} - Defines how to transform the features.
+             */
+            interface Options {
+                dataToRows?(data: H.datalens.Service.Data, x: H.datalens.QueryTileProvider.X, y: H.datalens.QueryTileProvider.Y, z: H.datalens.QueryTileProvider.Zoom):
+                    H.datalens.SpatialLayer.Row[];
+                rowToSpatialId(row: H.datalens.SpatialLayer.Row): string;
+                featureToSpatialId(feature: H.datalens.SpatialLayer.Feature): string;
+                rowToStyle(row: H.datalens.SpatialLayer.Row, z: H.datalens.QueryTileProvider.Zoom, styleState: H.datalens.SpatialLayer.StyleState): any;
+                defaultStyle(z: H.datalens.QueryTileProvider.Zoom, styleState: H.datalens.SpatialLayer.StyleState): any;
+                transformFeature: H.datalens.SpatialLayer.transformFeature;
+            }
+
+            /**
+             * Defines modification of a data-driven style
+             * StyleState appears as a parameter in the rowToStyle callback. By default it is 'DEFAULT_STATE'. To change StyleState, use the SpatialLayer.updateSpatialStyle method.
+             */
+            type StyleState = any;
+
+            /**
+             * Defines a slice of data (eg Data Lens query data row) that represents a data point
+             * By default each row is an object where property names correspond to data column names. This representation can be changed with the dataToRows callback.
+             */
+            type Row = any;
+
+            /**
+             * Defines a geometry in the vector tile
+             * Each geometry is described by various properties, including a unique identifier which must be used to map the geometry to user data.
+             */
+            type Feature = any;
+
+            /**
+             * TODO: missing in documentation: https://developer.here.com/visualization/documentation/datalens/h-datalens-spatiallayer-options.html
+             */
+            type transformFeature = any;
+        }
+
+        /**
+         * Specifies how to access layer data (shapes, geometries) using the Data Lens REST API.
+         * This provider defines the interface for accessing shape layers via the Data Lens REST API. The input data is provided as vector tiles in the MapBox format (Protobuf).
+         * Data is loaded by tiles.
+         */
+        class SpatialTileProvider extends H.map.provider.RemoteTileProvider {
+            /**
+             * Constructor
+             * @param service {H.datalens.Service} - Data Lens REST API service
+             * @param options {H.datalens.SpatialTileProvider.Options} - Configures layer name
+             */
+            constructor(service: H.datalens.Service, options: H.datalens.SpatialTileProvider.Options);
+
+            static VectorTile: any;
+
+            /**
+             * Updates the layer name to be used in the next call of the Data Lens REST API. Note that new data will be fetched only after the reload method is called.
+             * @param {string} layerName
+             */
+            setLayerName(layerName: string): void;
+
+            /**
+             * Updates the query's dynamic parameters to be used in the next call of the Data Lens REST API. Note that new data will be fetched only after the reload method is called.
+             * This method is normally used when updating your visualization.
+             * @param {any|null} queryParams
+             */
+            setQueryParams(queryParams: any | null): void;
+        }
+
+        namespace SpatialTileProvider {
+            /**
+             * Defines layer name and data accessibility parameters for H.datalens.SpatialTileProvider
+             * This defines the layer name and dynamic parameters required for fetching tiled geometry data with the Data Lens REST API. Other options from H.datalens.Provider.Options are available.
+             * @property layerName {string} - The name of the layer to fetch with the Data Lens REST API query
+             * @property queryParams {any} - The query's dynamic parameters. The dynamic parameters can be used to filter data provided by the query.
+             */
+            interface Options {
+                layerName: string;
+                queryParams?: any;
+            }
+        }
+    }
+}
diff --git a/types/jquery.ajaxfile/tsconfig.json b/types/heredatalens/tsconfig.json
similarity index 85%
rename from types/jquery.ajaxfile/tsconfig.json
rename to types/heredatalens/tsconfig.json
index f17ec1e4af..9c60b13753 100644
--- a/types/jquery.ajaxfile/tsconfig.json
+++ b/types/heredatalens/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "jquery.ajaxfile-tests.ts"
+        "heredatalens-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/heredatalens/tslint.json b/types/heredatalens/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/heredatalens/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/heremaps/heremaps-tests.ts b/types/heremaps/heremaps-tests.ts
index 43c50d417c..01360c1bdf 100644
--- a/types/heremaps/heremaps-tests.ts
+++ b/types/heremaps/heremaps-tests.ts
@@ -28,19 +28,19 @@ function capture(resultContainer: HTMLElement, map: H.Map, ui: H.ui.UI) {
  * Boilerplate map initialization code starts below:
  */
 // Step 1: initialize communication with the platform
-var platform = new H.service.Platform({
+let platform = new H.service.Platform({
     app_id: 'DemoAppId01082013GAL',
     app_code: 'AJKnXv84fjrb0KIHawS0Tg',
     useHTTPS: true,
     useCIT: true
 });
 
-var defaultLayers = platform.createDefaultLayers();
+let defaultLayers = platform.createDefaultLayers();
 
-var mapContainer = document.getElementById('map');
+let mapContainer = document.getElementById('map');
 
 // Step 2: initialize a map
-var map = new H.Map(mapContainer, defaultLayers.normal.map, {
+let map = new H.Map(mapContainer, defaultLayers.normal.map, {
     // initial center and zoom level of the map
     zoom: 16,
     // Champs-Elysees
@@ -50,23 +50,22 @@ var map = new H.Map(mapContainer, defaultLayers.normal.map, {
 // Step 3: make the map interactive
 // MapEvents enables the event system
 // Behavior implements default interactions for pan/zoom (also on mobile touch environments)
-var behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(map));
+let behavior = new H.mapevents.Behavior(new H.mapevents.MapEvents(map));
 
 // Step 4: Create the default UI
-var ui = H.ui.UI.createDefault(map, defaultLayers, 'en-US');
-
+let ui = H.ui.UI.createDefault(map, defaultLayers, 'en-US');
 
 // Step 6: Create "Capture" button and place for showing the captured area
-var resultContainer = document.getElementById('panel');
+let resultContainer = document.getElementById('panel');
 
 // Create container for the "Capture" button
-var containerNode = document.createElement('div');
+let containerNode = document.createElement('div');
 containerNode.setAttribute('style',
     'position:absolute;top:0;left:0;background-color:#fff; padding:10px;');
 containerNode.className = 'btn-group';
 
 // Create the "Capture" button
-var captureBtn = document.createElement('input');
+let captureBtn = document.createElement('input');
 captureBtn.value = 'Capture';
 captureBtn.type = 'button';
 captureBtn.className = 'btn btn-sm btn-default';
@@ -76,6 +75,13 @@ containerNode.appendChild(captureBtn);
 mapContainer.appendChild(containerNode);
 
 // Step 7: Handle capture button click event
-captureBtn.onclick = function() {
+captureBtn.onclick = () => {
     capture(resultContainer, map, ui);
-};
\ No newline at end of file
+};
+
+let icon = new H.map.Icon('svg', { size: 5, crossOrigin: false });
+
+let polyline = new H.map.Polyline(new H.geo.Strip());
+// tslint:disable-next-line:array-type
+let clipArr: Array<Array<number>>;
+clipArr = polyline.clip(new H.geo.Rect(5, 5, 5, 5));
diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index bfdd353dd3..206a932e68 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -1,14 +1,17 @@
-// Type definitions for HERE Maps API for JavaScript 3.0s
+// Type definitions for 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 declare namespace H {
     /***** Map *****/
     /**
-     * Map class defines map instance in the application. By creating this object you will initialize a visible map object which is attached to the provided dom element. Map class is an entry point to all operations related to layers, map objects and geo-screen transformations. By specifying options you can initialize map with predefined view.
+     * Map class defines map instance in the application. By creating this object you will initialize a visible map object which is attached to the provided dom element.
+     * Map class is an entry point to all operations related to layers, map objects and geo-screen transformations. By specifying options you can initialize map with predefined view.
      */
-    export class Map extends H.util.EventTarget {
+    class Map extends H.util.EventTarget {
         /**
          * Constructor
          * @param element {Element} - html element into which the map will be rendered
@@ -81,7 +84,8 @@ declare namespace H {
         getCameraDataForBounds(rect: H.geo.Rect): H.map.ViewModel.CameraData;
 
         /**
-         * This method returns current map viewport. Viewport can be used to modify padding and margin which will reflect the position of the viewport center and the amount of extra data loaded (for margin)
+         * This method returns current map viewport.
+         * Viewport can be used to modify padding and margin which will reflect the position of the viewport center and the amount of extra data loaded (for margin)
          * @returns {H.map.ViewPort}
          */
         getViewPort(): H.map.ViewPort;
@@ -105,7 +109,8 @@ declare namespace H {
         getImprint(): H.map.Imprint;
 
         /**
-         * This method captures desired region of the map and objects on it. Result is returned as an HTML5 Canvas element. Origin of coordinate system for capturing is in the top left corner of the viewport.
+         * This method captures desired region of the map and objects on it. Result is returned as an HTML5 Canvas element.
+         * Origin of coordinate system for capturing is in the top left corner of the viewport.
          * @param callback {function(HTMLCanvasElement=)} - Callback function to call once result of the capturing is ready
          * @param opt_capturables {Array<H.util.ICapturable>=} - Collection of "capturable" element(s) to draw into the resulting canvas
          * @param opt_x1 {number=} - The X coordinate of the left edge of the capturing rectangle defaults to 0
@@ -113,7 +118,7 @@ declare namespace H {
          * @param opt_x2 {number=} - The X coordinate of the right edge of the capturing rectangle defaults to viewport width
          * @param opt_y2 {number=} - The Y coordinate of the bottom edge of the capturing rectangle defaults to viewport height
          */
-        capture(callback?: (canvas: HTMLCanvasElement) => void, opt_capturables?: Array<H.util.ICapturable>, opt_x1?: number, opt_y1?: number, opt_x2?: number, opt_y2?: number): void;
+        capture(callback?: (canvas: HTMLCanvasElement) => void, opt_capturables?: H.util.ICapturable[], opt_x1?: number, opt_y1?: number, opt_x2?: number, opt_y2?: number): void;
 
         /**
          * This method sets the rendering engine type for the map. Rendering engine is responsible for displaying i.e tiles and data on the map.
@@ -123,7 +128,8 @@ declare namespace H {
         setEngineType(type: H.Map.EngineType): H.Map;
 
         /**
-         * To persistently store the content of a map layer for a given area and range of zoom levels. It can be used to enable map rendering when no internet connection is established and also to reduce the download traffic for frequently visited map areas.
+         * To persistently store the content of a map layer for a given area and range of zoom levels.
+         * It can be used to enable map rendering when no internet connection is established and also to reduce the download traffic for frequently visited map areas.
          * @param opt_onprogress {function(H.util.Request)=} - A callback which is invoked every time when the progress state of the returned store request changes.
          * @param opt_bounds {H.geo.Rect=} - The area to store, default is the current view bounds
          * @param opt_min {number=} - The minimum zoom level to store, default is the current zoom level
@@ -209,21 +215,21 @@ declare namespace H {
          * This method retrieves the list of all objects which have been added to the map.
          * @returns {Array<H.map.Object>} - the list of all use objects which are currently on the map.
          */
-        getObjects(): Array<H.map.Object>;
+        getObjects(): H.map.Object[];
 
         /**
          * This method adds an array of objects or an object group to the map.
          * @param mapObjects {Array<!H.map.Object>}
          * @returns {H.Map} - the map instance
          */
-        addObjects(mapObjects: Array<H.map.Object>): H.Map;
+        addObjects(mapObjects: H.map.Object[]): H.Map;
 
         /**
          * This method removes an array of object or an object group from the map.
          * @param mapObjects {(Array<H.map.Object> | H.map.Group)}
          * @returns {H.Map} - the map instance
          */
-        removeObjects(mapObjects: (Array<H.map.Object> | H.map.Group)): H.Map;
+        removeObjects(mapObjects: (H.map.Object[] | H.map.Group)): H.Map;
 
         /**
          * Returns the top most z-ordered map object found under the specific screen coordinates. Coordinates are viewport pixel coordinates starting from top left corner as (0, 0) point.
@@ -239,7 +245,7 @@ declare namespace H {
          * @param y {number} - map viewport y-axis pixel coordinate
          * @returns {Array<!H.map.Object>}
          */
-        getObjectsAt(x: number, y: number): Array<H.map.Object>;
+        getObjectsAt(x: number, y: number): H.map.Object[];
 
         /**
          * This method will dispatch event on the event target object
@@ -257,16 +263,17 @@ declare namespace H {
          * @param callback {Function} - The callback function.
          * @param opt_scope {Object=} - An optional scope to call the callback in.
          */
-        addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+        addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
     }
 
-    export module Map {
+    namespace Map {
         /**
-         * It defines the number of lower and higher zoom levels, where cached content of the base map is rendered while content of the current zoom level is still loading. Example: if range was set to {lower: 3, higher: 2} and current level is 10 then rendering engine will try to display cached tiles from lower zoom levels 7, 8, 9 and higher levels 11 and 12.
+         * It defines the number of lower and higher zoom levels, where cached content of the base map is rendered while content of the current zoom level is still loading.
+         * Example: if range was set to {lower: 3, higher: 2} and current level is 10 then rendering engine will try to display cached tiles from lower zoom levels 7, 8, 9 and higher levels 11 and 12.
          * @property lower {number} - The number of lower zoom levels to take into account, default is 0
          * @property higher {number} - The number of higher zoom levels to take into account, default is 0
          */
-        export interface BackgroundRange {
+        interface BackgroundRange {
             lower: number;
             higher: number;
         }
@@ -274,7 +281,7 @@ declare namespace H {
         /**
          * Types of engines
          */
-        export enum EngineType {
+        enum EngineType {
             P2D,
             PANORAMA,
         }
@@ -288,17 +295,19 @@ declare namespace H {
          * @property engineType: {H.Map.EngineType=} - The initial engine type to use, default is P2D
          * @property pixelRatio {number} - The pixelRatio to use for over-sampling in cases of high-resolution displays, default is 1
          * @property imprint {H.map.Imprint.Options=} - The imprint options or null to suppress the imprint
-         * @property renderBaseBackground {H.Map.BackgroundRange=} - Object describes how many cached zoom levels should be used as a base map background while base map tiles are loading. Example: {lower: 3, higher: 2}
-         * @property autoColor {boolean=} - Indicates whether the UI's colors should automatically adjusted to the base layer, default is true. Up to now only the copyright style will be adjusted. See H.map.layer.Layer.Options#dark
+         * @property renderBaseBackground {H.Map.BackgroundRange=} - Object describes how many cached zoom levels should be used as a base map background while base map tiles are loading.
+         * Example: {lower: 3, higher: 2}
+         * @property autoColor {boolean=} - Indicates whether the UI's colors should automatically adjusted to the base layer, default is true. Up to now only the copyright style will be adjusted.
+         * See H.map.layer.Layer.Options#dark
          * @property margin {number=} - The size in pixel of the supplemental area to render for each side of the map
          * @property padding {H.map.ViewPort.Padding=} - The padding in pixels for each side of the map
          * @property fixedCenter {boolean=} - Indicates whether the center of the map should remain unchanged if the viewport's size or padding has been changed, default is true
          */
-        export interface Options {
+        interface Options {
             center?: H.geo.IPoint;
             zoom?: number;
             bounds?: H.geo.Rect;
-            layers?: Array<H.map.layer.Layer>;
+            layers?: H.map.layer.Layer[];
             engineType?: EngineType;
             pixelRatio?: number;
             imprint?: H.map.Imprint.Options;
@@ -311,7 +320,7 @@ declare namespace H {
     }
 
     /***** clustering *****/
-    export module clustering {
+    namespace clustering {
         /**
          * This class represents the input data structure for data points to be clustered.
          * @property lat {H.geo.Latitude} - The latitude coordinate of the data point's position
@@ -319,7 +328,7 @@ declare namespace H {
          * @property wt {number} - The weight of the data point
          * @property data {*} - Data associated with this data point
          */
-        export class DataPoint implements H.geo.IPoint {
+        class DataPoint implements H.geo.IPoint {
             /**
              * Constructor
              * @param lat {H.geo.Latitude} - The latitude coordinate of the data point's position
@@ -340,7 +349,7 @@ declare namespace H {
         /**
          * This interface describes a cluster of data points, which fulfill the clustering specification (i.e. data points are within the epsilon and there are enough points to form a cluster).
          */
-        export interface ICluster {
+        interface ICluster {
             /**
              * Returns the maximum zoom level where this cluster doesn't fall apart into sub clusters and/or noise poinst
              * @returns {number}
@@ -354,7 +363,8 @@ declare namespace H {
             getBounds(): H.geo.Rect;
 
             /**
-             * Invokes the specified callback for each "entry" of the cluster. That "entry" can be either a cluster which implements H.clustering.ICluster interface or a noise point which implements H.clustering.INoisePoint interface.
+             * Invokes the specified callback for each "entry" of the cluster.
+             * That "entry" can be either a cluster which implements H.clustering.ICluster interface or a noise point which implements H.clustering.INoisePoint interface.
              * @param callback {function(H.clustering.IResult)} - The callback gets the currently traversed entry as an argument, which is cluster or noise point.
              */
             forEachEntry(callback: (result: H.clustering.IResult) => void): void;
@@ -393,7 +403,7 @@ declare namespace H {
         /**
          * This interface represents a data point which does not belong to a cluster.
          */
-        export interface INoisePoint {
+        interface INoisePoint {
             /**
              * This method returns data which coresponds to this noise point.
              * @returns {*}
@@ -428,8 +438,7 @@ declare namespace H {
         /**
          * This interface represents the result item of a clustering operation.
          */
-        export interface IResult {
-
+        interface IResult {
             /**
              * Returns the geographical position of this cluster result.
              * @returns {H.geo.Point}
@@ -458,8 +467,7 @@ declare namespace H {
         /**
          * Interface which specifies the methods a theme must implement.
          */
-        export interface ITheme {
-
+        interface ITheme {
             /**
              * Function returns a cluster presentation as a map object.
              * @param cluster {H.clustering.ICluster}
@@ -476,17 +484,18 @@ declare namespace H {
         }
 
         /**
-         * The clustering provider serves clusters and noise point representation for the map depending on the provided data set. Levels for clustering as well as custom cluster representation can be set via Options.
+         * The clustering provider serves clusters and noise point representation for the map depending on the provided data set.
+         * Levels for clustering as well as custom cluster representation can be set via Options.
          * @property min {number} - Minimum zoom level at which provider can cluster data
          * @property max {number} - Maximum zoom level at which provider can cluster data
          */
-        export class Provider extends H.util.EventTarget {
+        class Provider extends H.util.EventTarget {
             /**
              * Constructor
              * @param dataPoints {Array<H.clustering.DataPoint>}
              * @param opt_options {H.clustering.Provider.Options=}
              */
-            constructor(dataPoints: Array<H.clustering.DataPoint>, opt_options?: H.clustering.Provider.Options);
+            constructor(dataPoints: H.clustering.DataPoint[], opt_options?: H.clustering.Provider.Options);
 
             /**
              * This method will dispatch event on the event target object
@@ -504,13 +513,13 @@ declare namespace H {
              * @param callback {Function}
              * @param opt_scope {Object=}
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
 
             /**
              * This method sets new data to the provider
              * @param dataPoints {Array<H.clustering.DataPoint>}
              */
-            setDataPoints(dataPoints: Array<H.clustering.DataPoint>): void;
+            setDataPoints(dataPoints: H.clustering.DataPoint[]): void;
 
             /**
              * This method adds a data point to the provider. Beware that this method provokes reclustering of the whole data set.
@@ -522,7 +531,7 @@ declare namespace H {
              * This method adds a list of data points to the provider. Beware that this method provokes reclustering of the whole data set.
              * @param dataPoints {Array<H.clustering.DataPoint>}
              */
-            addDataPoints(dataPoints: Array<H.clustering.DataPoint>): void;
+            addDataPoints(dataPoints: H.clustering.DataPoint[]): void;
 
             /**
              * This method removes a data point from the provider. Beware that this method provokes reclustering of the whole data set.
@@ -556,7 +565,7 @@ declare namespace H {
              * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
              * @returns {Array<H.map.DomMarker>} - a list of intersecting objects
              */
-            requestDomMarkers(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.DomMarker>;
+            requestDomMarkers(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.DomMarker[];
 
             /**
              * This method always returns true as we don't have information about visual representation until we have the clustering result and apply the theme.
@@ -572,7 +581,7 @@ declare namespace H {
              * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
              * @returns {Array<H.map.Marker>} - a list of intersecting objects
              */
-            requestMarkers(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Marker>;
+            requestMarkers(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.Marker[];
 
             /**
              * This method always returns true as we don't have information about visual representation until we have the clustering result and apply the theme.
@@ -588,7 +597,7 @@ declare namespace H {
              * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
              * @returns {Array<H.map.Spatial>} - a list of intersecting objects
              */
-            requestSpatials(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Spatial>;
+            requestSpatials(bounds: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.Spatial[];
 
             /**
              * Returns the spatial objects which intersect the given tile
@@ -597,7 +606,7 @@ declare namespace H {
              * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
              * @returns {Array<H.map.Spatial>} - a list of intersecting objects
              */
-            requestSpatialsByTile(tile: H.map.provider.Tile, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Spatial>;
+            requestSpatialsByTile(tile: H.map.provider.Tile, visiblesOnly: boolean, cacheOnly: boolean): H.map.Spatial[];
 
             /**
              * Returns the accumulate invalidations of this provider's objects that have occurred.
@@ -616,15 +625,16 @@ declare namespace H {
             max: number;
         }
 
-        export module Provider {
+        namespace Provider {
             /**
              * Options which are used within cluster calculations.
-             * @property eps {number=} - epsilon parameter for cluster calculation. For the FASTGRID strategy it must not exceed 256 and must take values that are power of 2. For the GRID and DYNAMICGRID strategies it can take values from 10 to 127. Default is 32.
+             * @property eps {number=} - epsilon parameter for cluster calculation. For the FASTGRID strategy it must not exceed 256 and must take values that are power of 2.
+             * For the GRID and DYNAMICGRID strategies it can take values from 10 to 127. Default is 32.
              * @property minWeight {number=} - the minimum points weight sum to form a cluster, default is 2
              * @property projection {H.geo.IProjection=} - projection to use for clustering, default is H.geo.mercator
              * @property strategy {H.clustering.Provider.Strategy=} - clustering stretegy, defaults to H.clustering.Provider.Strategy.FASTGRID
              */
-            export interface ClusteringOptions {
+            interface ClusteringOptions {
                 eps?: number;
                 minWeight?: number;
                 projection?: H.geo.IProjection;
@@ -638,7 +648,7 @@ declare namespace H {
              * @property clusteringOptions {H.clustering.Provider.ClusteringOptions=} - options for clustering algorithm
              * @property theme {H.clustering.ITheme=} - cluster and noise point graphical representation
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 clusteringOptions?: H.clustering.Provider.ClusteringOptions;
@@ -646,9 +656,12 @@ declare namespace H {
             }
 
             /**
-             * Enumeration represents possible clustering strategies. FASTGRID clustering is the efficient way to cluster large sets of data points. GRID clustering is slower but has greater precision due to the bigger range of epsilon values, this strategy suitable for clustering smaller data sets (up to 1000 data points) on desktop devices. DYNAMICGRID clustering uses the same algorithm of clustering as the GRID, but clusters on the viewport basis is meant to be used with data sets that are subject to the frequent update operations.
+             * Enumeration represents possible clustering strategies. FASTGRID clustering is the efficient way to cluster large sets of data points.
+             * GRID clustering is slower but has greater precision due to the bigger range of epsilon values, this strategy suitable for clustering smaller data sets (up to 1000 data points)
+             * on desktop devices. DYNAMICGRID clustering uses the same algorithm of clustering as the GRID, but clusters on the viewport basis is meant to be used with data sets that are subject
+             * to the frequent update operations.
              */
-            export enum Strategy {
+            enum Strategy {
                 FASTGRID,
                 GRID,
                 DYNAMICGRID,
@@ -657,11 +670,11 @@ declare namespace H {
     }
 
     /***** data *****/
-    export module data {
+    namespace data {
         /**
          * An abstract reader class defines interface for data readers and has general functionality related to fetching data and reader events.
          */
-        export class AbstractReader extends H.util.EventTarget {
+        class AbstractReader extends H.util.EventTarget {
             /**
              * Constructor
              * @param opt_url {string=}
@@ -669,7 +682,8 @@ declare namespace H {
             constructor(opt_url?: string);
 
             /**
-             * Method returns H.map.layer.ObjectLayer that contains parsed data, and can be added directly to the map. It returns new instance of the class with every invocation. If data hasn't been parsed it will return H.map.layer.ObjectLayer that contains partial information, and reader will add new parsed objects to the layer's provider later on.
+             * Method returns H.map.layer.ObjectLayer that contains parsed data, and can be added directly to the map. It returns new instance of the class with every invocation.
+             * If data hasn't been parsed it will return H.map.layer.ObjectLayer that contains partial information, and reader will add new parsed objects to the layer's provider later on.
              * @returns {H.map.layer.ObjectLayer}
              */
             getLayer(): H.map.layer.ObjectLayer;
@@ -678,7 +692,7 @@ declare namespace H {
              * Method returns collection of currently parsed, and converted to H.map.Object data objects. Method returns only currently parsed objects if parsing is ongoing.
              * @returns {Array<H.map.Object>}
              */
-            getParsedObjects(): Array<H.map.Object>;
+            getParsedObjects(): H.map.Object[];
 
             /**
              * Returns URL of the current file, which is either in process of fetching/parsing or file that has been already parsed.
@@ -687,7 +701,8 @@ declare namespace H {
             getUrl(): string | void;
 
             /**
-             * Method sets reader's URL. Method resets current Reader's state to its initial values (clears data about last parsed objects, etc.), and throws InvalidState exception if Reader's state is not READY or ERROR.
+             * Method sets reader's URL. Method resets current Reader's state to its initial values (clears data about last parsed objects, etc.), and throws
+             * InvalidState exception if Reader's state is not READY or ERROR.
              * @param url {string} - The new URL
              * @returns {H.data.AbstractReader}
              */
@@ -700,16 +715,17 @@ declare namespace H {
             getState(): H.data.AbstractReader.State;
 
             /**
-             * Method launches parsing of the data file at the current url (see H.data.AbstractReader#setUrl or H.data.AbstractReader). Method uses XHR as a transport therefore same origin policy applies, or server should respond with proper CORS headers.
+             * Method launches parsing of the data file at the current url (see H.data.AbstractReader#setUrl or H.data.AbstractReader).
+             * Method uses XHR as a transport therefore same origin policy applies, or server should respond with proper CORS headers.
              */
             parse(): void;
         }
 
-        export module AbstractReader {
+        namespace AbstractReader {
             /**
              * The event class for state events that are dispatched by AbstractReader
              */
-            export class Event extends H.util.Event {
+            class Event extends H.util.Event {
                 /**
                  * Constructor
                  * @param target {(H.data.AbstractReader | H.map.Object)} - The target that's passed to event listeners
@@ -723,7 +739,7 @@ declare namespace H {
             /**
              * The state types of an Reader. Possible states are:
              */
-            export enum State {
+            enum State {
                 ERROR,
                 LOADING,
                 VISIT,
@@ -733,16 +749,16 @@ declare namespace H {
     }
 
     /***** geo *****/
-    export module geo {
+    namespace geo {
         /**
          * A Geographic coordinate that specifies the height of a point in meters. A value of undefined is treated as 0.
          */
-        export type Altitude = number;
+        type Altitude = number;
 
         /**
          * Contexts for altitudes to specify the contextual origin of an altitude's value
          */
-        export enum AltitudeContext {
+        enum AltitudeContext {
             /** Ground level */
             undefined,
             /** Ground level */
@@ -766,14 +782,14 @@ declare namespace H {
          * @property alt {H.geo.Altitude=} - The altitude coordinate.
          * @property ctx {H.geo.AltitudeContext=} - The altitude context.
          */
-        export interface IPoint {
+        interface IPoint {
             lat: H.geo.Latitude;
             lng: Longitude;
             alt?: H.geo.Altitude;
             ctx?: H.geo.AltitudeContext;
         }
 
-        export interface IProjection {
+        interface IProjection {
             latLngToPoint(lat: number, lng: number, opt_out?: H.math.Point): H.math.Point;
             xyToGeo(x: number, y: number, opt_out?: H.geo.Point): H.geo.Point;
             pointToGeo(point: H.math.IPoint, opt_out?: H.geo.Point): H.geo.Point;
@@ -783,12 +799,12 @@ declare namespace H {
         /**
          * A geographic coordinate that specifies the north-south position of a point on the Earth's surface in the range from -90 to + 90 degrees, inclusive.
          */
-        export type Latitude = number;
+        type Latitude = number;
 
         /**
          * A Geographic coordinate that specifies the east-west position of a point on the Earth's surface in the range from -180 to 180 degrees, inclusive.
          */
-        export type Longitude = number;
+        type Longitude = number;
 
         /**
          * Class represents a geographical point, which is defined by the latitude, longitude and optional altitude.
@@ -797,7 +813,7 @@ declare namespace H {
          * @property alt {H.geo.Altitude} - The altitude coordinate.
          * @property ctx {H.geo.AltitudeContext} - The altitude context.
          */
-        export class Point implements IPoint {
+        class Point implements IPoint {
             /**
              * Constructor
              * @property lat {H.geo.Latitude} - The latitude coordinate.
@@ -822,7 +838,8 @@ declare namespace H {
             distance(other: IPoint): number;
 
             /**
-             * This method calculates the geographic point of a destination point using the distance and bearing specified by the caller. The altitude is ignored, instead the WGS84 Mean Radius is taken.
+             * This method calculates the geographic point of a destination point using the distance and bearing specified by the caller.
+             * The altitude is ignored, instead the WGS84 Mean Radius is taken.
              * @param bearing {number} - The bearing to use in the calculation in degrees.
              * @param distance {number} - The distance to the destination in meters.
              * @param opt_overGreatCircle {boolean=} - If true the computation uses the 'Great Circle' otherwise 'Rhumb Line'.
@@ -831,13 +848,14 @@ declare namespace H {
             walk(bearing: number, distance: number, opt_overGreatCircle?: boolean): Point;
 
             /**
-             * This method validates the given IPoint. It checks, if lat, lng, alt and ctx have valid types. Additionally the value of the lat property is clamped into a range of -90 ... +90 and the value of the lng property is modulo into a range of -180 ... +180 plus validates the values of the alt and ctx properties
+             * This method validates the given IPoint. It checks, if lat, lng, alt and ctx have valid types. Additionally the value of the lat property is clamped into a range of -90 ... +90
+             * and the value of the lng property is modulo into a range of -180 ... +180 plus validates the values of the alt and ctx properties
              * @param point {H.geo.IPoint} - The point to validate
              * @param opt_caller {Function=} - The caller to use for InvalidArgumentError. If omitted no error is thrown
              * @param opt_argNr {number=} - The argument number to use for InvalidArgumentError.
              * @returns {boolean} - if the given point could validate
              */
-            static validate(point: IPoint, opt_caller?: Function, opt_argNr?: number): boolean;
+            static validate(point: IPoint, opt_caller?: () => void, opt_argNr?: number): boolean;
 
             /**
              * This method creates a Point instance from a given IPoint object.
@@ -855,7 +873,7 @@ declare namespace H {
         /**
          * This class represents a rectangular geographic area. The area is defined by four geographical coordinates two (left, right) longitudes and two (top, bottom) latitudes.
          */
-        export class Rect {
+        class Rect {
             /**
              * Constructor
              * @param top {H.geo.Latitude} - the northern-most latitude
@@ -1030,7 +1048,8 @@ declare namespace H {
              * @param opt_out {H.geo.Rect=} - an optional rect to store the results
              * @returns {H.geo.Rect} - either the opt_out rect or a new rect
              */
-            static merge(topA: H.geo.Latitude, leftA: H.geo.Longitude, bottomA: H.geo.Latitude, rightA: H.geo.Longitude, topB: H.geo.Latitude, leftB: H.geo.Longitude, bottomB: H.geo.Latitude, rightB: H.geo.Longitude, opt_out?: H.geo.Rect): H.geo.Rect;
+            static merge(topA: H.geo.Latitude, leftA: H.geo.Longitude, bottomA: H.geo.Latitude, rightA: H.geo.Longitude, topB: H.geo.Latitude, leftB: H.geo.Longitude, bottomB: H.geo.Latitude,
+                         rightB: H.geo.Longitude, opt_out?: H.geo.Rect): H.geo.Rect;
 
             /**
              * This method creates a rectangular area from a top-left and bottom-right point pair.
@@ -1047,7 +1066,7 @@ declare namespace H {
              * @param opt_skipValidation {boolean=} - a boolean flag indicating whether to check validity of the arguments
              * @returns {H.geo.Rect} - returns the minimum rectangular area covering the points or null if no point is covered
              */
-            static coverPoints(pointArray: Array<H.geo.IPoint>, opt_skipValidation?: boolean): H.geo.Rect;
+            static coverPoints(pointArray: H.geo.IPoint[], opt_skipValidation?: boolean): H.geo.Rect;
 
             /**
              * This method creates the minimum rectangular area covering all of the coordinates in the argument array.
@@ -1055,7 +1074,7 @@ declare namespace H {
              * @param opt_skipValidation {boolean=} - a boolean flag indicating whether to check validity of the arguments
              * @returns {(H.geo.Rect | undefined)} - returns the minimum rectangular area covering the coordinates
              */
-            static coverLatLngAlts(latLngAltArray: Array<number>, opt_skipValidation?: boolean): H.geo.Rect | void;
+            static coverLatLngAlts(latLngAltArray: number[], opt_skipValidation?: boolean): H.geo.Rect | void;
 
             /**
              * This method creates the minimum rectangular area covering all of the rectangular areas in the argument array.
@@ -1063,7 +1082,7 @@ declare namespace H {
              * @param opt_skipValidation {boolean=} - a boolean flag indicating whether to check validity of the arguments
              * @returns {(H.geo.Rect | undefined)} - returns the minimum rectangular area covering the rectangular areas
              */
-            static coverRects(rectArray: Array<H.geo.Rect>, opt_skipValidation?: boolean): H.geo.Rect | void;
+            static coverRects(rectArray: H.geo.Rect[], opt_skipValidation?: boolean): H.geo.Rect | void;
 
             /**
              * This method clones the given bounding rect and resizes the clone if necessary until the location supplied by the caller is at its center.
@@ -1077,13 +1096,13 @@ declare namespace H {
         /**
          * A strip is a flat list of latitude, longitude, altitude tuples in a fixed order.
          */
-        export class Strip {
+        class Strip {
           /**
            * Constructor
            * @param opt_latLngAlts {Array<number>=} - An optional array of latitude, longitude and altitude triples to initialize the strip with.
            * @param opt_ctx {H.geo.AltitudeContext=} - An optional altitude context for all altitudes contained in this strip.
            */
-          constructor(opt_latLngAlts?: Array<number>, opt_ctx?: H.geo.AltitudeContext);
+          constructor(opt_latLngAlts?: number[], opt_ctx?: H.geo.AltitudeContext);
 
           /**
            * This method pushes a lat, lng, alt to the end of this strip.
@@ -1100,7 +1119,7 @@ declare namespace H {
            * @param opt_latLngAlts {Array<number>=} - The lat, lng, alt values to add
            * @returns {Array<number>} - an array of removed elements
            */
-          spliceLatLngAlts(index: number, opt_nRemove?: number, opt_latLngAlts?: Array<number>): Array<number>;
+          spliceLatLngAlts(index: number, opt_nRemove?: number, opt_latLngAlts?: number[]): number[];
 
           /**
            * This method inserts one set of lat, lng, alt values into the strip at the specified index.
@@ -1145,7 +1164,8 @@ declare namespace H {
           extractPoint(pointIndex: number, opt_out?: H.geo.Point): H.geo.Point;
 
           /**
-           * This method is a utility method that iterates over the lat, lng, alt array and calls the provided function for each 3 elements passing lat, lng and alt and the virtual point index as arguments.
+           * This method is a utility method that iterates over the lat, lng, alt array and calls the provided function for each 3 elements passing lat, lng and alt and the virtual point
+           * index as arguments.
            * @param eachFn {function(H.geo.Latitude, H.geo.Longitude, H.geo.Altitude, number)} - the function to be called for each 3 elements
            * @param opt_start {number=} - an optional start index to iterate from
            * @param opt_end {number=} - an optional end index to iterate to
@@ -1169,7 +1189,7 @@ declare namespace H {
            * This method returns the internal array keeping the lat, lng, alt values. Modifying this array directly can destroy the integrity of this strip. Use it only for read access.
            * @returns {Array<number>} - returns the raw lat, lng, alt values of this strip
            */
-          getLatLngAltArray(): Array<number>;
+          getLatLngAltArray(): number[];
 
           /**
            * This method returns the bounding box of this strip.
@@ -1190,18 +1210,18 @@ declare namespace H {
            * @param latLngs {Array<number>} - the array of lat, lng value.
            * @returns {H.geo.Strip} - the strip containing the lat, lng values
            */
-          static fromLatLngArray(latLngs: Array<number>): H.geo.Strip;
+          static fromLatLngArray(latLngs: number[]): H.geo.Strip;
         }
     }
 
     /***** lang *****/
 
     /***** map *****/
-    export module map {
+    namespace map {
         /**
          * This class represents marker, which offers a means of identifying a location on the map with an icon.
          */
-        export class AbstractMarker extends H.map.Object {
+        class AbstractMarker extends H.map.Object {
             /**
              * Constructor
              * @param position {H.geo.IPoint} - The location of this marker
@@ -1236,18 +1256,19 @@ declare namespace H {
             setIcon(icon: (H.map.Icon | H.map.DomIcon)): H.map.AbstractMarker;
         }
 
-        export module AbstractMarker {
+        namespace AbstractMarker {
             /**
              * Options used to initialize a AbstractMarker
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
              * @property visibility {boolean=} - Indicates whether the map object is visible at all, default is true.
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object.
+             * This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
              * @property icon {(H.map.Icon | H.map.DomIcon)=} - The icon to use for the visual representation, if omitted a default icon is used.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 visibility?: boolean;
@@ -1261,7 +1282,7 @@ declare namespace H {
         /**
          * This class represents style attributes for arrows to be rendered along a polyline. A ArrowStyle instance is always treated as immutable to avoid inconstiencies and must not modified.
          */
-        export class ArrowStyle {
+        class ArrowStyle {
             /**
              * Constructor
              * @param opt_options {(H.map.ArrowStyle | H.map.ArrowStyle.Options)=}
@@ -1276,15 +1297,18 @@ declare namespace H {
             equals(other: (H.map.ArrowStyle | H.map.ArrowStyle.Options)): boolean;
         }
 
-        export module ArrowStyle {
+        namespace ArrowStyle {
             /**
              * An object type to specify the style of arrows to render along a polyline
              * @property fillColor {string=} - The CSS color value used to fill the arrow shapes. If omitted or the value evaluates to false it defaults to "rgba(255, 255, 255, 0.75)"
-             * @property width {number=} - The width of the arrow shape. The value is taken as a factor of the width of the line, where the arrow description is applied. If omitted or the value is <= 0 it defaults to 1.2
-             * @property length {number=} - The length of the arrow shapes. The value is taken as a factor of the width of the line at the end of which the arrow is drawn. If omitted or the value is <= 0 it defaults to 1.6
-             * @property frequency {number=} - The frequency of arrow shapes. The value is taken as factor of the length of the arrow. A value of 1 results in gapless arrows. If omitted or the value is false it defaults to 5
+             * @property width {number=} - The width of the arrow shape. The value is taken as a factor of the width of the line, where the arrow description is applied.
+             * If omitted or the value is <= 0 it defaults to 1.2
+             * @property length {number=} - The length of the arrow shapes. The value is taken as a factor of the width of the line at the end of which the arrow is drawn.
+             * If omitted or the value is <= 0 it defaults to 1.6
+             * @property frequency {number=} - The frequency of arrow shapes. The value is taken as factor of the length of the arrow. A value of 1 results in gapless arrows.
+             * If omitted or the value is false it defaults to 5
              */
-            export interface Options {
+            interface Options {
                 fillColor?: string;
                 width?: number;
                 length?: number;
@@ -1295,17 +1319,18 @@ declare namespace H {
         /**
          * A Polygon with a circular shape.
          */
-        export class Circle extends H.map.Polygon {
+        class Circle extends H.map.Polygon {
           /**
            * Constructor
            * @param center {H.geo.IPoint} - The geographical coordinates of the circle's center
            * @param radius {number} - The radius of the circle in meters
-           * @param opt_options {H.map.Circle.Options=} - An object that specifies circle options and their initial values (among these, precision has a significant impact on the shape of the circle - please see
+           * @param opt_options {H.map.Circle.Options=} - An object that specifies circle options and their initial values (among these, precision has a significant impact on the shape of the circle
            */
           constructor(center: H.geo.IPoint, radius: number, opt_options?: H.map.Circle.Options);
 
           /**
-           * To set the geographical center point of this circle. If the specified center is an instance of H.geo.Point you must not modify this Point instance without calling setCenter immediately afterwards.
+           * To set the geographical center point of this circle. If the specified center is an instance of H.geo.Point you must not modify this Point instance without calling setCenter
+           * immediately afterwards.
            * @param center {H.geo.IPoint}
            */
           setCenter(center: H.geo.IPoint): void;
@@ -1341,18 +1366,22 @@ declare namespace H {
           getPrecision(): number;
         }
 
-        export module Circle {
+        namespace Circle {
           /**
            * @property style {H.map.SpatialStyle=} - the style to be used when tracing the polyline
            * @property visibility {boolean=} - An optional boolean value indicating whether this map object is visible, default is true
-           * @property precision {number=} - The precision of a circle as a number of segments to be used when rendering the circle. The value is clamped to the range between [4 ... 360], where 60 is the default. Note that the lower the value the more angular and the less circle-like the shape appears and, conversely, the higher the value the smoother and more rounded the result. Thus, starting at the extreme low end of the possible values, 4 produces a square, 6 a hexagon, while 30 results in a circle-like shape, although it appears increasingly angular as the zoom level increases (as you zoom in), and finally 360 produces a smooth circle.
+           * @property precision {number=} - The precision of a circle as a number of segments to be used when rendering the circle. The value is clamped to the range between [4 ... 360], where 60 is
+           * the default. Note that the lower the value the more angular and the less circle-like the shape appears and, conversely, the higher the value the smoother and more rounded the result.
+           * Thus, starting at the extreme low end of the possible values, 4 produces a square, 6 a hexagon, while 30 results in a circle-like shape, although it appears increasingly angular as
+           * the zoom level increases (as you zoom in), and finally 360 produces a smooth circle.
            * @property zIndex {number=} - The z-index value of the circle, default is 0
            * @property min {number=} - The minimum zoom level for which the circle is visible, default is -Infinity
            * @property max {number=} - The maximum zoom level for which the circle is visible, default is Infinity
-           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object.
+           * This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
            * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData
            */
-          export interface Options {
+          interface Options {
             style?: H.map.SpatialStyle | H.map.SpatialStyle.Options;
             visibility?: boolean;
             precision?: number;
@@ -1365,20 +1394,21 @@ declare namespace H {
         }
 
         /**
-         * The class represents data model of the map. It holds list of layers that are rendered by map's RenderEngine. The class listens to 'update' events from layers and dispatches them to the RenderEngine.
+         * The class represents data model of the map. It holds list of layers that are rendered by map's RenderEngine.
+         * The class listens to 'update' events from layers and dispatches them to the RenderEngine.
          */
-        export class DataModel extends H.util.OList {
+        class DataModel extends H.util.OList {
             /**
              * Constructor
              * @param opt_layers {Array=} - array of layers to be added to the data model
              */
-            constructor(opt_layers?: Array<H.map.layer.Layer>);
+            constructor(opt_layers?: H.map.layer.Layer[]);
         }
 
         /**
          * A visual representation of the H.map.DomMarker.
          */
-        export class DomIcon {
+        class DomIcon {
             /**
              * Constructor
              * @param element {!(Element | string)} - The element or markup to use for this icon
@@ -1387,22 +1417,25 @@ declare namespace H {
             constructor(element: (Element | string), opt_options?: H.map.DomIcon.Options);
         }
 
-        export module DomIcon {
+        namespace DomIcon {
             /**
              * Options used to initialize a DomIcon
-             * @property onAttach {function(Element, H.map.DomIcon, H.map.DomMarker)=} - A callback which is invoked before a clone of the icon's element is appended and displayed on the map. This callback can be used to setup the clone.
-             * @property onDetach {function(Element, H.map.DomIcon, H.map.DomMarker)=} - A callback which is invoked after a clone of the icon's element is removed from the map. This callback can be used to clean up the clone.
+             * @property onAttach {function(Element, H.map.DomIcon, H.map.DomMarker)=} - A callback which is invoked before a clone of the icon's element is appended and displayed on the map.
+             * This callback can be used to setup the clone.
+             * @property onDetach {function(Element, H.map.DomIcon, H.map.DomMarker)=} - A callback which is invoked after a clone of the icon's element is removed from the map.
+             * This callback can be used to clean up the clone.
              */
-            export interface Options {
-                onAttach?: (el: Element, icon: H.map.DomIcon, marker: H.map.DomMarker) => void;
-                onDetach?: (el: Element, icon: H.map.DomIcon, marker: H.map.DomMarker) => void;
+            interface Options {
+                onAttach?(el: Element, icon: H.map.DomIcon, marker: H.map.DomMarker): void;
+                onDetach?(el: Element, icon: H.map.DomIcon, marker: H.map.DomMarker): void;
             }
         }
 
         /**
-         * A marker with a visual representation in the form of a full styleable and scripteable DOM element. DomMarker are predestinated if small amounts of markers with dynamic styled and/or scripted icons should be displayed om the map (e.g. animated interactive SVG).
+         * A marker with a visual representation in the form of a full styleable and scripteable DOM element. DomMarker are predestinated if small amounts of markers with dynamic styled and/or
+         * scripted icons should be displayed om the map (e.g. animated interactive SVG).
          */
-        export class DomMarker extends H.map.AbstractMarker {
+        class DomMarker extends H.map.AbstractMarker {
             /**
              * Constructor
              * @param position {H.geo.IPoint}
@@ -1411,18 +1444,19 @@ declare namespace H {
             constructor(position: H.geo.IPoint, opt_options?: H.map.DomMarker.Options);
         }
 
-        export module DomMarker {
+        namespace DomMarker {
             /**
              * Options used to initialize a DomMarker
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
              * @property visibility {boolean=} - Indicates whether the map object is visible at all, default is true.
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to
+             * instantiate an object.
              * @property icon {H.map.DomIcon=} - The icon to use for the visual representation, if omitted a default icon is used.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 visibility?: boolean;
@@ -1436,7 +1470,7 @@ declare namespace H {
         /**
          * This class represents a spatial shape in geographic space. It is defined by a path containing the vertices of the shape (lat, lng, alt values).
          */
-        export class GeoShape extends H.map.Spatial {
+        class GeoShape extends H.map.Spatial {
           /**
            * Constructor
            * @param isClosed {boolean} - Indicates whether this geographical shape is closed (a polygon)
@@ -1468,7 +1502,7 @@ declare namespace H {
         /**
          * This class represents a map object which can contain other map objects. It's visibility, zIndex and object-order influences the contained map objects
          */
-        export class Group extends H.map.Object {
+        class Group extends H.map.Object {
             /**
              * Constructor
              * @param opt_options {H.map.Group.Options=} - an optional object containing initialization values
@@ -1488,7 +1522,7 @@ declare namespace H {
              * @param opt_recursive {boolean=} - Indicates whether objects in sub-groups are also collected .
              * @returns {!Array<!H.map.Object>}
              */
-            getObjects(opt_recursive?: boolean): Array<H.map.Object>;
+            getObjects(opt_recursive?: boolean): H.map.Object[];
 
             /**
              * Method returns the bounding rectangle for the group. The rectangle is the smallest rectangle that covers all objects. If group doesn't contains objects method returns null.
@@ -1507,7 +1541,7 @@ declare namespace H {
              * Appends a list of objects to this group
              * @param objects {Array<!H.map.Object>}
              */
-            addObjects(objects: Array<H.map.Object>): void;
+            addObjects(objects: H.map.Object[]): void;
 
             /**
              * Removes an object from this group.
@@ -1520,7 +1554,7 @@ declare namespace H {
              * Removes objects from this group.
              * @param objects {!Array<!H.map.Object>} - The list of objects to remove
              */
-            removeObjects(objects: Array<H.map.Object>): void;
+            removeObjects(objects: H.map.Object[]): void;
 
             /**
              * Method removes all objects from the group.
@@ -1528,45 +1562,46 @@ declare namespace H {
             removeAll(): void;
         }
 
-        export module Group {
+        namespace Group {
             /**
              * Options used to initialize a group
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
              * @property visibility {boolean=} - Indicates whether the map object is visible, default is true
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+             * an object.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              * @property objects {Array<H.map.Object>=} - A list of map objects to add initially to this group.
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 visibility?: boolean;
                 zIndex?: number;
                 provider?: H.map.provider.Provider;
                 data?: any;
-                objects?: Array<H.map.Object>;
+                objects?: H.map.Object[];
             }
         }
 
         /**
          * This class represents an area that objects, like a marker, occupies in the screen space, meaning that object can be probed and returned by H.Map@getObjectsAt method.
          */
-        export class HitArea {
+        class HitArea {
             /**
              * Constructor
              * @param shapeType {H.map.HitArea.ShapeType} - The shape type of the HitArea
              * @param opt_values {Array<number>=} - The type-dependent values to define the shape of the hit area. The format for the different types are:
              */
-            constructor(shapeType: H.map.HitArea.ShapeType, opt_values?: Array<number>);
+            constructor(shapeType: H.map.HitArea.ShapeType, opt_values?: number[]);
         }
 
-        export module HitArea {
+        namespace HitArea {
             /**
              * Enumeration represents possible shape types that HitArea can have.
              */
-            export enum ShapeType {
+            enum ShapeType {
                 NONE,
                 RECT,
                 CIRCLE,
@@ -1577,8 +1612,7 @@ declare namespace H {
         /**
          * Control interface defines method which are used for direct view or camera manipulation
          */
-        export interface IControl {
-
+        interface IControl {
             /**
              * This method starts control action for camera. This action allows to control camera animation and movement according to provided values in the H.map.IControl#control function
              * @param opt_kinetics {H.util.kinetics.IKinetics=} - kinetics settings
@@ -1588,7 +1622,8 @@ declare namespace H {
             startControl(opt_kinetics?: H.util.kinetics.IKinetics, opt_atX?: number, opt_atY?: number): void;
 
             /**
-             * This method triggers single control action on engine. This will trigger an animation which will start modification of the view's or camera's properties according to values begin set. Modification will occur at every frame. The speed values are measure by 'levels per frame' were 1 level cooresponds to a distance to next zoom level.
+             * This method triggers single control action on engine. This will trigger an animation which will start modification of the view's or camera's properties according to values begin set.
+             * Modification will occur at every frame. The speed values are measure by 'levels per frame' were 1 level cooresponds to a distance to next zoom level.
              * @param moveX {number} - moves the view/cam in right/left direction
              * @param moveY {number} - moves the view/cam in bottom/top direction
              * @param moveZ {number} - moves the view/cam in depth direction (changes zoom level)
@@ -1601,9 +1636,11 @@ declare namespace H {
             control(moveX: number, moveY: number, moveZ: number, angleX: number, angleY: number, angleZ: number, zoom: number, opt_timestamp?: number): void;
 
             /**
-             * This method ends current control, which will stop ongoing animation triggered by the startControl method. This method can prevent kinetics as well as it can adjust the final view if the adjust function is being passed.
+             * This method ends current control, which will stop ongoing animation triggered by the startControl method. This method can prevent kinetics as well as it can adjust the final view if
+             * the adjust function is being passed.
              * @param opt_preventKinetics {boolean=} - if set to true will prevent kinetics animation
-             * @param opt_adjustView {function(H.map.ViewModel.CameraData)=} - user defined function which can adjust the final view this function takes last requestedData from the view model and should return a modified H.map.ViewModel.CameraData which will be set as the final view
+             * @param opt_adjustView {function(H.map.ViewModel.CameraData)=} - user defined function which can adjust the final view this function takes last requestedData from the view model and
+             * should return a modified H.map.ViewModel.CameraData which will be set as the final view
              */
             endControl(opt_preventKinetics?: boolean, opt_adjustView?: (data: H.map.ViewModel.CameraData) => void): void;
         }
@@ -1613,15 +1650,16 @@ declare namespace H {
          * @property label {string} - A short textual representation of the copyright note, e.g. "DigitalGlobe 2009"
          * @property alt {string} - A detailed textual representation of the copyright note, e.g. "copyright 2009 DigitalGlobe, Inc."
          */
-        export interface ICopyright {
+        interface ICopyright {
             label: string;
             alt: string;
         }
 
         /**
-         * Interface describes interaction with the view port. Interaction will reflect view change depending on the interaction coordinates passed and the modifiers which specify the type of interaction.
+         * Interface describes interaction with the view port. Interaction will reflect view change depending on the interaction coordinates passed and the modifiers which specify the type of
+         * interaction.
          */
-        export interface IInteraction {
+        interface IInteraction {
             /**
              * This method starts the interaction with the view port. Should be called every time when new interaction is started i.e mouse grab, or touch start.
              * @param modifiers {number} - a bitmask which specifies what operations should performed during every interaction
@@ -1649,7 +1687,7 @@ declare namespace H {
         /**
          * A visual representation of the H.map.Marker.
          */
-        export class Icon {
+        class Icon {
             /**
              * Constructor
              * @param bitmap {!(string | HTMLImageElement | HTMLCanvasElement)} - Either an image URL, a SVG markup, an image or a canvas.
@@ -1688,13 +1726,14 @@ declare namespace H {
             getHitArea(): H.map.HitArea;
 
             /**
-             * This method allows to listen for specific event triggered by the object. Keep in mind, that you must removeEventListener manually or dispose an object when you no longer need it. Otherwise memory leak is possible.
+             * This method allows to listen for specific event triggered by the object. Keep in mind, that you must removeEventListener manually or dispose an object when you no longer need it.
+             * Otherwise memory leak is possible.
              * @param type {string} - name of event
              * @param handler {Function} - event handler function
              * @param opt_capture {boolean=} - if set to true will listen in the capture phase (bubble otherwise)
              * @param opt_scope {Object=} - scope for the handler function
              */
-            addEventListener(type: string, handler: Function, opt_capture?: boolean, opt_scope?: Object): void;
+            addEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
 
             /**
              * This method will removed previously added listener from the event target
@@ -1703,7 +1742,7 @@ declare namespace H {
              * @param opt_capture {boolean=} - if set to true will listen in the capture phase (bubble otherwise)
              * @param opt_scope {Object=} - scope for the handler function
              */
-            removeEventListener(type: string, handler: Function, opt_capture?: boolean, opt_scope?: Object): void;
+            removeEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
 
             /**
              * This method will dispatch event on the event target object
@@ -1721,14 +1760,14 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
-        export module Icon {
+        namespace Icon {
             /**
              * The state types of an Icon
              */
-            export enum State {
+            enum State {
                 ERROR,
                 LOADING,
                 READY,
@@ -1739,11 +1778,13 @@ declare namespace H {
              * @property size {H.math.ISize=} - The icon's size in pixel, default is the bitmap's natural size
              * @property anchor {H.math.IPoint=} - The anchorage point in pixel, default is bottom-center
              * @property hitArea {H.map.HitArea=} - The area to use for hit detection, default is the whole rectangular area
-             * @property asCanvas {H.map.HitArea=} - Indicates whether a non canvas bitmap is converted into a canvas, default is true. The conversion improves the rendering performance but it could also cause a higher memory consumption.
-             * @property crossOrigin {boolean} - Specifies whether to use anonynous Cross-Origin Resource Sharing (CORS) when fetching an image to prevent resulting canvas from tainting, default is false. The option is ignored by IE9-10.
+             * @property asCanvas {H.map.HitArea=} - Indicates whether a non canvas bitmap is converted into a canvas, default is true. The conversion improves the rendering performance but it could
+             * also cause a higher memory consumption.
+             * @property crossOrigin {boolean} - Specifies whether to use anonynous Cross-Origin Resource Sharing (CORS) when fetching an image to prevent resulting canvas from tainting, default is
+             * false. The option is ignored by IE9-10.
              */
-            export interface Options {
-                size?: H.math.ISize;
+            interface Options {
+                size?: H.math.ISize | number;
                 anchor?: H.math.IPoint;
                 hitArea?: H.map.HitArea;
                 asCanvas?: H.map.HitArea;
@@ -1754,7 +1795,7 @@ declare namespace H {
         /**
          * This class encapsulates the brand, copyright and terms of use elements on the map.
          */
-        export class Imprint {
+        class Imprint {
             /**
              * Constructor
              * @param map {H.Map} - The map where the imprint is attached to
@@ -1785,7 +1826,7 @@ declare namespace H {
              * @param callback {Function}
              * @param opt_scope {Object=}
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
 
             /**
              * This method is used to capture the element view
@@ -1797,14 +1838,14 @@ declare namespace H {
             capture(canvas: HTMLCanvasElement, pixelRatio: number, callback?: (canvas: HTMLCanvasElement) => void, opt_errback?: (s: string) => void): void;
         }
 
-        export module Imprint {
+        namespace Imprint {
             /**
              * Options to style an imprint
              * @property invert {boolean=} - Indicates whether the logo is inverted. If omitted the current value remains, default is false.
              * @property font {string=} - The font of the text. If omitted the current value remains, default is &quot;11px Arial,sans-serif&quot;.
              * @property href {string=} - The URL of the &quot;Terms of use&quot; link. If omitted the current value remains, default is &quot;http://here.com/terms&quot;.
              */
-            export interface Options {
+            interface Options {
                 invert?: boolean;
                 font?: string;
                 href?: string;
@@ -1814,7 +1855,7 @@ declare namespace H {
         /**
          * A marker with a visual representation in the form of a bitmap icon. Marker are predestinated if large amounts of markers with static icons should be displayed om the map.
          */
-        export class Marker extends H.map.AbstractMarker {
+        class Marker extends H.map.AbstractMarker {
             /**
              * Constructor
              * @param position {H.geo.IPoint} - The location of this marker
@@ -1823,18 +1864,19 @@ declare namespace H {
             constructor(position: H.geo.IPoint, opt_options?: H.map.Marker.Options);
         }
 
-        export module Marker {
+        namespace Marker {
             /**
              * Options used to initialize a Marker
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
              * @property visibility {boolean=} - Indicates whether the map object is visible at all, default is true.
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+             * an object.
              * @property icon {H.map.Icon=} - The icon to use for the visual representation, if omitted a default icon is used.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 visibility?: boolean;
@@ -1848,7 +1890,7 @@ declare namespace H {
         /**
          * This class represents the abstract base class for map objects such as polylines, polygons, markers, groups etc.
          */
-        export class Object extends H.util.EventTarget {
+        class Object extends H.util.EventTarget {
             /**
              * Constructor
              * @param opt_options {H.map.Object.Options=} - The values to initialize this object
@@ -1963,20 +2005,21 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
-        export module Object {
+        namespace Object {
             /**
              * Options used to initialize a map object
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
              * @property visibility {boolean=} - Indicates whether the map object is visible at all, default is true
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+             * an object.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 visibility?: boolean;
@@ -1988,7 +2031,7 @@ declare namespace H {
             /**
              * The major types of map objects
              */
-            export enum Type {
+            enum Type {
                 /** spatial object */
                 ANY,
                 /** spatial object */
@@ -2007,7 +2050,7 @@ declare namespace H {
         /**
          * This class represents an overlay, which offers a bitmap that covers a geographical reactangular area on the map.
          */
-        export class Overlay extends H.map.Object {
+        class Overlay extends H.map.Object {
             /**
              * Constructor
              * @param bounds {H.geo.Rect} - The geographical reactangular area of this overlay
@@ -2056,7 +2099,7 @@ declare namespace H {
             setOpacity(opacity: number): H.map.Overlay;
         }
 
-        export module Overlay {
+        namespace Overlay {
             /**
              * Options used to initialize an Overlay
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
@@ -2064,10 +2107,11 @@ declare namespace H {
              * @property opacity {number=} - The opacity of the object in range from 0 (transparent) to 1 (opaque), default is 1.
              * @property visibility {boolean=} - Indicates whether the map object is visible at all, default is true.
              * @property zIndex {number=} - The z-index value of the map object, default is 0
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+             * an object.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              */
-            export interface Options {
+            interface Options {
                 min?: number;
                 max?: number;
                 opacity?: number;
@@ -2079,9 +2123,11 @@ declare namespace H {
         }
 
         /**
-         * This class represents a polygon in geo-space. It is defined by a strip containing the vertices of a geo shape object (lat, lng, alt values) and a pen to use when rendering the polyline. Polygon represents a closed plane defined by the list of verticies, projected on the map display. List of vericies which define the polygon are is a list of geo coordinates encapsulated by the strip object H.geo.Strip
+         * This class represents a polygon in geo-space. It is defined by a strip containing the vertices of a geo shape object (lat, lng, alt values) and a pen to use when rendering the polyline.
+         * Polygon represents a closed plane defined by the list of verticies, projected on the map display. List of vericies which define the polygon are is a list of geo coordinates encapsulated
+         * by the strip object H.geo.Strip
          */
-        export class Polygon extends H.map.GeoShape {
+        class Polygon extends H.map.GeoShape {
           /**
            * Constructor
            * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
@@ -2090,7 +2136,8 @@ declare namespace H {
           constructor(strip: H.geo.Strip, opt_options?: H.map.Spatial.Options);
 
           /**
-           * To set the indicator whether this polygon covers the north pole. It's needed for Polygons whose strip is defined as lines arround the world on longitude axis (for example a circle whose center is one of the poles). In this case a additional information is needed to know if the southern or northern part of the world should be covered by the poygon.
+           * To set the indicator whether this polygon covers the north pole. It's needed for Polygons whose strip is defined as lines arround the world on longitude axis (for example a circle whose
+           * center is one of the poles). In this case a additional information is needed to know if the southern or northern part of the world should be covered by the poygon.
            * @param flag {boolean} - A value of true means it covers the north pole, false means south pole
            * @returns {H.map.Polygon} - the Polygon instance itself
            */
@@ -2106,7 +2153,7 @@ declare namespace H {
         /**
          * This class represents a polyline in geo-space. It is defined by a path containing the vertices of a polyline (lat, lng, alt values) and a pen to use when tracing the path on the map.
          */
-        export class Polyline extends H.map.GeoShape {
+        class Polyline extends H.map.GeoShape {
           /**
            * Constructor
            * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
@@ -2119,10 +2166,10 @@ declare namespace H {
            * @param geoRect {H.geo.Rect}
            * @returns {Array<Array<number>>}
            */
-          clip(geoRect: H.geo.Rect): Array<Array<number>>;
+          clip(geoRect: H.geo.Rect): number[][];
         }
 
-        export module Polyline {
+        namespace Polyline {
           /**
            * Options which are used to initialize a polyline
            * @property style {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - the style to be used when tracing the polyline
@@ -2131,10 +2178,11 @@ declare namespace H {
            * @property zIndex {number=} - The z-index value of the map object, default is 0
            * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
            * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
-           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+           * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+           * an object.
            * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData
            */
-          export interface Options {
+          interface Options {
             style?: (H.map.SpatialStyle | H.map.SpatialStyle.Options);
             arrows?: (H.map.ArrowStyle | H.map.ArrowStyle.Options);
             visibility?: boolean;
@@ -2149,7 +2197,7 @@ declare namespace H {
         /**
          * A Polygon with a rectangular shape.
          */
-        export class Rect extends H.map.Polygon {
+        class Rect extends H.map.Polygon {
           /**
            * Constructor
            * @param bounds {H.geo.Rect} - The geographical bounding box for this rectangle
@@ -2167,7 +2215,7 @@ declare namespace H {
         /**
          * This class represents a spatial map object which provides its projected geometry.
          */
-        export class Spatial extends H.map.Object {
+        class Spatial extends H.map.Object {
             /**
              * Constructor
              * @param isClosed {boolean} - Indicates whether this spatial object represents a closed shape
@@ -2182,14 +2230,16 @@ declare namespace H {
             getStyle(): H.map.SpatialStyle;
 
             /**
-             * To set the drawing style of this object. If the passed opt_style argument is an instance of H.map.SpatialStyle it is treated as immutable and must not be modified afterwards to prevent inconsistancies! .
+             * To set the drawing style of this object. If the passed opt_style argument is an instance of H.map.SpatialStyle it is treated as immutable and must not be modified afterwards to prevent
+             * inconsistancies!
              * @param opt_style {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - The style to set. If it evaluates to a falsy the H.map.SpatialStyle.DEFAULT_STYLE is used.
              * @returns {H.map.Spatial} - the Spatial instance itself
              */
             setStyle(opt_style?: (H.map.SpatialStyle | H.map.SpatialStyle.Options)): H.map.Spatial;
 
             /**
-             * To get the arrow style of this spatial object or undefined if no style is defined. A returned arrow style is treated as immutable and must not be modified afterwards to prevent inconsistancies!
+             * To get the arrow style of this spatial object or undefined if no style is defined. A returned arrow style is treated as immutable and must not be modified afterwards to prevent
+             * inconsistancies!
              * @returns {(H.map.ArrowStyle | undefined)}
              */
             getArrows(): H.map.ArrowStyle | void;
@@ -2208,7 +2258,7 @@ declare namespace H {
             isClosed(): boolean;
         }
 
-        export module Spatial {
+        namespace Spatial {
             /**
              * Data to used as rendering hint for a label
              * @property x {number} - The X coordinate of the first line's starting point
@@ -2219,7 +2269,7 @@ declare namespace H {
              * @property color {string} - The CSS color
              * @property text {string} - The text content, new line characters (\u000A) are interpreted as line breaks
              */
-            export interface Label {
+            interface Label {
                 x: number;
                 y: number;
                 angle: number;
@@ -2237,10 +2287,11 @@ declare namespace H {
              * @property zIndex {number=} - The z-index value of the map object, default is 0
              * @property min {number=} - The minimum zoom level for which the object is visible, default is -Infinity
              * @property max {number=} - The maximum zoom level for which the object is visible, default is Infinity
-             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate an object.
+             * @property provider {(H.map.provider.Provider | null)=} - The provider of this object. This property is only needed if a customized Implementation of ObjectProvider wants to instantiate
+             * an object.
              * @property data {*} - Optional arbitrary data to be stored with this map object. This data can be retrieved by calling getData.
              */
-            export interface Options {
+            interface Options {
                 style?: (H.map.SpatialStyle | H.map.SpatialStyle.Options);
                 arrows?: (H.map.ArrowStyle | H.map.ArrowStyle.Options);
                 visibility?: boolean;
@@ -2253,19 +2304,21 @@ declare namespace H {
         }
 
         /**
-         * The SpatialStyle class represents a style with which spatial objects like polylines and polygons are drawn. A SpatialStyle instance is always treated as immutable to avoid inconstiencies and must not modified.
+         * The SpatialStyle class represents a style with which spatial objects like polylines and polygons are drawn. A SpatialStyle instance is always treated as immutable to avoid inconstiencies
+         * and must not modified.
          * @property strokeColor {string} - The color of the stroke in CSS syntax, default is 'rgba(0, 85, 170, 0.6)'.
          * @property fillColor {string} - The filling color in CSS syntax, default is 'rgba(0, 85, 170, 0.4)'.
          * @property lineWidth {number} - The width of the line in pixels, default is 2.
          * @property lineCap {H.map.SpatialStyle.LineCap} - The style of the end caps for a line, default is 'round'.
          * @property lineJoin {H.map.SpatialStyle.LineJoin} - The type of corner created, when two lines meet, default is 'miter'.
          * @property miterLimit {number} - The miter length is the distance between the inner corner and the outer corner where two lines meet. The default is 10.
-         * @property lineDash {Array<number>} - The line dash pattern as an even numbered list of distances to alternately produce a line and a space. The default is [ ].
+         * @property lineDash {Array<number>} - The line dash pattern as an even numbered list of distances to alternately produce a line and a space. The default is [].
          * @property lineDashOffset {number} - The phase offset of the line dash pattern The default is 0.
          * @property MAX_LINE_WIDTH {number} - This constant represents the maximum line width which can be used for rendering.
-         * @property DEFAULT_STYLE {H.map.SpatialStyle} - This static member defines the default style for spatial objects on the map. It's value is  { strokeColor: '#05A', fillColor: 'rgba(0, 85, 170, 0.4)' lineWidth: 1, lineCap: 'round', lineJoin: 'miter', miterLimit: 10, lineDash: [ ], lineDashOffset: 0 }
+         * @property DEFAULT_STYLE {H.map.SpatialStyle} - This static member defines the default style for spatial objects on the map. It's value is
+         * { strokeColor: '#05A', fillColor: 'rgba(0, 85, 170, 0.4)', lineWidth: 1, lineCap: 'round', lineJoin: 'miter', miterLimit: 10, lineDash: [], lineDashOffset: 0 }
          */
-        export class SpatialStyle {
+        class SpatialStyle {
             /**
              * Constructor
              * @param opt_options {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - The optional style attributes
@@ -2292,22 +2345,22 @@ declare namespace H {
             lineCap: H.map.SpatialStyle.LineCap;
             lineJoin: H.map.SpatialStyle.LineJoin;
             miterLimit: number;
-            lineDash: Array<number>;
+            lineDash: number[];
             lineDashOffset: number;
             static MAX_LINE_WIDTH: number;
             static DEFAULT_STYLE: H.map.SpatialStyle;
         }
 
-        export module SpatialStyle {
+        namespace SpatialStyle {
             /**
              * The style of the end caps for a line, one of 'butt', 'round' or 'square'.
              */
-            export type LineCap = 'butt' | 'round' | 'square';
+            type LineCap = 'butt' | 'round' | 'square';
 
             /**
              * The type of corner created, when two lines meet, one of 'round', 'bevel' or 'miter'.
              */
-            export type LineJoin = 'round' | 'bevel' | 'miter';
+            type LineJoin = 'round' | 'bevel' | 'miter';
 
             /**
              * Options used to initialize a style. If a property is not set, the default value from H.map.SpatialStyle is taken.
@@ -2317,25 +2370,27 @@ declare namespace H {
              * @property lineCap {H.map.SpatialStyle.LineCap=} - The style of the end caps for a line.
              * @property lineJoin {H.map.SpatialStyle.LineJoin=} - The type of corner created, when two lines meet.
              * @property miterLimit {number=} - The miter limit in pixel, default is 10. The maximum supported miter limit is 100
-             * @property lineDash {Array<number>} - The line dash pattern as an even numbered list of distances to alternately produce a line and a space. If the browser doesn't support this feature this style property is ignored.
+             * @property lineDash {Array<number>} - The line dash pattern as an even numbered list of distances to alternately produce a line and a space. If the browser doesn't support this feature
+             * this style property is ignored.
              * @property lineDashOffset {number=} - The phase offset of the line dash pattern
              */
-            export interface Options {
+            interface Options {
                 strokeColor?: string;
                 fillColor?: string;
                 lineWidth?: number;
                 lineCap?: H.map.SpatialStyle.LineCap;
                 lineJoin?: H.map.SpatialStyle.LineJoin;
                 miterLimit?: number;
-                lineDash?: Array<number>;
+                lineDash?: number[];
                 lineDashOffset?: number;
             }
         }
 
         /**
-         * This class represents a view of the map. It consists of a virtual camera and a look-at point both of which have a position in geo-space and orientation angles. The view model allows to change the values of these objects in order to move or rotate the map or zoom in and out.
+         * This class represents a view of the map. It consists of a virtual camera and a look-at point both of which have a position in geo-space and orientation angles. The view model allows to
+         * change the values of these objects in order to move or rotate the map or zoom in and out.
          */
-        export class ViewModel extends H.util.EventTarget implements H.map.IControl {
+        class ViewModel extends H.util.EventTarget implements H.map.IControl {
             /**
              * This method returns the camera data, which is currently rendered.
              * @returns {H.map.ViewModel.CameraData} - the current rendered camera data
@@ -2411,10 +2466,10 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
-        export module ViewModel {
+        namespace ViewModel {
             /**
              * Defines camera's properties.
              * @property zoom {number=} - zoom level to be used by rendering engine
@@ -2424,7 +2479,7 @@ declare namespace H {
              * @property roll {number=} - the rotation of the virtual camera along its local z-axis
              * @property fov {number=} -
              */
-            export interface CameraData {
+            interface CameraData {
                 zoom?: number;
                 position: H.geo.IPoint;
                 pitch?: number;
@@ -2439,7 +2494,7 @@ declare namespace H {
              * @property zoom {number=} - The requested zoom level
              * @property animate {boolean=} - indicates if the requested transition should be animated
              */
-            export interface RequestedData {
+            interface RequestedData {
                 camera?: H.map.ViewModel.CameraData;
                 zoom?: number;
                 animate?: boolean;
@@ -2452,7 +2507,7 @@ declare namespace H {
              * @property type {string} - Name of the dispatched event
              * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
              */
-            export class UpdateEvent extends H.util.Event {
+            class UpdateEvent extends H.util.Event {
                 /**
                  * Constructor
                  * @param requested {H.map.ViewModel.RequestedData}
@@ -2477,7 +2532,8 @@ declare namespace H {
         }
 
         /**
-         * ViewPort object holds information about the HTML element where the map is rendered. It contains information regarding the element (view port) size and triggers events when the element size is changed.
+         * ViewPort object holds information about the HTML element where the map is rendered. It contains information regarding the element (view port) size and triggers events when the element size
+         * is changed.
          * @property element {Element} - This property holds the HTML element, which defines the viewport.
          * @property width {number} - This property holds this viewport&#x27;s current width
          * @property height {number} - This property holds this viewport&#x27;s current height
@@ -2485,7 +2541,7 @@ declare namespace H {
          * @property padding {H.map.ViewPort.Padding} - This property holds this viewport&#x27;s current padding
          * @property center {H.math.Point} - This property holds this viewport&#x27;s current center point
          */
-        export class ViewPort extends H.util.EventTarget implements H.map.IInteraction {
+        class ViewPort extends H.util.EventTarget implements H.map.IInteraction {
             /**
              * Constructor
              * @param element {Element} - html element were map will be rendered
@@ -2552,7 +2608,7 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
 
             element: Element;
             width: number;
@@ -2562,14 +2618,14 @@ declare namespace H {
             center: H.math.Point;
         }
 
-        export module ViewPort {
+        namespace ViewPort {
             /**
              * Options which may be used to initialize new ViewPort instance
              * @property margin {number=} - The size in pixel of the supplemental area to render for each side of the map
              * @property padding {H.map.ViewPort.Padding=} - The padding in pixels for each side of the map
              * @property fixedCenter {boolean=} - Indicates whether the center of the map should remain unchanged if the viewport's size or or padding has been changed, default is true
              */
-            export interface Options {
+            interface Options {
                 margin?: number;
                 padding?: H.map.ViewPort.Padding;
                 fixedCenter?: boolean;
@@ -2582,7 +2638,7 @@ declare namespace H {
              * @property bottom {number} - the padding on the bottom edge (in pixels)
              * @property left {number} - the padding on the left edge (in pixels)
              */
-            export interface Padding {
+            interface Padding {
                 top: number;
                 right: number;
                 bottom: number;
@@ -2590,11 +2646,12 @@ declare namespace H {
             }
         }
 
-        export module layer {
+        namespace layer {
             /**
-             * BaseTileLayer encapsulates funcitonailty that is common to all layers that deliver tiles, such as H.map.layer.TileLayer. The functionality includes geo bounding box to grid calculation, tile request management.
+             * BaseTileLayer encapsulates funcitonailty that is common to all layers that deliver tiles, such as H.map.layer.TileLayer. The functionality includes geo bounding box to grid
+             * calculation, tile request management.
              */
-            export class BaseTileLayer extends H.map.layer.Layer {
+            class BaseTileLayer extends H.map.layer.Layer {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.TileProvider} - data source for the TileLayer
@@ -2643,7 +2700,8 @@ declare namespace H {
                 cancelTile(x: number, y: number, z: number): void;
 
                 /**
-                 * This method requests tiles from the data source (provider). It can return a set of tiles which are currently loaded. All tiles which are not yet loaded will be included in response as soon as they will be available during subsequent calls.
+                 * This method requests tiles from the data source (provider). It can return a set of tiles which are currently loaded. All tiles which are not yet loaded will be included in response
+                 * as soon as they will be available during subsequent calls.
                  * @param tileBounds {H.math.Rect} - bounds in tile grid
                  * @param isCDB {boolean}
                  * @param zoomLevel {number} - The zoom level for which the objects are requested
@@ -2657,8 +2715,7 @@ declare namespace H {
             /**
              * This interface describes a layer which provides marker objects to the renderer.
              */
-            export interface IMarkerLayer {
-
+            interface IMarkerLayer {
                 /**
                  * This method requests marker objects for provided bounding rectangle.
                  * @param boundingRect {H.geo.Rect} - the bounding rectangle for which marker are to be returned
@@ -2677,18 +2734,19 @@ declare namespace H {
                  * @param prioCenter {H.math.Point} - The priority center as an offset in screen pixel relative to the center
                  * @returns {(H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse)} - a response object containing the number of markers and the markers themselves
                  */
-                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse);
+                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response |
+                                  H.map.layer.IMarkerLayer.TiledResponse);
             }
 
-            export module IMarkerLayer {
+            namespace IMarkerLayer {
                 /**
                  * This type represents a response object returned by the H.map.layer.IMarkerLayer#requestMarkers function.
                  * @property total {number} - The total number of markers, inclusive markers with not ready icons
                  * @property markers {Array<H.map.AbstractMarker>} - The marker objects for the bounding rectangle (only ready)
                  */
-                export interface Response {
+                interface Response {
                     total: number;
-                    markers: Array<H.map.AbstractMarker>;
+                    markers: H.map.AbstractMarker[];
                 }
 
                 /**
@@ -2697,17 +2755,18 @@ declare namespace H {
                  * @property requested {number} - number of requested tiles
                  * @property objects {Array<H.map.AbstractMarker>} - the marker objects within requested tiled area
                  */
-                export interface TiledResponse {
+                interface TiledResponse {
                     number: number;
                     requested: number;
-                    objects: Array<H.map.AbstractMarker>;
+                    objects: H.map.AbstractMarker[];
                 }
             }
 
             /**
-             * This interface describes a layer which provides data partitioned in quad-tree tiles in an x, y, z fashion (where z describes the level within the tree and x and y describe the absolute column and row indeces whithin the level).
+             * This interface describes a layer which provides data partitioned in quad-tree tiles in an x, y, z fashion (where z describes the level within the tree and x and y describe the absolute
+             * column and row indeces whithin the level).
              */
-            export interface ITileLayer {
+            interface ITileLayer {
                 /**
                  * This method requests tiles for the current bounding rectangle at the given zoom level (z-value).
                  * @param boundingRect {H.geo.Rect} - the bounding rectangle for which tiles are to be returned
@@ -2737,13 +2796,13 @@ declare namespace H {
                 cancelTile(x: number, y: number, z: number): void;
             }
 
-            export module ITileLayer {
+            namespace ITileLayer {
                 /**
                  * Options which are used to initialize a TileLayer object.
                  * @property projection {H.geo.IProjection=} - an optional projection to be used for this layer, default is H.geo.mercator
                  * @property opacity {number=} - tile layer opacity, default is 1
                  */
-                export interface Options {
+                interface Options {
                     projection?: H.geo.IProjection;
                     opacity?: number;
                 }
@@ -2753,16 +2812,17 @@ declare namespace H {
                  * @property total {number} - the total number of requested tiles
                  * @property tiles {Array<H.map.provider.Tile>} - the tiles which this provider can currently return synchronously
                  */
-                export interface Response {
+                interface Response {
                     total: number;
-                    tiles: Array<H.map.provider.Tile>;
+                    tiles: H.map.provider.Tile[];
                 }
             }
 
             /**
-             * The Layer class represents an object that is evaluated by the renderer in the order in which it is added to the layers collection. It provides the basic infrastructure for dispatching update events to the renderer in case new data is available.
+             * The Layer class represents an object that is evaluated by the renderer in the order in which it is added to the layers collection. It provides the basic infrastructure for dispatching
+             * update events to the renderer in case new data is available.
              */
-            export class Layer extends H.util.EventTarget {
+            class Layer extends H.util.EventTarget {
                 /**
                  * Constructor
                  * @param opt_options {H.map.layer.Layer.Options=} - optional configuration object
@@ -2796,7 +2856,7 @@ declare namespace H {
                  * @param level {number} - the zoom level for which to retrieve the copyright information
                  * @returns {Array<H.map.ICopyright>} - a list of copyright information objects for the provided area and zoom level
                  */
-                getCopyrights(bounds: H.geo.Rect, level: number): Array<H.map.ICopyright>;
+                getCopyrights(bounds: H.geo.Rect, level: number): H.map.ICopyright[];
 
                 /**
                  * This method will dispatch event on the event target object
@@ -2814,10 +2874,10 @@ declare namespace H {
                  * @param callback {Function} - The callback function.
                  * @param opt_scope {Object=} - An optional scope to call the callback in.
                  */
-                addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+                addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
             }
 
-            export module Layer {
+            namespace Layer {
                 /**
                  * Options which can be used when creating new layer object.
                  * @property min {number=} - The minimum zoom level for which the layer can provide data, default is 0
@@ -2826,7 +2886,7 @@ declare namespace H {
                  * @property projection {H.geo.IProjection=} - The projection to be used for this layer, default is H.geo.mercator
                  * @property minWorldSize {number=} - The minimal world size at zoom level 0, default is 256
                  */
-                export interface Options {
+                interface Options {
                     min?: number;
                     max?: number;
                     dark?: boolean;
@@ -2838,7 +2898,7 @@ declare namespace H {
             /**
              * ObjectTileLayer represents map objects which are requested on a tile basis
              */
-            export class MarkerTileLayer extends H.map.layer.BaseTileLayer implements H.map.layer.IMarkerLayer {
+            class MarkerTileLayer extends H.map.layer.BaseTileLayer implements H.map.layer.IMarkerLayer {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.MarkerTileProvider}
@@ -2864,13 +2924,15 @@ declare namespace H {
                  * @param prioCenter {H.math.Point} - The priority center as an offset in screen pixel relative to the center
                  * @returns {(H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse)} - a response object containing the number of markers and the markers themselves
                  */
-                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse);
+                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response |
+                                  H.map.layer.IMarkerLayer.TiledResponse);
             }
 
             /**
-             * This class represents a layer which renders map objects. Spatial objects like polygons and polylines a rendered to tiles before being passed to the enigne. Point objects like markers are provided as objects given an rectangular area.
+             * This class represents a layer which renders map objects. Spatial objects like polygons and polylines a rendered to tiles before being passed to the enigne. Point objects like markers
+             * are provided as objects given an rectangular area.
              */
-            export class ObjectLayer extends H.map.layer.Layer implements H.map.layer.ITileLayer {
+            class ObjectLayer extends H.map.layer.Layer implements H.map.layer.ITileLayer {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.ObjectProvider} - the ObjectProvider which provides the map objects to this object layer.
@@ -2940,10 +3002,11 @@ declare namespace H {
                  * @param prioCenter {H.math.Point} - The priority center as an offset in screen pixel relative to the center
                  * @returns {(H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse)} - a response object containing the number of markers and the markers themselves
                  */
-                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response | H.map.layer.IMarkerLayer.TiledResponse);
+                requestDomMarkers(boundingRect: H.geo.Rect, zoomLevel: number, cacheOnly: boolean, prioCenter: H.math.Point): (H.map.layer.IMarkerLayer.Response |
+                                  H.map.layer.IMarkerLayer.TiledResponse);
             }
 
-            export module ObjectLayer {
+            namespace ObjectLayer {
                 /**
                  * Configuration object which can be use to initialize the ObjectLayer.
                  * @property tileSize {number=} - the size of the tiles rendered by this layer for polylines and polygons (must be power of 2, default is 256)
@@ -2951,7 +3014,7 @@ declare namespace H {
                  * @property dataCacheSize {number=} - the number of tiles to cache which have render data only, default is 512
                  * @property pixelRatio {number=} - The pixelRatio to use for over-sampling in cases of high-resolution displays
                  */
-                export interface Options {
+                interface Options {
                     tileSize?: number;
                     tileCacheSize?: number;
                     dataCacheSize?: number;
@@ -2963,9 +3026,9 @@ declare namespace H {
                  * @property total {number} - The total number of overlays within the requested bounds, inclusive overlays which are not ready loaded yet
                  * @property overlays {Array<H.map.Overlay>} - A list all overlays which are ready to render
                  */
-                export interface OverlaysResponse {
+                interface OverlaysResponse {
                     total: number;
-                    overlays: Array<H.map.Overlay>;
+                    overlays: H.map.Overlay[];
                 }
             }
 
@@ -2973,7 +3036,7 @@ declare namespace H {
              * Tile Layer, represents data shown on map on a tile basis. Can be used to show map tile images or other type of data which is partitioned into tiles.
              * @event update {H.util.Event}
              */
-            export class TileLayer extends H.map.layer.BaseTileLayer implements H.map.layer.ITileLayer {
+            class TileLayer extends H.map.layer.BaseTileLayer implements H.map.layer.ITileLayer {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.TileProvider} - data source for the TileLayer
@@ -2995,12 +3058,12 @@ declare namespace H {
             }
         }
 
-        export module provider {
+        namespace provider {
             /**
              * An ImageTileProvider uses network service to provide bitmap images as tiles.
              * @property tileSize {number} - Size of a tile image supported by the provider
              */
-            export class ImageTileProvider extends H.map.provider.RemoteTileProvider {
+            class ImageTileProvider extends H.map.provider.RemoteTileProvider {
                 /**
                  * Constructor
                  * @param options {H.map.provider.ImageTileProvider.Options} - configuration for tile provider
@@ -3010,25 +3073,27 @@ declare namespace H {
                 tileSize: number;
             }
 
-            export module ImageTileProvider {
+            namespace ImageTileProvider {
                 /**
                  * Options to initialize an ImageTileProvider instance
-                 * @property uri {string=} - The provider's unique resource identifier which must not contain an underscore "_". If omitted an auto-generated unique Session ID is used. If a cross sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
+                 * @property uri {string=} - The provider's unique resource identifier which must not contain an underscore "_". If omitted an auto-generated unique Session ID is used. If a cross
+                 * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
                  * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  * @property tileSize {number=} - The size of a tile as edge length in pixels. It must be 2^n where n is in range [0 ... 30], default is 256
                  * @property getURL {function(number, number, number)} - The function to create an URL for the specified tile. If it returns a falsy the tile is not requested.
-                 * @property crossOrigin {(string | boolean=)} - The CORS settings to use for the crossOrigin attribute for the image, if omitted or if the value evaluates to false no CORS settings are used.
+                 * @property crossOrigin {(string | boolean=)} - The CORS settings to use for the crossOrigin attribute for the image, if omitted or if the value evaluates to false no CORS settings
+                 * are used.
                  */
-                export interface Options {
+                interface Options {
                     uri?: string;
                     min?: number;
                     max?: number;
-                    getCopyrights?: ((rect: H.geo.Rect, n: number) => Array<H.map.ICopyright>);
+                    getCopyrights?(rect: H.geo.Rect, n: number): H.map.ICopyright[];
                     tileSize?: number;
-                    getURL: (n1: number, n2: number, n3: number) => string;
-                    crossOrigin?: (string | boolean);
+                    getURL(n1: number, n2: number, n3: number): string;
+                    crossOrigin?: string | boolean;
                 }
             }
 
@@ -3036,8 +3101,7 @@ declare namespace H {
              * This class represents invalidation states of a renderable object. A renderer can optimize its rendering strategies based on the information in this object.
              * @property MARK_INITIAL {H.map.provider.Invalidations.Mark} - This constant represents the initial invalidation mark an invalidations object has.
              */
-            export class Invalidations {
-
+            class Invalidations {
                 /**
                  * To update invalidation marks accordingly to the given the invalidation types.
                  * @param mark {H.map.provider.Invalidations.Mark} - The invalidation mark to set
@@ -3096,11 +3160,11 @@ declare namespace H {
                 static MARK_INITIAL: H.map.provider.Invalidations.Mark;
             }
 
-            export module Invalidations {
+            namespace Invalidations {
                 /**
                  * This enumeration encapsulates bit flags for different invalidations of map objects.
                  */
-                export enum Flag {
+                enum Flag {
                     NONE,
                     VISUAL,
                     SPATIAL,
@@ -3112,7 +3176,7 @@ declare namespace H {
                 /**
                  * The invalidation mark represents a counter which is increased whenever an invalidation takes place.
                  */
-                export interface Mark { }
+                type Mark = any;
             }
 
             /**
@@ -3125,7 +3189,7 @@ declare namespace H {
              * @property max {number} - Maximum zoom level at which provider can server data, set at construction time
              * @property uid {string} - Provider instance unique identifier, generated at construction time
              */
-            export class MarkerTileProvider extends H.map.provider.RemoteTileProvider {
+            class MarkerTileProvider extends H.map.provider.RemoteTileProvider {
                 /**
                  * Constructor
                  * @param options {H.map.provider.MarkerTileProvider.Options} - configuration for tile provider
@@ -3146,18 +3210,19 @@ declare namespace H {
                 providesDomMarkers(): boolean;
             }
 
-            export module MarkerTileProvider {
+            namespace MarkerTileProvider {
                 /**
                  * Options which are used to initialize the MarkerTileProvider object.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function) : H.util.ICancelable} - function that fetches marker data and creates array of H.map.AbstractMarker that is passed success callback, if function fails to fetch data onError callback must be called
+                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function) : H.util.ICancelable} - function that fetches marker data and creates array
+                 * of H.map.AbstractMarker that is passed success callback, if function fails to fetch data onError callback must be called
                  * @property providesDomMarkers {boolean=} - indicates if markers provided are of type H.map.DomMarker or H.map.Marker, default is H.map.Marker
                  */
-                export interface Options {
+                interface Options {
                     min?: number;
                     max?: number;
-                    requestData: (n1: number, n2: number, n3: number, markerCallback: (markers: Array<H.map.AbstractMarker>) => void, f: Function) => H.util.ICancelable;
+                    requestData(n1: number, n2: number, n3: number, markerCallback: (markers: H.map.AbstractMarker[]) => void, f: () => void): H.util.ICancelable;
                     providesDomMarkers?: boolean;
                 }
             }
@@ -3165,7 +3230,7 @@ declare namespace H {
             /**
              * An abstract class to manage and provide map objects (Marker, Polyline, Polygon)
              */
-            export class ObjectProvider extends H.map.provider.Provider {
+            class ObjectProvider extends H.map.provider.Provider {
                 /**
                  * Constructor
                  * @param opt_options {H.map.provider.Provider.Options=}
@@ -3200,7 +3265,7 @@ declare namespace H {
                  * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
                  * @returns {Array<H.map.Overlay>} - a list of intersecting objects
                  */
-                requestOverlays(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Overlay>;
+                requestOverlays(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.Overlay[];
 
                 /**
                  * Checks whether this provider is currently providing spatial map objects. A concrete implementation of ObjectProvider must override it if it currently provides Spatials.
@@ -3216,7 +3281,7 @@ declare namespace H {
                  * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
                  * @returns {Array<H.map.Spatial>} - a list of intersecting objects
                  */
-                requestSpatials(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Spatial>;
+                requestSpatials(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.Spatial[];
 
                 /**
                  * Returns the spatial objects which intersect the given tile
@@ -3225,7 +3290,7 @@ declare namespace H {
                  * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
                  * @returns {Array<H.map.Spatial>} - a list of intersecting objects
                  */
-                requestSpatialsByTile(tile: H.map.provider.Tile, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Spatial>;
+                requestSpatialsByTile(tile: H.map.provider.Tile, visiblesOnly: boolean, cacheOnly: boolean): H.map.Spatial[];
 
                 /**
                  * Checks whether this provider is currently providing Marker map objects. A concrete implementation of ObjectProvider must override it if it currently provides Markers.
@@ -3241,7 +3306,7 @@ declare namespace H {
                  * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
                  * @returns {Array<H.map.Marker>} - a list of intersecting objects
                  */
-                requestMarkers(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.Marker>;
+                requestMarkers(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.Marker[];
 
                 /**
                  * Checks whether this provider is currently providing DomMarker map objects. A concrete implementation of ObjectProvider must override it if it currently provides Markers.
@@ -3257,17 +3322,18 @@ declare namespace H {
                  * @param cacheOnly {boolean} - Indicates whether only cached objects are to be considered
                  * @returns {Array<H.map.DomMarker>} - a list of intersecting objects
                  */
-                requestDomMarkers(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): Array<H.map.DomMarker>;
+                requestDomMarkers(geoRect: H.geo.Rect, zoomLevel: number, visiblesOnly: boolean, cacheOnly: boolean): H.map.DomMarker[];
             }
 
             /**
-             * A Provider defines an object which works as a database for the map. Providers can exists in different forms they can implement client side object storage or they can request data from the remote service.
+             * A Provider defines an object which works as a database for the map. Providers can exists in different forms they can implement client side object storage or they can request data from
+             * the remote service.
              * @property uri {string} - This provider's unique resource identifier, if not provided at construction time it defaults to provider's uid
              * @property min {number} - Minimum zoom level at which provider can serve data, set at construction time
              * @property max {number} - Maximum zoom level at which provider can server data, set at construction time
              * @property uid {string} - Provider instance unique identifier, generated at construction time
              */
-            export class Provider extends H.util.EventTarget {
+            class Provider extends H.util.EventTarget {
                 /**
                  * Constructor
                  * @param opt_options {H.map.provider.Provider.Options=}
@@ -3280,7 +3346,7 @@ declare namespace H {
                  * @param level {number} - The zoom level for which to retrieve the copyright information
                  * @returns {?Array<H.map.ICopyright>} - a list of copyright information objects for the provided area and zoom level
                  */
-                getCopyrights(bounds: H.geo.Rect, level: number): Array<H.map.ICopyright>;
+                getCopyrights(bounds: H.geo.Rect, level: number): H.map.ICopyright[];
 
                 /**
                  * This method will dispatch event on the event target object
@@ -3298,7 +3364,7 @@ declare namespace H {
                  * @param callback {Function} - The callback function.
                  * @param opt_scope {Object=} - An optional scope to call the callback in.
                  */
-                addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+                addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
 
                 uri: string;
                 min: number;
@@ -3306,26 +3372,28 @@ declare namespace H {
                 uid: string;
             }
 
-            export module Provider {
+            namespace Provider {
                 /**
                  * Options to initialize a Provider instance
-                 * @property uri {string=} - The provider's unique resource identifier which must not contain an underscore "_". If omitted an auto-generated unique Session ID is used. If a cross sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
+                 * @property uri {string=} - The provider's unique resource identifier which must not contain an underscore "_". If omitted an auto-generated unique Session ID is used. If a cross
+                 * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
                  * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  */
-                export interface Options {
+                interface Options {
                     uri?: string;
                     min?: number;
                     max?: number;
-                    getCopyrights?: (rect: H.geo.Rect, n: number) => Array<H.map.ICopyright>;
+                    getCopyrights?(rect: H.geo.Rect, n: number): H.map.ICopyright[];
                 }
             }
 
             /**
-             * RemoteTileProvider is an abstract class which should be used by classes implementing data provision on a tile basis. Every child class needs to implement 'requestInternal' (to request remote tile) and 'getCache' (to provide configured cache object were tiled data is being cached)
+             * RemoteTileProvider is an abstract class which should be used by classes implementing data provision on a tile basis. Every child class needs to implement 'requestInternal'
+             * (to request remote tile) and 'getCache' (to provide configured cache object were tiled data is being cached)
              */
-            export class RemoteTileProvider extends H.map.provider.TileProvider {
+            class RemoteTileProvider extends H.map.provider.TileProvider {
                 /**
                  * Constructor
                  * @param options {H.map.provider.TileProvider.Options} - The options to instantiate this TileProvider
@@ -3354,7 +3422,7 @@ declare namespace H {
                     z: number,
 
                     onResponse?: (
-                        object: Array<H.map.Object> | HTMLImageElement | HTMLCanvasElement | ArrayBuffer,
+                        object: H.map.Object[] | HTMLImageElement | HTMLCanvasElement | ArrayBuffer,
                         response: any
                     ) => void,
 
@@ -3370,7 +3438,8 @@ declare namespace H {
             }
 
             /**
-             * Generic Tile object which represents a part of the world fiting into the Tile area represented by the Tiel coordinates (x - row, y - column) and the zoom level (z). Number of tiles at particular zoom level (which means number of areas into world is being splitted) is defined as following: numberOfRows &#x3D; numberOfColumns &#x3D; 2^zoomlevel
+             * Generic Tile object which represents a part of the world fiting into the Tile area represented by the Tiel coordinates (x - row, y - column) and the zoom level (z). Number of tiles
+             * at particular zoom level (which means number of areas into world is being splitted) is defined as following: numberOfRows &#x3D; numberOfColumns &#x3D; 2^zoomlevel
              * @property key {string} - Unique tile key generated by provider
              * @property data {*} - Tile data (an image for example)
              * @property valid {boolean} - This property holds a boolean flag indicating whether this tile is still valid (true) or whether it should be re-fetched (false)
@@ -3378,7 +3447,7 @@ declare namespace H {
              * @property y {number} - Tile row
              * @property z {number} - Tile zoom level
              */
-            export class Tile {
+            class Tile {
                 /**
                  * Constructor
                  * @param x {number} - x tile coordinate (row)
@@ -3405,7 +3474,7 @@ declare namespace H {
              * @property max {number} - Maximum zoom level at which provider can server data, set at construction time
              * @property uid {string} - Provider instance unique identifier, generated at construction time
              */
-            export class TileProvider extends H.map.provider.Provider {
+            class TileProvider extends H.map.provider.Provider {
                 /**
                  * Constructor
                  * @param options {H.map.provider.TileProvider.Options} - The options to instantiate this TileProvider
@@ -3441,19 +3510,20 @@ declare namespace H {
                 uid: string;
             }
 
-            export module TileProvider {
+            namespace TileProvider {
                 /**
-                 * @property uri {string=} - The provider&#x27;s unique resource identifier which must not contain an underscore &quot;_&quot;. If omitted an auto-generated unique Session ID is used. If a cross sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
+                 * @property uri {string=} - The provider&#x27;s unique resource identifier which must not contain an underscore &quot;_&quot;. If omitted an auto-generated unique Session ID is used.
+                 * If a cross sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
                  * @property getCopyrights {(function(H.geo.Rect, number): Array<H.map.ICopyright>)=} - A function to replace the default implememtation of H.map.provider.Provider#getCopyrights
                  * @property tileSize {number=} - The size of a tile as edge length in pixels. It must be 2^n where n is in range [0 ... 30], default is 256
                  */
-                export interface Options {
+                interface Options {
                     uri?: string;
                     min?: number;
                     max?: number;
-                    getCopyrights?(rect: H.geo.Rect, number: number): Array<H.map.ICopyright>;
+                    getCopyrights?(rect: H.geo.Rect, number: number): H.map.ICopyright[];
                     tileSize?: number;
                 }
             }
@@ -3461,14 +3531,14 @@ declare namespace H {
     }
 
     /***** mapevents *****/
-    export module mapevents {
+    namespace mapevents {
         /**
          * Behavior class uses map events and adds behavior functionality to the map. This allows map panning and zooming via using mouse wheel
          * @property DRAGGING {number} - Map responds to user dragging via mouse or touch
          * @property WHEELZOOM {number} - Map zooms in or out in respond to mouse wheel events
          * @property DBLTAPZOOM {number} - Map zooms in or out in response to double click or double tap. For double tap if more that one touches are on the screen map will zoom out.
          */
-        export class Behavior extends H.util.Disposable {
+        class Behavior extends H.util.Disposable {
             /**
              * Constructor
              * @param mapEvents {H.mapevents.MapEvents} - previously initialized map events instance
@@ -3477,7 +3547,8 @@ declare namespace H {
             constructor(mapEvents: H.mapevents.MapEvents, options?: H.mapevents.Behavior.Options);
 
             /**
-             * This method destroys all map interaction handling. Should be used when the behavior functionality is disposed. Behavior object will also be disposed (this function will be called) when attached H.mapevents.MapEvents object is dispose.
+             * This method destroys all map interaction handling. Should be used when the behavior functionality is disposed. Behavior object will also be disposed (this function will be called)
+             * when attached H.mapevents.MapEvents object is dispose.
              */
             dispose(): void;
 
@@ -3505,13 +3576,13 @@ declare namespace H {
             static DBLTAPZOOM: number;
         }
 
-        export module Behavior {
+        namespace Behavior {
             /**
              * Options which are used to initialize the Behavior class.
              * @property kinetics {H.util.kinetics.IKinetics=} - The parameters for the kinetic movement.
              * @property enable {number=} - The bitmask of behaviors to enable like H.mapevents.Behavior.DRAGGING. All are enabled by default.
              */
-            export interface Options {
+            interface Options {
                 kinetics?: H.util.kinetics.IKinetics;
                 enable?: H.math.BitMask;
             }
@@ -3527,7 +3598,7 @@ declare namespace H {
          * @property type {string} - Name of the dispatched event
          * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
          */
-        export class ContextMenuEvent extends H.util.Event {
+        class ContextMenuEvent extends H.util.Event {
             /**
              * Constructor
              * @param viewportX {number} - The x coordinate on the viewport
@@ -3537,7 +3608,7 @@ declare namespace H {
              */
             constructor(viewportX: number, viewportY: number, target: (H.Map | H.map.Object), originalEvent: Event);
 
-            viewportX: Array<H.util.ContextItem>;
+            viewportX: H.util.ContextItem[];
             viewportY: number;
             originalEvent: Event;
         }
@@ -3554,7 +3625,7 @@ declare namespace H {
          * @property type {string} - Name of the dispatched event
          * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
          */
-        export class Event extends H.util.Event {
+        class Event extends H.util.Event {
             /**
              * Constructor
              * @param type {string} - type of event
@@ -3565,7 +3636,8 @@ declare namespace H {
              * @param target {(H.Map | H.map.Object)} - target map object which triggered event
              * @param originalEvent {Event} - original dom event
              */
-            constructor(type: string, pointers: Array<H.mapevents.Pointer>, changedPointers: Array<H.mapevents.Pointer>, targetPointers: Array<H.mapevents.Pointer>, currentPointer: H.mapevents.Pointer, target: (H.Map | H.map.Object), originalEvent: Event);
+            constructor(type: string, pointers: H.mapevents.Pointer[], changedPointers: H.mapevents.Pointer[], targetPointers: H.mapevents.Pointer[], currentPointer: H.mapevents.Pointer,
+                        target: (H.Map | H.map.Object), originalEvent: Event);
 
             /**
              * Sets defaultPrevented to true. Which can be used to prevent some default behavior.
@@ -3577,9 +3649,9 @@ declare namespace H {
              */
             stopPropagation(): void;
 
-            pointers: Array<H.mapevents.Pointer>;
-            changedPointers: Array<H.mapevents.Pointer>;
-            targetPointers: Array<H.mapevents.Pointer>;
+            pointers: H.mapevents.Pointer[];
+            changedPointers: H.mapevents.Pointer[];
+            targetPointers: H.mapevents.Pointer[];
             currentPointer: H.mapevents.Pointer;
             originalEvent: Event;
             target: (H.map.Object | H.Map);
@@ -3589,9 +3661,11 @@ declare namespace H {
         }
 
         /**
-         * MapEvents enable the events functionality on the map and on the map objects. By using this extension it is possible to listen to events on map objects like markers, polylines, polygons, circles and on the map object itself. Events are triggered depending on user interaction. Please check the Events Summary section for the list of events fired by this class and by the map objects.
+         * MapEvents enable the events functionality on the map and on the map objects. By using this extension it is possible to listen to events on map objects like markers, polylines, polygons,
+         * circles and on the map object itself. Events are triggered depending on user interaction. Please check the Events Summary section for the list of events fired by this class and by the map
+         * objects.
          */
-        export class MapEvents extends H.util.Disposable {
+        class MapEvents extends H.util.Disposable {
             /**
              * Constructor
              * @param map {H.Map} - map instance which is used for firing events
@@ -3599,7 +3673,8 @@ declare namespace H {
             constructor(map: H.Map);
 
             /**
-             * This method destroys the MapEvents by removing all handlers from the map object. After calling this function mapEvents and map objects will not trigger any events. This object will be disposed automatically if the corresponding map object is disposed.
+             * This method destroys the MapEvents by removing all handlers from the map object. After calling this function mapEvents and map objects will not trigger any events. This object will be
+             * disposed automatically if the corresponding map object is disposed.
              */
             dispose(): void;
 
@@ -3620,7 +3695,7 @@ declare namespace H {
          * @property dragTarget {(H.map.Object | H.Map)} - Object which is currently dragged by the pointer
          * @property button {H.mapevents.Pointer.Button} - Indicates which pointer device button has changed.
          */
-        export class Pointer {
+        class Pointer {
             /**
              * Constructor
              * @param viewportX {number} - pointer position on x-axis
@@ -3640,11 +3715,11 @@ declare namespace H {
             static button: H.mapevents.Pointer.Button;
         }
 
-        export module Pointer {
+        namespace Pointer {
             /**
              * Types of a button
              */
-            export enum Button {
+            enum Button {
                 /** No button */
                 NONE,
                 /** Left mouse button or touch contact or pen contact */
@@ -3664,7 +3739,7 @@ declare namespace H {
              *   - 4: Middle mouse button pressed
              */
             // TODO not sure this is the right interpretation of the docs
-            export type Buttons = H.math.BitMask;
+            type Buttons = H.math.BitMask;
         }
 
         /**
@@ -3678,7 +3753,7 @@ declare namespace H {
          * @property type {string} - Name of the dispatched event
          * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
          */
-        export class WheelEvent extends H.util.Event {
+        class WheelEvent extends H.util.Event {
             /**
              * Constructor
              * @param deltaY {number} - The wheel move delta on y-axis
@@ -3697,18 +3772,18 @@ declare namespace H {
     }
 
     /***** math *****/
-    export module math {
+    namespace math {
         /**
          * A signed 32 bit integer (JS restriction) where bit operator can be applied to. The range is [-2,147,483,648 ... 2,147,483,647] or [-2^31 ... 2^31 − 1]
          */
-        export type BitMask = number;
+        type BitMask = number;
 
         /**
          * An interface for a 2-dimensional point consisting a x and y coordinate.
          * @property x {number} - The point's coordinate on X-axis.
          * @property y {number} - The point's coordinate on Y-axis.
          */
-        export interface IPoint {
+        interface IPoint {
             x: number;
             y: number;
         }
@@ -3718,7 +3793,7 @@ declare namespace H {
          * @property w {number} - The size's width.
          * @property h {number} - The size's height.
          */
-        export interface ISize {
+        interface ISize {
             w: number;
             h: number;
         }
@@ -3728,7 +3803,7 @@ declare namespace H {
          * @property x {number} - The point's coordinate on X-axis.
          * @property y {number} - The point's coordinate on Y-axis.
          */
-        export class Point implements IPoint {
+        class Point implements IPoint {
             /**
              * Constructor
              * @param x {number} - The point's coordinate on X-axis.
@@ -3826,7 +3901,7 @@ declare namespace H {
         /**
          * Class defines a rectangle in 2-dimensional geometric space. It is used to represent the area in projected space.
          */
-        export class Rect {
+        class Rect {
             /**
              * Constructor
              * @param left {number} - The rectangle's left edge x value
@@ -3885,7 +3960,7 @@ declare namespace H {
          * @property w {number} - The size's width value
          * @property h {number} - The size's height value
          */
-        export class Size {
+        class Size {
             /**
              * Constructor
              * @param width {number} - Width.
@@ -3898,27 +3973,27 @@ declare namespace H {
     }
 
     /***** net *****/
-    export module net {
-        export module Request {
-            export enum State {
+    namespace net {
+        namespace Request {
+            enum State {
                 DONE = 2,
                 OPENED = 1,
                 UNSENT = 0,
             }
 
             // TODO no idea how this interface is set up, investigate
-            export interface Priority { }
+            type Priority = any;
         }
     }
 
     /***** places *****/
 
     /***** service *****/
-    export module service {
+    namespace service {
         /**
          * Abstract rest service class
          */
-        export class AbstractRestService implements H.service.IConfigurable {
+        class AbstractRestService implements H.service.IConfigurable {
             /**
              * Constructor
              * @param opt_options {H.service.AbstractRestService.Options=}
@@ -3931,22 +4006,22 @@ declare namespace H {
              * @param appCode {string} - The application code to identify the client against the platform (mandatory to provide)
              * @param useHTTPS {boolean} - Indicates whether secure communication should be used, default is false
              * @param useCIT {boolean} - Indicates whether the Customer Integration Testing should be used, default is false
-             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in the opt_baseUrl to use HTTPS.
+             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in
+             * the opt_baseUrl to use HTTPS.
              * @returns {H.service.IConfigurable}
              */
             configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, opt_baseUrl?: H.service.Url): H.service.IConfigurable;
         }
 
-        export module AbstractRestService {
-            export interface Options {
-
-            }
+        namespace AbstractRestService {
+            type Options = any;
         }
 
         /**
-         * This class encapsulates Enterprise Routing REST API as a service stub. An instance of this class can be retrieved by calling the factory method on a platform instance. H.service.Platform#getEnterpriseRoutingService.
+         * This class encapsulates Enterprise Routing REST API as a service stub. An instance of this class can be retrieved by calling the factory method on a platform instance.
+         * H.service.Platform#getEnterpriseRoutingService.
          */
-        export class EnterpriseRoutingService extends H.service.AbstractRestService {
+        class EnterpriseRoutingService extends H.service.AbstractRestService {
             /**
              * Constructor
              * @param opt_options {H.service.EnterpriseRoutingService.Options=}
@@ -3954,7 +4029,8 @@ declare namespace H {
             constructor(opt_options?: H.service.EnterpriseRoutingService.Options);
 
             /**
-             * This method sends a "calculateroute" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occurred.
+             * This method sends a "calculateroute" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing
+             * a H.service.ServiceResult object - or the onError callback if a communication error occurred.
              * @param calculateRouteParams {H.service.ServiceParameters} - the service parameters to be sent with the routing request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Enterprise Routing REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -3962,7 +4038,8 @@ declare namespace H {
             calculateRoute(calculateRouteParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): void;
 
             /**
-             * This method sends a "getroute" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occurred.
+             * This method sends a "getroute" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing
+             * a H.service.ServiceResult object - or the onError callback if a communication error occurred.
              * @param getRouteParams {H.service.ServiceParameters} - the service parameters to be sent with the routing request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Enterprise Routing REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -3970,7 +4047,8 @@ declare namespace H {
             getRoute(getRouteParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): void;
 
             /**
-             * This method sends a "getlinkinfo" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occured.
+             * This method sends a "getlinkinfo" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing
+             * a H.service.ServiceResult object - or the onError callback if a communication error occured.
              * @param getLinkInfoParams {H.service.ServiceParameters} - the service parameters to be sent with the routing request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Enterprise Routing REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -3978,7 +4056,8 @@ declare namespace H {
             getLinkInfo(getLinkInfoParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): void;
 
             /**
-             * This method sends a "calculateisoline" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occurred.
+             * This method sends a "calculateisoline" request to Enterprise Routing REST API and calls the onResult callback function once the service response was received - providing
+             * a H.service.ServiceResult object - or the onError callback if a communication error occurred.
              * @param calculateIsolineParams {H.service.ServiceParameters} - the service parameters to be sent with the routing request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Enterprise Routing REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -3986,13 +4065,14 @@ declare namespace H {
             calculateIsoline(calculateIsolineParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): void;
         }
 
-        export module EnterpriseRoutingService {
+        namespace EnterpriseRoutingService {
             /**
              * @property subDomain {string=} - The sub-domain of the routing service relative to the platform's base URL (default is 'route')
              * @property path {string=} - The path of the map tile service, default is "routing/7.2"
-             * @property baseUrl {H.service.Url=} - The base URL of the service, defaults to the the platform's base URL if instance was created using H.service.Platform#getEnterpriseRoutingService method.
+             * @property baseUrl {H.service.Url=} - The base URL of the service, defaults to the the platform's base URL if instance was created using H.service.Platform#getEnterpriseRoutingService
+             * method.
              */
-            export interface Options {
+            interface Options {
                 subDomain?: string;
                 path?: string;
                 baseUrl?: H.service.Url;
@@ -4002,7 +4082,7 @@ declare namespace H {
         /**
          * This class encapsulates the Geocoding REST API in a service stub with calls to its various resources implemented.
          */
-        export class GeocodingService extends H.service.AbstractRestService {
+        class GeocodingService extends H.service.AbstractRestService {
             /**
              * Constructor
              * @param opt_options {H.service.GeocodingService.Options=}
@@ -4010,7 +4090,8 @@ declare namespace H {
             constructor(opt_options?: H.service.GeocodingService.Options);
 
             /**
-             * This method sends a reverse geocoding request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occured.
+             * This method sends a reverse geocoding request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult
+             * object - or the onError callback if a communication error occured.
              * @param geoodingParams {H.service.ServiceParameters} - the service parameters to be sent with the geocoding request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Geocoder REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -4019,7 +4100,8 @@ declare namespace H {
             geocode(geoodingParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): H.service.JsonpRequestHandle;
 
             /**
-             * This method sends a reverse geocoding request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occured.
+             * This method sends a reverse geocoding request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult
+             * object - or the onError callback if a communication error occured.
              * @param reverseGeocodingParams {H.service.ServiceParameters} - the service parameters to be sent with the reverse geocoding request
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Geocoder REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -4028,7 +4110,8 @@ declare namespace H {
             reverseGeocode(reverseGeocodingParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): H.service.JsonpRequestHandle;
 
             /**
-             * This method sends a landmark search request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occured.
+             * This method sends a landmark search request to Geocoder REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult
+             * object - or the onError callback if a communication error occured.
              * @param searchParams {H.service.ServiceParameters} - the service parameters to be sent with the reverse geocoding request
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Geocoder REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -4037,12 +4120,12 @@ declare namespace H {
             search(searchParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): H.service.JsonpRequestHandle;
         }
 
-        export module GeocodingService {
+        namespace GeocodingService {
             /**
              * @property subDomain {string=} - the sub-domain of the geo-coding service relative to the platform's base URL, default is 'geocoder'
              * @property path {string=} - the path of the Geocoding service, default is '6.2'
              */
-            export interface Options {
+            interface Options {
                 subDomain?: string;
                 path?: string;
             }
@@ -4051,14 +4134,15 @@ declare namespace H {
         /**
          * An interface represents an object, that can be configured credentials, settings etc. by H.service.Platform
          */
-        export interface IConfigurable {
+        interface IConfigurable {
             /**
              * This methods receive configuration parameters from the platform, that can be used by the object implementing the interface.
              * @param appId {string} - The application ID to identify the client against the platform (mandatory to provide)
              * @param appCode {string} - The application code to identify the client against the platform (mandatory to provide)
              * @param useHTTPS {boolean} - Indicates whether secure communication should be used, default is false
              * @param useCIT {boolean} - Indicates whether the Customer Integration Testing should be used, default is false
-             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in the opt_baseUrl to use HTTPS.
+             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in
+             * the opt_baseUrl to use HTTPS.
              * @returns {H.service.IConfigurable}
              */
             configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, opt_baseUrl?: H.service.Url): H.service.IConfigurable;
@@ -4068,15 +4152,15 @@ declare namespace H {
          * @property id {number} - the ID associated internally with this request
          * @property cancel {function()} - this function cancels the request and invokes the errback function
          */
-        export interface JsonpRequestHandle {
+        interface JsonpRequestHandle {
             id: number;
-            cancel: () => void;
+            cancel(): void;
         }
 
         /**
          * This class encapsulates a map tile end point of the HERE Map Tile API.
          */
-        export class MapTileService extends H.util.EventTarget implements H.service.IConfigurable {
+        class MapTileService extends H.util.EventTarget implements H.service.IConfigurable {
             /**
              * Constructor
              * @param opt_options {H.service.MapTileService.Options=}
@@ -4111,7 +4195,8 @@ declare namespace H {
              * @param opt_options {H.service.TileProviderOptions=} - additional set of options for the provider
              * @returns {H.map.provider.ImageTileProvider} - the image tile provider
              */
-            createTileProvider(tileType: string, scheme: string, tileSize: number, format: string, opt_additionalParameters?: H.service.ServiceParameters, opt_options?: H.service.TileProviderOptions): H.map.provider.ImageTileProvider;
+            createTileProvider(tileType: string, scheme: string, tileSize: number, format: string, opt_additionalParameters?: H.service.ServiceParameters, opt_options?: H.service.TileProviderOptions):
+                               H.map.provider.ImageTileProvider;
 
             /**
              * This method creates a tile layer. This layer can be used as a layer on a map's data model.
@@ -4125,7 +4210,8 @@ declare namespace H {
              * @param opt_options {H.service.TileProviderOptions=} - additional set of options for the provider
              * @returns {H.map.layer.TileLayer} - the tile layer
              */
-            createTileLayer(tileType: string, scheme: string, tileSize: number, format: string, opt_additionalParameters?: H.service.ServiceParameters, opt_opacity?: number, opt_dark?: boolean, opt_options?: H.service.TileProviderOptions): H.map.layer.TileLayer;
+            createTileLayer(tileType: string, scheme: string, tileSize: number, format: string, opt_additionalParameters?: H.service.ServiceParameters, opt_opacity?: number, opt_dark?: boolean,
+                            opt_options?: H.service.TileProviderOptions): H.map.layer.TileLayer;
 
             /**
              * This methods receive configuration parameters from the platform, that can be used by the object implementing the interface.
@@ -4133,13 +4219,14 @@ declare namespace H {
              * @param appCode {string} - The application code to identify the client against the platform (mandatory to provide)
              * @param useHTTPS {boolean} - Indicates whether secure communication should be used, default is false
              * @param useCIT {boolean} - Indicates whether the Customer Integration Testing should be used, default is false
-             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in the opt_baseUrl to use HTTPS.
+             * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in
+             * the opt_baseUrl to use HTTPS.
              * @returns {H.service.IConfigurable}
              */
             configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, opt_baseUrl?: H.service.Url): H.service.IConfigurable;
         }
 
-        export module MapTileService {
+        namespace MapTileService {
             /**
              * @property maps {Object<string, Object>} -
              * @property schemes {Object<string, Object>} -
@@ -4148,7 +4235,7 @@ declare namespace H {
              * @property resolutions {Object<string, Object>} -
              * @property languages {Object<string, Object>} -
              */
-            export interface Info {
+            interface Info {
                 maps: { [key: string]: any };
                 schemes: { [key: string]: any };
                 tiletypes: { [key: string]: any };
@@ -4163,7 +4250,7 @@ declare namespace H {
              * @property subDomain {string=} - the sub-domain of the map tile service relative to the platform's base URL, default is 'maps'
              * @property path {string=} - the path of the map tile service, default is 'maptile/2.1'
              */
-            export interface Options {
+            interface Options {
                 type?: string;
                 version?: string;
                 subDomain?: string;
@@ -4172,7 +4259,8 @@ declare namespace H {
         }
 
         /**
-         * A map type is an object holding tile layers corresponding to a map type (e.g. 'normal', 'satellite' or 'terrain'). A map type contains at least a map property which defines the basic map layer for a given map type. In addition it can hold other map layers with the given style, e.g. base, xbase, traffic etc.
+         * A map type is an object holding tile layers corresponding to a map type (e.g. 'normal', 'satellite' or 'terrain'). A map type contains at least a map property which defines the basic
+         * map layer for a given map type. In addition it can hold other map layers with the given style, e.g. base, xbase, traffic etc.
          * @property map {H.map.layer.TileLayer} - the basic map tiles with all features and labels
          * @property mapnight {H.map.layer.TileLayer} - the basic map tiles with all features and labels (night mode)
          * @property xbase {H.map.layer.TileLayer=} - map tiles without features and labels
@@ -4186,7 +4274,7 @@ declare namespace H {
          * @property panoramanight {H.map.layer.TileLayer=} - map tiles highlighting areas with HERE StreetLevel coverage (night mode)
          * @property labels {H.map.layer.TileLayer=} - transparent map tiles with labels only
          */
-        export interface MapType {
+        interface MapType {
             map: H.map.layer.TileLayer;
             mapnight: H.map.layer.TileLayer;
             xbase?: H.map.layer.TileLayer;
@@ -4204,7 +4292,7 @@ declare namespace H {
         /**
          * Places service implements a low level places RestApi access. Please refer to Restful API documentation for providing parameters and handling response objects.
          */
-        export class PlacesService extends H.service.AbstractRestService {
+        class PlacesService extends H.service.AbstractRestService {
             /**
              * Constructor
              * @param opt_options {H.service.PlacesService.Options=}
@@ -4214,12 +4302,13 @@ declare namespace H {
             /**
              * This is generic method to query places RestAPI.
              * @param entryPoint {string} - can be one of available entry points H.service.PlacesService.EntryPoint i.e value of H.service.PlacesService.EntryPoint.SEARCH
-             * @param entryPointParams {Object} - parameter map key value pairs will be transformed into the url key=value parametes. For entry point parameters description please refer to places restful api documentation documentation for available parameters for chose entry point
+             * @param entryPointParams {Object} - parameter map key value pairs will be transformed into the url key=value parametes. For entry point parameters description please refer to places
+             * restful api documentation documentation for available parameters for chose entry point
              * @param onResult {Function} - callback which is called when result is returned
              * @param onError {Function} - callback which is called when error occured (i.e request timeout)
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            request(entryPoint: string, entryPointParams: Object, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            request(entryPoint: string, entryPointParams: {}, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'search' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4228,7 +4317,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            search(searchParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            search(searchParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'suggestions' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4237,7 +4326,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            suggest(suggestParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            suggest(suggestParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'explore' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4246,7 +4335,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            explore(exploreParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            explore(exploreParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'around' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4255,7 +4344,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            around(aroundParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            around(aroundParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'here' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4264,7 +4353,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            here(hereParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            here(hereParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * Function triggers places api 'categories' entry point. Please refer to documentation for parameter specification and response handling.
@@ -4273,7 +4362,7 @@ declare namespace H {
              * @param onError {Function}
              * @returns {H.service.JsonpRequestHandle} - jsonp request handle
              */
-            categories(categoriesParams: H.service.ServiceParameters, onResult: Function, onError: Function): H.service.JsonpRequestHandle;
+            categories(categoriesParams: H.service.ServiceParameters, onResult: () => void, onError: () => void): H.service.JsonpRequestHandle;
 
             /**
              * This method should be used to follow hyperlinks available in results returned by dicovery queries.
@@ -4283,14 +4372,14 @@ declare namespace H {
              * @param opt_additionalParameters {Object=} - additional parameters to send with request
              * @returns {H.service.JsonpRequestHandle} - jsonp resquest handle
              */
-            follow(hyperlink: string, onResult: Function, onError: Function, opt_additionalParameters?: Object): H.service.JsonpRequestHandle;
+            follow(hyperlink: string, onResult: () => void, onError: () => void, opt_additionalParameters?: {}): H.service.JsonpRequestHandle;
         }
 
-        export module PlacesService {
+        namespace PlacesService {
             /**
              * List of available entry points
              */
-            export enum EntryPoint {
+            enum EntryPoint {
                 SEARCH,
                 SUGGEST,
                 EXPLORE,
@@ -4304,7 +4393,7 @@ declare namespace H {
              * @property path {string=} - the path of the places service, default is 'places/v1'
              * @property baseUrl {H.service.Url=} - an optional base URL if it differs from the platform's default base URL
              */
-            export interface Options {
+            interface Options {
                 subDomain?: string;
                 path?: string;
                 baseUrl?: H.service.Url;
@@ -4312,9 +4401,10 @@ declare namespace H {
         }
 
         /**
-         * The Platform class represents central class from which all other service stubs are created. It also contains the shared settings to be passed to the individual service stubs, for example the root URL of the platform, application credentials, etc.
+         * The Platform class represents central class from which all other service stubs are created. It also contains the shared settings to be passed to the individual service stubs, for example
+         * the root URL of the platform, application credentials, etc.
          */
-        export class Platform {
+        class Platform {
             /**
              * Constructor
              * @param options {H.service.Platform.Options}
@@ -4381,15 +4471,18 @@ declare namespace H {
 
             /**
              * This method creates a pre-configured set of HERE tile layers for convenient use with the map.
-             * @param opt_tileSize {(H.service.Platform.DefaultLayersOptions | number)=} - When a number – optional tile size to be queried from the HERE Map Tile API, default is 256. If the parameter is an object, then it represents options and all remaining below parameters should be omitted.
+             * @param opt_tileSize {(H.service.Platform.DefaultLayersOptions | number)=} - When a number – optional tile size to be queried from the HERE Map Tile API, default is 256.
+             * If theparameter is an object, then it represents options and all remaining below parameters should be omitted.
              * @param opt_ppi {number=} - optional 'ppi' parameter to use when querying tiles, default is not specified
              * @param opt_lang {string=} - optional primary language parameter, default is not specified
              * @param opt_secondaryLang {string=} - optional secondary language parameter, default is not specified
              * @param opt_style {string=} - optional 'style' parameter to use when querying map tiles, default is not specified
-             * @param opt_pois {(string | boolean)=} - indicates if pois are displayed on the map. Pass true to indicate that all pois should be visible. Alternatively you can specify mask for the POI Categories as described at the Map Tile API documentation POI Categories chapter.
+             * @param opt_pois {(string | boolean)=} - indicates if pois are displayed on the map. Pass true to indicate that all pois should be visible. Alternatively you can specify mask for the
+             * POI Categories as described at the Map Tile API documentation POI Categories chapter.
              * @returns {Object<string, H.service.MapType>} - a set of tile layers ready to use
              */
-            createDefaultLayers(opt_tileSize?: (H.service.Platform.DefaultLayersOptions | number), opt_ppi?: number, opt_lang?: string, opt_secondaryLang?: string, opt_style?: string, opt_pois?: (string | boolean)): H.service.Platform.MapTypes;
+            createDefaultLayers(opt_tileSize?: (H.service.Platform.DefaultLayersOptions | number), opt_ppi?: number, opt_lang?: string, opt_secondaryLang?: string, opt_style?: string,
+                                opt_pois?: (string | boolean)): H.service.Platform.MapTypes;
 
             /**
              * This method returns an instance of H.service.RoutingService to query the Routing API.
@@ -4419,7 +4512,7 @@ declare namespace H {
             getEnterpriseRoutingService(opt_options?: H.service.EnterpriseRoutingService.Options): H.service.EnterpriseRoutingService;
         }
 
-        export module Platform {
+        namespace Platform {
             /**
              * Options used to create default layers
              * @property tileSize {number=} - tile size to be queried from the HERE Map Tile API, default is 256
@@ -4428,9 +4521,10 @@ declare namespace H {
              * @property lg2 {string=} - optional secondary language parameter, default is not specified
              * @property style {string=} - optional 'style' parameter to use when querying map tiles, default is not specified
              * @property pois {boolean=} - indicates if pois are displayed on the map
-             * @property crossOrigin {(string | boolean=)} - indicates if CORS headers should be used for default layers, if false is specified, CORS headers are not set, defaults to 'anonymous'. Be aware that storing of content is not possible if crossOrigin is not set to true (see H.Map#storeContent).
+             * @property crossOrigin {(string | boolean=)} - indicates if CORS headers should be used for default layers, if false is specified, CORS headers are not set, defaults to 'anonymous'.
+             * Be aware that storing of content is not possible if crossOrigin is not set to true (see H.Map#storeContent).
              */
-            export interface DefaultLayersOptions {
+            interface DefaultLayersOptions {
                 tileSize?: number;
                 ppi?: number;
                 lg?: string;
@@ -4447,7 +4541,7 @@ declare namespace H {
              * @property useCIT {boolean=} - Indicates whether the Customer Integration Testing should be used, default is false
              * @property useHTTPS {boolean=} - Indicates whether secure communication should be used, default is false
              */
-            export interface Options {
+            interface Options {
                 app_id: string;
                 app_code: string;
                 baseUrl?: H.service.Url;
@@ -4458,18 +4552,19 @@ declare namespace H {
             /**
              * pre-configured set of HERE tile layers for convenient use with the map.
              */
-            export interface MapTypes {
+            interface MapTypes {
                 normal?: H.service.MapType;
                 satellite?: H.service.MapType;
                 terrain?: H.service.MapType;
-                [key: string]: H.service.MapType;
+                [key: string]: H.service.MapType | undefined;
             }
         }
 
         /**
-         * This class encapsulates the Routing REST API as a service stub. An instance of this class can be retrieved by calling the factory method on a platform instance. H.service.Platform#getRoutingService.
+         * This class encapsulates the Routing REST API as a service stub. An instance of this class can be retrieved by calling the factory method on a platform instance.
+         * H.service.Platform#getRoutingService.
          */
-        export class RoutingService extends H.service.AbstractRestService {
+        class RoutingService extends H.service.AbstractRestService {
             /**
              * Constructor
              * @param opt_options {H.service.RoutingService.Options=}
@@ -4477,7 +4572,8 @@ declare namespace H {
             constructor(opt_options?: H.service.RoutingService.Options);
 
             /**
-             * This method sends a "calculateroute" request to Routing REST API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object - or the onError callback if a communication error occured.
+             * This method sends a "calculateroute" request to Routing REST API and calls the onResult callback function once the service response was received - providing a
+             * H.service.ServiceResult object - or the onError callback if a communication error occured.
              * @param calculateRouteParams {H.service.ServiceParameters} - the service parameters to be sent with the routing request.
              * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Routing REST API provides a response to the request.
              * @param onError {function(Error)} - this function will be called if a communication error occurs during the JSON-P request
@@ -4485,13 +4581,13 @@ declare namespace H {
             calculateRoute(calculateRouteParams: H.service.ServiceParameters, onResult: (result: H.service.ServiceResult) => void, onError: (error: Error) => void): void;
         }
 
-        export module RoutingService {
+        namespace RoutingService {
             /**
              * @property subDomain {string=} - the sub-domain of the routing service relative to the platform's base URL, default is 'route'
              * @property path {string=} - the path of the map tile service, default is 'routing/7.2'
              * @property baseUrl {H.service.Url=} - an optional base URL if it differs from the platform's default base URL
              */
-            export interface Options {
+            interface Options {
                 subDomain?: string;
                 path?: string;
                 baseUrl?: H.service.Url;
@@ -4501,14 +4597,14 @@ declare namespace H {
         /**
          * This type encapsulates URL parameters to be sent to a HERE platform service.
          */
-        export interface ServiceParameters {
+        interface ServiceParameters {
             [key: string]: string;
         }
 
         /**
          * This type encapsulates a response object provider by a HERE platform service.
          */
-        export interface ServiceResult {
+        interface ServiceResult {
             [key: string]: string;
         }
 
@@ -4516,14 +4612,15 @@ declare namespace H {
          * Options which are used to initialize the tile provider.
          * @property crossOrigin {boolean=} - The string to be set for the crossOrigin attribute for loaded images
          */
-        export interface TileProviderOptions {
+        interface TileProviderOptions {
             crossOrigin?: boolean;
         }
 
         /**
-         * TrafficIncindentsService provides functionality to the low level traffic incidents api Traffic API documentation where it is possible to retrieve traffic incident information on a tile basis
+         * TrafficIncindentsService provides functionality to the low level traffic incidents api Traffic API documentation where it is possible to retrieve traffic incident information on a
+         * tile basis
          */
-        export class TrafficIncidentsService extends H.service.AbstractRestService {
+        class TrafficIncidentsService extends H.service.AbstractRestService {
             /**
              * Constructor
              * @param opt_options {H.service.TrafficIncidentsService.Options=}
@@ -4549,16 +4646,17 @@ declare namespace H {
              * @param opt_serviceParams {H.service.ServiceParameters=} - optional service parameters to be added to the request
              * @returns {H.service.JsonpRequestHandle}
              */
-            requestIncidentsByTile(x: number, y: number, z: number, onResponse: (result: H.service.ServiceResult) => void, onError: () => void, opt_serviceParams?: H.service.ServiceParameters): H.service.JsonpRequestHandle;
+            requestIncidentsByTile(x: number, y: number, z: number, onResponse: (result: H.service.ServiceResult) => void, onError: () => void, opt_serviceParams?: H.service.ServiceParameters):
+                H.service.JsonpRequestHandle;
         }
 
-        export module TrafficIncidentsService {
+        namespace TrafficIncidentsService {
             /**
              * @property subDomain {string=} - the sub-domain of the traffic incidents service relative to the platform's base URL, default is 'traffic'
              * @property path {string=} - the path of the traffic incidents service, default is 'traffic/6.1'
              * @property baseUrl {H.service.Url=} - an optional base URL if it differs from the platform's default base URL
              */
-            export interface Options {
+            interface Options {
                 subDomain?: string;
                 path?: string;
                 baseUrl?: H.service.Url;
@@ -4566,9 +4664,10 @@ declare namespace H {
         }
 
         /**
-         * This class represents a URL giving access to the individual parts that make up a URL,such as the scheme, host/domain, path, etc. Use the static parse method to populate a new URL object from a URL string. Be aware that URLs with user and password like "ftp://user:password@foo.bar/" are not supported!
+         * This class represents a URL giving access to the individual parts that make up a URL,such as the scheme, host/domain, path, etc. Use the static parse method to populate a new URL object
+         * from a URL string. Be aware that URLs with user and password like "ftp://user:password@foo.bar/" are not supported!
          */
-        export class Url {
+        class Url {
             /**
              * Constructor
              * @param scheme {string} - the URL scheme (e.g. "http" or "https" or "mailto")
@@ -4578,7 +4677,7 @@ declare namespace H {
              * @param opt_port {number=} - The port of the host on which the host listens. If a string is passed it must be convertible to an integer.
              * @param opt_anchor {string=} - an optional anchor part of the URL (usually preceded by '#');
              */
-            constructor(scheme: string, host: string, opt_path?: string, opt_params?: Object, opt_port?: number, opt_anchor?: string);
+            constructor(scheme: string, host: string, opt_path?: string, opt_params?: {}, opt_port?: number, opt_anchor?: string);
 
             /**
              * This function parses a URL string and returns a H.service.Url object. The URL string must contain at least a scheme and a host.
@@ -4589,7 +4688,8 @@ declare namespace H {
             static parse(url: string, opt_baseURL?: string): H.service.Url;
 
             /**
-             * Clones this URL object. Optionally, mutations can be passed to this function to modify properties of the cloned object. Note that URL parameters are not replaced but merged with the parameters of this instance.
+             * Clones this URL object. Optionally, mutations can be passed to this function to modify properties of the cloned object. Note that URL parameters are not replaced but merged with the
+             * parameters of this instance.
              * @returns {H.service.Url} - the clone of the URL object
              */
             clone(): H.service.Url;
@@ -4634,11 +4734,12 @@ declare namespace H {
             getPath(): string | void;
 
             /**
-             * This function sets the specified parameters for this URL object. Keys in this object, which are associated with undefined values will be treated as query string parameters with no value.
+             * This function sets the specified parameters for this URL object. Keys in this object, which are associated with undefined values will be treated as query string parameters
+             * with no value.
              * @param params {(Object | undefined)} - a hash of query string parameters specifying the parameters to be set.or a boolean to clear the parameters.
              * @returns {H.service.Url} - this URL object
              */
-            setQuery(params?: Object | boolean): H.service.Url;
+            setQuery(params?: {} | boolean): H.service.Url;
 
             /**
              * This function returns a boolean value indicating whether there are any query string parameter associated with this URL.
@@ -4650,7 +4751,7 @@ declare namespace H {
              * This function returns the query object of this Url object.
              * @returns {Object} - the query object
              */
-            getQuery(): Object;
+            getQuery(): {};
 
             /**
              * This function sets the anchor of this URL object.
@@ -4666,11 +4767,12 @@ declare namespace H {
             getAnchor(): string | void;
 
             /**
-             * This function merges the provided parameters into this URL's existing parameters. Key-value pairs which are defined in the argument and this URL's parameters will be overwritten. Key-value pairs which are defined in the argument and are not defined in this URL's parameters will be added. Prototype properties and function properties will not be merged.
+             * This function merges the provided parameters into this URL's existing parameters. Key-value pairs which are defined in the argument and this URL's parameters will be overwritten.
+             * Key-value pairs which are defined in the argument and are not defined in this URL's parameters will be added. Prototype properties and function properties will not be merged.
              * @param other {Object} - the parmeters to be merged into this URL's query string parameters
              * @returns {H.service.Url} - this URL object
              */
-            mergeQuery(other: Object): H.service.Url;
+            mergeQuery(other: {}): H.service.Url;
 
             /**
              * This function adds a sub-domain to the host of this URL object.
@@ -4693,11 +4795,11 @@ declare namespace H {
             toString(): string;
         }
 
-        export module metaInfo {
+        namespace metaInfo {
             /**
              * This class encapsulates a Metainfo Tile end point of the HERE Map Tile API.
              */
-            export class Service extends H.util.EventTarget implements H.service.IConfigurable {
+            class Service extends H.util.EventTarget implements H.service.IConfigurable {
                 /**
                  * Constructor
                  * @param opt_options {H.service.metaInfo.Service.Options=} - additional service parameters
@@ -4726,7 +4828,8 @@ declare namespace H {
                  * @param opt_scheme {string=} - the scheme for which the meta info tiles a requested (default is 'normal.day')
                  * @returns {H.map.provider.TileProvider} - the tile provider
                  */
-                createTileProvider(tileSize: number, pixelRatio: number, opt_categoryFilter?: Array<string>, opt_additionalParameters?: H.service.ServiceParameters, opt_tileType?: string, opt_scheme?: string): H.map.provider.TileProvider;
+                createTileProvider(tileSize: number, pixelRatio: number, opt_categoryFilter?: string[], opt_additionalParameters?: H.service.ServiceParameters, opt_tileType?: string,
+                                   opt_scheme?: string): H.map.provider.TileProvider;
 
                 /**
                  * This method creates a tile layer. This layer can be used as a layer on a map's data model.
@@ -4738,7 +4841,8 @@ declare namespace H {
                  * @param opt_scheme {string=} - the scheme for which the meta info tiles a requested (default is 'normal.day')
                  * @returns {H.map.layer.TileLayer} - the tile layer
                  */
-                createTileLayer(tileSize: number, pixelRatio: number, opt_categoryFilter?: Array<string>, opt_additionalParameters?: H.service.ServiceParameters, opt_tileType?: string, opt_scheme?: string): H.map.layer.TileLayer;
+                createTileLayer(tileSize: number, pixelRatio: number, opt_categoryFilter?: string[], opt_additionalParameters?: H.service.ServiceParameters, opt_tileType?: string,
+                                opt_scheme?: string): H.map.layer.TileLayer;
 
                 /**
                  * This methods receive configuration parameters from the platform, that can be used by the object implementing the interface.
@@ -4746,13 +4850,14 @@ declare namespace H {
                  * @param appCode {string} - The application code to identify the client against the platform (mandatory to provide)
                  * @param useHTTPS {boolean} - Indicates whether secure communication should be used, default is false
                  * @param useCIT {boolean} - Indicates whether the Customer Integration Testing should be used, default is false
-                 * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in the opt_baseUrl to use HTTPS.
+                 * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified
+                 * in the opt_baseUrl to use HTTPS.
                  * @returns {H.service.IConfigurable}
                  */
                 configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, opt_baseUrl?: H.service.Url): H.service.IConfigurable;
             }
 
-            export module Service {
+            namespace Service {
                 /**
                  * @property maps {Object<string, Object>} -
                  * @property schemes {Object<string, Object>} -
@@ -4761,7 +4866,7 @@ declare namespace H {
                  * @property resolutions {Object<string, Object>} -
                  * @property languages {Object<string, Object>} -
                  */
-                export interface Info {
+                interface Info {
                     maps: { [key: string]: any };
                     schemes: { [key: string]: any };
                     tiletypes: { [key: string]: any };
@@ -4771,11 +4876,12 @@ declare namespace H {
                 }
 
                 /**
-                 * @property type {string=} - the type of the map tile service to communicate with, e.g. 'base' (default), 'aerial', etc. (refer to the Map Tile REST API documentation for available types)
+                 * @property type {string=} - the type of the map tile service to communicate with, e.g. 'base' (default), 'aerial', etc. (refer to the Map Tile REST API documentation for
+                 * available types)
                  * @property version {string=} - the map version hash to use for retrieving tiles, default is newest and will be automatically updated
                  * @property subDomain {string=} - the sub-domain of the map tile service relative to the platform's base URL, default is 'maps'
                  */
-                export interface Options {
+                interface Options {
                     type?: string;
                     version?: string;
                     subDomain?: string;
@@ -4785,7 +4891,7 @@ declare namespace H {
             /**
              * This class utilizes Metainfo Tiles functionality provided by the Map Tile API to load meta information about map objects (buildings, labels, public transport etc.).
              */
-            export class TileProvider extends H.map.provider.RemoteTileProvider {
+            class TileProvider extends H.map.provider.RemoteTileProvider {
                 /**
                  * Constructor
                  * @param service {(H.service.metaInfo.Service | H.service.MapTileService)} - the tile service which holds information from about the source of the tiles
@@ -4795,7 +4901,7 @@ declare namespace H {
                 constructor(service: (H.service.metaInfo.Service | H.service.MapTileService), opt_params?: H.service.ServiceParameters, opt_options?: H.service.metaInfo.TileProvider.Options);
             }
 
-            export module TileProvider {
+            namespace TileProvider {
                 /**
                  * Configuration object which can be used to initialize the TileProvider.
                  * @property tileType {string=} - The tile type for which to request meta info
@@ -4805,22 +4911,22 @@ declare namespace H {
                  * @property pixelRatio {number=} - The pixel ratio to use for over-sampling in cases of high-resolution displays
                  * @property categoryFilter {Array<string>=} - A list of meta-info category names which should be suppressed. See Metainfo Tile for valid category names.
                  */
-                export interface Options {
+                interface Options {
                     tileType?: string;
                     scheme?: string;
                     tileCacheSize?: number;
                     tileSize?: number;
                     pixelRatio?: number;
-                    categoryFilter?: Array<string>;
+                    categoryFilter?: string[];
                 }
             }
         }
 
-        export module venues {
+        namespace venues {
             /**
              * The class represents the building in the venue hiearachy (see H.service.venues.Venue) and holds floors that belong to the building.
              */
-            export class Building extends H.map.Group {
+            class Building extends H.map.Group {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.ObjectProvider} - The object provider of this venue building
@@ -4857,9 +4963,10 @@ declare namespace H {
             }
 
             /**
-             * The class represents the floor object in the venue hierarchy (see H.service.venues.Venue). The class holds information about floor geometry and spaces (see H.service.venues.Space) that belong to this floor.
+             * The class represents the floor object in the venue hierarchy (see H.service.venues.Venue). The class holds information about floor geometry and spaces (see H.service.venues.Space)
+             * that belong to this floor.
              */
-            export class Floor extends H.map.Group {
+            class Floor extends H.map.Group {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.ObjectProvider} - The object provider of this venue floor
@@ -4893,7 +5000,8 @@ declare namespace H {
                 getBuilding(): H.service.venues.Building;
 
                 /**
-                 * Method returns raw data associated with the floor. For more details on data format see http://developer.here.com/rest-apis/documentation/venue-maps/topics/resource-type-venue-interaction-tile-floor.html
+                 * Method returns raw data associated with the floor. For more details on data format see
+                 * http://developer.here.com/rest-apis/documentation/venue-maps/topics/resource-type-venue-interaction-tile-floor.html
                  * @returns {*} - the raw floor data object
                  */
                 getData(): any;
@@ -4909,7 +5017,7 @@ declare namespace H {
             /**
              * This class encapsulates methods to call Venue Maps API endpoints.
              */
-            export class Service extends H.util.EventTarget implements H.service.IConfigurable {
+            class Service extends H.util.EventTarget implements H.service.IConfigurable {
                 /**
                  * Constructor
                  * @param opt_options {H.service.venues.Service.Options=} - additional service parameters
@@ -4917,7 +5025,8 @@ declare namespace H {
                 constructor(opt_options?: H.service.venues.Service.Options);
 
                 /**
-                 * This method sends a discovery request to the Venue Maps API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult object, or the onError callback if a communication error occured.
+                 * This method sends a discovery request to the Venue Maps API and calls the onResult callback function once the service response was received - providing a H.service.ServiceResult
+                 * object, or the onError callback if a communication error occured.
                  * @param serviceParams {H.service.ServiceParameters} - the service parameters to be sent with the discovery request
                  * @param onResult {function(H.service.ServiceResult)} - this function will be called once the Venue Maps API provides a response to the request
                  * @param onError {function(string)} - this function will be called if a communication error occurs during request and error type is passed as an argument
@@ -4925,7 +5034,8 @@ declare namespace H {
                 discover(serviceParams: H.service.ServiceParameters, onResult: (res: H.service.ServiceResult) => void, onError: (s: string) => void): void;
 
                 /**
-                 * This method creates a tile layer which can be added to the map in order to see the venues. It uses Interaction Tile endpoint of the Venue Maps API, more at http://developer.here.com/rest-apis/documentation/venue-maps/topics/quick-start-get-interaction-tile.html.
+                 * This method creates a tile layer which can be added to the map in order to see the venues. It uses Interaction Tile endpoint of the Venue Maps API, more at
+                 * http://developer.here.com/rest-apis/documentation/venue-maps/topics/quick-start-get-interaction-tile.html.
                  * @param opt_options {H.service.venues.TileProvider.Options=} - Tile provider options
                  * @returns {H.map.layer.TileLayer} - the tile layer
                  */
@@ -4943,18 +5053,19 @@ declare namespace H {
                  * @param appCode {string} - The application code to identify the client against the platform (mandatory to provide)
                  * @param useHTTPS {boolean} - Indicates whether secure communication should be used, default is false
                  * @param useCIT {boolean} - Indicates whether the Customer Integration Testing should be used, default is false
-                 * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified in the opt_baseUrl to use HTTPS.
+                 * @param opt_baseUrl {H.service.Url=} - The base URL of the platform, default is http://api.here.com. Note that if useHTTPS flag is passed it will override the URL scheme specified
+                 * in the opt_baseUrl to use HTTPS.
                  * @returns {H.service.IConfigurable}
                  */
                 configure(appId: string, appCode: string, useHTTPS: boolean, useCIT: boolean, opt_baseUrl?: H.service.Url): H.service.IConfigurable;
             }
 
-            export module Service {
+            namespace Service {
                 /**
                  * @property subDomain {string=} - the sub-domain of the Venue Maps service relative to the platform's base URL, default is 'venue.maps'
                  * @property path {string=} - the path to append after host name when making requests to the Venue Maps API, default is empty
                  */
-                export interface Options {
+                interface Options {
                     subDomain?: string;
                     path?: string;
                 }
@@ -4962,7 +5073,7 @@ declare namespace H {
                 /**
                  * The state types of the H.service.venues.Service. Possible states are:
                  */
-                export enum State {
+                enum State {
                     ERROR,
                     INIT,
                     READY,
@@ -4972,7 +5083,7 @@ declare namespace H {
             /**
              * Represents a spatial object for this space. Each space object contains data associated with that space and can be retrieved by using H.service.venues.Space#getData method.
              */
-            export class Space {
+            class Space {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.ObjectProvider} - The provider of this object.
@@ -4989,7 +5100,8 @@ declare namespace H {
                 isFloorSpace(): boolean;
 
                 /**
-                 * This method sets custom style to use for rendering the labels. Should be called before the first render of the space, otherwise has no any effect. Note that due to the design consistency currently it is not allowed to change the font family and the size of the labels.
+                 * This method sets custom style to use for rendering the labels. Should be called before the first render of the space, otherwise has no any effect. Note that due to the design
+                 * consistency currently it is not allowed to change the font family and the size of the labels.
                  * @param labelStyle {(H.map.SpatialStyle | H.map.SpatialStyle.Options)} - Custom label style
                  */
                 initLabelStyle(labelStyle: (H.map.SpatialStyle | H.map.SpatialStyle.Options)): void;
@@ -5001,16 +5113,17 @@ declare namespace H {
                 getFloor(): H.service.venues.Floor;
 
                 /**
-                 * Method returns raw data associated with the space. For more details on data format see http://developer.here.com/rest-apis/documentation/venue-maps/topics/resource-type-venue-interaction-tile-space.html
+                 * Method returns raw data associated with the space. For more details on data format see
+                 * http://developer.here.com/rest-apis/documentation/venue-maps/topics/resource-type-venue-interaction-tile-space.html
                  * @returns {Object} - raw space data object
                  */
-                getData(): Object;
+                getData(): {};
             }
 
             /**
              * This class represents a Venue Maps tile provider which requests venues tiles from a platform venue tile service.
              */
-            export class TileProvider extends H.map.provider.RemoteTileProvider {
+            class TileProvider extends H.map.provider.RemoteTileProvider {
                 /**
                  * Constructor
                  * @param service {H.service.venues.Service}
@@ -5031,24 +5144,27 @@ declare namespace H {
                 getCurrentLevel(): number;
             }
 
-            export module TileProvider {
+            namespace TileProvider {
                 /**
                  * Configuration object which can be used to initialize the TileProvider.
                  * @property tileCacheSize {number=} - The number of fully rendered spatial tiles that are cached for immediate reuse, default is 32
                  * @property pixelRatio {number=} - The pixel ratio to use for over-sampling in cases of high-resolution displays
-                 * @property onSpaceCreated {function(H.service.venues.Space)=} - A callback function that is called on every created space (see H.service.venues.Space) object. The function can be used for space object styling.
+                 * @property onSpaceCreated {function(H.service.venues.Space)=} - A callback function that is called on every created space (see H.service.venues.Space) object. The function can be
+                 * used for space object styling.
                  */
-                export interface Options {
+                interface Options {
                     tileCacheSize?: number;
                     pixelRatio?: number;
-                    onSpaceCreated?: (space: H.service.venues.Space) => void;
+                    onSpaceCreated?(space: H.service.venues.Space): void;
                 }
             }
 
             /**
-             * The class represents the venue, it is a root for the venue object heirarchy. The venue inherits from H.map.Group and holds building objects (see H.service.venues.Building). Building objects hold floor objects (see H.service.venues.Floor) and inherit from H.map.Group as well. Leaf objects are spaces (see H.service.venues.Space) that are spatial map objects and reside inside floor containers.
+             * The class represents the venue, it is a root for the venue object heirarchy. The venue inherits from H.map.Group and holds building objects (see H.service.venues.Building).
+             * Building objects hold floor objects (see H.service.venues.Floor) and inherit from H.map.Group as well. Leaf objects are spaces (see H.service.venues.Space) that are spatial map objects
+             * and reside inside floor containers.
              */
-            export class Venue extends H.map.Group {
+            class Venue extends H.map.Group {
                 /**
                  * Constructor
                  * @param provider {H.map.provider.ObjectProvider} - The object provider of this venue
@@ -5073,11 +5189,11 @@ declare namespace H {
     }
 
     /***** ui *****/
-    export module ui {
+    namespace ui {
         /**
          * This class represents the base class for UI controls on the map.
          */
-        export class Control extends H.ui.base.Container {
+        class Control extends H.ui.base.Container {
             /**
              * This abstract method can be overridden by deriving classes to be invoked when the UI object&#x27;s unit system changes.
              * @param unitSystem {H.ui.UnitSystem} - the unit system the UI currently uses
@@ -5119,7 +5235,7 @@ declare namespace H {
         /**
          * This class represents a distance measurement control which helps calculating distances between geographical locations indicated by the user clicks.
          */
-        export class DistanceMeasurement extends H.ui.Control {
+        class DistanceMeasurement extends H.ui.Control {
             /**
              * Constructor
              * @param opt_options {H.ui.DistanceMeasurement.Options=} - optional parameters to be passed to this control
@@ -5127,7 +5243,7 @@ declare namespace H {
             constructor(opt_options?: H.ui.DistanceMeasurement.Options);
         }
 
-        export module DistanceMeasurement {
+        namespace DistanceMeasurement {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.RIGHT_BOTTOM
              * @property startIcon {H.map.Icon=} - the icon to use for the first measurement point
@@ -5135,9 +5251,10 @@ declare namespace H {
              * @property endIcon {H.map.Icon=} - the icon to use for the last measurement point
              * @property splitIcon {H.map.Icon=} - the icon to use for indicating position under pointer over the line where new point will be created once user clicks
              * @property lineStyle {(H.map.SpatialStyle | H.map.SpatialStyle.Options)} - the style to use for connecting lines of the measurement points
-             * @property distanceFormatter {function(number)=} - Optional function used for formatting a distance. By default distance measurement tool will do the formatting according to the specified measurement unit (see H.ui.UI.Options#unitSystem)
+             * @property distanceFormatter {function(number)=} - Optional function used for formatting a distance. By default distance measurement tool will do the formatting according to the
+             * specified measurement unit (see H.ui.UI.Options#unitSystem)
              */
-            export interface Options {
+            interface Options {
                 alignment?: H.ui.LayoutAlignment;
                 startIcon?: H.map.Icon;
                 stopoverIcon?: H.map.Icon;
@@ -5151,7 +5268,7 @@ declare namespace H {
         /**
          * This class represents an information bubble bound to a geo-position on the map.
          */
-        export class InfoBubble extends base.Element {
+        class InfoBubble extends base.Element {
             /**
              * Constructor
              * @param position {H.geo.IPoint} - the geo-position to which this info bubble corresponds
@@ -5196,24 +5313,25 @@ declare namespace H {
             getContentElement(): HTMLElement;
 
             /**
-             * This methods sets the content of the info bubble. This can either be a string (applied as innerHTML) to the content element of this info bubble or a HTML node which is appended to the content element.
+             * This methods sets the content of the info bubble. This can either be a string (applied as innerHTML) to the content element of this info bubble or a HTML node which is appended
+             * to the content element.
              * @param content {(string | Node)} - the content for this bubble
              */
             setContent(content: string | Node): void;
         }
 
-        export module InfoBubble {
+        namespace InfoBubble {
             /**
              * This enumeration holds the state an info bubble can have.
              */
-            export enum State {
+            enum State {
                 /** This value represents the state where an info bubble is open and visible (value: 'open'). */
                 OPEN,
                 /** This value represents the state where an info bubble is closed and invisible (value: 'closed') */
                 CLOSED,
             }
 
-            export interface Options {
+            interface Options {
                 /**
                  * a callback to be invoked when the info bubble's state changes
                  * @param event {H.util.Event}
@@ -5230,7 +5348,7 @@ declare namespace H {
         /**
          * This enumeration holds the possible layout alignments for the UI elements.
          */
-        export enum LayoutAlignment {
+        enum LayoutAlignment {
             TOP_LEFT,
             TOP_CENTER,
             TOP_RIGHT,
@@ -5248,7 +5366,7 @@ declare namespace H {
         /**
          * This class represents a menu control allowing to control which map type the map shows, etc.
          */
-        export class MapSettingsControl extends H.ui.Control {
+        class MapSettingsControl extends H.ui.Control {
             /**
              * Constructor
              * @param opt_options {H.ui.MapSettingsControl.Options=} - optional parameters to be passed to this control
@@ -5262,13 +5380,13 @@ declare namespace H {
             setIncidentsLayer(incidentsLayer: H.map.layer.Layer): void;
         }
 
-        export module MapSettingsControl {
+        namespace MapSettingsControl {
             /**
              * The map type entry is an object containing a display name and a map type object to which it refers.
              * @property name {string} - label which describes the map type
              * @property mapType {H.service.MapType} - reference to map type
              */
-            export interface MapTypeEntry {
+            interface MapTypeEntry {
                 name: string;
                 mapType: H.service.MapType;
             }
@@ -5278,9 +5396,9 @@ declare namespace H {
              * @property entries {Array<H.ui.MapSettingsControl.MapTypeEntry>=} - the map type entries to be shown in this map settings control
              * @property incidents {H.map.layer.Layer} - the traffic incidents layer to be activated by the map settings control
              */
-            export interface Options {
+            interface Options {
                 alignment?: H.ui.LayoutAlignment;
-                entries?: Array<H.ui.MapSettingsControl.MapTypeEntry>;
+                entries?: H.ui.MapSettingsControl.MapTypeEntry[];
                 incidents: H.map.layer.Layer;
             }
         }
@@ -5288,7 +5406,7 @@ declare namespace H {
         /**
          * This class represents the UI controls for panorama
          */
-        export class Pano extends H.ui.Control {
+        class Pano extends H.ui.Control {
             /**
              * Constructor
              * @param opt_options {H.ui.Pano.Options=} - optional parameters to be passed to the map.
@@ -5296,12 +5414,12 @@ declare namespace H {
             constructor(opt_options?: H.ui.Pano.Options);
         }
 
-        export module Pano {
+        namespace Pano {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.RIGHT_BOTTOM
              * @property mapTypes {H.service.MapTypes} - The map types to use
              */
-            export interface Options {
+            interface Options {
                 alignment?: H.ui.LayoutAlignment;
                 mapTypes: H.service.MapType;
             }
@@ -5310,7 +5428,7 @@ declare namespace H {
         /**
          * This class represents a UI element showing the current zoom scale.
          */
-        export class ScaleBar {
+        class ScaleBar {
             /**
              * Constructor
              * @param opt_options {H.ui.ScaleBar.Options=} - optional parameters to be passed to this scale bar.
@@ -5318,11 +5436,11 @@ declare namespace H {
             constructor(opt_options?: H.ui.ScaleBar.Options);
         }
 
-        export module ScaleBar {
+        namespace ScaleBar {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.BOTTOM_RIGHT
              */
-            export interface Options {
+            interface Options {
                 alignment?: H.ui.LayoutAlignment;
             }
         }
@@ -5330,7 +5448,7 @@ declare namespace H {
         /**
          * This class encapsulates map UI functionality.
          */
-        export class UI implements H.util.ICapturable {
+        class UI implements H.util.ICapturable {
             /**
              * Constructor
              * @param map {H.Map}
@@ -5383,7 +5501,7 @@ declare namespace H {
              * This method returns a list of info bubble objects which are currently attached to this UI.
              * @returns {Array<H.ui.InfoBubble>} - the list of info bubbles
              */
-            getBubbles(): Array<InfoBubble>;
+            getBubbles(): InfoBubble[];
 
             /**
              * This method appends a control to the UI.
@@ -5451,7 +5569,7 @@ declare namespace H {
              */
         }
 
-        export module UI {
+        namespace UI {
             /**
              * Optional parameters to be passed to the UI constructor.
              * @property unitSystem {H.ui.UnitSystem=} - An optional unit system to be used by the UI, default is H.ui.UnitSystem.METRIC
@@ -5461,9 +5579,11 @@ declare namespace H {
              * @property scalebar {(H.ui.ScaleBar.Options | boolean)=} -
              * @property panorama {(H.ui.Pano.Options | boolean)=} -
              * @property distancemeasurement {(H.ui.DistanceMeasurement.Options | boolean)=} -
-             * @property locale {(H.ui.i18n.Localization | string)=} - defines language in which UI can be rendered. It can be predefined H.ui.i18n.Localization object with custom translation map, or a string one of following 'en-US', 'de-DE', 'es-ES', 'fi-FI', 'fr-FR', 'it-IT', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'tr-TR', 'zh-CN'. If not defined ui will use 'en-US' by default
+             * @property locale {(H.ui.i18n.Localization | string)=} - defines language in which UI can be rendered. It can be predefined H.ui.i18n.Localization object with custom translation map,
+             * or a string one of following 'en-US', 'de-DE', 'es-ES', 'fi-FI', 'fr-FR', 'it-IT', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'tr-TR', 'zh-CN'. If not defined ui will use 'en-US'
+             * by default
              */
-            export interface Options {
+            interface Options {
                 unitSystem?: H.ui.UnitSystem;
                 zoom?: (H.ui.ZoomControl.Options | boolean);
                 zoomrectangle?: (H.ui.ZoomRectangle.Options | boolean);
@@ -5478,7 +5598,7 @@ declare namespace H {
         /**
          * This enumeration holds the possible unit systems for the UI to display distances.
          */
-        export enum UnitSystem {
+        enum UnitSystem {
             /** This value represents the imperial unit system using miles and feet (value: 'imperial'). */
             IMPERIAL,
             /** This value represents the metric unit system using meters and kilometers, etc (value: 'metric'). */
@@ -5488,7 +5608,7 @@ declare namespace H {
         /**
          * This class represents the UI controls for zooming in an out of the map.
          */
-        export class ZoomControl extends H.ui.Control {
+        class ZoomControl extends H.ui.Control {
             /**
              * Constructor
              * @param opt_options {H.ui.ZoomControl.Options=} - optional parameters to be passed to the map.
@@ -5502,14 +5622,14 @@ declare namespace H {
             getZoomSpeed(): number;
         }
 
-        export module ZoomControl {
+        namespace ZoomControl {
             /**
              * @property zoomSpeed {number=} - the speed if zooming in and out in levels per millisecond, defaults to 0.05
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, defaults to H.ui.LayoutAlignment.RIGHT_MIDDLE
              * @property slider {boolean=} - flag whether to show the slider (true) or not, defaults to false
              * @property sliderSnaps {boolean=} - flag whether slider should snap to the integer values or not, defaults to false. This option has effect only if slider is enabled.
              */
-            export interface Options {
+            interface Options {
                 zoomSpeed?: number;
                 alignment?: H.ui.LayoutAlignment;
                 slider?: boolean;
@@ -5520,7 +5640,7 @@ declare namespace H {
         /**
          * This class represents a zoom rectangle control element that allows zooming to the selected area on the screen.
          */
-        export class ZoomRectangle extends H.ui.Control {
+        class ZoomRectangle extends H.ui.Control {
             /**
              * Constructor
              * @param opt_options {H.ui.ZoomRectangle.Options=} - optional parameters to be passed to this control
@@ -5528,12 +5648,13 @@ declare namespace H {
             constructor(opt_options?: H.ui.ZoomRectangle.Options);
         }
 
-        export module ZoomRectangle {
+        namespace ZoomRectangle {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.BOTTOM_RIGHT
-             * @property adjustZoom {function(number, H.Map) : number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the bounding rectangle into the view port.
+             * @property adjustZoom {function(number, H.Map) : number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the
+             * bounding rectangle into the view port.
              */
-            export interface Options {
+            interface Options {
                 alignment?: H.ui.LayoutAlignment;
                 adjustZoom?(n: number, m: H.Map): number;
             }
@@ -5544,15 +5665,15 @@ declare namespace H {
         /**
          * This namespace contains basic UI elements from which the UI controls are built.
          */
-        export module base {
-            export class Container extends H.util.EventTarget {
+        namespace base {
+            class Container extends H.util.EventTarget {
                 /**
                  * Constructor
                  * @param opt_elementType {string=} - the type of HTML element this UI element renders as, default is 'div'
                  * @param opt_className {string=} - an optional class name to be used on this element
                  * @param opt_children {Array<H.ui.base.Element>=} - optional child elements to be added to this container
                  */
-                constructor(opt_elementType?: string, opt_className?: string, opt_children?: Array<Element>);
+                constructor(opt_elementType?: string, opt_className?: string, opt_children?: Element[]);
 
                 /**
                  * Adds a child element to be rendered within the container element.
@@ -5565,7 +5686,7 @@ declare namespace H {
                  * Returns the child collection of this container.
                  * @returns {Array<H.ui.base.Element>} - Returns the child collection of this container.
                  */
-                getChildren(): Array<Element>;
+                getChildren(): Element[];
 
                 /**
                  * Removes a child element from this container's child collection.
@@ -5641,7 +5762,7 @@ declare namespace H {
                 removeClass(className: string): Element;
             }
 
-            export class Element extends H.util.EventTarget {
+            class Element extends H.util.EventTarget {
                 /**
                  * Constructor
                  * @param opt_elementType {string=} - the type of HTML element this UI element renders as, default is 'div'
@@ -5721,16 +5842,16 @@ declare namespace H {
         /**
          * Namespace contains functionality related to internationalization.
          */
-        export module i18n {
+        namespace i18n {
             /**
              * Default available locales. UI provides default translations for this set of locale codes.
              */
-            export const defaultLocales: Array<string>;
+            const defaultLocales: string[];
 
             /**
              * This class is used for internationalization of UI components.
              */
-            export class Localization {
+            class Localization {
                 constructor(locale: string, opt_translationMap?: any);
 
                 /**
@@ -5743,7 +5864,7 @@ declare namespace H {
                  * This method returns translation keys for current locale. Keys from this set can be used to get translations via translate method.
                  * @returns {Array<string>}
                  */
-                getKeys(): Array<string>;
+                getKeys(): string[];
 
                 /**
                  * This method returns a boolean value indicating whether this localization object has a translation for the specified translation key.
@@ -5763,11 +5884,13 @@ declare namespace H {
     }
 
     /***** util *****/
-    export module util {
+    namespace util {
         /**
-         * The cache represents a in-memory LRU-cache with a fixed size. It stores any data that is added until the cache's content exceeds a maximum size. Once the size of all content elements exceeds the maximum size the cache will drop the least recently retrieved elements until the size of the cache is within the bounds of its maximum size. Data elements are always associated with an identifier that allow to retrieve them at a later stage and their content size.
+         * The cache represents a in-memory LRU-cache with a fixed size. It stores any data that is added until the cache's content exceeds a maximum size. Once the size of all content elements
+         * exceeds the maximum size the cache will drop the least recently retrieved elements until the size of the cache is within the bounds of its maximum size. Data elements are always
+         * associated with an identifier that allow to retrieve them at a later stage and their content size.
          */
-        export class Cache implements H.util.ICache {
+        class Cache implements H.util.ICache {
             /**
              * Constructor
              * @param maxSize {number} - the maximum size of the cache
@@ -5819,7 +5942,8 @@ declare namespace H {
             drop(id: any): void;
 
             /**
-             * This method will execute the provided callback function on each of the cache's entries. If the optional match predicate is passed to this method the callback will only be executed on those entries for which the predicated returns true.
+             * This method will execute the provided callback function on each of the cache's entries. If the optional match predicate is passed to this method the callback will only be executed
+             * on those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
              * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
@@ -5827,8 +5951,10 @@ declare namespace H {
             forEach(callback: (s: string, i: any, n: number) => void, opt_ctx?: any, opt_matcher?: (s: string, i: any, n: number) => boolean): void;
 
             /**
-             * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or leave the entry in the cache respectively
+             * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
+             * return true.
+             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: (s: string, i: any, n: number) => boolean): void;
 
@@ -5846,7 +5972,7 @@ declare namespace H {
          * @property type {string} - Name of the dispatched event
          * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
          */
-        export class ChangeEvent extends H.util.Event {
+        class ChangeEvent extends H.util.Event {
             /**
              * Constructor
              * @param type {string} - The type of the event
@@ -5875,7 +6001,7 @@ declare namespace H {
          * This class represents a contextual information/action.
          * @property SEPARATOR {H.util.ContextItem} - Separator for the context items
          */
-        export class ContextItem extends H.util.EventTarget {
+        class ContextItem extends H.util.EventTarget {
             /**
              * Constructor
              * @param opt_options {H.util.ContextItem.Options=} - The values to initialize this context item
@@ -5924,29 +6050,29 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
 
             static SEPARATOR: H.util.ContextItem;
         }
 
-        export module ContextItem {
+        namespace ContextItem {
             /**
              * This type defines options which can be used to initialize the context item.
              * @property label {string=} - the label of the context item
              * @property disabled {boolean=} - flag indicatting whether context item is disabled or no, by default false
              * @property callback {function(H.util.Event)=} - Optional callback function to call once context item is selected
              */
-            export interface Options {
+            interface Options {
                 label?: string;
                 disabled?: boolean;
-                callback?: (event: H.util.Event) => void;
+                callback?(event: H.util.Event): void;
             }
         }
 
         /**
          * Object which can be safely disposed.
          */
-        export class Disposable {
+        class Disposable {
             /**
              * Constructor
              */
@@ -5957,7 +6083,7 @@ declare namespace H {
              * @param callback {Function}
              * @param opt_scope {Object=}
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
         /**
@@ -5967,7 +6093,7 @@ declare namespace H {
          * @property type {string} - Name of the dispatched event
          * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
          */
-        export class Event {
+        class Event {
             /**
              * Constructor
              * @param type {string} - Event Type.
@@ -5994,14 +6120,15 @@ declare namespace H {
         /**
          * EventTarget enabled listening and dispatching events on all instances and derived classes.
          */
-        export class EventTarget {
+        class EventTarget {
             /**
              * Constructor
              */
             constructor();
 
             /**
-             * This method allows to listen for specific event triggered by the object. Keep in mind, that you must removeEventListener manually or dispose an object when you no longer need it. Otherwise memory leak is possible.
+             * This method allows to listen for specific event triggered by the object. Keep in mind, that you must removeEventListener manually or dispose an object when you no longer need it.
+             * Otherwise memory leak is possible.
              * @param type {string} - name of event
              * @param handler {Function} - event handler function
              * @param opt_capture {boolean=} - if set to true will listen in the capture phase (bubble otherwise)
@@ -6038,9 +6165,10 @@ declare namespace H {
         }
 
         /**
-         * An interface definition for the generic cache. Any data elements can be stored in the cache. They are always associated with an identifier to retrieve them at a later stage and their content size.
+         * An interface definition for the generic cache. Any data elements can be stored in the cache. They are always associated with an identifier to retrieve them at a later stage and their
+         * content size.
          */
-        export interface ICache {
+        interface ICache {
             /**
              * This method adds an element to the cache.
              * @param id {*} - The identifier of this data element, the value is converted to a string.
@@ -6065,16 +6193,19 @@ declare namespace H {
             drop(id: any): void;
 
             /**
-             * This method will execute the provided callback function on each of the cache's entries. If the optional match predicate is passed to this method the callback will only be executed on those entries for which the predicated returns true.
+             * This method will execute the provided callback function on each of the cache's entries. If the optional match predicate is passed to this method the callback will only be executed on
+             * those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
              * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
              */
-            forEach(callback: (s: string, t: any, n: number) => void, opt_ctx?: Object, opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
+            forEach(callback: (s: string, t: any, n: number) => void, opt_ctx?: {}, opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
 
             /**
-             * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or leave the entry in the cache respectively
+             * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
+             * return true.
+             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
 
@@ -6088,14 +6219,14 @@ declare namespace H {
         /**
          * An interface to cancelable requests and actions.
          */
-        export interface ICancelable {
+        interface ICancelable {
             /**
              * This method is used to cancel current action
              */
             cancel(): void;
         }
 
-        export interface ICapturable {
+        interface ICapturable {
             /**
              * This method is used to capture the element view
              * @param canvas {HTMLCanvasElement} - HTML Canvas element to draw the view of the capturable element
@@ -6123,12 +6254,12 @@ declare namespace H {
          * @event set {H.util.OList.Event} - Fired when an entry was set in the list.
          * @event move {H.util.OList.Event} - Fired when an entry was moved within the list.
          */
-        export class OList extends H.util.EventTarget {
-
+        class OList extends H.util.EventTarget {
             /**
              * This method inserts an entry to the list. Optionally it can place new entry at provided index.
              * @param entry {?} - The entry to insert
-             * @param opt_idx {number=} - The index where the new entry should be inserted; if omitted or greater then the current size of the list, the entry is added at the end of the list; a negative index is treated as being relative from the end of the list
+             * @param opt_idx {number=} - The index where the new entry should be inserted; if omitted or greater then the current size of the list, the entry is added at the end of the list;
+             * a negative index is treated as being relative from the end of the list
              */
             add(entry: any, opt_idx?: number): void;
 
@@ -6178,7 +6309,7 @@ declare namespace H {
              * This method returns all list's entries as an array.
              * @returns {Array<*>} - The list as an array
              */
-            asArray(): Array<any>;
+            asArray(): any[];
 
             /**
              * This method removes all entries from the list.
@@ -6201,10 +6332,10 @@ declare namespace H {
              * @param callback {Function} - The callback function.
              * @param opt_scope {Object=} - An optional scope to call the callback in.
              */
-            addOnDisposeCallback(callback: Function, opt_scope?: Object): void;
+            addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
-        export module OList {
+        namespace OList {
             /**
              * The event class for events that are dispatched by OList
              * @property target {*} - Object which triggered the event
@@ -6212,7 +6343,7 @@ declare namespace H {
              * @property type {string} - Name of the dispatched event
              * @property defaultPrevented {boolean} - Indicates if preventDefault was called on the current event
              */
-            export class Event extends H.util.Event {
+            class Event extends H.util.Event {
                 /**
                  * Constructor
                  * @param list {H.util.OList} - The OList instance which is emitting the event
@@ -6244,7 +6375,7 @@ declare namespace H {
         /**
          * A generic class to represent a handle for any kind of asynchronous processed requests
          */
-        export class Request {
+        class Request {
             /**
              * Constructor
              * @param opt_onprogress {function(H.util.Request)=} - A callback to invoke every time when the request's progress state changes
@@ -6277,11 +6408,11 @@ declare namespace H {
             getFailed(): number;
         }
 
-        export module Request {
+        namespace Request {
             /**
              * The supported states of an request
              */
-            export enum State {
+            enum State {
                 PENDING,
                 PROCESSING,
                 COMPLETE,
@@ -6290,11 +6421,11 @@ declare namespace H {
             }
         }
 
-        export module animation {
+        namespace animation {
             /**
              * This mamespace contains easing functions used for Animation class.
              */
-            export class ease {
+            class ease {
                 /**
                  * This function defines linear ease.
                  * @param val {number} - A value in range [0..1] to translate
@@ -6332,13 +6463,13 @@ declare namespace H {
             }
         }
 
-        export module kinetics {
+        namespace kinetics {
             /**
              * This interface defines kinetic move parameters used by map for kinetic drag.
              * @property power {number} - Power multiplier. Multiplier is used to increase the speed of the kinetic move. By default map uses 1.
              * @property duration {number} - Defines duration of the kinetic move.
              */
-            export interface IKinetics {
+            interface IKinetics {
                 /**
                  * Easing function modifies animation progress. In example it can modify the animation in a way it starts rapidly and then slows down at the end.
                  * @param p {number} - current progress
diff --git a/types/heremaps/tslint.json b/types/heremaps/tslint.json
new file mode 100644
index 0000000000..4ac54521fe
--- /dev/null
+++ b/types/heremaps/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": [false]
+    }
+}
\ No newline at end of file
diff --git a/types/highcharts-ng/index.d.ts b/types/highcharts-ng/index.d.ts
index 639d21d88e..7c5386a890 100644
--- a/types/highcharts-ng/index.d.ts
+++ b/types/highcharts-ng/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/pablojim/highcharts-ng
 // Definitions by: Scott Hatcher <https://github.com/scatcher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { ChartObject, IndividualSeriesOptions, Options } from "highcharts";
 
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 8cc623b680..2bdc1b648d 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.highcharts.com/
 // Definitions by: Damiano Gambarotto <http://github.com/damianog>, Dan Lewi Harkestad <http://github.com/baltie>, Albert Ozimek <https://github.com/AlbertOzimek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace Highcharts {
     interface Position {
@@ -5012,7 +5013,7 @@ declare namespace Highcharts {
          *            color: '#FF00FF'
          *        }]
          */
-        data?: number[] | Array<[number, number]> | Array<[string, number]> | DataPoint[];
+        data?: Array<number | [number, number] | [string, number] | DataPoint>;
         /**
          * An id for the series. This can be used after render time to get a pointer to the series object through
          * chart.get().
diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index 7c813e1c1e..9df2443a31 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -134,7 +134,10 @@ fooStream = _<Foo>((push, next) => {
 
 fooStream = _(fooStream);
 fooStream = _<Foo>(readable);
-fooStream = _<Foo>(emitter);
+fooStream = _<Foo>(str, emitter);
+fooStream = _<Foo>(str, emitter, num);
+fooStream = _<Foo>(str, emitter, strArr);
+fooStream = _<Foo>(str, emitter, f);
 
 fooStream = _(fooStreamThen);
 fooStream = _(fooThen);
@@ -142,100 +145,32 @@ fooStream = _(fooThen);
 fooArrStream = _(fooArrThen);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-obj = _.nil;
-
+// STREAM OBJECTS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-f = _.curry(fn, foo);
-f = _.curry(fn, foo, bar);
-
-f = _.ncurry(num, fn, foo);
-f = _.ncurry(num, fn, foo, bar);
-
-f = _.partial(f, foo);
-f = _.partial(f, foo, bar);
-
-f = _.flip(fn, foo);
-f = _.flip(fn, foo, bar);
-
-f = _.compose(f);
-f = _.compose(f, f);
-
-f = _.seq(f);
-f = _.seq(f, f);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-bool = _.isStream(x);
-bool = _.isStream(fooStream);
-
-bool = _.isStreamError(x);
-bool = _.isStreamError(fooStream);
-
-bool = _.isStreamRedirect(x);
-bool = _.isStreamRedirect(fooStream);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-anyStream = _.values(obj);
-fooStream = _.values(fooArr);
-
-strStream = _.keys(obj);
-
-anyArrStream = _.pairs(obj);
-anyArrStream = _.pairs(fooArr);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-obj = _.extend(obj, obj);
-
-objCurObj = _.extend(obj);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-x = _.get(str, obj);
-
-objCurObj = _.get(str);
-
-obj = _.set(str, foo, obj);
-
-objCurAny = _.set(str, foo);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-_.log(str);
-_.log(str, num, foo);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-f = _.wrapCallback(func);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-num = _.add(num, num);
-
-numCurNum = _.add(num);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// instance methods
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-fooStream.pause();
-fooStream.resume();
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-fooStream.end();
-
-fooStream = fooStream.pipe(fooStream);
-barStream = fooStream.pipe(barStream);
-
 fooStream.destroy();
 
+fooStream.end();
+
+fooStream.pause();
+
+fooStream.resume();
+
+bool = fooStream.write(foo);
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// TRANSFORMS
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+fooStream = fooStream.append(foo);
+
+fooArrStream = fooStream.batch(2);
+
+fooArrStream = fooStream.batchWithTimeOrCount(10, 2);
+
+fooArrStream = fooStream.collect();
+
+fooStream = fooStream.compact();
 
 barStream = fooStream.consume((err: Error, x: Foo, push: (err: Error, value?: Bar) => void, next: () => void) => {
 	push(err);
@@ -249,27 +184,11 @@ barStream = fooStream.consume<Bar>((err, x, push, next) => {
 	next();
 });
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fooStream = fooStream.debounce(num);
 
-fooStream.pull((err: Error, x: Foo) => {
+fooStream = fooStream.doto((x: Foo) => {});
 
-});
-
-fooStream.pull((err, x) => {
-
-});
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-bool = fooStream.write(foo);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-fooStream = fooStream.fork();
-
-fooStream = fooStream.observe();
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fooStream = fooStream.drop(2);
 
 fooStream = fooStream.errors((err: Error, push: (e: Error, x?: Foo) => void) => {
 	push(err);
@@ -283,26 +202,76 @@ fooStream = fooStream.errors((err, push) => {
 	push(null, foo);
 });
 
+fooStream = fooStream.filter((x: Foo) => {
+	return bool;
+});
+
+fooStream = fooStream.find((x: Foo) => {
+	return bool;
+});
+
+fooStream = fooStream.findWhere(obj);
+
+strFooArrMapStream = fooStream.group((x: Foo) => {
+	return str;
+});
+strFooArrMapStream = fooStream.group(str);
+
+fooStream = fooStream.head();
+
+barStream = fooStream.invoke<Bar>(str, anyArr);
+
+fooStream = fooStream.last();
+
+fooStream = fooStream.latest();
+
+barStream = fooStream.map((x: Foo) => {
+	return bar;
+});
+
+barStream = fooStream.pluck<Bar>(str);
+
+barStream = fooStream.reduce(bar, (memo: Bar, x: Foo) => {
+	return memo;
+});
+
+barStream = fooStream.reduce1(bar, (memo: Bar, x: Foo) => {
+	return memo;
+});
+
+fooStream = fooStream.reject((x: Foo) => {
+	return bool;
+});
+
+barStream = fooStream.scan(bar, (memo: Bar, x: Foo) => {
+	return memo;
+});
+
+//missing scan1
+
 fooStream = fooStream.stopOnError((e: Error) => {
 
 });
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fooStream = fooStream.take(num);
 
-fooStream.each((x: Foo) => {
+fooStream.tap((x: Foo) => {});
 
-});
+fooStream = fooStream.throttle(num);
 
-fooStream.apply(func);
+fooStream = fooStream.where(obj);
 
-fooStream.toArray((arr: Foo[]) => {
-
-});
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// HIGHER-ORDER STREAMS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barStream = fooStream.map((x: Foo) => {
-	return bar;
+fooStream = fooStream.concat(fooStream);
+
+fooStream = fooStream.concat(fooArr);
+
+fooStream = fooStream.flatFilter((x: Foo) => {
+	return boolStream;
 });
 
 barStream = fooStream.flatMap((x: Foo) => {
@@ -313,95 +282,127 @@ barStream = fooStream.flatMap((x: Foo) => {
 	return bar;
 });
 
-barStream = fooStream.pluck<Bar>(str);
+barStream = fooStream.flatten<Bar>();
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fooStream = fooStream.fork();
 
-fooStream = fooStream.filter((x: Foo) => {
-	return bool;
-});
+fooStream = fooStream.merge(fooStreamStream);
 
-fooStream = fooStream.flatFilter((x: Foo) => {
-	return boolStream;
-});
+fooStream = fooStream.observe();
 
-fooStream = fooStream.reject((x: Foo) => {
-	return bool;
-});
+fooStream = fooStream.otherwise(fooStream);
 
-fooStream = fooStream.find((x: Foo) => {
-	return bool;
-});
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-strFooArrMapStream = fooStream.group((x: Foo) => {
-	return str;
-});
-strFooArrMapStream = fooStream.group(str);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-fooStream = fooStream.compact();
-
-fooStream = fooStream.where(obj);
-
-fooStream = fooStream.zip(fooStream);
-fooStream = fooStream.zip([foo, foo]);
-
-fooStream = fooStream.head();
-fooStream = fooStream.take(num);
-
-fooStream = fooStream.last();
+fooStream = fooStream.parallel(num);
 
 barStream = fooStream.sequence<Bar>();
 
 barStream = fooStream.series<Bar>();
 
-barStream = fooStream.flatten<Bar>();
-
-fooStream = fooStream.parallel(num);
-
-fooStream = fooStream.otherwise(fooStream);
-
-fooStream = fooStream.append(foo);
+fooStream = fooStream.zip(fooStream);
+fooStream = fooStream.zip([foo, foo]);
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// CONSUMPTION
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barStream = fooStream.reduce(bar, (memo: Bar, x: Foo) => {
-	return memo;
+fooStream.apply(func);
+
+fooStream.done(() => {});
+
+fooStream.each((x: Foo) => {
+
 });
 
-barStream = fooStream.reduce1(bar, (memo: Bar, x: Foo) => {
-	return memo;
+fooStream = fooStream.pipe(fooStream);
+barStream = fooStream.pipe(barStream);
+
+fooStream.pull((err: Error, x: Foo) => {
+
 });
 
-fooArrStream = fooStream.collect();
+fooStream.pull((err, x) => {
 
-barStream = fooStream.scan(bar, (memo: Bar, x: Foo) => {
-	return memo;
 });
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fooStream.toArray((arr: Foo[]) => {
 
-fooStream = fooStream.concat(fooStream);
+});
 
-fooStream = fooStream.concat(fooArr);
+fooStream.toCallback((err: Error, x: Foo) => {});
+fooStream.toCallback((err: Error) => {});
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-fooStream = fooStream.merge(fooStreamStream);
-
+// UTILS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barStream = fooStream.invoke<Bar>(str, anyArr);
+bool = _.isStream(x);
+bool = _.isStream(fooStream);
 
-fooStream = fooStream.throttle(num);
+bool = _.isStreamError(x);
+bool = _.isStreamError(fooStream);
+
+bool = _.isStreamRedirect(x);
+bool = _.isStreamRedirect(fooStream);
+
+_.log(str);
+_.log(str, num, foo);
+
+obj = _.nil;
+
+f = _.wrapCallback(func);
+f = _.wrapCallback(func, num);
+f = _.wrapCallback(func, strArr);
+f = _.wrapCallback(func, fn);
 
-fooStream = fooStream.debounce(num);
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// OBJECTS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooStream = fooStream.latest();
+obj = _.extend(obj, obj);
+objCurObj = _.extend(obj);
+
+x = _.get(str, obj);
+objCurObj = _.get(str);
+
+strStream = _.keys(obj);
+
+anyArrStream = _.pairs(obj);
+anyArrStream = _.pairs(fooArr);
+
+obj = _.set(str, foo, obj);
+objCurAny = _.set(str, foo);
+
+anyStream = _.values(obj);
+fooStream = _.values(fooArr);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// FUNCTIONS
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+f = _.compose(f);
+f = _.compose(f, f);
+
+f = _.curry(fn, foo);
+f = _.curry(fn, foo, bar);
+
+f = _.flip(fn, foo);
+f = _.flip(fn, foo, bar);
+
+f = _.ncurry(num, fn, foo);
+f = _.ncurry(num, fn, foo, bar);
+
+f = _.partial(f, foo);
+f = _.partial(f, foo, bar);
+
+f = _.seq(f);
+f = _.seq(f, f);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// OPERATORS
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+num = _.add(num, num);
+
+numCurNum = _.add(num);
+
+//missing not
\ No newline at end of file
diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index b10f8e00bf..6a3532baca 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for Highland 1.14.0
+// Type definitions for Highland 2.10.5
 // Project: http://highlandjs.org/
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds/>
+//                 Hugo Wood <https://github.com/hgwood/>
+//                 William Yu <https://github.com/iwllyu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -48,6 +50,17 @@ interface HighlandStatic {
 	 * event emitter as the two arguments to the constructor and the first
 	 * argument emitted to the event handler will be written to the new Stream.
 	 *
+	 * You can pass a mapping hint as the third argument, which specifies how
+	 * event arguments are pushed into the stream. If no mapping hint is
+	 * provided, only the first value emitted with the event to the will be
+	 * pushed onto the Stream.
+	 *
+	 * If mappingHint is a number, an array of that length will be pushed onto
+	 * the stream, containing exactly that many parameters from the event. If
+	 * it's an array, it's used as keys to map the arguments into an object which
+	 * is pushed to the tream. If it is a function, it's called with the event
+	 * arguments, and the returned value is pushed.
+	 *
 	 * **Promise -** Accepts an ES6 / jQuery style promise and returns a
 	 * Highland Stream which will emit a single value (or an error).
 	 *
@@ -63,12 +76,43 @@ interface HighlandStatic {
 
 	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
 	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
-	<R>(xs: NodeJS.EventEmitter): Highland.Stream<R>;
+	<R>(eventName: string, xs: NodeJS.EventEmitter, mappingHint?: Highland.MappingHint): Highland.Stream<R>;
 
 	// moar (promise for everything?)
 	<R>(xs: Highland.Thenable<Highland.Stream<R>>): Highland.Stream<R>;
 	<R>(xs: Highland.Thenable<R>): Highland.Stream<R>;
 
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// UTILS
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	
+	/**
+	 * Returns true if `x` is a Highland Stream.
+	 *
+	 * @id isStream
+	 * @section Streams
+	 * @name _.isStream(x)
+	 * @param x - the object to test
+	 * @api public
+	 */
+	isStream(x: any): boolean;
+
+	isStreamError(x: any): boolean;
+
+	isStreamRedirect(x: any): boolean;
+
+	/**
+	 * Logs values to the console, a simple wrapper around `console.log` that
+	 * it suitable for passing to other functions by reference without having to
+	 * call `bind`.
+	 *
+	 * @id log
+	 * @section Utils
+	 * @name _.log(args..)
+	 * @api public
+	 */
+	log(x: any, ...args: any[]): void;
+
 	/**
 	 * The end of stream marker. This is sent along the data channel of a Stream
 	 * to tell consumers that the Stream has ended. See the following map code for
@@ -81,7 +125,139 @@ interface HighlandStatic {
 	 */
 	nil: Highland.Nil;
 
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	/**
+	 * Wraps a node-style async function which accepts a callback, transforming
+	 * it to a function which accepts the same arguments minus the callback and
+	 * returns a Highland Stream instead. The wrapped function keeps its context,
+	 * so you can safely use it as a method without binding (see the second
+	 * example below).
+	 *
+	 * wrapCallback also accepts an optional mappingHint, which specifies how
+	 * callback arguments are pushed to the stream. This can be used to handle
+	 * non-standard callback protocols that pass back more than one value.
+	 *
+	 * mappingHint can be a function, number, or array. See the documentation on
+	 * EventEmitter Stream Objects for details on the mapping hint. If
+	 * mappingHint is a function, it will be called with all but the first
+	 * argument that is passed to the callback. The first is still assumed to be
+	 * the error argument.
+	 *
+	 * @id wrapCallback
+	 * @section Utils
+	 * @name _.wrapCallback(f)
+	 * @param {Function} f - the node-style function to wrap
+	 * @param {Array | Function | Number} [mappingHint] - how to pass the arguments to the callback
+	 * @api public
+	 */
+	wrapCallback(f: Function, mappingHint?: Highland.MappingHint): (...args: any[]) => Highland.Stream<any>;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// OBJECTS
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Extends one object with the properties of another. **Note:** The
+	 * arguments are in the reverse order of other libraries such as
+	 * underscore. This is so it follows the convention of other functions in
+	 * this library and so you can more meaningfully partially apply it.
+	 *
+	 * @id extend
+	 * @section Objects
+	 * @name _.extend(a, b)
+	 * @param {Object} a - the properties to extend b with
+	 * @param {Object} b - the original object to extend
+	 * @api public
+	 */
+	extend(extensions: Object, target: Object): Object;
+
+	extend(target: Object): (extensions: Object) => Object;
+
+	/**
+	 * Returns a property from an object.
+	 *
+	 * @id get
+	 * @section Objects
+	 * @name _.get(prop, obj)
+	 * @param {String} prop - the property to return
+	 * @param {Object} obj - the object to read properties from
+	 * @api public
+	 */
+	get(prop: string, obj: Object): string;
+
+	get(prop: string): (obj: Object) => Object;
+
+	/**
+	 * Returns keys from an Object as a Stream.
+	 *
+	 * @id keys
+	 * @section Objects
+	 * @name _.keys(obj)
+	 * @param {Object} obj - the object to return keys from
+	 * @api public
+	 */
+	keys(obj: Object): Highland.Stream<string>;
+
+	/**
+	 * Returns key/value pairs for an Object as a Stream. Reads properties
+	 * lazily, so if you don't read from all keys on an object, not
+	 * all properties will be read from (may have an effect where getters
+	 * are used).
+	 *
+	 * @id pairs
+	 * @section Objects
+	 * @name _.pairs(obj)
+	 * @param {Object} obj - the object to return key/value pairs from
+	 * @api public
+	 */
+	pairs(obj: Object): Highland.Stream<any[]>;
+
+	pairs(obj: any[]): Highland.Stream<any[]>;
+
+	/**
+	 * Updates a property on an object, returning the updated object.
+	 *
+	 * @id set
+	 * @section Objects
+	 * @name _.set(prop, value, obj)
+	 * @param {String} prop - the property to return
+	 * @param value - the value to set the property to
+	 * @param {Object} obj - the object to set properties on
+	 * @api public
+	 */
+	set(prop: string, val: any, obj: Object): Object;
+
+	set(prop: string, val: any): (obj: Object) => Object;
+
+	/**
+	 * Returns values from an Object as a Stream. Reads properties
+	 * lazily, so if you don't read from all keys on an object, not
+	 * all properties will be read from (may have an effect where getters
+	 * are used).
+	 *
+	 * @id values
+	 * @section Objects
+	 * @name _.values(obj)
+	 * @param {Object} obj - the object to return values from
+	 * @api public
+	 */
+	values(obj: Object): Highland.Stream<any>;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// FUNCTIONS
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	/**
+	 * Creates a composite function, which is the application of function1 to
+	 * the results of function2. You can pass an arbitrary number of arguments
+	 * and have them composed. This means you can't partially apply the compose
+	 * function itself.
+	 *
+	 * @id compose
+	 * @name compose(fn1, fn2, ...)
+	 * @section Functions
+	 * @api public
+	 */
+	compose(...functions: Function[]): Function;
 
 	/**
 	 * Transforms a function with specific arity (all arguments must be
@@ -100,6 +276,20 @@ interface HighlandStatic {
 	 */
 	curry(fn: Function, ...args: any[]): Function;
 
+	/**
+	 * Evaluates the function `fn` with the argument positions swapped. Only
+	 * works with functions that accept two arguments.
+	 *
+	 * @id flip
+	 * @name flip(fn, [x, y])
+	 * @section Functions
+	 * @param {Function} f - function to flip argument application for
+	 * @param x - parameter to apply to the right hand side of f
+	 * @param y - parameter to apply to the left hand side of f
+	 * @api public
+	 */
+	flip(fn: Function, ...args: any[]): Function;
+
 	/**
 	 * Same as `curry` but with a specific number of arguments. This can be
 	 * useful when functions do not explicitly define all its parameters.
@@ -131,33 +321,6 @@ interface HighlandStatic {
 	 */
 	partial(f: Function, ...args: any[]): Function;
 
-	/**
-	 * Evaluates the function `fn` with the argument positions swapped. Only
-	 * works with functions that accept two arguments.
-	 *
-	 * @id flip
-	 * @name flip(fn, [x, y])
-	 * @section Functions
-	 * @param {Function} f - function to flip argument application for
-	 * @param x - parameter to apply to the right hand side of f
-	 * @param y - parameter to apply to the left hand side of f
-	 * @api public
-	 */
-	flip(fn: Function, ...args: any[]): Function;
-
-	/**
-	 * Creates a composite function, which is the application of function1 to
-	 * the results of function2. You can pass an arbitrary number of arguments
-	 * and have them composed. This means you can't partially apply the compose
-	 * function itself.
-	 *
-	 * @id compose
-	 * @name compose(fn1, fn2, ...)
-	 * @section Functions
-	 * @api public
-	 */
-	compose(...functions: Function[]): Function;
-
 	/**
 	 * The reversed version of compose. Where arguments are in the order of
 	 * application.
@@ -169,148 +332,10 @@ interface HighlandStatic {
 	 */
 	seq(...functions: Function[]): Function;
 
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns true if `x` is a Highland Stream.
-	 *
-	 * @id isStream
-	 * @section Streams
-	 * @name _.isStream(x)
-	 * @param x - the object to test
-	 * @api public
-	 */
-	isStream(x: any): boolean;
-
-	isStreamError(x: any): boolean;
-
-	isStreamRedirect(x: any): boolean;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns values from an Object as a Stream. Reads properties
-	 * lazily, so if you don't read from all keys on an object, not
-	 * all properties will be read from (may have an effect where getters
-	 * are used).
-	 *
-	 * @id values
-	 * @section Objects
-	 * @name _.values(obj)
-	 * @param {Object} obj - the object to return values from
-	 * @api public
-	 */
-	values(obj: Object): Highland.Stream<any>;
-
-	/**
-	 * Returns keys from an Object as a Stream.
-	 *
-	 * @id keys
-	 * @section Objects
-	 * @name _.keys(obj)
-	 * @param {Object} obj - the object to return keys from
-	 * @api public
-	 */
-	keys(obj: Object): Highland.Stream<string>;
-
-	/**
-	 * Returns key/value pairs for an Object as a Stream. Reads properties
-	 * lazily, so if you don't read from all keys on an object, not
-	 * all properties will be read from (may have an effect where getters
-	 * are used).
-	 *
-	 * @id pairs
-	 * @section Objects
-	 * @name _.pairs(obj)
-	 * @param {Object} obj - the object to return key/value pairs from
-	 * @api public
-	 */
-	pairs(obj: Object): Highland.Stream<any[]>;
-
-	pairs(obj: any[]): Highland.Stream<any[]>;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Extends one object with the properties of another. **Note:** The
-	 * arguments are in the reverse order of other libraries such as
-	 * underscore. This is so it follows the convention of other functions in
-	 * this library and so you can more meaningfully partially apply it.
-	 *
-	 * @id extend
-	 * @section Objects
-	 * @name _.extend(a, b)
-	 * @param {Object} a - the properties to extend b with
-	 * @param {Object} b - the original object to extend
-	 * @api public
-	 */
-	extend(extensions: Object, target: Object): Object;
-
-	extend(target: Object): (extensions: Object) => Object;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Returns a property from an object.
-	 *
-	 * @id get
-	 * @section Objects
-	 * @name _.get(prop, obj)
-	 * @param {String} prop - the property to return
-	 * @param {Object} obj - the object to read properties from
-	 * @api public
-	 */
-	get(prop: string, obj: Object): string;
-
-	get(prop: string): (obj: Object) => Object;
-
-	/**
-	 * Updates a property on an object, returning the updated object.
-	 *
-	 * @id set
-	 * @section Objects
-	 * @name _.set(prop, value, obj)
-	 * @param {String} prop - the property to return
-	 * @param value - the value to set the property to
-	 * @param {Object} obj - the object to set properties on
-	 * @api public
-	 */
-	set(prop: string, val: any, obj: Object): Object;
-
-	set(prop: string, val: any): (obj: Object) => Object;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Logs values to the console, a simple wrapper around `console.log` that
-	 * it suitable for passing to other functions by reference without having to
-	 * call `bind`.
-	 *
-	 * @id log
-	 * @section Utils
-	 * @name _.log(args..)
-	 * @api public
-	 */
-	log(x: any, ...args: any[]): void;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Wraps a node-style async function which accepts a callback, transforming
-	 * it to a function which accepts the same arguments minus the callback and
-	 * returns a Highland Stream instead. Only the first argument to the
-	 * callback (or an error) will be pushed onto the Stream.
-	 *
-	 * @id wrapCallback
-	 * @section Utils
-	 * @name _.wrapCallback(f)
-	 * @param {Function} f - the node-style function to wrap
-	 * @api public
-	 */
-	wrapCallback(f: Function): Function;
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	// OPERATORS
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	
 	/**
 	 * Add two values. Can be partially applied.
 	 *
@@ -322,6 +347,19 @@ interface HighlandStatic {
 	add(a: number, b: number): number;
 	add(a: number): (b: number) => number;
 
+	/**
+	 * Perform logical negation on a value. If `x` is truthy then returns false,
+	 * otherwise returns true.
+	 *
+	 * @id not
+	 * @section Operators
+	 * @name _.not(x)
+	 * @param x - the value to negate
+	 * @api public
+	 *
+	 * _.not(true)   // => false
+	 * _.not(false)  // => true
+	 */
 	not<R>(a: any): boolean;
 }
 
@@ -367,6 +405,37 @@ declare namespace Highland {
 	 */
 	interface Stream<R> extends NodeJS.EventEmitter {
 
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		// STREAM OBJECTS
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+		/**
+		 * Destroys a stream by unlinking it from any consumers and sources. This will
+		 * stop all consumers from receiving events from this stream and removes this
+		 * stream as a consumer of any source stream.
+		 *
+		 * This function calls end() on the stream and unlinks it from any piped-to streams.
+		 *
+		 * @id pipe
+		 * @section Streams
+		 * @name Stream.destroy()
+		 * @api public
+		 */
+		destroy(): void;
+
+		/**
+		 * Ends a Stream. This is the same as sending a [nil](#nil) value as data.
+		 * You shouldn't need to call this directly, rather it will be called by
+		 * any [Node Readable Streams](http://nodejs.org/api/stream.html#stream_class_stream_readable)
+		 * you pipe in.
+		 *
+		 * @id end
+		 * @section Streams
+		 * @name Stream.end()
+		 * @api public
+		 */
+		end(): void;
+		
 		/**
 		 * Pauses the stream. All Highland Streams start in the paused state.
 		 *
@@ -388,90 +457,6 @@ declare namespace Highland {
 		 */
 		resume(): void;
 
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Ends a Stream. This is the same as sending a [nil](#nil) value as data.
-		 * You shouldn't need to call this directly, rather it will be called by
-		 * any [Node Readable Streams](http://nodejs.org/api/stream.html#stream_class_stream_readable)
-		 * you pipe in.
-		 *
-		 * @id end
-		 * @section Streams
-		 * @name Stream.end()
-		 * @api public
-		 */
-		end(): void;
-
-		/**
-		 * Pipes a Highland Stream to a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable)
-		 * (Highland Streams are also Node Writable Streams). This will pull all the
-		 * data from the source Highland Stream and write it to the destination,
-		 * automatically managing flow so that the destination is not overwhelmed
-		 * by a fast source.
-		 *
-		 * This function returns the destination so you can chain together pipe calls.
-		 *
-		 * @id pipe
-		 * @section Streams
-		 * @name Stream.pipe(dest)
-		 * @param {Writable Stream} dest - the destination to write all data to
-		 * @api public
-		 */
-		pipe<U>(dest: Stream<U>): Stream<U>;
-		pipe<U>(dest: NodeJS.ReadWriteStream): Stream<U>;
-		pipe(dest: NodeJS.WritableStream): void;
-
-		/**
-		 * Destroys a stream by unlinking it from any consumers and sources. This will
-		 * stop all consumers from receiving events from this stream and removes this
-		 * stream as a consumer of any source stream.
-		 *
-		 * This function calls end() on the stream and unlinks it from any piped-to streams.
-		 *
-		 * @id pipe
-		 * @section Streams
-		 * @name Stream.destroy()
-		 * @api public
-		 */
-		destroy(): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Consumes values from a Stream (once resumed) and returns a new Stream for
-		 * you to optionally push values onto using the provided push / next functions.
-		 *
-		 * This function forms the basis of many higher-level Stream operations.
-		 * It will not cause a paused stream to immediately resume, but behaves more
-		 * like a 'through' stream, handling values as they are read.
-		 *
-		 * @id consume
-		 * @section Streams
-		 * @name Stream.consume(f)
-		 * @param {Function} f - the function to handle errors and values
-		 * @api public
-		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error, value?: U) => void, next: () => void) => void): Stream<U>;
-
-		/**
-		 * Consumes a single item from the Stream. Unlike consume, this function will
-		 * not provide a new stream for you to push values onto, and it will unsubscribe
-		 * as soon as it has a single error, value or nil from the source.
-		 *
-		 * You probably won't need to use this directly, but it is used internally by
-		 * some functions in the Highland library.
-		 *
-		 * @id pull
-		 * @section Streams
-		 * @name Stream.pull(f)
-		 * @param {Function} f - the function to handle data
-		 * @api public
-		 */
-		pull(f: (err: Error, x: R) => void): void;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
 		/**
 		 * Writes a value to the Stream. If the Stream is paused it will go into the
 		 * Stream's incoming buffer, otherwise it will be immediately processed and
@@ -490,36 +475,145 @@ declare namespace Highland {
 		write(x: R): boolean;
 
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Forks a stream, allowing you to add additional consumers with shared
-		 * back-pressure. A stream forked to multiple consumers will only pull values
-		 * from it's source as fast as the slowest consumer can handle them.
-		 *
-		 * @id fork
-		 * @section Streams
-		 * @name Stream.fork()
-		 * @api public
-		 */
-		fork(): Stream<R>;
-
-		/**
-		 * Observes a stream, allowing you to handle values as they are emitted, without
-		 * adding back-pressure or causing data to be pulled from the source. This can
-		 * be useful when you are performing two related queries on a stream where one
-		 * would block the other. Just be aware that a slow observer could fill up it's
-		 * buffer and cause memory issues. Where possible, you should use [fork](#fork).
-		 *
-		 * @id observe
-		 * @section Streams
-		 * @name Stream.observe()
-		 * @api public
-		 */
-		observe(): Stream<R>;
-
+		// TRANSFORMS
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		
+		/**
+		 * Adds a value to the end of a Stream.
+		 *
+		 * @id append
+		 * @section Streams
+		 * @name Stream.append(y)
+		 * @param y - the value to append to the Stream
+		 * @api public
+		 */
+		append(y: R): Stream<R>;
 
 		/**
+		 * Takes one Stream and batches incoming data into arrays of given length
+		 *
+		 * @id batch
+		 * @section Transforms
+		 * @name Stream.batch(n)
+		 * @param {Number} n - length of the array to batch
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4, 5]).batch(2)  // => [1, 2], [3, 4], [5]
+		 */
+		batch(n: number): Stream<R[]>;
+		
+		/**
+		 * Takes one Stream and batches incoming data within a maximum time frame
+		 * into arrays of a maximum length.
+		 *
+		 * @id batchWithTimeOrCount
+		 * @section Transforms
+		 * @name Stream.batchWithTimeOrCount(ms, n)
+		 * @param {Number} ms - the maximum milliseconds to buffer a batch
+		 * @param {Number} n - the maximum length of the array to batch
+		 * @api public
+		 *
+		 * _(function (push) {
+		 *     push(1);
+		 *     push(2);
+		 *     push(3);
+		 *     setTimeout(push, 20, 4);
+		 * }).batchWithTimeOrCount(10, 2)
+		 *
+		 * // => [1, 2], [3], [4]
+		 */
+		batchWithTimeOrCount(ms: number, n: number): Stream<R[]>;
+
+		/**
+		 * Groups all values into an Array and passes down the stream as a single
+		 * data event. This is a bit like doing [toArray](#toArray), but instead
+		 * of accepting a callback and causing a *thunk*, it passes the value on.
+		 *
+		 * @id collect
+		 * @section Streams
+		 * @name Stream.collect()
+		 * @api public
+		 */
+		collect(): Stream<R[]>;
+
+		/**
+		 * Filters a Stream to drop all non-truthy values.
+		 *
+		 * @id compact
+		 * @section Streams
+		 * @name Stream.compact()
+		 * @api public
+		 */
+		compact(): Stream<R>;
+
+		/**
+		 * Consumes values from a Stream (once resumed) and returns a new Stream for
+		 * you to optionally push values onto using the provided push / next functions.
+		 *
+		 * This function forms the basis of many higher-level Stream operations.
+		 * It will not cause a paused stream to immediately resume, but behaves more
+		 * like a 'through' stream, handling values as they are read.
+		 *
+		 * @id consume
+		 * @section Streams
+		 * @name Stream.consume(f)
+		 * @param {Function} f - the function to handle errors and values
+		 * @api public
+		 */
+		consume<U>(f: (err: Error, x: R, push: (err: Error, value?: U) => void, next: () => void) => void): Stream<U>;
+
+		/**
+		 * Holds off pushing data events downstream until there has been no more
+		 * data for `ms` milliseconds. Sends the last value that occurred before
+		 * the delay, discarding all other values.
+		 *
+		 * @id debounce
+		 * @section Streams
+		 * @name Stream.debounce(ms)
+		 * @param {Number} ms - the milliseconds to wait before sending data
+		 * @api public
+		 */
+		debounce(ms: number): Stream<R>;
+
+		/**
+		 * Creates a new Stream which applies a function to each value from the source
+		 * and re-emits the source value. Useful when you want to mutate the value or
+		 * perform side effects
+		 *
+		 * @id doto
+		 * @section Transforms
+		 * @name Stream.doto(f)
+		 * @param {Function} f - the function to apply
+		 * @api public
+		 *
+		 * var appended = _([[1], [2], [3], [4]]).doto(function (x) {
+		 *     x.push(1);
+		 * });
+		 *
+		 * _([1, 2, 3]).doto(console.log)
+		 * // 1
+		 * // 2
+		 * // 3
+		 * // => 1, 2, 3
+		 */
+		doto(f: (x: R) => void): Stream<R>;
+
+		/**
+		 * Acts as the inverse of [`take(n)`](#take) - instead of returning the first `n` values, it ignores the
+		 * first `n` values and then emits the rest. `n` must be of type `Number`, if not the whole stream will
+		 * be returned. All errors (even ones emitted before the nth value) will be emitted.
+		 *
+		 * @id drop
+		 * @section Transforms
+		 * @name Stream.drop(n)
+		 * @param {Number} n - integer representing number of values to read from source
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4]).drop(2) // => 3, 4
+		 */
+		 drop(n: number): Stream<R>;
+
+		 /**
 		 * Extracts errors from a Stream and applies them to an error handler
 		 * function. Returns a new Stream with the errors removed (unless the error
 		 * handler chooses to rethrow them using `push`). Errors can also be
@@ -534,62 +628,116 @@ declare namespace Highland {
 		errors(f: (err: Error, push: (err: Error, x?: R) => void) => void): Stream<R>;
 
 		/**
-		 * Like the [errors](#errors) method, but emits a Stream end marker after
-		 * an Error is encountered.
+		 * Creates a new Stream including only the values which pass a truth test.
 		 *
-		 * @id stopOnError
+		 * @id filter
 		 * @section Streams
-		 * @name Stream.stopOnError(f)
-		 * @param {Function} f - the function to handle an error
+		 * @name Stream.filter(f)
+		 * @param f - the truth test function
 		 * @api public
 		 */
-		stopOnError(f: (err: Error) => void): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		filter(f: (x: R) => boolean): Stream<R>;
 
 		/**
-		 * Iterates over every value from the Stream, calling the iterator function
-		 * on each of them. This function causes a **thunk**.
+		 * A convenient form of filter, which returns the first object from a
+		 * Stream that passes the provided truth test
 		 *
-		 * If an error from the Stream reaches the `each` call, it will emit an
-		 * error event (which will cause it to throw if unhandled).
-		 *
-		 * @id each
+		 * @id find
 		 * @section Streams
-		 * @name Stream.each(f)
-		 * @param {Function} f - the iterator function
+		 * @name Stream.find(f)
+		 * @param {Function} f - the truth test function which returns a Stream
 		 * @api public
 		 */
-		each(f: (x: R) => void): void;
+		find(f: (x: R) => boolean): Stream<R>;
+
+		 /**
+		 * A convenient form of [where](#where), which returns the first object from a
+		 * Stream that matches a set of property values. findWhere is to [where](#where) as [find](#find) is to [filter](#filter).
+		 *
+		 * @id findWhere
+		 * @section Transforms
+		 * @name Stream.findWhere(props)
+		 * @param {Object} props - the properties to match against
+		 * @api public
+		 *
+		 * var docs = [
+		 *     {type: 'blogpost', title: 'foo'},
+		 *     {type: 'blogpost', title: 'bar'},
+		 *     {type: 'comment', title: 'foo'}
+		 * ];
+		 *
+		 * _(docs).findWhere({type: 'blogpost'})
+		 * // => {type: 'blogpost', title: 'foo'}
+		 *
+		 * // example with partial application
+		 * var firstBlogpost = _.findWhere({type: 'blogpost'});
+		 *
+		 * firstBlogpost(docs)
+		 * // => {type: 'blogpost', title: 'foo'}
+		 */
+		findWhere(props: Object): Stream<R>;
 
 		/**
-		 * Applies results from a Stream as arguments to a function
+		 * A convenient form of reduce, which groups items based on a function or property name
 		 *
-		 * @id apply
+		 * @id group
 		 * @section Streams
-		 * @name Stream.apply(f)
-		 * @param {Function} f - the function to apply arguments to
+		 * @name Stream.group(f)
+		 * @param {Function|String} f - the function or property name on which to group,
+		 *                              toString() is called on the result of a function.
 		 * @api public
 		 */
-		// TODO what to do here?
-		apply(f: Function): void;
+		// TODO verify this
+		group(f: (x: R) => string): Stream<{[prop:string]:R[]}>;
+		group(prop: string): Stream<{[prop:string]:R[]}>;
 
 		/**
-		 * Collects all values from a Stream into an Array and calls a function with
-		 * once with the result. This function causes a **thunk**.
+		 * Creates a new Stream with only the first value from the source.
 		 *
-		 * If an error from the Stream reaches the `toArray` call, it will emit an
-		 * error event (which will cause it to throw if unhandled).
-		 *
-		 * @id toArray
+		 * @id head
 		 * @section Streams
-		 * @name Stream.toArray(f)
-		 * @param {Function} f - the callback to provide the completed Array to
+		 * @name Stream.head()
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4]).head() // => 1
+		 */
+		head(): Stream<R>;
+
+		/**
+		 * Calls a named method on each object from the Stream - returning
+		 * a new stream with the result of those calls.
+		 *
+		 * @id invoke
+		 * @section Streams
+		 * @name Stream.invoke(method, args)
+		 * @param {String} method - the method name to call
+		 * @param {Array} args - the arguments to call the method with
 		 * @api public
 		 */
-		toArray(f: (arr: R[]) => void): void;
+		invoke<U>(method: string, args: any[]): Stream<U>;
 
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		/**
+		 * Drops all values from the Stream apart from the last one (if any).
+		 *
+		 * @id last
+		 * @section Streams
+		 * @name Stream.last()
+		 * @api public
+		 */
+		last(): Stream<R>;
+
+		/**
+		 * Creates a new Stream, which when read from, only returns the last
+		 * seen value from the source. The source stream does not experience
+		 * back-pressure. Useful if you're using a Stream to model a changing
+		 * property which you need to query periodically.
+		 *
+		 * @id latest
+		 * @section Streams
+		 * @name Stream.latest()
+		 * @api public
+		 */
+		latest(): Stream<R>;
 
 		/**
 		 * Creates a new Stream of transformed values by applying a function to each
@@ -605,22 +753,6 @@ declare namespace Highland {
 		 */
 		map<U>(f: (x: R) => U): Stream<U>;
 
-		/**
-		 * Creates a new Stream of values by applying each item in a Stream to an
-		 * iterator function which may return a Stream. Each item on these result
-		 * Streams are then emitted on a single output Stream.
-		 *
-		 * The same as calling `stream.map(f).flatten()`.
-		 *
-		 * @id flatMap
-		 * @section Streams
-		 * @name Stream.flatMap(f)
-		 * @param {Function} f - the iterator function
-		 * @api public
-		 */
-		flatMap<U>(f: (x: R) => Stream<U>): Stream<U>;
-		flatMap<U>(f: (x: R) => U): Stream<U>;
-
 		/**
 		 * Retrieves values associated with a given property from all elements in
 		 * the collection.
@@ -633,219 +765,6 @@ declare namespace Highland {
 		 */
 		pluck<U>(prop: string): Stream<U>;
 
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Creates a new Stream including only the values which pass a truth test.
-		 *
-		 * @id filter
-		 * @section Streams
-		 * @name Stream.filter(f)
-		 * @param f - the truth test function
-		 * @api public
-		 */
-		filter(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * Filters using a predicate which returns a Stream. If you need to check
-		 * against an asynchronous data source when filtering a Stream, this can
-		 * be convenient. The Stream returned from the filter function should have
-		 * a Boolean as it's first value (all other values on the Stream will be
-		 * disregarded).
-		 *
-		 * @id flatFilter
-		 * @section Streams
-		 * @name Stream.flatFilter(f)
-		 * @param {Function} f - the truth test function which returns a Stream
-		 * @api public
-		 */
-		flatFilter(f: (x: R) => Stream<boolean>): Stream<R>;
-
-		/**
-		 * The inverse of [filter](#filter).
-		 *
-		 * @id reject
-		 * @section Streams
-		 * @name Stream.reject(f)
-		 * @param {Function} f - the truth test function
-		 * @api public
-		 *
-		 * var odds = _([1, 2, 3, 4]).reject(function (x) {
-		 *     return x % 2 === 0;
-		 * });
-		 */
-		reject(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * A convenient form of filter, which returns the first object from a
-		 * Stream that passes the provided truth test
-		 *
-		 * @id find
-		 * @section Streams
-		 * @name Stream.find(f)
-		 * @param {Function} f - the truth test function which returns a Stream
-		 * @api public
-		 */
-		find(f: (x: R) => boolean): Stream<R>;
-
-		/**
-		 * A convenient form of reduce, which groups items based on a function or property name
-		 *
-		 * @id group
-		 * @section Streams
-		 * @name Stream.group(f)
-		 * @param {Function|String} f - the function or property name on which to group,
-		 *                              toString() is called on the result of a function.
-		 * @api public
-		 */
-		// TODO verify this
-		group(f: (x: R) => string): Stream<{[prop:string]:R[]}>;
-		group(prop: string): Stream<{[prop:string]:R[]}>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		/**
-		 * Filters a Stream to drop all non-truthy values.
-		 *
-		 * @id compact
-		 * @section Streams
-		 * @name Stream.compact()
-		 * @api public
-		 */
-		compact(): Stream<R>;
-
-		/**
-		 * A convenient form of filter, which returns all objects from a Stream
-		 * match a set of property values.
-		 *
-		 * @id where
-		 * @section Streams
-		 * @name Stream.where(props)
-		 * @param {Object} props - the properties to match against
-		 * @api public
-		 */
-		where(props: Object): Stream<R>;
-
-		/**
-		 * Takes two Streams and returns a Stream of corresponding pairs.
-		 *
-		 * @id zip
-		 * @section Streams
-		 * @name Stream.zip(ys)
-		 * @param {Array | Stream} ys - the other stream to combine values with
-		 * @api public
-		 */
-		zip(ys: R[]): Stream<R>;
-		zip(ys: Stream<R>): Stream<R>;
-
-		/**
-		 * Creates a new Stream with the first `n` values from the source.
-		 *
-		 * @id take
-		 * @section Streams
-		 * @name Stream.take(n)
-		 * @param {Number} n - integer representing number of values to read from source
-		 * @api public
-		 */
-		take(n: number): Stream<R>;
-
-		/**
-		 * Creates a new Stream with only the first value from the source.
-		 *
-		 * @id head
-		 * @section Streams
-		 * @name Stream.head()
-		 * @api public
-		 *
-		 * _([1, 2, 3, 4]).head() // => 1
-		 */
-		head(): Stream<R>;
-
-		/**
-		 * Drops all values from the Stream apart from the last one (if any).
-		 *
-		 * @id last
-		 * @section Streams
-		 * @name Stream.last()
-		 * @api public
-		 */
-		last(): Stream<R>;
-
-		/**
-		 * Reads values from a Stream of Streams, emitting them on a Single output
-		 * Stream. This can be thought of as a flatten, just one level deep. Often
-		 * used for resolving asynchronous actions such as a HTTP request or reading
-		 * a file.
-		 *
-		 * @id sequence
-		 * @section Streams
-		 * @name Stream.sequence()
-		 * @api public
-		 */
-		//TODO figure out typing
-		sequence<U>(): Stream<U>;
-
-		/**
-		 * An alias for the [sequence](#sequence) method.
-		 *
-		 * @id series
-		 * @section Streams
-		 * @name Stream.series()
-		 * @api public
-		 */
-		// TODO figure out typing
-		series<U>(): Stream<U>;
-
-		/**
-		 * Recursively reads values from a Stream which may contain nested Streams
-		 * or Arrays. As values or errors are encountered, they are emitted on a
-		 * single output Stream.
-		 *
-		 * @id flatten
-		 * @section Streams
-		 * @name Stream.flatten()
-		 * @api public
-		 */
-		flatten<U>(): Stream<U>;
-		flatten(): Stream<R>;
-
-		/**
-		 * Takes a Stream of Streams and reads from them in parallel, buffering
-		 * the results until they can be returned to the consumer in their original
-		 * order.
-		 *
-		 * @id parallel
-		 * @section Streams
-		 * @name Stream.parallel(n)
-		 * @param {Number} n - the maximum number of concurrent reads/buffers
-		 * @api public
-		 */
-		parallel(n: number): Stream<R>;
-
-		/**
-		 * Switches source to an alternate Stream if the current Stream is empty.
-		 *
-		 * @id otherwise
-		 * @section Streams
-		 * @name Stream.otherwise(ys)
-		 * @param {Stream} ys - alternate stream to use if this stream is empty
-		 * @api public
-		 */
-		otherwise(ys: Stream<R>): Stream<R>;
-
-		/**
-		 * Adds a value to the end of a Stream.
-		 *
-		 * @id append
-		 * @section Streams
-		 * @name Stream.append(y)
-		 * @param y - the value to append to the Stream
-		 * @api public
-		 */
-		append(y: R): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
 		/**
 		 * Boils down a Stream to a single value. The memo is the initial state
 		 * of the reduction, and each successive step of it should be returned by
@@ -875,16 +794,19 @@ declare namespace Highland {
 		reduce1<U>(memo: U, f: (memo: U, x: R) => U): Stream<U>;
 
 		/**
-		 * Groups all values into an Array and passes down the stream as a single
-		 * data event. This is a bit like doing [toArray](#toArray), but instead
-		 * of accepting a callback and causing a *thunk*, it passes the value on.
+		 * The inverse of [filter](#filter).
 		 *
-		 * @id collect
+		 * @id reject
 		 * @section Streams
-		 * @name Stream.collect()
+		 * @name Stream.reject(f)
+		 * @param {Function} f - the truth test function
 		 * @api public
+		 *
+		 * var odds = _([1, 2, 3, 4]).reject(function (x) {
+		 *     return x % 2 === 0;
+		 * });
 		 */
-		collect(): Stream<R[]>;
+		reject(f: (x: R) => boolean): Stream<R>;
 
 		/**
 		 * Like [reduce](#reduce), but emits each intermediate value of the
@@ -913,6 +835,68 @@ declare namespace Highland {
 		 */
 		scan1<U>(memo: U, x: (memo: U, x: R) => U): Stream<U>;
 
+		/**
+		 * Like the [errors](#errors) method, but emits a Stream end marker after
+		 * an Error is encountered.
+		 *
+		 * @id stopOnError
+		 * @section Streams
+		 * @name Stream.stopOnError(f)
+		 * @param {Function} f - the function to handle an error
+		 * @api public
+		 */
+		stopOnError(f: (err: Error) => void): Stream<R>;
+
+		/**
+		 * Creates a new Stream with the first `n` values from the source.
+		 *
+		 * @id take
+		 * @section Streams
+		 * @name Stream.take(n)
+		 * @param {Number} n - integer representing number of values to read from source
+		 * @api public
+		 */
+		take(n: number): Stream<R>;
+
+		/**
+		 * An alias for the [doto](#doto) method.
+		 *
+		 * @id tap
+		 * @section Transforms
+		 * @name Stream.tap(f)
+		 * @param {Function} f - the function to apply
+		 * @api public
+		 *
+		 * _([1, 2, 3]).tap(console.log)
+		 */
+		tap(f: (x: R) => void): Stream<R>;
+
+		/**
+		 * Ensures that only one data event is push downstream (or into the buffer)
+		 * every `ms` milliseconds, any other values are dropped.
+		 *
+		 * @id throttle
+		 * @section Streams
+		 * @name Stream.throttle(ms)
+		 * @param {Number} ms - the minimum milliseconds between each value
+		 * @api public
+		 */
+		throttle(ms: number): Stream<R>;
+
+		/**
+		 * A convenient form of filter, which returns all objects from a Stream
+		 * match a set of property values.
+		 *
+		 * @id where
+		 * @section Streams
+		 * @name Stream.where(props)
+		 * @param {Object} props - the properties to match against
+		 * @api public
+		 */
+		where(props: Object): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		// HIGHER-ORDER STREAMS
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 		/**
@@ -931,6 +915,62 @@ declare namespace Highland {
 		concat(ys: Stream<R>): Stream<R>;
 		concat(ys: R[]): Stream<R>;
 
+		/**
+		 * Filters using a predicate which returns a Stream. If you need to check
+		 * against an asynchronous data source when filtering a Stream, this can
+		 * be convenient. The Stream returned from the filter function should have
+		 * a Boolean as it's first value (all other values on the Stream will be
+		 * disregarded).
+		 *
+		 * @id flatFilter
+		 * @section Streams
+		 * @name Stream.flatFilter(f)
+		 * @param {Function} f - the truth test function which returns a Stream
+		 * @api public
+		 */
+		flatFilter(f: (x: R) => Stream<boolean>): Stream<R>;
+
+		/**
+		 * Creates a new Stream of values by applying each item in a Stream to an
+		 * iterator function which may return a Stream. Each item on these result
+		 * Streams are then emitted on a single output Stream.
+		 *
+		 * The same as calling `stream.map(f).flatten()`.
+		 *
+		 * @id flatMap
+		 * @section Streams
+		 * @name Stream.flatMap(f)
+		 * @param {Function} f - the iterator function
+		 * @api public
+		 */
+		flatMap<U>(f: (x: R) => Stream<U>): Stream<U>;
+		flatMap<U>(f: (x: R) => U): Stream<U>;
+
+		/**
+		 * Recursively reads values from a Stream which may contain nested Streams
+		 * or Arrays. As values or errors are encountered, they are emitted on a
+		 * single output Stream.
+		 *
+		 * @id flatten
+		 * @section Streams
+		 * @name Stream.flatten()
+		 * @api public
+		 */
+		flatten<U>(): Stream<U>;
+		flatten(): Stream<R>;
+
+		/**
+		 * Forks a stream, allowing you to add additional consumers with shared
+		 * back-pressure. A stream forked to multiple consumers will only pull values
+		 * from it's source as fast as the slowest consumer can handle them.
+		 *
+		 * @id fork
+		 * @section Streams
+		 * @name Stream.fork()
+		 * @api public
+		 */
+		fork(): Stream<R>;
+
 		/**
 		 * Takes a Stream of Streams and merges their values and errors into a
 		 * single new Stream. The merged stream ends when all source streams have
@@ -954,61 +994,220 @@ declare namespace Highland {
 		 */
 		merge (ys: Stream<Stream<R>>): Stream<R>;
 
+		/**
+		 * Observes a stream, allowing you to handle values as they are emitted, without
+		 * adding back-pressure or causing data to be pulled from the source. This can
+		 * be useful when you are performing two related queries on a stream where one
+		 * would block the other. Just be aware that a slow observer could fill up it's
+		 * buffer and cause memory issues. Where possible, you should use [fork](#fork).
+		 *
+		 * @id observe
+		 * @section Streams
+		 * @name Stream.observe()
+		 * @api public
+		 */
+		observe(): Stream<R>;
+
+		/**
+		 * Switches source to an alternate Stream if the current Stream is empty.
+		 *
+		 * @id otherwise
+		 * @section Streams
+		 * @name Stream.otherwise(ys)
+		 * @param {Stream} ys - alternate stream to use if this stream is empty
+		 * @api public
+		 */
+		otherwise(ys: Stream<R>): Stream<R>;
+
+		/**
+		 * Takes a Stream of Streams and reads from them in parallel, buffering
+		 * the results until they can be returned to the consumer in their original
+		 * order.
+		 *
+		 * @id parallel
+		 * @section Streams
+		 * @name Stream.parallel(n)
+		 * @param {Number} n - the maximum number of concurrent reads/buffers
+		 * @api public
+		 */
+		parallel(n: number): Stream<R>;
+
+		/**
+		 * Reads values from a Stream of Streams, emitting them on a Single output
+		 * Stream. This can be thought of as a flatten, just one level deep. Often
+		 * used for resolving asynchronous actions such as a HTTP request or reading
+		 * a file.
+		 *
+		 * @id sequence
+		 * @section Streams
+		 * @name Stream.sequence()
+		 * @api public
+		 */
+		//TODO figure out typing
+		sequence<U>(): Stream<U>;
+
+		/**
+		 * An alias for the [sequence](#sequence) method.
+		 *
+		 * @id series
+		 * @section Streams
+		 * @name Stream.series()
+		 * @api public
+		 */
+		// TODO figure out typing
+		series<U>(): Stream<U>;
+
+		/**
+		 * Takes two Streams and returns a Stream of corresponding pairs.
+		 *
+		 * @id zip
+		 * @section Streams
+		 * @name Stream.zip(ys)
+		 * @param {Array | Stream} ys - the other stream to combine values with
+		 * @api public
+		 */
+		zip(ys: R[]): Stream<R>;
+		zip(ys: Stream<R>): Stream<R>;
+
+		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		// CONSUMPTION
 		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 		/**
-		 * Calls a named method on each object from the Stream - returning
-		 * a new stream with the result of those calls.
+		 * Applies results from a Stream as arguments to a function
 		 *
-		 * @id invoke
+		 * @id apply
 		 * @section Streams
-		 * @name Stream.invoke(method, args)
-		 * @param {String} method - the method name to call
-		 * @param {Array} args - the arguments to call the method with
+		 * @name Stream.apply(f)
+		 * @param {Function} f - the function to apply arguments to
 		 * @api public
 		 */
-		invoke<U>(method: string, args: any[]): Stream<U>;
+		// TODO what to do here?
+		apply(f: Function): void;
 
 		/**
-		 * Ensures that only one data event is push downstream (or into the buffer)
-		 * every `ms` milliseconds, any other values are dropped.
+		 * Calls a function once the Stream has ended. This method consumes the stream.
+		 * If the Stream has already ended, the function is called immediately.
 		 *
-		 * @id throttle
-		 * @section Streams
-		 * @name Stream.throttle(ms)
-		 * @param {Number} ms - the minimum milliseconds between each value
+		 * If an error from the Stream reaches this call, it will emit an `error` event
+		 * (i.e., it will call `emit('error')` on the stream being consumed).  This
+		 * event will cause an error to be thrown if unhandled.
+		 *
+		 * As a special case, it is possible to chain `done` after a call to
+		 * [each](#each) even though both methods consume the stream.
+		 *
+		 * @id done
+		 * @section Consumption
+		 * @name Stream.done(f)
+		 * @param {Function} f - the callback
 		 * @api public
+		 *
+		 * var total = 0;
+		 * _([1, 2, 3, 4]).each(function (x) {
+		 *     total += x;
+		 * }).done(function () {
+		 *     // total will be 10
+		 * });
 		 */
-		throttle(ms: number): Stream<R>;
+		done(f: () => void): void;
 
 		/**
-		 * Holds off pushing data events downstream until there has been no more
-		 * data for `ms` milliseconds. Sends the last value that occurred before
-		 * the delay, discarding all other values.
+		 * Iterates over every value from the Stream, calling the iterator function
+		 * on each of them. This function causes a **thunk**.
 		 *
-		 * @id debounce
+		 * If an error from the Stream reaches the `each` call, it will emit an
+		 * error event (which will cause it to throw if unhandled).
+		 *
+		 * @id each
 		 * @section Streams
-		 * @name Stream.debounce(ms)
-		 * @param {Number} ms - the milliseconds to wait before sending data
+		 * @name Stream.each(f)
+		 * @param {Function} f - the iterator function
 		 * @api public
 		 */
-		debounce(ms: number): Stream<R>;
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+		each(f: (x: R) => void): void;
 
 		/**
-		 * Creates a new Stream, which when read from, only returns the last
-		 * seen value from the source. The source stream does not experience
-		 * back-pressure. Useful if you're using a Stream to model a changing
-		 * property which you need to query periodically.
+		 * Pipes a Highland Stream to a [Node Writable Stream](http://nodejs.org/api/stream.html#stream_class_stream_writable)
+		 * (Highland Streams are also Node Writable Streams). This will pull all the
+		 * data from the source Highland Stream and write it to the destination,
+		 * automatically managing flow so that the destination is not overwhelmed
+		 * by a fast source.
 		 *
-		 * @id latest
+		 * This function returns the destination so you can chain together pipe calls.
+		 *
+		 * @id pipe
 		 * @section Streams
-		 * @name Stream.latest()
+		 * @name Stream.pipe(dest)
+		 * @param {Writable Stream} dest - the destination to write all data to
 		 * @api public
 		 */
-		latest(): Stream<R>;
+		pipe<U>(dest: Stream<U>): Stream<U>;
+		pipe<U>(dest: NodeJS.ReadWriteStream): Stream<U>;
+		pipe(dest: NodeJS.WritableStream): void;
+
+		/**
+		 * Consumes a single item from the Stream. Unlike consume, this function will
+		 * not provide a new stream for you to push values onto, and it will unsubscribe
+		 * as soon as it has a single error, value or nil from the source.
+		 *
+		 * You probably won't need to use this directly, but it is used internally by
+		 * some functions in the Highland library.
+		 *
+		 * @id pull
+		 * @section Streams
+		 * @name Stream.pull(f)
+		 * @param {Function} f - the function to handle data
+		 * @api public
+		 */
+		pull(f: (err: Error, x: R) => void): void;
+		
+		/**
+		 * Collects all values from a Stream into an Array and calls a function with
+		 * once with the result. This function causes a **thunk**.
+		 *
+		 * If an error from the Stream reaches the `toArray` call, it will emit an
+		 * error event (which will cause it to throw if unhandled).
+		 *
+		 * @id toArray
+		 * @section Streams
+		 * @name Stream.toArray(f)
+		 * @param {Function} f - the callback to provide the completed Array to
+		 * @api public
+		 */
+		toArray(f: (arr: R[]) => void): void;
+
+		/**
+		 * Returns the result of a stream to a nodejs-style callback function.
+		 *
+		 * If the stream contains a single value, it will call `cb`
+		 * with the single item emitted by the stream (if present).
+		 * If the stream is empty, `cb` will be called without any arguments.
+		 * If an error is encountered in the stream, this function will stop
+		 * consumption and call `cb` with the error.
+		 * If the stream contains more than one item, it will stop consumption
+		 * and call `cb` with an error.
+		 *
+		 * @id toCallback
+		 * @section Consumption
+		 * @name Stream.toCallback(cb)
+		 * @param {Function} cb - the callback to provide the error/result to
+		 * @api public
+		 *
+		 * _([1, 2, 3, 4]).collect().toCallback(function (err, result) {
+		 *     // parameter result will be [1,2,3,4]
+		 *     // parameter err will be null
+		 * });
+		 */
+		toCallback(cb: (err?: Error, x?: R) => void): void;
 	}
+
+	interface PipeableStream<T, R> extends Stream<R> {}
+
+	interface PipeOptions {
+		end: boolean
+	}
+
+	type MappingHint = number | string[] | Function;
 }
 
 declare var highland:HighlandStatic;
diff --git a/types/history/LocationUtils.d.ts b/types/history/LocationUtils.d.ts
index d78332e57c..26c98e374c 100644
--- a/types/history/LocationUtils.d.ts
+++ b/types/history/LocationUtils.d.ts
@@ -1,5 +1,4 @@
 import { Path, LocationState, LocationKey, Location, LocationDescriptor } from './index';
 
 export function locationsAreEqual(lv: LocationDescriptor, rv: LocationDescriptor): boolean;
-export function createLocation(options: LocationDescriptor): Location;
-export function createLocation(path: Path, state?: LocationState, key?: LocationKey, currentLocation?: Location): Location;
+export function createLocation(path: LocationDescriptor, state?: LocationState, key?: LocationKey, currentLocation?: Location): Location;
diff --git a/types/history/PathUtils.d.ts b/types/history/PathUtils.d.ts
index 4cc947fcf3..80e5c2db54 100644
--- a/types/history/PathUtils.d.ts
+++ b/types/history/PathUtils.d.ts
@@ -2,6 +2,8 @@ import { Path, Location, LocationDescriptorObject } from './index';
 
 export function addLeadingSlash(path: Path): Path;
 export function stripLeadingSlash(path: Path): Path;
-export function stripPrefix(path: Path, prefix: string): Path;
+export function hasBasename(path: Path): boolean;
+export function stripBasename(path: Path, prefix: string): Path;
+export function stripTrailingSlash(path: Path): Path;
 export function parsePath(path: Path): Location;
 export function createPath(location: LocationDescriptorObject): Path;
diff --git a/types/history/history-tests.ts b/types/history/history-tests.ts
index 4cb788f806..0a63059b12 100644
--- a/types/history/history-tests.ts
+++ b/types/history/history-tests.ts
@@ -101,9 +101,15 @@ let input = { value: "" };
     LocationUtils.locationsAreEqual(location1, location2);
 }
 
+{
+    let location1 = LocationUtils.createLocation({ pathname: 'path/1' }, { state: 1 });
+    let location2 = LocationUtils.createLocation({ pathname: 'pathname', state: 2 });
+    LocationUtils.locationsAreEqual(location1, location2);
+}
+
 {
     let path = PathUtils.createPath({ pathname: '/a/path', hash: '#hash' });
-    let strippedPath = PathUtils.stripPrefix(path, '/a/');
+    let strippedPath = PathUtils.stripBasename(path, '/a/');
     let location = PathUtils.parsePath(strippedPath);
 }
 
diff --git a/types/history/index.d.ts b/types/history/index.d.ts
index eda8c1bb10..a7f93bba86 100644
--- a/types/history/index.d.ts
+++ b/types/history/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for history 4.5
+// Type definitions for history 4.6.2
 // Project: https://github.com/mjackson/history
 // Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Nathan Brown <https://github.com/ngbrown>, Young Rok Kim <https://github.com/rokoroku>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/hls.js/hls.js-tests.ts b/types/hls.js/hls.js-tests.ts
index be71857652..a8f7291044 100644
--- a/types/hls.js/hls.js-tests.ts
+++ b/types/hls.js/hls.js-tests.ts
@@ -1,8 +1,9 @@
 import * as Hls from 'hls.js';
 
-if (Hls.isSupported) {
+if (Hls.isSupported()) {
   const video = <HTMLVideoElement> document.getElementById('video');
   const hls = new Hls();
+  const version: string = Hls.version;
   hls.loadSource('http://www.streambox.fr/playlists/test_001/stream.m3u8');
   hls.attachMedia(video);
   hls.on(Hls.Events.MANIFEST_PARSED, () => {
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index c0607a2307..1911413c4f 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -29,6 +29,41 @@ declare namespace Hls {
      * data: { }
      */
     const MEDIA_DETACHED: string;
+    /**
+     * fired when the buffer is going to be reset
+     * data: { }
+     */
+    const BUFFER_RESET: string;
+    /**
+     * fired when we know about the codecs that we need buffers for to push into
+     * data: { tracks : { container, codec, levelCodec, initSegment, metadata } }
+     */
+    const BUFFER_CODECS: string;
+    /**
+     * fired when we append a segment to the buffer
+     * data: { segment: segment object }
+     */
+    const BUFFER_APPENDING: string;
+    /**
+     * fired when we are done with appending a media segment to the buffer
+     * data: { parent : segment parent that triggered BUFFER_APPENDING, pending : nb of segments waiting for appending for this segment parent }
+     */
+    const BUFFER_APPENDED: string;
+    /**
+     * fired when the stream is finished and we want to notify the media buffer that there will be no more data
+     * data: { }
+     */
+    const BUFFER_EOS: string;
+    /**
+     * fired when the media buffer should be flushed
+     * data: { }
+     */
+    const BUFFER_FLUSHING: string;
+    /**
+     * fired when the media buffer has been flushed
+     * data: { }
+     */
+    const BUFFER_FLUSHED: string;
     /**
      * fired to signal that a manifest loading starts
      * data: { url : manifestURL }
@@ -74,6 +109,61 @@ declare namespace Hls {
      * data: { level: level object }
      */
     const LEVEL_SWITCHED: string;
+    /**
+     * fired to notify that audio track lists has been updated
+     * data: { audioTracks : audioTracks }
+     */
+    const AUDIO_TRACKS_UPDATED: string;
+    /**
+     * fired when an audio track switch occurs. deprecated in favor AUDIO_TRACK_SWITCHING
+     * data: { id : audio track id }
+     */
+    const AUDIO_TRACK_SWTICH: string;
+    /**
+     * fired when an audio track switching is requested
+     * data: { id : audio track id }
+     */
+    const AUDIO_TRACK_SWITCHING: string;
+    /**
+     * fired when an audio track switch actually occurs
+     * data: { id : audio track id }
+     */
+    const AUDIO_TRACK_SWITCHED: string;
+    /**
+     * fired when an audio track loading starts
+     * data: { url : audio track URL, id : audio track id }
+     */
+    const AUDIO_TRACK_LOADING: string;
+    /**
+     * fired when an audio track loading finishes
+     * data: { details : levelDetails object, id : audio track id, stats : { trequest, tfirst, tload, mtime } }
+     */
+    const AUDIO_TRACK_LOADED: string;
+    /**
+     * fired to notify that subtitle track lists has been updated
+     * data: { subtitleTracks : subtitleTracks }
+     */
+    const SUBTITLE_TRACKS_UPDATED: string;
+    /**
+     * fired when an subtitle track switch occurs
+     * data: { id : subtitle track id }
+     */
+    const SUBTITLE_TRACK_SWITCH: string;
+    /**
+     * fired when a subtitle track loading starts
+     * data: { url : subtitle track URL, id : subtitle track id }
+     */
+    const SUBTITLE_TRACK_LOADING: string;
+    /**
+     * fired when a subtitle track loading finishes
+     * data: { details : levelDetails object, id : subtitle track id, stats : { trequest, tfirst, tload, mtime } }
+     */
+    const SUBTITLE_TRACK_LOADED: string;
+    /**
+     * fired when a subtitle fragment has been processed
+     * data: { success : boolean, frag : the processed frag }
+     */
+    const SUBTITLE_FRAG_PROCESSED: string;
     /**
      * fired when a decryption key loading starts
      * data: { frag: fragment object }
@@ -288,11 +378,11 @@ declare namespace Hls {
   /**
    * checks whether your browser is supporting MediaSource Extensions
    */
-  const isSupported: boolean;
+  function isSupported(): boolean;
   /**
    * returns hls.js dist version number
    */
-  const version: number;
+  const version: string;
 
   interface Config {
     /**
@@ -334,7 +424,7 @@ declare namespace Hls {
      * (default: 1)
      * number of segments needed to start a playback of Live stream.
      */
-    initialLiveManifestSize: number;
+    initialLiveManifestSize?: number;
     /**
      * (default: 30 seconds)
      * Maximum buffer length in seconds. If buffer length is/become less than this value, a new fragment will be loaded.
@@ -383,25 +473,25 @@ declare namespace Hls {
      * media element is expected to play and if currentTime has not moved for more than lowBufferWatchdogPeriod and if there are less than maxBufferHole seconds buffered upfront,
      * hls.js will try to nudge playhead to recover playback
      */
-    lowBufferWatchdogPeriod: number;
+    lowBufferWatchdogPeriod?: number;
     /**
      * (default: 3s)
      * if media element is expected to play and if currentTime has not moved for more than highBufferWatchdogPeriod and if there are more than maxBufferHole seconds buffered upfront,
      * hls.js will try to nudge playhead to recover playback
      */
-    highBufferWatchdogPeriod: number;
+    highBufferWatchdogPeriod?: number;
     /**
      * (default: 0.1s)
      * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
      * media.currentTime += (nb nudge retry -1)*nudgeOffset
      */
-    nudgeOffset: number;
+    nudgeOffset?: number;
     /**
      * (default: 3s)
      * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
      * media.currentTime += (nb nudge retry -1)*nudgeOffset
      */
-    nudgeMaxRetry: number;
+    nudgeMaxRetry?: number;
     /**
      * (default 0.2s)
      * This tolerance factor is used during fragment lookup.
@@ -1247,6 +1337,10 @@ declare class Hls {
    * hls.js event listener
    */
   on(event: string, callback: (event: string, data: Hls.Data) => void): void;
+  /**
+   * remove hls.js event listener
+   */
+  off(event: string, callback: (event: string, data: Hls.Data) => void): void;
 }
 
 export as namespace Hls;
diff --git a/types/homeworks/index.d.ts b/types/homeworks/index.d.ts
index 87affa65e5..4449483d35 100644
--- a/types/homeworks/index.d.ts
+++ b/types/homeworks/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/IGAWorksDev/homeworks/
 // Definitions by: Kenneth Ceyer <https://github.com/KennethanCeyer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/homeworks/tsconfig.json b/types/homeworks/tsconfig.json
index 65f6fc4f01..d29bd1acfe 100644
--- a/types/homeworks/tsconfig.json
+++ b/types/homeworks/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -19,4 +20,4 @@
         "index.d.ts",
         "homeworks-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/html2canvas/index.d.ts b/types/html2canvas/index.d.ts
index 0efe8bc34f..33effeff87 100644
--- a/types/html2canvas/index.d.ts
+++ b/types/html2canvas/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/niklasvh/html2canvas
 // Definitions by: Richard Hepburn <https://github.com/rwhepburn/>, Pei-Tang Huang <https://github.com/tan9/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/http-aws-es/http-aws-es-tests.ts b/types/http-aws-es/http-aws-es-tests.ts
new file mode 100644
index 0000000000..df432dbab4
--- /dev/null
+++ b/types/http-aws-es/http-aws-es-tests.ts
@@ -0,0 +1,42 @@
+import { EnvironmentCredentials } from "aws-sdk/lib/core";
+import { Client } from "elasticsearch";
+import HttpAmazonESConnector = require("http-aws-es");
+
+new Client({
+    amazonES: {
+        accessKey: "AKID",
+        region: "us-east-1",
+        secretKey: "secret",
+    },
+    connectionClass: HttpAmazonESConnector,
+    host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
+});
+
+new Client({
+    amazonES: {
+        accessKey: "AKID",
+        region: "us-east-1",
+        secretKey: "secret",
+    },
+    connectionClass: require("http-aws-es"),
+    host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
+});
+
+const myCredentials = new EnvironmentCredentials("AWS");
+new Client({
+    amazonES: {
+        credentials: myCredentials,
+        region: "us-east-1",
+    },
+    connectionClass: HttpAmazonESConnector,
+    host: "https://amazon-es-host.us-east-1.es.amazonaws.com",
+});
+
+new Client({
+    amazonES: {
+        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
new file mode 100644
index 0000000000..c14547a58f
--- /dev/null
+++ b/types/http-aws-es/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for http-aws-es 1.1
+// Project: https://github.com/TheDeveloper/http-aws-es#readme
+// Definitions by: Marco Gonzalez <https://github.com/marcogrcr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as e from "elasticsearch";
+import { Credentials } from "aws-sdk/lib/core";
+
+declare module "elasticsearch" {
+    interface AmazonESOptions {
+        accessKey?: string;
+        credentials?: Credentials;
+        region: string;
+        secretKey?: string;
+    }
+
+    interface ConfigOptions {
+        amazonES?: AmazonESOptions;
+    }
+}
+
+declare const HttpAmazonESConnector: any;
+export = HttpAmazonESConnector;
diff --git a/types/http-aws-es/package.json b/types/http-aws-es/package.json
new file mode 100644
index 0000000000..e4fd5a5e97
--- /dev/null
+++ b/types/http-aws-es/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "aws-sdk": "^2.7.0"
+    }
+}
diff --git a/types/http-aws-es/tsconfig.json b/types/http-aws-es/tsconfig.json
new file mode 100644
index 0000000000..f1689d92e4
--- /dev/null
+++ b/types/http-aws-es/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "http-aws-es-tests.ts"
+    ]
+}
diff --git a/types/http-aws-es/tslint.json b/types/http-aws-es/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-aws-es/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hubot/hubot-tests.ts b/types/hubot/hubot-tests.ts
new file mode 100644
index 0000000000..9c5e832bc2
--- /dev/null
+++ b/types/hubot/hubot-tests.ts
@@ -0,0 +1,14 @@
+import * as Hubot from "hubot";
+
+const brain = new Hubot.Brain();
+brain; // $ExpectType Brain
+brain.userForName('someone'); // $ExpectType any
+
+const robot = new Hubot.Robot(
+  'src/adapters',
+  'slack',
+  false,
+  'hubot',
+);
+robot; // $ExpectType Robot
+robot.hear(/hello/, () => null); // $ExpectType void
diff --git a/types/hubot/index.d.ts b/types/hubot/index.d.ts
new file mode 100644
index 0000000000..e0a809f69a
--- /dev/null
+++ b/types/hubot/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for hubot 2.19
+// Project: https://github.com/github/hubot
+// Definitions by: Dirk Gadsden <https://github.com/dirk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Hubot {
+    class Brain {
+        userForId(id: any): any;
+        userForName(name: string): any;
+    }
+
+    class User {
+        id: any;
+        name: string;
+    }
+
+    class Message {
+        user: User;
+        text: string;
+        id: string;
+    }
+
+    class Response {
+        match: RegExpMatchArray;
+        message: Message;
+
+        constructor(robot: Robot, message: Message, match: RegExpMatchArray);
+        send(...strings: string[]): void;
+        reply(...strings: string[]): void;
+        random<T>(items: T[]): T;
+    }
+
+    type ListenerCallback = (response: Response) => void;
+
+    class Robot {
+        brain: Brain;
+
+        constructor(adapterPath: string, adapter: string, httpd: boolean, name: string, alias?: string);
+        hear(regex: RegExp, callback: ListenerCallback): void;
+        hear(regex: RegExp, options: any, callback: ListenerCallback): void;
+        respond(regex: RegExp, callback: ListenerCallback): void;
+        respond(regex: RegExp, options: any, callback: ListenerCallback): void;
+    }
+}
+
+// Compatibility with CommonJS syntax exported by Hubot's CoffeeScript.
+// tslint:disable-next-line export-just-namespace
+export = Hubot;
+export as namespace Hubot;
diff --git a/types/hubot/tsconfig.json b/types/hubot/tsconfig.json
new file mode 100644
index 0000000000..0e3faa4c35
--- /dev/null
+++ b/types/hubot/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hubot-tests.ts"
+    ]
+}
diff --git a/types/hubot/tslint.json b/types/hubot/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hubot/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/humanize-plus/humanize-plus-tests.ts b/types/humanize-plus/humanize-plus-tests.ts
new file mode 100644
index 0000000000..4e66ff6c26
--- /dev/null
+++ b/types/humanize-plus/humanize-plus-tests.ts
@@ -0,0 +1,204 @@
+import * as Humanize from 'humanize-plus';
+
+/////////////
+// Numbers //
+/////////////
+
+/**
+ * formatNumber
+ */
+Humanize.formatNumber(123456789, 2);
+// "123,456,789.00"
+
+/**
+ * intComma
+ */
+Humanize.intComma(123456789);
+// "123,456,789"
+
+/**
+ * compactInteger
+ */
+Humanize.compactInteger(123456789, 1);
+// "123.5M"
+
+// Switch to scientific notation for trillons, because no one knows those abbreviations.
+Humanize.compactInteger(-7832186132456328967, 4);
+// "-7.8322x10^18"
+
+Humanize.compactInteger(-100, 2);
+// "-100"
+
+/**
+ * boundedNumber
+ */
+Humanize.boundedNumber(110, 100);
+// "100+"
+
+Humanize.boundedNumber(50, 100);
+// "50"
+
+/**
+ * ordinal
+ */
+Humanize.ordinal(22);
+// "22nd"
+
+/**
+ * times
+ */
+for (let i = 0; i < 5; i ++) {
+  Humanize.times(i, {4: 'too many'});
+  if (i === 1) {
+    Humanize.times(1.1);
+  }
+}
+// never
+// once
+// 1.1 times
+// twice
+// 3 times
+// too many times
+
+/**
+ * pace
+ */
+const second = 1000;
+const week = 6.048e8;
+const decade = 3.156e11;
+
+Humanize.pace(1.5, second, "heartbeat");
+// Approximately 2 heartbeats per second
+
+Humanize.pace(4, week);
+// Approximately 4 times per week
+
+Humanize.pace(1, decade, "life crisis");
+// Less than 1 life crisis per week
+
+/**
+ * fileSize
+ */
+Humanize.fileSize(1024 * 20);
+// "20 Kb"
+
+Humanize.fileSize(1024 * 2000);
+// "1.95 Mb"
+
+Humanize.fileSize(Math.pow(1000, 4));
+// "931.32 Gb"
+
+/**
+ * pluralize
+ */
+Humanize.pluralize(1, "duck");
+// "duck"
+
+Humanize.pluralize(3, "duck");
+// "ducks"
+
+Humanize.pluralize(3, "duck", "duckies");
+// "duckies"
+
+/////////////
+// Strings //
+/////////////
+
+/**
+ * truncate
+ */
+Humanize.truncate('long text is good for you');
+// "long text is good for you"
+
+Humanize.truncate('long text is good for you', 19);
+// "long text is goo..."
+
+Humanize.truncate('long text is good for you', 19, '... etc');
+// "long text is... etc"
+
+/**
+ * truncateWords
+ */
+Humanize.truncateWords('long text is good for you', 5);
+// "long text is good for ..."
+
+/**
+ * capitalize
+ */
+Humanize.capitalize("some boring string");
+// "Some boring string"
+
+Humanize.capitalize("wHoOaA!");
+// "WHoOaA!"
+
+Humanize.capitalize("wHoOaA!", true);
+// "Whooaa!"
+
+/**
+ * capitalizeAll
+ */
+Humanize.capitalizeAll("some boring string");
+// "Some Boring String"
+
+/**
+ * titleCase
+ */
+Humanize.titleCase("some of a boring string");
+// "Some of a Boring String"
+
+Humanize.titleCase("cool the          iTunes cake, O'Malley!");
+// "Cool the iTunes Cake, O'Malley!"
+
+////////////
+// Arrays //
+////////////
+
+/**
+ * oxford
+ */
+const items = ['apple', 'orange', 'banana', 'pear', 'pineapple'];
+
+Humanize.oxford(items);
+// "apple, orange, banana, pear, and pineapple"
+
+Humanize.oxford(items, 3);
+// "apple, orange, banana, and 2 others"
+
+// Pluralizes properly too!
+Humanize.oxford(items, 4);
+// "apple, orange, banana, pear, and 1 other"
+
+Humanize.oxford(items, 3, "and some other fruits");
+// "apple, orange, banana, and some other fruits"
+
+/**
+ * frequency
+ */
+const aznPics = [
+  'http://24.media.tumblr.com/77082543cb69af56ede38a0cdb2511d0/tumblr_mh96olWPLv1r8k4ywo1_1280.jpg',
+  'http://25.media.tumblr.com/3e2d318be34d5ef8f86a612cd1d795ff/tumblr_mhbhb96t3z1r8k4ywo1_1280.jpg',
+  'http://24.media.tumblr.com/8c5a052e33c27c784514e1b124b383a1/tumblr_mhexaqrk0w1r8k4ywo1_1280.jpg'
+];
+const bigfootPics: string[] = [];
+
+"Instagrammers " + Humanize.frequency(aznPics, "took pictures of food");
+// "Instagrammers took pictures of food 3 times"
+
+"Bigfoot " + Humanize.frequency(bigfootPics, "took pictures of food");
+// "Bigfoot never took pictures of food"
+
+/////////////////////
+// Utility methods //
+/////////////////////
+
+/**
+ * toFixed
+ */
+Humanize.toFixed(0.615, 2);
+// "0.62"
+
+/**
+ * normalizePrecision
+ */
+Humanize.normalizePrecision(-232.231);
+// 232
diff --git a/types/humanize-plus/index.d.ts b/types/humanize-plus/index.d.ts
new file mode 100644
index 0000000000..4b20ada3fd
--- /dev/null
+++ b/types/humanize-plus/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for humanize-plus 1.8
+// Project: https://github.com/HubSpot/humanize
+// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Numbers
+export function formatNumber(number: number, decimals?: number): string;
+export function intComma(number: number, decimals?: number): string;
+export function compactInteger(number: number, decimals?: number): string;
+export function boundedNumber(number: number, bounds?: number, ending?: string): string;
+export function ordinal(value: number): string;
+export function times(value: number, overrides?: any): string;
+export function pace(value: number, intervalMs: number, unit?: string): string;
+export function fileSize(filesize: number, precision?: number): string;
+export function pluralize(number: number, singular?: string, plural?: string): string;
+
+// Strings
+export function truncate(string: string, length?: number, ending?: string): string;
+export function truncateWords(string: string, length?: number): string | null;
+export function capitalize(string: string, downCaseTail?: boolean): string;
+export function capitalizeAll(string: string): string;
+export function titleCase(string: string): string;
+
+// Arrays
+export function oxford(items: any[], limit?: number, limitStr?: string): string;
+export function frequency(list: any[], verb?: string): string;
+
+// Utility methods
+export function toFixed(value: number, precision?: number): string;
+export function normalizePrecision(value: number, base?: number): number;
diff --git a/types/humanize-plus/tsconfig.json b/types/humanize-plus/tsconfig.json
new file mode 100644
index 0000000000..c79c7259f7
--- /dev/null
+++ b/types/humanize-plus/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "humanize-plus-tests.ts"
+    ]
+}
diff --git a/types/humanize-plus/tslint.json b/types/humanize-plus/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/humanize-plus/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/i18n/i18n-tests.ts b/types/i18n/i18n-tests.ts
index dc87c60a28..ac3813c934 100644
--- a/types/i18n/i18n-tests.ts
+++ b/types/i18n/i18n-tests.ts
@@ -1,18 +1,15 @@
 /**
  * Test suite created by Maxime LUCE <https://github.com/SomaticIT>
+ * Updated by FindQ for version 0.8 of i18n-node
  *
  * Created by using code samples from https://github.com/mashpie/i18n-node.
  */
 
-/// <reference types="node" />
-
-
-
 import express = require("express");
 import i18n = require("i18n");
 
-var app = express();
-var req: express.Request;
+const app = express();
+let req: express.Request;
 
 /**
  * Configuration
@@ -25,20 +22,35 @@ i18n.configure({
 
 i18n.configure({
     // setup some locales - other locales default to en silently
-    locales: ['en', 'de'],
+    locales: [ 'en', 'de' ],
+
+    // fall back from Dutch to German
+    fallbacks: { nl: 'de' },
 
     // you may alter a site wide default locale
     defaultLocale: 'de',
 
-    // sets a custom cookie name to parse locale settings from  - defaults to NULL
+    // sets a custom cookie name to parse locale settings from - defaults to NULL
     cookie: 'yourcookiename',
 
+    // query parameter to switch locale (ie. /home?lang=ch) - defaults to NULL
+    queryParameter: 'lang',
+
     // where to store json files - defaults to './locales' relative to modules directory
     directory: './mylocales',
 
+    // controll mode on directory creation - defaults to NULL which defaults to umask of process user. Setting has no effect on win.
+    directoryPermissions: '755',
+
+    // watch for changes in json files to reload locale on updates - defaults to false
+    autoReload: true,
+
     // whether to write new locale information to disk - defaults to true
     updateFiles: false,
 
+    // sync locale information accros all files - defaults to false
+    syncFiles: false,
+
     // what to use as the indentation unit - defaults to "\t"
     indent: "\t",
 
@@ -49,27 +61,57 @@ i18n.configure({
     prefix: 'webapp-',
 
     // enable object notation
-    objectNotation: false
+    objectNotation: false,
+
+    // setting of log level DEBUG - default to require('debug')('i18n:debug')
+    logDebugFn: (msg) => {
+        console.log('debug', msg);
+    },
+
+    // setting of log level WARN - default to require('debug')('i18n:warn')
+    logWarnFn: (msg) => {
+        console.log('warn', msg);
+    },
+
+    // setting of log level ERROR - default to require('debug')('i18n:error')
+    logErrorFn: (msg) => {
+        console.log('error', msg);
+    },
+
+    // object or [obj1, obj2] to bind the i18n api and current locale to - defaults to null
+    register: global,
+
+    // hash to specify different aliases for i18n's internal methods to apply on the request/response objects (method -> alias).
+    // note that this will *not* overwrite existing properties with the same name
+    api: {
+      __: 't',  // now req.__ becomes req.t
+      __n: 'tn' // and req.__n can be called as req.tn
+    },
+
+    // Downcase locale when passed on queryParam; e.g. lang=en-US becomes
+    // en-us.  When set to false, the queryParam value will be used as passed;
+    // e.g. lang=en-US remains en-US.
+    preserveLegacyCase: true
 });
 
 /**
  * Usage in global scope
  * https://github.com/mashpie/i18n-node#example-usage-in-global-scope
  */
-var greeting = i18n.__('Hello');
+let greeting = i18n.__('Hello');
 
 /**
  * Usage in Express
  * https://github.com/mashpie/i18n-node#example-usage-in-expressjs
  */
 // Configuration
-app.configure(function () {
+app.configure(() => {
     // default: using 'accept-language' header to guess language settings
     app.use(i18n.init);
 });
 
-app.get('/de', function (_req, res) {
-    var greeting = res.__('Hello');
+app.get('/de', (_req: Express.Request, res: Express.Response) => {
+    let greeting = res.__('Hello');
 });
 
 /**
@@ -109,6 +151,39 @@ i18n.__n({ singular: "%s cat", plural: "%s cats", locale: "fr" }, 3); // 3 chat
 i18n.__n({ singular: "%s cat", plural: "%s cats", locale: "fr", count: 1 }); // 1 chat
 i18n.__n({ singular: "%s cat", plural: "%s cats", locale: "fr", count: 3 }); // 3 chat
 
+/**
+ * __mf()
+ * https://github.com/mashpie/i18n-node#i18n__mf
+ */
+app.get('/de', (_req: Express.Request, res: Express.Response) => {
+    // assume res is set to german
+    res.setLocale('de');
+
+    // start simple
+    res.__mf('Hello'); // --> Hallo
+
+    // can replace too
+    res.__mf('Hello {name}', { name: 'Marcus' }); // --> Hallo Marcus
+
+    // and combines with sprintf
+    res.__mf('Hello {name}, how was your %s?', 'test', { name: 'Marcus' }); // --> Hallo Marcus, wie war dein test?
+
+    // now check out a plural rule
+    res.__mf('{N, plural, one{# cat} few{# cats} many{# cats} others{# cats}}', {N: 1});
+});
+
+/**
+ * __l()
+ * https://github.com/mashpie/i18n-node#i18n__l
+ */
+i18n.__l('Hello'); // --> [ 'Hallo', 'Hello' ]
+
+/**
+ * __h()
+ * https://github.com/mashpie/i18n-node#i18n__h
+ */
+i18n.__h('Hello'); // --> [ { de: 'Hallo' }, { en: 'Hello' } ]
+
 /**
  * setLocale()
  * https://github.com/mashpie/i18n-node#setlocale
@@ -117,6 +192,15 @@ i18n.setLocale('de');
 i18n.setLocale(req, 'de');
 req.setLocale('de');
 
+app.get('/ar', (_req: Express.Request, res: Express.Response) => {
+    i18n.setLocale(req, 'ar');
+    i18n.setLocale(res, 'ar');
+    i18n.setLocale(res.locals, 'ar');
+
+    i18n.setLocale([req, res.locals], req.params.lang);
+    i18n.setLocale(res, 'ar', true);
+});
+
 /**
  * getLocale()
  * https://github.com/mashpie/i18n-node#getlocale
@@ -125,6 +209,12 @@ i18n.getLocale(); // --> de
 i18n.getLocale(req); // --> de
 req.getLocale(); // --> de
 
+/**
+ * getLocales()
+ * https://github.com/mashpie/i18n-node#i18ngetlocales
+ */
+i18n.getLocales(); // --> ['en', 'de', 'en-GB']
+
 /**
  * getCatalog()
  * https://github.com/mashpie/i18n-node#getcatalog
@@ -137,4 +227,3 @@ i18n.getCatalog(req, 'de'); // returns just 'de'
 
 req.getCatalog(); // returns all locales
 req.getCatalog('de'); // returns just 'de'
-
diff --git a/types/i18n/index.d.ts b/types/i18n/index.d.ts
index 7c7697cc22..534b46b186 100644
--- a/types/i18n/index.d.ts
+++ b/types/i18n/index.d.ts
@@ -1,14 +1,29 @@
-// Type definitions for i18n-node 0.5.0
+// Type definitions for i18n-node 0.8
 // Project: https://github.com/mashpie/i18n-node
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+//                 FindQ <https://github.com/FindQ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 declare namespace i18n {
-    export interface ConfigurationOptions {
-        /** Setup some locales - other locales default to en silently */
+    interface ConfigurationOptions {
+        /**
+         * Setup some locales - other locales default to en silently
+         * @default []
+         */
         locales?: string[];
-        /** Alter a site wide default locale */
+
+        /**
+         * Language fallback map
+         * @default {}
+         */
+        fallbacks?: {
+            [locale: string]: string;
+        };
+
+        /**
+         * Alter a site wide default locale
+         * @default "en"
+         */
         defaultLocale?: string;
 
         /**
@@ -16,6 +31,13 @@ declare namespace i18n {
          * @default null
          */
         cookie?: string;
+
+        /**
+         * Query parameter to switch locale (ie. /home?lang=ch)
+         * @default null
+         */
+        queryParameter?: string;
+
         /**
          * Where to store json files, relative to modules directory
          * @default "./locales"
@@ -23,11 +45,29 @@ declare namespace i18n {
         directory?: string;
 
         /**
-         * whether to write new locale information to disk
+         * Control mode on directory creation. Setting has no effect on win.
+         * @default null
+         */
+        directoryPermissions?: string;
+
+        /**
+         * Watch for changes in json files to reload locale on updates
+         * @default false
+         */
+        autoReload?: boolean;
+
+        /**
+         * Whether to write new locale information to disk
          * @default true
          */
         updateFiles?: boolean;
 
+        /**
+         * Sync locale information across all files
+         * @default false
+         */
+        syncFiles?: boolean;
+
         /**
          * What to use as the indentation unit
          * @default "\t"
@@ -40,6 +80,12 @@ declare namespace i18n {
          */
         extension?: string;
 
+        /**
+         * Setting prefix of json files name (in case you use different locale files naming scheme (webapp-en.json), rather then just en.json)
+         * @default ""
+         */
+        prefix?: string;
+
         /**
          * Enable object notation
          * @default false
@@ -47,36 +93,70 @@ declare namespace i18n {
         objectNotation?: boolean;
 
         /**
-         * json files prefix
+         * Setting of log level DEBUG
+         * @default require("debug")("i18n:debug")
          */
-        prefix?: string;
-        
+        logDebugFn?: (msg: string) => void;
+
         /**
-         * object or [obj1, obj2] to bind the i18n api and current locale to - defaults to null
+         * Setting of log level WARN
+         * @default require("debug")("i18n:warn")
+         */
+        logWarnFn?: (msg: string) => void;
+
+        /**
+         * Setting of log level ERROR
+         * @default require("debug")("i18n:error")
+         */
+        logErrorFn?: (msg: string) => void;
+
+        /**
+         * object or [obj1, obj2] to bind the i18n api and current locale to
+         * @default null
          */
         register?: any;
+
+        /**
+         * Hash to specify different aliases for i18n's internal methods to apply on the request/response objects (method -> alias).
+         * Note that this will *not* overwrite existing properties with the same name.
+         * @default undefined
+         */
+        api?: {
+            [method: string]: string;
+        };
+
+        /**
+         * Downcase locale when passed on queryParam; e.g. lang=en-US becomes en-us.
+         * When set to false, the queryParam value will be used as passed; e.g. lang=en-US remains en-US.
+         * @default true
+         */
+        preserveLegacyCase?: boolean;
     }
-    export interface TranslateOptions {
+    interface TranslateOptions {
         phrase: string;
         locale?: string;
     }
-    export interface PluralOptions {
+    interface PluralOptions {
         singular: string;
         plural: string;
         count?: number;
         locale?: string;
     }
-    export interface Replacements {
+    interface Replacements {
         [key: string]: string;
     }
 
-    export interface LocaleCatalog {
+    interface LocaleCatalog {
         [key: string]: string;
     }
-    export interface GlobalCatalog {
+    interface GlobalCatalog {
         [key: string]: LocaleCatalog;
     }
 
+    interface HashedList {
+        [key: string]: string;
+    }
+
     /**
      * Configure current i18n instance
      * @param {ConfigurationOptions} options - configuration options for i18n
@@ -89,42 +169,23 @@ declare namespace i18n {
      * @param {Express.Response} response - Current express response
      * @param {Function} next - Callback to continue process
      */
-    function init(request: Express.Request, response: Express.Response, next?: Function): void;
+    function init(request: Express.Request, response: Express.Response, next?: () => void): void;
 
     //#region __()
 
     /**
      * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
      * @returns {string} The translated phrase
      */
-    function __(phrase: string, ...replace: string[]): string;
+    function __(phraseOrOptions: string | TranslateOptions, ...replace: string[]): string;
     /**
      * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @param {Object} replacements - An object containing replacements
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
+     * @param {Replacements} replacements - An object containing replacements
      * @returns {string} The translated phrase
      */
-    function __(phrase: string, replacements: Replacements): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    function __(options: TranslateOptions, replacements: Replacements): string;
+    function __(phraseOrOptions: string | TranslateOptions, replacements: Replacements): string;
 
     //#endregion
 
@@ -133,33 +194,58 @@ declare namespace i18n {
     /**
      * Translate with plural condition the given phrase and count using locale configuration
      * @param {PluralOptions} options - Options for plural translate
+     * @param {number} [count] - The number which allow to select from plural to singular
      * @returns {string} The translated phrase
      */
-    function __n(options: PluralOptions): string;
+    function __n(options: PluralOptions, count?: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular phrase to translate if count is <= 1
+     * @param {string} plural - The plural phrase to translate if count is > 1
+     * @param {number | string} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    function __n(singular: string, plural: string, count: number | string): string;
+
+    //#endregion
+
+    //#region __mf()
 
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} count - The number which allow to select from plural to singular
+     * Translate the given phrase using locale configuration and MessageFormat
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
      * @returns {string} The translated phrase
      */
-    function __n(options: PluralOptions, count: number): string;
+    function __mf(phraseOrOptions: string | TranslateOptions, ...replace: any[]): string;
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
+     * Translate the given phrase using locale configuration and MessageFormat
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
+     * @param {Replacements} replacements - An object containing replacements
      * @returns {string} The translated phrase
      */
-    function __n(singular: string, plural: string, count: number): string;
+    function __mf(phraseOrOptions: string | TranslateOptions, replacements: Replacements): string;
+
+    //#endregion
+
+    //#region __l()
+
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * Returns a list of translations for a given phrase in each language.
+     * @param {string} phrase - The phrase to get translations in each language
+     * @returns {string[]} The phrase in each language
      */
-    function __n(singular: string, plural: string, count: string): string;
+    function __l(phrase: string): string[];
+
+    //#endregion
+
+    //#region __h()
+
+    /**
+     * Returns a hashed list of translations for a given phrase in each language.
+     * @param {string} phrase - The phrase to get translations in each language
+     * @returns {HashedList[]} The phrase in each language
+     */
+    function __h(phrase: string): HashedList[];
 
     //#endregion
 
@@ -171,23 +257,34 @@ declare namespace i18n {
      */
     function setLocale(locale: string): void;
     /**
-     * Change the current active locale for specified request
-     * @param {Express.Request} request - The request to change locale on
+     * Change the current active locale for specified response
+     * @param {Express.Request | Express.Response} response - The request or response to change locale on
      * @param {string} locale - The locale to set as default
+     * @param {boolean} [inheritance=false] - Disables inheritance if true
      */
-    function setLocale(request: Express.Request, locale: string): void;
+    // tslint:disable-next-line:unified-signatures
+    function setLocale(requestOrResponse: Express.Request | Express.Response, locale: string, inheritance?: boolean): void;
+    /**
+     * Change the current active locale for specified response
+     * @param {any | any[]} objects - The object(s) to change locale on
+     * @param {string} locale - The locale to set as default
+     * @param {boolean} [inheritance=false] - Disables inheritance if true
+     */
+    // tslint:disable-next-line:unified-signatures
+    function setLocale(objects: any | any[], locale: string, inheritance?: boolean): void;
 
-    /**
-     * Get the current active locale
-     * @returns {string} The current locale in request
-     */
-    function getLocale(): string;
     /**
      * Get the current active locale for specified request
-     * @param {Express.Request} request - The request to get locale for
+     * @param {Express.Request} [request] - The request to get locale for
      * @returns {string} The current locale in request
      */
-    function getLocale(request: Express.Request): string;
+    function getLocale(request?: Express.Request): string;
+
+    /**
+     * Get a list with all configured locales
+     * @returns {string[]}
+     */
+    function getLocales(): string[];
 
     //#endregion
 
@@ -207,16 +304,10 @@ declare namespace i18n {
     /**
      * Get the current active locale catalog for specified request
      * @param {Express.Request} request - The request to get locale catalog for
+     * @param {string} [locale] - The locale to get catalog for
      * @returns {LocaleCatalog} The current locale catalog for the specified request
      */
-    function getCatalog(request: Express.Request): LocaleCatalog;
-    /**
-     * Get the current locale catalog for specified request and specified locale
-     * @param {Express.Request} request - The request to get locale catalog for
-     * @param {string} locale - The locale to get catalog for
-     * @returns {LocaleCatalog} The specified locale catalog
-     */
-    function getCatalog(request: Express.Request, locale: string): LocaleCatalog;
+    function getCatalog(request: Express.Request, locale?: string): LocaleCatalog;
 
     //#endregion
 
@@ -230,7 +321,7 @@ declare namespace i18n {
      * Get current i18n-node version
      * @member {string}
      */
-    var version: string;
+    const version: string;
 }
 
 interface i18nAPI {
@@ -240,36 +331,17 @@ interface i18nAPI {
 
     /**
      * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
      * @returns {string} The translated phrase
      */
-    __(phrase: string, ...replace: string[]): string;
+    __(phraseOrOptions: string | i18n.TranslateOptions, ...replace: string[]): string;
     /**
      * Translate the given phrase using locale configuration
-     * @param {string} phrase - The phrase to translate
-     * @param {Object} replacements - An object containing replacements
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
+     * @param {i18n.Replacements} replacements - An object containing replacements
      * @returns {string} The translated phrase
      */
-    __(phrase: string, replacements: i18n.Replacements): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions, ...replace: string[]): string;
-    /**
-     * Translate the given phrase using locale configuration
-     * @param {TranslateOptions} options - Options for translation
-     * @param {Object} replacements - An object containing replacements
-     * @returns {string} The translated phrase
-     */
-    __(options: i18n.TranslateOptions, replacements: i18n.Replacements): string;
+    __(phraseOrOptions: string | i18n.TranslateOptions, replacements: i18n.Replacements): string;
 
     //#endregion
 
@@ -278,33 +350,58 @@ interface i18nAPI {
     /**
      * Translate with plural condition the given phrase and count using locale configuration
      * @param {PluralOptions} options - Options for plural translate
+     * @param {number} [count] - The number which allow to select from plural to singular
      * @returns {string} The translated phrase
      */
-    __n(options: i18n.PluralOptions): string;
+    __n(options: i18n.PluralOptions, count?: number): string;
+    /**
+     * Translate with plural condition the given phrase and count using locale configuration
+     * @param {string} singular - The singular phrase to translate if count is <= 1
+     * @param {string} plural - The plural phrase to translate if count is > 1
+     * @param {number | string} count - The number which allow to select from plural to singular
+     * @returns {string} The translated phrase
+     */
+    __n(singular: string, plural: string, count: number | string): string;
+
+    //#endregion
+
+    //#region __mf()
 
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {PluralOptions} options - Options for plural translate
-     * @param {number} count - The number which allow to select from plural to singular
+     * Translate the given phrase using locale configuration and MessageFormat
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
      * @returns {string} The translated phrase
      */
-    __n(options: i18n.PluralOptions, count: number): string;
+    __mf(phraseOrOptions: string | i18n.TranslateOptions, ...replace: any[]): string;
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
+     * Translate the given phrase using locale configuration and MessageFormat
+     * @param {string | TranslateOptions} phraseOrOptions - The phrase to translate or options for translation
+     * @param {i18n.Replacements} replacements - An object containing replacements
      * @returns {string} The translated phrase
      */
-    __n(singular: string, plural: string, count: number): string;
+    __mf(phraseOrOptions: string | i18n.TranslateOptions, replacements: i18n.Replacements): string;
+
+    //#endregion
+
+    //#region __l()
+
     /**
-     * Translate with plural condition the given phrase and count using locale configuration
-     * @param {string} singular - The singular pharse to translate if count is <= 1
-     * @param {string} plural - The plural pharse to translate if count is > 1
-     * @param {number} count - The number which allow to select from plural to singular
-     * @returns {string} The translated phrase
+     * Returns a list of translations for a given phrase in each language.
+     * @param {string} phrase - The phrase to get translations in each language
+     * @returns {string[]} The phrase in each language
      */
-    __n(singular: string, plural: string, count: string): string;
+    __l(phrase: string): string[];
+
+    //#endregion
+
+    //#region __h()
+
+    /**
+     * Returns a hashed list of translations for a given phrase in each language.
+     * @param {string} phrase - The phrase to get translations in each language
+     * @returns {HashedList[]} The phrase in each language
+     */
+    __h(phrase: string): i18n.HashedList[];
 
     //#endregion
 
@@ -313,6 +410,7 @@ interface i18nAPI {
      * @returns {string} The current locale in request
      */
     getLocale(): string;
+
     /**
      * Change the current active locale
      * @param {string} locale - The locale to set as default
@@ -329,7 +427,7 @@ interface i18nAPI {
      * @param {string} locale - The locale to get catalog for
      * @returns {LocaleCatalog} The specified locale catalog
      */
-    getCatalog(locale: string): i18n.LocaleCatalog;
+    getCatalog(locale?: string): i18n.LocaleCatalog;
 }
 
 declare module "i18n" {
@@ -337,13 +435,14 @@ declare module "i18n" {
 }
 
 declare namespace Express {
-    export interface Request extends i18nAPI {
+    interface Request extends i18nAPI {
         languages: string[];
         regions: string[];
         language: string;
         region: string;
     }
-    export interface Response extends i18nAPI {
-        locals: i18nAPI
+
+    interface Response extends i18nAPI {
+        locals: i18nAPI;
     }
 }
diff --git a/types/i18n/tslint.json b/types/i18n/tslint.json
new file mode 100644
index 0000000000..bd50eb1958
--- /dev/null
+++ b/types/i18n/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+      "prefer-method-signature": false,
+      "no-single-declare-module": false
+    }
+}
diff --git a/types/i18next/i18next-tests.ts b/types/i18next/i18next-tests.ts
index 2d3f6d3b04..a96901cbb7 100644
--- a/types/i18next/i18next-tests.ts
+++ b/types/i18next/i18next-tests.ts
@@ -1,8 +1,3 @@
-/// <reference types="sinon" />
-/// <reference types="mocha" />
-/// <reference types="expect.js" />
-/// <reference types="jquery" />
-
 import i18n = require("i18next");
 
 i18n.init({
diff --git a/types/ibm-mobilefirst/index.d.ts b/types/ibm-mobilefirst/index.d.ts
index 957d9075e0..4da0cbf3b1 100644
--- a/types/ibm-mobilefirst/index.d.ts
+++ b/types/ibm-mobilefirst/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.ibm.com/software/products/en/mobilefirstfoundation
 // Definitions by: Guillermo Ignacio Enriquez Gutierrez <https://github.com/nacho4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/icheck/index.d.ts b/types/icheck/index.d.ts
index fb03ef9704..ea97f646a9 100644
--- a/types/icheck/index.d.ts
+++ b/types/icheck/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://damirfoy.com/iCheck/
 // Definitions by: Dániel Tar <https://github.com/qcz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface ICheckOptions {
 	/**
diff --git a/types/imagemapster/imagemapster-tests.ts b/types/imagemapster/imagemapster-tests.ts
index 9712cb4e1a..8ee3942fd4 100644
--- a/types/imagemapster/imagemapster-tests.ts
+++ b/types/imagemapster/imagemapster-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 const areaOptions: ImageMapster.AreaRenderingOptions = {
     key:         "foo",
     includeKeys: "foo",
diff --git a/types/imagemapster/index.d.ts b/types/imagemapster/index.d.ts
index 0c28c2ad2b..0ab0991f7e 100644
--- a/types/imagemapster/index.d.ts
+++ b/types/imagemapster/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: delphinus <https://github.com/delphinus35/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="jquery" />
-
 declare namespace ImageMapster {
 
     type Select = "select";
diff --git a/types/imagemapster/tsconfig.json b/types/imagemapster/tsconfig.json
index dc96de2d3e..ca23742027 100644
--- a/types/imagemapster/tsconfig.json
+++ b/types/imagemapster/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "imagemapster-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/imagesloaded/index.d.ts b/types/imagesloaded/index.d.ts
index 9a48a18e19..5dd4ea0abc 100644
--- a/types/imagesloaded/index.d.ts
+++ b/types/imagesloaded/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/desandro/imagesloaded
 // Definitions by: Chris Charabaruk <https://github.com/coldacid>, Cameron Little <https://github.com/apexskier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/inert/index.d.ts b/types/inert/index.d.ts
index a54841eac7..28e4efbe58 100644
--- a/types/inert/index.d.ts
+++ b/types/inert/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/hapijs/inert/
 // Definitions by: Steve Ognibene <http://github.com/nycdotnet>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as hapi from 'hapi';
 
diff --git a/types/inert/inert-tests.ts b/types/inert/inert-tests.ts
index 82cd1f1295..9062e13f6b 100644
--- a/types/inert/inert-tests.ts
+++ b/types/inert/inert-tests.ts
@@ -1,7 +1,5 @@
 // Copied from: https://github.com/hapijs/inert#examples
 
-/// <reference types="node" />
-
 import Path = require('path');
 import Hapi = require('hapi');
 import Inert = require('inert');
diff --git a/types/ini/ini-tests.ts b/types/ini/ini-tests.ts
index 806d816a1a..a0c98264ca 100644
--- a/types/ini/ini-tests.ts
+++ b/types/ini/ini-tests.ts
@@ -1,9 +1,6 @@
-/// <reference types="node" />
-
-import fs = require("fs");
 import ini = require("ini");
 
-var ini_content = fs.readFileSync("path_to_file.ini", "utf-8");
+var ini_content = "";
 
 var ini_object: any = ini.decode(ini_content);
 var ini_rev_string: string = ini.encode(ini_object);
\ No newline at end of file
diff --git a/types/inline-css/index.d.ts b/types/inline-css/index.d.ts
index a6db3ef67b..6d43b7975d 100644
--- a/types/inline-css/index.d.ts
+++ b/types/inline-css/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jonkemp/inline-css
 // Definitions by: Philip Spain <https://github.com/philipisapain>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="bluebird" />
 
diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index dd2f4ad3c7..2a0b9f60f4 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Inquirer.js
 // Project: https://github.com/SBoudrias/Inquirer.js
 // Definitions by: Qubo <https://github.com/tkQubo>
+//                 Parvez <https://github.com/ppathan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="rx" />
@@ -110,6 +111,10 @@ declare namespace inquirer {
          * Change the number of lines that will be rendered when using list, rawList, expand or checkbox.
          */
         pageSize?: number;
+        /**
+         * Add a mask when password will entered
+         */
+        mask?: string;
     }
 
     /**
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index a8610aca8a..d3591b13d2 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import inquirer = require('inquirer');
 
 
diff --git a/types/insert-module-globals/index.d.ts b/types/insert-module-globals/index.d.ts
new file mode 100644
index 0000000000..1fb0b6e7ba
--- /dev/null
+++ b/types/insert-module-globals/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for insert-module-globals 7.0
+// Project: https://github.com/substack/insert-module-globals
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from 'stream';
+
+export = InsertModuleGlobals;
+
+interface InsertModuleGlobals {
+    /**
+     * Return a transform stream inserter for the filename file that will accept a javascript file as input and
+     * will output the file with a closure around the contents as necessary to define extra builtins.
+     */
+    (file: string, opts?: InsertModuleGlobals.Options): stream.Transform;
+
+    /**
+     * Defaults
+     */
+    readonly vars: {
+        process(file: string): string;
+        global(): string;
+        'Buffer.isBuffer'(file: string): string;
+        Buffer(): string;
+        __filename(file: string, basedir: string): string;
+        __dirname(file: string, basedir: string): string;
+    };
+}
+
+declare const InsertModuleGlobals: InsertModuleGlobals;
+
+declare namespace InsertModuleGlobals {
+    interface Options {
+        /**
+         * When opts.always is true, wrap every file with all the global variables without parsing.
+         * This is handy because parsing the scope can take a long time, so you can prioritize fast builds over saving bytes in the final output.
+         * When opts.always is truthy but not true, avoid parsing but perform a quick test to determine if wrapping should be skipped.
+         */
+        always?: boolean;
+        /**
+         * Use opts.vars to override the default inserted variables, or set opts.vars[name] to undefined to not insert a variable which would otherwise be inserted.
+         *
+         * opts.vars properties with a . in their name will be executed instead of the parent object if ONLY that property is used.
+         * For example, "Buffer.isBuffer" will mask "Buffer" only when there is a Buffer.isBuffer() call in a file and no other references to Buffer.
+         */
+        vars?: VarsOption;
+        /**
+         * If opts.debug is true, an inline source map will be generated to compensate for the extra lines.
+         */
+        debug?: boolean;
+        basedir?: string;
+    }
+
+    interface VarsOption {
+        [name: string]: InsertFunction | undefined;
+    }
+
+    type InsertFunction = (file: string, basedir: string) => VariableConfig | string;
+
+    interface VariableConfig {
+        id: string;
+        source: string;
+        suffix?: string;
+    }
+}
diff --git a/types/insert-module-globals/insert-module-globals-tests.ts b/types/insert-module-globals/insert-module-globals-tests.ts
new file mode 100644
index 0000000000..0fa6c1af38
--- /dev/null
+++ b/types/insert-module-globals/insert-module-globals-tests.ts
@@ -0,0 +1,60 @@
+import insert = require('insert-module-globals');
+import { VarsOption } from 'insert-module-globals';
+
+function example() {
+    function inserter(file: string) {
+        return insert(file, { basedir: __dirname + '/files' });
+    }
+
+    return inserter;
+}
+
+function insert_custom_globals() {
+    const customProcessContent = 'customProcessContent';
+    const files: string[] = [];
+
+    const vars: VarsOption = {
+        process(file, basedir) {
+            return {
+                id: "path/to/custom_process.js",
+                source: customProcessContent
+            };
+        },
+        Buffer(file, basedir) {
+            return {
+                id: 'path/to/custom_buffer.js',
+                source: customProcessContent,
+                // suffix is optional
+                // it's used to extract the value from the module.
+                // it becomes: require(...).Buffer in this case.
+                suffix: '.Buffer'
+            };
+        },
+        Math() {
+            // if you return a string,
+            // it's simply set as the value.
+            return '{}';
+            // ^ any attempt to use Math[x] will throw!
+        }
+    };
+
+    function inserter(file: string) {
+        return insert(file, { vars });
+    }
+
+    return inserter;
+}
+
+function disable_select_globals() {
+    const insertGlobalVars: VarsOption = {};
+    const wantedGlobalVars = ['__filename', '__dirname'];
+    Object.keys(insert.vars).forEach((x) => {
+        if (wantedGlobalVars.indexOf(x) === -1) {
+            insertGlobalVars[x] = undefined;
+        }
+    });
+
+    return insert('index.js', {
+        vars: insertGlobalVars
+    });
+}
diff --git a/types/insert-module-globals/tsconfig.json b/types/insert-module-globals/tsconfig.json
new file mode 100644
index 0000000000..0a6e51fb74
--- /dev/null
+++ b/types/insert-module-globals/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "insert-module-globals-tests.ts"
+    ]
+}
diff --git a/types/insert-module-globals/tslint.json b/types/insert-module-globals/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/insert-module-globals/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/intl-tel-input/index.d.ts b/types/intl-tel-input/index.d.ts
index 38ac9274ca..28a147a1c5 100644
--- a/types/intl-tel-input/index.d.ts
+++ b/types/intl-tel-input/index.d.ts
@@ -1,17 +1,108 @@
 // Type definitions for intl-tel-input
 // Project: https://github.com/jackocnr/intl-tel-input
-// Definitions by: Fidan Hakaj <https://github.com/fdnhkj/>
+// Definitions by: Fidan Hakaj <https://github.com/fdnhkj/>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Static methods that are defined in JQueryStatic.fn are not typed
-// as jquery.d.ts has no interface for fn
-// https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/jquery/jquery.d.ts#L958
-//     fn: any;  //TODO: Decide how we want to type this
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
 declare namespace IntlTelInput {
 
+  interface Plugin {
+    /**
+     * Get all of the plugin's country data - either to re-use elsewhere
+     * e.g. to populate a country dropdown.
+     */
+    getCountryData(): CountryData[];
+    /**
+     * Load the utils.js script (included in the lib directory) to enable
+     * formatting/validation etc.
+     */
+    loadUtils(path: string, utilsScriptDeferred?: boolean): void;
+
+    /**
+     * Remove the plugin from the input, and unbind any event listeners.
+     */
+    (method: 'destroy'): void;
+    /**
+     * Get the extension from the current number.
+     * Requires the utilsScript option.
+     * e.g. if the input value was "(702) 555-5555 ext. 1234", this would
+     * return "1234".
+     */
+    (method: 'getExtension'): string;
+    /**
+     * Get the current number in the given format (defaults to E.164 standard).
+     * The different formats are available in the enum
+     * intlTelInputUtils.numberFormat - taken from here.
+     * Requires the utilsScript option.
+     * Note that even if nationalMode is enabled, this can still return a full
+     * international number.
+     */
+    (method: 'getNumber'): string;
+    /**
+     * Get the type (fixed-line/mobile/toll-free etc) of the current number.
+     * Requires the utilsScript option.
+     * Returns an integer, which you can match against the various options in the
+     * global enum intlTelInputUtils.numberType.
+     * Note that in the US there's no way to differentiate between fixed-line and
+     * mobile numbers, so instead it will return FIXED_LINE_OR_MOBILE.
+     */
+    (method: 'getNumberType'): intlTelInputUtils.numberType;
+    /**
+     * Get the country data for the currently selected flag.
+     */
+    (method: 'getSelectedCountryData'): IntlTelInput.CountryData;
+    /**
+     * Get more information about a validation error.
+     * Requires the utilsScript option.
+     * Returns an integer, which you can match against the various options in the
+     * global enum intlTelInputUtils.validationError
+     */
+    (method: 'getValidationError'): intlTelInputUtils.validationError;
+    /**
+     * Validate the current number. Expects an internationally formatted number
+     * (unless nationalMode is enabled). If validation fails, you can use
+     * getValidationError to get more information.
+     * Requires the utilsScript option.
+     * Also see getNumberType if you want to make sure the user enters a certain
+     * type of number e.g. a mobile number.
+     */
+    (method: 'isValidNumber'): boolean;
+    (method: string): void;
+    /**
+     * Change the country selection (e.g. when the user is entering their address).
+     * @param countryCode country code of the country to be set.
+     */
+    (method: 'setCountry', countryCode: string): void;
+    /**
+     * Insert a number, and update the selected flag accordingly.
+     * Note that by default, if nationalMode is enabled it will try to use
+     * national formatting.
+     * @param aNumber number to be set.
+     */
+    (method: 'setNumber', aNumber: string): void;
+    (method: string, value: string): void;
+
+    /**
+     * Get the current number in the given format (defaults to E.164 standard).
+     * The different formats are available in the enum
+     * intlTelInputUtils.numberFormat - taken from here.
+     * Requires the utilsScript option.
+     * Note that even if nationalMode is enabled, this can still return a full
+     * international number.
+     * @param numberFormat the format in which the number will be returned.
+     */
+    (method: 'getNumber', numberFormat: intlTelInputUtils.numberFormat): string;
+    (method: string, numberFormat: intlTelInputUtils.numberFormat): string;
+
+    /**
+     * initialise the plugin with optional options.
+     * @param options options that can be provided during initialization.
+     */
+    (options?: IntlTelInput.Options): JQueryDeferred<any>;
+  }
+
   interface Options {
     /**
      * Whether or not to allow the dropdown. If disabled, there is no dropdown
@@ -154,85 +245,5 @@ declare namespace intlTelInputUtils {
 }
 
 interface JQuery {
-  /**
-   * Remove the plugin from the input, and unbind any event listeners.
-   */
-  intlTelInput(method: 'destroy'): void;
-  /**
-   * Get the extension from the current number.
-   * Requires the utilsScript option.
-   * e.g. if the input value was "(702) 555-5555 ext. 1234", this would
-   * return "1234".
-   */
-  intlTelInput(method: 'getExtension'): string;
-  /**
-   * Get the current number in the given format (defaults to E.164 standard).
-   * The different formats are available in the enum
-   * intlTelInputUtils.numberFormat - taken from here.
-   * Requires the utilsScript option.
-   * Note that even if nationalMode is enabled, this can still return a full
-   * international number.
-   */
-  intlTelInput(method: 'getNumber'): string;
-  /**
-   * Get the type (fixed-line/mobile/toll-free etc) of the current number.
-   * Requires the utilsScript option.
-   * Returns an integer, which you can match against the various options in the
-   * global enum intlTelInputUtils.numberType.
-   * Note that in the US there's no way to differentiate between fixed-line and
-   * mobile numbers, so instead it will return FIXED_LINE_OR_MOBILE.
-   */
-  intlTelInput(method: 'getNumberType'): intlTelInputUtils.numberType;
-  /**
-   * Get the country data for the currently selected flag.
-   */
-  intlTelInput(method: 'getSelectedCountryData'): IntlTelInput.CountryData;
-  /**
-   * Get more information about a validation error.
-   * Requires the utilsScript option.
-   * Returns an integer, which you can match against the various options in the
-   * global enum intlTelInputUtils.validationError
-   */
-  intlTelInput(method: 'getValidationError'): intlTelInputUtils.validationError;
-  /**
-   * Validate the current number. Expects an internationally formatted number
-   * (unless nationalMode is enabled). If validation fails, you can use
-   * getValidationError to get more information.
-   * Requires the utilsScript option.
-   * Also see getNumberType if you want to make sure the user enters a certain
-   * type of number e.g. a mobile number.
-   */
-  intlTelInput(method: 'isValidNumber'): boolean;
-  intlTelInput(method: string): void;
-  /**
-   * Change the country selection (e.g. when the user is entering their address).
-   * @param countryCode country code of the country to be set.
-   */
-  intlTelInput(method: 'setCountry', countryCode: string): void;
-  /**
-   * Insert a number, and update the selected flag accordingly.
-   * Note that by default, if nationalMode is enabled it will try to use
-   * national formatting.
-   * @param aNumber number to be set.
-   */
-  intlTelInput(method: 'setNumber', aNumber: string): void;
-  intlTelInput(method: string, value: string): void;
-
-  /**
-   * Get the current number in the given format (defaults to E.164 standard).
-   * The different formats are available in the enum
-   * intlTelInputUtils.numberFormat - taken from here.
-   * Requires the utilsScript option.
-   * Note that even if nationalMode is enabled, this can still return a full
-   * international number.
-   * @param numberFormat the format in which the number will be returned.
-   */
-  intlTelInput(method: 'getNumber', numberFormat: intlTelInputUtils.numberFormat): string;
-  intlTelInput(method: string, numberFormat: intlTelInputUtils.numberFormat): string;
-
-  /**
-   * initialise the plugin with optional options.
-   * @param options options that can be provided during initialization.
-   */
-  intlTelInput(options?: IntlTelInput.Options): JQueryDeferred<any>;
+  intlTelInput: IntlTelInput.Plugin;
 }
diff --git a/types/intro.js/index.d.ts b/types/intro.js/index.d.ts
index b0925cd41a..26d1fbcac4 100644
--- a/types/intro.js/index.d.ts
+++ b/types/intro.js/index.d.ts
@@ -50,6 +50,7 @@ declare namespace IntroJs {
         exit(): IntroJs;
         clone(): IntroJs;
 
+        goToStepNumber(stepId: number): IntroJs
         goToStep(step: number): IntroJs;
         nextStep(): IntroJs;
         previousStep(): IntroJs;
@@ -66,11 +67,12 @@ declare namespace IntroJs {
         oncomplete(callback: Function): IntroJs;
 
         addHints(): IntroJs;
-
         showHint(stepId: number): IntroJs;
         showHints(): IntroJs;
         hideHint(stepId: number): IntroJs;
         hideHints(): IntroJs;
+        removeHint(stepId: number): IntroJs;
+        removeHints(): IntroJs;
 
         onhintsadded(callback: Function): IntroJs;
         onhintclick(callback: (hintElement: HTMLElement, item: Step, stepId: number) => any): IntroJs;
diff --git a/types/intro.js/intro.js-tests.ts b/types/intro.js/intro.js-tests.ts
index 19267a94a3..d40fbe3f36 100644
--- a/types/intro.js/intro.js-tests.ts
+++ b/types/intro.js/intro.js-tests.ts
@@ -57,6 +57,7 @@ intro.setOptions({
 intro.start()
     .nextStep()
     .previousStep()
+    .goToStepNumber(1).start()
     .goToStep(2)
     .exit()
     .refresh()
@@ -89,6 +90,8 @@ intro.start()
     .showHints()
     .hideHint(1)
     .hideHints()
+    .hideHint(1)
+    .hideHints()
     .clone();
 
 introWithElement.start()
diff --git a/types/ion.rangeslider/index.d.ts b/types/ion.rangeslider/index.d.ts
index 49dd14f815..21d99c5c6d 100644
--- a/types/ion.rangeslider/index.d.ts
+++ b/types/ion.rangeslider/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/IonDen/ion.rangeSlider/
 // Definitions by: Sixin Li <https://github.com/sixinli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
 
diff --git a/types/ion.rangeslider/v1/index.d.ts b/types/ion.rangeslider/v1/index.d.ts
index 55c74e3f4e..d819f46964 100644
--- a/types/ion.rangeslider/v1/index.d.ts
+++ b/types/ion.rangeslider/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/IonDen/ion.rangeSlider/
 // Definitions by: Douglas Eichelberger <https://github.com/dduugg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
 
diff --git a/types/ionic/index.d.ts b/types/ionic/index.d.ts
index 4dfb7f60b6..51d284a711 100644
--- a/types/ionic/index.d.ts
+++ b/types/ionic/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://ionicframework.com
 // Definitions by: Spencer Williams <https://github.com/spencerwi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/ip/index.d.ts b/types/ip/index.d.ts
index 0e3bb7bd14..602a71eed9 100644
--- a/types/ip/index.d.ts
+++ b/types/ip/index.d.ts
@@ -75,6 +75,16 @@ declare module "ip" {
      **/
     export function isLoopback(ip: string): boolean;
 
+    /**
+     * Check whether an IP is a IPv4 address.
+     **/
+    export function isV4Format(ip: string): boolean;
+    
+    /**
+     * Check whether an IP is a IPv6 address.
+     **/
+    export function isV6Format(ip: string): boolean;
+    
     /**
      * Get the loopback address for an IP family.
      * 
diff --git a/types/isotope-layout/index.d.ts b/types/isotope-layout/index.d.ts
index 007740df8e..84f14bed06 100644
--- a/types/isotope-layout/index.d.ts
+++ b/types/isotope-layout/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://isotope.metafizzy.co/
 // Definitions by: Anže Videnič <https://github.com/avidenic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/isotope-layout/isotope-layout-tests.ts b/types/isotope-layout/isotope-layout-tests.ts
index 8f20d52fcc..648ba507ce 100644
--- a/types/isotope-layout/isotope-layout-tests.ts
+++ b/types/isotope-layout/isotope-layout-tests.ts
@@ -101,7 +101,7 @@ let iso: Isotope = $grid.data('isotope');
 iso = new Isotope('.grid');
 iso.addItems($('.items'));
 iso.appended(new HTMLElement());
-iso.arrange(new HTMLElement());
+iso.arrange({ cellsByColumn: { columnWidth: 101, rowHeight: 12 } });
 iso.destroy();
 elements = iso.getFilteredItemElements();
 elements = iso.getItemElements();
diff --git a/types/jasmine-fixture/index.d.ts b/types/jasmine-fixture/index.d.ts
index f018dde1cf..3c02fad4ac 100644
--- a/types/jasmine-fixture/index.d.ts
+++ b/types/jasmine-fixture/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/searls/jasmine-fixture
 // Definitions by: Craig Brett <https://github.com/craigbrett17/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="jasmine" />
 
diff --git a/types/jasmine-given/index.d.ts b/types/jasmine-given/index.d.ts
new file mode 100644
index 0000000000..70a23d7e07
--- /dev/null
+++ b/types/jasmine-given/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for jasmine-given 2.6
+// Project: https://github.com/searls/jasmine-given
+// Definitions by: Shai Reznik <https://github.com/shairez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function Given(func: () => void): void;
+declare function When(func: () => void): void;
+declare function Then(func: () => void): void;
+declare function And(func: () => void): void;
+declare function Invariant(func: () => void): void;
diff --git a/types/jasmine-given/jasmine-given-tests.ts b/types/jasmine-given/jasmine-given-tests.ts
new file mode 100644
index 0000000000..8a994ecbbe
--- /dev/null
+++ b/types/jasmine-given/jasmine-given-tests.ts
@@ -0,0 +1,9 @@
+Given(() => { });
+
+When(() => { });
+
+Then(() => { });
+
+And(() => { });
+
+Invariant(() => {});
diff --git a/types/jasmine-given/tsconfig.json b/types/jasmine-given/tsconfig.json
new file mode 100644
index 0000000000..cb1571590b
--- /dev/null
+++ b/types/jasmine-given/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "jasmine-given-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/jasmine-given/tslint.json b/types/jasmine-given/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/jasmine-given/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/jasmine-jquery/index.d.ts b/types/jasmine-jquery/index.d.ts
index 14eb26b380..4cb2de8c26 100644
--- a/types/jasmine-jquery/index.d.ts
+++ b/types/jasmine-jquery/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/velesin/jasmine-jquery
 // Definitions by: Gregor Stamac <https://github.com/gstamac/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="jasmine"/>
 /// <reference types="jquery"/>
diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index 11b0d1919c..f1af5ef514 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -1,44 +1,123 @@
 // Type definitions for Jasmine 2.5.2
 // 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/>
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Theodore Brown <https://github.com/theodorejb>, David Pärsson <https://github.com/davidparsson/>, Gabe Moothart <https://github.com/gmoothart>, Lukas Zech <https://github.com/lukas-zech-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
 
 // For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
 
+/**
+ * Create a group of specs (often called a suite).
+ * @param description Textual description of the group
+ * @param specDefinitions Function for Jasmine to invoke that will define inner suites a specs
+ */
 declare function describe(description: string, specDefinitions: () => void): void;
 declare function fdescribe(description: string, specDefinitions: () => void): void;
 declare function xdescribe(description: string, specDefinitions: () => void): void;
 
+/**
+ * Define a single spec. A spec should contain one or more expectations that test the state of the code.
+ * A spec whose expectations all succeed will be passing and a spec with any failures will fail.
+ * @param expectation Textual description of what this spec is checking
+ * @param assertion Function that contains the code of your test. If not provided the test will be pending.
+ * @param timeout Custom timeout for an async spec.
+ */
 declare function it(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
+
+/**
+ * A focused it
+ * If suites or specs are focused, only those that are focused will be executed.
+ * @param expectation 
+ * @param assertion
+ * @param timeout
+ */
 declare function fit(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
 declare function xit(expectation: string, assertion?: (done: DoneFn) => void, timeout?: number): void;
 
-/** If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending. */
+/**
+ * Mark a spec as pending, expectation results will be ignored.
+ * If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending.
+ * @param reason
+ * @returns {} 
+ */
 declare function pending(reason?: string): void;
 
+/**
+ * Run some shared setup before each of the specs in the describe in which it is called.
+ * @param action Function that contains the code to setup your specs.
+ * @param timeout Custom timeout for an async beforeEach.
+ */
 declare function beforeEach(action: (done: DoneFn) => void, timeout?: number): void;
+
+/**
+ * Run some shared teardown after each of the specs in the describe in which it is called.
+ * @param action Function that contains the code to teardown your specs.
+ * @param timeout Custom timeout for an async afterEach.
+ */
 declare function afterEach(action: (done: DoneFn) => void, timeout?: number): void;
 
+/**
+ * Run some shared setup once before all of the specs in the describe are run.
+ * Note: Be careful, sharing the setup from a beforeAll makes it easy to accidentally leak state between your specs so that they erroneously pass or fail.
+ * @param action Function that contains the code to setup your specs.
+ * @param timeout Custom timeout for an async beforeAll.
+ */
 declare function beforeAll(action: (done: DoneFn) => void, timeout?: number): void;
+
+/**
+ * Run some shared teardown once before all of the specs in the describe are run.
+ * Note: Be careful, sharing the teardown from a afterAll makes it easy to accidentally leak state between your specs so that they erroneously pass or fail.
+ * @param action Function that contains the code to teardown your specs.
+ * @param timeout Custom timeout for an async afterAll
+ */
 declare function afterAll(action: (done: DoneFn) => void, timeout?: number): void;
 
+/**
+ * Create an expectation for a spec.
+ * @param spy
+ */
 declare function expect(spy: Function): jasmine.Matchers<any>;
+
+/**
+ * Create an expectation for a spec.
+ * @param actual
+ */
 declare function expect<T>(actual: ArrayLike<T>): jasmine.ArrayLikeMatchers<T>;
+
+/**
+ * Create an expectation for a spec.
+ * @param actual Actual computed value to test expectations against.
+ */
 declare function expect<T>(actual: T): jasmine.Matchers<T>;
 
+/**
+ * Explicitly mark a spec as failed.
+ * @param e
+ */
 declare function fail(e?: any): void;
+
 /** Action method that should be called when the async work is complete */
 interface DoneFn extends Function {
     (): void;
 
     /** fails the spec and indicates that it has completed. If the message is an Error, Error.message is used */
-    fail: (message?: Error|string) => void;
+    fail: (message?: Error | string) => void;
 }
 
+/**
+ * Install a spy onto an existing object.
+ * @param object The object upon which to install the Spy
+ * @param method The name of the method to replace with a Spy.
+ */
 declare function spyOn<T>(object: T, method: keyof T): jasmine.Spy;
 
+/**
+ * Install a spy on a property onto an existing object.
+ * @param object The object upon which to install the Spy
+ * @param property The name of the property to replace with a Spy
+ * @param accessType The access type (get|set) of the property to Spy on.
+ */
 declare function spyOnProperty<T>(object: T, property: keyof T, accessType: string): jasmine.Spy;
 
 declare function runs(asyncMethod: Function): void;
@@ -58,8 +137,12 @@ declare namespace jasmine {
     function objectContaining<T>(sample: Partial<T>): ObjectContaining<T>;
     function createSpy(name: string, originalFn?: Function): Spy;
 
-    function createSpyObj(baseName: string, methodNames: any[]): any;
-    function createSpyObj<T>(baseName: string, methodNames: any[]): T;
+    function createSpyObj(baseName: string, methodNames: any[] | {[methodName: string]: any}): any;
+    function createSpyObj<T>(baseName: string, methodNames: any[] | {[methodName: string]: any}): SpyObj<T>;
+
+    function createSpyObj(baseName: string, methodNames: any): any;
+    function createSpyObj(methodNames: any[]): any;
+    function createSpyObj(methodNames: any): any;
 
     function pp(value: any): string;
 
@@ -75,7 +158,7 @@ declare namespace jasmine {
     function formatErrorMsg(domain: string, usage: string): (msg: string) => string;
 
     interface Any {
-
+        (...params: any[]):any; // jasmine.Any can also be a function
         new (expectedClass: any): any;
 
         jasmineMatches(other: any): boolean;
@@ -126,7 +209,7 @@ declare namespace jasmine {
         withMock(func: () => void): void;
     }
 
-    type CustomEqualityTester = (first: any, second: any) => boolean;
+    type CustomEqualityTester = (first: any, second: any) => boolean | void;
 
     interface CustomMatcher {
         compare<T>(actual: T, expected: T): CustomMatcherResult;
@@ -248,7 +331,7 @@ declare namespace jasmine {
     }
 
     interface Order {
-        new (options: {random: boolean, seed: string}): any;
+        new (options: { random: boolean, seed: string }): any;
         random: boolean;
         seed: string;
         sort<T>(items: T[]): T[];
@@ -321,7 +404,20 @@ declare namespace jasmine {
         isNot?: boolean;
         message(): any;
 
+        /**
+         * 
+         * @param expected the actual value to be === to the expected value.
+         * @param expectationFailOutput 
+         * @returns {} 
+         */
         toBe(expected: Expected<T>, expectationFailOutput?: any): boolean;
+
+        /**
+         *  
+         * @param expected the actual value to be equal to the expected, using deep equality comparison.
+         * @param expectationFailOutput 
+         * @returns {} 
+         */
         toEqual(expected: Expected<T>, expectationFailOutput?: any): boolean;
         toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
         toBeDefined(expectationFailOutput?: any): boolean;
@@ -350,7 +446,7 @@ declare namespace jasmine {
     interface ArrayLikeMatchers<T> extends Matchers<ArrayLike<T>> {
         toBe(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
         toEqual(expected: Expected<ArrayLike<T>>, expectationFailOutput?: any): boolean;
-        toContain(expected: T, expectationFailOutput?: any): boolean;
+        toContain(expected: Expected<T>, expectationFailOutput?: any): boolean;
         not: ArrayLikeMatchers<T>;
     }
 
@@ -510,10 +606,14 @@ declare namespace jasmine {
         identity: string;
         and: SpyAnd;
         calls: Calls;
-        mostRecentCall: {args: any[]; };
+        mostRecentCall: { args: any[]; };
         argsForCall: any[];
     }
 
+    type SpyObj<T> = T & {
+      [k in keyof T]: Spy;
+    }
+
     interface SpyAnd {
         /** By chaining the spy with and.callThrough, the spy will still track all calls to it but in addition it will delegate to the actual implementation. */
         callThrough(): Spy;
@@ -595,3 +695,39 @@ declare namespace jasmine {
     export var DEFAULT_TIMEOUT_INTERVAL: number;
     export var MAX_PRETTY_PRINT_DEPTH: number;
 }
+
+declare module "jasmine" {
+    class jasmine {
+        constructor(options: any);
+        jasmine: jasmine.Jasmine;
+        addMatchers(matchers: jasmine.CustomMatcherFactories): void;
+        addReporter(reporter: jasmine.Reporter): void;
+        addSpecFile(filePath: string): void;
+        addSpecFiles(files: string[]): void;
+        configureDefaultReporter(options: any, ...args: any[]): void;
+        execute(files: any, filterString: any): any;
+        exitCodeCompletion(passed: any): void;
+        loadConfig(config: any): void;
+        loadConfigFile(configFilePath: any): void;
+        loadHelpers(): void;
+        loadSpecs(): void;
+        onComplete(onCompleteCallback: () => void): void;
+        provideFallbackReporter(reporter: jasmine.Reporter): void;
+        randomizeTests(value?: any): boolean;
+        seed(value: any): void;
+        showColors(value: any): void;
+        stopSpecOnExpectationFailure(value: any): void;
+        static ConsoleReporter(): any;
+        env: jasmine.Env;
+        reportersCount: number;
+        completionReporter: jasmine.CustomReporter;
+        reporter: jasmine.CustomReporter;
+        coreVersion(): string;
+        showingColors: boolean;
+        projectBaseDir: string;
+        printDeprecation(): void;
+        specFiles: string[];
+        helperFiles: string[];
+    }
+    export = jasmine;
+}
diff --git a/types/jasmine/jasmine-tests.ts b/types/jasmine/jasmine-tests.ts
index d681d972b0..017896ebf5 100644
--- a/types/jasmine/jasmine-tests.ts
+++ b/types/jasmine/jasmine-tests.ts
@@ -112,6 +112,13 @@ describe("Included matchers:", () => {
         expect(a).not.toContain("quux");
     });
 
+    it("The 'toContain' matcher is also for finding an object containing distinct properties in an Array", () => {
+        var a = [{ a: "foo" }, { a: "bar" }, { b: "baz" }];
+
+        expect(a).toContain(jasmine.objectContaining({ a: "foo" }));
+        expect(a).not.toContain({ a: "quux" });
+    });
+
     it("The 'toBeLessThan' matcher is for mathematical comparisons", () => {
         var pi = 3.1415926,
             e = 2.78;
@@ -616,9 +623,14 @@ describe("A spy, when created manually", () => {
 
 describe("Multiple spies, when created manually", () => {
     var tape: any;
+    var el: jasmine.SpyObj<Element>;
 
     beforeEach(() => {
         tape = jasmine.createSpyObj('tape', ['play', 'pause', 'stop', 'rewind']);
+        el = jasmine.createSpyObj<Element>('Element', ['hasAttribute']);
+
+        el.hasAttribute.and.returnValue(false);
+        el.hasAttribute("href");
 
         tape.play();
         tape.pause();
@@ -650,6 +662,25 @@ describe("jasmine.any", () => {
         expect(12).toEqual(jasmine.any(Number));
     });
 
+    it("matches any function", () => {
+        interface Test {
+            fn1(): void;
+            fn2(param1: number): number;
+        }
+
+        const a: Test = {
+            fn1: () => { },
+            fn2: (param1: number) => { return param1; },
+        };
+
+        const expected: Test = {
+            fn1: jasmine.any(Function),
+            fn2: jasmine.any(Function),
+        };
+
+        expect(a).toEqual(expected);
+    });
+
     describe("when used with a spy", () => {
         it("is useful for comparing arguments", () => {
             var foo = jasmine.createSpy('foo');
@@ -841,7 +872,7 @@ describe("Fail", () => {
 
 // test based on http://jasmine.github.io/2.2/custom_equality.html
 describe("custom equality", () => {
-    var myCustomEquality: jasmine.CustomEqualityTester = function(first: any, second: any): boolean {
+    var myCustomEquality: jasmine.CustomEqualityTester = function (first: any, second: any): boolean | void {
         if (typeof first === "string" && typeof second === "string") {
             return first[0] === second[1];
         }
@@ -983,6 +1014,54 @@ describe("Randomize Tests", () => {
     });
 });
 
+//dest spces copied from jasmine project (https://github.com/jasmine/jasmine/blob/master/spec/core/SpecSpec.js)
+describe("createSpyObj", function () {
+    it("should create an object with spy methods and corresponding return values when you call jasmine.createSpyObj() with an object", function () {
+        var spyObj = jasmine.createSpyObj('BaseName', { 'method1': 42, 'method2': 'special sauce' });
+
+        expect(spyObj.method1()).toEqual(42);
+        expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
+
+        expect(spyObj.method2()).toEqual('special sauce');
+        expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
+    });
+
+
+    it("should create an object with a bunch of spy methods when you call jasmine.createSpyObj()", function () {
+        var spyObj = jasmine.createSpyObj('BaseName', ['method1', 'method2']);
+
+        expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function) });
+        expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
+        expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
+    });
+
+    it("should allow you to omit the baseName", function () {
+        var spyObj = jasmine.createSpyObj(['method1', 'method2']);
+
+        expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function) });
+        expect(spyObj.method1.and.identity()).toEqual('unknown.method1');
+        expect(spyObj.method2.and.identity()).toEqual('unknown.method2');
+    });
+
+    it("should throw if you do not pass an array or object argument", function () {
+        expect(function () {
+            jasmine.createSpyObj('BaseName');
+        }).toThrow("createSpyObj requires a non-empty array or object of method names to create spies for");
+    });
+
+    it("should throw if you pass an empty array argument", function () {
+        expect(function () {
+            jasmine.createSpyObj('BaseName', []);
+        }).toThrow("createSpyObj requires a non-empty array or object of method names to create spies for");
+    });
+
+    it("should throw if you pass an empty object argument", function () {
+        expect(function () {
+            jasmine.createSpyObj('BaseName', {});
+        }).toThrow("createSpyObj requires a non-empty array or object of method names to create spies for");
+    });
+});
+
 (() => {
     // from boot.js
     var env = jasmine.getEnv();
@@ -1007,4 +1086,4 @@ describe("Randomize Tests", () => {
 })();
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
-jasmine.MAX_PRETTY_PRINT_DEPTH = 40;
\ No newline at end of file
+jasmine.MAX_PRETTY_PRINT_DEPTH = 40;
diff --git a/types/java/index.d.ts b/types/java/index.d.ts
index 46dc577e35..cf770a8807 100644
--- a/types/java/index.d.ts
+++ b/types/java/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/joeferner/node-java
 // Definitions by: Jim Lloyd <https://github.com/jimlloyd>, Kentaro Teramoto <https://github.com/hrl7>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/java/java-tests.ts b/types/java/java-tests.ts
index 6d464b36e1..4c79640733 100644
--- a/types/java/java-tests.ts
+++ b/types/java/java-tests.ts
@@ -1,5 +1,3 @@
-///<reference types="bluebird"/>
-
 import java = require('java');
 import BluePromise = require('bluebird');
 
@@ -9,7 +7,7 @@ java.asyncOptions = {
   promiseSuffix: 'P',
   promisify: BluePromise.promisify
 };
-// todo: figure out why promise doesn't work here 
+// todo: figure out why promise doesn't work here
 /* java.registerClientP((): Promise<void> => {
   return BluePromise.resolve();
 }); */
diff --git a/types/javascript-state-machine/index.d.ts b/types/javascript-state-machine/index.d.ts
new file mode 100644
index 0000000000..32088d7bd4
--- /dev/null
+++ b/types/javascript-state-machine/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for Finite State Machine 2.4
+// Project: https://github.com/jakesgordon/javascript-state-machine
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>,
+// 					Maarten Docter <https://github.com/mdocter>,
+// 					William Sears <https://github.com/MrBigDog2U>,
+// 					samael <https://github.com/samael65535>,
+// 					taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type StateMachineErrorCallback = (
+	eventName?: string,
+	from?: string,
+	to?: string,
+	args?: any[],
+	errorCode?: number,
+	errorMessage?: string,
+	ex?: Error
+) => void; // NB. errorCode? See: StateMachine.Error
+
+export interface StateMachineEventDef {
+	name: string;
+	from: any;    // string or string[]
+	to: string;
+}
+
+export type StateMachineEvent = (...args: any[]) => void;
+
+export interface StateMachineConfig {
+	initial?: any; // string or { state: 'foo', event: 'setup', defer: true|false }
+	events?: StateMachineEventDef[];
+	callbacks?: {
+		[s: string]: (event?: string, from?: string, to?: string, ...args: any[]) => any;
+	};
+	target?: StateMachine;
+	error?: StateMachineErrorCallback;
+}
+
+export type StateMachineIsFinished = (state: string) => boolean;
+
+export const VERSION: string; 		        // = "2.4.0"
+export const WILDCARD: string;		        // = '*'
+export const ASYNC: string;			        // = 'async'
+
+export const Result: {
+	SUCCEEDED: number;	        // = 1, the event transitioned successfully from one state to another
+	NOTRANSITION: number;	    // = 2, the event was successfull but no state transition was necessary
+	CANCELLED: number;	        // = 3, the event was cancelled by the caller in a beforeEvent callback
+	PENDING: number;		        // = 4, the event is asynchronous and the caller is in control of when the transition occurs
+};
+
+export const Error: {
+	INVALID_TRANSITION: number;	// = 100, caller tried to fire an event that was innapropriate in the current state
+	PENDING_TRANSITION: number;	// = 200, caller tried to fire an event while an async transition was still pending
+	INVALID_CALLBACK: number;	// = 300, caller provided callback function threw an exception
+};
+
+export function create(config: StateMachineConfig, target?: StateMachine): StateMachine;
+
+export interface StateMachineTransition {
+	(): void;
+	cancel(): void;
+}
+
+export type StateMachineIs = (state: string) => boolean;
+
+export type StateMachineCan = (evt: string) => boolean;
+
+export type StateMachineTransitions = () => string[];
+
+export interface StateMachine {
+	current: string;
+	is: StateMachineIs;
+	can: StateMachineCan;
+	cannot: StateMachineCan;
+	error: StateMachineErrorCallback;
+	isFinished: StateMachineIsFinished;
+	/*  transition - only available when performing async state transitions; otherwise null. Can be a:
+		[1] fsm.transition(); // called from async callback
+		[2] fsm.transition.cancel();
+	*/
+	transition: StateMachineTransition;
+	transitions: StateMachineTransitions;
+}
+
+export namespace StateMachine {
+	const VERSION: string; 		        // = "2.4.0"
+	const WILDCARD: string;		        // = '*'
+	const ASYNC: string;			        // = 'async'
+
+	const Result: {
+		SUCCEEDED: number;	        // = 1, the event transitioned successfully from one state to another
+		NOTRANSITION: number;	    // = 2, the event was successfull but no state transition was necessary
+		CANCELLED: number;	        // = 3, the event was cancelled by the caller in a beforeEvent callback
+		PENDING: number;		        // = 4, the event is asynchronous and the caller is in control of when the transition occurs
+	};
+
+	const Error: {
+		INVALID_TRANSITION: number;	// = 100, caller tried to fire an event that was innapropriate in the current state
+		PENDING_TRANSITION: number;	// = 200, caller tried to fire an event while an async transition was still pending
+		INVALID_CALLBACK: number;	// = 300, caller provided callback function threw an exception
+	};
+	function create(config: StateMachineConfig, target?: StateMachine): StateMachine;
+}
+
+export as namespace StateMachine;
diff --git a/types/javascript-state-machine/javascript-state-machine-tests.ts b/types/javascript-state-machine/javascript-state-machine-tests.ts
new file mode 100644
index 0000000000..099926acf4
--- /dev/null
+++ b/types/javascript-state-machine/javascript-state-machine-tests.ts
@@ -0,0 +1,32 @@
+import { StateMachine, StateMachineEvent, create } from 'javascript-state-machine';
+
+interface StateMachineTest extends StateMachine {
+	warn?: StateMachineEvent;
+	panic?: StateMachineEvent;
+	calm?: StateMachineEvent;
+	clear?: StateMachineEvent;
+}
+
+const fsm: StateMachineTest = StateMachine.create({
+	initial: 'green',
+	events: [
+		{ name: 'warn', from: 'green', to: 'yellow' },
+		{ name: 'panic', from: 'yellow', to: 'red' },
+		{ name: 'calm', from: 'red', to: 'yellow' },
+		{ name: 'clear', from: 'yellow', to: 'green' }
+	],
+	callbacks: {
+		onpanic(event?, from?, to?, msg?) { alert('panic! ' + msg); },
+		onclear(event?, from?, to?, msg?) { alert('thanks to ' + msg); },
+		ongreen(event?, from?, to?) { document.body.className = 'green'; },
+		onyellow(event?, from?, to?) { document.body.className = 'yellow'; },
+		onred(event?, from?, to?) { document.body.className = 'red'; },
+	}
+});
+
+// fsm.warn();					// transition from green to yellow
+// fsm.panic("ERROR ALERT");	// transition from yellow to red
+// fsm.calm();					// transition from red to yellow
+// fsm.clear("All clear");		// transition from yellow to green
+
+const transitions = fsm.transitions();
diff --git a/types/state-machine/tsconfig.json b/types/javascript-state-machine/tsconfig.json
similarity index 90%
rename from types/state-machine/tsconfig.json
rename to types/javascript-state-machine/tsconfig.json
index 3d1eaef3f7..45c4f171fb 100644
--- a/types/state-machine/tsconfig.json
+++ b/types/javascript-state-machine/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "state-machine-tests.ts"
+        "javascript-state-machine-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/javascript-state-machine/tslint.json b/types/javascript-state-machine/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/javascript-state-machine/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jcanvas/index.d.ts b/types/jcanvas/index.d.ts
index a5c1b7204f..4fdc3f72af 100644
--- a/types/jcanvas/index.d.ts
+++ b/types/jcanvas/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/caleb531/jcanvas
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jcanvas/jcanvas-tests.ts b/types/jcanvas/jcanvas-tests.ts
index 3cd5e32cab..667d9f9619 100644
--- a/types/jcanvas/jcanvas-tests.ts
+++ b/types/jcanvas/jcanvas-tests.ts
@@ -1,5 +1,4 @@
 
-import $ = require("jquery");
 import jcanvas = require("jcanvas");
 jcanvas($, window);
 
diff --git a/types/jdataview/index.d.ts b/types/jdataview/index.d.ts
index b91a6813ec..f80784eb60 100644
--- a/types/jdataview/index.d.ts
+++ b/types/jdataview/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jDataView/jDataView
 // Definitions by: Ingvar Stepanyan <https://github.com/RReverser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare class jDataView implements DataView {
 	constructor(byteCount: number, offset?: number, length?: number, littleEndian?: boolean)
diff --git a/types/jest-matchers/index.d.ts b/types/jest-matchers/index.d.ts
new file mode 100644
index 0000000000..27e6a5b9f0
--- /dev/null
+++ b/types/jest-matchers/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for jest-matchers 20.0
+// Project: https://github.com/facebook/jest#readme
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="jest" />
+export = expect;
diff --git a/types/jest-matchers/jest-matchers-tests.ts b/types/jest-matchers/jest-matchers-tests.ts
new file mode 100644
index 0000000000..7484dd5ed8
--- /dev/null
+++ b/types/jest-matchers/jest-matchers-tests.ts
@@ -0,0 +1,3 @@
+import * as expect from 'jest-matchers';
+
+expect('x').toEqual('x');
diff --git a/types/jest-matchers/tsconfig.json b/types/jest-matchers/tsconfig.json
new file mode 100644
index 0000000000..37a7e86d8d
--- /dev/null
+++ b/types/jest-matchers/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-matchers-tests.ts"
+    ]
+}
diff --git a/types/jest-matchers/tslint.json b/types/jest-matchers/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-matchers/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 36011e67a7..b886bdeaac 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Jest 19.2.0
+// Type definitions for Jest 20.0.5
 // Project: http://facebook.github.io/jest/
-// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>, Alexey Svetliakov <https://github.com/asvetliakov>, Alex Jover Morales <https://github.com/alexjoverm>
+// Definitions by: Asana <https://asana.com>, Ivo Stratev <https://github.com/NoHomey>, jwbay <https://github.com/jwbay>, Alexey Svetliakov <https://github.com/asvetliakov>, Alex Jover Morales <https://github.com/alexjoverm>, Allan Lukwago <https://github.com/epicallan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -114,8 +114,9 @@ declare namespace jest {
          *
          * @param {string} name The name of your test
          * @param {fn?} ProvidesCallback The function for your test
+         * @param {timeout?} timeout The timeout for an async function test
          */
-        (name: string, fn?: ProvidesCallback): void;
+        (name: string, fn?: ProvidesCallback, timeout?: number): void;
         /** Only runs this test in the current file. */
         only: It;
         skip: It;
@@ -152,6 +153,44 @@ declare namespace jest {
         [key: string]: (this: MatcherUtils, received: any, actual: any) => { message: () => string, pass: boolean };
     }
 
+    interface SnapshotSerializerOptions {
+        callToJSON?: boolean;
+        edgeSpacing?: string;
+        spacing?: string;
+        escapeRegex?: boolean;
+        highlight?: boolean;
+        indent?: number;
+        maxDepth?: number;
+        min?: boolean;
+        plugins?: Array<SnapshotSerializerPlugin>
+        printFunctionName?: boolean;
+        theme?: SnapshotSerializerOptionsTheme;
+
+        // see https://github.com/facebook/jest/blob/e56103cf142d2e87542ddfb6bd892bcee262c0e6/types/PrettyFormat.js
+    }
+    interface SnapshotSerializerOptionsTheme {
+        comment?: string;
+        content?: string;
+        prop?: string;
+        tag?: string;
+        value?: string;
+    }
+    interface SnapshotSerializerColor {
+        close: string;
+        open: string;
+    }
+    interface SnapshotSerializerColors {
+        comment: SnapshotSerializerColor;
+        content: SnapshotSerializerColor;
+        prop: SnapshotSerializerColor;
+        tag: SnapshotSerializerColor;
+        value: SnapshotSerializerColor;
+    }
+    interface SnapshotSerializerPlugin {
+        print(val:any, serialize:((val:any) => string), indent:((str:string) => string), opts:SnapshotSerializerOptions, colors: SnapshotSerializerColors) : string;
+        test(val:any) : boolean;
+    }
+
     /** The `expect` function is used every time you want to test a value. You will rarely call `expect` by itself. */
     interface Expect {
         /**
@@ -159,7 +198,7 @@ declare namespace jest {
          *
          * @param {any} actual The value to apply matchers against.
         */
-        (actual: any): Matchers;
+        (actual: any): Matchers<void>;
         anything(): any;
         /** Matches anything that was created with the given constructor. You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value. */
         any(classType: any): any;
@@ -167,75 +206,85 @@ declare namespace jest {
         arrayContaining(arr: any[]): any;
         /** Verifies that a certain number of assertions are called during a test. This is often useful when testing asynchronous code, in order to make sure that assertions in a callback actually got called. */
         assertions(num: number): void;
+        /** Verifies that at least one assertion is called during a test. This is often useful when testing asynchronous code, in order to make sure that assertions in a callback actually got called. */
+        hasAssertions(): void;
         /** You can use `expect.extend` to add your own matchers to Jest. */
         extend(obj: ExpectExtendMap): void;
+        /** Adds a module to format application-specific data structures for serialization. */
+        addSnapshotSerializer(serializer: SnapshotSerializerPlugin) : void;
         /** Matches any object that recursively matches the provided keys. This is often handy in conjunction with other asymmetric matchers. */
         objectContaining(obj: {}): any;
         /** Matches any string that contains the exact provided string */
         stringMatching(str: string | RegExp): any;
     }
 
-    interface Matchers {
+    interface Matchers<R> {
         /** If you know how to test something, `.not` lets you test its opposite. */
-        not: Matchers;
-        lastCalledWith(...args: any[]): void;
+        not: Matchers<R>;
+        /** Use resolves to unwrap the value of a fulfilled promise so any other matcher can be chained. If the promise is rejected the assertion fails. */
+        resolves: Matchers<Promise<R>>;
+        /** Unwraps the reason of a rejected promise so any other matcher can be chained. If the promise is fulfilled the assertion fails. */
+        rejects: Matchers<Promise<R>>;
+        lastCalledWith(...args: any[]): R;
         /** Checks that a value is what you expect. It uses `===` to check strict equality. Don't use `toBe` with floating-point numbers. */
-        toBe(expected: any): void;
+        toBe(expected: any): R;
         /** Ensures that a mock function is called. */
-        toBeCalled(): void;
+        toBeCalled(): R;
         /** Ensure that a mock function is called with specific arguments. */
-        toBeCalledWith(...args: any[]): void;
+        toBeCalledWith(...args: any[]): R;
         /** Using exact equality with floating point numbers is a bad idea. Rounding means that intuitive things fail. */
-        toBeCloseTo(expected: number, delta?: number): void;
+        toBeCloseTo(expected: number, delta?: number): R;
         /** Ensure that a variable is not undefined. */
-        toBeDefined(): void;
+        toBeDefined(): R;
         /** When you don't care what a value is, you just want to ensure a value is false in a boolean context. */
-        toBeFalsy(): void;
+        toBeFalsy(): R;
         /** For comparing floating point numbers. */
-        toBeGreaterThan(expected: number): void;
+        toBeGreaterThan(expected: number): R;
         /** For comparing floating point numbers. */
-        toBeGreaterThanOrEqual(expected: number): void;
+        toBeGreaterThanOrEqual(expected: number): R;
         /** Ensure that an object is an instance of a class. This matcher uses `instanceof` underneath. */
-        toBeInstanceOf(expected: any): void
+        toBeInstanceOf(expected: any): R
         /** For comparing floating point numbers. */
-        toBeLessThan(expected: number): void;
+        toBeLessThan(expected: number): R;
         /** For comparing floating point numbers. */
-        toBeLessThanOrEqual(expected: number): void;
+        toBeLessThanOrEqual(expected: number): R;
         /** This is the same as `.toBe(null)` but the error messages are a bit nicer. So use `.toBeNull()` when you want to check that something is null. */
-        toBeNull(): void;
+        toBeNull(): R;
         /** Use when you don't care what a value is, you just want to ensure a value is true in a boolean context. In JavaScript, there are six falsy values: `false`, `0`, `''`, `null`, `undefined`, and `NaN`. Everything else is truthy. */
-        toBeTruthy(): void;
+        toBeTruthy(): R;
         /** Used to check that a variable is undefined. */
-        toBeUndefined(): void;
+        toBeUndefined(): R;
+        /** Used to check that a variable is NaN. */
+        toBeNaN(): R;
         /** Used when you want to check that an item is in a list. For testing the items in the list, this uses `===`, a strict equality check. */
-        toContain(expected: any): void;
+        toContain(expected: any): R;
         /** Used when you want to check that an item is in a list. For testing the items in the list, this  matcher recursively checks the equality of all fields, rather than checking for object identity. */
-        toContainEqual(expected: any): void;
+        toContainEqual(expected: any): R;
         /** Used when you want to check that two objects have the same value. This matcher recursively checks the equality of all fields, rather than checking for object identity. */
-        toEqual(expected: any): void;
+        toEqual(expected: any): R;
         /** Ensures that a mock function is called. */
-        toHaveBeenCalled(): boolean;
+        toHaveBeenCalled(): R;
         /** Ensures that a mock function is called an exact number of times. */
-        toHaveBeenCalledTimes(expected: number): boolean;
+        toHaveBeenCalledTimes(expected: number): R;
         /** Ensure that a mock function is called with specific arguments. */
-        toHaveBeenCalledWith(...params: any[]): boolean;
+        toHaveBeenCalledWith(...params: any[]): R;
         /** If you have a mock function, you can use `.toHaveBeenLastCalledWith` to test what arguments it was last called with. */
-        toHaveBeenLastCalledWith(...params: any[]): boolean;
+        toHaveBeenLastCalledWith(...params: any[]): R;
         /** Used to check that an object has a `.length` property and it is set to a certain numeric value. */
-        toHaveLength(expected: number): void;
-        toHaveProperty(propertyPath: string, value?: any): void;
+        toHaveLength(expected: number): R;
+        toHaveProperty(propertyPath: string, value?: any): R;
         /** Check that a string matches a regular expression. */
-        toMatch(expected: string | RegExp): void;
+        toMatch(expected: string | RegExp): R;
         /** Used to check that a JavaScript object matches a subset of the properties of an objec */
-        toMatchObject(expected: {}): void;
+        toMatchObject(expected: {}): R;
         /** This ensures that a value matches the most recent snapshot. Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information. */
-        toMatchSnapshot(snapshotName?: string): void;
+        toMatchSnapshot(snapshotName?: string): R;
         /** Used to test that a function throws when it is called. */
-        toThrow(error?: string | Constructable | RegExp): void;
+        toThrow(error?: string | Constructable | RegExp): R;
         /** If you want to test that a specific error is thrown inside a function. */
-        toThrowError(error?: string | Constructable | RegExp): void;
+        toThrowError(error?: string | Constructable | RegExp): R;
         /** Used to test that a function throws a error matching the most recent snapshot when it is called. */
-        toThrowErrorMatchingSnapshot(): void;
+        toThrowErrorMatchingSnapshot(): R;
     }
 
     interface Constructable {
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index d951153842..ef62f9b1c2 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -1,4 +1,11 @@
-/// <reference types="node" />
+// TODO: Avoid requiring things that don't exist.
+declare var require: {
+    (s: string): any;
+    requireActual(s: string): any;
+    requireMock(s: string): any;
+};
+// TODO: use real jquery types?
+declare var $: any;
 
 // Tests based on the Jest website
 jest.unmock('../sum');
@@ -12,7 +19,6 @@ describe('sum', function() {
 
 describe('fetchCurrentUser', function() {
     it('calls the callback when $.ajax requests are finished', function() {
-        var $ = require('jquery');
         var fetchCurrentUser = require('../fetchCurrentUser');
 
         // Create a mock function for our callback
@@ -123,6 +129,10 @@ xdescribe('Hooks and Suits', function () {
     xit('expect null to be null', function () {
        expect(null).toBeNull();
     });
+
+    xit('expect NaN to be NaN', function () {
+       expect(NaN).toBeNaN();
+    });
 });
 
 describe('compartion', function () {
@@ -335,6 +345,30 @@ describe('toThrowErrorMatchingSnapshot', function () {
     });
 });
 
+const testSerializerPluginString = "set by testSerializerPlugin";
+let testSerializerPluginCallCount = 0;
+expect.addSnapshotSerializer({
+  print(val, serialize, indent, opts, colors) {
+    val.willOverwrite = testSerializerPluginString;
+    testSerializerPluginCallCount += 1;
+    return 'plugin called: ' + serialize(val.willOverwrite);
+  },
+  test(val) {
+    return val && val.willOverwrite && val.willOverwrite !== testSerializerPluginString;
+  },
+});
+describe('addSnapshotSerializer', function () {
+    it('the plugin does its work', function () {
+        testSerializerPluginCallCount = 0;
+        expect({ willOverwrite: { x: 1, y: 2, } }).toMatchSnapshot();
+        expect({ willOverwrite: "this will get overwritten by testSerializerPlugin" }).toMatchSnapshot();
+        expect({ willOverwrite: "so will this" }).toMatchSnapshot();
+        expect({ foo: "this will not" }).toMatchSnapshot();
+        expect(testSerializerPluginCallCount).toBe(3);
+    });
+});
+
+
 function testInstances() {
     var mockFn = jest.fn<Function>();
     var a = new mockFn();
@@ -501,3 +535,41 @@ describe('Mocks', function () {
         anotherIns.testMethod.mockImplementation(() => 1);
     });
 });
+
+// https://facebook.github.io/jest/docs/en/expect.html#resolves
+describe('resolves', function() {
+    it('unwraps the expected Promise', function() {
+        const expectation = expect(Promise.resolve('test')).resolves.toEqual('test');
+        expect(expectation instanceof Promise).toBeTruthy();
+        return expectation;
+    });
+
+    it('unwraps a .toHaveBeenCalledX', function(done) {
+        expect.assertions(2);
+
+        const fn = jest.fn();
+        return expect(Promise.resolve(fn)).resolves.toHaveBeenCalledTimes(0).then(val => {
+            expect(val).toEqual(true);
+            done();
+        });
+    });
+
+    it('unwraps a not.toHaveBeenCalledX', function(done) {
+        expect.assertions(2);
+
+        const fn = jest.fn();
+        return expect(Promise.resolve(fn)).resolves.not.toHaveBeenCalledTimes(1).then(val => {
+            expect(val).toEqual(true);
+            done();
+        });
+    });
+});
+
+// https://facebook.github.io/jest/docs/en/expect.html#rejects
+describe('rejects', function() {
+    it('unwraps the expected Promise', function() {
+        const expectation = expect(Promise.reject(new Error('error'))).rejects.toMatch('error');
+        expect(expectation instanceof Promise).toBeTruthy();
+        return expectation;
+    });
+});
diff --git a/types/jest/v16/jest-tests.ts b/types/jest/v16/jest-tests.ts
index c69eae61a2..7a58d6e9b1 100644
--- a/types/jest/v16/jest-tests.ts
+++ b/types/jest/v16/jest-tests.ts
@@ -1,4 +1,11 @@
-/// <reference types="node" />
+// TODO: Avoid requiring things that don't exist.
+declare var require: {
+    (s: string): any;
+    requireActual(s: string): any;
+    requireMock(s: string): any;
+};
+// TODO: use real jquery types?
+declare var $: any;
 
 // Tests based on the Jest website
 jest.unmock('../sum');
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index dbf134e541..fb3547b3e4 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for joi v10.3.0
+// Type definitions for joi v10.4.0
 // Project: https://github.com/hapijs/joi
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Laurence Dougal Myers <https://github.com/laurence-myers>, Christopher Glantschnig <https://github.com/cglantschnig>, David Broder-Rodgers <https://github.com/DavidBR-SW>, Gael Magnan de Bornier <https://github.com/GaelMagnan>, Rytis Alekna <https://github.com/ralekna>, Pavel Ivanov <https://github.com/schfkt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -146,7 +146,14 @@ export interface ValidationErrorItem {
     type: string;
     path: string;
     options?: ValidationOptions;
-    context?: any;
+    context?: {
+        [key: string]: any;
+        value?: any;
+    };
+}
+
+export interface ValidationErrorFunction {
+    (errors: ValidationErrorItem[]): string | ValidationErrorItem | ValidationErrorItem[] | Error;
 }
 
 export interface ValidationResult<T> {
@@ -313,14 +320,23 @@ export interface AnySchema<T extends AnySchema<Schema>> {
 
     /**
      * Overrides the default joi error with a custom error if the rule fails where:
-     * @param err - the override error.
+     * @param err - can be:
+     *   an instance of `Error` - the override error.
+     *   a `function(errors)`, taking an array of errors as argument, where it must either:
+     *    return a `string` - substitutes the error message with this text
+     *    return a single `object` or an `Array` of it, where:
+     *     `type` - optional parameter providing the type of the error (eg. `number.min`).
+     *     `message` - optional parameter if `template` is provided, containing the text of the error.
+     *     `template` - optional parameter if `message` is provided, containing a template string, using the same format as usual joi language errors.
+     *     `context` - optional parameter, to provide context to your error if you are using the `template`.
+     *    return an `Error` - same as when you directly provide an `Error`, but you can customize the error message based on the errors.
      *
-     * Note that the provided error will be returned as-is, unmodified and undecorated
-     * with any of the normal joi error properties. If validation fails and another
-     * error is found before the error override, that error will be returned and the
-     * override will be ignored (unless the abortEarly option has been set to false).
+     * Note that if you provide an `Error`, it will be returned as-is, unmodified and undecorated with any of the
+     * normal joi error properties. If validation fails and another error is found before the error
+     * override, that error will be returned and the override will be ignored (unless the `abortEarly`
+     * option has been set to `false`).
      */
-    error?(err: Error): T;
+    error?(err: Error | ValidationErrorFunction): T;
 }
 
 export interface BooleanSchema extends AnySchema<BooleanSchema> {
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 3cd2e28b73..a0684724b7 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import Joi = require('joi');
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -13,7 +10,6 @@ var bool: boolean = false;
 var exp: RegExp = null;
 var obj: Object = null;
 var date: Date = null;
-var bin: NodeBuffer = null;
 var err: Error = null;
 var func: Function = null;
 
@@ -23,7 +19,6 @@ var strArr: string[] = [];
 var boolArr: boolean[] = [];
 var expArr: RegExp[] = [];
 var objArr: Object[] = [];
-var bufArr: NodeBuffer[] = [];
 var errArr: Error[] = [];
 var funcArr: Function[] = [];
 
@@ -118,6 +113,7 @@ refOpts = { contextPrefix: str };
 
 var validErr: Joi.ValidationError = null;
 var validErrItem: Joi.ValidationErrorItem;
+var validErrFunc: Joi.ValidationErrorFunction;
 
 validErrItem = {
     message: str,
@@ -133,6 +129,11 @@ validErrItem = {
     context: obj
 };
 
+validErrFunc = errs => errs;
+validErrFunc = errs => errs[0];
+validErrFunc = errs => 'Some error';
+validErrFunc = errs => err;
+
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 schema = anySchema;
@@ -243,6 +244,7 @@ namespace common {
     anySchema = anySchema.empty(anySchema);
 
     anySchema = anySchema.error(err);
+    anySchema = anySchema.error(validErrFunc);
 }
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
diff --git a/types/joi/v6/joi-tests.ts b/types/joi/v6/joi-tests.ts
index 03ca5ffac0..33923b500a 100644
--- a/types/joi/v6/joi-tests.ts
+++ b/types/joi/v6/joi-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import Joi = require('joi');
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -12,7 +10,6 @@ var bool: boolean = false;
 var exp: RegExp = null;
 var obj: Object = null;
 var date: Date = null;
-var bin: NodeBuffer = null;
 var err: Error = null;
 var func: Function = null;
 
@@ -22,7 +19,6 @@ var strArr: string[] = [];
 var boolArr: boolean[] = [];
 var expArr: RegExp[] = [];
 var objArr: Object[] = [];
-var bufArr: NodeBuffer[] = [];
 var errArr: Error[] = [];
 var funcArr: Function[] = [];
 
diff --git a/types/jointjs/index.d.ts b/types/jointjs/index.d.ts
index 5ce0f187f0..c15cdc79c6 100644
--- a/types/jointjs/index.d.ts
+++ b/types/jointjs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jointjs.com/
 // Definitions by: Aidan Reel <http://github.com/areel>, David Durman <http://github.com/DavidDurman>, Ewout Van Gossum <https://github.com/DenEwout>, Federico Caselli <https://github.com/CaselIT>, Chris Moran <https://github.com/ChrisMoran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // typings: https://github.com/CaselIT/typings-jointjs
 
 /// <reference types="backbone" />
diff --git a/types/jqgrid/index.d.ts b/types/jqgrid/index.d.ts
index 00310f43ad..5b85910077 100644
--- a/types/jqgrid/index.d.ts
+++ b/types/jqgrid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tonytomov/jqGrid
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -414,4 +415,4 @@ interface JQuery {
      * @returns {} 
      */
     setGridParam(obj: any): void;
-}
\ No newline at end of file
+}
diff --git a/types/jqrangeslider/index.d.ts b/types/jqrangeslider/index.d.ts
index 36bb5a16d2..5ee9a45ed7 100644
--- a/types/jqrangeslider/index.d.ts
+++ b/types/jqrangeslider/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://ghusse.github.com/jQRangeSlider
 // Definitions by: Dániel Tar <https://github.com/qcz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="jqueryui"/>
diff --git a/types/jqrangeslider/tsconfig.json b/types/jqrangeslider/tsconfig.json
index 2484e06a5c..4a41364b36 100644
--- a/types/jqrangeslider/tsconfig.json
+++ b/types/jqrangeslider/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jqrangeslider-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery-ajax-chain/index.d.ts b/types/jquery-ajax-chain/index.d.ts
index 6f15c1190f..3c24da237c 100644
--- a/types/jquery-ajax-chain/index.d.ts
+++ b/types/jquery-ajax-chain/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/humana-fragilitas/jQuery-Ajax-Chain/
 // Definitions by: Andrea Blasio <https://github.com/humana-fragilitas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-alertable/index.d.ts b/types/jquery-alertable/index.d.ts
index 4f874547e2..3b302ce286 100644
--- a/types/jquery-alertable/index.d.ts
+++ b/types/jquery-alertable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/claviska/jquery-alertable
 // Definitions by: Steven Robertson <https://github.com/stever>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-backstretch/index.d.ts b/types/jquery-backstretch/index.d.ts
index f868cc5c94..7f2826502f 100644
--- a/types/jquery-backstretch/index.d.ts
+++ b/types/jquery-backstretch/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/srobbin/jquery-backstretch
 // Definitions by: Dmytro Kulyk <https://github.com/dkulyk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -89,4 +90,4 @@ interface JQueryStatic {
 interface JQuery {
     backstretch(images:string[], config?:JQueryBackStretch.BackStretchOptions):JQueryBackStretch.BackStretch;
     backstretch(method:string):JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery-cropbox/index.d.ts b/types/jquery-cropbox/index.d.ts
index 42d2ed9689..0de20878d5 100644
--- a/types/jquery-cropbox/index.d.ts
+++ b/types/jquery-cropbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/acornejo/jquery-cropbox
 // Definitions by: Per Kastman <https://github.com/PerKastman/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-easy-loading/index.d.ts b/types/jquery-easy-loading/index.d.ts
index c6d878df1a..72ab6cd65d 100644
--- a/types/jquery-easy-loading/index.d.ts
+++ b/types/jquery-easy-loading/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: delphinus <https://github.com/delphinus35/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 declare namespace JQueryEasyLoading {
 
     interface Static {
diff --git a/types/jquery-easy-loading/tsconfig.json b/types/jquery-easy-loading/tsconfig.json
index 392a80ff8c..efe892fc96 100644
--- a/types/jquery-easy-loading/tsconfig.json
+++ b/types/jquery-easy-loading/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jquery-easy-loading-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery-fullscreen/index.d.ts b/types/jquery-fullscreen/index.d.ts
index 477caf3b45..8190ad935c 100644
--- a/types/jquery-fullscreen/index.d.ts
+++ b/types/jquery-fullscreen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kayahr/jquery-fullscreen-plugin
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-handsontable/index.d.ts b/types/jquery-handsontable/index.d.ts
index fbf8bcda33..29a4d8a327 100644
--- a/types/jquery-handsontable/index.d.ts
+++ b/types/jquery-handsontable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://handsontable.com
 // Definitions by: Ted John <https://github.com/intelorca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-jsonrpcclient/index.d.ts b/types/jquery-jsonrpcclient/index.d.ts
index 911e9d08ec..31a2979b74 100644
--- a/types/jquery-jsonrpcclient/index.d.ts
+++ b/types/jquery-jsonrpcclient/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Textalk/jquery.jsonrpcclient.js
 // Definitions by: Maksim Karelov <https://github.com/Ty3uK>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -100,4 +101,4 @@ interface JsonRpcClientFactory {
 
 interface JQueryStatic {
     JsonRpcClient: JsonRpcClientFactory;
-}
\ No newline at end of file
+}
diff --git a/types/jquery-knob/index.d.ts b/types/jquery-knob/index.d.ts
index 925e632c68..ef1e720ba5 100644
--- a/types/jquery-knob/index.d.ts
+++ b/types/jquery-knob/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://anthonyterrien.com/knob/
 // Definitions by: Iain Buchanan <https://github.com/iain8/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-mask-plugin/index.d.ts b/types/jquery-mask-plugin/index.d.ts
index 270828856f..a142d0a97e 100644
--- a/types/jquery-mask-plugin/index.d.ts
+++ b/types/jquery-mask-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://igorescobar.github.io/jQuery-Mask-Plugin/
 // Definitions by: Anže Videnič <https://github.com/avidenic>, Igor Escobar <http://www.igorescobar.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-match-height/index.d.ts b/types/jquery-match-height/index.d.ts
new file mode 100644
index 0000000000..664a5de4b4
--- /dev/null
+++ b/types/jquery-match-height/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for jquery-match-height 0.7
+// Project: https://github.com/liabru/jquery-match-height
+// Definitions by: Andrea Briganti <https://github.com/kbytesys/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery"/>
+
+interface JQueryMatchHeight {
+    _throttle: number;
+    _maintainScroll: boolean;
+    _groups: any[];
+
+    /**
+     * Set all selected elements to the height of the tallest.
+     * If the items are on multiple rows, the items of each row will be set to the tallest of that row.
+     *
+     * @param options
+     */
+    (options?: JQueryMatchHeight.Options): JQuery;
+    _update(): void;
+    _rows($item: JQuery): any[];
+    _beforeUpdate(event: JQueryEventObject, groups: any[]): any;
+    _afterUpdate(event: JQueryEventObject, groups: any[]): any;
+    _apply(elements: any, options: any): void;
+}
+
+declare namespace JQueryMatchHeight {
+    interface Options {
+        byRow?: boolean;
+        property?: string;
+        target?: string;
+        remove?: boolean;
+    }
+}
+
+interface JQuery {
+    matchHeight: JQueryMatchHeight;
+}
diff --git a/types/jquery-match-height/jquery-match-height-tests.ts b/types/jquery-match-height/jquery-match-height-tests.ts
new file mode 100644
index 0000000000..97467573b0
--- /dev/null
+++ b/types/jquery-match-height/jquery-match-height-tests.ts
@@ -0,0 +1,37 @@
+/* from documentation at https://github.com/liabru/jquery-match-height */
+
+$(document).ready(() => {
+    $(".containers").matchHeight();
+    $(".containers").matchHeight({
+        byRow: true,
+        property: "height",
+        remove: true}
+    );
+});
+
+$.fn.matchHeight._update();
+
+$.fn.matchHeight._rows($('.containers'));
+
+$('.containers').matchHeight({ remove: true });
+
+// tslint:disable-next-line no-used-variable
+$.fn.matchHeight._beforeUpdate = (event, groups) => {
+    // do something before any updates are applied
+};
+
+// tslint:disable-next-line no-used-variable
+$.fn.matchHeight._afterUpdate = (event, groups) => {
+    // do something after all updates are applied
+};
+
+let elements = $('.containers');
+let options = {byRow: true};
+
+$.fn.matchHeight._apply(elements, options);
+
+$.fn.matchHeight._throttle = 80;
+
+$.fn.matchHeight._maintainScroll = true;
+
+$.fn.matchHeight._groups;
diff --git a/types/jquery-match-height/tsconfig.json b/types/jquery-match-height/tsconfig.json
new file mode 100644
index 0000000000..2dd28f9c69
--- /dev/null
+++ b/types/jquery-match-height/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-match-height-tests.ts"
+    ]
+}
diff --git a/types/jquery-match-height/tslint.json b/types/jquery-match-height/tslint.json
new file mode 100644
index 0000000000..c9a409bbed
--- /dev/null
+++ b/types/jquery-match-height/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // This package uses the Function type, and it will take effort to fix.
+    "ban-types": false
+  }
+}
diff --git a/types/jquery-mockjax/index.d.ts b/types/jquery-mockjax/index.d.ts
index f951fb9e11..f5dc5c8db1 100644
--- a/types/jquery-mockjax/index.d.ts
+++ b/types/jquery-mockjax/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Laszlo Jakab <https://github.com/laszlojakab/>, Vladimir Đokić <https://github.com/vladeck/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 interface MockJaxSettingsHeaders {
     [key: string]: string;
 }
diff --git a/types/jquery-mockjax/jquery-mockjax-tests.ts b/types/jquery-mockjax/jquery-mockjax-tests.ts
index 3090a1c3cc..a0df96dad6 100644
--- a/types/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/types/jquery-mockjax/jquery-mockjax-tests.ts
@@ -1,5 +1,7 @@
 /// <reference types="qunit" />
 
+import $ = require('jquery');
+
 class Tests {
     private _noErrorCallbackExpected: (jqXHR: JQueryXHR, textStatus: string, errorThrown: string) => any;
     private _defaultMockjaxSettings: MockJaxSettings;
diff --git a/types/jquery-mockjax/tsconfig.json b/types/jquery-mockjax/tsconfig.json
index 95708b17ef..5fcedf714e 100644
--- a/types/jquery-mockjax/tsconfig.json
+++ b/types/jquery-mockjax/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jquery-mockjax-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery-mousewheel/index.d.ts b/types/jquery-mousewheel/index.d.ts
index dbc91e126c..fdeaa39585 100644
--- a/types/jquery-mousewheel/index.d.ts
+++ b/types/jquery-mousewheel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jquery/jquery-mousewheel
 // Definitions by: Brian Surowiec <https://github.com/xt0rted/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-sortable/index.d.ts b/types/jquery-sortable/index.d.ts
index 2205bf50e1..e144510fa8 100644
--- a/types/jquery-sortable/index.d.ts
+++ b/types/jquery-sortable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://johnny.github.io/jquery-sortable/
 // Definitions by: Nathan Pitman <https://github.com/Seltzer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-steps/index.d.ts b/types/jquery-steps/index.d.ts
index 7670245480..72b2e036f3 100644
--- a/types/jquery-steps/index.d.ts
+++ b/types/jquery-steps/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jquery-steps.com/
 // Definitions by: Joseph Blank <https://github.com/jblank/>, Nicholas Wong <https://github.com/nickwph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-timeentry/index.d.ts b/types/jquery-timeentry/index.d.ts
index 1ba12a40d6..ebc0fb3ab8 100644
--- a/types/jquery-timeentry/index.d.ts
+++ b/types/jquery-timeentry/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kbwood/timeentry
 // Definitions by: Mark Nadig <https://github.com/marknadig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-toastmessage-plugin/index.d.ts b/types/jquery-toastmessage-plugin/index.d.ts
index 9e5eb8e8b9..89b905cb3a 100644
--- a/types/jquery-toastmessage-plugin/index.d.ts
+++ b/types/jquery-toastmessage-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/akquinet/jquery-toastmessage-plugin
 // Definitions by: Joe Skeen <https://github.com/joeskeen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-truncate-html/index.d.ts b/types/jquery-truncate-html/index.d.ts
index cb9b749e48..9e110b0233 100644
--- a/types/jquery-truncate-html/index.d.ts
+++ b/types/jquery-truncate-html/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kbwood/timeentry
 // Definitions by: Abraão Alves <https://github.com/abraaoalves>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery-urlparam/index.d.ts b/types/jquery-urlparam/index.d.ts
index 496bb2f26c..d8b437f201 100644
--- a/types/jquery-urlparam/index.d.ts
+++ b/types/jquery-urlparam/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://gist.github.com/stpettersens/e1f4478f299b6f4905c1
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery-validation-unobtrusive/index.d.ts b/types/jquery-validation-unobtrusive/index.d.ts
index f1997a1002..128ef10544 100644
--- a/types/jquery-validation-unobtrusive/index.d.ts
+++ b/types/jquery-validation-unobtrusive/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/aspnet/jquery-validation-unobtrusive
 // Definitions by: Matt Brooks <https://github.com/EnableSoftware>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery.validation" />
 
diff --git a/types/jquery.address/index.d.ts b/types/jquery.address/index.d.ts
index 3c0003b8ca..efa8353c29 100644
--- a/types/jquery.address/index.d.ts
+++ b/types/jquery.address/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/asual/jquery-address
 // Definitions by: Martin Duparc <https://github.com/martinduparc>, Tim Klingeleers <https://github.com/mardaneus86>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.ajaxfile/index.d.ts b/types/jquery.ajaxfile/index.d.ts
deleted file mode 100644
index 12ff53b389..0000000000
--- a/types/jquery.ajaxfile/index.d.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Type definitions for jquery.ajaxfile v0.2.0
-// Project: https://github.com/fpellet/jquery.ajaxFile
-// Definitions by: Florent PELLET <https://github.com/fpellet/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="jquery" />
-/// <reference types="knockout" />
-
-declare namespace JQueryAjaxFile {
-	export enum DataType {
-		Json,
-		Xml,
-		Text
-	}
-
-	interface IFileData {
-		name: string;
-		element: HTMLInputElement;
-	}
-
-	interface IOption {
-		method?: string;
-		url?: string;
-
-		data?: any;
-		files?: IFileData[];
-		desiredResponseDataType?: DataType;
-
-		timeoutInSeconds?: number;
-	}
-
-	interface IResponseStatus {
-		code: number;
-		text: string;
-		isSuccess: boolean;
-	}
-
-	interface IAjaxFileResult<T> {
-		error?: any;
-		data?: any;
-		status?: IResponseStatus;
-	}
-
-	interface IAjaxFileResultCallback<T> {
-		(result: IAjaxFileResult<T>): void;
-	}
-
-	interface IAjaxFilePromise<T> {
-		then(success: IAjaxFileResultCallback<T>, error?: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		done(success: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		fail(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-		always(error: IAjaxFileResultCallback<T>): IAjaxFilePromise<T>;
-
-		abord(): void;
-	}
-
-	interface IAjaxFileStatic {
-		DataType: typeof DataType;
-		send<T>(option: IOption): IAjaxFilePromise<T>;
-	}
-	
-	interface IJQueryXHR {
-        readyState: any;
-        status: number;
-        statusText: string;
-        responseXML: Document;
-        responseText: string;
-        statusCode?: { [key: string]: any; };
-
-        abort(statusText?: string): void;
-
-        setRequestHeader(header: string, value: string): void;
-        getAllResponseHeaders(): string;
-        getResponseHeader(header: string): string;
-
-        beforeSend?(jqXHR: IJQueryXHR, settings: JQueryAjaxSettings): any;
-        dataFilter?(data: any, ty: any): any;
-        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
-        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
-        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
-    }
-
-    interface IJQueryOption {
-        type?: string;
-        url?: string;
-
-        data?: any;
-        files?: IFileData[];
-        dataType?: string;
-
-        timeout?: number;
-
-        global?: boolean;
-
-        error?(jqXHR: IJQueryXHR, textStatus: string, errorThrown: string): any;
-        success?(data: any, textStatus: string, jqXHR: IJQueryXHR): any;
-        complete?(jqXHR: IJQueryXHR, textStatus: string): any;
-    }
-
-    interface IAjaxFileJQueryExtension {
-        ajaxWithFile<T>(jqueryOption: IJQueryOption): JQueryDeferred<T>;
-    }
-}
-
-declare var AjaxFile: JQueryAjaxFile.IAjaxFileStatic;
-
-declare namespace AjaxFileKnockout {
-    interface IFileInputWrapper {
-        getElement(): HTMLInputElement;
-        fileSelected(): boolean;
-    }
-}
-
-interface KnockoutBindingHandlers {
-    file: KnockoutBindingHandler;
-}
diff --git a/types/jquery.ajaxfile/jquery.ajaxfile-tests.ts b/types/jquery.ajaxfile/jquery.ajaxfile-tests.ts
deleted file mode 100644
index 73bc6662dc..0000000000
--- a/types/jquery.ajaxfile/jquery.ajaxfile-tests.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-function testRawApi(){
-	var inputElement:HTMLInputElement = null;
-	var resultPromise = AjaxFile.send<number>({
-		method: 'POST',
-		url: '/',
-		desiredResponseDataType: JQueryAjaxFile.DataType.Json,
-		files: [
-			{ name: 'joeFile', element: inputElement }
-		],
-		data: {
-			name: 'joe'
-		},
-		timeoutInSeconds: 30
-	})
-	.then(result => console.log('Result: ' + result.data), result => console.log('Error: ' + result.error))
-	.done(result => console.log('Result: ' + result.data))
-	.fail(result => console.log('Error: ' + result.error + " " + result.status.code + " " + result.status.text + " " + result.status.isSuccess))
-	.always(result => console.log('end'))
-	.abord();
-}
-
-function testJQuery() {
-    var inputElement: HTMLInputElement = null;
-    var extension: JQueryAjaxFile.IAjaxFileJQueryExtension = $.fn.ajaxWithFile;
-    var option: JQueryAjaxFile.IJQueryOption = {
-        type: 'POST',
-        url: '/',
-        dataType: "json",
-        files: [
-            { name: 'joeFile', element: inputElement }
-        ],
-        data: {
-            name: 'joe'
-        },
-        success(result) { console.log('Result: ' + result); },
-        error(jqXhr, textStatus, errorThrown) { console.log('Error: ' + errorThrown); },
-        complete(jqXhr, textStatus) { console.log('end'); },
-        global: true,
-        timeout: 60
-    };
-    extension.ajaxWithFile<number>(option);
-}
-
-function testKnockoutExtension(){
-	var fileHandler:KnockoutBindingHandler = ko.bindingHandlers.file;
-}
-
-testKnockoutExtension();
-testJQuery();
-testRawApi();
\ No newline at end of file
diff --git a/types/jquery.are-you-sure/index.d.ts b/types/jquery.are-you-sure/index.d.ts
index 5a7e547e50..0eef8c01e9 100644
--- a/types/jquery.are-you-sure/index.d.ts
+++ b/types/jquery.are-you-sure/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/codedance/jquery.AreYouSure
 // Definitions by: Jon Egerton <https://github.com/jonegerton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -31,4 +32,4 @@ interface AreYouSure {
 
 interface JQuery {
     areYouSure: AreYouSure;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.autosize/index.d.ts b/types/jquery.autosize/index.d.ts
index f43e6bf7d3..5d9ded0a77 100644
--- a/types/jquery.autosize/index.d.ts
+++ b/types/jquery.autosize/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jacklmoore.com/autosize/
 // Definitions by: Aaron T. King <https://github.com/kingdango>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 declare namespace autosize {
diff --git a/types/jquery.base64/index.d.ts b/types/jquery.base64/index.d.ts
index e071dc940a..5eaf083d9b 100644
--- a/types/jquery.base64/index.d.ts
+++ b/types/jquery.base64/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/yatt/jquery.base64/
 // Definitions by: Shinya Mochizuki <https://github.com/enrapt-mochizuki/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.bbq/index.d.ts b/types/jquery.bbq/index.d.ts
index 44deadb690..1860d63343 100644
--- a/types/jquery.bbq/index.d.ts
+++ b/types/jquery.bbq/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Adam R. Smith <https://github.com/sunetos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 declare namespace JQueryBbq {
 
     interface JQuery {
diff --git a/types/jquery.bbq/jquery.bbq-tests.ts b/types/jquery.bbq/jquery.bbq-tests.ts
index 16216ea557..9762ee44d9 100644
--- a/types/jquery.bbq/jquery.bbq-tests.ts
+++ b/types/jquery.bbq/jquery.bbq-tests.ts
@@ -1,5 +1,7 @@
 /// <reference types="qunit/v1" />
 
+import $ = require('jquery');
+
 // ************** Tests to jquery JQueryParam interface
 var myObject = {
   a: {
@@ -1277,4 +1279,4 @@ test( 'jQuery.bbq.pushState(), jQuery.bbq.getState(), jQuery.bbq.removeState(),
 });
 
 
-}); // END CLOSURE
\ No newline at end of file
+}); // END CLOSURE
diff --git a/types/jquery.bbq/tsconfig.json b/types/jquery.bbq/tsconfig.json
index 776f038eab..b6df3537a9 100644
--- a/types/jquery.bbq/tsconfig.json
+++ b/types/jquery.bbq/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jquery.bbq-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery.blockui/index.d.ts b/types/jquery.blockui/index.d.ts
index 6763de1a0f..bdaad4e21d 100644
--- a/types/jquery.blockui/index.d.ts
+++ b/types/jquery.blockui/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://malsup.com/jquery/block/
 // Definitions by: Jeffrey Lee <http://blog.darkthread.net/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -126,4 +127,4 @@ interface JQuery {
      * unblock the element(s)
      */
     unblock(option?: JQBlockUIOptions): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.bootstrap.wizard/index.d.ts b/types/jquery.bootstrap.wizard/index.d.ts
index b04835e14e..465d7cd095 100644
--- a/types/jquery.bootstrap.wizard/index.d.ts
+++ b/types/jquery.bootstrap.wizard/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/VinceG/twitter-bootstrap-wizard
 // Definitions by: Blake Niemyjski <https://github.com/niemyjski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -45,4 +46,4 @@ interface JQuery {
 
 interface JQueryStatic {
     bootstrapWizard: Wizard;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.cleditor/index.d.ts b/types/jquery.cleditor/index.d.ts
index 14ce2703ad..324aaa2dff 100644
--- a/types/jquery.cleditor/index.d.ts
+++ b/types/jquery.cleditor/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://premiumsoftware.net/CLEditor
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/jquery.clientsidelogging/index.d.ts b/types/jquery.clientsidelogging/index.d.ts
index 9266ff2f94..f0548b89b2 100644
--- a/types/jquery.clientsidelogging/index.d.ts
+++ b/types/jquery.clientsidelogging/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Diullei Gomes <https://github.com/diullei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery"/>
-
 interface ClientSideLoggingClientInfoObject {
     location?: boolean;	//  The url to the page on which the error occurred.
     screen_size?: boolean;	//  The size of the user's screen (different to the window size because the window might not be maximized)
diff --git a/types/jquery.clientsidelogging/jquery.clientsidelogging-tests.ts b/types/jquery.clientsidelogging/jquery.clientsidelogging-tests.ts
index b0724ecc0f..f23b9acb25 100644
--- a/types/jquery.clientsidelogging/jquery.clientsidelogging-tests.ts
+++ b/types/jquery.clientsidelogging/jquery.clientsidelogging-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 $.clientSideLogging({
 	log_level: 3,
 	client_info: {
@@ -12,4 +14,4 @@ $.info({msg:$(this).parents('li').find('input:text').val()});
 $.error({msg:$(this).parents('li').find('input:text').val()});
 $.log($(this).parents('li').find('input:text').val());
 
-$.post('/log?type=error&msg=YOUR_ERROR_MESSAGE');
\ No newline at end of file
+$.post('/log?type=error&msg=YOUR_ERROR_MESSAGE');
diff --git a/types/jquery.clientsidelogging/tsconfig.json b/types/jquery.clientsidelogging/tsconfig.json
index de9b88ffd8..db54f5cd84 100644
--- a/types/jquery.clientsidelogging/tsconfig.json
+++ b/types/jquery.clientsidelogging/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jquery.clientsidelogging-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery.color/index.d.ts b/types/jquery.color/index.d.ts
index 4b24a7c434..713ed67915 100644
--- a/types/jquery.color/index.d.ts
+++ b/types/jquery.color/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jquery/jquery-color
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.colorbox/index.d.ts b/types/jquery.colorbox/index.d.ts
index 3e9b0ea161..2a830611ab 100644
--- a/types/jquery.colorbox/index.d.ts
+++ b/types/jquery.colorbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jacklmoore.com/colorbox/
 // Definitions by: Gidon Junge <https://github.com/gjunge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.colorpicker/index.d.ts b/types/jquery.colorpicker/index.d.ts
index 566b7d4103..2d44ddb967 100644
--- a/types/jquery.colorpicker/index.d.ts
+++ b/types/jquery.colorpicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vanderlee/colorpicker
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.contextmenu/index.d.ts b/types/jquery.contextmenu/index.d.ts
index 64db123173..56188d2ac0 100644
--- a/types/jquery.contextmenu/index.d.ts
+++ b/types/jquery.contextmenu/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://medialize.github.com/jQuery-contextMenu/
 // Definitions by: Natan Vivo <https://github.com/nvivo/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.cookie/index.d.ts b/types/jquery.cookie/index.d.ts
index 8c3ef6190d..c15341aa97 100644
--- a/types/jquery.cookie/index.d.ts
+++ b/types/jquery.cookie/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/carhartl/jquery-cookie
 // Definitions by: Roy Goode <https://github.com/RoyGoode/>, Ben Lorantfy <https://github.com/BenLorantfy/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/jquery.customselect/index.d.ts b/types/jquery.customselect/index.d.ts
index faaf6df5af..c64589afd3 100644
--- a/types/jquery.customselect/index.d.ts
+++ b/types/jquery.customselect/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://adam.co/lab/jquery/customselect//
 // Definitions by: adamcoulombe <https://github.com/adamcoulombe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -13,4 +14,4 @@ interface JQueryCustomSelectOption {
 
 interface JQuery {
     customSelect(val:JQueryCustomSelectOption): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.cycle/index.d.ts b/types/jquery.cycle/index.d.ts
index 3c91561f93..5bee065fdb 100644
--- a/types/jquery.cycle/index.d.ts
+++ b/types/jquery.cycle/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jquery.malsup.com/cycle/
 // Definitions by: François Guillot <http://fguillot.developpez.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.cycle/jquery.cycle-tests.ts b/types/jquery.cycle/jquery.cycle-tests.ts
index df8ed24b22..bdcd70aa9d 100644
--- a/types/jquery.cycle/jquery.cycle-tests.ts
+++ b/types/jquery.cycle/jquery.cycle-tests.ts
@@ -259,7 +259,7 @@ $('#s6').cycle({
     }
 });
 
-$.fn.cycle.transitions.pinch = function ($cont, $slides, opts) {
+$.fn.cycle.transitions['pinch'] = function ($cont, $slides, opts) {
     var $el = $($slides[0]);
     var w = $el.width();
     var h = $el.height();
diff --git a/types/jquery.cycle2/index.d.ts b/types/jquery.cycle2/index.d.ts
index 39bb2f0d90..faef998fae 100644
--- a/types/jquery.cycle2/index.d.ts
+++ b/types/jquery.cycle2/index.d.ts
@@ -3,6 +3,7 @@
 //          https://github.com/malsup/cycle2
 // Definitions by: Donny Nadolny <https://github.com/dnadolny/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.dropotron/index.d.ts b/types/jquery.dropotron/index.d.ts
index e930034292..26dbc29050 100644
--- a/types/jquery.dropotron/index.d.ts
+++ b/types/jquery.dropotron/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/n33/jquery.dropotron
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.3
 
 /**
  * @summary Interface for "dropotron" configurations.
@@ -157,4 +158,4 @@ interface Dropotron {
  */
 interface JQuery {
     dropotron: Dropotron;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.dynatree/index.d.ts b/types/jquery.dynatree/index.d.ts
index 273f88a2c5..267115cc8d 100644
--- a/types/jquery.dynatree/index.d.ts
+++ b/types/jquery.dynatree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://code.google.com/p/dynatree/
 // Definitions by: François de Campredon <https://github.com/fdecampredon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.elang/index.d.ts b/types/jquery.elang/index.d.ts
index 9a5459af65..21a73e237f 100644
--- a/types/jquery.elang/index.d.ts
+++ b/types/jquery.elang/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sumegizoltan/ELang/
 // Definitions by: Zoltan Sumegi <https://github.com/sumegizoltan/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -311,4 +312,4 @@ interface IFnJQuery {
              command: string,
              pluginName: string,
              pluginDataAttribute: string): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.fancytree/index.d.ts b/types/jquery.fancytree/index.d.ts
index c5e84d69f7..e2c79b0341 100644
--- a/types/jquery.fancytree/index.d.ts
+++ b/types/jquery.fancytree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mar10/fancytree
 // Definitions by: Peter Palotas <https://github.com/alphaleonis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 ///<reference types="jquery" />
diff --git a/types/jquery.fileupload/index.d.ts b/types/jquery.fileupload/index.d.ts
index e113d2733c..6ca998d41a 100644
--- a/types/jquery.fileupload/index.d.ts
+++ b/types/jquery.fileupload/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/blueimp/jQuery-File-Upload
 // Definitions by: Rob Alarcon <https://github.com/rob-alarcon/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.finger/index.d.ts b/types/jquery.finger/index.d.ts
index d8a033834b..0cf61e07d2 100644
--- a/types/jquery.finger/index.d.ts
+++ b/types/jquery.finger/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://ngryman.sh/jquery.finger/
 // Definitions by: Max Ackley <https://github.com/maxackley/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.flagstrap/index.d.ts b/types/jquery.flagstrap/index.d.ts
index 98acf3cc39..4f6557fdaa 100644
--- a/types/jquery.flagstrap/index.d.ts
+++ b/types/jquery.flagstrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/blazeworx/flagstrap
 // Definitions by: Felipe de Sena Garcia <https://github.com/felipedgarcia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -81,4 +82,4 @@ interface JQuery {
     
     flagStrap(): void;
     flagStrap(options: jQueryFlagStrap.FlagStrapOptions): void;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.form/index.d.ts b/types/jquery.form/index.d.ts
index 404b618618..c96b1fd71b 100644
--- a/types/jquery.form/index.d.ts
+++ b/types/jquery.form/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://malsup.com/jquery/form/
 // Definitions by: François Guillot <http://fguillot.developpez.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
@@ -47,4 +48,4 @@ interface JQuery {
     formToArray: (semantic?: boolean, elements?: Element[]) => any[];
     enable: (enable?: boolean) => JQuery;
     selected: (select?: boolean) => JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.fullscreen/index.d.ts b/types/jquery.fullscreen/index.d.ts
index 8831a68cbd..dd8fd9a2e8 100644
--- a/types/jquery.fullscreen/index.d.ts
+++ b/types/jquery.fullscreen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/private-face/jquery.fullscreen
 // Definitions by: Piraveen Kamalathas <https://github.com/piraveen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.gridster/index.d.ts b/types/jquery.gridster/index.d.ts
index 305788190b..c91fd6f9e4 100644
--- a/types/jquery.gridster/index.d.ts
+++ b/types/jquery.gridster/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jbaldwin/gridster
 // Definitions by: Josh Baldwin <https://github.com/jbaldwin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /*
 gridster-0.1.0.d.ts may be freely distributed under the MIT license.
diff --git a/types/jquery.growl/index.d.ts b/types/jquery.growl/index.d.ts
index 2a847b8ef7..caa9e0d7cd 100644
--- a/types/jquery.growl/index.d.ts
+++ b/types/jquery.growl/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/ksylvest/jquery-growl#readme
 // Definitions by: Amir.h Yeganemehr <https://github.com/yeganemehr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-///<reference types="jquery" />
+/// <reference types="jquery" />
 
 declare namespace growl {
 	interface Options {
diff --git a/types/jquery.highlight-bartaz/index.d.ts b/types/jquery.highlight-bartaz/index.d.ts
index 26fbb1e40a..f76a2bcb98 100644
--- a/types/jquery.highlight-bartaz/index.d.ts
+++ b/types/jquery.highlight-bartaz/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bartaz/sandbox.js/blob/master/jquery.highlight.js
 // Definitions by: Stefan Profanter <https://github.com/Pro/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 ///<reference types="jquery" />
diff --git a/types/jquery.jnotify/index.d.ts b/types/jquery.jnotify/index.d.ts
index d85fceb054..8e1fc1433a 100644
--- a/types/jquery.jnotify/index.d.ts
+++ b/types/jquery.jnotify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jnotify.codeplex.com
 // Definitions by: James Curran <https://github.com/jamescurran/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // Project by: Fabio Franzini
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.joyride/index.d.ts b/types/jquery.joyride/index.d.ts
index ee918d83c0..05e5b5e2d9 100644
--- a/types/jquery.joyride/index.d.ts
+++ b/types/jquery.joyride/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Vincent Bortone <https://github.com/vbortone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery" />
-
 /**
 * HTML segments for tip layout
 */
@@ -270,4 +268,4 @@ interface JQuery {
 	* @return {Joyride} Joyride instance.
 	*/
 	joyride: Joyride;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.joyride/jquery.joyride-tests.ts b/types/jquery.joyride/jquery.joyride-tests.ts
index c7324dd6c9..08d7687611 100644
--- a/types/jquery.joyride/jquery.joyride-tests.ts
+++ b/types/jquery.joyride/jquery.joyride-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 var options: JoyrideOptions;
 options.autoStart = true;
 options.postStepCallback = (index, tip)=> {
@@ -10,4 +12,4 @@ options.expose = true;
 
 $(window).load(()=> {
     $('#joyRideTipContent').joyride(options);
-});
\ No newline at end of file
+});
diff --git a/types/jquery.joyride/tsconfig.json b/types/jquery.joyride/tsconfig.json
index ceb432e871..2c4734d4ae 100644
--- a/types/jquery.joyride/tsconfig.json
+++ b/types/jquery.joyride/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jquery.joyride-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery.jsignature/index.d.ts b/types/jquery.jsignature/index.d.ts
index a047f83dea..a3650d487b 100644
--- a/types/jquery.jsignature/index.d.ts
+++ b/types/jquery.jsignature/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/willowsystems/jSignature
 // Definitions by: Patrick Magee <https://github.com/pjmagee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // Project by: Willow Systems Corp
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.leanmodal/index.d.ts b/types/jquery.leanmodal/index.d.ts
index e0c2f7f707..91f9ea83d6 100644
--- a/types/jquery.leanmodal/index.d.ts
+++ b/types/jquery.leanmodal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://leanmodal.finelysliced.com.au/
 // Definitions by: FinelySliced <https://github.com/FinelySliced>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -19,4 +20,4 @@ interface JQueryStatic {
 interface JQuery {
     leanModal(): JQuery;
     leanModal(val : JQueryLeanModalOption): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.livestampjs/index.d.ts b/types/jquery.livestampjs/index.d.ts
index 12d401367d..2d65c13674 100644
--- a/types/jquery.livestampjs/index.d.ts
+++ b/types/jquery.livestampjs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://mattbradley.github.com/livestampjs/
 // Definitions by: Vincent Bortone <https://github.com/vbortone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // A simple, unobtrusive jQuery plugin that provides auto-updating timeago text to your timestamped HTML elements using Moment.js.
 
diff --git a/types/jquery.menuaim/index.d.ts b/types/jquery.menuaim/index.d.ts
index 5bcbebf189..393a637d6f 100644
--- a/types/jquery.menuaim/index.d.ts
+++ b/types/jquery.menuaim/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kamens/jQuery-menu-aim
 // Definitions by: Robert Fonseca-Ensor <http://www.robfe.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.mmenu/index.d.ts b/types/jquery.mmenu/index.d.ts
index 9c27bdb530..07eb443a11 100644
--- a/types/jquery.mmenu/index.d.ts
+++ b/types/jquery.mmenu/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://mmenu.frebsite.nl/
 // Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.notify/index.d.ts b/types/jquery.notify/index.d.ts
new file mode 100644
index 0000000000..9dcf3e5d49
--- /dev/null
+++ b/types/jquery.notify/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for 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
+// TypeScript Version: 2.3
+
+/// <reference types="jquery"/>
+
+interface JQueryNotifyOptions {
+	close?: () => void;
+	open?: () => void;
+	custom?: boolean;
+	disabled?: boolean;
+	expires?: number;
+	queue?: boolean;
+	speed?: number;
+	stack?: "below" | "above";
+}
+interface JQuery {
+	notify(options?: JQueryNotifyOptions): JQueryNotifyWidget;
+	notify(method: string, template: number, params?: object, opts?: JQueryNotifyOptions): JQueryNotifyInstance;
+	notify(method: string, params?: object, opts?: JQueryNotifyOptions): JQueryNotifyInstance;
+}
+interface JQueryNotifyInstance {
+	element: JQuery;
+	isOpen: boolean;
+	options: JQueryNotifyOptions;
+	close(): void;
+	open(): void;
+}
+interface JQueryNotifyWidget extends JQuery  {
+}
diff --git a/types/jquery.notify/jquery.notify-tests.ts b/types/jquery.notify/jquery.notify-tests.ts
new file mode 100644
index 0000000000..1af31996a1
--- /dev/null
+++ b/types/jquery.notify/jquery.notify-tests.ts
@@ -0,0 +1,21 @@
+let $container: JQueryNotifyWidget = $("<div style='display:none' class='noprint'><div></div></div>").appendTo(document.body).notify();
+
+let notification: JQueryNotifyInstance = $container.notify(
+	"create",
+	{}, // empty parameters
+	{
+		close: () => {
+			console.log("closed");
+		},
+		open: () => {
+			console.log("opened");
+		},
+		expires: 1000,
+		speed: 100
+	}
+);
+notification.element.html("<strong>text</strong>");
+
+notification.element.click(() => {
+	notification.close();
+});
diff --git a/types/electron/tsconfig.json b/types/jquery.notify/tsconfig.json
similarity index 78%
rename from types/electron/tsconfig.json
rename to types/jquery.notify/tsconfig.json
index bf2299ea31..0fbfcb5134 100644
--- a/types/electron/tsconfig.json
+++ b/types/jquery.notify/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,8 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "test/index.ts",
-        "test/main.ts",
-        "test/renderer.ts"
+        "jquery.notify-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/jquery.notify/tslint.json b/types/jquery.notify/tslint.json
new file mode 100644
index 0000000000..e6098321a2
--- /dev/null
+++ b/types/jquery.notify/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "prefer-method-signature": false
+    }
+}
diff --git a/types/jquery.notifybar/index.d.ts b/types/jquery.notifybar/index.d.ts
index f1e500d420..6aa12b52f6 100644
--- a/types/jquery.notifybar/index.d.ts
+++ b/types/jquery.notifybar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.whoop.ee/posts/2013-04-05-the-resurrection-of-jquery-notify-bar/
 // Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.noty/index.d.ts b/types/jquery.noty/index.d.ts
index f4bfe4bcb9..0570e02358 100644
--- a/types/jquery.noty/index.d.ts
+++ b/types/jquery.noty/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Aaron King <https://github.com/kingdango/>, Tim Helfensdörfer <https://github.com/thelfensdrfer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Project by: Nedim Carter <http://needim.github.io>
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.payment/index.d.ts b/types/jquery.payment/index.d.ts
index 88ecd255a5..26cbbc3fef 100644
--- a/types/jquery.payment/index.d.ts
+++ b/types/jquery.payment/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/stripe/jquery.payment
 // Definitions by: Eric J. Smith <https://github.com/ejsmith/>, John Rutherford <https://github.com/johnrutherford/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.payment/jquery.payment-tests.ts b/types/jquery.payment/jquery.payment-tests.ts
index 9eaad853cb..5b0c3be9c8 100644
--- a/types/jquery.payment/jquery.payment-tests.ts
+++ b/types/jquery.payment/jquery.payment-tests.ts
@@ -35,8 +35,8 @@ $.payment.cardExpiryVal('03 / 2025') === {month: 3, year: 2025}; //=> {month: 3,
 $.payment.cardExpiryVal('05 / 04') === {month: 3, year: 2025}; //=> {month: 5, year: 2004}
 $('input.cc-exp').payment('cardExpiryVal') //=> {month: 4, year: 2020}
 
-var valid = $.payment.validateCardNumber($('input.cc-num').val());
+var valid = $.payment.validateCardNumber($('input.cc-num').val() as string);
 
 if (!valid) {
   alert('Your card is not valid!');
-}
\ No newline at end of file
+}
diff --git a/types/jquery.pjax.falsandtru/index.d.ts b/types/jquery.pjax.falsandtru/index.d.ts
index 02c3b1fdda..e7a5cea8e0 100644
--- a/types/jquery.pjax.falsandtru/index.d.ts
+++ b/types/jquery.pjax.falsandtru/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/falsandtru/jquery.pjax.js/
 // Definitions by: 新ゝ月 NewNotMoon <http://new.not-moon.net/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -186,4 +187,4 @@ interface JQueryStatic {
 
 interface JQuery {
     pjax(setting?: PjaxSetting): any;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.pjax/index.d.ts b/types/jquery.pjax/index.d.ts
index 2657a90f44..ebb713236e 100644
--- a/types/jquery.pjax/index.d.ts
+++ b/types/jquery.pjax/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/defunkt/jquery-pjax
 // Definitions by: Junle Li <https://github.com/lijunle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.placeholder/index.d.ts b/types/jquery.placeholder/index.d.ts
index 92fe7e5f02..6f8283ff38 100644
--- a/types/jquery.placeholder/index.d.ts
+++ b/types/jquery.placeholder/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mathiasbynens/jquery-placeholder
 // Definitions by: Peter Gill <https://github.com/majorsilence>, Neil Culver <https://github.com/EnableSoftware>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.pnotify/index.d.ts b/types/jquery.pnotify/index.d.ts
index 1d222efb26..70946c30ef 100644
--- a/types/jquery.pnotify/index.d.ts
+++ b/types/jquery.pnotify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sciactive/pnotify
 // Definitions by: David Sichau <https://github.com/DavidSichau>, Robin Maenhaut <https://github.com/FUNExtreme>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -133,6 +134,10 @@ interface PNotifyOptions {
      * Whether to escape the content of the text. (Not allow HTML.)
      */
     text_escape?: boolean;
+    /**
+    * Support for PNotifyconfirm options
+    */
+    confirm?: PNotifyconfirm
     /**
      * What styling classes to use. (Can be either "brighttheme", "jqueryui", "bootstrap2", "bootstrap3", "fontawesome" or a custom style object)
      */
diff --git a/types/jquery.pnotify/jquery.pnotify-tests.ts b/types/jquery.pnotify/jquery.pnotify-tests.ts
index f1b8ffb73e..fa4f008ef9 100644
--- a/types/jquery.pnotify/jquery.pnotify-tests.ts
+++ b/types/jquery.pnotify/jquery.pnotify-tests.ts
@@ -21,9 +21,9 @@ function test_pnotify() {
         text: 'I don\'t have a shadow. (It\'s cause I\'m a vampire or something. Or is that reflections...)',
         shadow: false
     });
-    new PNotify('Check me out! I\'m a notice.');
+    // new PNotify('Check me out! I\'m a notice.');
 
-    new PNotify(Math.round(Math.random() * 9999));
+    // new PNotify(Math.round(Math.random() * 9999));
 
     new PNotify({
         title: 'PIcon Notice',
@@ -216,7 +216,7 @@ function test_pnotify() {
         icon: "fa fa-bars",
         delay: 20000,
         history: false,
-        stack: false
+        stack: {}
     });
 
     var type = "error";
diff --git a/types/jquery.postmessage/index.d.ts b/types/jquery.postmessage/index.d.ts
index f370ad3822..9e5c3a1d7c 100644
--- a/types/jquery.postmessage/index.d.ts
+++ b/types/jquery.postmessage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://benalman.com/projects/jquery-postmessage-plugin/
 // Definitions by: Junle Li <https://github.com/lijunle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // Official docs: http://benalman.com/code/projects/jquery-postmessage/docs/files/jquery-ba-postmessage-js.html
 
 interface JQueryStatic {
diff --git a/types/jquery.prettyphoto/index.d.ts b/types/jquery.prettyphoto/index.d.ts
index 9c5f5f6a52..d37d7c40d2 100644
--- a/types/jquery.prettyphoto/index.d.ts
+++ b/types/jquery.prettyphoto/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/scaron/prettyphoto
 // Definitions by: pgaske <https://github.com/pgaske>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.qrcode/index.d.ts b/types/jquery.qrcode/index.d.ts
index 94504d4dda..0ce6a0b96b 100644
--- a/types/jquery.qrcode/index.d.ts
+++ b/types/jquery.qrcode/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lrsjng/jquery-qrcode
 // Definitions by: Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.rateit/index.d.ts b/types/jquery.rateit/index.d.ts
index be62f3b3da..f94640c5ff 100644
--- a/types/jquery.rateit/index.d.ts
+++ b/types/jquery.rateit/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/gjunge/rateit.js
 // Definitions by: Gidon Junge <https://github.com/gjunge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 type RateItMode = "bg" | "font";
diff --git a/types/jquery.rowgrid/index.d.ts b/types/jquery.rowgrid/index.d.ts
index 5456b9c323..121a2be5bd 100644
--- a/types/jquery.rowgrid/index.d.ts
+++ b/types/jquery.rowgrid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/brunjo/rowGrid.js
 // Definitions by: Vinayak Garg <https://github.com/vinayak-garg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -14,4 +15,4 @@ interface JQueryRowGridJSOptions {
 interface JQuery {
     rowGrid(options?: JQueryRowGridJSOptions): JQuery;
     rowGrid(appended: string): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.scrollto/index.d.ts b/types/jquery.scrollto/index.d.ts
index 3a4f13d1a8..9a6777b7a9 100644
--- a/types/jquery.scrollto/index.d.ts
+++ b/types/jquery.scrollto/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/flesler/jquery.scrollTo
 // Definitions by: Neil Stalker <https://github.com/nestalk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.simplemodal/index.d.ts b/types/jquery.simplemodal/index.d.ts
index 7fff90f18a..4588fd5b21 100644
--- a/types/jquery.simplemodal/index.d.ts
+++ b/types/jquery.simplemodal/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.ericmmartin.com/projects/simplemodal/
 // Definitions by: Friedrich von Never <https://github.com/ForNeVeR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.simplepagination/index.d.ts b/types/jquery.simplepagination/index.d.ts
index c09ea685e3..85f3ca88a2 100644
--- a/types/jquery.simplepagination/index.d.ts
+++ b/types/jquery.simplepagination/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/flaviusmatis/simplePagination.js
 // Definitions by: Natan Vivo <https://github.com/nvivo/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.simulate/index.d.ts b/types/jquery.simulate/index.d.ts
index 65a80a263e..73d3690e7d 100644
--- a/types/jquery.simulate/index.d.ts
+++ b/types/jquery.simulate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jquery/jquery-simulate
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.slimscroll/index.d.ts b/types/jquery.slimscroll/index.d.ts
index 4309e19c21..43eb86a028 100644
--- a/types/jquery.slimscroll/index.d.ts
+++ b/types/jquery.slimscroll/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rochal/jQuery-slimScroll
 // Definitions by: Chintan Shah <https://github.com/Promact>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 /// <reference types="jquery"/>
 
 interface IJQuerySlimScrollOptions {
diff --git a/types/jquery.soap/index.d.ts b/types/jquery.soap/index.d.ts
index 384b5bc480..36674a677b 100644
--- a/types/jquery.soap/index.d.ts
+++ b/types/jquery.soap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/doedje/jquery.soap
 // Definitions by: Roland Greim <https://github.com/tigerxy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.sortelements/index.d.ts b/types/jquery.sortelements/index.d.ts
index 5fbf62ab8e..112c2f8169 100644
--- a/types/jquery.sortelements/index.d.ts
+++ b/types/jquery.sortelements/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://james.padolsey.com/javascript/sorting-elements-with-jquery/
 // Definitions by: Tim Bureck <https://github.com/tbureck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.superlink/index.d.ts b/types/jquery.superlink/index.d.ts
index 23bd71077d..90eed21d69 100644
--- a/types/jquery.superlink/index.d.ts
+++ b/types/jquery.superlink/index.d.ts
@@ -2,9 +2,10 @@
 // Project: http://james.padolsey.com/demos/plugins/jQuery/superLink/superlink.jquery.js
 // Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
 interface JQuery {
     superLink(link?: string): JQuery;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.tagsmanager/index.d.ts b/types/jquery.tagsmanager/index.d.ts
index aa9ff8e74f..77af837b63 100644
--- a/types/jquery.tagsmanager/index.d.ts
+++ b/types/jquery.tagsmanager/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://welldonethings.com/tags/manager
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.tile/index.d.ts b/types/jquery.tile/index.d.ts
index d8437b0b01..0519c64673 100644
--- a/types/jquery.tile/index.d.ts
+++ b/types/jquery.tile/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/urin/jquery.tile.js
 // Definitions by: Shunsuke Ohtani <https://github.com/zaneli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.timeago/index.d.ts b/types/jquery.timeago/index.d.ts
index 820af3e128..9e1087ec31 100644
--- a/types/jquery.timeago/index.d.ts
+++ b/types/jquery.timeago/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://timeago.yarp.com/
 // Definitions by: François Guillot <http://fguillot.developpez.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
@@ -59,4 +60,4 @@ interface JQueryStatic {
 
 interface JQuery {
     timeago: Timeago;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.timepicker/index.d.ts b/types/jquery.timepicker/index.d.ts
index d6a8d45a3b..cb6dcd5a5a 100644
--- a/types/jquery.timepicker/index.d.ts
+++ b/types/jquery.timepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://fgelinas.com/code/timepicker/
 // Definitions by: Anwar Javed <https://github.com/anwarjaved>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="jqueryui"/>
diff --git a/types/jquery.timer/index.d.ts b/types/jquery.timer/index.d.ts
index f43e887787..752e04289e 100644
--- a/types/jquery.timer/index.d.ts
+++ b/types/jquery.timer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jchavannes/jquery-timer
 // Definitions by: Joshua Strobl <https://github.com/JoshStrobl/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.tinycarousel/index.d.ts b/types/jquery.tinycarousel/index.d.ts
index 0e91ba75ad..213fdd0728 100644
--- a/types/jquery.tinycarousel/index.d.ts
+++ b/types/jquery.tinycarousel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://baijs.nl/tinycarousel/
 // Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.tinyscrollbar/index.d.ts b/types/jquery.tinyscrollbar/index.d.ts
index c56da8df7d..5cd3240dfb 100644
--- a/types/jquery.tinyscrollbar/index.d.ts
+++ b/types/jquery.tinyscrollbar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://baijs.nl/tinyscrollbar/
 // Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.tipsy/index.d.ts b/types/jquery.tipsy/index.d.ts
index 678c2a77f0..3414eeae49 100644
--- a/types/jquery.tipsy/index.d.ts
+++ b/types/jquery.tipsy/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://onehackoranother.com/projects/jquery/tipsy/
 // Definitions by: Brian Dukes <https://github.com/bdukes/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.tipsy/jquery.tipsy-tests.ts b/types/jquery.tipsy/jquery.tipsy-tests.ts
index 09ba7f2d68..8a0591e137 100644
--- a/types/jquery.tipsy/jquery.tipsy-tests.ts
+++ b/types/jquery.tipsy/jquery.tipsy-tests.ts
@@ -22,8 +22,8 @@ $(function() {
   $('#focus-example [title]').tipsy({trigger: 'focus', gravity: 'w'});
 });
 
-function onclickExample1() { $("#manual-example a[rel=tipsy]").tipsy("show"); return false; }
-function onclickExample2() { $("#manual-example a[rel=tipsy]").tipsy("hide"); return false; }
+function onclickExample1() { $("#manual-example a[rel=tipsy]").tipsy({ title: "show" }); return false; }
+function onclickExample2() { $("#manual-example a[rel=tipsy]").tipsy({ title: "hide" }); return false; }
 $('#manual-example a[rel=tipsy]').tipsy({trigger: 'manual'});
 
-$('a.live-tipsy').tipsy({live: true});
\ No newline at end of file
+$('a.live-tipsy').tipsy({live: true});
diff --git a/types/jquery.tools/index.d.ts b/types/jquery.tools/index.d.ts
index d84db10e7b..0c19d7a8fb 100644
--- a/types/jquery.tools/index.d.ts
+++ b/types/jquery.tools/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jquerytools/jquerytools
 // Definitions by: Joe Skeen <https://github.com/joeskeen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.tools/jquery.tools-tests.ts b/types/jquery.tools/jquery.tools-tests.ts
index f2f27666f6..d7c9b36523 100644
--- a/types/jquery.tools/jquery.tools-tests.ts
+++ b/types/jquery.tools/jquery.tools-tests.ts
@@ -13,7 +13,7 @@ const triggers = $(".modalInput").overlay({
     closeOnClick: false
 });
 
-const buttons = $("#yesno button").click(function(this: JQuery, e: JQueryEventObject) {
+const buttons = $("#yesno button").click(function(e) {
     // get user input
     const yes = buttons.index(this) === 0;
 
@@ -32,14 +32,14 @@ $(".my_overlay_trigger").overlay({
     // ... the rest of the configuration properties
 });
 
-$("#prompt form").submit(function(this: JQuery, e: JQueryEventObject) {
+$("#prompt form").submit(function(e) {
     // close the overlay
     triggers.eq(1).overlay<JQueryTools.overlay.Overlay>().close();
     // or more straightforward:
     triggers.data('overlay').close();
 
     // get user input
-    const input = $("input", this).val();
+    const input = $("input", this).val() as string;
 
     // do something with the answer
     triggers.eq(1).html(input);
@@ -57,13 +57,13 @@ $.tools.overlay.addEffect("myEffect",
         - 'this' variable is a reference to the overlay API
         - here we use jQuery's fadeIn() method to perform the effect
         */
-        this.getOverlay().css(position).fadeIn(this.getConf().speed, done);
+        this.getOverlay().css(position).fadeIn(this.getConf().speed!, done);
     },
 
     // close function
     function(done) {
         // fade out the overlay
-        this.getOverlay().fadeOut(this.getConf().closeSpeed, done);
+        this.getOverlay().fadeOut(this.getConf().closeSpeed!, done);
     }
 );
 
@@ -100,7 +100,7 @@ $(() => {
             const wrap = this.getOverlay().find(".contentWrap");
 
             // load the page specified in the trigger
-            wrap.load(this.getTrigger().attr("href"));
+            wrap.load(this.getTrigger().attr("href")!);
         }
     });
 });
@@ -115,7 +115,7 @@ $(() => {
     ];
 
     // setup triggers
-    $("button[rel]").each(function(this: JQuery, i: number) {
+    $("button[rel]").each(function(i) {
         $(this).overlay({
             // common configuration for each overlay
             oneInstance: false,
@@ -161,7 +161,7 @@ $.tools.overlay.addEffect("drop",
             { top: '-=55', opacity: 0, width: '-=20' },
             300,
             'drop',
-            function(this: JQuery) {
+            function() {
                 $(this).hide();
                 done.call(null);
             });
diff --git a/types/jquery.tooltipster/index.d.ts b/types/jquery.tooltipster/index.d.ts
index 3534730ec4..8d2e580d35 100644
--- a/types/jquery.tooltipster/index.d.ts
+++ b/types/jquery.tooltipster/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for jQuery Tooltipster 3.3.0
 // Project: https://github.com/iamceege/tooltipster
-// Definitions by: Patrick Magee <https://github.com/pjmagee/>, Dmitry Pesterev <https://github.com/VorobeY1326/>
+// Definitions by: Patrick Magee <https://github.com/pjmagee/>, Dmitry Pesterev <https://github.com/VorobeY1326/>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -164,25 +165,6 @@ interface JQueryTooltipsterOptions {
 
 interface JQuery {
 
-    /**
-    * Initiate the Tooltipster plugin
-    */ 
-    tooltipster(): JQuery;
-
-    /**
-    * Creates a new tooltip with the specified, or default, options.
-    * @param options The options
-    * @example
-    * $('.tooltip').tooltipster({
-    *   animation: 'fade',
-    *   delay: 200,
-    *   theme: 'tooltipster-default',
-    *   touchDevices: false,
-    *   trigger: 'hover'
-    * });
-    */
-    tooltipster(options?: JQueryTooltipsterOptions): JQuery;
-
     /**
      * Show a tooltip (the 'callback' argument is optional)
      * @param methodName show
@@ -262,11 +244,35 @@ interface JQuery {
      */
     tooltipster(methodName: "elementIcon"): JQuery;
 
+    /**
+     * Change default options for all future instances
+     * @param methodName setDefaults
+     * @param {object} options The options that should be made defaults
+     */
+    tooltipster(methodName: 'setDefaults', options: JQueryTooltipsterOptions): JQuery;
+
     /**
      * Generics
      */
-    tooltipster(methodName: string, optionName: string, optionValue: string): JQuery;
-    tooltipster(methodName: string, param: string): JQuery;
-    tooltipster(methodName: string): JQuery;
-    tooltipster(methodName: string): string;
+    tooltipster(methodName: string, optionName: string, optionValue?: string): JQuery;
+    tooltipster(methodName: string): JQuery | string;
+
+    /**
+     * Creates a new tooltip with the specified, or default, options.
+     * @param options The options
+     * @example
+     * $('.tooltip').tooltipster({
+    *   animation: 'fade',
+    *   delay: 200,
+    *   theme: 'tooltipster-default',
+    *   touchDevices: false,
+    *   trigger: 'hover'
+    * });
+     */
+    tooltipster(options?: JQueryTooltipsterOptions): JQuery;
+
+    /**
+     * Initiate the Tooltipster plugin
+     */
+    tooltipster(): JQuery;
 }
diff --git a/types/jquery.total-storage/index.d.ts b/types/jquery.total-storage/index.d.ts
index 5de79c34a6..1966d84e62 100644
--- a/types/jquery.total-storage/index.d.ts
+++ b/types/jquery.total-storage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Upstatement/jquery-total-storage
 // Definitions by: Jeremy Brooks <https://github.com/JeremyCBrooks/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -61,4 +62,4 @@ interface JQueryTotalStorageOptions {
 
 interface JQueryStatic {
     totalStorage: JQueryTotalStorage;
-}
\ No newline at end of file
+}
diff --git a/types/jquery.transit/index.d.ts b/types/jquery.transit/index.d.ts
index f267bbb24f..4bf4f5aabf 100644
--- a/types/jquery.transit/index.d.ts
+++ b/types/jquery.transit/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://ricostacruz.com/jquery.transit/
 // Definitions by: MrBigDog2U <https://github.com/MrBigDog2U>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.ui.datetimepicker/index.d.ts b/types/jquery.ui.datetimepicker/index.d.ts
index 96ed13e2bc..332bba5358 100644
--- a/types/jquery.ui.datetimepicker/index.d.ts
+++ b/types/jquery.ui.datetimepicker/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://trentrichardson.com/examples/timepicker/
 // Definitions by: dougajmcdonald <https://github.com/dougajmcdonald>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="jqueryui"/>
diff --git a/types/jquery.ui.layout/index.d.ts b/types/jquery.ui.layout/index.d.ts
index cab45fe24d..148265ac6a 100644
--- a/types/jquery.ui.layout/index.d.ts
+++ b/types/jquery.ui.layout/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://layout.jquery-dev.net/
 // Definitions by: Steve Fenton <https://github.com/Steve-Fenton>, Douglas Armstrong <https://github.com/drarmstr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="jqueryui"/>
diff --git a/types/jquery.uniform/index.d.ts b/types/jquery.uniform/index.d.ts
index b8b44f9b88..685538aa08 100644
--- a/types/jquery.uniform/index.d.ts
+++ b/types/jquery.uniform/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/pixelmatrix/uniform
 // Definitions by: flyfishMT <https://github.com/flyfishMT/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/jquery.validation/index.d.ts b/types/jquery.validation/index.d.ts
index 5e0e2cfa01..95be732332 100644
--- a/types/jquery.validation/index.d.ts
+++ b/types/jquery.validation/index.d.ts
@@ -2,6 +2,7 @@
 // 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
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery.watermark/index.d.ts b/types/jquery.watermark/index.d.ts
index bb6c5e1f0c..b735bcb2e0 100644
--- a/types/jquery.watermark/index.d.ts
+++ b/types/jquery.watermark/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jquery-watermark.googlecode.com
 // Definitions by: Anwar Javed <https://github.com/anwarjaved>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/jquery.window/index.d.ts b/types/jquery.window/index.d.ts
index 2dc8f75309..d1e60ff5be 100644
--- a/types/jquery.window/index.d.ts
+++ b/types/jquery.window/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://fstoke.me/jquery/window/
 // Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jquery/README.md b/types/jquery/README.md
new file mode 100644
index 0000000000..d1bbad05fc
--- /dev/null
+++ b/types/jquery/README.md
@@ -0,0 +1,53 @@
+### Usage
+
+#### Global
+
+When jQuery is globally available, you can use `jQuery` and `$` directly.
+
+#### Importing (with a global DOM available)
+
+When you want to import jQuery as a module and have a global DOM available (e.g. browser and browser-like environments):
+
+```typescript
+import * as jQuery from 'jquery';
+```
+
+#### Importing (without a global DOM available)
+
+When you want to import jQuery as a module and do not have a global DOM available (e.g. Node.js environment):
+
+```typescript
+import jQueryFactory = require('jquery');
+const jQuery = jQueryFactory(window, true);
+```
+
+Note that while the factory function ignores the second parameter, it is required to get correct type declarations.
+
+### Authoring type definitions for jQuery plugins
+
+`$.fn` is represented by `JQuery`.
+
+`$` is represented by `JQueryStatic`.
+
+Declare an interface that has the plugin's overloads as call signatures and static members as properties.
+
+```typescript
+interface MyPlugin {
+    settings: MyPluginSettings;
+    
+    (behavior: 'enable'): JQuery;
+    (settings?: MyPluginSettings): JQuery;
+}
+
+interface MyPluginSettings {
+    title?: string;
+}
+```
+
+Then declare a property on `JQuery` with your plugin's type.
+
+```typescript
+interface JQuery {
+    myPlugin: MyPlugin;
+}
+```
diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index ca799f21e5..2c7d5ce75a 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -1,493 +1,4529 @@
-// Type definitions for jQuery 1.10.x / 2.0.x
-// Project: http://jquery.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Christian Hoffmeister <https://github.com/choffmeister>, Steve Fenton <https://github.com/Steve-Fenton>, Diullei Gomes <https://github.com/Diullei>, Tass Iliopoulos <https://github.com/tasoili>, Jason Swearingen <https://github.com/jasons-novaleaf>, Sean Hill <https://github.com/seanski>, Guus Goossens <https://github.com/Guuz>, Kelly Summerlin <https://github.com/ksummerlin>, Basarat Ali Syed <https://github.com/basarat>, Nicholas Wolverson <https://github.com/nwolverson>, Derek Cicerone <https://github.com/derekcicerone>, Andrew Gaspar <https://github.com/AndrewGaspar>, Seikichi Kondo <https://github.com/seikichi>, Benjamin Jackman <https://github.com/benjaminjackman>, Poul Sorensen <https://github.com/s093294>, Josh Strobl <https://github.com/JoshStrobl>, John Reilly <https://github.com/johnnyreilly/>, Dick van den Brink <https://github.com/DickvdBrink>, Thomas Schulz <https://github.com/King2500>
+// Type definitions for jquery 3.2
+// Project: https://jquery.com
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+//                 Boris Yankov <https://github.com/borisyankov/>
+//                 Christian Hoffmeister <https://github.com/choffmeister>
+//                 Steve Fenton <https://github.com/Steve-Fenton>
+//                 Diullei Gomes <https://github.com/Diullei>
+//                 Tass Iliopoulos <https://github.com/tasoili>
+//                 Jason Swearingen <https://github.com/jasons-novaleaf>
+//                 Sean Hill <https://github.com/seanski>
+//                 Guus Goossens <https://github.com/Guuz>
+//                 Kelly Summerlin <https://github.com/ksummerlin>
+//                 Basarat Ali Syed <https://github.com/basarat>
+//                 Nicholas Wolverson <https://github.com/nwolverson>
+//                 Derek Cicerone <https://github.com/derekcicerone>
+//                 Andrew Gaspar <https://github.com/AndrewGaspar>
+//                 Seikichi Kondo <https://github.com/seikichi>
+//                 Benjamin Jackman <https://github.com/benjaminjackman>
+//                 Poul Sorensen <https://github.com/s093294>
+//                 Josh Strobl <https://github.com/JoshStrobl>
+//                 John Reilly <https://github.com/johnnyreilly/>
+//                 Dick van den Brink <https://github.com/DickvdBrink>
+//                 Thomas Schulz <https://github.com/King2500>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-/* *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-
-/**
- * Interface for the AJAX setting that will configure the AJAX request
- * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
- */
-interface JQueryAjaxSettings {
-    /**
-     * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
-     */
-    accepts?: any;
-    /**
-     * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success().
-     */
-    async?: boolean;
-    /**
-     * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request.
-     */
-    beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any;
-    /**
-     * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET.
-     */
-    cache?: boolean;
-    /**
-     * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
-     */
-    complete? (jqXHR: JQueryXHR, textStatus: string): any;
-    /**
-     * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5)
-     */
-    contents?: { [key: string]: any; };
-    //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
-    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
-    /**
-     * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
-     */
-    contentType?: any;
-    /**
-     * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
-     */
-    context?: any;
-    /**
-     * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5)
-     */
-    converters?: { [key: string]: any; };
-    /**
-     * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5)
-     */
-    crossDomain?: boolean;
-    /**
-     * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be key-value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below).
-     */
-    data?: any;
-    /**
-     * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter.
-     */
-    dataFilter? (data: any, ty: any): any;
-    /**
-     * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string).
-     */
-    dataType?: string;
-    /**
-     * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
-     */
-    error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any;
-    /**
-     * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events.
-     */
-    global?: boolean;
-    /**
-     * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5)
-     */
-    headers?: { [key: string]: any; };
-    /**
-     * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
-     */
-    ifModified?: boolean;
-    /**
-     * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1)
-     */
-    isLocal?: boolean;
-    /**
-     * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" }
-     */
-    jsonp?: any;
-    /**
-     * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
-     */
-    jsonpCallback?: any;
-    /**
-     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
-     */
-    method?: string;
-    /**
-     * A MIME type to override the XHR MIME type. (version added: 1.5.1)
-     */
-    mimeType?: string;
-    /**
-     * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
-     */
-    password?: string;
-    /**
-     * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false.
-     */
-    processData?: boolean;
-    /**
-     * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script.
-     */
-    scriptCharset?: string;
-    /**
-     * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5)
-     */
-    statusCode?: { [key: string]: any; };
-    /**
-     * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
-     */
-    success? (data: any, textStatus: string, jqXHR: JQueryXHR): any;
-    /**
-     * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period.
-     */
-    timeout?: number;
-    /**
-     * Set this to true if you wish to use the traditional style of parameter serialization.
-     */
-    traditional?: boolean;
-    /**
-     * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
-     */
-    type?: string;
-    /**
-     * A string containing the URL to which the request is sent.
-     */
-    url?: string;
-    /**
-     * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
-     */
-    username?: string;
-    /**
-     * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.
-     */
-    xhr?: any;
-    /**
-     * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1)
-     */
-    xhrFields?: { [key: string]: any; };
+declare module 'jquery' {
+    export = jQuery;
 }
 
-/**
- * Interface for the jqXHR object
- * @see {@link https://api.jquery.com/jQuery.ajax/#jqXHR}
- */
-interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
-    /**
-     * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5).
-     */
-    overrideMimeType(mimeType: string): any;
-    /**
-     * Cancel the request.
-     *
-     * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled"
-     */
-    abort(statusText?: string): void;
-    /**
-     * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
-     */
-    then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R|JQueryPromise<R>, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
-    /**
-     * Property containing the parsed response if the response content type is json
-     */
-    responseJSON?: any;
-    /**
-     * A function to be called if the request fails.
-     */
-    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
+declare module 'jquery/dist/jquery.slim' {
+    export = jQuery;
 }
 
-/**
- * Interface for the JQuery callback
- * @see {@link https://api.jquery.com/category/callbacks-object/}
- */
-interface JQueryCallback {
+declare const jQuery: JQueryStatic;
+declare const $: JQueryStatic;
+
+// Used by JQuery.Event
+type _Event = Event;
+
+interface JQuery<TElement extends Node = HTMLElement> {
     /**
-     * Add a callback or a collection of callbacks to a callback list.
+     * A string containing the jQuery version number.
      *
-     * @param callbacks A function, or array of functions, that are to be added to the callback list.
-     * @see {@link https://api.jquery.com/callbacks.add/}
+     * @see {@link https://api.jquery.com/jquery/}
+     * @since 1.0
      */
-    add(callbacks: Function): JQueryCallback;
+    jquery: string;
     /**
-     * Add a callback or a collection of callbacks to a callback list.
+     * The number of elements in the jQuery object.
      *
-     * @param callbacks A function, or array of functions, that are to be added to the callback list.
-     * @see {@link https://api.jquery.com/callbacks.add/}
+     * @see {@link https://api.jquery.com/length/}
+     * @since 1.0
      */
-    add(callbacks: Function[]): JQueryCallback;
-
+    length: number;
     /**
-     * Disable a callback list from doing anything more.
-     * @see {@link https://api.jquery.com/callbacks.disable/}
-     */
-    disable(): JQueryCallback;
-
-    /**
-     * Determine if the callbacks list has been disabled.
-     * @see {@link https://api.jquery.com/callbacks.disabled/}
-     */
-    disabled(): boolean;
-
-    /**
-     * Remove all of the callbacks from a list.
-     * @see {@link https://api.jquery.com/callbacks.empty/}
-     */
-    empty(): JQueryCallback;
-
-    /**
-     * Call all of the callbacks with the given arguments
+     * Create a new jQuery object with elements added to the set of matched elements.
      *
-     * @param arguments The argument or list of arguments to pass back to the callback list.
-     * @see {@link https://api.jquery.com/callbacks.fire/}
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     * @param context The point in the document at which the selector should begin matching; similar to the context
+     *                argument of the $(selector, context) method.
+     * @see {@link https://api.jquery.com/add/}
+     * @since 1.4
      */
-    fire(...arguments: any[]): JQueryCallback;
-
+    add(selector: JQuery.Selector, context: Element): JQuery<TElement>;
     /**
-     * Determine if the callbacks have already been called at least once.
-     * @see {@link https://api.jquery.com/callbacks.fired/}
-     */
-    fired(): boolean;
-
-    /**
-     * Call all callbacks in a list with the given context and arguments.
+     * Create a new jQuery object with elements added to the set of matched elements.
      *
-     * @param context A reference to the context in which the callbacks in the list should be fired.
-     * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
-     * @see {@link https://api.jquery.com/callbacks.fireWith/}
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     *                 One or more elements to add to the set of matched elements.
+     *                 An HTML fragment to add to the set of matched elements.
+     *                 An existing jQuery object to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/}
+     * @since 1.0
+     * @since 1.3.2
      */
-    fireWith(context?: any, args?: any[]): JQueryCallback;
-
+    add(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery.htmlString | JQuery): JQuery<TElement>;
     /**
-     * Determine whether a supplied callback is in a list
+     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
      *
-     * @param callback The callback to search for.
-     * @see {@link https://api.jquery.com/callbacks.has/}
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     * @see {@link https://api.jquery.com/addBack/}
+     * @since 1.8
      */
-    has(callback: Function): boolean;
-
+    addBack(selector?: JQuery.Selector): this;
     /**
-     * Lock a callback list in its current state.
-     * @see {@link https://api.jquery.com/callbacks.lock/}
-     */
-    lock(): JQueryCallback;
-
-    /**
-     * Determine if the callbacks list has been locked.
-     * @see {@link https://api.jquery.com/callbacks.locked/}
-     */
-    locked(): boolean;
-
-    /**
-     * Remove a callback or a collection of callbacks from a callback list.
+     * Adds the specified class(es) to each element in the set of matched elements.
      *
-     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
-     * @see {@link https://api.jquery.com/callbacks.remove/}
+     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+     *                  A function returning one or more space-separated class names to be added to the existing class
+     *                  name(s). Receives the index position of the element in the set and the existing class name(s) as
+     *                  arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/addClass/}
+     * @since 1.0
+     * @since 1.4
      */
-    remove(callbacks: Function): JQueryCallback;
+    addClass(className: string | ((this: TElement, index: number, currentClassName: string) => string)): this;
     /**
-     * Remove a callback or a collection of callbacks from a callback list.
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
      *
-     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
-     * @see {@link https://api.jquery.com/callbacks.remove/}
+     * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
+     *                 jQuery objects to insert after each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/after/}
+     * @since 1.0
      */
-    remove(callbacks: Function[]): JQueryCallback;
+    after(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery>): this;
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * @param fn A function that returns an HTML string, DOM element(s), text node(s), or jQuery object to insert
+     *           after each element in the set of matched elements. Receives the index position of the element in the
+     *           set and the old HTML value of the element as arguments. Within the function, this refers to the
+     *           current element in the set.
+     * @see {@link https://api.jquery.com/after/}
+     * @since 1.4
+     * @since 1.10
+     */
+    after(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    /**
+     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxComplete/}
+     * @since 1.0
+     */
+    ajaxComplete(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    /**
+     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxError/}
+     * @since 1.0
+     */
+    ajaxError(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxSettings: JQuery.AjaxSettings, thrownError: string) => void | false): this;
+    /**
+     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSend/}
+     * @since 1.0
+     */
+    ajaxSend(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    /**
+     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStart/}
+     * @since 1.0
+     */
+    ajaxStart(handler: (this: Document) => void | false): this;
+    /**
+     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStop/}
+     * @since 1.0
+     */
+    ajaxStop(handler: (this: Document) => void | false): this;
+    /**
+     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSuccess/}
+     * @since 1.0
+     */
+    ajaxSuccess(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings, data: JQuery.PlainObject) => void | false): this;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/animate/}
+     * @since 1.0
+     */
+    animate(properties: JQuery.PlainObject,
+            duration: JQuery.Duration,
+            easing: string,
+            complete?: (this: TElement) => void): this;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/animate/}
+     * @since 1.0
+     */
+    animate(properties: JQuery.PlainObject,
+            duration_easing: JQuery.Duration | string,
+            complete?: (this: TElement) => void): this;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/animate/}
+     * @since 1.0
+     */
+    animate(properties: JQuery.PlainObject,
+            options: JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/animate/}
+     * @since 1.0
+     */
+    animate(properties: JQuery.PlainObject,
+            complete?: (this: TElement) => void): this;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
+     *                 jQuery objects to insert at the end of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/append/}
+     * @since 1.0
+     */
+    append(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery>): this;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param fn A function that returns an HTML string, DOM element(s), text node(s), or jQuery object to insert at
+     *           the end of each element in the set of matched elements. Receives the index position of the element
+     *           in the set and the old HTML value of the element as arguments. Within the function, this refers to
+     *           the current element in the set.
+     * @see {@link https://api.jquery.com/append/}
+     * @since 1.4
+     */
+    append(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    /**
+     * Insert every element in the set of matched elements to the end of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements
+     *               will be inserted at the end of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/appendTo/}
+     * @since 1.0
+     */
+    appendTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param value A value to set for the attribute. If null, the specified attribute will be removed (as in .removeAttr()).
+     *              A function returning the value to set. this is the current element. Receives the index position of
+     *              the element in the set and the old attribute value as arguments.
+     * @see {@link https://api.jquery.com/attr/}
+     * @since 1.0
+     * @since 1.1
+     */
+    attr(attributeName: string,
+         value: string | number | null | ((this: TElement, index: number, attr: string) => string | number | void | undefined)): this;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributes An object of attribute-value pairs to set.
+     * @see {@link https://api.jquery.com/attr/}
+     * @since 1.0
+     */
+    attr(attributes: JQuery.PlainObject): this;
+    /**
+     * Get the value of an attribute for the first element in the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to get.
+     * @see {@link https://api.jquery.com/attr/}
+     * @since 1.0
+     */
+    attr(attributeName: string): string | undefined;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
+     *                 jQuery objects to insert before each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/before/}
+     * @since 1.0
+     */
+    before(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery>): this;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param fn A function that returns an HTML string, DOM element(s), text node(s), or jQuery object to insert
+     *           before each element in the set of matched elements. Receives the index position of the element in
+     *           the set and the old HTML value of the element as arguments. Within the function, this refers to the
+     *           current element in the set.
+     * @see {@link https://api.jquery.com/before/}
+     * @since 1.4
+     * @since 1.10
+     */
+    before(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    // [bind() overloads] https://github.com/jquery/api.jquery.com/issues/1048
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/bind/}
+     * @since 1.0
+     * @since 1.4.3
+     * @deprecated 3.0
+     */
+    bind<TData>(eventType: string, eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     *                Setting the second argument to false will attach a function that prevents the default action from
+     *                occurring and stops the event from bubbling.
+     * @see {@link https://api.jquery.com/bind/}
+     * @since 1.0
+     * @since 1.4.3
+     * @deprecated 3.0
+     */
+    bind(eventType: string, handler: JQuery.EventHandler<TElement> | false | null | undefined): this;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param events An object containing one or more DOM event types and functions to execute for them.
+     * @see {@link https://api.jquery.com/bind/}
+     * @since 1.4
+     * @deprecated 3.0
+     */
+    bind(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    /**
+     * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/}
+     * @since 1.4.3
+     */
+    blur<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/}
+     * @since 1.0
+     */
+    blur(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/}
+     * @since 1.4.3
+     */
+    change<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/}
+     * @since 1.0
+     */
+    change(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/children/}
+     * @since 1.0
+     */
+    children(selector?: JQuery.Selector): this;
+    /**
+     * Remove from the queue all items that have not yet been run.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/clearQueue/}
+     * @since 1.4
+     */
+    clearQueue(queueName?: string): this;
+    /**
+     * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/}
+     * @since 1.4.3
+     */
+    click<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/}
+     * @since 1.0
+     */
+    click(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Create a deep copy of the set of matched elements.
+     *
+     * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The
+     *                          default value is false. *In jQuery 1.5.0 the default value was incorrectly true; it was changed back
+     *                          to false in 1.5.1 and up.
+     * @param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should
+     *                              be copied. By default its value matches the first argument's value (which defaults to false).
+     * @see {@link https://api.jquery.com/clone/}
+     * @since 1.0
+     * @since 1.5
+     */
+    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): this;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element
+     * itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @param context A DOM element within which a matching element may be found.
+     * @see {@link https://api.jquery.com/closest/}
+     * @since 1.4
+     */
+    closest(selector: JQuery.Selector, context: Element): this;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element
+     * itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     *                 A jQuery object to match elements against.
+     *                 An element to match elements against.
+     * @see {@link https://api.jquery.com/closest/}
+     * @since 1.3
+     * @since 1.6
+     */
+    closest(selector: JQuery.Selector | JQuery | Element): this;
+    /**
+     * Get the children of each element in the set of matched elements, including text and comment nodes.
+     *
+     * @see {@link https://api.jquery.com/contents/}
+     * @since 1.2
+     */
+    contents(): this;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/}
+     * @since 1.4.3
+     */
+    contextmenu<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/}
+     * @since 1.0
+     */
+    contextmenu(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     *              A function returning the value to set. this is the current element. Receives the index position of
+     *              the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/css/}
+     * @since 1.0
+     * @since 1.4
+     */
+    css(propertyName: string,
+        value: string | number | ((this: TElement, index: number, value: string) => string | number | void | undefined)): this;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/css/}
+     * @since 1.0
+     */
+    css(properties: JQuery.PlainObject<string | number | ((this: TElement, index: number, value: string) => string | number | void | undefined)>): this;
+    /**
+     * Get the computed style properties for the first element in the set of matched elements.
+     *
+     * @param propertyName A CSS property.
+     *                     An array of one or more CSS properties.
+     * @see {@link https://api.jquery.com/css/}
+     * @since 1.0
+     */
+    css(propertyName: string): string;
+    /**
+     * Get the computed style properties for the first element in the set of matched elements.
+     *
+     * @param propertyNames An array of one or more CSS properties.
+     * @see {@link https://api.jquery.com/css/}
+     * @since 1.9
+     */
+    css(propertyNames: string[]): JQuery.PlainObject<string>;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by
+     * data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     * @param undefined
+     * @see {@link https://api.jquery.com/data/}
+     * @since 1.2.3
+     */
+    data(key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; this can be any Javascript type except undefined.
+     * @see {@link https://api.jquery.com/data/}
+     * @since 1.2.3
+     */
+    data(key: string, value: any): this;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     * @see {@link https://api.jquery.com/data/}
+     * @since 1.4.3
+     */
+    data(obj: JQuery.PlainObject): this;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by
+     * data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     * @see {@link https://api.jquery.com/data/}
+     * @since 1.2.3
+     */
+    data(key: string): any;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by
+     * data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @see {@link https://api.jquery.com/data/}
+     * @since 1.4
+     */
+    data(): JQuery.PlainObject;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/}
+     * @since 1.4.3
+     */
+    dblclick<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/}
+     * @since 1.0
+     */
+    dblclick(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Set a timer to delay execution of subsequent items in the queue.
+     *
+     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/delay/}
+     * @since 1.4
+     */
+    delay(duration: JQuery.Duration, queueName?: string): this;
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the
+     * future, based on a specific set of root elements.
+     *
+     * @param selector A selector to filter the elements that trigger the event.
+     * @param eventType A string containing one or more space-separated JavaScript event types, such as "click" or
+     *                  "keydown," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/delegate/}
+     * @since 1.4.2
+     * @deprecated 3.0
+     */
+    delegate<TData>(selector: JQuery.Selector, eventType: string, eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the
+     * future, based on a specific set of root elements.
+     *
+     * @param selector A selector to filter the elements that trigger the event.
+     * @param eventType A string containing one or more space-separated JavaScript event types, such as "click" or
+     *                  "keydown," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/delegate/}
+     * @since 1.4.2
+     * @deprecated 3.0
+     */
+    delegate(selector: JQuery.Selector, eventType: string, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the
+     * future, based on a specific set of root elements.
+     *
+     * @param selector A selector to filter the elements that trigger the event.
+     * @param events A plain object of one or more event types and functions to execute for them.
+     * @see {@link https://api.jquery.com/delegate/}
+     * @since 1.4.3
+     * @deprecated 3.0
+     */
+    delegate(selector: JQuery.Selector, events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    /**
+     * Execute the next function on the queue for the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/dequeue/}
+     * @since 1.2
+     */
+    dequeue(queueName?: string): this;
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/detach/}
+     * @since 1.4
+     */
+    detach(selector?: JQuery.Selector): this;
+    /**
+     * Iterate over a jQuery object, executing a function for each matched element.
+     *
+     * @param fn A function to execute for each matched element.
+     * @see {@link https://api.jquery.com/each/}
+     * @since 1.0
+     */
+    each(fn: (this: TElement, index: number, element: Element) => void | false): this;
+    /**
+     * Remove all child nodes of the set of matched elements from the DOM.
+     *
+     * @see {@link https://api.jquery.com/empty/}
+     * @since 1.0
+     */
+    empty(): this;
+    /**
+     * End the most recent filtering operation in the current chain and return the set of matched elements
+     * to its previous state.
+     *
+     * @see {@link https://api.jquery.com/end/}
+     * @since 1.0
+     */
+    end(): this;
+    /**
+     * Reduce the set of matched elements to the one at the specified index.
+     *
+     * @param index An integer indicating the 0-based position of the element.
+     *              An integer indicating the position of the element, counting backwards from the last element in the set.
+     * @see {@link https://api.jquery.com/eq/}
+     * @since 1.1.2
+     * @since 1.4
+     */
+    eq(index: number): this;
+    /**
+     * Merge the contents of an object onto the jQuery prototype to provide new jQuery instance methods.
+     *
+     * @param obj An object to merge onto the jQuery prototype.
+     * @see {@link https://api.jquery.com/jQuery.fn.extend/}
+     * @since 1.0
+     */
+    extend(obj: object): JQuery<TElement>;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeIn/}
+     * @since 1.4.3
+     */
+    fadeIn(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeIn/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeIn(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeIn/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeIn(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeOut/}
+     * @since 1.4.3
+     */
+    fadeOut(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeOut/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeOut(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeOut/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeOut(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeTo/}
+     * @since 1.4.3
+     */
+    fadeTo(duration: JQuery.Duration, opacity: number, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeTo/}
+     * @since 1.0
+     */
+    fadeTo(duration: JQuery.Duration, opacity: number, complete?: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @since 1.4.4
+     */
+    fadeToggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeToggle(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    fadeToggle(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     *                 One or more DOM elements to match the current set of elements against.
+     *                 An existing jQuery object to match the current set of elements against.
+     *                 A function used as a test for each element in the set. this is the current DOM element.
+     * @see {@link https://api.jquery.com/filter/}
+     * @since 1.0
+     * @since 1.4
+     */
+    filter(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery | ((this: TElement, index: number, element: TElement) => boolean)): this;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector,
+     * jQuery object, or element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     *                 An element or a jQuery object to match elements against.
+     * @see {@link https://api.jquery.com/find/}
+     * @since 1.0
+     * @since 1.6
+     */
+    find(selector: JQuery.Selector | Element | JQuery): JQuery<TElement>;
+    /**
+     * Stop the currently-running animation, remove all queued animations, and complete all animations for
+     * the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @see {@link https://api.jquery.com/finish/}
+     * @since 1.9
+     */
+    finish(queue?: string): this;
+    /**
+     * Reduce the set of matched elements to the first in the set.
+     *
+     * @see {@link https://api.jquery.com/first/}
+     * @since 1.4
+     */
+    first(): this;
+    /**
+     * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/}
+     * @since 1.4.3
+     */
+    focus<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/}
+     * @since 1.0
+     */
+    focus(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "focusin" event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/}
+     * @since 1.4.3
+     */
+    focusin<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "focusin" event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/}
+     * @since 1.4
+     */
+    focusin(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/}
+     * @since 1.4.3
+     */
+    focusout<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/}
+     * @since 1.4
+     */
+    focusout(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Retrieve one of the elements matched by the jQuery object.
+     *
+     * @param index A zero-based integer indicating which element to retrieve.
+     * @see {@link https://api.jquery.com/get/}
+     * @since 1.0
+     */
+    get(index: number): TElement;
+    /**
+     * Retrieve the elements matched by the jQuery object.
+     *
+     * @see {@link https://api.jquery.com/get/}
+     * @since 1.0
+     */
+    get(): TElement[];
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     *                 A DOM element to match elements against.
+     * @see {@link https://api.jquery.com/has/}
+     * @since 1.4
+     */
+    has(selector: string | Element): this;
+    /**
+     * Determine whether any of the matched elements are assigned the given class.
+     *
+     * @param className The class name to search for.
+     * @see {@link https://api.jquery.com/hasClass/}
+     * @since 1.2
+     */
+    hasClass(className: string): boolean;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure
+     *              appended (as a string).
+     *              A function returning the height to set. Receives the index position of the element in the set and
+     *              the old height as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/height/}
+     * @since 1.0
+     * @since 1.4.1
+     */
+    height(value: string | number | ((this: TElement, index: number, height: number) => string | number)): this;
+    /**
+     * Get the current computed height for the first element in the set of matched elements.
+     *
+     * @see {@link https://api.jquery.com/height/}
+     * @since 1.0
+     */
+    height(): number | undefined;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/hide/}
+     * @since 1.4.3
+     */
+    hide(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): this;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing_complete A string indicating which easing function to use for the transition.
+     *                        A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/hide/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    hide(duration: JQuery.Duration, easing_complete: string | ((this: TElement) => void)): this;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration_complete_options A string or number determining how long the animation will run.
+     *                                  A function to call once the animation is complete, called once per matched element.
+     *                                  A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/hide/}
+     * @since 1.0
+     */
+    hide(duration_complete_options?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Bind one or two handlers to the matched elements, to be executed when the mouse pointer enters and
+     * leaves the elements.
+     *
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     * @param handlerOut A function to execute when the mouse pointer leaves the element.
+     * @see {@link https://api.jquery.com/hover/}
+     * @since 1.0
+     * @since 1.4
+     */
+    hover(handlerInOut: JQuery.EventHandler<TElement> | false, handlerOut?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param htmlString A string of HTML to set as the content of each matched element.
+     *                   A function returning the HTML content to set. Receives the index position of the element in the set
+     *                   and the old HTML value as arguments. jQuery empties the element before calling the function; use the
+     *                   oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/html/}
+     * @since 1.0
+     * @since 1.4
+     */
+    html(htmlString: JQuery.htmlString | ((this: TElement, index: number, oldhtml: JQuery.htmlString) => JQuery.htmlString)): this;
+    /**
+     * Get the HTML contents of the first element in the set of matched elements.
+     *
+     * @see {@link https://api.jquery.com/html/}
+     * @since 1.0
+     */
+    html(): string;
+    /**
+     * Search for a given element from among the matched elements.
+     *
+     * @param element The DOM element or first element within the jQuery object to look for.
+     *                A selector representing a jQuery collection in which to look for an element.
+     * @see {@link https://api.jquery.com/index/}
+     * @since 1.0
+     * @since 1.4
+     */
+    index(element?: Element | JQuery | JQuery.Selector): number;
+    /**
+     * Set the CSS inner height of each element in the set of matched elements.
+     *
+     * @param value A number representing the number of pixels, or a number along with an optional unit of measure
+     *              appended (as a string).
+     *              A function returning the inner height (including padding but not border) to set. Receives the index
+     *              position of the element in the set and the old inner height as arguments. Within the function, this
+     *              refers to the current element in the set.
+     * @see {@link https://api.jquery.com/innerHeight/}
+     * @since 1.8.0
+     */
+    innerHeight(value: string | number | ((this: TElement, index: number, height: number) => string | number)): this;
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including
+     * padding but not border.
+     *
+     * @see {@link https://api.jquery.com/innerHeight/}
+     * @since 1.2.6
+     */
+    innerHeight(): number | undefined;
+    /**
+     * Set the CSS inner width of each element in the set of matched elements.
+     *
+     * @param value A number representing the number of pixels, or a number along with an optional unit of measure
+     *              appended (as a string).
+     *              A function returning the inner width (including padding but not border) to set. Receives the index
+     *              position of the element in the set and the old inner width as arguments. Within the function, this
+     *              refers to the current element in the set.
+     * @see {@link https://api.jquery.com/innerWidth/}
+     * @since 1.8.0
+     */
+    innerWidth(value: string | number | ((this: TElement, index: number, width: number) => string | number)): this;
+    /**
+     * Get the current computed inner width for the first element in the set of matched elements, including
+     * padding but not border.
+     *
+     * @see {@link https://api.jquery.com/innerWidth/}
+     * @since 1.2.6
+     */
+    innerWidth(): number | undefined;
+    /**
+     * Insert every element in the set of matched elements after the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements
+     *               will be inserted after the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertAfter/}
+     * @since 1.0
+     */
+    insertAfter(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    /**
+     * Insert every element in the set of matched elements before the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements
+     *               will be inserted before the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertBefore/}
+     * @since 1.0
+     */
+    insertBefore(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return
+     * true if at least one of these elements matches the given arguments.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     *                 A function used as a test for every element in the set. It accepts two arguments, index, which is
+     *                 the element's index in the jQuery collection, and element, which is the DOM element. Within the
+     *                 function, this refers to the current DOM element.
+     *                 An existing jQuery object to match the current set of elements against.
+     *                 One or more elements to match the current set of elements against.
+     * @see {@link https://api.jquery.com/is/}
+     * @since 1.0
+     * @since 1.6
+     */
+    is(selector: JQuery.Selector | ((this: TElement, index: number, element: TElement) => boolean) | JQuery | Element | Element[]): boolean;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/}
+     * @since 1.4.3
+     */
+    keydown<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/}
+     * @since 1.0
+     */
+    keydown(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/}
+     * @since 1.4.3
+     */
+    keypress<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/}
+     * @since 1.0
+     */
+    keypress(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/}
+     * @since 1.4.3
+     */
+    keyup<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/}
+     * @since 1.0
+     */
+    keyup(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Reduce the set of matched elements to the final one in the set.
+     *
+     * @see {@link https://api.jquery.com/last/}
+     * @since 1.4
+     */
+    last(): this;
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param complete A callback function that is executed when the request completes.
+     * @see {@link https://api.jquery.com/load/}
+     * @since 1.0
+     */
+    load(url: string,
+         data: string | JQuery.PlainObject,
+         complete: (this: TElement, responseText: string, textStatus: JQuery.Ajax.TextStatus, jqXHR: JQuery.jqXHR) => void): this;
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param complete_data A callback function that is executed when the request completes.
+     *                      A plain object or string that is sent to the server with the request.
+     * @see {@link https://api.jquery.com/load/}
+     * @since 1.0
+     */
+    load(url: string,
+         complete_data?: ((this: TElement, responseText: string, textStatus: JQuery.Ajax.TextStatus, jqXHR: JQuery.jqXHR) => void) | string | JQuery.PlainObject): this;
+    /**
+     * Pass each element in the current matched set through a function, producing a new jQuery object
+     * containing the return values.
+     *
+     * @param callback A function object that will be invoked for each element in the current set.
+     * @see {@link https://api.jquery.com/map/}
+     * @since 1.2
+     */
+    map(callback: (this: TElement, index: number, domElement: TElement) => any | any[] | null | undefined): JQuery<TElement>;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/}
+     * @since 1.4.3
+     */
+    mousedown<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/}
+     * @since 1.0
+     */
+    mousedown(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/}
+     * @since 1.4.3
+     */
+    mouseenter<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/}
+     * @since 1.0
+     */
+    mouseenter(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/}
+     * @since 1.4.3
+     */
+    mouseleave<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/}
+     * @since 1.0
+     */
+    mouseleave(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/}
+     * @since 1.4.3
+     */
+    mousemove<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/}
+     * @since 1.0
+     */
+    mousemove(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/}
+     * @since 1.4.3
+     */
+    mouseout<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/}
+     * @since 1.0
+     */
+    mouseout(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/}
+     * @since 1.4.3
+     */
+    mouseover<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/}
+     * @since 1.0
+     */
+    mouseover(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/}
+     * @since 1.4.3
+     */
+    mouseup<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/}
+     * @since 1.0
+     */
+    mouseup(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Get the immediately following sibling of each element in the set of matched elements. If a selector
+     * is provided, it retrieves the next sibling only if it matches that selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/next/}
+     * @since 1.0
+     */
+    next(selector?: JQuery.Selector): this;
+    /**
+     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextAll/}
+     * @since 1.2
+     */
+    nextAll(selector?: string): this;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the
+     * selector, DOM node, or jQuery object passed.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
+     *                 A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/}
+     * @since 1.4
+     * @since 1.6
+     */
+    nextUntil(selector?: JQuery.Selector | Element | JQuery, filter?: JQuery.Selector): this;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param selector A string containing a selector expression, a DOM element, or an array of elements to match against the set.
+     *                 A function used as a test for each element in the set. It accepts two arguments, index, which is the
+     *                 element's index in the jQuery collection, and element, which is the DOM element. Within the
+     *                 function, this refers to the current DOM element.
+     *                 An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/not/}
+     * @since 1.0
+     * @since 1.4
+     */
+    not(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | ((this: TElement, index: number, element: TElement) => boolean) | JQuery): this;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as
+     *               "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/off/}
+     * @since 1.7
+     */
+    off(events: string, selector: JQuery.Selector, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as
+     *               "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector_handler A selector which should match the one originally passed to .on() when attaching event handlers.
+     *                         A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/off/}
+     * @since 1.7
+     */
+    off(events: string, selector_handler?: JQuery.Selector | JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Remove an event handler.
+     *
+     * @param events An object where the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent handler functions previously attached for the event(s).
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @see {@link https://api.jquery.com/off/}
+     * @since 1.7
+     */
+    off(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>, selector?: JQuery.Selector): this;
+    /**
+     * Remove an event handler.
+     *
+     * @param event A jQuery.Event object.
+     * @see {@link https://api.jquery.com/off/}
+     * @since 1.7
+     */
+    off(event?: JQuery.Event<TElement>): this;
+    /**
+     * Set the current coordinates of every element in the set of matched elements, relative to the document.
+     *
+     * @param coordinates An object containing the properties top and left, which are numbers indicating the new top and left
+     *                    coordinates for the elements.
+     *                    A function to return the coordinates to set. Receives the index of the element in the collection as
+     *                    the first argument and the current coordinates as the second argument. The function should return an
+     *                    object with the new top and left properties.
+     * @see {@link https://api.jquery.com/offset/}
+     * @since 1.4
+     */
+    offset(coordinates: JQuery.Coordinates | ((this: TElement, index: number, coords: JQuery.Coordinates) => JQuery.Coordinates)): this;
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
+     *
+     * @see {@link https://api.jquery.com/offset/}
+     * @since 1.2
+     */
+    offset(): JQuery.Coordinates;
+    /**
+     * Get the closest ancestor element that is positioned.
+     *
+     * @see {@link https://api.jquery.com/offsetParent/}
+     * @since 1.2.6
+     */
+    offsetParent(): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: string, selector: JQuery.Selector | null, data: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
+     *                for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: string, selector: JQuery.Selector | null, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: string, data: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
+     *                for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: string, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>, selector: JQuery.Selector | null, data: TData): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>, selector: JQuery.Selector): this; // tslint:disable-line:unified-signatures
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>, data: TData): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one<TData>(events: string, selector: JQuery.Selector | null, data: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
+     *                for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one(events: string, selector: JQuery.Selector | null, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one<TData>(events: string, data: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
+     *                for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one(events: string, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>, selector: JQuery.Selector | null, data: TData): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>, selector: JQuery.Selector): this; // tslint:disable-line:unified-signatures
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>, data: TData): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @see {@link https://api.jquery.com/one/}
+     * @since 1.7
+     */
+    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    /**
+     * Set the CSS outer height of each element in the set of matched elements.
+     *
+     * @param value A number representing the number of pixels, or a number along with an optional unit of measure
+     *              appended (as a string).
+     * @see {@link https://api.jquery.com/outerHeight/}
+     * @since 1.8.0
+     */
+    outerHeight(value: string | number | ((this: TElement, index: number, height: number) => string | number)): this;
+    /**
+     * Get the current computed outer height (including padding, border, and optionally margin) for the
+     * first element in the set of matched elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerHeight/}
+     * @since 1.2.6
+     */
+    outerHeight(includeMargin?: boolean): number | undefined;
+    /**
+     * Set the CSS outer width of each element in the set of matched elements.
+     *
+     * @param value A number representing the number of pixels, or a number along with an optional unit of measure
+     *              appended (as a string).
+     *              A function returning the outer width to set. Receives the index position of the element in the set
+     *              and the old outer width as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/outerWidth/}
+     * @since 1.8.0
+     */
+    outerWidth(value: string | number | ((this: TElement, index: number, width: number) => string | number)): this;
+    /**
+     * Get the current computed outer width (including padding, border, and optionally margin) for the
+     * first element in the set of matched elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerWidth/}
+     * @since 1.2.6
+     */
+    outerWidth(includeMargin?: boolean): number | undefined;
+    /**
+     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parent/}
+     * @since 1.0
+     */
+    parent(selector?: JQuery.Selector): this;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parents/}
+     * @since 1.0
+     */
+    parents(selector?: JQuery.Selector): this;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including
+     * the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
+     *                 A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/}
+     * @since 1.4
+     * @since 1.6
+     */
+    parentsUntil(selector?: JQuery.Selector | Element | JQuery, filter?: JQuery.Selector): this;
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
+     *
+     * @see {@link https://api.jquery.com/position/}
+     * @since 1.2
+     */
+    position(): JQuery.Coordinates;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
+     *                 jQuery objects to insert at the beginning of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/prepend/}
+     * @since 1.0
+     */
+    prepend(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery>): this;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param fn A function that returns an HTML string, DOM element(s), text node(s), or jQuery object to insert at
+     *           the beginning of each element in the set of matched elements. Receives the index position of the
+     *           element in the set and the old HTML value of the element as arguments. Within the function, this
+     *           refers to the current element in the set.
+     * @see {@link https://api.jquery.com/prepend/}
+     * @since 1.4
+     */
+    prepend(fn: (this: TElement, index: number, html: string) => JQuery.htmlString | JQuery.TypeOrArray<Element | Text> | JQuery): this;
+    /**
+     * Insert every element in the set of matched elements to the beginning of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements
+     *               will be inserted at the beginning of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/prependTo/}
+     * @since 1.0
+     */
+    prependTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    /**
+     * Get the immediately preceding sibling of each element in the set of matched elements. If a selector
+     * is provided, it retrieves the previous sibling only if it matches that selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prev/}
+     * @since 1.0
+     */
+    prev(selector?: JQuery.Selector): this;
+    /**
+     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevAll/}
+     * @since 1.2
+     */
+    prevAll(selector?: JQuery.Selector): this;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the
+     * selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
+     *                 A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/}
+     * @since 1.4
+     * @since 1.6
+     */
+    prevUntil(selector?: JQuery.Selector | Element | JQuery, filter?: JQuery.Selector): this;
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection,
+     * queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed.
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/promise/}
+     * @since 1.6
+     */
+    promise<T>(type: string, target: T): T & JQuery.Promise<Element>;
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection,
+     * queued or not, have finished.
+     *
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/promise/}
+     * @since 1.6
+     */
+    promise<T>(target: T): T & JQuery.Promise<Element>;
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection,
+     * queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed.
+     * @see {@link https://api.jquery.com/promise/}
+     * @since 1.6
+     */
+    promise(type?: string): JQuery.Promise<this>;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A function returning the value to set. Receives the index position of the element in the set and the
+     *              old property value as arguments. Within the function, the keyword this refers to the current element.
+     * @see {@link https://api.jquery.com/prop/}
+     * @since 1.6
+     */
+    prop(propertyName: string, value: (this: TElement, index: number, oldPropertyValue: any) => any): this;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A value to set for the property.
+     * @see {@link https://api.jquery.com/prop/}
+     * @since 1.6
+     */
+    prop(propertyName: string, value: any): this; // tslint:disable-line:unified-signatures
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/prop/}
+     * @since 1.6
+     */
+    prop(properties: JQuery.PlainObject): this;
+    /**
+     * Get the value of a property for the first element in the set of matched elements.
+     *
+     * @param propertyName The name of the property to get.
+     * @see {@link https://api.jquery.com/prop/}
+     * @since 1.6
+     */
+    prop(propertyName: string): any | undefined;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @param name The name of a jQuery method that generated the array of elements.
+     * @param args The arguments that were passed in to the jQuery method (for serialization).
+     * @see {@link https://api.jquery.com/pushStack/}
+     * @since 1.3
+     */
+    pushStack(elements: ArrayLike<Element>, name: string, args: any[]): JQuery<TElement>;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @see {@link https://api.jquery.com/pushStack/}
+     * @since 1.0
+     */
+    pushStack(elements: ArrayLike<Element>): JQuery<TElement>;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue The new function to add to the queue, with a function to call that will dequeue the next item.
+     *                 An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/}
+     * @since 1.2
+     */
+    queue(queueName: string, newQueue: JQuery.TypeOrArray<JQuery.QueueFunction<TElement>>): this;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param newQueue The new function to add to the queue, with a function to call that will dequeue the next item.
+     *                 An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/}
+     * @since 1.2
+     */
+    queue(newQueue: JQuery.TypeOrArray<JQuery.QueueFunction<TElement>>): this;
+    /**
+     * Show the queue of functions to be executed on the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/queue/}
+     * @since 1.2
+     */
+    queue(queueName?: string): JQuery.Queue<TElement>;
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     *
+     * @param handler A function to execute after the DOM is ready.
+     * @see {@link https://api.jquery.com/ready/}
+     * @since 1.0
+     */
+    ready(handler: ($: JQueryStatic<TElement>) => void): this;
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/remove/}
+     * @since 1.0
+     */
+    remove(selector?: string): this;
+    /**
+     * Remove an attribute from each element in the set of matched elements.
+     *
+     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
+     * @see {@link https://api.jquery.com/removeAttr/}
+     * @since 1.0
+     */
+    removeAttr(attributeName: string): this;
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+     *                  A function returning one or more space-separated class names to be removed. Receives the index
+     *                  position of the element in the set and the old class value as arguments.
+     * @see {@link https://api.jquery.com/removeClass/}
+     * @since 1.0
+     * @since 1.4
+     */
+    removeClass(className?: string | ((this: TElement, index: number, className: string) => string)): this;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param name A string naming the piece of data to delete.
+     *             An array or space-separated string naming the pieces of data to delete.
+     * @see {@link https://api.jquery.com/removeData/}
+     * @since 1.2.3
+     * @since 1.7
+     */
+    removeData(name?: JQuery.TypeOrArray<string>): this;
+    /**
+     * Remove a property for the set of matched elements.
+     *
+     * @param propertyName The name of the property to remove.
+     * @see {@link https://api.jquery.com/removeProp/}
+     * @since 1.6
+     */
+    removeProp(propertyName: string): this;
+    /**
+     * Replace each target element with the set of matched elements.
+     *
+     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
+     * @see {@link https://api.jquery.com/replaceAll/}
+     * @since 1.2
+     */
+    replaceAll(target: JQuery.Selector | JQuery | JQuery.TypeOrArray<Element>): this;
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set
+     * of elements that was removed.
+     *
+     * @param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
+     *                   A function that returns content with which to replace the set of matched elements.
+     * @see {@link https://api.jquery.com/replaceWith/}
+     * @since 1.2
+     * @since 1.4
+     */
+    replaceWith(newContent: JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery | ((this: TElement) => any)): JQuery<TElement>;
+    /**
+     * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/}
+     * @since 1.4.3
+     */
+    resize<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/}
+     * @since 1.0
+     */
+    resize(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/}
+     * @since 1.4.3
+     */
+    scroll<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/}
+     * @since 1.0
+     */
+    scroll(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollLeft/}
+     * @since 1.2.6
+     */
+    scrollLeft(value: number): this;
+    /**
+     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements.
+     *
+     * @see {@link https://api.jquery.com/scrollLeft/}
+     * @since 1.2.6
+     */
+    scrollLeft(): number;
+    /**
+     * Set the current vertical position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value A number indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollTop/}
+     * @since 1.2.6
+     */
+    scrollTop(value: number): this;
+    /**
+     * Get the current vertical position of the scroll bar for the first element in the set of matched
+     * elements or set the vertical position of the scroll bar for every matched element.
+     *
+     * @see {@link https://api.jquery.com/scrollTop/}
+     * @since 1.2.6
+     */
+    scrollTop(): number;
+    /**
+     * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/}
+     * @since 1.4.3
+     */
+    select<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/}
+     * @since 1.0
+     */
+    select(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Encode a set of form elements as a string for submission.
+     *
+     * @see {@link https://api.jquery.com/serialize/}
+     * @since 1.0
+     */
+    serialize(): string;
+    /**
+     * Encode a set of form elements as an array of names and values.
+     *
+     * @see {@link https://api.jquery.com/serializeArray/}
+     * @since 1.2
+     */
+    serializeArray(): JQuery.NameValuePair[];
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/show/}
+     * @since 1.4.3
+     */
+    show(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): this;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing_complete A string indicating which easing function to use for the transition.
+     *                        A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/show/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    show(duration: JQuery.Duration, easing_complete: string | ((this: TElement) => void)): this;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration_complete_options A string or number determining how long the animation will run.
+     *                                  A function to call once the animation is complete, called once per matched element.
+     *                                  A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/show/}
+     * @since 1.0
+     */
+    show(duration_complete_options?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/siblings/}
+     * @since 1.0
+     */
+    siblings(selector?: JQuery.Selector): this;
+    /**
+     * Reduce the set of matched elements to a subset specified by a range of indices.
+     *
+     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative,
+     *              it indicates an offset from the end of the set.
+     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative,
+     *            it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
+     * @see {@link https://api.jquery.com/slice/}
+     * @since 1.1.4
+     */
+    slice(start: number, end?: number): this;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideDown/}
+     * @since 1.4.3
+     */
+    slideDown(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideDown/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideDown(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideDown/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideDown(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideToggle/}
+     * @since 1.4.3
+     */
+    slideToggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideToggle/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideToggle(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideToggle/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideToggle(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideUp/}
+     * @since 1.4.3
+     */
+    slideUp(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration_easing A string or number determining how long the animation will run.
+     *                        A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/slideUp/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideUp(duration_easing: JQuery.Duration | string, complete: (this: TElement) => void): this;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration_easing_complete_options A string or number determining how long the animation will run.
+     *                                         A string indicating which easing function to use for the transition.
+     *                                         A function to call once the animation is complete, called once per matched element.
+     *                                         A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideUp/}
+     * @since 1.0
+     * @since 1.4.3
+     */
+    slideUp(duration_easing_complete_options?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/}
+     * @since 1.7
+     */
+    stop(queue: string, clearQueue?: boolean, jumpToEnd?: boolean): this;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/}
+     * @since 1.2
+     */
+    stop(clearQueue?: boolean, jumpToEnd?: boolean): this;
+    /**
+     * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/}
+     * @since 1.4.3
+     */
+    submit<TData>(eventData: TData, handler: JQuery.EventHandler<TElement, TData>): this;
+    /**
+     * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/}
+     * @since 1.0
+     */
+    submit(handler?: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will
+     *             be converted to a String representation.
+     *             A function returning the text content to set. Receives the index position of the element in the set
+     *             and the old text value as arguments.
+     * @see {@link https://api.jquery.com/text/}
+     * @since 1.0
+     * @since 1.4
+     */
+    text(text: string | number | boolean | ((this: TElement, index: number, text: string) => string | number | boolean)): this;
+    /**
+     * Get the combined text contents of each element in the set of matched elements, including their descendants.
+     *
+     * @see {@link https://api.jquery.com/text/}
+     * @since 1.0
+     */
+    text(): string;
+    /**
+     * Retrieve all the elements contained in the jQuery set, as an array.
+     *
+     * @see {@link https://api.jquery.com/toArray/}
+     * @since 1.4
+     */
+    toArray(): TElement[];
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/toggle/}
+     * @since 1.4.3
+     */
+    toggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/toggle/}
+     * @since 1.0
+     */
+    toggle(duration: JQuery.Duration, complete: (this: TElement) => void): this;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration_complete_options_display A string or number determining how long the animation will run.
+     *                                          A function to call once the animation is complete, called once per matched element.
+     *                                          A map of additional options to pass to the method.
+     *                                          Use true to show the element or false to hide it.
+     * @see {@link https://api.jquery.com/toggle/}
+     * @since 1.0
+     * @since 1.3
+     */
+    toggle(duration_complete_options_display?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement> | boolean): this;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on
+     * either the class's presence or the value of the state argument.
+     *
+     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+     *                  A function that returns class names to be toggled in the class attribute of each element in the
+     *                  matched set. Receives the index position of the element in the set, the old class value, and the state as arguments.
+     * @param state A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/}
+     * @since 1.0
+     * @since 1.3
+     * @since 1.4
+     */
+    toggleClass<TState extends boolean>(className: string | ((this: TElement, index: number, className: string, state: TState) => string),
+                                        state?: TState): this;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on
+     * either the class's presence or the value of the state argument.
+     *
+     * @param state A boolean value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/}
+     * @since 1.4
+     * @deprecated 3.0
+     */
+    toggleClass(state?: boolean): this;
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     *                  A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/trigger/}
+     * @since 1.0
+     * @since 1.3
+     */
+    trigger(eventType: string | JQuery.Event<TElement>, extraParameters?: any[] | JQuery.PlainObject | string | number): this;
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     *                  A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/triggerHandler/}
+     * @since 1.2
+     * @since 1.3
+     */
+    triggerHandler(eventType: string | JQuery.Event<TElement>, extraParameters?: any[] | JQuery.PlainObject | string | number): undefined | any;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param event A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/unbind/}
+     * @since 1.0
+     * @since 1.4.3
+     * @deprecated 3.0
+     */
+    unbind(event: string, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param event A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     *              A jQuery.Event object.
+     * @see {@link https://api.jquery.com/unbind/}
+     * @since 1.0
+     * @deprecated 3.0
+     */
+    unbind(event?: string | JQuery.Event<TElement>): this;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a
+     * specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/undelegate/}
+     * @since 1.4.2
+     * @deprecated 3.0
+     */
+    undelegate(selector: JQuery.Selector, eventType: string, handler: JQuery.EventHandler<TElement> | false): this;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a
+     * specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventTypes A string containing a JavaScript event type, such as "click" or "keydown"
+     *                   An object of one or more event types and previously bound functions to unbind from them.
+     * @see {@link https://api.jquery.com/undelegate/}
+     * @since 1.4.2
+     * @since 1.4.3
+     * @deprecated 3.0
+     */
+    undelegate(selector: JQuery.Selector, eventTypes: string | JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a
+     * specific set of root elements.
+     *
+     * @param namespace A selector which will be used to filter the event results.
+     * @see {@link https://api.jquery.com/undelegate/}
+     * @since 1.4.2
+     * @since 1.6
+     * @deprecated 3.0
+     */
+    undelegate(namespace?: string): this;
+    /**
+     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+     *
+     * @param selector A selector to check the parent element against. If an element's parent does not match the selector,
+     *                 the element won't be unwrapped.
+     * @see {@link https://api.jquery.com/unwrap/}
+     * @since 1.4
+     * @since 3.0
+     */
+    unwrap(selector?: string): this;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param value A string of text, a number, or an array of strings corresponding to the value of each matched
+     *              element to set as selected/checked.
+     *              A function returning the value to set. this is the current element. Receives the index position of
+     *              the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/val/}
+     * @since 1.0
+     * @since 1.4
+     */
+    val(value: string | number | string[] | ((this: TElement, index: number, value: string) => string)): this;
+    /**
+     * Get the current value of the first element in the set of matched elements.
+     *
+     * @see {@link https://api.jquery.com/val/}
+     * @since 1.0
+     */
+    val(): string | number | string[] | undefined;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure
+     *              appended (as a string).
+     *              A function returning the width to set. Receives the index position of the element in the set and the
+     *              old width as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/width/}
+     * @since 1.0
+     * @since 1.4.1
+     */
+    width(value: string | number | ((this: TElement, index: number, value: number) => string | number)): this;
+    /**
+     * Get the current computed width for the first element in the set of matched elements.
+     *
+     * @see {@link https://api.jquery.com/width/}
+     * @since 1.0
+     */
+    width(): number | undefined;
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the
+     *                        matched elements. When you pass a jQuery collection containing more than one element, or a selector
+     *                        matching more than one element, the first element will be used.
+     *                        A callback function returning the HTML content or jQuery object to wrap around the matched elements.
+     *                        Receives the index position of the element in the set as an argument. Within the function, this
+     *                        refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrap/}
+     * @since 1.0
+     * @since 1.4
+     */
+    wrap(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | JQuery)): this;
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     *                        A callback function returning the HTML content or jQuery object to wrap around all the matched
+     *                        elements. Within the function, this refers to the first element in the set. Prior to jQuery 3.0, the
+     *                        callback was incorrectly called for every element in the set and received the index position of the
+     *                        element in the set as an argument.
+     * @see {@link https://api.jquery.com/wrapAll/}
+     * @since 1.2
+     * @since 1.4
+     */
+    wrapAll(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement) => string | JQuery)): this;
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap
+     *                        around the content of the matched elements.
+     *                        A callback function which generates a structure to wrap around the content of the matched elements.
+     *                        Receives the index position of the element in the set as an argument. Within the function, this
+     *                        refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrapInner/}
+     * @since 1.2
+     * @since 1.4
+     */
+    wrapInner(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | Element | JQuery)): this;
 }
 
-/**
- * Allows jQuery Promises to interop with non-jQuery promises
- */
-interface JQueryGenericPromise<T> {
-    /**
-     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-     *
-     * @param doneFilter A function that is called when the Deferred is resolved.
-     * @param failFilter An optional function that is called when the Deferred is rejected.
-     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
-     */
-    then<U>(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise<U>, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<U>;
+interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
 
+interface JQueryStatic<TElement extends Node = HTMLElement> {
+    Event: JQuery.Event<TElement>;
     /**
-     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize
+     * CSS property naming, or create custom properties.
      *
-     * @param doneFilter A function that is called when the Deferred is resolved.
-     * @param failFilter An optional function that is called when the Deferred is rejected.
-     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
+     * @see {@link https://api.jquery.com/jQuery.cssHooks/}
+     * @since 1.4.3
      */
-    then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<void>;
+    cssHooks: JQuery.PlainObject<JQuery.CSSHook<TElement>>;
+    /**
+     * An object containing all CSS properties that may be used without a unit. The .css() method uses this
+     * object to see if it may append px to unitless values.
+     *
+     * @see {@link https://api.jquery.com/jQuery.cssNumber/}
+     * @since 1.4.3
+     */
+    cssNumber: JQuery.PlainObject<boolean>;
+    readonly fn: JQuery;
+    fx: {
+        /**
+         * The rate (in milliseconds) at which animations fire.
+         *
+         * @see {@link https://api.jquery.com/jQuery.fx.interval/}
+         * @since 1.4.3
+         * @deprecated 3.0
+         */
+        interval: number;
+        /**
+         * Globally disable all animations.
+         *
+         * @see {@link https://api.jquery.com/jQuery.fx.off/}
+         * @since 1.3
+         */
+        off: boolean;
+        step: JQuery.PlainObject<JQuery.AnimationHook<TElement>>;
+    };
+    /**
+     * A Promise-like object (or "thenable") that resolves when the document is ready.
+     *
+     * @see {@link https://api.jquery.com/jQuery.ready/}
+     * @since 1.8
+     */
+    ready: JQuery.Thenable<JQueryStatic>;
+    /**
+     * A collection of properties that represent the presence of different browser features or bugs.
+     * Intended for jQuery's internal use; specific properties may be removed when they are no longer
+     * needed internally to improve page startup performance. For your own project's feature-detection
+     * needs, we strongly recommend the use of an external library such as Modernizr instead of dependency
+     * on properties in jQuery.support.
+     *
+     * @see {@link https://api.jquery.com/jQuery.support/}
+     * @since 1.3
+     * @deprecated 1.9
+     */
+    support: JQuery.PlainObject;
+    valHooks: JQuery.PlainObject<JQuery.ValHook<TElement>>;
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
+     *             A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
+     * @param ownerDocument_attributes A document in which the new elements will be created.
+     *                                 An object of attributes, events, and methods to call on the newly-created element.
+     * @see {@link https://api.jquery.com/jQuery/}
+     * @since 1.0
+     * @since 1.4
+     */
+    (html: JQuery.htmlString, ownerDocument_attributes: Document | JQuery.PlainObject): JQuery<TElement>;
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param selector A string containing a selector expression
+     * @param context A DOM Element, Document, or jQuery to use as context
+     * @see {@link https://api.jquery.com/jQuery/}
+     * @since 1.0
+     */
+    (selector: JQuery.Selector, context: Element | Document | JQuery | undefined): JQuery<TElement>;
+    // HACK: This is the factory function returned when importing jQuery without a DOM. Declaring it separately breaks using the type parameter on JQueryStatic.
+    // HACK: The discriminator parameter handles the edge case of passing a Window object to JQueryStatic. It doesn't actually exist on the factory function.
+    <FElement extends Node = HTMLElement>(window: Window, discriminator: boolean): JQueryStatic<FElement>;
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * Binds a function to be executed when the DOM has finished loading.
+     *
+     * @param selector_object_callback A string containing a selector expression
+     *                                 A DOM element to wrap in a jQuery object.
+     *                                 An array containing a set of DOM elements to wrap in a jQuery object.
+     *                                 A plain object to wrap in a jQuery object.
+     *                                 An existing jQuery object to clone.
+     *                                 The function to execute when the DOM is ready.
+     * @see {@link https://api.jquery.com/jQuery/}
+     * @since 1.0
+     * @since 1.4
+     */
+    (selector_object_callback?: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery.PlainObject | JQuery | (($: JQueryStatic) => void)): JQuery<TElement>;
+    /**
+     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
+     *
+     * @param flags An optional list of space-separated flags that change how the callback list behaves.
+     * @see {@link https://api.jquery.com/jQuery.Callbacks/}
+     * @since 1.7
+     */
+    Callbacks(flags?: string): JQuery.Callbacks;
+    /**
+     * A factory function that returns a chainable utility object with methods to register multiple
+     * callbacks into callback queues, invoke callback queues, and relay the success or failure state of
+     * any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     * @see {@link https://api.jquery.com/jQuery.Deferred/}
+     * @since 1.5
+     */
+    Deferred<TResolve = any,
+        TReject = any,
+        TNotify = any>(beforeStart?: (this: JQuery.Deferred<TResolve, TReject, TNotify>,
+                                      deferred: JQuery.Deferred<TResolve, TReject, TNotify>) => void): JQuery.Deferred<TResolve, TReject, TNotify>;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can
+     *                 be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) below for a complete list of all settings.
+     * @see {@link https://api.jquery.com/jQuery.ajax/}
+     * @since 1.5
+     */
+    ajax(url: string, settings?: JQuery.AjaxSettings): JQuery.jqXHR;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can
+     *                 be set for any option with $.ajaxSetup().
+     * @see {@link https://api.jquery.com/jQuery.ajax/}
+     * @since 1.0
+     */
+    ajax(settings?: JQuery.AjaxSettings): JQuery.jqXHR;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they
+     * are processed by $.ajax().
+     *
+     * @param dataTypes An optional string containing one or more space-separated dataTypes
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     * @since 1.5
+     */
+    ajaxPrefilter(dataTypes: string,
+                  handler: (options: JQuery.AjaxSettings, originalOptions: JQuery.AjaxSettings, jqXHR: JQuery.jqXHR) => string | void): void;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they
+     * are processed by $.ajax().
+     *
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     * @since 1.5
+     */
+    ajaxPrefilter(handler: (options: JQuery.AjaxSettings, originalOptions: JQuery.AjaxSettings, jqXHR: JQuery.jqXHR) => string | void): void;
+    /**
+     * Set default values for future Ajax requests. Its use is not recommended.
+     *
+     * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
+     * @see {@link https://api.jquery.com/jQuery.ajaxSetup/}
+     * @since 1.1
+     */
+    ajaxSetup(options: JQuery.AjaxSettings): JQuery.AjaxSettings;
+    /**
+     * Creates an object that handles the actual transmission of Ajax data.
+     *
+     * @param dataType A string identifying the data type to use
+     * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
+     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
+     * @since 1.5
+     */
+    ajaxTransport(dataType: string,
+                  handler: (options: JQuery.AjaxSettings, originalOptions: JQuery.AjaxSettings, jqXHR: JQuery.jqXHR) => JQuery.Transport | void): void;
+    /**
+     * Check to see if a DOM element is a descendant of another DOM element.
+     *
+     * @param container The DOM element that may contain the other element.
+     * @param contained The DOM element that may be contained by (a descendant of) the other element.
+     * @see {@link https://api.jquery.com/jQuery.contains/}
+     * @since 1.4
+     */
+    contains(container: Element, contained: Element): boolean;
+    css(elem: Element, unknown: any): any;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or
+     * the full data store for the element.
+     *
+     * @param element The DOM element to query for the data.
+     * @param key Name of the data stored.
+     * @param undefined
+     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @since 1.2.3
+     */
+    data(element: Element, key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
+    /**
+     * Store arbitrary data associated with the specified element. Returns the value that was set.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; this can be any Javascript type except undefined.
+     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @since 1.2.3
+     */
+    data<T>(element: Element, key: string, value: T): T;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or
+     * the full data store for the element.
+     *
+     * @param element The DOM element to query for the data.
+     * @param key Name of the data stored.
+     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @since 1.2.3
+     * @since 1.4
+     */
+    data(element: Element, key?: string): any;
+    /**
+     * Execute the next function on the queue for the matched element.
+     *
+     * @param element A DOM element from which to remove and execute a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.dequeue/}
+     * @since 1.3
+     */
+    dequeue(element: Element, queueName?: string): void;
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays.
+     * Arrays and array-like objects with a length property (such as a function's arguments object) are
+     * iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param array The array to iterate over.
+     * @param callback The function that will be executed on every object.
+     * @see {@link https://api.jquery.com/jQuery.each/}
+     * @since 1.0
+     */
+    each<T>(array: ArrayLike<T>, callback: (indexInArray: number, value: T) => false | any): ArrayLike<T>;
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays.
+     * Arrays and array-like objects with a length property (such as a function's arguments object) are
+     * iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param obj The object to iterate over.
+     * @param callback The function that will be executed on every object.
+     * @see {@link https://api.jquery.com/jQuery.each/}
+     * @since 1.0
+     */
+    each<T, K extends keyof T>(obj: T, callback: (propertyName: K, valueOfProperty: T[K]) => false | any): T;
+    /**
+     * Takes a string and throws an exception containing it.
+     *
+     * @param message The message to send out.
+     * @see {@link https://api.jquery.com/jQuery.error/}
+     * @since 1.4.1
+     */
+    error(message: string): never;
+    /**
+     * Escapes any character that has a special meaning in a CSS selector.
+     *
+     * @param selector A string containing a selector expression to escape.
+     * @see {@link https://api.jquery.com/jQuery.escapeSelector/}
+     * @since 3.0
+     */
+    escapeSelector(selector: JQuery.Selector): JQuery.Selector;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U, V, W, X, Y, Z>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X, object5: Y, object6: Z): T & U & V & W & X & Y & Z;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U, V, W, X, Y>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X, object5: Y): T & U & V & W & X & Y;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U, V, W, X>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X): T & U & V & W & X;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U, V, W>(deep: true, target: T, object1: U, object2: V, object3: W): T & U & V & W;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U, V>(deep: true, target: T, object1: U, object2: V): T & U & V;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U>(deep: true, target: T, object1: U): T & U;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
+     * @param target The object to extend. It will receive the new properties.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.1.4
+     */
+    extend<T, U>(deep: true, target: T, ...objects: U[]): T & U;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U, V, W, X, Y, Z>(target: T, object1: U, object2: V, object3: W, object4: X, object5: Y, object6: Z): T & U & V & W & X & Y & Z;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U, V, W, X, Y>(target: T, object1: U, object2: V, object3: W, object4: X, object5: Y): T & U & V & W & X & Y;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U, V, W, X>(target: T, object1: U, object2: V, object3: W, object4: X): T & U & V & W & X;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U, V, W>(target: T, object1: U, object2: V, object3: W): T & U & V & W;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U, V>(target: T, object1: U, object2: V): T & U & V;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U>(target: T, object1: U): T & U;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will
+     *               extend the jQuery namespace if it is the sole argument.
+     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @since 1.0
+     */
+    extend<T, U>(target: T, ...objects: U[]): T & U;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                you can use null or jQuery.noop as a placeholder.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @since 1.0
+     */
+    get(url: string,
+        data: JQuery.PlainObject | string,
+        success: JQuery.jqXHR.DoneCallback | null,
+        dataType?: string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                you can use null or jQuery.noop as a placeholder.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @since 1.0
+     */
+    get(url: string,
+        success: JQuery.jqXHR.DoneCallback | null,
+        dataType: string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success_data A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                     you can use null or jQuery.noop as a placeholder.
+     *                     A plain object or string that is sent to the server with the request.
+     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @since 1.0
+     */
+    get(url: string,
+        success_data: JQuery.jqXHR.DoneCallback | JQuery.PlainObject | string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url_settings A string containing the URL to which the request is sent.
+     *                     A set of key/value pairs that configure the Ajax request. All properties except for url are
+     *                     optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) for a
+     *                     complete list of all settings. The type option will automatically be set to GET.
+     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @since 1.0
+     * @since 1.12
+     * @since 2.2
+     */
+    get(url_settings?: string | JQuery.AjaxSettings): JQuery.jqXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     * @since 1.0
+     */
+    getJSON(url: string,
+            data: JQuery.PlainObject | string,
+            success: JQuery.jqXHR.DoneCallback): JQuery.jqXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success_data A callback function that is executed if the request succeeds.
+     *                     A plain object or string that is sent to the server with the request.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     * @since 1.0
+     */
+    getJSON(url: string,
+            success_data?: JQuery.jqXHR.DoneCallback | JQuery.PlainObject | string): JQuery.jqXHR;
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getScript/}
+     * @since 1.0
+     */
+    getScript(url: string,
+              success?: JQuery.jqXHR.DoneCallback<string | undefined>): JQuery.jqXHR;
+    /**
+     * Execute some JavaScript code globally.
+     *
+     * @param code The JavaScript code to execute.
+     * @see {@link https://api.jquery.com/jQuery.globalEval/}
+     * @since 1.0.4
+     */
+    globalEval(code: string): void;
+    /**
+     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
+     *
+     * @param array The array-like object to search through.
+     * @param fn The function to process each item against. The first argument to the function is the item, and the
+     *           second argument is the index. The function should return a Boolean value. this will be the global window object.
+     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements
+     *               for which "callback" returns true. If "invert" is true, then the function returns an array
+     *               consisting of all elements for which "callback" returns false.
+     * @see {@link https://api.jquery.com/jQuery.grep/}
+     * @since 1.0
+     */
+    grep<T>(array: ArrayLike<T>,
+            fn: (elementOfArray: T, indexInArray: number) => boolean,
+            invert?: boolean): T[];
+    /**
+     * Determine whether an element has any jQuery data associated with it.
+     *
+     * @param element A DOM element to be checked for data.
+     * @see {@link https://api.jquery.com/jQuery.hasData/}
+     * @since 1.5
+     */
+    hasData(element: Element): boolean;
+    /**
+     * Holds or releases the execution of jQuery's ready event.
+     *
+     * @param hold Indicates whether the ready hold is being requested or released
+     * @see {@link https://api.jquery.com/jQuery.holdReady/}
+     * @since 1.6
+     */
+    holdReady(hold: boolean): void;
+    /**
+     * Modify and filter HTML strings passed through jQuery manipulation methods.
+     *
+     * @param html The HTML string on which to operate.
+     * @see {@link https://api.jquery.com/jQuery.htmlPrefilter/}
+     * @since 1.12/2.2
+     */
+    htmlPrefilter(html: string): string;
+    /**
+     * Search for a specified value within an array and return its index (or -1 if not found).
+     *
+     * @param value The value to search for.
+     * @param array An array through which to search.
+     * @param fromIndex The index of the array at which to begin the search. The default is 0, which will search the whole array.
+     * @see {@link https://api.jquery.com/jQuery.inArray/}
+     * @since 1.2
+     */
+    inArray<T>(value: T, array: T[], fromIndex?: number): number;
+    /**
+     * Determine whether the argument is an array.
+     *
+     * @param obj Object to test whether or not it is an array.
+     * @see {@link https://api.jquery.com/jQuery.isArray/}
+     * @since 1.3
+     */
+    isArray(obj: any): obj is any[];
+    /**
+     * Check to see if an object is empty (contains no enumerable properties).
+     *
+     * @param obj The object that will be checked to see if it's empty.
+     * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
+     * @since 1.4
+     */
+    isEmptyObject(obj: any): boolean;
+    /**
+     * Determine if the argument passed is a JavaScript function object.
+     *
+     * @param obj Object to test whether or not it is a function.
+     * @see {@link https://api.jquery.com/jQuery.isFunction/}
+     * @since 1.2
+     */
+    isFunction(obj: any): obj is Function;
+    /**
+     * Determines whether its argument represents a JavaScript number.
+     *
+     * @param value The value to be tested.
+     * @see {@link https://api.jquery.com/jQuery.isNumeric/}
+     * @since 1.7
+     */
+    isNumeric(value: any): value is number;
+    /**
+     * Check to see if an object is a plain object (created using "{}" or "new Object").
+     *
+     * @param obj The object that will be checked to see if it's a plain object.
+     * @see {@link https://api.jquery.com/jQuery.isPlainObject/}
+     * @since 1.4
+     */
+    isPlainObject(obj: any): obj is JQuery.PlainObject;
+    /**
+     * Determine whether the argument is a window.
+     *
+     * @param obj Object to test whether or not it is a window.
+     * @see {@link https://api.jquery.com/jQuery.isWindow/}
+     * @since 1.4.3
+     */
+    isWindow(obj: any): obj is Window;
+    /**
+     * Check to see if a DOM node is within an XML document (or is an XML document).
+     *
+     * @param node The DOM node that will be checked to see if it's in an XML document.
+     * @see {@link https://api.jquery.com/jQuery.isXMLDoc/}
+     * @since 1.1.4
+     */
+    isXMLDoc(node: Node): boolean;
+    /**
+     * Convert an array-like object into a true JavaScript array.
+     *
+     * @param obj Any object to turn into a native Array.
+     * @see {@link https://api.jquery.com/jQuery.makeArray/}
+     * @since 1.2
+     */
+    makeArray<T>(obj: ArrayLike<T>): T[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param array The Array to translate.
+     * @param callback The function to process each item against. The first argument to the function is the array item, the
+     *                 second argument is the index in array The function can return any value. A returned array will be
+     *                 flattened into the resulting array. Within the function, this refers to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/}
+     * @since 1.0
+     */
+    map<T, R>(array: T[], callback: (elementOfArray: T, indexInArray: number) => R): R[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param obj The Object to translate.
+     * @param callback The function to process each item against. The first argument to the function is the value; the
+     *                 second argument is the key of the object property. The function can return any value to add to the
+     *                 array. A returned array will be flattened into the resulting array. Within the function, this refers
+     *                 to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/}
+     * @since 1.6
+     */
+    map<T, K extends keyof T, R>(obj: T, callback: (propertyOfObject: T[K], key: K) => R): R[];
+    /**
+     * Merge the contents of two arrays together into the first array.
+     *
+     * @param first The first array-like object to merge, the elements of second added.
+     * @param second The second array-like object to merge into the first, unaltered.
+     * @see {@link https://api.jquery.com/jQuery.merge/}
+     * @since 1.0
+     */
+    merge<T, U>(first: ArrayLike<T>, second: ArrayLike<U>): Array<T | U>;
+    /**
+     * Relinquish jQuery's control of the $ variable.
+     *
+     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
+     * @see {@link https://api.jquery.com/jQuery.noConflict/}
+     * @since 1.0
+     */
+    noConflict(removeAll?: boolean): JQueryStatic;
+    /**
+     * An empty function.
+     *
+     * @see {@link https://api.jquery.com/jQuery.noop/}
+     * @since 1.4
+     */
+    noop(): undefined;
+    /**
+     * Return a number representing the current time.
+     *
+     * @see {@link https://api.jquery.com/jQuery.now/}
+     * @since 1.4.3
+     */
+    now(): number;
+    /**
+     * Create a serialized representation of an array, a plain object, or a jQuery object suitable for use
+     * in a URL query string or Ajax request. In case a jQuery object is passed, it should contain input
+     * elements with name/value properties.
+     *
+     * @param obj An array, a plain object, or a jQuery object to serialize.
+     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
+     * @see {@link https://api.jquery.com/jQuery.param/}
+     * @since 1.2
+     * @since 1.4
+     */
+    param(obj: any[] | JQuery.PlainObject | JQuery, traditional?: boolean): string;
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context Document element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     * @since 1.8
+     */
+    parseHTML(data: string, context: Document | null | undefined, keepScripts: boolean): Node[];
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context_keepScripts Document element to serve as the context in which the HTML fragment will be created
+     *                            A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     * @since 1.8
+     */
+    parseHTML(data: string, context_keepScripts?: Document | null | undefined | boolean): Node[];
+    /**
+     * Takes a well-formed JSON string and returns the resulting JavaScript value.
+     *
+     * @param json The JSON string to parse.
+     * @see {@link https://api.jquery.com/jQuery.parseJSON/}
+     * @since 1.4.1
+     * @deprecated 3.0
+     */
+    parseJSON(json: string): any;
+    /**
+     * Parses a string into an XML document.
+     *
+     * @param data a well-formed XML string to be parsed
+     * @see {@link https://api.jquery.com/jQuery.parseXML/}
+     * @since 1.5
+     */
+    parseXML(data: string): XMLDocument;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @since 1.0
+     */
+    post(url: string,
+         data: JQuery.PlainObject | string,
+         success: JQuery.jqXHR.DoneCallback | null,
+         dataType?: string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @since 1.0
+     */
+    post(url: string,
+         success: JQuery.jqXHR.DoneCallback | null,
+         dataType: string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success_data A callback function that is executed if the request succeeds. Required if dataType is provided, but
+     *                     can be null in that case.
+     *                     A plain object or string that is sent to the server with the request.
+     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @since 1.0
+     */
+    post(url: string,
+         success_data: JQuery.jqXHR.DoneCallback | JQuery.PlainObject | string): JQuery.jqXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url_settings A string containing the URL to which the request is sent.
+     *                     A set of key/value pairs that configure the Ajax request. All properties except for url are
+     *                     optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) for a
+     *                     complete list of all settings. Type will automatically be set to POST.
+     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @since 1.0
+     * @since 1.12
+     * @since 2.2
+     */
+    post(url_settings?: string | JQuery.AjaxSettings): JQuery.jqXHR;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param fn The function whose context will be changed.
+     * @param context The object to which the context (this) of the function should be set.
+     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @since 1.4
+     * @since 1.6
+     */
+    proxy(fn: Function, context: object, ...additionalArguments: any[]): Function;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param context The object to which the context of the function should be set.
+     * @param name The name of the function whose context will be changed (should be a property of the context object).
+     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @since 1.4
+     * @since 1.6
+     */
+    proxy<T extends object>(context: T, name: keyof T, ...additionalArguments: any[]): Function;
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element where the array of queued functions is attached.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue The new function to add to the queue.
+     *                 An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/jQuery.queue/}
+     * @since 1.3
+     */
+    queue(element: Element, queueName: string, newQueue: JQuery.TypeOrArray<JQuery.QueueFunction<Element>>): JQuery;
+    /**
+     * Show the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element to inspect for an attached queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.queue/}
+     * @since 1.3
+     */
+    queue(element: Element, queueName?: string): JQuery.Queue<TElement>;
+    /**
+     * Handles errors thrown synchronously in functions wrapped in jQuery().
+     *
+     * @param error An error thrown in the function wrapped in jQuery().
+     * @see {@link https://api.jquery.com/jQuery.readyException/}
+     * @since 3.1
+     */
+    readyException(error: Error): any;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param element A DOM element from which to remove data.
+     * @param name A string naming the piece of data to remove.
+     * @see {@link https://api.jquery.com/jQuery.removeData/}
+     * @since 1.2.3
+     */
+    removeData(element: Element, name?: string): JQuery;
+    /**
+     * Creates an object containing a set of properties ready to be used in the definition of custom animations.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @since 1.1
+     */
+    speed(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): JQuery.EffectsOptions<TElement>;
+    /**
+     * Creates an object containing a set of properties ready to be used in the definition of custom animations.
+     *
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @since 1.1
+     */
+    speed(easing: string, complete: (this: TElement) => void): JQuery.EffectsOptions<TElement>;
+    /**
+     * Creates an object containing a set of properties ready to be used in the definition of custom animations.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing_complete_settings A string indicating which easing function to use for the transition.
+     *                                 A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @since 1.0
+     * @since 1.1
+     */
+    speed(duration: JQuery.Duration,
+          easing_complete_settings: string | ((this: TElement) => void) | JQuery.SpeedSettings<TElement>): JQuery.EffectsOptions<TElement>;
+    /**
+     * Creates an object containing a set of properties ready to be used in the definition of custom animations.
+     *
+     * @param duration_easing_complete_settings A string or number determining how long the animation will run.
+     *                                          A string indicating which easing function to use for the transition.
+     *                                          A function to call once the animation is complete, called once per matched element.
+     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @since 1.0
+     * @since 1.1
+     */
+    speed(duration_easing_complete_settings?: JQuery.Duration | string | ((this: TElement) => void) | JQuery.SpeedSettings<TElement>): JQuery.EffectsOptions<TElement>;
+    /**
+     * Remove the whitespace from the beginning and end of a string.
+     *
+     * @param str The string to trim.
+     * @see {@link https://api.jquery.com/jQuery.trim/}
+     * @since 1.0
+     */
+    trim(str: string): string;
+    /**
+     * Determine the internal JavaScript [[Class]] of an object.
+     *
+     * @param obj Object to get the internal JavaScript [[Class]] of.
+     * @see {@link https://api.jquery.com/jQuery.type/}
+     * @since 1.4.3
+     */
+    type(obj: any): 'array' | 'boolean' | 'date' | 'error' | 'function' | 'null' | 'number' | 'object' | 'regexp' | 'string' | 'symbol' | 'undefined';
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on
+     * arrays of DOM elements, not strings or numbers.
+     *
+     * @param array The Array of DOM elements.
+     * @see {@link https://api.jquery.com/jQuery.unique/}
+     * @since 1.1.3
+     * @deprecated 3.0
+     */
+    unique<T extends Element>(array: T[]): T[];
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on
+     * arrays of DOM elements, not strings or numbers.
+     *
+     * @param array The Array of DOM elements.
+     * @see {@link https://api.jquery.com/jQuery.uniqueSort/}
+     * @since 1.12-2.2
+     */
+    uniqueSort<T extends Element>(array: T[]): T[];
+    when<T, U, V>(jqxhr1: JQuery.jqXHR<T>, jqxhr2: JQuery.jqXHR<U>, jqxhr3: JQuery.jqXHR<V>): JQuery.Promise<[T | U | V, string, JQuery.jqXHR<T | U | V>]>;
+    when<T, U>(jqxhr1: JQuery.jqXHR<T>, jqxhr2: JQuery.jqXHR<U>): JQuery.Promise<[T | U, string, JQuery.jqXHR<T | U>]>;
+    when<T>(jqxhr1: JQuery.jqXHR<T>): JQuery.Promise<T | string | JQuery.jqXHR<T>>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds Zero or more Thenable objects.
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when(...deferreds: any[]): JQuery.Promise<any>;
 }
 
+declare namespace JQuery {
+    type TypeOrArray<T> = T | T[];
+
+    /**
+     * A string is designated htmlString in jQuery documentation when it is used to represent one or more
+     * DOM elements, typically to be created and inserted in the document. When passed as an argument of
+     * the jQuery() function, the string is identified as HTML if it starts with <tag ... >) and is parsed
+     * as such until the final > character. Prior to jQuery 1.9, a string was considered to be HTML if it
+     * contained <tag ... > anywhere within the string.
+     */
+    type htmlString = string;
+    /**
+     * A selector is used in jQuery to select DOM elements from a DOM document. That document is, in most
+     * cases, the DOM document present in all browsers, but can also be an XML document received via Ajax.
+     */
+    type Selector = string;
+
+    /**
+     * The PlainObject type is a JavaScript object containing zero or more key-value pairs. The plain
+     * object is, in other words, an Object object. It is designated "plain" in jQuery documentation to
+     * distinguish it from other kinds of JavaScript objects: for example, null, user-defined arrays, and
+     * host objects such as document, all of which have a typeof value of "object."
+     */
+    interface PlainObject<T = any> {
+        [key: string]: T;
+    }
+
+    // region Ajax
+
+    /**
+     * @see {@link http://api.jquery.com/jquery.ajax/#jQuery-ajax-settings}
+     */
+    interface AjaxSettings<TContext = any> {
+        /**
+         * A set of key/value pairs that map a given dataType to its MIME type, which gets sent in the Accept
+         * request header. This header tells the server what kind of response it will accept in return.
+         */
+        accepts?: PlainObject<string>;
+        /**
+         * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need
+         * synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests
+         * do not support synchronous operation. Note that synchronous requests may temporarily lock the
+         * browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async:
+         * false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback
+         * options instead of the corresponding methods of the jqXHR object such as jqXHR.done().
+         */
+        async?: boolean;
+        /**
+         * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x,
+         * XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and
+         * settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend
+         * function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless
+         * of the type of request.
+         */
+        beforeSend?(this: TContext, jqXHR: jqXHR, settings: AjaxSettings<TContext>): false | void;
+        /**
+         * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache
+         * to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}"
+         * to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a
+         * POST is made to a URL that has already been requested by a GET.
+         */
+        cache?: boolean;
+        /**
+         * A function to be called when the request finishes (after success and error callbacks are executed).
+         * The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a
+         * string categorizing the status of the request ("success", "notmodified", "nocontent", "error",
+         * "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of
+         * functions. Each function will be called in turn. This is an Ajax Event.
+         */
+        complete?: TypeOrArray<Ajax.CompleteCallback<TContext>>;
+        /**
+         * An object of string/regular-expression pairs that determine how jQuery will parse the response,
+         * given its content type.
+         */
+        contents?: PlainObject<RegExp>;
+        /**
+         * When sending data to the server, use this content type. Default is
+         * "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly
+         * pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent).
+         * As of jQuery 1.6 you can pass false to tell jQuery to not set any content type header. Note: The W3C
+         * XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset
+         * will not force the browser to change the encoding. Note: For cross-domain requests, setting the
+         * content type to anything other than application/x-www-form-urlencoded, multipart/form-data, or
+         * text/plain will trigger the browser to send a preflight OPTIONS request to the server.
+         */
+        contentType?: string | false;
+        /**
+         * This object will be the context of all Ajax-related callbacks. By default, the context is an object
+         * that represents the Ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
+         */
+        context?: TContext;
+        /**
+         * An object containing dataType-to-dataType converters. Each converter's value is a function that
+         * returns the transformed value of the response.
+         */
+        converters?: PlainObject<((value: any) => any) | true>;
+        /**
+         * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of
+         * crossDomain to true. This allows, for example, server-side redirection to another domain.
+         */
+        crossDomain?: boolean;
+        /**
+         * Data to be sent to the server. It is converted to a query string, if not already a string. It's
+         * appended to the url for GET-requests. See processData option to prevent this automatic processing.
+         * Object must be Key/Value pairs. If value is an Array, jQuery serializes multiple values with same
+         * key based on the value of the traditional setting (described below).
+         */
+        data?: PlainObject | string | any[];
+        /**
+         * A function to be used to handle the raw response data of XMLHttpRequest. This is a pre-filtering
+         * function to sanitize the response. You should return the sanitized data. The function accepts two
+         * arguments: The raw data returned from the server and the 'dataType' parameter.
+         */
+        dataFilter?(data: string, type: string): any;
+        /**
+         * The type of data that you're expecting back from the server. If none is specified, jQuery will try
+         * to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON
+         * will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be
+         * returned as a string). The available types (and the result passed as the first argument to your
+         * success callback) are:
+         *
+         * "xml": Returns a XML document that can be processed via jQuery.
+         *
+         * "html": Returns HTML as plain text; included script tags are evaluated when inserted in the DOM.
+         *
+         * "script": Evaluates the response as JavaScript and returns it as plain text. Disables caching by
+         * appending a query string parameter, _=[TIMESTAMP], to the URL unless the cache option is set to
+         * true. Note: This will turn POSTs into GETs for remote-domain requests.
+         *
+         * "json": Evaluates the response as JSON and returns a JavaScript object. Cross-domain "json" requests
+         * are converted to "jsonp" unless the request includes jsonp: false in its request options. The JSON
+         * data is parsed in a strict manner; any malformed JSON is rejected and a parse error is thrown. As of
+         * jQuery 1.9, an empty response is also rejected; the server should return a response of null or {}
+         * instead. (See json.org for more information on proper JSON formatting.)
+         *
+         * "jsonp": Loads in a JSON block using JSONP. Adds an extra "?callback=?" to the end of your URL to
+         * specify the callback. Disables caching by appending a query string parameter, "_=[TIMESTAMP]", to
+         * the URL unless the cache option is set to true.
+         *
+         * "text": A plain text string.
+         *
+         * multiple, space-separated values: As of jQuery 1.5, jQuery can convert a dataType from what it
+         * received in the Content-Type header to what you require. For example, if you want a text response to
+         * be treated as XML, use "text xml" for the dataType. You can also make a JSONP request, have it
+         * received as text, and interpreted by jQuery as XML: "jsonp text xml". Similarly, a shorthand string
+         * such as "jsonp xml" will first attempt to convert from jsonp to xml, and, failing that, convert from
+         * jsonp to text, and then from text to xml.
+         */
+        dataType?: 'xml' | 'html' | 'script' | 'json' | 'jsonp' | 'text' | string;
+        /**
+         * A function to be called if the request fails. The function receives three arguments: The jqXHR (in
+         * jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an
+         * optional exception object, if one occurred. Possible values for the second argument (besides null)
+         * are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives
+         * the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery
+         * 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note:
+         * This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
+         */
+        error?: TypeOrArray<Ajax.ErrorCallback<TContext>>;
+        /**
+         * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to
+         * prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to
+         * control various Ajax Events.
+         */
+        global?: boolean;
+        /**
+         * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest
+         * transport. The header X-Requested-With: XMLHttpRequest is always added, but its default
+         * XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from
+         * within the beforeSend function.
+         */
+        headers?: PlainObject;
+        /**
+         * Allow the request to be successful only if the response has changed since the last request. This is
+         * done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery
+         * 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
+         */
+        ifModified?: boolean;
+        /**
+         * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery
+         * does not recognize it as such by default. The following protocols are currently recognized as local:
+         * file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so
+         * once in the $.ajaxSetup() method.
+         */
+        isLocal?: boolean;
+        /**
+         * Override the callback function name in a JSONP request. This value will be used instead of
+         * 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would
+         * result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false
+         * prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for
+         * transformation. In this case, you should also explicitly set the jsonpCallback setting. For example,
+         * { jsonp: false, jsonpCallback: "callbackName" }. If you don't trust the target of your Ajax
+         * requests, consider setting the jsonp property to false for security reasons.
+         */
+        jsonp?: string | boolean;
+        /**
+         * Specify the callback function name for a JSONP request. This value will be used instead of the
+         * random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name
+         * as it'll make it easier to manage the requests and provide callbacks and error handling. You may
+         * want to specify the callback when you want to enable better browser caching of GET requests. As of
+         * jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback
+         * is set to the return value of that function.
+         */
+        jsonpCallback?: string | ((this: TContext) => string);
+        /**
+         * The HTTP method to use for the request (e.g. "POST", "GET", "PUT").
+         */
+        method?: string;
+        /**
+         * A mime type to override the XHR mime type.
+         */
+        mimeType?: string;
+        /**
+         * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
+         */
+        password?: string;
+        /**
+         * By default, data passed in to the data option as an object (technically, anything other than a
+         * string) will be processed and transformed into a query string, fitting to the default content-type
+         * "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data,
+         * set this option to false.
+         */
+        processData?: boolean;
+        /**
+         * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or
+         * "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request.
+         * Used when the character set on the local page is not the same as the one on the remote script.
+         */
+        scriptCharset?: string;
+        /**
+         * An object of numeric HTTP codes and functions to be called when the response has the corresponding
+         * code.
+         *
+         * If the request is successful, the status code functions take the same parameters as the success
+         * callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback.
+         */
+        statusCode?: PlainObject<Ajax.SuccessCallback<TContext> | Ajax.ErrorCallback<TContext>>;
+        /**
+         * A function to be called if the request succeeds. The function gets passed three arguments: The data
+         * returned from the server, formatted according to the dataType parameter or the dataFilter callback
+         * function, if specified; a string describing the status; and the jqXHR (in jQuery 1.4.x,
+         * XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each
+         * function will be called in turn. This is an Ajax Event.
+         */
+        success?: TypeOrArray<Ajax.SuccessCallback<TContext>>;
+        /**
+         * Set a timeout (in milliseconds) for the request. A value of 0 means there will be no timeout. This
+         * will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the
+         * $.ajax call is made; if several other requests are in progress and the browser has no connections
+         * available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and
+         * below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any
+         * object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be
+         * cancelled by a timeout; the script will run even if it arrives after the timeout period.
+         */
+        timeout?: number;
+        /**
+         * Set this to true if you wish to use the traditional style of param serialization.
+         */
+        traditional?: boolean;
+        /**
+         * An alias for method. You should use type if you're using versions of jQuery prior to 1.9.0.
+         */
+        type?: string;
+        /**
+         * A string containing the URL to which the request is sent.
+         */
+        url?: string;
+        /**
+         * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
+         */
+        username?: string;
+        /**
+         * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE),
+         * the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or
+         * enhancements to the factory.
+         */
+        xhr?(): XMLHttpRequest;
+        /**
+         * An object of fieldName-fieldValue pairs to set on the native XHR object.
+         *
+         * In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS
+         * requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+
+         * should you require the use of it.
+         */
+        xhrFields?: PlainObject;
+    }
+
+    namespace Ajax {
+        type SuccessTextStatus = 'success' | 'notmodified' | 'nocontent';
+        type ErrorTextStatus = 'timeout' | 'error' | 'abort' | 'parsererror';
+        type TextStatus = SuccessTextStatus | ErrorTextStatus;
+
+        interface SuccessCallback<TContext> {
+            (this: TContext, data: any, textStatus: SuccessTextStatus, jqXHR: JQuery.jqXHR): void;
+        }
+
+        interface ErrorCallback<TContext> {
+            (this: TContext, jqXHR: jqXHR, textStatus: ErrorTextStatus | null, errorThrown: string): void;
+        }
+
+        interface CompleteCallback<TContext> {
+            (this: TContext, jqXHR: jqXHR, textStatus: TextStatus): void;
+        }
+    }
+
+    interface Transport {
+        send(headers: PlainObject, completeCallback: Transport.SuccessCallback): void;
+        abort(): void;
+    }
+
+    namespace Transport {
+        interface SuccessCallback {
+            (status: number, statusText: Ajax.TextStatus, responses?: PlainObject, headers?: string): void;
+        }
+    }
+
+    /**
+     * @see {@link http://api.jquery.com/jquery.ajax/#jqXHR}
+     */
+    interface jqXHR<TResolve = any> extends Pick<XMLHttpRequest, 'readyState' | 'responseXML' | 'responseText' | 'status' |
+        'statusText' | 'abort' | 'getAllResponseHeaders' | 'getResponseHeader' | 'overrideMimeType' | 'setRequestHeader'> {
+        responseJSON: any;
+        statusCode(map: PlainObject<Ajax.SuccessCallback<any> | Ajax.ErrorCallback<any>>): void;
+
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<jqXHR.AlwaysCallback<TResolve>>,
+               ...alwaysCallbacks: Array<TypeOrArray<jqXHR.AlwaysCallback<TResolve>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch(failFilter: (jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => never): Deferred<never, any, never>;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch<UResolve>(failFilter: (jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UResolve | Thenable<UResolve>): Deferred<UResolve, never>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<jqXHR.DoneCallback<TResolve>>,
+             ...doneCallbacks: Array<TypeOrArray<jqXHR.DoneCallback<TResolve>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<jqXHR.FailCallback<this>>,
+             ...failCallbacks: Array<TypeOrArray<jqXHR.FailCallback<this>>>): this;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<UResolve, UReject>(doneFilter: ((data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: this) => UResolve | Thenable<UResolve>) | null,
+                                failFilter?: ((jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UReject | Thenable<UReject>) | null): Deferred<UResolve | UReject>;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<jqXHR.ProgressCallback>,
+                 ...progressCallbacks: Array<TypeOrArray<jqXHR.ProgressCallback>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve | Ajax.TextStatus | this> & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): JQuery.Promise<TResolve | Ajax.TextStatus | this>;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<UResolve = never,
+            UReject = never>(doneFilter: ((data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: this) => UResolve | Thenable<UResolve>) | null,
+                             failFilter?: ((jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UReject | Thenable<UReject>) | null): Deferred<UResolve | UReject>;
+    }
+
+    namespace jqXHR {
+        interface DoneCallback<TResolve = any> {
+            (data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: jqXHR<TResolve>): void;
+        }
+
+        interface FailCallback<TResolve> {
+            (jqXHR: TResolve, textStatus: Ajax.ErrorTextStatus | null, errorThrown: string): void;
+        }
+
+        interface AlwaysCallback<TResolve = any> {
+            (data_jqXHR: TResolve | jqXHR<TResolve>, textStatus: Ajax.TextStatus, jqXHR_errorThrown: jqXHR<TResolve> | string): void;
+        }
+
+        interface ProgressCallback {
+            (...values: any[]): void;
+        }
+    }
+
+    // endregion
+
+    // region Callbacks
+
+    interface Callbacks {
+        /**
+         * Add a callback or a collection of callbacks to a callback list.
+         *
+         * @param callbacks A function, or array of functions, that are to be added to the callback list.
+         * @see {@link https://api.jquery.com/callbacks.add/}
+         * @since 1.7
+         */
+        add(callbacks: TypeOrArray<Function>): this;
+        /**
+         * Disable a callback list from doing anything more.
+         *
+         * @see {@link https://api.jquery.com/callbacks.disable/}
+         * @since 1.7
+         */
+        disable(): this;
+        /**
+         * Determine if the callbacks list has been disabled.
+         *
+         * @see {@link https://api.jquery.com/callbacks.disabled/}
+         * @since 1.7
+         */
+        disabled(): boolean;
+        /**
+         * Remove all of the callbacks from a list.
+         *
+         * @see {@link https://api.jquery.com/callbacks.empty/}
+         * @since 1.7
+         */
+        empty(): this;
+        /**
+         * Call all of the callbacks with the given arguments.
+         *
+         * @param args The argument or list of arguments to pass back to the callback list.
+         * @see {@link https://api.jquery.com/callbacks.fire/}
+         * @since 1.7
+         */
+        fire(...args: any[]): this;
+        /**
+         * Call all callbacks in a list with the given context and arguments.
+         *
+         * @param context A reference to the context in which the callbacks in the list should be fired.
+         * @param args An argument, or array of arguments, to pass to the callbacks in the list.
+         * @see {@link https://api.jquery.com/callbacks.fireWith/}
+         * @since 1.7
+         */
+        fireWith(context?: object, args?: TypeOrArray<any>): this;
+        /**
+         * Determine if the callbacks have already been called at least once.
+         *
+         * @see {@link https://api.jquery.com/callbacks.fired/}
+         * @since 1.7
+         */
+        fired(): boolean;
+        /**
+         * Determine whether or not the list has any callbacks attached. If a callback is provided as an
+         * argument, determine whether it is in a list.
+         *
+         * @param callback The callback to search for.
+         * @see {@link https://api.jquery.com/callbacks.has/}
+         * @since 1.7
+         */
+        has(callback?: Function): boolean;
+        /**
+         * Lock a callback list in its current state.
+         *
+         * @see {@link https://api.jquery.com/callbacks.lock/}
+         * @since 1.7
+         */
+        lock(): this;
+        /**
+         * Determine if the callbacks list has been locked.
+         *
+         * @see {@link https://api.jquery.com/callbacks.locked/}
+         * @since 1.7
+         */
+        locked(): boolean;
+        /**
+         * Remove a callback or a collection of callbacks from a callback list.
+         *
+         * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+         * @see {@link https://api.jquery.com/callbacks.remove/}
+         * @since 1.7
+         */
+        remove(callbacks: TypeOrArray<Function>): this;
+    }
+
+    // endregion
+
+    // region CSS
+
+    interface CSSHook<TElement> {
+        get(this: this, elem: TElement, computed: any, extra: any): any;
+        set(this: this, elem: TElement, value: any): void;
+    }
+
+    // endregion
+
+    // region Deferred
+
+    /**
+     * Any object that has a then method.
+     */
+    interface Thenable<T> extends PromiseLike<T> { }
+
+    interface Deferred<TResolve, TReject = any, TNotify = any> {
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>,
+               ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch<UResolve>(failFilter: (...reasons: TReject[]) => UResolve | Thenable<UResolve>): Deferred<UResolve, TReject, TNotify>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<Deferred.DoneCallback<TResolve>>,
+             ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TResolve>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<Deferred.FailCallback<TReject>>,
+             ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TReject>>>): this;
+        /**
+         * Call the progressCallbacks on a Deferred object with the given args.
+         *
+         * @param args Optional arguments that are passed to the progressCallbacks.
+         * @see {@link https://api.jquery.com/deferred.notify/}
+         * @since 1.7
+         */
+        notify(...args: TNotify[]): this;
+        /**
+         * Call the progressCallbacks on a Deferred object with the given context and args.
+         *
+         * @param context Context passed to the progressCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the progressCallbacks.
+         * @see {@link https://api.jquery.com/deferred.notifyWith/}
+         * @since 1.7
+         */
+        notifyWith(context: object, ...args: TNotify[]): this;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TNotify>>,
+                 ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TNotify>>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve> & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): JQuery.Promise<TResolve>;
+        /**
+         * Reject a Deferred object and call any failCallbacks with the given args.
+         *
+         * @param args Optional arguments that are passed to the failCallbacks.
+         * @see {@link https://api.jquery.com/deferred.reject/}
+         * @since 1.5
+         */
+        reject(...args: TReject[]): this;
+        /**
+         * Reject a Deferred object and call any failCallbacks with the given context and args.
+         *
+         * @param context Context passed to the failCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the failCallbacks.
+         * @see {@link https://api.jquery.com/deferred.rejectWith/}
+         * @since 1.5
+         */
+        rejectWith(context: object, ...args: TReject[]): this;
+        /**
+         * Resolve a Deferred object and call any doneCallbacks with the given args.
+         *
+         * @param args Optional arguments that are passed to the doneCallbacks.
+         * @see {@link https://api.jquery.com/deferred.resolve/}
+         * @since 1.5
+         */
+        resolve(...args: TResolve[]): this;
+        /**
+         * Resolve a Deferred object and call any doneCallbacks with the given context and args.
+         *
+         * @param context Context passed to the doneCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the doneCallbacks.
+         * @see {@link https://api.jquery.com/deferred.resolveWith/}
+         * @since 1.5
+         */
+        resolveWith(context: object, ...args: TResolve[]): this;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+    }
+
+    namespace Deferred {
+        interface DoneCallback<TResolve> {
+            (...values: TResolve[]): void;
+        }
+
+        interface FailCallback<TReject> {
+            (...reasons: TReject[]): void;
+        }
+
+        interface AlwaysCallback<TResolve, TReject> {
+            (...values_reasons: Array<TResolve | TReject>): void;
+        }
+
+        interface ProgressCallback<TNotify> {
+            (...values: TNotify[]): void;
+        }
+    }
+
+    /**
+     * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
+     * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
+     *
+     * @see {@link http://api.jquery.com/Types/#Promise}
+     */
+    interface Promise<TResolve, TReject = any, TNotify = any> extends Pick<Deferred<TResolve, TReject, TNotify>,
+        'always' | 'done' | 'fail' | 'progress' | 'promise' | 'state'> {
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch<UReject = TReject>(failFilter: (...reasons: TReject[]) => UReject | Thenable<UReject>): Promise<TResolve, UReject, TNotify>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Promise<UResolve, UReject, UNotify>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Promise<UResolve, UReject, UNotify>;
+    }
+
+    // endregion
+
+    // region Effects
+
+    type Duration = number | 'fast' | 'slow';
+    // TODO: Is the first element always a string or is that specific to the 'fx' queue?
+    type Queue<TElement> = { 0: string; } & Array<QueueFunction<TElement>>;
+
+    interface QueueFunction<TElement> {
+        (this: TElement, next: () => void): void;
+    }
+
+    /**
+     * @see {@link https://api.jquery.com/animate/#animate-properties-options}
+     */
+    interface EffectsOptions<TElement> {
+        /**
+         * A function to be called when the animation on an element completes or stops without completing (its
+         * Promise object is either resolved or rejected).
+         */
+        always?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        /**
+         * A function that is called once the animation on an element is complete.
+         */
+        complete?(this: TElement): void;
+        /**
+         * A function to be called when the animation on an element completes (its Promise object is resolved).
+         */
+        done?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        /**
+         * A string or number determining how long the animation will run.
+         */
+        duration?: Duration;
+        /**
+         * A string indicating which easing function to use for the transition.
+         */
+        easing?: string;
+        /**
+         * A function to be called when the animation on an element fails to complete (its Promise object is rejected).
+         */
+        fail?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        /**
+         * A function to be called after each step of the animation, only once per animated element regardless
+         * of the number of animated properties.
+         */
+        progress?(this: TElement, animation: JQuery.Promise<any>, progress: number, remainingMs: number): void;
+        /**
+         * A Boolean indicating whether to place the animation in the effects queue. If false, the animation
+         * will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case
+         * the animation is added to the queue represented by that string. When a custom queue name is used the
+         * animation does not automatically start; you must call .dequeue("queuename") to start it.
+         */
+        queue?: boolean | string;
+        /**
+         * An object containing one or more of the CSS properties defined by the properties argument and their
+         * corresponding easing functions.
+         */
+        specialEasing?: PlainObject<string>;
+        /**
+         * A function to call when the animation on an element begins.
+         */
+        start?(this: TElement, animation: JQuery.Promise<any>): void;
+        /**
+         * A function to be called for each animated property of each animated element. This function provides
+         * an opportunity to modify the Tween object to change the value of the property before it is set.
+         */
+        step?(this: TElement, now: number, tween: Tween<TElement>): void;
+    }
+
+    interface SpeedSettings<TElement> {
+        /**
+         * A string or number determining how long the animation will run.
+         */
+        duration?: Duration;
+        /**
+         * A string indicating which easing function to use for the transition.
+         */
+        easing?: string;
+        /**
+         * A function to call once the animation is complete.
+         */
+        complete?(this: TElement): void;
+    }
+
+    // Undocumented
+    // https://github.com/jquery/api.jquery.com/issues/391
+    // https://github.com/jquery/api.jquery.com/issues/61
+    class Tween<TElement> {
+        easing: string;
+        elem: TElement;
+        end: number;
+        now: number;
+        options: EffectsOptions<TElement>;
+        pos: number;
+        prop: string;
+        start: number;
+        unit: string;
+    }
+
+    interface AnimationHook<TElement> {
+        (fx: JQuery.Tween<TElement>): void;
+    }
+
+    // endregion
+
+    // region Events
+
+    // This should be a class but doesn't work correctly under the JQuery namespace. Event should be an inner class of jQuery.
+    interface Event<TTarget = EventTarget, TData = null> {
+        /**
+         * The current DOM element within the event bubbling phase.
+         *
+         * @see {@link https://api.jquery.com/event.currentTarget/}
+         * @since 1.3
+         */
+        currentTarget: TTarget;
+        /**
+         * An optional object of data passed to an event method when the current executing handler is bound.
+         *
+         * @see {@link https://api.jquery.com/event.data/}
+         * @since 1.1
+         */
+        data: TData;
+        /**
+         * The element where the currently-called jQuery event handler was attached.
+         *
+         * @see {@link https://api.jquery.com/event.delegateTarget/}
+         * @since 1.7
+         */
+        delegateTarget: TTarget;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         *
+         * @see {@link https://api.jquery.com/event.metaKey/}
+         * @since 1.0.4
+         */
+        metaKey: boolean;
+        /**
+         * The namespace specified when the event was triggered.
+         *
+         * @see {@link https://api.jquery.com/event.namespace/}
+         * @since 1.4.3
+         */
+        namespace: string;
+        /**
+         * The mouse position relative to the left edge of the document.
+         *
+         * @see {@link https://api.jquery.com/event.pageX/}
+         * @since 1.0.4
+         */
+        pageX: number;
+        /**
+         * The mouse position relative to the top edge of the document.
+         *
+         * @see {@link https://api.jquery.com/event.pageY/}
+         * @since 1.0.4
+         */
+        pageY: number;
+        /**
+         * The other DOM element involved in the event, if any.
+         *
+         * @see {@link https://api.jquery.com/event.relatedTarget/}
+         * @since 1.1.4
+         */
+        relatedTarget: TTarget | null;
+        /**
+         * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
+         *
+         * @see {@link https://api.jquery.com/event.result/}
+         * @since 1.3
+         */
+        result: any;
+        /**
+         * The DOM element that initiated the event.
+         *
+         * @see {@link https://api.jquery.com/event.target/}
+         * @since 1.0
+         */
+        target: TTarget;
+        /**
+         * The difference in milliseconds between the time the browser created the event and January 1, 1970.
+         *
+         * @see {@link https://api.jquery.com/event.timeStamp/}
+         * @since 1.2.6
+         */
+        timeStamp: number;
+        /**
+         * Describes the nature of the event.
+         *
+         * @see {@link https://api.jquery.com/event.type/}
+         * @since 1.0
+         */
+        type: string;
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         *
+         * @see {@link https://api.jquery.com/event.which/}
+         * @since 1.1.3
+         */
+        which: number;
+
+        /**
+         * Returns whether event.preventDefault() was ever called on this event object.
+         *
+         * @see {@link https://api.jquery.com/event.isDefaultPrevented/}
+         * @since 1.3
+         */
+        isDefaultPrevented(): boolean;
+
+        /**
+         * Returns whether event.stopImmediatePropagation() was ever called on this event object.
+         *
+         * @see {@link https://api.jquery.com/event.isImmediatePropagationStopped/}
+         * @since 1.3
+         */
+        isImmediatePropagationStopped(): boolean;
+
+        /**
+         * Returns whether event.stopPropagation() was ever called on this event object.
+         *
+         * @see {@link https://api.jquery.com/event.isPropagationStopped/}
+         * @since 1.3
+         */
+        isPropagationStopped(): boolean;
+
+        /**
+         * If this method is called, the default action of the event will not be triggered.
+         *
+         * @see {@link https://api.jquery.com/event.preventDefault/}
+         * @since 1.0
+         */
+        preventDefault(): void;
+
+        /**
+         * Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.
+         *
+         * @see {@link https://api.jquery.com/event.stopImmediatePropagation/}
+         * @since 1.3
+         */
+        stopImmediatePropagation(): void;
+
+        /**
+         * Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
+         *
+         * @see {@link https://api.jquery.com/event.stopPropagation/}
+         * @since 1.0
+         */
+        stopPropagation(): void;
+    }
+
+    interface Event<TTarget = EventTarget> extends Partial<Pick<PointerEvent & KeyboardEvent & TouchEvent, 'altKey' | 'bubbles' | 'cancelable' |
+        'changedTouches' | 'ctrlKey' | 'detail' | 'eventPhase' | 'metaKey' | 'pageX' | 'pageY' | 'shiftKey' | 'view' |
+        'char' | 'charCode' | 'key' | 'keyCode' | 'button' | 'buttons' | 'clientX' | 'clientY' | 'offsetX' | 'offsetY' |
+        'pointerId' | 'pointerType' | 'screenX' | 'screenY' | 'targetTouches' | 'toElement' | 'touches'>> {
+        originalTarget?: TTarget;
+        originalEvent: _Event;
+        new<T extends PlainObject>(event: string, properties?: T): JQuery.Event<TTarget> & T;
+        new<T extends PlainObject>(properties: T): JQuery.Event<TTarget> & T;
+        <T extends PlainObject>(event: string, properties?: T): JQuery.Event<TTarget> & T;
+        <T extends PlainObject>(properties: T): JQuery.Event<TTarget> & T;
+    }
+
+    // Extra parameters can be passed from trigger()
+    interface EventHandler<TContext, TData = null> {
+        (this: TContext, eventObject: JQuery.Event<TContext, TData>, ...args: any[]): void | false | any;
+    }
+
+    // Provided for convenience for use with jQuery.Event.which
+    const enum Mouse {
+        None = 0,
+        Left = 1,
+        Middle = 2,
+        Right = 3
+    }
+
+    // Provided for convenience for use with jQuery.Event.which
+    const enum Key {
+        Backspace = 8,
+        Tab = 9,
+        Enter = 13,
+        Shift = 16,
+        Control = 17,
+        Alt = 18,
+        CapsLock = 20,
+        Escape = 27,
+        Space = 32,
+        PageUp = 33,
+        PageDown = 34,
+        End = 35,
+        Home = 36,
+        ArrowLeft = 37,
+        ArrowUp = 38,
+        ArrowRight = 39,
+        ArrowDown = 40,
+
+        Semicolon = 186,
+        Colon = 186,
+        EqualsSign = 187,
+        Plus = 187,
+        Comma = 188,
+        LessThanSign = 188,
+        Minus = 189,
+        Underscore = 189,
+        Period = 190,
+        GreaterThanSign = 190,
+        ForwardSlash = 191,
+        QuestionMark = 191,
+        Backtick = 192,
+        Tilde = 192,
+        OpeningSquareBracket = 219,
+        OpeningCurlyBrace = 219,
+        Backslash = 220,
+        Pipe = 220,
+        ClosingSquareBracket = 221,
+        ClosingCurlyBrace = 221,
+        SingleQuote = 222,
+        DoubleQuote = 222,
+
+        Pause = 19,
+        PrintScreen = 44,
+        Insert = 45,
+        Delete = 46,
+        Num0 = 48,
+        Num1 = 49,
+        Num2 = 50,
+        Num3 = 51,
+        Num4 = 52,
+        Num5 = 53,
+        Num6 = 54,
+        Num7 = 55,
+        Num8 = 56,
+        Num9 = 57,
+        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,
+        MetaLeft = 91,
+        MetaRight = 92,
+        ContextMenu = 93,
+        Numpad0 = 96,
+        Numpad1 = 97,
+        Numpad2 = 98,
+        Numpad3 = 99,
+        Numpad4 = 100,
+        Numpad5 = 101,
+        Numpad6 = 102,
+        Numpad7 = 103,
+        Numpad8 = 104,
+        Numpad9 = 105,
+        NumpadMultiply = 106,
+        NumpadAdd = 107,
+        NumpadSubtract = 109,
+        NumpadDecimal = 110,
+        NumpadDivide = 111,
+        F1 = 112,
+        F2 = 113,
+        F3 = 114,
+        F4 = 115,
+        F5 = 116,
+        F6 = 117,
+        F7 = 118,
+        F8 = 119,
+        F9 = 120,
+        F10 = 121,
+        F11 = 122,
+        F12 = 123,
+        NumLock = 144,
+        ScrollLock = 145
+    }
+
+    // endregion
+
+    interface NameValuePair {
+        name: string;
+        value: string;
+    }
+
+    interface Coordinates {
+        left: number;
+        top: number;
+    }
+
+    interface ValHook<TElement> {
+        get?(elem: TElement): any;
+        set?(elem: TElement, value: any): any;
+    }
+}
+
+// region Legacy types
+
+interface JQueryCallback extends JQuery.Callbacks { }
+interface JQueryDeferred<T> extends JQuery.Deferred<T> { }
+interface JQueryEventObject extends JQuery.Event<HTMLElement> { }
+interface JQueryEventConstructor extends JQuery.Event<EventTarget> { }
+interface JQueryDeferred<T> extends JQuery.Deferred<T> { }
+interface JQueryAjaxSettings extends JQuery.AjaxSettings { }
+interface JQueryAnimationOptions extends JQuery.EffectsOptions<Element> { }
+interface JQueryCoordinates extends JQuery.Coordinates { }
+interface JQueryGenericPromise<T> extends JQuery.Thenable<T> { }
+interface JQueryXHR extends JQuery.jqXHR { }
+interface JQueryPromise<T> extends JQuery.Promise<T> { }
+interface JQuerySerializeArrayElement extends JQuery.NameValuePair { }
+
 /**
- * Interface for the JQuery promise/deferred callbacks
+ * @deprecated 1.9
+ */
+interface JQuerySupport extends JQuery.PlainObject { }
+
+// Legacy types that are not represented in the current type definitions are marked deprecated.
+
+/**
+ * @deprecated
  */
 interface JQueryPromiseCallback<T> {
     (value?: T, ...args: any[]): void;
 }
-
-interface JQueryPromiseOperator<T, U> {
-    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
-}
-
 /**
- * Interface for the JQuery promise, part of callbacks
- * @see {@link https://api.jquery.com/category/deferred-object/}
+ * @deprecated
  */
-interface JQueryPromise<T> extends JQueryGenericPromise<T> {
+interface JQueryParam {
     /**
-     * Determine the current state of a Deferred object.
-     * @see {@link https://api.jquery.com/deferred.state/}
-     */
-    state(): string;
-    /**
-     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
      *
-     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
-     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-     * @see {@link https://api.jquery.com/deferred.always/}
+     * @param obj An array or object to serialize.
+     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
      */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object is resolved.
-     *
-     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
-     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-     * @see {@link https://api.jquery.com/deferred.done/}
-     */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object is rejected.
-     *
-     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
-     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-     * @see {@link https://api.jquery.com/deferred.fail/}
-     */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-    /**
-     * Add handlers to be called when the Deferred object generates progress notifications.
-     *
-     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
-     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
-     * @see {@link https://api.jquery.com/deferred.progress/}
-     */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
-
-    // Deprecated - given no typings
-    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
-
-    /**
-     * Return a Deferred's Promise object.
-     *
-     * @param target Object onto which the promise methods have to be attached
-     * @see {@link https://api.jquery.com/deferred.promise/}
-     */
-    promise(target?: any): JQueryPromise<T>;
+    (obj: any, traditional?: boolean): string;
 }
-
 /**
- * Interface for the JQuery deferred, part of callbacks
- * @see {@link https://api.jquery.com/category/deferred-object/}
- */
-interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
-    /**
-     * Determine the current state of a Deferred object.
-     * @see {@link https://api.jquery.com/deferred.state/}
-     */
-    state(): string;
-    /**
-     * Add handlers to be called when the Deferred object is either resolved or rejected.
-     *
-     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
-     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-     * @see {@link https://api.jquery.com/deferred.always/}
-     */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is resolved.
-     *
-     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
-     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-     * @see {@link https://api.jquery.com/deferred.done/}
-     */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is rejected.
-     *
-     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
-     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-     * @see {@link https://api.jquery.com/deferred.fail/}
-     */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object generates progress notifications.
-     *
-     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
-     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
-     * @see {@link https://api.jquery.com/deferred.progress/}
-     */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-
-    /**
-     * Call the progressCallbacks on a Deferred object with the given args.
-     *
-     * @param args Optional arguments that are passed to the progressCallbacks.
-     * @see {@link https://api.jquery.com/deferred.notify/}
-     */
-    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
-
-    /**
-     * Call the progressCallbacks on a Deferred object with the given context and args.
-     *
-     * @param context Context passed to the progressCallbacks as the this object.
-     * @param args Optional arguments that are passed to the progressCallbacks.
-     * @see {@link https://api.jquery.com/deferred.notifyWith/}
-     */
-    notifyWith(context: any, args?: any[]): JQueryDeferred<T>;
-
-    /**
-     * Reject a Deferred object and call any failCallbacks with the given args.
-     *
-     * @param args Optional arguments that are passed to the failCallbacks.
-     * @see {@link https://api.jquery.com/deferred.reject/}
-     */
-    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
-    /**
-     * Reject a Deferred object and call any failCallbacks with the given context and args.
-     *
-     * @param context Context passed to the failCallbacks as the this object.
-     * @param args An optional array of arguments that are passed to the failCallbacks.
-     * @see {@link https://api.jquery.com/deferred.rejectWith/}
-     */
-    rejectWith(context: any, args?: any[]): JQueryDeferred<T>;
-
-    /**
-     * Resolve a Deferred object and call any doneCallbacks with the given args.
-     *
-     * @param value First argument passed to doneCallbacks.
-     * @param args Optional subsequent arguments that are passed to the doneCallbacks.
-     * @see {@link https://api.jquery.com/deferred.resolve/}
-     */
-    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
-
-    /**
-     * Resolve a Deferred object and call any doneCallbacks with the given context and args.
-     *
-     * @param context Context passed to the doneCallbacks as the this object.
-     * @param args An optional array of arguments that are passed to the doneCallbacks.
-     * @see {@link https://api.jquery.com/deferred.resolveWith/}
-     */
-    resolveWith(context: any, args?: T[]): JQueryDeferred<T>;
-
-    /**
-     * Return a Deferred's Promise object.
-     *
-     * @param target Object onto which the promise methods have to be attached
-     * @see {@link https://api.jquery.com/deferred.promise/}
-     */
-    promise(target?: any): JQueryPromise<T>;
-
-    // Deprecated - given no typings
-    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
-}
-
-/**
- * Interface of the JQuery extension of the W3C event object
- * @see {@link https://api.jquery.com/category/events/event-object/}
+ * @deprecated
  */
 interface BaseJQueryEventObject extends Event {
     /**
@@ -581,14 +4617,18 @@ interface BaseJQueryEventObject extends Event {
      */
     metaKey: boolean;
 }
-
+/**
+ * @deprecated
+ */
 interface JQueryInputEventObject extends BaseJQueryEventObject {
     altKey: boolean;
     ctrlKey: boolean;
     metaKey: boolean;
     shiftKey: boolean;
 }
-
+/**
+ * @deprecated
+ */
 interface JQueryMouseEventObject extends JQueryInputEventObject {
     button: number;
     clientX: number;
@@ -600,3190 +4640,35 @@ interface JQueryMouseEventObject extends JQueryInputEventObject {
     screenX: number;
     screenY: number;
 }
-
+/**
+ * @deprecated
+ */
 interface JQueryKeyEventObject extends JQueryInputEventObject {
     char: any;
     charCode: number;
     key: any;
     keyCode: number;
 }
-
-interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{
-}
-
 /**
- * A collection of properties that represent the presence of different browser features or bugs.
- *
- * Intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally
- * to improve page startup performance. For your own project's feature-detection needs, we strongly recommend the
- * use of an external library such as {@link http://modernizr.com/|Modernizr} instead of dependency on properties
- * in jQuery.support.
- *
- * @deprecated since version 1.9
+ * @deprecated
  */
-interface JQuerySupport {
-    ajax?: boolean;
-    boxModel?: boolean;
-    changeBubbles?: boolean;
-    checkClone?: boolean;
-    checkOn?: boolean;
-    cors?: boolean;
-    cssFloat?: boolean;
-    hrefNormalized?: boolean;
-    htmlSerialize?: boolean;
-    leadingWhitespace?: boolean;
-    noCloneChecked?: boolean;
-    noCloneEvent?: boolean;
-    opacity?: boolean;
-    optDisabled?: boolean;
-    optSelected?: boolean;
-    scriptEval? (): boolean;
-    style?: boolean;
-    submitBubbles?: boolean;
-    tbody?: boolean;
+interface JQueryPromiseOperator<T, U> {
+    (callback1: JQuery.TypeOrArray<JQueryPromiseCallback<T>>,
+     ...callbacksN: Array<JQuery.TypeOrArray<JQueryPromiseCallback<any>>>): JQueryPromise<U>;
 }
-
-interface JQueryParam {
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     *
-     * @param obj An array or object to serialize.
-     */
-    (obj: any): string;
-
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     *
-     * @param obj An array or object to serialize.
-     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
-     */
-    (obj: any, traditional: boolean): string;
-}
-
 /**
- * The interface used to construct jQuery events (with $.Event). It is
- * defined separately instead of inline in JQueryStatic to allow
- * overriding the construction function with specific strings
- * returning specific event objects.
+ * @deprecated
  */
-interface JQueryEventConstructor {
-    (name: string, eventProperties?: any): JQueryEventObject;
-    new (name: string, eventProperties?: any): JQueryEventObject;
-}
-
-/**
- * The interface used to specify coordinates.
- */
-interface JQueryCoordinates {
-    left: number;
-    top: number;
-}
-
-/**
- * Elements in the array returned by serializeArray()
- */
-interface JQuerySerializeArrayElement {
-    name: string;
-    value: string;
-}
-
-/**
- * @see {@link https://api.jquery.com/animate/}
- */
-interface JQueryAnimationOptions {
-    /**
-     * A string or number determining how long the animation will run.
-     */
-    duration?: any;
-    /**
-     * A string indicating which easing function to use for the transition.
-     */
-    easing?: string;
-    /**
-     * A function to call once the animation is complete.
-     */
-    complete?: Function;
-    /**
-     * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set.
-     */
-    step?: (now: number, tween: any) => any;
-    /**
-     * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8)
-     */
-    progress?: (animation: JQueryPromise<any>, progress: number, remainingMs: number) => any;
-    /**
-     * A function to call when the animation begins. (version added: 1.8)
-     */
-    start?: (animation: JQueryPromise<any>) => any;
-    /**
-     * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8)
-     */
-    done?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
-    /**
-     * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8)
-     */
-    fail?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
-    /**
-     * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8)
-     */
-    always?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
-    /**
-     * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it.
-     */
-    queue?: any;
-    /**
-     * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4)
-     */
-    specialEasing?: Object;
-}
-
 interface JQueryEasingFunction {
-    ( percent: number ): number;
+    (percent: number): number;
 }
-
+/**
+ * @deprecated
+ */
 interface JQueryEasingFunctions {
-    [ name: string ]: JQueryEasingFunction;
+    [name: string]: JQueryEasingFunction;
     linear: JQueryEasingFunction;
     swing: JQueryEasingFunction;
 }
 
-/**
- * Static members of jQuery (those on $ and jQuery themselves)
- *
- * @see {@link https://api.jquery.com/Types/#jQuery}
- */
-interface JQueryStatic {
-
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
-     */
-    ajax(settings: JQueryAjaxSettings): JQueryXHR;
-    /**
-     * Perform an asynchronous HTTP (Ajax) request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
-     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-url-settings}
-     */
-    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
-
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param dataTypes An optional string containing one or more space-separated dataTypes
-     * @param handler A handler to set default values for future Ajax requests.
-     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
-     */
-    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-    /**
-     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
-     *
-     * @param handler A handler to set default values for future Ajax requests.
-     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
-     */
-    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-
-     /**
-     * Creates an object that handles the actual transmission of Ajax data.
-     *
-     * @param dataType A string identifying the data type to use.
-     * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
-     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
-     */
-    ajaxTransport(dataType: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
-    
-    ajaxSettings: JQueryAjaxSettings;
-
-     /**
-      * Set default values for future Ajax requests. Its use is not recommended.
-      *
-      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
-      * @see {@link https://api.jquery.com/jQuery.ajaxSetup/}
-      */
-    ajaxSetup(options: JQueryAjaxSettings): void;
-
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
-     */
-    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
-     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
-     */
-    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP GET request.
-     *
-     * @param settings The JQueryAjaxSettings to be used for the request
-     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-settings}
-     */
-    get(settings : JQueryAjaxSettings): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     * @see {@link https://api.jquery.com/jQuery.getJSON/}
-     */
-    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load JSON-encoded data from the server using a GET HTTP request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds.
-     * @see {@link https://api.jquery.com/jQuery.getJSON/}
-     */
-    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-    /**
-     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds.
-     * @see {@link https://api.jquery.com/jQuery.getScript/}
-     */
-    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
-
-    /**
-     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
-     *
-     * @see {@link https://api.jquery.com/jQuery.param/}
-     */
-    param: JQueryParam;
-
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
-     */
-    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
-     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
-     */
-    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
-    /**
-     * Load data from the server using a HTTP POST request.
-     *
-     * @param settings The JQueryAjaxSettings to be used for the request
-     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-settings}
-     */
-    post(settings : JQueryAjaxSettings): JQueryXHR;
-    /**
-     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
-     *
-     * @param flags An optional list of space-separated flags that change how the callback list behaves.
-     * @see {@link https://api.jquery.com/jQuery.Callbacks/}
-     */
-    Callbacks(flags?: string): JQueryCallback;
-
-    /**
-     * Holds or releases the execution of jQuery's ready event.
-     *
-     * @param hold Indicates whether the ready hold is being requested or released
-     * @see {@link https://api.jquery.com/jQuery.holdReady/}
-     */
-    holdReady(hold: boolean): void;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param selector A string containing a selector expression
-     * @param context A DOM Element, Document, or jQuery to use as context
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-selector-context}
-     */
-    (selector: string, context?: Element|JQuery): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param element A DOM element to wrap in a jQuery object.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-element}
-     */
-    (element: Element): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-elementArray}
-     */
-    (elementArray: Element[]): JQuery;
-
-    /**
-     * Binds a function to be executed when the DOM has finished loading.
-     *
-     * @param callback A function to execute after the DOM is ready.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-callback}
-     */
-    (callback: (jQueryAlias?: JQueryStatic) => any): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object A plain object to wrap in a jQuery object.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
-     */
-    (object: {}): JQuery;
-
-    /**
-     * Accepts a string containing a CSS selector which is then used to match a set of elements.
-     *
-     * @param object An existing jQuery object to clone.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
-     */
-    (object: JQuery): JQuery;
-
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery}
-     */
-    (): JQuery;
-
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
-     * @param ownerDocument A document in which the new elements will be created.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-ownerDocument}
-     */
-    (html: string, ownerDocument?: Document): JQuery;
-
-    /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
-     *
-     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
-     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
-     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-attributes}
-     */
-    (html: string, attributes: Object): JQuery;
-
-    /**
-     * Relinquish jQuery's control of the $ variable.
-     *
-     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
-     * @see {@link https://api.jquery.com/jQuery.noConflict/}
-     */
-    noConflict(removeAll?: boolean): JQueryStatic;
-
-    /**
-     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
-     *
-     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
-     * @see {@link https://api.jquery.com/jQuery.when/}
-     */
-    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
-
-    /**
-     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
-     * @see {@link https://api.jquery.com/jQuery.cssHooks/}
-     */
-    cssHooks: { [key: string]: any; };
-
-    /**
-     * An object containing all CSS properties that may be used without a unit. The .css() method uses this object to see if it may append px to unitless values.
-     * @see {@link https://api.jquery.com/jQuery.cssNumber/}
-     */
-    cssNumber: any;
-
-    /**
-     * Store arbitrary data associated with the specified element. Returns the value that was set.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value.
-     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key-value}
-     */
-    data<T>(element: Element, key: string, value: T): T;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     * @param key A string naming the piece of data to set.
-     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key}
-     */
-    data(element: Element, key: string): any;
-    /**
-     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
-     *
-     * @param element The DOM element to associate with the data.
-     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element}
-     */
-    data(element: Element): any;
-
-    /**
-     * Execute the next function on the queue for the matched element.
-     *
-     * @param element A DOM element from which to remove and execute a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/jQuery.dequeue/}
-     */
-    dequeue(element: Element, queueName?: string): void;
-
-    /**
-     * Determine whether an element has any jQuery data associated with it.
-     *
-     * @param element A DOM element to be checked for data.
-     * @see {@link https://api.jquery.com/jQuery.hasData/}
-     */
-    hasData(element: Element): boolean;
-
-    /**
-     * Show the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element to inspect for an attached queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName}
-     */
-    queue(element: Element, queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element where the array of queued functions is attached.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-newQueue}
-     */
-    queue(element: Element, queueName: string, newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed on the matched element.
-     *
-     * @param element A DOM element on which to add a queued function.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue.
-     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-callback}
-     */
-    queue(element: Element, queueName: string, callback: Function): JQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param element A DOM element from which to remove data.
-     * @param name A string naming the piece of data to remove.
-     * @see {@link https://api.jquery.com/jQuery.removeData/}
-     */
-    removeData(element: Element, name?: string): JQuery;
-
-    /**
-     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
-     *
-     * @param beforeStart A function that is called just before the constructor returns.
-     * @see {@link https://api.jquery.com/jQuery.Deferred/}
-     */
-    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
-
-    /**
-     * Effects
-     */
-
-    easing: JQueryEasingFunctions;
-
-    fx: {
-        tick: () => void;
-        /**
-         * The rate (in milliseconds) at which animations fire.
-         * @see {@link https://api.jquery.com/jQuery.fx.interval/}
-         */
-        interval: number;
-        stop: () => void;
-        speeds: { slow: number; fast: number; };
-        /**
-         * Globally disable all animations.
-         * @see {@link https://api.jquery.com/jQuery.fx.off/}
-         */
-        off: boolean;
-        step: any;
-    };
-
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param func The function whose context will be changed.
-     * @param context The object to which the context (this) of the function should be set.
-     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
-     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-function-context-additionalArguments}
-     */
-    proxy(func: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
-    /**
-     * Takes a function and returns a new one that will always have a particular context.
-     *
-     * @param context The object to which the context (this) of the function should be set.
-     * @param name The name of the function whose context will be changed (should be a property of the context object).
-     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
-     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-context-name-additionalArguments}
-     */
-    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
-
-    Event: JQueryEventConstructor;
-
-    /**
-     * Takes a string and throws an exception containing it.
-     *
-     * @param message The message to send out.
-     * @see {@link https://api.jquery.com/jQuery.error/}
-     */
-    error(message: any): JQuery;
-
-    expr: any;
-    fn: any;  //TODO: Decide how we want to type this
-
-    isReady: boolean;
-
-    // Properties
-    support: JQuerySupport;
-
-    /**
-     * Check to see if a DOM element is a descendant of another DOM element.
-     *
-     * @param container The DOM element that may contain the other element.
-     * @param contained The DOM element that may be contained by (a descendant of) the other element.
-     * @see {@link https://api.jquery.com/jQuery.contains/}
-     */
-    contains(container: Element, contained: Element): boolean;
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     *
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object. Will break the loop by returning false.
-     * @returns the first argument, the object that is iterated.
-     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-array-callback}
-     */
-    each<T>(
-        collection: T[],
-        callback: (indexInArray: number, valueOfElement: T) => boolean | void
-        ): T[];
-
-    /**
-     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
-     *
-     * @param collection The object or array to iterate over.
-     * @param callback The function that will be executed on every object. Will break the loop by returning false.
-     * @returns the first argument, the object that is iterated.
-     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-object-callback}
-     */
-    each<T extends Object>(
-        collection: T,
-        // TODO: `(keyInObject: keyof T, valueOfElement: T[keyof T])`, when TypeScript 2.1 allowed in repository
-        callback: (keyInObject: string, valueOfElement: any) => boolean | void
-        ): T;
-
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-target-object1-objectN}
-     */
-    extend(target: any, object1?: any, ...objectN: any[]): any;
-    /**
-     * Merge the contents of two or more objects together into the first object.
-     *
-     * @param deep If true, the merge becomes recursive (aka. deep copy).
-     * @param target The object to extend. It will receive the new properties.
-     * @param object1 An object containing additional properties to merge in.
-     * @param objectN Additional objects containing properties to merge in.
-     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-deep-target-object1-objectN}
-     */
-    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
-
-    /**
-     * Execute some JavaScript code globally.
-     *
-     * @param code The JavaScript code to execute.
-     * @see {@link https://api.jquery.com/jQuery.globalEval/}
-     */
-    globalEval(code: string): any;
-
-    /**
-     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
-     *
-     * @param array The array to search through.
-     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
-     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
-     * @see {@link https://api.jquery.com/jQuery.grep/}
-     */
-    grep<T>(array: T[], func: (elementOfArray?: T, indexInArray?: number) => boolean, invert?: boolean): T[];
-
-    /**
-     * Search for a specified value within an array and return its index (or -1 if not found).
-     *
-     * @param value The value to search for.
-     * @param array An array through which to search.
-     * @param fromIndex The index of the array at which to begin the search. The default is 0, which will search the whole array.
-     * @see {@link https://api.jquery.com/jQuery.inArray/}
-     */
-    inArray<T>(value: T, array: T[], fromIndex?: number): number;
-
-    /**
-     * Determine whether the argument is an array.
-     *
-     * @param obj Object to test whether or not it is an array.
-     * @see {@link https://api.jquery.com/jQuery.isArray/}
-     */
-    isArray(obj: any): obj is Array<any>;
-    /**
-     * Check to see if an object is empty (contains no enumerable properties).
-     *
-     * @param obj The object that will be checked to see if it's empty.
-     * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
-     */
-    isEmptyObject(obj: any): boolean;
-    /**
-     * Determine if the argument passed is a JavaScript function object.
-     *
-     * @param obj Object to test whether or not it is a function.
-     * @see {@link https://api.jquery.com/jQuery.isFunction/}
-     */
-    isFunction(obj: any): obj is Function;
-    /**
-     * Determines whether its argument is a number.
-     *
-     * @param value The value to be tested.
-     * @see {@link https://api.jquery.com/jQuery.isNumeric/}
-     */
-    isNumeric(value: any): boolean;
-    /**
-     * Check to see if an object is a plain object (created using "{}" or "new Object").
-     *
-     * @param obj The object that will be checked to see if it's a plain object.
-     * @see {@link https://api.jquery.com/jQuery.isPlainObject/}
-     */
-    isPlainObject(obj: any): boolean;
-    /**
-     * Determine whether the argument is a window.
-     *
-     * @param obj Object to test whether or not it is a window.
-     * @see {@link https://api.jquery.com/jQuery.isWindow/}
-     */
-    isWindow(obj: any): obj is Window;
-    /**
-     * Check to see if a DOM node is within an XML document (or is an XML document).
-     *
-     * @param node The DOM node that will be checked to see if it's in an XML document.
-     * @see {@link https://api.jquery.com/jQuery.isXMLDoc/}
-     */
-    isXMLDoc(node: Node): boolean;
-
-    /**
-     * Convert an array-like object into a true JavaScript array.
-     *
-     * @param obj Any object to turn into a native Array.
-     * @see {@link https://api.jquery.com/jQuery.makeArray/}
-     */
-    makeArray(obj: any): any[];
-
-    /**
-     * Translate all items in an array or object to new array of items.
-     *
-     * @param array The Array to translate.
-     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
-     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-array-callback}
-     */
-    map<T, U>(array: T[], callback: (elementOfArray?: T, indexInArray?: number) => U): U[];
-    /**
-     * Translate all items in an array or object to new array of items.
-     *
-     * @param arrayOrObject The Array or Object to translate.
-     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
-     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-object-callback}
-     */
-    map(arrayOrObject: any, callback: (value?: any, indexOrKey?: any) => any): any;
-
-    /**
-     * Merge the contents of two arrays together into the first array.
-     *
-     * @param first The first array to merge, the elements of second added.
-     * @param second The second array to merge into the first, unaltered.
-     * @see {@link https://api.jquery.com/jQuery.merge/}
-     */
-    merge<T>(first: T[], second: T[]): T[];
-
-    /**
-     * An empty function.
-     * @see {@link https://api.jquery.com/jQuery.noop/}
-     */
-    noop(): any;
-
-    /**
-     * Return a number representing the current time.
-     * @see {@link https://api.jquery.com/jQuery.now/}
-     */
-    now(): number;
-
-    /**
-     * Takes a well-formed JSON string and returns the resulting JavaScript object.
-     *
-     * @param json The JSON string to parse.
-     * @see {@link https://api.jquery.com/jQuery.parseJSON/}
-     */
-    parseJSON(json: string): any;
-
-    /**
-     * Parses a string into an XML document.
-     *
-     * @param data a well-formed XML string to be parsed
-     * @see {@link https://api.jquery.com/jQuery.parseXML/}
-     */
-    parseXML(data: string): XMLDocument;
-
-    /**
-     * Remove the whitespace from the beginning and end of a string.
-     *
-     * @param str Remove the whitespace from the beginning and end of a string.
-     * @see {@link https://api.jquery.com/jQuery.trim/}
-     */
-    trim(str: string): string;
-
-    /**
-     * Determine the internal JavaScript [[Class]] of an object.
-     *
-     * @param obj Object to get the internal JavaScript [[Class]] of.
-     * @see {@link https://api.jquery.com/jQuery.type/}
-     */
-    type(obj: any): "array" | "boolean" | "date" | "error" | "function" | "null" | "number" | "object" | "regexp" | "string" | "symbol" | "undefined";
-
-    /**
-     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
-     *
-     * @param array The Array of DOM elements.
-     * @see {@link https://api.jquery.com/jQuery.unique/}
-     */
-    unique<T extends Element>(array: T[]): T[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
-     */
-    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
-
-    /**
-     * Parses a string into an array of DOM nodes.
-     *
-     * @param data HTML string to be parsed
-     * @param context DOM element to serve as the context in which the HTML fragment will be created
-     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
-     */
-    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
-}
-
-/**
- * The jQuery instance members
- *
- * @see {@link https://api.jquery.com/Types/#jQuery}
- */
-interface JQuery {
-    /**
-     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxComplete/}
-     */
-    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery;
-    /**
-     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxError/}
-     */
-    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery;
-    /**
-     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxSend/}
-     */
-    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
-    /**
-     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxStart/}
-     */
-    ajaxStart(handler: () => any): JQuery;
-    /**
-     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxStop/}
-     */
-    ajaxStop(handler: () => any): JQuery;
-    /**
-     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
-     *
-     * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxSuccess/}
-     */
-    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
-
-    /**
-     * Load data from the server and place the returned HTML into the matched element.
-     *
-     * @param url A string containing the URL to which the request is sent.
-     * @param data A plain object or string that is sent to the server with the request.
-     * @param complete A callback function that is executed when the request completes.
-     * @see {@link https://api.jquery.com/load/}
-     */
-    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery;
-
-    /**
-     * Encode a set of form elements as a string for submission.
-     * @see {@link https://api.jquery.com/serialize/}
-     */
-    serialize(): string;
-    /**
-     * Encode a set of form elements as an array of names and values.
-     * @see {@link https://api.jquery.com/serializeArray/}
-     */
-    serializeArray(): JQuerySerializeArrayElement[];
-
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
-     * @see {@link https://api.jquery.com/addClass/#addClass-className}
-     */
-    addClass(className: string): JQuery;
-    /**
-     * Adds the specified class(es) to each of the set of matched elements.
-     *
-     * @param func A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/addClass/#addClass-function}
-     */
-    addClass(func: (index: number, className: string) => string): JQuery;
-
-    /**
-     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
-     * @see {@link https://api.jquery.com/addBack/}
-     */
-    addBack(selector?: string): JQuery;
-
-    /**
-     * Get the value of an attribute for the first element in the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to get.
-     * @see {@link https://api.jquery.com/attr/#attr-attributeName}
-     */
-    attr(attributeName: string): string;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param value A value to set for the attribute. If this is `null`, the attribute will be deleted.
-     * @see {@link https://api.jquery.com/attr/#attr-attributeName-value}
-     */
-    attr(attributeName: string, value: string|number|null): JQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributeName The name of the attribute to set.
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
-     * @see {@link https://api.jquery.com/attr/#attr-attributeName-function}
-     */
-    attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery;
-    /**
-     * Set one or more attributes for the set of matched elements.
-     *
-     * @param attributes An object of attribute-value pairs to set.
-     * @see {@link https://api.jquery.com/attr/#attr-attributes}
-     */
-    attr(attributes: Object): JQuery;
-
-    /**
-     * Determine whether any of the matched elements are assigned the given class.
-     *
-     * @param className The class name to search for.
-     * @see {@link https://api.jquery.com/hasClass/}
-     */
-    hasClass(className: string): boolean;
-
-    /**
-     * Get the HTML contents of the first element in the set of matched elements.
-     * @see {@link https://api.jquery.com/html/#html}
-     */
-    html(): string;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param htmlString A string of HTML to set as the content of each matched element.
-     * @see {@link https://api.jquery.com/html/#html-htmlString}
-     */
-    html(htmlString: string): JQuery;
-    /**
-     * Set the HTML contents of each element in the set of matched elements.
-     *
-     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/html/#html-function}
-     */
-    html(func: (index: number, oldhtml: string) => string): JQuery;
-
-    /**
-     * Get the value of a property for the first element in the set of matched elements.
-     *
-     * @param propertyName The name of the property to get.
-     * @see {@link https://api.jquery.com/prop/#prop-propertyName}
-     */
-    prop(propertyName: string): any;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param value A value to set for the property.
-     * @see {@link https://api.jquery.com/prop/#prop-propertyName-value}
-     */
-    prop(propertyName: string, value: string|number|boolean): JQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     * @see {@link https://api.jquery.com/prop/#prop-properties}
-     */
-    prop(properties: Object): JQuery;
-    /**
-     * Set one or more properties for the set of matched elements.
-     *
-     * @param propertyName The name of the property to set.
-     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
-     * @see {@link https://api.jquery.com/prop/#prop-propertyName-function}
-     */
-    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery;
-
-    /**
-     * Remove an attribute from each element in the set of matched elements.
-     *
-     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
-     * @see {@link https://api.jquery.com/removeAttr/}
-     */
-    removeAttr(attributeName: string): JQuery;
-
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
-     * @see {@link https://api.jquery.com/removeClass/#removeClass-className}
-     */
-    removeClass(className?: string): JQuery;
-    /**
-     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
-     *
-     * @param func A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
-     * @see {@link https://api.jquery.com/removeClass/#removeClass-function}
-     */
-    removeClass(func: (index: number, className: string) => string): JQuery;
-
-    /**
-     * Remove a property for the set of matched elements.
-     *
-     * @param propertyName The name of the property to remove.
-     * @see {@link https://api.jquery.com/removeProp/}
-     */
-    removeProp(propertyName: string): JQuery;
-
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
-     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
-     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-className}
-     */
-    toggleClass(className: string, swtch?: boolean): JQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-state}
-     */
-    toggleClass(swtch?: boolean): JQuery;
-    /**
-     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
-     *
-     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
-     * @param swtch A boolean value to determine whether the class should be added or removed.
-     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-function-state}
-     */
-    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery;
-
-    /**
-     * Get the current value of the first element in the set of matched elements.
-     * @see {@link https://api.jquery.com/val/#val}
-     */
-    val(): any;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked.
-     * @see {@link https://api.jquery.com/val/#val-value}
-     */
-    val(value: string|string[]|number): JQuery;
-    /**
-     * Set the value of each element in the set of matched elements.
-     *
-     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     * @see {@link https://api.jquery.com/val/#val-function}
-     */
-    val(func: (index: number, value: string) => string): JQuery;
-
-    /**
-     * Get the value of style properties for the first element in the set of matched elements.
-     *
-     * @param propertyName A CSS property.
-     * @see {@link https://api.jquery.com/css/#css-propertyName}
-     */
-    css(propertyName: string): string;
-    /**
-     * Get the value of style properties for the first element in the set of matched elements.
-     * Results in an object of property-value pairs.
-     *
-     * @param propertyNames An array of one or more CSS properties.
-     * @see {@link https://api.jquery.com/css/#css-propertyNames}
-     */
-    css(propertyNames: string[]): any;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A value to set for the property.
-     * @see {@link https://api.jquery.com/css/#css-propertyName-value}
-     */
-    css(propertyName: string, value: string|number): JQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param propertyName A CSS property name.
-     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
-     * @see {@link https://api.jquery.com/css/#css-propertyName-function}
-     */
-    css(propertyName: string, value: (index: number, value: string) => string|number): JQuery;
-    /**
-     * Set one or more CSS properties for the set of matched elements.
-     *
-     * @param properties An object of property-value pairs to set.
-     * @see {@link https://api.jquery.com/css/#css-properties}
-     */
-    css(properties: Object): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements.
-     * @see {@link https://api.jquery.com/height/#height}
-     */
-    height(): number;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/height/#height-value}
-     */
-    height(value: number|string): JQuery;
-    /**
-     * Set the CSS height of every matched element.
-     *
-     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/height/#height-function}
-     */
-    height(func: (index: number, height: number) => number|string): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
-     * @see {@link https://api.jquery.com/innerHeight/#innerHeight}
-     */
-    innerHeight(): number;
-
-    /**
-     * Sets the inner height on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/innerHeight/#innerHeight-value}
-     */
-    innerHeight(value: number|string): JQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
-     * @see {@link https://api.jquery.com/innerWidth/#innerWidth}
-     */
-    innerWidth(): number;
-
-    /**
-     * Sets the inner width on elements in the set of matched elements, including padding but not border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/innerWidth/#innerWidth-value}
-     */
-    innerWidth(value: number|string): JQuery;
-
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
-     * @see {@link https://api.jquery.com/offset/#offset}
-     */
-    offset(): JQueryCoordinates;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     * @see {@link https://api.jquery.com/offset/#offset-coordinates}
-     */
-    offset(coordinates: JQueryCoordinates): JQuery;
-    /**
-     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
-     *
-     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
-     * @see {@link https://api.jquery.com/offset/#offset-function}
-     */
-    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery;
-
-    /**
-     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-includeMargin}
-     */
-    outerHeight(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer height on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-value}
-     */
-    outerHeight(value: number|string): JQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements, including padding and border.
-     *
-     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-includeMargin}
-     */
-    outerWidth(includeMargin?: boolean): number;
-
-    /**
-     * Sets the outer width on elements in the set of matched elements, including padding and border.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-value}
-     */
-    outerWidth(value: number|string): JQuery;
-
-    /**
-     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
-     * @see {@link https://api.jquery.com/position/}
-     */
-    position(): JQueryCoordinates;
-
-    /**
-     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
-     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft}
-     */
-    scrollLeft(): number;
-    /**
-     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft-value}
-     */
-    scrollLeft(value: number): JQuery;
-
-    /**
-     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
-     * @see {@link https://api.jquery.com/scrollTop/#scrollTop}
-     */
-    scrollTop(): number;
-    /**
-     * Set the current vertical position of the scroll bar for each of the set of matched elements.
-     *
-     * @param value An integer indicating the new position to set the scroll bar to.
-     * @see {@link https://api.jquery.com/scrollTop/#scrollTop-value}
-     */
-    scrollTop(value: number): JQuery;
-
-    /**
-     * Get the current computed width for the first element in the set of matched elements.
-     * @see {@link https://api.jquery.com/width/#width}
-     */
-    width(): number;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-     * @see {@link https://api.jquery.com/width/#width-value}
-     */
-    width(value: number|string): JQuery;
-    /**
-     * Set the CSS width of each element in the set of matched elements.
-     *
-     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/width/#width-function}
-     */
-    width(func: (index: number, width: number) => number|string): JQuery;
-
-    /**
-     * Remove from the queue all items that have not yet been run.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/clearQueue/}
-     */
-    clearQueue(queueName?: string): JQuery;
-
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param key A string naming the piece of data to set.
-     * @param value The new data value; it can be any JavaScript type including Array or Object.
-     * @see {@link https://api.jquery.com/data/#data-key-value}
-     */
-    data(key: string, value: any): JQuery;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     *
-     * @param key Name of the data stored.
-     * @see {@link https://api.jquery.com/data/#data-key}
-     */
-    data(key: string): any;
-    /**
-     * Store arbitrary data associated with the matched elements.
-     *
-     * @param obj An object of key-value pairs of data to update.
-     * @see {@link https://api.jquery.com/data/#data-obj}
-     */
-    data(obj: { [key: string]: any; }): JQuery;
-    /**
-     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
-     * @see {@link https://api.jquery.com/data/#data}
-     */
-    data(): any;
-
-    /**
-     * Execute the next function on the queue for the matched elements.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/dequeue/}
-     */
-    dequeue(queueName?: string): JQuery;
-
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
-     * @see {@link https://api.jquery.com/removeData/#removeData-name}
-     */
-    removeData(name: string): JQuery;
-    /**
-     * Remove a previously-stored piece of data.
-     *
-     * @param list An array of strings naming the pieces of data to delete.
-     * @see {@link https://api.jquery.com/removeData/#removeData-list}
-     */
-    removeData(list: string[]): JQuery;
-    /**
-     * Remove all previously-stored piece of data.
-     * @see {@link https://api.jquery.com/removeData/}
-     */
-    removeData(): JQuery;
-
-    /**
-     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
-     *
-     * @param type The type of queue that needs to be observed. (default: fx)
-     * @param target Object onto which the promise methods have to be attached
-     * @see {@link https://api.jquery.com/promise/}
-     */
-    promise(type?: string, target?: Object): JQueryPromise<any>;
-
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
-     */
-    animate(properties: Object, duration?: string|number, complete?: Function): JQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition. (default: swing)
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
-     */
-    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery;
-    /**
-     * Perform a custom animation of a set of CSS properties.
-     *
-     * @param properties An object of CSS properties and values that the animation will move toward.
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/animate/#animate-properties-options}
-     */
-    animate(properties: Object, options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Set a timer to delay execution of subsequent items in the queue.
-     *
-     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/delay/}
-     */
-    delay(duration: number, queueName?: string): JQuery;
-
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-complete}
-     */
-    fadeIn(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-easing-complete}
-     */
-    fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements by fading them to opaque.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-options}
-     */
-    fadeIn(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-complete}
-     */
-    fadeOut(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-easing-complete}
-     */
-    fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements by fading them to transparent.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-options}
-     */
-    fadeOut(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-complete}
-     */
-    fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery;
-    /**
-     * Adjust the opacity of the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param opacity A number between 0 and 1 denoting the target opacity.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-easing-complete}
-     */
-    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery;
-
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
-     */
-    fadeToggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
-     */
-    fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements by animating their opacity.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-options}
-     */
-    fadeToggle(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     * @see {@link https://api.jquery.com/finish/}
-     */
-    finish(queue?: string): JQuery;
-
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/hide/#hide}
-     */
-    hide(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/hide/#hide-duration-easing-complete}
-     */
-    hide(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/hide/#hide-options}
-     */
-    hide(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/show/#show}
-     */
-    show(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/show/#show-duration-easing-complete}
-     */
-    show(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/show/#show-options}
-     */
-    show(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-complete}
-     */
-    slideDown(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-easing-complete}
-     */
-    slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideDown/#slideDown-options}
-     */
-    slideDown(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-complete}
-     */
-    slideToggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-easing-complete}
-     */
-    slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-options}
-     */
-    slideToggle(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-complete}
-     */
-    slideUp(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-easing-complete}
-     */
-    slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Hide the matched elements with a sliding motion.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideUp/#slideUp-options}
-     */
-    slideUp(options: JQueryAnimationOptions): JQuery;
-
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     * @see {@link https://api.jquery.com/stop/#stop-clearQueue-jumpToEnd}
-     */
-    stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
-    /**
-     * Stop the currently-running animation on the matched elements.
-     *
-     * @param queue The name of the queue in which to stop animations.
-     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
-     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     * @see {@link https://api.jquery.com/stop/#stop-queue-clearQueue-jumpToEnd}
-     */
-    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
-
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/toggle/#toggle-duration-complete}
-     */
-    toggle(duration?: number|string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param duration A string or number determining how long the animation will run.
-     * @param easing A string indicating which easing function to use for the transition.
-     * @param complete A function to call once the animation is complete.
-     * @see {@link https://api.jquery.com/toggle/#toggle-duration-easing-complete}
-     */
-    toggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/toggle/#toggle-options}
-     */
-    toggle(options: JQueryAnimationOptions): JQuery;
-    /**
-     * Display or hide the matched elements.
-     *
-     * @param showOrHide A Boolean indicating whether to show or hide the elements.
-     * @see {@link https://api.jquery.com/toggle/#toggle-display}
-     */
-    toggle(showOrHide: boolean): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
-     */
-    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
-     */
-    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
-     */
-    bind(eventType: string, eventData: any, preventBubble: boolean): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
-     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
-     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
-     */
-    bind(eventType: string, preventBubble: boolean): JQuery;
-    /**
-     * Attach a handler to an event for the elements.
-     *
-     * @param events An object containing one or more DOM event types and functions to execute for them.
-     * @see {@link https://api.jquery.com/bind/#bind-events}
-     */
-    bind(events: any): JQuery;
-
-    /**
-     * Trigger the "blur" event on an element
-     * @see {@link https://api.jquery.com/blur/#blur}
-     */
-    blur(): JQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/blur/#blur-handler}
-     */
-    blur(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "blur" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/blur/#blur-eventData-handler}
-     */
-    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "change" event on an element.
-     * @see {@link https://api.jquery.com/change/#change}
-     */
-    change(): JQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/change/#change-handler}
-     */
-    change(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "change" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/change/#change-eventData-handler}
-     */
-    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "click" event on an element.
-     * @see {@link https://api.jquery.com/click/#click}
-     */
-    click(): JQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/click/#click-handler}
-     */
-    click(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "click" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/click/#click-eventData-handler}
-     */
-    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "contextmenu" event on an element.
-     * @see {@link https://api.jquery.com/contextmenu/#contextmenu}
-     */
-    contextmenu(): JQuery;
-    /**
-     * Bind an event handler to the "contextmenu" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-handler}
-     */
-    contextmenu(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "contextmenu" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-eventData-handler}
-     */
-    contextmenu(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "dblclick" event on an element.
-     * @see {@link https://api.jquery.com/dblclick/#dblclick}
-     */
-    dblclick(): JQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/dblclick/#dblclick-handler}
-     */
-    dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "dblclick" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/dblclick/#dblclick-eventData-handler}
-     */
-    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
-     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-handler}
-     */
-    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
-     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-eventData-handler}
-     */
-    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focus" event on an element.
-     * @see {@link https://api.jquery.com/focus/#focus}
-     */
-    focus(): JQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focus/#focus-handler}
-     */
-    focus(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focus" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focus/#focus-eventData-handler}
-     */
-    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focusin" event on an element.
-     * @see {@link https://api.jquery.com/focusin/#focusin}
-     */
-    focusin(): JQuery;
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusin/#focusin-handler}
-     */
-    focusin(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focusin" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusin/#focusin-eventData-handler}
-     */
-    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "focusout" event on an element.
-     * @see {@link https://api.jquery.com/focusout/#focusout}
-     */
-    focusout(): JQuery;
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusout/#focusout-handler}
-     */
-    focusout(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "focusout" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusout/#focusout-eventData-handler}
-     */
-    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
-     *
-     * @param handlerIn A function to execute when the mouse pointer enters the element.
-     * @param handlerOut A function to execute when the mouse pointer leaves the element.
-     * @see {@link https://api.jquery.com/hover/#hover-handlerIn-handlerOut}
-     */
-    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
-     *
-     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
-     * @see {@link https://api.jquery.com/hover/#hover-handlerInOut}
-     */
-    hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keydown" event on an element.
-     * @see {@link https://api.jquery.com/keydown/#keydown}
-     */
-    keydown(): JQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keydown/#keydown-handler}
-     */
-    keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keydown" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keydown/#keydown-eventData-handler}
-     */
-    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keypress" event on an element.
-     * @see {@link https://api.jquery.com/keypress/#keypress}
-     */
-    keypress(): JQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keypress/#keypress-handler}
-     */
-    keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keypress" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keypress/#keypress-eventData-handler}
-     */
-    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "keyup" event on an element.
-     * @see {@link https://api.jquery.com/keyup/#keyup}
-     */
-    keyup(): JQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keyup/#keyup-handler}
-     */
-    keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "keyup" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keyup/#keyup-eventData-handler}
-     */
-    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
-
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/load/}
-     */
-    load(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "load" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/load/}
-     */
-    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mousedown" event on an element.
-     * @see {@link https://api.jquery.com/mousedown/#mousedown}
-     */
-    mousedown(): JQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mousedown/#mousedown-handler}
-     */
-    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mousedown" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mousedown/#mousedown-eventData-handler}
-     */
-    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseenter" event on an element.
-     * @see {@link https://api.jquery.com/mouseenter/#mouseenter}
-     */
-    mouseenter(): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-handler}
-     */
-    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse enters an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-eventData-handler}
-     */
-    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseleave" event on an element.
-     * @see {@link https://api.jquery.com/mouseleave/#mouseleave}
-     */
-    mouseleave(): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-handler}
-     */
-    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to be fired when the mouse leaves an element.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-eventData-handler}
-     */
-    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mousemove" event on an element.
-     * @see {@link https://api.jquery.com/mousemove/#mousemove}
-     */
-    mousemove(): JQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mousemove/#mousemove-handler}
-     */
-    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mousemove" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mousemove/#mousemove-eventData-handler}
-     */
-    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseout" event on an element.
-     * @see {@link https://api.jquery.com/mouseout/#mouseout}
-     */
-    mouseout(): JQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseout/#mouseout-handler}
-     */
-    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseout" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseout/#mouseout-eventData-handler}
-     */
-    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseover" event on an element.
-     * @see {@link https://api.jquery.com/mouseover/#mouseover}
-     */
-    mouseover(): JQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseover/#mouseover-handler}
-     */
-    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseover" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseover/#mouseover-eventData-handler}
-     */
-    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "mouseup" event on an element.
-     * @see {@link https://api.jquery.com/mouseup/#mouseup}
-     */
-    mouseup(): JQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseup/#mouseup-handler}
-     */
-    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "mouseup" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/mouseup/#mouseup-eventData-handler}
-     */
-    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     * @see {@link https://api.jquery.com/off/#off}
-     */
-    off(): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
-     */
-    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
-     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
-     */
-    off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
-     */
-    off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove an event handler.
-     *
-     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
-     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     * @see {@link https://api.jquery.com/off/#off-events-selector}
-     */
-    off(events: { [key: string]: any; }, selector?: string): JQuery;
-
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
-     */
-    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
-    */
-    on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
-     */
-    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
-     */
-    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
-     */
-    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, selector?: string, data?: any): JQuery;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
-     */
-    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, data?: any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param handler A function to execute at the time the event is triggered.
-     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
-     */
-    one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
-     * @param data An object containing data that will be passed to the event handler.
-     * @param handler A function to execute at the time the event is triggered.
-     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
-     */
-    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
-     */
-    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
-     */
-    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
-     */
-    one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
-
-    /**
-     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
-     *
-     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
-     * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
-     */
-    one(events: { [key: string]: any; }, data?: any): JQuery;
-
-
-    /**
-     * Specify a function to execute when the DOM is fully loaded.
-     *
-     * @param handler A function to execute after the DOM is ready.
-     * @see {@link https://api.jquery.com/ready/}
-     */
-    ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery;
-
-    /**
-     * Trigger the "resize" event on an element.
-     * @see {@link https://api.jquery.com/resize/#resize}
-     */
-    resize(): JQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/resize/#resize-handler}
-     */
-    resize(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "resize" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/resize/#resize-eventData-handler}
-     */
-    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "scroll" event on an element.
-     * @see {@link https://api.jquery.com/scroll/#scroll}
-     */
-    scroll(): JQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/scroll/#scroll-handler}
-     */
-    scroll(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "scroll" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/scroll/#scroll-eventData-handler}
-     */
-    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "select" event on an element.
-     * @see {@link https://api.jquery.com/select/#select}
-     */
-    select(): JQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/select/#select-handler}
-     */
-    select(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "select" JavaScript event.
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/select/#select-eventData-handler}
-     */
-    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Trigger the "submit" event on an element.
-     * @see {@link https://api.jquery.com/submit/#submit}
-     */
-    submit(): JQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/submit/#submit-handler}
-     */
-    submit(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "submit" JavaScript event
-     *
-     * @param eventData An object containing data that will be passed to the event handler.
-     * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/submit/#submit-eventData-handler}
-     */
-    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/trigger/#trigger-eventType-extraParameters}
-     */
-    trigger(eventType: string, extraParameters?: any[]|Object): JQuery;
-    /**
-     * Execute all handlers and behaviors attached to the matched elements for the given event type.
-     *
-     * @param event A jQuery.Event object.
-     * @param extraParameters Additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/trigger/#trigger-event-extraParameters}
-     */
-    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery;
-
-    /**
-     * Execute all handlers attached to an element for an event.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param extraParameters An array of additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-eventType-extraParameters}
-     */
-    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
-
-    /**
-     * Execute all handlers attached to an element for an event.
-     *
-     * @param event A jQuery.Event object.
-     * @param extraParameters An array of additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-event-extraParameters}
-     */
-    triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object;
-
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param handler The function that is to be no longer executed.
-     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-handler}
-     */
-    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param eventType A string containing a JavaScript event type, such as click or submit.
-     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
-     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-false}
-     */
-    unbind(eventType: string, fls: boolean): JQuery;
-    /**
-     * Remove a previously-attached event handler from the elements.
-     *
-     * @param evt A JavaScript event object as passed to an event handler.
-     * @see {@link https://api.jquery.com/unbind/#unbind-event}
-     */
-    unbind(evt: any): JQuery;
-
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     * @see {@link https://api.jquery.com/undelegate/#undelegate}
-     */
-    undelegate(): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param selector A selector which will be used to filter the event results.
-     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
-     * @param handler A function to execute at the time the event is triggered.
-     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-eventType}
-     */
-    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param selector A selector which will be used to filter the event results.
-     * @param events An object of one or more event types and previously bound functions to unbind from them.
-     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-events}
-     */
-    undelegate(selector: string, events: Object): JQuery;
-    /**
-     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
-     *
-     * @param namespace A string containing a namespace to unbind all events from.
-     * @see {@link https://api.jquery.com/undelegate/#undelegate-namespace}
-     */
-    undelegate(namespace: string): JQuery;
-
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/unload/#unload-handler}
-     */
-    unload(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/unload/#unload-eventData-handler}
-     */
-    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
-     * @see {@link https://api.jquery.com/context/}
-     */
-    context: Element;
-
-    jquery: string;
-
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/error/#error-handler}
-     */
-    error(handler: (eventObject: JQueryEventObject) => any): JQuery;
-    /**
-     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
-     *
-     * @param eventData A plain object of data that will be passed to the event handler.
-     * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/error/#error-eventData-handler}
-     */
-    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     *
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements}
-     */
-    pushStack(elements: any[]): JQuery;
-    /**
-     * Add a collection of DOM elements onto the jQuery stack.
-     *
-     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     * @param name The name of a jQuery method that generated the array of elements.
-     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
-     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements-name-arguments}
-     */
-    pushStack(elements: any[], name: string, arguments: any[]): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     *
-     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert after each element in the set of matched elements.
-     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/after/#after-content-content}
-     */
-    after(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, after each element in the set of matched elements.
-     *
-     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/after/#after-function}
-     */
-    after(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     *
-     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
-     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/append/#append-content-content}
-     */
-    append(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
-     *
-     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/append/#append-function}
-     */
-    append(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the end of the target.
-     *
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/appendTo/}
-     */
-    appendTo(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     *
-     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert before each element in the set of matched elements.
-     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/before/#before-content-content}
-     */
-    before(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, before each element in the set of matched elements.
-     *
-     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/before/#before-function}
-     */
-    before(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Create a deep copy of the set of matched elements.
-     *
-     * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
-     * @param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
-     * @see {@link https://api.jquery.com/clone/}
-     */
-    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     *
-     * @param selector A selector expression that filters the set of matched elements to be removed.
-     * @see {@link https://api.jquery.com/detach/}
-     */
-    detach(selector?: string): JQuery;
-
-    /**
-     * Remove all child nodes of the set of matched elements from the DOM.
-     * @see {@link https://api.jquery.com/empty/}
-     */
-    empty(): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements after the target.
-     *
-     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/insertAfter/}
-     */
-    insertAfter(target: JQuery|any[]|Element|Text|string): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements before the target.
-     *
-     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/insertBefore/}
-     */
-    insertBefore(target: JQuery|any[]|Element|Text|string): JQuery;
-
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     *
-     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
-     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/prepend/#prepend-content-content}
-     */
-    prepend(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
-    /**
-     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
-     *
-     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/prepend/#prepend-function}
-     */
-    prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery;
-
-    /**
-     * Insert every element in the set of matched elements to the beginning of the target.
-     *
-     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/prependTo/}
-     */
-    prependTo(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Remove the set of matched elements from the DOM.
-     *
-     * @param selector A selector expression that filters the set of matched elements to be removed.
-     * @see {@link https://api.jquery.com/remove/}
-     */
-    remove(selector?: string): JQuery;
-
-    /**
-     * Replace each target element with the set of matched elements.
-     *
-     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
-     * @see {@link https://api.jquery.com/replaceAll/}
-     */
-    replaceAll(target: JQuery|any[]|Element|string): JQuery;
-
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     *
-     * @param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
-     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-newContent}
-     */
-    replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery;
-    /**
-     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
-     *
-     * @param func A function that returns content with which to replace the set of matched elements.
-     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-function}
-     */
-    replaceWith(func: () => Element|JQuery): JQuery;
-
-    /**
-     * Get the combined text contents of each element in the set of matched elements, including their descendants.
-     * @see {@link https://api.jquery.com/text/#text}
-     */
-    text(): string;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     *
-     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
-     * @see {@link https://api.jquery.com/text/#text-text}
-     */
-    text(text: string|number|boolean): JQuery;
-    /**
-     * Set the content of each element in the set of matched elements to the specified text.
-     *
-     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
-     * @see {@link https://api.jquery.com/text/#text-function}
-     */
-    text(func: (index: number, text: string) => string): JQuery;
-
-    /**
-     * Retrieve all the elements contained in the jQuery set, as an array.
-     * @name toArray
-     * @see {@link https://api.jquery.com/toArray/}
-     */
-    toArray(): HTMLElement[];
-
-    /**
-     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
-     * @see {@link https://api.jquery.com/unwrap/}
-     */
-    unwrap(): JQuery;
-
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     *
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     * @see {@link https://api.jquery.com/wrap/#wrap-wrappingElement}
-     */
-    wrap(wrappingElement: JQuery|Element|string): JQuery;
-    /**
-     * Wrap an HTML structure around each element in the set of matched elements.
-     *
-     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/wrap/#wrap-function}
-     */
-    wrap(func: (index: number) => string|JQuery): JQuery;
-
-    /**
-     * Wrap an HTML structure around all elements in the set of matched elements.
-     *
-     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
-     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-wrappingElement}
-     */
-    wrapAll(wrappingElement: JQuery|Element|string): JQuery;
-    /**
-     * Wrap an HTML structure around all elements in the set of matched elements.
-     *
-     * @param func A callback function returning the HTML content or jQuery object to wrap around all the matched elements. Within the function, this refers to the first element in the set.
-     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-function}
-     */
-    wrapAll(func: (index: number) => string): JQuery;
-
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     *
-     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
-     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-wrappingElement}
-     */
-    wrapInner(wrappingElement: JQuery|Element|string): JQuery;
-    /**
-     * Wrap an HTML structure around the content of each element in the set of matched elements.
-     *
-     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-function}
-     */
-    wrapInner(func: (index: number) => string): JQuery;
-
-    /**
-     * Iterate over a jQuery object, executing a function for each matched element.
-     *
-     * @param func A function to execute for each matched element. Can stop the loop by returning false.
-     * @see {@link https://api.jquery.com/each/}
-     */
-    each(func: (index: number, elem: Element) => boolean | void): JQuery;
-
-    /**
-     * Retrieve one of the elements matched by the jQuery object.
-     *
-     * @param index A zero-based integer indicating which element to retrieve.
-     * @see {@link https://api.jquery.com/get/#get-index}
-     */
-    get(index: number): HTMLElement;
-    /**
-     * Retrieve the elements matched by the jQuery object.
-     * @alias toArray
-     * @see {@link https://api.jquery.com/get/#get}
-     */
-    get(): HTMLElement[];
-
-    /**
-     * Search for a given element from among the matched elements.
-     * @see {@link https://api.jquery.com/index/#index}
-     */
-    index(): number;
-    /**
-     * Search for a given element from among the matched elements.
-     *
-     * @param selector A selector representing a jQuery collection in which to look for an element.
-     * @see {@link https://api.jquery.com/index/#index-selector}
-     */
-    index(selector: string|JQuery|Element): number;
-
-    /**
-     * The number of elements in the jQuery object.
-     * @see {@link https://api.jquery.com/length/}
-     */
-    length: number;
-    /**
-     * A selector representing selector passed to jQuery(), if any, when creating the original set.
-     * version deprecated: 1.7, removed: 1.9
-     * @see {@link https://api.jquery.com/selector/}
-     */
-    selector: string;
-    [index: number]: HTMLElement;
-
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
-     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
-     * @see {@link https://api.jquery.com/add/#add-selector}
-     */
-    add(selector: string, context?: Element): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param elements One or more elements to add to the set of matched elements.
-     * @see {@link https://api.jquery.com/add/#add-elements}
-     */
-    add(...elements: Element[]): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param html An HTML fragment to add to the set of matched elements.
-     * @see {@link https://api.jquery.com/add/#add-html}
-     */
-    add(html: string): JQuery;
-    /**
-     * Add elements to the set of matched elements.
-     *
-     * @param obj An existing jQuery object to add to the set of matched elements.
-     * @see {@link https://api.jquery.com/add/#add-selection}
-     */
-    add(obj: JQuery): JQuery;
-
-    /**
-     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/children/}
-     */
-    children(selector?: string): JQuery;
-
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/closest/#closest-selector}
-     */
-    closest(selector: string): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     * @see {@link https://api.jquery.com/closest/#closest-selector-context}
-     */
-    closest(selector: string, context?: Element): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param obj A jQuery object to match elements against.
-     * @see {@link https://api.jquery.com/closest/#closest-selection}
-     */
-    closest(obj: JQuery): JQuery;
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     *
-     * @param element An element to match elements against.
-     * @see {@link https://api.jquery.com/closest/#closest-element}
-     */
-    closest(element: Element): JQuery;
-
-    /**
-     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
-     *
-     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
-     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
-     * @see {@link https://api.jquery.com/closest/#closest-selectors-context}
-     */
-    closest(selectors: any, context?: Element): any[];
-
-    /**
-     * Get the children of each element in the set of matched elements, including text and comment nodes.
-     * @see {@link https://api.jquery.com/contents/}
-     */
-    contents(): JQuery;
-
-    /**
-     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
-     * @see {@link https://api.jquery.com/end/}
-     */
-    end(): JQuery;
-
-    /**
-     * Reduce the set of matched elements to the one at the specified index.
-     *
-     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
-     * @see {@link https://api.jquery.com/eq/}
-     */
-    eq(index: number): JQuery;
-
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param selector A string containing a selector expression to match the current set of elements against.
-     * @see {@link https://api.jquery.com/filter/#filter-selector}
-     */
-    filter(selector: string): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     * @see {@link https://api.jquery.com/filter/#filter-function}
-     */
-    filter(func: (index: number, element: Element) => boolean): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param element An element to match the current set of elements against.
-     * @see {@link https://api.jquery.com/filter/#filter-elements}
-     */
-    filter(element: Element): JQuery;
-    /**
-     * Reduce the set of matched elements to those that match the selector or pass the function's test.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     * @see {@link https://api.jquery.com/filter/#filter-selection}
-     */
-    filter(obj: JQuery): JQuery;
-
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/find/#find-selector}
-     */
-    find(selector: string): JQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param element An element to match elements against.
-     * @see {@link https://api.jquery.com/find/#find-element}
-     */
-    find(element: Element): JQuery;
-    /**
-     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
-     *
-     * @param obj A jQuery object to match elements against.
-     * @see {@link https://api.jquery.com/find/#find-element}
-     */
-    find(obj: JQuery): JQuery;
-
-    /**
-     * Reduce the set of matched elements to the first in the set.
-     * @see {@link https://api.jquery.com/first/}
-     */
-    first(): JQuery;
-
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/has/#has-selector}
-     */
-    has(selector: string): JQuery;
-    /**
-     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
-     *
-     * @param contained A DOM element to match elements against.
-     * @see {@link https://api.jquery.com/has/#has-contained}
-     */
-    has(contained: Element): JQuery;
-
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/is/#is-selector}
-     */
-    is(selector: string): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
-     * @see {@link https://api.jquery.com/is/#is-function}
-     */
-    is(func: (index: number, element: Element) => boolean): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     * @see {@link https://api.jquery.com/is/#is-selection}
-     */
-    is(obj: JQuery): boolean;
-    /**
-     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
-     *
-     * @param elements One or more elements to match the current set of elements against.
-     * @see {@link https://api.jquery.com/is/#is-elements}
-     */
-    is(elements: any): boolean;
-
-    /**
-     * Reduce the set of matched elements to the final one in the set.
-     * @see {@link https://api.jquery.com/last/}
-     */
-    last(): JQuery;
-
-    /**
-     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
-     *
-     * @param callback A function object that will be invoked for each element in the current set.
-     * @see {@link https://api.jquery.com/map/}
-     */
-    map(callback: (index: number, domElement: Element) => any): JQuery;
-
-    /**
-     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/next/}
-     */
-    next(selector?: string): JQuery;
-
-    /**
-     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/nextAll/}
-     */
-    nextAll(selector?: string): JQuery;
-
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-selector-filter}
-     */
-    nextUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
-     */
-    nextUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
-     */
-    nextUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/not/#not-selector}
-     */
-    not(selector: string): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param func A function used as a test for each element in the set. this is the current DOM element.
-     * @see {@link https://api.jquery.com/not/#not-function}
-     */
-    not(func: (index: number, element: Element) => boolean): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param elements One or more DOM elements to remove from the matched set.
-     * @see {@link https://api.jquery.com/not/#not-selection}
-     */
-    not(elements: Element|Element[]): JQuery;
-    /**
-     * Remove elements from the set of matched elements.
-     *
-     * @param obj An existing jQuery object to match the current set of elements against.
-     * @see {@link https://api.jquery.com/not/#not-selection}
-     */
-    not(obj: JQuery): JQuery;
-
-    /**
-     * Get the closest ancestor element that is positioned.
-     * @see {@link https://api.jquery.com/offsetParent/}
-     */
-    offsetParent(): JQuery;
-
-    /**
-     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parent/}
-     */
-    parent(selector?: string): JQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parents/}
-     */
-    parents(selector?: string): JQuery;
-
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-selector-filter}
-     */
-    parentsUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
-     */
-    parentsUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
-     */
-    parentsUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prev/}
-     */
-    prev(selector?: string): JQuery;
-
-    /**
-     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prevAll/}
-     */
-    prevAll(selector?: string): JQuery;
-
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-selector-filter}
-     */
-    prevUntil(selector?: string, filter?: string): JQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
-     */
-    prevUntil(element?: Element, filter?: string): JQuery;
-    /**
-     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
-     *
-     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
-     * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
-     */
-    prevUntil(obj?: JQuery, filter?: string): JQuery;
-
-    /**
-     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
-     *
-     * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/siblings/}
-     */
-    siblings(selector?: string): JQuery;
-
-    /**
-     * Reduce the set of matched elements to a subset specified by a range of indices.
-     *
-     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
-     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
-     * @see {@link https://api.jquery.com/slice/}
-     */
-    slice(start: number, end?: number): JQuery;
-
-    /**
-     * Show the queue of functions to be executed on the matched elements.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/queue/#queue-queueName}
-     */
-    queue(queueName?: string): any[];
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param newQueue An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
-     */
-    queue(newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
-     */
-    queue(callback: Function): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param newQueue An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
-     */
-    queue(queueName: string, newQueue: Function[]): JQuery;
-    /**
-     * Manipulate the queue of functions to be executed, once for each matched element.
-     *
-     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
-     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
-     */
-    queue(queueName: string, callback: Function): JQuery;
-}
-declare module "jquery" {
-    export = $;
-}
-declare var jQuery: JQueryStatic;
-declare var $: JQueryStatic;
+// endregion
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index d2d58aa2a2..c31352cb02 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1,3552 +1,2640 @@
-
-
-function test_add() {
-    $("p").add("div").addClass("widget");
-    var pdiv = $("p").add("div");
-
-    $('li').add('p').css('background-color', 'red');
-    $('li').add(document.getElementsByTagName('p')[0])
-      .css('background-coailor', 'red');
-    $('li').add('<p id="new">new paragraph</p>')
-      .css('background-color', 'red');
-    $("div").css("border", "2px solid red")
-            .add("p")
-            .css("background", "yellow");
-    $("p").add("span").css("background", "yellow");
-    $("p").clone().add("<span>Again</span>").appendTo(document.body);
-    $("p").add(document.getElementById("a")).css("background", "yellow");
-    var collection = $("p");
-
-    collection = collection.add(document.getElementById("a"));
-    collection.css("background", "yellow");
-}
-
-function test_addClass() {
-    $("p").addClass("myClass yourClass");
-    $("p").removeClass("myClass noClass").addClass("yourClass");
-    $("ul li:last").addClass(function (index) {
-        return "item-" + index;
-    });
-    $("p:last").addClass("selected");
-    $("p:last").addClass("selected highlight");
-    $("div").addClass(function (index, currentClass) {
-        var addedClass: string;
-        if (currentClass === "red") {
-            addedClass = "green";
-            $("p").text("There is one green div");
-        }
-        return addedClass;
-    });
-}
-
-function test_after() {
-    $('.inner').after('<p>Test</p>');
-    $('<div/>').after('<p></p>').after(document.createDocumentFragment());
-    $('<div/>').after('<p></p>').addClass('foo')
-      .filter('p').attr('id', 'bar').html('hello')
-    .end()
-    .appendTo('body');
-    $('p').after(function () {
-        return '<div>' + this.className + '</div>';
-    });
-    var $newdiv1 = $('<div id="object1"/>'),
-        newdiv2 = document.createElement('div'),
-        existingdiv1 = document.getElementById('foo');
-    $('p').first().after($newdiv1, [newdiv2, existingdiv1]);
-    $("p").after(document.createTextNode("Hello"));
-    $("p").after($("b"));
-}
-
-function test_ajax() {
-    $.ajax({
-        url: "test.html",
-        context: document.body
-    }).done(function () {
-        $(this).addClass("done");
-    });
-    $.ajax({
-        statusCode: {
-            404: function () {
-                alert("page not found");
-            }
-        }
-    });
-    $.ajax({
-        url: "http://fiddle.jshell.net/favicon.png",
-        beforeSend: function (xhr) {
-            xhr.overrideMimeType("text/plain; charset=x-user-defined");
-        }
-    }).done(function (data) {
-        if (console && console.log) {
-            console.log("Sample of data:", data.slice(0, 100));
-        }
-    });
-    $.ajax({
-        url: 'ajax/test.html',
-        success: function (data) {
-            $('.result').html(data);
-            alert('Load was performed.');
-        },
-        error: function (jqXHR, textStatus, errorThrown) {
-            alert('Load failed. responseJSON=' + jqXHR.responseJSON);
-        }
-    });
-    var _super = jQuery.ajaxSettings.xhr;
-    jQuery.ajaxSettings.xhr = function () {
-        var xhr = _super(),
-            getAllResponseHeaders = xhr.getAllResponseHeaders;
-
-        xhr.getAllResponseHeaders = function () {
-            if (getAllResponseHeaders()) {
-                return getAllResponseHeaders();
-            }
-
-            var allHeaders = "";
-            var headersFieldNames = ["Cache-Control", "Content-Language", "Content-Type",
-                "Expires", "Last-Modified", "Pragma"];
-            $(headersFieldNames).each(function (i, header_name) {
-                if (xhr.getResponseHeader(header_name)) {
-                    allHeaders += header_name + ": " + xhr.getResponseHeader(header_name) + "\n";
-                }
-            });
-            return allHeaders;
-        };
-
-        return xhr;
-    };
-    $.ajax({
-        type: "POST",
-        url: "some.php",
-        data: { name: "John", location: "Boston" }
-    }).done(function (msg) {
-        alert("Data Saved: " + msg);
-    });
-    $.ajax({
-        method: "POST",
-        url: "some.php",
-        data: { name: "John", location: "Boston" }
-    });
-    $.ajax({
-        url: "test.html",
-        cache: false
-    }).done(function (html) {
-        $("#results").append(html);
-    });
-    var xmlDocument = [];
-    var xmlRequest = $.ajax({
-        url: "page.php",
-        processData: false,
-        data: xmlDocument
-    });
-    var handleResponse;
-    xmlRequest.done(handleResponse);
-
-    var menuId = $("ul.nav").first().attr("id");
-    var request = $.ajax({
-        url: "script.php",
-        type: "POST",
-        data: { id: menuId },
-        dataType: "html"
-    });
-    request.done(function (msg) {
-        $("#log").html(msg);
-    });
-    request.fail(function (jqXHR, textStatus) {
-        alert("Request failed: " + textStatus);
-    });
-
-    $.ajax({
-        type: "GET",
-        url: "test.js",
-        dataType: "script"
-    });
-
-    // Test the jqXHR object returned by $.ajax() as of 1.5
-    // More details: http://api.jquery.com/jQuery.ajax/#jqXHR
-
-    // done method
-    $.ajax({
-        url: "test.js"
-    }).done((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    });
-
-    // then method can change promise type through promise chaining
-    var chainedValuePromise : JQueryPromise<number>;
-    chainedValuePromise = $.ajax({
-        url: "test.js"
-    }).then(() => $.when(1));
-
-    // fail method
-    $.ajax({
-        url: "test.js"
-    }).fail((jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // always method with successful request
-    $.ajax({
-        url: "test.js"
-    }).always((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    });
-
-    // always method with failed request
-    $.ajax({
-        url: "test.js"
-    }).always((jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // then method (as of 1.8)
-    $.ajax({
-        url: "test.js"
-    }).then((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    }, (jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // generic then method
-    var p: JQueryPromise<number> = $.ajax({ url: "test.js" })
-        .then(() => "Hello")
-        .then((x) => x.length);
-
-    // jqXHR object
-    var jqXHR = $.ajax({
-        url: "test.js"
-    });
-    jqXHR.abort('aborting because I can');
-
-    //Test the promise exposed by the jqXHR object
-
-    // done method
-    $.ajax({
-        url: "test.js"
-    }).promise().done((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    });
-
-    // fail method
-    $.ajax({
-        url: "test.js"
-    }).promise().fail((jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // always method with successful request
-    $.ajax({
-        url: "test.js"
-    }).promise().always((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    });
-
-    // always method with failed request
-    $.ajax({
-        url: "test.js"
-    }).promise().always((jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // then method (as of 1.8)
-    $.ajax({
-        url: "test.js"
-    }).promise().then((data, textStatus, jqXHR) => {
-        console.log(data, textStatus, jqXHR);
-    }, (jqXHR, textStatus, errorThrown) => {
-        console.log(jqXHR, textStatus, errorThrown);
-    });
-
-    // generic then method
-    var p: JQueryPromise<number> = $.ajax({ url: "test.js" }).promise()
-        .then(() => "Hello")
-        .then((x) => x.length);
-}
-
-function test_ajaxComplete() {
-    $('.log').ajaxComplete(function () {
-        $(this).text('Triggered ajaxComplete handler.');
-    });
-    $('.trigger').click(function () {
-        $('.result').load('ajax/test.html');
-    });
-    $('.log').ajaxComplete(function (e, xhr, settings) {
-        if (settings.url == 'ajax/test.html') {
-            $(this).text('Triggered ajaxComplete handler. The result is ' + xhr.responseText);
-        }
-    });
-    $("#msg").ajaxComplete(function (event, request, settings) {
-        $(this).append("<li>Request Complete.</li>");
-    });
-}
-
-function test_ajaxError() {
-    $("div.log").ajaxError(function () {
-        $(this).text("Triggered ajaxError handler.");
-    });
-    $("button.trigger").click(function () {
-        $("div.result").load("ajax/missing.html");
-    });
-    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
-        if (settings.url == "ajax/missing.html") {
-            $(this).text("Triggered ajaxError handler.");
-        }
-    });
-    $("#msg").ajaxError(function (event, request, settings) {
-        $(this).append("<li>Error requesting page " + settings.url + "</li>");
-    });
-}
-
-function test_ajaxPrefilter() {
-    var currentRequests = {};
-    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
-        if (options.abortOnRetry) {
-            if (currentRequests[options.url]) {
-                currentRequests[options.url].abort();
-            }
-            currentRequests[options.url] = jqXHR;
-        }
-    });
-    $.ajaxPrefilter(function (options) {
-        if (options.crossDomain) {
-            options.url = "http://mydomain.net/proxy/" + encodeURIComponent(options.url);
-            options.crossDomain = false;
-        }
-    });
-    $.ajaxPrefilter("json script", function (options, originalOptions, jqXHR) {
-
-    });
-    var isActuallyScript;
-    $.ajaxPrefilter(function (options) {
-        if (isActuallyScript(options.url)) {
-            return "script";
-        }
-    });
-}
-
-function test_ajaxSend() {
-    $('.log').ajaxSend(function () {
-        $(this).text('Triggered ajaxSend handler.');
-    });
-    $('.trigger').click(function () {
-        $('.result').load('ajax/test.html');
-    });
-    $('.log').ajaxSend(function (e, jqxhr, settings) {
-        if (settings.url == 'ajax/test.html') {
-            $(this).text('Triggered ajaxSend handler.');
-        }
-    });
-    $("#msg").ajaxSend(function (evt, request, settings) {
-        $(this).append("<li>Starting request at " + settings.url + "</li>");
-    });
-}
-
-function test_ajaxSetup() {
-    $.ajaxSetup({
-        url: 'ping.php'
-    });
-    $.ajax({
-        data: { 'name': 'Dan' }
-    });
-    $.ajaxSetup({
-        url: "/xmlhttp/",
-        global: false,
-        type: "POST"
-    });
-}
-
-function test_ajaxStart() {
-    $('.log').ajaxStart(function () {
-        $(this).text('Triggered ajaxStart handler.');
-    });
-    $('.trigger').click(function () {
-        $('.result').load('ajax/test.html');
-    });
-    $("#loading").ajaxStart(function () {
-        $(this).show();
-    });
-}
-
-function test_ajaxStop() {
-    $('.log').ajaxStop(function () {
-        $(this).text('Triggered ajaxStop handler.');
-    });
-    $('.trigger').click(function () {
-        $('.result').load('ajax/test.html');
-    });
-    $("#loading").ajaxStop(function () {
-        $(this).hide();
-    });
-}
-
-function test_ajaxSuccess() {
-    $('.log').ajaxSuccess(function () {
-        $(this).text('Triggered ajaxSuccess handler.');
-    });
-    $('.trigger').click(function () {
-        $('.result').load('ajax/test.html');
-    });
-    $('.log').ajaxSuccess(function (e, xhr, settings) {
-        if (settings.url == 'ajax/test.html') {
-            $(this).text('Triggered ajaxSuccess handler. The ajax response was:' + xhr.responseText);
-        }
-    });
-    $("#msg").ajaxSuccess(function (evt, request, settings) {
-        $(this).append("<li>Successful Request!</li>");
-    });
-}
-
-function test_allSelector() {
-    var elementCount = $("*").css("border", "3px solid red").length;
-    $("body").prepend("<h3>" + elementCount + " elements found</h3>");
-    var elementCount2 = $("#test").find("*").css("border", "3px solid red").length;
-    $("body").prepend("<h3>" + elementCount2 + " elements found</h3>");
-}
-
-function test_animate() {
-    $('#clickme').click(function () {
-        $('#book').animate({
-            opacity: 0.25,
-            left: '+=50',
-            height: 'toggle'
-        }, 5000, function () {
-        });
-    });
-    $('li').animate({
-        opacity: .5,
-        height: '50%'
-    }, {
-        step: function (now, fx) {
-            var data = fx.elem.id + ' ' + fx.prop + ': ' + now;
-            $('body').append('<div>' + data + '</div>');
-        }
-    });
-    $('#clickme').click(function () {
-        $('#book').animate({
-            width: ['toggle', 'swing'],
-            height: ['toggle', 'swing'],
-            opacity: 'toggle'
-        }, 5000, 'linear', function () {
-            $(this).after('<div>Animation complete.</div>');
-        });
-    });
-    $('#clickme').click(function () {
-        $('#book').animate({
-            width: 'toggle',
-            height: 'toggle'
-        }, {
-            duration: 5000,
-            specialEasing: {
-                width: 'linear',
-                height: 'easeOutBounce'
-            },
-            complete: function () {
-                $(this).after('<div>Animation complete.</div>');
-            }
-        });
-    });
-    $("#go").click(function () {
-        $("#block").animate({
-            width: "70%",
-            opacity: 0.4,
-            marginLeft: "0.6in",
-            fontSize: "3em",
-            borderWidth: "10px"
-        }, 1500);
-    });
-    $("#right").click(function () {
-        $(".block").animate({ "left": "+=50px" }, "slow");
-    });
-    $("#left").click(function () {
-        $(".block").animate({ "left": "-=50px" }, "slow");
-    });
-    $("#go1").click(function () {
-        $("#block1").animate({ width: "90%" }, { queue: false, duration: 3000 })
-           .animate({ fontSize: "24px" }, 1500)
-           .animate({ borderRightWidth: "15px" }, 1500);
-    });
-    $("#go2").click(function () {
-        $("#block2").animate({ width: "90%" }, 1000)
-           .animate({ fontSize: "24px" }, 1000)
-           .animate({ borderLeftWidth: "15px" }, 1000);
-    });
-    $("#go3").click(function () {
-        $("#go1").add("#go2").click();
-    });
-    $("#go4").click(function () {
-        $("div").css({ width: "", fontSize: "", borderWidth: "" });
-    });
-    $("#go").click(function () {
-        $(".block:first").animate({
-            left: 100
-        }, {
-            duration: 1000,
-            step: function (now, fx) {
-                $(".block:gt(0)").css("left", now);
-            }
-        });
-    });
-    $("p").animate({
-        height: "toggle", opacity: "toggle"
-    }, "slow");
-    $("p").animate({
-        left: 50, opacity: 1
-    }, 500);
-    $("p").animate({
-        left: "50px", opacity: 1
-    }, { duration: 500, queue: false });
-    $("p").animate({
-        opacity: "show"
-    }, "slow", "easein");
-    $("p").animate({
-        height: "toggle", opacity: "toggle"
-    }, { duration: "slow" });
-    $("p").animate({
-        opacity: "show"
-    }, { duration: "slow", easing: "easein" });
-    $("p").animate({
-        height: 200, width: 400, opacity: 0.5
-    }, 1000, "linear", function () {
-        alert("all done");
-    });
-}
-
-function test_animatedSelector() {
-    $("#run").click(function () {
-        $("div:animated").toggleClass("colored");
-    });
-    function animateIt() {
-        $("#mover").slideToggle("slow", animateIt);
-    }
-    animateIt();
-}
-
-function test_slideToggle() {
-    $("button").click(function () {
-        $("p").slideToggle("slow");
-    });
-
-    $("#aa").click(function () {
-        $("div:not(.still)").slideToggle("slow", function () {
-            var n = parseInt($("span").text(), 10);
-            $("span").text(n + 1);
-        });
-    });
-}
-
-function test_toggle() {
-    $(".target").toggle();
-
-    $("#clickme").click(function () {
-        $("#book").toggle("slow", function () {
-            // Animation complete.
-        });
-    });
-
-    $("#foo").toggle(true);
-
-    $("button").click(function () {
-        $("p").toggle();
-    });
-
-    $("button").click(function () {
-        $("p").toggle("slow");
-    });
-
-    var flip = 0;
-    $("button").click(function () {
-        $("p").toggle(flip++ % 2 === 0);
-    });
-}
-
-function test_append() {
-    $('.inner').append('<p>Test</p>');
-    $('.container').append($('h2')).append(document.createDocumentFragment());
-
-    var $newdiv1 = $('<div id="object1"/>'),
-    newdiv2 = document.createElement('div'),
-    existingdiv1 = document.getElementById('foo');
-
-    $('body').append($newdiv1, [newdiv2, existingdiv1]);
-}
-
-function test_appendTo() {
-    $('<p>Test</p>').appendTo('.inner');
-    $('h2').appendTo($('.container'));
-}
-
-function test_attr() {
-    var title = $("em").attr("title");
-    $("em").attr("title", null); // Delete an attribute.
-    $("div").text(title);
-    $('#greatphoto').attr('alt', 'Beijing Brush Seller');
-    $('#greatphoto')
-        .attr('title', 'Photo by Kelly Clark');
-    $('#greatphoto').attr({
-        alt: 'Beijing Brush Seller',
-        title: 'photo by Kelly Clark'
-    });
-    $('#greatphoto').attr('title', function (i, val) {
-        return val + ' - photo by Kelly Clark'
-    });
-    $("div").attr("id", function (arr) {
-        return "div-id" + arr;
-    })
-    .each(function () {
-        $("span", this).html("(ID = '<b>" + this.id + "</b>')");
-    });
-    $("img").attr("src", function () {
-        return "/images/" + this.title;
-    });
-}
-
-function test_attributeSelectors() {
-    $('a[hreflang|="en"]').css('border', '3px dotted green');
-    $('input[name*="man"]').val('has man in it!');
-    $('input[name~="man"]').val('mr. man is in it!');
-    $('input[name$="letter"]').val('a letter');
-    $('input[value="Hot Fuzz"]').next().text(" Hot Fuzz");
-    $('input[name!="newsletter"]').next().append('<b>; not newsletter</b>');
-    $('input[name^="news"]').val('news here!');
-}
-
-function test_before() {
-    $('.inner').before('<p>Test</p>');
-    $('.container').before($('h2')).before(document.createDocumentFragment());
-    $("<div/>").before("<p></p>");
-    var $newdiv1 = $('<div id="object1"/>'),
-        newdiv2 = document.createElement('div'),
-        existingdiv1 = document.getElementById('foo');
-    $('p').first().before($newdiv1, [newdiv2, existingdiv1]);
-}
-
-function test_bind() {
-    $('#foo').bind('click', function () {
-        alert('User clicked on "foo."');
-    });
-    $('#foo').bind('mouseenter mouseleave', function () {
-        $(this).toggleClass('entered');
-    });
-    $('#foo').bind({
-        click: function () { },
-        mouseenter: function () { }
-    });
-    $('#foo').bind('click', function () {
-        alert($(this).text());
-    });
-    $(document).ready(function () {
-        $('#foo').bind('click', function (event) {
-            alert('The mouse cursor is at ('
-              + event.pageX + ', ' + event.pageY + ')');
-        });
-    });
-    var message = 'Spoon!';
-    $('#foo').bind('click', function () {
-        alert(message);
-    });
-    message = 'Not in the face!';
-    $('#bar').bind('click', function () {
-        alert(message);
-    });
-    var message = 'Spoon!';
-    $('#foo').bind('click', { msg: message }, function (event) {
-        alert(event.data.msg);
-    });
-    message = 'Not in the face!';
-    $('#bar').bind('click', { msg: message }, function (event) {
-        alert(event.data.msg);
-    });
-    $("p").bind("click", function (event) {
-        var str = "( " + event.pageX + ", " + event.pageY + " )";
-        $("span").text("Click happened! " + str);
-    });
-    $("p").bind("dblclick", function () {
-        $("span").text("Double-click happened in " + this.nodeName);
-    });
-    $("p").bind("mouseenter mouseleave", function (event) {
-        $(this).toggleClass("over");
-    });
-    $("p").bind("click", function () {
-        alert($(this).text());
-    });
-    function handler(event) {
-        alert(event.data.foo);
-    }
-    $("p").bind("click", { foo: "bar" }, handler)
-    $("form").bind("submit", function () { return false; })
-    $("form").bind("submit", function (event) {
-        event.preventDefault();
-    });
-    $("form").bind("submit", function (event) {
-        event.stopPropagation();
-    });
-    $("p").bind("myCustomEvent", function (e, myName?, myValue?) {
-        $(this).text(myName + ", hi there!");
-        $("span").stop().css("opacity", 1)
-        .text("myName = " + myName)
-        .fadeIn(30).fadeOut(1000);
-    });
-    $("button").click(function () {
-        $("p").trigger("myCustomEvent", ["John"]);
-    });
-    $("div.test").bind({
-        click: function () {
-            $(this).addClass("active");
-        },
-        mouseenter: function () {
-            $(this).addClass("inside");
-        },
-        mouseleave: function () {
-            $(this).removeClass("inside");
-        }
-    });
-}
-
-function test_unbind() {
-    $("#foo").unbind();
-
-    $("#foo").unbind("click");
-
-    var handler = function () {
-        alert("The quick brown fox jumps over the lazy dog.");
-    };
-    $("#foo").bind("click", handler);
-    $("#foo").unbind("click", handler);
-
-    $("#foo").bind("click", function () {
-        alert("The quick brown fox jumps over the lazy dog.");
-    });
-
-    // Will NOT work
-    $("#foo").unbind("click", function () {
-        alert("The quick brown fox jumps over the lazy dog.");
-    });
-
-    $("#foo").bind("click.myEvents", handler);
-
-    $("#foo").unbind("click");
-
-    $("#foo").unbind("click.myEvents");
-
-    $("#foo").unbind(".myEvents");
-
-    var timesClicked = 0;
-    $("#foo").bind("click", function (event) {
-        alert("The quick brown fox jumps over the lazy dog.");
-        timesClicked++;
-        if (timesClicked >= 3) {
-            $(this).unbind(event);
-        }
-    });
-
-    function aClick() {
-        $("div").show().fadeOut("slow");
-    }
-    $("#bind").click(function () {
-        $("#theone")
-            .bind("click", aClick)
-            .text("Can Click!");
-    });
-    $("#unbind").click(function () {
-        $("#theone")
-            .unbind("click", aClick)
-            .text("Does nothing...");
-    });
-
-    $("p").unbind();
-
-    $("p").unbind("click");
-
-    var foo = function () {
-        // Code to handle some kind of event
-    };
-
-    $("p").bind("click", foo); // ... Now foo will be called when paragraphs are clicked ...
-
-    $("p").unbind("click", foo); // ... foo will no longer be called.
-}
-
-function test_blur() {
-    $('#target').blur(function () {
-        alert('Handler for .blur() called.');
-    });
-    $('#other').click(function () {
-        $('#target').blur();
-
-    });
-    $("p").blur();
-}
-
-interface JQueryStatic { Topic; }
-function test_callbacks() {
-    function fn1(value) {
-        console.log(value);
-    }
-    function fn2(value) {
-        fn1("fn2 says:" + value);
-        return false;
-    }
-    var callbacks = $.Callbacks();
-    var callbacks2 = $.Callbacks("once");
-    callbacks.add(fn1);
-    callbacks.fire("foo!");
-    callbacks.add(fn2);
-    callbacks.fire("bar!");
-    callbacks.remove(fn2);
-    callbacks.fire("foobar");
-    var topics = {};
-
-    jQuery.Topic = function (id) {
-        var callbacks,
-            method,
-            topic = id && topics[id];
-        if (!topic) {
-            callbacks = jQuery.Callbacks();
-            topic = {
-                publish: callbacks.fire,
-                subscribe: callbacks.add,
-                unsubscribe: callbacks.remove
-            };
-            if (id) {
-                topics[id] = topic;
-            }
-        }
-        return topic;
-    };
-    $.Topic("mailArrived").subscribe(fn1);
-    $.Topic("mailArrived").subscribe(fn2);
-    $.Topic("mailSent").subscribe(fn1);
-    $.Topic("mailArrived").publish("hello world!");
-    $.Topic("mailSent").publish("woo! mail!");
-    $.Topic("mailArrived").subscribe(fn1);
-
-    var dfd = $.Deferred();
-    var topic = $.Topic("mailArrived");
-    dfd.done(topic.publish);
-    dfd.resolve("its been published!");
-}
-
-function test_callbacksFunctions() {
-    var foo = function (value) {
-        console.log('foo:' + value);
-    }
-    var bar = function (value) {
-        console.log('bar:' + value);
-    }
-    var callbacks = $.Callbacks();
-    callbacks.add(foo);
-    callbacks.fire('hello');
-    callbacks.add(bar);
-    callbacks.fire('world');
-    callbacks.disable();
-
-    // Test the disabled state of the list
-    console.log(callbacks.disabled());
-    // Outputs: true
-
-    callbacks.empty();
-    callbacks.fire('hello');
-    console.log(callbacks.fired());
-    callbacks.fireWith(window, ['foo', 'bar']);
-    var foo2 = function (value1, value2) {
-        console.log('Received:' + value1 + ',' + value2);
-    };
-    console.log(callbacks.has(foo2));
-    callbacks.lock();
-    console.log(callbacks.locked());
-    callbacks.remove(foo);
-}
-
-function test_change() {
-    $('.target').change(function () {
-        alert('Handler for .change() called.');
-    });
-    $('#other').click(function () {
-        $('.target').change();
-    });
-    $("input[type='text']").change(function () { });
-    $("input[type='text']").change();
-}
-
-function test_children() {
-    $('ul.level-2').children().css('background-color', 'red');
-    $("#container").click(function (e) {
-        $("*").removeClass("hilite");
-        var $kids = $(e.target).children();
-        var len = $kids.addClass("hilite").length;
-
-        $("#results span:first").text(len);
-        //$("#results span:last").text(e.target.tagName);
-
-        e.preventDefault();
-        return false;
-    });
-    $("div").children(".selected").css("color", "blue");
-}
-
-function test_clearQueue() {
-    $("#start").click(function () {
-        var myDiv = $("div");
-        myDiv.show("slow");
-        myDiv.animate({ left: '+=200' }, 5000);
-        myDiv.queue(function () {
-            var _this = $(this);
-            _this.addClass("newcolor");
-            _this.dequeue();
-        });
-        myDiv.animate({ left: '-=200' }, 1500);
-        myDiv.queue(function () {
-            var _this = $(this);
-            _this.removeClass("newcolor");
-            _this.dequeue();
-        });
-        myDiv.slideUp();
-
-    });
-    $("#stop").click(function () {
-        var myDiv = $("div");
-        myDiv.clearQueue();
-        myDiv.stop();
-    });
-}
-
-function test_click() {
-    $("#target").click(function () {
-        alert("Handler for .click() called.");
-    });
-    $("#other").click(function () {
-        $("#target").click();
-    });
-    $("p").click(function () {
-        $(this).slideUp();
-    });
-    $("p").click();
-}
-
-function test_submit() {
-    $("#target").submit(function () {
-        alert("Handler for .submit() called.");
-    });
-    $("#target").submit();
-}
-
-function test_trigger() {
-
-    $("#foo").on("click", function () {
-        alert($(this).text());
-    });
-    $("#foo").trigger("click");
-
-    $("#foo").on("custom", function (event, param1?, param2?) {
-        alert(param1 + "\n" + param2);
-    });
-    $("#foo").trigger("custom", ["Custom", "Event"]);
-
-    $("button:first").click(function () {
-        update($("span:first"));
-    });
-
-    $("button:last").click(function () {
-        $("button:first").trigger("click");
-        update($("span:last"));
-    });
-
-    function update(j) {
-        var n = parseInt(j.text(), 10);
-        j.text(n + 1);
+function JQuery() {
+    function type_assertion() {
+        const $el = $(document.createElement('canvas'));
+        const $canvas = $el as JQuery<HTMLCanvasElement>;
     }
 
-    $("form:first").trigger("submit");
-
-    var event = jQuery.Event("submit");
-    $("form:first").trigger(event);
-    if (event.isDefaultPrevented()) {
-        // Perform an action...
-    }
-
-    $("p")
-        .click(function (event, a, b) {
-            // When a normal click fires, a and b are undefined
-            // for a trigger like below a refers to "foo" and b refers to "bar"
-        })
-        .trigger("click", ["foo", "bar"]);
-
-    var event = jQuery.Event("logged");
-    (<any>event).user = "foo";
-    (<any>event).pass = "bar";
-    $("body").trigger(event);
-
-    // Adapted from jQuery documentation which may be wrong on this occasion
-    var event2 = jQuery.Event("logged");
-    $("body").trigger(event2, {
-        type: "logged",
-        user: "foo",
-        pass: "bar"
-    });
-}
-
-function test_clone() {
-    $('.hello').clone().appendTo('.goodbye');
-    var $elem = $('#elem').data({ "arr": [1] }),
-        $clone = $elem.clone(true)
-        .data("arr", $.extend([], $elem.data("arr")));
-    $("b").clone().prependTo("p");
-    $('#copy').append($('#orig .elem')
-          .clone()
-          .children('a')
-          .prepend('foo - ')
-          .parent()
-          .clone());
-}
-
-function test_prepend() {
-    $('.inner').prepend('<p>Test</p>');
-    $('.container').prepend($('h2')).prepend(document.createDocumentFragment());
-
-    var $newdiv1 = $('<div id="object1"/>'),
-        newdiv2 = document.createElement('div'),
-        existingdiv1 = document.getElementById('foo');
-
-    $('body').prepend($newdiv1, [newdiv2, existingdiv1]);
-}
-
-function test_prependTo() {
-    $("<p>Test</p>").prependTo(".inner");
-    $("h2").prependTo($(".container"));
-    $("span").prependTo("#foo");
-}
-
-function test_closest() {
-    $('li.item-a').closest('ul')
-        .css('background-color', 'red');
-    $('li.item-a').closest('li')
-        .css('background-color', 'red');
-    var listItemII = document.getElementById('ii');
-    $('li.item-a').closest('ul', listItemII)
-        .css('background-color', 'red');
-    $('li.item-a').closest('#one', listItemII)
-        .css('background-color', 'green');
-    $(document).bind("click", function (e) {
-        $(e.target).closest("li").toggleClass("hilight");
-    });
-    var $listElements = $("li").css("color", "blue");
-    $(document).bind("click", function (e) {
-        //$(e.target).closest($listElements).toggleClass("hilight");
-    });
-}
-
-function test_contains() {
-    jQuery.contains(document.documentElement, document.body);
-    jQuery.contains(document.body, document.documentElement);
-}
-
-function test_contents() {
-    $('.container').contents().filter(function () {
-        return this.nodeType == 3;
-    })
-    .wrap('<p></p>')
-    .end()
-    .filter('br')
-    .remove();
-    $("#frameDemo").contents().find("a").css("background-color", "#BADA55");
-}
-
-function test_context() {
-    $("ul")
-        .append("<li>" + $("ul").context + "</li>")
-        .append("<li>" + $("ul", document.body).context.nodeName + "</li>");
-}
-
-function test_css() {
-    $("div").click(function () {
-        var color = $(this).css("background-color");
-        $("#result").html("That div is <span style='color:" + color + ";'>" + color + "</span>.");
-    });
-    $('div.example').css('width', function (index) {
-        return index * 50;
-    });
-    $("p").mouseover(function () {
-        $(this).css("color", "red");
-    });
-    $("#box").one("click", function () {
-        $(this).css("width", "+=200");
-    });
-    var words = $("p:first").text().split(" ");
-    var text = words.join("</span> <span>");
-    $("p:first").html("<span>" + text + "</span>");
-    $("span").click(function () {
-        $(this).css("background-color", "yellow");
-    });
-    $("p").hover(function () {
-        $(this).css({ 'background-color': 'yellow', 'font-weight': 'bolder' });
-    }, function () {
-        var cssObj = {
-            'background-color': '#ddd',
-            'font-weight': '',
-            'color': 'rgb(0,40,244)'
+    function iterable() {
+        for (const a of $('div')) {
+            a.textContent = 'myDiv';
         }
-        $(this).css(cssObj);
-    });
-    $("div").click(function () {
-        $(this).css({
-            width: function (index, value) {
-                return parseFloat(value) * 1.2;
-            },
-            height: function (index, value) {
-                return parseFloat(value) * 1.2;
-            }
-        });
-    });
-    var dims = $("#box").css([ "width", "height", "backgroundColor" ]);
-}
-
-function test_cssHooks() {
-    if (!$.cssHooks) {
-        throw ("jQuery 1.4.3 or above is required for this plugin to work");
-    }
-    $.cssHooks["someCSSProp"] = {
-        get: function (elem, computed, extra) { },
-        set: function (elem, value) { }
-    };
-    function styleSupport(prop) {
-        var vendorProp, supportedProp,
-            capProp = prop.charAt(0).toUpperCase() + prop.slice(1),
-            prefixes = ["Moz", "Webkit", "O", "ms"],
-            div = document.createElement("div");
-
-        if (prop in div.style) {
-            supportedProp = prop;
-        } else {
-            for (var i = 0; i < prefixes.length; i++) {
-                vendorProp = prefixes[i] + capProp;
-                if (vendorProp in div.style) {
-                    supportedProp = vendorProp;
-                    break;
-                }
-            }
-        }
-        div = null;
-        $.support[prop] = supportedProp;
-        return supportedProp;
-    }
-    styleSupport("borderRadius");
-
-    $.cssNumber["someCSSProp"] = true;
-    $.fx.step["someCSSProp"] = function (fx) {
-        $.cssHooks["someCSSProp"].set(fx.elem, fx.now + fx.unit);
-    };
-}
-
-function test_data() {
-    $('body').data('foo', 52);
-    $('body').data('bar', { myType: 'test', count: 40 });
-    $('body').data('foo');
-    $('body').data();
-    $("div").data("test", { first: 16, last: "pizza!" });
-    $("span:first").text($("div").data("test").first);
-    $("span:last").text($("div").data("test").last);
-    alert($('body').data('foo'));
-    alert($('body').data());
-    alert($("body").data("foo"));
-    $("body").data("bar", "foobar");
-    alert($("body").data("bar"));
-    $("div").data("role") === "page";
-    $("div").data("lastValue") === 43;
-    $("div").data("hidden") === true;
-    $("div").data("options").name === "John";
-    var value;
-    switch ($("button").index(this)) {
-        case 0:
-            value = $("div").data("blah");
-            break;
-        case 1:
-            $("div").data("blah", "hello");
-            value = "Stored!";
-            break;
-        case 2:
-            $("div").data("blah", 86);
-            value = "Stored!";
-            break;
-        case 3:
-            $("div").removeData("blah");
-            value = "Removed!";
-            break;
-    }
-    $("span").text("" + value);
-    jQuery.data(document.body, 'foo', 52);
-    jQuery.data(document.body, 'bar', 'test');
-    var div = $("div")[0];
-    jQuery.data(div, "test", { first: 16, last: "pizza!" });
-    $("span:first").text(jQuery.data(div, "test").first);
-    $("span:last").text(jQuery.data(div, "test").last);
-    $.data(document.getElementById("id"), "", 8).toFixed(2);
-    $.data(document.getElementById("id"), "", "8").toUpperCase();
-}
-
-function test_removeData() {
-    $("span:eq(0)").text("" + $("div").data("test1"));
-    $("div").data("test1", "VALUE-1");
-    $("div").data("test2", "VALUE-2");
-    $("span:eq(1)").text("" + $("div").data("test1"));
-    $("div").removeData("test1");
-    $("span:eq(2)").text("" + $("div").data("test1"));
-    $("span:eq(3)").text("" + $("div").data("test2"));
-}
-
-function test_jQuery_removeData() {
-    var div = $("div")[0];
-    $("span:eq(0)").text("" + $("div").data("test1"));
-    jQuery.data(div, "test1", "VALUE-1");
-    jQuery.data(div, "test2", "VALUE-2");
-    $("span:eq(1)").text("" + jQuery.data(div, "test1"));
-    jQuery.removeData(div, "test1");
-    $("span:eq(2)").text("" + jQuery.data(div, "test1"));
-    $("span:eq(3)").text("" + jQuery.data(div, "test2"));
-}
-
-function test_removeDataAll() {
-    var el = $("div");
-    el.data("test1", "VALUE-1");
-    el.data("test2", "VALUE-2");
-    el.removeData();
-}
-
-function test_dblclick() {
-    $('#target').dblclick(function () {
-        alert('Handler for .dblclick() called.');
-    });
-    $('#other').click(function () {
-        $('#target').dblclick();
-    });
-    $("p").dblclick(function () { alert("Hello World!"); });
-    var divdbl = $("div:first");
-    divdbl.dblclick(function () {
-        divdbl.toggleClass('dbl');
-    });
-	$('#target').dblclick();
-}
-
-function test_delay() {
-    $('#foo').slideUp(300).delay(800).fadeIn(400);
-    $("button").click(function () {
-        $("div.first").slideUp(300).delay(800).fadeIn(400);
-        $("div.second").slideUp(300).fadeIn(400);
-    });
-}
-
-function test_delegate() {
-    $("table").delegate("td", "click", function () {
-        $(this).toggleClass("chosen");
-    });
-    $("table").on("click", "td", function () {
-        $(this).toggleClass("chosen");
-    });
-    $("body").delegate("p", "click", function () {
-        $(this).after("<p>Another paragraph!</p>");
-    });
-    $("body").delegate("p", "click", function () {
-        alert($(this).text());
-    });
-    $("body").delegate("a", "click", function () { return false; });
-    $("body").delegate("a", "click", function (event) {
-        event.preventDefault();
-    });
-    $("body").delegate("p", "myCustomEvent", function (e, myName?, myValue?) {
-        $(this).text("Hi there!");
-        $("span").stop().css("opacity", 1)
-                 .text("myName = " + myName)
-                 .fadeIn(30).fadeOut(1000);
-    });
-    $("button").click(function () {
-        $("p").trigger("myCustomEvent");
-    });
-}
-
-function test_undelegate() {
-    function aClick() {
-        $("div").show().fadeOut("slow");
-    }
-    $("#bind").click(function () {
-        $("body")
-            .delegate("#theone", "click", aClick)
-            .find("#theone").text("Can Click!");
-    });
-    $("#unbind").click(function () {
-        $("body")
-            .undelegate("#theone", "click", aClick)
-            .find("#theone").text("Does nothing...");
-    });
-
-    $("p").undelegate();
-
-    $("p").undelegate("click");
-
-    var foo = function () {
-        // Code to handle some kind of event
-    };
-
-    // ... Now foo will be called when paragraphs are clicked ...
-    $("body").delegate("p", "click", foo);
-
-    // ... foo will no longer be called.
-    $("body").undelegate("p", "click", foo);
-
-    var foo = function () {
-        // Code to handle some kind of event
-    };
-
-    // Delegate events under the ".whatever" namespace
-    $("form").delegate(":button", "click.whatever", foo);
-
-    $("form").delegate("input[type='text'] ", "keypress.whatever", foo);
-
-    // Unbind all events delegated under the ".whatever" namespace
-    $("form").undelegate(".whatever");
-}
-
-function test_dequeue() {
-    $("button").click(function () {
-        $("div").animate({ left: '+=200px' }, 2000);
-        $("div").animate({ top: '0px' }, 600);
-        $("div").queue(function () {
-            $(this).toggleClass("red");
-            $(this).dequeue();
-        });
-        $("div").animate({ left: '10px', top: '30px' }, 700);
-    });
-}
-
-function test_queue() {
-
-    $("#show").click(function () {
-        var n = jQuery.queue($("div")[0], "fx");
-        $("span").text("Queue length is: " + n.length);
-    });
-
-    function runIt() {
-        $("div")
-            .show("slow")
-            .animate({
-                left: "+=200"
-            }, 2000)
-            .slideToggle(1000)
-            .slideToggle("fast")
-            .animate({
-                left: "-=200"
-            }, 1500)
-            .hide("slow")
-            .show(1200)
-            .slideUp("normal", runIt);
     }
 
-    runIt();
+    function arrayLike() {
+        $('div')[0] === new HTMLElement();
+    }
 
-    $(document.body).click(function () {
-        var divs = $("div")
-            .show("slow")
-            .animate({ left: "+=200" }, 2000);
-        jQuery.queue(divs[0], "fx", function () {
-            $(this).addClass("newcolor");
-            jQuery.dequeue(this);
-        });
-        divs.animate({ left: "-=200" }, 500);
-        jQuery.queue(divs[0], "fx", function () {
-            $(this).removeClass("newcolor");
-            jQuery.dequeue(this);
-        });
-        divs.slideUp();
-    });
+    function ajax() {
+        function ajaxComplete() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxComplete(function(event, jqXHR, ajaxOptions) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
 
-    $("#start").click(function () {
-        var divs = $("div")
-            .show("slow")
-            .animate({ left: "+=200" }, 5000);
-        jQuery.queue(divs[0], "fx", function () {
-            $(this).addClass("newcolor");
-            jQuery.dequeue(this);
-        });
-        divs.animate({ left: "-=200" }, 1500);
-        jQuery.queue(divs[0], "fx", function () {
-            $(this).removeClass("newcolor");
-            jQuery.dequeue(this);
-        });
-        divs.slideUp();
-    });
-    $("#stop").click(function () {
-        jQuery.queue($("div")[0], "fx", []);
-        $("div").stop();
-    });
-}
-
-function test_detach() {
-    $("p").click(function () {
-        $(this).toggleClass("off");
-    });
-    var p;
-    $("button").click(function () {
-        if (p) {
-            p.appendTo("body");
-            p = null;
-        } else {
-            p = $("p").detach();
-        }
-    });
-}
-
-function test_each() {
-    var numArray: number[];
-    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
-        alert(index + ': ' + value);
-    });
-    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
-        alert(index + ': ' + value);
-        return value < 2;
-    });
-
-    var res: {one: number, 2: string};
-    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
-        alert(key + ': ' + value);
-    });
-    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
-        alert(key + ': ' + value);
-        return key === "2";
-    });
-
-    var map = {
-        'flammable': 'inflammable',
-        'duh': 'no duh'
-    };
-    $.each(map, function (key, value) {
-        alert(key + ': ' + value);
-    });
-    var arr = ["one", "two", "three", "four", "five"];
-    var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
-    jQuery.each(arr, function () {
-        $("#" + this).text("Mine is " + this + ".");
-        return (this != "three");
-    });
-    jQuery.each(obj, function (i, val) {
-        $("#" + i).append(document.createTextNode(" - " + val));
-    });
-    $.each(['a', 'b', 'c'], function (i, l) {
-        alert("Index #" + i + ": " + l);
-    });
-    $.each({ name: "John", lang: "JS" }, function (k, v) {
-        alert("Key: " + k + ", Value: " + v);
-    });
-    $.each([{a: 1}, {a: 2}, {a: 3}], function (i, o) {
-        alert("Index #" + i + ": " + o.a);
-    });
-    $('li').each(function (index) {
-        alert(index + ': ' + $(this).text());
-    });
-    $(document.body).click(function () {
-        $("div").each(function (i) {
-            if (this.style.color != "blue") {
-                this.style.color = "blue";
-            } else {
-                this.style.color = "";
-            }
-        });
-    });
-    $("span").click(function () {
-        $("li").each(function () {
-            $(this).toggleClass("example");
-        });
-    });
-    $("button").click(function () {
-        $("div").each(function (index, domEle) {
-            // domEle == this
-            $(domEle).css("backgroundColor", "yellow");
-            if ($(this).is("#stop")) {
-                $("span").text("Stopped at div index #" + index);
                 return false;
-            }
-        });
-    });
-}
-
-function test_empty() {
-    $('.hello').empty();
-}
-
-function test_end() {
-    $('ul.first').find('.foo').css('background-color', 'red')
-        .end().find('.bar').css('background-color', 'green');
-    $('ul.first').find('.foo')
-        .css('background-color', 'red')
-        .end().find('.bar')
-        .css('background-color', 'green')
-        .end();
-}
-
-function test_eq() {
-    $('li').eq(2).css('background-color', 'red');
-    $('li').eq(-2).css('background-color', 'red');
-    $('li').eq(5).css('background-color', 'red');
-    $("body").find("div").eq(2).addClass("blue");
-}
-
-function test_error() {
-    $('#book')
-        .error(function () {
-            alert('Handler for .error() called.')
-        })
-        .attr("src", "missing.png");
-    $("img")
-        .error(function () {
-            $(this).hide();
-        })
-        .attr("src", "missing.png");
-    jQuery.error("Oups");
-    jQuery.error = (message?: string) => {
-        console.error(message); return this;
-    };
-}
-
-function test_eventParams() {
-    $("p").click(function (event) {
-        event.currentTarget === this;
-    });
-    $(".box").on("click", "button", function (event) {
-        $(event.delegateTarget).css("background-color", "red");
-    });
-    $("a").click(function (event) {
-        event.isDefaultPrevented();
-        event.preventDefault();
-        event.isDefaultPrevented();
-    });
-    function immediatePropStopped(e) {
-        var msg = "";
-        if (e.isImmediatePropagationStopped()) {
-            msg = "called"
-        } else {
-            msg = "not called";
-        }
-        $("#stop-log").append("<div>" + msg + "</div>");
-    }
-    $("button").click(function (event) {
-        immediatePropStopped(event);
-        event.stopImmediatePropagation();
-        immediatePropStopped(event);
-    });
-    function propStopped(e) {
-        var msg = "";
-        if (e.isPropagationStopped()) {
-            msg = "called";
-        } else {
-            msg = "not called";
-        }
-        $("#stop-log").append("<div>" + msg + "</div>");
-    }
-    $("button").click(function (event) {
-        propStopped(event);
-        event.stopPropagation();
-        propStopped(event);
-    });
-    $("p").bind("test.something", function (event) {
-        alert(event.namespace);
-    });
-    $("button").click(function (event) {
-        $("p").trigger("test.something");
-    });
-    $(document).bind('mousemove', function (e) {
-        $("#log").text("e.pageX: " + e.pageX + ", e.pageY: " + e.pageY);
-    });
-    $("a").click(function (event) {
-        event.preventDefault();
-        $('<div/>')
-            .append('default ' + event.type + ' prevented')
-            .appendTo('#log');
-    });
-    $("a").mouseout(function (event) {
-        alert(event.relatedTarget.nodeName);
-    });
-    $("button").click(function (event) {
-        return "hey";
-    });
-    $("button").click(function (event) {
-        $("p").html(event.result);
-    });
-    $("p").click(function (event) {
-        event.stopImmediatePropagation();
-    });
-    $("p").click(function (event) {
-        $(this).css("background-color", "#f00");
-    });
-    $("div").click(function (event) {
-        $(this).css("background-color", "#f00");
-    });
-    $("p").click(function (event) {
-        event.stopPropagation();
-    });
-    $("body").click(function (event) {
-        //bugfix, duplicate identifier.  see: http://stackoverflow.com/questions/14824143/duplicate-identifier-nodename-in-jquery-d-ts
-        //$("#log").html("clicked: " + event.target.nodeName);
-    });
-    $('#whichkey').bind('keydown', function (e) {
-        $('#log').html(e.type + ': ' + e.which);
-    });
-    $('#whichkey').bind('mousedown', function (e) {
-        $('#log').html(e.type + ': ' + e.which);
-    });
-    $(window).on('mousewheel', (e) => {
-        var delta = (<WheelEvent>e.originalEvent).deltaY;
-    });
-    $( "p" ).click(function( event ) {
-      alert( event.currentTarget === this ); // true
-    });
-}
-
-function test_extend() {
-    var object1 = {
-        apple: 0,
-        banana: { weight: 52, price: 100 },
-        cherry: 97
-    };
-    var object2 = {
-        banana: { price: 200 },
-        durian: 100
-    };
-    $.extend(object1, object2);
-    var printObj = typeof JSON != "undefined" ? JSON.stringify : function (obj) {
-        var arr = [];
-        $.each(obj, function (key, val) {
-            var next = key + ": ";
-            next += $.isPlainObject(val) ? printObj(val) : val;
-            arr.push(next);
-        });
-        return "{ " + arr.join(", ") + " }";
-    };
-    $("#log").append(printObj(object1));
-
-    var defaults = { validate: false, limit: 5, name: "foo" };
-    var options = { validate: true, name: "bar" };
-    var settings: typeof defaults = $.extend({}, defaults, options);
-}
-
-function test_fadeIn() {
-    $('#clickme').click(function () {
-        $('#book').fadeIn('slow', function () { });
-    });
-    $(document.body).click(function () {
-        $("div:hidden:first").fadeIn("slow");
-    });
-    $("a").click(function () {
-        $("div").fadeIn(3000, function () {
-            $("span").fadeIn(100);
-        });
-        return false;
-    });
-}
-
-function test_fadeOut() {
-    $('#clickme').click(function () {
-        $('#book').fadeOut('slow', function () { });
-    });
-    $("p").click(function () {
-        $("p").fadeOut("slow");
-    });
-    $("span").click(function () {
-        $(this).fadeOut(1000, function () {
-            $("div").text("'" + $(this).text() + "' has faded!");
-            $(this).remove();
-        });
-    });
-    $("span").hover(function () {
-        $(this).addClass("hilite");
-    }, function () {
-        $(this).removeClass("hilite");
-    });
-    $("#btn1").click(function () {
-        function complete() {
-            $("<div/>").text(this.id).appendTo("#log");
-        }
-        $("#box1").fadeOut(1600, "linear", complete);
-        $("#box2").fadeOut(1600, complete);
-    });
-    $("#btn2").click(function () {
-        $("div").show();
-        $("#log").empty();
-    });
-}
-
-function test_fadeTo() {
-    $('#clickme').click(function () {
-        $('#book').fadeTo('slow', 0.5, function () { });
-    });
-    $("p:first").click(function () {
-        $(this).fadeTo("slow", 0.33);
-    });
-    $("div").click(function () {
-        $(this).fadeTo("fast", Math.random());
-    });
-    var getPos = function (n) {
-        return (Math.floor(n) * 90) + "px";
-    };
-    $("p").each(function (n) {
-        var r = Math.floor(Math.random() * 3);
-        var tmp = $(this).text();
-        $(this).text($("p:eq(" + r + ")").text());
-        $("p:eq(" + r + ")").text(tmp);
-        $(this).css("left", getPos(n));
-    });
-    $("div").each(function (n) {
-        $(this).css("left", getPos(n));
-    })
-    .css("cursor", "pointer")
-    .click(function () {
-        $(this).fadeTo(250, 0.25, function () {
-            $(this).css("cursor", "")
-                   .prev().css({
-                       "font-weight": "bolder",
-                       "font-style": "italic"
-                   });
-        });
-    });
-}
-
-function test_fadeToggle() {
-    $("button:first").click(function () {
-        $("p:first").fadeToggle("slow", "linear");
-    });
-    $("button:last").click(function () {
-        $("p:last").fadeToggle("fast", function () {
-            $("#log").append("<div>finished</div>");
-        });
-    });
-}
-
-function test_filter() {
-    $('li').filter(':even').css('background-color', 'red');
-    $('li').filter(function (index) {
-        return index % 3 === 2;
-    }).css('background-color', 'red');
-    $("div").css("background", "#b4b0da")
-        .filter(function (index) {
-            return index === 1 || $(this).attr("id") === "fourth";
-        })
-        .css("border", "3px double red");
-    $("div").filter(document.getElementById("unique"));
-    $("div").filter($("#unique"));
-}
-
-function test_find() {
-    $('li.item-ii').find('li').css('background-color', 'red');
-    var item1 = $('li.item-1')[0];
-    $('li.item-ii').find(item1).css('background-color', 'red');
-    var $spans = $('span');
-    $("p").find($spans).css('color', 'red');
-    var newText = $("p").text().split(" ").join("</span> <span>");
-    newText = "<span>" + newText + "</span>";
-    $("p").html(newText)
-        .find('span')
-        .hover(function () {
-            $(this).addClass("hilite");
-        },
-        function () {
-            $(this).removeClass("hilite");
-        })
-    .end()
-        .find(":contains('t')")
-        .css({ "font-style": "italic", "font-weight": "bolder" });
-}
-
-function test_finish() {
-    $(".box").finish();
-}
-
-function test_first() {
-    $('li').first().css('background-color', 'red');
-}
-
-function test_focus() {
-    $('#target').focus(function () {
-        alert('Handler for .focus() called.');
-    });
-    $('#other').click(function () {
-        $('#target').focus();
-    });
-    $("input").focus(function () {
-        $(this).next("span").css('display', 'inline').fadeOut(1000);
-    });
-    $("input[type=text]").focus(function () {
-        $(this).blur();
-    });
-    $(document).ready(function () {
-        $("#login").focus();
-    });
-}
-
-function test_focusin() {
-    $("p").focusin(function () {
-        $(this).find("span").css('display', 'inline').fadeOut(1000);
-    });
-}
-
-function test_focusout() {
-    var fo = 0, b = 0;
-    $("p").focusout(function () {
-        fo++;
-        $("#fo")
-            .text("focusout fired: " + fo + "x");
-    }).blur(function () {
-        b++;
-        $("#b")
-            .text("blur fired: " + b + "x");
-    });
-}
-
-function test_easing() {
-    const easing = jQuery.easing;
-
-    function test_easing_function( name: string, fn: JQueryEasingFunction ) {
-        const step = Math.pow( 2, -3 ); // use power of 2 to prevent floating point rounding error
-        for( let i = 0; i <= 1; i += step ) {
-            console.log( `$.easing.${name}(${i}): ${fn.call(easing, i)}` );
-        }
-    }
-
-    test_easing_function( "linear", easing.linear );
-    test_easing_function( "swing", easing.swing );
-}
-
-function test_fx() {
-    jQuery.fx.interval = 100;
-    $("input").click(function () {
-        $("div").toggle(3000);
-    });
-    var toggleFx = function () {
-        $.fx.off = !$.fx.off;
-    };
-    toggleFx();
-    $("button").click(toggleFx)
-    $("input").click(function () {
-        $("div").toggle("slow");
-    });
-}
-
-function test_get() {
-    $.get('ajax/test.html', function (data) {
-        $('.result').html(data);
-        alert('Load was performed.');
-    });
-    var jqxhr = $.get("example.php", function () {
-        alert("success");
-    })
-    .done(function () { alert("second success"); })
-    .fail(function () { alert("error"); });
-
-    $.get("test.php");
-    $.get("test.php", { name: "John", time: "2pm" });
-    $.get("test.php", { 'choices[]': ["Jon", "Susan"] });
-    $.get("test.php", function (data) {
-        alert("Data Loaded: " + data);
-    });
-    $.get("test.cgi", { name: "John", time: "2pm" },
-        function (data) {
-            alert("Data Loaded: " + data);
-        });
-    $.get("test.php",
-       function (data) {
-           $('body').append("Name: " + data.name)
-                    .append("Time: " + data.time);
-       }, "json");
-    alert($('li').get());
-    $('li').get(0);
-    $('li')[0];
-    alert($('li').get(-1));
-    function disp(divs) {
-        var a = [];
-        for (var i = 0; i < divs.length; i++) {
-            a.push(divs[i].innerHTML);
-        }
-        $("span").text(a.join(" "));
-    }
-    disp($("div").get().reverse());
-    $("*", document.body).click(function (e) {
-        e.stopPropagation();
-        var domEl = $(this).get(0);
-        $("span:first").text("Clicked on - " + domEl.tagName);
-    });
-}
-
-function test_getJSON() {
-    $.getJSON('ajax/test.json', function (data) {
-        var items = [];
-        $.each(data, function (key, val) {
-            items.push('<li id="' + key + '">' + val + '</li>');
-        });
-        $('<ul/>', {
-            'class': 'my-new-list',
-            html: items.join('')
-        }).appendTo('body');
-    });
-    var jqxhr = $.getJSON("example.json", function () {
-        alert("success");
-    })
-    .done(function () { alert("second success"); })
-    .fail(function () { alert("error"); });
-    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?jsoncallback=?",
-    {
-        tags: "mount rainier",
-        tagmode: "any",
-        format: "json"
-    },
-    function (data) {
-        $.each(data.items, function (i, item) {
-            $("<img/>").attr("src", item.media.m).appendTo("#images");
-            if (i === "3") return false;
-        });
-    });
-    $.getJSON("test.js", function (json) {
-        alert("JSON Data: " + json.users[3].name);
-    });
-    $.getJSON("test.js", { name: "John", time: "2pm" }, function (json) {
-        alert("JSON Data: " + json.users[3].name);
-    });
-}
-
-function test_getScript() {
-    $.getScript("ajax/test.js", function (data, textStatus, jqxhr) {
-        console.log(data);
-        console.log(textStatus);
-        console.log(jqxhr.status);
-        console.log('Load was performed.');
-    });
-    $.getScript("ajax/test.js")
-        .done(function (script, textStatus) {
-            console.log(textStatus);
-        })
-        .fail(function (jqxhr, settings, exception) {
-            $("div.log").text("Triggered ajaxError handler.");
-        });
-    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
-        if (settings.dataType == 'script') {
-            $(this).text("Triggered ajaxError handler.");
-        }
-    });
-    $.ajaxSetup({
-        cache: true
-    });
-    $.getScript("/scripts/jquery.color.js", function () {
-        $("#go").click(function () {
-            $(".block").animate({ backgroundColor: "pink" }, 1000)
-              .delay(500)
-              .animate({ backgroundColor: "blue" }, 1000);
-        });
-    });
-}
-
-function test_jQueryget() {
-    console.log($("li").get(0));
-    console.log($("li")[0]);
-    console.log($("li").get(-1));
-    $("*", document.body).click(function (event) {
-        event.stopPropagation();
-        var domElement = $(this).get(0);
-        $("span:first").text("Clicked on - " + domElement.nodeName);
-    });
-
-    function display(divs) {
-        var a = [];
-        for (var i = 0; i < divs.length; i++) {
-            a.push(divs[i].innerHTML);
-        }
-        $("span").text(a.join(" "));
-    }
-    display($("div").get().reverse());
-}
-
-function test_globalEval() {
-    jQuery.globalEval("var newVar = true;");
-}
-
-function test_grep() {
-    var arr = [1, 9, 3, 8, 6, 1, 5, 9, 4, 7, 3, 8, 6, 9, 1];
-    $("div").text(arr.join(", "));
-    arr = jQuery.grep(arr, function (n, i) {
-        return (n != 5 && i > 4);
-    });
-    $("p").text(arr.join(", "));
-    var arr2 = jQuery.grep(arr, function (a) { return a != 9; });
-    $("span").text(arr.join(", "));
-    $.grep([0, 1, 2], function (n, i) {
-        return n > 0;
-    }, true);
-    var arr3 = $.grep(["a", "b", "c"], function (n, i) { return n !== "b"; });
-}
-
-function test_has() {
-    $('li').has('ul').css('background-color', 'red');
-    $("ul").append("<li>" + ($("ul").has("li").length ? "Yes" : "No") + "</li>");
-    $("ul").has("li").addClass("full");
-}
-
-function test_hasClass() {
-    $('#mydiv').hasClass('foo');
-    $("div#result1").append($("p:first").hasClass("selected").toString());
-    $("div#result2").append($("p:last").hasClass("selected").toString());
-    $("div#result3").append($("p").hasClass("selected").toString());
-}
-
-function test_hasData() {
-    var $p = jQuery("p"), p = $p[0];
-    $p.append(jQuery.hasData(p) + " ");
-    $.data(p, "testing", 123);
-    $p.append(jQuery.hasData(p) + " ");
-    $.removeData(p, "testing");
-    $p.append(jQuery.hasData(p) + " ");
-    $p.on('click', function () { });
-    $p.append(jQuery.hasData(p) + " ");
-    $p.off('click');
-    $p.append(jQuery.hasData(p) + " ");
-}
-
-function test_jQuery_proxy() {
-
-    function test1() {
-        var me = {
-            type: "zombie",
-            test: function (event?) {
-                // Without proxy, `this` would refer to the event target
-                // use event.target to reference that element.
-                var element = event.target;
-                $(element).css("background-color", "red");
-
-                // With proxy, `this` refers to the me object encapsulating
-                // this function.
-                $("#log").append("Hello " + this.type + "<br>");
-                $("#test").off("click", this.test);
-            }
-        };
-
-        var you = {
-            type: "person",
-            test: function (event?) {
-                $("#log").append(this.type + " ");
-            }
-        };
-
-        // Execute you.test() in the context of the `you` object
-        // no matter where it is called
-        // i.e. the `this` keyword will refer to `you`
-        var youClick = $.proxy(you.test, you);
-
-        // attach click handlers to #test
-        $("#test")
-        // this === "zombie"; handler unbound after first click
-            .on("click", $.proxy(me.test, me))
-
-        // this === "person"
-            .on("click", youClick)
-
-        // this === "zombie"
-            .on("click", $.proxy(you.test, me))
-
-        // this === "<button> element"
-            .on("click", you.test);
-    }
-
-    function test2() {
-        var obj = {
-            name: "John",
-            test: function () {
-                $("#log").append(this.name);
-                $("#test").off("click", obj.test);
-            }
-        };
-        $("#test").on("click", jQuery.proxy(obj, "test"));
-    }
-
-    function test3() {
-        var me = {
-            // I'm a dog
-            type: "dog",
-
-            // Note that event comes *after* one and two
-            test: function (one?, two?, event?) {
-                $("#log")
-
-                // `one` maps to `you`, the 1st additional
-                // argument in the $.proxy function call
-                    .append("<h3>Hello " + one.type + ":</h3>")
-
-                // The `this` keyword refers to `me`
-                // (the 2nd, context, argument of $.proxy)
-                    .append("I am a " + this.type + ", ")
-
-                // `two` maps to `they`, the 2nd additional
-                // argument in the $.proxy function call
-                    .append("and they are " + two.type + ".<br>")
-
-                // The event type is "click"
-                    .append("Thanks for " + event.type + "ing.")
-
-                // The clicked element is `event.target`,
-                // and its type is "button"
-                    .append("the " + event.target.type + ".");
-            }
-        };
-
-        var you = { type: "cat" };
-        var they = { type: "fish" };
-
-        // Set up handler to execute me.test() in the context
-        // of `me`, with `you` and `they` as additional arguments
-        var proxy = $.proxy(me.test, me, you, they);
-
-        $("#test")
-            .on("click", proxy);
-    }
-}
-
-function test_height() {
-    $(window).height();
-    $(document).height();
-    function showHeight(ele, h) {
-        $("div").text("The height for the " + ele + " is " + h + "px.");
-    }
-    $("#getp").click(function () {
-        showHeight("paragraph", $("p").height());
-    });
-    $("#getd").click(function () {
-        showHeight("document", $(document).height());
-    });
-    $("#getw").click(function () {
-        showHeight("window", $(window).height());
-    });
-    $("div").one('click', function () {
-        $(this).height(30)
-               .css({ cursor: "auto", backgroundColor: "green" });
-    });
-}
-
-function test_wrap() {
-    $(".inner").wrap("<div class='new'></div>");
-    $(".inner").wrap(function () {
-        return "<div class='" + $(this).text() + "'></div>";
-    });
-    $("span").wrap("<div><div><p><em><b></b></em></p></div></div>");
-    $("p").wrap(document.createElement("div"));
-    $("p").wrap($(".doublediv"));
-}
-
-function test_wrapAll() {
-    $(".inner").wrapAll("<div class='new' />");
-    $("p").wrapAll("<div></div>");
-    $("span").wrapAll("<div><div><p><em><b></b></em></p></div></div>");
-    $("p").wrapAll(document.createElement("div"));
-    $("p").wrapAll($(".doublediv"));
-}
-
-function test_wrapInner() {
-    $(".inner").wrapInner("<div class='new'></div>");
-    $(".inner").wrapInner(function () {
-        return "<div class='" + this.nodeValue + "'></div>";
-    });
-    var elem: Element;
-    $(elem).wrapInner("<div class='test'></div>");
-    $(elem).wrapInner("<div class=\"test\"></div>");
-    $("p").wrapInner("<b></b>");
-    $("body").wrapInner("<div><div><p><em><b></b></em></p></div></div>");
-    $("p").wrapInner(document.createElement("b"));
-    $("p").wrapInner($("<span class='red'></span>"));
-}
-
-function test_width() {
-    // Returns width of browser viewport
-    $(window).width();
-
-    // Returns width of HTML document
-    $(document).width();
-
-    function showWidth(ele, w) {
-        $("div").text("The width for the " + ele + " is " + w + "px.");
-    }
-    $("#getp").click(function () {
-        showWidth("paragraph", $("p").width());
-    });
-    $("#getd").click(function () {
-        showWidth("document", $(document).width());
-    });
-    $("#getw").click(function () {
-        showWidth("window", $(window).width());
-    });
-
-    var modWidth = 50;
-    $("div").one("click", function () {
-        $(this).width(modWidth).addClass("mod");
-        modWidth -= 8;
-    });
-}
-
-function test_coordinates() {
-    var p = $("p:last");
-    var offset = p.offset();
-    p.html("left: " + offset.left + ", top: " + offset.top);
-
-    $("*", document.body).click(function (event) {
-        var offset = $(this).offset();
-        event.stopPropagation();
-        $("#result").text(this.tagName +
-            " coords ( " + offset.left + ", " + offset.top + " )");
-    });
-
-    $("p:last").offset({ top: 10, left: 30 });
-}
-
-function test_hide() {
-    $('.target').hide();
-    $('#clickme').click(function () {
-        $('#book').hide('slow', function () {
-            alert('Animation complete.');
-        });
-    });
-    $("p").hide();
-    $("a").click(function (event) {
-        event.preventDefault();
-        $(this).hide();
-    });
-    $("button").click(function () {
-        $("p").hide("slow");
-    });
-    $("#hidr").click(function () {
-        $("span:last-child").hide("fast", function () {
-            $(this).prev().hide("fast", arguments.callee);
-        });
-    });
-    $("#showr").click(function () {
-        $("span").show(2000);
-    });
-    $("div").click(function () {
-        $(this).hide(2000, function () {
-            $(this).remove();
-        });
-    });
-}
-
-function test_holdReady() {
-    $.holdReady(true);
-    $.getScript("myplugin.js", function () {
-        $.holdReady(false);
-    });
-}
-
-function test_hover() {
-    $("li").hover(
-        function () {
-            $(this).append($("<span> ***</span>"));
-        },
-        function () {
-            $(this).find("span:last").remove();
-        }
-    );
-    $("li.fade").hover(function () { $(this).fadeOut(100); $(this).fadeIn(500); });
-    $("li")
-    .filter(":odd")
-    .hide()
-    .end()
-    .filter(":even")
-    .hover(
-        function () {
-            $(this).toggleClass("active")
-            .next().stop(true, true).slideToggle();
-        }
-    );
-}
-
-function test_html() {
-    $('div.demo-container').html();
-    $("p").click(function () {
-        var htmlStr = $(this).html();
-        $(this).text(htmlStr);
-    });
-    $('div.demo-container')
-        .html('<p>All new content. <em>You bet!</em></p>');
-    $('div.demo-container').html(function (index, oldhtml) {
-        var emph = '<em>' + $('p').length + ' paragraphs!</em>';
-        return '<p>All new content for ' + emph + '</p>';
-    });
-    $("div").html("<b>Wow!</b> Such excitement...");
-    $("div b").append(document.createTextNode("!!!"))
-              .css("color", "red");
-}
-
-function test_inArray() {
-    var arr: any[] = [4, "Pete", 8, "John"];
-    var $spans = $("span");
-    $spans.eq(0).text(jQuery.inArray("John", arr));
-    $spans.eq(1).text(jQuery.inArray(4, arr));
-    $spans.eq(2).text(jQuery.inArray("Karl", arr));
-    $spans.eq(3).text(jQuery.inArray("Pete", arr, 2));
-
-    var arr2: number[] = [1, 2, 3, 4];
-    $spans.eq(1).text(jQuery.inArray(4, arr2));
-}
-
-function test_index() {
-    var listItem = document.getElementById('bar');
-    alert('Index: ' + $('li').index(listItem));
-    var listItems = $('li:gt(0)');
-    alert('Index: ' + $('li').index(listItems));
-    alert('Index: ' + $('#bar').index());
-    $("div").click(function () {
-        var index = $("div").index(this);
-        $("span").text("That was div index #" + index);
-    });
-    var listItems = $('li:gt(0)');
-    $('div').html('Index: ' + $('li').index(listItems));
-    $('div').html('Index: ' + $('#bar').index('li'));
-    var foobar = $("li").index($('#foobar'));
-    $('div').html('Index: ' + foobar);
-}
-
-function test_innerHeight() {
-    var p = $("p:first");
-    $("p:last").text("innerHeight:" + p.innerHeight());
-
-    p.innerHeight(123);
-    p.innerHeight('123px');
-}
-
-function test_innerWidth() {
-    var p = $("p:first");
-    $("p:last").text("innerWidth:" + p.innerWidth());
-
-
-    p.innerWidth(123);
-    p.innerWidth('123px');
-}
-
-function test_outerHeight() {
-    var p = $("p:first");
-    $("p:last").text(
-        "outerHeight:" + p.outerHeight() +
-        " , outerHeight( true ):" + p.outerHeight(true));
-
-    p.outerHeight(123);
-    p.outerHeight('123px');
-}
-
-function test_outerWidth() {
-    var p = $("p:first");
-    $("p:last").text(
-        "outerWidth:" + p.outerWidth() +
-        " , outerWidth( true ):" + p.outerWidth(true));
-
-    p.outerWidth(123);
-    p.outerWidth('123px');
-}
-
-function test_scrollLeft() {
-    var p = $("p:first");
-    $("p:last").text("scrollLeft:" + p.scrollLeft());
-
-    $("div.demo").scrollLeft(300);
-}
-
-function test_scrollTop() {
-    var p = $("p:first");
-    $("p:last").text("scrollTop:" + p.scrollTop());
-
-    $("div.demo").scrollTop(300);
-}
-
-function test_parent() {
-    $("*", document.body).each(function () {
-        var parentTag = $(this).parent().get(0).tagName;
-        $(this).prepend(document.createTextNode(parentTag + " > "));
-    });
-    $("p").parent(".selected").css("background", "yellow");
-}
-
-function test_parents() {
-    var parentEls = $("b").parents()
-        .map(function () {
-            return this.tagName;
-        })
-        .get()
-        .join(", ");
-    $("b").append("<strong>" + parentEls + "</strong>");
-
-    function showParents() {
-        $("div").css("border-color", "white");
-        var len = $("span.selected")
-            .parents("div")
-            .css("border", "2px red solid")
-            .length;
-        $("b").text("Unique div parents: " + len);
-    }
-    $("span").click(function () {
-        $(this).toggleClass("selected");
-        showParents();
-    });
-}
-
-function test_param() {
-
-    function test1() {
-        var myObject = {
-            a: {
-                one: 1,
-                two: 2,
-                three: 3
-            },
-            b: [1, 2, 3]
-        };
-        var recursiveEncoded = $.param(myObject);
-        var recursiveDecoded = decodeURIComponent($.param(myObject));
-
-        alert(recursiveEncoded);
-        alert(recursiveDecoded);
-    }
-
-    function test2() {
-        var myObject = {
-            a: {
-                one: 1,
-                two: 2,
-                three: 3
-            },
-            b: [1, 2, 3]
-        };
-        var shallowEncoded = $.param(myObject, true);
-        var shallowDecoded = decodeURIComponent(shallowEncoded);
-
-        alert(shallowEncoded);
-        alert(shallowDecoded);
-    }
-
-    var params = { width: 1680, height: 1050 };
-    var str = jQuery.param(params);
-    $("#results").text(str);
-
-    // <=1.3.2:
-    $.param({ a: [2, 3, 4] }); // "a=2&a=3&a=4"
-    // >=1.4:
-    $.param({ a: [2, 3, 4] }); // "a[]=2&a[]=3&a[]=4"
-
-    // <=1.3.2:
-    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
-    // "a=[object+Object]&d=3&d=4&d=[object+Object]"
-
-    // >=1.4:
-    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
-    // "a[b]=1&a[c]=2&d[]=3&d[]=4&d[2][e]=5"
-}
-
-function test_position() {
-    var p = $("p:first");
-    var position = p.position();
-    $("p:last").text("left: " + position.left + ", top: " + position.top);
-}
-
-function test_insertAfter() {
-    $('<p>Test</p>').insertAfter('.inner');
-    $('h2').insertAfter($('.container'));
-    $("p").insertAfter("#foo");
-}
-
-function test_insertBefore() {
-    $('<p>Test</p>').insertBefore('.inner');
-    $('h2').insertBefore($('.container'));
-    $("p").insertBefore("#foo");
-}
-
-function test_promise() {
-    var div = $("<div>");
-
-    div.promise().done(function (arg1) {
-        // Will fire right away and alert "true"
-        alert(this === div && arg1 === div);
-    });
-
-    $("button").on("click", function () {
-        $("p").append("Started...");
-
-        $("div").each(function (i) {
-            $(this).fadeIn().fadeOut(1000 * (i + 1));
-        });
-
-        $("div").promise().done(function () {
-            $("p").append(" Finished! ");
-        });
-    });
-
-    var effect = function () {
-        return $("div").fadeIn(800).delay(1200).fadeOut();
-    };
-
-    $("button").on("click", function () {
-        $("p").append(" Started... ");
-
-        $.when(effect()).done(function () {
-            $("p").append(" Finished! ");
-        });
-    });
-}
-
-function test_is() {
-    $("ul").click(function (event) {
-        var $target = $(event.target);
-        if ($target.is("li")) {
-            $target.css("background-color", "red");
-        }
-    });
-    $("li").click(function () {
-    var $li = $(this),
-        isWithTwo = $li.is(function () {
-            return $('strong', this).length === 2;
-        });
-        if (isWithTwo) {
-            $li.css("background-color", "green");
-        } else {
-            $li.css("background-color", "red");
-        }
-    });
-    $("div").one('click', function () {
-        if ($(this).is(":first-child")) {
-            $("p").text("It's the first div.");
-        } else if ($(this).is(".blue,.red")) {
-            $("p").text("It's a blue or red div.");
-        } else if ($(this).is(":contains('Peter')")) {
-            $("p").text("It's Peter!");
-        } else {
-            $("p").html("It's nothing <em>special</em>.");
-        }
-        $("p").hide().slideDown("slow");
-        $(this).css({ "border-style": "inset", cursor: "default" });
-    });
-    var isFormParent = $("input[type='checkbox']").parent().is("form");
-    $("div").text("isFormParent = " + isFormParent);
-    var isFormParent = $("input[type='checkbox']").parent().is("form");
-    $("div").text("isFormParent = " + isFormParent);
-    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
-    $('li').click(function () {
-        var $li = $(this);
-        if ($li.is($alt)) {
-            $li.slideUp();
-        } else {
-            $li.css("background", "red");
-        }
-    });
-    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
-    $('li').click(function () {
-        if ($alt.is(this)) {
-            $(this).slideUp();
-        } else {
-            $(this).css("background", "red");
-        }
-    });
-}
-
-function test_isTypeGuards() {
-    var foo: number[] | ((x: string) => number) | Window;
-    if (jQuery.isArray(foo)) {
-        foo.push(1515);
-    } else if (jQuery.isWindow(foo)) {
-        foo.close();
-    } else if (jQuery.isFunction(foo)) {
-        foo("hello world");
-    }
-}
-
-function test_isArray() {
-    $("b").append("" + $.isArray([]));
-}
-
-function test_isEmptyObject() {
-    jQuery.isEmptyObject({});
-    jQuery.isEmptyObject({ foo: "bar" });
-}
-
-function test_isFunction() {
-    function stub() { };
-    var objs: any[] = [
-          function () { },
-          { x: 15, y: 20 },
-          null,
-          stub,
-          "function"
-    ];
-    jQuery.each(objs, function (i) {
-        var isFunc = jQuery.isFunction(objs[i]);
-        $("span").eq(i).text(isFunc);
-    });
-    $.isFunction(function () { });
-}
-
-function test_isNumeric() {
-    $.isNumeric("-10");
-    $.isNumeric(16);
-    $.isNumeric(0xFF);
-    $.isNumeric("0xFF");
-    $.isNumeric("8e5");
-    $.isNumeric(3.1415);
-    $.isNumeric(+10);
-    $.isNumeric(144);
-    $.isNumeric("");
-    $.isNumeric({});
-    $.isNumeric(NaN);
-    $.isNumeric(null);
-    $.isNumeric(true);
-    $.isNumeric(Infinity);
-    $.isNumeric(undefined);
-}
-
-function test_isPlainObject() {
-    $.isPlainObject(document.location);
-    jQuery.isPlainObject({});
-    jQuery.isPlainObject("test");
-}
-
-function test_isWindow() {
-    $("b").append("" + $.isWindow(window));
-}
-
-function test_isXMLDoc() {
-    jQuery.isXMLDoc(document);
-    jQuery.isXMLDoc(document.body);
-}
-
-function test_unique() {
-    jQuery.unique($('div.foo, div.bar').get());
-    jQuery.unique($('div.foo, div.bar').toArray());
-
-    var divs: HTMLDivElement[];
-    var unique: HTMLDivElement[];
-    unique = jQuery.unique(divs);
-    unique = jQuery.unique<HTMLDivElement>(divs);
-}
-
-function test_jQuery() {
-    $('div.foo');
-    $('div.foo').click(function () {
-        $('span', this).addClass('bar');
-    });
-    $('div.foo').click(function () {
-        $(this).slideUp();
-    });
-    $.post('url.xml', function (data) {
-        var $child = $(data).find('child');
-    });
-    $.post({
-        url: "test.php",
-        success : () => {
-            console.log("successfull");
-        }
-    });
-    $.get({
-        url: "test.php",
-        success : () => {
-            console.log("successfull");
-        }
-    });
-    var foo = { foo: 'bar', hello: 'world' };
-    var $foo = $(foo);
-    var test1 = $foo.prop('foo');
-    $foo.prop('foo', 'foobar');
-    var test2 = $foo.prop('foo');
-    $foo.data('keyName', 'someValue');
-    console.log($foo);
-    $foo.bind('eventName', function () {
-        console.log('eventName was called');
-    });
-    $foo.trigger('eventName');
-    $foo.triggerHandler('eventName');
-    $("div > p").css("border", "1px solid gray");
-    $("input:radio", document.forms[0]);
-    var xml: any;
-    $("div", xml.responseXML);
-    $(document.body).css("background", "black");
-    var myForm: any;
-    $(myForm.elements).hide();
-    $('<p id="test">My <em>new</em> text</p>').appendTo('body');
-    $('<img />');
-    $('<input>');
-    var el = $('1<br/>2<br/>3');
-    el = $('1<br/>2<br/>3 >');
-    $('<input />', {
-        type: 'text',
-        name: 'test'
-    }).appendTo("body");
-    $('<input type="text" />').attr({
-        name: 'test'
-    }).appendTo("body");
-    $("<div><p>Hello</p></div>").appendTo("body");
-    $("<div/>", {
-        "class": "test",
-        text: "Click me!",
-        click: function () {
-            $(this).toggleClass("test");
-        }
-    }).appendTo("body");
-    jQuery(function ($) {
-        // Your code using failsafe $ alias here...
-    });
-    jQuery(document).ready(function ($) {
-        // Your code using failsafe $ alias here...
-    });
-}
-
-function test_fn_extend() {
-    jQuery.fn.extend({
-        check: function () {
-            return this.each(function () {
-                this.checked = true;
-            });
-        },
-        uncheck: function () {
-            return this.each(function () {
-                this.checked = false;
             });
         }
-    });
 
-    // Use the newly created .check() method
-    //$( "input[type='checkbox']" ).check();
-    // The above test cannot be run as no way that I know of in TypeScript to model the augmentation of jQueryStatic with dynamically added methods
-    // The below would only work at runtime if extend had first been called.
-    $("input[type='checkbox']")["check"]();
+        function ajaxError() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxSettings;
+                // $ExpectType string
+                thrownError;
+
+                return false;
+            });
+        }
+
+        function ajaxSend() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
+
+                return false;
+            });
+        }
+
+        function ajaxStart() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxStart(function() {
+                // $ExpectType Document
+                this;
+
+                return false;
+            });
+        }
+
+        function ajaxStop() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxStop(function() {
+                // $ExpectType Document
+                this;
+
+                return false;
+            });
+        }
+
+        function ajaxSuccess() {
+            // $ExpectType JQuery<HTMLElement>
+            $(document).ajaxSuccess(function(event, jqXHR, ajaxOptions, data) {
+                // $ExpectType Document
+                this;
+                // $ExpectType Event<Document, null>
+                event;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+                // $ExpectType AjaxSettings<any>
+                ajaxOptions;
+                // $ExpectType PlainObject<any>
+                data;
+
+                return false;
+            });
+        }
+
+        function load() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', 'data', function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', { data: 'data' }, function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', function(responseText, textStatus, jqXHR) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType string
+                responseText;
+                // $ExpectType TextStatus
+                textStatus;
+                // $ExpectType jqXHR<any>
+                jqXHR;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', 'data');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#result').load('/echo/html/', { data: 'data' });
+        }
+    }
+
+    function attributes() {
+        function attr() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('alt', 'Beijing Brush Seller');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('width', 200);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', null);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('alt', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return 'Beijing Brush Seller';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('width', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return 200;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').attr('title', function(index, attr) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                attr;
+
+                return undefined;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('img').attr({
+                src: '/resources/hat.gif',
+                title: 'jQuery',
+                alt: 'jQuery Logo'
+            });
+
+            // $ExpectType string | undefined
+            $('img').attr('src');
+        }
+
+        function removeAttr() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#greatphoto').removeAttr('alt');
+        }
+    }
+
+    function properties() {
+        function prop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prop('myProp', function(index, oldPropertyValue) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType any
+                oldPropertyValue;
+
+                return {};
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prop('myProp', {});
+
+            // $ExpectType JQuery<HTMLElement>
+            $('input[type=\'checkbox\']').prop({
+                myProp: true
+            });
+
+            // $ExpectType any
+            $('input[type=\'checkbox\']').prop('myProp');
+        }
+
+        function removeProp() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeProp('luggageCode');
+        }
+    }
+
+    function css() {
+        // TODO: .css() getters can return 'undefined' for properties that don't exist. Consider changing the return types to reflect this after adding specialized signatures.
+        function css() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', 'value');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', 20);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return 'value';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return 20;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css('cssProp', function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return undefined;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').css({
+                myProp1: 'value',
+                myProp2: 20,
+                myProp3(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return 'value';
+                },
+                myProp4(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return 20;
+                },
+                myProp5(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+                },
+                myProp6(index, value) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType number
+                    index;
+                    // $ExpectType string
+                    value;
+
+                    return undefined;
+                }
+            });
+
+            // $ExpectType string
+            $('p').css('myProp');
+
+            // $ExpectType PlainObject<string>
+            $('p').css([
+                'myProp1',
+                'myProp2'
+            ]);
+        }
+
+        function height() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').height(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').height();
+        }
+
+        function innerHeight() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').innerHeight();
+        }
+
+        function outerHeight() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerHeight(function(index, height) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                height;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').outerHeight();
+
+            // $ExpectType number | undefined
+            $('p').outerHeight(true);
+        }
+
+        function width() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').width(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').width();
+        }
+
+        function innerWidth() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').innerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').innerWidth();
+        }
+
+        function outerWidth() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth('200px');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(400);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return '200px';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').outerWidth(function(index, width) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType number
+                width;
+
+                return 400;
+            });
+
+            // $ExpectType number | undefined
+            $('p').outerWidth();
+
+            // $ExpectType number | undefined
+            $('p').outerWidth(true);
+        }
+
+        function offset() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset({
+                left: 20,
+                top: 50
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset(function(index, coords) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType Coordinates
+                coords;
+
+                return {
+                    left: 20,
+                    top: 50
+                };
+            });
+
+            // $ExpectType Coordinates
+            $('p').offset();
+        }
+
+        function position() {
+            // $ExpectType Coordinates
+            $('p').position();
+        }
+
+        function scrollLeft() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scrollLeft(200);
+
+            // $ExpectType number
+            $('p').scrollLeft();
+        }
+
+        function scrollTop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scrollTop(200);
+
+            // $ExpectType number
+            $('p').scrollTop();
+        }
+
+        function addClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addClass(function(index, currentClassName) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                currentClassName;
+
+                return 'className';
+            });
+        }
+
+        function hasClass() {
+            // $ExpectType boolean
+            $('p').hasClass('className');
+        }
+
+        function removeClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass(function(index, currentClassName) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                currentClassName;
+
+                return 'className';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeClass();
+        }
+
+        function toggleClass() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass('className', true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(function(index, className, state) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                className;
+                // $ExpectType true
+                state;
+
+                return 'className';
+            }, true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass('className');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(function(index, className, state) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                className;
+                // $ExpectType boolean
+                state;
+
+                return 'className';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggleClass();
+        }
+    }
+
+    function data() {
+        function data() {
+            // $ExpectType any
+            $('p').data('myData', undefined);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').data('myData', {});
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').data({
+                myData1: {},
+                myData2: false
+            });
+
+            // $ExpectType any
+            $('p').data('myData');
+
+            // $ExpectType PlainObject<any>
+            $('p').data();
+        }
+
+        function removeData() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData('myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData([
+                'myData1',
+                'myData2'
+            ]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').removeData();
+        }
+    }
+
+    function effects() {
+        function animate() {
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000, function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            }, function() {
+                // $ExpectType HTMLElement
+                this;
+
+                $(this).after('<div>Animation complete.</div>');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: 'toggle',
+                height: 'toggle'
+            }, {
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: 200,
+                opacity: 'toggle'
+            });
+        }
+
+        function fadeIn() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeIn();
+        }
+
+        function fadeOut() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeOut();
+        }
+
+        function fadeToggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeToggle();
+        }
+
+        function slideDown() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideDown();
+        }
+
+        function slideToggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideToggle();
+        }
+
+        function slideUp() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp('linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slideUp();
+        }
+
+        function fadeTo() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').fadeTo(5000, 0.9);
+        }
+
+        function toggle() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle('linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle(true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').toggle();
+        }
+
+        function hide() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hide();
+        }
+
+        function show() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, 'linear', function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, 'linear');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000, function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(5000);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show(function() {
+                // $ExpectType HTMLElement
+                this;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show({
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce'
+                },
+                complete() {
+                    $(this).after('<div>Animation complete.</div>');
+                }
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').show();
+        }
+
+        function clearQueue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clearQueue('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clearQueue();
+        }
+
+        function delay() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').delay('fast', 'myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').delay('slow');
+        }
+
+        function dequeue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dequeue('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dequeue();
+        }
+
+        function finish() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').finish('myQueue');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').finish();
+        }
+
+        function queue() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue('myQueue', function(next) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType () => void
+                next;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue('myQueue', [
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                },
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                }
+            ]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue(function(next) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType () => void
+                next;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').queue([
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                },
+                function(next) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType () => void
+                    next;
+                }
+            ]);
+
+            // $ExpectType Queue<HTMLElement>
+            $('p').queue('myQueue');
+
+            // $ExpectType Queue<HTMLElement>
+            $('p').queue();
+        }
+
+        function stop() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop('myQueue', true, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop('myQueue', true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop(true, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').stop(true);
+        }
+    }
+
+    function events() {
+        // [bind() overloads] https://github.com/jquery/api.jquery.com/issues/1048
+        function bind() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                },
+                myEvent2: false
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', null);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', undefined);
+        }
+
+        function delegate() {
+            // $ExpectType JQuery<HTMLElement>
+            $('table').delegate('td', 'myEvent', 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').delegate('td', 'myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').delegate('td', 'myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').delegate('td', {
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            });
+        }
+
+        function off() {
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent', 'td', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent', 'td', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent', 'td');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off('myEvent');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            }, 'td');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off($.Event('myEvent'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').off();
+        }
+
+        function on() {
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', null, 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 3, function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, number>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, string>
+                    event;
+                },
+                myEvent2: false
+            }, 'td', 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, string>
+                    event;
+                },
+                myEvent2: false
+            }, null, 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            }, 'td');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, number>
+                    event;
+                },
+                myEvent2: false
+            }, 3);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            });
+        }
+
+        function one() {
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', 'td', 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', null, 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', 'td', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', 'td', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', 3, function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, number>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, string>
+                    event;
+                },
+                myEvent2: false
+            }, 'td', 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, string>
+                    event;
+                },
+                myEvent2: false
+            }, null, 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            }, 'td');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, number>
+                    event;
+                },
+                myEvent2: false
+            }, 3);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            });
+        }
+
+        function trigger() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger('myEvent', ['Custom', 'Event']);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger('myEvent', { myData: 'myData' });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger('myEvent', 'Custom');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger('myEvent', 3);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger($.Event('myEvent'), ['Custom', 'Event']);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger($.Event('myEvent'), { myData: 'myData' });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger($.Event('myEvent'), 'Custom');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').trigger($.Event('myEvent'), 3);
+        }
+
+        function triggerHandler() {
+            // $ExpectType any
+            $('p').triggerHandler('myEvent', ['Custom', 'Event']);
+
+            // $ExpectType any
+            $('p').triggerHandler('myEvent', { myData: 'myData' });
+
+            // $ExpectType any
+            $('p').triggerHandler('myEvent', 'Custom');
+
+            // $ExpectType any
+            $('p').triggerHandler('myEvent', 3);
+
+            // $ExpectType any
+            $('p').triggerHandler($.Event('myEvent'), ['Custom', 'Event']);
+
+            // $ExpectType any
+            $('p').triggerHandler($.Event('myEvent'), { myData: 'myData' });
+
+            // $ExpectType any
+            $('p').triggerHandler($.Event('myEvent'), 'Custom');
+
+            // $ExpectType any
+            $('p').triggerHandler($.Event('myEvent'), 3);
+        }
+
+        function unbind() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unbind('myEvent', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unbind('myEvent', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unbind('myEvent');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unbind($.Event('myEvent'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unbind();
+        }
+
+        function undelegate() {
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate('td', 'click', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate('td', 'click', false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate('td', 'click');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate('td', {
+                myEvent1(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType Event<HTMLElement, null>
+                    event;
+                },
+                myEvent2: false
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate('.tt');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').undelegate();
+        }
+
+        function blur() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').blur('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').blur(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').blur(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').blur();
+        }
+
+        function change() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').change('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').change(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').change(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').change();
+        }
+
+        function click() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').click('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').click(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').click(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').click();
+        }
+
+        function contextmenu() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').contextmenu('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').contextmenu(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').contextmenu(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').contextmenu();
+        }
+
+        function dblclick() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dblclick('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dblclick(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dblclick(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').dblclick();
+        }
+
+        function focus() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focus('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focus(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focus(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focus();
+        }
+
+        function focusin() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusin('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusin(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusin(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusin();
+        }
+
+        function focusout() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusout('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusout(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusout(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').focusout();
+        }
+
+        function keydown() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keydown('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keydown(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keydown(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keydown();
+        }
+
+        function keypress() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keypress('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keypress(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keypress(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keypress();
+        }
+
+        function keyup() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keyup('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keyup(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keyup(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').keyup();
+        }
+
+        function mousedown() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousedown('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousedown(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousedown(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousedown();
+        }
+
+        function mouseenter() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseenter('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseenter(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseenter(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseenter();
+        }
+
+        function mouseleave() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseleave('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseleave(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseleave(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseleave();
+        }
+
+        function mousemove() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousemove('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousemove(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousemove(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mousemove();
+        }
+
+        function mouseout() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseout('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseout(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseout(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseout();
+        }
+
+        function mouseover() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseover('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseover(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseover(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseover();
+        }
+
+        function mouseup() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseup('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseup(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseup(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').mouseup();
+        }
+
+        function resize() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').resize('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').resize(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').resize(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').resize();
+        }
+
+        function scroll() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scroll('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scroll(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scroll(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').scroll();
+        }
+
+        function select() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').select('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').select(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').select(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').select();
+        }
+
+        function submit() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').submit('myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, string>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').submit(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').submit(false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').submit();
+        }
+
+        function hover() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            }, function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            }, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(false, function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(false, false);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType Event<HTMLElement, null>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').hover(false);
+        }
+
+        function ready() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').ready(($) => {
+                // $ExpectType JQueryStatic<HTMLElement>
+                $;
+            });
+        }
+    }
 }
 
-function test_jquery() {
-    var a = <any>{ what: "A regular JS object" },
-    b = $('body');
-    if (a.jquery) {
-        alert(' a is a jQuery object! ');
+function JQueryStatic() {
+    function type_assertion() {
+        const $Canvas = $ as JQueryStatic<HTMLCanvasElement>;
     }
-    if (b.jquery) {
-        alert(' b is a jQuery object! ');
+
+    function type_annotation() {
+        const jq: JQueryStatic = $;
     }
-    alert('You are running jQuery version: ' + $.fn.jquery);
 
-    $("div.foo");
+    function constructor() {
+        function selector_object_callback() {
+            const jq = $ as JQueryStatic<Node>;
+            // $ExpectType JQuery<Node>
+            jq('div');
+        }
+    }
 
-    $("div.foo").click(function () {
-        $("span", this).addClass("bar");
-    });
+    function Callbacks() {
+        const cb = $.Callbacks();
 
-    $("div.foo").click(function () {
-        $(this).slideUp();
-    });
+        cb.add(console.log);
+    }
 
-    $.post("url.xml", function (data) {
-        var $child = $(data).find("child");
-    });
+    function Event() {
+        function constructor() {
+            const e = $.Event('click');
+            e.stopPropagation();
+        }
+    }
 
-    // Define a plain object
-    var foo = { foo: "bar", hello: "world" };
+    function each() {
+        function arrayLike() {
+            $.each({ length: 3 }, (index, val) => {
+                index === 3;
+            });
+        }
+    }
 
-    // Pass it to the jQuery function
-    var $foo = $(foo);
-
-    // Test accessing property values
-    var test1 = $foo.prop("foo"); // bar
-
-    // Test setting property values
-    $foo.prop("foo", "foobar");
-    var test2 = $foo.prop("foo"); // foobar
-
-    // Test using .data() as summarized above
-    $foo.data("keyName", "someValue");
-    console.log($foo); // will now contain a jQuery{randomNumber} property
-
-    // Test binding an event name and triggering
-    $foo.on("eventName", function () {
-        console.log("eventName was called");
-    });
-
-    $foo.trigger("eventName"); // Logs "eventName was called"
-
-    $foo.triggerHandler("eventName"); // Also logs "eventName was called"
-
-    $("div > p").css("border", "1px solid gray");
-
-    $("input:radio", document.forms[0]);
-
-    $(document.body).css("background", "black");
-
-    var myForm: HTMLFormElement;
-    $(myForm.elements).hide();
-
-    $("<p id='test'>My <em>new</em> text</p>").appendTo("body");
-
-    $("<a href='http://jquery.com'></a>");
-
-    $("<img>");
-    $("<input>");
-
-    var el = $("1<br>2<br>3"); // returns [<br>, "2", <br>]
-    el = $("1<br>2<br>3 >"); // returns [<br>, "2", <br>, "3 &gt;"]
-
-    $("<div></div>", {
-        "class": "my-div",
-        on: {
-            touchstart: function (event) {
-                // Do something
+    function isArray() {
+        function type_guard(obj: object) {
+            if ($.isArray(obj)) {
+                console.log(obj[0]);
             }
         }
-    }).appendTo("body");
+    }
 
-    $("<div></div>")
-        .addClass("my-div")
-        .on({
-            touchstart: function (event) {
-                // Do something
+    function isFunction() {
+        function type_guard(obj: object) {
+            if ($.isFunction(obj)) {
+                obj();
             }
-        })
-        .appendTo("body");
+        }
+    }
 
-    $("<div><p>Hello</p></div>").appendTo("body")
-
-    $("<div/>", {
-            "class": "test",
-            text: "Click me!",
-            click: function () {
-                $(this).toggleClass("test");
+    function isNumeric() {
+        function type_guard(obj: boolean) {
+            if ($.isNumeric(obj)) {
+                obj.toFixed();
             }
-        })
-        .appendTo("body");
-
-    $(function () {
-        // Document is ready
-    });
-
-    jQuery(function ($) {
-        // Your code using failsafe $ alias here...
-    });
-
-    $(document.body)
-        .click(function () {
-            $(document.body).append($("<div>"));
-            var n = $("div").length;
-            $("span").text("There are " + n + " divs." +
-                "Click to add more.");
-        })
-    // Trigger the click to start
-        .trigger("click");
-}
-
-function test_keydown() {
-    $('#target').keydown(function () {
-        alert('Handler for .keydown() called.');
-    });
-    $('#other').click(function () {
-        $('#target').keydown();
-    });
-    var xTriggered = 0;
-    $('#target').keydown(function (event) {
-        if (event.which == 13) {
-            event.preventDefault();
         }
-        xTriggered++;
-        var msg = 'Handler for .keydown() called ' + xTriggered + ' time(s).';
-    });
-    $('#other').click(function () {
-        $('#target').keydown();
-    });
-}
-
-function test_keypress() {
-    $("#target").keypress(function () {
-        alert("Handler for .keypress() called.");
-    });
-    $('#other').click(function () {
-        $("#target").keypress();
-    });
-    $("#other").click(function () {
-        $("#target").keypress();
-    });
-}
-
-function test_keyup() {
-    $('#target').keyup(function () {
-        alert('Handler for .keyup() called.');
-    });
-    $('#other').click(function () {
-        $('#target').keyup();
-    });
-    $('#other').click(function () {
-        $('#target').keyup();
-    });
-}
-
-function test_resize() {
-	$('#other').resize();
-    $('#other').resize(function () {
-        alert('Handler for .resize() called.');
-    });
-    $('#other').resize({ "event": "Data" }, function () {
-        alert('Handler for .resize() called.');
-    });
-}
-
-function test_scroll() {
-	$('#other').scroll();
-    $('#other').scroll(function () {
-        alert('Handler for .scroll() called.');
-    });
-    $('#other').scroll({ "event": "Data" }, function () {
-        alert('Handler for .scroll() called.');
-    });
-}
-
-function test_select() {
-	$('#other').select();
-    $('#other').select(function () {
-        alert('Handler for .select() called.');
-    });
-    $('#other').select({ "event": "Data" }, function () {
-        alert('Handler for .select() called.');
-    });
-}
-
-function test_last() {
-    $('li').last().css('background-color', 'red');
-    $("p span").last().addClass('highlight');
-}
-
-function test_length() {
-    $(document.body).click(function () {
-        $(document.body).append($("<div>"));
-        var n = $("div").length;
-        $("span").text("There are " + n + " divs." + "Click to add more.");
-    }).trigger('click');
-}
-
-function test_load() {
-    $('#result').load('ajax/test.html');
-    $('#result').load('ajax/test.html', function () {
-        alert('Load was performed.');
-    });
-    $('#result').load('ajax/test.html #container');
-    $('#b').load('article.html #target');
-    $("#success").load("/not-here.php", function (response, status, xhr) {
-        if (status == "error") {
-            var msg = "Sorry but there was an error: ";
-            $("#error").html(msg + xhr.status + " " + xhr.statusText);
-        }
-    });
-    $("#objectID").load("test.php", { 'choices[]': ["Jon", "Susan"] });
-    $("#feeds").load("feeds.php", { limit: 25 }, function () {
-        alert("The last 25 entries in the feed have been loaded");
-    });
-}
-
-function test_loadEvent() {
-    $('#book').load(function () { });
-    $('img.userIcon').load(function () {
-        if ($(this).height() > 100) {
-            $(this).addClass('bigImg');
-        }
-    });
-}
-
-function test_mousedown() {
-    $('#target').mousedown(function () {
-        alert('Handler for .mousedown() called.');
-    });
-    $('#other').click(function () {
-        $('#target').mousedown();
-    });
-}
-
-function test_mouseenter() {
-    $('#outer').mouseenter(function () {
-        $('#log').append('<div>Handler for .mouseenter() called.</div>');
-    });
-    $('#other').click(function () {
-        $('#outer').mouseenter();
-    });
-    var n = 0;
-    $("div.enterleave").mouseenter(function () {
-        $("p:first", this).text("mouse enter");
-        $("p:last", this).text(++n);
-    }).mouseleave(function () {
-        $("p:first", this).text("mouse leave");
-    });
-}
-
-function test_mouseleave() {
-    $('#outer').mouseleave(function () {
-        $('#log').append('<div>Handler for .mouseleave() called.</div>');
-    });
-    $('#other').click(function () {
-        $('#outer').mouseleave();
-    });
-    var i = 0;
-    $("div.overout").mouseover(function () {
-        $("p:first", this).text("mouse over");
-    }).mouseout(function () {
-        $("p:first", this).text("mouse out");
-        $("p:last", this).text(++i);
-    });
-    var n = 0;
-    $("div.enterleave").mouseenter(function () {
-        $("p:first", this).text("mouse enter");
-    }).mouseleave(function () {
-        $("p:first", this).text("mouse leave");
-        $("p:last", this).text(++n);
-    });
-}
-
-function test_mousemove() {
-    $("#target").mousemove(function (event) {
-        var msg = "Handler for .mousemove() called at ";
-        msg += event.pageX + ", " + event.pageY;
-        $("#log").append("<div>" + msg + "</div>");
-    });
-    $("#other").click(function () {
-        $("#target").mousemove();
-    });
-    $("div").mousemove(function (e) {
-        var pageCoords = "( " + e.pageX + ", " + e.pageY + " )";
-        var clientCoords = "( " + e.clientX + ", " + e.clientY + " )";
-        $("span:first").text("( e.pageX, e.pageY ) : " + pageCoords);
-        $("span:last").text("( e.clientX, e.clientY ) : " + clientCoords);
-    });
-}
-
-function test_mouseout() {
-    $('#outer').mouseout(function () {
-        $('#log').append('Handler for .mouseout() called.');
-    });
-    $('#other').click(function () {
-        $('#outer').mouseout();
-    });
-    var i = 0;
-    $("div.overout").mouseout(function () {
-        $("p:first", this).text("mouse out");
-        $("p:last", this).text(++i);
-    }).mouseover(function () {
-        $("p:first", this).text("mouse over");
-    });
-    var n = 0;
-    $("div.enterleave").bind("mouseenter", function () {
-        $("p:first", this).text("mouse enter");
-    }).bind("mouseleave", function () {
-        $("p:first", this).text("mouse leave");
-        $("p:last", this).text(++n);
-    });
-}
-
-function test_mouseup() {
-    $("p").mouseup(function () {
-        $(this).append('<span style="color:#F00;">Mouse up.</span>');
-    }).mousedown(function () {
-        $(this).append('<span style="color:#00F;">Mouse down.</span>');
-    });
-    $('#target').mouseup(function () {
-        alert('Handler for .mouseup() called.');
-    });
-    $('#other').click(function () {
-        $('#target').mouseup();
-    });
-    $("p").mouseup(function () {
-        $(this).append('<span style="color:#F00;">Mouse up.</span>');
-    }).mousedown(function () {
-        $(this).append('<span style="color:#00F;">Mouse down.</span>');
-    });
-}
-
-function test_mouseover() {
-    $('#outer').mouseover(function () {
-        $('#log').append('<div>Handler for .mouseover() called.</div>');
-    });
-    $('#other').click(function () {
-        $('#outer').mouseover();
-    });
-    var i = 0;
-    $("div.overout").mouseover(function () {
-        $("p:first", this).text("mouse over");
-        $("p:last", this).text(++i);
-    }).mouseout(function () {
-        $("p:first", this).text("mouse out");
-    });
-    var n = 0;
-    $("div.enterleave").mouseenter(function () {
-        n += 1;
-        $(this).find("span").text("mouse enter x " + n);
-    }).mouseleave(function () {
-        $(this).find("span").text("mouse leave");
-    });
-}
-
-function test_makeArray() {
-    var elems = document.getElementsByTagName("div");
-    var arr = jQuery.makeArray(elems);
-    arr.reverse();
-    $(arr).appendTo(document.body);
-    var obj = $('li');
-    var arr = $.makeArray(obj);
-    jQuery.isArray(arr) === true;
-}
-
-function test_replaceAll() {
-    $("<h2>New heading</h2>").replaceAll(".inner");
-    $(".first").replaceAll(".third");
-    $("<b>Paragraph. </b>").replaceAll("p");
-}
-
-function test_replaceWith() {
-    $("div.second").replaceWith("<h2>New heading</h2>");
-    $("div.inner").replaceWith("<h2>New heading</h2>");
-    $("div.third").replaceWith($(".first"));
-
-    $("button").click(function () {
-        $(this).replaceWith("<div>" + $(this).text() + "</div>");
-    });
-
-    $("p").replaceWith("<b>Paragraph. </b>");
-
-    $("p").click(function () {
-        $(this).replaceWith($("div"));
-    });
-
-    $("button").on("click", function () {
-        var $container = $("div.container").replaceWith(function () {
-            return $(this).contents();
-        });
-
-        $("p").append($container.attr("class"));
-    });
-}
-
-function test_map() {
-    $(':checkbox').map(function () {
-        return this.id;
-    }).get().join(',');
-    $("p").append($("input").map(function () {
-        return $(this).val();
-    }).get().join(", "));
-    var mappedItems = $("li").map(function (index) {
-        var replacement:any = $("<li>").text($(this).text()).get(0);
-        if (index === 0) {
-
-            // Make the first item all caps
-            $(replacement).text($(replacement).text().toUpperCase());
-        } else if (index === 1 || index === 3) {
-
-            // Delete the second and fourth items
-            replacement = null;
-        } else if (index === 2) {
-
-            // Make two of the third item and add some text
-            replacement = [replacement, $("<li>").get(0)];
-            $(replacement[0]).append("<b> - A</b>");
-            $(replacement[1]).append("Extra <b> - B</b>");
-        }
-
-        // Replacement will be a dom element, null,
-        // or an array of dom elements
-        return replacement;
-    });
-    $("#results").append(mappedItems);
-    var fakeArray = { "length": 1, 0: "Addy", 1: "Subtracty" };
-    var realArray = $.makeArray(fakeArray)
-    $.map(realArray, function (val, i) { });
-    var arr = ["a", "b", "c", "d", "e"];
-    $("div").text(arr.join(", "));
-    arr = jQuery.map(arr, function (n, i) {
-        return (n.toUpperCase() + i);
-    });
-    $("p").text(arr.join(", "));
-    arr = jQuery.map(arr, function (a) {
-        return a + a;
-    });
-    $("span").text(arr.join(", "));
-    $.map([0, 1, 2], function (n) {
-        return n + 4;
-    });
-    $.map([0, 1, 2], function (n) {
-        return n > 0 ? n + 1 : null;
-    });
-    $.map([0, 1, 2], function (n) {
-        return [n, n + 1];
-    });
-    var dimensions = { width: 10, height: 15, length: 20 };
-    dimensions = $.map(dimensions, function (value, index) {
-        return value * 2;
-    });
-    var dimensions = { width: 10, height: 15, length: 20 },
-    keys = $.map(dimensions, function (value, index) {
-        return index;
-    });
-    $.map([0, 1, 2, 3], function (a) {
-        return a * a;
-    });
-    $.map([0, 1, 52, 97], function (a) {
-        return (a > 50 ? a - 45 : null);
-    });
-    var array = [0, 1, 52, 97];
-    var array2 = $.map(array, function (a, index) {
-        return [a - 45, index];
-    });
-}
-
-function test_merge() {
-    var oldArray: any[];
-    var newArray = $.merge([], oldArray);
-    $.merge([0, 1, 2], [2, 3, 4]);
-    var first = ['a', 'b', 'c'];
-    var second = ['d', 'e', 'f'];
-    $.merge($.merge([], first), second);
-    var z = $.merge<any>([0, 1, 2], ['a', 'b', 'c']);
-}
-
-function test_prop() {
-    var $input = $(this);
-    $("p").html(".attr('checked'): <b>" + $input.attr('checked') + "</b><br>"
-                + ".prop('checked'): <b>" + $input.prop('checked') + "</b><br>"
-                + ".is(':checked'): <b>" + $input.is(':checked')) + "</b>";
-    $("input").prop("disabled", false);
-    $("input").prop("checked", true);
-    $("input").val("someValue");
-    $("input[type='checkbox']").prop("checked", function (i, val) {
-        return !val;
-    });
-    $("input[type='checkbox']").prop({
-        disabled: true
-    });
-    var title: string = $('option:selected', this).prop('title');
-}
-
-function test_val() {
-    // Get the value from a dropdown select
-    $("select.foo option:selected").val();
-
-    // Get the value from a dropdown select even easier
-    $("select.foo").val();
-
-    // Get the value from a checked checkbox
-    $("input:checkbox:checked").val();
-
-    // Get the value from a set of radio buttons
-    $("input:radio[name=bar]:checked").val();
-
-    function displayVals() {
-        var singleValues = $("#single").val();
-        var multipleValues = $("#multiple").val() || [];
-        $("p").html("<b>Single:</b> " + singleValues +
-            " <b>Multiple:</b> " + multipleValues.join(", "));
     }
 
-    $("select").change(displayVals);
-    displayVals();
-
-
-    $("input")
-        .keyup(function () {
-            var value = $(this).val();
-            $("p").text(value);
-        })
-        .keyup();
-
-    $("input:text.items").val(function (index, value) {
-        return value + " " + this.className;
-    });
-
-    $("button").click(function () {
-        var text = $(this).text();
-        $("input").val(text);
-    });
-
-    $("input").on("blur", function () {
-        $(this).val(function (i, val) {
-            return val.toUpperCase();
-        });
-    });
-
-    $("#single").val("Single2");
-    $("#multiple").val(["Multiple2", "Multiple3"]);
-    $("input").val(["check1", "check2", "radio1"]);
-    $("input").val(1);
-}
-
-function test_selector() {
-  var $main = $('#main');
-  var $mainDivs = $('div', $main);
-  return $mainDivs.selector == '#main div';
-}
-
-function test_text() {
-    var str = $("p:first").text();
-    $("p:last").html(str);
-    $('ul li').text(function (index) {
-        return 'item number ' + (index + 1);
-    });
-    $("p").text("<b>Some</b> new text.");
-}
-
-$('#item').click(function(e) {
-	if (e.ctrlKey) { console.log('control pressed'); }
-	if (e.altKey) { console.log('alt pressed'); }
-});
-
-function test_addBack() {
-    $('li.third-item').nextAll().addBack().css('background-color', 'red');
-
-    $("div.left, div.right").find("div, div > p").addClass("border");
-
-    // First Example
-    $("div.before-addback").find("p").addClass("background");
-
-    // Second Example
-    $("div.after-addback").find("p").addBack().addClass("background");
-}
-
-// http://api.jquery.com/jQuery.parseHTML/
-function test_parseHTML() {
-	var $log = $( "#log" ),
-		str = "hello, <b>my name is</b> jQuery.",
-		html = $.parseHTML( str ),
-		nodeNames = [];
-
-	// Append the parsed HTML
-	$log.append( html );
-
-	// Gather the parsed HTML's node names
-	$.each( html, function( i, el ) {
-		nodeNames[i] = "<li>" + el.nodeName + "</li>";
-	});
-
-	// Insert the node names
-	$log.append( "<h3>Node Names:</h3>" );
-	$( "<ol></ol>" )
-	  .append( nodeNames.join( "" ) )
-	  .appendTo( $log );
-
-	// parse HTML with all parameters
-	$.parseHTML( str, document, true );
-}
-
-// http://api.jquery.com/jQuery.parseJSON/
-function test_parseJSON() {
-    // Return type should be any, not Object
-    var i = $.parseJSON('1');
-    var a = $.parseJSON('[1]');
-    var o = $.parseJSON('{"foo":"bar"}');
-    var s = $.parseJSON('"string"');
-    var n = $.parseJSON('null');
-
-    i instanceof Object; // false
-    a instanceof Object; // true
-    o instanceof Object; // true
-    s instanceof Object; // false
-    n instanceof Object; // false
-}
-
-function test_not() {
-    $("li").not(":even").css("background-color", "red");
-
-    $("li").not(document.getElementById("notli"))
-        .css("background-color", "red");
-
-    $("div").not(".green, #blueone")
-        .css("border-color", "red");
-
-    $("p").not($("#selected")[0]);
-
-    $("p").not("#selected");
-
-    $("p").not($("div p.selected"));
-
-    var el1 = $("<div/>")[0];
-    var el2 = $("<div/>")[0];
-    $("p").not([el1, el2]);
-}
-
-function test_EventIsNewable() {
-    var ev = new jQuery.Event('click');
-}
-
-function test_EventIsCallable() {
-    var ev = jQuery.Event('click');
-}
-
-$.when<any>($.ajax("/my/page.json")).then(a => a.asdf); // is type JQueryPromise<any>
-$.when<any>($.ajax("/my/page.json")).then((a?,b?,c?) => a.asdf); // is type JQueryPromise<any>
-$.when("asdf", "jkl;").done((x,y) => x.length + y.length, (x,y) => x.length + y.length);
-
-var f1 = $.when("fetch"); // Is type JQueryPromise<string>
-var f2: JQueryPromise<string[]> = f1.then(s => [s, s]);
-var f3: JQueryPromise<number> = f2.then(v => 3);
-
-// ISSUE: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
-// http://stackoverflow.com/questions/5392344/sending-multipart-formdata-with-jquery-ajax#answer-5976031
-$.ajax({
-    url: 'php/upload.php',
-    data: {},
-    cache: false,
-    contentType: false,
-    processData: false,
-    type: 'POST',
-    success: function (data) {
-        alert(data);
-    }
-});
-
-function test_deferred() {
-
-    function returnPromise(): JQueryPromise<{ MyString: string; MyNumber: number; }> {
-        return $.Deferred<{ MyString: string; MyNumber: number; }>().resolve({
-            MyString: "MyString",
-            MyNumber: 5
-        }, "failed", null);
-    }
-    var x = returnPromise();
-    x.done((data, textStatus, jqXHR) => {
-        var myNumber: number = data.MyNumber;
-        var myString: string = data.MyString;
-        var theTextStatus: string = textStatus;
-        var thejqXHR: JQueryXHR = jqXHR;
-    });
-
-    $.get("test.php").always(function () {
-        alert("$.get completed with success or error callback arguments");
-    });
-    $.get("test.php").done(function () {
-        alert("$.get succeeded");
-    });
-    function fn1() {
-        $("p").append(" 1 ");
-    }
-    function fn2() {
-        $("p").append(" 2 ");
-    }
-    function fn3(n) {
-        $("p").append(n + " 3 " + n);
-    }
-    var dfd = $.Deferred<string>();
-    dfd
-        .done([fn1, fn2], fn3, [fn2, fn1])
-        .done(function (n) {
-            $("p").append(n + " we're done.");
-        });
-    $("button").bind("click", function () {
-        dfd.resolve("and");
-    });
-    $.get("test.php")
-        .done(function () { alert("$.get succeeded"); })
-        .fail(function () { alert("$.get failed!"); });
-    dfd.state();
-    var defer = $.Deferred(),
-        filtered = defer.pipe(function (value) {
-            return value * 2;
-        });
-    defer.resolve(5);
-    filtered.done(function (value) {
-        alert("Value is ( 2*5 = ) 10: " + value);
-    });
-    filtered.fail(function (value) {
-        alert("Value is ( 3*6 = ) 18: " + value);
-    });
-    filtered.done(function (data) { });
-
-    var obj = {
-        hello: function (name) {
-            alert("Hello " + name);
-        }
-    },
-        defer = $.Deferred();
-    defer.promise(obj);
-    defer.resolve("John");
-    $.get("test.php").then(
-        function () { alert("$.get succeeded"); },
-        function () { alert("$.get failed!"); }
-        );
-}
-
-function test_deferred_promise() {
-
-    function asyncEvent() {
-        var dfd = $.Deferred<string>();
-
-        // Resolve after a random interval
-        setTimeout(function () {
-            dfd.resolve("hurray");
-        }, Math.floor(400 + Math.random() * 2000));
-
-        // Reject after a random interval
-        setTimeout(function () {
-            dfd.reject("sorry");
-        }, Math.floor(400 + Math.random() * 2000));
-
-        // Show a "working..." message every half-second
-        setTimeout(function working() {
-            if (dfd.state() === "pending") {
-                dfd.notify("working... ");
-                setTimeout(working, 500);
+    function isPlainObject() {
+        function type_guard(obj: object) {
+            if ($.isPlainObject(obj)) {
+                obj['key'] = true;
             }
-        }, 1);
-
-        // Return the Promise so caller can't change the Deferred
-        return dfd.promise();
+        }
     }
 
-    // Attach a done, fail, and progress handler for the asyncEvent
-    $.when(asyncEvent()).then(
-        function (status) {
-            alert(status + ", things are going well");
+    function isWindow() {
+        function type_guard(obj: object) {
+            if ($.isWindow(obj)) {
+                obj.location.href === 'href';
+            }
+        }
+    }
+
+    function map() {
+        function object() {
+            const testObj = {
+                myProp: true,
+                name: 'Rogers',
+            };
+
+            const results = $.map(testObj, (propertyOfObject, key) => {
+                switch (key) {
+                    case 'myProp':
+                        return 1;
+                    case 'name':
+                        return false;
+                }
+            });
+
+            for (const result of results) {
+                result === 1;
+            }
+        }
+    }
+
+    function queue() {
+        const el = new HTMLElement();
+        const queue = jQuery.queue(el);
+        queue[0] === 'inprogress';
+    }
+
+    function readyException() {
+        jQuery.readyException = (error) => {
+            console.error(error);
+        };
+    }
+}
+
+function EffectsOptions() {
+    $('p').show({
+        always(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
         },
-        function (status) {
-            alert(status + ", you fail this time");
+        complete() {
+            // $ExpectType HTMLElement
+            this;
         },
-        function (status) {
-            $("body").append(status);
+        done(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
+        },
+        duration: 5000,
+        easing: 'linear',
+        fail(animation, jumpToEnd) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType boolean
+            jumpToEnd;
+        },
+        progress(animation, progress, remainingMs) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+            // $ExpectType number
+            progress;
+            // $ExpectType number
+            remainingMs;
+        },
+        queue: true,
+        specialEasing: {
+            width: 'linear',
+            height: 'easeOutBounce'
+        },
+        start(animation) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType Promise<any, any, any>
+            animation;
+        },
+        step(now, tween) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType number
+            now;
+            // $ExpectType Tween<HTMLElement>
+            tween;
         }
-        );
+    });
 }
 
-function test_promise_then_change_type() {
-	function request() {
-		var def = $.Deferred<any>();
-		var promise = def.promise(null);
+function JQuery_Event() {
+    function mixin() {
+        const e = $.Event('keydown', {
+            mySpecialKeyCode: JQuery.Key.CapsLock,
+        });
 
-		def.rejectWith(this, [new Error()]);
-
-		return promise;
-	}
-
-	function count() {
-		var def = request();
-		return def.then<number>(data => {
-			try {
-				var count: number = parseInt(data.count, 10);
-			} catch (err) {
-				return $.Deferred<number>().reject(err).promise();
-			}
-			return $.Deferred<number>().resolve(count).promise();
-		});
-	}
-
-	count().done(data => {
-	}).fail((exception: Error) => {
-	});
+        e.mySpecialKeyCode === JQuery.Key.NumLock;
+    }
 }
 
-function test_promise_then_not_return_deferred() {
-  var state: string;
+function jqXHR() {
+    function catch_returnType() {
+        // $ExpectType Deferred<void, never, any>
+        $.ajax('/echo').catch(() => { });
+    }
 
-  var deferred: JQueryDeferred<any> = $.Deferred();
-  state = deferred.state();
-  deferred = deferred.progress();
-  deferred = deferred.done();
-  deferred = deferred.fail();
-  deferred = deferred.always();
-  deferred = deferred.notify();
-  deferred = deferred.resolve();
-  deferred = deferred.reject();
-  promise = deferred.promise();
-  promise = deferred.then(function () { });
+    function catch_throw_returnType() {
+        // $ExpectType Deferred<never, any, never>
+        $.ajax('/echo').catch((reason) => {
+            throw new Error();
+        });
+    }
 
-  var promise: JQueryPromise<any> = $.Deferred().promise();
-  state = promise.state();
-  promise = promise.then(function () { });
-  promise = promise.progress();
-  promise = promise.done();
-  promise = promise.fail();
-  promise = promise.always();
+    function then_returnType() {
+        // $ExpectType Deferred<void, any, any>
+        $.ajax('/echo').then(() => { });
+    }
+
+    function throw_from_catch() {
+        $.ajax('/echo').catch(() => {
+            throw new Error('Thrown from [jQuery] 1st catch block');
+        }).then((value) => {
+            // $ExpectType never
+            value;
+        }).catch((reason) => {
+            // $ExpectType any
+            reason;
+        }).then((value) => {
+            // $ExpectType void
+            value;
+        });
+    }
+
+    function fail() {
+        $.ajax('/echo').fail((jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // This test is flaky
+            // Should be 'ErrorTextStatus | null' and should be able to handle it out of order
+            // $ExpectType "timeout" | "error" | "abort" | "parsererror" | null
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        });
+    }
 }
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
new file mode 100644
index 0000000000..961e239192
--- /dev/null
+++ b/types/jquery/test/example-tests.ts
@@ -0,0 +1,5003 @@
+/* tslint:disable:no-arg object-literal-shorthand one-variable-per-declaration only-arrow-functions prefer-const prefer-for-of triple-equals no-var */
+
+function examples() {
+    function add_0() {
+        $('div').css('border', '2px solid red')
+            .add('p')
+            .css('background', 'yellow');
+    }
+
+    function add_1() {
+        $('p').add('span').css('background', 'yellow');
+    }
+
+    function add_2() {
+        $('p').clone().add('<span>Again</span>').appendTo(document.body);
+    }
+
+    function add_3() {
+        $('p').add(document.getElementById('a')!).css('background', 'yellow');
+    }
+
+    function add_4() {
+        var collection = $('p');
+        // Capture the new collection
+        collection = collection.add(document.getElementById('a')!);
+        collection.css('background', 'yellow');
+    }
+
+    function add_back_0() {
+        $('div.left, div.right').find('div, div > p').addClass('border');
+
+        // First Example
+        $('div.before-addback').find('p').addClass('background');
+
+        // Second Example
+        $('div.after-addback').find('p').addBack().addClass('background');
+    }
+
+    function add_class_0() {
+        $('p').last().addClass('selected');
+    }
+
+    function add_class_1() {
+        $('p:last').addClass('selected highlight');
+    }
+
+    function add_class_2() {
+        $('div').addClass(function(index, currentClass) {
+            var addedClass = '';
+
+            if (currentClass === 'red') {
+                addedClass = 'green';
+                $('p').text('There is one green div');
+            }
+
+            return addedClass;
+        });
+    }
+
+    function after_0() {
+        $('p').after('<b>Hello</b>');
+    }
+
+    function after_1() {
+        $('p').after(document.createTextNode('Hello'));
+    }
+
+    function after_2() {
+        $('p').after($('b'));
+    }
+
+    function ajax_complete_0() {
+        $(document).ajaxComplete(function(event, request, settings) {
+            $('#msg').append('<li>Request Complete.</li>');
+        });
+    }
+
+    function ajax_error_0() {
+        $(document).ajaxError(function(event, request, settings) {
+            $('#msg').append('<li>Error requesting page ' + settings.url + '</li>');
+        });
+    }
+
+    function ajax_send_0() {
+        $(document).ajaxSend(function(event, request, settings) {
+            $('#msg').append('<li>Starting request at ' + settings.url + '</li>');
+        });
+    }
+
+    function ajax_start_0() {
+        $(document).ajaxStart(function() {
+            $('#loading').show();
+        });
+    }
+
+    function ajax_stop_0() {
+        $(document).ajaxStop(function() {
+            $('#loading').hide();
+        });
+    }
+
+    function ajax_success_0() {
+        $(document).ajaxSuccess(function(event, request, settings) {
+            $('#msg').append('<li>Successful Request!</li>');
+        });
+    }
+
+    function all_0() {
+        var elementCount = $('*').css('border', '3px solid red').length;
+        $('body').prepend('<h3>' + elementCount + ' elements found</h3>');
+    }
+
+    function all_1() {
+        var elementCount = $('#test').find('*').css('border', '3px solid red').length;
+        $('body').prepend('<h3>' + elementCount + ' elements found</h3>');
+    }
+
+    function animate_0() {
+        // Using multiple unit types within one animation.
+
+        $('#go').click(function() {
+            $('#block').animate({
+                width: '70%',
+                opacity: 0.4,
+                marginLeft: '0.6in',
+                fontSize: '3em',
+                borderWidth: '10px',
+            }, 1500);
+        });
+    }
+
+    function animate_1() {
+        $('#right').click(function() {
+            $('.block').animate({ left: '+=50px' }, 'slow');
+        });
+
+        $('#left').click(function() {
+            $('.block').animate({ left: '-=50px' }, 'slow');
+        });
+    }
+
+    function animate_2() {
+        $('#go1').click(function() {
+            $('#block1')
+                .animate({
+                    width: '90%',
+                }, {
+                    queue: false,
+                    duration: 3000,
+                })
+                .animate({ fontSize: '24px' }, 1500)
+                .animate({ borderRightWidth: '15px' }, 1500);
+        });
+
+        $('#go2').click(function() {
+            $('#block2')
+                .animate({ width: '90%' }, 1000)
+                .animate({ fontSize: '24px' }, 1000)
+                .animate({ borderLeftWidth: '15px' }, 1000);
+        });
+
+        $('#go3').click(function() {
+            $('#go1').add('#go2').click();
+        });
+
+        $('#go4').click(function() {
+            $('div').css({
+                width: '',
+                fontSize: '',
+                borderWidth: '',
+            });
+        });
+    }
+
+    function animate_3() {
+        $('#go').click(function() {
+            $('.block:first').animate({
+                left: 100,
+            }, {
+                duration: 1000,
+                step: function(now, fx) {
+                    $('.block:gt(0)').css('left', now);
+                },
+            });
+        });
+    }
+
+    function animate_4() {
+        $('p').animate({
+            height: 'toggle',
+            opacity: 'toggle',
+        }, 'slow');
+    }
+
+    function animate_5() {
+        $('p').animate({
+            left: 50,
+            opacity: 1,
+        }, 500);
+    }
+
+    function animate_6() {
+        $('p').animate({
+            left: '50px',
+            opacity: 1,
+        }, {
+            duration: 500,
+            queue: false,
+        });
+    }
+
+    function animate_7() {
+        $('p').animate({
+            opacity: 'show',
+        }, 'slow', 'easein');
+    }
+
+    function animate_8() {
+        $('p').animate({
+            height: 'toggle',
+            opacity: 'toggle',
+        }, {
+            duration: 'slow',
+        });
+    }
+
+    function animate_9() {
+        $('p').animate({
+            opacity: 'show',
+        }, {
+            duration: 'slow',
+            easing: 'easein',
+        });
+    }
+
+    function animate_10() {
+        $('p').animate({
+            height: 200,
+            width: 400,
+            opacity: 0.5,
+        }, 1000, 'linear', function() {
+            alert('all done');
+        });
+    }
+
+    function animated_0() {
+        $('#run').click(function() {
+            $('div:animated').toggleClass('colored');
+        });
+
+        function animateIt() {
+            $('#mover').slideToggle('slow', animateIt);
+        }
+
+        animateIt();
+    }
+
+    function append_0() {
+        $('p').append('<strong>Hello</strong>');
+    }
+
+    function append_1() {
+        $('p').append(document.createTextNode('Hello'));
+    }
+
+    function append_2() {
+        $('p').append($('strong'));
+    }
+
+    function append_to_0() {
+        $('span').appendTo('#foo');
+    }
+
+    function attr_0() {
+        $('input')
+            .change(function() {
+                var $input = $(this);
+                $('p').html('.attr( \'checked\' ): <b>' + $input.attr('checked') + '</b><br>' +
+                    '.prop( \'checked\' ): <b>' + $input.prop('checked') + '</b><br>' +
+                    '.is( \':checked\' ): <b>' + $input.is(':checked') + '</b>');
+            })
+            .change();
+    }
+
+    function attr_1() {
+        var title = $('em').attr('title')!;
+        $('div').text(title);
+    }
+
+    function attr_2() {
+        $('img').attr({
+            src: '/resources/hat.gif',
+            title: 'jQuery',
+            alt: 'jQuery Logo',
+        });
+        $('div').text($('img').attr('alt')!);
+    }
+
+    function attr_3() {
+        $('div')
+            .attr('id', function(arr) {
+                return 'div-id' + arr;
+            })
+            .each(function() {
+                $('span', this).html('(id = \'<b>' + this.id + '</b>\')');
+            });
+    }
+
+    function attr_4() {
+        $('img').attr('src', function() {
+            return '/resources/' + this.title;
+        });
+    }
+
+    function attribute_contains_prefix_0() {
+        $('a[hreflang|=\'en\']').css('border', '3px dotted green');
+    }
+
+    function attribute_contains_0() {
+        $('input[name*=\'man\']').val('has man in it!');
+    }
+
+    function attribute_contains_word_0() {
+        $('input[name~=\'man\']').val('mr. man is in it!');
+    }
+
+    function attribute_ends_with_0() {
+        $('input[name$=\'letter\']').val('a letter');
+    }
+
+    function attribute_equals_0() {
+        $('input[value=\'Hot Fuzz\']').next().text('Hot Fuzz');
+    }
+
+    function attribute_not_equal_0() {
+        $('input[name!=\'newsletter\']').next().append('<b>; not newsletter</b>');
+    }
+
+    function attribute_starts_with_0() {
+        $('input[name^=\'news\']').val('news here!');
+    }
+
+    function before_0() {
+        $('p').before('<b>Hello</b>');
+    }
+
+    function before_1() {
+        $('p').before(document.createTextNode('Hello'));
+    }
+
+    function before_2() {
+        $('p').before($('b'));
+    }
+
+    function bind_0() {
+        $('p').bind('click', function(event) {
+            var str = '( ' + event.pageX + ', ' + event.pageY + ' )';
+            $('span').text('Click happened! ' + str);
+        });
+        $('p').bind('dblclick', function() {
+            $('span').text('Double-click happened in ' + this.nodeName);
+        });
+        $('p').bind('mouseenter mouseleave', function(event) {
+            $(this).toggleClass('over');
+        });
+    }
+
+    function bind_1() {
+        $('p').bind('click', function() {
+            alert($(this).text());
+        });
+    }
+
+    function bind_2() {
+        function handler(event: JQuery.Event<HTMLElement, any>) {
+            alert(event.data.foo);
+        }
+
+        $('p').bind('click', {
+            foo: 'bar',
+        }, handler);
+    }
+
+    function bind_3() {
+        $('form').bind('submit', function() {
+            return false;
+        });
+    }
+
+    function bind_4() {
+        $('form').bind('submit', function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function bind_5() {
+        $('form').bind('submit', function(event) {
+            event.stopPropagation();
+        });
+    }
+
+    function bind_6() {
+        $('p').bind('myCustomEvent', function(e, myName, myValue) {
+            $(this).text(myName + ', hi there!');
+            $('span')
+                .stop()
+                .css('opacity', 1)
+                .text('myName = ' + myName)
+                .fadeIn(30)
+                .fadeOut(1000);
+        });
+        $('button').click(function() {
+            $('p').trigger('myCustomEvent', ['John']);
+        });
+    }
+
+    function bind_7() {
+        $('div.test').bind({
+            click: function() {
+                $(this).addClass('active');
+            },
+            mouseenter: function() {
+                $(this).addClass('inside');
+            },
+            mouseleave: function() {
+                $(this).removeClass('inside');
+            },
+        });
+    }
+
+    function blur_0() {
+        $('p').blur();
+    }
+
+    function button_0() {
+        var input = $(':button').addClass('marked');
+        $('div').text('For this type jQuery found ' + input.length + '.');
+        // Prevent the form from submitting
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function callbacks_add_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo: ' + value);
+        };
+
+        // Another function to also be added to the list
+        var bar = function(value: string) {
+            console.log('bar: ' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the function "foo" to the list
+        callbacks.add(foo);
+
+        // Fire the items on the list
+        callbacks.fire('hello');
+        // Outputs: "foo: hello"
+
+        // Add the function "bar" to the list
+        callbacks.add(bar);
+
+        // Fire the items on the list again
+        callbacks.fire('world');
+
+        // Outputs:
+        // "foo: world"
+        // "bar: world"
+    }
+
+    function callbacks_disable_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log(value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the above function to the list
+        callbacks.add(foo);
+
+        // Fire the items on the list
+        callbacks.fire('foo');
+        // Outputs: foo
+
+        // Disable further calls being possible
+        callbacks.disable();
+
+        // Attempt to fire with "foobar" as an argument
+        callbacks.fire('foobar');
+        // foobar isn't output
+    }
+
+    function callbacks_disabled_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo:' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the logging function to the callback list
+        callbacks.add(foo);
+
+        // Fire the items on the list, passing an argument
+        callbacks.fire('hello');
+        // Outputs "foo: hello"
+
+        // Disable the callbacks list
+        callbacks.disable();
+
+        // Test the disabled state of the list
+        console.log(callbacks.disabled());
+        // Outputs: true
+    }
+
+    function callbacks_empty_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value1: string, value2: string) {
+            console.log('foo: ' + value1 + ',' + value2);
+        };
+
+        // Another function to also be added to the list
+        var bar = function(value1: string, value2: string) {
+            console.log('bar: ' + value1 + ',' + value2);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the two functions
+        callbacks.add(foo);
+        callbacks.add(bar);
+
+        // Empty the callbacks list
+        callbacks.empty();
+
+        // Check to ensure all callbacks have been removed
+        console.log(callbacks.has(foo));
+        // false
+        console.log(callbacks.has(bar));
+        // false
+    }
+
+    function callbacks_fire_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo:' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the function "foo" to the list
+        callbacks.add(foo);
+
+        // Fire the items on the list
+        callbacks.fire('hello'); // Outputs: "foo: hello"
+        callbacks.fire('world'); // Outputs: "foo: world"
+
+        // Add another function to the list
+        var bar = function(value: string) {
+            console.log('bar:' + value);
+        };
+
+        // Add this function to the list
+        callbacks.add(bar);
+
+        // Fire the items on the list again
+        callbacks.fire('hello again');
+        // Outputs:
+        // "foo: hello again"
+        // "bar: hello again"
+    }
+
+    function callbacks_fired_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo:' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the function "foo" to the list
+        callbacks.add(foo);
+
+        // Fire the items on the list
+        callbacks.fire('hello'); // Outputs: "foo: hello"
+        callbacks.fire('world'); // Outputs: "foo: world"
+
+        // Test to establish if the callbacks have been called
+        console.log(callbacks.fired());
+    }
+
+    function callbacks_fire_with_0() {
+        // A sample logging function to be added to a callbacks list
+        var log = function(value1: string, value2: string) {
+            console.log('Received: ' + value1 + ',' + value2);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the log method to the callbacks list
+        callbacks.add(log);
+
+        // Fire the callbacks on the list using the context "window"
+        // and an arguments array
+
+        callbacks.fireWith(window, ['foo', 'bar']);
+        // Outputs: "Received: foo, bar"
+    }
+
+    function callbacks_has_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value1: string, value2: string) {
+            console.log('Received: ' + value1 + ',' + value2);
+        };
+
+        // A second function which will not be added to the list
+        var bar = function(value1: string, value2: string) {
+            console.log('foobar');
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the log method to the callbacks list
+        callbacks.add(foo);
+
+        // Determine which callbacks are in the list
+        console.log(callbacks.has(foo));
+        // true
+        console.log(callbacks.has(bar));
+        // false
+    }
+
+    function callbacks_lock_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo:' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the logging function to the callback list
+        callbacks.add(foo);
+
+        // Fire the items on the list, passing an argument
+        callbacks.fire('hello');
+        // Outputs "foo: hello"
+
+        // Lock the callbacks list
+        callbacks.lock();
+
+        // Try firing the items again
+        callbacks.fire('world');
+
+        // As the list was locked, no items were called,
+        // so "world" isn't logged
+    }
+
+    function callbacks_lock_1() {
+        // Simple function for logging results
+        var log = function(value: string) {
+            $('#log').append('<p>' + value + '</p>');
+        };
+
+        // Two sample functions to be added to a callbacks list
+        var foo = function(value: string) {
+            log('foo: ' + value);
+        };
+        var bar = function(value: string) {
+            log('bar: ' + value);
+        };
+
+        // Create the callbacks object with the "memory" flag
+        var callbacks = $.Callbacks('memory');
+
+        // Add the foo logging function to the callback list
+        callbacks.add(foo);
+
+        // Fire the items on the list, passing an argument
+        callbacks.fire('hello');
+        // Outputs "foo: hello"
+
+        // Lock the callbacks list
+        callbacks.lock();
+
+        // Try firing the items again
+        callbacks.fire('world');
+        // As the list was locked, no items were called,
+        // so "foo: world" isn't logged
+
+        // Add the foo function to the callback list again
+        callbacks.add(foo);
+
+        // Try firing the items again
+        callbacks.fire('silentArgument');
+        // Outputs "foo: hello" because the argument value was stored in memory
+
+        // Add the bar function to the callback list
+        callbacks.add(bar);
+
+        callbacks.fire('youHadMeAtHello');
+        // Outputs "bar: hello" because the list is still locked,
+        // and the argument value is still stored in memory
+    }
+
+    function callbacks_locked_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo: ' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the logging function to the callback list
+        callbacks.add(foo);
+
+        // Fire the items on the list, passing an argument
+        callbacks.fire('hello');
+        // Outputs "foo: hello"
+
+        // Lock the callbacks list
+        callbacks.lock();
+
+        // Test the lock-state of the list
+        console.log(callbacks.locked());
+        // true
+    }
+
+    function callbacks_remove_0() {
+        // A sample logging function to be added to a callbacks list
+        var foo = function(value: string) {
+            console.log('foo: ' + value);
+        };
+
+        var callbacks = $.Callbacks();
+
+        // Add the function "foo" to the list
+        callbacks.add(foo);
+
+        // Fire the items on the list
+        callbacks.fire('hello');
+        // Outputs: "foo: hello"
+
+        // Remove "foo" from the callback list
+        callbacks.remove(foo);
+
+        // Fire the items on the list again
+        callbacks.fire('world');
+
+        // Nothing output as "foo" is no longer in the list
+    }
+
+    function change_0() {
+        $('select')
+            .change(function() {
+                var str = '';
+                $('select option:selected').each(function() {
+                    str += $(this).text() + ' ';
+                });
+                $('div').text(str);
+            })
+            .change();
+    }
+
+    function change_1() {
+        $('input[type=\'text\']').change(function() {
+            // Check input( $( this ).val() ) for validity here
+        });
+    }
+
+    function checkbox_0() {
+        var input = $('form input:checkbox')
+            .wrap('<span></span>')
+            .parent()
+            .css({
+                background: 'yellow',
+                border: '3px red solid',
+            });
+
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+
+        // Prevent the form from submitting
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function checked_0() {
+        var countChecked = function() {
+            var n = $('input:checked').length;
+            $('div').text(n + (n === 1 ? ' is' : ' are') + ' checked!');
+        };
+        countChecked();
+
+        $('input[type=checkbox]').on('click', countChecked);
+    }
+
+    function checked_1() {
+        $('input').on('click', function() {
+            $('#log').html($('input:checked').val() + ' is checked!');
+        });
+    }
+
+    function child_0() {
+        $('ul.topnav > li').css('border', '3px double red');
+    }
+
+    function children_0() {
+        $('#container').click(function(event) {
+            $('*').removeClass('hilite');
+            var kids = $(event.target).children();
+            var len = kids.addClass('hilite').length;
+
+            $('#results span:first').text(len);
+            $('#results span:last').text((<HTMLElement> event.target).tagName);
+
+            event.preventDefault();
+        });
+    }
+
+    function children_1() {
+        $('div').children().css('border-bottom', '3px double red');
+    }
+
+    function children_2() {
+        $('div').children('.selected').css('color', 'blue');
+    }
+
+    function class_0() {
+        $('.myClass').css('border', '3px solid red');
+    }
+
+    function class_1() {
+        $('.myclass.otherclass').css('border', '13px solid red');
+    }
+
+    function clear_queue_0() {
+        $('#start').click(function() {
+            var myDiv = $('div');
+            myDiv.show('slow');
+            myDiv.animate({
+                left: '+=200',
+            }, 5000);
+
+            myDiv.queue(function() {
+                var that = $(this);
+                that.addClass('newcolor');
+                that.dequeue();
+            });
+
+            myDiv.animate({
+                left: '-=200',
+            }, 1500);
+            myDiv.queue(function() {
+                var that = $(this);
+                that.removeClass('newcolor');
+                that.dequeue();
+            });
+            myDiv.slideUp();
+        });
+
+        $('#stop').click(function() {
+            var myDiv = $('div');
+            myDiv.clearQueue();
+            myDiv.stop();
+        });
+    }
+
+    function click_0() {
+        $('p').click(function() {
+            $(this).slideUp();
+        });
+    }
+
+    function click_1() {
+        $('p').click();
+    }
+
+    function clone_0() {
+        $('b').clone().prependTo('p');
+    }
+
+    function closest_0() {
+        $(document).on('click', function(event) {
+            $(event.target).closest('li').toggleClass('hilight');
+        });
+    }
+
+    function closest_1() {
+        var listElements = $('li').css('color', 'blue');
+        $(document).on('click', function(event) {
+            $(event.target).closest(listElements).toggleClass('hilight');
+        });
+    }
+
+    function contains_0() {
+        $('div:contains(\'John\')').css('text-decoration', 'underline');
+    }
+
+    function contents_0() {
+        $('p')
+            .contents()
+            .filter(function() {
+                return this.nodeType !== 1;
+            })
+            .wrap('<b></b>');
+    }
+
+    function contents_1() {
+        $('#frameDemo').contents().find('a').css('background-color', '#BADA55');
+    }
+
+    function contextmenu_0() {
+        $('p').contextmenu(function() {
+            alert('Hello World!');
+        });
+    }
+
+    function contextmenu_1() {
+        var div = $('div:first');
+        div.contextmenu(function() {
+            div.toggleClass('contextmenu');
+        });
+    }
+
+    function css_0() {
+        $('div').click(function() {
+            var color = $(this).css('background-color');
+            $('#result').html('That div is <span style=\'color:' +
+                color + ';\'>' + color + '</span>.');
+        });
+    }
+
+    function css_1() {
+        $('div').click(function() {
+            var html = ['The clicked div has the following styles:'];
+
+            var styleProps = $(this).css([
+                'width', 'height', 'color', 'background-color',
+            ]);
+            $.each(styleProps, function(prop, value) {
+                html.push(prop + ': ' + value);
+            });
+
+            $('#result').html(html.join('<br>'));
+        });
+    }
+
+    function css_2() {
+        $('p').on('mouseover', function() {
+            $(this).css('color', 'red');
+        });
+    }
+
+    function css_3() {
+        $('#box').one('click', function() {
+            $(this).css('width', '+=200');
+        });
+    }
+
+    function css_4() {
+        var words = $('p').first().text().split(/\s+/);
+        var text = words.join('</span> <span>');
+        $('p').first().html('<span>' + text + '</span>');
+        $('span').on('click', function() {
+            $(this).css('background-color', 'yellow');
+        });
+    }
+
+    function css_5() {
+        $('p')
+            .on('mouseenter', function() {
+                $(this).css({
+                    'background-color': 'yellow',
+                    'font-weight': 'bolder',
+                });
+            })
+            .on('mouseleave', function() {
+                var styles = {
+                    backgroundColor: '#ddd',
+                    fontWeight: '',
+                };
+                $(this).css(styles);
+            });
+    }
+
+    function css_6() {
+        $('div').on('click', function() {
+            $(this).css({
+                width: function(index, value) {
+                    return parseFloat(value) * 1.2;
+                },
+                height: function(index, value) {
+                    return parseFloat(value) * 1.2;
+                },
+            });
+        });
+    }
+
+    function data_0() {
+        $('div').data('test', { first: 16, last: 'pizza!' });
+        $('span:first').text($('div').data('test').first);
+        $('span:last').text($('div').data('test').last);
+    }
+
+    function data_1() {
+        $('button').click(function() {
+            var value;
+
+            switch ($('button').index(this)) {
+                case 0 :
+                    value = $('div').data('blah');
+                    break;
+                case 1 :
+                    $('div').data('blah', 'hello');
+                    value = 'Stored!';
+                    break;
+                case 2 :
+                    $('div').data('blah', 86);
+                    value = 'Stored!';
+                    break;
+                case 3 :
+                    $('div').removeData('blah');
+                    value = 'Removed!';
+                    break;
+            }
+
+            $('span').text('' + value);
+        });
+    }
+
+    function data_2() {
+        $('button').click(function() {
+            var value;
+
+            switch ($('button').index(this)) {
+                case 0 :
+                    value = $('div').data('blah');
+                    break;
+                case 1 :
+                    $('div').data('blah', 'hello');
+                    value = 'Stored!';
+                    break;
+                case 2 :
+                    $('div').data('blah', 86);
+                    value = 'Stored!';
+                    break;
+                case 3 :
+                    $('div').removeData('blah');
+                    value = 'Removed!';
+                    break;
+            }
+
+            $('span').text('' + value);
+        });
+    }
+
+    function dblclick_0() {
+        $('p').dblclick(function() {
+            alert('Hello World!');
+        });
+    }
+
+    function dblclick_1() {
+        var divdbl = $('div:first');
+        divdbl.dblclick(function() {
+            divdbl.toggleClass('dbl');
+        });
+    }
+
+    function deferred_always_0() {
+        $.get('test.php').always(function() {
+            alert('$.get completed with success or error callback arguments');
+        });
+    }
+
+    function deferred_catch_0() {
+        $.get('test.php')
+            .then(function() {
+                alert('$.get succeeded');
+            })
+            .catch(function() {
+                alert('$.get failed!');
+            });
+    }
+
+    function deferred_done_0() {
+        $.get('test.php').done(function() {
+            alert('$.get succeeded');
+        });
+    }
+
+    function deferred_done_1() {
+        // 3 functions to call when the Deferred object is resolved
+        function fn1() {
+            $('p').append(' 1 ');
+        }
+
+        function fn2() {
+            $('p').append(' 2 ');
+        }
+
+        function fn3(n: string) {
+            $('p').append(n + ' 3 ' + n);
+        }
+
+        // Create a deferred object
+        var dfd = $.Deferred();
+
+        // Add handlers to be called when dfd is resolved
+        dfd
+        // .done() can take any number of functions or arrays of functions
+            .done([fn1, fn2], fn3, [fn2, fn1])
+            // We can chain done methods, too
+            .done(function(n) {
+                $('p').append(n + ' we\'re done.');
+            });
+
+        // Resolve the Deferred object when the button is clicked
+        $('button').on('click', function() {
+            dfd.resolve('and');
+        });
+    }
+
+    function deferred_fail_0() {
+        $.get('test.php')
+            .done(function() {
+                alert('$.get succeeded');
+            })
+            .fail(function() {
+                alert('$.get failed!');
+            });
+    }
+
+    function deferred_pipe_0() {
+        var defer = $.Deferred<number>(),
+            filtered = defer.pipe(function(value) {
+                return value * 2;
+            });
+
+        defer.resolve(5);
+        filtered.done(function(value) {
+            alert('Value is ( 2*5 = ) 10: ' + value);
+        });
+    }
+
+    function deferred_pipe_1() {
+        var defer = $.Deferred<number>(),
+            filtered = defer.pipe(null, function(value) {
+                return value * 3;
+            });
+
+        defer.reject(6);
+        filtered.fail(function(value) {
+            alert('Value is ( 3*6 = ) 18: ' + value);
+        });
+    }
+
+    function deferred_pipe_2(url: string, url2: string) {
+        var request = $.ajax(url, { dataType: 'json' }),
+            chained = request.pipe(function(data) {
+                return $.ajax(url2, { data: { user: data.userId } });
+            });
+
+        chained.done(function(data) {
+            // data retrieved from url2 as provided by the first request
+        });
+    }
+
+    function deferred_promise_0() {
+        function asyncEvent() {
+            var dfd = jQuery.Deferred<string>();
+
+            // Resolve after a random interval
+            setTimeout(function() {
+                dfd.resolve('hurray');
+            }, Math.floor(400 + Math.random() * 2000));
+
+            // Reject after a random interval
+            setTimeout(function() {
+                dfd.reject('sorry');
+            }, Math.floor(400 + Math.random() * 2000));
+
+            // Show a "working..." message every half-second
+            setTimeout(function working() {
+                if (dfd.state() === 'pending') {
+                    dfd.notify('working... ');
+                    setTimeout(working, 500);
+                }
+            }, 1);
+
+            // Return the Promise so caller can't change the Deferred
+            return dfd.promise();
+        }
+
+        // Attach a done, fail, and progress handler for the asyncEvent
+        $.when(asyncEvent()).then(
+            function(status) {
+                status === 3;
+                alert(status + ', things are going well');
+            },
+            function(status) {
+                alert(status + ', you fail this time');
+            },
+            function(status) {
+                // $('body').append(status);
+            },
+        );
+    }
+
+    function deferred_promise_1() {
+        // Existing object
+        var obj = {
+                hello: function(name: string) {
+                    alert('Hello ' + name);
+                },
+            },
+            // Create a Deferred
+            defer = $.Deferred<string>();
+
+        // Set object as a promise
+        var _obj = defer.promise(obj);
+
+        // Resolve the deferred
+        defer.resolve('John');
+
+        // Use the object as a Promise
+        _obj.done(function(name) {
+            _obj.hello(name); // Will alert "Hello John"
+        });
+        /// TODO: This doesn't work even though .done() returns this
+        //     .hello('Karl'); // Will alert "Hello Karl"
+    }
+
+    function deferred_then_0() {
+        $.get('test.php').then(
+            function() {
+                alert('$.get succeeded');
+            }, function() {
+                alert('$.get failed!');
+            },
+        );
+    }
+
+    function deferred_then_1() {
+        var filterResolve = function() {
+            var defer = $.Deferred<number>(),
+                filtered = defer.then(function(value) {
+                    return value * 2;
+                });
+
+            defer.resolve(5);
+            filtered.done(function(value) {
+                $('p').html('Value is ( 2*5 = ) 10: ' + value);
+            });
+        };
+
+        $('button').on('click', filterResolve);
+    }
+
+    function deferred_then_2() {
+        var defer = $.Deferred(),
+            filtered = defer.then(null, function(value) {
+                return value * 3;
+            });
+
+        defer.reject(6);
+        filtered.fail(function(value) {
+            alert('Value is ( 3*6 = ) 18: ' + value);
+        });
+    }
+
+    function deferred_then_3(url: string, url2: string) {
+        var request = $.ajax(url, { dataType: 'json' }),
+            chained = request.then(function(data) {
+                return $.ajax(url2, { data: { user: data.userId } });
+            });
+
+        chained.done(function(data) {
+            // data retrieved from url2 as provided by the first request
+        });
+    }
+
+    function delay_0() {
+        $('button').click(function() {
+            $('div.first').slideUp(300).delay(800).fadeIn(400);
+            $('div.second').slideUp(300).fadeIn(400);
+        });
+    }
+
+    function delegate_0() {
+        $('body').delegate('p', 'click', function() {
+            $(this).after('<p>Another paragraph!</p>');
+        });
+    }
+
+    function delegate_1() {
+        $('body').delegate('p', 'click', function() {
+            alert($(this).text());
+        });
+    }
+
+    function delegate_2() {
+        $('body').delegate('a', 'click', function() {
+            return false;
+        });
+    }
+
+    function delegate_3() {
+        $('body').delegate('a', 'click', function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function delegate_4() {
+        $('body').delegate('p', 'myCustomEvent', function(e, myName, myValue) {
+            $(this).text('Hi there!');
+            $('span')
+                .stop()
+                .css('opacity', 1)
+                .text('myName = ' + myName)
+                .fadeIn(30)
+                .fadeOut(1000);
+        });
+        $('button').click(function() {
+            $('p').trigger('myCustomEvent');
+        });
+    }
+
+    function dequeue_0() {
+        $('button').click(function() {
+            $('div')
+                .animate({ left: '+=200px' }, 2000)
+                .animate({ top: '0px' }, 600)
+                .queue(function() {
+                    $(this).toggleClass('red').dequeue();
+                })
+                .animate({ left: '10px', top: '30px' }, 700);
+        });
+    }
+
+    function descendant_0() {
+        $('form input').css('border', '2px dotted blue');
+        $('form fieldset input').css('backgroundColor', 'yellow');
+    }
+
+    function detach_0() {
+        $('p').click(function() {
+            $(this).toggleClass('off');
+        });
+        var p: JQuery | null;
+        $('button').click(function() {
+            if (p) {
+                p.appendTo('body');
+                p = null;
+            } else {
+                p = $('p').detach();
+            }
+        });
+    }
+
+    function disabled_0() {
+        $('input:disabled').val('this is it');
+    }
+
+    function each_0() {
+        $(document.body).click(function() {
+            $('div').each(function(i) {
+                if (this.style.color !== 'blue') {
+                    this.style.color = 'blue';
+                } else {
+                    this.style.color = '';
+                }
+            });
+        });
+    }
+
+    function each_1() {
+        $('span').click(function() {
+            $('li').each(function() {
+                $(this).toggleClass('example');
+            });
+        });
+    }
+
+    function each_2() {
+        $('button').click(function() {
+            $('div').each(function(index, element) {
+                // element == this
+                $(element).css('backgroundColor', 'yellow');
+                if ($(this).is('#stop')) {
+                    $('span').text('Stopped at div index #' + index);
+                    return false;
+                }
+            });
+        });
+    }
+
+    function element_0() {
+        $('div').css('border', '9px solid red');
+    }
+
+    function empty_0() {
+        $('td:empty')
+            .text('Was empty!')
+            .css('background', 'rgb(255,220,200)');
+    }
+
+    function empty_1() {
+        $('button').click(function() {
+            $('p').empty();
+        });
+    }
+
+    function enabled_0() {
+        $('input:enabled').val('this is it');
+    }
+
+    function end_1() {
+        $('p')
+            .find('span')
+            .end()
+            .css('border', '2px red solid');
+    }
+
+    function eq_0() {
+        $('td:eq( 2 )').css('color', 'red');
+    }
+
+    function eq_1() {
+        // Applies yellow background color to a single <li>
+        $('ul.nav li:eq(1)').css('backgroundColor', '#ff0');
+
+        // Applies italics to text of the second <li> within each <ul class="nav">
+        $('ul.nav').each(function(index) {
+            $(this).find('li:eq(1)').css('fontStyle', 'italic');
+        });
+
+        // Applies red text color to descendants of <ul class="nav">
+        // for each <li> that is the second child of its parent
+        $('ul.nav li:nth-child(2)').css('color', 'red');
+    }
+
+    function eq_2() {
+        $('li:eq(-2)').addClass('foo');
+    }
+
+    function eq_3() {
+        $('body').find('div').eq(2).addClass('blue');
+    }
+
+    function even_0() {
+        $('tr:even').css('background-color', '#bbf');
+    }
+
+    function event_current_target_0() {
+        $('p').click(function(event) {
+            alert(event.currentTarget === this); // true
+        });
+    }
+
+    function event_data_0() {
+        var logDiv = $('#log');
+
+        for (var i = 0; i < 5; i++) {
+            const j = i;
+            $('button').eq(i).on('click', { value: i }, function(event) {
+                var msgs = [
+                    'button = ' + $(this).index(),
+                    'event.data.value = ' + event.data.value,
+                    'i = ' + j,
+                ];
+                logDiv.append(msgs.join(', ') + '<br>');
+            });
+        }
+    }
+
+    function event_delegate_target_0() {
+        $('.box').on('click', 'button', function(event) {
+            $(event.delegateTarget).css('background-color', 'red');
+        });
+    }
+
+    function event_is_default_prevented_0() {
+        $('a').click(function(event) {
+            alert(event.isDefaultPrevented()); // false
+            event.preventDefault();
+            alert(event.isDefaultPrevented()); // true
+        });
+    }
+
+    function event_is_immediate_propagation_stopped_0() {
+        function immediatePropStopped(event: JQuery.Event) {
+            var msg = '';
+            if (event.isImmediatePropagationStopped()) {
+                msg = 'called';
+            } else {
+                msg = 'not called';
+            }
+            $('#stop-log').append('<div>' + msg + '</div>');
+        }
+
+        $('button').click(function(event) {
+            immediatePropStopped(event);
+            event.stopImmediatePropagation();
+            immediatePropStopped(event);
+        });
+    }
+
+    function event_is_propagation_stopped_0() {
+        function propStopped(event: JQuery.Event) {
+            var msg = '';
+            if (event.isPropagationStopped()) {
+                msg = 'called';
+            } else {
+                msg = 'not called';
+            }
+            $('#stop-log').append('<div>' + msg + '</div>');
+        }
+
+        $('button').click(function(event) {
+            propStopped(event);
+            event.stopPropagation();
+            propStopped(event);
+        });
+    }
+
+    function event_meta_key_0() {
+        $('#checkMetaKey').click(function(event) {
+            $('#display').text(event.metaKey);
+        });
+    }
+
+    function event_namespace_0() {
+        $('p').on('test.something', function(event) {
+            alert(event.namespace);
+        });
+        $('button').click(function(event) {
+            $('p').trigger('test.something');
+        });
+    }
+
+    function event_page_x_0() {
+        $(document).on('mousemove', function(event) {
+            $('#log').text('pageX: ' + event.pageX + ', pageY: ' + event.pageY);
+        });
+    }
+
+    function event_page_y_0() {
+        $(document).on('mousemove', function(event) {
+            $('#log').text('pageX: ' + event.pageX + ', pageY: ' + event.pageY);
+        });
+    }
+
+    function event_prevent_default_0() {
+        $('a').click(function(event) {
+            event.preventDefault();
+            $('<div>')
+                .append('default ' + event.type + ' prevented')
+                .appendTo('#log');
+        });
+    }
+
+    function event_related_target_0() {
+        $('a').mouseout(function(event) {
+            alert((<HTMLElement> event.relatedTarget).nodeName); // "DIV"
+        });
+    }
+
+    function event_result_0() {
+        $('button').click(function(event) {
+            return 'hey';
+        });
+        $('button').click(function(event) {
+            $('p').html(event.result);
+        });
+    }
+
+    function event_stop_immediate_propagation_0() {
+        $('p').click(function(event) {
+            event.stopImmediatePropagation();
+        });
+        $('p').click(function(event) {
+            // This function won't be executed
+            $(this).css('background-color', '#f00');
+        });
+        $('div').click(function(event) {
+            // This function will be executed
+            $(this).css('background-color', '#f00');
+        });
+    }
+
+    function event_stop_propagation_0() {
+        $('p').click(function(event) {
+            event.stopPropagation();
+            // Do something
+        });
+    }
+
+    function event_target_0() {
+        $('body').click(function(event) {
+            $('#log').html('clicked: ' + (<HTMLElement> event.target).nodeName);
+        });
+    }
+
+    function event_target_1() {
+        function handler(event: JQuery.Event) {
+            var target = $(event.target);
+            if (target.is('li')) {
+                target.children().toggle();
+            }
+        }
+
+        $('ul').click(handler).find('ul').hide();
+    }
+
+    function event_time_stamp_0() {
+        var last: number,
+            diff: number;
+        $('div').click(function(event) {
+            if (last) {
+                diff = event.timeStamp - last;
+                $('div').append('time since last event: ' + diff + '<br>');
+            } else {
+                $('div').append('Click again.<br>');
+            }
+            last = event.timeStamp;
+        });
+    }
+
+    function event_type_0() {
+        $('a').click(function(event) {
+            alert(event.type); // "click"
+        });
+    }
+
+    function event_which_0() {
+        $('#whichkey').on('keydown', function(event) {
+            $('#log').html(event.type + ': ' + event.which);
+        });
+    }
+
+    function event_which_1() {
+        $('#whichkey').on('mousedown', function(event) {
+            $('#log').html(event.type + ': ' + event.which);
+        });
+    }
+
+    function fade_in_0() {
+        $(document.body).click(function() {
+            $('div:hidden:first').fadeIn('slow');
+        });
+    }
+
+    function fade_in_1() {
+        $('a').click(function() {
+            $('div').fadeIn(3000, function() {
+                $('span').fadeIn(100);
+            });
+            return false;
+        });
+    }
+
+    function fade_out_0() {
+        $('p').click(function() {
+            $('p').fadeOut('slow');
+        });
+    }
+
+    function fade_out_1() {
+        $('span').click(function() {
+            $(this).fadeOut(1000, function() {
+                $('div').text('\'' + $(this).text() + '\' has faded!');
+                $(this).remove();
+            });
+        });
+        $('span').hover(function() {
+            $(this).addClass('hilite');
+        }, function() {
+            $(this).removeClass('hilite');
+        });
+    }
+
+    function fade_out_2() {
+        $('#btn1').click(function() {
+            function complete(this: HTMLElement) {
+                $('<div>').text(this.id).appendTo('#log');
+            }
+
+            $('#box1').fadeOut(1600, 'linear', complete);
+            $('#box2').fadeOut(1600, complete);
+        });
+
+        $('#btn2').click(function() {
+            $('div').show();
+            $('#log').empty();
+        });
+    }
+
+    function fade_to_0() {
+        $('p:first').click(function() {
+            $(this).fadeTo('slow', 0.33);
+        });
+    }
+
+    function fade_to_1() {
+        $('div').click(function() {
+            $(this).fadeTo('fast', Math.random());
+        });
+    }
+
+    function fade_to_2() {
+        var getPos = function(n: number) {
+            return (Math.floor(n) * 90) + 'px';
+        };
+        $('p').each(function(n) {
+            var r = Math.floor(Math.random() * 3);
+            var tmp = $(this).text();
+            $(this).text($('p:eq(' + r + ')').text());
+            $('p:eq(' + r + ')').text(tmp);
+            $(this).css('left', getPos(n));
+        });
+        $('div')
+            .each(function(n) {
+                $(this).css('left', getPos(n));
+            })
+            .css('cursor', 'pointer')
+            .click(function() {
+                $(this).fadeTo(250, 0.25, function() {
+                    $(this)
+                        .css('cursor', '')
+                        .prev()
+                        .css({
+                            'font-weight': 'bolder',
+                            'font-style': 'italic',
+                        });
+                });
+            });
+    }
+
+    function fade_toggle_0() {
+        $('button:first').click(function() {
+            $('p:first').fadeToggle('slow', 'linear');
+        });
+        $('button:last').click(function() {
+            $('p:last').fadeToggle('fast', function() {
+                $('#log').append('<div>finished</div>');
+            });
+        });
+    }
+
+    function file_0() {
+        var input = $('input:file').css({
+            background: 'yellow',
+            border: '3px red solid',
+        });
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function filter_0() {
+        $('div')
+            .css('background', '#c8ebcc')
+            .filter('.middle')
+            .css('border-color', 'red');
+    }
+
+    function filter_1() {
+        $('div')
+            .css('background', '#b4b0da')
+            .filter(function(index) {
+                return index === 1 || $(this).attr('id') === 'fourth';
+            })
+            .css('border', '3px double red');
+    }
+
+    function filter_2() {
+        $('div').filter(document.getElementById('unique')!);
+    }
+
+    function filter_3() {
+        $('div').filter($('#unique'));
+    }
+
+    function find_0() {
+        $('p').find('span').css('color', 'red');
+    }
+
+    function find_1() {
+        var spans = $('span');
+        $('p').find(spans).css('color', 'red');
+    }
+
+    function find_2() {
+        var newText = $('p').text().split(' ').join('</span> <span>');
+        newText = '<span>' + newText + '</span>';
+
+        $('p')
+            .html(newText)
+            .find('span')
+            .hover(function() {
+                $(this).addClass('hilite');
+            }, function() {
+                $(this).removeClass('hilite');
+            })
+            .end()
+            .find(':contains(\'t\')')
+            .css({
+                'font-style': 'italic',
+                'font-weight': 'bolder',
+            });
+    }
+
+    function finish_0() {
+        var horiz = $('#path').width()! - 20,
+            vert = $('#path').height()! - 20;
+
+        var btns: { [key: string]: () => void; } = {
+            bstt: function() {
+                $('div.box').stop(true, true);
+            },
+            bs: function() {
+                $('div.box').stop();
+            },
+            bsft: function() {
+                $('div.box').stop(false, true);
+            },
+            bf: function() {
+                $('div.box').finish();
+            },
+            bcf: function() {
+                $('div.box').clearQueue().finish();
+            },
+            bsff: function() {
+                $('div.box').stop(false, false);
+            },
+            bstf: function() {
+                $('div.box').stop(true, false);
+            },
+            bcs: function() {
+                $('div.box').clearQueue().stop();
+            },
+        };
+
+        $('button.b').on('click', function() {
+            btns[this.id]();
+        });
+
+        $('#go').on('click', function() {
+            $('.box')
+                .clearQueue()
+                .stop()
+                .css({
+                    left: 10,
+                    top: 10,
+                })
+                .animate({
+                    top: vert,
+                }, 3000)
+                .animate({
+                    left: horiz,
+                }, 3000)
+                .animate({
+                    top: 10,
+                }, 3000);
+        });
+    }
+
+    function first_child_0() {
+        $('div span:first-child')
+            .css('text-decoration', 'underline')
+            .hover(function() {
+                $(this).addClass('sogreen');
+            }, function() {
+                $(this).removeClass('sogreen');
+            });
+    }
+
+    function first_of_type_0() {
+        $('span:first-of-type').addClass('fot');
+    }
+
+    function first_0() {
+        $('tr:first').css('font-style', 'italic');
+    }
+
+    function first_1() {
+        $('p span').first().addClass('highlight');
+    }
+
+    function focus_0() {
+        $('#content').delegate('*', 'focus blur', function() {
+            var elem = $(this);
+            setTimeout(function() {
+                elem.toggleClass('focused', elem.is(':focus'));
+            }, 0);
+        });
+    }
+
+    function focus_1() {
+        $('input').focus(function() {
+            $(this).next('span').css('display', 'inline').fadeOut(1000);
+        });
+    }
+
+    function focus_2() {
+        $('input[type=text]').focus(function() {
+            $(this).blur();
+        });
+    }
+
+    function focus_3() {
+        $(document).ready(function() {
+            $('#login').focus();
+        });
+    }
+
+    function focusin_0() {
+        $('p').focusin(function() {
+            $(this).find('span').css('display', 'inline').fadeOut(1000);
+        });
+    }
+
+    function get_0() {
+        $('*', document.body).click(function(event) {
+            event.stopPropagation();
+            var domElement = $(this).get(0);
+            $('span:first').text('Clicked on - ' + domElement.nodeName);
+        });
+    }
+
+    function get_1() {
+        function display(divs: HTMLElement[]) {
+            var a: any[] = [];
+            for (var i = 0; i < divs.length; i++) {
+                a.push(divs[i].innerHTML);
+            }
+            $('span').text(a.join(' '));
+        }
+
+        display($('div').get().reverse());
+    }
+
+    function gt_0() {
+        $('td:gt(4)').css('backgroundColor', 'yellow');
+        $('td:gt(-2)').css('color', 'red');
+    }
+
+    function attribute_has_0() {
+        // Using .one() so the handler is executed at most once
+        // per element per event type
+        $('div[id]').one('click', function() {
+            var idString = $(this).text() + ' = ' + $(this).attr('id');
+            $(this).text(idString);
+        });
+    }
+
+    function has_0() {
+        $('div:has(p)').addClass('test');
+    }
+
+    function has_1() {
+        $('ul').append('<li>' +
+            ( $('ul').has('li').length ? 'Yes' : 'No' ) +
+            '</li>');
+        $('ul').has('li').addClass('full');
+    }
+
+    function has_class_0() {
+        $('#result1').append($('p:first').hasClass('selected').toString());
+        $('#result2').append($('p:last').hasClass('selected').toString());
+        $('#result3').append($('p').hasClass('selected').toString());
+    }
+
+    function header_0() {
+        $(':header').css({ background: '#ccc', color: 'blue' });
+    }
+
+    function height_0() {
+        function showHeight(element: string, height: number) {
+            $('div').text('The height for the ' + element + ' is ' + height + 'px.');
+        }
+
+        $('#getp').click(function() {
+            showHeight('paragraph', $('p').height()!);
+        });
+        $('#getd').click(function() {
+            showHeight('document', $(document).height()!);
+        });
+        $('#getw').click(function() {
+            showHeight('window', $(window).height()!);
+        });
+    }
+
+    function height_1() {
+        $('div').one('click', function() {
+            $(this).height(30).css({
+                cursor: 'auto',
+                backgroundColor: 'green',
+            });
+        });
+    }
+
+    function hidden_0() {
+        // In some browsers :hidden includes head, title, script, etc...
+        var hiddenElements = $('body').find(':hidden').not('script');
+
+        $('span:first').text('Found ' + hiddenElements.length + ' hidden elements total.');
+        $('div:hidden').show(3000);
+        $('span:last').text('Found ' + $('input:hidden').length + ' hidden inputs.');
+    }
+
+    function hide_0() {
+        $('p').hide();
+        $('a').click(function(event) {
+            event.preventDefault();
+            $(this).hide();
+        });
+    }
+
+    function hide_1() {
+        $('button').click(function() {
+            $('p').hide('slow');
+        });
+    }
+
+    function hide_2() {
+        $('#hider').click(function() {
+            $('span:last-child').hide('fast', function() {
+                // Use arguments.callee so we don't need a named function
+                $(this).prev().hide('fast', arguments.callee as any);
+            });
+        });
+        $('#shower').click(function() {
+            $('span').show(2000);
+        });
+    }
+
+    function hide_3() {
+        for (var i = 0; i < 5; i++) {
+            $('<div>').appendTo(document.body);
+        }
+        $('div').click(function() {
+            $(this).hide(2000, function() {
+                $(this).remove();
+            });
+        });
+    }
+
+    function hover_0() {
+        $('li')
+            .filter(':odd')
+            .hide()
+            .end()
+            .filter(':even')
+            .hover(function() {
+                $(this)
+                    .toggleClass('active')
+                    .next()
+                    .stop(true, true)
+                    .slideToggle();
+            });
+    }
+
+    function html_0() {
+        $('p').click(function() {
+            var htmlString = $(this).html();
+            $(this).text(htmlString);
+        });
+    }
+
+    function html_1() {
+        $('div').html('<span class=\'red\'>Hello <b>Again</b></span>');
+    }
+
+    function html_2() {
+        $('div').html('<b>Wow!</b> Such excitement...');
+        $('div b')
+            .append(document.createTextNode('!!!'))
+            .css('color', 'red');
+    }
+
+    function id_0() {
+        $('#myDiv').css('border', '3px solid red');
+    }
+
+    function id_1() {
+        $('#myID\\.entry\\[1\\]').css('border', '3px solid red');
+    }
+
+    function image_0() {
+        var input = $('input:image').css({
+            background: 'yellow',
+            border: '3px red solid',
+        });
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function index_0() {
+        $('div').click(function() {
+            // `this` is the DOM element that was clicked
+            var index = $('div').index(this);
+            $('span').text('That was div index #' + index);
+        });
+    }
+
+    function index_1() {
+        var listItem = $('#bar');
+        $('div').html('Index: ' + $('li').index(listItem));
+    }
+
+    function index_2() {
+        var listItems = $('li:gt(0)');
+        $('div').html('Index: ' + $('li').index(listItems));
+    }
+
+    function index_3() {
+        $('div').html('Index: ' + $('#bar').index('li'));
+    }
+
+    function index_4() {
+        var barIndex = $('#bar').index();
+        $('div').html('Index: ' + barIndex);
+    }
+
+    function index_5() {
+        var foobar = $('li').index($('#foobar'));
+        $('div').html('Index: ' + foobar);
+    }
+
+    function inner_height_0() {
+        var p = $('p:first');
+        $('p:last').text('innerHeight:' + p.innerHeight());
+    }
+
+    function inner_height_1() {
+        var modHeight = 70;
+        $('div').one('click', function() {
+            $(this).innerHeight(modHeight).addClass('mod');
+            modHeight -= 8;
+        });
+    }
+
+    function inner_width_0() {
+        var p = $('p:first');
+        $('p:last').text('innerWidth:' + p.innerWidth());
+    }
+
+    function inner_width_1() {
+        var modWidth = 60;
+        $('div').one('click', function() {
+            $(this).innerWidth(modWidth).addClass('mod');
+            modWidth -= 8;
+        });
+    }
+
+    function input_0() {
+        var allInputs = $(':input');
+        var formChildren = $('form > *');
+        $('#messages').text('Found ' + allInputs.length + ' inputs and the form has ' +
+            formChildren.length + ' children.');
+
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function insert_after_0() {
+        $('p').insertAfter('#foo');
+    }
+
+    function insert_before_0() {
+        $('p').insertBefore('#foo');
+    }
+
+    function is_0() {
+        $('div').one('click', function() {
+            if ($(this).is(':first-child')) {
+                $('p').text('It\'s the first div.');
+            } else if ($(this).is('.blue,.red')) {
+                $('p').text('It\'s a blue or red div.');
+            } else if ($(this).is(':contains(\'Peter\')')) {
+                $('p').text('It\'s Peter!');
+            } else {
+                $('p').html('It\'s nothing <em>special</em>.');
+            }
+            $('p').hide().slideDown('slow');
+            $(this).css({
+                'border-style': 'inset',
+                cursor: 'default',
+            });
+        });
+    }
+
+    function is_1() {
+        var isFormParent = $('input[type=\'checkbox\']').parent().is('form');
+        $('div').text('isFormParent = ' + isFormParent);
+    }
+
+    function is_2() {
+        var isFormParent = $('input[type=\'checkbox\']').parent().is('form');
+        $('div').text('isFormParent = ' + isFormParent);
+    }
+
+    function is_3() {
+        var alt = $('#browsers li:nth-child(2n)').css('background', '#0ff');
+        $('li').click(function() {
+            var li = $(this);
+            if (li.is(alt)) {
+                li.slideUp();
+            } else {
+                li.css('background', 'red');
+            }
+        });
+    }
+
+    function is_4() {
+        var alt = $('#browsers li:nth-child(2n)').css('background', '#0ff');
+        $('li').click(function() {
+            if (alt.is(this)) {
+                $(this).slideUp();
+            } else {
+                $(this).css('background', 'red');
+            }
+        });
+    }
+
+    function jquery_0() {
+        var a = { what: 'A regular JS object' },
+            b = $('body');
+
+        // if (a.jquery) { // Falsy, since it's undefined
+        //     alert('a is a jQuery object!');
+        // }
+
+        if (b.jquery) { // Truthy, since it's a string
+            alert('b is a jQuery object!');
+        }
+    }
+
+    function jquery_1() {
+        alert('You are running jQuery version: ' + $.fn.jquery);
+    }
+
+    function jQuery_ajax_0() {
+        $.ajax({
+            method: 'POST',
+            url: 'some.php',
+            data: { name: 'John', location: 'Boston' },
+        })
+            .done(function(msg) {
+                alert('Data Saved: ' + msg);
+            });
+    }
+
+    function jQuery_ajax_1() {
+        $.ajax({
+            url: 'test.html',
+            cache: false,
+        })
+            .done(function(html) {
+                $('#results').append(html);
+            });
+    }
+
+    function jQuery_ajax_2(handleResponse: JQuery.jqXHR.DoneCallback) {
+        var xmlDocument = 'create xml document';
+        var xmlRequest = $.ajax({
+            url: 'page.php',
+            processData: false,
+            data: xmlDocument,
+        });
+
+        xmlRequest.done(handleResponse);
+    }
+
+    function jQuery_ajax_3() {
+        var menuId = $('ul.nav').first().attr('id');
+        var request = $.ajax({
+            url: 'script.php',
+            method: 'POST',
+            data: { id: menuId },
+            dataType: 'html',
+        });
+
+        request.done(function(msg) {
+            $('#log').html(msg);
+        });
+
+        request.fail(function(jqXHR, textStatus) {
+            alert('Request failed: ' + textStatus);
+        });
+    }
+
+    function jQuery_ajax_4() {
+        $.ajax({
+            method: 'GET',
+            url: 'test.js',
+            dataType: 'script',
+        });
+    }
+
+    function jQuery_ajax_setup_0(myData: JQuery.PlainObject) {
+        $.ajaxSetup({
+            url: '/xmlhttp/',
+            global: false,
+            type: 'POST',
+        });
+        $.ajax({ data: myData });
+    }
+
+    function jQuery_contains_0() {
+        $.contains(document.documentElement, document.body); // true
+        $.contains(document.body, document.documentElement); // false
+    }
+
+    function jQuery_data_0() {
+        var div = $('div')[0];
+        jQuery.data(div, 'test', {
+            first: 16,
+            last: 'pizza!',
+        });
+        $('span:first').text(jQuery.data(div, 'test').first);
+        $('span:last').text(jQuery.data(div, 'test').last);
+    }
+
+    function jQuery_data_1() {
+        $('button').click(function() {
+            var value,
+                div = $('div')[0];
+            switch ($('button').index(this)) {
+                case 0 :
+                    value = jQuery.data(div, 'blah');
+                    break;
+                case 1 :
+                    jQuery.data(div, 'blah', 'hello');
+                    value = 'Stored!';
+                    break;
+                case 2 :
+                    jQuery.data(div, 'blah', 86);
+                    value = 'Stored!';
+                    break;
+                case 3 :
+                    jQuery.removeData(div, 'blah');
+                    value = 'Removed!';
+                    break;
+            }
+            $('span').text('' + value);
+        });
+    }
+
+    function jQuery_dequeue_0() {
+        $('button').click(function() {
+            $('div')
+                .animate({ left: '+=200px' }, 2000)
+                .animate({ top: '0px' }, 600)
+                .queue(function() {
+                    $(this).toggleClass('red');
+                    $.dequeue(this);
+                })
+                .animate({ left: '10px', top: '30px' }, 700);
+        });
+    }
+
+    function jQuery_each_0() {
+        var arr = ['one', 'two', 'three', 'four', 'five'];
+        var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
+
+        jQuery.each(arr, function(i, val) {
+            $('#' + val).text('Mine is ' + val + '.');
+
+            // Will stop running after "three"
+            return ( val !== 'three' );
+        });
+
+        jQuery.each(obj, function(i, val) {
+            $('#' + i).append(document.createTextNode(' - ' + val));
+        });
+    }
+
+    function jQuery_each_1() {
+        $.each(['a', 'b', 'c'], function(i, l) {
+            alert('Index #' + i + ': ' + l);
+        });
+    }
+
+    function jQuery_each_2() {
+        $.each({ name: 'John', lang: 'JS' }, function(k, v) {
+            alert('Key: ' + k + ', Value: ' + v);
+        });
+    }
+
+    function jQuery_each_3() {
+        var arr = ['one', 'two', 'three', 'four', 'five'];
+        var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
+
+        jQuery.each(arr, function(i, val) {
+            $('#' + val).text('Mine is ' + val + '.');
+
+            // Will stop running after "three"
+            return ( val !== 'three' );
+        });
+
+        jQuery.each(obj, function(i, val) {
+            $('#' + i).append(document.createTextNode(' - ' + val));
+        });
+    }
+
+    function jQuery_each_4() {
+        $.each(['a', 'b', 'c'], function(i, l) {
+            alert('Index #' + i + ': ' + l);
+        });
+    }
+
+    function jQuery_each_5() {
+        $.each({ name: 'John', lang: 'JS' }, function(k, v) {
+            alert('Key: ' + k + ', Value: ' + v);
+        });
+    }
+
+    function jQuery_error_0() {
+        jQuery.error = console.error as any;
+    }
+
+    function jQuery_escape_selector_0() {
+        $.escapeSelector('#target'); // "\#target"
+    }
+
+    function jQuery_escape_selector_1() {
+        $('div').find('.' + $.escapeSelector('.box'));
+    }
+
+    function jQuery_extend_0() {
+        var object1 = {
+            apple: 0,
+            banana: { weight: 52, price: 100 },
+            cherry: 97,
+        };
+        var object2 = {
+            banana: { price: 200 },
+            durian: 100,
+        };
+
+        // Merge object2 into object1
+        $.extend(object1, object2);
+
+        // Assuming JSON.stringify - not available in IE<8
+        $('#log').append(JSON.stringify(object1));
+    }
+
+    function jQuery_extend_1() {
+        var object1 = {
+            apple: 0,
+            banana: { weight: 52, price: 100 },
+            cherry: 97,
+        };
+        var object2 = {
+            banana: { price: 200 },
+            durian: 100,
+        };
+
+        // Merge object2 into object1, recursively
+        $.extend(true, object1, object2);
+
+        // Assuming JSON.stringify - not available in IE<8
+        $('#log').append(JSON.stringify(object1));
+    }
+
+    function jQuery_extend_2() {
+        var defaults = { validate: false, limit: 5, name: 'foo' };
+        var options = { validate: true, name: 'bar' };
+
+        // Merge defaults and options, without modifying defaults
+        var settings = $.extend({}, defaults, options);
+
+        // Assuming JSON.stringify - not available in IE<8
+        $('#log').append('<div><b>defaults -- </b>' + JSON.stringify(defaults) + '</div>');
+        $('#log').append('<div><b>options -- </b>' + JSON.stringify(options) + '</div>');
+        $('#log').append('<div><b>settings -- </b>' + JSON.stringify(settings) + '</div>');
+    }
+
+    function jQuery_fx_interval_0() {
+        jQuery.fx.interval = 100;
+        $('input').click(function() {
+            $('div').toggle(3000);
+        });
+    }
+
+    function jQuery_fx_off_0() {
+        var toggleFx = function() {
+            $.fx.off = !$.fx.off;
+        };
+        toggleFx();
+        $('button').click(toggleFx);
+        $('input').click(function() {
+            $('div').toggle('slow');
+        });
+    }
+
+    function jQuery_get_0() {
+        $.get('test.php');
+    }
+
+    function jQuery_get_1() {
+        $.get('test.php', { name: 'John', time: '2pm' });
+    }
+
+    function jQuery_get_2() {
+        $.get('test.php', { 'choices[]': ['Jon', 'Susan'] });
+    }
+
+    function jQuery_get_3() {
+        $.get('test.php', function(data) {
+            alert('Data Loaded: ' + data);
+        });
+    }
+
+    function jQuery_get_4() {
+        $.get('test.cgi', { name: 'John', time: '2pm' })
+            .done(function(data) {
+                alert('Data Loaded: ' + data);
+            });
+    }
+
+    function jQuery_get_5() {
+        $.get('test.php', function(data) {
+            $('body')
+                .append('Name: ' + data.name) // John
+                .append('Time: ' + data.time); //  2pm
+        }, 'json');
+    }
+
+    function jQuery_get_json_0() {
+        (function() {
+            var flickerAPI = 'http://api.flickr.com/services/feeds/photos_public.gne?jsoncallback=?';
+            $.getJSON(flickerAPI, {
+                tags: 'mount rainier',
+                tagmode: 'any',
+                format: 'json',
+            })
+                .done(function(data) {
+                    $.each(data.items as any[], function(i, item) {
+                        $('<img>').attr('src', item.media.m).appendTo('#images');
+                        if (i === 3) {
+                            return false;
+                        }
+                    });
+                });
+        })();
+    }
+
+    function jQuery_get_json_1() {
+        $.getJSON('test.js', function(json) {
+            console.log('JSON Data: ' + json.users[3].name);
+        });
+    }
+
+    function jQuery_get_json_2() {
+        $.getJSON('test.js', { name: 'John', time: '2pm' })
+            .done(function(json) {
+                console.log('JSON Data: ' + json.users[3].name);
+            })
+            .fail(function(jqxhr, textStatus, error) {
+                var err = textStatus + ', ' + error;
+                console.log('Request Failed: ' + err);
+            });
+    }
+
+    function jQuery_get_script_1() {
+        var url = 'https://code.jquery.com/color/jquery.color.js';
+        $.getScript(url, function() {
+            $('#go').click(function() {
+                $('.block')
+                    .animate({
+                        backgroundColor: 'rgb(255, 180, 180)',
+                    }, 1000)
+                    .delay(500)
+                    .animate({
+                        backgroundColor: 'olive',
+                    }, 1000)
+                    .delay(500)
+                    .animate({
+                        backgroundColor: '#00f',
+                    }, 1000);
+            });
+        });
+    }
+
+    function jQuery_global_eval_0() {
+        function test() {
+            jQuery.globalEval('var newVar = true;');
+        }
+
+        test();
+        // newVar === true
+    }
+
+    function jQuery_grep_0() {
+        var arr = [1, 9, 3, 8, 6, 1, 5, 9, 4, 7, 3, 8, 6, 9, 1];
+        $('div').text(arr.join(', '));
+
+        arr = jQuery.grep(arr, function(n, i) {
+            return ( n !== 5 && i > 4 );
+        });
+        $('p').text(arr.join(', '));
+
+        arr = jQuery.grep(arr, function(a) {
+            return a !== 9;
+        });
+
+        $('span').text(arr.join(', '));
+    }
+
+    function jQuery_grep_1() {
+        $.grep([0, 1, 2], function(n, i) {
+            return n > 0;
+        });
+    }
+
+    function jQuery_grep_2() {
+        $.grep([0, 1, 2], function(n, i) {
+            return n > 0;
+        }, true);
+    }
+
+    function jQuery_has_data_0() {
+        var $p = jQuery('p'),
+            p = $p[0];
+        $p.append(jQuery.hasData(p) + ' '); // false
+
+        $.data(p, 'testing', 123);
+        $p.append(jQuery.hasData(p) + ' '); // true
+
+        $.removeData(p, 'testing');
+        $p.append(jQuery.hasData(p) + ' '); // false
+
+        $p.on('click', function() {});
+        $p.append(jQuery.hasData(p) + ' '); // true
+
+        $p.off('click');
+        $p.append(jQuery.hasData(p) + ' '); // false
+    }
+
+    function jQuery_hold_ready_0() {
+        $.holdReady(true);
+        $.getScript('myplugin.js', function() {
+            $.holdReady(false);
+        });
+    }
+
+    function jQuery_in_array_0() {
+        var arr = [4, 'Pete', 8, 'John'];
+        var $spans = $('span');
+        $spans.eq(0).text(jQuery.inArray('John', arr));
+        $spans.eq(1).text(jQuery.inArray(4, arr));
+        $spans.eq(2).text(jQuery.inArray('Karl', arr));
+        $spans.eq(3).text(jQuery.inArray('Pete', arr, 2));
+    }
+
+    function jQuery_is_array_0() {
+        $('b').append('' + $.isArray([]));
+    }
+
+    function jQuery_is_empty_object_0() {
+        jQuery.isEmptyObject({}); // true
+        jQuery.isEmptyObject({ foo: 'bar' }); // false
+    }
+
+    function jQuery_is_function_0() {
+        function stub() {}
+
+        var objs = [
+            function() {},
+            { x: 15, y: 20 },
+            null,
+            stub,
+            'function',
+        ];
+
+        jQuery.each(objs, function(i) {
+            var isFunc = jQuery.isFunction(objs[i]);
+            $('span').eq(i).text(isFunc);
+        });
+    }
+
+    function jQuery_is_function_1() {
+        $.isFunction(function() {});
+    }
+
+    function jQuery_is_numeric_0() {
+        // true (numeric)
+        $.isNumeric('-10');
+        $.isNumeric('0');
+        $.isNumeric(0xFF);
+        $.isNumeric('0xFF');
+        $.isNumeric('8e5');
+        $.isNumeric('3.1415');
+        $.isNumeric(+10);
+        $.isNumeric(0o144);
+
+        // false (non-numeric)
+        $.isNumeric('-0x42');
+        $.isNumeric('7.2acdgs');
+        $.isNumeric('');
+        $.isNumeric({});
+        $.isNumeric(NaN);
+        $.isNumeric(null);
+        $.isNumeric(true);
+        $.isNumeric(Infinity);
+        $.isNumeric(undefined);
+    }
+
+    function jQuery_is_plain_object_0() {
+        jQuery.isPlainObject({}); // true
+        jQuery.isPlainObject('test'); // false
+    }
+
+    function jQuery_is_window_0() {
+        $('b').append('' + $.isWindow(window));
+    }
+
+    function jQuery_is_xml_doc_0() {
+        jQuery.isXMLDoc(document); // false
+        jQuery.isXMLDoc(document.body); // false
+    }
+
+    function jQuery_make_array_0() {
+        // Returns a NodeList
+        var elems = document.getElementsByTagName('div');
+        // Convert the NodeList to an Array
+        var arr = jQuery.makeArray(elems);
+        // Use an Array method on list of dom elements
+        arr.reverse();
+        $(arr).appendTo(document.body);
+    }
+
+    function jQuery_make_array_1() {
+        var obj = $('li');
+        var arr = $.makeArray(obj);
+    }
+
+    function jQuery_map_0() {
+        var arr = ['a', 'b', 'c', 'd', 'e'];
+        $('div').text(arr.join(', '));
+
+        arr = jQuery.map(arr, function(n, i) {
+            return ( n.toUpperCase() + i );
+        });
+        $('p').text(arr.join(', '));
+
+        arr = jQuery.map(arr, function(a) {
+            return a + a;
+        });
+        $('span').text(arr.join(', '));
+    }
+
+    function jQuery_map_1() {
+        $.map([0, 1, 2], function(n) {
+            return n + 4;
+        });
+    }
+
+    function jQuery_map_2() {
+        $.map([0, 1, 2], function(n) {
+            return n > 0 ? n + 1 : null;
+        });
+    }
+
+    function jQuery_map_3() {
+        $.map([0, 1, 2], function(n) {
+            return [n, n + 1];
+        });
+    }
+
+    function jQuery_map_4() {
+        var dimensions = { width: 10, height: 15, length: 20 };
+        var _dimensions = $.map(dimensions, function(value, index) {
+            return value * 2;
+        });
+    }
+
+    function jQuery_map_5() {
+        var dimensions = { width: 10, height: 15, length: 20 };
+        var keys = $.map(dimensions, function(value, key) {
+            return key;
+        });
+    }
+
+    function jQuery_map_6() {
+        $.map([0, 1, 2, 3], function(a) {
+            return a * a;
+        });
+    }
+
+    function jQuery_map_7() {
+        $.map([0, 1, 52, 97], function(a) {
+            return (a > 50 ? a - 45 : null);
+        });
+    }
+
+    function jQuery_map_8() {
+        var array = [0, 1, 52, 97];
+        var _array = $.map(array, function(a, index) {
+            return [a - 45, index];
+        });
+    }
+
+    function jQuery_merge_0() {
+        $.merge([0, 1, 2], [2, 3, 4]);
+    }
+
+    function jQuery_merge_1() {
+        $.merge([3, 2, 1], [4, 3, 2]);
+    }
+
+    function jQuery_merge_2() {
+        var first = ['a', 'b', 'c'];
+        var second = ['d', 'e', 'f'];
+        $.merge($.merge([], first), second);
+    }
+
+    function jQuery_no_conflict_0() {
+        jQuery.noConflict();
+        // Do something with jQuery
+        jQuery('div p').hide();
+        // Do something with another library's $()
+        // $('content').style.display = 'none';
+    }
+
+    function jQuery_no_conflict_1() {
+        jQuery.noConflict();
+        (function($) {
+            $(function() {
+                // More code using $ as alias to jQuery
+            });
+        })(jQuery);
+
+        // Other code using $ as an alias to the other library
+    }
+
+    function jQuery_no_conflict_2() {
+        var j = jQuery.noConflict();
+
+        // Do something with jQuery
+        j('div p').hide();
+
+        // Do something with another library's $()
+        // $('content').style.display = 'none';
+    }
+
+    function jQuery_no_conflict_3() {
+        var dom = {} as any;
+        dom.query = jQuery.noConflict(true);
+    }
+
+    function jQuery_no_conflict_4(jq162: JQueryStatic) {
+        var $log = $('#log');
+
+        $log.append('2nd loaded jQuery version ($): ' + $.fn.jquery + '<br>');
+
+        // Restore globally scoped jQuery variables to the first version loaded
+        // (the newer version)
+
+        jq162 = jQuery.noConflict(true);
+
+        $log.append('<h3>After $.noConflict(true)</h3>');
+        $log.append('1st loaded jQuery version ($): ' + $.fn.jquery + '<br>');
+        $log.append('2nd loaded jQuery version (jq162): ' + jq162.fn.jquery + '<br>');
+    }
+
+    function jQuery_param_0() {
+        var params = { width: 1680, height: 1050 };
+        var str = jQuery.param(params);
+        $('#results').text(str);
+    }
+
+    function jQuery_param_1() {
+        // <=1.3.2:
+        $.param({ a: [2, 3, 4] }); // "a=2&a=3&a=4"
+        // >=1.4:
+        $.param({ a: [2, 3, 4] }); // "a[]=2&a[]=3&a[]=4"
+
+        // <=1.3.2:
+        $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+        // "a=[object+Object]&d=3&d=4&d=[object+Object]"
+
+        // >=1.4:
+        $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+        // "a[b]=1&a[c]=2&d[]=3&d[]=4&d[2][e]=5"
+    }
+
+    function jQuery_parse_html_0() {
+        var $log = $('#log'),
+            str = 'hello, <b>my name is</b> jQuery.',
+            html = $.parseHTML(str) as HTMLElement[],
+            nodeNames: string[] = [];
+
+        // Append the parsed HTML
+        $log.append(html);
+
+        // Gather the parsed HTML's node names
+        $.each(html, function(i, el) {
+            nodeNames[i] = '<li>' + el.nodeName + '</li>';
+        });
+
+        // Insert the node names
+        $log.append('<h3>Node Names:</h3>');
+        $('<ol></ol>')
+            .append(nodeNames.join(''))
+            .appendTo($log);
+    }
+
+    function jQuery_parse_json_0() {
+        var obj = jQuery.parseJSON('{ "name": "John" }');
+        alert(obj.name === 'John');
+    }
+
+    function jQuery_parse_xml_0() {
+        var xml = '<rss version=\'2.0\'><channel><title>RSS Title</title></channel></rss>',
+            xmlDoc = $.parseXML(xml),
+            $xml = $(xmlDoc),
+            $title = $xml.find('title');
+
+        // Append "RSS Title" to #someElement
+        $('#someElement').append($title.text());
+
+        // Change the title to "XML Title"
+        $title.text('XML Title');
+
+        // Append "XML Title" to #anotherElement
+        $('#anotherElement').append($title.text());
+    }
+
+    function jQuery_post_0() {
+        $.post('test.php');
+    }
+
+    function jQuery_post_1() {
+        $.post('test.php', { name: 'John', time: '2pm' });
+    }
+
+    function jQuery_post_2() {
+        $.post('test.php', { 'choices[]': ['Jon', 'Susan'] });
+    }
+
+    function jQuery_post_3() {
+        $.post('test.php', $('#testform').serialize());
+    }
+
+    function jQuery_post_4() {
+        $.post('test.php', function(data) {
+            alert('Data Loaded: ' + data);
+        });
+    }
+
+    function jQuery_post_5() {
+        $.post('test.php', { name: 'John', time: '2pm' })
+            .done(function(data) {
+                alert('Data Loaded: ' + data);
+            });
+    }
+
+    function jQuery_post_6() {
+        $.post('test.php', { func: 'getNameAndTime' }, function(data) {
+            console.log(data.name); // John
+            console.log(data.time); // 2pm
+        }, 'json');
+    }
+
+    function jQuery_post_7() {
+        // Attach a submit handler to the form
+        $('#searchForm').submit(function(event) {
+            // Stop form from submitting normally
+            event.preventDefault();
+
+            // Get some values from elements on the page:
+            var $form = $(this),
+                term = $form.find('input[name=\'s\']').val(),
+                url = $form.attr('action')!;
+
+            // Send the data using post
+            var posting = $.post(url, { s: term });
+
+            // Put the results in a div
+            posting.done(function(data) {
+                var content = $(data).find('#content');
+                $('#result').empty().append(content);
+            });
+        });
+    }
+
+    function jQuery_proxy_0() {
+        var me = {
+            type: 'zombie',
+            test: function(event: JQuery.Event) {
+                // Without proxy, `this` would refer to the event target
+                // use event.target to reference that element.
+                var element = event.target;
+                $(element).css('background-color', 'red');
+
+                // With proxy, `this` refers to the me object encapsulating
+                // this function.
+                $('#log').append('Hello ' + this.type + '<br>');
+                $('#test').off('click', this.test);
+            },
+        };
+
+        var you = {
+            type: 'person',
+            test: function(event: JQuery.Event) {
+                $('#log').append(this.type + ' ');
+            },
+        };
+
+        // Execute you.test() in the context of the `you` object
+        // no matter where it is called
+        // i.e. the `this` keyword will refer to `you`
+        var youClick = $.proxy(you.test, you);
+
+        // attach click handlers to #test
+        $('#test')
+        // this === "zombie"; handler unbound after first click
+            .on('click', $.proxy(me.test, me) as JQuery.EventHandler<HTMLElement>)
+
+            // this === "person"
+            .on('click', youClick as JQuery.EventHandler<HTMLElement>)
+
+            // this === "zombie"
+            .on('click', $.proxy(you.test, me) as JQuery.EventHandler<HTMLElement>)
+
+            // this === "<button> element"
+            .on('click', you.test);
+    }
+
+    function jQuery_proxy_1() {
+        var obj = {
+            name: 'John',
+            test: function() {
+                $('#log').append(this.name);
+                $('#test').off('click', obj.test);
+            },
+        };
+        $('#test').on('click', jQuery.proxy(obj, 'test') as JQuery.EventHandler<HTMLElement>);
+    }
+
+    function jQuery_proxy_2() {
+        var me = {
+            // I'm a dog
+            type: 'dog',
+
+            // Note that event comes *after* one and two
+            test: function(one: any, two: any, event: any) {
+                $('#log')
+
+                // `one` maps to `you`, the 1st additional
+                // argument in the $.proxy function call
+                    .append('<h3>Hello ' + one.type + ':</h3>')
+
+                    // The `this` keyword refers to `me`
+                    // (the 2nd, context, argument of $.proxy)
+                    .append('I am a ' + this.type + ', ')
+
+                    // `two` maps to `they`, the 2nd additional
+                    // argument in the $.proxy function call
+                    .append('and they are ' + two.type + '.<br>')
+
+                    // The event type is "click"
+                    .append('Thanks for ' + event.type + 'ing.')
+
+                    // The clicked element is `event.target`,
+                    // and its type is "button"
+                    .append('the ' + event.target.type + '.');
+            },
+        };
+
+        var you = { type: 'cat' };
+        var they = { type: 'fish' };
+
+        // Set up handler to execute me.test() in the context
+        // of `me`, with `you` and `they` as additional arguments
+        var proxy = $.proxy(me.test, me, you, they) as JQuery.EventHandler<HTMLElement>;
+
+        $('#test')
+            .on('click', proxy);
+    }
+
+    function jQuery_queue_0() {
+        $('#show').click(function() {
+            var n = jQuery.queue($('div')[0], 'fx');
+            $('span').text('Queue length is: ' + n.length);
+        });
+
+        function runIt() {
+            $('div')
+                .show('slow')
+                .animate({
+                    left: '+=200',
+                }, 2000)
+                .slideToggle(1000)
+                .slideToggle('fast')
+                .animate({
+                    left: '-=200',
+                }, 1500)
+                .hide('slow')
+                .show(1200)
+                .slideUp('normal', runIt);
+        }
+
+        runIt();
+    }
+
+    function jQuery_queue_1() {
+        $(document.body).click(function() {
+            var divs = $('div')
+                .show('slow')
+                .animate({ left: '+=200' }, 2000);
+            jQuery.queue(divs[0], 'fx', function() {
+                $(this).addClass('newcolor');
+                jQuery.dequeue(this);
+            });
+            divs.animate({ left: '-=200' }, 500);
+            jQuery.queue(divs[0], 'fx', function() {
+                $(this).removeClass('newcolor');
+                jQuery.dequeue(this);
+            });
+            divs.slideUp();
+        });
+    }
+
+    function jQuery_queue_2() {
+        $('#start').click(function() {
+            var divs = $('div')
+                .show('slow')
+                .animate({ left: '+=200' }, 5000);
+            jQuery.queue(divs[0], 'fx', function() {
+                $(this).addClass('newcolor');
+                jQuery.dequeue(this);
+            });
+            divs.animate({ left: '-=200' }, 1500);
+            jQuery.queue(divs[0], 'fx', function() {
+                $(this).removeClass('newcolor');
+                jQuery.dequeue(this);
+            });
+            divs.slideUp();
+        });
+        $('#stop').click(function() {
+            jQuery.queue($('div')[0], 'fx', []);
+            $('div').stop();
+        });
+    }
+
+    function jQuery_ready_0() {
+        $.when($.ready).then(function() {
+            // Document is ready.
+        });
+    }
+
+    function jQuery_ready_1() {
+        $.when(
+            $.getJSON('ajax/test.json'),
+            $.ready,
+        ).done(function(data) {
+            // Document is ready.
+            // Value of test.json is passed as `data`.
+        });
+    }
+
+    function jQuery_ready_exception_0() {
+        jQuery.readyException = function(error) {
+            console.error(error);
+        };
+    }
+
+    function jQuery_remove_data_0() {
+        var div = $('div')[0];
+        $('span:eq(0)').text('' + $('div').data('test1'));
+        jQuery.data(div, 'test1', 'VALUE-1');
+        jQuery.data(div, 'test2', 'VALUE-2');
+        $('span:eq(1)').text('' + jQuery.data(div, 'test1'));
+        jQuery.removeData(div, 'test1');
+        $('span:eq(2)').text('' + jQuery.data(div, 'test1'));
+        $('span:eq(3)').text('' + jQuery.data(div, 'test2'));
+    }
+
+    function jQuery_trim_0() {
+        var str = '         lots of spaces before and after         ';
+        $('#original').html('Original String: \'' + str + '\'');
+        $('#trimmed').html('$.trim()\'ed: \'' + $.trim(str) + '\'');
+    }
+
+    function jQuery_trim_1() {
+        $.trim('    hello, how are you?    ');
+    }
+
+    function jQuery_type_0() {
+        $('b').append('' + jQuery.type(/test/));
+    }
+
+    function jQuery_unique_0() {
+        // unique() must take a native array
+        var divs = $('div').get();
+
+        // Add 3 elements of class dup too (they are divs)
+        divs = divs.concat($('.dup').get());
+        $('div:eq(1)').text('Pre-unique there are ' + divs.length + ' elements.');
+
+        divs = jQuery.unique(divs);
+        $('div:eq(2)').text('Post-unique there are ' + divs.length + ' elements.')
+            .css('color', 'red');
+    }
+
+    function jQuery_unique_sort_0() {
+        // unique() must take a native array
+        var divs = $('div').get();
+
+        // Add 3 elements of class dup too (they are divs)
+        divs = divs.concat($('.dup').get());
+        $('div:eq(1)').text('Pre-unique there are ' + divs.length + ' elements.');
+
+        divs = jQuery.uniqueSort(divs);
+        $('div:eq(2)').text('Post-unique there are ' + divs.length + ' elements.')
+            .css('color', 'red');
+    }
+
+    function jQuery_when_0() {
+        $.when($.ajax('/page1.php'), $.ajax('/page2.php')).done(function(a1, a2) {
+            // a1 and a2 are arguments resolved for the page1 and page2 ajax requests, respectively.
+            // Each argument is an array with the following structure: [ data, statusText, jqXHR ]
+
+            var data = a1[0] + a2[0]; // a1[ 0 ] = "Whip", a2[ 0 ] = " It"
+            if (/Whip It/.test(data)) {
+                alert('We got what we came for!');
+            }
+        });
+    }
+
+    function jQuery_when_1(myFunc: any, myFailure: any) {
+        $.when($.ajax('/page1.php'), $.ajax('/page2.php'))
+            .then(myFunc, myFailure);
+    }
+
+    function jQuery_0() {
+        $('div > p').css('border', '1px solid gray');
+    }
+
+    function jQuery_1() {
+        $('input:radio', document.forms[0]);
+    }
+
+    function jQuery_2(xml: JQuery.jqXHR) {
+        $('div', xml.responseXML!);
+    }
+
+    function jQuery_3() {
+        $(document.body).css('background', 'black');
+    }
+
+    function jQuery_4(myForm: HTMLFormElement) {
+        $(myForm.elements).hide();
+    }
+
+    function jQuery_5() {
+        $('<div><p>Hello</p></div>').appendTo('body');
+    }
+
+    function jQuery_6() {
+        $('<div/>', {
+            class: 'test',
+            text: 'Click me!',
+            click: function() {
+                $(this).toggleClass('test');
+            },
+        })
+            .appendTo('body');
+    }
+
+    function jQuery_7() {
+        $(function() {
+            // Document is ready
+        });
+    }
+
+    function jQuery_8() {
+        jQuery(function($) {
+            // Your code using failsafe $ alias here...
+        });
+    }
+
+    function keydown_0() {
+        var xTriggered = 0;
+        $('#target').keydown(function(event) {
+            if (event.which == 13) {
+                event.preventDefault();
+            }
+            xTriggered++;
+            var msg = 'Handler for .keydown() called ' + xTriggered + ' time(s).';
+            // $.print(msg, 'html');
+            // $.print(event);
+        });
+
+        $('#other').click(function() {
+            $('#target').keydown();
+        });
+    }
+
+    function keypress_0() {
+        var xTriggered = 0;
+        $('#target').keypress(function(event) {
+            if (event.which == 13) {
+                event.preventDefault();
+            }
+            xTriggered++;
+            var msg = 'Handler for .keypress() called ' + xTriggered + ' time(s).';
+            // $.print(msg, 'html');
+            // $.print(event);
+        });
+
+        $('#other').click(function() {
+            $('#target').keypress();
+        });
+    }
+
+    function keyup_0() {
+        var xTriggered = 0;
+        $('#target').keyup(function(event) {
+            xTriggered++;
+            var msg = 'Handler for .keyup() called ' + xTriggered + ' time(s).';
+            // $.print(msg, 'html');
+            // $.print(event);
+        }).keydown(function(event) {
+            if (event.which == 13) {
+                event.preventDefault();
+            }
+        });
+
+        $('#other').click(function() {
+            $('#target').keyup();
+        });
+    }
+
+    function lang_0() {
+        $('div:lang(en-us)').addClass('usa');
+        $('div:lang(es-es)').addClass('spain');
+    }
+
+    function last_child_0() {
+        $('div span:last-child')
+            .css({ color: 'red', fontSize: '80%' })
+            .hover(function() {
+                $(this).addClass('solast');
+            }, function() {
+                $(this).removeClass('solast');
+            });
+    }
+
+    function last_of_type_0() {
+        $('span:last-of-type')
+            .css({ color: 'red', fontSize: '80%' })
+            .hover(function() {
+                $(this).addClass('solast');
+            }, function() {
+                $(this).removeClass('solast');
+            });
+    }
+
+    function last_0() {
+        $('tr:last').css({ backgroundColor: 'yellow', fontWeight: 'bolder' });
+    }
+
+    function last_1() {
+        $('p span').last().addClass('highlight');
+    }
+
+    function length_0() {
+        $(document.body)
+            .click(function() {
+                $(document.body).append($('<div>'));
+                var n = $('div').length;
+                $('span').text('There are ' + n + ' divs.' +
+                    'Click to add more.');
+            })
+            // Trigger the click to start
+            .trigger('click');
+    }
+
+    function load_0() {
+        $('#new-projects').load('/resources/load.html #projects li');
+    }
+
+    function load_1() {
+        $('#success').load('/not-here.php', function(response, status, xhr) {
+            if (status == 'error') {
+                var msg = 'Sorry but there was an error: ';
+                $('#error').html(msg + xhr.status + ' ' + xhr.statusText);
+            }
+        });
+    }
+
+    function load_2() {
+        $('#feeds').load('feeds.html');
+    }
+
+    function load_3() {
+        $('#objectID').load('test.php', { 'choices[]': ['Jon', 'Susan'] });
+    }
+
+    function load_4() {
+        $('#feeds').load('feeds.php', { limit: 25 }, function() {
+            alert('The last 25 entries in the feed have been loaded');
+        });
+    }
+
+    function lt_0() {
+        $('td:lt(4)').css('backgroundColor', 'yellow');
+        $('td:lt(-2)').css('color', 'red');
+    }
+
+    function map_0() {
+        $('p')
+            .append($('input').map(function() {
+                return $(this).val();
+            })
+                .get()
+                .join(', '));
+    }
+
+    function map_1() {
+        var mappedItems = $('li').map(function(index) {
+            var replacement: Element | null = $('<li>').text($(this).text()).get(0);
+            if (index === 0) {
+                // Make the first item all caps
+                $(replacement).text($(replacement).text().toUpperCase());
+            } else if (index === 1 || index === 3) {
+                // Delete the second and fourth items
+                replacement = null;
+            } else if (index === 2) {
+                // Make two of the third item and add some text
+                var _replacement = [replacement, $('<li>').get(0)];
+                $(_replacement[0]).append('<b> - A</b>');
+                $(_replacement[1]).append('Extra <b> - B</b>');
+            }
+
+            // Replacement will be a dom element, null,
+            // or an array of dom elements
+            return replacement;
+        });
+        $('#results').append(mappedItems);
+    }
+
+    function mousedown_0() {
+        $('p')
+            .mouseup(function() {
+                $(this).append('<span style=\'color:#f00;\'>Mouse up.</span>');
+            })
+            .mousedown(function() {
+                $(this).append('<span style=\'color:#00f;\'>Mouse down.</span>');
+            });
+    }
+
+    function mouseenter_0() {
+        var i = 0;
+        $('div.overout')
+            .mouseover(function() {
+                $('p:first', this).text('mouse over');
+                $('p:last', this).text(++i);
+            })
+            .mouseout(function() {
+                $('p:first', this).text('mouse out');
+            });
+
+        var n = 0;
+        $('div.enterleave')
+            .mouseenter(function() {
+                $('p:first', this).text('mouse enter');
+                $('p:last', this).text(++n);
+            })
+            .mouseleave(function() {
+                $('p:first', this).text('mouse leave');
+            });
+    }
+
+    function mouseleave_0() {
+        var i = 0;
+        $('div.overout')
+            .mouseover(function() {
+                $('p:first', this).text('mouse over');
+            })
+            .mouseout(function() {
+                $('p:first', this).text('mouse out');
+                $('p:last', this).text(++i);
+            });
+
+        var n = 0;
+        $('div.enterleave')
+            .mouseenter(function() {
+                $('p:first', this).text('mouse enter');
+            })
+            .mouseleave(function() {
+                $('p:first', this).text('mouse leave');
+                $('p:last', this).text(++n);
+            });
+    }
+
+    function mousemove_0() {
+        $('div').mousemove(function(event) {
+            var pageCoords = '( ' + event.pageX + ', ' + event.pageY + ' )';
+            var clientCoords = '( ' + event.clientX + ', ' + event.clientY + ' )';
+            $('span:first').text('( event.pageX, event.pageY ) : ' + pageCoords);
+            $('span:last').text('( event.clientX, event.clientY ) : ' + clientCoords);
+        });
+    }
+
+    function mouseout_0() {
+        var i = 0;
+        $('div.overout')
+            .mouseout(function() {
+                $('p:first', this).text('mouse out');
+                $('p:last', this).text(++i);
+            })
+            .mouseover(function() {
+                $('p:first', this).text('mouse over');
+            });
+
+        var n = 0;
+        $('div.enterleave')
+            .on('mouseenter', function() {
+                $('p:first', this).text('mouse enter');
+            })
+            .on('mouseleave', function() {
+                $('p:first', this).text('mouse leave');
+                $('p:last', this).text(++n);
+            });
+    }
+
+    function mouseover_0() {
+        var i = 0;
+        $('div.overout')
+            .mouseover(function() {
+                i += 1;
+                $(this).find('span').text('mouse over x ' + i);
+            })
+            .mouseout(function() {
+                $(this).find('span').text('mouse out ');
+            });
+
+        var n = 0;
+        $('div.enterleave')
+            .mouseenter(function() {
+                n += 1;
+                $(this).find('span').text('mouse enter x ' + n);
+            })
+            .mouseleave(function() {
+                $(this).find('span').text('mouse leave');
+            });
+    }
+
+    function mouseup_0() {
+        $('p')
+            .mouseup(function() {
+                $(this).append('<span style=\'color:#f00;\'>Mouse up.</span>');
+            })
+            .mousedown(function() {
+                $(this).append('<span style=\'color:#00f;\'>Mouse down.</span>');
+            });
+    }
+
+    function attribute_multiple_0() {
+        $('input[id][name$=\'man\']').val('only this one');
+    }
+
+    function multiple_0() {
+        $('div, span, p.myClass').css('border', '3px solid red');
+    }
+
+    function multiple_1() {
+        var list = $('div, p, span')
+            .map(function() {
+                return this.tagName;
+            })
+            .get()
+            .join(', ');
+        $('b').append(document.createTextNode(list));
+    }
+
+    function next_adjacent_0() {
+        $('label + input').css('color', 'blue').val('Labeled!');
+    }
+
+    function next_siblings_0() {
+        $('#prev ~ div').css('border', '3px groove blue');
+    }
+
+    function next_0() {
+        $('button[disabled]').next().text('this button is disabled');
+    }
+
+    function next_1() {
+        $('p').next('.selected').css('background', 'yellow');
+    }
+
+    function next_all_0() {
+        $('div:first').nextAll().addClass('after');
+    }
+
+    function next_all_1() {
+        $(':nth-child(1)').nextAll('p').addClass('after');
+    }
+
+    function next_until_0() {
+        $('#term-2')
+            .nextUntil('dt')
+            .css('background-color', 'red');
+        var term3 = document.getElementById('term-3')!;
+        $('#term-1')
+            .nextUntil(term3, 'dd')
+            .css('color', 'green');
+    }
+
+    function not_0() {
+        $('input:not(:checked) + span').css('background-color', 'yellow');
+        $('input').attr('disabled', 'disabled');
+    }
+
+    function not_1() {
+        $('div').not('.green, #blueone')
+            .css('border-color', 'red');
+    }
+
+    function not_2() {
+        $('p').not($('#selected')[0]);
+    }
+
+    function not_3() {
+        $('p').not('#selected');
+    }
+
+    function not_4() {
+        $('p').not($('div p.selected'));
+    }
+
+    function nth_child_0() {
+        $('ul li:nth-child(2)').append('<span> - 2nd!</span>');
+    }
+
+    function nth_child_1() {
+        $('button').click(function() {
+            var str = $(this).text();
+            $('tr').css('background', 'white');
+            $('tr' + str).css('background', '#ff0000');
+            $('#inner').text(str);
+        });
+    }
+
+    function nth_last_child_0() {
+        $('ul li:nth-last-child(2)').append('<span> - 2nd to last!</span>');
+    }
+
+    function nth_last_child_1() {
+        $('button').click(function() {
+            var str = $(this).text();
+            $('tr').css('background', 'white');
+            $('tr' + str).css('background', '#ff0000');
+            $('#inner').text(str);
+        });
+    }
+
+    function nth_last_of_type_0() {
+        $('ul li:nth-last-of-type(2)').append('<span> - 2nd to last!</span>');
+    }
+
+    function nth_last_of_type_1() {
+        $('button').click(function() {
+            var str = $(this).text();
+            $('tr').css('background', 'white');
+            $('tr' + str).css('background', '#ff0000');
+            $('#inner').text(str);
+        });
+    }
+
+    function nth_of_type_0() {
+        $('span:nth-of-type(2)')
+            .append('<span> is 2nd sibling span</span>')
+            .addClass('nth');
+    }
+
+    function odd_0() {
+        $('tr:odd').css('background-color', '#bbbbff');
+    }
+
+    function off_0() {
+        function flash() {
+            $('div').show().fadeOut('slow');
+        }
+
+        $('#bind').click(function() {
+            $('body')
+                .on('click', '#theone', flash)
+                .find('#theone')
+                .text('Can Click!');
+        });
+        $('#unbind').click(function() {
+            $('body')
+                .off('click', '#theone', flash)
+                .find('#theone')
+                .text('Does nothing...');
+        });
+    }
+
+    function off_1() {
+        $('p').off();
+    }
+
+    function off_2() {
+        $('p').off('click', '**');
+    }
+
+    function off_3() {
+        var foo = function() {
+            // Code to handle some kind of event
+        };
+
+        // ... Now foo will be called when paragraphs are clicked ...
+        $('body').on('click', 'p', foo);
+
+        // ... Foo will no longer be called.
+        $('body').off('click', 'p', foo);
+    }
+
+    function off_4() {
+        var validate = function() {
+            // Code to validate form entries
+        };
+
+        // Delegate events under the ".validator" namespace
+        $('form').on('click.validator', 'button', validate);
+
+        $('form').on('keypress.validator', 'input[type=\'text\']', validate);
+
+        // Remove event handlers in the ".validator" namespace
+        $('form').off('.validator');
+    }
+
+    function offset_0() {
+        var p = $('p:last');
+        var offset = p.offset();
+        p.html('left: ' + offset.left + ', top: ' + offset.top);
+    }
+
+    function offset_1() {
+        $('*', document.body).click(function(event) {
+            var offset = $(this).offset();
+            event.stopPropagation();
+            $('#result').text(this.tagName +
+                ' coords ( ' + offset.left + ', ' + offset.top + ' )');
+        });
+    }
+
+    function offset_2() {
+        $('p:last').offset({ top: 10, left: 30 });
+    }
+
+    function offset_parent_0() {
+        $('li.item-a').offsetParent().css('background-color', 'red');
+    }
+
+    function on_0() {
+        $('p').on('click', function() {
+            alert($(this).text());
+        });
+    }
+
+    function on_1() {
+        function myHandler(event: JQuery.Event<HTMLElement, { foo: string; }>) {
+            alert(event.data.foo);
+        }
+
+        $('p').on('click', { foo: 'bar' }, myHandler);
+    }
+
+    function on_2() {
+        $('form').on('submit', false);
+    }
+
+    function on_3() {
+        $('form').on('submit', function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function on_4() {
+        $('form').on('submit', function(event) {
+            event.stopPropagation();
+        });
+    }
+
+    function on_5() {
+        $('div').on('click', function(event, person) {
+            alert('Hello, ' + person.name);
+        });
+        $('div').trigger('click', { name: 'Jim' });
+    }
+
+    function on_6() {
+        $('div').on('click', function(event, salutation, name) {
+            alert(salutation + ', ' + name);
+        });
+        $('div').trigger('click', ['Goodbye', 'Jim']);
+    }
+
+    function on_7() {
+        $('p').on('myCustomEvent', function(event, myName) {
+            $(this).text(myName + ', hi there!');
+            $('span')
+                .stop()
+                .css('opacity', 1)
+                .text('myName = ' + myName)
+                .fadeIn(30)
+                .fadeOut(1000);
+        });
+        $('button').click(function() {
+            $('p').trigger('myCustomEvent', ['John']);
+        });
+    }
+
+    function on_8() {
+        $('div.test').on({
+            click: function() {
+                $(this).toggleClass('active');
+            }, mouseenter: function() {
+                $(this).addClass('inside');
+            }, mouseleave: function() {
+                $(this).removeClass('inside');
+            },
+        });
+    }
+
+    function on_9() {
+        var count = 0;
+        $('body').on('click', 'p', function() {
+            $(this).after('<p>Another paragraph! ' + (++count) + '</p>');
+        });
+    }
+
+    function on_10() {
+        $('body').on('click', 'p', function() {
+            alert($(this).text());
+        });
+    }
+
+    function on_11() {
+        $('body').on('click', 'a', function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function on_12() {
+        $('#cart').on('mouseenter mouseleave', function(event) {
+            $(this).toggleClass('active');
+        });
+    }
+
+    function one_0() {
+        var n = 0;
+        $('div').one('click', function() {
+            var index = $('div').index(this);
+            $(this).css({
+                borderStyle: 'inset',
+                cursor: 'auto',
+            });
+            $('p').text('Div at index #' + index + ' clicked.' +
+                ' That\'s ' + (++n) + ' total clicks.');
+        });
+    }
+
+    function one_1() {
+        $('p').one('click', function() {
+            alert($(this).text());
+        });
+    }
+
+    function one_2() {
+        var n = 0;
+        $('.target').one('click mouseenter', function() {
+            $('.count').html((++n).toString());
+        });
+    }
+
+    function only_child_0() {
+        $('div button:only-child').text('Alone').css('border', '2px blue solid');
+    }
+
+    function only_of_type_0() {
+        $('button:only-of-type').text('Alone').css('border', '2px blue solid');
+    }
+
+    function outer_height_0() {
+        var p = $('p:first');
+        $('p:last').text(
+            'outerHeight:' + p.outerHeight() +
+            ' , outerHeight( true ):' + p.outerHeight(true));
+    }
+
+    function outer_height_1() {
+        var modHeight = 60;
+        $('div').one('click', function() {
+            $(this).outerHeight(modHeight).addClass('mod');
+            modHeight -= 8;
+        });
+    }
+
+    function outer_width_0() {
+        var p = $('p:first');
+        $('p:last').text(
+            'outerWidth:' + p.outerWidth() +
+            ' , outerWidth( true ):' + p.outerWidth(true));
+    }
+
+    function outer_width_1() {
+        var modWidth = 60;
+        $('div').one('click', function() {
+            $(this).outerWidth(modWidth).addClass('mod');
+            modWidth -= 8;
+        });
+    }
+
+    function parent_0() {
+        $('td:parent').fadeTo(1500, 0.3);
+    }
+
+    function parent_1() {
+        $('*', document.body).each(function() {
+            var parentTag = $(this).parent().get(0).tagName;
+            $(this).prepend(document.createTextNode(parentTag + ' > '));
+        });
+    }
+
+    function parent_2() {
+        $('p').parent('.selected').css('background', 'yellow');
+    }
+
+    function parents_0() {
+        var parentEls = $('b').parents()
+            .map(function() {
+                return this.tagName;
+            })
+            .get()
+            .join(', ');
+        $('b').append('<strong>' + parentEls + '</strong>');
+    }
+
+    function parents_1() {
+        function showParents() {
+            $('div').css('border-color', 'white');
+            var len = $('span.selected')
+                .parents('div')
+                .css('border', '2px red solid')
+                .length;
+            $('b').text('Unique div parents: ' + len);
+        }
+
+        $('span').click(function() {
+            $(this).toggleClass('selected');
+            showParents();
+        });
+    }
+
+    function parents_until_0() {
+        $('li.item-a')
+            .parentsUntil('.level-1')
+            .css('background-color', 'red');
+
+        $('li.item-2')
+            .parentsUntil($('ul.level-1'), '.yes')
+            .css('border', '3px solid green');
+    }
+
+    function password_0() {
+        var input = $('input:password').css({
+            background: 'yellow',
+            border: '3px red solid',
+        });
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+
+        // Prevent form submission
+        $('form').submit(function() {
+            return false;
+        });
+    }
+
+    function position_0() {
+        var p = $('p:first');
+        var position = p.position();
+        $('p:last').text('left: ' + position.left + ', top: ' + position.top);
+    }
+
+    function prepend_0() {
+        $('p').prepend('<b>Hello </b>');
+    }
+
+    function prepend_1() {
+        $('p').prepend(document.createTextNode('Hello '));
+    }
+
+    function prepend_2() {
+        $('p').prepend($('b'));
+    }
+
+    function prepend_to_0() {
+        $('span').prependTo('#foo');
+    }
+
+    function prev_0() {
+        var $curr = $('#start');
+        $curr.css('background', '#f99');
+        $('button').click(function() {
+            $curr = $curr.prev();
+            $('div').css('background', '');
+            $curr.css('background', '#f99');
+        });
+    }
+
+    function prev_1() {
+        $('p').prev('.selected').css('background', 'yellow');
+    }
+
+    function prev_all_0() {
+        $('div:last').prevAll().addClass('before');
+    }
+
+    function prev_until_0() {
+        $('#term-2').prevUntil('dt')
+            .css('background-color', 'red');
+
+        var term1 = document.getElementById('term-1')!;
+        $('#term-3').prevUntil(term1, 'dd')
+            .css('color', 'green');
+    }
+
+    function promise_0() {
+        var div = $('<div>');
+
+        div.promise().done(function(this: JQuery, arg1: JQuery) {
+            // Will fire right away and alert "true"
+            alert(this === div && arg1 === div);
+        });
+    }
+
+    function promise_1() {
+        $('button').on('click', function() {
+            $('p').append('Started...');
+
+            $('div').each(function(i) {
+                $(this).fadeIn().fadeOut(1000 * ( i + 1 ));
+            });
+
+            $('div').promise().done(function() {
+                $('p').append(' Finished! ');
+            });
+        });
+    }
+
+    function promise_2() {
+        var effect = function() {
+            return $('div').fadeIn(800).delay(1200).fadeOut();
+        };
+
+        $('button').on('click', function() {
+            $('p').append(' Started... ');
+
+            $.when(effect()).done(function() {
+                $('p').append(' Finished! ');
+            });
+        });
+    }
+
+    function prop_0() {
+        $('input').change(function() {
+            var $input = $(this);
+            $('p').html(
+                '.attr( "checked" ): <b>' + $input.attr('checked') + '</b><br>' +
+                '.prop( "checked" ): <b>' + $input.prop('checked') + '</b><br>' +
+                '.is( ":checked" ): <b>' + $input.is(':checked') + '</b>');
+        }).change();
+    }
+
+    function prop_1() {
+        $('input[type=\'checkbox\']').prop({
+            disabled: true,
+        });
+    }
+
+    function push_stack_0() {
+        jQuery([])
+            .pushStack(document.getElementsByTagName('div'))
+            .remove()
+            .end();
+    }
+
+    function queue_0() {
+        var div = $('div');
+
+        function runIt() {
+            div
+                .show('slow')
+                .animate({ left: '+=200' }, 2000)
+                .slideToggle(1000)
+                .slideToggle('fast')
+                .animate({ left: '-=200' }, 1500)
+                .hide('slow')
+                .show(1200)
+                .slideUp('normal', runIt);
+        }
+
+        function showIt() {
+            var n = div.queue('fx');
+            $('span').text(n.length);
+            setTimeout(showIt, 100);
+        }
+
+        runIt();
+        showIt();
+    }
+
+    function queue_1() {
+        $(document.body).click(function() {
+            $('div')
+                .show('slow')
+                .animate({ left: '+=200' }, 2000)
+                .queue(function() {
+                    $(this).addClass('newcolor').dequeue();
+                })
+                .animate({ left: '-=200' }, 500)
+                .queue(function() {
+                    $(this).removeClass('newcolor').dequeue();
+                })
+                .slideUp();
+        });
+    }
+
+    function queue_2() {
+        $('#start').click(function() {
+            $('div')
+                .show('slow')
+                .animate({ left: '+=200' }, 5000)
+                .queue(function() {
+                    $(this).addClass('newcolor').dequeue();
+                })
+                .animate({ left: '-=200' }, 1500)
+                .queue(function() {
+                    $(this).removeClass('newcolor').dequeue();
+                })
+                .slideUp();
+        });
+        $('#stop').click(function() {
+            $('div')
+                .queue('fx', [])
+                .stop();
+        });
+    }
+
+    function radio_0() {
+        var input = $('form input:radio')
+            .wrap('<span></span>')
+            .parent()
+            .css({
+                background: 'yellow',
+                border: '3px red solid',
+            });
+
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+
+        // Prevent form submission
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function ready_0() {
+        $(function() {
+            $('p').text('The DOM is now loaded and can be manipulated.');
+        });
+    }
+
+    function remove_0() {
+        $('button').click(function() {
+            $('p').remove();
+        });
+    }
+
+    function remove_1() {
+        $('button').click(function() {
+            $('p').remove(':contains(\'Hello\')');
+        });
+    }
+
+    function remove_attr_0() {
+        (function() {
+            var inputTitle = $('input').attr('title')!;
+            $('button').click(function() {
+                var input = $(this).next();
+
+                if (input.attr('title') === inputTitle) {
+                    input.removeAttr('title');
+                } else {
+                    input.attr('title', inputTitle);
+                }
+
+                $('#log').html('input title is now ' + input.attr('title'));
+            });
+        })();
+    }
+
+    function remove_class_0() {
+        $('p:even').removeClass('blue');
+    }
+
+    function remove_class_1() {
+        $('p:odd').removeClass('blue under');
+    }
+
+    function remove_class_2() {
+        $('p:eq(1)').removeClass();
+    }
+
+    function remove_data_0() {
+        $('span:eq(0)').text('' + $('div').data('test1'));
+        $('div').data('test1', 'VALUE-1');
+        $('div').data('test2', 'VALUE-2');
+        $('span:eq(1)').text('' + $('div').data('test1'));
+        $('div').removeData('test1');
+        $('span:eq(2)').text('' + $('div').data('test1'));
+        $('span:eq(3)').text('' + $('div').data('test2'));
+    }
+
+    function remove_prop_0(para: JQuery) {
+        para = $('p');
+        para
+            .prop('luggageCode', 1234)
+            .append('The secret luggage code is: ', String(para.prop('luggageCode')), '. ')
+            .removeProp('luggageCode')
+            .append('Now the secret luggage code is: ', String(para.prop('luggageCode')), '. ');
+    }
+
+    function replace_all_0() {
+        $('<b>Paragraph. </b>').replaceAll('p');
+    }
+
+    function replace_with_0() {
+        $('button').click(function() {
+            $(this).replaceWith('<div>' + $(this).text() + '</div>');
+        });
+    }
+
+    function replace_with_1() {
+        $('p').replaceWith('<b>Paragraph. </b>');
+    }
+
+    function replace_with_2() {
+        $('p').click(function() {
+            $(this).replaceWith($('div'));
+        });
+    }
+
+    function replace_with_3() {
+        $('button').on('click', function() {
+            var $container = $('div.container').replaceWith(function() {
+                return $(this).contents();
+            });
+
+            $('p').append($container.attr('class')!);
+        });
+    }
+
+    function reset_0() {
+        var input = $('input:reset').css({
+            background: 'yellow',
+            border: '3px red solid',
+        });
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+
+        // Prevent form submission
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function resize_0() {
+        $(window).resize(function() {
+            $('body').prepend('<div>' + $(window).width() + '</div>');
+        });
+    }
+
+    function root_0() {
+        $('<b></b>').html($(':root')[0].nodeName).appendTo('#log');
+    }
+
+    function scroll_0() {
+        $('p').clone().appendTo(document.body);
+        $('p').clone().appendTo(document.body);
+        $('p').clone().appendTo(document.body);
+        $(window).scroll(function() {
+            $('span').css('display', 'inline').fadeOut('slow');
+        });
+    }
+
+    function scroll_left_0() {
+        var p = $('p:first');
+        $('p:last').text('scrollLeft:' + p.scrollLeft());
+    }
+
+    function scroll_left_1() {
+        $('div.demo').scrollLeft(300);
+    }
+
+    function scroll_top_0() {
+        var p = $('p:first');
+        $('p:last').text('scrollTop:' + p.scrollTop());
+    }
+
+    function scroll_top_1() {
+        $('div.demo').scrollTop(300);
+    }
+
+    function select_0() {
+        $(':input').select(function() {
+            $('div').text('Something was selected').show().fadeOut(1000);
+        });
+    }
+
+    function select_1() {
+        $('input').select();
+    }
+
+    function selected_0() {
+        $('select')
+            .change(function() {
+                var str = '';
+                $('select option:selected').each(function() {
+                    str += $(this).text() + ' ';
+                });
+                $('div').text(str);
+            })
+            .trigger('change');
+    }
+
+    function serialize_0() {
+        function showValues() {
+            var str = $('form').serialize();
+            $('#results').text(str);
+        }
+
+        $('input[type=\'checkbox\'], input[type=\'radio\']').on('click', showValues);
+        $('select').on('change', showValues);
+        showValues();
+    }
+
+    function serialize_array_0() {
+        function showValues() {
+            var fields = $(':input').serializeArray();
+            $('#results').empty();
+            jQuery.each(fields, function(i, field) {
+                $('#results').append(field.value + ' ');
+            });
+        }
+
+        $(':checkbox, :radio').click(showValues);
+        $('select').change(showValues);
+        showValues();
+    }
+
+    function show_0() {
+        $('button').click(function() {
+            $('p').show('slow');
+        });
+    }
+
+    function show_1() {
+        $('#showr').click(function() {
+            $('div').first().show('fast', function showNext() {
+                $(this).next('div').show('fast', showNext);
+            });
+        });
+
+        $('#hidr').click(function() {
+            $('div').hide(1000);
+        });
+    }
+
+    function show_2() {
+        function doIt() {
+            $('span,div').show('slow');
+        }
+
+        // Can pass in function name
+        $('button').click(doIt);
+
+        $('form').submit(function(event) {
+            if ($('input').val() === 'yes') {
+                $('p').show(4000, function() {
+                    $(this).text('Ok, DONE! (now showing)');
+                });
+            }
+            $('span,div').hide('fast');
+
+            // Prevent form submission
+            event.preventDefault();
+        });
+    }
+
+    function siblings_0() {
+        var len = $('.hilite').siblings()
+            .css('color', 'red')
+            .length;
+        $('b').text(len);
+    }
+
+    function siblings_1() {
+        $('p').siblings('.selected').css('background', 'yellow');
+    }
+
+    function slice_0() {
+        function colorEm() {
+            var $div = $('div');
+            var start = Math.floor(Math.random() * $div.length);
+            var end: number | undefined = Math.floor(Math.random() * ( $div.length - start )) +
+                start + 1;
+            if (end === $div.length) {
+                end = undefined;
+            }
+            $div.css('background', '');
+            if (end) {
+                $div.slice(start, end).css('background', 'yellow');
+            } else {
+                $div.slice(start).css('background', 'yellow');
+            }
+            $('span').text('$( \'div\' ).slice( ' + start +
+                (end ? ', ' + end : '') +
+                ').css( \'background\', \'yellow\' );');
+        }
+
+        $('button').click(colorEm);
+    }
+
+    function slice_1() {
+        $('p').slice(0, 1).wrapInner('<b></b>');
+    }
+
+    function slice_2() {
+        $('p').slice(0, 2).wrapInner('<b></b>');
+    }
+
+    function slice_3() {
+        $('p').slice(1, 2).wrapInner('<b></b>');
+    }
+
+    function slice_4() {
+        $('p').slice(1).wrapInner('<b></b>');
+    }
+
+    function slice_5() {
+        $('p').slice(-1).wrapInner('<b></b>');
+    }
+
+    function slide_down_0() {
+        $(document.body).click(function() {
+            if ($('div:first').is(':hidden')) {
+                $('div').slideDown('slow');
+            } else {
+                $('div').hide();
+            }
+        });
+    }
+
+    function slide_down_1() {
+        $('div').click(function() {
+            $(this).css({
+                borderStyle: 'inset',
+                cursor: 'wait',
+            });
+            $('input').slideDown(1000, function() {
+                $(this)
+                    .css('border', '2px red inset')
+                    .filter('.middle')
+                    .css('background', 'yellow')
+                    .focus();
+                $('div').css('visibility', 'hidden');
+            });
+        });
+    }
+
+    function slide_toggle_0() {
+        $('button').click(function() {
+            $('p').slideToggle('slow');
+        });
+    }
+
+    function slide_toggle_1() {
+        $('#aa').click(function() {
+            $('div:not(.still)').slideToggle('slow', function() {
+                var n = parseInt($('span').text(), 10);
+                $('span').text(n + 1);
+            });
+        });
+    }
+
+    function slide_up_0() {
+        $(document.body).click(function() {
+            if ($('div:first').is(':hidden')) {
+                $('div').show('slow');
+            } else {
+                $('div').slideUp();
+            }
+        });
+    }
+
+    function slide_up_1() {
+        $('button').click(function() {
+            $(this).parent().slideUp('slow', function() {
+                $('#msg').text($('button', this).text() + ' has completed.');
+            });
+        });
+    }
+
+    function stop_0() {
+        // Start animation
+        $('#go').click(function() {
+            $('.block').animate({ left: '+=100px' }, 2000);
+        });
+
+        // Stop animation when button is clicked
+        $('#stop').click(function() {
+            $('.block').stop();
+        });
+
+        // Start animation in the opposite direction
+        $('#back').click(function() {
+            $('.block').animate({ left: '-=100px' }, 2000);
+        });
+    }
+
+    function stop_1() {
+        var $block = $('.block');
+
+        // Toggle a sliding animation animation
+        $('#toggle').on('click', function() {
+            $block.stop().slideToggle(1000);
+        });
+    }
+
+    function submit_0() {
+        var submitEl = $('td :submit')
+            .parent('td')
+            .css({
+                background: 'yellow',
+                border: '3px red solid',
+            })
+            .end();
+
+        $('#result').text('jQuery matched ' + submitEl.length + ' elements.');
+
+        // Prevent form submission
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+
+        // Extra JS to make the HTML easier to edit (None of this is relevant to the ':submit' selector)
+        $('#exampleTable').find('td').each(function(i, el) {
+            var inputEl = $(el).children(),
+                inputType = inputEl.attr('type') ? ' type=\'' + inputEl.attr('type') + '\'' : '';
+            $(el).before('<td>' + inputEl[0].nodeName + inputType + '</td>');
+        });
+    }
+
+    function submit_1() {
+        $('form').submit(function(event) {
+            if ($('input:first').val() === 'correct') {
+                $('span').text('Validated...').show();
+                return;
+            }
+
+            $('span').text('Not valid!').show().fadeOut(1000);
+            event.preventDefault();
+        });
+    }
+
+    function submit_2() {
+        $('form').submit(function() {
+            // return this.some_flag_variable;
+        });
+    }
+
+    function submit_3() {
+        $('form:first').submit();
+    }
+
+    function text_0() {
+        var input = $('form input:text').css({
+            background: 'yellow',
+            border: '3px red solid',
+        });
+
+        $('div')
+            .text('For this type jQuery found ' + input.length + '.')
+            .css('color', 'red');
+
+        // Prevent form submission
+        $('form').submit(function(event) {
+            event.preventDefault();
+        });
+    }
+
+    function text_1() {
+        var str = $('p:first').text();
+        $('p:last').html(str);
+    }
+
+    function text_2() {
+        $('p').text('<b>Some</b> new text.');
+    }
+
+    function to_array_0() {
+        function disp(divs: HTMLElement[]) {
+            var a: any[] = [];
+            for (var i = 0; i < divs.length; i++) {
+                a.push(divs[i].innerHTML);
+            }
+            $('span').text(a.join(' '));
+        }
+
+        disp($('div').toArray().reverse());
+    }
+
+    function toggle_0() {
+        $('button').click(function() {
+            $('p').toggle();
+        });
+    }
+
+    function toggle_1() {
+        $('button').click(function() {
+            $('p').toggle('slow');
+        });
+    }
+
+    function toggle_2() {
+        var flip = 0;
+        $('button').click(function() {
+            $('p').toggle(flip++ % 2 === 0);
+        });
+    }
+
+    function toggle_class_0() {
+        $('p').click(function() {
+            $(this).toggleClass('highlight');
+        });
+    }
+
+    function toggle_class_1() {
+        var count = 0;
+        $('p').each(function() {
+            var $thisParagraph = $(this);
+            var count = 0;
+            $thisParagraph.click(function() {
+                count++;
+                $thisParagraph.find('span').text('clicks: ' + count);
+                $thisParagraph.toggleClass('highlight', count % 3 === 0);
+            });
+        });
+    }
+
+    function toggle_class_2() {
+        var cls = ['', 'a', 'a b', 'a b c'];
+        var divs = $('div.wrap').children();
+        var appendClass = function() {
+            divs.append(function() {
+                return '<div>' + ( this.className || 'none' ) + '</div>';
+            });
+        };
+
+        appendClass();
+
+        $('button').on('click', function() {
+            var tc = this.className || undefined;
+            divs.toggleClass(tc!);
+            appendClass();
+        });
+
+        $('a').on('click', function(event) {
+            event.preventDefault();
+            divs.empty().each(function(i) {
+                this.className = cls[i];
+            });
+            appendClass();
+        });
+    }
+
+    function trigger_0() {
+        $('button:first').click(function() {
+            update($('span:first'));
+        });
+
+        $('button:last').click(function() {
+            $('button:first').trigger('click');
+            update($('span:last'));
+        });
+
+        function update(j: JQuery) {
+            var n = parseInt(j.text(), 10);
+            j.text(n + 1);
+        }
+    }
+
+    function trigger_1() {
+        $('form:first').trigger('submit');
+    }
+
+    function trigger_2() {
+        var event = jQuery.Event('submit');
+        $('form:first').trigger(event);
+        if (event.isDefaultPrevented()) {
+            // Perform an action...
+        }
+    }
+
+    function trigger_3() {
+        $('p')
+            .click(function(event, a, b) {
+                // When a normal click fires, a and b are undefined
+                // for a trigger like below a refers to "foo" and b refers to "bar"
+            })
+            .trigger('click', ['foo', 'bar']);
+    }
+
+    function trigger_4() {
+        var event = jQuery.Event('logged');
+        // event.user = 'foo';
+        // event.pass = 'bar';
+        $('body').trigger(event);
+    }
+
+    function trigger_5() {
+        $('body').trigger({
+            type: 'logged',
+            user: 'foo',
+            pass: 'bar',
+        } as any);
+    }
+
+    function trigger_handler_0() {
+        $('#old').click(function() {
+            $('input').trigger('focus');
+        });
+        $('#new').click(function() {
+            $('input').triggerHandler('focus');
+        });
+        $('input').focus(function() {
+            $('<span>Focused!</span>').appendTo('body').fadeOut(1000);
+        });
+    }
+
+    function unbind_0() {
+        function aClick() {
+            $('div').show().fadeOut('slow');
+        }
+
+        $('#bind').click(function() {
+            $('#theone')
+                .bind('click', aClick)
+                .text('Can Click!');
+        });
+        $('#unbind').click(function() {
+            $('#theone')
+                .unbind('click', aClick)
+                .text('Does nothing...');
+        });
+    }
+
+    function unbind_1() {
+        $('p').unbind();
+    }
+
+    function unbind_2() {
+        $('p').unbind('click');
+    }
+
+    function unbind_3() {
+        var foo = function() {
+            // Code to handle some kind of event
+        };
+
+        $('p').bind('click', foo); // ... Now foo will be called when paragraphs are clicked ...
+
+        $('p').unbind('click', foo); // ... foo will no longer be called.
+    }
+
+    function undelegate_0() {
+        function aClick() {
+            $('div').show().fadeOut('slow');
+        }
+
+        $('#bind').click(function() {
+            $('body')
+                .delegate('#theone', 'click', aClick)
+                .find('#theone').text('Can Click!');
+        });
+        $('#unbind').click(function() {
+            $('body')
+                .undelegate('#theone', 'click', aClick)
+                .find('#theone').text('Does nothing...');
+        });
+    }
+
+    function undelegate_1() {
+        $('p').undelegate();
+    }
+
+    function undelegate_2() {
+        $('p').undelegate('click');
+    }
+
+    function undelegate_3() {
+        var foo = function() {
+            // Code to handle some kind of event
+        };
+
+        // ... Now foo will be called when paragraphs are clicked ...
+        $('body').delegate('p', 'click', foo);
+
+        // ... foo will no longer be called.
+        $('body').undelegate('p', 'click', foo);
+    }
+
+    function undelegate_4() {
+        var foo = function() {
+            // Code to handle some kind of event
+        };
+
+        // Delegate events under the ".whatever" namespace
+        $('form').delegate(':button', 'click.whatever', foo);
+
+        $('form').delegate('input[type=\'text\'] ', 'keypress.whatever', foo);
+
+        // Unbind all events delegated under the ".whatever" namespace
+        $('form').undelegate('.whatever');
+    }
+
+    function unwrap_0() {
+        var pTags = $('p');
+        $('button').click(function() {
+            if (pTags.parent().is('div')) {
+                pTags.unwrap();
+            } else {
+                pTags.wrap('<div></div>');
+            }
+        });
+    }
+
+    function val_0() {
+        function displayVals() {
+            var singleValues = $('#single').val();
+            var multipleValues = $('#multiple').val() as string[] || [];
+            // When using jQuery 3:
+            // var multipleValues = $( "#multiple" ).val();
+            $('p').html('<b>Single:</b> ' + singleValues +
+                ' <b>Multiple:</b> ' + multipleValues.join(', '));
+        }
+
+        $('select').change(displayVals);
+        displayVals();
+    }
+
+    function val_1() {
+        $('input')
+            .keyup(function() {
+                var value = $(this).val() as string;
+                $('p').text(value);
+            })
+            .keyup();
+    }
+
+    function val_2() {
+        $('button').click(function() {
+            var text = $(this).text();
+            $('input').val(text);
+        });
+    }
+
+    function val_3() {
+        $('input').on('blur', function() {
+            $(this).val(function(i, val) {
+                return val.toUpperCase();
+            });
+        });
+    }
+
+    function val_4() {
+        $('#single').val('Single2');
+        $('#multiple').val(['Multiple2', 'Multiple3']);
+        $('input').val(['check1', 'check2', 'radio1']);
+    }
+
+    function visible_0() {
+        $('div:visible').click(function() {
+            $(this).css('background', 'yellow');
+        });
+        $('button').click(function() {
+            $('div:hidden').show('fast');
+        });
+    }
+
+    function width_0() {
+        function showWidth(ele: string, w: number) {
+            $('div').text('The width for the ' + ele + ' is ' + w + 'px.');
+        }
+
+        $('#getp').click(function() {
+            showWidth('paragraph', $('p').width()!);
+        });
+        $('#getd').click(function() {
+            showWidth('document', $(document).width()!);
+        });
+        $('#getw').click(function() {
+            showWidth('window', $(window).width()!);
+        });
+    }
+
+    function width_1() {
+        var modWidth = 50;
+        $('div').one('click', function() {
+            $(this).width(modWidth).addClass('mod');
+            modWidth -= 8;
+        });
+    }
+
+    function wrap_0() {
+        $('p').wrap('<div></div>');
+    }
+
+    function wrap_1() {
+        $('span').wrap('<div><div><p><em><b></b></em></p></div></div>');
+    }
+
+    function wrap_2() {
+        $('p').wrap(document.createElement('div'));
+    }
+
+    function wrap_3() {
+        $('p').wrap($('.doublediv'));
+    }
+
+    function wrap_all_0() {
+        $('p').wrapAll('<div></div>');
+    }
+
+    function wrap_all_1() {
+        $('span').wrapAll('<div><div><p><em><b></b></em></p></div></div>');
+    }
+
+    function wrap_all_2() {
+        $('p').wrapAll(document.createElement('div'));
+    }
+
+    function wrap_all_3() {
+        $('p').wrapAll($('.doublediv'));
+    }
+
+    function wrap_inner_0() {
+        $('p').wrapInner('<b></b>');
+    }
+
+    function wrap_inner_1() {
+        $('body').wrapInner('<div><div><p><em><b></b></em></p></div></div>');
+    }
+
+    function wrap_inner_2() {
+        $('p').wrapInner(document.createElement('b'));
+    }
+
+    function wrap_inner_3() {
+        $('p').wrapInner($('<span class=\'red\'></span>'));
+    }
+}
diff --git a/types/jquery/test/jquery-no-window-module-tests.ts b/types/jquery/test/jquery-no-window-module-tests.ts
new file mode 100644
index 0000000000..2f2de4cc98
--- /dev/null
+++ b/types/jquery/test/jquery-no-window-module-tests.ts
@@ -0,0 +1,5 @@
+import jQueryFactory = require('jquery');
+
+const jq = jQueryFactory(window, true);
+// $ExpectType JQueryStatic<HTMLElement>
+jq;
diff --git a/types/jquery/test/jquery-slim-no-window-module-tests.ts b/types/jquery/test/jquery-slim-no-window-module-tests.ts
new file mode 100644
index 0000000000..2e104af0eb
--- /dev/null
+++ b/types/jquery/test/jquery-slim-no-window-module-tests.ts
@@ -0,0 +1,5 @@
+import jQueryFactory = require('jquery/dist/jquery.slim');
+
+const jq = jQueryFactory(window, true);
+// $ExpectType JQueryStatic<HTMLElement>
+jq;
diff --git a/types/jquery/test/jquery-slim-window-module-tests.ts b/types/jquery/test/jquery-slim-window-module-tests.ts
new file mode 100644
index 0000000000..76870e7a04
--- /dev/null
+++ b/types/jquery/test/jquery-slim-window-module-tests.ts
@@ -0,0 +1,5 @@
+import * as jq from 'jquery/dist/jquery.slim';
+
+const $window = jq(window);
+// $ExpectType JQuery<HTMLElement>
+$window;
diff --git a/types/jquery/test/jquery-window-module-tests.ts b/types/jquery/test/jquery-window-module-tests.ts
new file mode 100644
index 0000000000..71e20bc4a0
--- /dev/null
+++ b/types/jquery/test/jquery-window-module-tests.ts
@@ -0,0 +1,18 @@
+import * as jq from 'jquery';
+
+const $window = jq(window);
+// $ExpectType JQuery<HTMLElement>
+$window;
+
+class CanvasLayersDirective {
+    private readonly $renderingCanvas: JQuery<HTMLCanvasElement>;
+    private readonly $offscreenCanvas: JQuery<HTMLCanvasElement>;
+
+    constructor(elementRef: { nativeElement: any; }) {
+        // This type assertion results in an error when exporting 'typeof factory & JQueryStatic' where
+        // 'factory' is jQuery's factory function.
+        const $Canvas = $ as JQueryStatic<HTMLCanvasElement>;
+        this.$renderingCanvas = $Canvas(elementRef.nativeElement);
+        this.$offscreenCanvas = $Canvas(document.createElement('canvas'));
+    }
+}
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
new file mode 100644
index 0000000000..d77823ff78
--- /dev/null
+++ b/types/jquery/test/longdesc-tests.ts
@@ -0,0 +1,2524 @@
+/* tslint:disable:object-literal-key-quotes object-literal-shorthand one-variable-per-declaration only-arrow-functions prefer-const prefer-for-of triple-equals no-var */
+
+function longdesc() {
+    function add_0() {
+        $('p').add('div').addClass('widget');
+        var pdiv = $('p').add('div');
+    }
+
+    function add_1() {
+        var pdiv = $('p');
+        pdiv.add('div'); // WRONG, pdiv will not change
+    }
+
+    function add_2() {
+        $('li').add('p').css('background-color', 'red');
+    }
+
+    function add_3() {
+        $('li').add(document.getElementsByTagName('p')[0])
+            .css('background-color', 'red');
+    }
+
+    function add_4() {
+        $('li').add('<p id=\'new\'>new paragraph</p>')
+            .css('background-color', 'red');
+    }
+
+    function add_back_0() {
+        $('li.third-item').nextAll().addBack()
+            .css('background-color', 'red');
+    }
+
+    function add_class_0() {
+        $('p').addClass('myClass yourClass');
+    }
+
+    function add_class_1() {
+        $('p').removeClass('myClass noClass').addClass('yourClass');
+    }
+
+    function add_class_2() {
+        $('ul li').addClass(function(index) {
+            return 'item-' + index;
+        });
+    }
+
+    function after_0() {
+        $('.inner').after('<p>Test</p>');
+    }
+
+    function after_1() {
+        $('.container').after($('h2'));
+    }
+
+    function after_2() {
+        $('p').after(function() {
+            return '<div>' + this.className + '</div>';
+        });
+    }
+
+    function after_3() {
+        var $newdiv1 = $('<div id=\'object1\'></div>'),
+            newdiv2 = document.createElement('div'),
+            existingdiv1 = document.getElementById('foo')!;
+
+        $('p').first().after($newdiv1, [newdiv2, existingdiv1]);
+    }
+
+    function ajax_complete_0() {
+        $(document).ajaxComplete(function() {
+            $('.log').text('Triggered ajaxComplete handler.');
+        });
+    }
+
+    function ajax_complete_1() {
+        $('.trigger').click(function() {
+            $('.result').load('ajax/test.html');
+        });
+    }
+
+    function ajax_complete_2() {
+        $(document).ajaxComplete(function(event, xhr, settings) {
+            if (settings.url === 'ajax/test.html') {
+                $('.log').text('Triggered ajaxComplete handler. The result is ' +
+                    xhr.responseText);
+            }
+        });
+    }
+
+    function ajax_error_0() {
+        $(document).ajaxError(function() {
+            $('.log').text('Triggered ajaxError handler.');
+        });
+    }
+
+    function ajax_error_1() {
+        $('button.trigger').on('click', function() {
+            $('div.result').load('ajax/missing.html');
+        });
+    }
+
+    function ajax_error_2() {
+        $(document).ajaxError(function(event, jqxhr, settings, thrownError) {
+            if (settings.url == 'ajax/missing.html') {
+                $('div.log').text('Triggered ajaxError handler.');
+            }
+        });
+    }
+
+    function ajax_send_0() {
+        $(document).ajaxSend(function() {
+            $('.log').text('Triggered ajaxSend handler.');
+        });
+    }
+
+    function ajax_send_1() {
+        $('.trigger').click(function() {
+            $('.result').load('ajax/test.html');
+        });
+    }
+
+    function ajax_send_2() {
+        $(document).ajaxSend(function(event, jqxhr, settings) {
+            if (settings.url == 'ajax/test.html') {
+                $('.log').text('Triggered ajaxSend handler.');
+            }
+        });
+    }
+
+    function ajax_start_0() {
+        $(document).ajaxStart(function() {
+            $('.log').text('Triggered ajaxStart handler.');
+        });
+    }
+
+    function ajax_start_1() {
+        $('.trigger').click(function() {
+            $('.result').load('ajax/test.html');
+        });
+    }
+
+    function ajax_stop_0() {
+        $(document).ajaxStop(function() {
+            $('.log').text('Triggered ajaxStop handler.');
+        });
+    }
+
+    function ajax_stop_1() {
+        $('.trigger').click(function() {
+            $('.result').load('ajax/test.html');
+        });
+    }
+
+    function ajax_success_0() {
+        $(document).ajaxSuccess(function() {
+            $('.log').text('Triggered ajaxSuccess handler.');
+        });
+    }
+
+    function ajax_success_1() {
+        $('.trigger').on('click', function() {
+            $('.result').load('ajax/test.html');
+        });
+    }
+
+    function ajax_success_2() {
+        $(document).ajaxSuccess(function(event, xhr, settings) {
+            if (settings.url == 'ajax/test.html') {
+                $('.log').text('Triggered ajaxSuccess handler. The Ajax response was: ' +
+                    xhr.responseText);
+            }
+        });
+    }
+
+    function animate_0() {
+        $('#clickme').click(function() {
+            $('#book').animate({
+                opacity: 0.25,
+                left: '+=50',
+                height: 'toggle',
+            }, 5000, function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function animate_1() {
+        $('li').animate({
+            opacity: .5,
+            height: '50%',
+        }, {
+            step: function(now, fx) {
+                var data = fx.elem.id + ' ' + fx.prop + ': ' + now;
+                $('body').append('<div>' + data + '</div>');
+            },
+        });
+    }
+
+    function animate_2() {
+        $('#clickme').click(function() {
+            $('#book').animate({
+                width: ['toggle', 'swing'],
+                height: ['toggle', 'swing'],
+                opacity: 'toggle',
+            }, 5000, 'linear', function() {
+                $(this).after('<div>Animation complete.</div>');
+            });
+        });
+    }
+
+    function animate_3() {
+        $('#clickme').click(function() {
+            $('#book').animate({
+                width: 'toggle',
+                height: 'toggle',
+            }, {
+                duration: 5000,
+                specialEasing: {
+                    width: 'linear',
+                    height: 'easeOutBounce',
+                },
+                complete: function() {
+                    $(this).after('<div>Animation complete.</div>');
+                },
+            });
+        });
+    }
+
+    function append_0() {
+        $('.inner').append('<p>Test</p>');
+    }
+
+    function append_1() {
+        $('.container').append($('h2'));
+    }
+
+    function append_2() {
+        var $newdiv1 = $('<div id=\'object1\'></div>'),
+            newdiv2 = document.createElement('div'),
+            existingdiv1 = document.getElementById('foo')!;
+
+        $('body').append($newdiv1, [newdiv2, existingdiv1]);
+    }
+
+    function append_to_0() {
+        $('<p>Test</p>').appendTo('.inner');
+    }
+
+    function append_to_1() {
+        $('h2').appendTo($('.container'));
+    }
+
+    function attr_0() {
+        $('#greatphoto').attr('alt', 'Beijing Brush Seller');
+    }
+
+    function attr_1() {
+        $('#greatphoto').attr('title', 'Photo by Kelly Clark');
+    }
+
+    function attr_2() {
+        $('#greatphoto').attr({
+            alt: 'Beijing Brush Seller',
+            title: 'photo by Kelly Clark',
+        });
+    }
+
+    function attr_3() {
+        $('#greatphoto').attr('title', function(i, val) {
+            return val + ' - photo by Kelly Clark';
+        });
+    }
+
+    function before_0() {
+        $('.inner').before('<p>Test</p>');
+    }
+
+    function before_1() {
+        $('.container').before($('h2'));
+    }
+
+    function before_2() {
+        var newdiv1 = $('<div id=\'object1\'></div>'),
+            newdiv2 = document.createElement('div'),
+            existingdiv1 = document.getElementById('foo')!;
+
+        $('p').first().before(newdiv1, [newdiv2, existingdiv1]);
+    }
+
+    function bind_0() {
+        $('#foo').bind('click', function() {
+            alert('User clicked on \'foo.\'');
+        });
+    }
+
+    function bind_1() {
+        $('#foo').bind('mouseenter mouseleave', function() {
+            $(this).toggleClass('entered');
+        });
+    }
+
+    function bind_2() {
+        $('#foo').bind({
+            click: function() {
+                // Do something on click
+            },
+            mouseenter: function() {
+                // Do something on mouseenter
+            },
+        });
+    }
+
+    function bind_3() {
+        $('#foo').bind('click', function() {
+            alert($(this).text());
+        });
+    }
+
+    function bind_4() {
+        $(document).ready(function() {
+            $('#foo').bind('click', function(event) {
+                alert('The mouse cursor is at (' +
+                    event.pageX + ', ' + event.pageY +
+                    ')');
+            });
+        });
+    }
+
+    function bind_5() {
+        var message = 'Spoon!';
+        $('#foo').bind('click', function() {
+            alert(message);
+        });
+        message = 'Not in the face!';
+        $('#bar').bind('click', function() {
+            alert(message);
+        });
+    }
+
+    function bind_6() {
+        var message = 'Spoon!';
+        $('#foo').bind('click', {
+            msg: message,
+        }, function(event) {
+            alert(event.data.msg);
+        });
+        message = 'Not in the face!';
+        $('#bar').bind('click', {
+            msg: message,
+        }, function(event) {
+            alert(event.data.msg);
+        });
+    }
+
+    function blur_0() {
+        $('#other').click(function() {
+            $('#target').blur();
+        });
+    }
+
+    function change_0() {
+        $('.target').change(function() {
+            alert('Handler for .change() called.');
+        });
+    }
+
+    function change_1() {
+        $('#other').click(function() {
+            $('.target').change();
+        });
+    }
+
+    function children_0() {
+        $('ul.level-2').children().css('background-color', 'red');
+    }
+
+    function click_0() {
+        $('#target').click(function() {
+            alert('Handler for .click() called.');
+        });
+    }
+
+    function click_1() {
+        $('#other').click(function() {
+            $('#target').click();
+        });
+    }
+
+    function clone_0() {
+        $('.hello').appendTo('.goodbye');
+    }
+
+    function clone_1() {
+        $('.hello').clone().appendTo('.goodbye');
+    }
+
+    function clone_2() {
+        // Original element with attached data
+        var $elem = $('#elem').data('arr', [1]),
+            $clone = $elem.clone(true)
+            // Deep copy to prevent data sharing
+                .data('arr', $.extend([], $elem.data('arr')));
+    }
+
+    function closest_0() {
+        $('li.item-a')
+            .closest('ul')
+            .css('background-color', 'red');
+    }
+
+    function closest_1() {
+        $('li.item-a')
+            .closest('li')
+            .css('background-color', 'red');
+    }
+
+    function closest_2() {
+        var listItemII = document.getElementById('ii')!;
+        $('li.item-a')
+            .closest('ul', listItemII)
+            .css('background-color', 'red');
+        $('li.item-a')
+            .closest('#one', listItemII)
+            .css('background-color', 'green');
+    }
+
+    function contents_0() {
+        $('.container')
+            .contents()
+            .filter(function() {
+                return this.nodeType === 3;
+            })
+            .wrap('<p></p>')
+            .end()
+            .filter('br')
+            .remove();
+    }
+
+    function contextmenu_0() {
+        $('#target').contextmenu(function() {
+            alert('Handler for .contextmenu() called.');
+        });
+    }
+
+    function contextmenu_1() {
+        $('#target').contextmenu();
+    }
+
+    function css_0() {
+        $('div.example').css('width', function(index) {
+            return index * 50;
+        });
+    }
+
+    function data_0() {
+        alert($('body').data('foo'));
+        alert($('body').data());
+    }
+
+    function data_1() {
+        alert($('body').data('foo')); // undefined
+        $('body').data('bar', 'foobar');
+        alert($('body').data('bar')); // foobar
+    }
+
+    function data_2() {
+        $('div').data('role') === 'page';
+        $('div').data('lastValue') === 43;
+        $('div').data('hidden') === true;
+        $('div').data('options').name === 'John';
+    }
+
+    function data_3() {
+        var mydata = $('#mydiv').data();
+        if (mydata.count < 9) {
+            mydata.count = 43;
+            mydata.status = 'embiggened';
+        }
+    }
+
+    function data_4() {
+        $('body').data('foo', 52);
+        $('body').data('bar', { myType: 'test', count: 40 });
+        $('body').data({ baz: [1, 2, 3] });
+        $('body').data('foo'); // 52
+        $('body').data(); // { foo: 52, bar: { myType: "test", count: 40 }, baz: [ 1, 2, 3 ] }
+    }
+
+    function data_5() {
+        alert($('body').data('foo'));
+        alert($('body').data());
+    }
+
+    function data_6() {
+        alert($('body').data('foo')); // undefined
+        $('body').data('bar', 'foobar');
+        alert($('body').data('bar')); // foobar
+    }
+
+    function data_7() {
+        $('div').data('role') === 'page';
+        $('div').data('lastValue') === 43;
+        $('div').data('hidden') === true;
+        $('div').data('options').name === 'John';
+    }
+
+    function data_8() {
+        var mydata = $('#mydiv').data();
+        if (mydata.count < 9) {
+            mydata.count = 43;
+            mydata.status = 'embiggened';
+        }
+    }
+
+    function dblclick_0() {
+        $('#target').dblclick(function() {
+            alert('Handler for .dblclick() called.');
+        });
+    }
+
+    function dblclick_1() {
+        $('#other').click(function() {
+            $('#target').dblclick();
+        });
+    }
+
+    function delay_0() {
+        $('#foo').slideUp(300).delay(800).fadeIn(400);
+    }
+
+    function delegate_0(elements: HTMLElement[], selector: string, events: any, data: any, handler: JQuery.EventHandler<HTMLElement>) {
+        // jQuery 1.4.3+
+        $(elements).delegate(selector, events, data, handler);
+        // jQuery 1.7+
+        $(elements).on(events, selector, data, handler);
+    }
+
+    function delegate_1() {
+        $('table').delegate('td', 'click', function() {
+            $(this).toggleClass('chosen');
+        });
+    }
+
+    function delegate_2() {
+        $('table').on('click', 'td', function() {
+            $(this).toggleClass('chosen');
+        });
+    }
+
+    function each_0() {
+        $('li').each(function(index) {
+            console.log(index + ': ' + $(this).text());
+        });
+    }
+
+    function each_1() {
+        // The .each() method is unnecessary here:
+        $('li').each(function() {
+            $(this).addClass('foo');
+        });
+
+        // Instead, you should rely on implicit iteration:
+        $('li').addClass('bar');
+    }
+
+    function empty_0() {
+        $('.hello').empty();
+    }
+
+    function end_0() {
+        $('ul.first')
+            .find('.foo')
+            .css('background-color', 'red')
+            .end()
+            .find('.bar')
+            .css('background-color', 'green');
+    }
+
+    function end_1() {
+        $('ul.first')
+            .find('.foo')
+            .css('background-color', 'red')
+            .end()
+            .find('.bar')
+            .css('background-color', 'green')
+            .end();
+    }
+
+    function eq_0() {
+        $('li').eq(2).css('background-color', 'red');
+    }
+
+    function eq_1() {
+        $('li').eq(-2).css('background-color', 'red');
+    }
+
+    function eq_2() {
+        $('li').eq(5).css('background-color', 'red');
+    }
+
+    function fade_out_0() {
+        $('#clickme').click(function() {
+            $('#book').fadeOut('slow', function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function filter_0() {
+        $('li').filter(':even').css('background-color', 'red');
+    }
+
+    function filter_1() {
+        $('li')
+            .filter(function(index) {
+                return $('strong', this).length === 1;
+            })
+            .css('background-color', 'red');
+    }
+
+    function filter_2() {
+        $('li')
+            .filter(function(index) {
+                return index % 3 === 2;
+            })
+            .css('background-color', 'red');
+    }
+
+    function find_0() {
+        $('li.item-ii').find('li').css('background-color', 'red');
+    }
+
+    function find_1() {
+        var allListElements = $('li');
+    }
+
+    function find_2(allListElements: never) {
+        $('li.item-ii').find(allListElements);
+    }
+
+    function find_3() {
+        var item1 = $('li.item-1')[0];
+        $('li.item-ii').find(item1).css('background-color', 'red');
+    }
+
+    function first_0() {
+        $('li').first().css('background-color', 'red');
+    }
+
+    function focus_0() {
+        $('#target').focus(function() {
+            alert('Handler for .focus() called.');
+        });
+    }
+
+    function focus_1() {
+        $('#other').click(function() {
+            $('#target').focus();
+        });
+    }
+
+    function get_0() {
+        console.log($('li').get(0));
+    }
+
+    function get_1() {
+        console.log($('li')[0]);
+    }
+
+    function get_2() {
+        console.log($('li').get(-1));
+    }
+
+    function get_3() {
+        console.log($('li').get());
+    }
+
+    function has_0() {
+        $('li').has('ul').css('background-color', 'red');
+    }
+
+    function has_class_0() {
+        $('#mydiv').hasClass('foo');
+    }
+
+    function has_class_1() {
+        $('#mydiv').hasClass('bar');
+    }
+
+    function has_class_2() {
+        $('#mydiv').hasClass('quux');
+    }
+
+    function height_0() {
+        // Returns height of browser viewport
+        $(window).height();
+
+        // Returns height of HTML document
+        $(document).height();
+    }
+
+    function hide_0() {
+        $('.target').hide();
+    }
+
+    function hide_1() {
+        // With the element initially shown, we can hide it slowly:
+        $('#clickme').click(function() {
+            $('#book').hide('slow', function() {
+                alert('Animation complete.');
+            });
+        });
+    }
+
+    function hover_0(selector: string, handlerInOut: never) {
+        $(selector).on('mouseenter mouseleave', handlerInOut);
+    }
+
+    function html_0() {
+        $('div.demo-container').html();
+    }
+
+    function html_1() {
+        $('div.demo-container')
+            .html('<p>All new content. <em>You bet!</em></p>');
+    }
+
+    function html_2() {
+        $('div.demo-container').html(function() {
+            var emphasis = '<em>' + $('p').length + ' paragraphs!</em>';
+            return '<p>All new content for ' + emphasis + '</p>';
+        });
+    }
+
+    function index_0() {
+        var listItem = document.getElementById('bar')!;
+        alert('Index: ' + $('li').index(listItem));
+    }
+
+    function index_1() {
+        var listItem = $('#bar');
+        alert('Index: ' + $('li').index(listItem));
+    }
+
+    function index_2() {
+        var listItems = $('li:gt(0)');
+        alert('Index: ' + $('li').index(listItems));
+    }
+
+    function index_3() {
+        var listItem = $('#bar');
+        alert('Index: ' + listItem.index('li'));
+    }
+
+    function index_4() {
+        alert('Index: ' + $('#bar').index());
+    }
+
+    function insert_after_0() {
+        $('<p>Test</p>').insertAfter('.inner');
+    }
+
+    function insert_after_1() {
+        $('h2').insertAfter($('.container'));
+    }
+
+    function insert_before_0() {
+        $('<p>Test</p>').insertBefore('.inner');
+    }
+
+    function insert_before_1() {
+        $('h2').insertBefore($('.container'));
+    }
+
+    function is_0() {
+        $('ul').click(function(event) {
+            var target = $(event.target);
+            if (target.is('li')) {
+                target.css('background-color', 'red');
+            }
+        });
+    }
+
+    function is_1() {
+        $('li').click(function() {
+            var li = $(this),
+                isWithTwo = li.is(function() {
+                    return $('strong', this).length === 2;
+                });
+            if (isWithTwo) {
+                li.css('background-color', 'green');
+            } else {
+                li.css('background-color', 'red');
+            }
+        });
+    }
+
+    function jquery_ajax_0() {
+        $.ajax();
+    }
+
+    function jquery_ajax_1() {
+        $.ajax({
+            url: 'http://fiddle.jshell.net/favicon.png',
+            beforeSend: function(xhr) {
+                xhr.overrideMimeType('text/plain; charset=x-user-defined');
+            },
+        })
+            .done(function(data) {
+                if (console && console.log) {
+                    console.log('Sample of data:', data.slice(0, 100));
+                }
+            });
+    }
+
+    function jquery_ajax_2() {
+        // Assign handlers immediately after making the request,
+        // and remember the jqXHR object for this request
+        var jqxhr = $.ajax('example.php')
+            .done(function() {
+                alert('success');
+            })
+            .fail(function() {
+                alert('error');
+            })
+            .always(function() {
+                alert('complete');
+            });
+
+        // Perform other work here ...
+
+        // Set another completion function for the request above
+        jqxhr.always(function() {
+            alert('second complete');
+        });
+    }
+
+    function jquery_ajax_3() {
+        $.ajaxSetup({
+            contents: {
+                mycustomtype: /mycustomtype/,
+            },
+            converters: {
+                'mycustomtype json': function(result) {
+                    // Do stuff
+                    var newresult = '';
+                    return newresult;
+                },
+            },
+        });
+    }
+
+    function jquery_ajax_4() {
+        $.ajaxSetup({
+            contents: {
+                mycustomtype: /mycustomtype/,
+            },
+            converters: {
+                'text mycustomtype': true,
+                'mycustomtype json': function(result) {
+                    // Do stuff
+                    var newresult = '';
+                    return newresult;
+                },
+            },
+        });
+    }
+
+    function jquery_ajax_prefilter_0() {
+        $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
+            // Modify options, control originalOptions, store jqXHR, etc
+        });
+    }
+
+    function jquery_ajax_prefilter_1() {
+        var currentRequests: JQuery.PlainObject = {};
+
+        $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
+            if ((<any> options).abortOnRetry) {
+                if (currentRequests[options.url!]) {
+                    currentRequests[options.url!].abort();
+                }
+                currentRequests[options.url!] = jqXHR;
+            }
+        });
+    }
+
+    function jquery_ajax_prefilter_2() {
+        $.ajaxPrefilter(function(options) {
+            if (options.crossDomain) {
+                options.url = 'http://mydomain.net/proxy/' + encodeURIComponent(options.url!);
+                options.crossDomain = false;
+            }
+        });
+    }
+
+    function jquery_ajax_prefilter_3() {
+        $.ajaxPrefilter('json script', function(options, originalOptions, jqXHR) {
+            // Modify options, control originalOptions, store jqXHR, etc
+        });
+    }
+
+    function jquery_ajax_prefilter_4(isActuallyScript: Function) {
+        $.ajaxPrefilter(function(options) {
+            if (isActuallyScript(options.url)) {
+                return 'script';
+            }
+        });
+    }
+
+    function jquery_ajax_setup_0() {
+        $.ajaxSetup({
+            url: 'ping.php',
+        });
+    }
+
+    function jquery_ajax_setup_1() {
+        $.ajax({
+            // url not set here; uses ping.php
+            data: { 'name': 'Dan' },
+        });
+    }
+
+    function jquery_ajax_transport_0(dataType: string, transportCanHandleRequest: boolean) {
+        $.ajaxTransport(dataType, function(options, originalOptions, jqXHR) {
+            if (transportCanHandleRequest) {
+                return {
+                    send: function(headers, completeCallback) {
+                        // Send code
+                    },
+                    abort: function() {
+                        // Abort code
+                    },
+                };
+            }
+        });
+    }
+
+    function jquery_ajax_transport_1() {
+        // function(status, statusText, responses, headers) {}
+    }
+
+    function jquery_ajax_transport_2() {
+        $.ajaxTransport('script', function(options, originalOptions, jqXHR) {
+            // Will only be called for script requests
+            return {} as JQuery.Transport;
+        });
+    }
+
+    function jquery_ajax_transport_3() {
+        $.ajaxTransport('image', function(s) {
+            if (s.type === 'GET' && s.async) {
+                var image: any;
+                return {
+                    send: function(_, callback) {
+                        image = new Image();
+                        function done(status: number) {
+                            if (image) {
+                                var statusText: JQuery.Ajax.TextStatus = ( status === 200 ) ? 'success' : 'error',
+                                    tmp = image;
+                                image = image.onreadystatechange = image.onerror = image.onload = null;
+                                // Error:(962, 50) TS2345:Argument of type 'string' is not assignable to parameter of type
+                                //     '"success" | "notmodified" | "nocontent" | "abort" | "timeout" | "error" | "parsererror"'.
+                                // Why can't the compiler infer this?
+                                callback(status, statusText, { image: tmp });
+                            }
+                        }
+
+                        image.onreadystatechange = image.onload = function() {
+                            done(200);
+                        };
+                        image.onerror = function() {
+                            done(404);
+                        };
+                        image.src = s.url;
+                    },
+                    abort: function() {
+                        if (image) {
+                            image = image.onreadystatechange = image.onerror = image.onload = null;
+                        }
+                    },
+                };
+            }
+        });
+    }
+
+    function jquery_ajax_transport_4() {
+        // List of data converters
+        // 1) Key format is "source_type destination_type"
+        //    (a single space in-between)
+        // 2) The catchall symbol "*" can be used for source_type
+        return {
+            converters: {
+                // Convert anything to text
+                '* text': String,
+                // Text to html (true = no transformation)
+                'text html': true,
+                // Evaluate text as a json expression
+                'text json': jQuery.parseJSON,
+                // Parse text as xml
+                'text xml': jQuery.parseXML,
+            },
+        };
+    }
+
+    function jquery_ajax_transport_5() {
+        jQuery.ajaxSetup({
+            accepts: {
+                script: 'text/javascript, application/javascript',
+            },
+            contents: {
+                script: /javascript/,
+            },
+            converters: {
+                'text script': jQuery.globalEval,
+            },
+        });
+    }
+
+    function jquery_callbacks_0() {
+        function fn1(value: string) {
+            console.log(value);
+        }
+
+        function fn2(value: string) {
+            console.log('fn2 says: ' + value);
+            return false;
+        }
+    }
+
+    function jquery_callbacks_1(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks();
+        callbacks.add(fn1);
+
+        // Outputs: foo!
+        callbacks.fire('foo!');
+
+        callbacks.add(fn2);
+
+        // Outputs: bar!, fn2 says: bar!
+        callbacks.fire('bar!');
+    }
+
+    function jquery_callbacks_2(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks();
+        callbacks.add(fn1);
+
+        // Outputs: foo!
+        callbacks.fire('foo!');
+
+        callbacks.add(fn2);
+
+        // Outputs: bar!, fn2 says: bar!
+        callbacks.fire('bar!');
+
+        callbacks.remove(fn2);
+
+        // Only outputs foobar, as fn2 has been removed.
+        callbacks.fire('foobar');
+    }
+
+    function jquery_callbacks_3(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks('once');
+        callbacks.add(fn1);
+        callbacks.fire('foo');
+        callbacks.add(fn2);
+        callbacks.fire('bar');
+        callbacks.remove(fn2);
+        callbacks.fire('foobar');
+
+        /*
+         output:
+         foo
+         */
+    }
+
+    function jquery_callbacks_4(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks('memory');
+        callbacks.add(fn1);
+        callbacks.fire('foo');
+        callbacks.add(fn2);
+        callbacks.fire('bar');
+        callbacks.remove(fn2);
+        callbacks.fire('foobar');
+
+        /*
+         output:
+         foo
+         fn2 says:foo
+         bar
+         fn2 says:bar
+         foobar
+         */
+    }
+
+    function jquery_callbacks_5(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks('unique');
+        callbacks.add(fn1);
+        callbacks.fire('foo');
+        callbacks.add(fn1); // Repeat addition
+        callbacks.add(fn2);
+        callbacks.fire('bar');
+        callbacks.remove(fn2);
+        callbacks.fire('foobar');
+
+        /*
+         output:
+         foo
+         bar
+         fn2 says:bar
+         foobar
+         */
+    }
+
+    function jquery_callbacks_6() {
+        function fn1(value: string) {
+            console.log(value);
+            return false;
+        }
+
+        function fn2(value: string) {
+            fn1('fn2 says: ' + value);
+            return false;
+        }
+
+        var callbacks = $.Callbacks('stopOnFalse');
+        callbacks.add(fn1);
+        callbacks.fire('foo');
+        callbacks.add(fn2);
+        callbacks.fire('bar');
+        callbacks.remove(fn2);
+        callbacks.fire('foobar');
+
+        /*
+         output:
+         foo
+         bar
+         foobar
+         */
+    }
+
+    function jquery_callbacks_7() {
+        function fn1(value: string) {
+            console.log(value);
+            return false;
+        }
+
+        function fn2(value: string) {
+            fn1('fn2 says: ' + value);
+            return false;
+        }
+
+        var callbacks = $.Callbacks('unique memory');
+        callbacks.add(fn1);
+        callbacks.fire('foo');
+        callbacks.add(fn1); // Repeat addition
+        callbacks.add(fn2);
+        callbacks.fire('bar');
+        callbacks.add(fn2);
+        callbacks.fire('baz');
+        callbacks.remove(fn2);
+        callbacks.fire('foobar');
+
+        /*
+         output:
+         foo
+         fn2 says:foo
+         bar
+         fn2 says:bar
+         baz
+         fn2 says:baz
+         foobar
+         */
+    }
+
+    function jquery_callbacks_8(fn1: Function, fn2: Function) {
+        var callbacks = $.Callbacks(),
+            add = callbacks.add,
+            remove = callbacks.remove,
+            fire = callbacks.fire;
+
+        add(fn1);
+        fire('hello world');
+        remove(fn1);
+    }
+
+    function jquery_css_hooks_0() {
+        (function($) {
+            // First, check to see if cssHooks are supported
+            if (!$.cssHooks) {
+                // If not, output an error message
+                throw( new Error('jQuery 1.4.3 or above is required for this plugin to work') );
+            }
+
+            // Wrap in a document ready call, because jQuery writes
+            // cssHooks at this time and will blow away your functions
+            // if they exist.
+            $(function() {
+                $.cssHooks['someCSSProp'] = {
+                    get: function(elem, computed, extra) {
+                        // Handle getting the CSS property
+                    },
+                    set: function(elem, value) {
+                        // Handle setting the CSS value
+                    },
+                };
+            });
+        })(jQuery);
+    }
+
+    function jquery_css_hooks_1() {
+        (function($) {
+            function styleSupport(prop: string) {
+                var vendorProp,
+                    supportedProp,
+
+                    // Capitalize first character of the prop to test vendor prefix
+                    capProp = prop.charAt(0).toUpperCase() + prop.slice(1),
+                    prefixes = ['Moz', 'Webkit', 'O', 'ms'],
+                    div: HTMLElement | null = document.createElement('div');
+
+                if (prop in div.style) {
+                    // Browser supports standard CSS property name
+                    supportedProp = prop;
+                } else {
+                    // Otherwise test support for vendor-prefixed property names
+                    for (var i = 0; i < prefixes.length; i++) {
+                        vendorProp = prefixes[i] + capProp;
+                        if (vendorProp in div.style) {
+                            supportedProp = vendorProp;
+                            break;
+                        }
+                    }
+                }
+
+                // Avoid memory leak in IE
+                div = null;
+
+                // Add property to $.support so it can be accessed elsewhere
+                $.support[prop] = supportedProp;
+                return supportedProp;
+            }
+
+            // Call the function, e.g. testing for "border-radius" support:
+            styleSupport('borderRadius');
+        })(jQuery);
+    }
+
+    function jquery_css_hooks_2() {
+        (function($) {
+            if (!$.cssHooks) {
+                throw( new Error('jQuery 1.4.3+ is needed for this plugin to work') );
+            }
+
+            function styleSupport(prop: string) {
+                var vendorProp,
+                    supportedProp,
+                    capProp = prop.charAt(0).toUpperCase() + prop.slice(1),
+                    prefixes = ['Moz', 'Webkit', 'O', 'ms'],
+                    div: HTMLElement | null = document.createElement('div');
+
+                if (prop in div.style) {
+                    supportedProp = prop;
+                } else {
+                    for (var i = 0; i < prefixes.length; i++) {
+                        vendorProp = prefixes[i] + capProp;
+                        if (vendorProp in div.style) {
+                            supportedProp = vendorProp;
+                            break;
+                        }
+                    }
+                }
+
+                div = null;
+                $.support[prop] = supportedProp;
+                return supportedProp;
+            }
+
+            var borderRadius = styleSupport('borderRadius');
+
+            // Set cssHooks only for browsers that support a vendor-prefixed border radius
+            if (borderRadius && borderRadius !== 'borderRadius') {
+                $.cssHooks.borderRadius = {
+                    get: function(elem, computed, extra) {
+                        return $.css(elem, borderRadius);
+                    },
+                    set: function(elem, value) {
+                        (<any> elem.style)[borderRadius!] = value;
+                    },
+                };
+            }
+        })(jQuery);
+    }
+
+    function jquery_css_hooks_3() {
+        $('#element').css('borderRadius', '10px');
+        $('#another').css('border-radius', '20px');
+    }
+
+    function jquery_css_hooks_4(supportsProprietaryAlternative: boolean) {
+        (function($) {
+            // Feature test for support of a CSS property
+            // and a proprietary alternative
+            // ...
+            if ($.support.someCSSProp && $.support.someCSSProp !== 'someCSSProp') {
+                // Set cssHooks for browsers that
+                // support only a vendor-prefixed someCSSProp
+                $.cssHooks.someCSSProp = {
+                    get: function(elem, computed, extra) {
+                        return $.css(elem, $.support.someCSSProp);
+                    },
+                    set: function(elem, value) {
+                        elem.style[$.support.someCSSProp] = value;
+                    },
+                };
+            } else if (supportsProprietaryAlternative) {
+                $.cssHooks.someCSSProp = {
+                    get: function(elem, computed, extra) {
+                        // Handle crazy conversion from the proprietary alternative
+                    },
+                    set: function(elem, value) {
+                        // Handle crazy conversion to the proprietary alternative
+                    },
+                };
+            }
+        })(jQuery);
+    }
+
+    function jquery_css_hooks_5() {
+        $.cssNumber.someCSSProp = true;
+    }
+
+    function jquery_css_hooks_6() {
+        $.fx.step.someCSSProp = function(fx) {
+            $.cssHooks.someCSSProp.set(fx.elem, fx.now + fx.unit);
+        };
+    }
+
+    function jquery_css_number_0() {
+        jQuery.cssNumber.someCSSProp = true;
+    }
+
+    function jquery_data_0() {
+        jQuery.data(document.body, 'foo', 52);
+        jQuery.data(document.body, 'bar', 'test');
+    }
+
+    function jquery_data_1() {
+        alert(jQuery.data(document.body, 'foo'));
+        alert(jQuery.data(document.body));
+    }
+
+    function jquery_each_0() {
+        $.each([52, 97], function(index, value) {
+            alert(index + ': ' + value);
+        });
+    }
+
+    function jquery_each_1() {
+        var obj = {
+            'flammable': 'inflammable',
+            'duh': 'no duh',
+        };
+        $.each(obj, function(key, value) {
+            alert(key + ': ' + value);
+        });
+    }
+
+    function jquery_each_2() {
+        $.each([52, 97], function(index, value) {
+            alert(index + ': ' + value);
+        });
+    }
+
+    function jquery_each_3() {
+        var obj = {
+            'flammable': 'inflammable',
+            'duh': 'no duh',
+        };
+        $.each(obj, function(key, value) {
+            alert(key + ': ' + value);
+        });
+    }
+
+    function jquery_extend_0(object1: object, object2: object) {
+        var object = $.extend({}, object1, object2);
+    }
+
+    function jquery_get_0(url: string, data: any, success: never, dataType: string) {
+        $.ajax({
+            url: url,
+            data: data,
+            success: success,
+            dataType: dataType,
+        });
+    }
+
+    function jquery_get_1() {
+        $.get('ajax/test.html', function(data) {
+            $('.result').html(data);
+            alert('Load was performed.');
+        });
+    }
+
+    function jquery_get_2() {
+        // Assign handlers immediately after making the request,
+        // and remember the jqxhr object for this request
+        var jqxhr = $.get('example.php', function() {
+            alert('success');
+        })
+            .done(function() {
+                alert('second success');
+            })
+            .fail(function() {
+                alert('error');
+            })
+            .always(function() {
+                alert('finished');
+            });
+
+        // Perform other work here ...
+
+        // Set another completion function for the request above
+        jqxhr.always(function() {
+            alert('second finished');
+        });
+    }
+
+    function jquery_get_json_0(url: string, data: any, success: never) {
+        $.ajax({
+            dataType: 'json',
+            url: url,
+            data: data,
+            success: success,
+        });
+    }
+
+    function jquery_get_json_1() {
+        $.getJSON('ajax/test.json', function(data) {
+            var items: string[] = [];
+            $.each(data, function(key, val) {
+                items.push('<li id=\'' + key + '\'>' + val + '</li>');
+            });
+
+            $('<ul/>', {
+                'class': 'my-new-list',
+                html: items.join(''),
+            }).appendTo('body');
+        });
+    }
+
+    function jquery_get_json_2() {
+        return {
+            'one': 'Singular sensation',
+            'two': 'Beady little eyes',
+            'three': 'Little birds pitch by my doorstep',
+        };
+    }
+
+    function jquery_get_script_0(url: string, success: never) {
+        $.ajax({
+            url: url,
+            dataType: 'script',
+            success: success,
+        });
+    }
+
+    function jquery_get_script_1() {
+        $.getScript('ajax/test.js', function(data, textStatus, jqxhr) {
+            console.log(data); // Data returned
+            console.log(textStatus); // Success
+            console.log(jqxhr.status); // 200
+            console.log('Load was performed.');
+        });
+    }
+
+    function jquery_get_script_2() {
+        $.getScript('ajax/test.js')
+            .done(function(script, textStatus) {
+                console.log(textStatus);
+            })
+            .fail(function(jqxhr, settings, exception) {
+                $('div.log').text('Triggered ajaxError handler.');
+            });
+    }
+
+    function jquery_get_script_3() {
+        $('div.log').ajaxError(function(e, jqxhr, settings, exception) {
+            if (settings.dataType == 'script') {
+                $(this).text('Triggered ajaxError handler.');
+            }
+        });
+    }
+
+    function jquery_get_script_4() {
+        $.ajaxSetup({
+            cache: true,
+        });
+    }
+
+    function jquery_html_prefilter_0() {
+        var htmlPrefilter = $.htmlPrefilter,
+            rdel = /<(del)(?=[\s>])[\w\W]*?<\/\1\s*>/gi;
+
+        $.htmlPrefilter = function(html) {
+            return htmlPrefilter.call(this, html).replace(rdel, '');
+        };
+    }
+
+    function jquery_html_prefilter_1() {
+        $.htmlPrefilter = function(html) {
+            // Return HTML strings unchanged
+            return html;
+        };
+    }
+
+    function jquery_html_prefilter_2() {
+        var panything = '[\\w\\W]*?',
+
+            // Whitespace
+            // https://html.spec.whatwg.org/multipage/infrastructure.html#space-character
+            pspace = '[\\x20\\t\\r\\n\\f]',
+
+            // End of tag name (whitespace or greater-than)
+            pnameEnd = pspace.replace(']', '>]'),
+
+            // Tag name (a leading letter, then almost anything)
+            // https://html.spec.whatwg.org/multipage/syntax.html#tag-open-state
+            // https://html.spec.whatwg.org/multipage/syntax.html#tag-name-state
+            pname = '[a-z]' + pnameEnd.replace('[', '[^/\\0') + '*',
+
+            // Void element (end tag prohibited)
+            // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+            pvoidName = '(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|' +
+                'source|track|wbr)(?=' + pnameEnd + ')',
+
+            // Attributes (double-quoted value, single-quoted value, unquoted value, or no value)
+            // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+            pattrs = '(?:' + pspace + '+[^\\0-\\x20\\x7f-\\x9f="\'/>]+(?:' + pspace + '*=' + pspace +
+                '*(?:"' + panything + '"|\'' + panything + '\'|' +
+                pnameEnd.replace('[', '[^') + '*(?!/)' +
+                ')|))*' + pspace + '*',
+
+            // Trailing content of a close tag
+            pcloseTail = '(?:' + pspace + panything + '|)',
+
+            rspecialHtml = new RegExp(
+                // Non-void element that self-closes: $1–$5
+                '(<)(?!' + pvoidName + ')(' + pname + ')(' + pattrs + ')(\\/)(>)|' +
+                // No-innerHTML container (element, comment, or CDATA): $6
+                '(<(script|style|textarea)' + pattrs + '>' + panything + '<\\/\\7' + pcloseTail + '>|' +
+                '<!--' + panything + '--)',
+                'gi',
+            ),
+
+            // "<"; element name; attributes; ">"; "<"; "/"; element name; ">"; no-innerHTML container
+            pspecialReplacement = '$1$2$3$5$1$4$2$5$6';
+
+        $.htmlPrefilter = function(html) {
+            return ( html + '' ).replace(rspecialHtml, pspecialReplacement);
+        };
+    }
+
+    function jquery_in_array_0() {
+        $.inArray((5 + 5).toString(), ['8', '9', '10', 10 + '']);
+    }
+
+    function jquery_is_plain_object_0() {
+        console.log($.isPlainObject(document.location));
+    }
+
+    function jquery_map_0() {
+        // The following object masquerades as an array.
+        var fakeArray = { 'length': 2, 0: 'Addy', 1: 'Subtracty' };
+
+        // Therefore, convert it to a real array
+        var realArray = $.makeArray(fakeArray);
+
+        // Now it can be used reliably with $.map()
+        $.map(realArray, function(val, i) {
+            // Do something
+        });
+    }
+
+    function jquery_merge_0(oldArray: any[]) {
+        var newArray = $.merge([], oldArray);
+    }
+
+    function jquery_param_0() {
+        [
+            { name: 'first', value: 'Rick' },
+            { name: 'last', value: 'Astley' },
+            { name: 'job', value: 'Rock Star' },
+        ];
+    }
+
+    function jquery_param_1() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3,
+            },
+            b: [1, 2, 3],
+        };
+        var recursiveEncoded = $.param(myObject);
+        var recursiveDecoded = decodeURIComponent($.param(myObject));
+
+        alert(recursiveEncoded);
+        alert(recursiveDecoded);
+    }
+
+    function jquery_param_2() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3,
+            },
+            b: [1, 2, 3],
+        };
+        var shallowEncoded = $.param(myObject, true);
+        var shallowDecoded = decodeURIComponent(shallowEncoded);
+
+        alert(shallowEncoded);
+        alert(shallowDecoded);
+    }
+
+    function jquery_post_0(url: string, data: any, success: never, dataType: string) {
+        $.ajax({
+            type: 'POST',
+            url: url,
+            data: data,
+            success: success,
+            dataType: dataType,
+        });
+    }
+
+    function jquery_post_1() {
+        $.post('ajax/test.html', function(data) {
+            $('.result').html(data);
+        });
+    }
+
+    function jquery_post_2() {
+        // Assign handlers immediately after making the request,
+        // and remember the jqxhr object for this request
+        var jqxhr = $.post('example.php', function() {
+            alert('success');
+        })
+            .done(function() {
+                alert('second success');
+            })
+            .fail(function() {
+                alert('error');
+            })
+            .always(function() {
+                alert('finished');
+            });
+
+        // Perform other work here ...
+
+        // Set another completion function for the request above
+        jqxhr.always(function() {
+            alert('second finished');
+        });
+    }
+
+    function jquery_when_0() {
+        $.when($.ajax('test.aspx')).then(function(data, textStatus, jqXHR) {
+            alert(jqXHR.status); // Alerts 200
+        });
+    }
+
+    function jquery_when_1() {
+        $.when({ testing: 123 }).done(function(x: { testing: number; }) {
+            alert(x.testing); // Alerts "123"
+        });
+    }
+
+    function jquery_when_2() {
+        $.when().then(function() {
+            alert('I fired immediately');
+        });
+    }
+
+    function jquery_when_3() {
+        var d1 = $.Deferred();
+        var d2 = $.Deferred();
+
+        $.when(d1, d2).done(function(v1, v2) {
+            console.log(v1); // "Fish"
+            console.log(v2); // "Pizza"
+        });
+
+        d1.resolve('Fish');
+        d2.resolve('Pizza');
+    }
+
+    function jquery_when_4() {
+        var d1 = $.Deferred();
+        var d2 = $.Deferred<string>();
+        var d3 = $.Deferred<number>();
+
+        $.when(d1, d2, d3).done(function(v1, v2, v3) {
+            console.log(v1); // v1 is undefined
+            console.log(v2); // v2 is "abc"
+            console.log(v3); // v3 is an array [ 1, 2, 3, 4, 5 ]
+        });
+
+        d1.resolve();
+        d2.resolve('abc');
+        d3.resolve(1, 2, 3, 4, 5);
+    }
+
+    function jquery_0() {
+        $('<p id=\'test\'>My <em>new</em> text</p>').appendTo('body');
+    }
+
+    function jquery_1() {
+        $('<a href=\'http://jquery.com\'></a>');
+    }
+
+    function jquery_2() {
+        $('<img>');
+        $('<input>');
+    }
+
+    function jquery_3() {
+        var el = $('<br>2<br>3'); // returns [<br>, "2", <br>]
+        el = $('<br>2<br>3 >'); // returns [<br>, "2", <br>, "3 &gt;"]
+    }
+
+    function jquery_4() {
+        $('', {
+            'class': 'my-div',
+            on: {
+                touchstart: function(event: JQuery.Event) {
+                    // Do something
+                },
+            },
+        }).appendTo('body');
+    }
+
+    function jquery_5() {
+        $('')
+            .addClass('my-div')
+            .on({
+                touchstart: function(event) {
+                    // Do something
+                },
+            })
+            .appendTo('body');
+    }
+
+    function jquery_6() {
+        $('div.foo');
+    }
+
+    function jquery_7() {
+        $('div.foo').click(function() {
+            $('span', this).addClass('bar');
+        });
+    }
+
+    function jquery_8() {
+        $('div.foo').click(function() {
+            $(this).slideUp();
+        });
+    }
+
+    function jquery_9() {
+        $.post('url.xml', function(data) {
+            var $child = $(data).find('child');
+        });
+    }
+
+    function jquery_10() {
+        // Define a plain object
+        var foo = { foo: 'bar', hello: 'world' };
+
+        // Pass it to the jQuery function
+        var $foo = $(foo);
+
+        // Test accessing property values
+        var test1 = $foo.prop('foo'); // bar
+
+        // Test setting property values
+        $foo.prop('foo', 'foobar');
+        var test2 = $foo.prop('foo'); // foobar
+
+        // Test using .data() as summarized above
+        $foo.data('keyName', 'someValue');
+        console.log($foo); // will now contain a jQuery{randomNumber} property
+
+        // Test binding an event name and triggering
+        $foo.on('eventName', function() {
+            console.log('eventName was called');
+        });
+
+        $foo.trigger('eventName'); // Logs "eventName was called"
+    }
+
+    function jquery_11($foo: JQuery) {
+        $foo.triggerHandler('eventName'); // Also logs "eventName was called"
+    }
+
+    function keydown_0() {
+        $('#target').keydown(function() {
+            alert('Handler for .keydown() called.');
+        });
+    }
+
+    function keydown_1() {
+        $('#other').click(function() {
+            $('#target').keydown();
+        });
+    }
+
+    function keypress_0() {
+        $('#target').keypress(function() {
+            console.log('Handler for .keypress() called.');
+        });
+    }
+
+    function keypress_1() {
+        $('#other').click(function() {
+            $('#target').keypress();
+        });
+    }
+
+    function keyup_0() {
+        $('#target').keyup(function() {
+            alert('Handler for .keyup() called.');
+        });
+    }
+
+    function keyup_1() {
+        $('#other').click(function() {
+            $('#target').keyup();
+        });
+    }
+
+    function last_0() {
+        $('li').last().css('background-color', 'red');
+    }
+
+    function load_0() {
+        $('#result').load('ajax/test.html');
+    }
+
+    function load_1() {
+        $('#result').load('ajax/test.html', function() {
+            alert('Load was performed.');
+        });
+    }
+
+    function load_2() {
+        $('#result').load('ajax/test.html #container');
+    }
+
+    function load_3() {
+        $('#a').load('article.html');
+    }
+
+    function load_4() {
+        $('#b').load('article.html #target');
+    }
+
+    function map_0() {
+        $(':checkbox')
+            .map(function() {
+                return this.id;
+            })
+            .get()
+            .join();
+    }
+
+    function mousedown_0() {
+        $('#target').mousedown(function() {
+            alert('Handler for .mousedown() called.');
+        });
+    }
+
+    function mousedown_1() {
+        $('#other').click(function() {
+            $('#target').mousedown();
+        });
+    }
+
+    function mouseenter_0() {
+        $('#outer').mouseenter(function() {
+            $('#log').append('<div>Handler for .mouseenter() called.</div>');
+        });
+    }
+
+    function mouseenter_1() {
+        $('#other').click(function() {
+            $('#outer').mouseenter();
+        });
+    }
+
+    function mouseleave_0() {
+        $('#outer').mouseleave(function() {
+            $('#log').append('<div>Handler for .mouseleave() called.</div>');
+        });
+    }
+
+    function mouseleave_1() {
+        $('#other').click(function() {
+            $('#outer').mouseleave();
+        });
+    }
+
+    function mousemove_0() {
+        $('#target').mousemove(function(event) {
+            var msg = 'Handler for .mousemove() called at ';
+            msg += event.pageX + ', ' + event.pageY;
+            $('#log').append('<div>' + msg + '</div>');
+        });
+    }
+
+    function mousemove_1() {
+        $('#other').click(function() {
+            $('#target').mousemove();
+        });
+    }
+
+    function mouseout_0() {
+        $('#outer').mouseout(function() {
+            $('#log').append('Handler for .mouseout() called.');
+        });
+    }
+
+    function mouseout_1() {
+        $('#other').click(function() {
+            $('#outer').mouseout();
+        });
+    }
+
+    function mouseover_0() {
+        $('#outer').mouseover(function() {
+            $('#log').append('<div>Handler for .mouseover() called.</div>');
+        });
+    }
+
+    function mouseover_1() {
+        $('#other').click(function() {
+            $('#outer').mouseover();
+        });
+    }
+
+    function mouseup_0() {
+        $('#target').mouseup(function() {
+            alert('Handler for .mouseup() called.');
+        });
+    }
+
+    function mouseup_1() {
+        $('#other').click(function() {
+            $('#target').mouseup();
+        });
+    }
+
+    function next_0() {
+        $('li.third-item').next().css('background-color', 'red');
+    }
+
+    function next_all_0() {
+        $('li.third-item').nextAll().css('background-color', 'red');
+    }
+
+    function not_0() {
+        $('li').not(':even').css('background-color', 'red');
+    }
+
+    function not_1() {
+        $('li').not(document.getElementById('notli')!)
+            .css('background-color', 'red');
+    }
+
+    function offset_parent_0() {
+        $('li.item-a').offsetParent().css('background-color', 'red');
+    }
+
+    function on_0() {
+        $('#dataTable tbody tr').on('click', function() {
+            console.log($(this).text());
+        });
+    }
+
+    function on_1() {
+        $('#dataTable tbody').on('click', 'tr', function() {
+            console.log($(this).text());
+        });
+    }
+
+    function on_2() {
+        function notify() {
+            alert('clicked');
+        }
+
+        $('button').on('click', notify);
+    }
+
+    function on_3() {
+        function greet(event: JQuery.Event<HTMLElement, { name: string; }>) {
+            alert('Hello ' + event.data.name);
+        }
+
+        $('button').on('click', {
+            name: 'Karl',
+        }, greet);
+        $('button').on('click', {
+            name: 'Addy',
+        }, greet);
+    }
+
+    function on_4() {
+        var $test = $('#test');
+
+        function handler1() {
+            console.log('handler1');
+            $test.off('click', handler2);
+        }
+
+        function handler2() {
+            console.log('handler2');
+        }
+
+        $test.on('click', handler1);
+        $test.on('click', handler2);
+    }
+
+    function one_0() {
+        $('#foo').one('click', function() {
+            alert('This will be displayed only once.');
+        });
+    }
+
+    function one_1() {
+        $('#foo').on('click', function(event) {
+            alert('This will be displayed only once.');
+            $(this).off(event);
+        });
+    }
+
+    function one_2() {
+        $('#foo').one('click mouseover', function(event) {
+            alert('The ' + event.type + ' event happened!');
+        });
+    }
+
+    function parent_0() {
+        $('li.item-a').parent().css('background-color', 'red');
+    }
+
+    function parents_0() {
+        $('li.item-a').parents().css('background-color', 'red');
+    }
+
+    function prepend_0() {
+        $('.inner').prepend('<p>Test</p>');
+    }
+
+    function prepend_1() {
+        $('.container').prepend($('h2'));
+    }
+
+    function prepend_2() {
+        var $newdiv1 = $('<div id=\'object1\'></div>'),
+            newdiv2 = document.createElement('div'),
+            existingdiv1 = document.getElementById('foo')!;
+
+        $('body').prepend($newdiv1, [newdiv2, existingdiv1]);
+    }
+
+    function prepend_to_0() {
+        $('<p>Test</p>').prependTo('.inner');
+    }
+
+    function prepend_to_1() {
+        $('h2').prependTo($('.container'));
+    }
+
+    function prev_0() {
+        $('li.third-item').prev().css('background-color', 'red');
+    }
+
+    function prev_all_0() {
+        $('li.third-item').prevAll().css('background-color', 'red');
+    }
+
+    function prop_0() {
+        $('input').prop('disabled', false);
+        $('input').prop('checked', true);
+        $('input').val('someValue');
+    }
+
+    function prop_1() {
+        $('input[type=\'checkbox\']').prop('checked', function(i, val) {
+            return !val;
+        });
+    }
+
+    function queue_0() {
+        $('#foo').slideUp().fadeIn();
+    }
+
+    function queue_1() {
+        $('#foo').slideUp();
+        $('#foo').queue(function() {
+            alert('Animation complete.');
+            $(this).dequeue();
+        });
+    }
+
+    function queue_2() {
+        $('#foo').slideUp(function() {
+            alert('Animation complete.');
+        });
+    }
+
+    function queue_3() {
+        $('#test').queue(function(next) {
+            // Do some stuff...
+            next();
+        });
+    }
+
+    function ready_0() {
+        $(document).ready(function() {
+            // Handler for .ready() called.
+        });
+    }
+
+    function ready_1() {
+        $(function() {
+            // Handler for .ready() called.
+        });
+    }
+
+    function ready_2(jq2: JQueryStatic) {
+        jq2 = jQuery.noConflict();
+        jq2(function($) {
+            // Code using $ as usual goes here; the actual jQuery object is jq2
+        });
+    }
+
+    function remove_0() {
+        $('.hello').remove();
+    }
+
+    function remove_1() {
+        $('div').remove('.hello');
+    }
+
+    function remove_attr_0($element: JQuery) {
+        $element.prop('onclick', null);
+        console.log('onclick property: ', $element[0].onclick);
+    }
+
+    function remove_class_0() {
+        $('p').removeClass('myClass yourClass');
+    }
+
+    function remove_class_1() {
+        $('p').removeClass('myClass noClass').addClass('yourClass');
+    }
+
+    function remove_class_2() {
+        $('li:last').removeClass(function() {
+            return $(this).prev().attr('class')!;
+        });
+    }
+
+    function replace_all_0() {
+        $('<h2>New heading</h2>').replaceAll('.inner');
+    }
+
+    function replace_all_1() {
+        $('.first').replaceAll('.third');
+    }
+
+    function replace_with_0() {
+        $('div.second').replaceWith('<h2>New heading</h2>');
+    }
+
+    function replace_with_1() {
+        $('div.inner').replaceWith('<h2>New heading</h2>');
+    }
+
+    function replace_with_2() {
+        $('div.third').replaceWith($('.first'));
+    }
+
+    function resize_0() {
+        $(window).resize(function() {
+            $('#log').append('<div>Handler for .resize() called.</div>');
+        });
+    }
+
+    function scroll_0() {
+        $('#target').scroll(function() {
+            $('#log').append('<div>Handler for .scroll() called.</div>');
+        });
+    }
+
+    function scroll_1() {
+        $('#other').click(function() {
+            $('#target').scroll();
+        });
+    }
+
+    function select_0() {
+        $('#target').select(function() {
+            alert('Handler for .select() called.');
+        });
+    }
+
+    function select_1() {
+        $('#other').click(function() {
+            $('#target').select();
+        });
+    }
+
+    function serialize_0() {
+        $('form').on('submit', function(event) {
+            event.preventDefault();
+            console.log($(this).serialize());
+        });
+    }
+
+    function serialize_array_0() {
+        $('form').submit(function(event) {
+            console.log($(this).serializeArray());
+            event.preventDefault();
+        });
+    }
+
+    function serialize_array_1() {
+        [
+            {
+                name: 'a',
+                value: '1',
+            },
+            {
+                name: 'b',
+                value: '2',
+            },
+            {
+                name: 'c',
+                value: '3',
+            },
+            {
+                name: 'd',
+                value: '4',
+            },
+            {
+                name: 'e',
+                value: '5',
+            },
+        ];
+    }
+
+    function show_0() {
+        $('.target').show();
+    }
+
+    function siblings_0() {
+        $('li.third-item').siblings().css('background-color', 'red');
+    }
+
+    function slice_0() {
+        $('li').slice(2).css('background-color', 'red');
+    }
+
+    function slice_1() {
+        $('li').slice(2, 4).css('background-color', 'red');
+    }
+
+    function slice_2() {
+        $('li').slice(-2, -1).css('background-color', 'red');
+    }
+
+    function slide_down_0() {
+        $('#clickme').click(function() {
+            $('#book').slideDown('slow', function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function slide_toggle_0() {
+        $('#clickme').click(function() {
+            $('#book').slideToggle('slow', function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function slide_up_0() {
+        $('#clickme').click(function() {
+            $('#book').slideUp('slow', function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function stop_0() {
+        $('#hoverme-stop-2').hover(function() {
+            $(this).find('img').stop(true, true).fadeOut();
+        }, function() {
+            $(this).find('img').stop(true, true).fadeIn();
+        });
+    }
+
+    function submit_0() {
+        $('#target').submit(function(event) {
+            alert('Handler for .submit() called.');
+            event.preventDefault();
+        });
+    }
+
+    function submit_1() {
+        $('#other').click(function() {
+            $('#target').submit();
+        });
+    }
+
+    function text_0() {
+        $('<input>').is('[type=text]'); // false
+        $('<input>').is(':text'); // true
+    }
+
+    function text_1() {
+        $('ul li').text(function(index) {
+            return 'item number ' + ( index + 1 );
+        });
+    }
+
+    function to_array_0() {
+        alert($('li').toArray());
+    }
+
+    function toggle_0() {
+        $('.target').toggle();
+    }
+
+    function toggle_1() {
+        $('#clickme').click(function() {
+            $('#book').toggle('slow', function() {
+                // Animation complete.
+            });
+        });
+    }
+
+    function toggle_2(display: boolean) {
+        $('#foo').toggle(display);
+    }
+
+    function toggle_3(display: boolean) {
+        if (display === true) {
+            $('#foo').show();
+        } else if (display === false) {
+            $('#foo').hide();
+        }
+    }
+
+    function toggle_class_0(className: string, addOrRemove: boolean) {
+        $('#foo').toggleClass(className, addOrRemove);
+    }
+
+    function toggle_class_1(className: string, addOrRemove: boolean) {
+        if (addOrRemove) {
+            $('#foo').addClass(className);
+        } else {
+            $('#foo').removeClass(className);
+        }
+    }
+
+    function toggle_class_2() {
+        $('div.foo').toggleClass(function() {
+            if ($(this).parent().is('.bar')) {
+                return 'happy';
+            } else {
+                return 'sad';
+            }
+        });
+    }
+
+    function trigger_0() {
+        $('#foo').on('click', function() {
+            alert($(this).text());
+        });
+        $('#foo').trigger('click');
+    }
+
+    function trigger_1() {
+        $('#foo').on('custom', function(event, param1, param2) {
+            alert(param1 + '\n' + param2);
+        });
+        $('#foo').trigger('custom', ['Custom', 'Event']);
+    }
+
+    function unbind_0() {
+        $('#foo').unbind();
+    }
+
+    function unbind_1() {
+        $('#foo').unbind('click');
+    }
+
+    function unbind_2() {
+        var handler = function() {
+            alert('The quick brown fox jumps over the lazy dog.');
+        };
+        $('#foo').bind('click', handler);
+        $('#foo').unbind('click', handler);
+    }
+
+    function unbind_3() {
+        $('#foo').bind('click', function() {
+            alert('The quick brown fox jumps over the lazy dog.');
+        });
+
+        // Will NOT work
+        $('#foo').unbind('click', function() {
+            alert('The quick brown fox jumps over the lazy dog.');
+        });
+    }
+
+    function unbind_4(handler: never) {
+        $('#foo').bind('click.myEvents', handler);
+    }
+
+    function unbind_5() {
+        $('#foo').unbind('click');
+    }
+
+    function unbind_6() {
+        $('#foo').unbind('click.myEvents');
+    }
+
+    function unbind_7() {
+        $('#foo').unbind('.myEvents');
+    }
+
+    function unbind_8() {
+        var timesClicked = 0;
+        $('#foo').bind('click', function(event) {
+            alert('The quick brown fox jumps over the lazy dog.');
+            timesClicked++;
+            if (timesClicked >= 3) {
+                $(this).unbind(event);
+            }
+        });
+    }
+
+    function val_0() {
+        // Get the value from the selected option in a dropdown
+        $('select#foo option:checked').val();
+
+        // Get the value from a dropdown select directly
+        $('select#foo').val();
+
+        // Get the value from a checked checkbox
+        $('input[type=checkbox][name=bar]:checked').val();
+
+        // Get the value from a set of radio buttons
+        $('input[type=radio][name=baz]:checked').val();
+    }
+
+    function val_1() {
+        $.valHooks.textarea = {
+            get: function(elem: HTMLTextAreaElement) {
+                return elem.value.replace(/\r?\n/g, '\r\n');
+            },
+        };
+    }
+
+    function val_2() {
+        $('input[type=text].tags').val(function(index, value) {
+            return value.trim();
+        });
+    }
+
+    function width_0() {
+        // Returns width of browser viewport
+        $(window).width();
+
+        // Returns width of HTML document
+        $(document).width();
+    }
+
+    function wrap_0() {
+        $('.inner').wrap('<div class=\'new\'></div>');
+    }
+
+    function wrap_1() {
+        $('.inner').wrap(function() {
+            return '<div class=\'' + $(this).text() + '\'></div>';
+        });
+    }
+
+    function wrap_all_0() {
+        $('.inner').wrapAll('<div class=\'new\' />');
+    }
+
+    function wrap_inner_0() {
+        $('.inner').wrapInner('<div class=\'new\'></div>');
+    }
+
+    function wrap_inner_1() {
+        $('.inner').wrapInner(function() {
+            return '<div class=\'' + this.nodeValue + '\'></div>';
+        });
+    }
+
+    function wrap_inner_2(elem: HTMLElement) {
+        $(elem).wrapInner('<div class=\'test\'></div>');
+        $(elem).wrapInner('<div class="test"></div>');
+    }
+}
diff --git a/types/jquery/tsconfig.json b/types/jquery/tsconfig.json
index 1edb6aed47..21d35a63da 100644
--- a/types/jquery/tsconfig.json
+++ b/types/jquery/tsconfig.json
@@ -5,9 +5,10 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,6 +19,12 @@
     },
     "files": [
         "index.d.ts",
-        "jquery-tests.ts"
+        "jquery-tests.ts",
+        "test/example-tests.ts",
+        "test/longdesc-tests.ts",
+        "test/jquery-no-window-module-tests.ts",
+        "test/jquery-window-module-tests.ts",
+        "test/jquery-slim-no-window-module-tests.ts",
+        "test/jquery-slim-window-module-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery/tslint.json b/types/jquery/tslint.json
new file mode 100644
index 0000000000..401b7a77e9
--- /dev/null
+++ b/types/jquery/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false,
+        "no-misused-new": false,
+        "no-empty-interface": false,
+        "callable-types": false
+    }
+}
diff --git a/types/jquery/v1/index.d.ts b/types/jquery/v1/index.d.ts
new file mode 100644
index 0000000000..a3c2d42979
--- /dev/null
+++ b/types/jquery/v1/index.d.ts
@@ -0,0 +1,3825 @@
+// Type definitions for jQuery 1.10
+// Project: http://jquery.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+//                 Christian Hoffmeister <https://github.com/choffmeister>
+//                 Steve Fenton <https://github.com/Steve-Fenton>
+//                 Diullei Gomes <https://github.com/Diullei>
+//                 Tass Iliopoulos <https://github.com/tasoili>
+//                 Jason Swearingen <https://github.com/jasons-novaleaf>
+//                 Sean Hill <https://github.com/seanski>
+//                 Guus Goossens <https://github.com/Guuz>
+//                 Kelly Summerlin <https://github.com/ksummerlin>
+//                 Basarat Ali Syed <https://github.com/basarat>
+//                 Nicholas Wolverson <https://github.com/nwolverson>
+//                 Derek Cicerone <https://github.com/derekcicerone>
+//                 Andrew Gaspar <https://github.com/AndrewGaspar>
+//                 Seikichi Kondo <https://github.com/seikichi>
+//                 Benjamin Jackman <https://github.com/benjaminjackman>
+//                 Poul Sorensen <https://github.com/s093294>
+//                 Josh Strobl <https://github.com/JoshStrobl>
+//                 John Reilly <https://github.com/johnnyreilly/>
+//                 Dick van den Brink <https://github.com/DickvdBrink>
+//                 Thomas Schulz <https://github.com/King2500>
+//                 Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+/**
+ * Interface for the AJAX setting that will configure the AJAX request
+ * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
+ */
+interface JQueryAjaxSettings {
+    /**
+     * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
+     */
+    accepts?: any;
+    /**
+     * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success().
+     */
+    async?: boolean;
+    /**
+     * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request.
+     */
+    beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any;
+    /**
+     * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET.
+     */
+    cache?: boolean;
+    /**
+     * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    complete? (jqXHR: JQueryXHR, textStatus: string): any;
+    /**
+     * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5)
+     */
+    contents?: { [key: string]: any; };
+    //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
+    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+    /**
+     * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
+     */
+    contentType?: any;
+    /**
+     * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
+     */
+    context?: any;
+    /**
+     * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5)
+     */
+    converters?: { [key: string]: any; };
+    /**
+     * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5)
+     */
+    crossDomain?: boolean;
+    /**
+     * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be key-value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below).
+     */
+    data?: any;
+    /**
+     * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter.
+     */
+    dataFilter? (data: any, ty: any): any;
+    /**
+     * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string).
+     */
+    dataType?: string;
+    /**
+     * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
+     */
+    error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any;
+    /**
+     * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events.
+     */
+    global?: boolean;
+    /**
+     * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5)
+     */
+    headers?: { [key: string]: any; };
+    /**
+     * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
+     */
+    ifModified?: boolean;
+    /**
+     * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1)
+     */
+    isLocal?: boolean;
+    /**
+     * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" }
+     */
+    jsonp?: any;
+    /**
+     * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
+     */
+    jsonpCallback?: any;
+    /**
+     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
+     */
+    method?: string;
+    /**
+     * A MIME type to override the XHR MIME type. (version added: 1.5.1)
+     */
+    mimeType?: string;
+    /**
+     * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    password?: string;
+    /**
+     * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false.
+     */
+    processData?: boolean;
+    /**
+     * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script.
+     */
+    scriptCharset?: string;
+    /**
+     * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5)
+     */
+    statusCode?: { [key: string]: any; };
+    /**
+     * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    success? (data: any, textStatus: string, jqXHR: JQueryXHR): any;
+    /**
+     * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period.
+     */
+    timeout?: number;
+    /**
+     * Set this to true if you wish to use the traditional style of parameter serialization.
+     */
+    traditional?: boolean;
+    /**
+     * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
+     */
+    type?: string;
+    /**
+     * A string containing the URL to which the request is sent.
+     */
+    url?: string;
+    /**
+     * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    username?: string;
+    /**
+     * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.
+     */
+    xhr?: any;
+    /**
+     * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1)
+     */
+    xhrFields?: { [key: string]: any; };
+}
+
+/**
+ * Interface for the jqXHR object
+ * @see {@link https://api.jquery.com/jQuery.ajax/#jqXHR}
+ */
+interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
+    /**
+     * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5).
+     */
+    overrideMimeType(mimeType: string): any;
+    /**
+     * Cancel the request.
+     *
+     * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled"
+     */
+    abort(statusText?: string): void;
+    /**
+     * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
+     */
+    then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R|JQueryPromise<R>, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
+    /**
+     * Property containing the parsed response if the response content type is json
+     */
+    responseJSON?: any;
+    /**
+     * A function to be called if the request fails.
+     */
+    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
+}
+
+/**
+ * Interface for the JQuery callback
+ * @see {@link https://api.jquery.com/category/callbacks-object/}
+ */
+interface JQueryCallback {
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.add/}
+     */
+    add(callbacks: Function): JQueryCallback;
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.add/}
+     */
+    add(callbacks: Function[]): JQueryCallback;
+
+    /**
+     * Disable a callback list from doing anything more.
+     * @see {@link https://api.jquery.com/callbacks.disable/}
+     */
+    disable(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been disabled.
+     * @see {@link https://api.jquery.com/callbacks.disabled/}
+     */
+    disabled(): boolean;
+
+    /**
+     * Remove all of the callbacks from a list.
+     * @see {@link https://api.jquery.com/callbacks.empty/}
+     */
+    empty(): JQueryCallback;
+
+    /**
+     * Call all of the callbacks with the given arguments
+     *
+     * @param arguments The argument or list of arguments to pass back to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.fire/}
+     */
+    fire(...arguments: any[]): JQueryCallback;
+
+    /**
+     * Determine if the callbacks have already been called at least once.
+     * @see {@link https://api.jquery.com/callbacks.fired/}
+     */
+    fired(): boolean;
+
+    /**
+     * Call all callbacks in a list with the given context and arguments.
+     *
+     * @param context A reference to the context in which the callbacks in the list should be fired.
+     * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
+     * @see {@link https://api.jquery.com/callbacks.fireWith/}
+     */
+    fireWith(context?: any, args?: any[]): JQueryCallback;
+
+    /**
+     * Determine whether a supplied callback is in a list
+     *
+     * @param callback The callback to search for.
+     * @see {@link https://api.jquery.com/callbacks.has/}
+     */
+    has(callback: Function): boolean;
+
+    /**
+     * Lock a callback list in its current state.
+     * @see {@link https://api.jquery.com/callbacks.lock/}
+     */
+    lock(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been locked.
+     * @see {@link https://api.jquery.com/callbacks.locked/}
+     */
+    locked(): boolean;
+
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     * @see {@link https://api.jquery.com/callbacks.remove/}
+     */
+    remove(callbacks: Function): JQueryCallback;
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     * @see {@link https://api.jquery.com/callbacks.remove/}
+     */
+    remove(callbacks: Function[]): JQueryCallback;
+}
+
+/**
+ * Allows jQuery Promises to interop with non-jQuery promises
+ */
+interface JQueryGenericPromise<T> {
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     *
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
+     */
+    then<U>(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise<U>, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<U>;
+
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     *
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
+     */
+    then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<void>;
+}
+
+/**
+ * Interface for the JQuery promise/deferred callbacks
+ */
+interface JQueryPromiseCallback<T> {
+    (value?: T, ...args: any[]): void;
+}
+
+interface JQueryPromiseOperator<T, U> {
+    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
+}
+
+/**
+ * Interface for the JQuery promise, part of callbacks
+ * @see {@link https://api.jquery.com/category/deferred-object/}
+ */
+interface JQueryPromise<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     * @see {@link https://api.jquery.com/deferred.state/}
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     *
+     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     * @see {@link https://api.jquery.com/deferred.always/}
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     *
+     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     * @see {@link https://api.jquery.com/deferred.done/}
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     *
+     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.fail/}
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     *
+     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
+     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
+     * @see {@link https://api.jquery.com/deferred.progress/}
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+
+    /**
+     * Return a Deferred's Promise object.
+     *
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/deferred.promise/}
+     */
+    promise(target?: any): JQueryPromise<T>;
+}
+
+/**
+ * Interface for the JQuery deferred, part of callbacks
+ * @see {@link https://api.jquery.com/category/deferred-object/}
+ */
+interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     * @see {@link https://api.jquery.com/deferred.state/}
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     *
+     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     * @see {@link https://api.jquery.com/deferred.always/}
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     *
+     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     * @see {@link https://api.jquery.com/deferred.done/}
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     *
+     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.fail/}
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     *
+     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
+     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
+     * @see {@link https://api.jquery.com/deferred.progress/}
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given args.
+     *
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     * @see {@link https://api.jquery.com/deferred.notify/}
+     */
+    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given context and args.
+     *
+     * @param context Context passed to the progressCallbacks as the this object.
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     * @see {@link https://api.jquery.com/deferred.notifyWith/}
+     */
+    notifyWith(context: any, args?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given args.
+     *
+     * @param args Optional arguments that are passed to the failCallbacks.
+     * @see {@link https://api.jquery.com/deferred.reject/}
+     */
+    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given context and args.
+     *
+     * @param context Context passed to the failCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the failCallbacks.
+     * @see {@link https://api.jquery.com/deferred.rejectWith/}
+     */
+    rejectWith(context: any, args?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given args.
+     *
+     * @param value First argument passed to doneCallbacks.
+     * @param args Optional subsequent arguments that are passed to the doneCallbacks.
+     * @see {@link https://api.jquery.com/deferred.resolve/}
+     */
+    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given context and args.
+     *
+     * @param context Context passed to the doneCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the doneCallbacks.
+     * @see {@link https://api.jquery.com/deferred.resolveWith/}
+     */
+    resolveWith(context: any, args?: T[]): JQueryDeferred<T>;
+
+    /**
+     * Return a Deferred's Promise object.
+     *
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/deferred.promise/}
+     */
+    promise(target?: any): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+}
+
+/**
+ * Interface of the JQuery extension of the W3C event object
+ * @see {@link https://api.jquery.com/category/events/event-object/}
+ */
+interface BaseJQueryEventObject extends Event {
+    /**
+     * The current DOM element within the event bubbling phase.
+     * @see {@link https://api.jquery.com/event.currentTarget/}
+     */
+    currentTarget: Element;
+    /**
+     * An optional object of data passed to an event method when the current executing handler is bound.
+     * @see {@link https://api.jquery.com/event.data/}
+     */
+    data: any;
+    /**
+     * The element where the currently-called jQuery event handler was attached.
+     * @see {@link https://api.jquery.com/event.delegateTarget/}
+     */
+    delegateTarget: Element;
+    /**
+     * Returns whether event.preventDefault() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isDefaultPrevented/}
+     */
+    isDefaultPrevented(): boolean;
+    /**
+     * Returns whether event.stopImmediatePropagation() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isImmediatePropagationStopped/}
+     */
+    isImmediatePropagationStopped(): boolean;
+    /**
+     * Returns whether event.stopPropagation() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isPropagationStopped/}
+     */
+    isPropagationStopped(): boolean;
+    /**
+     * The namespace specified when the event was triggered.
+     * @see {@link https://api.jquery.com/event.namespace/}
+     */
+    namespace: string;
+    /**
+     * The browser's original Event object.
+     * @see {@link https://api.jquery.com/category/events/event-object/}
+     */
+    originalEvent: Event;
+    /**
+     * If this method is called, the default action of the event will not be triggered.
+     * @see {@link https://api.jquery.com/event.preventDefault/}
+     */
+    preventDefault(): any;
+    /**
+     * The other DOM element involved in the event, if any.
+     * @see {@link https://api.jquery.com/event.relatedTarget/}
+     */
+    relatedTarget: Element;
+    /**
+     * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
+     * @see {@link https://api.jquery.com/event.result/}
+     */
+    result: any;
+    /**
+     * Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.
+     * @see {@link https://api.jquery.com/event.stopImmediatePropagation/}
+     */
+    stopImmediatePropagation(): void;
+    /**
+     * Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
+     * @see {@link https://api.jquery.com/event.stopPropagation/}
+     */
+    stopPropagation(): void;
+    /**
+     * The DOM element that initiated the event.
+     * @see {@link https://api.jquery.com/event.target/}
+     */
+    target: Element;
+    /**
+     * The mouse position relative to the left edge of the document.
+     * @see {@link https://api.jquery.com/event.pageX/}
+     */
+    pageX: number;
+    /**
+     * The mouse position relative to the top edge of the document.
+     * @see {@link https://api.jquery.com/event.pageY/}
+     */
+    pageY: number;
+    /**
+     * For key or mouse events, this property indicates the specific key or button that was pressed.
+     * @see {@link https://api.jquery.com/event.which/}
+     */
+    which: number;
+    /**
+     * Indicates whether the META key was pressed when the event fired.
+     * @see {@link https://api.jquery.com/event.metaKey/}
+     */
+    metaKey: boolean;
+}
+
+interface JQueryInputEventObject extends BaseJQueryEventObject {
+    altKey: boolean;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+}
+
+interface JQueryMouseEventObject extends JQueryInputEventObject {
+    button: number;
+    clientX: number;
+    clientY: number;
+    offsetX: number;
+    offsetY: number;
+    pageX: number;
+    pageY: number;
+    screenX: number;
+    screenY: number;
+}
+
+interface JQueryKeyEventObject extends JQueryInputEventObject {
+    char: any;
+    charCode: number;
+    key: any;
+    keyCode: number;
+}
+
+interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{
+}
+
+/**
+ * A collection of properties that represent the presence of different browser features or bugs.
+ *
+ * Intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally
+ * to improve page startup performance. For your own project's feature-detection needs, we strongly recommend the
+ * use of an external library such as {@link http://modernizr.com/|Modernizr} instead of dependency on properties
+ * in jQuery.support.
+ *
+ * @deprecated since version 1.9
+ */
+interface JQuerySupport {
+    ajax?: boolean;
+    boxModel?: boolean;
+    changeBubbles?: boolean;
+    checkClone?: boolean;
+    checkOn?: boolean;
+    cors?: boolean;
+    cssFloat?: boolean;
+    hrefNormalized?: boolean;
+    htmlSerialize?: boolean;
+    leadingWhitespace?: boolean;
+    noCloneChecked?: boolean;
+    noCloneEvent?: boolean;
+    opacity?: boolean;
+    optDisabled?: boolean;
+    optSelected?: boolean;
+    scriptEval? (): boolean;
+    style?: boolean;
+    submitBubbles?: boolean;
+    tbody?: boolean;
+}
+
+interface JQueryParam {
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @param obj An array or object to serialize.
+     */
+    (obj: any): string;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @param obj An array or object to serialize.
+     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
+     */
+    (obj: any, traditional: boolean): string;
+}
+
+/**
+ * The interface used to construct jQuery events (with $.Event). It is
+ * defined separately instead of inline in JQueryStatic to allow
+ * overriding the construction function with specific strings
+ * returning specific event objects.
+ */
+interface JQueryEventConstructor {
+    (name: string, eventProperties?: any): JQueryEventObject;
+    new (name: string, eventProperties?: any): JQueryEventObject;
+}
+
+/**
+ * The interface used to specify coordinates.
+ */
+interface JQueryCoordinates {
+    left: number;
+    top: number;
+}
+
+/**
+ * The interface used to specify the properties parameter in css()
+ */
+type cssPropertySetter = (index: number, value?: string) => string | number;
+interface JQueryCssProperties {
+    [propertyName: string]: string | number | cssPropertySetter;
+}
+
+/**
+ * Elements in the array returned by serializeArray()
+ */
+interface JQuerySerializeArrayElement {
+    name: string;
+    value: string;
+}
+
+/**
+ * @see {@link https://api.jquery.com/animate/}
+ */
+interface JQueryAnimationOptions {
+    /**
+     * A string or number determining how long the animation will run.
+     */
+    duration?: any;
+    /**
+     * A string indicating which easing function to use for the transition.
+     */
+    easing?: string;
+    /**
+     * A function to call once the animation is complete.
+     */
+    complete?: Function;
+    /**
+     * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set.
+     */
+    step?: (now: number, tween: any) => any;
+    /**
+     * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8)
+     */
+    progress?: (animation: JQueryPromise<any>, progress: number, remainingMs: number) => any;
+    /**
+     * A function to call when the animation begins. (version added: 1.8)
+     */
+    start?: (animation: JQueryPromise<any>) => any;
+    /**
+     * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8)
+     */
+    done?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8)
+     */
+    fail?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8)
+     */
+    always?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it.
+     */
+    queue?: any;
+    /**
+     * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4)
+     */
+    specialEasing?: Object;
+}
+
+interface JQueryEasingFunction {
+    ( percent: number ): number;
+}
+
+interface JQueryEasingFunctions {
+    [ name: string ]: JQueryEasingFunction;
+    linear: JQueryEasingFunction;
+    swing: JQueryEasingFunction;
+}
+
+/**
+ * Static members of jQuery (those on $ and jQuery themselves)
+ *
+ * @see {@link https://api.jquery.com/Types/#jQuery}
+ */
+interface JQueryStatic {
+
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
+     */
+    ajax(settings: JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-url-settings}
+     */
+    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param dataTypes An optional string containing one or more space-separated dataTypes
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     */
+    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     */
+    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+
+     /**
+     * Creates an object that handles the actual transmission of Ajax data.
+     *
+     * @param dataType A string identifying the data type to use.
+     * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
+     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
+     */
+    ajaxTransport(dataType: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    
+    ajaxSettings: JQueryAjaxSettings;
+
+     /**
+      * Set default values for future Ajax requests. Its use is not recommended.
+      *
+      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
+      * @see {@link https://api.jquery.com/jQuery.ajaxSetup/}
+      */
+    ajaxSetup(options: JQueryAjaxSettings): void;
+
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
+     */
+    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
+     */
+    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-settings}
+     */
+    get(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     */
+    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     */
+    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getScript/}
+     */
+    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @see {@link https://api.jquery.com/jQuery.param/}
+     */
+    param: JQueryParam;
+
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
+     */
+    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
+     */
+    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-settings}
+     */
+    post(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
+     *
+     * @param flags An optional list of space-separated flags that change how the callback list behaves.
+     * @see {@link https://api.jquery.com/jQuery.Callbacks/}
+     */
+    Callbacks(flags?: string): JQueryCallback;
+
+    /**
+     * Holds or releases the execution of jQuery's ready event.
+     *
+     * @param hold Indicates whether the ready hold is being requested or released
+     * @see {@link https://api.jquery.com/jQuery.holdReady/}
+     */
+    holdReady(hold: boolean): void;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param selector A string containing a selector expression
+     * @param context A DOM Element, Document, or jQuery to use as context
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-selector-context}
+     */
+    (selector: string, context?: Element|JQuery): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param element A DOM element to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-element}
+     */
+    (element: Element): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-elementArray}
+     */
+    (elementArray: Element[]): JQuery;
+
+    /**
+     * Binds a function to be executed when the DOM has finished loading.
+     *
+     * @param callback A function to execute after the DOM is ready.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-callback}
+     */
+    (callback: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object A plain object to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
+     */
+    (object: {}): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object An existing jQuery object to clone.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
+     */
+    (object: JQuery): JQuery;
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery}
+     */
+    (): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
+     * @param ownerDocument A document in which the new elements will be created.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-ownerDocument}
+     */
+    (html: string, ownerDocument?: Document): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
+     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-attributes}
+     */
+    (html: string, attributes: Object): JQuery;
+
+    /**
+     * Relinquish jQuery's control of the $ variable.
+     *
+     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
+     * @see {@link https://api.jquery.com/jQuery.noConflict/}
+     */
+    noConflict(removeAll?: boolean): JQueryStatic;
+
+    /**
+     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     */
+    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
+
+    /**
+     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
+     * @see {@link https://api.jquery.com/jQuery.cssHooks/}
+     */
+    cssHooks: { [key: string]: any; };
+
+    /**
+     * An object containing all CSS properties that may be used without a unit. The .css() method uses this object to see if it may append px to unitless values.
+     * @see {@link https://api.jquery.com/jQuery.cssNumber/}
+     */
+    cssNumber: any;
+
+    /**
+     * Store arbitrary data associated with the specified element. Returns the value that was set.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key-value}
+     */
+    data<T>(element: Element, key: string, value: T): T;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key}
+     */
+    data(element: Element, key: string): any;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element}
+     */
+    data(element: Element): any;
+
+    /**
+     * Execute the next function on the queue for the matched element.
+     *
+     * @param element A DOM element from which to remove and execute a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.dequeue/}
+     */
+    dequeue(element: Element, queueName?: string): void;
+
+    /**
+     * Determine whether an element has any jQuery data associated with it.
+     *
+     * @param element A DOM element to be checked for data.
+     * @see {@link https://api.jquery.com/jQuery.hasData/}
+     */
+    hasData(element: Element): boolean;
+
+    /**
+     * Show the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element to inspect for an attached queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName}
+     */
+    queue(element: Element, queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element where the array of queued functions is attached.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-newQueue}
+     */
+    queue(element: Element, queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element on which to add a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-callback}
+     */
+    queue(element: Element, queueName: string, callback: Function): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param element A DOM element from which to remove data.
+     * @param name A string naming the piece of data to remove.
+     * @see {@link https://api.jquery.com/jQuery.removeData/}
+     */
+    removeData(element: Element, name?: string): JQuery;
+
+    /**
+     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     * @see {@link https://api.jquery.com/jQuery.Deferred/}
+     */
+    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
+
+    /**
+     * Effects
+     */
+
+    easing: JQueryEasingFunctions;
+
+    fx: {
+        tick: () => void;
+        /**
+         * The rate (in milliseconds) at which animations fire.
+         * @see {@link https://api.jquery.com/jQuery.fx.interval/}
+         */
+        interval: number;
+        stop: () => void;
+        speeds: { slow: number; fast: number; };
+        /**
+         * Globally disable all animations.
+         * @see {@link https://api.jquery.com/jQuery.fx.off/}
+         */
+        off: boolean;
+        step: any;
+    };
+
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param func The function whose context will be changed.
+     * @param context The object to which the context (this) of the function should be set.
+     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-function-context-additionalArguments}
+     */
+    proxy(func: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param context The object to which the context (this) of the function should be set.
+     * @param name The name of the function whose context will be changed (should be a property of the context object).
+     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-context-name-additionalArguments}
+     */
+    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
+
+    Event: JQueryEventConstructor;
+
+    /**
+     * Takes a string and throws an exception containing it.
+     *
+     * @param message The message to send out.
+     * @see {@link https://api.jquery.com/jQuery.error/}
+     */
+    error(message: any): JQuery;
+
+    expr: any;
+    readonly fn: JQuery;
+
+    isReady: boolean;
+
+    // Properties
+    support: JQuerySupport;
+
+    /**
+     * Check to see if a DOM element is a descendant of another DOM element.
+     *
+     * @param container The DOM element that may contain the other element.
+     * @param contained The DOM element that may be contained by (a descendant of) the other element.
+     * @see {@link https://api.jquery.com/jQuery.contains/}
+     */
+    contains(container: Element, contained: Element): boolean;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
+     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-array-callback}
+     */
+    each<T>(
+        collection: T[],
+        callback: (indexInArray: number, valueOfElement: T) => boolean | void
+        ): T[];
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
+     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-object-callback}
+     */
+    each<T extends Object>(
+        collection: T,
+        // TODO: `(keyInObject: keyof T, valueOfElement: T[keyof T])`, when TypeScript 2.1 allowed in repository
+        callback: (keyInObject: string, valueOfElement: any) => boolean | void
+        ): T;
+
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-target-object1-objectN}
+     */
+    extend(target: any, object1?: any, ...objectN: any[]): any;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy).
+     * @param target The object to extend. It will receive the new properties.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-deep-target-object1-objectN}
+     */
+    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
+
+    /**
+     * Execute some JavaScript code globally.
+     *
+     * @param code The JavaScript code to execute.
+     * @see {@link https://api.jquery.com/jQuery.globalEval/}
+     */
+    globalEval(code: string): any;
+
+    /**
+     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
+     *
+     * @param array The array to search through.
+     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
+     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
+     * @see {@link https://api.jquery.com/jQuery.grep/}
+     */
+    grep<T>(array: T[], func: (elementOfArray?: T, indexInArray?: number) => boolean, invert?: boolean): T[];
+
+    /**
+     * Search for a specified value within an array and return its index (or -1 if not found).
+     *
+     * @param value The value to search for.
+     * @param array An array through which to search.
+     * @param fromIndex The index of the array at which to begin the search. The default is 0, which will search the whole array.
+     * @see {@link https://api.jquery.com/jQuery.inArray/}
+     */
+    inArray<T>(value: T, array: T[], fromIndex?: number): number;
+
+    /**
+     * Determine whether the argument is an array.
+     *
+     * @param obj Object to test whether or not it is an array.
+     * @see {@link https://api.jquery.com/jQuery.isArray/}
+     */
+    isArray(obj: any): obj is Array<any>;
+    /**
+     * Check to see if an object is empty (contains no enumerable properties).
+     *
+     * @param obj The object that will be checked to see if it's empty.
+     * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
+     */
+    isEmptyObject(obj: any): boolean;
+    /**
+     * Determine if the argument passed is a JavaScript function object.
+     *
+     * @param obj Object to test whether or not it is a function.
+     * @see {@link https://api.jquery.com/jQuery.isFunction/}
+     */
+    isFunction(obj: any): obj is Function;
+    /**
+     * Determines whether its argument is a number.
+     *
+     * @param value The value to be tested.
+     * @see {@link https://api.jquery.com/jQuery.isNumeric/}
+     */
+    isNumeric(value: any): boolean;
+    /**
+     * Check to see if an object is a plain object (created using "{}" or "new Object").
+     *
+     * @param obj The object that will be checked to see if it's a plain object.
+     * @see {@link https://api.jquery.com/jQuery.isPlainObject/}
+     */
+    isPlainObject(obj: any): boolean;
+    /**
+     * Determine whether the argument is a window.
+     *
+     * @param obj Object to test whether or not it is a window.
+     * @see {@link https://api.jquery.com/jQuery.isWindow/}
+     */
+    isWindow(obj: any): obj is Window;
+    /**
+     * Check to see if a DOM node is within an XML document (or is an XML document).
+     *
+     * @param node The DOM node that will be checked to see if it's in an XML document.
+     * @see {@link https://api.jquery.com/jQuery.isXMLDoc/}
+     */
+    isXMLDoc(node: Node): boolean;
+
+    /**
+     * Convert an array-like object into a true JavaScript array.
+     *
+     * @param obj Any object to turn into a native Array.
+     * @see {@link https://api.jquery.com/jQuery.makeArray/}
+     */
+    makeArray(obj: any): any[];
+
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param array The Array to translate.
+     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-array-callback}
+     */
+    map<T, U>(array: T[], callback: (elementOfArray?: T, indexInArray?: number) => U): U[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param arrayOrObject The Array or Object to translate.
+     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-object-callback}
+     */
+    map(arrayOrObject: any, callback: (value?: any, indexOrKey?: any) => any): any;
+
+    /**
+     * Merge the contents of two arrays together into the first array.
+     *
+     * @param first The first array to merge, the elements of second added.
+     * @param second The second array to merge into the first, unaltered.
+     * @see {@link https://api.jquery.com/jQuery.merge/}
+     */
+    merge<T>(first: T[], second: T[]): T[];
+
+    /**
+     * An empty function.
+     * @see {@link https://api.jquery.com/jQuery.noop/}
+     */
+    noop(): any;
+
+    /**
+     * Return a number representing the current time.
+     * @see {@link https://api.jquery.com/jQuery.now/}
+     */
+    now(): number;
+
+    /**
+     * Takes a well-formed JSON string and returns the resulting JavaScript object.
+     *
+     * @param json The JSON string to parse.
+     * @see {@link https://api.jquery.com/jQuery.parseJSON/}
+     */
+    parseJSON(json: string): any;
+
+    /**
+     * Parses a string into an XML document.
+     *
+     * @param data a well-formed XML string to be parsed
+     * @see {@link https://api.jquery.com/jQuery.parseXML/}
+     */
+    parseXML(data: string): XMLDocument;
+
+    /**
+     * Remove the whitespace from the beginning and end of a string.
+     *
+     * @param str Remove the whitespace from the beginning and end of a string.
+     * @see {@link https://api.jquery.com/jQuery.trim/}
+     */
+    trim(str: string): string;
+
+    /**
+     * Determine the internal JavaScript [[Class]] of an object.
+     *
+     * @param obj Object to get the internal JavaScript [[Class]] of.
+     * @see {@link https://api.jquery.com/jQuery.type/}
+     */
+    type(obj: any): "array" | "boolean" | "date" | "error" | "function" | "null" | "number" | "object" | "regexp" | "string" | "symbol" | "undefined";
+
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
+     *
+     * @param array The Array of DOM elements.
+     * @see {@link https://api.jquery.com/jQuery.unique/}
+     */
+    unique<T extends Element>(array: T[]): T[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     */
+    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     */
+    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
+}
+
+/**
+ * The jQuery instance members
+ *
+ * @see {@link https://api.jquery.com/Types/#jQuery}
+ */
+interface JQuery {
+    /**
+     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxComplete/}
+     */
+    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery;
+    /**
+     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxError/}
+     */
+    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery;
+    /**
+     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSend/}
+     */
+    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+    /**
+     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStart/}
+     */
+    ajaxStart(handler: () => any): JQuery;
+    /**
+     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStop/}
+     */
+    ajaxStop(handler: () => any): JQuery;
+    /**
+     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSuccess/}
+     */
+    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param complete A callback function that is executed when the request completes.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery;
+
+    /**
+     * Encode a set of form elements as a string for submission.
+     * @see {@link https://api.jquery.com/serialize/}
+     */
+    serialize(): string;
+    /**
+     * Encode a set of form elements as an array of names and values.
+     * @see {@link https://api.jquery.com/serializeArray/}
+     */
+    serializeArray(): JQuerySerializeArrayElement[];
+
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+     * @see {@link https://api.jquery.com/addClass/#addClass-className}
+     */
+    addClass(className: string): JQuery;
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param func A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/addClass/#addClass-function}
+     */
+    addClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
+     * @see {@link https://api.jquery.com/addBack/}
+     */
+    addBack(selector?: string): JQuery;
+
+    /**
+     * Get the value of an attribute for the first element in the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to get.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName}
+     */
+    attr(attributeName: string): string;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param value A value to set for the attribute. If this is `null`, the attribute will be deleted.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName-value}
+     */
+    attr(attributeName: string, value: string|number|null): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName-function}
+     */
+    attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributes An object of attribute-value pairs to set.
+     * @see {@link https://api.jquery.com/attr/#attr-attributes}
+     */
+    attr(attributes: Object): JQuery;
+
+    /**
+     * Determine whether any of the matched elements are assigned the given class.
+     *
+     * @param className The class name to search for.
+     * @see {@link https://api.jquery.com/hasClass/}
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Get the HTML contents of the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/html/#html}
+     */
+    html(): string;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param htmlString A string of HTML to set as the content of each matched element.
+     * @see {@link https://api.jquery.com/html/#html-htmlString}
+     */
+    html(htmlString: string): JQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/html/#html-function}
+     */
+    html(func: (index: number, oldhtml: string) => string): JQuery;
+
+    /**
+     * Get the value of a property for the first element in the set of matched elements.
+     *
+     * @param propertyName The name of the property to get.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName}
+     */
+    prop(propertyName: string): any;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A value to set for the property.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName-value}
+     */
+    prop(propertyName: string, value: string|number|boolean): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/prop/#prop-properties}
+     */
+    prop(properties: Object): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName-function}
+     */
+    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery;
+
+    /**
+     * Remove an attribute from each element in the set of matched elements.
+     *
+     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
+     * @see {@link https://api.jquery.com/removeAttr/}
+     */
+    removeAttr(attributeName: string): JQuery;
+
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+     * @see {@link https://api.jquery.com/removeClass/#removeClass-className}
+     */
+    removeClass(className?: string): JQuery;
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param func A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
+     * @see {@link https://api.jquery.com/removeClass/#removeClass-function}
+     */
+    removeClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Remove a property for the set of matched elements.
+     *
+     * @param propertyName The name of the property to remove.
+     * @see {@link https://api.jquery.com/removeProp/}
+     */
+    removeProp(propertyName: string): JQuery;
+
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-className}
+     */
+    toggleClass(className: string, swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-state}
+     */
+    toggleClass(swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-function-state}
+     */
+    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery;
+
+    /**
+     * Get the current value of the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/val/#val}
+     */
+    val(): any;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked.
+     * @see {@link https://api.jquery.com/val/#val-value}
+     */
+    val(value: string|string[]|number): JQuery;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/val/#val-function}
+     */
+    val(func: (index: number, value: string) => string): JQuery;
+
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     *
+     * @param propertyName A CSS property.
+     * @see {@link https://api.jquery.com/css/#css-propertyName}
+     */
+    css(propertyName: string): string;
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     * Results in an object of property-value pairs.
+     *
+     * @param propertyNames An array of one or more CSS properties.
+     * @see {@link https://api.jquery.com/css/#css-propertyNames}
+     */
+    css(propertyNames: string[]): any;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     * @see {@link https://api.jquery.com/css/#css-propertyName-value}
+     */
+    css(propertyName: string, value: string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/css/#css-propertyName-function}
+     */
+    css(propertyName: string, value: (index: number, value: string) => string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/css/#css-properties}
+     */
+    css(properties: JQueryCssProperties): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/height/#height}
+     */
+    height(): number;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/height/#height-value}
+     */
+    height(value: number|string): JQuery;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/height/#height-function}
+     */
+    height(func: (index: number, height: number) => number|string): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
+     * @see {@link https://api.jquery.com/innerHeight/#innerHeight}
+     */
+    innerHeight(): number;
+
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/innerHeight/#innerHeight-value}
+     */
+    innerHeight(value: number|string): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
+     * @see {@link https://api.jquery.com/innerWidth/#innerWidth}
+     */
+    innerWidth(): number;
+
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/innerWidth/#innerWidth-value}
+     */
+    innerWidth(value: number|string): JQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
+     * @see {@link https://api.jquery.com/offset/#offset}
+     */
+    offset(): JQueryCoordinates;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     * @see {@link https://api.jquery.com/offset/#offset-coordinates}
+     */
+    offset(coordinates: JQueryCoordinates): JQuery;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
+     * @see {@link https://api.jquery.com/offset/#offset-function}
+     */
+    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-includeMargin}
+     */
+    outerHeight(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer height on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-value}
+     */
+    outerHeight(value: number|string): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding and border.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-includeMargin}
+     */
+    outerWidth(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-value}
+     */
+    outerWidth(value: number|string): JQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
+     * @see {@link https://api.jquery.com/position/}
+     */
+    position(): JQueryCoordinates;
+
+    /**
+     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
+     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft}
+     */
+    scrollLeft(): number;
+    /**
+     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft-value}
+     */
+    scrollLeft(value: number): JQuery;
+
+    /**
+     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
+     * @see {@link https://api.jquery.com/scrollTop/#scrollTop}
+     */
+    scrollTop(): number;
+    /**
+     * Set the current vertical position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollTop/#scrollTop-value}
+     */
+    scrollTop(value: number): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/width/#width}
+     */
+    width(): number;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/width/#width-value}
+     */
+    width(value: number|string): JQuery;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/width/#width-function}
+     */
+    width(func: (index: number, width: number) => number|string): JQuery;
+
+    /**
+     * Remove from the queue all items that have not yet been run.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/clearQueue/}
+     */
+    clearQueue(queueName?: string): JQuery;
+
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; it can be any JavaScript type including Array or Object.
+     * @see {@link https://api.jquery.com/data/#data-key-value}
+     */
+    data(key: string, value: any): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     * @see {@link https://api.jquery.com/data/#data-key}
+     */
+    data(key: string): any;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     * @see {@link https://api.jquery.com/data/#data-obj}
+     */
+    data(obj: { [key: string]: any; }): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     * @see {@link https://api.jquery.com/data/#data}
+     */
+    data(): any;
+
+    /**
+     * Execute the next function on the queue for the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/dequeue/}
+     */
+    dequeue(queueName?: string): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
+     * @see {@link https://api.jquery.com/removeData/#removeData-name}
+     */
+    removeData(name: string): JQuery;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param list An array of strings naming the pieces of data to delete.
+     * @see {@link https://api.jquery.com/removeData/#removeData-list}
+     */
+    removeData(list: string[]): JQuery;
+    /**
+     * Remove all previously-stored piece of data.
+     * @see {@link https://api.jquery.com/removeData/}
+     */
+    removeData(): JQuery;
+
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed. (default: fx)
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/promise/}
+     */
+    promise(type?: string, target?: Object): JQueryPromise<any>;
+
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
+     */
+    animate(properties: Object, duration?: string|number, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition. (default: swing)
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
+     */
+    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-options}
+     */
+    animate(properties: Object, options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Set a timer to delay execution of subsequent items in the queue.
+     *
+     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/delay/}
+     */
+    delay(duration: number, queueName?: string): JQuery;
+
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-complete}
+     */
+    fadeIn(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-easing-complete}
+     */
+    fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-options}
+     */
+    fadeIn(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-complete}
+     */
+    fadeOut(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-easing-complete}
+     */
+    fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-options}
+     */
+    fadeOut(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-complete}
+     */
+    fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-easing-complete}
+     */
+    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery;
+
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
+     */
+    fadeToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
+     */
+    fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-options}
+     */
+    fadeToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @see {@link https://api.jquery.com/finish/}
+     */
+    finish(queue?: string): JQuery;
+
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/hide/#hide}
+     */
+    hide(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/hide/#hide-duration-easing-complete}
+     */
+    hide(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/hide/#hide-options}
+     */
+    hide(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/show/#show}
+     */
+    show(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/show/#show-duration-easing-complete}
+     */
+    show(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/show/#show-options}
+     */
+    show(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-complete}
+     */
+    slideDown(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-easing-complete}
+     */
+    slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-options}
+     */
+    slideDown(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-complete}
+     */
+    slideToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-easing-complete}
+     */
+    slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-options}
+     */
+    slideToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-complete}
+     */
+    slideUp(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-easing-complete}
+     */
+    slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-options}
+     */
+    slideUp(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/#stop-clearQueue-jumpToEnd}
+     */
+    stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/#stop-queue-clearQueue-jumpToEnd}
+     */
+    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/toggle/#toggle-duration-complete}
+     */
+    toggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/toggle/#toggle-duration-easing-complete}
+     */
+    toggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/toggle/#toggle-options}
+     */
+    toggle(options: JQueryAnimationOptions): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param showOrHide A Boolean indicating whether to show or hide the elements.
+     * @see {@link https://api.jquery.com/toggle/#toggle-display}
+     */
+    toggle(showOrHide: boolean): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
+     */
+    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
+     */
+    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
+     */
+    bind(eventType: string, eventData: any, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
+     */
+    bind(eventType: string, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param events An object containing one or more DOM event types and functions to execute for them.
+     * @see {@link https://api.jquery.com/bind/#bind-events}
+     */
+    bind(events: any): JQuery;
+
+    /**
+     * Trigger the "blur" event on an element
+     * @see {@link https://api.jquery.com/blur/#blur}
+     */
+    blur(): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/#blur-handler}
+     */
+    blur(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/#blur-eventData-handler}
+     */
+    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "change" event on an element.
+     * @see {@link https://api.jquery.com/change/#change}
+     */
+    change(): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/#change-handler}
+     */
+    change(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/#change-eventData-handler}
+     */
+    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "click" event on an element.
+     * @see {@link https://api.jquery.com/click/#click}
+     */
+    click(): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/#click-handler}
+     */
+    click(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/#click-eventData-handler}
+     */
+    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "contextmenu" event on an element.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu}
+     */
+    contextmenu(): JQuery;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-handler}
+     */
+    contextmenu(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-eventData-handler}
+     */
+    contextmenu(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "dblclick" event on an element.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick}
+     */
+    dblclick(): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick-handler}
+     */
+    dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick-eventData-handler}
+     */
+    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
+     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-handler}
+     */
+    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
+     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-eventData-handler}
+     */
+    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focus" event on an element.
+     * @see {@link https://api.jquery.com/focus/#focus}
+     */
+    focus(): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/#focus-handler}
+     */
+    focus(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/#focus-eventData-handler}
+     */
+    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusin" event on an element.
+     * @see {@link https://api.jquery.com/focusin/#focusin}
+     */
+    focusin(): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/#focusin-handler}
+     */
+    focusin(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/#focusin-eventData-handler}
+     */
+    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusout" event on an element.
+     * @see {@link https://api.jquery.com/focusout/#focusout}
+     */
+    focusout(): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/#focusout-handler}
+     */
+    focusout(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/#focusout-eventData-handler}
+     */
+    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
+     *
+     * @param handlerIn A function to execute when the mouse pointer enters the element.
+     * @param handlerOut A function to execute when the mouse pointer leaves the element.
+     * @see {@link https://api.jquery.com/hover/#hover-handlerIn-handlerOut}
+     */
+    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
+     *
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     * @see {@link https://api.jquery.com/hover/#hover-handlerInOut}
+     */
+    hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keydown" event on an element.
+     * @see {@link https://api.jquery.com/keydown/#keydown}
+     */
+    keydown(): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/#keydown-handler}
+     */
+    keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/#keydown-eventData-handler}
+     */
+    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keypress" event on an element.
+     * @see {@link https://api.jquery.com/keypress/#keypress}
+     */
+    keypress(): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/#keypress-handler}
+     */
+    keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/#keypress-eventData-handler}
+     */
+    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keyup" event on an element.
+     * @see {@link https://api.jquery.com/keyup/#keyup}
+     */
+    keyup(): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/#keyup-handler}
+     */
+    keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/#keyup-eventData-handler}
+     */
+    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousedown" event on an element.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown}
+     */
+    mousedown(): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown-handler}
+     */
+    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown-eventData-handler}
+     */
+    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseenter" event on an element.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter}
+     */
+    mouseenter(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-handler}
+     */
+    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-eventData-handler}
+     */
+    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseleave" event on an element.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave}
+     */
+    mouseleave(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-handler}
+     */
+    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-eventData-handler}
+     */
+    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousemove" event on an element.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove}
+     */
+    mousemove(): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove-handler}
+     */
+    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove-eventData-handler}
+     */
+    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseout" event on an element.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout}
+     */
+    mouseout(): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout-handler}
+     */
+    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout-eventData-handler}
+     */
+    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseover" event on an element.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover}
+     */
+    mouseover(): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover-handler}
+     */
+    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover-eventData-handler}
+     */
+    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseup" event on an element.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup}
+     */
+    mouseup(): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup-handler}
+     */
+    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup-eventData-handler}
+     */
+    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     * @see {@link https://api.jquery.com/off/#off}
+     */
+    off(): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @see {@link https://api.jquery.com/off/#off-events-selector}
+     */
+    off(events: { [key: string]: any; }, selector?: string): JQuery;
+
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+    */
+    on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
+     */
+    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, selector?: string, data?: any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
+     */
+    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
+     */
+    one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param data An object containing data that will be passed to the event handler.
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
+     */
+    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
+     */
+    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
+     */
+    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
+     */
+    one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
+     */
+    one(events: { [key: string]: any; }, data?: any): JQuery;
+
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     *
+     * @param handler A function to execute after the DOM is ready.
+     * @see {@link https://api.jquery.com/ready/}
+     */
+    ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Trigger the "resize" event on an element.
+     * @see {@link https://api.jquery.com/resize/#resize}
+     */
+    resize(): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/#resize-handler}
+     */
+    resize(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/#resize-eventData-handler}
+     */
+    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "scroll" event on an element.
+     * @see {@link https://api.jquery.com/scroll/#scroll}
+     */
+    scroll(): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/#scroll-handler}
+     */
+    scroll(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/#scroll-eventData-handler}
+     */
+    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "select" event on an element.
+     * @see {@link https://api.jquery.com/select/#select}
+     */
+    select(): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/#select-handler}
+     */
+    select(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/#select-eventData-handler}
+     */
+    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "submit" event on an element.
+     * @see {@link https://api.jquery.com/submit/#submit}
+     */
+    submit(): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/#submit-handler}
+     */
+    submit(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/#submit-eventData-handler}
+     */
+    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/trigger/#trigger-eventType-extraParameters}
+     */
+    trigger(eventType: string, extraParameters?: any[]|Object): JQuery;
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param event A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/trigger/#trigger-event-extraParameters}
+     */
+    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-eventType-extraParameters}
+     */
+    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param event A jQuery.Event object.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-event-extraParameters}
+     */
+    triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object;
+
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param handler The function that is to be no longer executed.
+     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-handler}
+     */
+    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
+     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-false}
+     */
+    unbind(eventType: string, fls: boolean): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param evt A JavaScript event object as passed to an event handler.
+     * @see {@link https://api.jquery.com/unbind/#unbind-event}
+     */
+    unbind(evt: any): JQuery;
+
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate}
+     */
+    undelegate(): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-eventType}
+     */
+    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param events An object of one or more event types and previously bound functions to unbind from them.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-events}
+     */
+    undelegate(selector: string, events: Object): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param namespace A string containing a namespace to unbind all events from.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-namespace}
+     */
+    undelegate(namespace: string): JQuery;
+
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/unload/#unload-handler}
+     */
+    unload(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/unload/#unload-eventData-handler}
+     */
+    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
+     * @see {@link https://api.jquery.com/context/}
+     */
+    context: Element;
+
+    jquery: string;
+
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/error/#error-handler}
+     */
+    error(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/error/#error-eventData-handler}
+     */
+    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements}
+     */
+    pushStack(elements: any[]): JQuery;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @param name The name of a jQuery method that generated the array of elements.
+     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
+     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements-name-arguments}
+     */
+    pushStack(elements: any[], name: string, arguments: any[]): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert after each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/after/#after-content-content}
+     */
+    after(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/after/#after-function}
+     */
+    after(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/append/#append-content-content}
+     */
+    append(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/append/#append-function}
+     */
+    append(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the end of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/appendTo/}
+     */
+    appendTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert before each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/before/#before-content-content}
+     */
+    before(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/before/#before-function}
+     */
+    before(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Create a deep copy of the set of matched elements.
+     *
+     * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
+     * @param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
+     * @see {@link https://api.jquery.com/clone/}
+     */
+    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/detach/}
+     */
+    detach(selector?: string): JQuery;
+
+    /**
+     * Remove all child nodes of the set of matched elements from the DOM.
+     * @see {@link https://api.jquery.com/empty/}
+     */
+    empty(): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements after the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertAfter/}
+     */
+    insertAfter(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements before the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertBefore/}
+     */
+    insertBefore(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/prepend/#prepend-content-content}
+     */
+    prepend(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/prepend/#prepend-function}
+     */
+    prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the beginning of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/prependTo/}
+     */
+    prependTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/remove/}
+     */
+    remove(selector?: string): JQuery;
+
+    /**
+     * Replace each target element with the set of matched elements.
+     *
+     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
+     * @see {@link https://api.jquery.com/replaceAll/}
+     */
+    replaceAll(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * @param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
+     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-newContent}
+     */
+    replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery;
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * @param func A function that returns content with which to replace the set of matched elements.
+     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-function}
+     */
+    replaceWith(func: () => Element|JQuery): JQuery;
+
+    /**
+     * Get the combined text contents of each element in the set of matched elements, including their descendants.
+     * @see {@link https://api.jquery.com/text/#text}
+     */
+    text(): string;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
+     * @see {@link https://api.jquery.com/text/#text-text}
+     */
+    text(text: string|number|boolean): JQuery;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
+     * @see {@link https://api.jquery.com/text/#text-function}
+     */
+    text(func: (index: number, text: string) => string): JQuery;
+
+    /**
+     * Retrieve all the elements contained in the jQuery set, as an array.
+     * @name toArray
+     * @see {@link https://api.jquery.com/toArray/}
+     */
+    toArray(): HTMLElement[];
+
+    /**
+     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+     * @see {@link https://api.jquery.com/unwrap/}
+     */
+    unwrap(): JQuery;
+
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     * @see {@link https://api.jquery.com/wrap/#wrap-wrappingElement}
+     */
+    wrap(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrap/#wrap-function}
+     */
+    wrap(func: (index: number) => string|JQuery): JQuery;
+
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-wrappingElement}
+     */
+    wrapAll(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param func A callback function returning the HTML content or jQuery object to wrap around all the matched elements. Within the function, this refers to the first element in the set.
+     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-function}
+     */
+    wrapAll(func: (index: number) => string): JQuery;
+
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
+     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-wrappingElement}
+     */
+    wrapInner(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-function}
+     */
+    wrapInner(func: (index: number) => string): JQuery;
+
+    /**
+     * Iterate over a jQuery object, executing a function for each matched element.
+     *
+     * @param func A function to execute for each matched element. Can stop the loop by returning false.
+     * @see {@link https://api.jquery.com/each/}
+     */
+    each(func: (index: number, elem: Element) => boolean | void): JQuery;
+
+    /**
+     * Retrieve one of the elements matched by the jQuery object.
+     *
+     * @param index A zero-based integer indicating which element to retrieve.
+     * @see {@link https://api.jquery.com/get/#get-index}
+     */
+    get(index: number): HTMLElement;
+    /**
+     * Retrieve the elements matched by the jQuery object.
+     * @alias toArray
+     * @see {@link https://api.jquery.com/get/#get}
+     */
+    get(): HTMLElement[];
+
+    /**
+     * Search for a given element from among the matched elements.
+     * @see {@link https://api.jquery.com/index/#index}
+     */
+    index(): number;
+    /**
+     * Search for a given element from among the matched elements.
+     *
+     * @param selector A selector representing a jQuery collection in which to look for an element.
+     * @see {@link https://api.jquery.com/index/#index-selector}
+     */
+    index(selector: string|JQuery|Element): number;
+
+    /**
+     * The number of elements in the jQuery object.
+     * @see {@link https://api.jquery.com/length/}
+     */
+    length: number;
+    /**
+     * A selector representing selector passed to jQuery(), if any, when creating the original set.
+     * version deprecated: 1.7, removed: 1.9
+     * @see {@link https://api.jquery.com/selector/}
+     */
+    selector: string;
+    [index: number]: HTMLElement;
+
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
+     * @see {@link https://api.jquery.com/add/#add-selector}
+     */
+    add(selector: string, context?: Element): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param elements One or more elements to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-elements}
+     */
+    add(...elements: Element[]): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param html An HTML fragment to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-html}
+     */
+    add(html: string): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param obj An existing jQuery object to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-selection}
+     */
+    add(obj: JQuery): JQuery;
+
+    /**
+     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/children/}
+     */
+    children(selector?: string): JQuery;
+
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-selector}
+     */
+    closest(selector: string): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     * @see {@link https://api.jquery.com/closest/#closest-selector-context}
+     */
+    closest(selector: string, context?: Element): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param obj A jQuery object to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-selection}
+     */
+    closest(obj: JQuery): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param element An element to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-element}
+     */
+    closest(element: Element): JQuery;
+
+    /**
+     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
+     *
+     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     * @see {@link https://api.jquery.com/closest/#closest-selectors-context}
+     */
+    closest(selectors: any, context?: Element): any[];
+
+    /**
+     * Get the children of each element in the set of matched elements, including text and comment nodes.
+     * @see {@link https://api.jquery.com/contents/}
+     */
+    contents(): JQuery;
+
+    /**
+     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
+     * @see {@link https://api.jquery.com/end/}
+     */
+    end(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the one at the specified index.
+     *
+     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
+     * @see {@link https://api.jquery.com/eq/}
+     */
+    eq(index: number): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-selector}
+     */
+    filter(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     * @see {@link https://api.jquery.com/filter/#filter-function}
+     */
+    filter(func: (index: number, element: Element) => boolean): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param element An element to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-elements}
+     */
+    filter(element: Element): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-selection}
+     */
+    filter(obj: JQuery): JQuery;
+
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-selector}
+     */
+    find(selector: string): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param element An element to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-element}
+     */
+    find(element: Element): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param obj A jQuery object to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-element}
+     */
+    find(obj: JQuery): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the first in the set.
+     * @see {@link https://api.jquery.com/first/}
+     */
+    first(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/has/#has-selector}
+     */
+    has(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param contained A DOM element to match elements against.
+     * @see {@link https://api.jquery.com/has/#has-contained}
+     */
+    has(contained: Element): JQuery;
+
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/is/#is-selector}
+     */
+    is(selector: string): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
+     * @see {@link https://api.jquery.com/is/#is-function}
+     */
+    is(func: (index: number, element: Element) => boolean): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/is/#is-selection}
+     */
+    is(obj: JQuery): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param elements One or more elements to match the current set of elements against.
+     * @see {@link https://api.jquery.com/is/#is-elements}
+     */
+    is(elements: any): boolean;
+
+    /**
+     * Reduce the set of matched elements to the final one in the set.
+     * @see {@link https://api.jquery.com/last/}
+     */
+    last(): JQuery;
+
+    /**
+     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
+     *
+     * @param callback A function object that will be invoked for each element in the current set.
+     * @see {@link https://api.jquery.com/map/}
+     */
+    map(callback: (index: number, domElement: Element) => any): JQuery;
+
+    /**
+     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/next/}
+     */
+    next(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextAll/}
+     */
+    nextAll(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-selector-filter}
+     */
+    nextUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
+     */
+    nextUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
+     */
+    nextUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/not/#not-selector}
+     */
+    not(selector: string): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     * @see {@link https://api.jquery.com/not/#not-function}
+     */
+    not(func: (index: number, element: Element) => boolean): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param elements One or more DOM elements to remove from the matched set.
+     * @see {@link https://api.jquery.com/not/#not-selection}
+     */
+    not(elements: Element|Element[]): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/not/#not-selection}
+     */
+    not(obj: JQuery): JQuery;
+
+    /**
+     * Get the closest ancestor element that is positioned.
+     * @see {@link https://api.jquery.com/offsetParent/}
+     */
+    offsetParent(): JQuery;
+
+    /**
+     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parent/}
+     */
+    parent(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parents/}
+     */
+    parents(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-selector-filter}
+     */
+    parentsUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
+     */
+    parentsUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
+     */
+    parentsUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prev/}
+     */
+    prev(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevAll/}
+     */
+    prevAll(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-selector-filter}
+     */
+    prevUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
+     */
+    prevUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
+     */
+    prevUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/siblings/}
+     */
+    siblings(selector?: string): JQuery;
+
+    /**
+     * Reduce the set of matched elements to a subset specified by a range of indices.
+     *
+     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
+     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
+     * @see {@link https://api.jquery.com/slice/}
+     */
+    slice(start: number, end?: number): JQuery;
+
+    /**
+     * Show the queue of functions to be executed on the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName}
+     */
+    queue(queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
+     */
+    queue(newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
+     */
+    queue(callback: Function): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
+     */
+    queue(queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
+     */
+    queue(queueName: string, callback: Function): JQuery;
+
+    /**
+     * Merge the contents of an object onto the jQuery prototype to provide new jQuery instance methods.
+     *
+     * @param object An object to merge onto the jQuery prototype.
+     * @see {@link https://api.jquery.com/jQuery.fn.extend/#jQuery-fn-extend-object}
+     */
+    extend(object: { [method: string]: (...args: any[]) => any; }): JQuery;
+}
+declare module "jquery" {
+    export = $;
+}
+declare var jQuery: JQueryStatic;
+declare var $: JQueryStatic;
diff --git a/types/jquery/v1/jquery-tests.ts b/types/jquery/v1/jquery-tests.ts
new file mode 100644
index 0000000000..4b6fc4e0db
--- /dev/null
+++ b/types/jquery/v1/jquery-tests.ts
@@ -0,0 +1,3555 @@
+
+
+function test_add() {
+    $("p").add("div").addClass("widget");
+    var pdiv = $("p").add("div");
+
+    $('li').add('p').css('background-color', 'red');
+    $('li').add(document.getElementsByTagName('p')[0])
+      .css('background-coailor', 'red');
+    $('li').add('<p id="new">new paragraph</p>')
+      .css('background-color', 'red');
+    $("div").css("border", "2px solid red")
+            .add("p")
+            .css("background", "yellow");
+    $("p").add("span").css("background", "yellow");
+    $("p").clone().add("<span>Again</span>").appendTo(document.body);
+    $("p").add(document.getElementById("a")).css("background", "yellow");
+    var collection = $("p");
+
+    collection = collection.add(document.getElementById("a"));
+    collection.css("background", "yellow");
+}
+
+function test_addClass() {
+    $("p").addClass("myClass yourClass");
+    $("p").removeClass("myClass noClass").addClass("yourClass");
+    $("ul li:last").addClass(function (index) {
+        return "item-" + index;
+    });
+    $("p:last").addClass("selected");
+    $("p:last").addClass("selected highlight");
+    $("div").addClass(function (index, currentClass) {
+        var addedClass: string;
+        if (currentClass === "red") {
+            addedClass = "green";
+            $("p").text("There is one green div");
+        }
+        return addedClass;
+    });
+}
+
+function test_after() {
+    $('.inner').after('<p>Test</p>');
+    $('<div/>').after('<p></p>').after(document.createDocumentFragment());
+    $('<div/>').after('<p></p>').addClass('foo')
+      .filter('p').attr('id', 'bar').html('hello')
+    .end()
+    .appendTo('body');
+    $('p').after(function () {
+        return '<div>' + this.className + '</div>';
+    });
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+    $('p').first().after($newdiv1, [newdiv2, existingdiv1]);
+    $("p").after(document.createTextNode("Hello"));
+    $("p").after($("b"));
+}
+
+function test_ajax() {
+    $.ajax({
+        url: "test.html",
+        context: document.body
+    }).done(function () {
+        $(this).addClass("done");
+    });
+    $.ajax({
+        statusCode: {
+            404: function () {
+                alert("page not found");
+            }
+        }
+    });
+    $.ajax({
+        url: "http://fiddle.jshell.net/favicon.png",
+        beforeSend: function (xhr) {
+            xhr.overrideMimeType("text/plain; charset=x-user-defined");
+        }
+    }).done(function (data) {
+        if (console && console.log) {
+            console.log("Sample of data:", data.slice(0, 100));
+        }
+    });
+    $.ajax({
+        url: 'ajax/test.html',
+        success: function (data) {
+            $('.result').html(data);
+            alert('Load was performed.');
+        },
+        error: function (jqXHR, textStatus, errorThrown) {
+            alert('Load failed. responseJSON=' + jqXHR.responseJSON);
+        }
+    });
+    var _super = jQuery.ajaxSettings.xhr;
+    jQuery.ajaxSettings.xhr = function () {
+        var xhr = _super(),
+            getAllResponseHeaders = xhr.getAllResponseHeaders;
+
+        xhr.getAllResponseHeaders = function () {
+            if (getAllResponseHeaders()) {
+                return getAllResponseHeaders();
+            }
+
+            var allHeaders = "";
+            var headersFieldNames = ["Cache-Control", "Content-Language", "Content-Type",
+                "Expires", "Last-Modified", "Pragma"];
+            $(headersFieldNames).each(function (i, header_name) {
+                if (xhr.getResponseHeader(header_name)) {
+                    allHeaders += header_name + ": " + xhr.getResponseHeader(header_name) + "\n";
+                }
+            });
+            return allHeaders;
+        };
+
+        return xhr;
+    };
+    $.ajax({
+        type: "POST",
+        url: "some.php",
+        data: { name: "John", location: "Boston" }
+    }).done(function (msg) {
+        alert("Data Saved: " + msg);
+    });
+    $.ajax({
+        method: "POST",
+        url: "some.php",
+        data: { name: "John", location: "Boston" }
+    });
+    $.ajax({
+        url: "test.html",
+        cache: false
+    }).done(function (html) {
+        $("#results").append(html);
+    });
+    var xmlDocument = [];
+    var xmlRequest = $.ajax({
+        url: "page.php",
+        processData: false,
+        data: xmlDocument
+    });
+    var handleResponse;
+    xmlRequest.done(handleResponse);
+
+    var menuId = $("ul.nav").first().attr("id");
+    var request = $.ajax({
+        url: "script.php",
+        type: "POST",
+        data: { id: menuId },
+        dataType: "html"
+    });
+    request.done(function (msg) {
+        $("#log").html(msg);
+    });
+    request.fail(function (jqXHR, textStatus) {
+        alert("Request failed: " + textStatus);
+    });
+
+    $.ajax({
+        type: "GET",
+        url: "test.js",
+        dataType: "script"
+    });
+
+    // Test the jqXHR object returned by $.ajax() as of 1.5
+    // More details: http://api.jquery.com/jQuery.ajax/#jqXHR
+
+    // done method
+    $.ajax({
+        url: "test.js"
+    }).done((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // then method can change promise type through promise chaining
+    var chainedValuePromise : JQueryPromise<number>;
+    chainedValuePromise = $.ajax({
+        url: "test.js"
+    }).then(() => $.when(1));
+
+    // fail method
+    $.ajax({
+        url: "test.js"
+    }).fail((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // always method with successful request
+    $.ajax({
+        url: "test.js"
+    }).always((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // always method with failed request
+    $.ajax({
+        url: "test.js"
+    }).always((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // then method (as of 1.8)
+    $.ajax({
+        url: "test.js"
+    }).then((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    }, (jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // generic then method
+    var p: JQueryPromise<number> = $.ajax({ url: "test.js" })
+        .then(() => "Hello")
+        .then((x) => x.length);
+
+    // jqXHR object
+    var jqXHR = $.ajax({
+        url: "test.js"
+    });
+    jqXHR.abort('aborting because I can');
+
+    //Test the promise exposed by the jqXHR object
+
+    // done method
+    $.ajax({
+        url: "test.js"
+    }).promise().done((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // fail method
+    $.ajax({
+        url: "test.js"
+    }).promise().fail((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // always method with successful request
+    $.ajax({
+        url: "test.js"
+    }).promise().always((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // always method with failed request
+    $.ajax({
+        url: "test.js"
+    }).promise().always((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // then method (as of 1.8)
+    $.ajax({
+        url: "test.js"
+    }).promise().then((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    }, (jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // generic then method
+    var p: JQueryPromise<number> = $.ajax({ url: "test.js" }).promise()
+        .then(() => "Hello")
+        .then((x) => x.length);
+}
+
+function test_ajaxComplete() {
+    $('.log').ajaxComplete(function () {
+        $(this).text('Triggered ajaxComplete handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxComplete(function (e, xhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxComplete handler. The result is ' + xhr.responseText);
+        }
+    });
+    $("#msg").ajaxComplete(function (event, request, settings) {
+        $(this).append("<li>Request Complete.</li>");
+    });
+}
+
+function test_ajaxError() {
+    $("div.log").ajaxError(function () {
+        $(this).text("Triggered ajaxError handler.");
+    });
+    $("button.trigger").click(function () {
+        $("div.result").load("ajax/missing.html");
+    });
+    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
+        if (settings.url == "ajax/missing.html") {
+            $(this).text("Triggered ajaxError handler.");
+        }
+    });
+    $("#msg").ajaxError(function (event, request, settings) {
+        $(this).append("<li>Error requesting page " + settings.url + "</li>");
+    });
+}
+
+function test_ajaxPrefilter() {
+    var currentRequests = {};
+    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+        if (options.abortOnRetry) {
+            if (currentRequests[options.url]) {
+                currentRequests[options.url].abort();
+            }
+            currentRequests[options.url] = jqXHR;
+        }
+    });
+    $.ajaxPrefilter(function (options) {
+        if (options.crossDomain) {
+            options.url = "http://mydomain.net/proxy/" + encodeURIComponent(options.url);
+            options.crossDomain = false;
+        }
+    });
+    $.ajaxPrefilter("json script", function (options, originalOptions, jqXHR) {
+
+    });
+    var isActuallyScript;
+    $.ajaxPrefilter(function (options) {
+        if (isActuallyScript(options.url)) {
+            return "script";
+        }
+    });
+}
+
+function test_ajaxSend() {
+    $('.log').ajaxSend(function () {
+        $(this).text('Triggered ajaxSend handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxSend(function (e, jqxhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxSend handler.');
+        }
+    });
+    $("#msg").ajaxSend(function (evt, request, settings) {
+        $(this).append("<li>Starting request at " + settings.url + "</li>");
+    });
+}
+
+function test_ajaxSetup() {
+    $.ajaxSetup({
+        url: 'ping.php'
+    });
+    $.ajax({
+        data: { 'name': 'Dan' }
+    });
+    $.ajaxSetup({
+        url: "/xmlhttp/",
+        global: false,
+        type: "POST"
+    });
+}
+
+function test_ajaxStart() {
+    $('.log').ajaxStart(function () {
+        $(this).text('Triggered ajaxStart handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $("#loading").ajaxStart(function () {
+        $(this).show();
+    });
+}
+
+function test_ajaxStop() {
+    $('.log').ajaxStop(function () {
+        $(this).text('Triggered ajaxStop handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $("#loading").ajaxStop(function () {
+        $(this).hide();
+    });
+}
+
+function test_ajaxSuccess() {
+    $('.log').ajaxSuccess(function () {
+        $(this).text('Triggered ajaxSuccess handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxSuccess(function (e, xhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxSuccess handler. The ajax response was:' + xhr.responseText);
+        }
+    });
+    $("#msg").ajaxSuccess(function (evt, request, settings) {
+        $(this).append("<li>Successful Request!</li>");
+    });
+}
+
+function test_allSelector() {
+    var elementCount = $("*").css("border", "3px solid red").length;
+    $("body").prepend("<h3>" + elementCount + " elements found</h3>");
+    var elementCount2 = $("#test").find("*").css("border", "3px solid red").length;
+    $("body").prepend("<h3>" + elementCount2 + " elements found</h3>");
+}
+
+function test_animate() {
+    $('#clickme').click(function () {
+        $('#book').animate({
+            opacity: 0.25,
+            left: '+=50',
+            height: 'toggle'
+        }, 5000, function () {
+        });
+    });
+    $('li').animate({
+        opacity: .5,
+        height: '50%'
+    }, {
+        step: function (now, fx) {
+            var data = fx.elem.id + ' ' + fx.prop + ': ' + now;
+            $('body').append('<div>' + data + '</div>');
+        }
+    });
+    $('#clickme').click(function () {
+        $('#book').animate({
+            width: ['toggle', 'swing'],
+            height: ['toggle', 'swing'],
+            opacity: 'toggle'
+        }, 5000, 'linear', function () {
+            $(this).after('<div>Animation complete.</div>');
+        });
+    });
+    $('#clickme').click(function () {
+        $('#book').animate({
+            width: 'toggle',
+            height: 'toggle'
+        }, {
+            duration: 5000,
+            specialEasing: {
+                width: 'linear',
+                height: 'easeOutBounce'
+            },
+            complete: function () {
+                $(this).after('<div>Animation complete.</div>');
+            }
+        });
+    });
+    $("#go").click(function () {
+        $("#block").animate({
+            width: "70%",
+            opacity: 0.4,
+            marginLeft: "0.6in",
+            fontSize: "3em",
+            borderWidth: "10px"
+        }, 1500);
+    });
+    $("#right").click(function () {
+        $(".block").animate({ "left": "+=50px" }, "slow");
+    });
+    $("#left").click(function () {
+        $(".block").animate({ "left": "-=50px" }, "slow");
+    });
+    $("#go1").click(function () {
+        $("#block1").animate({ width: "90%" }, { queue: false, duration: 3000 })
+           .animate({ fontSize: "24px" }, 1500)
+           .animate({ borderRightWidth: "15px" }, 1500);
+    });
+    $("#go2").click(function () {
+        $("#block2").animate({ width: "90%" }, 1000)
+           .animate({ fontSize: "24px" }, 1000)
+           .animate({ borderLeftWidth: "15px" }, 1000);
+    });
+    $("#go3").click(function () {
+        $("#go1").add("#go2").click();
+    });
+    $("#go4").click(function () {
+        $("div").css({ width: "", fontSize: "", borderWidth: "" });
+    });
+    $("#go").click(function () {
+        $(".block:first").animate({
+            left: 100
+        }, {
+            duration: 1000,
+            step: function (now, fx) {
+                $(".block:gt(0)").css("left", now);
+            }
+        });
+    });
+    $("p").animate({
+        height: "toggle", opacity: "toggle"
+    }, "slow");
+    $("p").animate({
+        left: 50, opacity: 1
+    }, 500);
+    $("p").animate({
+        left: "50px", opacity: 1
+    }, { duration: 500, queue: false });
+    $("p").animate({
+        opacity: "show"
+    }, "slow", "easein");
+    $("p").animate({
+        height: "toggle", opacity: "toggle"
+    }, { duration: "slow" });
+    $("p").animate({
+        opacity: "show"
+    }, { duration: "slow", easing: "easein" });
+    $("p").animate({
+        height: 200, width: 400, opacity: 0.5
+    }, 1000, "linear", function () {
+        alert("all done");
+    });
+}
+
+function test_animatedSelector() {
+    $("#run").click(function () {
+        $("div:animated").toggleClass("colored");
+    });
+    function animateIt() {
+        $("#mover").slideToggle("slow", animateIt);
+    }
+    animateIt();
+}
+
+function test_slideToggle() {
+    $("button").click(function () {
+        $("p").slideToggle("slow");
+    });
+
+    $("#aa").click(function () {
+        $("div:not(.still)").slideToggle("slow", function () {
+            var n = parseInt($("span").text(), 10);
+            $("span").text(n + 1);
+        });
+    });
+}
+
+function test_toggle() {
+    $(".target").toggle();
+
+    $("#clickme").click(function () {
+        $("#book").toggle("slow", function () {
+            // Animation complete.
+        });
+    });
+
+    $("#foo").toggle(true);
+
+    $("button").click(function () {
+        $("p").toggle();
+    });
+
+    $("button").click(function () {
+        $("p").toggle("slow");
+    });
+
+    var flip = 0;
+    $("button").click(function () {
+        $("p").toggle(flip++ % 2 === 0);
+    });
+}
+
+function test_append() {
+    $('.inner').append('<p>Test</p>');
+    $('.container').append($('h2')).append(document.createDocumentFragment());
+
+    var $newdiv1 = $('<div id="object1"/>'),
+    newdiv2 = document.createElement('div'),
+    existingdiv1 = document.getElementById('foo');
+
+    $('body').append($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_appendTo() {
+    $('<p>Test</p>').appendTo('.inner');
+    $('h2').appendTo($('.container'));
+}
+
+function test_attr() {
+    var title = $("em").attr("title");
+    $("em").attr("title", null); // Delete an attribute.
+    $("div").text(title);
+    $('#greatphoto').attr('alt', 'Beijing Brush Seller');
+    $('#greatphoto')
+        .attr('title', 'Photo by Kelly Clark');
+    $('#greatphoto').attr({
+        alt: 'Beijing Brush Seller',
+        title: 'photo by Kelly Clark'
+    });
+    $('#greatphoto').attr('title', function (i, val) {
+        return val + ' - photo by Kelly Clark'
+    });
+    $("div").attr("id", function (arr) {
+        return "div-id" + arr;
+    })
+    .each(function () {
+        $("span", this).html("(ID = '<b>" + this.id + "</b>')");
+    });
+    $("img").attr("src", function () {
+        return "/images/" + this.title;
+    });
+}
+
+function test_attributeSelectors() {
+    $('a[hreflang|="en"]').css('border', '3px dotted green');
+    $('input[name*="man"]').val('has man in it!');
+    $('input[name~="man"]').val('mr. man is in it!');
+    $('input[name$="letter"]').val('a letter');
+    $('input[value="Hot Fuzz"]').next().text(" Hot Fuzz");
+    $('input[name!="newsletter"]').next().append('<b>; not newsletter</b>');
+    $('input[name^="news"]').val('news here!');
+}
+
+function test_before() {
+    $('.inner').before('<p>Test</p>');
+    $('.container').before($('h2')).before(document.createDocumentFragment());
+    $("<div/>").before("<p></p>");
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+    $('p').first().before($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_bind() {
+    $('#foo').bind('click', function () {
+        alert('User clicked on "foo."');
+    });
+    $('#foo').bind('mouseenter mouseleave', function () {
+        $(this).toggleClass('entered');
+    });
+    $('#foo').bind({
+        click: function () { },
+        mouseenter: function () { }
+    });
+    $('#foo').bind('click', function () {
+        alert($(this).text());
+    });
+    $(document).ready(function () {
+        $('#foo').bind('click', function (event) {
+            alert('The mouse cursor is at ('
+              + event.pageX + ', ' + event.pageY + ')');
+        });
+    });
+    var message = 'Spoon!';
+    $('#foo').bind('click', function () {
+        alert(message);
+    });
+    message = 'Not in the face!';
+    $('#bar').bind('click', function () {
+        alert(message);
+    });
+    var message = 'Spoon!';
+    $('#foo').bind('click', { msg: message }, function (event) {
+        alert(event.data.msg);
+    });
+    message = 'Not in the face!';
+    $('#bar').bind('click', { msg: message }, function (event) {
+        alert(event.data.msg);
+    });
+    $("p").bind("click", function (event) {
+        var str = "( " + event.pageX + ", " + event.pageY + " )";
+        $("span").text("Click happened! " + str);
+    });
+    $("p").bind("dblclick", function () {
+        $("span").text("Double-click happened in " + this.nodeName);
+    });
+    $("p").bind("mouseenter mouseleave", function (event) {
+        $(this).toggleClass("over");
+    });
+    $("p").bind("click", function () {
+        alert($(this).text());
+    });
+    function handler(event) {
+        alert(event.data.foo);
+    }
+    $("p").bind("click", { foo: "bar" }, handler)
+    $("form").bind("submit", function () { return false; })
+    $("form").bind("submit", function (event) {
+        event.preventDefault();
+    });
+    $("form").bind("submit", function (event) {
+        event.stopPropagation();
+    });
+    $("p").bind("myCustomEvent", function (e, myName?, myValue?) {
+        $(this).text(myName + ", hi there!");
+        $("span").stop().css("opacity", 1)
+        .text("myName = " + myName)
+        .fadeIn(30).fadeOut(1000);
+    });
+    $("button").click(function () {
+        $("p").trigger("myCustomEvent", ["John"]);
+    });
+    $("div.test").bind({
+        click: function () {
+            $(this).addClass("active");
+        },
+        mouseenter: function () {
+            $(this).addClass("inside");
+        },
+        mouseleave: function () {
+            $(this).removeClass("inside");
+        }
+    });
+}
+
+function test_unbind() {
+    $("#foo").unbind();
+
+    $("#foo").unbind("click");
+
+    var handler = function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    };
+    $("#foo").bind("click", handler);
+    $("#foo").unbind("click", handler);
+
+    $("#foo").bind("click", function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    });
+
+    // Will NOT work
+    $("#foo").unbind("click", function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    });
+
+    $("#foo").bind("click.myEvents", handler);
+
+    $("#foo").unbind("click");
+
+    $("#foo").unbind("click.myEvents");
+
+    $("#foo").unbind(".myEvents");
+
+    var timesClicked = 0;
+    $("#foo").bind("click", function (event) {
+        alert("The quick brown fox jumps over the lazy dog.");
+        timesClicked++;
+        if (timesClicked >= 3) {
+            $(this).unbind(event);
+        }
+    });
+
+    function aClick() {
+        $("div").show().fadeOut("slow");
+    }
+    $("#bind").click(function () {
+        $("#theone")
+            .bind("click", aClick)
+            .text("Can Click!");
+    });
+    $("#unbind").click(function () {
+        $("#theone")
+            .unbind("click", aClick)
+            .text("Does nothing...");
+    });
+
+    $("p").unbind();
+
+    $("p").unbind("click");
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    $("p").bind("click", foo); // ... Now foo will be called when paragraphs are clicked ...
+
+    $("p").unbind("click", foo); // ... foo will no longer be called.
+}
+
+function test_blur() {
+    $('#target').blur(function () {
+        alert('Handler for .blur() called.');
+    });
+    $('#other').click(function () {
+        $('#target').blur();
+
+    });
+    $("p").blur();
+}
+
+interface JQueryStatic { Topic; }
+function test_callbacks() {
+    function fn1(value) {
+        console.log(value);
+    }
+    function fn2(value) {
+        fn1("fn2 says:" + value);
+        return false;
+    }
+    var callbacks = $.Callbacks();
+    var callbacks2 = $.Callbacks("once");
+    callbacks.add(fn1);
+    callbacks.fire("foo!");
+    callbacks.add(fn2);
+    callbacks.fire("bar!");
+    callbacks.remove(fn2);
+    callbacks.fire("foobar");
+    var topics = {};
+
+    jQuery.Topic = function (id) {
+        var callbacks,
+            method,
+            topic = id && topics[id];
+        if (!topic) {
+            callbacks = jQuery.Callbacks();
+            topic = {
+                publish: callbacks.fire,
+                subscribe: callbacks.add,
+                unsubscribe: callbacks.remove
+            };
+            if (id) {
+                topics[id] = topic;
+            }
+        }
+        return topic;
+    };
+    $.Topic("mailArrived").subscribe(fn1);
+    $.Topic("mailArrived").subscribe(fn2);
+    $.Topic("mailSent").subscribe(fn1);
+    $.Topic("mailArrived").publish("hello world!");
+    $.Topic("mailSent").publish("woo! mail!");
+    $.Topic("mailArrived").subscribe(fn1);
+
+    var dfd = $.Deferred();
+    var topic = $.Topic("mailArrived");
+    dfd.done(topic.publish);
+    dfd.resolve("its been published!");
+}
+
+function test_callbacksFunctions() {
+    var foo = function (value) {
+        console.log('foo:' + value);
+    }
+    var bar = function (value) {
+        console.log('bar:' + value);
+    }
+    var callbacks = $.Callbacks();
+    callbacks.add(foo);
+    callbacks.fire('hello');
+    callbacks.add(bar);
+    callbacks.fire('world');
+    callbacks.disable();
+
+    // Test the disabled state of the list
+    console.log(callbacks.disabled());
+    // Outputs: true
+
+    callbacks.empty();
+    callbacks.fire('hello');
+    console.log(callbacks.fired());
+    callbacks.fireWith(window, ['foo', 'bar']);
+    var foo2 = function (value1, value2) {
+        console.log('Received:' + value1 + ',' + value2);
+    };
+    console.log(callbacks.has(foo2));
+    callbacks.lock();
+    console.log(callbacks.locked());
+    callbacks.remove(foo);
+}
+
+function test_change() {
+    $('.target').change(function () {
+        alert('Handler for .change() called.');
+    });
+    $('#other').click(function () {
+        $('.target').change();
+    });
+    $("input[type='text']").change(function () { });
+    $("input[type='text']").change();
+}
+
+function test_children() {
+    $('ul.level-2').children().css('background-color', 'red');
+    $("#container").click(function (e) {
+        $("*").removeClass("hilite");
+        var $kids = $(e.target).children();
+        var len = $kids.addClass("hilite").length;
+
+        $("#results span:first").text(len);
+        //$("#results span:last").text(e.target.tagName);
+
+        e.preventDefault();
+        return false;
+    });
+    $("div").children(".selected").css("color", "blue");
+}
+
+function test_clearQueue() {
+    $("#start").click(function () {
+        var myDiv = $("div");
+        myDiv.show("slow");
+        myDiv.animate({ left: '+=200' }, 5000);
+        myDiv.queue(function () {
+            var _this = $(this);
+            _this.addClass("newcolor");
+            _this.dequeue();
+        });
+        myDiv.animate({ left: '-=200' }, 1500);
+        myDiv.queue(function () {
+            var _this = $(this);
+            _this.removeClass("newcolor");
+            _this.dequeue();
+        });
+        myDiv.slideUp();
+
+    });
+    $("#stop").click(function () {
+        var myDiv = $("div");
+        myDiv.clearQueue();
+        myDiv.stop();
+    });
+}
+
+function test_click() {
+    $("#target").click(function () {
+        alert("Handler for .click() called.");
+    });
+    $("#other").click(function () {
+        $("#target").click();
+    });
+    $("p").click(function () {
+        $(this).slideUp();
+    });
+    $("p").click();
+}
+
+function test_submit() {
+    $("#target").submit(function () {
+        alert("Handler for .submit() called.");
+    });
+    $("#target").submit();
+}
+
+function test_trigger() {
+
+    $("#foo").on("click", function () {
+        alert($(this).text());
+    });
+    $("#foo").trigger("click");
+
+    $("#foo").on("custom", function (event, param1?, param2?) {
+        alert(param1 + "\n" + param2);
+    });
+    $("#foo").trigger("custom", ["Custom", "Event"]);
+
+    $("button:first").click(function () {
+        update($("span:first"));
+    });
+
+    $("button:last").click(function () {
+        $("button:first").trigger("click");
+        update($("span:last"));
+    });
+
+    function update(j) {
+        var n = parseInt(j.text(), 10);
+        j.text(n + 1);
+    }
+
+    $("form:first").trigger("submit");
+
+    var event = jQuery.Event("submit");
+    $("form:first").trigger(event);
+    if (event.isDefaultPrevented()) {
+        // Perform an action...
+    }
+
+    $("p")
+        .click(function (event, a, b) {
+            // When a normal click fires, a and b are undefined
+            // for a trigger like below a refers to "foo" and b refers to "bar"
+        })
+        .trigger("click", ["foo", "bar"]);
+
+    var event = jQuery.Event("logged");
+    (<any>event).user = "foo";
+    (<any>event).pass = "bar";
+    $("body").trigger(event);
+
+    // Adapted from jQuery documentation which may be wrong on this occasion
+    var event2 = jQuery.Event("logged");
+    $("body").trigger(event2, {
+        type: "logged",
+        user: "foo",
+        pass: "bar"
+    });
+}
+
+function test_clone() {
+    $('.hello').clone().appendTo('.goodbye');
+    var $elem = $('#elem').data({ "arr": [1] }),
+        $clone = $elem.clone(true)
+        .data("arr", $.extend([], $elem.data("arr")));
+    $("b").clone().prependTo("p");
+    $('#copy').append($('#orig .elem')
+          .clone()
+          .children('a')
+          .prepend('foo - ')
+          .parent()
+          .clone());
+}
+
+function test_prepend() {
+    $('.inner').prepend('<p>Test</p>');
+    $('.container').prepend($('h2')).prepend(document.createDocumentFragment());
+
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+
+    $('body').prepend($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_prependTo() {
+    $("<p>Test</p>").prependTo(".inner");
+    $("h2").prependTo($(".container"));
+    $("span").prependTo("#foo");
+}
+
+function test_closest() {
+    $('li.item-a').closest('ul')
+        .css('background-color', 'red');
+    $('li.item-a').closest('li')
+        .css('background-color', 'red');
+    var listItemII = document.getElementById('ii');
+    $('li.item-a').closest('ul', listItemII)
+        .css('background-color', 'red');
+    $('li.item-a').closest('#one', listItemII)
+        .css('background-color', 'green');
+    $(document).bind("click", function (e) {
+        $(e.target).closest("li").toggleClass("hilight");
+    });
+    var $listElements = $("li").css("color", "blue");
+    $(document).bind("click", function (e) {
+        //$(e.target).closest($listElements).toggleClass("hilight");
+    });
+}
+
+function test_contains() {
+    jQuery.contains(document.documentElement, document.body);
+    jQuery.contains(document.body, document.documentElement);
+}
+
+function test_contents() {
+    $('.container').contents().filter(function () {
+        return this.nodeType == 3;
+    })
+    .wrap('<p></p>')
+    .end()
+    .filter('br')
+    .remove();
+    $("#frameDemo").contents().find("a").css("background-color", "#BADA55");
+}
+
+function test_context() {
+    $("ul")
+        .append("<li>" + $("ul").context + "</li>")
+        .append("<li>" + $("ul", document.body).context.nodeName + "</li>");
+}
+
+function test_css() {
+    $("div").click(function () {
+        var color = $(this).css("background-color");
+        $("#result").html("That div is <span style='color:" + color + ";'>" + color + "</span>.");
+    });
+    $('div.example').css('width', function (index) {
+        return index * 50;
+    });
+    $('div.example').css('width', function (index, style) {
+        return style.length > 0 ? style : index * 50;
+    });
+    $("p").mouseover(function () {
+        $(this).css("color", "red");
+    });
+    $("#box").one("click", function () {
+        $(this).css("width", "+=200");
+    });
+    var words = $("p:first").text().split(" ");
+    var text = words.join("</span> <span>");
+    $("p:first").html("<span>" + text + "</span>");
+    $("span").click(function () {
+        $(this).css("background-color", "yellow");
+    });
+    $("p").hover(function () {
+        $(this).css({ 'background-color': 'yellow', 'font-weight': 'bolder' });
+    }, function () {
+        var cssObj = {
+            'background-color': '#ddd',
+            'font-weight': '',
+            'color': 'rgb(0,40,244)'
+        }
+        $(this).css(cssObj);
+    });
+    $("div").click(function () {
+        $(this).css({
+            width: function (index, value) {
+                return parseFloat(value) * 1.2;
+            },
+            height: function (index, value) {
+                return parseFloat(value) * 1.2;
+            }
+        });
+    });
+    var dims = $("#box").css([ "width", "height", "backgroundColor" ]);
+}
+
+function test_cssHooks() {
+    if (!$.cssHooks) {
+        throw ("jQuery 1.4.3 or above is required for this plugin to work");
+    }
+    $.cssHooks["someCSSProp"] = {
+        get: function (elem, computed, extra) { },
+        set: function (elem, value) { }
+    };
+    function styleSupport(prop) {
+        var vendorProp, supportedProp,
+            capProp = prop.charAt(0).toUpperCase() + prop.slice(1),
+            prefixes = ["Moz", "Webkit", "O", "ms"],
+            div = document.createElement("div");
+
+        if (prop in div.style) {
+            supportedProp = prop;
+        } else {
+            for (var i = 0; i < prefixes.length; i++) {
+                vendorProp = prefixes[i] + capProp;
+                if (vendorProp in div.style) {
+                    supportedProp = vendorProp;
+                    break;
+                }
+            }
+        }
+        div = null;
+        $.support[prop] = supportedProp;
+        return supportedProp;
+    }
+    styleSupport("borderRadius");
+
+    $.cssNumber["someCSSProp"] = true;
+    $.fx.step["someCSSProp"] = function (fx) {
+        $.cssHooks["someCSSProp"].set(fx.elem, fx.now + fx.unit);
+    };
+}
+
+function test_data() {
+    $('body').data('foo', 52);
+    $('body').data('bar', { myType: 'test', count: 40 });
+    $('body').data('foo');
+    $('body').data();
+    $("div").data("test", { first: 16, last: "pizza!" });
+    $("span:first").text($("div").data("test").first);
+    $("span:last").text($("div").data("test").last);
+    alert($('body').data('foo'));
+    alert($('body').data());
+    alert($("body").data("foo"));
+    $("body").data("bar", "foobar");
+    alert($("body").data("bar"));
+    $("div").data("role") === "page";
+    $("div").data("lastValue") === 43;
+    $("div").data("hidden") === true;
+    $("div").data("options").name === "John";
+    var value;
+    switch ($("button").index(this)) {
+        case 0:
+            value = $("div").data("blah");
+            break;
+        case 1:
+            $("div").data("blah", "hello");
+            value = "Stored!";
+            break;
+        case 2:
+            $("div").data("blah", 86);
+            value = "Stored!";
+            break;
+        case 3:
+            $("div").removeData("blah");
+            value = "Removed!";
+            break;
+    }
+    $("span").text("" + value);
+    jQuery.data(document.body, 'foo', 52);
+    jQuery.data(document.body, 'bar', 'test');
+    var div = $("div")[0];
+    jQuery.data(div, "test", { first: 16, last: "pizza!" });
+    $("span:first").text(jQuery.data(div, "test").first);
+    $("span:last").text(jQuery.data(div, "test").last);
+    $.data(document.getElementById("id"), "", 8).toFixed(2);
+    $.data(document.getElementById("id"), "", "8").toUpperCase();
+}
+
+function test_removeData() {
+    $("span:eq(0)").text("" + $("div").data("test1"));
+    $("div").data("test1", "VALUE-1");
+    $("div").data("test2", "VALUE-2");
+    $("span:eq(1)").text("" + $("div").data("test1"));
+    $("div").removeData("test1");
+    $("span:eq(2)").text("" + $("div").data("test1"));
+    $("span:eq(3)").text("" + $("div").data("test2"));
+}
+
+function test_jQuery_removeData() {
+    var div = $("div")[0];
+    $("span:eq(0)").text("" + $("div").data("test1"));
+    jQuery.data(div, "test1", "VALUE-1");
+    jQuery.data(div, "test2", "VALUE-2");
+    $("span:eq(1)").text("" + jQuery.data(div, "test1"));
+    jQuery.removeData(div, "test1");
+    $("span:eq(2)").text("" + jQuery.data(div, "test1"));
+    $("span:eq(3)").text("" + jQuery.data(div, "test2"));
+}
+
+function test_removeDataAll() {
+    var el = $("div");
+    el.data("test1", "VALUE-1");
+    el.data("test2", "VALUE-2");
+    el.removeData();
+}
+
+function test_dblclick() {
+    $('#target').dblclick(function () {
+        alert('Handler for .dblclick() called.');
+    });
+    $('#other').click(function () {
+        $('#target').dblclick();
+    });
+    $("p").dblclick(function () { alert("Hello World!"); });
+    var divdbl = $("div:first");
+    divdbl.dblclick(function () {
+        divdbl.toggleClass('dbl');
+    });
+	$('#target').dblclick();
+}
+
+function test_delay() {
+    $('#foo').slideUp(300).delay(800).fadeIn(400);
+    $("button").click(function () {
+        $("div.first").slideUp(300).delay(800).fadeIn(400);
+        $("div.second").slideUp(300).fadeIn(400);
+    });
+}
+
+function test_delegate() {
+    $("table").delegate("td", "click", function () {
+        $(this).toggleClass("chosen");
+    });
+    $("table").on("click", "td", function () {
+        $(this).toggleClass("chosen");
+    });
+    $("body").delegate("p", "click", function () {
+        $(this).after("<p>Another paragraph!</p>");
+    });
+    $("body").delegate("p", "click", function () {
+        alert($(this).text());
+    });
+    $("body").delegate("a", "click", function () { return false; });
+    $("body").delegate("a", "click", function (event) {
+        event.preventDefault();
+    });
+    $("body").delegate("p", "myCustomEvent", function (e, myName?, myValue?) {
+        $(this).text("Hi there!");
+        $("span").stop().css("opacity", 1)
+                 .text("myName = " + myName)
+                 .fadeIn(30).fadeOut(1000);
+    });
+    $("button").click(function () {
+        $("p").trigger("myCustomEvent");
+    });
+}
+
+function test_undelegate() {
+    function aClick() {
+        $("div").show().fadeOut("slow");
+    }
+    $("#bind").click(function () {
+        $("body")
+            .delegate("#theone", "click", aClick)
+            .find("#theone").text("Can Click!");
+    });
+    $("#unbind").click(function () {
+        $("body")
+            .undelegate("#theone", "click", aClick)
+            .find("#theone").text("Does nothing...");
+    });
+
+    $("p").undelegate();
+
+    $("p").undelegate("click");
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    // ... Now foo will be called when paragraphs are clicked ...
+    $("body").delegate("p", "click", foo);
+
+    // ... foo will no longer be called.
+    $("body").undelegate("p", "click", foo);
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    // Delegate events under the ".whatever" namespace
+    $("form").delegate(":button", "click.whatever", foo);
+
+    $("form").delegate("input[type='text'] ", "keypress.whatever", foo);
+
+    // Unbind all events delegated under the ".whatever" namespace
+    $("form").undelegate(".whatever");
+}
+
+function test_dequeue() {
+    $("button").click(function () {
+        $("div").animate({ left: '+=200px' }, 2000);
+        $("div").animate({ top: '0px' }, 600);
+        $("div").queue(function () {
+            $(this).toggleClass("red");
+            $(this).dequeue();
+        });
+        $("div").animate({ left: '10px', top: '30px' }, 700);
+    });
+}
+
+function test_queue() {
+
+    $("#show").click(function () {
+        var n = jQuery.queue($("div")[0], "fx");
+        $("span").text("Queue length is: " + n.length);
+    });
+
+    function runIt() {
+        $("div")
+            .show("slow")
+            .animate({
+                left: "+=200"
+            }, 2000)
+            .slideToggle(1000)
+            .slideToggle("fast")
+            .animate({
+                left: "-=200"
+            }, 1500)
+            .hide("slow")
+            .show(1200)
+            .slideUp("normal", runIt);
+    }
+
+    runIt();
+
+    $(document.body).click(function () {
+        var divs = $("div")
+            .show("slow")
+            .animate({ left: "+=200" }, 2000);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).addClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.animate({ left: "-=200" }, 500);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).removeClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.slideUp();
+    });
+
+    $("#start").click(function () {
+        var divs = $("div")
+            .show("slow")
+            .animate({ left: "+=200" }, 5000);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).addClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.animate({ left: "-=200" }, 1500);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).removeClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.slideUp();
+    });
+    $("#stop").click(function () {
+        jQuery.queue($("div")[0], "fx", []);
+        $("div").stop();
+    });
+}
+
+function test_detach() {
+    $("p").click(function () {
+        $(this).toggleClass("off");
+    });
+    var p;
+    $("button").click(function () {
+        if (p) {
+            p.appendTo("body");
+            p = null;
+        } else {
+            p = $("p").detach();
+        }
+    });
+}
+
+function test_each() {
+    var numArray: number[];
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
+        alert(index + ': ' + value);
+    });
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
+        alert(index + ': ' + value);
+        return value < 2;
+    });
+
+    var res: {one: number, 2: string};
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+    });
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+        return key === "2";
+    });
+
+    var map = {
+        'flammable': 'inflammable',
+        'duh': 'no duh'
+    };
+    $.each(map, function (key, value) {
+        alert(key + ': ' + value);
+    });
+    var arr = ["one", "two", "three", "four", "five"];
+    var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
+    jQuery.each(arr, function () {
+        $("#" + this).text("Mine is " + this + ".");
+        return (this != "three");
+    });
+    jQuery.each(obj, function (i, val) {
+        $("#" + i).append(document.createTextNode(" - " + val));
+    });
+    $.each(['a', 'b', 'c'], function (i, l) {
+        alert("Index #" + i + ": " + l);
+    });
+    $.each({ name: "John", lang: "JS" }, function (k, v) {
+        alert("Key: " + k + ", Value: " + v);
+    });
+    $.each([{a: 1}, {a: 2}, {a: 3}], function (i, o) {
+        alert("Index #" + i + ": " + o.a);
+    });
+    $('li').each(function (index) {
+        alert(index + ': ' + $(this).text());
+    });
+    $(document.body).click(function () {
+        $("div").each(function (i) {
+            if (this.style.color != "blue") {
+                this.style.color = "blue";
+            } else {
+                this.style.color = "";
+            }
+        });
+    });
+    $("span").click(function () {
+        $("li").each(function () {
+            $(this).toggleClass("example");
+        });
+    });
+    $("button").click(function () {
+        $("div").each(function (index, domEle) {
+            // domEle == this
+            $(domEle).css("backgroundColor", "yellow");
+            if ($(this).is("#stop")) {
+                $("span").text("Stopped at div index #" + index);
+                return false;
+            }
+        });
+    });
+}
+
+function test_empty() {
+    $('.hello').empty();
+}
+
+function test_end() {
+    $('ul.first').find('.foo').css('background-color', 'red')
+        .end().find('.bar').css('background-color', 'green');
+    $('ul.first').find('.foo')
+        .css('background-color', 'red')
+        .end().find('.bar')
+        .css('background-color', 'green')
+        .end();
+}
+
+function test_eq() {
+    $('li').eq(2).css('background-color', 'red');
+    $('li').eq(-2).css('background-color', 'red');
+    $('li').eq(5).css('background-color', 'red');
+    $("body").find("div").eq(2).addClass("blue");
+}
+
+function test_error() {
+    $('#book')
+        .error(function () {
+            alert('Handler for .error() called.')
+        })
+        .attr("src", "missing.png");
+    $("img")
+        .error(function () {
+            $(this).hide();
+        })
+        .attr("src", "missing.png");
+    jQuery.error("Oups");
+    jQuery.error = (message?: string) => {
+        console.error(message); return this;
+    };
+}
+
+function test_eventParams() {
+    $("p").click(function (event) {
+        event.currentTarget === this;
+    });
+    $(".box").on("click", "button", function (event) {
+        $(event.delegateTarget).css("background-color", "red");
+    });
+    $("a").click(function (event) {
+        event.isDefaultPrevented();
+        event.preventDefault();
+        event.isDefaultPrevented();
+    });
+    function immediatePropStopped(e) {
+        var msg = "";
+        if (e.isImmediatePropagationStopped()) {
+            msg = "called"
+        } else {
+            msg = "not called";
+        }
+        $("#stop-log").append("<div>" + msg + "</div>");
+    }
+    $("button").click(function (event) {
+        immediatePropStopped(event);
+        event.stopImmediatePropagation();
+        immediatePropStopped(event);
+    });
+    function propStopped(e) {
+        var msg = "";
+        if (e.isPropagationStopped()) {
+            msg = "called";
+        } else {
+            msg = "not called";
+        }
+        $("#stop-log").append("<div>" + msg + "</div>");
+    }
+    $("button").click(function (event) {
+        propStopped(event);
+        event.stopPropagation();
+        propStopped(event);
+    });
+    $("p").bind("test.something", function (event) {
+        alert(event.namespace);
+    });
+    $("button").click(function (event) {
+        $("p").trigger("test.something");
+    });
+    $(document).bind('mousemove', function (e) {
+        $("#log").text("e.pageX: " + e.pageX + ", e.pageY: " + e.pageY);
+    });
+    $("a").click(function (event) {
+        event.preventDefault();
+        $('<div/>')
+            .append('default ' + event.type + ' prevented')
+            .appendTo('#log');
+    });
+    $("a").mouseout(function (event) {
+        alert(event.relatedTarget.nodeName);
+    });
+    $("button").click(function (event) {
+        return "hey";
+    });
+    $("button").click(function (event) {
+        $("p").html(event.result);
+    });
+    $("p").click(function (event) {
+        event.stopImmediatePropagation();
+    });
+    $("p").click(function (event) {
+        $(this).css("background-color", "#f00");
+    });
+    $("div").click(function (event) {
+        $(this).css("background-color", "#f00");
+    });
+    $("p").click(function (event) {
+        event.stopPropagation();
+    });
+    $("body").click(function (event) {
+        //bugfix, duplicate identifier.  see: http://stackoverflow.com/questions/14824143/duplicate-identifier-nodename-in-jquery-d-ts
+        //$("#log").html("clicked: " + event.target.nodeName);
+    });
+    $('#whichkey').bind('keydown', function (e) {
+        $('#log').html(e.type + ': ' + e.which);
+    });
+    $('#whichkey').bind('mousedown', function (e) {
+        $('#log').html(e.type + ': ' + e.which);
+    });
+    $(window).on('mousewheel', (e) => {
+        var delta = (<WheelEvent>e.originalEvent).deltaY;
+    });
+    $( "p" ).click(function( event ) {
+      alert( event.currentTarget === this ); // true
+    });
+}
+
+function test_extend() {
+    var object1 = {
+        apple: 0,
+        banana: { weight: 52, price: 100 },
+        cherry: 97
+    };
+    var object2 = {
+        banana: { price: 200 },
+        durian: 100
+    };
+    $.extend(object1, object2);
+    var printObj = typeof JSON != "undefined" ? JSON.stringify : function (obj) {
+        var arr = [];
+        $.each(obj, function (key, val) {
+            var next = key + ": ";
+            next += $.isPlainObject(val) ? printObj(val) : val;
+            arr.push(next);
+        });
+        return "{ " + arr.join(", ") + " }";
+    };
+    $("#log").append(printObj(object1));
+
+    var defaults = { validate: false, limit: 5, name: "foo" };
+    var options = { validate: true, name: "bar" };
+    var settings: typeof defaults = $.extend({}, defaults, options);
+}
+
+function test_fadeIn() {
+    $('#clickme').click(function () {
+        $('#book').fadeIn('slow', function () { });
+    });
+    $(document.body).click(function () {
+        $("div:hidden:first").fadeIn("slow");
+    });
+    $("a").click(function () {
+        $("div").fadeIn(3000, function () {
+            $("span").fadeIn(100);
+        });
+        return false;
+    });
+}
+
+function test_fadeOut() {
+    $('#clickme').click(function () {
+        $('#book').fadeOut('slow', function () { });
+    });
+    $("p").click(function () {
+        $("p").fadeOut("slow");
+    });
+    $("span").click(function () {
+        $(this).fadeOut(1000, function () {
+            $("div").text("'" + $(this).text() + "' has faded!");
+            $(this).remove();
+        });
+    });
+    $("span").hover(function () {
+        $(this).addClass("hilite");
+    }, function () {
+        $(this).removeClass("hilite");
+    });
+    $("#btn1").click(function () {
+        function complete() {
+            $("<div/>").text(this.id).appendTo("#log");
+        }
+        $("#box1").fadeOut(1600, "linear", complete);
+        $("#box2").fadeOut(1600, complete);
+    });
+    $("#btn2").click(function () {
+        $("div").show();
+        $("#log").empty();
+    });
+}
+
+function test_fadeTo() {
+    $('#clickme').click(function () {
+        $('#book').fadeTo('slow', 0.5, function () { });
+    });
+    $("p:first").click(function () {
+        $(this).fadeTo("slow", 0.33);
+    });
+    $("div").click(function () {
+        $(this).fadeTo("fast", Math.random());
+    });
+    var getPos = function (n) {
+        return (Math.floor(n) * 90) + "px";
+    };
+    $("p").each(function (n) {
+        var r = Math.floor(Math.random() * 3);
+        var tmp = $(this).text();
+        $(this).text($("p:eq(" + r + ")").text());
+        $("p:eq(" + r + ")").text(tmp);
+        $(this).css("left", getPos(n));
+    });
+    $("div").each(function (n) {
+        $(this).css("left", getPos(n));
+    })
+    .css("cursor", "pointer")
+    .click(function () {
+        $(this).fadeTo(250, 0.25, function () {
+            $(this).css("cursor", "")
+                   .prev().css({
+                       "font-weight": "bolder",
+                       "font-style": "italic"
+                   });
+        });
+    });
+}
+
+function test_fadeToggle() {
+    $("button:first").click(function () {
+        $("p:first").fadeToggle("slow", "linear");
+    });
+    $("button:last").click(function () {
+        $("p:last").fadeToggle("fast", function () {
+            $("#log").append("<div>finished</div>");
+        });
+    });
+}
+
+function test_filter() {
+    $('li').filter(':even').css('background-color', 'red');
+    $('li').filter(function (index) {
+        return index % 3 === 2;
+    }).css('background-color', 'red');
+    $("div").css("background", "#b4b0da")
+        .filter(function (index) {
+            return index === 1 || $(this).attr("id") === "fourth";
+        })
+        .css("border", "3px double red");
+    $("div").filter(document.getElementById("unique"));
+    $("div").filter($("#unique"));
+}
+
+function test_find() {
+    $('li.item-ii').find('li').css('background-color', 'red');
+    var item1 = $('li.item-1')[0];
+    $('li.item-ii').find(item1).css('background-color', 'red');
+    var $spans = $('span');
+    $("p").find($spans).css('color', 'red');
+    var newText = $("p").text().split(" ").join("</span> <span>");
+    newText = "<span>" + newText + "</span>";
+    $("p").html(newText)
+        .find('span')
+        .hover(function () {
+            $(this).addClass("hilite");
+        },
+        function () {
+            $(this).removeClass("hilite");
+        })
+    .end()
+        .find(":contains('t')")
+        .css({ "font-style": "italic", "font-weight": "bolder" });
+}
+
+function test_finish() {
+    $(".box").finish();
+}
+
+function test_first() {
+    $('li').first().css('background-color', 'red');
+}
+
+function test_focus() {
+    $('#target').focus(function () {
+        alert('Handler for .focus() called.');
+    });
+    $('#other').click(function () {
+        $('#target').focus();
+    });
+    $("input").focus(function () {
+        $(this).next("span").css('display', 'inline').fadeOut(1000);
+    });
+    $("input[type=text]").focus(function () {
+        $(this).blur();
+    });
+    $(document).ready(function () {
+        $("#login").focus();
+    });
+}
+
+function test_focusin() {
+    $("p").focusin(function () {
+        $(this).find("span").css('display', 'inline').fadeOut(1000);
+    });
+}
+
+function test_focusout() {
+    var fo = 0, b = 0;
+    $("p").focusout(function () {
+        fo++;
+        $("#fo")
+            .text("focusout fired: " + fo + "x");
+    }).blur(function () {
+        b++;
+        $("#b")
+            .text("blur fired: " + b + "x");
+    });
+}
+
+function test_easing() {
+    const easing = jQuery.easing;
+
+    function test_easing_function( name: string, fn: JQueryEasingFunction ) {
+        const step = Math.pow( 2, -3 ); // use power of 2 to prevent floating point rounding error
+        for( let i = 0; i <= 1; i += step ) {
+            console.log( `$.easing.${name}(${i}): ${fn.call(easing, i)}` );
+        }
+    }
+
+    test_easing_function( "linear", easing.linear );
+    test_easing_function( "swing", easing.swing );
+}
+
+function test_fx() {
+    jQuery.fx.interval = 100;
+    $("input").click(function () {
+        $("div").toggle(3000);
+    });
+    var toggleFx = function () {
+        $.fx.off = !$.fx.off;
+    };
+    toggleFx();
+    $("button").click(toggleFx)
+    $("input").click(function () {
+        $("div").toggle("slow");
+    });
+}
+
+function test_get() {
+    $.get('ajax/test.html', function (data) {
+        $('.result').html(data);
+        alert('Load was performed.');
+    });
+    var jqxhr = $.get("example.php", function () {
+        alert("success");
+    })
+    .done(function () { alert("second success"); })
+    .fail(function () { alert("error"); });
+
+    $.get("test.php");
+    $.get("test.php", { name: "John", time: "2pm" });
+    $.get("test.php", { 'choices[]': ["Jon", "Susan"] });
+    $.get("test.php", function (data) {
+        alert("Data Loaded: " + data);
+    });
+    $.get("test.cgi", { name: "John", time: "2pm" },
+        function (data) {
+            alert("Data Loaded: " + data);
+        });
+    $.get("test.php",
+       function (data) {
+           $('body').append("Name: " + data.name)
+                    .append("Time: " + data.time);
+       }, "json");
+    alert($('li').get());
+    $('li').get(0);
+    $('li')[0];
+    alert($('li').get(-1));
+    function disp(divs) {
+        var a = [];
+        for (var i = 0; i < divs.length; i++) {
+            a.push(divs[i].innerHTML);
+        }
+        $("span").text(a.join(" "));
+    }
+    disp($("div").get().reverse());
+    $("*", document.body).click(function (e) {
+        e.stopPropagation();
+        var domEl = $(this).get(0);
+        $("span:first").text("Clicked on - " + domEl.tagName);
+    });
+}
+
+function test_getJSON() {
+    $.getJSON('ajax/test.json', function (data) {
+        var items = [];
+        $.each(data, function (key, val) {
+            items.push('<li id="' + key + '">' + val + '</li>');
+        });
+        $('<ul/>', {
+            'class': 'my-new-list',
+            html: items.join('')
+        }).appendTo('body');
+    });
+    var jqxhr = $.getJSON("example.json", function () {
+        alert("success");
+    })
+    .done(function () { alert("second success"); })
+    .fail(function () { alert("error"); });
+    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?jsoncallback=?",
+    {
+        tags: "mount rainier",
+        tagmode: "any",
+        format: "json"
+    },
+    function (data) {
+        $.each(data.items, function (i, item) {
+            $("<img/>").attr("src", item.media.m).appendTo("#images");
+            if (i === "3") return false;
+        });
+    });
+    $.getJSON("test.js", function (json) {
+        alert("JSON Data: " + json.users[3].name);
+    });
+    $.getJSON("test.js", { name: "John", time: "2pm" }, function (json) {
+        alert("JSON Data: " + json.users[3].name);
+    });
+}
+
+function test_getScript() {
+    $.getScript("ajax/test.js", function (data, textStatus, jqxhr) {
+        console.log(data);
+        console.log(textStatus);
+        console.log(jqxhr.status);
+        console.log('Load was performed.');
+    });
+    $.getScript("ajax/test.js")
+        .done(function (script, textStatus) {
+            console.log(textStatus);
+        })
+        .fail(function (jqxhr, settings, exception) {
+            $("div.log").text("Triggered ajaxError handler.");
+        });
+    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
+        if (settings.dataType == 'script') {
+            $(this).text("Triggered ajaxError handler.");
+        }
+    });
+    $.ajaxSetup({
+        cache: true
+    });
+    $.getScript("/scripts/jquery.color.js", function () {
+        $("#go").click(function () {
+            $(".block").animate({ backgroundColor: "pink" }, 1000)
+              .delay(500)
+              .animate({ backgroundColor: "blue" }, 1000);
+        });
+    });
+}
+
+function test_jQueryget() {
+    console.log($("li").get(0));
+    console.log($("li")[0]);
+    console.log($("li").get(-1));
+    $("*", document.body).click(function (event) {
+        event.stopPropagation();
+        var domElement = $(this).get(0);
+        $("span:first").text("Clicked on - " + domElement.nodeName);
+    });
+
+    function display(divs) {
+        var a = [];
+        for (var i = 0; i < divs.length; i++) {
+            a.push(divs[i].innerHTML);
+        }
+        $("span").text(a.join(" "));
+    }
+    display($("div").get().reverse());
+}
+
+function test_globalEval() {
+    jQuery.globalEval("var newVar = true;");
+}
+
+function test_grep() {
+    var arr = [1, 9, 3, 8, 6, 1, 5, 9, 4, 7, 3, 8, 6, 9, 1];
+    $("div").text(arr.join(", "));
+    arr = jQuery.grep(arr, function (n, i) {
+        return (n != 5 && i > 4);
+    });
+    $("p").text(arr.join(", "));
+    var arr2 = jQuery.grep(arr, function (a) { return a != 9; });
+    $("span").text(arr.join(", "));
+    $.grep([0, 1, 2], function (n, i) {
+        return n > 0;
+    }, true);
+    var arr3 = $.grep(["a", "b", "c"], function (n, i) { return n !== "b"; });
+}
+
+function test_has() {
+    $('li').has('ul').css('background-color', 'red');
+    $("ul").append("<li>" + ($("ul").has("li").length ? "Yes" : "No") + "</li>");
+    $("ul").has("li").addClass("full");
+}
+
+function test_hasClass() {
+    $('#mydiv').hasClass('foo');
+    $("div#result1").append($("p:first").hasClass("selected").toString());
+    $("div#result2").append($("p:last").hasClass("selected").toString());
+    $("div#result3").append($("p").hasClass("selected").toString());
+}
+
+function test_hasData() {
+    var $p = jQuery("p"), p = $p[0];
+    $p.append(jQuery.hasData(p) + " ");
+    $.data(p, "testing", 123);
+    $p.append(jQuery.hasData(p) + " ");
+    $.removeData(p, "testing");
+    $p.append(jQuery.hasData(p) + " ");
+    $p.on('click', function () { });
+    $p.append(jQuery.hasData(p) + " ");
+    $p.off('click');
+    $p.append(jQuery.hasData(p) + " ");
+}
+
+function test_jQuery_proxy() {
+
+    function test1() {
+        var me = {
+            type: "zombie",
+            test: function (event?) {
+                // Without proxy, `this` would refer to the event target
+                // use event.target to reference that element.
+                var element = event.target;
+                $(element).css("background-color", "red");
+
+                // With proxy, `this` refers to the me object encapsulating
+                // this function.
+                $("#log").append("Hello " + this.type + "<br>");
+                $("#test").off("click", this.test);
+            }
+        };
+
+        var you = {
+            type: "person",
+            test: function (event?) {
+                $("#log").append(this.type + " ");
+            }
+        };
+
+        // Execute you.test() in the context of the `you` object
+        // no matter where it is called
+        // i.e. the `this` keyword will refer to `you`
+        var youClick = $.proxy(you.test, you);
+
+        // attach click handlers to #test
+        $("#test")
+        // this === "zombie"; handler unbound after first click
+            .on("click", $.proxy(me.test, me))
+
+        // this === "person"
+            .on("click", youClick)
+
+        // this === "zombie"
+            .on("click", $.proxy(you.test, me))
+
+        // this === "<button> element"
+            .on("click", you.test);
+    }
+
+    function test2() {
+        var obj = {
+            name: "John",
+            test: function () {
+                $("#log").append(this.name);
+                $("#test").off("click", obj.test);
+            }
+        };
+        $("#test").on("click", jQuery.proxy(obj, "test"));
+    }
+
+    function test3() {
+        var me = {
+            // I'm a dog
+            type: "dog",
+
+            // Note that event comes *after* one and two
+            test: function (one?, two?, event?) {
+                $("#log")
+
+                // `one` maps to `you`, the 1st additional
+                // argument in the $.proxy function call
+                    .append("<h3>Hello " + one.type + ":</h3>")
+
+                // The `this` keyword refers to `me`
+                // (the 2nd, context, argument of $.proxy)
+                    .append("I am a " + this.type + ", ")
+
+                // `two` maps to `they`, the 2nd additional
+                // argument in the $.proxy function call
+                    .append("and they are " + two.type + ".<br>")
+
+                // The event type is "click"
+                    .append("Thanks for " + event.type + "ing.")
+
+                // The clicked element is `event.target`,
+                // and its type is "button"
+                    .append("the " + event.target.type + ".");
+            }
+        };
+
+        var you = { type: "cat" };
+        var they = { type: "fish" };
+
+        // Set up handler to execute me.test() in the context
+        // of `me`, with `you` and `they` as additional arguments
+        var proxy = $.proxy(me.test, me, you, they);
+
+        $("#test")
+            .on("click", proxy);
+    }
+}
+
+function test_height() {
+    $(window).height();
+    $(document).height();
+    function showHeight(ele, h) {
+        $("div").text("The height for the " + ele + " is " + h + "px.");
+    }
+    $("#getp").click(function () {
+        showHeight("paragraph", $("p").height());
+    });
+    $("#getd").click(function () {
+        showHeight("document", $(document).height());
+    });
+    $("#getw").click(function () {
+        showHeight("window", $(window).height());
+    });
+    $("div").one('click', function () {
+        $(this).height(30)
+               .css({ cursor: "auto", backgroundColor: "green" });
+    });
+}
+
+function test_wrap() {
+    $(".inner").wrap("<div class='new'></div>");
+    $(".inner").wrap(function () {
+        return "<div class='" + $(this).text() + "'></div>";
+    });
+    $("span").wrap("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrap(document.createElement("div"));
+    $("p").wrap($(".doublediv"));
+}
+
+function test_wrapAll() {
+    $(".inner").wrapAll("<div class='new' />");
+    $("p").wrapAll("<div></div>");
+    $("span").wrapAll("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrapAll(document.createElement("div"));
+    $("p").wrapAll($(".doublediv"));
+}
+
+function test_wrapInner() {
+    $(".inner").wrapInner("<div class='new'></div>");
+    $(".inner").wrapInner(function () {
+        return "<div class='" + this.nodeValue + "'></div>";
+    });
+    var elem: Element;
+    $(elem).wrapInner("<div class='test'></div>");
+    $(elem).wrapInner("<div class=\"test\"></div>");
+    $("p").wrapInner("<b></b>");
+    $("body").wrapInner("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrapInner(document.createElement("b"));
+    $("p").wrapInner($("<span class='red'></span>"));
+}
+
+function test_width() {
+    // Returns width of browser viewport
+    $(window).width();
+
+    // Returns width of HTML document
+    $(document).width();
+
+    function showWidth(ele, w) {
+        $("div").text("The width for the " + ele + " is " + w + "px.");
+    }
+    $("#getp").click(function () {
+        showWidth("paragraph", $("p").width());
+    });
+    $("#getd").click(function () {
+        showWidth("document", $(document).width());
+    });
+    $("#getw").click(function () {
+        showWidth("window", $(window).width());
+    });
+
+    var modWidth = 50;
+    $("div").one("click", function () {
+        $(this).width(modWidth).addClass("mod");
+        modWidth -= 8;
+    });
+}
+
+function test_coordinates() {
+    var p = $("p:last");
+    var offset = p.offset();
+    p.html("left: " + offset.left + ", top: " + offset.top);
+
+    $("*", document.body).click(function (event) {
+        var offset = $(this).offset();
+        event.stopPropagation();
+        $("#result").text(this.tagName +
+            " coords ( " + offset.left + ", " + offset.top + " )");
+    });
+
+    $("p:last").offset({ top: 10, left: 30 });
+}
+
+function test_hide() {
+    $('.target').hide();
+    $('#clickme').click(function () {
+        $('#book').hide('slow', function () {
+            alert('Animation complete.');
+        });
+    });
+    $("p").hide();
+    $("a").click(function (event) {
+        event.preventDefault();
+        $(this).hide();
+    });
+    $("button").click(function () {
+        $("p").hide("slow");
+    });
+    $("#hidr").click(function () {
+        $("span:last-child").hide("fast", function () {
+            $(this).prev().hide("fast", arguments.callee);
+        });
+    });
+    $("#showr").click(function () {
+        $("span").show(2000);
+    });
+    $("div").click(function () {
+        $(this).hide(2000, function () {
+            $(this).remove();
+        });
+    });
+}
+
+function test_holdReady() {
+    $.holdReady(true);
+    $.getScript("myplugin.js", function () {
+        $.holdReady(false);
+    });
+}
+
+function test_hover() {
+    $("li").hover(
+        function () {
+            $(this).append($("<span> ***</span>"));
+        },
+        function () {
+            $(this).find("span:last").remove();
+        }
+    );
+    $("li.fade").hover(function () { $(this).fadeOut(100); $(this).fadeIn(500); });
+    $("li")
+    .filter(":odd")
+    .hide()
+    .end()
+    .filter(":even")
+    .hover(
+        function () {
+            $(this).toggleClass("active")
+            .next().stop(true, true).slideToggle();
+        }
+    );
+}
+
+function test_html() {
+    $('div.demo-container').html();
+    $("p").click(function () {
+        var htmlStr = $(this).html();
+        $(this).text(htmlStr);
+    });
+    $('div.demo-container')
+        .html('<p>All new content. <em>You bet!</em></p>');
+    $('div.demo-container').html(function (index, oldhtml) {
+        var emph = '<em>' + $('p').length + ' paragraphs!</em>';
+        return '<p>All new content for ' + emph + '</p>';
+    });
+    $("div").html("<b>Wow!</b> Such excitement...");
+    $("div b").append(document.createTextNode("!!!"))
+              .css("color", "red");
+}
+
+function test_inArray() {
+    var arr: any[] = [4, "Pete", 8, "John"];
+    var $spans = $("span");
+    $spans.eq(0).text(jQuery.inArray("John", arr));
+    $spans.eq(1).text(jQuery.inArray(4, arr));
+    $spans.eq(2).text(jQuery.inArray("Karl", arr));
+    $spans.eq(3).text(jQuery.inArray("Pete", arr, 2));
+
+    var arr2: number[] = [1, 2, 3, 4];
+    $spans.eq(1).text(jQuery.inArray(4, arr2));
+}
+
+function test_index() {
+    var listItem = document.getElementById('bar');
+    alert('Index: ' + $('li').index(listItem));
+    var listItems = $('li:gt(0)');
+    alert('Index: ' + $('li').index(listItems));
+    alert('Index: ' + $('#bar').index());
+    $("div").click(function () {
+        var index = $("div").index(this);
+        $("span").text("That was div index #" + index);
+    });
+    var listItems = $('li:gt(0)');
+    $('div').html('Index: ' + $('li').index(listItems));
+    $('div').html('Index: ' + $('#bar').index('li'));
+    var foobar = $("li").index($('#foobar'));
+    $('div').html('Index: ' + foobar);
+}
+
+function test_innerHeight() {
+    var p = $("p:first");
+    $("p:last").text("innerHeight:" + p.innerHeight());
+
+    p.innerHeight(123);
+    p.innerHeight('123px');
+}
+
+function test_innerWidth() {
+    var p = $("p:first");
+    $("p:last").text("innerWidth:" + p.innerWidth());
+
+
+    p.innerWidth(123);
+    p.innerWidth('123px');
+}
+
+function test_outerHeight() {
+    var p = $("p:first");
+    $("p:last").text(
+        "outerHeight:" + p.outerHeight() +
+        " , outerHeight( true ):" + p.outerHeight(true));
+
+    p.outerHeight(123);
+    p.outerHeight('123px');
+}
+
+function test_outerWidth() {
+    var p = $("p:first");
+    $("p:last").text(
+        "outerWidth:" + p.outerWidth() +
+        " , outerWidth( true ):" + p.outerWidth(true));
+
+    p.outerWidth(123);
+    p.outerWidth('123px');
+}
+
+function test_scrollLeft() {
+    var p = $("p:first");
+    $("p:last").text("scrollLeft:" + p.scrollLeft());
+
+    $("div.demo").scrollLeft(300);
+}
+
+function test_scrollTop() {
+    var p = $("p:first");
+    $("p:last").text("scrollTop:" + p.scrollTop());
+
+    $("div.demo").scrollTop(300);
+}
+
+function test_parent() {
+    $("*", document.body).each(function () {
+        var parentTag = $(this).parent().get(0).tagName;
+        $(this).prepend(document.createTextNode(parentTag + " > "));
+    });
+    $("p").parent(".selected").css("background", "yellow");
+}
+
+function test_parents() {
+    var parentEls = $("b").parents()
+        .map(function () {
+            return this.tagName;
+        })
+        .get()
+        .join(", ");
+    $("b").append("<strong>" + parentEls + "</strong>");
+
+    function showParents() {
+        $("div").css("border-color", "white");
+        var len = $("span.selected")
+            .parents("div")
+            .css("border", "2px red solid")
+            .length;
+        $("b").text("Unique div parents: " + len);
+    }
+    $("span").click(function () {
+        $(this).toggleClass("selected");
+        showParents();
+    });
+}
+
+function test_param() {
+
+    function test1() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3
+            },
+            b: [1, 2, 3]
+        };
+        var recursiveEncoded = $.param(myObject);
+        var recursiveDecoded = decodeURIComponent($.param(myObject));
+
+        alert(recursiveEncoded);
+        alert(recursiveDecoded);
+    }
+
+    function test2() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3
+            },
+            b: [1, 2, 3]
+        };
+        var shallowEncoded = $.param(myObject, true);
+        var shallowDecoded = decodeURIComponent(shallowEncoded);
+
+        alert(shallowEncoded);
+        alert(shallowDecoded);
+    }
+
+    var params = { width: 1680, height: 1050 };
+    var str = jQuery.param(params);
+    $("#results").text(str);
+
+    // <=1.3.2:
+    $.param({ a: [2, 3, 4] }); // "a=2&a=3&a=4"
+    // >=1.4:
+    $.param({ a: [2, 3, 4] }); // "a[]=2&a[]=3&a[]=4"
+
+    // <=1.3.2:
+    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+    // "a=[object+Object]&d=3&d=4&d=[object+Object]"
+
+    // >=1.4:
+    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+    // "a[b]=1&a[c]=2&d[]=3&d[]=4&d[2][e]=5"
+}
+
+function test_position() {
+    var p = $("p:first");
+    var position = p.position();
+    $("p:last").text("left: " + position.left + ", top: " + position.top);
+}
+
+function test_insertAfter() {
+    $('<p>Test</p>').insertAfter('.inner');
+    $('h2').insertAfter($('.container'));
+    $("p").insertAfter("#foo");
+}
+
+function test_insertBefore() {
+    $('<p>Test</p>').insertBefore('.inner');
+    $('h2').insertBefore($('.container'));
+    $("p").insertBefore("#foo");
+}
+
+function test_promise() {
+    var div = $("<div>");
+
+    div.promise().done(function (arg1) {
+        // Will fire right away and alert "true"
+        alert(this === div && arg1 === div);
+    });
+
+    $("button").on("click", function () {
+        $("p").append("Started...");
+
+        $("div").each(function (i) {
+            $(this).fadeIn().fadeOut(1000 * (i + 1));
+        });
+
+        $("div").promise().done(function () {
+            $("p").append(" Finished! ");
+        });
+    });
+
+    var effect = function () {
+        return $("div").fadeIn(800).delay(1200).fadeOut();
+    };
+
+    $("button").on("click", function () {
+        $("p").append(" Started... ");
+
+        $.when(effect()).done(function () {
+            $("p").append(" Finished! ");
+        });
+    });
+}
+
+function test_is() {
+    $("ul").click(function (event) {
+        var $target = $(event.target);
+        if ($target.is("li")) {
+            $target.css("background-color", "red");
+        }
+    });
+    $("li").click(function () {
+    var $li = $(this),
+        isWithTwo = $li.is(function () {
+            return $('strong', this).length === 2;
+        });
+        if (isWithTwo) {
+            $li.css("background-color", "green");
+        } else {
+            $li.css("background-color", "red");
+        }
+    });
+    $("div").one('click', function () {
+        if ($(this).is(":first-child")) {
+            $("p").text("It's the first div.");
+        } else if ($(this).is(".blue,.red")) {
+            $("p").text("It's a blue or red div.");
+        } else if ($(this).is(":contains('Peter')")) {
+            $("p").text("It's Peter!");
+        } else {
+            $("p").html("It's nothing <em>special</em>.");
+        }
+        $("p").hide().slideDown("slow");
+        $(this).css({ "border-style": "inset", cursor: "default" });
+    });
+    var isFormParent = $("input[type='checkbox']").parent().is("form");
+    $("div").text("isFormParent = " + isFormParent);
+    var isFormParent = $("input[type='checkbox']").parent().is("form");
+    $("div").text("isFormParent = " + isFormParent);
+    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
+    $('li').click(function () {
+        var $li = $(this);
+        if ($li.is($alt)) {
+            $li.slideUp();
+        } else {
+            $li.css("background", "red");
+        }
+    });
+    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
+    $('li').click(function () {
+        if ($alt.is(this)) {
+            $(this).slideUp();
+        } else {
+            $(this).css("background", "red");
+        }
+    });
+}
+
+function test_isTypeGuards() {
+    var foo: number[] | ((x: string) => number) | Window;
+    if (jQuery.isArray(foo)) {
+        foo.push(1515);
+    } else if (jQuery.isWindow(foo)) {
+        foo.close();
+    } else if (jQuery.isFunction(foo)) {
+        foo("hello world");
+    }
+}
+
+function test_isArray() {
+    $("b").append("" + $.isArray([]));
+}
+
+function test_isEmptyObject() {
+    jQuery.isEmptyObject({});
+    jQuery.isEmptyObject({ foo: "bar" });
+}
+
+function test_isFunction() {
+    function stub() { };
+    var objs: any[] = [
+          function () { },
+          { x: 15, y: 20 },
+          null,
+          stub,
+          "function"
+    ];
+    jQuery.each(objs, function (i) {
+        var isFunc = jQuery.isFunction(objs[i]);
+        $("span").eq(i).text(isFunc);
+    });
+    $.isFunction(function () { });
+}
+
+function test_isNumeric() {
+    $.isNumeric("-10");
+    $.isNumeric(16);
+    $.isNumeric(0xFF);
+    $.isNumeric("0xFF");
+    $.isNumeric("8e5");
+    $.isNumeric(3.1415);
+    $.isNumeric(+10);
+    $.isNumeric(144);
+    $.isNumeric("");
+    $.isNumeric({});
+    $.isNumeric(NaN);
+    $.isNumeric(null);
+    $.isNumeric(true);
+    $.isNumeric(Infinity);
+    $.isNumeric(undefined);
+}
+
+function test_isPlainObject() {
+    $.isPlainObject(document.location);
+    jQuery.isPlainObject({});
+    jQuery.isPlainObject("test");
+}
+
+function test_isWindow() {
+    $("b").append("" + $.isWindow(window));
+}
+
+function test_isXMLDoc() {
+    jQuery.isXMLDoc(document);
+    jQuery.isXMLDoc(document.body);
+}
+
+function test_unique() {
+    jQuery.unique($('div.foo, div.bar').get());
+    jQuery.unique($('div.foo, div.bar').toArray());
+
+    var divs: HTMLDivElement[];
+    var unique: HTMLDivElement[];
+    unique = jQuery.unique(divs);
+    unique = jQuery.unique<HTMLDivElement>(divs);
+}
+
+function test_jQuery() {
+    $('div.foo');
+    $('div.foo').click(function () {
+        $('span', this).addClass('bar');
+    });
+    $('div.foo').click(function () {
+        $(this).slideUp();
+    });
+    $.post('url.xml', function (data) {
+        var $child = $(data).find('child');
+    });
+    $.post({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
+    $.get({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
+    var foo = { foo: 'bar', hello: 'world' };
+    var $foo = $(foo);
+    var test1 = $foo.prop('foo');
+    $foo.prop('foo', 'foobar');
+    var test2 = $foo.prop('foo');
+    $foo.data('keyName', 'someValue');
+    console.log($foo);
+    $foo.bind('eventName', function () {
+        console.log('eventName was called');
+    });
+    $foo.trigger('eventName');
+    $foo.triggerHandler('eventName');
+    $("div > p").css("border", "1px solid gray");
+    $("input:radio", document.forms[0]);
+    var xml: any;
+    $("div", xml.responseXML);
+    $(document.body).css("background", "black");
+    var myForm: any;
+    $(myForm.elements).hide();
+    $('<p id="test">My <em>new</em> text</p>').appendTo('body');
+    $('<img />');
+    $('<input>');
+    var el = $('1<br/>2<br/>3');
+    el = $('1<br/>2<br/>3 >');
+    $('<input />', {
+        type: 'text',
+        name: 'test'
+    }).appendTo("body");
+    $('<input type="text" />').attr({
+        name: 'test'
+    }).appendTo("body");
+    $("<div><p>Hello</p></div>").appendTo("body");
+    $("<div/>", {
+        "class": "test",
+        text: "Click me!",
+        click: function () {
+            $(this).toggleClass("test");
+        }
+    }).appendTo("body");
+    jQuery(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+    jQuery(document).ready(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+}
+
+function test_fn_extend() {
+    jQuery.fn.extend({
+        check: function () {
+            return this.each(function () {
+                this.checked = true;
+            });
+        },
+        uncheck: function () {
+            return this.each(function () {
+                this.checked = false;
+            });
+        }
+    });
+
+    // Use the newly created .check() method
+    //$( "input[type='checkbox']" ).check();
+    // The above test cannot be run as no way that I know of in TypeScript to model the augmentation of jQueryStatic with dynamically added methods
+    // The below would only work at runtime if extend had first been called.
+    $("input[type='checkbox']")["check"]();
+}
+
+function test_jquery() {
+    var a = <any>{ what: "A regular JS object" },
+    b = $('body');
+    if (a.jquery) {
+        alert(' a is a jQuery object! ');
+    }
+    if (b.jquery) {
+        alert(' b is a jQuery object! ');
+    }
+    alert('You are running jQuery version: ' + $.fn.jquery);
+
+    $("div.foo");
+
+    $("div.foo").click(function () {
+        $("span", this).addClass("bar");
+    });
+
+    $("div.foo").click(function () {
+        $(this).slideUp();
+    });
+
+    $.post("url.xml", function (data) {
+        var $child = $(data).find("child");
+    });
+
+    // Define a plain object
+    var foo = { foo: "bar", hello: "world" };
+
+    // Pass it to the jQuery function
+    var $foo = $(foo);
+
+    // Test accessing property values
+    var test1 = $foo.prop("foo"); // bar
+
+    // Test setting property values
+    $foo.prop("foo", "foobar");
+    var test2 = $foo.prop("foo"); // foobar
+
+    // Test using .data() as summarized above
+    $foo.data("keyName", "someValue");
+    console.log($foo); // will now contain a jQuery{randomNumber} property
+
+    // Test binding an event name and triggering
+    $foo.on("eventName", function () {
+        console.log("eventName was called");
+    });
+
+    $foo.trigger("eventName"); // Logs "eventName was called"
+
+    $foo.triggerHandler("eventName"); // Also logs "eventName was called"
+
+    $("div > p").css("border", "1px solid gray");
+
+    $("input:radio", document.forms[0]);
+
+    $(document.body).css("background", "black");
+
+    var myForm: HTMLFormElement;
+    $(myForm.elements).hide();
+
+    $("<p id='test'>My <em>new</em> text</p>").appendTo("body");
+
+    $("<a href='http://jquery.com'></a>");
+
+    $("<img>");
+    $("<input>");
+
+    var el = $("1<br>2<br>3"); // returns [<br>, "2", <br>]
+    el = $("1<br>2<br>3 >"); // returns [<br>, "2", <br>, "3 &gt;"]
+
+    $("<div></div>", {
+        "class": "my-div",
+        on: {
+            touchstart: function (event) {
+                // Do something
+            }
+        }
+    }).appendTo("body");
+
+    $("<div></div>")
+        .addClass("my-div")
+        .on({
+            touchstart: function (event) {
+                // Do something
+            }
+        })
+        .appendTo("body");
+
+    $("<div><p>Hello</p></div>").appendTo("body")
+
+    $("<div/>", {
+            "class": "test",
+            text: "Click me!",
+            click: function () {
+                $(this).toggleClass("test");
+            }
+        })
+        .appendTo("body");
+
+    $(function () {
+        // Document is ready
+    });
+
+    jQuery(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+
+    $(document.body)
+        .click(function () {
+            $(document.body).append($("<div>"));
+            var n = $("div").length;
+            $("span").text("There are " + n + " divs." +
+                "Click to add more.");
+        })
+    // Trigger the click to start
+        .trigger("click");
+}
+
+function test_keydown() {
+    $('#target').keydown(function () {
+        alert('Handler for .keydown() called.');
+    });
+    $('#other').click(function () {
+        $('#target').keydown();
+    });
+    var xTriggered = 0;
+    $('#target').keydown(function (event) {
+        if (event.which == 13) {
+            event.preventDefault();
+        }
+        xTriggered++;
+        var msg = 'Handler for .keydown() called ' + xTriggered + ' time(s).';
+    });
+    $('#other').click(function () {
+        $('#target').keydown();
+    });
+}
+
+function test_keypress() {
+    $("#target").keypress(function () {
+        alert("Handler for .keypress() called.");
+    });
+    $('#other').click(function () {
+        $("#target").keypress();
+    });
+    $("#other").click(function () {
+        $("#target").keypress();
+    });
+}
+
+function test_keyup() {
+    $('#target').keyup(function () {
+        alert('Handler for .keyup() called.');
+    });
+    $('#other').click(function () {
+        $('#target').keyup();
+    });
+    $('#other').click(function () {
+        $('#target').keyup();
+    });
+}
+
+function test_resize() {
+	$('#other').resize();
+    $('#other').resize(function () {
+        alert('Handler for .resize() called.');
+    });
+    $('#other').resize({ "event": "Data" }, function () {
+        alert('Handler for .resize() called.');
+    });
+}
+
+function test_scroll() {
+	$('#other').scroll();
+    $('#other').scroll(function () {
+        alert('Handler for .scroll() called.');
+    });
+    $('#other').scroll({ "event": "Data" }, function () {
+        alert('Handler for .scroll() called.');
+    });
+}
+
+function test_select() {
+	$('#other').select();
+    $('#other').select(function () {
+        alert('Handler for .select() called.');
+    });
+    $('#other').select({ "event": "Data" }, function () {
+        alert('Handler for .select() called.');
+    });
+}
+
+function test_last() {
+    $('li').last().css('background-color', 'red');
+    $("p span").last().addClass('highlight');
+}
+
+function test_length() {
+    $(document.body).click(function () {
+        $(document.body).append($("<div>"));
+        var n = $("div").length;
+        $("span").text("There are " + n + " divs." + "Click to add more.");
+    }).trigger('click');
+}
+
+function test_load() {
+    $('#result').load('ajax/test.html');
+    $('#result').load('ajax/test.html', function () {
+        alert('Load was performed.');
+    });
+    $('#result').load('ajax/test.html #container');
+    $('#b').load('article.html #target');
+    $("#success").load("/not-here.php", function (response, status, xhr) {
+        if (status == "error") {
+            var msg = "Sorry but there was an error: ";
+            $("#error").html(msg + xhr.status + " " + xhr.statusText);
+        }
+    });
+    $("#objectID").load("test.php", { 'choices[]': ["Jon", "Susan"] });
+    $("#feeds").load("feeds.php", { limit: 25 }, function () {
+        alert("The last 25 entries in the feed have been loaded");
+    });
+}
+
+function test_loadEvent() {
+    $('#book').load(function () { });
+    $('img.userIcon').load(function () {
+        if ($(this).height() > 100) {
+            $(this).addClass('bigImg');
+        }
+    });
+}
+
+function test_mousedown() {
+    $('#target').mousedown(function () {
+        alert('Handler for .mousedown() called.');
+    });
+    $('#other').click(function () {
+        $('#target').mousedown();
+    });
+}
+
+function test_mouseenter() {
+    $('#outer').mouseenter(function () {
+        $('#log').append('<div>Handler for .mouseenter() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseenter();
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        $("p:first", this).text("mouse enter");
+        $("p:last", this).text(++n);
+    }).mouseleave(function () {
+        $("p:first", this).text("mouse leave");
+    });
+}
+
+function test_mouseleave() {
+    $('#outer').mouseleave(function () {
+        $('#log').append('<div>Handler for .mouseleave() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseleave();
+    });
+    var i = 0;
+    $("div.overout").mouseover(function () {
+        $("p:first", this).text("mouse over");
+    }).mouseout(function () {
+        $("p:first", this).text("mouse out");
+        $("p:last", this).text(++i);
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        $("p:first", this).text("mouse enter");
+    }).mouseleave(function () {
+        $("p:first", this).text("mouse leave");
+        $("p:last", this).text(++n);
+    });
+}
+
+function test_mousemove() {
+    $("#target").mousemove(function (event) {
+        var msg = "Handler for .mousemove() called at ";
+        msg += event.pageX + ", " + event.pageY;
+        $("#log").append("<div>" + msg + "</div>");
+    });
+    $("#other").click(function () {
+        $("#target").mousemove();
+    });
+    $("div").mousemove(function (e) {
+        var pageCoords = "( " + e.pageX + ", " + e.pageY + " )";
+        var clientCoords = "( " + e.clientX + ", " + e.clientY + " )";
+        $("span:first").text("( e.pageX, e.pageY ) : " + pageCoords);
+        $("span:last").text("( e.clientX, e.clientY ) : " + clientCoords);
+    });
+}
+
+function test_mouseout() {
+    $('#outer').mouseout(function () {
+        $('#log').append('Handler for .mouseout() called.');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseout();
+    });
+    var i = 0;
+    $("div.overout").mouseout(function () {
+        $("p:first", this).text("mouse out");
+        $("p:last", this).text(++i);
+    }).mouseover(function () {
+        $("p:first", this).text("mouse over");
+    });
+    var n = 0;
+    $("div.enterleave").bind("mouseenter", function () {
+        $("p:first", this).text("mouse enter");
+    }).bind("mouseleave", function () {
+        $("p:first", this).text("mouse leave");
+        $("p:last", this).text(++n);
+    });
+}
+
+function test_mouseup() {
+    $("p").mouseup(function () {
+        $(this).append('<span style="color:#F00;">Mouse up.</span>');
+    }).mousedown(function () {
+        $(this).append('<span style="color:#00F;">Mouse down.</span>');
+    });
+    $('#target').mouseup(function () {
+        alert('Handler for .mouseup() called.');
+    });
+    $('#other').click(function () {
+        $('#target').mouseup();
+    });
+    $("p").mouseup(function () {
+        $(this).append('<span style="color:#F00;">Mouse up.</span>');
+    }).mousedown(function () {
+        $(this).append('<span style="color:#00F;">Mouse down.</span>');
+    });
+}
+
+function test_mouseover() {
+    $('#outer').mouseover(function () {
+        $('#log').append('<div>Handler for .mouseover() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseover();
+    });
+    var i = 0;
+    $("div.overout").mouseover(function () {
+        $("p:first", this).text("mouse over");
+        $("p:last", this).text(++i);
+    }).mouseout(function () {
+        $("p:first", this).text("mouse out");
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        n += 1;
+        $(this).find("span").text("mouse enter x " + n);
+    }).mouseleave(function () {
+        $(this).find("span").text("mouse leave");
+    });
+}
+
+function test_makeArray() {
+    var elems = document.getElementsByTagName("div");
+    var arr = jQuery.makeArray(elems);
+    arr.reverse();
+    $(arr).appendTo(document.body);
+    var obj = $('li');
+    var arr = $.makeArray(obj);
+    jQuery.isArray(arr) === true;
+}
+
+function test_replaceAll() {
+    $("<h2>New heading</h2>").replaceAll(".inner");
+    $(".first").replaceAll(".third");
+    $("<b>Paragraph. </b>").replaceAll("p");
+}
+
+function test_replaceWith() {
+    $("div.second").replaceWith("<h2>New heading</h2>");
+    $("div.inner").replaceWith("<h2>New heading</h2>");
+    $("div.third").replaceWith($(".first"));
+
+    $("button").click(function () {
+        $(this).replaceWith("<div>" + $(this).text() + "</div>");
+    });
+
+    $("p").replaceWith("<b>Paragraph. </b>");
+
+    $("p").click(function () {
+        $(this).replaceWith($("div"));
+    });
+
+    $("button").on("click", function () {
+        var $container = $("div.container").replaceWith(function () {
+            return $(this).contents();
+        });
+
+        $("p").append($container.attr("class"));
+    });
+}
+
+function test_map() {
+    $(':checkbox').map(function () {
+        return this.id;
+    }).get().join(',');
+    $("p").append($("input").map(function () {
+        return $(this).val();
+    }).get().join(", "));
+    var mappedItems = $("li").map(function (index) {
+        var replacement:any = $("<li>").text($(this).text()).get(0);
+        if (index === 0) {
+
+            // Make the first item all caps
+            $(replacement).text($(replacement).text().toUpperCase());
+        } else if (index === 1 || index === 3) {
+
+            // Delete the second and fourth items
+            replacement = null;
+        } else if (index === 2) {
+
+            // Make two of the third item and add some text
+            replacement = [replacement, $("<li>").get(0)];
+            $(replacement[0]).append("<b> - A</b>");
+            $(replacement[1]).append("Extra <b> - B</b>");
+        }
+
+        // Replacement will be a dom element, null,
+        // or an array of dom elements
+        return replacement;
+    });
+    $("#results").append(mappedItems);
+    var fakeArray = { "length": 1, 0: "Addy", 1: "Subtracty" };
+    var realArray = $.makeArray(fakeArray)
+    $.map(realArray, function (val, i) { });
+    var arr = ["a", "b", "c", "d", "e"];
+    $("div").text(arr.join(", "));
+    arr = jQuery.map(arr, function (n, i) {
+        return (n.toUpperCase() + i);
+    });
+    $("p").text(arr.join(", "));
+    arr = jQuery.map(arr, function (a) {
+        return a + a;
+    });
+    $("span").text(arr.join(", "));
+    $.map([0, 1, 2], function (n) {
+        return n + 4;
+    });
+    $.map([0, 1, 2], function (n) {
+        return n > 0 ? n + 1 : null;
+    });
+    $.map([0, 1, 2], function (n) {
+        return [n, n + 1];
+    });
+    var dimensions = { width: 10, height: 15, length: 20 };
+    dimensions = $.map(dimensions, function (value, index) {
+        return value * 2;
+    });
+    var dimensions = { width: 10, height: 15, length: 20 },
+    keys = $.map(dimensions, function (value, index) {
+        return index;
+    });
+    $.map([0, 1, 2, 3], function (a) {
+        return a * a;
+    });
+    $.map([0, 1, 52, 97], function (a) {
+        return (a > 50 ? a - 45 : null);
+    });
+    var array = [0, 1, 52, 97];
+    var array2 = $.map(array, function (a, index) {
+        return [a - 45, index];
+    });
+}
+
+function test_merge() {
+    var oldArray: any[];
+    var newArray = $.merge([], oldArray);
+    $.merge([0, 1, 2], [2, 3, 4]);
+    var first = ['a', 'b', 'c'];
+    var second = ['d', 'e', 'f'];
+    $.merge($.merge([], first), second);
+    var z = $.merge<any>([0, 1, 2], ['a', 'b', 'c']);
+}
+
+function test_prop() {
+    var $input = $(this);
+    $("p").html(".attr('checked'): <b>" + $input.attr('checked') + "</b><br>"
+                + ".prop('checked'): <b>" + $input.prop('checked') + "</b><br>"
+                + ".is(':checked'): <b>" + $input.is(':checked')) + "</b>";
+    $("input").prop("disabled", false);
+    $("input").prop("checked", true);
+    $("input").val("someValue");
+    $("input[type='checkbox']").prop("checked", function (i, val) {
+        return !val;
+    });
+    $("input[type='checkbox']").prop({
+        disabled: true
+    });
+    var title: string = $('option:selected', this).prop('title');
+}
+
+function test_val() {
+    // Get the value from a dropdown select
+    $("select.foo option:selected").val();
+
+    // Get the value from a dropdown select even easier
+    $("select.foo").val();
+
+    // Get the value from a checked checkbox
+    $("input:checkbox:checked").val();
+
+    // Get the value from a set of radio buttons
+    $("input:radio[name=bar]:checked").val();
+
+    function displayVals() {
+        var singleValues = $("#single").val();
+        var multipleValues = $("#multiple").val() || [];
+        $("p").html("<b>Single:</b> " + singleValues +
+            " <b>Multiple:</b> " + multipleValues.join(", "));
+    }
+
+    $("select").change(displayVals);
+    displayVals();
+
+
+    $("input")
+        .keyup(function () {
+            var value = $(this).val();
+            $("p").text(value);
+        })
+        .keyup();
+
+    $("input:text.items").val(function (index, value) {
+        return value + " " + this.className;
+    });
+
+    $("button").click(function () {
+        var text = $(this).text();
+        $("input").val(text);
+    });
+
+    $("input").on("blur", function () {
+        $(this).val(function (i, val) {
+            return val.toUpperCase();
+        });
+    });
+
+    $("#single").val("Single2");
+    $("#multiple").val(["Multiple2", "Multiple3"]);
+    $("input").val(["check1", "check2", "radio1"]);
+    $("input").val(1);
+}
+
+function test_selector() {
+  var $main = $('#main');
+  var $mainDivs = $('div', $main);
+  return $mainDivs.selector == '#main div';
+}
+
+function test_text() {
+    var str = $("p:first").text();
+    $("p:last").html(str);
+    $('ul li').text(function (index) {
+        return 'item number ' + (index + 1);
+    });
+    $("p").text("<b>Some</b> new text.");
+}
+
+$('#item').click(function(e) {
+	if (e.ctrlKey) { console.log('control pressed'); }
+	if (e.altKey) { console.log('alt pressed'); }
+});
+
+function test_addBack() {
+    $('li.third-item').nextAll().addBack().css('background-color', 'red');
+
+    $("div.left, div.right").find("div, div > p").addClass("border");
+
+    // First Example
+    $("div.before-addback").find("p").addClass("background");
+
+    // Second Example
+    $("div.after-addback").find("p").addBack().addClass("background");
+}
+
+// http://api.jquery.com/jQuery.parseHTML/
+function test_parseHTML() {
+	var $log = $( "#log" ),
+		str = "hello, <b>my name is</b> jQuery.",
+		html = $.parseHTML( str ),
+		nodeNames = [];
+
+	// Append the parsed HTML
+	$log.append( html );
+
+	// Gather the parsed HTML's node names
+	$.each( html, function( i, el ) {
+		nodeNames[i] = "<li>" + el.nodeName + "</li>";
+	});
+
+	// Insert the node names
+	$log.append( "<h3>Node Names:</h3>" );
+	$( "<ol></ol>" )
+	  .append( nodeNames.join( "" ) )
+	  .appendTo( $log );
+
+	// parse HTML with all parameters
+	$.parseHTML( str, document, true );
+}
+
+// http://api.jquery.com/jQuery.parseJSON/
+function test_parseJSON() {
+    // Return type should be any, not Object
+    var i = $.parseJSON('1');
+    var a = $.parseJSON('[1]');
+    var o = $.parseJSON('{"foo":"bar"}');
+    var s = $.parseJSON('"string"');
+    var n = $.parseJSON('null');
+
+    i instanceof Object; // false
+    a instanceof Object; // true
+    o instanceof Object; // true
+    s instanceof Object; // false
+    n instanceof Object; // false
+}
+
+function test_not() {
+    $("li").not(":even").css("background-color", "red");
+
+    $("li").not(document.getElementById("notli"))
+        .css("background-color", "red");
+
+    $("div").not(".green, #blueone")
+        .css("border-color", "red");
+
+    $("p").not($("#selected")[0]);
+
+    $("p").not("#selected");
+
+    $("p").not($("div p.selected"));
+
+    var el1 = $("<div/>")[0];
+    var el2 = $("<div/>")[0];
+    $("p").not([el1, el2]);
+}
+
+function test_EventIsNewable() {
+    var ev = new jQuery.Event('click');
+}
+
+function test_EventIsCallable() {
+    var ev = jQuery.Event('click');
+}
+
+$.when<any>($.ajax("/my/page.json")).then(a => a.asdf); // is type JQueryPromise<any>
+$.when<any>($.ajax("/my/page.json")).then((a?,b?,c?) => a.asdf); // is type JQueryPromise<any>
+$.when("asdf", "jkl;").done((x,y) => x.length + y.length, (x,y) => x.length + y.length);
+
+var f1 = $.when("fetch"); // Is type JQueryPromise<string>
+var f2: JQueryPromise<string[]> = f1.then(s => [s, s]);
+var f3: JQueryPromise<number> = f2.then(v => 3);
+
+// ISSUE: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+// http://stackoverflow.com/questions/5392344/sending-multipart-formdata-with-jquery-ajax#answer-5976031
+$.ajax({
+    url: 'php/upload.php',
+    data: {},
+    cache: false,
+    contentType: false,
+    processData: false,
+    type: 'POST',
+    success: function (data) {
+        alert(data);
+    }
+});
+
+function test_deferred() {
+
+    function returnPromise(): JQueryPromise<{ MyString: string; MyNumber: number; }> {
+        return $.Deferred<{ MyString: string; MyNumber: number; }>().resolve({
+            MyString: "MyString",
+            MyNumber: 5
+        }, "failed", null);
+    }
+    var x = returnPromise();
+    x.done((data, textStatus, jqXHR) => {
+        var myNumber: number = data.MyNumber;
+        var myString: string = data.MyString;
+        var theTextStatus: string = textStatus;
+        var thejqXHR: JQueryXHR = jqXHR;
+    });
+
+    $.get("test.php").always(function () {
+        alert("$.get completed with success or error callback arguments");
+    });
+    $.get("test.php").done(function () {
+        alert("$.get succeeded");
+    });
+    function fn1() {
+        $("p").append(" 1 ");
+    }
+    function fn2() {
+        $("p").append(" 2 ");
+    }
+    function fn3(n) {
+        $("p").append(n + " 3 " + n);
+    }
+    var dfd = $.Deferred<string>();
+    dfd
+        .done([fn1, fn2], fn3, [fn2, fn1])
+        .done(function (n) {
+            $("p").append(n + " we're done.");
+        });
+    $("button").bind("click", function () {
+        dfd.resolve("and");
+    });
+    $.get("test.php")
+        .done(function () { alert("$.get succeeded"); })
+        .fail(function () { alert("$.get failed!"); });
+    dfd.state();
+    var defer = $.Deferred(),
+        filtered = defer.pipe(function (value) {
+            return value * 2;
+        });
+    defer.resolve(5);
+    filtered.done(function (value) {
+        alert("Value is ( 2*5 = ) 10: " + value);
+    });
+    filtered.fail(function (value) {
+        alert("Value is ( 3*6 = ) 18: " + value);
+    });
+    filtered.done(function (data) { });
+
+    var obj = {
+        hello: function (name) {
+            alert("Hello " + name);
+        }
+    },
+        defer = $.Deferred();
+    defer.promise(obj);
+    defer.resolve("John");
+    $.get("test.php").then(
+        function () { alert("$.get succeeded"); },
+        function () { alert("$.get failed!"); }
+        );
+}
+
+function test_deferred_promise() {
+
+    function asyncEvent() {
+        var dfd = $.Deferred<string>();
+
+        // Resolve after a random interval
+        setTimeout(function () {
+            dfd.resolve("hurray");
+        }, Math.floor(400 + Math.random() * 2000));
+
+        // Reject after a random interval
+        setTimeout(function () {
+            dfd.reject("sorry");
+        }, Math.floor(400 + Math.random() * 2000));
+
+        // Show a "working..." message every half-second
+        setTimeout(function working() {
+            if (dfd.state() === "pending") {
+                dfd.notify("working... ");
+                setTimeout(working, 500);
+            }
+        }, 1);
+
+        // Return the Promise so caller can't change the Deferred
+        return dfd.promise();
+    }
+
+    // Attach a done, fail, and progress handler for the asyncEvent
+    $.when(asyncEvent()).then(
+        function (status) {
+            alert(status + ", things are going well");
+        },
+        function (status) {
+            alert(status + ", you fail this time");
+        },
+        function (status) {
+            $("body").append(status);
+        }
+        );
+}
+
+function test_promise_then_change_type() {
+	function request() {
+		var def = $.Deferred<any>();
+		var promise = def.promise(null);
+
+		def.rejectWith(this, [new Error()]);
+
+		return promise;
+	}
+
+	function count() {
+		var def = request();
+		return def.then<number>(data => {
+			try {
+				var count: number = parseInt(data.count, 10);
+			} catch (err) {
+				return $.Deferred<number>().reject(err).promise();
+			}
+			return $.Deferred<number>().resolve(count).promise();
+		});
+	}
+
+	count().done(data => {
+	}).fail((exception: Error) => {
+	});
+}
+
+function test_promise_then_not_return_deferred() {
+  var state: string;
+
+  var deferred: JQueryDeferred<any> = $.Deferred();
+  state = deferred.state();
+  deferred = deferred.progress();
+  deferred = deferred.done();
+  deferred = deferred.fail();
+  deferred = deferred.always();
+  deferred = deferred.notify();
+  deferred = deferred.resolve();
+  deferred = deferred.reject();
+  promise = deferred.promise();
+  promise = deferred.then(function () { });
+
+  var promise: JQueryPromise<any> = $.Deferred().promise();
+  state = promise.state();
+  promise = promise.then(function () { });
+  promise = promise.progress();
+  promise = promise.done();
+  promise = promise.fail();
+  promise = promise.always();
+}
diff --git a/types/jquery/v1/tsconfig.json b/types/jquery/v1/tsconfig.json
new file mode 100644
index 0000000000..03de81078e
--- /dev/null
+++ b/types/jquery/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "jquery": [
+                "jquery/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-tests.ts"
+    ]
+}
diff --git a/types/jquery/v2/index.d.ts b/types/jquery/v2/index.d.ts
new file mode 100644
index 0000000000..b01e4ceda7
--- /dev/null
+++ b/types/jquery/v2/index.d.ts
@@ -0,0 +1,3825 @@
+// Type definitions for jQuery 2.0
+// Project: http://jquery.com/
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>
+//                 Christian Hoffmeister <https://github.com/choffmeister>
+//                 Steve Fenton <https://github.com/Steve-Fenton>
+//                 Diullei Gomes <https://github.com/Diullei>
+//                 Tass Iliopoulos <https://github.com/tasoili>
+//                 Jason Swearingen <https://github.com/jasons-novaleaf>
+//                 Sean Hill <https://github.com/seanski>
+//                 Guus Goossens <https://github.com/Guuz>
+//                 Kelly Summerlin <https://github.com/ksummerlin>
+//                 Basarat Ali Syed <https://github.com/basarat>
+//                 Nicholas Wolverson <https://github.com/nwolverson>
+//                 Derek Cicerone <https://github.com/derekcicerone>
+//                 Andrew Gaspar <https://github.com/AndrewGaspar>
+//                 Seikichi Kondo <https://github.com/seikichi>
+//                 Benjamin Jackman <https://github.com/benjaminjackman>
+//                 Poul Sorensen <https://github.com/s093294>
+//                 Josh Strobl <https://github.com/JoshStrobl>
+//                 John Reilly <https://github.com/johnnyreilly/>
+//                 Dick van den Brink <https://github.com/DickvdBrink>
+//                 Thomas Schulz <https://github.com/King2500>
+//                 Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+/**
+ * Interface for the AJAX setting that will configure the AJAX request
+ * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
+ */
+interface JQueryAjaxSettings {
+    /**
+     * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
+     */
+    accepts?: any;
+    /**
+     * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success().
+     */
+    async?: boolean;
+    /**
+     * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request.
+     */
+    beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any;
+    /**
+     * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET.
+     */
+    cache?: boolean;
+    /**
+     * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    complete? (jqXHR: JQueryXHR, textStatus: string): any;
+    /**
+     * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5)
+     */
+    contents?: { [key: string]: any; };
+    //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
+    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+    /**
+     * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
+     */
+    contentType?: any;
+    /**
+     * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax).
+     */
+    context?: any;
+    /**
+     * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5)
+     */
+    converters?: { [key: string]: any; };
+    /**
+     * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5)
+     */
+    crossDomain?: boolean;
+    /**
+     * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be key-value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below).
+     */
+    data?: any;
+    /**
+     * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter.
+     */
+    dataFilter? (data: any, ty: any): any;
+    /**
+     * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string).
+     */
+    dataType?: string;
+    /**
+     * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
+     */
+    error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any;
+    /**
+     * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events.
+     */
+    global?: boolean;
+    /**
+     * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5)
+     */
+    headers?: { [key: string]: any; };
+    /**
+     * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data.
+     */
+    ifModified?: boolean;
+    /**
+     * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1)
+     */
+    isLocal?: boolean;
+    /**
+     * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" }
+     */
+    jsonp?: any;
+    /**
+     * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
+     */
+    jsonpCallback?: any;
+    /**
+     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
+     */
+    method?: string;
+    /**
+     * A MIME type to override the XHR MIME type. (version added: 1.5.1)
+     */
+    mimeType?: string;
+    /**
+     * A password to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    password?: string;
+    /**
+     * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false.
+     */
+    processData?: boolean;
+    /**
+     * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script.
+     */
+    scriptCharset?: string;
+    /**
+     * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5)
+     */
+    statusCode?: { [key: string]: any; };
+    /**
+     * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event.
+     */
+    success? (data: any, textStatus: string, jqXHR: JQueryXHR): any;
+    /**
+     * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period.
+     */
+    timeout?: number;
+    /**
+     * Set this to true if you wish to use the traditional style of parameter serialization.
+     */
+    traditional?: boolean;
+    /**
+     * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
+     */
+    type?: string;
+    /**
+     * A string containing the URL to which the request is sent.
+     */
+    url?: string;
+    /**
+     * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
+     */
+    username?: string;
+    /**
+     * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.
+     */
+    xhr?: any;
+    /**
+     * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1)
+     */
+    xhrFields?: { [key: string]: any; };
+}
+
+/**
+ * Interface for the jqXHR object
+ * @see {@link https://api.jquery.com/jQuery.ajax/#jqXHR}
+ */
+interface JQueryXHR extends XMLHttpRequest, JQueryPromise<any> {
+    /**
+     * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5).
+     */
+    overrideMimeType(mimeType: string): any;
+    /**
+     * Cancel the request.
+     *
+     * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled"
+     */
+    abort(statusText?: string): void;
+    /**
+     * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
+     */
+    then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R|JQueryPromise<R>, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
+    /**
+     * Property containing the parsed response if the response content type is json
+     */
+    responseJSON?: any;
+    /**
+     * A function to be called if the request fails.
+     */
+    error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void;
+}
+
+/**
+ * Interface for the JQuery callback
+ * @see {@link https://api.jquery.com/category/callbacks-object/}
+ */
+interface JQueryCallback {
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.add/}
+     */
+    add(callbacks: Function): JQueryCallback;
+    /**
+     * Add a callback or a collection of callbacks to a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be added to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.add/}
+     */
+    add(callbacks: Function[]): JQueryCallback;
+
+    /**
+     * Disable a callback list from doing anything more.
+     * @see {@link https://api.jquery.com/callbacks.disable/}
+     */
+    disable(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been disabled.
+     * @see {@link https://api.jquery.com/callbacks.disabled/}
+     */
+    disabled(): boolean;
+
+    /**
+     * Remove all of the callbacks from a list.
+     * @see {@link https://api.jquery.com/callbacks.empty/}
+     */
+    empty(): JQueryCallback;
+
+    /**
+     * Call all of the callbacks with the given arguments
+     *
+     * @param arguments The argument or list of arguments to pass back to the callback list.
+     * @see {@link https://api.jquery.com/callbacks.fire/}
+     */
+    fire(...arguments: any[]): JQueryCallback;
+
+    /**
+     * Determine if the callbacks have already been called at least once.
+     * @see {@link https://api.jquery.com/callbacks.fired/}
+     */
+    fired(): boolean;
+
+    /**
+     * Call all callbacks in a list with the given context and arguments.
+     *
+     * @param context A reference to the context in which the callbacks in the list should be fired.
+     * @param arguments An argument, or array of arguments, to pass to the callbacks in the list.
+     * @see {@link https://api.jquery.com/callbacks.fireWith/}
+     */
+    fireWith(context?: any, args?: any[]): JQueryCallback;
+
+    /**
+     * Determine whether a supplied callback is in a list
+     *
+     * @param callback The callback to search for.
+     * @see {@link https://api.jquery.com/callbacks.has/}
+     */
+    has(callback: Function): boolean;
+
+    /**
+     * Lock a callback list in its current state.
+     * @see {@link https://api.jquery.com/callbacks.lock/}
+     */
+    lock(): JQueryCallback;
+
+    /**
+     * Determine if the callbacks list has been locked.
+     * @see {@link https://api.jquery.com/callbacks.locked/}
+     */
+    locked(): boolean;
+
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     * @see {@link https://api.jquery.com/callbacks.remove/}
+     */
+    remove(callbacks: Function): JQueryCallback;
+    /**
+     * Remove a callback or a collection of callbacks from a callback list.
+     *
+     * @param callbacks A function, or array of functions, that are to be removed from the callback list.
+     * @see {@link https://api.jquery.com/callbacks.remove/}
+     */
+    remove(callbacks: Function[]): JQueryCallback;
+}
+
+/**
+ * Allows jQuery Promises to interop with non-jQuery promises
+ */
+interface JQueryGenericPromise<T> {
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     *
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
+     */
+    then<U>(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise<U>, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<U>;
+
+    /**
+     * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+     *
+     * @param doneFilter A function that is called when the Deferred is resolved.
+     * @param failFilter An optional function that is called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.then/#deferred-then-doneFilter-failFilter-progressFilter}
+     */
+    then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise<void>;
+}
+
+/**
+ * Interface for the JQuery promise/deferred callbacks
+ */
+interface JQueryPromiseCallback<T> {
+    (value?: T, ...args: any[]): void;
+}
+
+interface JQueryPromiseOperator<T, U> {
+    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
+}
+
+/**
+ * Interface for the JQuery promise, part of callbacks
+ * @see {@link https://api.jquery.com/category/deferred-object/}
+ */
+interface JQueryPromise<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     * @see {@link https://api.jquery.com/deferred.state/}
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     *
+     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     * @see {@link https://api.jquery.com/deferred.always/}
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     *
+     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     * @see {@link https://api.jquery.com/deferred.done/}
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     *
+     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.fail/}
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     *
+     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
+     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
+     * @see {@link https://api.jquery.com/deferred.progress/}
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+
+    /**
+     * Return a Deferred's Promise object.
+     *
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/deferred.promise/}
+     */
+    promise(target?: any): JQueryPromise<T>;
+}
+
+/**
+ * Interface for the JQuery deferred, part of callbacks
+ * @see {@link https://api.jquery.com/category/deferred-object/}
+ */
+interface JQueryDeferred<T> extends JQueryGenericPromise<T> {
+    /**
+     * Determine the current state of a Deferred object.
+     * @see {@link https://api.jquery.com/deferred.state/}
+     */
+    state(): string;
+    /**
+     * Add handlers to be called when the Deferred object is either resolved or rejected.
+     *
+     * @param alwaysCallback1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
+     * @param alwaysCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+     * @see {@link https://api.jquery.com/deferred.always/}
+     */
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is resolved.
+     *
+     * @param doneCallback1 A function, or array of functions, that are called when the Deferred is resolved.
+     * @param doneCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+     * @see {@link https://api.jquery.com/deferred.done/}
+     */
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object is rejected.
+     *
+     * @param failCallback1 A function, or array of functions, that are called when the Deferred is rejected.
+     * @param failCallbackN Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+     * @see {@link https://api.jquery.com/deferred.fail/}
+     */
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+    /**
+     * Add handlers to be called when the Deferred object generates progress notifications.
+     *
+     * @param progressCallback1 A function, or array of functions, to be called when the Deferred generates progress notifications.
+     * @param progressCallbackN Optional additional functions, or arrays of functions, to be called when the Deferred generates progress notifications.
+     * @see {@link https://api.jquery.com/deferred.progress/}
+     */
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given args.
+     *
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     * @see {@link https://api.jquery.com/deferred.notify/}
+     */
+    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Call the progressCallbacks on a Deferred object with the given context and args.
+     *
+     * @param context Context passed to the progressCallbacks as the this object.
+     * @param args Optional arguments that are passed to the progressCallbacks.
+     * @see {@link https://api.jquery.com/deferred.notifyWith/}
+     */
+    notifyWith(context: any, args?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given args.
+     *
+     * @param args Optional arguments that are passed to the failCallbacks.
+     * @see {@link https://api.jquery.com/deferred.reject/}
+     */
+    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
+    /**
+     * Reject a Deferred object and call any failCallbacks with the given context and args.
+     *
+     * @param context Context passed to the failCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the failCallbacks.
+     * @see {@link https://api.jquery.com/deferred.rejectWith/}
+     */
+    rejectWith(context: any, args?: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given args.
+     *
+     * @param value First argument passed to doneCallbacks.
+     * @param args Optional subsequent arguments that are passed to the doneCallbacks.
+     * @see {@link https://api.jquery.com/deferred.resolve/}
+     */
+    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
+
+    /**
+     * Resolve a Deferred object and call any doneCallbacks with the given context and args.
+     *
+     * @param context Context passed to the doneCallbacks as the this object.
+     * @param args An optional array of arguments that are passed to the doneCallbacks.
+     * @see {@link https://api.jquery.com/deferred.resolveWith/}
+     */
+    resolveWith(context: any, args?: T[]): JQueryDeferred<T>;
+
+    /**
+     * Return a Deferred's Promise object.
+     *
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/deferred.promise/}
+     */
+    promise(target?: any): JQueryPromise<T>;
+
+    // Deprecated - given no typings
+    pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
+}
+
+/**
+ * Interface of the JQuery extension of the W3C event object
+ * @see {@link https://api.jquery.com/category/events/event-object/}
+ */
+interface BaseJQueryEventObject extends Event {
+    /**
+     * The current DOM element within the event bubbling phase.
+     * @see {@link https://api.jquery.com/event.currentTarget/}
+     */
+    currentTarget: Element;
+    /**
+     * An optional object of data passed to an event method when the current executing handler is bound.
+     * @see {@link https://api.jquery.com/event.data/}
+     */
+    data: any;
+    /**
+     * The element where the currently-called jQuery event handler was attached.
+     * @see {@link https://api.jquery.com/event.delegateTarget/}
+     */
+    delegateTarget: Element;
+    /**
+     * Returns whether event.preventDefault() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isDefaultPrevented/}
+     */
+    isDefaultPrevented(): boolean;
+    /**
+     * Returns whether event.stopImmediatePropagation() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isImmediatePropagationStopped/}
+     */
+    isImmediatePropagationStopped(): boolean;
+    /**
+     * Returns whether event.stopPropagation() was ever called on this event object.
+     * @see {@link https://api.jquery.com/event.isPropagationStopped/}
+     */
+    isPropagationStopped(): boolean;
+    /**
+     * The namespace specified when the event was triggered.
+     * @see {@link https://api.jquery.com/event.namespace/}
+     */
+    namespace: string;
+    /**
+     * The browser's original Event object.
+     * @see {@link https://api.jquery.com/category/events/event-object/}
+     */
+    originalEvent: Event;
+    /**
+     * If this method is called, the default action of the event will not be triggered.
+     * @see {@link https://api.jquery.com/event.preventDefault/}
+     */
+    preventDefault(): any;
+    /**
+     * The other DOM element involved in the event, if any.
+     * @see {@link https://api.jquery.com/event.relatedTarget/}
+     */
+    relatedTarget: Element;
+    /**
+     * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
+     * @see {@link https://api.jquery.com/event.result/}
+     */
+    result: any;
+    /**
+     * Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.
+     * @see {@link https://api.jquery.com/event.stopImmediatePropagation/}
+     */
+    stopImmediatePropagation(): void;
+    /**
+     * Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
+     * @see {@link https://api.jquery.com/event.stopPropagation/}
+     */
+    stopPropagation(): void;
+    /**
+     * The DOM element that initiated the event.
+     * @see {@link https://api.jquery.com/event.target/}
+     */
+    target: Element;
+    /**
+     * The mouse position relative to the left edge of the document.
+     * @see {@link https://api.jquery.com/event.pageX/}
+     */
+    pageX: number;
+    /**
+     * The mouse position relative to the top edge of the document.
+     * @see {@link https://api.jquery.com/event.pageY/}
+     */
+    pageY: number;
+    /**
+     * For key or mouse events, this property indicates the specific key or button that was pressed.
+     * @see {@link https://api.jquery.com/event.which/}
+     */
+    which: number;
+    /**
+     * Indicates whether the META key was pressed when the event fired.
+     * @see {@link https://api.jquery.com/event.metaKey/}
+     */
+    metaKey: boolean;
+}
+
+interface JQueryInputEventObject extends BaseJQueryEventObject {
+    altKey: boolean;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+}
+
+interface JQueryMouseEventObject extends JQueryInputEventObject {
+    button: number;
+    clientX: number;
+    clientY: number;
+    offsetX: number;
+    offsetY: number;
+    pageX: number;
+    pageY: number;
+    screenX: number;
+    screenY: number;
+}
+
+interface JQueryKeyEventObject extends JQueryInputEventObject {
+    char: any;
+    charCode: number;
+    key: any;
+    keyCode: number;
+}
+
+interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{
+}
+
+/**
+ * A collection of properties that represent the presence of different browser features or bugs.
+ *
+ * Intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally
+ * to improve page startup performance. For your own project's feature-detection needs, we strongly recommend the
+ * use of an external library such as {@link http://modernizr.com/|Modernizr} instead of dependency on properties
+ * in jQuery.support.
+ *
+ * @deprecated since version 1.9
+ */
+interface JQuerySupport {
+    ajax?: boolean;
+    boxModel?: boolean;
+    changeBubbles?: boolean;
+    checkClone?: boolean;
+    checkOn?: boolean;
+    cors?: boolean;
+    cssFloat?: boolean;
+    hrefNormalized?: boolean;
+    htmlSerialize?: boolean;
+    leadingWhitespace?: boolean;
+    noCloneChecked?: boolean;
+    noCloneEvent?: boolean;
+    opacity?: boolean;
+    optDisabled?: boolean;
+    optSelected?: boolean;
+    scriptEval? (): boolean;
+    style?: boolean;
+    submitBubbles?: boolean;
+    tbody?: boolean;
+}
+
+interface JQueryParam {
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @param obj An array or object to serialize.
+     */
+    (obj: any): string;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @param obj An array or object to serialize.
+     * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
+     */
+    (obj: any, traditional: boolean): string;
+}
+
+/**
+ * The interface used to construct jQuery events (with $.Event). It is
+ * defined separately instead of inline in JQueryStatic to allow
+ * overriding the construction function with specific strings
+ * returning specific event objects.
+ */
+interface JQueryEventConstructor {
+    (name: string, eventProperties?: any): JQueryEventObject;
+    new (name: string, eventProperties?: any): JQueryEventObject;
+}
+
+/**
+ * The interface used to specify coordinates.
+ */
+interface JQueryCoordinates {
+    left: number;
+    top: number;
+}
+
+/**
+ * The interface used to specify the properties parameter in css()
+ */
+type cssPropertySetter = (index: number, value?: string) => string | number;
+interface JQueryCssProperties {
+    [propertyName: string]: string | number | cssPropertySetter;
+}
+
+/**
+ * Elements in the array returned by serializeArray()
+ */
+interface JQuerySerializeArrayElement {
+    name: string;
+    value: string;
+}
+
+/**
+ * @see {@link https://api.jquery.com/animate/}
+ */
+interface JQueryAnimationOptions {
+    /**
+     * A string or number determining how long the animation will run.
+     */
+    duration?: any;
+    /**
+     * A string indicating which easing function to use for the transition.
+     */
+    easing?: string;
+    /**
+     * A function to call once the animation is complete.
+     */
+    complete?: Function;
+    /**
+     * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set.
+     */
+    step?: (now: number, tween: any) => any;
+    /**
+     * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8)
+     */
+    progress?: (animation: JQueryPromise<any>, progress: number, remainingMs: number) => any;
+    /**
+     * A function to call when the animation begins. (version added: 1.8)
+     */
+    start?: (animation: JQueryPromise<any>) => any;
+    /**
+     * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8)
+     */
+    done?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8)
+     */
+    fail?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8)
+     */
+    always?: (animation: JQueryPromise<any>, jumpedToEnd: boolean) => any;
+    /**
+     * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it.
+     */
+    queue?: any;
+    /**
+     * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4)
+     */
+    specialEasing?: Object;
+}
+
+interface JQueryEasingFunction {
+    ( percent: number ): number;
+}
+
+interface JQueryEasingFunctions {
+    [ name: string ]: JQueryEasingFunction;
+    linear: JQueryEasingFunction;
+    swing: JQueryEasingFunction;
+}
+
+/**
+ * Static members of jQuery (those on $ and jQuery themselves)
+ *
+ * @see {@link https://api.jquery.com/Types/#jQuery}
+ */
+interface JQueryStatic {
+
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings}
+     */
+    ajax(settings: JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Perform an asynchronous HTTP (Ajax) request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup().
+     * @see {@link https://api.jquery.com/jQuery.ajax/#jQuery-ajax-url-settings}
+     */
+    ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param dataTypes An optional string containing one or more space-separated dataTypes
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     */
+    ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    /**
+     * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax().
+     *
+     * @param handler A handler to set default values for future Ajax requests.
+     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     */
+    ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+
+     /**
+     * Creates an object that handles the actual transmission of Ajax data.
+     *
+     * @param dataType A string identifying the data type to use.
+     * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
+     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
+     */
+    ajaxTransport(dataType: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void;
+    
+    ajaxSettings: JQueryAjaxSettings;
+
+     /**
+      * Set default values for future Ajax requests. Its use is not recommended.
+      *
+      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
+      * @see {@link https://api.jquery.com/jQuery.ajaxSetup/}
+      */
+    ajaxSetup(options: JQueryAjaxSettings): void;
+
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
+     */
+    get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html).
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-url-data-success-dataType}
+     */
+    get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP GET request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     * @see {@link https://api.jquery.com/jQuery.get/#jQuery-get-settings}
+     */
+    get(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     */
+    getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load JSON-encoded data from the server using a GET HTTP request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     */
+    getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+    /**
+     * Load a JavaScript file from the server using a GET HTTP request, then execute it.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds.
+     * @see {@link https://api.jquery.com/jQuery.getScript/}
+     */
+    getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR;
+
+    /**
+     * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request.
+     *
+     * @see {@link https://api.jquery.com/jQuery.param/}
+     */
+    param: JQueryParam;
+
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
+     */
+    post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case.
+     * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-url-data-success-dataType}
+     */
+    post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
+    /**
+     * Load data from the server using a HTTP POST request.
+     *
+     * @param settings The JQueryAjaxSettings to be used for the request
+     * @see {@link https://api.jquery.com/jQuery.post/#jQuery-post-settings}
+     */
+    post(settings : JQueryAjaxSettings): JQueryXHR;
+    /**
+     * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
+     *
+     * @param flags An optional list of space-separated flags that change how the callback list behaves.
+     * @see {@link https://api.jquery.com/jQuery.Callbacks/}
+     */
+    Callbacks(flags?: string): JQueryCallback;
+
+    /**
+     * Holds or releases the execution of jQuery's ready event.
+     *
+     * @param hold Indicates whether the ready hold is being requested or released
+     * @see {@link https://api.jquery.com/jQuery.holdReady/}
+     */
+    holdReady(hold: boolean): void;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param selector A string containing a selector expression
+     * @param context A DOM Element, Document, or jQuery to use as context
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-selector-context}
+     */
+    (selector: string, context?: Element|JQuery): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param element A DOM element to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-element}
+     */
+    (element: Element): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-elementArray}
+     */
+    (elementArray: Element[]): JQuery;
+
+    /**
+     * Binds a function to be executed when the DOM has finished loading.
+     *
+     * @param callback A function to execute after the DOM is ready.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-callback}
+     */
+    (callback: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object A plain object to wrap in a jQuery object.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
+     */
+    (object: {}): JQuery;
+
+    /**
+     * Accepts a string containing a CSS selector which is then used to match a set of elements.
+     *
+     * @param object An existing jQuery object to clone.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-object}
+     */
+    (object: JQuery): JQuery;
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery}
+     */
+    (): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML.
+     * @param ownerDocument A document in which the new elements will be created.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-ownerDocument}
+     */
+    (html: string, ownerDocument?: Document): JQuery;
+
+    /**
+     * Creates DOM elements on the fly from the provided string of raw HTML.
+     *
+     * @param html A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
+     * @param attributes An object of attributes, events, and methods to call on the newly-created element.
+     * @see {@link https://api.jquery.com/jQuery/#jQuery-html-attributes}
+     */
+    (html: string, attributes: Object): JQuery;
+
+    /**
+     * Relinquish jQuery's control of the $ variable.
+     *
+     * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
+     * @see {@link https://api.jquery.com/jQuery.noConflict/}
+     */
+    noConflict(removeAll?: boolean): JQueryStatic;
+
+    /**
+     * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds One or more Deferred objects, or plain JavaScript objects.
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     */
+    when<T>(...deferreds: Array<T|JQueryPromise<T>/* as JQueryDeferred<T> */>): JQueryPromise<T>;
+
+    /**
+     * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties.
+     * @see {@link https://api.jquery.com/jQuery.cssHooks/}
+     */
+    cssHooks: { [key: string]: any; };
+
+    /**
+     * An object containing all CSS properties that may be used without a unit. The .css() method uses this object to see if it may append px to unitless values.
+     * @see {@link https://api.jquery.com/jQuery.cssNumber/}
+     */
+    cssNumber: any;
+
+    /**
+     * Store arbitrary data associated with the specified element. Returns the value that was set.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key-value}
+     */
+    data<T>(element: Element, key: string, value: T): T;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @param key A string naming the piece of data to set.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element-key}
+     */
+    data(element: Element, key: string): any;
+    /**
+     * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element.
+     *
+     * @param element The DOM element to associate with the data.
+     * @see {@link https://api.jquery.com/jQuery.data/#jQuery-data-element}
+     */
+    data(element: Element): any;
+
+    /**
+     * Execute the next function on the queue for the matched element.
+     *
+     * @param element A DOM element from which to remove and execute a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.dequeue/}
+     */
+    dequeue(element: Element, queueName?: string): void;
+
+    /**
+     * Determine whether an element has any jQuery data associated with it.
+     *
+     * @param element A DOM element to be checked for data.
+     * @see {@link https://api.jquery.com/jQuery.hasData/}
+     */
+    hasData(element: Element): boolean;
+
+    /**
+     * Show the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element to inspect for an attached queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName}
+     */
+    queue(element: Element, queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element where the array of queued functions is attached.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-newQueue}
+     */
+    queue(element: Element, queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed on the matched element.
+     *
+     * @param element A DOM element on which to add a queued function.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue.
+     * @see {@link https://api.jquery.com/jQuery.queue/#jQuery-queue-element-queueName-callback}
+     */
+    queue(element: Element, queueName: string, callback: Function): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param element A DOM element from which to remove data.
+     * @param name A string naming the piece of data to remove.
+     * @see {@link https://api.jquery.com/jQuery.removeData/}
+     */
+    removeData(element: Element, name?: string): JQuery;
+
+    /**
+     * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     * @see {@link https://api.jquery.com/jQuery.Deferred/}
+     */
+    Deferred<T>(beforeStart?: (deferred: JQueryDeferred<T>) => any): JQueryDeferred<T>;
+
+    /**
+     * Effects
+     */
+
+    easing: JQueryEasingFunctions;
+
+    fx: {
+        tick: () => void;
+        /**
+         * The rate (in milliseconds) at which animations fire.
+         * @see {@link https://api.jquery.com/jQuery.fx.interval/}
+         */
+        interval: number;
+        stop: () => void;
+        speeds: { slow: number; fast: number; };
+        /**
+         * Globally disable all animations.
+         * @see {@link https://api.jquery.com/jQuery.fx.off/}
+         */
+        off: boolean;
+        step: any;
+    };
+
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param func The function whose context will be changed.
+     * @param context The object to which the context (this) of the function should be set.
+     * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-function-context-additionalArguments}
+     */
+    proxy(func: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any;
+    /**
+     * Takes a function and returns a new one that will always have a particular context.
+     *
+     * @param context The object to which the context (this) of the function should be set.
+     * @param name The name of the function whose context will be changed (should be a property of the context object).
+     * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
+     * @see {@link https://api.jquery.com/jQuery.proxy/#jQuery-proxy-context-name-additionalArguments}
+     */
+    proxy(context: Object, name: string, ...additionalArguments: any[]): any;
+
+    Event: JQueryEventConstructor;
+
+    /**
+     * Takes a string and throws an exception containing it.
+     *
+     * @param message The message to send out.
+     * @see {@link https://api.jquery.com/jQuery.error/}
+     */
+    error(message: any): JQuery;
+
+    expr: any;
+    readonly fn: JQuery;
+
+    isReady: boolean;
+
+    // Properties
+    support: JQuerySupport;
+
+    /**
+     * Check to see if a DOM element is a descendant of another DOM element.
+     *
+     * @param container The DOM element that may contain the other element.
+     * @param contained The DOM element that may be contained by (a descendant of) the other element.
+     * @see {@link https://api.jquery.com/jQuery.contains/}
+     */
+    contains(container: Element, contained: Element): boolean;
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
+     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-array-callback}
+     */
+    each<T>(
+        collection: T[],
+        callback: (indexInArray: number, valueOfElement: T) => boolean | void
+        ): T[];
+
+    /**
+     * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties.
+     *
+     * @param collection The object or array to iterate over.
+     * @param callback The function that will be executed on every object. Will break the loop by returning false.
+     * @returns the first argument, the object that is iterated.
+     * @see {@link https://api.jquery.com/jQuery.each/#jQuery-each-object-callback}
+     */
+    each<T extends Object>(
+        collection: T,
+        // TODO: `(keyInObject: keyof T, valueOfElement: T[keyof T])`, when TypeScript 2.1 allowed in repository
+        callback: (keyInObject: string, valueOfElement: any) => boolean | void
+        ): T;
+
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-target-object1-objectN}
+     */
+    extend(target: any, object1?: any, ...objectN: any[]): any;
+    /**
+     * Merge the contents of two or more objects together into the first object.
+     *
+     * @param deep If true, the merge becomes recursive (aka. deep copy).
+     * @param target The object to extend. It will receive the new properties.
+     * @param object1 An object containing additional properties to merge in.
+     * @param objectN Additional objects containing properties to merge in.
+     * @see {@link https://api.jquery.com/jQuery.extend/#jQuery-extend-deep-target-object1-objectN}
+     */
+    extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any;
+
+    /**
+     * Execute some JavaScript code globally.
+     *
+     * @param code The JavaScript code to execute.
+     * @see {@link https://api.jquery.com/jQuery.globalEval/}
+     */
+    globalEval(code: string): any;
+
+    /**
+     * Finds the elements of an array which satisfy a filter function. The original array is not affected.
+     *
+     * @param array The array to search through.
+     * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value.  this will be the global window object.
+     * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
+     * @see {@link https://api.jquery.com/jQuery.grep/}
+     */
+    grep<T>(array: T[], func: (elementOfArray?: T, indexInArray?: number) => boolean, invert?: boolean): T[];
+
+    /**
+     * Search for a specified value within an array and return its index (or -1 if not found).
+     *
+     * @param value The value to search for.
+     * @param array An array through which to search.
+     * @param fromIndex The index of the array at which to begin the search. The default is 0, which will search the whole array.
+     * @see {@link https://api.jquery.com/jQuery.inArray/}
+     */
+    inArray<T>(value: T, array: T[], fromIndex?: number): number;
+
+    /**
+     * Determine whether the argument is an array.
+     *
+     * @param obj Object to test whether or not it is an array.
+     * @see {@link https://api.jquery.com/jQuery.isArray/}
+     */
+    isArray(obj: any): obj is Array<any>;
+    /**
+     * Check to see if an object is empty (contains no enumerable properties).
+     *
+     * @param obj The object that will be checked to see if it's empty.
+     * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
+     */
+    isEmptyObject(obj: any): boolean;
+    /**
+     * Determine if the argument passed is a JavaScript function object.
+     *
+     * @param obj Object to test whether or not it is a function.
+     * @see {@link https://api.jquery.com/jQuery.isFunction/}
+     */
+    isFunction(obj: any): obj is Function;
+    /**
+     * Determines whether its argument is a number.
+     *
+     * @param value The value to be tested.
+     * @see {@link https://api.jquery.com/jQuery.isNumeric/}
+     */
+    isNumeric(value: any): boolean;
+    /**
+     * Check to see if an object is a plain object (created using "{}" or "new Object").
+     *
+     * @param obj The object that will be checked to see if it's a plain object.
+     * @see {@link https://api.jquery.com/jQuery.isPlainObject/}
+     */
+    isPlainObject(obj: any): boolean;
+    /**
+     * Determine whether the argument is a window.
+     *
+     * @param obj Object to test whether or not it is a window.
+     * @see {@link https://api.jquery.com/jQuery.isWindow/}
+     */
+    isWindow(obj: any): obj is Window;
+    /**
+     * Check to see if a DOM node is within an XML document (or is an XML document).
+     *
+     * @param node The DOM node that will be checked to see if it's in an XML document.
+     * @see {@link https://api.jquery.com/jQuery.isXMLDoc/}
+     */
+    isXMLDoc(node: Node): boolean;
+
+    /**
+     * Convert an array-like object into a true JavaScript array.
+     *
+     * @param obj Any object to turn into a native Array.
+     * @see {@link https://api.jquery.com/jQuery.makeArray/}
+     */
+    makeArray(obj: any): any[];
+
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param array The Array to translate.
+     * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-array-callback}
+     */
+    map<T, U>(array: T[], callback: (elementOfArray?: T, indexInArray?: number) => U): U[];
+    /**
+     * Translate all items in an array or object to new array of items.
+     *
+     * @param arrayOrObject The Array or Object to translate.
+     * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
+     * @see {@link https://api.jquery.com/jQuery.map/#jQuery-map-object-callback}
+     */
+    map(arrayOrObject: any, callback: (value?: any, indexOrKey?: any) => any): any;
+
+    /**
+     * Merge the contents of two arrays together into the first array.
+     *
+     * @param first The first array to merge, the elements of second added.
+     * @param second The second array to merge into the first, unaltered.
+     * @see {@link https://api.jquery.com/jQuery.merge/}
+     */
+    merge<T>(first: T[], second: T[]): T[];
+
+    /**
+     * An empty function.
+     * @see {@link https://api.jquery.com/jQuery.noop/}
+     */
+    noop(): any;
+
+    /**
+     * Return a number representing the current time.
+     * @see {@link https://api.jquery.com/jQuery.now/}
+     */
+    now(): number;
+
+    /**
+     * Takes a well-formed JSON string and returns the resulting JavaScript object.
+     *
+     * @param json The JSON string to parse.
+     * @see {@link https://api.jquery.com/jQuery.parseJSON/}
+     */
+    parseJSON(json: string): any;
+
+    /**
+     * Parses a string into an XML document.
+     *
+     * @param data a well-formed XML string to be parsed
+     * @see {@link https://api.jquery.com/jQuery.parseXML/}
+     */
+    parseXML(data: string): XMLDocument;
+
+    /**
+     * Remove the whitespace from the beginning and end of a string.
+     *
+     * @param str Remove the whitespace from the beginning and end of a string.
+     * @see {@link https://api.jquery.com/jQuery.trim/}
+     */
+    trim(str: string): string;
+
+    /**
+     * Determine the internal JavaScript [[Class]] of an object.
+     *
+     * @param obj Object to get the internal JavaScript [[Class]] of.
+     * @see {@link https://api.jquery.com/jQuery.type/}
+     */
+    type(obj: any): "array" | "boolean" | "date" | "error" | "function" | "null" | "number" | "object" | "regexp" | "string" | "symbol" | "undefined";
+
+    /**
+     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers.
+     *
+     * @param array The Array of DOM elements.
+     * @see {@link https://api.jquery.com/jQuery.unique/}
+     */
+    unique<T extends Element>(array: T[]): T[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     */
+    parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[];
+
+    /**
+     * Parses a string into an array of DOM nodes.
+     *
+     * @param data HTML string to be parsed
+     * @param context DOM element to serve as the context in which the HTML fragment will be created
+     * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
+     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     */
+    parseHTML(data: string, context?: Document, keepScripts?: boolean): any[];
+}
+
+/**
+ * The jQuery instance members
+ *
+ * @see {@link https://api.jquery.com/Types/#jQuery}
+ */
+interface JQuery {
+    /**
+     * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxComplete/}
+     */
+    ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery;
+    /**
+     * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxError/}
+     */
+    ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery;
+    /**
+     * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSend/}
+     */
+    ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+    /**
+     * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStart/}
+     */
+    ajaxStart(handler: () => any): JQuery;
+    /**
+     * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxStop/}
+     */
+    ajaxStop(handler: () => any): JQuery;
+    /**
+     * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
+     *
+     * @param handler The function to be invoked.
+     * @see {@link https://api.jquery.com/ajaxSuccess/}
+     */
+    ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery;
+
+    /**
+     * Load data from the server and place the returned HTML into the matched element.
+     *
+     * @param url A string containing the URL to which the request is sent.
+     * @param data A plain object or string that is sent to the server with the request.
+     * @param complete A callback function that is executed when the request completes.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery;
+
+    /**
+     * Encode a set of form elements as a string for submission.
+     * @see {@link https://api.jquery.com/serialize/}
+     */
+    serialize(): string;
+    /**
+     * Encode a set of form elements as an array of names and values.
+     * @see {@link https://api.jquery.com/serializeArray/}
+     */
+    serializeArray(): JQuerySerializeArrayElement[];
+
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be added to the class attribute of each matched element.
+     * @see {@link https://api.jquery.com/addClass/#addClass-className}
+     */
+    addClass(className: string): JQuery;
+    /**
+     * Adds the specified class(es) to each of the set of matched elements.
+     *
+     * @param func A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/addClass/#addClass-function}
+     */
+    addClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
+     * @see {@link https://api.jquery.com/addBack/}
+     */
+    addBack(selector?: string): JQuery;
+
+    /**
+     * Get the value of an attribute for the first element in the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to get.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName}
+     */
+    attr(attributeName: string): string;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param value A value to set for the attribute. If this is `null`, the attribute will be deleted.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName-value}
+     */
+    attr(attributeName: string, value: string|number|null): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributeName The name of the attribute to set.
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments.
+     * @see {@link https://api.jquery.com/attr/#attr-attributeName-function}
+     */
+    attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery;
+    /**
+     * Set one or more attributes for the set of matched elements.
+     *
+     * @param attributes An object of attribute-value pairs to set.
+     * @see {@link https://api.jquery.com/attr/#attr-attributes}
+     */
+    attr(attributes: Object): JQuery;
+
+    /**
+     * Determine whether any of the matched elements are assigned the given class.
+     *
+     * @param className The class name to search for.
+     * @see {@link https://api.jquery.com/hasClass/}
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Get the HTML contents of the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/html/#html}
+     */
+    html(): string;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param htmlString A string of HTML to set as the content of each matched element.
+     * @see {@link https://api.jquery.com/html/#html-htmlString}
+     */
+    html(htmlString: string): JQuery;
+    /**
+     * Set the HTML contents of each element in the set of matched elements.
+     *
+     * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/html/#html-function}
+     */
+    html(func: (index: number, oldhtml: string) => string): JQuery;
+
+    /**
+     * Get the value of a property for the first element in the set of matched elements.
+     *
+     * @param propertyName The name of the property to get.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName}
+     */
+    prop(propertyName: string): any;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param value A value to set for the property.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName-value}
+     */
+    prop(propertyName: string, value: string|number|boolean): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/prop/#prop-properties}
+     */
+    prop(properties: Object): JQuery;
+    /**
+     * Set one or more properties for the set of matched elements.
+     *
+     * @param propertyName The name of the property to set.
+     * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element.
+     * @see {@link https://api.jquery.com/prop/#prop-propertyName-function}
+     */
+    prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery;
+
+    /**
+     * Remove an attribute from each element in the set of matched elements.
+     *
+     * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
+     * @see {@link https://api.jquery.com/removeAttr/}
+     */
+    removeAttr(attributeName: string): JQuery;
+
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param className One or more space-separated classes to be removed from the class attribute of each matched element.
+     * @see {@link https://api.jquery.com/removeClass/#removeClass-className}
+     */
+    removeClass(className?: string): JQuery;
+    /**
+     * Remove a single class, multiple classes, or all classes from each element in the set of matched elements.
+     *
+     * @param func A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments.
+     * @see {@link https://api.jquery.com/removeClass/#removeClass-function}
+     */
+    removeClass(func: (index: number, className: string) => string): JQuery;
+
+    /**
+     * Remove a property for the set of matched elements.
+     *
+     * @param propertyName The name of the property to remove.
+     * @see {@link https://api.jquery.com/removeProp/}
+     */
+    removeProp(propertyName: string): JQuery;
+
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set.
+     * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-className}
+     */
+    toggleClass(className: string, swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-state}
+     */
+    toggleClass(swtch?: boolean): JQuery;
+    /**
+     * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument.
+     *
+     * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments.
+     * @param swtch A boolean value to determine whether the class should be added or removed.
+     * @see {@link https://api.jquery.com/toggleClass/#toggleClass-function-state}
+     */
+    toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery;
+
+    /**
+     * Get the current value of the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/val/#val}
+     */
+    val(): any;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked.
+     * @see {@link https://api.jquery.com/val/#val-value}
+     */
+    val(value: string|string[]|number): JQuery;
+    /**
+     * Set the value of each element in the set of matched elements.
+     *
+     * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/val/#val-function}
+     */
+    val(func: (index: number, value: string) => string): JQuery;
+
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     *
+     * @param propertyName A CSS property.
+     * @see {@link https://api.jquery.com/css/#css-propertyName}
+     */
+    css(propertyName: string): string;
+    /**
+     * Get the value of style properties for the first element in the set of matched elements.
+     * Results in an object of property-value pairs.
+     *
+     * @param propertyNames An array of one or more CSS properties.
+     * @see {@link https://api.jquery.com/css/#css-propertyNames}
+     */
+    css(propertyNames: string[]): any;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A value to set for the property.
+     * @see {@link https://api.jquery.com/css/#css-propertyName-value}
+     */
+    css(propertyName: string, value: string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param propertyName A CSS property name.
+     * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments.
+     * @see {@link https://api.jquery.com/css/#css-propertyName-function}
+     */
+    css(propertyName: string, value: (index: number, value: string) => string|number): JQuery;
+    /**
+     * Set one or more CSS properties for the set of matched elements.
+     *
+     * @param properties An object of property-value pairs to set.
+     * @see {@link https://api.jquery.com/css/#css-properties}
+     */
+    css(properties: JQueryCssProperties): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/height/#height}
+     */
+    height(): number;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/height/#height-value}
+     */
+    height(value: number|string): JQuery;
+    /**
+     * Set the CSS height of every matched element.
+     *
+     * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/height/#height-function}
+     */
+    height(func: (index: number, height: number) => number|string): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding but not border.
+     * @see {@link https://api.jquery.com/innerHeight/#innerHeight}
+     */
+    innerHeight(): number;
+
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/innerHeight/#innerHeight-value}
+     */
+    innerHeight(value: number|string): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding but not border.
+     * @see {@link https://api.jquery.com/innerWidth/#innerWidth}
+     */
+    innerWidth(): number;
+
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/innerWidth/#innerWidth-value}
+     */
+    innerWidth(value: number|string): JQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
+     * @see {@link https://api.jquery.com/offset/#offset}
+     */
+    offset(): JQueryCoordinates;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     * @see {@link https://api.jquery.com/offset/#offset-coordinates}
+     */
+    offset(coordinates: JQueryCoordinates): JQuery;
+    /**
+     * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
+     *
+     * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties.
+     * @see {@link https://api.jquery.com/offset/#offset-function}
+     */
+    offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery;
+
+    /**
+     * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-includeMargin}
+     */
+    outerHeight(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer height on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/outerHeight/#outerHeight-value}
+     */
+    outerHeight(value: number|string): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements, including padding and border.
+     *
+     * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
+     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-includeMargin}
+     */
+    outerWidth(includeMargin?: boolean): number;
+
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/outerWidth/#outerWidth-value}
+     */
+    outerWidth(value: number|string): JQuery;
+
+    /**
+     * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
+     * @see {@link https://api.jquery.com/position/}
+     */
+    position(): JQueryCoordinates;
+
+    /**
+     * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element.
+     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft}
+     */
+    scrollLeft(): number;
+    /**
+     * Set the current horizontal position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollLeft/#scrollLeft-value}
+     */
+    scrollLeft(value: number): JQuery;
+
+    /**
+     * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element.
+     * @see {@link https://api.jquery.com/scrollTop/#scrollTop}
+     */
+    scrollTop(): number;
+    /**
+     * Set the current vertical position of the scroll bar for each of the set of matched elements.
+     *
+     * @param value An integer indicating the new position to set the scroll bar to.
+     * @see {@link https://api.jquery.com/scrollTop/#scrollTop-value}
+     */
+    scrollTop(value: number): JQuery;
+
+    /**
+     * Get the current computed width for the first element in the set of matched elements.
+     * @see {@link https://api.jquery.com/width/#width}
+     */
+    width(): number;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     * @see {@link https://api.jquery.com/width/#width-value}
+     */
+    width(value: number|string): JQuery;
+    /**
+     * Set the CSS width of each element in the set of matched elements.
+     *
+     * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/width/#width-function}
+     */
+    width(func: (index: number, width: number) => number|string): JQuery;
+
+    /**
+     * Remove from the queue all items that have not yet been run.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/clearQueue/}
+     */
+    clearQueue(queueName?: string): JQuery;
+
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param key A string naming the piece of data to set.
+     * @param value The new data value; it can be any JavaScript type including Array or Object.
+     * @see {@link https://api.jquery.com/data/#data-key-value}
+     */
+    data(key: string, value: any): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     *
+     * @param key Name of the data stored.
+     * @see {@link https://api.jquery.com/data/#data-key}
+     */
+    data(key: string): any;
+    /**
+     * Store arbitrary data associated with the matched elements.
+     *
+     * @param obj An object of key-value pairs of data to update.
+     * @see {@link https://api.jquery.com/data/#data-obj}
+     */
+    data(obj: { [key: string]: any; }): JQuery;
+    /**
+     * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute.
+     * @see {@link https://api.jquery.com/data/#data}
+     */
+    data(): any;
+
+    /**
+     * Execute the next function on the queue for the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/dequeue/}
+     */
+    dequeue(queueName?: string): JQuery;
+
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete.
+     * @see {@link https://api.jquery.com/removeData/#removeData-name}
+     */
+    removeData(name: string): JQuery;
+    /**
+     * Remove a previously-stored piece of data.
+     *
+     * @param list An array of strings naming the pieces of data to delete.
+     * @see {@link https://api.jquery.com/removeData/#removeData-list}
+     */
+    removeData(list: string[]): JQuery;
+    /**
+     * Remove all previously-stored piece of data.
+     * @see {@link https://api.jquery.com/removeData/}
+     */
+    removeData(): JQuery;
+
+    /**
+     * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished.
+     *
+     * @param type The type of queue that needs to be observed. (default: fx)
+     * @param target Object onto which the promise methods have to be attached
+     * @see {@link https://api.jquery.com/promise/}
+     */
+    promise(type?: string, target?: Object): JQueryPromise<any>;
+
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
+     */
+    animate(properties: Object, duration?: string|number, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition. (default: swing)
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-duration-easing-complete}
+     */
+    animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery;
+    /**
+     * Perform a custom animation of a set of CSS properties.
+     *
+     * @param properties An object of CSS properties and values that the animation will move toward.
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/animate/#animate-properties-options}
+     */
+    animate(properties: Object, options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Set a timer to delay execution of subsequent items in the queue.
+     *
+     * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/delay/}
+     */
+    delay(duration: number, queueName?: string): JQuery;
+
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-complete}
+     */
+    fadeIn(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-duration-easing-complete}
+     */
+    fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements by fading them to opaque.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeIn/#fadeIn-options}
+     */
+    fadeIn(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-complete}
+     */
+    fadeOut(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-duration-easing-complete}
+     */
+    fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements by fading them to transparent.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeOut/#fadeOut-options}
+     */
+    fadeOut(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-complete}
+     */
+    fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery;
+    /**
+     * Adjust the opacity of the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param opacity A number between 0 and 1 denoting the target opacity.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeTo/#fadeTo-duration-opacity-easing-complete}
+     */
+    fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery;
+
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
+     */
+    fadeToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-duration-easing-complete}
+     */
+    fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements by animating their opacity.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/fadeToggle/#fadeToggle-options}
+     */
+    fadeToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @see {@link https://api.jquery.com/finish/}
+     */
+    finish(queue?: string): JQuery;
+
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/hide/#hide}
+     */
+    hide(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/hide/#hide-duration-easing-complete}
+     */
+    hide(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/hide/#hide-options}
+     */
+    hide(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/show/#show}
+     */
+    show(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/show/#show-duration-easing-complete}
+     */
+    show(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/show/#show-options}
+     */
+    show(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-complete}
+     */
+    slideDown(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-duration-easing-complete}
+     */
+    slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideDown/#slideDown-options}
+     */
+    slideDown(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-complete}
+     */
+    slideToggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-duration-easing-complete}
+     */
+    slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideToggle/#slideToggle-options}
+     */
+    slideToggle(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-complete}
+     */
+    slideUp(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-duration-easing-complete}
+     */
+    slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Hide the matched elements with a sliding motion.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/slideUp/#slideUp-options}
+     */
+    slideUp(options: JQueryAnimationOptions): JQuery;
+
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/#stop-clearQueue-jumpToEnd}
+     */
+    stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+    /**
+     * Stop the currently-running animation on the matched elements.
+     *
+     * @param queue The name of the queue in which to stop animations.
+     * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
+     * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
+     * @see {@link https://api.jquery.com/stop/#stop-queue-clearQueue-jumpToEnd}
+     */
+    stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery;
+
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/toggle/#toggle-duration-complete}
+     */
+    toggle(duration?: number|string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param duration A string or number determining how long the animation will run.
+     * @param easing A string indicating which easing function to use for the transition.
+     * @param complete A function to call once the animation is complete.
+     * @see {@link https://api.jquery.com/toggle/#toggle-duration-easing-complete}
+     */
+    toggle(duration?: number|string, easing?: string, complete?: Function): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param options A map of additional options to pass to the method.
+     * @see {@link https://api.jquery.com/toggle/#toggle-options}
+     */
+    toggle(options: JQueryAnimationOptions): JQuery;
+    /**
+     * Display or hide the matched elements.
+     *
+     * @param showOrHide A Boolean indicating whether to show or hide the elements.
+     * @see {@link https://api.jquery.com/toggle/#toggle-display}
+     */
+    toggle(showOrHide: boolean): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
+     */
+    bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler}
+     */
+    bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
+     */
+    bind(eventType: string, eventData: any, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true.
+     * @see {@link https://api.jquery.com/bind/#bind-eventType-eventData-preventBubble}
+     */
+    bind(eventType: string, preventBubble: boolean): JQuery;
+    /**
+     * Attach a handler to an event for the elements.
+     *
+     * @param events An object containing one or more DOM event types and functions to execute for them.
+     * @see {@link https://api.jquery.com/bind/#bind-events}
+     */
+    bind(events: any): JQuery;
+
+    /**
+     * Trigger the "blur" event on an element
+     * @see {@link https://api.jquery.com/blur/#blur}
+     */
+    blur(): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/#blur-handler}
+     */
+    blur(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "blur" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/blur/#blur-eventData-handler}
+     */
+    blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "change" event on an element.
+     * @see {@link https://api.jquery.com/change/#change}
+     */
+    change(): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/#change-handler}
+     */
+    change(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "change" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/change/#change-eventData-handler}
+     */
+    change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "click" event on an element.
+     * @see {@link https://api.jquery.com/click/#click}
+     */
+    click(): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/#click-handler}
+     */
+    click(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "click" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/click/#click-eventData-handler}
+     */
+    click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "contextmenu" event on an element.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu}
+     */
+    contextmenu(): JQuery;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-handler}
+     */
+    contextmenu(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/contextmenu/#contextmenu-eventData-handler}
+     */
+    contextmenu(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "dblclick" event on an element.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick}
+     */
+    dblclick(): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick-handler}
+     */
+    dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "dblclick" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/dblclick/#dblclick-eventData-handler}
+     */
+    dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
+     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-handler}
+     */
+    delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
+     * @see {@link https://api.jquery.com/delegate/#delegate-selector-eventType-eventData-handler}
+     */
+    delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focus" event on an element.
+     * @see {@link https://api.jquery.com/focus/#focus}
+     */
+    focus(): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/#focus-handler}
+     */
+    focus(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focus" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focus/#focus-eventData-handler}
+     */
+    focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusin" event on an element.
+     * @see {@link https://api.jquery.com/focusin/#focusin}
+     */
+    focusin(): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/#focusin-handler}
+     */
+    focusin(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusin" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusin/#focusin-eventData-handler}
+     */
+    focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "focusout" event on an element.
+     * @see {@link https://api.jquery.com/focusout/#focusout}
+     */
+    focusout(): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/#focusout-handler}
+     */
+    focusout(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "focusout" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/focusout/#focusout-eventData-handler}
+     */
+    focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
+     *
+     * @param handlerIn A function to execute when the mouse pointer enters the element.
+     * @param handlerOut A function to execute when the mouse pointer leaves the element.
+     * @see {@link https://api.jquery.com/hover/#hover-handlerIn-handlerOut}
+     */
+    hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
+     *
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     * @see {@link https://api.jquery.com/hover/#hover-handlerInOut}
+     */
+    hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keydown" event on an element.
+     * @see {@link https://api.jquery.com/keydown/#keydown}
+     */
+    keydown(): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/#keydown-handler}
+     */
+    keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keydown" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keydown/#keydown-eventData-handler}
+     */
+    keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keypress" event on an element.
+     * @see {@link https://api.jquery.com/keypress/#keypress}
+     */
+    keypress(): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/#keypress-handler}
+     */
+    keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keypress" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keypress/#keypress-eventData-handler}
+     */
+    keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "keyup" event on an element.
+     * @see {@link https://api.jquery.com/keyup/#keyup}
+     */
+    keyup(): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/#keyup-handler}
+     */
+    keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "keyup" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/keyup/#keyup-eventData-handler}
+     */
+    keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery;
+
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "load" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/load/}
+     */
+    load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousedown" event on an element.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown}
+     */
+    mousedown(): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown-handler}
+     */
+    mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousedown" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousedown/#mousedown-eventData-handler}
+     */
+    mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseenter" event on an element.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter}
+     */
+    mouseenter(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-handler}
+     */
+    mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse enters an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseenter/#mouseenter-eventData-handler}
+     */
+    mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseleave" event on an element.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave}
+     */
+    mouseleave(): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-handler}
+     */
+    mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to be fired when the mouse leaves an element.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseleave/#mouseleave-eventData-handler}
+     */
+    mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mousemove" event on an element.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove}
+     */
+    mousemove(): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove-handler}
+     */
+    mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mousemove" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mousemove/#mousemove-eventData-handler}
+     */
+    mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseout" event on an element.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout}
+     */
+    mouseout(): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout-handler}
+     */
+    mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseout" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseout/#mouseout-eventData-handler}
+     */
+    mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseover" event on an element.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover}
+     */
+    mouseover(): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover-handler}
+     */
+    mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseover" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseover/#mouseover-eventData-handler}
+     */
+    mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "mouseup" event on an element.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup}
+     */
+    mouseup(): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup-handler}
+     */
+    mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "mouseup" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/mouseup/#mouseup-eventData-handler}
+     */
+    mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     * @see {@link https://api.jquery.com/off/#off}
+     */
+    off(): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     * @see {@link https://api.jquery.com/off/#off-events-selector-handler}
+     */
+    off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove an event handler.
+     *
+     * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).
+     * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
+     * @see {@link https://api.jquery.com/off/#off-events-selector}
+     */
+    off(events: { [key: string]: any; }, selector?: string): JQuery;
+
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+    */
+    on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data-handler}
+     */
+    on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
+     */
+    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, selector?: string, data?: any): JQuery;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/on/#on-events-selector-data}
+     */
+    on(events: { [key: string]: (eventObject: JQueryEventObject, ...args: any[]) => any; }, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
+     */
+    one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names.
+     * @param data An object containing data that will be passed to the event handler.
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/one/#one-events-data-handler}
+     */
+    one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
+     */
+    one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data-handler}
+     */
+    one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
+     */
+    one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery;
+
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     *
+     * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see {@link https://api.jquery.com/one/#one-events-selector-data}
+     */
+    one(events: { [key: string]: any; }, data?: any): JQuery;
+
+
+    /**
+     * Specify a function to execute when the DOM is fully loaded.
+     *
+     * @param handler A function to execute after the DOM is ready.
+     * @see {@link https://api.jquery.com/ready/}
+     */
+    ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery;
+
+    /**
+     * Trigger the "resize" event on an element.
+     * @see {@link https://api.jquery.com/resize/#resize}
+     */
+    resize(): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/#resize-handler}
+     */
+    resize(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "resize" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/resize/#resize-eventData-handler}
+     */
+    resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "scroll" event on an element.
+     * @see {@link https://api.jquery.com/scroll/#scroll}
+     */
+    scroll(): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/#scroll-handler}
+     */
+    scroll(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "scroll" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/scroll/#scroll-eventData-handler}
+     */
+    scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "select" event on an element.
+     * @see {@link https://api.jquery.com/select/#select}
+     */
+    select(): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/#select-handler}
+     */
+    select(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "select" JavaScript event.
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/select/#select-eventData-handler}
+     */
+    select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Trigger the "submit" event on an element.
+     * @see {@link https://api.jquery.com/submit/#submit}
+     */
+    submit(): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/#submit-handler}
+     */
+    submit(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "submit" JavaScript event
+     *
+     * @param eventData An object containing data that will be passed to the event handler.
+     * @param handler A function to execute each time the event is triggered.
+     * @see {@link https://api.jquery.com/submit/#submit-eventData-handler}
+     */
+    submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/trigger/#trigger-eventType-extraParameters}
+     */
+    trigger(eventType: string, extraParameters?: any[]|Object): JQuery;
+    /**
+     * Execute all handlers and behaviors attached to the matched elements for the given event type.
+     *
+     * @param event A jQuery.Event object.
+     * @param extraParameters Additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/trigger/#trigger-event-extraParameters}
+     */
+    trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-eventType-extraParameters}
+     */
+    triggerHandler(eventType: string, ...extraParameters: any[]): Object;
+
+    /**
+     * Execute all handlers attached to an element for an event.
+     *
+     * @param event A jQuery.Event object.
+     * @param extraParameters An array of additional parameters to pass along to the event handler.
+     * @see {@link https://api.jquery.com/triggerHandler/#triggerHandler-event-extraParameters}
+     */
+    triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object;
+
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param handler The function that is to be no longer executed.
+     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-handler}
+     */
+    unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param eventType A string containing a JavaScript event type, such as click or submit.
+     * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ).
+     * @see {@link https://api.jquery.com/unbind/#unbind-eventType-false}
+     */
+    unbind(eventType: string, fls: boolean): JQuery;
+    /**
+     * Remove a previously-attached event handler from the elements.
+     *
+     * @param evt A JavaScript event object as passed to an event handler.
+     * @see {@link https://api.jquery.com/unbind/#unbind-event}
+     */
+    unbind(evt: any): JQuery;
+
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate}
+     */
+    undelegate(): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
+     * @param handler A function to execute at the time the event is triggered.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-eventType}
+     */
+    undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param selector A selector which will be used to filter the event results.
+     * @param events An object of one or more event types and previously bound functions to unbind from them.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-selector-events}
+     */
+    undelegate(selector: string, events: Object): JQuery;
+    /**
+     * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
+     *
+     * @param namespace A string containing a namespace to unbind all events from.
+     * @see {@link https://api.jquery.com/undelegate/#undelegate-namespace}
+     */
+    undelegate(namespace: string): JQuery;
+
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/unload/#unload-handler}
+     */
+    unload(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/unload/#unload-eventData-handler}
+     */
+    unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10)
+     * @see {@link https://api.jquery.com/context/}
+     */
+    context: Element;
+
+    jquery: string;
+
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/error/#error-handler}
+     */
+    error(handler: (eventObject: JQueryEventObject) => any): JQuery;
+    /**
+     * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8)
+     *
+     * @param eventData A plain object of data that will be passed to the event handler.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/error/#error-eventData-handler}
+     */
+    error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements}
+     */
+    pushStack(elements: any[]): JQuery;
+    /**
+     * Add a collection of DOM elements onto the jQuery stack.
+     *
+     * @param elements An array of elements to push onto the stack and make into a new jQuery object.
+     * @param name The name of a jQuery method that generated the array of elements.
+     * @param arguments The arguments that were passed in to the jQuery method (for serialization).
+     * @see {@link https://api.jquery.com/pushStack/#pushStack-elements-name-arguments}
+     */
+    pushStack(elements: any[], name: string, arguments: any[]): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert after each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/after/#after-content-content}
+     */
+    after(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, after each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/after/#after-function}
+     */
+    after(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/append/#append-content-content}
+     */
+    append(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/append/#append-function}
+     */
+    append(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the end of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/appendTo/}
+     */
+    appendTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert before each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/before/#before-content-content}
+     */
+    before(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, before each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/before/#before-function}
+     */
+    before(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Create a deep copy of the set of matched elements.
+     *
+     * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false.
+     * @param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false).
+     * @see {@link https://api.jquery.com/clone/}
+     */
+    clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/detach/}
+     */
+    detach(selector?: string): JQuery;
+
+    /**
+     * Remove all child nodes of the set of matched elements from the DOM.
+     * @see {@link https://api.jquery.com/empty/}
+     */
+    empty(): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements after the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertAfter/}
+     */
+    insertAfter(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements before the target.
+     *
+     * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/insertBefore/}
+     */
+    insertBefore(target: JQuery|any[]|Element|Text|string): JQuery;
+
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
+     * @param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
+     * @see {@link https://api.jquery.com/prepend/#prepend-content-content}
+     */
+    prepend(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+    /**
+     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
+     *
+     * @param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/prepend/#prepend-function}
+     */
+    prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery;
+
+    /**
+     * Insert every element in the set of matched elements to the beginning of the target.
+     *
+     * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter.
+     * @see {@link https://api.jquery.com/prependTo/}
+     */
+    prependTo(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Remove the set of matched elements from the DOM.
+     *
+     * @param selector A selector expression that filters the set of matched elements to be removed.
+     * @see {@link https://api.jquery.com/remove/}
+     */
+    remove(selector?: string): JQuery;
+
+    /**
+     * Replace each target element with the set of matched elements.
+     *
+     * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
+     * @see {@link https://api.jquery.com/replaceAll/}
+     */
+    replaceAll(target: JQuery|any[]|Element|string): JQuery;
+
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * @param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
+     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-newContent}
+     */
+    replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery;
+    /**
+     * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed.
+     *
+     * @param func A function that returns content with which to replace the set of matched elements.
+     * @see {@link https://api.jquery.com/replaceWith/#replaceWith-function}
+     */
+    replaceWith(func: () => Element|JQuery): JQuery;
+
+    /**
+     * Get the combined text contents of each element in the set of matched elements, including their descendants.
+     * @see {@link https://api.jquery.com/text/#text}
+     */
+    text(): string;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation.
+     * @see {@link https://api.jquery.com/text/#text-text}
+     */
+    text(text: string|number|boolean): JQuery;
+    /**
+     * Set the content of each element in the set of matched elements to the specified text.
+     *
+     * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments.
+     * @see {@link https://api.jquery.com/text/#text-function}
+     */
+    text(func: (index: number, text: string) => string): JQuery;
+
+    /**
+     * Retrieve all the elements contained in the jQuery set, as an array.
+     * @name toArray
+     * @see {@link https://api.jquery.com/toArray/}
+     */
+    toArray(): HTMLElement[];
+
+    /**
+     * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
+     * @see {@link https://api.jquery.com/unwrap/}
+     */
+    unwrap(): JQuery;
+
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     * @see {@link https://api.jquery.com/wrap/#wrap-wrappingElement}
+     */
+    wrap(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around each element in the set of matched elements.
+     *
+     * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrap/#wrap-function}
+     */
+    wrap(func: (index: number) => string|JQuery): JQuery;
+
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements.
+     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-wrappingElement}
+     */
+    wrapAll(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around all elements in the set of matched elements.
+     *
+     * @param func A callback function returning the HTML content or jQuery object to wrap around all the matched elements. Within the function, this refers to the first element in the set.
+     * @see {@link https://api.jquery.com/wrapAll/#wrapAll-function}
+     */
+    wrapAll(func: (index: number) => string): JQuery;
+
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements.
+     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-wrappingElement}
+     */
+    wrapInner(wrappingElement: JQuery|Element|string): JQuery;
+    /**
+     * Wrap an HTML structure around the content of each element in the set of matched elements.
+     *
+     * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set.
+     * @see {@link https://api.jquery.com/wrapInner/#wrapInner-function}
+     */
+    wrapInner(func: (index: number) => string): JQuery;
+
+    /**
+     * Iterate over a jQuery object, executing a function for each matched element.
+     *
+     * @param func A function to execute for each matched element. Can stop the loop by returning false.
+     * @see {@link https://api.jquery.com/each/}
+     */
+    each(func: (index: number, elem: Element) => boolean | void): JQuery;
+
+    /**
+     * Retrieve one of the elements matched by the jQuery object.
+     *
+     * @param index A zero-based integer indicating which element to retrieve.
+     * @see {@link https://api.jquery.com/get/#get-index}
+     */
+    get(index: number): HTMLElement;
+    /**
+     * Retrieve the elements matched by the jQuery object.
+     * @alias toArray
+     * @see {@link https://api.jquery.com/get/#get}
+     */
+    get(): HTMLElement[];
+
+    /**
+     * Search for a given element from among the matched elements.
+     * @see {@link https://api.jquery.com/index/#index}
+     */
+    index(): number;
+    /**
+     * Search for a given element from among the matched elements.
+     *
+     * @param selector A selector representing a jQuery collection in which to look for an element.
+     * @see {@link https://api.jquery.com/index/#index-selector}
+     */
+    index(selector: string|JQuery|Element): number;
+
+    /**
+     * The number of elements in the jQuery object.
+     * @see {@link https://api.jquery.com/length/}
+     */
+    length: number;
+    /**
+     * A selector representing selector passed to jQuery(), if any, when creating the original set.
+     * version deprecated: 1.7, removed: 1.9
+     * @see {@link https://api.jquery.com/selector/}
+     */
+    selector: string;
+    [index: number]: HTMLElement;
+
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
+     * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method.
+     * @see {@link https://api.jquery.com/add/#add-selector}
+     */
+    add(selector: string, context?: Element): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param elements One or more elements to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-elements}
+     */
+    add(...elements: Element[]): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param html An HTML fragment to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-html}
+     */
+    add(html: string): JQuery;
+    /**
+     * Add elements to the set of matched elements.
+     *
+     * @param obj An existing jQuery object to add to the set of matched elements.
+     * @see {@link https://api.jquery.com/add/#add-selection}
+     */
+    add(obj: JQuery): JQuery;
+
+    /**
+     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/children/}
+     */
+    children(selector?: string): JQuery;
+
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-selector}
+     */
+    closest(selector: string): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     * @see {@link https://api.jquery.com/closest/#closest-selector-context}
+     */
+    closest(selector: string, context?: Element): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param obj A jQuery object to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-selection}
+     */
+    closest(obj: JQuery): JQuery;
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     *
+     * @param element An element to match elements against.
+     * @see {@link https://api.jquery.com/closest/#closest-element}
+     */
+    closest(element: Element): JQuery;
+
+    /**
+     * Get an array of all the elements and selectors matched against the current element up through the DOM tree.
+     *
+     * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object).
+     * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead.
+     * @see {@link https://api.jquery.com/closest/#closest-selectors-context}
+     */
+    closest(selectors: any, context?: Element): any[];
+
+    /**
+     * Get the children of each element in the set of matched elements, including text and comment nodes.
+     * @see {@link https://api.jquery.com/contents/}
+     */
+    contents(): JQuery;
+
+    /**
+     * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state.
+     * @see {@link https://api.jquery.com/end/}
+     */
+    end(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the one at the specified index.
+     *
+     * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set.
+     * @see {@link https://api.jquery.com/eq/}
+     */
+    eq(index: number): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param selector A string containing a selector expression to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-selector}
+     */
+    filter(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     * @see {@link https://api.jquery.com/filter/#filter-function}
+     */
+    filter(func: (index: number, element: Element) => boolean): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param element An element to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-elements}
+     */
+    filter(element: Element): JQuery;
+    /**
+     * Reduce the set of matched elements to those that match the selector or pass the function's test.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/filter/#filter-selection}
+     */
+    filter(obj: JQuery): JQuery;
+
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-selector}
+     */
+    find(selector: string): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param element An element to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-element}
+     */
+    find(element: Element): JQuery;
+    /**
+     * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element.
+     *
+     * @param obj A jQuery object to match elements against.
+     * @see {@link https://api.jquery.com/find/#find-element}
+     */
+    find(obj: JQuery): JQuery;
+
+    /**
+     * Reduce the set of matched elements to the first in the set.
+     * @see {@link https://api.jquery.com/first/}
+     */
+    first(): JQuery;
+
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/has/#has-selector}
+     */
+    has(selector: string): JQuery;
+    /**
+     * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element.
+     *
+     * @param contained A DOM element to match elements against.
+     * @see {@link https://api.jquery.com/has/#has-contained}
+     */
+    has(contained: Element): JQuery;
+
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/is/#is-selector}
+     */
+    is(selector: string): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element.
+     * @see {@link https://api.jquery.com/is/#is-function}
+     */
+    is(func: (index: number, element: Element) => boolean): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/is/#is-selection}
+     */
+    is(obj: JQuery): boolean;
+    /**
+     * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments.
+     *
+     * @param elements One or more elements to match the current set of elements against.
+     * @see {@link https://api.jquery.com/is/#is-elements}
+     */
+    is(elements: any): boolean;
+
+    /**
+     * Reduce the set of matched elements to the final one in the set.
+     * @see {@link https://api.jquery.com/last/}
+     */
+    last(): JQuery;
+
+    /**
+     * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values.
+     *
+     * @param callback A function object that will be invoked for each element in the current set.
+     * @see {@link https://api.jquery.com/map/}
+     */
+    map(callback: (index: number, domElement: Element) => any): JQuery;
+
+    /**
+     * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/next/}
+     */
+    next(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextAll/}
+     */
+    nextAll(selector?: string): JQuery;
+
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-selector-filter}
+     */
+    nextUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
+     */
+    nextUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/nextUntil/#nextUntil-element-filter}
+     */
+    nextUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/not/#not-selector}
+     */
+    not(selector: string): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param func A function used as a test for each element in the set. this is the current DOM element.
+     * @see {@link https://api.jquery.com/not/#not-function}
+     */
+    not(func: (index: number, element: Element) => boolean): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param elements One or more DOM elements to remove from the matched set.
+     * @see {@link https://api.jquery.com/not/#not-selection}
+     */
+    not(elements: Element|Element[]): JQuery;
+    /**
+     * Remove elements from the set of matched elements.
+     *
+     * @param obj An existing jQuery object to match the current set of elements against.
+     * @see {@link https://api.jquery.com/not/#not-selection}
+     */
+    not(obj: JQuery): JQuery;
+
+    /**
+     * Get the closest ancestor element that is positioned.
+     * @see {@link https://api.jquery.com/offsetParent/}
+     */
+    offsetParent(): JQuery;
+
+    /**
+     * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parent/}
+     */
+    parent(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parents/}
+     */
+    parents(selector?: string): JQuery;
+
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-selector-filter}
+     */
+    parentsUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
+     */
+    parentsUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/parentsUntil/#parentsUntil-element-filter}
+     */
+    parentsUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prev/}
+     */
+    prev(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevAll/}
+     */
+    prevAll(selector?: string): JQuery;
+
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-selector-filter}
+     */
+    prevUntil(selector?: string, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
+     */
+    prevUntil(element?: Element, filter?: string): JQuery;
+    /**
+     * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object.
+     *
+     * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
+     * @param filter A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/prevUntil/#prevUntil-element-filter}
+     */
+    prevUntil(obj?: JQuery, filter?: string): JQuery;
+
+    /**
+     * Get the siblings of each element in the set of matched elements, optionally filtered by a selector.
+     *
+     * @param selector A string containing a selector expression to match elements against.
+     * @see {@link https://api.jquery.com/siblings/}
+     */
+    siblings(selector?: string): JQuery;
+
+    /**
+     * Reduce the set of matched elements to a subset specified by a range of indices.
+     *
+     * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set.
+     * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
+     * @see {@link https://api.jquery.com/slice/}
+     */
+    slice(start: number, end?: number): JQuery;
+
+    /**
+     * Show the queue of functions to be executed on the matched elements.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName}
+     */
+    queue(queueName?: string): any[];
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
+     */
+    queue(newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
+     */
+    queue(callback: Function): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param newQueue An array of functions to replace the current queue contents.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-newQueue}
+     */
+    queue(queueName: string, newQueue: Function[]): JQuery;
+    /**
+     * Manipulate the queue of functions to be executed, once for each matched element.
+     *
+     * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
+     * @param callback The new function to add to the queue, with a function to call that will dequeue the next item.
+     * @see {@link https://api.jquery.com/queue/#queue-queueName-callback}
+     */
+    queue(queueName: string, callback: Function): JQuery;
+
+    /**
+     * Merge the contents of an object onto the jQuery prototype to provide new jQuery instance methods.
+     *
+     * @param object An object to merge onto the jQuery prototype.
+     * @see {@link https://api.jquery.com/jQuery.fn.extend/#jQuery-fn-extend-object}
+     */
+    extend(object: { [method: string]: (...args: any[]) => any; }): JQuery;
+}
+declare module "jquery" {
+    export = $;
+}
+declare var jQuery: JQueryStatic;
+declare var $: JQueryStatic;
diff --git a/types/jquery/v2/jquery-tests.ts b/types/jquery/v2/jquery-tests.ts
new file mode 100644
index 0000000000..4b6fc4e0db
--- /dev/null
+++ b/types/jquery/v2/jquery-tests.ts
@@ -0,0 +1,3555 @@
+
+
+function test_add() {
+    $("p").add("div").addClass("widget");
+    var pdiv = $("p").add("div");
+
+    $('li').add('p').css('background-color', 'red');
+    $('li').add(document.getElementsByTagName('p')[0])
+      .css('background-coailor', 'red');
+    $('li').add('<p id="new">new paragraph</p>')
+      .css('background-color', 'red');
+    $("div").css("border", "2px solid red")
+            .add("p")
+            .css("background", "yellow");
+    $("p").add("span").css("background", "yellow");
+    $("p").clone().add("<span>Again</span>").appendTo(document.body);
+    $("p").add(document.getElementById("a")).css("background", "yellow");
+    var collection = $("p");
+
+    collection = collection.add(document.getElementById("a"));
+    collection.css("background", "yellow");
+}
+
+function test_addClass() {
+    $("p").addClass("myClass yourClass");
+    $("p").removeClass("myClass noClass").addClass("yourClass");
+    $("ul li:last").addClass(function (index) {
+        return "item-" + index;
+    });
+    $("p:last").addClass("selected");
+    $("p:last").addClass("selected highlight");
+    $("div").addClass(function (index, currentClass) {
+        var addedClass: string;
+        if (currentClass === "red") {
+            addedClass = "green";
+            $("p").text("There is one green div");
+        }
+        return addedClass;
+    });
+}
+
+function test_after() {
+    $('.inner').after('<p>Test</p>');
+    $('<div/>').after('<p></p>').after(document.createDocumentFragment());
+    $('<div/>').after('<p></p>').addClass('foo')
+      .filter('p').attr('id', 'bar').html('hello')
+    .end()
+    .appendTo('body');
+    $('p').after(function () {
+        return '<div>' + this.className + '</div>';
+    });
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+    $('p').first().after($newdiv1, [newdiv2, existingdiv1]);
+    $("p").after(document.createTextNode("Hello"));
+    $("p").after($("b"));
+}
+
+function test_ajax() {
+    $.ajax({
+        url: "test.html",
+        context: document.body
+    }).done(function () {
+        $(this).addClass("done");
+    });
+    $.ajax({
+        statusCode: {
+            404: function () {
+                alert("page not found");
+            }
+        }
+    });
+    $.ajax({
+        url: "http://fiddle.jshell.net/favicon.png",
+        beforeSend: function (xhr) {
+            xhr.overrideMimeType("text/plain; charset=x-user-defined");
+        }
+    }).done(function (data) {
+        if (console && console.log) {
+            console.log("Sample of data:", data.slice(0, 100));
+        }
+    });
+    $.ajax({
+        url: 'ajax/test.html',
+        success: function (data) {
+            $('.result').html(data);
+            alert('Load was performed.');
+        },
+        error: function (jqXHR, textStatus, errorThrown) {
+            alert('Load failed. responseJSON=' + jqXHR.responseJSON);
+        }
+    });
+    var _super = jQuery.ajaxSettings.xhr;
+    jQuery.ajaxSettings.xhr = function () {
+        var xhr = _super(),
+            getAllResponseHeaders = xhr.getAllResponseHeaders;
+
+        xhr.getAllResponseHeaders = function () {
+            if (getAllResponseHeaders()) {
+                return getAllResponseHeaders();
+            }
+
+            var allHeaders = "";
+            var headersFieldNames = ["Cache-Control", "Content-Language", "Content-Type",
+                "Expires", "Last-Modified", "Pragma"];
+            $(headersFieldNames).each(function (i, header_name) {
+                if (xhr.getResponseHeader(header_name)) {
+                    allHeaders += header_name + ": " + xhr.getResponseHeader(header_name) + "\n";
+                }
+            });
+            return allHeaders;
+        };
+
+        return xhr;
+    };
+    $.ajax({
+        type: "POST",
+        url: "some.php",
+        data: { name: "John", location: "Boston" }
+    }).done(function (msg) {
+        alert("Data Saved: " + msg);
+    });
+    $.ajax({
+        method: "POST",
+        url: "some.php",
+        data: { name: "John", location: "Boston" }
+    });
+    $.ajax({
+        url: "test.html",
+        cache: false
+    }).done(function (html) {
+        $("#results").append(html);
+    });
+    var xmlDocument = [];
+    var xmlRequest = $.ajax({
+        url: "page.php",
+        processData: false,
+        data: xmlDocument
+    });
+    var handleResponse;
+    xmlRequest.done(handleResponse);
+
+    var menuId = $("ul.nav").first().attr("id");
+    var request = $.ajax({
+        url: "script.php",
+        type: "POST",
+        data: { id: menuId },
+        dataType: "html"
+    });
+    request.done(function (msg) {
+        $("#log").html(msg);
+    });
+    request.fail(function (jqXHR, textStatus) {
+        alert("Request failed: " + textStatus);
+    });
+
+    $.ajax({
+        type: "GET",
+        url: "test.js",
+        dataType: "script"
+    });
+
+    // Test the jqXHR object returned by $.ajax() as of 1.5
+    // More details: http://api.jquery.com/jQuery.ajax/#jqXHR
+
+    // done method
+    $.ajax({
+        url: "test.js"
+    }).done((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // then method can change promise type through promise chaining
+    var chainedValuePromise : JQueryPromise<number>;
+    chainedValuePromise = $.ajax({
+        url: "test.js"
+    }).then(() => $.when(1));
+
+    // fail method
+    $.ajax({
+        url: "test.js"
+    }).fail((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // always method with successful request
+    $.ajax({
+        url: "test.js"
+    }).always((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // always method with failed request
+    $.ajax({
+        url: "test.js"
+    }).always((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // then method (as of 1.8)
+    $.ajax({
+        url: "test.js"
+    }).then((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    }, (jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // generic then method
+    var p: JQueryPromise<number> = $.ajax({ url: "test.js" })
+        .then(() => "Hello")
+        .then((x) => x.length);
+
+    // jqXHR object
+    var jqXHR = $.ajax({
+        url: "test.js"
+    });
+    jqXHR.abort('aborting because I can');
+
+    //Test the promise exposed by the jqXHR object
+
+    // done method
+    $.ajax({
+        url: "test.js"
+    }).promise().done((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // fail method
+    $.ajax({
+        url: "test.js"
+    }).promise().fail((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // always method with successful request
+    $.ajax({
+        url: "test.js"
+    }).promise().always((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    });
+
+    // always method with failed request
+    $.ajax({
+        url: "test.js"
+    }).promise().always((jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // then method (as of 1.8)
+    $.ajax({
+        url: "test.js"
+    }).promise().then((data, textStatus, jqXHR) => {
+        console.log(data, textStatus, jqXHR);
+    }, (jqXHR, textStatus, errorThrown) => {
+        console.log(jqXHR, textStatus, errorThrown);
+    });
+
+    // generic then method
+    var p: JQueryPromise<number> = $.ajax({ url: "test.js" }).promise()
+        .then(() => "Hello")
+        .then((x) => x.length);
+}
+
+function test_ajaxComplete() {
+    $('.log').ajaxComplete(function () {
+        $(this).text('Triggered ajaxComplete handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxComplete(function (e, xhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxComplete handler. The result is ' + xhr.responseText);
+        }
+    });
+    $("#msg").ajaxComplete(function (event, request, settings) {
+        $(this).append("<li>Request Complete.</li>");
+    });
+}
+
+function test_ajaxError() {
+    $("div.log").ajaxError(function () {
+        $(this).text("Triggered ajaxError handler.");
+    });
+    $("button.trigger").click(function () {
+        $("div.result").load("ajax/missing.html");
+    });
+    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
+        if (settings.url == "ajax/missing.html") {
+            $(this).text("Triggered ajaxError handler.");
+        }
+    });
+    $("#msg").ajaxError(function (event, request, settings) {
+        $(this).append("<li>Error requesting page " + settings.url + "</li>");
+    });
+}
+
+function test_ajaxPrefilter() {
+    var currentRequests = {};
+    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+        if (options.abortOnRetry) {
+            if (currentRequests[options.url]) {
+                currentRequests[options.url].abort();
+            }
+            currentRequests[options.url] = jqXHR;
+        }
+    });
+    $.ajaxPrefilter(function (options) {
+        if (options.crossDomain) {
+            options.url = "http://mydomain.net/proxy/" + encodeURIComponent(options.url);
+            options.crossDomain = false;
+        }
+    });
+    $.ajaxPrefilter("json script", function (options, originalOptions, jqXHR) {
+
+    });
+    var isActuallyScript;
+    $.ajaxPrefilter(function (options) {
+        if (isActuallyScript(options.url)) {
+            return "script";
+        }
+    });
+}
+
+function test_ajaxSend() {
+    $('.log').ajaxSend(function () {
+        $(this).text('Triggered ajaxSend handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxSend(function (e, jqxhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxSend handler.');
+        }
+    });
+    $("#msg").ajaxSend(function (evt, request, settings) {
+        $(this).append("<li>Starting request at " + settings.url + "</li>");
+    });
+}
+
+function test_ajaxSetup() {
+    $.ajaxSetup({
+        url: 'ping.php'
+    });
+    $.ajax({
+        data: { 'name': 'Dan' }
+    });
+    $.ajaxSetup({
+        url: "/xmlhttp/",
+        global: false,
+        type: "POST"
+    });
+}
+
+function test_ajaxStart() {
+    $('.log').ajaxStart(function () {
+        $(this).text('Triggered ajaxStart handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $("#loading").ajaxStart(function () {
+        $(this).show();
+    });
+}
+
+function test_ajaxStop() {
+    $('.log').ajaxStop(function () {
+        $(this).text('Triggered ajaxStop handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $("#loading").ajaxStop(function () {
+        $(this).hide();
+    });
+}
+
+function test_ajaxSuccess() {
+    $('.log').ajaxSuccess(function () {
+        $(this).text('Triggered ajaxSuccess handler.');
+    });
+    $('.trigger').click(function () {
+        $('.result').load('ajax/test.html');
+    });
+    $('.log').ajaxSuccess(function (e, xhr, settings) {
+        if (settings.url == 'ajax/test.html') {
+            $(this).text('Triggered ajaxSuccess handler. The ajax response was:' + xhr.responseText);
+        }
+    });
+    $("#msg").ajaxSuccess(function (evt, request, settings) {
+        $(this).append("<li>Successful Request!</li>");
+    });
+}
+
+function test_allSelector() {
+    var elementCount = $("*").css("border", "3px solid red").length;
+    $("body").prepend("<h3>" + elementCount + " elements found</h3>");
+    var elementCount2 = $("#test").find("*").css("border", "3px solid red").length;
+    $("body").prepend("<h3>" + elementCount2 + " elements found</h3>");
+}
+
+function test_animate() {
+    $('#clickme').click(function () {
+        $('#book').animate({
+            opacity: 0.25,
+            left: '+=50',
+            height: 'toggle'
+        }, 5000, function () {
+        });
+    });
+    $('li').animate({
+        opacity: .5,
+        height: '50%'
+    }, {
+        step: function (now, fx) {
+            var data = fx.elem.id + ' ' + fx.prop + ': ' + now;
+            $('body').append('<div>' + data + '</div>');
+        }
+    });
+    $('#clickme').click(function () {
+        $('#book').animate({
+            width: ['toggle', 'swing'],
+            height: ['toggle', 'swing'],
+            opacity: 'toggle'
+        }, 5000, 'linear', function () {
+            $(this).after('<div>Animation complete.</div>');
+        });
+    });
+    $('#clickme').click(function () {
+        $('#book').animate({
+            width: 'toggle',
+            height: 'toggle'
+        }, {
+            duration: 5000,
+            specialEasing: {
+                width: 'linear',
+                height: 'easeOutBounce'
+            },
+            complete: function () {
+                $(this).after('<div>Animation complete.</div>');
+            }
+        });
+    });
+    $("#go").click(function () {
+        $("#block").animate({
+            width: "70%",
+            opacity: 0.4,
+            marginLeft: "0.6in",
+            fontSize: "3em",
+            borderWidth: "10px"
+        }, 1500);
+    });
+    $("#right").click(function () {
+        $(".block").animate({ "left": "+=50px" }, "slow");
+    });
+    $("#left").click(function () {
+        $(".block").animate({ "left": "-=50px" }, "slow");
+    });
+    $("#go1").click(function () {
+        $("#block1").animate({ width: "90%" }, { queue: false, duration: 3000 })
+           .animate({ fontSize: "24px" }, 1500)
+           .animate({ borderRightWidth: "15px" }, 1500);
+    });
+    $("#go2").click(function () {
+        $("#block2").animate({ width: "90%" }, 1000)
+           .animate({ fontSize: "24px" }, 1000)
+           .animate({ borderLeftWidth: "15px" }, 1000);
+    });
+    $("#go3").click(function () {
+        $("#go1").add("#go2").click();
+    });
+    $("#go4").click(function () {
+        $("div").css({ width: "", fontSize: "", borderWidth: "" });
+    });
+    $("#go").click(function () {
+        $(".block:first").animate({
+            left: 100
+        }, {
+            duration: 1000,
+            step: function (now, fx) {
+                $(".block:gt(0)").css("left", now);
+            }
+        });
+    });
+    $("p").animate({
+        height: "toggle", opacity: "toggle"
+    }, "slow");
+    $("p").animate({
+        left: 50, opacity: 1
+    }, 500);
+    $("p").animate({
+        left: "50px", opacity: 1
+    }, { duration: 500, queue: false });
+    $("p").animate({
+        opacity: "show"
+    }, "slow", "easein");
+    $("p").animate({
+        height: "toggle", opacity: "toggle"
+    }, { duration: "slow" });
+    $("p").animate({
+        opacity: "show"
+    }, { duration: "slow", easing: "easein" });
+    $("p").animate({
+        height: 200, width: 400, opacity: 0.5
+    }, 1000, "linear", function () {
+        alert("all done");
+    });
+}
+
+function test_animatedSelector() {
+    $("#run").click(function () {
+        $("div:animated").toggleClass("colored");
+    });
+    function animateIt() {
+        $("#mover").slideToggle("slow", animateIt);
+    }
+    animateIt();
+}
+
+function test_slideToggle() {
+    $("button").click(function () {
+        $("p").slideToggle("slow");
+    });
+
+    $("#aa").click(function () {
+        $("div:not(.still)").slideToggle("slow", function () {
+            var n = parseInt($("span").text(), 10);
+            $("span").text(n + 1);
+        });
+    });
+}
+
+function test_toggle() {
+    $(".target").toggle();
+
+    $("#clickme").click(function () {
+        $("#book").toggle("slow", function () {
+            // Animation complete.
+        });
+    });
+
+    $("#foo").toggle(true);
+
+    $("button").click(function () {
+        $("p").toggle();
+    });
+
+    $("button").click(function () {
+        $("p").toggle("slow");
+    });
+
+    var flip = 0;
+    $("button").click(function () {
+        $("p").toggle(flip++ % 2 === 0);
+    });
+}
+
+function test_append() {
+    $('.inner').append('<p>Test</p>');
+    $('.container').append($('h2')).append(document.createDocumentFragment());
+
+    var $newdiv1 = $('<div id="object1"/>'),
+    newdiv2 = document.createElement('div'),
+    existingdiv1 = document.getElementById('foo');
+
+    $('body').append($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_appendTo() {
+    $('<p>Test</p>').appendTo('.inner');
+    $('h2').appendTo($('.container'));
+}
+
+function test_attr() {
+    var title = $("em").attr("title");
+    $("em").attr("title", null); // Delete an attribute.
+    $("div").text(title);
+    $('#greatphoto').attr('alt', 'Beijing Brush Seller');
+    $('#greatphoto')
+        .attr('title', 'Photo by Kelly Clark');
+    $('#greatphoto').attr({
+        alt: 'Beijing Brush Seller',
+        title: 'photo by Kelly Clark'
+    });
+    $('#greatphoto').attr('title', function (i, val) {
+        return val + ' - photo by Kelly Clark'
+    });
+    $("div").attr("id", function (arr) {
+        return "div-id" + arr;
+    })
+    .each(function () {
+        $("span", this).html("(ID = '<b>" + this.id + "</b>')");
+    });
+    $("img").attr("src", function () {
+        return "/images/" + this.title;
+    });
+}
+
+function test_attributeSelectors() {
+    $('a[hreflang|="en"]').css('border', '3px dotted green');
+    $('input[name*="man"]').val('has man in it!');
+    $('input[name~="man"]').val('mr. man is in it!');
+    $('input[name$="letter"]').val('a letter');
+    $('input[value="Hot Fuzz"]').next().text(" Hot Fuzz");
+    $('input[name!="newsletter"]').next().append('<b>; not newsletter</b>');
+    $('input[name^="news"]').val('news here!');
+}
+
+function test_before() {
+    $('.inner').before('<p>Test</p>');
+    $('.container').before($('h2')).before(document.createDocumentFragment());
+    $("<div/>").before("<p></p>");
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+    $('p').first().before($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_bind() {
+    $('#foo').bind('click', function () {
+        alert('User clicked on "foo."');
+    });
+    $('#foo').bind('mouseenter mouseleave', function () {
+        $(this).toggleClass('entered');
+    });
+    $('#foo').bind({
+        click: function () { },
+        mouseenter: function () { }
+    });
+    $('#foo').bind('click', function () {
+        alert($(this).text());
+    });
+    $(document).ready(function () {
+        $('#foo').bind('click', function (event) {
+            alert('The mouse cursor is at ('
+              + event.pageX + ', ' + event.pageY + ')');
+        });
+    });
+    var message = 'Spoon!';
+    $('#foo').bind('click', function () {
+        alert(message);
+    });
+    message = 'Not in the face!';
+    $('#bar').bind('click', function () {
+        alert(message);
+    });
+    var message = 'Spoon!';
+    $('#foo').bind('click', { msg: message }, function (event) {
+        alert(event.data.msg);
+    });
+    message = 'Not in the face!';
+    $('#bar').bind('click', { msg: message }, function (event) {
+        alert(event.data.msg);
+    });
+    $("p").bind("click", function (event) {
+        var str = "( " + event.pageX + ", " + event.pageY + " )";
+        $("span").text("Click happened! " + str);
+    });
+    $("p").bind("dblclick", function () {
+        $("span").text("Double-click happened in " + this.nodeName);
+    });
+    $("p").bind("mouseenter mouseleave", function (event) {
+        $(this).toggleClass("over");
+    });
+    $("p").bind("click", function () {
+        alert($(this).text());
+    });
+    function handler(event) {
+        alert(event.data.foo);
+    }
+    $("p").bind("click", { foo: "bar" }, handler)
+    $("form").bind("submit", function () { return false; })
+    $("form").bind("submit", function (event) {
+        event.preventDefault();
+    });
+    $("form").bind("submit", function (event) {
+        event.stopPropagation();
+    });
+    $("p").bind("myCustomEvent", function (e, myName?, myValue?) {
+        $(this).text(myName + ", hi there!");
+        $("span").stop().css("opacity", 1)
+        .text("myName = " + myName)
+        .fadeIn(30).fadeOut(1000);
+    });
+    $("button").click(function () {
+        $("p").trigger("myCustomEvent", ["John"]);
+    });
+    $("div.test").bind({
+        click: function () {
+            $(this).addClass("active");
+        },
+        mouseenter: function () {
+            $(this).addClass("inside");
+        },
+        mouseleave: function () {
+            $(this).removeClass("inside");
+        }
+    });
+}
+
+function test_unbind() {
+    $("#foo").unbind();
+
+    $("#foo").unbind("click");
+
+    var handler = function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    };
+    $("#foo").bind("click", handler);
+    $("#foo").unbind("click", handler);
+
+    $("#foo").bind("click", function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    });
+
+    // Will NOT work
+    $("#foo").unbind("click", function () {
+        alert("The quick brown fox jumps over the lazy dog.");
+    });
+
+    $("#foo").bind("click.myEvents", handler);
+
+    $("#foo").unbind("click");
+
+    $("#foo").unbind("click.myEvents");
+
+    $("#foo").unbind(".myEvents");
+
+    var timesClicked = 0;
+    $("#foo").bind("click", function (event) {
+        alert("The quick brown fox jumps over the lazy dog.");
+        timesClicked++;
+        if (timesClicked >= 3) {
+            $(this).unbind(event);
+        }
+    });
+
+    function aClick() {
+        $("div").show().fadeOut("slow");
+    }
+    $("#bind").click(function () {
+        $("#theone")
+            .bind("click", aClick)
+            .text("Can Click!");
+    });
+    $("#unbind").click(function () {
+        $("#theone")
+            .unbind("click", aClick)
+            .text("Does nothing...");
+    });
+
+    $("p").unbind();
+
+    $("p").unbind("click");
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    $("p").bind("click", foo); // ... Now foo will be called when paragraphs are clicked ...
+
+    $("p").unbind("click", foo); // ... foo will no longer be called.
+}
+
+function test_blur() {
+    $('#target').blur(function () {
+        alert('Handler for .blur() called.');
+    });
+    $('#other').click(function () {
+        $('#target').blur();
+
+    });
+    $("p").blur();
+}
+
+interface JQueryStatic { Topic; }
+function test_callbacks() {
+    function fn1(value) {
+        console.log(value);
+    }
+    function fn2(value) {
+        fn1("fn2 says:" + value);
+        return false;
+    }
+    var callbacks = $.Callbacks();
+    var callbacks2 = $.Callbacks("once");
+    callbacks.add(fn1);
+    callbacks.fire("foo!");
+    callbacks.add(fn2);
+    callbacks.fire("bar!");
+    callbacks.remove(fn2);
+    callbacks.fire("foobar");
+    var topics = {};
+
+    jQuery.Topic = function (id) {
+        var callbacks,
+            method,
+            topic = id && topics[id];
+        if (!topic) {
+            callbacks = jQuery.Callbacks();
+            topic = {
+                publish: callbacks.fire,
+                subscribe: callbacks.add,
+                unsubscribe: callbacks.remove
+            };
+            if (id) {
+                topics[id] = topic;
+            }
+        }
+        return topic;
+    };
+    $.Topic("mailArrived").subscribe(fn1);
+    $.Topic("mailArrived").subscribe(fn2);
+    $.Topic("mailSent").subscribe(fn1);
+    $.Topic("mailArrived").publish("hello world!");
+    $.Topic("mailSent").publish("woo! mail!");
+    $.Topic("mailArrived").subscribe(fn1);
+
+    var dfd = $.Deferred();
+    var topic = $.Topic("mailArrived");
+    dfd.done(topic.publish);
+    dfd.resolve("its been published!");
+}
+
+function test_callbacksFunctions() {
+    var foo = function (value) {
+        console.log('foo:' + value);
+    }
+    var bar = function (value) {
+        console.log('bar:' + value);
+    }
+    var callbacks = $.Callbacks();
+    callbacks.add(foo);
+    callbacks.fire('hello');
+    callbacks.add(bar);
+    callbacks.fire('world');
+    callbacks.disable();
+
+    // Test the disabled state of the list
+    console.log(callbacks.disabled());
+    // Outputs: true
+
+    callbacks.empty();
+    callbacks.fire('hello');
+    console.log(callbacks.fired());
+    callbacks.fireWith(window, ['foo', 'bar']);
+    var foo2 = function (value1, value2) {
+        console.log('Received:' + value1 + ',' + value2);
+    };
+    console.log(callbacks.has(foo2));
+    callbacks.lock();
+    console.log(callbacks.locked());
+    callbacks.remove(foo);
+}
+
+function test_change() {
+    $('.target').change(function () {
+        alert('Handler for .change() called.');
+    });
+    $('#other').click(function () {
+        $('.target').change();
+    });
+    $("input[type='text']").change(function () { });
+    $("input[type='text']").change();
+}
+
+function test_children() {
+    $('ul.level-2').children().css('background-color', 'red');
+    $("#container").click(function (e) {
+        $("*").removeClass("hilite");
+        var $kids = $(e.target).children();
+        var len = $kids.addClass("hilite").length;
+
+        $("#results span:first").text(len);
+        //$("#results span:last").text(e.target.tagName);
+
+        e.preventDefault();
+        return false;
+    });
+    $("div").children(".selected").css("color", "blue");
+}
+
+function test_clearQueue() {
+    $("#start").click(function () {
+        var myDiv = $("div");
+        myDiv.show("slow");
+        myDiv.animate({ left: '+=200' }, 5000);
+        myDiv.queue(function () {
+            var _this = $(this);
+            _this.addClass("newcolor");
+            _this.dequeue();
+        });
+        myDiv.animate({ left: '-=200' }, 1500);
+        myDiv.queue(function () {
+            var _this = $(this);
+            _this.removeClass("newcolor");
+            _this.dequeue();
+        });
+        myDiv.slideUp();
+
+    });
+    $("#stop").click(function () {
+        var myDiv = $("div");
+        myDiv.clearQueue();
+        myDiv.stop();
+    });
+}
+
+function test_click() {
+    $("#target").click(function () {
+        alert("Handler for .click() called.");
+    });
+    $("#other").click(function () {
+        $("#target").click();
+    });
+    $("p").click(function () {
+        $(this).slideUp();
+    });
+    $("p").click();
+}
+
+function test_submit() {
+    $("#target").submit(function () {
+        alert("Handler for .submit() called.");
+    });
+    $("#target").submit();
+}
+
+function test_trigger() {
+
+    $("#foo").on("click", function () {
+        alert($(this).text());
+    });
+    $("#foo").trigger("click");
+
+    $("#foo").on("custom", function (event, param1?, param2?) {
+        alert(param1 + "\n" + param2);
+    });
+    $("#foo").trigger("custom", ["Custom", "Event"]);
+
+    $("button:first").click(function () {
+        update($("span:first"));
+    });
+
+    $("button:last").click(function () {
+        $("button:first").trigger("click");
+        update($("span:last"));
+    });
+
+    function update(j) {
+        var n = parseInt(j.text(), 10);
+        j.text(n + 1);
+    }
+
+    $("form:first").trigger("submit");
+
+    var event = jQuery.Event("submit");
+    $("form:first").trigger(event);
+    if (event.isDefaultPrevented()) {
+        // Perform an action...
+    }
+
+    $("p")
+        .click(function (event, a, b) {
+            // When a normal click fires, a and b are undefined
+            // for a trigger like below a refers to "foo" and b refers to "bar"
+        })
+        .trigger("click", ["foo", "bar"]);
+
+    var event = jQuery.Event("logged");
+    (<any>event).user = "foo";
+    (<any>event).pass = "bar";
+    $("body").trigger(event);
+
+    // Adapted from jQuery documentation which may be wrong on this occasion
+    var event2 = jQuery.Event("logged");
+    $("body").trigger(event2, {
+        type: "logged",
+        user: "foo",
+        pass: "bar"
+    });
+}
+
+function test_clone() {
+    $('.hello').clone().appendTo('.goodbye');
+    var $elem = $('#elem').data({ "arr": [1] }),
+        $clone = $elem.clone(true)
+        .data("arr", $.extend([], $elem.data("arr")));
+    $("b").clone().prependTo("p");
+    $('#copy').append($('#orig .elem')
+          .clone()
+          .children('a')
+          .prepend('foo - ')
+          .parent()
+          .clone());
+}
+
+function test_prepend() {
+    $('.inner').prepend('<p>Test</p>');
+    $('.container').prepend($('h2')).prepend(document.createDocumentFragment());
+
+    var $newdiv1 = $('<div id="object1"/>'),
+        newdiv2 = document.createElement('div'),
+        existingdiv1 = document.getElementById('foo');
+
+    $('body').prepend($newdiv1, [newdiv2, existingdiv1]);
+}
+
+function test_prependTo() {
+    $("<p>Test</p>").prependTo(".inner");
+    $("h2").prependTo($(".container"));
+    $("span").prependTo("#foo");
+}
+
+function test_closest() {
+    $('li.item-a').closest('ul')
+        .css('background-color', 'red');
+    $('li.item-a').closest('li')
+        .css('background-color', 'red');
+    var listItemII = document.getElementById('ii');
+    $('li.item-a').closest('ul', listItemII)
+        .css('background-color', 'red');
+    $('li.item-a').closest('#one', listItemII)
+        .css('background-color', 'green');
+    $(document).bind("click", function (e) {
+        $(e.target).closest("li").toggleClass("hilight");
+    });
+    var $listElements = $("li").css("color", "blue");
+    $(document).bind("click", function (e) {
+        //$(e.target).closest($listElements).toggleClass("hilight");
+    });
+}
+
+function test_contains() {
+    jQuery.contains(document.documentElement, document.body);
+    jQuery.contains(document.body, document.documentElement);
+}
+
+function test_contents() {
+    $('.container').contents().filter(function () {
+        return this.nodeType == 3;
+    })
+    .wrap('<p></p>')
+    .end()
+    .filter('br')
+    .remove();
+    $("#frameDemo").contents().find("a").css("background-color", "#BADA55");
+}
+
+function test_context() {
+    $("ul")
+        .append("<li>" + $("ul").context + "</li>")
+        .append("<li>" + $("ul", document.body).context.nodeName + "</li>");
+}
+
+function test_css() {
+    $("div").click(function () {
+        var color = $(this).css("background-color");
+        $("#result").html("That div is <span style='color:" + color + ";'>" + color + "</span>.");
+    });
+    $('div.example').css('width', function (index) {
+        return index * 50;
+    });
+    $('div.example').css('width', function (index, style) {
+        return style.length > 0 ? style : index * 50;
+    });
+    $("p").mouseover(function () {
+        $(this).css("color", "red");
+    });
+    $("#box").one("click", function () {
+        $(this).css("width", "+=200");
+    });
+    var words = $("p:first").text().split(" ");
+    var text = words.join("</span> <span>");
+    $("p:first").html("<span>" + text + "</span>");
+    $("span").click(function () {
+        $(this).css("background-color", "yellow");
+    });
+    $("p").hover(function () {
+        $(this).css({ 'background-color': 'yellow', 'font-weight': 'bolder' });
+    }, function () {
+        var cssObj = {
+            'background-color': '#ddd',
+            'font-weight': '',
+            'color': 'rgb(0,40,244)'
+        }
+        $(this).css(cssObj);
+    });
+    $("div").click(function () {
+        $(this).css({
+            width: function (index, value) {
+                return parseFloat(value) * 1.2;
+            },
+            height: function (index, value) {
+                return parseFloat(value) * 1.2;
+            }
+        });
+    });
+    var dims = $("#box").css([ "width", "height", "backgroundColor" ]);
+}
+
+function test_cssHooks() {
+    if (!$.cssHooks) {
+        throw ("jQuery 1.4.3 or above is required for this plugin to work");
+    }
+    $.cssHooks["someCSSProp"] = {
+        get: function (elem, computed, extra) { },
+        set: function (elem, value) { }
+    };
+    function styleSupport(prop) {
+        var vendorProp, supportedProp,
+            capProp = prop.charAt(0).toUpperCase() + prop.slice(1),
+            prefixes = ["Moz", "Webkit", "O", "ms"],
+            div = document.createElement("div");
+
+        if (prop in div.style) {
+            supportedProp = prop;
+        } else {
+            for (var i = 0; i < prefixes.length; i++) {
+                vendorProp = prefixes[i] + capProp;
+                if (vendorProp in div.style) {
+                    supportedProp = vendorProp;
+                    break;
+                }
+            }
+        }
+        div = null;
+        $.support[prop] = supportedProp;
+        return supportedProp;
+    }
+    styleSupport("borderRadius");
+
+    $.cssNumber["someCSSProp"] = true;
+    $.fx.step["someCSSProp"] = function (fx) {
+        $.cssHooks["someCSSProp"].set(fx.elem, fx.now + fx.unit);
+    };
+}
+
+function test_data() {
+    $('body').data('foo', 52);
+    $('body').data('bar', { myType: 'test', count: 40 });
+    $('body').data('foo');
+    $('body').data();
+    $("div").data("test", { first: 16, last: "pizza!" });
+    $("span:first").text($("div").data("test").first);
+    $("span:last").text($("div").data("test").last);
+    alert($('body').data('foo'));
+    alert($('body').data());
+    alert($("body").data("foo"));
+    $("body").data("bar", "foobar");
+    alert($("body").data("bar"));
+    $("div").data("role") === "page";
+    $("div").data("lastValue") === 43;
+    $("div").data("hidden") === true;
+    $("div").data("options").name === "John";
+    var value;
+    switch ($("button").index(this)) {
+        case 0:
+            value = $("div").data("blah");
+            break;
+        case 1:
+            $("div").data("blah", "hello");
+            value = "Stored!";
+            break;
+        case 2:
+            $("div").data("blah", 86);
+            value = "Stored!";
+            break;
+        case 3:
+            $("div").removeData("blah");
+            value = "Removed!";
+            break;
+    }
+    $("span").text("" + value);
+    jQuery.data(document.body, 'foo', 52);
+    jQuery.data(document.body, 'bar', 'test');
+    var div = $("div")[0];
+    jQuery.data(div, "test", { first: 16, last: "pizza!" });
+    $("span:first").text(jQuery.data(div, "test").first);
+    $("span:last").text(jQuery.data(div, "test").last);
+    $.data(document.getElementById("id"), "", 8).toFixed(2);
+    $.data(document.getElementById("id"), "", "8").toUpperCase();
+}
+
+function test_removeData() {
+    $("span:eq(0)").text("" + $("div").data("test1"));
+    $("div").data("test1", "VALUE-1");
+    $("div").data("test2", "VALUE-2");
+    $("span:eq(1)").text("" + $("div").data("test1"));
+    $("div").removeData("test1");
+    $("span:eq(2)").text("" + $("div").data("test1"));
+    $("span:eq(3)").text("" + $("div").data("test2"));
+}
+
+function test_jQuery_removeData() {
+    var div = $("div")[0];
+    $("span:eq(0)").text("" + $("div").data("test1"));
+    jQuery.data(div, "test1", "VALUE-1");
+    jQuery.data(div, "test2", "VALUE-2");
+    $("span:eq(1)").text("" + jQuery.data(div, "test1"));
+    jQuery.removeData(div, "test1");
+    $("span:eq(2)").text("" + jQuery.data(div, "test1"));
+    $("span:eq(3)").text("" + jQuery.data(div, "test2"));
+}
+
+function test_removeDataAll() {
+    var el = $("div");
+    el.data("test1", "VALUE-1");
+    el.data("test2", "VALUE-2");
+    el.removeData();
+}
+
+function test_dblclick() {
+    $('#target').dblclick(function () {
+        alert('Handler for .dblclick() called.');
+    });
+    $('#other').click(function () {
+        $('#target').dblclick();
+    });
+    $("p").dblclick(function () { alert("Hello World!"); });
+    var divdbl = $("div:first");
+    divdbl.dblclick(function () {
+        divdbl.toggleClass('dbl');
+    });
+	$('#target').dblclick();
+}
+
+function test_delay() {
+    $('#foo').slideUp(300).delay(800).fadeIn(400);
+    $("button").click(function () {
+        $("div.first").slideUp(300).delay(800).fadeIn(400);
+        $("div.second").slideUp(300).fadeIn(400);
+    });
+}
+
+function test_delegate() {
+    $("table").delegate("td", "click", function () {
+        $(this).toggleClass("chosen");
+    });
+    $("table").on("click", "td", function () {
+        $(this).toggleClass("chosen");
+    });
+    $("body").delegate("p", "click", function () {
+        $(this).after("<p>Another paragraph!</p>");
+    });
+    $("body").delegate("p", "click", function () {
+        alert($(this).text());
+    });
+    $("body").delegate("a", "click", function () { return false; });
+    $("body").delegate("a", "click", function (event) {
+        event.preventDefault();
+    });
+    $("body").delegate("p", "myCustomEvent", function (e, myName?, myValue?) {
+        $(this).text("Hi there!");
+        $("span").stop().css("opacity", 1)
+                 .text("myName = " + myName)
+                 .fadeIn(30).fadeOut(1000);
+    });
+    $("button").click(function () {
+        $("p").trigger("myCustomEvent");
+    });
+}
+
+function test_undelegate() {
+    function aClick() {
+        $("div").show().fadeOut("slow");
+    }
+    $("#bind").click(function () {
+        $("body")
+            .delegate("#theone", "click", aClick)
+            .find("#theone").text("Can Click!");
+    });
+    $("#unbind").click(function () {
+        $("body")
+            .undelegate("#theone", "click", aClick)
+            .find("#theone").text("Does nothing...");
+    });
+
+    $("p").undelegate();
+
+    $("p").undelegate("click");
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    // ... Now foo will be called when paragraphs are clicked ...
+    $("body").delegate("p", "click", foo);
+
+    // ... foo will no longer be called.
+    $("body").undelegate("p", "click", foo);
+
+    var foo = function () {
+        // Code to handle some kind of event
+    };
+
+    // Delegate events under the ".whatever" namespace
+    $("form").delegate(":button", "click.whatever", foo);
+
+    $("form").delegate("input[type='text'] ", "keypress.whatever", foo);
+
+    // Unbind all events delegated under the ".whatever" namespace
+    $("form").undelegate(".whatever");
+}
+
+function test_dequeue() {
+    $("button").click(function () {
+        $("div").animate({ left: '+=200px' }, 2000);
+        $("div").animate({ top: '0px' }, 600);
+        $("div").queue(function () {
+            $(this).toggleClass("red");
+            $(this).dequeue();
+        });
+        $("div").animate({ left: '10px', top: '30px' }, 700);
+    });
+}
+
+function test_queue() {
+
+    $("#show").click(function () {
+        var n = jQuery.queue($("div")[0], "fx");
+        $("span").text("Queue length is: " + n.length);
+    });
+
+    function runIt() {
+        $("div")
+            .show("slow")
+            .animate({
+                left: "+=200"
+            }, 2000)
+            .slideToggle(1000)
+            .slideToggle("fast")
+            .animate({
+                left: "-=200"
+            }, 1500)
+            .hide("slow")
+            .show(1200)
+            .slideUp("normal", runIt);
+    }
+
+    runIt();
+
+    $(document.body).click(function () {
+        var divs = $("div")
+            .show("slow")
+            .animate({ left: "+=200" }, 2000);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).addClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.animate({ left: "-=200" }, 500);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).removeClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.slideUp();
+    });
+
+    $("#start").click(function () {
+        var divs = $("div")
+            .show("slow")
+            .animate({ left: "+=200" }, 5000);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).addClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.animate({ left: "-=200" }, 1500);
+        jQuery.queue(divs[0], "fx", function () {
+            $(this).removeClass("newcolor");
+            jQuery.dequeue(this);
+        });
+        divs.slideUp();
+    });
+    $("#stop").click(function () {
+        jQuery.queue($("div")[0], "fx", []);
+        $("div").stop();
+    });
+}
+
+function test_detach() {
+    $("p").click(function () {
+        $(this).toggleClass("off");
+    });
+    var p;
+    $("button").click(function () {
+        if (p) {
+            p.appendTo("body");
+            p = null;
+        } else {
+            p = $("p").detach();
+        }
+    });
+}
+
+function test_each() {
+    var numArray: number[];
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
+        alert(index + ': ' + value);
+    });
+    numArray = $.each([1, 2, 3, 4], function (index: number, value: number) {
+        alert(index + ': ' + value);
+        return value < 2;
+    });
+
+    var res: {one: number, 2: string};
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+    });
+    res = $.each({ one: 1, 2: "two" }, function(key: string, value: any) {
+        alert(key + ': ' + value);
+        return key === "2";
+    });
+
+    var map = {
+        'flammable': 'inflammable',
+        'duh': 'no duh'
+    };
+    $.each(map, function (key, value) {
+        alert(key + ': ' + value);
+    });
+    var arr = ["one", "two", "three", "four", "five"];
+    var obj = { one: 1, two: 2, three: 3, four: 4, five: 5 };
+    jQuery.each(arr, function () {
+        $("#" + this).text("Mine is " + this + ".");
+        return (this != "three");
+    });
+    jQuery.each(obj, function (i, val) {
+        $("#" + i).append(document.createTextNode(" - " + val));
+    });
+    $.each(['a', 'b', 'c'], function (i, l) {
+        alert("Index #" + i + ": " + l);
+    });
+    $.each({ name: "John", lang: "JS" }, function (k, v) {
+        alert("Key: " + k + ", Value: " + v);
+    });
+    $.each([{a: 1}, {a: 2}, {a: 3}], function (i, o) {
+        alert("Index #" + i + ": " + o.a);
+    });
+    $('li').each(function (index) {
+        alert(index + ': ' + $(this).text());
+    });
+    $(document.body).click(function () {
+        $("div").each(function (i) {
+            if (this.style.color != "blue") {
+                this.style.color = "blue";
+            } else {
+                this.style.color = "";
+            }
+        });
+    });
+    $("span").click(function () {
+        $("li").each(function () {
+            $(this).toggleClass("example");
+        });
+    });
+    $("button").click(function () {
+        $("div").each(function (index, domEle) {
+            // domEle == this
+            $(domEle).css("backgroundColor", "yellow");
+            if ($(this).is("#stop")) {
+                $("span").text("Stopped at div index #" + index);
+                return false;
+            }
+        });
+    });
+}
+
+function test_empty() {
+    $('.hello').empty();
+}
+
+function test_end() {
+    $('ul.first').find('.foo').css('background-color', 'red')
+        .end().find('.bar').css('background-color', 'green');
+    $('ul.first').find('.foo')
+        .css('background-color', 'red')
+        .end().find('.bar')
+        .css('background-color', 'green')
+        .end();
+}
+
+function test_eq() {
+    $('li').eq(2).css('background-color', 'red');
+    $('li').eq(-2).css('background-color', 'red');
+    $('li').eq(5).css('background-color', 'red');
+    $("body").find("div").eq(2).addClass("blue");
+}
+
+function test_error() {
+    $('#book')
+        .error(function () {
+            alert('Handler for .error() called.')
+        })
+        .attr("src", "missing.png");
+    $("img")
+        .error(function () {
+            $(this).hide();
+        })
+        .attr("src", "missing.png");
+    jQuery.error("Oups");
+    jQuery.error = (message?: string) => {
+        console.error(message); return this;
+    };
+}
+
+function test_eventParams() {
+    $("p").click(function (event) {
+        event.currentTarget === this;
+    });
+    $(".box").on("click", "button", function (event) {
+        $(event.delegateTarget).css("background-color", "red");
+    });
+    $("a").click(function (event) {
+        event.isDefaultPrevented();
+        event.preventDefault();
+        event.isDefaultPrevented();
+    });
+    function immediatePropStopped(e) {
+        var msg = "";
+        if (e.isImmediatePropagationStopped()) {
+            msg = "called"
+        } else {
+            msg = "not called";
+        }
+        $("#stop-log").append("<div>" + msg + "</div>");
+    }
+    $("button").click(function (event) {
+        immediatePropStopped(event);
+        event.stopImmediatePropagation();
+        immediatePropStopped(event);
+    });
+    function propStopped(e) {
+        var msg = "";
+        if (e.isPropagationStopped()) {
+            msg = "called";
+        } else {
+            msg = "not called";
+        }
+        $("#stop-log").append("<div>" + msg + "</div>");
+    }
+    $("button").click(function (event) {
+        propStopped(event);
+        event.stopPropagation();
+        propStopped(event);
+    });
+    $("p").bind("test.something", function (event) {
+        alert(event.namespace);
+    });
+    $("button").click(function (event) {
+        $("p").trigger("test.something");
+    });
+    $(document).bind('mousemove', function (e) {
+        $("#log").text("e.pageX: " + e.pageX + ", e.pageY: " + e.pageY);
+    });
+    $("a").click(function (event) {
+        event.preventDefault();
+        $('<div/>')
+            .append('default ' + event.type + ' prevented')
+            .appendTo('#log');
+    });
+    $("a").mouseout(function (event) {
+        alert(event.relatedTarget.nodeName);
+    });
+    $("button").click(function (event) {
+        return "hey";
+    });
+    $("button").click(function (event) {
+        $("p").html(event.result);
+    });
+    $("p").click(function (event) {
+        event.stopImmediatePropagation();
+    });
+    $("p").click(function (event) {
+        $(this).css("background-color", "#f00");
+    });
+    $("div").click(function (event) {
+        $(this).css("background-color", "#f00");
+    });
+    $("p").click(function (event) {
+        event.stopPropagation();
+    });
+    $("body").click(function (event) {
+        //bugfix, duplicate identifier.  see: http://stackoverflow.com/questions/14824143/duplicate-identifier-nodename-in-jquery-d-ts
+        //$("#log").html("clicked: " + event.target.nodeName);
+    });
+    $('#whichkey').bind('keydown', function (e) {
+        $('#log').html(e.type + ': ' + e.which);
+    });
+    $('#whichkey').bind('mousedown', function (e) {
+        $('#log').html(e.type + ': ' + e.which);
+    });
+    $(window).on('mousewheel', (e) => {
+        var delta = (<WheelEvent>e.originalEvent).deltaY;
+    });
+    $( "p" ).click(function( event ) {
+      alert( event.currentTarget === this ); // true
+    });
+}
+
+function test_extend() {
+    var object1 = {
+        apple: 0,
+        banana: { weight: 52, price: 100 },
+        cherry: 97
+    };
+    var object2 = {
+        banana: { price: 200 },
+        durian: 100
+    };
+    $.extend(object1, object2);
+    var printObj = typeof JSON != "undefined" ? JSON.stringify : function (obj) {
+        var arr = [];
+        $.each(obj, function (key, val) {
+            var next = key + ": ";
+            next += $.isPlainObject(val) ? printObj(val) : val;
+            arr.push(next);
+        });
+        return "{ " + arr.join(", ") + " }";
+    };
+    $("#log").append(printObj(object1));
+
+    var defaults = { validate: false, limit: 5, name: "foo" };
+    var options = { validate: true, name: "bar" };
+    var settings: typeof defaults = $.extend({}, defaults, options);
+}
+
+function test_fadeIn() {
+    $('#clickme').click(function () {
+        $('#book').fadeIn('slow', function () { });
+    });
+    $(document.body).click(function () {
+        $("div:hidden:first").fadeIn("slow");
+    });
+    $("a").click(function () {
+        $("div").fadeIn(3000, function () {
+            $("span").fadeIn(100);
+        });
+        return false;
+    });
+}
+
+function test_fadeOut() {
+    $('#clickme').click(function () {
+        $('#book').fadeOut('slow', function () { });
+    });
+    $("p").click(function () {
+        $("p").fadeOut("slow");
+    });
+    $("span").click(function () {
+        $(this).fadeOut(1000, function () {
+            $("div").text("'" + $(this).text() + "' has faded!");
+            $(this).remove();
+        });
+    });
+    $("span").hover(function () {
+        $(this).addClass("hilite");
+    }, function () {
+        $(this).removeClass("hilite");
+    });
+    $("#btn1").click(function () {
+        function complete() {
+            $("<div/>").text(this.id).appendTo("#log");
+        }
+        $("#box1").fadeOut(1600, "linear", complete);
+        $("#box2").fadeOut(1600, complete);
+    });
+    $("#btn2").click(function () {
+        $("div").show();
+        $("#log").empty();
+    });
+}
+
+function test_fadeTo() {
+    $('#clickme').click(function () {
+        $('#book').fadeTo('slow', 0.5, function () { });
+    });
+    $("p:first").click(function () {
+        $(this).fadeTo("slow", 0.33);
+    });
+    $("div").click(function () {
+        $(this).fadeTo("fast", Math.random());
+    });
+    var getPos = function (n) {
+        return (Math.floor(n) * 90) + "px";
+    };
+    $("p").each(function (n) {
+        var r = Math.floor(Math.random() * 3);
+        var tmp = $(this).text();
+        $(this).text($("p:eq(" + r + ")").text());
+        $("p:eq(" + r + ")").text(tmp);
+        $(this).css("left", getPos(n));
+    });
+    $("div").each(function (n) {
+        $(this).css("left", getPos(n));
+    })
+    .css("cursor", "pointer")
+    .click(function () {
+        $(this).fadeTo(250, 0.25, function () {
+            $(this).css("cursor", "")
+                   .prev().css({
+                       "font-weight": "bolder",
+                       "font-style": "italic"
+                   });
+        });
+    });
+}
+
+function test_fadeToggle() {
+    $("button:first").click(function () {
+        $("p:first").fadeToggle("slow", "linear");
+    });
+    $("button:last").click(function () {
+        $("p:last").fadeToggle("fast", function () {
+            $("#log").append("<div>finished</div>");
+        });
+    });
+}
+
+function test_filter() {
+    $('li').filter(':even').css('background-color', 'red');
+    $('li').filter(function (index) {
+        return index % 3 === 2;
+    }).css('background-color', 'red');
+    $("div").css("background", "#b4b0da")
+        .filter(function (index) {
+            return index === 1 || $(this).attr("id") === "fourth";
+        })
+        .css("border", "3px double red");
+    $("div").filter(document.getElementById("unique"));
+    $("div").filter($("#unique"));
+}
+
+function test_find() {
+    $('li.item-ii').find('li').css('background-color', 'red');
+    var item1 = $('li.item-1')[0];
+    $('li.item-ii').find(item1).css('background-color', 'red');
+    var $spans = $('span');
+    $("p").find($spans).css('color', 'red');
+    var newText = $("p").text().split(" ").join("</span> <span>");
+    newText = "<span>" + newText + "</span>";
+    $("p").html(newText)
+        .find('span')
+        .hover(function () {
+            $(this).addClass("hilite");
+        },
+        function () {
+            $(this).removeClass("hilite");
+        })
+    .end()
+        .find(":contains('t')")
+        .css({ "font-style": "italic", "font-weight": "bolder" });
+}
+
+function test_finish() {
+    $(".box").finish();
+}
+
+function test_first() {
+    $('li').first().css('background-color', 'red');
+}
+
+function test_focus() {
+    $('#target').focus(function () {
+        alert('Handler for .focus() called.');
+    });
+    $('#other').click(function () {
+        $('#target').focus();
+    });
+    $("input").focus(function () {
+        $(this).next("span").css('display', 'inline').fadeOut(1000);
+    });
+    $("input[type=text]").focus(function () {
+        $(this).blur();
+    });
+    $(document).ready(function () {
+        $("#login").focus();
+    });
+}
+
+function test_focusin() {
+    $("p").focusin(function () {
+        $(this).find("span").css('display', 'inline').fadeOut(1000);
+    });
+}
+
+function test_focusout() {
+    var fo = 0, b = 0;
+    $("p").focusout(function () {
+        fo++;
+        $("#fo")
+            .text("focusout fired: " + fo + "x");
+    }).blur(function () {
+        b++;
+        $("#b")
+            .text("blur fired: " + b + "x");
+    });
+}
+
+function test_easing() {
+    const easing = jQuery.easing;
+
+    function test_easing_function( name: string, fn: JQueryEasingFunction ) {
+        const step = Math.pow( 2, -3 ); // use power of 2 to prevent floating point rounding error
+        for( let i = 0; i <= 1; i += step ) {
+            console.log( `$.easing.${name}(${i}): ${fn.call(easing, i)}` );
+        }
+    }
+
+    test_easing_function( "linear", easing.linear );
+    test_easing_function( "swing", easing.swing );
+}
+
+function test_fx() {
+    jQuery.fx.interval = 100;
+    $("input").click(function () {
+        $("div").toggle(3000);
+    });
+    var toggleFx = function () {
+        $.fx.off = !$.fx.off;
+    };
+    toggleFx();
+    $("button").click(toggleFx)
+    $("input").click(function () {
+        $("div").toggle("slow");
+    });
+}
+
+function test_get() {
+    $.get('ajax/test.html', function (data) {
+        $('.result').html(data);
+        alert('Load was performed.');
+    });
+    var jqxhr = $.get("example.php", function () {
+        alert("success");
+    })
+    .done(function () { alert("second success"); })
+    .fail(function () { alert("error"); });
+
+    $.get("test.php");
+    $.get("test.php", { name: "John", time: "2pm" });
+    $.get("test.php", { 'choices[]': ["Jon", "Susan"] });
+    $.get("test.php", function (data) {
+        alert("Data Loaded: " + data);
+    });
+    $.get("test.cgi", { name: "John", time: "2pm" },
+        function (data) {
+            alert("Data Loaded: " + data);
+        });
+    $.get("test.php",
+       function (data) {
+           $('body').append("Name: " + data.name)
+                    .append("Time: " + data.time);
+       }, "json");
+    alert($('li').get());
+    $('li').get(0);
+    $('li')[0];
+    alert($('li').get(-1));
+    function disp(divs) {
+        var a = [];
+        for (var i = 0; i < divs.length; i++) {
+            a.push(divs[i].innerHTML);
+        }
+        $("span").text(a.join(" "));
+    }
+    disp($("div").get().reverse());
+    $("*", document.body).click(function (e) {
+        e.stopPropagation();
+        var domEl = $(this).get(0);
+        $("span:first").text("Clicked on - " + domEl.tagName);
+    });
+}
+
+function test_getJSON() {
+    $.getJSON('ajax/test.json', function (data) {
+        var items = [];
+        $.each(data, function (key, val) {
+            items.push('<li id="' + key + '">' + val + '</li>');
+        });
+        $('<ul/>', {
+            'class': 'my-new-list',
+            html: items.join('')
+        }).appendTo('body');
+    });
+    var jqxhr = $.getJSON("example.json", function () {
+        alert("success");
+    })
+    .done(function () { alert("second success"); })
+    .fail(function () { alert("error"); });
+    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?jsoncallback=?",
+    {
+        tags: "mount rainier",
+        tagmode: "any",
+        format: "json"
+    },
+    function (data) {
+        $.each(data.items, function (i, item) {
+            $("<img/>").attr("src", item.media.m).appendTo("#images");
+            if (i === "3") return false;
+        });
+    });
+    $.getJSON("test.js", function (json) {
+        alert("JSON Data: " + json.users[3].name);
+    });
+    $.getJSON("test.js", { name: "John", time: "2pm" }, function (json) {
+        alert("JSON Data: " + json.users[3].name);
+    });
+}
+
+function test_getScript() {
+    $.getScript("ajax/test.js", function (data, textStatus, jqxhr) {
+        console.log(data);
+        console.log(textStatus);
+        console.log(jqxhr.status);
+        console.log('Load was performed.');
+    });
+    $.getScript("ajax/test.js")
+        .done(function (script, textStatus) {
+            console.log(textStatus);
+        })
+        .fail(function (jqxhr, settings, exception) {
+            $("div.log").text("Triggered ajaxError handler.");
+        });
+    $("div.log").ajaxError(function (e, jqxhr, settings, exception) {
+        if (settings.dataType == 'script') {
+            $(this).text("Triggered ajaxError handler.");
+        }
+    });
+    $.ajaxSetup({
+        cache: true
+    });
+    $.getScript("/scripts/jquery.color.js", function () {
+        $("#go").click(function () {
+            $(".block").animate({ backgroundColor: "pink" }, 1000)
+              .delay(500)
+              .animate({ backgroundColor: "blue" }, 1000);
+        });
+    });
+}
+
+function test_jQueryget() {
+    console.log($("li").get(0));
+    console.log($("li")[0]);
+    console.log($("li").get(-1));
+    $("*", document.body).click(function (event) {
+        event.stopPropagation();
+        var domElement = $(this).get(0);
+        $("span:first").text("Clicked on - " + domElement.nodeName);
+    });
+
+    function display(divs) {
+        var a = [];
+        for (var i = 0; i < divs.length; i++) {
+            a.push(divs[i].innerHTML);
+        }
+        $("span").text(a.join(" "));
+    }
+    display($("div").get().reverse());
+}
+
+function test_globalEval() {
+    jQuery.globalEval("var newVar = true;");
+}
+
+function test_grep() {
+    var arr = [1, 9, 3, 8, 6, 1, 5, 9, 4, 7, 3, 8, 6, 9, 1];
+    $("div").text(arr.join(", "));
+    arr = jQuery.grep(arr, function (n, i) {
+        return (n != 5 && i > 4);
+    });
+    $("p").text(arr.join(", "));
+    var arr2 = jQuery.grep(arr, function (a) { return a != 9; });
+    $("span").text(arr.join(", "));
+    $.grep([0, 1, 2], function (n, i) {
+        return n > 0;
+    }, true);
+    var arr3 = $.grep(["a", "b", "c"], function (n, i) { return n !== "b"; });
+}
+
+function test_has() {
+    $('li').has('ul').css('background-color', 'red');
+    $("ul").append("<li>" + ($("ul").has("li").length ? "Yes" : "No") + "</li>");
+    $("ul").has("li").addClass("full");
+}
+
+function test_hasClass() {
+    $('#mydiv').hasClass('foo');
+    $("div#result1").append($("p:first").hasClass("selected").toString());
+    $("div#result2").append($("p:last").hasClass("selected").toString());
+    $("div#result3").append($("p").hasClass("selected").toString());
+}
+
+function test_hasData() {
+    var $p = jQuery("p"), p = $p[0];
+    $p.append(jQuery.hasData(p) + " ");
+    $.data(p, "testing", 123);
+    $p.append(jQuery.hasData(p) + " ");
+    $.removeData(p, "testing");
+    $p.append(jQuery.hasData(p) + " ");
+    $p.on('click', function () { });
+    $p.append(jQuery.hasData(p) + " ");
+    $p.off('click');
+    $p.append(jQuery.hasData(p) + " ");
+}
+
+function test_jQuery_proxy() {
+
+    function test1() {
+        var me = {
+            type: "zombie",
+            test: function (event?) {
+                // Without proxy, `this` would refer to the event target
+                // use event.target to reference that element.
+                var element = event.target;
+                $(element).css("background-color", "red");
+
+                // With proxy, `this` refers to the me object encapsulating
+                // this function.
+                $("#log").append("Hello " + this.type + "<br>");
+                $("#test").off("click", this.test);
+            }
+        };
+
+        var you = {
+            type: "person",
+            test: function (event?) {
+                $("#log").append(this.type + " ");
+            }
+        };
+
+        // Execute you.test() in the context of the `you` object
+        // no matter where it is called
+        // i.e. the `this` keyword will refer to `you`
+        var youClick = $.proxy(you.test, you);
+
+        // attach click handlers to #test
+        $("#test")
+        // this === "zombie"; handler unbound after first click
+            .on("click", $.proxy(me.test, me))
+
+        // this === "person"
+            .on("click", youClick)
+
+        // this === "zombie"
+            .on("click", $.proxy(you.test, me))
+
+        // this === "<button> element"
+            .on("click", you.test);
+    }
+
+    function test2() {
+        var obj = {
+            name: "John",
+            test: function () {
+                $("#log").append(this.name);
+                $("#test").off("click", obj.test);
+            }
+        };
+        $("#test").on("click", jQuery.proxy(obj, "test"));
+    }
+
+    function test3() {
+        var me = {
+            // I'm a dog
+            type: "dog",
+
+            // Note that event comes *after* one and two
+            test: function (one?, two?, event?) {
+                $("#log")
+
+                // `one` maps to `you`, the 1st additional
+                // argument in the $.proxy function call
+                    .append("<h3>Hello " + one.type + ":</h3>")
+
+                // The `this` keyword refers to `me`
+                // (the 2nd, context, argument of $.proxy)
+                    .append("I am a " + this.type + ", ")
+
+                // `two` maps to `they`, the 2nd additional
+                // argument in the $.proxy function call
+                    .append("and they are " + two.type + ".<br>")
+
+                // The event type is "click"
+                    .append("Thanks for " + event.type + "ing.")
+
+                // The clicked element is `event.target`,
+                // and its type is "button"
+                    .append("the " + event.target.type + ".");
+            }
+        };
+
+        var you = { type: "cat" };
+        var they = { type: "fish" };
+
+        // Set up handler to execute me.test() in the context
+        // of `me`, with `you` and `they` as additional arguments
+        var proxy = $.proxy(me.test, me, you, they);
+
+        $("#test")
+            .on("click", proxy);
+    }
+}
+
+function test_height() {
+    $(window).height();
+    $(document).height();
+    function showHeight(ele, h) {
+        $("div").text("The height for the " + ele + " is " + h + "px.");
+    }
+    $("#getp").click(function () {
+        showHeight("paragraph", $("p").height());
+    });
+    $("#getd").click(function () {
+        showHeight("document", $(document).height());
+    });
+    $("#getw").click(function () {
+        showHeight("window", $(window).height());
+    });
+    $("div").one('click', function () {
+        $(this).height(30)
+               .css({ cursor: "auto", backgroundColor: "green" });
+    });
+}
+
+function test_wrap() {
+    $(".inner").wrap("<div class='new'></div>");
+    $(".inner").wrap(function () {
+        return "<div class='" + $(this).text() + "'></div>";
+    });
+    $("span").wrap("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrap(document.createElement("div"));
+    $("p").wrap($(".doublediv"));
+}
+
+function test_wrapAll() {
+    $(".inner").wrapAll("<div class='new' />");
+    $("p").wrapAll("<div></div>");
+    $("span").wrapAll("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrapAll(document.createElement("div"));
+    $("p").wrapAll($(".doublediv"));
+}
+
+function test_wrapInner() {
+    $(".inner").wrapInner("<div class='new'></div>");
+    $(".inner").wrapInner(function () {
+        return "<div class='" + this.nodeValue + "'></div>";
+    });
+    var elem: Element;
+    $(elem).wrapInner("<div class='test'></div>");
+    $(elem).wrapInner("<div class=\"test\"></div>");
+    $("p").wrapInner("<b></b>");
+    $("body").wrapInner("<div><div><p><em><b></b></em></p></div></div>");
+    $("p").wrapInner(document.createElement("b"));
+    $("p").wrapInner($("<span class='red'></span>"));
+}
+
+function test_width() {
+    // Returns width of browser viewport
+    $(window).width();
+
+    // Returns width of HTML document
+    $(document).width();
+
+    function showWidth(ele, w) {
+        $("div").text("The width for the " + ele + " is " + w + "px.");
+    }
+    $("#getp").click(function () {
+        showWidth("paragraph", $("p").width());
+    });
+    $("#getd").click(function () {
+        showWidth("document", $(document).width());
+    });
+    $("#getw").click(function () {
+        showWidth("window", $(window).width());
+    });
+
+    var modWidth = 50;
+    $("div").one("click", function () {
+        $(this).width(modWidth).addClass("mod");
+        modWidth -= 8;
+    });
+}
+
+function test_coordinates() {
+    var p = $("p:last");
+    var offset = p.offset();
+    p.html("left: " + offset.left + ", top: " + offset.top);
+
+    $("*", document.body).click(function (event) {
+        var offset = $(this).offset();
+        event.stopPropagation();
+        $("#result").text(this.tagName +
+            " coords ( " + offset.left + ", " + offset.top + " )");
+    });
+
+    $("p:last").offset({ top: 10, left: 30 });
+}
+
+function test_hide() {
+    $('.target').hide();
+    $('#clickme').click(function () {
+        $('#book').hide('slow', function () {
+            alert('Animation complete.');
+        });
+    });
+    $("p").hide();
+    $("a").click(function (event) {
+        event.preventDefault();
+        $(this).hide();
+    });
+    $("button").click(function () {
+        $("p").hide("slow");
+    });
+    $("#hidr").click(function () {
+        $("span:last-child").hide("fast", function () {
+            $(this).prev().hide("fast", arguments.callee);
+        });
+    });
+    $("#showr").click(function () {
+        $("span").show(2000);
+    });
+    $("div").click(function () {
+        $(this).hide(2000, function () {
+            $(this).remove();
+        });
+    });
+}
+
+function test_holdReady() {
+    $.holdReady(true);
+    $.getScript("myplugin.js", function () {
+        $.holdReady(false);
+    });
+}
+
+function test_hover() {
+    $("li").hover(
+        function () {
+            $(this).append($("<span> ***</span>"));
+        },
+        function () {
+            $(this).find("span:last").remove();
+        }
+    );
+    $("li.fade").hover(function () { $(this).fadeOut(100); $(this).fadeIn(500); });
+    $("li")
+    .filter(":odd")
+    .hide()
+    .end()
+    .filter(":even")
+    .hover(
+        function () {
+            $(this).toggleClass("active")
+            .next().stop(true, true).slideToggle();
+        }
+    );
+}
+
+function test_html() {
+    $('div.demo-container').html();
+    $("p").click(function () {
+        var htmlStr = $(this).html();
+        $(this).text(htmlStr);
+    });
+    $('div.demo-container')
+        .html('<p>All new content. <em>You bet!</em></p>');
+    $('div.demo-container').html(function (index, oldhtml) {
+        var emph = '<em>' + $('p').length + ' paragraphs!</em>';
+        return '<p>All new content for ' + emph + '</p>';
+    });
+    $("div").html("<b>Wow!</b> Such excitement...");
+    $("div b").append(document.createTextNode("!!!"))
+              .css("color", "red");
+}
+
+function test_inArray() {
+    var arr: any[] = [4, "Pete", 8, "John"];
+    var $spans = $("span");
+    $spans.eq(0).text(jQuery.inArray("John", arr));
+    $spans.eq(1).text(jQuery.inArray(4, arr));
+    $spans.eq(2).text(jQuery.inArray("Karl", arr));
+    $spans.eq(3).text(jQuery.inArray("Pete", arr, 2));
+
+    var arr2: number[] = [1, 2, 3, 4];
+    $spans.eq(1).text(jQuery.inArray(4, arr2));
+}
+
+function test_index() {
+    var listItem = document.getElementById('bar');
+    alert('Index: ' + $('li').index(listItem));
+    var listItems = $('li:gt(0)');
+    alert('Index: ' + $('li').index(listItems));
+    alert('Index: ' + $('#bar').index());
+    $("div").click(function () {
+        var index = $("div").index(this);
+        $("span").text("That was div index #" + index);
+    });
+    var listItems = $('li:gt(0)');
+    $('div').html('Index: ' + $('li').index(listItems));
+    $('div').html('Index: ' + $('#bar').index('li'));
+    var foobar = $("li").index($('#foobar'));
+    $('div').html('Index: ' + foobar);
+}
+
+function test_innerHeight() {
+    var p = $("p:first");
+    $("p:last").text("innerHeight:" + p.innerHeight());
+
+    p.innerHeight(123);
+    p.innerHeight('123px');
+}
+
+function test_innerWidth() {
+    var p = $("p:first");
+    $("p:last").text("innerWidth:" + p.innerWidth());
+
+
+    p.innerWidth(123);
+    p.innerWidth('123px');
+}
+
+function test_outerHeight() {
+    var p = $("p:first");
+    $("p:last").text(
+        "outerHeight:" + p.outerHeight() +
+        " , outerHeight( true ):" + p.outerHeight(true));
+
+    p.outerHeight(123);
+    p.outerHeight('123px');
+}
+
+function test_outerWidth() {
+    var p = $("p:first");
+    $("p:last").text(
+        "outerWidth:" + p.outerWidth() +
+        " , outerWidth( true ):" + p.outerWidth(true));
+
+    p.outerWidth(123);
+    p.outerWidth('123px');
+}
+
+function test_scrollLeft() {
+    var p = $("p:first");
+    $("p:last").text("scrollLeft:" + p.scrollLeft());
+
+    $("div.demo").scrollLeft(300);
+}
+
+function test_scrollTop() {
+    var p = $("p:first");
+    $("p:last").text("scrollTop:" + p.scrollTop());
+
+    $("div.demo").scrollTop(300);
+}
+
+function test_parent() {
+    $("*", document.body).each(function () {
+        var parentTag = $(this).parent().get(0).tagName;
+        $(this).prepend(document.createTextNode(parentTag + " > "));
+    });
+    $("p").parent(".selected").css("background", "yellow");
+}
+
+function test_parents() {
+    var parentEls = $("b").parents()
+        .map(function () {
+            return this.tagName;
+        })
+        .get()
+        .join(", ");
+    $("b").append("<strong>" + parentEls + "</strong>");
+
+    function showParents() {
+        $("div").css("border-color", "white");
+        var len = $("span.selected")
+            .parents("div")
+            .css("border", "2px red solid")
+            .length;
+        $("b").text("Unique div parents: " + len);
+    }
+    $("span").click(function () {
+        $(this).toggleClass("selected");
+        showParents();
+    });
+}
+
+function test_param() {
+
+    function test1() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3
+            },
+            b: [1, 2, 3]
+        };
+        var recursiveEncoded = $.param(myObject);
+        var recursiveDecoded = decodeURIComponent($.param(myObject));
+
+        alert(recursiveEncoded);
+        alert(recursiveDecoded);
+    }
+
+    function test2() {
+        var myObject = {
+            a: {
+                one: 1,
+                two: 2,
+                three: 3
+            },
+            b: [1, 2, 3]
+        };
+        var shallowEncoded = $.param(myObject, true);
+        var shallowDecoded = decodeURIComponent(shallowEncoded);
+
+        alert(shallowEncoded);
+        alert(shallowDecoded);
+    }
+
+    var params = { width: 1680, height: 1050 };
+    var str = jQuery.param(params);
+    $("#results").text(str);
+
+    // <=1.3.2:
+    $.param({ a: [2, 3, 4] }); // "a=2&a=3&a=4"
+    // >=1.4:
+    $.param({ a: [2, 3, 4] }); // "a[]=2&a[]=3&a[]=4"
+
+    // <=1.3.2:
+    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+    // "a=[object+Object]&d=3&d=4&d=[object+Object]"
+
+    // >=1.4:
+    $.param({ a: { b: 1, c: 2 }, d: [3, 4, { e: 5 }] });
+    // "a[b]=1&a[c]=2&d[]=3&d[]=4&d[2][e]=5"
+}
+
+function test_position() {
+    var p = $("p:first");
+    var position = p.position();
+    $("p:last").text("left: " + position.left + ", top: " + position.top);
+}
+
+function test_insertAfter() {
+    $('<p>Test</p>').insertAfter('.inner');
+    $('h2').insertAfter($('.container'));
+    $("p").insertAfter("#foo");
+}
+
+function test_insertBefore() {
+    $('<p>Test</p>').insertBefore('.inner');
+    $('h2').insertBefore($('.container'));
+    $("p").insertBefore("#foo");
+}
+
+function test_promise() {
+    var div = $("<div>");
+
+    div.promise().done(function (arg1) {
+        // Will fire right away and alert "true"
+        alert(this === div && arg1 === div);
+    });
+
+    $("button").on("click", function () {
+        $("p").append("Started...");
+
+        $("div").each(function (i) {
+            $(this).fadeIn().fadeOut(1000 * (i + 1));
+        });
+
+        $("div").promise().done(function () {
+            $("p").append(" Finished! ");
+        });
+    });
+
+    var effect = function () {
+        return $("div").fadeIn(800).delay(1200).fadeOut();
+    };
+
+    $("button").on("click", function () {
+        $("p").append(" Started... ");
+
+        $.when(effect()).done(function () {
+            $("p").append(" Finished! ");
+        });
+    });
+}
+
+function test_is() {
+    $("ul").click(function (event) {
+        var $target = $(event.target);
+        if ($target.is("li")) {
+            $target.css("background-color", "red");
+        }
+    });
+    $("li").click(function () {
+    var $li = $(this),
+        isWithTwo = $li.is(function () {
+            return $('strong', this).length === 2;
+        });
+        if (isWithTwo) {
+            $li.css("background-color", "green");
+        } else {
+            $li.css("background-color", "red");
+        }
+    });
+    $("div").one('click', function () {
+        if ($(this).is(":first-child")) {
+            $("p").text("It's the first div.");
+        } else if ($(this).is(".blue,.red")) {
+            $("p").text("It's a blue or red div.");
+        } else if ($(this).is(":contains('Peter')")) {
+            $("p").text("It's Peter!");
+        } else {
+            $("p").html("It's nothing <em>special</em>.");
+        }
+        $("p").hide().slideDown("slow");
+        $(this).css({ "border-style": "inset", cursor: "default" });
+    });
+    var isFormParent = $("input[type='checkbox']").parent().is("form");
+    $("div").text("isFormParent = " + isFormParent);
+    var isFormParent = $("input[type='checkbox']").parent().is("form");
+    $("div").text("isFormParent = " + isFormParent);
+    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
+    $('li').click(function () {
+        var $li = $(this);
+        if ($li.is($alt)) {
+            $li.slideUp();
+        } else {
+            $li.css("background", "red");
+        }
+    });
+    var $alt = $("#browsers li:nth-child(2n)").css("background", "#00FFFF");
+    $('li').click(function () {
+        if ($alt.is(this)) {
+            $(this).slideUp();
+        } else {
+            $(this).css("background", "red");
+        }
+    });
+}
+
+function test_isTypeGuards() {
+    var foo: number[] | ((x: string) => number) | Window;
+    if (jQuery.isArray(foo)) {
+        foo.push(1515);
+    } else if (jQuery.isWindow(foo)) {
+        foo.close();
+    } else if (jQuery.isFunction(foo)) {
+        foo("hello world");
+    }
+}
+
+function test_isArray() {
+    $("b").append("" + $.isArray([]));
+}
+
+function test_isEmptyObject() {
+    jQuery.isEmptyObject({});
+    jQuery.isEmptyObject({ foo: "bar" });
+}
+
+function test_isFunction() {
+    function stub() { };
+    var objs: any[] = [
+          function () { },
+          { x: 15, y: 20 },
+          null,
+          stub,
+          "function"
+    ];
+    jQuery.each(objs, function (i) {
+        var isFunc = jQuery.isFunction(objs[i]);
+        $("span").eq(i).text(isFunc);
+    });
+    $.isFunction(function () { });
+}
+
+function test_isNumeric() {
+    $.isNumeric("-10");
+    $.isNumeric(16);
+    $.isNumeric(0xFF);
+    $.isNumeric("0xFF");
+    $.isNumeric("8e5");
+    $.isNumeric(3.1415);
+    $.isNumeric(+10);
+    $.isNumeric(144);
+    $.isNumeric("");
+    $.isNumeric({});
+    $.isNumeric(NaN);
+    $.isNumeric(null);
+    $.isNumeric(true);
+    $.isNumeric(Infinity);
+    $.isNumeric(undefined);
+}
+
+function test_isPlainObject() {
+    $.isPlainObject(document.location);
+    jQuery.isPlainObject({});
+    jQuery.isPlainObject("test");
+}
+
+function test_isWindow() {
+    $("b").append("" + $.isWindow(window));
+}
+
+function test_isXMLDoc() {
+    jQuery.isXMLDoc(document);
+    jQuery.isXMLDoc(document.body);
+}
+
+function test_unique() {
+    jQuery.unique($('div.foo, div.bar').get());
+    jQuery.unique($('div.foo, div.bar').toArray());
+
+    var divs: HTMLDivElement[];
+    var unique: HTMLDivElement[];
+    unique = jQuery.unique(divs);
+    unique = jQuery.unique<HTMLDivElement>(divs);
+}
+
+function test_jQuery() {
+    $('div.foo');
+    $('div.foo').click(function () {
+        $('span', this).addClass('bar');
+    });
+    $('div.foo').click(function () {
+        $(this).slideUp();
+    });
+    $.post('url.xml', function (data) {
+        var $child = $(data).find('child');
+    });
+    $.post({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
+    $.get({
+        url: "test.php",
+        success : () => {
+            console.log("successfull");
+        }
+    });
+    var foo = { foo: 'bar', hello: 'world' };
+    var $foo = $(foo);
+    var test1 = $foo.prop('foo');
+    $foo.prop('foo', 'foobar');
+    var test2 = $foo.prop('foo');
+    $foo.data('keyName', 'someValue');
+    console.log($foo);
+    $foo.bind('eventName', function () {
+        console.log('eventName was called');
+    });
+    $foo.trigger('eventName');
+    $foo.triggerHandler('eventName');
+    $("div > p").css("border", "1px solid gray");
+    $("input:radio", document.forms[0]);
+    var xml: any;
+    $("div", xml.responseXML);
+    $(document.body).css("background", "black");
+    var myForm: any;
+    $(myForm.elements).hide();
+    $('<p id="test">My <em>new</em> text</p>').appendTo('body');
+    $('<img />');
+    $('<input>');
+    var el = $('1<br/>2<br/>3');
+    el = $('1<br/>2<br/>3 >');
+    $('<input />', {
+        type: 'text',
+        name: 'test'
+    }).appendTo("body");
+    $('<input type="text" />').attr({
+        name: 'test'
+    }).appendTo("body");
+    $("<div><p>Hello</p></div>").appendTo("body");
+    $("<div/>", {
+        "class": "test",
+        text: "Click me!",
+        click: function () {
+            $(this).toggleClass("test");
+        }
+    }).appendTo("body");
+    jQuery(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+    jQuery(document).ready(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+}
+
+function test_fn_extend() {
+    jQuery.fn.extend({
+        check: function () {
+            return this.each(function () {
+                this.checked = true;
+            });
+        },
+        uncheck: function () {
+            return this.each(function () {
+                this.checked = false;
+            });
+        }
+    });
+
+    // Use the newly created .check() method
+    //$( "input[type='checkbox']" ).check();
+    // The above test cannot be run as no way that I know of in TypeScript to model the augmentation of jQueryStatic with dynamically added methods
+    // The below would only work at runtime if extend had first been called.
+    $("input[type='checkbox']")["check"]();
+}
+
+function test_jquery() {
+    var a = <any>{ what: "A regular JS object" },
+    b = $('body');
+    if (a.jquery) {
+        alert(' a is a jQuery object! ');
+    }
+    if (b.jquery) {
+        alert(' b is a jQuery object! ');
+    }
+    alert('You are running jQuery version: ' + $.fn.jquery);
+
+    $("div.foo");
+
+    $("div.foo").click(function () {
+        $("span", this).addClass("bar");
+    });
+
+    $("div.foo").click(function () {
+        $(this).slideUp();
+    });
+
+    $.post("url.xml", function (data) {
+        var $child = $(data).find("child");
+    });
+
+    // Define a plain object
+    var foo = { foo: "bar", hello: "world" };
+
+    // Pass it to the jQuery function
+    var $foo = $(foo);
+
+    // Test accessing property values
+    var test1 = $foo.prop("foo"); // bar
+
+    // Test setting property values
+    $foo.prop("foo", "foobar");
+    var test2 = $foo.prop("foo"); // foobar
+
+    // Test using .data() as summarized above
+    $foo.data("keyName", "someValue");
+    console.log($foo); // will now contain a jQuery{randomNumber} property
+
+    // Test binding an event name and triggering
+    $foo.on("eventName", function () {
+        console.log("eventName was called");
+    });
+
+    $foo.trigger("eventName"); // Logs "eventName was called"
+
+    $foo.triggerHandler("eventName"); // Also logs "eventName was called"
+
+    $("div > p").css("border", "1px solid gray");
+
+    $("input:radio", document.forms[0]);
+
+    $(document.body).css("background", "black");
+
+    var myForm: HTMLFormElement;
+    $(myForm.elements).hide();
+
+    $("<p id='test'>My <em>new</em> text</p>").appendTo("body");
+
+    $("<a href='http://jquery.com'></a>");
+
+    $("<img>");
+    $("<input>");
+
+    var el = $("1<br>2<br>3"); // returns [<br>, "2", <br>]
+    el = $("1<br>2<br>3 >"); // returns [<br>, "2", <br>, "3 &gt;"]
+
+    $("<div></div>", {
+        "class": "my-div",
+        on: {
+            touchstart: function (event) {
+                // Do something
+            }
+        }
+    }).appendTo("body");
+
+    $("<div></div>")
+        .addClass("my-div")
+        .on({
+            touchstart: function (event) {
+                // Do something
+            }
+        })
+        .appendTo("body");
+
+    $("<div><p>Hello</p></div>").appendTo("body")
+
+    $("<div/>", {
+            "class": "test",
+            text: "Click me!",
+            click: function () {
+                $(this).toggleClass("test");
+            }
+        })
+        .appendTo("body");
+
+    $(function () {
+        // Document is ready
+    });
+
+    jQuery(function ($) {
+        // Your code using failsafe $ alias here...
+    });
+
+    $(document.body)
+        .click(function () {
+            $(document.body).append($("<div>"));
+            var n = $("div").length;
+            $("span").text("There are " + n + " divs." +
+                "Click to add more.");
+        })
+    // Trigger the click to start
+        .trigger("click");
+}
+
+function test_keydown() {
+    $('#target').keydown(function () {
+        alert('Handler for .keydown() called.');
+    });
+    $('#other').click(function () {
+        $('#target').keydown();
+    });
+    var xTriggered = 0;
+    $('#target').keydown(function (event) {
+        if (event.which == 13) {
+            event.preventDefault();
+        }
+        xTriggered++;
+        var msg = 'Handler for .keydown() called ' + xTriggered + ' time(s).';
+    });
+    $('#other').click(function () {
+        $('#target').keydown();
+    });
+}
+
+function test_keypress() {
+    $("#target").keypress(function () {
+        alert("Handler for .keypress() called.");
+    });
+    $('#other').click(function () {
+        $("#target").keypress();
+    });
+    $("#other").click(function () {
+        $("#target").keypress();
+    });
+}
+
+function test_keyup() {
+    $('#target').keyup(function () {
+        alert('Handler for .keyup() called.');
+    });
+    $('#other').click(function () {
+        $('#target').keyup();
+    });
+    $('#other').click(function () {
+        $('#target').keyup();
+    });
+}
+
+function test_resize() {
+	$('#other').resize();
+    $('#other').resize(function () {
+        alert('Handler for .resize() called.');
+    });
+    $('#other').resize({ "event": "Data" }, function () {
+        alert('Handler for .resize() called.');
+    });
+}
+
+function test_scroll() {
+	$('#other').scroll();
+    $('#other').scroll(function () {
+        alert('Handler for .scroll() called.');
+    });
+    $('#other').scroll({ "event": "Data" }, function () {
+        alert('Handler for .scroll() called.');
+    });
+}
+
+function test_select() {
+	$('#other').select();
+    $('#other').select(function () {
+        alert('Handler for .select() called.');
+    });
+    $('#other').select({ "event": "Data" }, function () {
+        alert('Handler for .select() called.');
+    });
+}
+
+function test_last() {
+    $('li').last().css('background-color', 'red');
+    $("p span").last().addClass('highlight');
+}
+
+function test_length() {
+    $(document.body).click(function () {
+        $(document.body).append($("<div>"));
+        var n = $("div").length;
+        $("span").text("There are " + n + " divs." + "Click to add more.");
+    }).trigger('click');
+}
+
+function test_load() {
+    $('#result').load('ajax/test.html');
+    $('#result').load('ajax/test.html', function () {
+        alert('Load was performed.');
+    });
+    $('#result').load('ajax/test.html #container');
+    $('#b').load('article.html #target');
+    $("#success").load("/not-here.php", function (response, status, xhr) {
+        if (status == "error") {
+            var msg = "Sorry but there was an error: ";
+            $("#error").html(msg + xhr.status + " " + xhr.statusText);
+        }
+    });
+    $("#objectID").load("test.php", { 'choices[]': ["Jon", "Susan"] });
+    $("#feeds").load("feeds.php", { limit: 25 }, function () {
+        alert("The last 25 entries in the feed have been loaded");
+    });
+}
+
+function test_loadEvent() {
+    $('#book').load(function () { });
+    $('img.userIcon').load(function () {
+        if ($(this).height() > 100) {
+            $(this).addClass('bigImg');
+        }
+    });
+}
+
+function test_mousedown() {
+    $('#target').mousedown(function () {
+        alert('Handler for .mousedown() called.');
+    });
+    $('#other').click(function () {
+        $('#target').mousedown();
+    });
+}
+
+function test_mouseenter() {
+    $('#outer').mouseenter(function () {
+        $('#log').append('<div>Handler for .mouseenter() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseenter();
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        $("p:first", this).text("mouse enter");
+        $("p:last", this).text(++n);
+    }).mouseleave(function () {
+        $("p:first", this).text("mouse leave");
+    });
+}
+
+function test_mouseleave() {
+    $('#outer').mouseleave(function () {
+        $('#log').append('<div>Handler for .mouseleave() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseleave();
+    });
+    var i = 0;
+    $("div.overout").mouseover(function () {
+        $("p:first", this).text("mouse over");
+    }).mouseout(function () {
+        $("p:first", this).text("mouse out");
+        $("p:last", this).text(++i);
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        $("p:first", this).text("mouse enter");
+    }).mouseleave(function () {
+        $("p:first", this).text("mouse leave");
+        $("p:last", this).text(++n);
+    });
+}
+
+function test_mousemove() {
+    $("#target").mousemove(function (event) {
+        var msg = "Handler for .mousemove() called at ";
+        msg += event.pageX + ", " + event.pageY;
+        $("#log").append("<div>" + msg + "</div>");
+    });
+    $("#other").click(function () {
+        $("#target").mousemove();
+    });
+    $("div").mousemove(function (e) {
+        var pageCoords = "( " + e.pageX + ", " + e.pageY + " )";
+        var clientCoords = "( " + e.clientX + ", " + e.clientY + " )";
+        $("span:first").text("( e.pageX, e.pageY ) : " + pageCoords);
+        $("span:last").text("( e.clientX, e.clientY ) : " + clientCoords);
+    });
+}
+
+function test_mouseout() {
+    $('#outer').mouseout(function () {
+        $('#log').append('Handler for .mouseout() called.');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseout();
+    });
+    var i = 0;
+    $("div.overout").mouseout(function () {
+        $("p:first", this).text("mouse out");
+        $("p:last", this).text(++i);
+    }).mouseover(function () {
+        $("p:first", this).text("mouse over");
+    });
+    var n = 0;
+    $("div.enterleave").bind("mouseenter", function () {
+        $("p:first", this).text("mouse enter");
+    }).bind("mouseleave", function () {
+        $("p:first", this).text("mouse leave");
+        $("p:last", this).text(++n);
+    });
+}
+
+function test_mouseup() {
+    $("p").mouseup(function () {
+        $(this).append('<span style="color:#F00;">Mouse up.</span>');
+    }).mousedown(function () {
+        $(this).append('<span style="color:#00F;">Mouse down.</span>');
+    });
+    $('#target').mouseup(function () {
+        alert('Handler for .mouseup() called.');
+    });
+    $('#other').click(function () {
+        $('#target').mouseup();
+    });
+    $("p").mouseup(function () {
+        $(this).append('<span style="color:#F00;">Mouse up.</span>');
+    }).mousedown(function () {
+        $(this).append('<span style="color:#00F;">Mouse down.</span>');
+    });
+}
+
+function test_mouseover() {
+    $('#outer').mouseover(function () {
+        $('#log').append('<div>Handler for .mouseover() called.</div>');
+    });
+    $('#other').click(function () {
+        $('#outer').mouseover();
+    });
+    var i = 0;
+    $("div.overout").mouseover(function () {
+        $("p:first", this).text("mouse over");
+        $("p:last", this).text(++i);
+    }).mouseout(function () {
+        $("p:first", this).text("mouse out");
+    });
+    var n = 0;
+    $("div.enterleave").mouseenter(function () {
+        n += 1;
+        $(this).find("span").text("mouse enter x " + n);
+    }).mouseleave(function () {
+        $(this).find("span").text("mouse leave");
+    });
+}
+
+function test_makeArray() {
+    var elems = document.getElementsByTagName("div");
+    var arr = jQuery.makeArray(elems);
+    arr.reverse();
+    $(arr).appendTo(document.body);
+    var obj = $('li');
+    var arr = $.makeArray(obj);
+    jQuery.isArray(arr) === true;
+}
+
+function test_replaceAll() {
+    $("<h2>New heading</h2>").replaceAll(".inner");
+    $(".first").replaceAll(".third");
+    $("<b>Paragraph. </b>").replaceAll("p");
+}
+
+function test_replaceWith() {
+    $("div.second").replaceWith("<h2>New heading</h2>");
+    $("div.inner").replaceWith("<h2>New heading</h2>");
+    $("div.third").replaceWith($(".first"));
+
+    $("button").click(function () {
+        $(this).replaceWith("<div>" + $(this).text() + "</div>");
+    });
+
+    $("p").replaceWith("<b>Paragraph. </b>");
+
+    $("p").click(function () {
+        $(this).replaceWith($("div"));
+    });
+
+    $("button").on("click", function () {
+        var $container = $("div.container").replaceWith(function () {
+            return $(this).contents();
+        });
+
+        $("p").append($container.attr("class"));
+    });
+}
+
+function test_map() {
+    $(':checkbox').map(function () {
+        return this.id;
+    }).get().join(',');
+    $("p").append($("input").map(function () {
+        return $(this).val();
+    }).get().join(", "));
+    var mappedItems = $("li").map(function (index) {
+        var replacement:any = $("<li>").text($(this).text()).get(0);
+        if (index === 0) {
+
+            // Make the first item all caps
+            $(replacement).text($(replacement).text().toUpperCase());
+        } else if (index === 1 || index === 3) {
+
+            // Delete the second and fourth items
+            replacement = null;
+        } else if (index === 2) {
+
+            // Make two of the third item and add some text
+            replacement = [replacement, $("<li>").get(0)];
+            $(replacement[0]).append("<b> - A</b>");
+            $(replacement[1]).append("Extra <b> - B</b>");
+        }
+
+        // Replacement will be a dom element, null,
+        // or an array of dom elements
+        return replacement;
+    });
+    $("#results").append(mappedItems);
+    var fakeArray = { "length": 1, 0: "Addy", 1: "Subtracty" };
+    var realArray = $.makeArray(fakeArray)
+    $.map(realArray, function (val, i) { });
+    var arr = ["a", "b", "c", "d", "e"];
+    $("div").text(arr.join(", "));
+    arr = jQuery.map(arr, function (n, i) {
+        return (n.toUpperCase() + i);
+    });
+    $("p").text(arr.join(", "));
+    arr = jQuery.map(arr, function (a) {
+        return a + a;
+    });
+    $("span").text(arr.join(", "));
+    $.map([0, 1, 2], function (n) {
+        return n + 4;
+    });
+    $.map([0, 1, 2], function (n) {
+        return n > 0 ? n + 1 : null;
+    });
+    $.map([0, 1, 2], function (n) {
+        return [n, n + 1];
+    });
+    var dimensions = { width: 10, height: 15, length: 20 };
+    dimensions = $.map(dimensions, function (value, index) {
+        return value * 2;
+    });
+    var dimensions = { width: 10, height: 15, length: 20 },
+    keys = $.map(dimensions, function (value, index) {
+        return index;
+    });
+    $.map([0, 1, 2, 3], function (a) {
+        return a * a;
+    });
+    $.map([0, 1, 52, 97], function (a) {
+        return (a > 50 ? a - 45 : null);
+    });
+    var array = [0, 1, 52, 97];
+    var array2 = $.map(array, function (a, index) {
+        return [a - 45, index];
+    });
+}
+
+function test_merge() {
+    var oldArray: any[];
+    var newArray = $.merge([], oldArray);
+    $.merge([0, 1, 2], [2, 3, 4]);
+    var first = ['a', 'b', 'c'];
+    var second = ['d', 'e', 'f'];
+    $.merge($.merge([], first), second);
+    var z = $.merge<any>([0, 1, 2], ['a', 'b', 'c']);
+}
+
+function test_prop() {
+    var $input = $(this);
+    $("p").html(".attr('checked'): <b>" + $input.attr('checked') + "</b><br>"
+                + ".prop('checked'): <b>" + $input.prop('checked') + "</b><br>"
+                + ".is(':checked'): <b>" + $input.is(':checked')) + "</b>";
+    $("input").prop("disabled", false);
+    $("input").prop("checked", true);
+    $("input").val("someValue");
+    $("input[type='checkbox']").prop("checked", function (i, val) {
+        return !val;
+    });
+    $("input[type='checkbox']").prop({
+        disabled: true
+    });
+    var title: string = $('option:selected', this).prop('title');
+}
+
+function test_val() {
+    // Get the value from a dropdown select
+    $("select.foo option:selected").val();
+
+    // Get the value from a dropdown select even easier
+    $("select.foo").val();
+
+    // Get the value from a checked checkbox
+    $("input:checkbox:checked").val();
+
+    // Get the value from a set of radio buttons
+    $("input:radio[name=bar]:checked").val();
+
+    function displayVals() {
+        var singleValues = $("#single").val();
+        var multipleValues = $("#multiple").val() || [];
+        $("p").html("<b>Single:</b> " + singleValues +
+            " <b>Multiple:</b> " + multipleValues.join(", "));
+    }
+
+    $("select").change(displayVals);
+    displayVals();
+
+
+    $("input")
+        .keyup(function () {
+            var value = $(this).val();
+            $("p").text(value);
+        })
+        .keyup();
+
+    $("input:text.items").val(function (index, value) {
+        return value + " " + this.className;
+    });
+
+    $("button").click(function () {
+        var text = $(this).text();
+        $("input").val(text);
+    });
+
+    $("input").on("blur", function () {
+        $(this).val(function (i, val) {
+            return val.toUpperCase();
+        });
+    });
+
+    $("#single").val("Single2");
+    $("#multiple").val(["Multiple2", "Multiple3"]);
+    $("input").val(["check1", "check2", "radio1"]);
+    $("input").val(1);
+}
+
+function test_selector() {
+  var $main = $('#main');
+  var $mainDivs = $('div', $main);
+  return $mainDivs.selector == '#main div';
+}
+
+function test_text() {
+    var str = $("p:first").text();
+    $("p:last").html(str);
+    $('ul li').text(function (index) {
+        return 'item number ' + (index + 1);
+    });
+    $("p").text("<b>Some</b> new text.");
+}
+
+$('#item').click(function(e) {
+	if (e.ctrlKey) { console.log('control pressed'); }
+	if (e.altKey) { console.log('alt pressed'); }
+});
+
+function test_addBack() {
+    $('li.third-item').nextAll().addBack().css('background-color', 'red');
+
+    $("div.left, div.right").find("div, div > p").addClass("border");
+
+    // First Example
+    $("div.before-addback").find("p").addClass("background");
+
+    // Second Example
+    $("div.after-addback").find("p").addBack().addClass("background");
+}
+
+// http://api.jquery.com/jQuery.parseHTML/
+function test_parseHTML() {
+	var $log = $( "#log" ),
+		str = "hello, <b>my name is</b> jQuery.",
+		html = $.parseHTML( str ),
+		nodeNames = [];
+
+	// Append the parsed HTML
+	$log.append( html );
+
+	// Gather the parsed HTML's node names
+	$.each( html, function( i, el ) {
+		nodeNames[i] = "<li>" + el.nodeName + "</li>";
+	});
+
+	// Insert the node names
+	$log.append( "<h3>Node Names:</h3>" );
+	$( "<ol></ol>" )
+	  .append( nodeNames.join( "" ) )
+	  .appendTo( $log );
+
+	// parse HTML with all parameters
+	$.parseHTML( str, document, true );
+}
+
+// http://api.jquery.com/jQuery.parseJSON/
+function test_parseJSON() {
+    // Return type should be any, not Object
+    var i = $.parseJSON('1');
+    var a = $.parseJSON('[1]');
+    var o = $.parseJSON('{"foo":"bar"}');
+    var s = $.parseJSON('"string"');
+    var n = $.parseJSON('null');
+
+    i instanceof Object; // false
+    a instanceof Object; // true
+    o instanceof Object; // true
+    s instanceof Object; // false
+    n instanceof Object; // false
+}
+
+function test_not() {
+    $("li").not(":even").css("background-color", "red");
+
+    $("li").not(document.getElementById("notli"))
+        .css("background-color", "red");
+
+    $("div").not(".green, #blueone")
+        .css("border-color", "red");
+
+    $("p").not($("#selected")[0]);
+
+    $("p").not("#selected");
+
+    $("p").not($("div p.selected"));
+
+    var el1 = $("<div/>")[0];
+    var el2 = $("<div/>")[0];
+    $("p").not([el1, el2]);
+}
+
+function test_EventIsNewable() {
+    var ev = new jQuery.Event('click');
+}
+
+function test_EventIsCallable() {
+    var ev = jQuery.Event('click');
+}
+
+$.when<any>($.ajax("/my/page.json")).then(a => a.asdf); // is type JQueryPromise<any>
+$.when<any>($.ajax("/my/page.json")).then((a?,b?,c?) => a.asdf); // is type JQueryPromise<any>
+$.when("asdf", "jkl;").done((x,y) => x.length + y.length, (x,y) => x.length + y.length);
+
+var f1 = $.when("fetch"); // Is type JQueryPromise<string>
+var f2: JQueryPromise<string[]> = f1.then(s => [s, s]);
+var f3: JQueryPromise<number> = f2.then(v => 3);
+
+// ISSUE: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+// http://stackoverflow.com/questions/5392344/sending-multipart-formdata-with-jquery-ajax#answer-5976031
+$.ajax({
+    url: 'php/upload.php',
+    data: {},
+    cache: false,
+    contentType: false,
+    processData: false,
+    type: 'POST',
+    success: function (data) {
+        alert(data);
+    }
+});
+
+function test_deferred() {
+
+    function returnPromise(): JQueryPromise<{ MyString: string; MyNumber: number; }> {
+        return $.Deferred<{ MyString: string; MyNumber: number; }>().resolve({
+            MyString: "MyString",
+            MyNumber: 5
+        }, "failed", null);
+    }
+    var x = returnPromise();
+    x.done((data, textStatus, jqXHR) => {
+        var myNumber: number = data.MyNumber;
+        var myString: string = data.MyString;
+        var theTextStatus: string = textStatus;
+        var thejqXHR: JQueryXHR = jqXHR;
+    });
+
+    $.get("test.php").always(function () {
+        alert("$.get completed with success or error callback arguments");
+    });
+    $.get("test.php").done(function () {
+        alert("$.get succeeded");
+    });
+    function fn1() {
+        $("p").append(" 1 ");
+    }
+    function fn2() {
+        $("p").append(" 2 ");
+    }
+    function fn3(n) {
+        $("p").append(n + " 3 " + n);
+    }
+    var dfd = $.Deferred<string>();
+    dfd
+        .done([fn1, fn2], fn3, [fn2, fn1])
+        .done(function (n) {
+            $("p").append(n + " we're done.");
+        });
+    $("button").bind("click", function () {
+        dfd.resolve("and");
+    });
+    $.get("test.php")
+        .done(function () { alert("$.get succeeded"); })
+        .fail(function () { alert("$.get failed!"); });
+    dfd.state();
+    var defer = $.Deferred(),
+        filtered = defer.pipe(function (value) {
+            return value * 2;
+        });
+    defer.resolve(5);
+    filtered.done(function (value) {
+        alert("Value is ( 2*5 = ) 10: " + value);
+    });
+    filtered.fail(function (value) {
+        alert("Value is ( 3*6 = ) 18: " + value);
+    });
+    filtered.done(function (data) { });
+
+    var obj = {
+        hello: function (name) {
+            alert("Hello " + name);
+        }
+    },
+        defer = $.Deferred();
+    defer.promise(obj);
+    defer.resolve("John");
+    $.get("test.php").then(
+        function () { alert("$.get succeeded"); },
+        function () { alert("$.get failed!"); }
+        );
+}
+
+function test_deferred_promise() {
+
+    function asyncEvent() {
+        var dfd = $.Deferred<string>();
+
+        // Resolve after a random interval
+        setTimeout(function () {
+            dfd.resolve("hurray");
+        }, Math.floor(400 + Math.random() * 2000));
+
+        // Reject after a random interval
+        setTimeout(function () {
+            dfd.reject("sorry");
+        }, Math.floor(400 + Math.random() * 2000));
+
+        // Show a "working..." message every half-second
+        setTimeout(function working() {
+            if (dfd.state() === "pending") {
+                dfd.notify("working... ");
+                setTimeout(working, 500);
+            }
+        }, 1);
+
+        // Return the Promise so caller can't change the Deferred
+        return dfd.promise();
+    }
+
+    // Attach a done, fail, and progress handler for the asyncEvent
+    $.when(asyncEvent()).then(
+        function (status) {
+            alert(status + ", things are going well");
+        },
+        function (status) {
+            alert(status + ", you fail this time");
+        },
+        function (status) {
+            $("body").append(status);
+        }
+        );
+}
+
+function test_promise_then_change_type() {
+	function request() {
+		var def = $.Deferred<any>();
+		var promise = def.promise(null);
+
+		def.rejectWith(this, [new Error()]);
+
+		return promise;
+	}
+
+	function count() {
+		var def = request();
+		return def.then<number>(data => {
+			try {
+				var count: number = parseInt(data.count, 10);
+			} catch (err) {
+				return $.Deferred<number>().reject(err).promise();
+			}
+			return $.Deferred<number>().resolve(count).promise();
+		});
+	}
+
+	count().done(data => {
+	}).fail((exception: Error) => {
+	});
+}
+
+function test_promise_then_not_return_deferred() {
+  var state: string;
+
+  var deferred: JQueryDeferred<any> = $.Deferred();
+  state = deferred.state();
+  deferred = deferred.progress();
+  deferred = deferred.done();
+  deferred = deferred.fail();
+  deferred = deferred.always();
+  deferred = deferred.notify();
+  deferred = deferred.resolve();
+  deferred = deferred.reject();
+  promise = deferred.promise();
+  promise = deferred.then(function () { });
+
+  var promise: JQueryPromise<any> = $.Deferred().promise();
+  state = promise.state();
+  promise = promise.then(function () { });
+  promise = promise.progress();
+  promise = promise.done();
+  promise = promise.fail();
+  promise = promise.always();
+}
diff --git a/types/jquery/v2/tsconfig.json b/types/jquery/v2/tsconfig.json
new file mode 100644
index 0000000000..e1c19d0e90
--- /dev/null
+++ b/types/jquery/v2/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-tests.ts"
+    ]
+}
diff --git a/types/jquerymobile/index.d.ts b/types/jquerymobile/index.d.ts
index 8d72e7d2a3..ec386acc81 100644
--- a/types/jquerymobile/index.d.ts
+++ b/types/jquerymobile/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jquerymobile.com/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
diff --git a/types/jqueryui/index.d.ts b/types/jqueryui/index.d.ts
index d74cc76c66..ee4752bb7f 100644
--- a/types/jqueryui/index.d.ts
+++ b/types/jqueryui/index.d.ts
@@ -2,9 +2,9 @@
 // Project: http://jqueryui.com/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-
-/// <reference types="jquery"/>
+/// <reference types="jquery" />
 
 declare namespace JQueryUI {
     // Accordion //////////////////////////////////////////////////
@@ -1804,6 +1804,7 @@ interface JQuery {
     tabs(methodName: 'load', index: number): void;
     tabs(methodName: 'refresh'): void;
     tabs(methodName: 'widget'): JQuery;
+    tabs(methodName: 'select', index: number): JQuery;
     tabs(methodName: string): JQuery;
     tabs(options: JQueryUI.TabsOptions): JQuery;
     tabs(optionLiteral: string, optionName: string): any;
diff --git a/types/jqueryui/jqueryui-tests.ts b/types/jqueryui/jqueryui-tests.ts
index 5755738622..93384f576e 100644
--- a/types/jqueryui/jqueryui-tests.ts
+++ b/types/jqueryui/jqueryui-tests.ts
@@ -641,7 +641,7 @@ function test_autocomplete() {
                     .insertAfter(select);
 
             function removeIfInvalid(element) {
-                var value = $(element).val(),
+                var value = $(element).val() as string,
                     matcher = new RegExp("^" + $.ui.autocomplete.escapeRegex(value) + "$", "i"),
                     valid = false;
                 select.children("option").each(() => {
@@ -1080,7 +1080,7 @@ function test_datepicker() {
     $("#datepicker").datepicker($.datepicker.regional["fr"]);
     $("#locale").change(function () {
         $("#datepicker").datepicker("option",
-            $.datepicker.regional[$(this).val()]);
+            $.datepicker.regional[$(this).val() as string]);
     });
     $("#datepicker").datepicker({
         altField: "#alternate",
@@ -1692,11 +1692,11 @@ function test_tabs() {
     });
     $("#tabs").tabs({
         beforeLoad: function (event, ui) {
-            ui.jqXHR.error = function () {
+            ui.jqXHR.fail(function () {
                 ui.panel.html(
                     "Couldn't load this tab. We'll try to fix this as soon as possible. " +
                     "If this wouldn't be a demo.");
-            };
+            });
         }
     });
     $("#tabs").tabs({
@@ -1789,7 +1789,7 @@ function test_effects() {
         width: 500
     }, 1000);
     $("div").effect("bounce", "slow");
-    var selectedEffect = $("#effectTypes").val();
+    var selectedEffect = $("#effectTypes").val() as string;
     var options: any;
     if (selectedEffect === "scale") {
         options = { percent: 0 };
@@ -1869,7 +1869,7 @@ function test_widget() {
 }
 
 function test_easing() {
-    const easing = jQuery.easing;
+    const easing = (<any> jQuery).easing;
 
     function test_easing_function( name: string, fn: JQueryEasingFunction ) {
         const step = Math.pow( 2, -3 ); // use power of 2 to prevent floating point rounding error
diff --git a/types/jqueryui/tsconfig.json b/types/jqueryui/tsconfig.json
index af4d1d59a3..537439f7cd 100644
--- a/types/jqueryui/tsconfig.json
+++ b/types/jqueryui/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jqueryui-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/js-beautify/index.d.ts b/types/js-beautify/index.d.ts
index 47fdd8292e..e73e013325 100644
--- a/types/js-beautify/index.d.ts
+++ b/types/js-beautify/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for js_beautify
 // Project: https://github.com/beautify-web/js-beautify/
-// Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg/>, Hans Windhoff <https://github.com/hansrwindhoff/> 
+// Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg/>, Hans Windhoff <https://github.com/hansrwindhoff/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface JsBeautifyOptions {
@@ -30,18 +30,20 @@ interface HTMLBeautifyOptions {
   indent_size?: number;
   indent_char?: string;
   indent_with_tabs?: boolean;
+  indent_handlebars?: boolean;
   eol?: string;
   end_with_newline?: boolean;
   preserve_newlines?: boolean;
   max_preserve_newlines?: number;
   indent_inner_html?: boolean;
   brace_style?: 'collapse-preserve-inline'|'collapse'|'expand'|'end-expand'|'none';
-  indent_scripts?: boolean; 
+  indent_scripts?: 'keep'|'separate'|'normal';
   wrap_line_length?: number;
   wrap_attributes?: 'auto'|'force' ;
   wrap_attributes_indent_size?: number;
-  unformatted?: string;
-  extra_liners?: string;
+  unformatted?: string[];
+  content_unformatted?: string[];
+  extra_liners?: string|string[];
 }
 
 interface CSSBeautifyOptions {
@@ -50,7 +52,7 @@ interface CSSBeautifyOptions {
   indent_with_tabs?: boolean;
   eol?: string;
   end_with_newline?: boolean;
-  selector_separator_newline?: boolean;   
+  selector_separator_newline?: boolean;
   newline_between_rules?: boolean;
 }
 
@@ -61,7 +63,7 @@ interface jsb{
 
   css:(js_source_text: string, options?: CSSBeautifyOptions) => string ;
   css_beautify:(js_source_text: string, options?: CSSBeautifyOptions) => string ;
-  
+
   html:(js_source_text: string, options?: HTMLBeautifyOptions) => string ;
   html_beautify:(js_source_text: string, options?: HTMLBeautifyOptions) => string ;
 }
diff --git a/types/js-data-angular/index.d.ts b/types/js-data-angular/index.d.ts
index 9c30feb8dc..60d0b66567 100644
--- a/types/js-data-angular/index.d.ts
+++ b/types/js-data-angular/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/js-data/js-data-angular
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="js-data" />
 /// <reference types="angular" />
diff --git a/types/js-data/js-data-tests.ts b/types/js-data/js-data-tests.ts
index 9b77da72ac..12ebc9026d 100644
--- a/types/js-data/js-data-tests.ts
+++ b/types/js-data/js-data-tests.ts
@@ -30,7 +30,7 @@ User.find(1).then(function (user:IUser) {
 var user:IUser = User.createInstance({name: 'John'});
 
 var store = new JSData.DS();
-var User2 = store.defineResource('user');
+var User2 = store.defineResource<IUser>('user');
 var user:IUser = User2.inject({id: 1, name: 'John'});
 var user2:IUser = User2.inject({id: 1, age: 30});
 
@@ -601,4 +601,4 @@ customActionResourceInstance.on("DS.change", myEvtHandler);
 customActionResourceInstance.off("DS.change", myEvtHandler);
 customActionResourceInstance.emit("DS.change", customActionResource, customActionResourceInstance);
 
-JSData.DSUtils.Promise = Promise;
\ No newline at end of file
+JSData.DSUtils.Promise = Promise;
diff --git a/types/js-data/v1/js-data-tests.ts b/types/js-data/v1/js-data-tests.ts
index 0832f066d9..69a056b081 100644
--- a/types/js-data/v1/js-data-tests.ts
+++ b/types/js-data/v1/js-data-tests.ts
@@ -30,7 +30,7 @@ User.find(1).then(function (user:IUser) {
 var user:IUser = User.createInstance({name: 'John'});
 
 var store = new JSData.DS();
-var User2 = store.defineResource('user');
+var User2 = store.defineResource<IUser>('user');
 var user:IUser = User2.inject({id: 1, name: 'John'});
 var user2:IUser = User2.inject({id: 1, age: 30});
 
diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 7f19fb32eb..d19f10a61c 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -7,7 +7,8 @@ declare namespace jsyaml {
 	export function safeLoad(str: string, opts?: LoadOptions): any;
 	export function load(str: string, opts?: LoadOptions): any;
 
-	export class Type implements TypeConstructorOptions {
+        export interface Type extends TypeConstructorOptions { }
+	export class Type {
 			constructor(tag: string, opts?: TypeConstructorOptions);
 			tag: string;
 	}
diff --git a/types/jscrollpane/index.d.ts b/types/jscrollpane/index.d.ts
index a2bde3955b..bf5f4c36c7 100644
--- a/types/jscrollpane/index.d.ts
+++ b/types/jscrollpane/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jscrollpane.kelvinluck.com/
 // Definitions by: Dániel Tar <https://github.com/qcz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jsdeferred/index.d.ts b/types/jsdeferred/index.d.ts
index ecfeff3a57..4002ffaee8 100644
--- a/types/jsdeferred/index.d.ts
+++ b/types/jsdeferred/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Daisuke Mino <https://github.com/minodisk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery"/>
-
 interface Loop {
     begin?: number;
     end?: number;
diff --git a/types/jsdeferred/jsdeferred-tests.ts b/types/jsdeferred/jsdeferred-tests.ts
index 3b0d39ec2e..7a24b7a441 100644
--- a/types/jsdeferred/jsdeferred-tests.ts
+++ b/types/jsdeferred/jsdeferred-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 declare function alert(a: any): void;
 
 interface IHttp {
diff --git a/types/jsdeferred/tsconfig.json b/types/jsdeferred/tsconfig.json
index b65528ce33..63824aad98 100644
--- a/types/jsdeferred/tsconfig.json
+++ b/types/jsdeferred/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "jsdeferred-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index 0f272a7c35..ca17ea4bbf 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -1,198 +1,138 @@
-// Type definitions for jsdom 2.0.0
-// Project: https://github.com/tmpvar/jsdom
-// Definitions by: Asana <https://asana.com>
+// Type definitions for jsdom 11.0
+// Project: https://github.com/tmpvar/jsdom#readme
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
-/// <reference types="jquery" />
 
+import { EventEmitter } from 'events';
+import { MarkupData } from 'parse5';
+import * as tough from 'tough-cookie';
+import { Script } from 'vm';
 
+export class JSDOM {
+    static fromURL(url: string | Buffer | jsdom.BinaryData, options?: jsdom.FromUrlOptions | object): Promise<JSDOM>;
 
-import EventEmitter = NodeJS.EventEmitter;
+    static fromFile(url: string | Buffer | jsdom.BinaryData, options?: jsdom.Options | object): Promise<JSDOM>;
 
-/**
- * The do-what-I-mean API.
- *
- * Example:
- * jsdom.env(html, function (errors, window) {
- *  // free memory associated with the window
- *  window.close();
- * });
- *
- * @param urlOrSource may be a URL, file name, or HTML fragment
- * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
- * @param config  Configuration object
- * @param callback 
- */
-export declare function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
-export declare function env(urlOrHtml: string, scripts: string, callback: Callback): void;
-export declare function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
-export declare function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
-export declare function env(urlOrHtml: string, callback: Callback): void;
-export declare function env(urlOrHtml: string, config: Config, callback?: Callback): void;
-export declare function env(config: Config, callback?: Callback): void;
+    static fragment(html: string): DocumentFragment;
 
-export declare function serializeDocument(doc: Document): string;
+    constructor(html?: string | Buffer | jsdom.BinaryData, options?: jsdom.Options | object);
 
-export interface VirtualConsole extends EventEmitter {
-    sendTo(console: Console): VirtualConsole;
+    readonly window: jsdom.Window;
+    readonly virtualConsole: jsdom.VirtualConsole;
+    readonly cookieJar: jsdom.CookieJar;
+
+    /**
+     * The serialize() method will return the HTML serialization of the document, including the doctype.
+     */
+    serialize(): string;
+
+    /**
+     * The nodeLocation() method will find where a DOM node is within the source document, returning the parse5 location info for the node.
+     */
+    nodeLocation(node: Node): MarkupData.ElementLocation | null;
+
+    /**
+     * The built-in vm module of Node.js allows you to create Script instances,
+     * which can be compiled ahead of time and then run multiple times on a given "VM context".
+     * Behind the scenes, a jsdom Window is indeed a VM context.
+     * To get access to this ability, use the runVMScript() method.
+     */
+    runVMScript(script: Script): void;
+
+    reconfigure(settings: jsdom.ReconfigureSettings | object): void;
 }
 
-export interface VirtualConsoleOptions {
-}
-
-export interface WindowProperties {
-    parsingMode?: string; // html, xml, auto, undefined
-    contentType?: string;
-    parser?: any;
-    url?: string;
-    referrer?: string;
-    cookieJar?: CookieJar;
-    cookie?: string;
-    resourceLoader?: any;
-    deferClose?: boolean;
-    concurrentNodeIterators?: number;
-    virtualConsole?: VirtualConsole;
-    created?: (something: any, window: Window) => any;
-    features?: FeatureOptions;
-    top?: Window;
-}
-
-// tough-cookie
-export interface CookieJar {
-
-}
-
-export declare function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
-export declare function getVirtualConsole(window: Window): VirtualConsole;
-export declare function createCookieJar(): CookieJar;
-export declare function nodeLocation(node: Node): any;
-export declare function reconfigureWindow(window: Window, newProps: WindowProperties): void;
-export declare function changeURL(window: Window, url: string): void;
-
-export declare function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
-
-export declare var debugMode: boolean;
-
-export interface DocumentWithParentWindow extends Document {
-    parentWindow: Window;
-}
-
-/**
- * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
- * separately supply script that it will inject and execute. It just gives you back a document object,
- * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
- * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
- * normal HTML page.
- *
- * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
- *					equivalent to what a browser will give if you open up an empty .html file.
- * @param options	see the explanation of the config object above.
- */
-export declare function jsdom(markup?: string, config?: Config): DocumentWithParentWindow;
-
-/**
- * Before creating any documents, you can modify the defaults for all future documents:
- */
-export declare var availableDocumentFeatures: FeatureOptions;
-export declare var defaultDocumentFeatures: FeatureOptions;
-export declare var applyDocumentFeatures: FeatureOptions;
-
-export interface Callback {
-    (errors: Error[], window: Window): any;
-}
-
-export interface FeatureOptions {
-    /**
-     * Enables/disables fetching files over the file system/HTTP
-     * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
-     * Default for jsdom.env: false
-     */
-    FetchExternalResources?: string[] | boolean;
-
-    /**
-     * Enables/disables JavaScript execution
-     * Default: ["script"]
-     * Allowed: ["script"] or false, 
-     * Default for jsdom.env: false
-     */
-    ProcessExternalResources?: string[] | boolean;
-
-    /**
-     * Filters resource downloading and processing to disallow those matching the given regular expression
-     * Default: false (allow all)
-     * Allowed: /url to be skipped/ or false
-     * Example: /http:\/\/example.org/js/bad\.js/
-     */
-    SkipExternalResources?: string | boolean;
-}
-
-export interface EnvDocument {
-    /**
-     * the new document will have this referrer.
-     */
-    referrer?: string;
-    /**
-     * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
-     */
-    cookie?: string;
-    /**
-     * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
-     */
-    cookieDomain?: string;
-}
-
-export interface Config {
-    /**
-     * a HTML fragment
-     */
-    html?: string;
-    /**
-     * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
-     */
-    file?: string;
-    /**
-     * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
-     */
-    url?: string;
-    /**
-     * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
-     */
-    scripts?: string[];
-    /**
-     * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
-     */
-    src?: string[];
-    /**
-     * a custom cookie jar, if desired; see mikeal/request documentation.
-     */
-    jar?: CookieJar;
-    /**
-     *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
-     */
-    parsingMode?: string;
-    document?: EnvDocument;
-    /**
-     * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
-     */
-    features?: FeatureOptions;
-
-    virtualConsole?: VirtualConsole;
-
-    /**
-     * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
-     * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
-     * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
-     * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
-     */
-    done?: Callback;
-    /**
-     * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
-     */
-    loaded?: Callback;
-
-    /**
-     * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
-     */
-    created?: (error: Error, window: Window) => void;
+// Alias DOM Window so we can extend from it and still name the type Window
+// tslint:disable-next-line strict-export-declare-modifiers
+type DOMWindow = Window;
+
+export namespace jsdom {
+    interface FromUrlOptions extends Pick<FromUrlOptions._Impl, keyof FromUrlOptions._Impl> { }
+
+    namespace FromUrlOptions {
+        interface _Impl {
+            /**
+             * referrer just affects the value read from document.referrer.
+             * It defaults to no referrer (which reflects as the empty string).
+             */
+            referrer: string;
+            /**
+             * userAgent affects the value read from navigator.userAgent, as well as the User-Agent header sent while fetching subresources.
+             * It defaults to `Mozilla/5.0 (${process.platform}) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/${jsdomVersion}`.
+             */
+            userAgent: string;
+            /**
+             * includeNodeLocations preserves the location info produced by the HTML parser,
+             * allowing you to retrieve it with the nodeLocation() method (described below).
+             * It defaults to false to give the best performance,
+             * and cannot be used with an XML content type since our XML parser does not support location info.
+             */
+            includeNodeLocations: boolean;
+            runScripts: 'dangerously' | 'outside-only';
+            resources: 'usable';
+            virtualConsole: VirtualConsole;
+            cookieJar: CookieJar;
+            beforeParse(window: jsdom.Window): void;
+        }
+    }
+
+    interface Options extends Pick<Options._Impl, keyof Options._Impl> { }
+
+    namespace Options {
+        interface _Impl extends FromUrlOptions._Impl {
+            /**
+             * url sets the value returned by window.location, document.URL, and document.documentURI,
+             * and affects things like resolution of relative URLs within the document
+             * and the same-origin restrictions and referrer used while fetching subresources.
+             * It defaults to "about:blank".
+             */
+            url: string;
+            /**
+             * contentType affects the value read from document.contentType, and how the document is parsed: as HTML or as XML.
+             * Values that are not "text/html" or an XML mime type will throw. It defaults to "text/html".
+             */
+            contentType: string;
+        }
+    }
+
+    interface Window extends DOMWindow {
+        ran: number;
+
+        eval(script: string): void;
+    }
+
+    type BinaryData = ArrayBuffer | DataView | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+
+    class VirtualConsole extends EventEmitter {
+        on<K extends keyof Console>(method: K, callback: Console[K]): this;
+        on(event: 'jsdomError', callback: (e: Error) => void): this;
+
+        sendTo(console: Console, options?: VirtualConsole.SendToOptions | object): this;
+    }
+
+    namespace VirtualConsole {
+        interface SendToOptions extends Pick<SendToOptions._Impl, keyof SendToOptions._Impl> { }
+
+        namespace SendToOptions {
+            interface _Impl {
+                omitJSDOMErrors: boolean;
+            }
+        }
+    }
+
+    class CookieJar extends tough.CookieJar { }
+
+    const toughCookie: typeof tough;
+
+    interface ReconfigureSettings extends Pick<ReconfigureSettings._Impl, keyof ReconfigureSettings._Impl> { }
+
+    namespace ReconfigureSettings {
+        interface _Impl {
+            windowTop: DOMWindow;
+            url: string;
+        }
+    }
 }
diff --git a/types/jsdom/jsdom-tests.ts b/types/jsdom/jsdom-tests.ts
index ec9e60b250..4c80bd2571 100644
--- a/types/jsdom/jsdom-tests.ts
+++ b/types/jsdom/jsdom-tests.ts
@@ -1,51 +1,162 @@
+import { jsdom, JSDOM } from 'jsdom';
+import { CookieJar, MemoryCookieStore } from 'tough-cookie';
+import { Script } from 'vm';
 
-import jsdom = require("jsdom");
+function test_basic_usage() {
+    const dom = new JSDOM(`<!DOCTYPE html><p>Hello world</p>`);
+    console.log(dom.window.document.querySelector('p')!.textContent); // "Hello world"
 
-jsdom.defaultDocumentFeatures.FetchExternalResources = ["img"];
+    const { window } = new JSDOM(`...`);
+    // or even
+    const { document } = (new JSDOM(`...`)).window;
+}
 
-jsdom.env(
-    "http://nodejs.org/dist/",
-    ["http://code.jquery.com/jquery.js"],
-    function (errors: Error[], window: Window) {
+function test_executing_scripts1() {
+    const dom = new JSDOM(`<body>
+  <script>document.body.appendChild(document.createElement("hr"));</script>
+</body>`);
+
+    // The script will not be executed, by default:
+    dom.window.document.body.children.length === 1;
+}
+
+function test_executing_scripts2() {
+    const dom = new JSDOM(`<body>
+  <script>document.body.appendChild(document.createElement("hr"));</script>
+</body>`, { runScripts: 'dangerously' });
+
+    // The script will be executed and modify the DOM:
+    dom.window.document.body.children.length === 2;
+}
+
+function test_executing_scripts3() {
+    const window = (new JSDOM(``, { runScripts: 'outside-only' })).window;
+
+    window.eval(`document.body.innerHTML = "<p>Hello, world!</p>";`);
+    window.document.body.children.length === 1;
+}
+
+function test_virtualConsole() {
+    const virtualConsole = new jsdom.VirtualConsole();
+    const dom = new JSDOM(``, { virtualConsole });
+
+    virtualConsole.on('error', () => { });
+    virtualConsole.on('warn', () => { });
+    virtualConsole.on('info', () => { });
+    virtualConsole.on('dir', () => { });
+    // ... etc. See https://console.spec.whatwg.org/#logging
+
+    virtualConsole.sendTo(console);
+
+    const c = console;
+    virtualConsole.sendTo(c, { omitJSDOMErrors: true });
+}
+
+function test_cookieJar() {
+    const store = {} as MemoryCookieStore;
+    const options = {} as CookieJar.Options;
+
+    const cookieJar = new jsdom.CookieJar(store, options);
+    const dom = new JSDOM(``, { cookieJar });
+}
+
+function test_beforeParse() {
+    const dom = new JSDOM(`<p>Hello</p>`, {
+        beforeParse(window) {
+            window.document.childNodes.length === 0;
+        }
+    });
+}
+
+function test_serialize() {
+    const dom = new JSDOM(`<!DOCTYPE html>hello`);
+
+    dom.serialize() === '<!DOCTYPE html><html><head></head><body>hello</body></html>';
+
+    // Contrast with:
+    dom.window.document.documentElement.outerHTML === '<html><head></head><body>hello</body></html>';
+}
+
+function test_nodeLocation() {
+    const dom = new JSDOM(
+        `<p>Hello
+    <img src="foo.jpg">
+  </p>`,
+        { includeNodeLocations: true }
+    );
+
+    const document = dom.window.document;
+    const bodyEl = document.body; // implicitly created
+    const pEl = document.querySelector('p')!;
+    const textNode = pEl.firstChild!;
+    const imgEl = document.querySelector('img')!;
+
+    console.log(dom.nodeLocation(bodyEl));   // null; it's not in the source
+    console.log(dom.nodeLocation(pEl));      // { startOffset: 0, endOffset: 39, startTag: ..., endTag: ... }
+    console.log(dom.nodeLocation(textNode)); // { startOffset: 3, endOffset: 13 }
+    console.log(dom.nodeLocation(imgEl));    // { startOffset: 13, endOffset: 32 }
+}
+
+function test_runVMScript() {
+    const dom = new JSDOM(``, { runScripts: 'outside-only' });
+    const s = new Script(`
+  if (!this.ran) {
+    this.ran = 0;
+  }
+
+  ++this.ran;
+`);
+
+    dom.runVMScript(s);
+    dom.runVMScript(s);
+    dom.runVMScript(s);
+
+    dom.window.ran === 3;
+}
+
+function test_reconfigure() {
+    const myFakeTopForTesting = {} as Window;
+
+    const dom = new JSDOM();
+
+    dom.window.top === dom.window;
+    dom.window.location.href === 'about:blank';
+
+    dom.reconfigure({ windowTop: myFakeTopForTesting, url: 'https://example.com/' });
+
+    dom.window.top === myFakeTopForTesting;
+    dom.window.location.href === 'https://example.com/';
+}
+
+function test_fromURL() {
+    const options = {} as jsdom.FromUrlOptions;
+
+    JSDOM.fromURL('https://example.com/', options).then(dom => {
+        console.log(dom.serialize());
+    });
+}
+
+function test_fromFile() {
+    const options = {} as jsdom.Options;
+
+    JSDOM.fromFile('stuff.html', options).then(dom => {
+        console.log(dom.serialize());
+    });
+}
+
+function test_fragment() {
+    const frag = JSDOM.fragment(`<p>Hello</p><p><strong>Hi!</strong>`);
+
+    frag.childNodes.length === 2;
+    frag.querySelector('strong')!.textContent = 'Why hello there!';
+    // etc.
+}
+
+function test_fragment_serialization() {
+    const frag = JSDOM.fragment(`<p>Hello</p>`);
+    if (frag instanceof Element) {
+        if (frag.firstChild instanceof Element) {
+            console.log(frag.firstChild.outerHTML); // logs "<p>Hello</p>"
+        }
     }
-);
-
-jsdom.env(
-    "http://nodejs.org/dist/",
-    function (errors: Error[], window: Window) {
-    }
-);
-
-jsdom.env(
-    "http://nodejs.org/dist/",
-    {
-        scripts: ["http://code.jquery.com/jquery.js"],
-    },
-    function (errors: Error[], window: Window) {
-    }
-);
-
-jsdom.env(
-    '<p><a class="the-link" href="https://github.com/tmpvar/jsdom">jsdom!</a></p>',
-    ["http://code.jquery.com/jquery.js"],
-    function (errors: Error[], window: Window) {
-    }
-);
-
-jsdom.env({
-    url: "http://news.ycombinator.com/",
-    scripts: ["http://code.jquery.com/jquery.js"],
-    done: function (errors: Error[], window: Window) {
-    }
-});
-
-var jquery: string;
-
-jsdom.env({
-    url: "http://news.ycombinator.com/",
-    src: [jquery],
-    done: function (errors: Error[], window: Window) {
-    }
-});
-
-var document: Document = jsdom.jsdom("<html></html>");
+}
diff --git a/types/jsdom/package.json b/types/jsdom/package.json
new file mode 100644
index 0000000000..3d840a49e2
--- /dev/null
+++ b/types/jsdom/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "parse5": "^3.0.2"
+    }
+}
diff --git a/types/jsdom/tsconfig.json b/types/jsdom/tsconfig.json
index b18f0d0264..ea8d7b93b3 100644
--- a/types/jsdom/tsconfig.json
+++ b/types/jsdom/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "jsdom-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jsdom/tslint.json b/types/jsdom/tslint.json
new file mode 100644
index 0000000000..4f44991c3c
--- /dev/null
+++ b/types/jsdom/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/jsdom/v2/index.d.ts b/types/jsdom/v2/index.d.ts
new file mode 100644
index 0000000000..099497979b
--- /dev/null
+++ b/types/jsdom/v2/index.d.ts
@@ -0,0 +1,199 @@
+// Type definitions for jsdom 2.0.0
+// Project: https://github.com/tmpvar/jsdom
+// Definitions by: Asana <https://asana.com>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+/// <reference types="jquery" />
+
+
+
+import EventEmitter = NodeJS.EventEmitter;
+
+/**
+ * The do-what-I-mean API.
+ *
+ * Example:
+ * jsdom.env(html, function (errors, window) {
+ *  // free memory associated with the window
+ *  window.close();
+ * });
+ *
+ * @param urlOrSource may be a URL, file name, or HTML fragment
+ * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
+ * @param config  Configuration object
+ * @param callback 
+ */
+export declare function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string, callback: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
+export declare function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
+export declare function env(urlOrHtml: string, callback: Callback): void;
+export declare function env(urlOrHtml: string, config: Config, callback?: Callback): void;
+export declare function env(config: Config, callback?: Callback): void;
+
+export declare function serializeDocument(doc: Document): string;
+
+export interface VirtualConsole extends EventEmitter {
+    sendTo(console: Console): VirtualConsole;
+}
+
+export interface VirtualConsoleOptions {
+}
+
+export interface WindowProperties {
+    parsingMode?: string; // html, xml, auto, undefined
+    contentType?: string;
+    parser?: any;
+    url?: string;
+    referrer?: string;
+    cookieJar?: CookieJar;
+    cookie?: string;
+    resourceLoader?: any;
+    deferClose?: boolean;
+    concurrentNodeIterators?: number;
+    virtualConsole?: VirtualConsole;
+    created?: (something: any, window: Window) => any;
+    features?: FeatureOptions;
+    top?: Window;
+}
+
+// tough-cookie
+export interface CookieJar {
+
+}
+
+export declare function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
+export declare function getVirtualConsole(window: Window): VirtualConsole;
+export declare function createCookieJar(): CookieJar;
+export declare function nodeLocation(node: Node): any;
+export declare function reconfigureWindow(window: Window, newProps: WindowProperties): void;
+export declare function changeURL(window: Window, url: string): void;
+
+export declare function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
+
+export declare var debugMode: boolean;
+
+export interface DocumentWithParentWindow extends Document {
+    parentWindow: Window;
+}
+
+/**
+ * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
+ * separately supply script that it will inject and execute. It just gives you back a document object,
+ * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
+ * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
+ * normal HTML page.
+ *
+ * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
+ *					equivalent to what a browser will give if you open up an empty .html file.
+ * @param options	see the explanation of the config object above.
+ */
+export declare function jsdom(markup?: string, config?: Config): DocumentWithParentWindow;
+
+/**
+ * Before creating any documents, you can modify the defaults for all future documents:
+ */
+export declare var availableDocumentFeatures: FeatureOptions;
+export declare var defaultDocumentFeatures: FeatureOptions;
+export declare var applyDocumentFeatures: FeatureOptions;
+
+export interface Callback {
+    (errors: Error[], window: Window): any;
+}
+
+export interface FeatureOptions {
+    /**
+     * Enables/disables fetching files over the file system/HTTP
+     * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
+     * Default for jsdom.env: false
+     */
+    FetchExternalResources?: string[] | boolean;
+
+    /**
+     * Enables/disables JavaScript execution
+     * Default: ["script"]
+     * Allowed: ["script"] or false, 
+     * Default for jsdom.env: false
+     */
+    ProcessExternalResources?: string[] | boolean;
+
+    /**
+     * Filters resource downloading and processing to disallow those matching the given regular expression
+     * Default: false (allow all)
+     * Allowed: /url to be skipped/ or false
+     * Example: /http:\/\/example.org/js/bad\.js/
+     */
+    SkipExternalResources?: string | boolean;
+}
+
+export interface EnvDocument {
+    /**
+     * the new document will have this referrer.
+     */
+    referrer?: string;
+    /**
+     * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
+     */
+    cookie?: string;
+    /**
+     * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
+     */
+    cookieDomain?: string;
+}
+
+export interface Config {
+    /**
+     * a HTML fragment
+     */
+    html?: string;
+    /**
+     * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
+     */
+    file?: string;
+    /**
+     * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
+     */
+    url?: string;
+    /**
+     * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
+     */
+    scripts?: string[];
+    /**
+     * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
+     */
+    src?: string[];
+    /**
+     * a custom cookie jar, if desired; see mikeal/request documentation.
+     */
+    jar?: CookieJar;
+    /**
+     *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
+     */
+    parsingMode?: string;
+    document?: EnvDocument;
+    /**
+     * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
+     */
+    features?: FeatureOptions;
+
+    virtualConsole?: VirtualConsole;
+
+    /**
+     * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
+     * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
+     * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
+     * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
+     */
+    done?: Callback;
+    /**
+     * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
+     */
+    loaded?: Callback;
+
+    /**
+     * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
+     */
+    created?: (error: Error, window: Window) => void;
+}
diff --git a/types/jsdom/v2/jsdom-tests.ts b/types/jsdom/v2/jsdom-tests.ts
new file mode 100644
index 0000000000..ec9e60b250
--- /dev/null
+++ b/types/jsdom/v2/jsdom-tests.ts
@@ -0,0 +1,51 @@
+
+import jsdom = require("jsdom");
+
+jsdom.defaultDocumentFeatures.FetchExternalResources = ["img"];
+
+jsdom.env(
+    "http://nodejs.org/dist/",
+    ["http://code.jquery.com/jquery.js"],
+    function (errors: Error[], window: Window) {
+    }
+);
+
+jsdom.env(
+    "http://nodejs.org/dist/",
+    function (errors: Error[], window: Window) {
+    }
+);
+
+jsdom.env(
+    "http://nodejs.org/dist/",
+    {
+        scripts: ["http://code.jquery.com/jquery.js"],
+    },
+    function (errors: Error[], window: Window) {
+    }
+);
+
+jsdom.env(
+    '<p><a class="the-link" href="https://github.com/tmpvar/jsdom">jsdom!</a></p>',
+    ["http://code.jquery.com/jquery.js"],
+    function (errors: Error[], window: Window) {
+    }
+);
+
+jsdom.env({
+    url: "http://news.ycombinator.com/",
+    scripts: ["http://code.jquery.com/jquery.js"],
+    done: function (errors: Error[], window: Window) {
+    }
+});
+
+var jquery: string;
+
+jsdom.env({
+    url: "http://news.ycombinator.com/",
+    src: [jquery],
+    done: function (errors: Error[], window: Window) {
+    }
+});
+
+var document: Document = jsdom.jsdom("<html></html>");
diff --git a/types/jsdom/v2/tsconfig.json b/types/jsdom/v2/tsconfig.json
new file mode 100644
index 0000000000..79417fd53c
--- /dev/null
+++ b/types/jsdom/v2/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "jsdom": [
+                "jsdom/v2"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsdom-tests.ts"
+    ]
+}
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 4c0f82b626..bf8f98b574 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for archiver 1.8
+// Type definitions for jsforce 1.8
 // Project: https://github.com/jsforce/jsforce
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,3 +12,4 @@ export { Date } from './date-enum';
 export { RecordResult } from './record-result';
 export { Connection } from './connection';
 export { SObject } from './salesforce-object';
+export { SalesforceId } from './salesforce-id';
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index ac2288fe33..12c9b97cf7 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -12,7 +12,8 @@ export class SObject {
     update(options: SObjectCreateOptions, callback?: (err: Error, ret: any) => void): void;
     retrieve(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
     retrieve(ids: string | string[], options?: Object, callback?: (err: Error, ret: any) => void): void;
-    // upsert(options: SObjectOptions): void;
+    upsert(records: Record | Record[], extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult | RecordResult[]>;
+    upsertBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describeGlobal(callback: (err: Error, res: any) => void): void;
     describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void;
     describeGlobal$(callback: (err: Error, res: any) => void): void;
@@ -30,18 +31,18 @@ export class SObject {
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
-    createBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    createBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     del(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
     destroy(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
     delete(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
-    deleteBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    destroyBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    destroyHardBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    deleteBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    destroyBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    destroyHardBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
-    deleteHardBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    deleteHardBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
-    insertBulk(input?: Record[] | stream.Stream | String, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    insertBulk(input?: Record[] | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;
diff --git a/types/jsnox/index.d.ts b/types/jsnox/index.d.ts
index 9587afc8f1..ad5fe5ed2e 100644
--- a/types/jsnox/index.d.ts
+++ b/types/jsnox/index.d.ts
@@ -2,11 +2,11 @@
 // Project: https://github.com/af/jsnox
 // Definitions by: Steve Baker <https://github.com/stkb/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
-import React = require("react");
+import * as React from "react";
 
 /*
  * JSnoX requires an object with a createElement method.
@@ -25,41 +25,41 @@ interface CreateElement {
     /**
      * Renders an HTML element from the given spec string, with children but without
      * extra props.
-     * @param specString A string that defines a component in a way that resembles 
+     * @param specString A string that defines a component in a way that resembles
      * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
      * @param children A single React node (string or ReactElement) or array of nodes.
-     * Note that unlike with React itself, multiple children must be placed into an array. 
+     * Note that unlike with React itself, multiple children must be placed into an array.
      */
     <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
 
     /**
-     * Renders an HTML element from the given spec string, with optional props 
+     * Renders an HTML element from the given spec string, with optional props
      * and children
-     * @param specString A string that defines a component in a way that resembles 
+     * @param specString A string that defines a component in a way that resembles
      * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
      * @param props Object of html attribute key-value pairs
      * @param children A single React node (string or ReactElement) or array of nodes.
-     * Note that unlike with React itself, multiple children must be placed into an array. 
+     * Note that unlike with React itself, multiple children must be placed into an array.
      */
     <P>(specString: string, props?: React.HTMLAttributes<{}>, children?: React.ReactNode): React.DOMElement<P, Element>
 
 
     /**
      * Renders a React component, with children but no props
-     * @param component A plain React component (created from React.createClass()) or 
+     * @param component A plain React component (created from React.createClass()) or
      * component factory (created from React.createFactory())
      * @param children A single React node (string or ReactElement) or array of nodes.
-     * Note that unlike with React itself, multiple children must be placed into an array. 
+     * Note that unlike with React itself, multiple children must be placed into an array.
      */
     <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
 
-    /** 
+    /**
      * Renders a React component, with optional props and children
-     * @param component A plain React component (created from React.createClass()) or 
+     * @param component A plain React component (created from React.createClass()) or
      * component factory (created from React.createFactory())
      * @param props Props object to pass to the component
      * @param children A single React node (string or ReactElement) or array of nodes.
-     * Note that unlike with React itself, multiple children must be placed into an array. 
+     * Note that unlike with React itself, multiple children must be placed into an array.
      */
     <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
 }
diff --git a/types/jsnox/jsnox-tests.ts b/types/jsnox/jsnox-tests.ts
index 5d7440e315..26014b362f 100644
--- a/types/jsnox/jsnox-tests.ts
+++ b/types/jsnox/jsnox-tests.ts
@@ -1,6 +1,6 @@
 
-import React = require('react');
-import jsnox = require('jsnox');
+import * as React from 'react';
+import * as jsnox from 'jsnox';
 var $ = jsnox(React);
 
 interface PersonProps {
@@ -20,7 +20,7 @@ var clickHandler: React.MouseEventHandler<{}>;
 // Tests with spec string
 function spec_string () {
     var result: React.ReactHTMLElement<HTMLElement>
-    
+
     // just spec string
     result = $('div')
 
diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index a00f878310..02a4a87dbb 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/auth0/node-jsonwebtoken
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Daniel Heim <https://github.com/danielheim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
@@ -47,7 +48,7 @@ export interface SignOptions {
     issuer?: string;
     jwtid?: string;
     noTimestamp?: boolean;
-    header?: Object;
+    header?: object;
     encoding?: string;
 
 }
@@ -74,7 +75,7 @@ export interface DecodeOptions {
 }
 
 export interface VerifyCallback {
-    (err: JsonWebTokenError | TokenExpiredError | NotBeforeError, decoded: any): void;
+    (err: JsonWebTokenError | NotBeforeError | TokenExpiredError, decoded: object | string): void;
 }
 
 export interface SignCallback {
@@ -88,7 +89,7 @@ export interface SignCallback {
  * @param {SignOptions} [options] - Options for the signature
  * @returns {String} The JSON Web Token string
  */
-export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
+export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
 
 /**
  * Sign the given payload into a JSON Web Token string
@@ -97,8 +98,8 @@ export declare function sign(payload: string | Buffer | Object, secretOrPrivateK
  * @param {SignOptions} [options] - Options for the signature
  * @param {Function} callback - Callback to get the encoded token on
  */
-export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
-export declare function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
+export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
+export declare function sign(payload: string | Buffer | object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
 
 /**
  * Synchronously verify given token using a secret or a public key to get a decoded token
@@ -107,8 +108,8 @@ export declare function sign(payload: string | Buffer | Object, secretOrPrivateK
  * @param {VerifyOptions} [options] - Options for the verification
  * @returns The decoded token.
  */
-declare function verify(token: string, secretOrPublicKey: string | Buffer): any;
-declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): any;
+declare function verify(token: string, secretOrPublicKey: string | Buffer): object | string;
+declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): object | string;
 
 /**
  * Asynchronously verify given token using a secret or a public key to get a decoded token
@@ -126,4 +127,4 @@ declare function verify(token: string, secretOrPublicKey: string | Buffer, optio
  * @param {DecodeOptions} [options] - Options for decoding
  * @returns {Object} The decoded Token
  */
-declare function decode(token: string, options?: DecodeOptions): any;
+declare function decode(token: string, options?: DecodeOptions): null | object | string;
diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index e591f31159..650f80d2bc 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -10,29 +10,35 @@ import fs = require("fs");
 var token: string;
 var cert: Buffer;
 
+interface ITestObject {
+  'foo': string
+}
+
+const testObject = { foo: 'bar' }
+
 /**
  * jwt.sign
  * https://github.com/auth0/node-jsonwebtoken#usage
  */
 // sign with default (HMAC SHA256)
-token = jwt.sign({ foo: 'bar' }, 'shhhhh');
+token = jwt.sign(testObject, 'shhhhh');
 
 // sign with default (HMAC SHA256) and single audience
-token = jwt.sign({ foo: 'bar' }, 'shhhhh', { audience: "theAudience"});
+token = jwt.sign(testObject, 'shhhhh', { audience: "theAudience"});
 
 // sign with default (HMAC SHA256) and multiple audiences
-token = jwt.sign({ foo: 'bar' }, 'shhhhh', { audience: ["audience1", "audience2"]});
+token = jwt.sign(testObject, 'shhhhh', { audience: ["audience1", "audience2"]});
 
 // sign with default (HMAC SHA256) and a keyid
-token = jwt.sign({ foo: 'bar' }, 'shhhhh', { keyid: "theKeyId"});
+token = jwt.sign(testObject, 'shhhhh', { keyid: "theKeyId"});
 
 // sign with RSA SHA256
 cert = fs.readFileSync('private.key');  // get private key
-token = jwt.sign({ foo: 'bar' }, cert, { algorithm: 'RS256'});
+token = jwt.sign(testObject, cert, { algorithm: 'RS256'});
 
 
 // sign asynchronously
-jwt.sign({ foo: 'bar' }, cert, { algorithm: 'RS256' }, function(err: Error, token: string) {
+jwt.sign(testObject, cert, { algorithm: 'RS256' }, function(err: Error, token: string) {
   console.log(token);
 });
 
@@ -42,7 +48,9 @@ jwt.sign({ foo: 'bar' }, cert, { algorithm: 'RS256' }, function(err: Error, toke
  */
 // verify a token symmetric
 jwt.verify(token, 'shhhhh', function(err, decoded) {
-  console.log(decoded.foo) // bar
+  const result = decoded as ITestObject
+
+  console.log(result.foo) // bar
 });
 
 // invalid token
@@ -53,8 +61,10 @@ jwt.verify(token, 'wrong-secret', function(err, decoded) {
 
 // verify a token asymmetric
 cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, function(err, decoded) {
-  console.log(decoded.foo) // bar
+jwt.verify(token, cert, function (err, decoded) {
+  const result = decoded as ITestObject
+
+  console.log(result.foo) // bar
 });
 
 // verify audience
diff --git a/types/jsplumb/index.d.ts b/types/jsplumb/index.d.ts
index 48c348f0c4..fbf2df8c3e 100644
--- a/types/jsplumb/index.d.ts
+++ b/types/jsplumb/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jsplumb.org
 // Definitions by: Steve Shearn <https://github.com/shearnie/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jsrender/index.d.ts b/types/jsrender/index.d.ts
index 240bbe0bf3..86f84cae91 100644
--- a/types/jsrender/index.d.ts
+++ b/types/jsrender/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jsviews.com/#jsrender
 // Definitions by: Kensuke Matsuzaki <https://github.com/zakki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jssha/jssha-tests.ts b/types/jssha/jssha-tests.ts
index a6869d6a22..bbff8dedca 100644
--- a/types/jssha/jssha-tests.ts
+++ b/types/jssha/jssha-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import imported = require("jssha");
 
 // constructor
diff --git a/types/jstorage/index.d.ts b/types/jstorage/index.d.ts
index 7881ac7693..ca2da52a0e 100644
--- a/types/jstorage/index.d.ts
+++ b/types/jstorage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jstorage.info/
 // Definitions by: Danil Flores <https://github.com/dflor003/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface JStorageOptions {
     TTL: number;
@@ -160,4 +161,4 @@ interface JStorageStatic {
 
 interface JQueryStatic {
     jStorage: JStorageStatic;
-}
\ No newline at end of file
+}
diff --git a/types/jstree/index.d.ts b/types/jstree/index.d.ts
index 5306332d42..21e07de80d 100644
--- a/types/jstree/index.d.ts
+++ b/types/jstree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.jstree.com/
 // Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/jsts/index.d.ts b/types/jsts/index.d.ts
index 661a3dd17c..0d7f182e77 100644
--- a/types/jsts/index.d.ts
+++ b/types/jsts/index.d.ts
@@ -1602,6 +1602,18 @@ declare namespace jsts {
     }
 
     namespace io {
+        export class GeoJSONReader {
+            constructor();
+
+            /**
+             * Converts a GeoJSON to its <code>Geometry</code> representation.
+             *
+             * @param {Object} The GeoJSON representation of the Geometry.
+             * @return {jsts.geom.Geometry}
+             * geometry a <code>Geometry</code> to process.
+             */
+            read(geometry: Object): geom.Geometry;
+        }
         export class GeoJSONWriter {
             /**
              * Writes the GeoJSON representation of a {@link Geometry}. The
diff --git a/types/jsuite/index.d.ts b/types/jsuite/index.d.ts
index 0b00b0277d..34fd066e0f 100644
--- a/types/jsuite/index.d.ts
+++ b/types/jsuite/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/darrenthill/jsuite
 // Definitions by: Darren Hill <https://github.com/darrenhillconsulting>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="suitescript"/>
 /// <reference types="jquery" />
diff --git a/types/jszip/index.d.ts b/types/jszip/index.d.ts
index be9b053d43..b44d2bc538 100644
--- a/types/jszip/index.d.ts
+++ b/types/jszip/index.d.ts
@@ -168,9 +168,18 @@ interface JSZipGeneratorOptions {
     base64?: boolean;
     /** DEFLATE or STORE */
     compression?: string;
-    /** base64 (default), string, uint8array, blob */
+    /** base64 (default), string, uint8array, arraybuffer, blob */
     type?: string;
     comment?: string;
+    /**
+     * mime-type for the generated file.
+     * Useful when you need to generate a file with a different extension, ie: “.ods”.
+     */
+    mimeType?: string;
+    /** streaming uses less memory */
+    streamFiles?: boolean;
+    /** DOS (default) or UNIX */
+    platform?: string;
 }
 
 interface JSZipLoadOptions {
diff --git a/types/jui-core/index.d.ts b/types/jui-core/index.d.ts
index d8143aaa28..c3c2cb895a 100644
--- a/types/jui-core/index.d.ts
+++ b/types/jui-core/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/juijs/jui-core
 // Definitions by: JinHo Park <https://github.com/easylogic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/jwt-decode/index.d.ts b/types/jwt-decode/index.d.ts
index 5cf3772b68..73dacb3c00 100644
--- a/types/jwt-decode/index.d.ts
+++ b/types/jwt-decode/index.d.ts
@@ -1,15 +1,15 @@
-// Type definitions for jwt-decode v1.4.0
+// Type definitions for jwt-decode 2.2
 // Project: https://github.com/auth0/jwt-decode
-// Definitions by: Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
+// Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Mads Madsen <https://github.com/madsmadsen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 declare namespace JwtDecode {
-    interface JwtDecodeStatic {
-        (token: string): any;
+    interface Options {
+        header: boolean;
     }
 }
 
-declare var jwtDecode: JwtDecode.JwtDecodeStatic;
-export = jwtDecode;
-export as namespace jwt_decode;
\ No newline at end of file
+declare function JwtDecode<TTokenDto>(token: string, options?: JwtDecode.Options): TTokenDto;
+
+export = JwtDecode;
+export as namespace jwt_decode;
diff --git a/types/jwt-decode/jwt-decode-tests.ts b/types/jwt-decode/jwt-decode-tests.ts
index 4ec792fde1..22bb5cf6cc 100644
--- a/types/jwt-decode/jwt-decode-tests.ts
+++ b/types/jwt-decode/jwt-decode-tests.ts
@@ -1,7 +1,6 @@
- 
-import jwtDecode = require('jwt-decode');
- 
-let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIiLCJleHAiOjEzOTMyODY4OTMsImlhdCI6MTM5MzI2ODg5M30.4-iaDojEVl0pJQMjrbM1EzUIfAZgsbK_kgnVyVxFSVo";
+import * as jwtDecode from "jwt-decode";
+
+const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIiLCJleHAiOjEzOTMyODY4OTMsImlhdCI6MTM5MzI2ODg5M30.4-iaDojEVl0pJQMjrbM1EzUIfAZgsbK_kgnVyVxFSVo";
 
 interface TokenDto {
   foo: string;
@@ -9,4 +8,12 @@ interface TokenDto {
   iat: number;
 }
 
-let decodedToken = jwtDecode(token) as TokenDto;
+interface TokenHeaderDto {
+  typ: string;
+  alg: string;
+}
+
+const decodedTokenPayloadOld = jwtDecode(token) as TokenDto;
+const decodedTokenPayload = jwtDecode<TokenDto>(token);
+const decodedTokenHeaderOld = jwtDecode(token, { header: true }) as TokenHeaderDto;
+const decodedTokenHeader = jwtDecode<TokenHeaderDto>(token, { header: true });
diff --git a/types/jwt-decode/tsconfig.json b/types/jwt-decode/tsconfig.json
index 34ce87d118..8d87ddb618 100644
--- a/types/jwt-decode/tsconfig.json
+++ b/types/jwt-decode/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "jwt-decode-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jwt-decode/tslint.json b/types/jwt-decode/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jwt-decode/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jwt-decode/v1/index.d.ts b/types/jwt-decode/v1/index.d.ts
new file mode 100644
index 0000000000..10ec01f10f
--- /dev/null
+++ b/types/jwt-decode/v1/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for jwt-decode 1.4
+// Project: https://github.com/auth0/jwt-decode
+// Definitions by: Giedrius Grabauskas <https://github.com/QuatroDevOfficial/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace JwtDecode { }
+
+declare function JwtDecode<TTokenDto>(token: string): TTokenDto;
+
+export = JwtDecode;
+export as namespace jwt_decode;
diff --git a/types/jwt-decode/v1/jwt-decode-tests.ts b/types/jwt-decode/v1/jwt-decode-tests.ts
new file mode 100644
index 0000000000..f1db120261
--- /dev/null
+++ b/types/jwt-decode/v1/jwt-decode-tests.ts
@@ -0,0 +1,12 @@
+import jwtDecode = require('jwt-decode');
+
+const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJmb28iOiJiYXIiLCJleHAiOjEzOTMyODY4OTMsImlhdCI6MTM5MzI2ODg5M30.4-iaDojEVl0pJQMjrbM1EzUIfAZgsbK_kgnVyVxFSVo";
+
+interface TokenDto {
+  foo: string;
+  exp: number;
+  iat: number;
+}
+
+const decodedTokenOld = jwtDecode(token) as TokenDto;
+const decodedToken = jwtDecode<TokenDto>(token);
diff --git a/types/jwt-decode/v1/tsconfig.json b/types/jwt-decode/v1/tsconfig.json
new file mode 100644
index 0000000000..a0d0dd4f39
--- /dev/null
+++ b/types/jwt-decode/v1/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "jwt-decode": [
+                "jwt-decode/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jwt-decode-tests.ts"
+    ]
+}
diff --git a/types/jwt-decode/v1/tslint.json b/types/jwt-decode/v1/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jwt-decode/v1/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/kafka-node/index.d.ts b/types/kafka-node/index.d.ts
index 7523f88c6f..89261a3c4d 100644
--- a/types/kafka-node/index.d.ts
+++ b/types/kafka-node/index.d.ts
@@ -1,16 +1,17 @@
 // Type definitions for kafka-node 1.3.3
 // Project: https://github.com/SOHU-Co/kafka-node/
-// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>, Bill <https://github.com/bkim54>
+// Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>, Bill <https://github.com/bkim54>, Michael Haan <https://github.com/sfrooster>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
 // # Classes
 export declare class Client {
-    constructor(connectionString: string, clientId: string, options?: ZKOptions);
+    constructor(connectionString: string, clientId?: string, options?: ZKOptions);
     close(callback?: Function): void;
     topicExists(topics: Array<string>, callback: Function): void;
     refreshMetadata(topics: Array<string>, cb?: (error: any, data: any) => any): void;
     close(cb: (error: any) => any): void;
+    sendOffsetCommitV2Request(group: string, generationId: number, memberId: string, commits: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
 }
 
 export declare class Producer {
@@ -33,6 +34,7 @@ export declare class HighLevelProducer {
 
 export declare class Consumer {
     constructor(client: Client, fetchRequests: Array<OffsetFetchRequest>, options: ConsumerOptions);
+    client: Client;
     on(eventName: string, cb: (message: string) => any): void;
     on(eventName: string, cb: (error: any) => any): void;
     addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
@@ -49,6 +51,7 @@ export declare class Consumer {
 
 export declare class HighLevelConsumer {
     constructor(client: Client, payloads: Array<Topic>, options: ConsumerOptions);
+    client: Client;
     on(eventName: string, cb: (message: string) => any): void;
     on(eventName: string, cb: (error: any) => any): void;
     addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
@@ -68,6 +71,8 @@ export declare class ConsumerGroup extends HighLevelConsumer {
     on(eventName: string, cb: (message: string) => any): void;
     on(eventName: string, cb: (error: any) => any): void;
     close(force: boolean, cb: (error: any) => any): void;
+    generationId: number;
+    memberId: string;
 }
 
 export declare class Offset {
@@ -146,7 +151,7 @@ export interface ConsumerGroupOptions {
     retries?: number;
     retryFactor?: number;
     retryMinTimeout?: number;
-    connectOnReady?: boolean;    
+    connectOnReady?: boolean;
 }
 
 export interface Topic {
diff --git a/types/karma-chai-sinon/index.d.ts b/types/karma-chai-sinon/index.d.ts
index 5f1395c583..70680f2ac7 100644
--- a/types/karma-chai-sinon/index.d.ts
+++ b/types/karma-chai-sinon/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tubalmartin/karma-chai-sinon
 // Definitions by: Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="chai" />
 import Sinon = require("sinon");
diff --git a/types/karma-coverage/index.d.ts b/types/karma-coverage/index.d.ts
index 20ee56f43c..03ca857449 100644
--- a/types/karma-coverage/index.d.ts
+++ b/types/karma-coverage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/karma-runner/karma-coverage
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as karma from 'karma';
 import * as istanbul from 'istanbul';
diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index 59590b0a6d..ab4dc9b31f 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -2,8 +2,8 @@
 // Project: https://github.com/karma-runner/karma
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-/// <reference types="bluebird" />
 /// <reference types="node" />
 
 // See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
@@ -54,7 +54,7 @@ declare namespace karma {
         };
         EXIT_CODE: string;
     }
-    
+
     interface LauncherStatic {
         generateId(): string;
         //TODO: injector should be of type `di.Injector`
diff --git a/types/karma/karma-tests.ts b/types/karma/karma-tests.ts
index 03fd0d04bf..4d342fd9e7 100644
--- a/types/karma/karma-tests.ts
+++ b/types/karma/karma-tests.ts
@@ -1,6 +1,3 @@
-
-
-
 import gulp = require('gulp');
 import karma = require('karma');
 
@@ -13,7 +10,7 @@ function runKarma(singleRun: boolean): void {
     });
 }
 
-gulp.task('test:unit:karma', ['build:test:unit'], () => runKarma(true));
+gulp.task('test:unit:karma', gulp.parallel('build:test:unit', () => runKarma(true)));
 
 
 
diff --git a/types/kdbush/index.d.ts b/types/kdbush/index.d.ts
index fa1581d09c..3ef758b85e 100644
--- a/types/kdbush/index.d.ts
+++ b/types/kdbush/index.d.ts
@@ -7,20 +7,16 @@ type Points = number[][];
 type Get<T> = (point: T) => number;
 type ArrayType = typeof Int32Array | typeof Array;
 
-declare class KDBush<T> {
-  ids: number[];
-  coords: number[];
-  nodeSize: number;
-  points: T[];
-  range(minX: number, minY: number, maxX: number, maxY: number): number[];
-  within(x: number, y: number, r: number): number[];
+declare function kdbush(points: Points): kdbush.KDBush<Points>;
+declare function kdbush<T>(points: T[], getX: Get<T>, getY: Get<T>, nodeSize?: number, ArrayType?: ArrayType): kdbush.KDBush<T>;
+declare namespace kdbush {
+  class KDBush<T> {
+    ids: number[];
+    coords: number[];
+    nodeSize: number;
+    points: T[];
+    range(minX: number, minY: number, maxX: number, maxY: number): number[];
+    within(x: number, y: number, r: number): number[];
+  }
 }
-
-interface KDBushStatic {
-  (points: Points): KDBush<Points>;
-  <T>(points: T[], getX: Get<T>, getY: Get<T>, nodeSize?: number, ArrayType?: ArrayType): KDBush<T>;
-}
-
-declare const kdbush: KDBushStatic;
-declare namespace kdbush {}
 export = kdbush;
diff --git a/types/kdbush/kdbush-tests.ts b/types/kdbush/kdbush-tests.ts
index c9fd8ae11f..fb7e268290 100644
--- a/types/kdbush/kdbush-tests.ts
+++ b/types/kdbush/kdbush-tests.ts
@@ -1,4 +1,5 @@
 import * as kdbush from 'kdbush';
+import {KDBush} from 'kdbush';
 
 // API
 const points = [[110, 60], [130, 40]];
@@ -20,7 +21,7 @@ index.within(10, 10, 5).map(id => points[id]);
 
 // custom points (object)
 const xy = [{x: 110, y: 60}, {x: 130, y: 40}];
-const index2 = kdbush(xy, p => p.x, p => p.y);
+const index2: KDBush<{x: number, y: number}> = kdbush(xy, p => p.x, p => p.y);
 index2.points[0].x;
 index2.points[0].y;
 index2.points.map(p => [p.x, p.y]);
diff --git a/types/kefir/index.d.ts b/types/kefir/index.d.ts
index 93d1c6c14f..09917d7846 100644
--- a/types/kefir/index.d.ts
+++ b/types/kefir/index.d.ts
@@ -68,14 +68,15 @@ export interface Stream<T, S> extends Observable<T, S> {
     delay(wait: number): Stream<T, S>;
     throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Stream<T, S>;
     debounce(wait: number, options?: { immediate: boolean }): Stream<T, S>;
-    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Stream<void, S | U>;
-    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Stream<T | U, void>;
+    valuesToErrors(): Stream<never, S | T>;
+    valuesToErrors<U>(handler: (value: T) => { convert: boolean, error: U }): Stream<never, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Stream<T | U, never>;
     mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
     filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
     endOnError(): Stream<T, S>;
     takeErrors(n: number): Stream<T, S>;
-    ignoreValues(): Stream<void, S>;
-    ignoreErrors(): Stream<T, void>;
+    ignoreValues(): Stream<never, S>;
+    ignoreErrors(): Stream<T, never>;
     ignoreEnd(): Stream<T, S>;
     beforeEnd<U>(fn: () => U): Stream<T | U, S>;
     slidingWindow(max: number, mix?: number): Stream<T[], S>;
@@ -124,14 +125,14 @@ export interface Property<T, S> extends Observable<T, S> {
     delay(wait: number): Property<T, S>;
     throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Property<T, S>;
     debounce(wait: number, options?: { immediate: boolean }): Property<T, S>;
-    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Property<void, S | U>;
-    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Property<T | U, void>;
+    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Property<never, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Property<T | U, never>;
     mapErrors<U>(fn: (error: S) => U): Property<T, U>;
     filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
     endOnError(): Property<T, S>;
     takeErrors(n: number): Stream<T, S>;
-    ignoreValues(): Property<void, S>;
-    ignoreErrors(): Property<T, void>;
+    ignoreValues(): Property<never, S>;
+    ignoreErrors(): Property<T, never>;
     ignoreEnd(): Property<T, S>;
     beforeEnd<U>(fn: () => U): Property<T | U, S>;
     slidingWindow(max: number, mix?: number): Property<T[], S>;
@@ -181,21 +182,21 @@ export interface Emitter<T, S> {
 }
 
 // Create a stream
-export declare function never(): Stream<void, void>;
-export declare function later<T>(wait: number, value: T): Stream<T, void>;
-export declare function interval<T>(interval: number, value: T): Stream<T, void>;
-export declare function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
-export declare function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
+export declare function never(): Stream<never, never>;
+export declare function later<T>(wait: number, value: T): Stream<T, never>;
+export declare function interval<T>(interval: number, value: T): Stream<T, never>;
+export declare function sequentially<T>(interval: number, values: T[]): Stream<T, never>;
+export declare function fromPoll<T>(interval: number, fn: () => T): Stream<T, never>;
 export declare function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
-export declare function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
+export declare function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, never>;
 export declare function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
 export declare function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
 export declare function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
 export declare function fromESObservable<T, S>(observable: any): Stream<T, S>
 
 // Create a property
-export declare function constant<T>(value: T): Property<T, void>;
-export declare function constantError<T>(error: T): Property<void, T>;
+export declare function constant<T>(value: T): Property<T, never>;
+export declare function constantError<T>(error: T): Property<never, T>;
 export declare function fromPromise<T, S>(promise: any): Property<T, S>;
 
 // Combine observables
diff --git a/types/kefir/kefir-tests.ts b/types/kefir/kefir-tests.ts
index acd0f5ae16..d2dbd5835e 100644
--- a/types/kefir/kefir-tests.ts
+++ b/types/kefir/kefir-tests.ts
@@ -106,11 +106,11 @@ import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'ke
 	let observable17: Stream<void, number> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors<number>(x => {
 		return {convert: x < 0, error: x * 2};
 	});
-	let observable18: Stream<number, void> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors<number>().errorsToValues<number>((x: number) => {
+	let observable18: Stream<number, void> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors().errorsToValues<number>((x: number) => {
 		return {convert: x >= 0, value: x * 2};
 	});
-	let observable19: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors<number>().mapErrors((x: number) => x * 2);
-	let observable20: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors<number>().filterErrors((x: number) => (x % 2) === 0);
+	let observable19: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors().mapErrors((x: number) => x * 2);
+	let observable20: Stream<void, number> = Kefir.sequentially(100, [0, 1, 2, 3]).valuesToErrors().filterErrors((x: number) => (x % 2) === 0);
 	let observable21: Stream<void, number> = Kefir.sequentially(100, [0, -1, 2, -3]).valuesToErrors(x => {
 		return {convert: x < 0, error: x};
 	}).endOnError();
diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index bc7cd464c7..8c58c182be 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.telerik.com/kendo-ui
 // Definitions by: Telerik <https://github.com/telerik/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -1294,7 +1295,7 @@ declare namespace kendo.data {
 	interface DataSourcePushEvent extends DataSourceEvent {
         items?: DataSourceItemOrGroup[];
 		type?: string;
-       
+
     }
 
     interface DataSourceErrorEvent extends DataSourceEvent {
@@ -1553,15 +1554,27 @@ declare namespace kendo.drawing.pdf {
 }
 
 declare namespace kendo.ui {
-    class AgendaView implements kendo.ui.SchedulerView {
-        static fn: AgendaView;
+    class SchedulerView extends Widget {
+        static fn: SchedulerView;
 
         startDate(): Date;
         endDate(): Date;
 
+        static extend(proto: Object): SchedulerView;
+    }
+
+    class AgendaView extends SchedulerView {
+        static fn: AgendaView;
+
         static extend(proto: Object): AgendaView;
     }
 
+    class TimelineView extends SchedulerView {
+        static fn: TimelineView;
+
+        static extend(proto: Object): TimelineView;
+    }
+
     class Alert extends kendo.ui.Dialog {
 
         static fn: Alert;
@@ -1580,11 +1593,11 @@ declare namespace kendo.ui {
 
     }
 
-    interface AlertMessages {
+    interface AlertMessages extends DialogMessages {
         okText?: string;
     }
 
-    interface AlertOptions {
+    interface AlertOptions extends DialogOptions {
         name?: string;
         messages?: AlertMessages;
     }
@@ -2092,12 +2105,12 @@ declare namespace kendo.ui {
 
     }
 
-    interface ConfirmMessages {
+    interface ConfirmMessages extends DialogMessages {
         okText?: string;
         cancel?: string;
     }
 
-    interface ConfirmOptions {
+    interface ConfirmOptions extends DialogOptions {
         name?: string;
         messages?: ConfirmMessages;
     }
@@ -4018,7 +4031,7 @@ declare namespace kendo.ui {
 
     interface GridDetailInitEvent extends GridEvent {
         data?: kendo.data.ObservableObject;
-        detailCell?: JQuery;
+        detailCell: JQuery;
         detailRow?: JQuery;
         masterRow?: JQuery;
     }
@@ -4595,7 +4608,7 @@ declare namespace kendo.ui {
     }
 
     interface NotificationShowEvent extends NotificationEvent {
-        element?: JQuery;
+        element: JQuery;
     }
 
 
@@ -5255,12 +5268,12 @@ declare namespace kendo.ui {
 
     }
 
-    interface PromptMessages {
+    interface PromptMessages extends DialogMessages {
         okText?: string;
         cancel?: string;
     }
 
-    interface PromptOptions {
+    interface PromptOptions extends DialogOptions {
         name?: string;
         messages?: PromptMessages;
     }
@@ -5408,8 +5421,7 @@ declare namespace kendo.ui {
         slotByPosition(xPosition: number, yPosition: number): any;
         slotByElement(element: Element): any;
         slotByElement(element: JQuery): any;
-        view(): kendo.ui.SchedulerView;
-        view(name: string): void;
+        view(type?: string): void | SchedulerView;
         viewName(): string;
 
     }
@@ -5620,7 +5632,7 @@ declare namespace kendo.ui {
         orientation?: string;
     }
 
-    interface SchedulerView {
+    interface SchedulerViewOptions {
         allDayEventTemplate?: string|Function;
         allDaySlot?: boolean;
         allDaySlotTemplate?: string|Function;
@@ -5629,7 +5641,7 @@ declare namespace kendo.ui {
         dayTemplate?: string|Function;
         editable?: boolean|SchedulerViewEditable;
         endDate?(): Date;
-	endTime?: Date;
+	    endTime?: Date;
         eventHeight?: number;
         eventTemplate?: string|Function;
         eventTimeTemplate?: string|Function;
@@ -5643,10 +5655,10 @@ declare namespace kendo.ui {
         selectedShortDateFormat?: string;
         showWorkHours?: boolean;
         slotTemplate?: string|Function;
-	startDate?(): Date;
+	    startDate?(): Date;
         startTime?: Date;
         title?: string;
-        type?: string;
+        type?: string | SchedulerView;
         workWeekStart?: number;
         workWeekEnd?: number;
     }
@@ -5691,7 +5703,7 @@ declare namespace kendo.ui {
         startTime?: Date;
         timezone?: string;
         toolbar?: SchedulerToolbarItem[];
-        views?: SchedulerView[];
+        views?: SchedulerViewOptions[];
         width?: number|string;
         workDayStart?: Date;
         workDayEnd?: Date;
@@ -18498,7 +18510,7 @@ declare namespace kendo.ooxml {
     interface WorkbookSheetRow {
         cells?: WorkbookSheetRowCell[];
         index?: number;
-        height?: number;      
+        height?: number;
         type?: "header" | "footer" | "group-header" | "group-footer" | "data";
     }
 
@@ -18756,7 +18768,7 @@ declare namespace kendo.dataviz.geometry {
         setHeight(value: number): kendo.geometry.Size;
 
     }
-    
+
     interface SizeOptions {
         name?: string;
     }
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index a68cabf66e..2e301af850 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -2,9 +2,8 @@
 // Project: https://github.com/tgriesser/knex
 // Definitions by: Qubo <https://github.com/tkQubo>, Baronfel <https://github.com/baronfel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
-/// <reference types="bluebird" />
 /// <reference types="node" />
 
 import events = require("events");
@@ -120,6 +119,10 @@ declare namespace Knex {
         orHaving: Having;
         orHavingRaw: RawQueryBuilder;
 
+        // Clear
+        clearSelect(): QueryBuilder;
+        clearWhere(): QueryBuilder;
+
         // Paging
         offset(offset: number): QueryBuilder;
         limit(limit: number): QueryBuilder;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index f057034006..1f12a1044a 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -406,6 +406,14 @@ knex.table('users').first(knex.raw('round(sum(products)) as p')).then(function(r
   console.log(row);
 });
 
+knex.table('users').select('*').clearSelect().select('id').then(function(rows) {
+  console.log(rows);
+});
+
+knex('accounts').where('userid', '=', 1).clearWhere().select().then(function (rows) {
+  console.log(rows);
+});
+
 // Using trx as a query builder:
 knex.transaction(function(trx) {
 
diff --git a/types/knockback/index.d.ts b/types/knockback/index.d.ts
index 69f5501d29..a2ec8446e8 100644
--- a/types/knockback/index.d.ts
+++ b/types/knockback/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://kmalakoff.github.io/knockback/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="knockout" />
 /// <reference types="backbone" />
diff --git a/types/knockout.kogrid/index.d.ts b/types/knockout.kogrid/index.d.ts
index 1e779bb7ee..3ac629e45b 100644
--- a/types/knockout.kogrid/index.d.ts
+++ b/types/knockout.kogrid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://knockout-contrib.github.io/KoGrid/
 // Definitions by: huer12 <https://github.com/huer12/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // These are very definitely preliminary. Please feel free to improve.
 
diff --git a/types/knockout.validation/index.d.ts b/types/knockout.validation/index.d.ts
index ad3a042aa7..480a2607e7 100644
--- a/types/knockout.validation/index.d.ts
+++ b/types/knockout.validation/index.d.ts
@@ -158,6 +158,7 @@ interface KnockoutValidationRuleDefinitions {
     required: KnockoutValidationRuleDefinition;
     step: KnockoutValidationRuleDefinition;
     unique: KnockoutValidationRuleDefinition;
+    [ruleName: string]: KnockoutValidationRuleDefinition;
 }
 
 interface KnockoutValidationRule {
diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 570d0ee830..40464a3bd8 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -154,6 +154,7 @@ interface KnockoutBindingHandler {
     update?: (element: any, valueAccessor: () => any, allBindingsAccessor?: KnockoutAllBindingsAccessor, viewModel?: any, bindingContext?: KnockoutBindingContext) => void;
     options?: any;
     preprocess?: (value: string, name: string, addBindingCallback?: (name: string, value: string) => void) => string;
+    [s: string]: any;
 }
 
 interface KnockoutBindingHandlers {
diff --git a/types/knockstrap/index.d.ts b/types/knockstrap/index.d.ts
index 354c0fe017..ae9aee438b 100644
--- a/types/knockstrap/index.d.ts
+++ b/types/knockstrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://faulknercs.github.io/Knockstrap/
 // Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" /> 
 ///<reference types="bootstrap" /> 
@@ -160,4 +161,4 @@ interface KnockstrapProgressDefaults {
     striped: boolean;
     type: string;
     animated: boolean;
-}
\ No newline at end of file
+}
diff --git a/types/ko.plus/index.d.ts b/types/ko.plus/index.d.ts
index 1fa17236b3..803a56fb74 100644
--- a/types/ko.plus/index.d.ts
+++ b/types/ko.plus/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/stevegreatrex/ko.plus
 // Definitions by: Howard Richards <https://github.com/conficient>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="knockout" />
diff --git a/types/koa-generic-session/index.d.ts b/types/koa-generic-session/index.d.ts
index f3a84e7b20..1bd8f366e0 100644
--- a/types/koa-generic-session/index.d.ts
+++ b/types/koa-generic-session/index.d.ts
@@ -1,13 +1,15 @@
 // Type definitions for koa-generic-session 1.x
 // Project: https://github.com/koajs/generic-session
-// Definitions by: Nick Simmons <https://github.com/nsimmons/>
+// Definitions by: Nick Simmons <https://github.com/nsimmons/>, Ragg <https://github.com/Ragg-/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Koa from "koa";
 
 declare namespace koaSession {
     interface Session {
         cookie: any;
+        [key: string]: any;
     }
 
     interface SessionIdStore {
@@ -50,5 +52,13 @@ declare namespace koaSession {
     const MemoryStore: SessionStore;
 }
 
+declare module 'koa' {
+    interface Context {
+        session: koaSession.Session|null;
+        sessionSave: boolean|null;
+        regenerateSession(): Generator;
+    }
+}
+
 declare function koaSession(options: koaSession.SessionOptions): Koa.Middleware;
 export = koaSession;
diff --git a/types/koa-generic-session/koa-generic-session-tests.ts b/types/koa-generic-session/koa-generic-session-tests.ts
index fb8d69b0e0..e9a4f94232 100644
--- a/types/koa-generic-session/koa-generic-session-tests.ts
+++ b/types/koa-generic-session/koa-generic-session-tests.ts
@@ -32,4 +32,16 @@ app.use(session({
     beforeSave: (ctx: Koa.Context, session: Session) => {}
 }));
 
+app.use((context: Koa.Context) => {
+    if (! context.session) {
+        return;
+    }
+
+    context.regenerateSession();
+    context.sessionSave = true;
+    context.session.cookie;
+    context.session['key'] = 'value';
+    context.session = null;
+});
+
 app.listen(80);
diff --git a/types/koa-hbs/index.d.ts b/types/koa-hbs/index.d.ts
index f38d2e9fdd..481738efc3 100644
--- a/types/koa-hbs/index.d.ts
+++ b/types/koa-hbs/index.d.ts
@@ -25,6 +25,7 @@
 /// <reference types="koa" />
 
 import * as Koa from "koa";
+import * as Handlebars from "handlebars";
 
 declare namespace Hbs {
     export interface Middleware {
@@ -44,6 +45,9 @@ declare namespace Hbs {
 declare class Hbs {
     constructor();
     middleware(opts: Hbs.Middleware): any;
+    registerHelper: typeof Handlebars.registerHelper;
+    SafeString: typeof Handlebars.SafeString;
+    Utils: typeof Handlebars.Utils;
 }
 
 declare const hbs: Hbs;
diff --git a/types/koa-hbs/koa-hbs-tests.ts b/types/koa-hbs/koa-hbs-tests.ts
index 3c86a51cad..14a113e816 100644
--- a/types/koa-hbs/koa-hbs-tests.ts
+++ b/types/koa-hbs/koa-hbs-tests.ts
@@ -4,6 +4,15 @@ import * as Path from 'path';
 
 const app = new Koa();
 
+hbs.registerHelper('link', (text: string, url: string) => {
+    text = hbs.Utils.escapeExpression(text);
+    url = hbs.Utils.escapeExpression(url);
+
+    let result = `<a href="${url}">${text}</a>`;
+
+    return new hbs.SafeString(result);
+});
+
 app.use(hbs.middleware({
     viewPath: Path.join(__dirname, './views')
 }));
diff --git a/types/koa-morgan/index.d.ts b/types/koa-morgan/index.d.ts
new file mode 100644
index 0000000000..f9cbc249c0
--- /dev/null
+++ b/types/koa-morgan/index.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for koa-morgan 1.0
+// Project: https://github.com/koa-modules/morgan
+// Definitions by: Vesa Poikajärvi <https://github.com/vesse>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import { IncomingMessage, ServerResponse } from 'http';
+import * as Koa from 'koa';
+import * as originalMorgan from 'morgan';
+
+declare namespace morgan {
+    interface FormatFn {
+        (tokens: TokenIndexer, req: IncomingMessage, res: ServerResponse): string;
+    }
+
+    interface TokenCallbackFn {
+        (req: IncomingMessage, res: ServerResponse, arg?: string | number | boolean): string;
+    }
+
+    type TokenIndexer = originalMorgan.TokenIndexer;
+
+    /**
+     * Public interface of morgan logger
+     */
+    interface KoaMorgan {
+        /***
+         * Create a new morgan logger middleware function using the given format and options. The
+         * format argument may be a string of a predefined name (see below for the names),
+         * or a string of a format string containing defined tokens.
+         * @param format
+         * @param options
+         */
+        (format: string, options?: Options): Koa.Middleware;
+
+        /***
+         * Standard Apache combined log output.
+         * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
+         * @param format
+         * @param options
+         */
+        (format: 'combined', options?: Options): Koa.Middleware;
+
+        /***
+         * Standard Apache common log output.
+         * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
+         * @param format
+         * @param options
+         */
+        (format: 'common', options?: Options): Koa.Middleware;
+
+        /**
+         * Concise output colored by response status for development use. The :status token will be colored red for
+         * server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
+         * :method :url :status :response-time ms - :res[content-length]
+         * @param format
+         * @param options
+         */
+        (format: 'dev', options?: Options): Koa.Middleware;
+
+        /***
+         * Shorter than default, also including response time.
+         * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
+         * @param format
+         * @param options
+         */
+        (format: 'short', options?: Options): Koa.Middleware;
+
+        /***
+         * The minimal output.
+         * :method :url :status :res[content-length] - :response-time ms
+         * @param format
+         * @param options
+         */
+        (format: 'tiny', options?: Options): Koa.Middleware;
+
+        /***
+         * Create a new morgan logger middleware function using the given format and options. The format argument may be a
+         * custom format function which adheres to the signature.
+         * @param format
+         * @param options
+         */
+        (format: FormatFn, options?: Options): Koa.Middleware;
+
+        /**
+         * Define a custom token which can be used in custom morgan logging formats.
+         */
+        token(name: string, callback: TokenCallbackFn): KoaMorgan;
+
+        /**
+         * Define a named custom format by specifying a format string in token notation
+         */
+        format(name: string, fmt: string): KoaMorgan;
+
+        /**
+         * Define a named custom format by specifying a format function
+         */
+        format(name: string, fmt: FormatFn): KoaMorgan;
+
+        /**
+         * Compile a format string in token notation into a format function
+         */
+        compile(format: string): FormatFn;
+    }
+
+    /**
+     * Define a custom token which can be used in custom morgan logging formats.
+     */
+    function token(name: string, callback: TokenCallbackFn): KoaMorgan;
+
+    /**
+     * Define a named custom format by specifying a format string in token notation
+     */
+    function format(name: string, fmt: string): KoaMorgan;
+
+    /**
+     * Define a named custom format by specifying a format function
+     */
+    function format(name: string, fmt: FormatFn): KoaMorgan;
+
+    /**
+     * Compile a format string in token notation into a format function
+     */
+    function compile(format: string): FormatFn;
+
+    type StreamOptions = originalMorgan.StreamOptions;
+
+    /***
+     * Morgan accepts these properties in the options object.
+     */
+    interface Options {
+        /***
+         * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
+         */
+        buffer?: boolean;
+
+        /***
+         * Write log line on request instead of response. This means that a requests will be logged even if the server
+         * crashes, but data from the response cannot be logged (like the response code).
+         */
+        immediate?: boolean;
+
+        /***
+         * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
+         */
+        skip?: (req: IncomingMessage, res: ServerResponse) => boolean;
+
+        /***
+         * Output stream for writing log lines, defaults to process.stdout.
+         * @param str
+         */
+        stream?: StreamOptions;
+    }
+}
+
+/***
+ * Create a new morgan logger middleware function using the given format and options. The format argument may be a string
+ * of a predefined name (see below for the names), or a string of a format string containing defined tokens.
+ * @param format
+ * @param options
+ */
+declare function morgan(format: string, options?: morgan.Options): Koa.Middleware;
+
+/***
+ * Standard Apache combined log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'combined', options?: morgan.Options): Koa.Middleware;
+
+/***
+ * Standard Apache common log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'common', options?: morgan.Options): Koa.Middleware;
+
+/***
+ * Concise output colored by response status for development use. The :status token will be colored red for server error codes,
+ * yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
+ * :method :url :status :response-time ms - :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'dev', options?: morgan.Options): Koa.Middleware;
+
+/***
+ * Shorter than default, also including response time.
+ * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'short', options?: morgan.Options): Koa.Middleware;
+
+/***
+ * The minimal output.
+ * :method :url :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'tiny', options?: morgan.Options): Koa.Middleware;
+
+/***
+ * Create a new morgan logger middleware function using the given format and options. The format argument may be a
+ * custom format function which adheres to the signature.
+ * @param format
+ * @param options
+ */
+declare function morgan(custom: (req: IncomingMessage, res: ServerResponse) => string): Koa.Middleware;
+
+export = morgan;
diff --git a/types/koa-morgan/koa-morgan-tests.ts b/types/koa-morgan/koa-morgan-tests.ts
new file mode 100644
index 0000000000..86c8c03e05
--- /dev/null
+++ b/types/koa-morgan/koa-morgan-tests.ts
@@ -0,0 +1,90 @@
+import { IncomingMessage, ServerResponse } from 'http';
+import * as Koa from 'koa';
+import * as morgan from 'koa-morgan';
+
+const app = new Koa();
+
+app.use(morgan('combined'));
+app.use(morgan('common'));
+app.use(morgan('dev'));
+app.use(morgan('short'));
+app.use(morgan('tiny'));
+app.use(morgan(':remote-addr :method :url'));
+
+const tokenCallback: morgan.TokenCallbackFn = (req: IncomingMessage, res: ServerResponse): string => {
+    if (req.headers['request-id']) {
+        if (Array.isArray(req.headers['request-id'])) {
+            return (req.headers['request-id'] as string[]).join(';');
+        } else {
+            return req.headers['request-id'] as string;
+        }
+    } else {
+        return '-';
+    }
+};
+
+morgan.token('id', tokenCallback);
+
+const stream: morgan.StreamOptions = {
+    write: (str: string) => {
+        console.log(str);
+    }
+};
+
+app.use(morgan('combined', {
+    buffer: true,
+    immediate: true,
+    skip: (req: IncomingMessage, res: ServerResponse) => res.statusCode < 400,
+    stream
+}));
+
+// test interface definition for morgan
+
+// a named custom format defined as string (example: extend 'tiny' format with user-agent token)
+morgan.format('tiny-extended', ':method :url :status :res[content-length] - :response-time ms :user-agent');
+app.use(morgan('tiny-extended'));
+
+// a named custom format defined using the Function signature (example: extend 'dev' format with user-agent token)
+
+// extend morgan.FormatFn interface with memoizer property to avoid unnecessary re-compiling
+// of status-code range driven colorized format functions
+interface FormatFnIndexer {
+    [memoizerName: string]: morgan.FormatFn;
+}
+
+interface ExtendedFormatFn extends morgan.FormatFn {
+    memoizer?: FormatFnIndexer;
+}
+
+const developmentExtendedFormatLine: ExtendedFormatFn = (tokens, req: IncomingMessage, res: ServerResponse): string => {
+    // get the status code if response written
+    const status = res.statusCode
+        ? res.statusCode
+        : undefined;
+
+    // get status color
+    const color = status && status >= 500 ? 31 // red
+        : status && status >= 400 ? 33 // yellow
+        : status && status >= 300 ? 36 // cyan
+        : status && status >= 200 ? 32 // green
+        : 0; // no color
+
+    // get colored format function, if previously memoized, otherwise undefined
+    let fn: morgan.FormatFn|undefined = developmentExtendedFormatLine.memoizer ? developmentExtendedFormatLine.memoizer[color] : undefined;
+
+    if (!fn) {
+        if (!developmentExtendedFormatLine.memoizer) {
+            developmentExtendedFormatLine.memoizer = {};
+        }
+
+        fn = developmentExtendedFormatLine.memoizer[color] = morgan.compile('\x1b[0m:method :url \x1b['
+            + color + 'm:status \x1b[0m:response-time ms - :res[content-length]\x1b[0m :user-agent');
+    }
+
+    return fn(tokens, req, res);
+};
+
+developmentExtendedFormatLine.memoizer = {};
+
+morgan.format('dev-extended', developmentExtendedFormatLine);
+app.use(morgan('dev-extended'));
diff --git a/types/koa-morgan/tsconfig.json b/types/koa-morgan/tsconfig.json
new file mode 100644
index 0000000000..d8dae4f5fc
--- /dev/null
+++ b/types/koa-morgan/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-morgan-tests.ts"
+    ]
+}
diff --git a/types/koa-morgan/tslint.json b/types/koa-morgan/tslint.json
new file mode 100644
index 0000000000..5b6c04888d
--- /dev/null
+++ b/types/koa-morgan/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false,
+        "no-empty-interface": false,
+        "prefer-method-signature": false,
+        "callable-types": false
+    }
+}
diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
new file mode 100644
index 0000000000..d46bdc7765
--- /dev/null
+++ b/types/koa-session/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for koa-session 3.0
+// Project: https://github.com/koajs/session
+// Definitions by: Yu Hsin Lu <https://github.com/kerol2r20/>
+// Definitions: https://github.com/kerol2r20/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import session = require("koa-session");
+    import Koa = require('koa');
+
+    var app = new Koa();
+    app.use(session(app));
+
+ =============================================== */
+
+import * as Koa from "koa";
+
+declare namespace session {
+    interface sessionConfig {
+        /**
+         * cookie key (default is koa:sess)
+         */
+        key?: string;
+
+        /**
+         * maxAge in ms (default is 1 days)
+         * 'session' will result in a cookie that expires when session/browser is closed
+         * Warning: If a session cookie is stolen, this cookie will never expire
+         */
+        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;
+
+        /**
+         * You can store the session content in external stores(redis, mongodb or other DBs)
+         */
+        store?: session.stores;
+
+        /**
+         * Hook: valid session value before use it
+         */
+        valid(...rest: any[]): void;
+
+        /**
+         * Hook: before save session
+         */
+        beforeSave(...rest: any[]): void;
+    }
+    interface sessionProps {
+        /**
+         * Returns true if the session is new
+         */
+        isNew: boolean;
+
+        /**
+         * Set cookie's maxAge
+         */
+        maxAge: number;
+
+        /**
+         * Save this session no matter whether it is populated
+         */
+        save(): void;
+        [propName: string]: any;
+    }
+
+    interface stores {
+        /**
+         * get session object by key
+         */
+        get(key: any): any;
+
+        /**
+         * set session object for key, with a maxAge (in ms)
+         */
+        set(key: any, sess: any, maxAge?: number): any;
+
+        /**
+         * destroy session for key
+         */
+        destroy(key: any): void;
+    }
+}
+
+declare function session(CONFIG: session.sessionConfig, app: Koa): Koa.Middleware;
+
+declare function session(app: Koa): Koa.Middleware;
+
+declare module 'koa' {
+    interface Context {
+        session: session.sessionProps;
+    }
+}
+
+export = session;
diff --git a/types/koa-session/koa-session-tests.ts b/types/koa-session/koa-session-tests.ts
new file mode 100644
index 0000000000..266cb4b98b
--- /dev/null
+++ b/types/koa-session/koa-session-tests.ts
@@ -0,0 +1,8 @@
+import * as Koa from 'koa';
+import session = require('koa-session');
+
+const app = new Koa();
+
+app.use(session(app));
+
+app.listen(3000);
diff --git a/types/koa-session/tsconfig.json b/types/koa-session/tsconfig.json
new file mode 100644
index 0000000000..d312ce0105
--- /dev/null
+++ b/types/koa-session/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-session-tests.ts"
+    ]
+}
diff --git a/types/koa-session/tslint.json b/types/koa-session/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-session/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-static/index.d.ts b/types/koa-static/index.d.ts
index fb58aa0aea..8e89911a22 100644
--- a/types/koa-static/index.d.ts
+++ b/types/koa-static/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for koa-static v2.x
+// Type definitions for koa-static 3.0
 // Project: https://github.com/koajs/static
 // Definitions by: Jerry Chin <https://github.com/hellopao/>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
@@ -13,11 +13,9 @@
 
  =============================================== */
 
-
 import * as Koa from "koa";
 
 declare function serve(root: string, opts?: {
-
     /**
      * Default file name, defaults to 'index.html'
      */
@@ -42,6 +40,11 @@ declare function serve(root: string, opts?: {
      * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
      */
     gzip?: boolean;
+
+    /**
+     * Try to match extensions from passed array to search for file when no extension is sufficed in URL. First found is served. (defaults to `false`)
+     */
+    extensions?: string[];
 }): Koa.Middleware;
-declare namespace serve{}
+declare namespace serve {}
 export = serve;
diff --git a/types/koa-static/koa-static-tests.ts b/types/koa-static/koa-static-tests.ts
index 2bd7d41cde..2bcb0ae030 100644
--- a/types/koa-static/koa-static-tests.ts
+++ b/types/koa-static/koa-static-tests.ts
@@ -3,6 +3,10 @@ import serve = require("koa-static");
 
 const app = new Koa();
 
-app.use(serve('.',{index:false,defer:false}));
+app.use(serve('.', {
+  index: false,
+  defer: false,
+  extensions: ['html']
+}));
 
-app.listen(80)
\ No newline at end of file
+app.listen(80);
diff --git a/types/koa-static/tslint.json b/types/koa-static/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/koa-static/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/kolite/index.d.ts b/types/kolite/index.d.ts
index 0a620aa363..aeea8507a2 100644
--- a/types/kolite/index.d.ts
+++ b/types/kolite/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/CodeSeven/kolite
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference path="knockout.activity.d.ts" />
 /// <reference path="knockout.command.d.ts" />
diff --git a/types/kue/index.d.ts b/types/kue/index.d.ts
index 4fc964b118..5e5db964ac 100644
--- a/types/kue/index.d.ts
+++ b/types/kue/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for kue 0.11.x
 // Project: https://github.com/Automattic/kue
 // Definitions by: Nicholas Penree <http://github.com/drudge>
+//                 Amiram Korach <http://github.com/amiram>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -29,7 +30,7 @@ export declare class Queue extends events.EventEmitter {
     checkActiveJobTtl(ttlOptions: Object): void;
     watchStuckJobs(ms: number): void;
     setting(name: string, fn: Function): Queue;
-    process(type: string, n?: number, fn?: Function): void;
+    process(type: string, n?: number | ProcessCallback, fn?: ProcessCallback): void;
     shutdown(timeout: number, type: string, fn: Function): Queue;
     types(fn: Function): Queue;
     state(string: string, fn: Function): Queue;
@@ -56,17 +57,25 @@ interface Priorities {
     critical: number;
 }
 
+export type DoneCallback = (err?: any, result?: any) => void;
+export type JobCallback = (err?: any, job?: Job) => void;
+export type ProcessCallback = (job: Job, cb: DoneCallback) => void;
+
 export declare class Job extends events.EventEmitter {
     public id: number;
     public type: string;
     public data: any;
+    public result: any;
+    // Should always be a number however currently it is a number when creating and a string when loading
+    // https://github.com/Automattic/kue/issues/1081
+    public created_at: string | number;
     public client: redisClientFactory.RedisClient;
     private _max_attempts;
 
     static priorities: Priorities;
     static disableSearch: boolean;
     static jobEvents: boolean;
-    static get(id: number, fn: Function): void;
+    static get(id: number, type: string | JobCallback, fn?: JobCallback): void;
     static remove(id: number, fn?: Function): void;
     static removeBadJob(id: number): void;
     static log(id: number, fn: Function): void;
@@ -79,6 +88,7 @@ export declare class Job extends events.EventEmitter {
     log(str: string): Job;
     set(key: string, val: string, fn?: Function): Job;
     get(key: string, fn?: Function): Job;
+    get(key: string, jobType: string, fn?: Function): Job;
     progress(complete: number, total: number, data?: any): Job;
     delay(ms: number | Date): Job;
     removeOnComplete(param: any): Job;
@@ -101,6 +111,7 @@ export declare class Job extends events.EventEmitter {
     save(fn?: Function): Job;
     update(fn?: Function): Job;
     subscribe(fn?: Function): Job;
+    events(events: boolean): Job;
 }
 
 declare class Worker extends events.EventEmitter {
diff --git a/types/kue/kue-tests.ts b/types/kue/kue-tests.ts
index d69f6eaead..fd929d7aeb 100644
--- a/types/kue/kue-tests.ts
+++ b/types/kue/kue-tests.ts
@@ -39,6 +39,13 @@ function create() {
 
   job.save();
 
+  kue.Job.get(job.id, function (err: any, _job: kue.Job) {
+    console.log('get job', _job);
+  });
+  kue.Job.get(job.id, 'video conversion', function (err: any, _job: kue.Job) {
+    console.log('get job', _job);
+  });
+
   setTimeout( create, Math.random() * 2000 | 0 );
 }
 
@@ -46,25 +53,28 @@ create();
 
 // process video conversion jobs, 1 at a time.
 
-jobs.process('video conversion', 1, function(job: kue.Job, done: Function) {
+var processCb = function(job: kue.Job, done: kue.DoneCallback) {
   var frames: number = job.data.frames;
 
   function next(i: number) {
     // pretend we are doing some work
-    convertFrame(i, function(err: Error) {
+    convertFrame(i, function(err: Error, result: any) {
       if (err) return done(err);
       // report progress, i/frames complete
       job.progress(i, frames);
-      if (i >= frames) done();
+      if (i >= frames) done(null, result);
       else next(i + Math.random() * 10);
     } );
   }
 
   next(0);
-} );
+}
+
+jobs.process('video conversion', 1, processCb);
+jobs.process('video conversion', processCb);
 
 function convertFrame(i: number, fn: Function) {
-  setTimeout(fn, Math.random() * 50);
+  setTimeout(() => fn(null, Math.random()), Math.random() * 50);
 }
 
 // one minute
@@ -102,4 +112,4 @@ jobs.process('email', 10, function(job: kue.Job, done: Function) {
 
 // start the UI
 kue.app.listen(3000);
-console.log('UI started on port 3000');
\ No newline at end of file
+console.log('UI started on port 3000');
diff --git a/types/ladda/index.d.ts b/types/ladda/index.d.ts
index b4b5944810..6c4d9d696c 100644
--- a/types/ladda/index.d.ts
+++ b/types/ladda/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/hakimel/Ladda
 // Definitions by: Danil Flores <https://github.com/dflor003/>, Michael Lee <https://github.com/leemicw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/leaflet-draw/index.d.ts b/types/leaflet-draw/index.d.ts
index 300c97b80f..22d0d45169 100644
--- a/types/leaflet-draw/index.d.ts
+++ b/types/leaflet-draw/index.d.ts
@@ -31,7 +31,7 @@ declare namespace L {
 			 *
 			 *  Default value: false
 			 */
-			edit: EditOptions;
+			edit?: EditOptions;
 		}
 
 		interface DrawOptions {
@@ -254,7 +254,7 @@ declare namespace L {
 	}
 
 	namespace DrawEvents {
-		interface Created {
+		interface Created extends L.Event {
 			/**
 			 * Layer that was just created.
 			 */
@@ -266,7 +266,7 @@ declare namespace L {
 			layerType: string;
 		}
 
-		interface Edited {
+		interface Edited extends L.Event {
 			/**
 			 * List of all layers just edited on the map.
 			 */
@@ -276,49 +276,49 @@ declare namespace L {
 		/**
 		 * Triggered when layers have been removed (and saved) from the FeatureGroup.
 		 */
-		interface Deleted {
+		interface Deleted extends L.Event {
 			/**
 			 * List of all layers just removed from the map.
 			 */
 			layers: LayerGroup;
 		}
 
-		interface DrawStart {
+		interface DrawStart extends L.Event {
 			/**
 			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
 			 */
 			layerType: string;
 		}
 
-		interface DrawStop {
+		interface DrawStop extends L.Event {
 			/**
 			 * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
 			 */
 			layerType: string;
 		}
 
-		interface EditStart {
+		interface EditStart extends L.Event {
 			/**
 			 * The type of edit this is. One of: edit
 			 */
 			handler: string;
 		}
 
-		interface EditStop {
+		interface EditStop extends L.Event {
 			/**
 			 * The type of edit this is. One of: edit
 			 */
 			handler: string;
 		}
 
-		interface DeleteStart {
+		interface DeleteStart extends L.Event {
 			/**
 			 * The type of edit this is. One of: remove
 			 */
 			handler: string;
 		}
 
-		interface DeleteStop {
+		interface DeleteStop extends L.Event {
 			/**
 			 * The type of edit this is. One of: remove
 			 */
diff --git a/types/leaflet-draw/leaflet-draw-tests.ts b/types/leaflet-draw/leaflet-draw-tests.ts
index 05f1a2db6a..21c08e21e9 100644
--- a/types/leaflet-draw/leaflet-draw-tests.ts
+++ b/types/leaflet-draw/leaflet-draw-tests.ts
@@ -35,10 +35,9 @@ const drawControl = new L.Control.Draw({
 });
 map.addControl(drawControl);
 
-map.on('draw:created', (e: any) => {
-    const drawEvent = e as L.DrawEvents.Created;
-    const type = drawEvent.layerType;
-    const layer = drawEvent.layer;
+map.on(L.Draw.Event.CREATED, (e: L.DrawEvents.Created) => {
+    const type = e.layerType;
+    const layer = e.layer;
 
     drawnItems.addLayer(layer);
 });
diff --git a/types/leaflet-polylinedecorator/index.d.ts b/types/leaflet-polylinedecorator/index.d.ts
new file mode 100644
index 0000000000..db3bea8dd6
--- /dev/null
+++ b/types/leaflet-polylinedecorator/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for leaflet-polylinedecorator 1.1
+// Project: https://github.com/bbecquet/Leaflet.PolylineDecorator#readme
+// Definitions by: Viktor Soucek <https://github.com/soucekv>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="leaflet" />
+
+declare namespace L {
+    namespace Symbol {
+        interface DashOptions {
+            pixelSize?: number;
+            pathOptions?: PathOptions;
+        }
+
+        class Dash {
+            constructor(options?: DashOptions);
+        }
+
+        function dash(options?: DashOptions): Dash;
+
+        interface ArrowHeadOptions {
+            polygon?: boolean;
+            pixelSize?: number;
+            headAngle?: number;
+            pathOptions?: PathOptions;
+        }
+
+        class ArrowHead {
+            constructor(options?: ArrowHeadOptions);
+        }
+
+        function arrowHead(options?: ArrowHeadOptions): ArrowHead;
+
+        interface MarkerOptions {
+            rotate?: boolean;
+            markerOptions?: L.MarkerOptions;
+        }
+
+        class Marker {
+            constructor(options?: L.Symbol.MarkerOptions);
+        }
+
+        function marker(options?: L.Symbol.MarkerOptions): L.Symbol.Marker;
+    }
+
+    interface Pattern {
+        offset?: number;
+        endOffset?: number;
+        repeat: number;
+        symbol: Symbol.Dash | Symbol.ArrowHead | Symbol.Marker;
+    }
+
+    interface PolylineDecoratorOptions {
+        patterns: Pattern[];
+    }
+
+    class PolylineDecorator extends FeatureGroup {
+        constructor(paths: Polyline | Polygon | LatLngExpression[] | Polyline[] | Polygon[] | LatLngExpression[][], options?: PolylineDecoratorOptions);
+    }
+
+    function polylineDecorator(paths: Polyline | Polyline[], options?: PolylineDecoratorOptions): PolylineDecorator;
+}
diff --git a/types/leaflet-polylinedecorator/leaflet-polylinedecorator-tests.ts b/types/leaflet-polylinedecorator/leaflet-polylinedecorator-tests.ts
new file mode 100644
index 0000000000..19bf57e6bd
--- /dev/null
+++ b/types/leaflet-polylinedecorator/leaflet-polylinedecorator-tests.ts
@@ -0,0 +1,52 @@
+const osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+const osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors';
+const osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
+const map = L.map('map', {layers: [osm], center: L.latLng(-37.7772, 175.2756), zoom: 15 });
+
+const polyline = L.polyline([[0, 0], [1, 1]]);
+
+L.polylineDecorator(polyline, {
+    patterns: [
+        // defines a pattern of 10px-wide dashes, repeated every 20px on the line
+        {offset: 0, repeat: 20, symbol: L.Symbol.dash({pixelSize: 10})}
+    ]
+});
+
+L.polylineDecorator(polyline, {
+    patterns: [
+        {
+            offset: 0,
+            endOffset: 10,
+            repeat: 15,
+            symbol: L.Symbol.dash({
+                pixelSize: 12,
+                pathOptions: {}
+            })}
+    ]
+}).addTo(map);
+
+L.polylineDecorator(polyline, {
+    patterns: [
+        {
+            offset: 0,
+            endOffset: 10,
+            repeat: 15,
+            symbol: L.Symbol.arrowHead({
+                polygon: true,
+                headAngle: 45,
+                pixelSize: 12,
+                pathOptions: {}
+            })}
+    ]
+}).addTo(map);
+
+L.polylineDecorator(polyline, {
+    patterns: [
+        {
+            repeat: 15,
+            symbol: L.Symbol.marker({
+                rotate: false,
+                markerOptions: {}
+            })}
+    ]
+}).addTo(map);
diff --git a/types/leaflet-polylinedecorator/tsconfig.json b/types/leaflet-polylinedecorator/tsconfig.json
new file mode 100644
index 0000000000..d50a96123e
--- /dev/null
+++ b/types/leaflet-polylinedecorator/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet-polylinedecorator-tests.ts"
+    ]
+}
diff --git a/types/leaflet-polylinedecorator/tslint.json b/types/leaflet-polylinedecorator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/leaflet-polylinedecorator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/leaflet.awesome-markers/index.d.ts b/types/leaflet.awesome-markers/index.d.ts
index 48c58b8f60..ece7b26076 100644
--- a/types/leaflet.awesome-markers/index.d.ts
+++ b/types/leaflet.awesome-markers/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Leaflet.awesome-markers plugin v2.0
 // Project: https://github.com/sigma-geosistemas/Leaflet.awesome-markers#properties
-// Definitions by: Egor Komarov <https://github.com/Odrin>
+// Definitions by: Marcel Sebek <https://github.com/sebek64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as Leaflet from "leaflet";
@@ -11,27 +11,12 @@ declare global { namespace L {
 
         function icon(options: AwesomeMarkers.IconOptions): AwesomeMarkers.Icon;
 
-        interface IconStatic extends Leaflet.IconStatic {
-            /**
-              * Creates an icon instance with the given options.
-              */
-            new (options: IconOptions): Icon;
-
-            Default: {
-                /**
-                  * Creates a default icon instance with the given options.
-                  */
-                new (options?: IconOptions): Icon.Default;
-
-                imagePath: string;
-            };
-        }
-
-        interface Icon extends Leaflet.Icon {
+        class Icon extends Leaflet.BaseIcon {
+            constructor(options?: AwesomeMarkers.IconOptions);
             options: AwesomeMarkers.IconOptions;
         }
 
-        interface IconOptions extends Leaflet.IconOptions {
+        interface IconOptions extends Leaflet.BaseIconOptions {
             /**
             * Name of the icon. See glyphicons or font-awesome.
             */
@@ -62,7 +47,5 @@ declare global { namespace L {
             */
             extraClasses?: string;
         }
-
-        var Icon: AwesomeMarkers.IconStatic;
     }
 } }
diff --git a/types/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts b/types/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
index 7fe7a82753..1183cad3f3 100644
--- a/types/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
+++ b/types/leaflet.awesome-markers/leaflet.awesome-markers-tests.ts
@@ -15,4 +15,4 @@ var blueMarker = new L.AwesomeMarkers.Icon({
 L.marker([51.941196, 4.512291], { icon: redMarker }).addTo(map);
 L.marker([51.941196, 4.512291], { icon: blueMarker }).addTo(map);
 
-L.AwesomeMarkers.Icon.prototype.options.prefix = 'ion';
\ No newline at end of file
+L.AwesomeMarkers.Icon.prototype.options.prefix = 'fa';
diff --git a/types/leaflet.awesome-markers/tsconfig.json b/types/leaflet.awesome-markers/tsconfig.json
index 74df02c260..d4e34220c0 100644
--- a/types/leaflet.awesome-markers/tsconfig.json
+++ b/types/leaflet.awesome-markers/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "leaflet": [
-                "leaflet/v0"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -25,4 +20,4 @@
         "index.d.ts",
         "leaflet.awesome-markers-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/leaflet.awesome-markers/v0/index.d.ts b/types/leaflet.awesome-markers/v0/index.d.ts
new file mode 100644
index 0000000000..b695d3918b
--- /dev/null
+++ b/types/leaflet.awesome-markers/v0/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for Leaflet.awesome-markers plugin v2.0 with Leaflet 0.x
+// Project: https://github.com/sigma-geosistemas/Leaflet.awesome-markers#properties
+// Definitions by: Egor Komarov <https://github.com/Odrin>, Marcel Sebek <https://github.com/sebek64>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Leaflet from "leaflet";
+
+declare global { namespace L {
+    module AwesomeMarkers {
+        var version: string;
+
+        function icon(options: AwesomeMarkers.IconOptions): AwesomeMarkers.Icon;
+
+        interface IconStatic extends Leaflet.IconStatic {
+            /**
+              * Creates an icon instance with the given options.
+              */
+            new (options: IconOptions): Icon;
+
+            Default: {
+                /**
+                  * Creates a default icon instance with the given options.
+                  */
+                new (options?: IconOptions): Icon.Default;
+
+                imagePath: string;
+            };
+        }
+
+        interface Icon extends Leaflet.Icon {
+            options: AwesomeMarkers.IconOptions;
+        }
+
+        interface IconOptions extends Leaflet.IconOptions {
+            /**
+            * Name of the icon. See glyphicons or font-awesome.
+            */
+            icon?: string;
+
+            /**
+            * Select de icon library. 'fa' for font-awesome or 'glyphicon' for bootstrap 3.
+            */
+            prefix?: 'fa' | 'glyphicon';
+
+            /**
+            * Color of the marker
+            */
+            markerColor?: 'red' | 'darkred' | 'orange' | 'green' | 'darkgreen' | 'blue' | 'purple' | 'darkpurple' | 'cadetblue';
+
+            /**
+            * Color of the icon. 'white', 'black' or css code (hex, rgba etc).
+            */
+            iconColor?: 'white' | 'black' | string;
+
+            /**
+            * Make the icon spin. true or false. Font-awesome required
+            */
+            spin?: boolean;
+
+            /**
+            * Additional classes in the created tag
+            */
+            extraClasses?: string;
+        }
+
+        var Icon: AwesomeMarkers.IconStatic;
+    }
+} }
diff --git a/types/leaflet.awesome-markers/v0/leaflet.awesome-markers-tests.ts b/types/leaflet.awesome-markers/v0/leaflet.awesome-markers-tests.ts
new file mode 100644
index 0000000000..7fe7a82753
--- /dev/null
+++ b/types/leaflet.awesome-markers/v0/leaflet.awesome-markers-tests.ts
@@ -0,0 +1,18 @@
+
+
+var map: L.Map;
+
+var redMarker = L.AwesomeMarkers.icon({
+    icon: 'coffee',
+    markerColor: 'red'
+});
+
+var blueMarker = new L.AwesomeMarkers.Icon({
+    icon: 'star',
+    markerColor: 'blue'
+});
+
+L.marker([51.941196, 4.512291], { icon: redMarker }).addTo(map);
+L.marker([51.941196, 4.512291], { icon: blueMarker }).addTo(map);
+
+L.AwesomeMarkers.Icon.prototype.options.prefix = 'ion';
\ No newline at end of file
diff --git a/types/leaflet.awesome-markers/v0/tsconfig.json b/types/leaflet.awesome-markers/v0/tsconfig.json
new file mode 100644
index 0000000000..95c7b0b62f
--- /dev/null
+++ b/types/leaflet.awesome-markers/v0/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "leaflet": [
+                "leaflet/v0"
+            ],
+            "leaflet.awesome-markers": [
+                "leaflet.awesome-markers/v0"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "leaflet.awesome-markers-tests.ts"
+    ]
+}
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 3208733869..80adf4bc3f 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -390,6 +390,7 @@ declare namespace L {
 
     interface LayerOptions {
         pane?: string;
+        attribution?: string;
     }
 
     interface InteractiveLayerOptions extends LayerOptions {
@@ -1375,8 +1376,8 @@ declare namespace L {
         wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds;
         distance(latlng1: LatLngExpression, latlng2: LatLngExpression): number;
         containerPointToLayerPoint(point: PointExpression): Point;
-        layerPointToContainerPoint(point: PointExpression): Point;
         containerPointToLatLng(point: PointExpression): LatLng;
+        layerPointToContainerPoint(point: PointExpression): Point;
         latLngToContainerPoint(latlng: LatLngExpression): Point;
         mouseEventToContainerPoint(ev: MouseEvent): Point;
         mouseEventToLayerPoint(ev: MouseEvent): Point;
diff --git a/types/lobibox/index.d.ts b/types/lobibox/index.d.ts
index 8ca43e3e10..4c790036f7 100644
--- a/types/lobibox/index.d.ts
+++ b/types/lobibox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/arboshiki/lobibox
 // Definitions by: Sabeeh Ul Hussnain <https://github.com/itboy87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare var Lobibox: LobiboxModule.LobiboxStatic;
 declare module "Lobibox" {
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index b8ae248190..bb0b7b7f9d 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -280,9 +280,12 @@ declare namespace _ {
         (value: number): LoDashImplicitWrapper<number>;
         (value: string): LoDashImplicitStringWrapper;
         (value: boolean): LoDashImplicitWrapper<boolean>;
+        (value: null | undefined): LoDashImplicitWrapper<null | undefined>;
         (value: number[]): LoDashImplicitNumberArrayWrapper;
         <T>(value: T[]): LoDashImplicitArrayWrapper<T>;
+        <T>(value: T[] | null | undefined): LoDashImplicitNillableArrayWrapper<T>;
         <T extends {}>(value: T): LoDashImplicitObjectWrapper<T>;
+        <T extends {}>(value: T | null | undefined): LoDashImplicitNillableObjectWrapper<T>;
         (value: any): LoDashImplicitWrapper<any>;
 
         /**
@@ -379,32 +382,50 @@ declare namespace _ {
 
     interface LoDashExplicitStringWrapper extends LoDashExplicitWrapper<string> { }
 
-    interface LoDashImplicitObjectWrapper<T> extends LoDashImplicitWrapperBase<T, LoDashImplicitObjectWrapper<T>> { }
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> extends LoDashImplicitWrapperBase<TObject, TWrapper> { }
 
-    interface LoDashExplicitObjectWrapper<T> extends LoDashExplicitWrapperBase<T, LoDashExplicitObjectWrapper<T>> { }
+    interface LoDashImplicitObjectWrapper<T> extends LoDashImplicitObjectWrapperBase<T, T, LoDashImplicitObjectWrapper<T>> { }
+ 
+    interface LoDashImplicitNillableObjectWrapper<T> extends LoDashImplicitObjectWrapperBase<T, T | null | undefined, LoDashImplicitNillableObjectWrapper<T>> { }
 
-    interface LoDashImplicitArrayWrapper<T> extends LoDashImplicitWrapperBase<T[], LoDashImplicitArrayWrapper<T>> {
-        pop(): T;
-        push(...items: T[]): LoDashImplicitArrayWrapper<T>;
-        shift(): T;
-        sort(compareFn?: (a: T, b: T) => number): LoDashImplicitArrayWrapper<T>;
-        splice(start: number): LoDashImplicitArrayWrapper<T>;
-        splice(start: number, deleteCount: number, ...items: any[]): LoDashImplicitArrayWrapper<T>;
-        unshift(...items: T[]): LoDashImplicitArrayWrapper<T>;
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> extends LoDashExplicitWrapperBase<TObject, TWrapper> { }
+
+    interface LoDashExplicitObjectWrapper<T> extends LoDashExplicitObjectWrapperBase<T, T, LoDashExplicitObjectWrapper<T>> { }
+ 
+    interface LoDashExplicitNillableObjectWrapper<T> extends LoDashExplicitObjectWrapperBase<T, T | null | undefined, LoDashExplicitNillableObjectWrapper<T>> { }
+
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> extends LoDashImplicitWrapperBase<TArray, TWrapper> {
+        pop(): T | undefined;
+        push(...items: T[]): TWrapper;
+        shift(): T | undefined;
+        sort(compareFn?: (a: T, b: T) => number): TWrapper;
+        splice(start: number): TWrapper;
+        splice(start: number, deleteCount: number, ...items: T[]): TWrapper;
+        unshift(...items: T[]): TWrapper;
     }
 
-    interface LoDashExplicitArrayWrapper<T> extends LoDashExplicitWrapperBase<T[], LoDashExplicitArrayWrapper<T>> {
-        pop(): LoDashExplicitObjectWrapper<T>;
-        push(...items: T[]): LoDashExplicitArrayWrapper<T>;
-        shift(): LoDashExplicitObjectWrapper<T>;
-        sort(compareFn?: (a: T, b: T) => number): LoDashExplicitArrayWrapper<T>;
-        splice(start: number): LoDashExplicitArrayWrapper<T>;
-        splice(start: number, deleteCount: number, ...items: any[]): LoDashExplicitArrayWrapper<T>;
-        unshift(...items: T[]): LoDashExplicitArrayWrapper<T>;
-    }
+    interface LoDashImplicitArrayWrapper<T> extends LoDashImplicitArrayWrapperBase<T, T[], LoDashImplicitArrayWrapper<T>> { }
+
+    interface LoDashImplicitNillableArrayWrapper<T> extends LoDashImplicitArrayWrapperBase<T, T[] | null | undefined, LoDashImplicitNillableArrayWrapper<T>> { }
+
+    interface LoDashImplicitNumberArrayWrapperBase<TArray extends number[] | null | undefined, TWrapper> extends LoDashImplicitArrayWrapperBase<number, TArray, TWrapper> { }
 
     interface LoDashImplicitNumberArrayWrapper extends LoDashImplicitArrayWrapper<number> { }
 
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> extends LoDashExplicitWrapperBase<TArray, TWrapper> {
+        pop(): LoDashExplicitObjectWrapper<T | undefined>;
+        push(...items: T[]): TWrapper;
+        shift(): LoDashExplicitObjectWrapper<T | undefined>;
+        sort(compareFn?: (a: T, b: T) => number): TWrapper;
+        splice(start: number): TWrapper;
+        splice(start: number, deleteCount: number, ...items: T[]): TWrapper;
+        unshift(...items: T[]): TWrapper;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> extends LoDashExplicitArrayWrapperBase<T, T[], LoDashExplicitArrayWrapper<T>> { }
+
+    interface LoDashExplicitNillableArrayWrapper<T> extends LoDashExplicitArrayWrapperBase<T, T[] | null | undefined, LoDashExplicitNillableArrayWrapper<T>> { }
+
     interface LoDashExplicitNumberArrayWrapper extends LoDashExplicitArrayWrapper<number> { }
 
     /*********
@@ -422,33 +443,33 @@ declare namespace _ {
          * @return Returns the new array containing chunks.
          */
         chunk<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             size?: number
         ): T[][];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.chunk
          */
         chunk(size?: number): LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.chunk
          */
         chunk<TResult>(size?: number): LoDashImplicitArrayWrapper<TResult[]>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.chunk
          */
         chunk(size?: number): LoDashExplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.chunk
          */
@@ -464,31 +485,31 @@ declare namespace _ {
          * @param array The array to compact.
          * @return (Array) Returns the new array of filtered values.
          */
-        compact<T>(array?: List<T | undefined>): T[];
+        compact<T>(array?: List<T | null | undefined> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.compact
          */
         compact(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.compact
          */
         compact<TResult>(): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.compact
          */
         compact(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.compact
          */
@@ -532,33 +553,33 @@ declare namespace _ {
          * @return Returns the new array of filtered values.
          */
         difference<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             ...values: Array<List<T>>
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.difference
          */
         difference(...values: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.difference
          */
         difference<TValue>(...values: Array<List<TValue>>): LoDashImplicitArrayWrapper<TValue>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.difference
          */
         difference(...values: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.difference
          */
@@ -578,7 +599,7 @@ declare namespace _ {
          * @returns Returns the new array of filtered values.
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values?: List<T>,
             iteratee?: ((value: T) => any)|string
         ): T[];
@@ -587,7 +608,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T, W extends Object>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values?: List<T>,
             iteratee?: W
         ): T[];
@@ -596,7 +617,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             iteratee?: ((value: T) => any)|string
@@ -606,7 +627,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T, W extends Object>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             iteratee?: W
@@ -616,7 +637,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -627,7 +648,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T, W extends Object>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -638,7 +659,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T, W extends Object>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -650,7 +671,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -662,7 +683,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -675,7 +696,7 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T, W extends Object>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             values1?: List<T>,
             values2?: List<T>,
             values3?: List<T>,
@@ -688,12 +709,12 @@ declare namespace _ {
          * @see _.differenceBy
          */
         differenceBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             ...values: any[]
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.differenceBy
          */
@@ -802,7 +823,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.differenceBy
          */
@@ -911,7 +932,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.differenceBy
          */
@@ -1020,7 +1041,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.differenceBy
          */
@@ -1162,31 +1183,31 @@ declare namespace _ {
          * @param n The number of elements to drop.
          * @return Returns the slice of array.
          */
-        drop<T>(array: List<T>, n?: number): T[];
+        drop<T>(array: List<T> | null | undefined, n?: number): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.drop
          */
         drop(n?: number): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.drop
          */
         drop<T>(n?: number): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.drop
          */
         drop(n?: number): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.drop
          */
@@ -1203,33 +1224,33 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         dropRight<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             n?: number
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropRight
          */
         dropRight(n?: number): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropRight
          */
         dropRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropRight
          */
         dropRight(n?: number): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropRight
          */
@@ -1257,7 +1278,7 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         dropRightWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: ListIterator<TValue, boolean>
         ): TValue[];
 
@@ -1265,7 +1286,7 @@ declare namespace _ {
          * @see _.dropRightWhile
          */
         dropRightWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: string
         ): TValue[];
 
@@ -1273,12 +1294,12 @@ declare namespace _ {
          * @see _.dropRightWhile
          */
         dropRightWhile<TWhere, TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: TWhere
         ): TValue[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropRightWhile
          */
@@ -1301,7 +1322,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropRightWhile
          */
@@ -1324,7 +1345,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<TValue>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropRightWhile
          */
@@ -1347,7 +1368,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropRightWhile
          */
@@ -1391,7 +1412,7 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         dropWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: ListIterator<TValue, boolean>
         ): TValue[];
 
@@ -1399,7 +1420,7 @@ declare namespace _ {
          * @see _.dropWhile
          */
         dropWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: string
         ): TValue[];
 
@@ -1407,12 +1428,12 @@ declare namespace _ {
          * @see _.dropWhile
          */
         dropWhile<TWhere, TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: TWhere
         ): TValue[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropWhile
          */
@@ -1435,7 +1456,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropWhile
          */
@@ -1458,7 +1479,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<TValue>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.dropWhile
          */
@@ -1481,7 +1502,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.dropWhile
          */
@@ -1518,7 +1539,7 @@ declare namespace _ {
          * @return Returns array.
          */
         fill<T>(
-            array: any[],
+            array: any[] | null | undefined,
             value: T,
             start?: number,
             end?: number
@@ -1528,14 +1549,14 @@ declare namespace _ {
          * @see _.fill
          */
         fill<T>(
-            array: List<any>,
+            array: List<any> | null | undefined,
             value: T,
             start?: number,
             end?: number
         ): List<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
@@ -1546,7 +1567,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
@@ -1557,7 +1578,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<List<T>>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
@@ -1568,7 +1589,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.fill
          */
@@ -1600,7 +1621,7 @@ declare namespace _ {
          * @return Returns the index of the found element, else -1.
          */
         findIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>,
             fromIndex?: number
         ): number;
@@ -1609,7 +1630,7 @@ declare namespace _ {
          * @see _.findIndex
          */
         findIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: string,
             fromIndex?: number
         ): number;
@@ -1618,13 +1639,13 @@ declare namespace _ {
          * @see _.findIndex
          */
         findIndex<W, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: W,
             fromIndex?: number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.findIndex
          */
@@ -1650,7 +1671,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findIndex
          */
@@ -1676,7 +1697,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.findIndex
          */
@@ -1702,7 +1723,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findIndex
          */
@@ -1748,7 +1769,7 @@ declare namespace _ {
          * @return Returns the index of the found element, else -1.
          */
         findLastIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>,
             fromIndex?: number
         ): number;
@@ -1757,7 +1778,7 @@ declare namespace _ {
          * @see _.findLastIndex
          */
         findLastIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: string,
             fromIndex?: number
         ): number;
@@ -1766,13 +1787,13 @@ declare namespace _ {
          * @see _.findLastIndex
          */
         findLastIndex<W, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             predicate?: W,
             fromIndex?: number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.findLastIndex
          */
@@ -1798,7 +1819,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findLastIndex
          */
@@ -1824,7 +1845,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.findLastIndex
          */
@@ -1850,7 +1871,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findLastIndex
          */
@@ -1881,28 +1902,28 @@ declare namespace _ {
         /**
          * @see _.head
          */
-        first<T>(array: List<T>): T;
+        first<T>(array: List<T> | null | undefined): T | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
         /**
          * @see _.head
          */
-        first(): string;
+        first(): string | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
-        first(): T;
+        first(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
-        first<T>(): T;
+        first<T>(): T | undefined;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -1912,14 +1933,14 @@ declare namespace _ {
         first(): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
         first<T>(): T;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
@@ -1939,17 +1960,17 @@ declare namespace _ {
          * @param isDeep Specify a deep flatten.
          * @return Returns the new flattened array.
          */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T>, isDeep: boolean): T[];
+        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, isDeep: boolean): T[];
 
         /**
          * @see _.flatten
          */
-        flatten<T>(array: List<Many<T>>): T[];
+        flatten<T>(array: List<Many<T>> | null | undefined): T[];
 
         /**
          * @see _.flatten
          */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T>): RecursiveArray<T>;
+        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): RecursiveArray<T>;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -1959,14 +1980,14 @@ declare namespace _ {
         flatten(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flatten
          */
         flatten<TResult>(isDeep?: boolean): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatten
          */
@@ -1980,14 +2001,14 @@ declare namespace _ {
         flatten(): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flatten
          */
         flatten<TResult>(isDeep?: boolean): LoDashExplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatten
          */
@@ -2002,7 +2023,7 @@ declare namespace _ {
          * @param array The array to recursively flatten.
          * @return Returns the new flattened array.
          */
-        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T>): T[];
+        flattenDeep<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -2012,14 +2033,14 @@ declare namespace _ {
         flattenDeep(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flattenDeep
          */
         flattenDeep<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flattenDeep
          */
@@ -2033,14 +2054,14 @@ declare namespace _ {
         flattenDeep(): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flattenDeep
          */
         flattenDeep<T>(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flattenDeep
          */
@@ -2056,7 +2077,7 @@ declare namespace _ {
         * @param number The maximum recursion depth.
         * @return Returns the new flattened array.
         */
-        flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T>, depth?: number): T[];
+        flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
      }
 
     //_.fromPairs
@@ -2076,19 +2097,19 @@ declare namespace _ {
          * // => { 'fred': 30, 'barney': 40 }
          */
         fromPairs<T>(
-          array: List<[_.StringRepresentable, T]>
+          array: List<[_.StringRepresentable, T]> | null | undefined
         ): Dictionary<T>;
 
         /**
          @see _.fromPairs
          */
         fromPairs(
-            array: List<any[]>
+            array: List<any[]> | null | undefined
         ): Dictionary<any>;
     }
 
     //_.fromPairs DUMMY
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.fromPairs
          */
@@ -2096,7 +2117,7 @@ declare namespace _ {
     }
 
     //_.fromPairs DUMMY
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.fromPairs
          */
@@ -2113,28 +2134,28 @@ declare namespace _ {
          * @param array The array to query.
          * @return Returns the first element of array.
          */
-        head<T>(array: List<T>): T;
+        head<T>(array: List<T> | null | undefined): T | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
         /**
          * @see _.head
          */
-        head(): string;
+        head(): string | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
-        head(): T;
+        head(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
-        head<T>(): T;
+        head<T>(): T | undefined;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -2144,14 +2165,14 @@ declare namespace _ {
         head(): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
         head<T>(): T;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.head
          */
@@ -2184,13 +2205,13 @@ declare namespace _ {
          * // => 3
          */
         indexOf<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             fromIndex?: boolean|number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.indexOf
          */
@@ -2200,7 +2221,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.indexOf
          */
@@ -2210,7 +2231,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.indexOf
          */
@@ -2220,7 +2241,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.indexOf
          */
@@ -2295,7 +2316,7 @@ declare namespace _ {
          * @returns Returns the joined string.
          */
         join(
-            array: List<any>,
+            array: List<any> | null | undefined,
             separator?: string
         ): string;
     }
@@ -2307,14 +2328,14 @@ declare namespace _ {
         join(separator?: string): string;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.join
          */
         join(separator?: string): string;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.join
          */
@@ -2328,14 +2349,14 @@ declare namespace _ {
         join(separator?: string): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.join
          */
         join(separator?: string): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.join
          */
@@ -2445,12 +2466,12 @@ declare namespace _ {
          * // => 2
          */
         sortedIndexOf<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexOf
          */
@@ -2459,7 +2480,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexOf
          */
@@ -2468,7 +2489,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexOf
          */
@@ -2477,7 +2498,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexOf
          */
@@ -2494,31 +2515,31 @@ declare namespace _ {
          * @param array The array to query.
          * @return Returns the slice of array.
          */
-        initial<T>(array: List<T>): T[];
+        initial<T>(array: List<T> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.initial
          */
         initial(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.initial
          */
         initial<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.initial
          */
         initial(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.initial
          */
@@ -2534,31 +2555,31 @@ declare namespace _ {
          * @param arrays The arrays to inspect.
          * @return Returns the new array of shared values.
          */
-        intersection<T>(...arrays: Array<List<T>>): T[];
+        intersection<T>(...arrays: Array<List<T> | null | undefined>): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.intersection
          */
         intersection<TResult>(...arrays: Array<List<TResult>>): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.intersection
          */
         intersection<TResult>(...arrays: Array<List<TResult>>): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.intersection
          */
         intersection<TResult>(...arrays: Array<List<TResult>>): LoDashExplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.intersection
          */
@@ -2573,28 +2594,28 @@ declare namespace _ {
          * @param array The array to query.
          * @return Returns the last element of array.
          */
-        last<T>(array: List<T>): T;
+        last<T>(array: List<T> | null | undefined): T | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
         /**
          * @see _.last
          */
-        last(): string;
+        last(): string | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.last
          */
-        last(): T;
+        last(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.last
          */
-        last<T>(): T;
+        last<T>(): T | undefined;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -2604,14 +2625,14 @@ declare namespace _ {
         last(): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.last
          */
         last<T>(): T;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.last
          */
@@ -2629,13 +2650,13 @@ declare namespace _ {
          * @return Returns the index of the matched value, else -1.
          */
         lastIndexOf<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             fromIndex?: boolean|number
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.lastIndexOf
          */
@@ -2645,7 +2666,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.lastIndexOf
          */
@@ -2655,7 +2676,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.lastIndexOf
          */
@@ -2665,7 +2686,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.lastIndexOf
          */
@@ -2685,30 +2706,30 @@ declare namespace _ {
          * @return Returns the nth element of `array`.
          */
         nth<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             n?: number
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.nth
          */
         nth(
             n?: number
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.nth
          */
         nth<TResult>(
             n?:number
-        ): TResult;
+        ): TResult | undefined;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.nth
          */
@@ -2717,7 +2738,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.nth
          */
@@ -2971,31 +2992,31 @@ declare namespace _ {
          * @param array The array to query.
          * @return Returns the slice of array.
          */
-        tail<T>(array: List<T>): T[];
+        tail<T>(array: List<T> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.tail
          */
         tail(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.tail
          */
         tail<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.tail
          */
         tail(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.tail
          */
@@ -3013,13 +3034,13 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         slice<T>(
-            array: T[],
+            array: T[] | null | undefined,
             start?: number,
             end?: number
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.slice
          */
@@ -3029,7 +3050,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.slice
          */
@@ -3059,40 +3080,8 @@ declare namespace _ {
          * _.sortedIndex([4, 5], 4);
          * // => 0
          */
-        sortedIndex<T, TSort>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
         sortedIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T
         ): number;
     }
@@ -3106,14 +3095,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: T
-        ): number;
-
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndex
          */
@@ -3122,27 +3104,13 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T, TSort>(
-            value: T
-        ): number;
-
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndex
          */
         sortedIndex<T>(
             value: T
         ): number;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            value: T
-        ): number;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -3154,50 +3122,22 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndex
          */
         sortedIndex(
             value: T
         ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<T, TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndex
          */
         sortedIndex<T>(
             value: T
         ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedIndex
-         */
-        sortedIndex<W, T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
     }
 
     // _.sortedIndexBy
@@ -3226,7 +3166,7 @@ declare namespace _ {
          * // => 0
          */
         sortedIndexBy<T, TSort>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: (x: T) => TSort
         ): number;
@@ -3235,7 +3175,7 @@ declare namespace _ {
          * @see _.sortedIndexBy
          */
         sortedIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: (x: T) => any
         ): number;
@@ -3244,7 +3184,7 @@ declare namespace _ {
          * @see _.sortedIndexBy
          */
         sortedIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: string
         ): number;
@@ -3253,7 +3193,7 @@ declare namespace _ {
          * @see _.sortedIndexBy
          */
         sortedIndexBy<W, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: W
         ): number;
@@ -3262,7 +3202,7 @@ declare namespace _ {
          * @see _.sortedIndexBy
          */
         sortedIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: Object
         ): number;
@@ -3278,7 +3218,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexBy
          */
@@ -3304,7 +3244,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexBy
          */
@@ -3356,7 +3296,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexBy
          */
@@ -3382,7 +3322,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedIndexBy
          */
@@ -3442,40 +3382,8 @@ declare namespace _ {
          * _.sortedLastIndex([4, 5], 4);
          * // => 1
          */
-        sortedLastIndex<T, TSort>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
         sortedLastIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            array: List<T>,
-            value: T
-        ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T
         ): number;
     }
@@ -3484,74 +3392,39 @@ declare namespace _ {
         /**
          * @see _.sortedLastIndex
          */
-        sortedLastIndex<TSort>(
+        sortedLastIndex(
             value: string
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: T
-        ): number;
-
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndex
          */
         sortedLastIndex(
             value: T
         ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W>(
-            value: T
-        ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T, TSort>(
-            value: T
-        ): number;
-
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndex
          */
         sortedLastIndex<T>(
             value: T
         ): number;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            value: T
-        ): number;
     }
 
     interface LoDashExplicitWrapper<T> {
         /**
          * @see _.sortedLastIndex
          */
-        sortedLastIndex<TSort>(
+        sortedLastIndex(
             value: string
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndex
          */
@@ -3560,27 +3433,13 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<T, TSort>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
-
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndex
          */
         sortedLastIndex<T>(
             value: T
         ): LoDashExplicitWrapper<number>;
-
-        /**
-         * @see _.sortedLastIndex
-         */
-        sortedLastIndex<W, T>(
-            value: T
-        ): LoDashExplicitWrapper<number>;
     }
 
     //_.sortedLastIndexBy
@@ -3604,7 +3463,7 @@ declare namespace _ {
          * // => 1
          */
         sortedLastIndexBy<T, TSort>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: (x: T) => TSort
         ): number;
@@ -3613,7 +3472,7 @@ declare namespace _ {
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: (x: T) => any
         ): number;
@@ -3622,7 +3481,7 @@ declare namespace _ {
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: string
         ): number;
@@ -3631,7 +3490,7 @@ declare namespace _ {
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<W, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: W
         ): number;
@@ -3640,7 +3499,7 @@ declare namespace _ {
          * @see _.sortedLastIndexBy
          */
         sortedLastIndexBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             value: T,
             iteratee: Object
         ): number;
@@ -3656,7 +3515,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndexBy
          */
@@ -3682,7 +3541,7 @@ declare namespace _ {
         ): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndexBy
          */
@@ -3734,7 +3593,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndexBy
          */
@@ -3760,7 +3619,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedLastIndexBy
          */
@@ -3819,10 +3678,10 @@ declare namespace _ {
          * _.sortedLastIndexOf([1, 1, 2, 2], 2);
          * // => 3
          */
-        sortedLastIndexOf(
-            array: List<any>,
-            ...values: any[]
-        ): any[];
+        sortedLastIndexOf<T>(
+            array: List<T> | null | undefined,
+            value: T
+        ): number;
     }
 
     //_.tail
@@ -3830,31 +3689,31 @@ declare namespace _ {
         /**
          * @see _.rest
          */
-        tail<T>(array: List<T>): T[];
+        tail<T>(array: List<T> | null | undefined): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.rest
          */
         tail(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.rest
          */
         tail<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.rest
          */
         tail(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.rest
          */
@@ -3871,33 +3730,33 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         take<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             n?: number
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.take
          */
         take(n?: number): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.take
          */
         take<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.take
          */
         take(n?: number): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.take
          */
@@ -3914,33 +3773,33 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         takeRight<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             n?: number
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeRight
          */
         takeRight(n?: number): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeRight
          */
         takeRight<TResult>(n?: number): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeRight
          */
         takeRight(n?: number): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeRight
          */
@@ -3968,7 +3827,7 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         takeRightWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: ListIterator<TValue, boolean>
         ): TValue[];
 
@@ -3976,7 +3835,7 @@ declare namespace _ {
          * @see _.takeRightWhile
          */
         takeRightWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: string
         ): TValue[];
 
@@ -3984,12 +3843,12 @@ declare namespace _ {
          * @see _.takeRightWhile
          */
         takeRightWhile<TWhere, TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: TWhere
         ): TValue[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeRightWhile
          */
@@ -4012,7 +3871,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeRightWhile
          */
@@ -4035,7 +3894,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<TValue>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeRightWhile
          */
@@ -4058,7 +3917,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeRightWhile
          */
@@ -4102,7 +3961,7 @@ declare namespace _ {
          * @return Returns the slice of array.
          */
         takeWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: ListIterator<TValue, boolean>
         ): TValue[];
 
@@ -4110,7 +3969,7 @@ declare namespace _ {
          * @see _.takeWhile
          */
         takeWhile<TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: string
         ): TValue[];
 
@@ -4118,12 +3977,12 @@ declare namespace _ {
          * @see _.takeWhile
          */
         takeWhile<TWhere, TValue>(
-            array: List<TValue>,
+            array: List<TValue> | null | undefined,
             predicate?: TWhere
         ): TValue[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeWhile
          */
@@ -4146,7 +4005,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeWhile
          */
@@ -4169,7 +4028,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<TValue>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.takeWhile
          */
@@ -4192,7 +4051,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.takeWhile
          */
@@ -4224,45 +4083,45 @@ declare namespace _ {
          * @param arrays The arrays to inspect.
          * @return Returns the new array of combined values.
          */
-        union<T>(...arrays: Array<List<T>>): T[];
+        union<T>(...arrays: Array<List<T> | null | undefined>): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.union
          */
-        union(...arrays: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        union(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
 
         /**
          * @see _.union
          */
-        union<T>(...arrays: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.union
          */
-        union<T>(...arrays: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.union
          */
-        union(...arrays: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
+        union(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
 
         /**
          * @see _.union
          */
-        union<T>(...arrays: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
+        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.union
          */
-        union<T>(...arrays: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
+        union<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.unionBy
@@ -4277,7 +4136,7 @@ declare namespace _ {
          * @return Returns the new array of combined values.
          */
         unionBy<T>(
-            arrays: List<T>,
+            arrays: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): T[];
 
@@ -4285,7 +4144,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays: List<T>,
+            arrays: List<T> | null | undefined,
             iteratee?: W
         ): T[];
 
@@ -4293,8 +4152,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays1: List<T>,
-            arrays2: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): T[];
 
@@ -4302,8 +4161,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays1: List<T>,
-            arrays2: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
             iteratee?: W
         ): T[];
 
@@ -4311,9 +4170,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): T[];
 
@@ -4321,9 +4180,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: W
         ): T[];
 
@@ -4331,10 +4190,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): T[];
 
@@ -4342,10 +4201,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: W
         ): T[];
 
@@ -4353,11 +4212,11 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): T[];
 
@@ -4365,11 +4224,11 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays1: List<T>,
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays1: List<T> | null | undefined,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: W
         ): T[];
 
@@ -4377,12 +4236,12 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays: List<T>,
+            arrays: List<T> | null | undefined,
             ...iteratee: any[]
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unionBy
          */
@@ -4401,7 +4260,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4409,7 +4268,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4417,8 +4276,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4426,8 +4285,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4435,9 +4294,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4445,9 +4304,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4455,10 +4314,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4466,10 +4325,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4481,7 +4340,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.unionBy
          */
@@ -4500,7 +4359,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4508,7 +4367,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4516,8 +4375,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4525,8 +4384,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4534,9 +4393,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4544,9 +4403,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4554,10 +4413,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4565,10 +4424,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: W
         ): LoDashImplicitArrayWrapper<T>;
 
@@ -4580,7 +4439,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unionBy
          */
@@ -4599,7 +4458,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4607,7 +4466,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4615,8 +4474,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4624,8 +4483,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4633,9 +4492,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4643,9 +4502,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4653,10 +4512,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4664,10 +4523,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4679,7 +4538,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.unionBy
          */
@@ -4698,7 +4557,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4706,7 +4565,7 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
+            arrays2: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4714,8 +4573,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4723,8 +4582,8 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4732,9 +4591,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4742,9 +4601,9 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4752,10 +4611,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: (value: T) => any
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4763,10 +4622,10 @@ declare namespace _ {
          * @see _.unionBy
          */
         unionBy<T, W extends Object>(
-            arrays2: List<T>,
-            arrays3: List<T>,
-            arrays4: List<T>,
-            arrays5: List<T>,
+            arrays2: List<T> | null | undefined,
+            arrays3: List<T> | null | undefined,
+            arrays4: List<T> | null | undefined,
+            arrays5: List<T> | null | undefined,
             iteratee?: W
         ): LoDashExplicitArrayWrapper<T>;
 
@@ -4797,14 +4656,14 @@ declare namespace _ {
          * // => [2, 1]
          */
         uniq<T>(
-            array: List<T>
+            array: List<T> | null | undefined
         ): T[];
 
         /**
          * @see _.uniq
          */
         uniq<T, TSort>(
-            array: List<T>
+            array: List<T> | null | undefined
         ): T[];
     }
 
@@ -4815,7 +4674,7 @@ declare namespace _ {
         uniq<TSort>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.uniq
          */
@@ -4827,7 +4686,7 @@ declare namespace _ {
         uniq(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         uniq<T>(): LoDashImplicitArrayWrapper<T>;
 
         /**
@@ -4843,7 +4702,7 @@ declare namespace _ {
         uniq<TSort>(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.uniq
          */
@@ -4855,7 +4714,7 @@ declare namespace _ {
         uniq(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.uniq
          */
@@ -4890,7 +4749,7 @@ declare namespace _ {
          * // => [{ 'x': 1 }, { 'x': 2 }]
          */
         uniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: ListIterator<T, any>
         ): T[];
 
@@ -4898,7 +4757,7 @@ declare namespace _ {
          * @see _.uniqBy
          */
         uniqBy<T, TSort>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: ListIterator<T, TSort>
         ): T[];
 
@@ -4906,7 +4765,7 @@ declare namespace _ {
          * @see _.uniqBy
          */
         uniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: string
         ): T[];
 
@@ -4914,7 +4773,7 @@ declare namespace _ {
          * @see _.uniqBy
          */
         uniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: Object
         ): T[];
 
@@ -4922,7 +4781,7 @@ declare namespace _ {
          * @see _.uniqBy
          */
         uniqBy<TWhere extends {}, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: TWhere
         ): T[];
     }
@@ -4936,7 +4795,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.uniqBy
          */
@@ -4959,7 +4818,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.uniqBy
          */
@@ -5005,7 +4864,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.uniqBy
          */
@@ -5028,7 +4887,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.uniqBy
          */
@@ -5082,14 +4941,14 @@ declare namespace _ {
          * // => [1, 2]
          */
         sortedUniq<T>(
-            array: List<T>
+            array: List<T> | null | undefined
         ): T[];
 
         /**
          * @see _.sortedUniq
          */
         sortedUniq<T, TSort>(
-            array: List<T>
+            array: List<T> | null | undefined
         ): T[];
     }
 
@@ -5100,7 +4959,7 @@ declare namespace _ {
         sortedUniq<TSort>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniq
          */
@@ -5112,7 +4971,7 @@ declare namespace _ {
         sortedUniq(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         sortedUniq<T>(): LoDashImplicitArrayWrapper<T>;
 
         /**
@@ -5128,7 +4987,7 @@ declare namespace _ {
         sortedUniq<TSort>(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniq
          */
@@ -5140,7 +4999,7 @@ declare namespace _ {
         sortedUniq(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniq
          */
@@ -5170,7 +5029,7 @@ declare namespace _ {
          * // => [1.1, 2.2]
          */
         sortedUniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: ListIterator<T, any>
         ): T[];
 
@@ -5178,7 +5037,7 @@ declare namespace _ {
          * @see _.sortedUniqBy
          */
         sortedUniqBy<T, TSort>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: ListIterator<T, TSort>
         ): T[];
 
@@ -5186,7 +5045,7 @@ declare namespace _ {
          * @see _.sortedUniqBy
          */
         sortedUniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: string
         ): T[];
 
@@ -5194,7 +5053,7 @@ declare namespace _ {
          * @see _.sortedUniqBy
          */
         sortedUniqBy<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: Object
         ): T[];
 
@@ -5202,7 +5061,7 @@ declare namespace _ {
          * @see _.sortedUniqBy
          */
         sortedUniqBy<TWhere extends {}, T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             iteratee: TWhere
         ): T[];
     }
@@ -5216,7 +5075,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniqBy
          */
@@ -5239,7 +5098,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniqBy
          */
@@ -5285,7 +5144,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniqBy
          */
@@ -5308,7 +5167,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortedUniqBy
          */
@@ -5407,31 +5266,31 @@ declare namespace _ {
          * @param array The array of grouped elements to process.
          * @return Returns the new array of regrouped elements.
          */
-        unzip<T>(array: List<List<T>>): T[][];
+        unzip<T>(array: List<List<T>> | null | undefined): T[][];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unzip
          */
         unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.unzip
          */
         unzip<T>(): LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unzip
          */
         unzip<T>(): LoDashExplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.unzip
          */
@@ -5451,12 +5310,12 @@ declare namespace _ {
          * @return Returns the new array of regrouped elements.
          */
         unzipWith<TArray, TResult>(
-            array: List<List<TArray>>,
+            array: List<List<TArray>> | null | undefined,
             iteratee?: MemoIterator<TArray, TResult>
         ): TResult[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.unzipWith
          */
@@ -5465,7 +5324,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.unzipWith
          */
@@ -5484,33 +5343,33 @@ declare namespace _ {
          * @return Returns the new array of filtered values.
          */
         without<T>(
-            array: List<T>,
+            array: List<T> | null | undefined,
             ...values: T[]
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.without
          */
         without(...values: T[]): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.without
          */
         without<T>(...values: T[]): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.without
          */
         without(...values: T[]): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.without
          */
@@ -5525,35 +5384,35 @@ declare namespace _ {
          * @param arrays The arrays to inspect.
          * @return Returns the new array of values.
          */
-        xor<T>(...arrays: Array<List<T>>): T[];
+        xor<T>(...arrays: Array<List<T> | null | undefined>): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.xor
          */
-        xor(...arrays: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        xor(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.xor
          */
-        xor<T>(...arrays: Array<List<T>>): LoDashImplicitArrayWrapper<T>;
+        xor<T>(...arrays: Array<List<T> | null | undefined>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.xor
          */
-        xor(...arrays: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
+        xor(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.xor
          */
-        xor<T>(...arrays: Array<List<T>>): LoDashExplicitArrayWrapper<T>;
+        xor<T>(...arrays: Array<List<T> | null | undefined>): LoDashExplicitArrayWrapper<T>;
     }
 
     //_.xorBy DUMMY
@@ -5620,35 +5479,35 @@ declare namespace _ {
          * @param arrays The arrays to process.
          * @return Returns the new array of grouped elements.
          */
-        zip<T>(...arrays: Array<List<T>>): T[][];
+        zip<T>(...arrays: Array<List<T> | null | undefined>): T[][];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T>>): _.LoDashImplicitArrayWrapper<T[]>;
+        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T>>): _.LoDashImplicitArrayWrapper<T[]>;
+        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T>>): _.LoDashExplicitArrayWrapper<T[]>;
+        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashExplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T>>): _.LoDashExplicitArrayWrapper<T[]>;
+        zip<T>(...arrays: Array<List<T> | null | undefined>): _.LoDashExplicitArrayWrapper<T[]>;
     }
 
     //_.zipObject
@@ -5908,9 +5767,13 @@ declare namespace _ {
         chain(value: number): LoDashExplicitWrapper<number>;
         chain(value: string): LoDashExplicitWrapper<string>;
         chain(value: boolean): LoDashExplicitWrapper<boolean>;
+        chain(value: null | undefined): LoDashExplicitWrapper<null | undefined>;
         chain<T>(value: T[]): LoDashExplicitArrayWrapper<T>;
         chain<T>(value: ReadonlyArray<T>): LoDashExplicitArrayWrapper<T>;
+        chain<T>(value: T[] | null | undefined): LoDashExplicitNillableArrayWrapper<T>;
+        chain<T>(value: ReadonlyArray<T> | null | undefined): LoDashExplicitNillableArrayWrapper<T>;
         chain<T extends {}>(value: T): LoDashExplicitObjectWrapper<T>;
+        chain<T extends {}>(value: T | null | undefined): LoDashExplicitObjectWrapper<T | null | undefined>;
         chain(value: any): LoDashExplicitWrapper<any>;
     }
 
@@ -5928,6 +5791,13 @@ declare namespace _ {
         chain(): LoDashExplicitArrayWrapper<T>;
     }
 
+    interface LoDashImplicitNillableArrayWrapper<T> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitNillableArrayWrapper<T>;
+    }
+
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.chain
@@ -5935,6 +5805,13 @@ declare namespace _ {
         chain(): LoDashExplicitObjectWrapper<T>;
     }
 
+    interface LoDashImplicitNillableObjectWrapper<T> {
+        /**
+         * @see _.chain
+         */
+        chain(): LoDashExplicitNillableObjectWrapper<T>;
+    }
+
     interface LoDashExplicitWrapperBase<T, TWrapper> {
         /**
          * @see _.chain
@@ -6268,33 +6145,33 @@ declare namespace _ {
          * @return Returns the new array of picked elements.
          */
         at<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             ...props: Array<Many<number|string>>
         ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
         at(...props: Array<Many<number|string>>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
         at<T>(...props: Array<Many<number|string>>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
         at(...props: Array<Many<number|string>>): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.at
          */
@@ -6324,7 +6201,7 @@ declare namespace _ {
          * @return Returns the composed aggregate object.
          */
         countBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, any>
         ): Dictionary<number>;
 
@@ -6332,7 +6209,7 @@ declare namespace _ {
          * @see _.countBy
          */
         countBy<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, any>
         ): Dictionary<number>;
 
@@ -6340,7 +6217,7 @@ declare namespace _ {
          * @see _.countBy
          */
         countBy<T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratee?: NumericDictionaryIterator<T, any>
         ): Dictionary<number>;
 
@@ -6348,7 +6225,7 @@ declare namespace _ {
          * @see _.countBy
          */
         countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             iteratee?: string
         ): Dictionary<number>;
 
@@ -6356,7 +6233,7 @@ declare namespace _ {
          * @see _.countBy
          */
         countBy<W, T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             iteratee?: W
         ): Dictionary<number>;
 
@@ -6364,7 +6241,7 @@ declare namespace _ {
          * @see _.countBy
          */
         countBy<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             iteratee?: Object
         ): Dictionary<number>;
     }
@@ -6378,7 +6255,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<number>>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.countBy
          */
@@ -6401,7 +6278,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<number>>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.countBy
          */
@@ -6433,7 +6310,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<number>>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.countBy
          */
@@ -6456,7 +6333,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<number>>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.countBy
          */
@@ -6489,6 +6366,14 @@ declare namespace _ {
             iteratee?: ListIterator<T, any>
         ): T[];
 
+        /**
+         * @see _.forEach
+         */
+        each(
+            collection: string,
+            iteratee?: ListIterator<string, any>
+        ): string;
+
         /**
          * @see _.forEach
          */
@@ -6520,6 +6405,54 @@ declare namespace _ {
             collection: T,
             iteratee?: ObjectIterator<TValue, any>
         ): T;
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: T[] | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): T[] | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        each(
+            collection: string | null | undefined,
+            iteratee?: ListIterator<string, any>
+        ): string | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): List<T> | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        each<T>(
+            collection: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<any, any>
+        ): T | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        each<T extends {}, TValue>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T | null | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -6531,22 +6464,22 @@ declare namespace _ {
         ): LoDashImplicitWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         each(
             iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         each<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -6558,26 +6491,34 @@ declare namespace _ {
         ): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         each(
             iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         each<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.eachRight
     interface LoDashStatic {
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            collection: string,
+            iteratee?: ListIterator<string, any>
+        ): string;
+
         /**
          * @see _.forEachRight
          */
@@ -6617,6 +6558,54 @@ declare namespace _ {
             collection: T,
             iteratee?: ObjectIterator<TValue, any>
         ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight(
+            collection: string | null | undefined,
+            iteratee?: ListIterator<string, any>
+        ): string | null | undefined;
+        
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: T[] | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): T[] | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): List<T> | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T>(
+            collection: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<any, any>
+        ): T | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        eachRight<T extends {}, TValue>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T | null | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -6628,22 +6617,22 @@ declare namespace _ {
         ): LoDashImplicitWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         eachRight(
             iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         eachRight<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -6655,22 +6644,22 @@ declare namespace _ {
         ): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         eachRight(
             iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         eachRight<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.every
@@ -6684,7 +6673,7 @@ declare namespace _ {
          * @return Returns true if all elements pass the predicate check, else false.
          */
         every<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>
         ): boolean;
 
@@ -6692,7 +6681,7 @@ declare namespace _ {
          * @see _.every
          */
         every<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             predicate?: DictionaryIterator<T, boolean>
         ): boolean;
 
@@ -6700,7 +6689,7 @@ declare namespace _ {
          * @see _.every
          */
         every<T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             predicate?: NumericDictionaryIterator<T, boolean>
         ): boolean;
 
@@ -6708,7 +6697,7 @@ declare namespace _ {
          * @see _.every
          */
         every<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             predicate?: string|any[]
         ): boolean;
 
@@ -6716,12 +6705,12 @@ declare namespace _ {
          * @see _.every
          */
         every<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             predicate?: PartialObject<T>
         ): boolean;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.every
          */
@@ -6744,7 +6733,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.every
          */
@@ -6767,7 +6756,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.every
          */
@@ -6790,7 +6779,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.every
          */
@@ -6834,7 +6823,7 @@ declare namespace _ {
          * @return Returns the new filtered array.
          */
         filter<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>
         ): T[];
 
@@ -6842,7 +6831,7 @@ declare namespace _ {
          * @see _.filter
          */
         filter<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             predicate?: DictionaryIterator<T, boolean>
         ): T[];
 
@@ -6850,7 +6839,7 @@ declare namespace _ {
          * @see _.filter
          */
         filter(
-            collection: string,
+            collection: string | null | undefined,
             predicate?: StringIterator<boolean>
         ): string[];
 
@@ -6858,7 +6847,7 @@ declare namespace _ {
          * @see _.filter
          */
         filter<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate: string|RegExp
         ): T[];
 
@@ -6866,7 +6855,7 @@ declare namespace _ {
          * @see _.filter
          */
         filter<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate: PartialObject<T>
         ): T[];
     }
@@ -6880,7 +6869,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
@@ -6901,7 +6890,7 @@ declare namespace _ {
         filter(predicate: PartialObject<T>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
@@ -6931,7 +6920,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
@@ -6952,7 +6941,7 @@ declare namespace _ {
         filter(predicate: PartialObject<T>): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.filter
          */
@@ -6994,7 +6983,7 @@ declare namespace _ {
          * @return Returns the matched element, else undefined.
          */
         find<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>,
             fromIndex?: number
         ): T|undefined;
@@ -7003,7 +6992,7 @@ declare namespace _ {
          * @see _.find
          */
         find<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             predicate?: DictionaryIterator<T, boolean>,
             fromIndex?: number
         ): T|undefined;
@@ -7012,7 +7001,7 @@ declare namespace _ {
          * @see _.find
          */
         find<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate?: string,
             fromIndex?: number
         ): T|undefined;
@@ -7021,13 +7010,13 @@ declare namespace _ {
          * @see _.find
          */
         find<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate?: PartialObject<T>,
             fromIndex?: number
         ): T|undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.find
          */
@@ -7053,7 +7042,7 @@ declare namespace _ {
         ): T|undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.find
          */
@@ -7079,6 +7068,32 @@ declare namespace _ {
         ): TResult|undefined;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.find
+         */
+        find(
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
+        ): any;
+
+        /**
+         * @see _.find
+         */
+        find(
+            predicate?: string,
+            fromIndex?: number
+        ): any;
+
+        /**
+         * @see _.find
+         */
+        find(
+            predicate?: PartialObject<T>,
+            fromIndex?: number
+        ): any;
+    }
+
     //_.findLast
     interface LoDashStatic {
         /**
@@ -7090,7 +7105,7 @@ declare namespace _ {
         * @return The found element, else undefined.
         **/
         findLast<T>(
-            collection: T[],
+            collection: T[] | null | undefined,
             callback: ListIterator<T, boolean>,
             fromIndex?: number
         ): T|undefined;
@@ -7099,7 +7114,7 @@ declare namespace _ {
         * @see _.find
         **/
         findLast<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             callback: ListIterator<T, boolean>,
             fromIndex?: number
         ): T|undefined;
@@ -7108,7 +7123,7 @@ declare namespace _ {
         * @see _.find
         **/
         findLast<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             callback: DictionaryIterator<T, boolean>,
             fromIndex?: number
         ): T|undefined;
@@ -7118,7 +7133,7 @@ declare namespace _ {
         * @param _.pluck style callback
         **/
         findLast<W, T>(
-            collection: T[],
+            collection: T[] | null | undefined,
             whereValue: W,
             fromIndex?: number
         ): T|undefined;
@@ -7128,7 +7143,7 @@ declare namespace _ {
         * @param _.pluck style callback
         **/
         findLast<W, T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             whereValue: W,
             fromIndex?: number
         ): T|undefined;
@@ -7138,7 +7153,7 @@ declare namespace _ {
         * @param _.pluck style callback
         **/
         findLast<W, T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             whereValue: W,
             fromIndex?: number
         ): T|undefined;
@@ -7148,7 +7163,7 @@ declare namespace _ {
         * @param _.where style callback
         **/
         findLast<T>(
-            collection: T[],
+            collection: T[] | null | undefined,
             pluckValue: string,
             fromIndex?: number
         ): T|undefined;
@@ -7158,7 +7173,7 @@ declare namespace _ {
         * @param _.where style callback
         **/
         findLast<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             pluckValue: string,
             fromIndex?: number
         ): T|undefined;
@@ -7168,13 +7183,13 @@ declare namespace _ {
         * @param _.where style callback
         **/
         findLast<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             pluckValue: string,
             fromIndex?: number
         ): T|undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
         * @see _.findLast
         */
@@ -7201,6 +7216,32 @@ declare namespace _ {
         ): T|undefined;
     }
 
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.findLast
+         */
+        findLast(
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
+        ): any;
+
+        /**
+         * @see _.findLast
+         */
+        findLast(
+            predicate?: string,
+            fromIndex?: number
+        ): any;
+
+        /**
+         * @see _.findLast
+         */
+        findLast(
+            predicate?: PartialObject<T>,
+            fromIndex?: number
+        ): any;
+    }
+
     //_.flatMap
     interface LoDashStatic {
         /**
@@ -7213,7 +7254,7 @@ declare namespace _ {
          * @return Returns the new flattened array.
          */
         flatMap<T, TResult>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, Many<TResult>>
         ): TResult[];
 
@@ -7221,7 +7262,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: List<any>,
+            collection: List<any> | null | undefined,
             iteratee?: ListIterator<any, Many<TResult>>
         ): TResult[];
 
@@ -7229,7 +7270,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<T, TResult>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, Many<TResult>>
         ): TResult[];
 
@@ -7237,7 +7278,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: Dictionary<any>,
+            collection: Dictionary<any> | null | undefined,
             iteratee?: DictionaryIterator<any, Many<TResult>>
         ): TResult[];
 
@@ -7245,7 +7286,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<T, TResult>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratee?: NumericDictionaryIterator<T, Many<TResult>>
         ): TResult[];
 
@@ -7253,7 +7294,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: NumericDictionary<any>,
+            collection: NumericDictionary<any> | null | undefined,
             iteratee?: NumericDictionaryIterator<any, Many<TResult>>
         ): TResult[];
 
@@ -7261,7 +7302,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TObject extends Object, TResult>(
-            collection: TObject,
+            collection: TObject | null | undefined,
             iteratee?: ObjectIterator<any, Many<TResult>>
         ): TResult[];
 
@@ -7269,7 +7310,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: Object,
+            collection: Object | null | undefined,
             iteratee?: ObjectIterator<any, Many<TResult>>
         ): TResult[];
 
@@ -7277,7 +7318,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TWhere extends Object, TObject extends Object>(
-            collection: TObject,
+            collection: TObject | null | undefined,
             iteratee: TWhere
         ): boolean[];
 
@@ -7285,7 +7326,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TObject extends Object, TResult>(
-            collection: TObject,
+            collection: TObject | null | undefined,
             iteratee: Object|string
         ): TResult[];
 
@@ -7293,7 +7334,7 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TObject extends Object>(
-            collection: TObject,
+            collection: TObject | null | undefined,
             iteratee: [string, any]
         ): boolean[];
 
@@ -7301,14 +7342,14 @@ declare namespace _ {
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: string
+            collection: string | null | undefined
         ): string[];
 
         /**
          * @see _.flatMap
          */
         flatMap<TResult>(
-            collection: Object,
+            collection: Object | null | undefined,
             iteratee?: Object|string
         ): TResult[];
     }
@@ -7327,7 +7368,7 @@ declare namespace _ {
         flatMap(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
@@ -7355,7 +7396,7 @@ declare namespace _ {
         flatMap<TResult>(): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
@@ -7404,7 +7445,7 @@ declare namespace _ {
         flatMap(): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
@@ -7432,7 +7473,7 @@ declare namespace _ {
         flatMap<TResult>(): LoDashExplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.flatMap
          */
@@ -7488,6 +7529,14 @@ declare namespace _ {
             iteratee?: ListIterator<T, any>
         ): T[];
 
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            collection: string,
+            iteratee?: ListIterator<string, any>
+        ): string;
+
         /**
          * @see _.forEach
          */
@@ -7519,6 +7568,54 @@ declare namespace _ {
             collection: T,
             iteratee?: ObjectIterator<TValue, any>
         ): T;
+        
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: T[] | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): T[] | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        forEach(
+            collection: string | null | undefined,
+            iteratee?: ListIterator<string, any>
+        ): string | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): List<T> | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T>(
+            collection: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<any, any>
+        ): T | null | undefined;
+
+        /**
+         * @see _.forEach
+         */
+        forEach<T extends {}, TValue>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T | null | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -7530,22 +7627,22 @@ declare namespace _ {
         ): LoDashImplicitWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         forEach(
             iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         forEach<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -7557,22 +7654,22 @@ declare namespace _ {
         ): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         forEach(
             iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEach
          */
         forEach<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.forEachRight
@@ -7591,6 +7688,14 @@ declare namespace _ {
             iteratee?: ListIterator<T, any>
         ): T[];
 
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            collection: string,
+            iteratee?: ListIterator<string, any>
+        ): string;
+
         /**
          * @see _.forEachRight
          */
@@ -7622,6 +7727,54 @@ declare namespace _ {
             collection: T,
             iteratee?: ObjectIterator<TValue, any>
         ): T;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: T[] | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): T[] | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight(
+            collection: string | null | undefined,
+            iteratee?: ListIterator<string, any>
+        ): string | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: List<T> | null | undefined,
+            iteratee?: ListIterator<T, any>
+        ): List<T> | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T>(
+            collection: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<any, any>
+        ): T | null | undefined;
+
+        /**
+         * @see _.forEachRight
+         */
+        forEachRight<T extends {}, TValue>(
+            collection: T | null | undefined,
+            iteratee?: ObjectIterator<TValue, any>
+        ): T | null | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -7633,22 +7786,22 @@ declare namespace _ {
         ): LoDashImplicitWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         forEachRight(
             iteratee: ListIterator<T, any>
-        ): LoDashImplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         forEachRight<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -7660,22 +7813,22 @@ declare namespace _ {
         ): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         forEachRight(
             iteratee: ListIterator<T, any>
-        ): LoDashExplicitArrayWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forEachRight
          */
         forEachRight<TValue>(
             iteratee?: ListIterator<TValue, any>|DictionaryIterator<TValue, any>
-        ): LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.groupBy
@@ -7701,7 +7854,7 @@ declare namespace _ {
          * @return Returns the composed aggregate object.
          */
         groupBy<T, TKey>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, TKey>
         ): Dictionary<T[]>;
 
@@ -7709,7 +7862,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T>(
-            collection: List<any>,
+            collection: List<any> | null | undefined,
             iteratee?: ListIterator<T, any>
         ): Dictionary<T[]>;
 
@@ -7717,7 +7870,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T, TKey>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, TKey>
         ): Dictionary<T[]>;
 
@@ -7725,7 +7878,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T>(
-            collection: Dictionary<any>,
+            collection: Dictionary<any> | null | undefined,
             iteratee?: DictionaryIterator<T, any>
         ): Dictionary<T[]>;
 
@@ -7733,7 +7886,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T, TValue>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: string
         ): Dictionary<T[]>;
 
@@ -7741,7 +7894,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: string
         ): Dictionary<T[]>;
 
@@ -7749,7 +7902,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<TWhere, T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: TWhere
         ): Dictionary<T[]>;
 
@@ -7757,7 +7910,7 @@ declare namespace _ {
          * @see _.groupBy
          */
         groupBy<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: Object
         ): Dictionary<T[]>;
     }
@@ -7771,7 +7924,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.groupBy
          */
@@ -7794,7 +7947,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<T[]>>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.groupBy
          */
@@ -7847,7 +8000,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.groupBy
          */
@@ -7870,7 +8023,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<T[]>>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.groupBy
          */
@@ -7926,7 +8079,7 @@ declare namespace _ {
          * @return True if the target element is found, else false.
          */
         includes<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -7935,13 +8088,13 @@ declare namespace _ {
          * @see _.includes
          */
         includes(
-            collection: string,
+            collection: string | null | undefined,
             target: string,
             fromIndex?: number
         ): boolean;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.includes
          */
@@ -7951,7 +8104,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.includes
          */
@@ -7971,7 +8124,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.includes
          */
@@ -7981,7 +8134,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.includes
          */
@@ -8024,7 +8177,7 @@ declare namespace _ {
          * @return Returns the composed aggregate object.
          */
         keyBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, any>
         ): Dictionary<T>;
 
@@ -8032,7 +8185,7 @@ declare namespace _ {
          * @see _.keyBy
          */
         keyBy<T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratee?: NumericDictionaryIterator<T, any>
         ): Dictionary<T>;
 
@@ -8040,7 +8193,7 @@ declare namespace _ {
          * @see _.keyBy
          */
         keyBy<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, any>
         ): Dictionary<T>;
 
@@ -8048,7 +8201,7 @@ declare namespace _ {
          * @see _.keyBy
          */
         keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
             iteratee?: string
         ): Dictionary<T>;
 
@@ -8056,7 +8209,7 @@ declare namespace _ {
          * @see _.keyBy
          */
         keyBy<W extends Object, T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
             iteratee?: W
         ): Dictionary<T>;
 
@@ -8064,7 +8217,7 @@ declare namespace _ {
          * @see _.keyBy
          */
         keyBy<T>(
-            collection: List<T>|NumericDictionary<T>|Dictionary<T>,
+            collection: List<T>|NumericDictionary<T>|Dictionary<T> | null | undefined,
             iteratee?: Object
         ): Dictionary<T>;
     }
@@ -8078,7 +8231,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.keyBy
          */
@@ -8101,7 +8254,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keyBy
          */
@@ -8140,7 +8293,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.keyBy
          */
@@ -8163,7 +8316,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keyBy
          */
@@ -8271,7 +8424,7 @@ declare namespace _ {
         * @param args Arguments to invoke the method with.
         **/
         invokeMap<TValue extends {}, TResult>(
-            collection: TValue[],
+            collection: TValue[] | null | undefined,
             methodName: string,
             ...args: any[]): TResult[];
 
@@ -8279,7 +8432,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue>,
+            collection: Dictionary<TValue> | null | undefined,
             methodName: string,
             ...args: any[]): TResult[];
 
@@ -8287,7 +8440,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
-            collection: Array<{}>,
+            collection: Array<{}> | null | undefined,
             methodName: string,
             ...args: any[]): TResult[];
 
@@ -8295,7 +8448,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
-            collection: Dictionary<{}>,
+            collection: Dictionary<{}> | null | undefined,
             methodName: string,
             ...args: any[]): TResult[];
 
@@ -8303,7 +8456,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TValue extends {}, TResult>(
-            collection: TValue[],
+            collection: TValue[] | null | undefined,
             method: (...args: any[]) => TResult,
             ...args: any[]): TResult[];
 
@@ -8311,7 +8464,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TValue extends {}, TResult>(
-            collection: Dictionary<TValue>,
+            collection: Dictionary<TValue> | null | undefined,
             method: (...args: any[]) => TResult,
             ...args: any[]): TResult[];
 
@@ -8319,7 +8472,7 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
-            collection: Array<{}>,
+            collection: Array<{}> | null | undefined,
             method: (...args: any[]) => TResult,
             ...args: any[]): TResult[];
 
@@ -8327,12 +8480,12 @@ declare namespace _ {
         * @see _.invokeMap
         **/
         invokeMap<TResult>(
-            collection: Dictionary<{}>,
+            collection: Dictionary<{}> | null | undefined,
             method: (...args: any[]) => TResult,
             ...args: any[]): TResult[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
         * @see _.invokeMap
         **/
@@ -8348,7 +8501,7 @@ declare namespace _ {
             ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
         * @see _.invokeMap
         **/
@@ -8364,7 +8517,7 @@ declare namespace _ {
             ...args: any[]): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
         * @see _.invokeMap
         **/
@@ -8380,7 +8533,7 @@ declare namespace _ {
             ...args: any[]): LoDashExplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
         * @see _.invokeMap
         **/
@@ -8425,45 +8578,45 @@ declare namespace _ {
          * @return Returns the new mapped array.
          */
         map<T, TResult>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee: ListIterator<T, TResult>
         ): TResult[];
 
         /**
          * @see _.map
          */
-        map<T>(collection: List<T>): T[];
+        map<T>(collection: List<T> | null | undefined): T[];
 
         /**
          * @see _.map
          */
         map<T extends {}, TResult>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee: DictionaryIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee: K
         ): T[K][];
 
         /** @see _.map */
-        map<T>(collection: Dictionary<T>): T[];
+        map<T>(collection: Dictionary<T> | null | undefined): T[];
 
         map<T extends {}, TResult>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratee?: NumericDictionaryIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
-        map<T, K extends keyof T>(collection: List<T>, iteratee: K): T[K][];
+        map<T, K extends keyof T>(collection: List<T> | null | undefined, iteratee: K): T[K][];
 
         /**
          * @see _.map
          */
         map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             iteratee?: string
         ): TResult[];
 
@@ -8471,12 +8624,12 @@ declare namespace _ {
          * @see _.map
          */
         map<T, TObject extends {}>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             iteratee?: TObject
         ): boolean[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.map
          */
@@ -8507,7 +8660,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<boolean>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.map
          */
@@ -8536,7 +8689,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<boolean>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.map
          */
@@ -8565,7 +8718,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.map
          */
@@ -8613,35 +8766,35 @@ declare namespace _ {
         * @return Returns the array of grouped elements.
         **/
         partition<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             callback: ListIterator<T, boolean>): T[][];
 
         /**
          * @see _.partition
          **/
         partition<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             callback: DictionaryIterator<T, boolean>): T[][];
 
         /**
          * @see _.partition
          **/
         partition<W, T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             whereValue: W): T[][];
 
         /**
          * @see _.partition
          **/
         partition<W, T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             whereValue: W): T[][];
 
         /**
          * @see _.partition
          **/
         partition<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             path: string,
             srcValue: any): T[][];
 
@@ -8649,7 +8802,7 @@ declare namespace _ {
          * @see _.partition
          **/
         partition<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             path: string,
             srcValue: any): T[][];
 
@@ -8657,14 +8810,14 @@ declare namespace _ {
          * @see _.partition
          **/
         partition<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             pluckValue: string): T[][];
 
         /**
          * @see _.partition
          **/
         partition<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             pluckValue: string): T[][];
     }
 
@@ -8676,7 +8829,7 @@ declare namespace _ {
             callback: ListIterator<string, boolean>): LoDashImplicitArrayWrapper<string[]>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.partition
          */
@@ -8700,7 +8853,7 @@ declare namespace _ {
             pluckValue: string): LoDashImplicitArrayWrapper<T[]>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.partition
          */
@@ -8748,7 +8901,7 @@ declare namespace _ {
         * @return Returns the accumulated value.
         **/
         reduce<T, TResult>(
-            collection: T[],
+            collection: T[] | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8756,7 +8909,7 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8764,7 +8917,7 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8772,7 +8925,7 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8780,32 +8933,32 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: T[],
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: T[] | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
 
         /**
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: List<T> | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
 
         /**
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: Dictionary<T> | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
 
         /**
         * @see _.reduce
         **/
         reduce<T, TResult>(
-            collection: NumericDictionary<T>,
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: NumericDictionary<T> | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
          /**
         * @see _.reduce
         **/
@@ -8817,10 +8970,10 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<TResult>(
-            callback: MemoIterator<T, TResult>): TResult;
+            callback: MemoIterator<T, TResult>): TResult | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
          /**
         * @see _.reduce
         **/
@@ -8832,10 +8985,10 @@ declare namespace _ {
         * @see _.reduce
         **/
         reduce<TValue, TResult>(
-            callback: MemoIterator<TValue, TResult>): TResult;
+            callback: MemoIterator<TValue, TResult>): TResult | undefined;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
         * @see _.reduce
         **/
@@ -8850,7 +9003,7 @@ declare namespace _ {
             callback: MemoIterator<TValue, TResult>): LoDashExplicitObjectWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**LoDashExplicitWrapper
          * @see _.reduce
          */
@@ -8877,7 +9030,7 @@ declare namespace _ {
         * @return The accumulated value.
         **/
         reduceRight<T, TResult>(
-            collection: T[],
+            collection: T[] | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8885,7 +9038,7 @@ declare namespace _ {
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8893,7 +9046,7 @@ declare namespace _ {
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             callback: MemoIterator<T, TResult>,
             accumulator: TResult): TResult;
 
@@ -8901,22 +9054,22 @@ declare namespace _ {
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: T[],
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: T[] | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: List<T>,
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: List<T> | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
 
         /**
         * @see _.reduceRight
         **/
         reduceRight<T, TResult>(
-            collection: Dictionary<T>,
-            callback: MemoIterator<T, TResult>): TResult;
+            collection: Dictionary<T> | null | undefined,
+            callback: MemoIterator<T, TResult>): TResult | undefined;
     }
 
     //_.reject
@@ -8931,7 +9084,7 @@ declare namespace _ {
          * @return Returns the new filtered array.
          */
         reject<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>
         ): T[];
 
@@ -8939,7 +9092,7 @@ declare namespace _ {
          * @see _.reject
          */
         reject<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             predicate?: DictionaryIterator<T, boolean>
         ): T[];
 
@@ -8947,7 +9100,7 @@ declare namespace _ {
          * @see _.reject
          */
         reject(
-            collection: string,
+            collection: string | null | undefined,
             predicate?: StringIterator<boolean>
         ): string[];
 
@@ -8955,7 +9108,7 @@ declare namespace _ {
          * @see _.reject
          */
         reject<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate: string
         ): T[];
 
@@ -8963,7 +9116,7 @@ declare namespace _ {
          * @see _.reject
          */
         reject<W extends {}, T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             predicate: W
         ): T[];
     }
@@ -8977,7 +9130,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.reject
          */
@@ -8998,7 +9151,7 @@ declare namespace _ {
         reject<W>(predicate: W): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.reject
          */
@@ -9028,7 +9181,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.reject
          */
@@ -9049,7 +9202,7 @@ declare namespace _ {
         reject<W>(predicate: W): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.reject
          */
@@ -9079,43 +9232,43 @@ declare namespace _ {
          * @return Returns the random element.
          */
         sample<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>
-        ): T;
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined
+        ): T | undefined;
 
         /**
          * @see _.sample
          */
         sample<O extends Object, T>(
-            collection: O
-        ): T;
+            collection: O | null | undefined
+        ): T | undefined;
 
         /**
          * @see _.sample
          */
         sample<T>(
-            collection: Object
-        ): T;
+            collection: Object | null | undefined
+        ): T | undefined;
     }
 
     interface LoDashImplicitWrapper<T> {
         /**
          * @see _.sample
          */
-        sample(): string;
+        sample(): string | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
-        sample(): T;
+        sample(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
-        sample<T>(): T;
+        sample<T>(): T | undefined;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -9125,14 +9278,14 @@ declare namespace _ {
         sample(): LoDashExplicitWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
         sample<TWrapper>(): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sample
          */
@@ -9149,7 +9302,7 @@ declare namespace _ {
          * @return Returns the random elements.
          */
         sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             n?: number
         ): T[];
 
@@ -9157,7 +9310,7 @@ declare namespace _ {
          * @see _.sampleSize
          */
         sampleSize<O extends Object, T>(
-            collection: O,
+            collection: O | null | undefined,
             n?: number
         ): T[];
 
@@ -9165,7 +9318,7 @@ declare namespace _ {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            collection: Object,
+            collection: Object | null | undefined,
             n?: number
         ): T[];
     }
@@ -9179,7 +9332,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sampleSize
          */
@@ -9188,7 +9341,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sampleSize
          */
@@ -9206,7 +9359,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sampleSize
          */
@@ -9215,7 +9368,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sampleSize
          */
@@ -9232,12 +9385,12 @@ declare namespace _ {
          * @param collection The collection to shuffle.
          * @return Returns the new shuffled array.
          */
-        shuffle<T>(collection: List<T>|Dictionary<T>): T[];
+        shuffle<T>(collection: List<T>|Dictionary<T> | null | undefined): T[];
 
         /**
          * @see _.shuffle
          */
-        shuffle(collection: string): string[];
+        shuffle(collection: string | null | undefined): string[];
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -9247,14 +9400,14 @@ declare namespace _ {
         shuffle(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.shuffle
          */
         shuffle(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.shuffle
          */
@@ -9268,14 +9421,14 @@ declare namespace _ {
         shuffle(): LoDashExplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.shuffle
          */
         shuffle(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.shuffle
          */
@@ -9291,12 +9444,12 @@ declare namespace _ {
          * @param collection The collection to inspect.
          * @return Returns the size of collection.
          */
-        size<T>(collection: List<T>|Dictionary<T>): number;
+        size<T>(collection: List<T>|Dictionary<T> | null | undefined): number;
 
         /**
          * @see _.size
          */
-        size(collection: string): number;
+        size(collection: string | null | undefined): number;
     }
 
     interface LoDashImplicitWrapper<T> {
@@ -9306,14 +9459,14 @@ declare namespace _ {
         size(): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.size
          */
         size(): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.size
          */
@@ -9327,14 +9480,14 @@ declare namespace _ {
         size(): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.size
          */
         size(): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.size
          */
@@ -9352,7 +9505,7 @@ declare namespace _ {
          * @return Returns true if any element passes the predicate check, else false.
          */
         some<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             predicate?: ListIterator<T, boolean>
         ): boolean;
 
@@ -9360,7 +9513,7 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             predicate?: DictionaryIterator<T, boolean>
         ): boolean;
 
@@ -9368,7 +9521,7 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             predicate?: NumericDictionaryIterator<T, boolean>
         ): boolean;
 
@@ -9376,7 +9529,7 @@ declare namespace _ {
          * @see _.some
          */
         some(
-            collection: Object,
+            collection: Object | null | undefined,
             predicate?: ObjectIterator<any, boolean>
         ): boolean;
 
@@ -9384,7 +9537,7 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             predicate?: string|[string, any]
         ): boolean;
 
@@ -9392,7 +9545,7 @@ declare namespace _ {
          * @see _.some
          */
         some(
-            collection: Object,
+            collection: Object | null | undefined,
             predicate?: string|[string, any]
         ): boolean;
 
@@ -9400,7 +9553,7 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             predicate?: PartialObject<T>
         ): boolean;
 
@@ -9408,7 +9561,7 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T>,
+            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
             predicate?: PartialObject<T>
         ): boolean;
 
@@ -9416,12 +9569,12 @@ declare namespace _ {
          * @see _.some
          */
         some<T>(
-            collection: Object,
+            collection: Object | null | undefined,
             predicate?: PartialObject<T>
         ): boolean;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.some
          */
@@ -9444,7 +9597,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.some
          */
@@ -9467,7 +9620,7 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.some
          */
@@ -9490,7 +9643,7 @@ declare namespace _ {
         ): LoDashExplicitWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.some
          */
@@ -9549,7 +9702,7 @@ declare namespace _ {
          * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
          */
         sortBy<T, TSort>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, TSort>
         ): T[];
 
@@ -9557,7 +9710,7 @@ declare namespace _ {
          * @see _.sortBy
          */
         sortBy<T, TSort>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, TSort>
         ): T[];
 
@@ -9565,7 +9718,7 @@ declare namespace _ {
          * @see _.sortBy
          */
         sortBy<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee: string
         ): T[];
 
@@ -9573,7 +9726,7 @@ declare namespace _ {
          * @see _.sortBy
          */
         sortBy<W extends {}, T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             whereValue: W
         ): T[];
 
@@ -9581,25 +9734,27 @@ declare namespace _ {
          * @see _.sortBy
          */
         sortBy<T>(
-            collection: List<T>|Dictionary<T>
+            collection: List<T>|Dictionary<T> | null | undefined
         ): T[];
 
         /**
          * @see _.sortBy
          */
         sortBy<T>(
-            collection: List<T>,
-            iteratees: Array<ListIterator<T, any>|string|Object>): T[];
+            collection: List<T> | null | undefined,
+            iteratees: Array<ListIterator<T, any>|string|Object>
+        ): T[];
 
         /**
          * @see _.sortBy
          */
         sortBy<T>(
-            collection: List<T>,
-            ...iteratees: Array<ListIterator<T, boolean>|Object|string>): T[];
+            collection: List<T> | null | undefined,
+            ...iteratees: Array<ListIterator<T, boolean>|Object|string>
+        ): T[];
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortBy
          */
@@ -9633,7 +9788,7 @@ declare namespace _ {
         sortBy(iteratees: Array<ListIterator<T, any>|string|Object>): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortBy
          */
@@ -9657,7 +9812,7 @@ declare namespace _ {
         sortBy<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sortBy
          */
@@ -9681,7 +9836,7 @@ declare namespace _ {
         sortBy(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sortBy
          */
@@ -9735,7 +9890,7 @@ declare namespace _ {
          * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
          */
         orderBy<W extends Object, T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratees: Many<ListIterator<T, any>|string|W>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9744,7 +9899,7 @@ declare namespace _ {
          * @see _.orderBy
          */
         orderBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratees: Many<ListIterator<T, any>|string|Object>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9753,7 +9908,7 @@ declare namespace _ {
          * @see _.orderBy
          */
         orderBy<W extends Object, T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratees: Many<NumericDictionaryIterator<T, any>|string|W>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9762,7 +9917,7 @@ declare namespace _ {
          * @see _.orderBy
          */
         orderBy<T>(
-            collection: NumericDictionary<T>,
+            collection: NumericDictionary<T> | null | undefined,
             iteratees: Many<NumericDictionaryIterator<T, any>|string|Object>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9771,7 +9926,7 @@ declare namespace _ {
          * @see _.orderBy
          */
         orderBy<W extends Object, T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratees: Many<DictionaryIterator<T, any>|string|W>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9780,7 +9935,7 @@ declare namespace _ {
          * @see _.orderBy
          */
         orderBy<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratees: Many<DictionaryIterator<T, any>|string|Object>,
             orders?: Many<boolean|string>
         ): T[];
@@ -9796,7 +9951,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.orderBy
          */
@@ -9806,7 +9961,7 @@ declare namespace _ {
         ): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.orderBy
          */
@@ -9866,7 +10021,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.orderBy
          */
@@ -9876,7 +10031,7 @@ declare namespace _ {
         ): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.orderBy
          */
@@ -10331,6 +10486,36 @@ declare namespace _ {
         (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
     }
+    interface RightCurriedFunction1<T1, R>{
+        ():RightCurriedFunction1<T1, R>
+        (t1:T1):R
+        }
+    interface RightCurriedFunction2<T1,T2, R>{
+        ():RightCurriedFunction2<T1,T2, R>
+        (t2:T2):RightCurriedFunction1<T1, R>
+        (t1:T1,t2:T2):R
+    }
+    interface RightCurriedFunction3<T1,T2,T3, R>{
+        ():RightCurriedFunction3<T1,T2,T3, R>
+        (t3:T3):RightCurriedFunction2<T1,T2, R>
+        (t2:T2,t3:T3):RightCurriedFunction1<T1, R>
+        (t1:T1,t2:T2,t3:T3):R
+    }
+    interface RightCurriedFunction4<T1,T2,T3,T4, R>{
+        ():RightCurriedFunction4<T1,T2,T3,T4, R>
+        (t4:T4):RightCurriedFunction3<T1,T2,T3, R>
+        (t3:T3,t4:T4):RightCurriedFunction2<T1,T2, R>
+        (t2:T2,t3:T3,t4:T4):RightCurriedFunction1<T1, R>
+        (t1:T1,t2:T2,t3:T3,t4:T4):R
+    }
+    interface RightCurriedFunction5<T1,T2,T3,T4,T5, R>{
+        ():RightCurriedFunction5<T1,T2,T3,T4,T5, R>
+        (t5:T5):RightCurriedFunction4<T1,T2,T3,T4, R>
+        (t4:T4,t5:T5):RightCurriedFunction3<T1,T2,T3, R>
+        (t3:T3,t4:T4,t5:T5):RightCurriedFunction2<T1,T2, R>
+        (t2:T2,t3:T3,t4:T4,t5:T5):RightCurriedFunction1<T1, R>
+        (t1:T1,t2:T2,t3:T3,t4:T4,t5:T5):R
+    }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
@@ -10348,7 +10533,7 @@ declare namespace _ {
          * @return Returns the new curried function.
          */
         curryRight<T1, R>(func: (t1: T1) => R):
-            CurriedFunction1<T1, R>;
+            RightCurriedFunction1<T1, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -10356,7 +10541,7 @@ declare namespace _ {
          * @return Returns the new curried function.
          */
         curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R):
-            CurriedFunction2<T2, T1, R>;
+            RightCurriedFunction2<T1, T2, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -10364,7 +10549,7 @@ declare namespace _ {
          * @return Returns the new curried function.
          */
         curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R):
-            CurriedFunction3<T3, T2, T1, R>;
+            RightCurriedFunction3<T1, T2, T3, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -10372,7 +10557,7 @@ declare namespace _ {
          * @return Returns the new curried function.
          */
         curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R):
-            CurriedFunction4<T4, T3, T2, T1, R>;
+            RightCurriedFunction4<T1, T2, T3, T4, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -10380,7 +10565,7 @@ declare namespace _ {
          * @return Returns the new curried function.
          */
         curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R):
-            CurriedFunction5<T5, T4, T3, T2, T1, R>;
+            RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -11160,7 +11345,7 @@ declare namespace _ {
         wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.wrap
          */
@@ -11172,7 +11357,7 @@ declare namespace _ {
         wrap<R extends Function>(wrapper: Function): LoDashImplicitObjectWrapper<R>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.wrap
          */
@@ -11196,7 +11381,7 @@ declare namespace _ {
         wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.wrap
          */
@@ -11208,7 +11393,7 @@ declare namespace _ {
         wrap<R extends Function>(wrapper: Function): LoDashExplicitObjectWrapper<R>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.wrap
          */
@@ -11242,18 +11427,18 @@ declare namespace _ {
         castArray(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.castArray
          */
-        castArray(): LoDashImplicitArrayWrapper<T>;
+        castArray(): TWrapper;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.castArray
          */
-        castArray(): LoDashImplicitArrayWrapper<T>;
+        castArray(): LoDashImplicitArrayWrapper<TObject>;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -11263,18 +11448,18 @@ declare namespace _ {
         castArray(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.castArray
          */
-        castArray(): LoDashExplicitArrayWrapper<T>;
+        castArray(): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.castArray
          */
-        castArray(): LoDashExplicitArrayWrapper<T>;
+        castArray(): LoDashExplicitArrayWrapper<TObject>;
     }
 
     //_.clone
@@ -11300,18 +11485,18 @@ declare namespace _ {
         clone(): T;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.clone
          */
-        clone(): T[];
+        clone(): TArray;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.clone
          */
-        clone(): T;
+        clone(): TObject;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -11321,18 +11506,18 @@ declare namespace _ {
         clone(): LoDashExplicitWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.clone
          */
-        clone(): LoDashExplicitArrayWrapper<T>;
+        clone(): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.clone
          */
-        clone(): LoDashExplicitObjectWrapper<T>;
+        clone(): TWrapper;
     }
 
     //_.cloneDeep
@@ -11353,18 +11538,18 @@ declare namespace _ {
         cloneDeep(): T;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): T[];
+        cloneDeep(): TArray;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): T;
+        cloneDeep(): TObject;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -11374,18 +11559,18 @@ declare namespace _ {
         cloneDeep(): LoDashExplicitWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): LoDashExplicitArrayWrapper<T>;
+        cloneDeep(): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeep
          */
-        cloneDeep(): LoDashExplicitObjectWrapper<T>;
+        cloneDeep(): TWrapper;
     }
 
     //_.cloneDeepWith
@@ -11422,21 +11607,21 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeepWith
          */
         cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
+            customizer?: CloneDeepWithCustomizer<TArray, TResult>
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeepWith
          */
         cloneDeepWith<TResult>(
-            customizer?: CloneDeepWithCustomizer<T, TResult>
+            customizer?: CloneDeepWithCustomizer<TObject, TResult>
         ): TResult;
     }
 
@@ -11463,12 +11648,12 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeepWith
          */
         cloneDeepWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneDeepWithCustomizer<T[], TResult>
+            customizer?: CloneDeepWithCustomizer<TArray, TResult>
         ): LoDashExplicitWrapper<TResult>;
 
         /**
@@ -11486,7 +11671,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneDeepWith
          */
@@ -11544,21 +11729,21 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneWith
          */
         cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T[], TResult>
+            customizer?: CloneWithCustomizer<TArray, TResult>
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneWith
          */
         cloneWith<TResult>(
-            customizer?: CloneWithCustomizer<T, TResult>
+            customizer?: CloneWithCustomizer<TObject, TResult>
         ): TResult;
     }
 
@@ -11585,12 +11770,12 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.cloneWith
          */
         cloneWith<TResult extends (number|string|boolean)>(
-            customizer?: CloneWithCustomizer<T[], TResult>
+            customizer?: CloneWithCustomizer<TArray, TResult>
         ): LoDashExplicitWrapper<TResult>;
 
         /**
@@ -11608,7 +11793,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<TResult>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.cloneWith
          */
@@ -12114,7 +12299,7 @@ declare namespace _ {
     }
 
     // _.isEqualWith
-    type IsEqualCustomizer = (value: any, other: any, indexOrKey?: number|string) => boolean;
+    type IsEqualCustomizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => boolean|undefined;
 
     interface LoDashStatic {
         /**
@@ -12151,7 +12336,7 @@ declare namespace _ {
         isEqualWith(
             value: any,
             other: any,
-            customizer: IsEqualCustomizer
+            customizer?: IsEqualCustomizer
         ): boolean;
     }
 
@@ -12161,7 +12346,7 @@ declare namespace _ {
          */
         isEqualWith(
             other: any,
-            customizer: IsEqualCustomizer
+            customizer?: IsEqualCustomizer
         ): boolean;
     }
 
@@ -12171,7 +12356,7 @@ declare namespace _ {
          */
         isEqualWith(
             other: any,
-            customizer: IsEqualCustomizer
+            customizer?: IsEqualCustomizer
         ): LoDashExplicitWrapper<boolean>;
     }
 
@@ -13023,14 +13208,14 @@ declare namespace _ {
         toArray<TResult>(): LoDashImplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.toArray
          */
         toArray(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.toArray
          */
@@ -13044,14 +13229,14 @@ declare namespace _ {
         toArray<TResult>(): LoDashExplicitArrayWrapper<TResult>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.toArray
          */
         toArray(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.toArray
          */
@@ -13376,22 +13561,22 @@ declare namespace _ {
           * @returns {*} Returns the maximum value.
           */
         max<T>(
-            collection: List<T>
-        ): T;
+            collection: List<T> | null | undefined
+        ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.max
          */
-        max(): T;
+        max(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.max
          */
-        max<T>(): T;
+        max<T>(): T | undefined;
     }
 
     //_.maxBy
@@ -13419,79 +13604,79 @@ declare namespace _ {
          * // => { 'n': 2 }
          */
         maxBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.maxBy
          */
         maxBy(
             iteratee?: ListIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy(
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<TObject extends {}>(
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.maxBy
          */
         maxBy<T>(
             iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<T>(
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.maxBy
          */
         maxBy<TObject extends {}, T>(
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
     //_.mean
@@ -13510,7 +13695,7 @@ declare namespace _ {
          * // => 5
          */
         mean<T>(
-            collection: List<T>
+            collection: List<T> | null | undefined
         ): number;
     }
 
@@ -13531,12 +13716,12 @@ declare namespace _ {
        * // => 5
        */
       meanBy<T>(
-        collection: List<T>,
+        collection: List<T> | null | undefined,
         iteratee?: DictionaryIterator<T, any>
       ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.mean
          */
@@ -13561,22 +13746,22 @@ declare namespace _ {
          * @returns {*} Returns the minimum value.
          */
         min<T>(
-            collection: List<T>
-        ): T;
+            collection: List<T> | null | undefined
+        ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.min
          */
-        min(): T;
+        min(): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.min
          */
-        min<T>(): T;
+        min<T>(): T | undefined;
     }
 
     //_.minBy
@@ -13604,79 +13789,79 @@ declare namespace _ {
          * // => { 'n': 1 }
          */
         minBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee?: ListIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<T>(
-            collection: Dictionary<T>,
+            collection: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<TObject extends {}, T>(
-            collection: List<T>|Dictionary<T>,
+            collection: List<T>|Dictionary<T> | null | undefined,
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.minBy
          */
         minBy(
             iteratee?: ListIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy(
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<TObject extends {}>(
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.minBy
          */
         minBy<T>(
             iteratee?: ListIterator<T, any>|DictionaryIterator<T, any>
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<T>(
             iteratee?: string
-        ): T;
+        ): T | undefined;
 
         /**
          * @see _.minBy
          */
         minBy<TObject extends {}, T>(
             whereValue?: TObject
-        ): T;
+        ): T | undefined;
     }
 
     //_.round
@@ -13723,22 +13908,22 @@ declare namespace _ {
          * _.sum([4, 2, 8, 6]);
          * // => 20
          */
-        sum<T>(collection: List<T>): number;
+        sum<T>(collection: List<T> | null | undefined): number;
 
         /**
          * @see _.sum
          */
-        sum(collection: List<number>|Dictionary<number>): number;
+        sum(collection: List<number>|Dictionary<number> | null | undefined): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sum
          */
         sum(): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sum
          **/
@@ -13750,14 +13935,14 @@ declare namespace _ {
         sum(): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sum
          */
         sum(): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sum
          */
@@ -13794,7 +13979,7 @@ declare namespace _ {
          * // => 20
          */
         sumBy<T>(
-            collection: List<T>,
+            collection: List<T> | null | undefined,
             iteratee: ListIterator<T, number>
         ): number;
 
@@ -13802,7 +13987,7 @@ declare namespace _ {
          * @see _.sumBy
          */
         sumBy(
-            collection: List<{}>,
+            collection: List<{}> | null | undefined,
             iteratee: string
         ): number;
 
@@ -13810,19 +13995,19 @@ declare namespace _ {
          * @see _.sumBy
          */
         sumBy(
-            collection: List<number>
+            collection: List<number> | null | undefined
         ): number;
 
         /**
          * @see _.sumBy
          */
         sumBy(
-            collection: List<{}>,
+            collection: List<{}> | null | undefined,
             iteratee: Dictionary<{}>
         ): number;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sumBy
          */
@@ -13841,7 +14026,7 @@ declare namespace _ {
         sumBy(iteratee: Dictionary<{}>): number;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sumBy
          */
@@ -13860,7 +14045,7 @@ declare namespace _ {
         sumBy(iteratee: Dictionary<{}>): number;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.sumBy
          */
@@ -13884,7 +14069,7 @@ declare namespace _ {
         sumBy(iteratee: Dictionary<{}>): LoDashExplicitWrapper<number>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.sumBy
          */
@@ -15355,7 +15540,7 @@ declare namespace _ {
         findKey<TValues, TObject>(
             object: TObject,
             predicate?: DictionaryIterator<TValues, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
@@ -15363,7 +15548,7 @@ declare namespace _ {
         findKey<TObject>(
             object: TObject,
             predicate?: ObjectIterator<any, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
@@ -15371,7 +15556,7 @@ declare namespace _ {
         findKey<TObject>(
             object: TObject,
             predicate?: string
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
@@ -15379,67 +15564,67 @@ declare namespace _ {
         findKey<TWhere extends Dictionary<any>, TObject>(
             object: TObject,
             predicate?: TWhere
-        ): string;
+        ): string | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findKey
          */
         findKey<TValues>(
             predicate?: DictionaryIterator<TValues, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
          */
         findKey(
             predicate?: ObjectIterator<any, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
          */
         findKey(
             predicate?: string
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findKey
          */
         findKey<TWhere extends Dictionary<any>>(
             predicate?: TWhere
-        ): string;
+        ): string | undefined;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findKey
          */
         findKey<TValues>(
             predicate?: DictionaryIterator<TValues, boolean>
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findKey
          */
         findKey(
             predicate?: ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findKey
          */
         findKey(
             predicate?: string
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findKey
          */
         findKey<TWhere extends Dictionary<any>>(
             predicate?: TWhere
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
     }
 
     //_.findLastKey
@@ -15464,7 +15649,7 @@ declare namespace _ {
         findLastKey<TValues, TObject>(
             object: TObject,
             predicate?: DictionaryIterator<TValues, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findLastKey
@@ -15472,7 +15657,7 @@ declare namespace _ {
         findLastKey<TObject>(
             object: TObject,
             predicate?: ObjectIterator<any, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findLastKey
@@ -15488,10 +15673,10 @@ declare namespace _ {
         findLastKey<TWhere extends Dictionary<any>, TObject>(
             object: TObject,
             predicate?: TWhere
-        ): string;
+        ): string | undefined;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findLastKey
          */
@@ -15504,51 +15689,51 @@ declare namespace _ {
          */
         findLastKey(
             predicate?: ObjectIterator<any, boolean>
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findLastKey
          */
         findLastKey(
             predicate?: string
-        ): string;
+        ): string | undefined;
 
         /**
          * @see _.findLastKey
          */
         findLastKey<TWhere extends Dictionary<any>>(
             predicate?: TWhere
-        ): string;
+        ): string | undefined;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.findLastKey
          */
         findLastKey<TValues>(
             predicate?: DictionaryIterator<TValues, boolean>
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findLastKey
          */
         findLastKey(
             predicate?: ObjectIterator<any, boolean>
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findLastKey
          */
         findLastKey(
             predicate?: string
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
 
         /**
          * @see _.findLastKey
          */
         findLastKey<TWhere extends Dictionary<any>>(
             predicate?: TWhere
-        ): LoDashExplicitWrapper<string>;
+        ): LoDashExplicitWrapper<string | undefined>;
     }
 
     //_.forIn
@@ -15571,28 +15756,36 @@ declare namespace _ {
         /**
          * @see _.forIn
          */
-        forIn<T extends {}>(
+        forIn<T>(
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forIn
+         */
+        forIn<T extends {} | null | undefined>(
             object: T,
             iteratee?: ObjectIterator<any, any>
         ): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forIn
          */
         forIn<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forIn
          */
         forIn<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.forInRight
@@ -15613,28 +15806,36 @@ declare namespace _ {
         /**
          * @see _.forInRight
          */
-        forInRight<T extends {}>(
+        forInRight<T>(
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forInRight
+         */
+        forInRight<T extends {} | null | undefined>(
             object: T,
             iteratee?: ObjectIterator<any, any>
         ): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forInRight
          */
         forInRight<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forInRight
          */
         forInRight<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.forOwn
@@ -15657,28 +15858,36 @@ declare namespace _ {
         /**
          * @see _.forOwn
          */
-        forOwn<T extends {}>(
+        forOwn<T>(
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forOwn
+         */
+        forOwn<T extends {} | null | undefined>(
             object: T,
             iteratee?: ObjectIterator<any, any>
         ): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forOwn
          */
         forOwn<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forOwn
          */
         forOwn<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.forOwnRight
@@ -15699,28 +15908,36 @@ declare namespace _ {
         /**
          * @see _.forOwnRight
          */
-        forOwnRight<T extends {}>(
+        forOwnRight<T>(
+            object: Dictionary<T> | null | undefined,
+            iteratee?: DictionaryIterator<T, any>
+        ): Dictionary<T> | null | undefined;
+
+        /**
+         * @see _.forOwnRight
+         */
+        forOwnRight<T extends {} | null | undefined>(
             object: T,
             iteratee?: ObjectIterator<any, any>
         ): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forOwnRight
          */
         forOwnRight<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashImplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.forOwnRight
          */
         forOwnRight<TValue>(
             iteratee?: DictionaryIterator<TValue, any>
-        ): _.LoDashExplicitObjectWrapper<T>;
+        ): TWrapper;
     }
 
     //_.functions
@@ -15840,7 +16057,7 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.get
          */
@@ -15850,7 +16067,7 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.get
          */
@@ -15870,7 +16087,7 @@ declare namespace _ {
         ): TResultWrapper;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.get
          */
@@ -15880,7 +16097,7 @@ declare namespace _ {
         ): TResultWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.get
          */
@@ -15924,14 +16141,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.has
          */
         has(path: Many<StringRepresentable>): boolean;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.has
          */
@@ -15971,14 +16188,14 @@ declare namespace _ {
         ): boolean;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.hasIn
          */
         hasIn(path: Many<StringRepresentable>): boolean;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.hasIn
          */
@@ -16161,14 +16378,14 @@ declare namespace _ {
         keys(object?: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keys
          */
         keys(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keys
          */
@@ -16188,14 +16405,14 @@ declare namespace _ {
         keysIn(object?: any): string[];
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keysIn
          */
         keysIn(): LoDashImplicitArrayWrapper<string>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.keysIn
          */
@@ -16214,7 +16431,7 @@ declare namespace _ {
          * @return Returns the new mapped object.
          */
         mapKeys<T, TKey>(
-            object: List<T>,
+            object: List<T> | null | undefined,
             iteratee?: ListIterator<T, TKey>
         ): Dictionary<T>;
 
@@ -16222,7 +16439,7 @@ declare namespace _ {
          * @see _.mapKeys
          */
         mapKeys<T, TKey>(
-            object: Dictionary<T>,
+            object: Dictionary<T> | null | undefined,
             iteratee?: DictionaryIterator<T, TKey>
         ): Dictionary<T>;
 
@@ -16230,7 +16447,7 @@ declare namespace _ {
          * @see _.mapKeys
          */
         mapKeys<T, TObject extends {}>(
-            object: List<T>|Dictionary<T>,
+            object: List<T>|Dictionary<T> | null | undefined,
             iteratee?: TObject
         ): Dictionary<T>;
 
@@ -16238,12 +16455,12 @@ declare namespace _ {
          * @see _.mapKeys
          */
         mapKeys<T>(
-            object: List<T>|Dictionary<T>,
+            object: List<T>|Dictionary<T> | null | undefined,
             iteratee?: string
         ): Dictionary<T>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.mapKeys
          */
@@ -16266,7 +16483,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.mapKeys
          */
@@ -16289,7 +16506,7 @@ declare namespace _ {
         ): LoDashImplicitObjectWrapper<Dictionary<TResult>>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.mapKeys
          */
@@ -16312,7 +16529,7 @@ declare namespace _ {
         ): LoDashExplicitObjectWrapper<Dictionary<T>>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.mapKeys
          */
@@ -16356,13 +16573,13 @@ declare namespace _ {
         * @param {Object} [thisArg] The `this` binding of `iteratee`.
         * @return {Object} Returns the new mapped object.
         */
-        mapValues<T, TResult>(obj: Dictionary<T>, callback: ObjectIterator<T, TResult>): Dictionary<TResult>;
-        mapValues<T>(obj: Dictionary<T>, where: Dictionary<T>): Dictionary<boolean>;
-        mapValues<T, TMapped>(obj: T, pluck: string): TMapped;
-        mapValues<T>(obj: T, callback: ObjectIterator<any, any>): T;
+        mapValues<T, TResult>(obj: Dictionary<T> | null | undefined, callback: ObjectIterator<T, TResult>): Dictionary<TResult>;
+        mapValues<T>(obj: Dictionary<T> | null | undefined, where: Dictionary<T>): Dictionary<boolean>;
+        mapValues<T, TMapped>(obj: T | null | undefined, pluck: string): TMapped;
+        mapValues<T>(obj: T | null | undefined, callback: ObjectIterator<any, any>): T;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.mapValues
          * TValue is the type of the property values of T.
@@ -16385,7 +16602,7 @@ declare namespace _ {
         mapValues<TResult>(where: Dictionary<TResult>): LoDashImplicitArrayWrapper<boolean>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.mapValues
          * TValue is the type of the property values of T.
@@ -16911,7 +17128,7 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.result
          */
@@ -16921,7 +17138,7 @@ declare namespace _ {
         ): TResult;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.result
          */
@@ -16941,7 +17158,7 @@ declare namespace _ {
         ): TResultWrapper;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.result
          */
@@ -17375,7 +17592,7 @@ declare namespace _ {
          * @param object The object to query.
          * @return Returns an array of property values.
          */
-        values<T>(object?: Dictionary<T>|NumericDictionary<T>|List<T>): T[];
+        values<T>(object?: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
 
         /**
          * @see _.values
@@ -17397,14 +17614,14 @@ declare namespace _ {
         values(): LoDashImplicitArrayWrapper<any>;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
         values(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
@@ -17418,14 +17635,14 @@ declare namespace _ {
         values<T>(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
         values(): LoDashExplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.values
          */
@@ -17448,14 +17665,14 @@ declare namespace _ {
         valuesIn<T>(object?: any): T[];
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.valuesIn
          */
         valuesIn<T>(): LoDashImplicitArrayWrapper<T>;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.valuesIn
          */
@@ -18557,18 +18774,18 @@ declare namespace _ {
         identity(): T;
     }
 
-    interface LoDashImplicitArrayWrapper<T> {
+    interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.identity
          */
-        identity(): T[];
+        identity(): TArray;
     }
 
-    interface LoDashImplicitObjectWrapper<T> {
+    interface LoDashImplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.identity
          */
-        identity(): T;
+        identity(): TObject;
     }
 
     interface LoDashExplicitWrapper<T> {
@@ -18578,18 +18795,18 @@ declare namespace _ {
         identity(): LoDashExplicitWrapper<T>;
     }
 
-    interface LoDashExplicitArrayWrapper<T> {
+    interface LoDashExplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
         /**
          * @see _.identity
          */
-        identity(): LoDashExplicitArrayWrapper<T>;
+        identity(): TWrapper;
     }
 
-    interface LoDashExplicitObjectWrapper<T> {
+    interface LoDashExplicitObjectWrapperBase<T, TObject extends T | null | undefined, TWrapper> {
         /**
          * @see _.identity
          */
-        identity(): LoDashExplicitObjectWrapper<T>;
+        identity(): TWrapper;
     }
 
     //_.iteratee
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 4f479eab83..d69529e0dd 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -133,6 +133,16 @@ namespace TestWrapper {
         let result: _.LoDashImplicitObjectWrapper<{a: string}>;
         result = _<{a: string}>({a: ''});
     }
+
+    {
+        let a: TResult[] = [];
+        _(a) // $ExpectType LoDashImplicitArrayWrapper<TResult>
+    }
+
+    {
+        let a: TResult[] | null | undefined = any;
+        _(a) // $ExpectType LoDashImplicitNillableArrayWrapper<TResult>
+    }
 }
 
 //Wrapped array shortcut methods
@@ -158,8 +168,8 @@ result = <_.LoDashExplicitArrayWrapper<number>>_.chain([1, 2, 3, 4]).unshift(5,
 
 // _.chunk
 namespace TestChunk {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[][];
@@ -184,6 +194,7 @@ namespace TestChunk {
     {
         let result: _.LoDashExplicitArrayWrapper<TResult[]>;
 
+        result = _.chain(array).chunk();
         result = _(array).chain().chunk();
         result = _(array).chain().chunk(42);
 
@@ -194,8 +205,8 @@ namespace TestChunk {
 
 // _.compact
 namespace TestCompact {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -222,56 +233,60 @@ namespace TestCompact {
 
 // _.difference
 namespace TestDifference {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let arrayParam: TResult[] = [];
+    let listParam: _.List<TResult> = [];
 
     {
         let result: TResult[];
 
         result = _.difference(array);
-        result = _.difference(array, array);
-        result = _.difference(array, list, array);
-        result = _.difference(array, array, list, array);
+        result = _.difference(array, arrayParam);
+        result = _.difference(array, listParam, arrayParam);
+        result = _.difference(array, listParam, listParam, arrayParam);
 
         result = _.difference(list);
-        result = _.difference(list, list);
-        result = _.difference(list, array, list);
-        result = _.difference(list, list, array, list);
+        result = _.difference(list, listParam);
+        result = _.difference(list, arrayParam, listParam);
+        result = _.difference(list, listParam, arrayParam, listParam);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
         result = _(array).difference();
-        result = _(array).difference(array);
-        result = _(array).difference(list, array);
-        result = _(array).difference(array, list, array);
+        result = _(array).difference(arrayParam);
+        result = _(array).difference(listParam, arrayParam);
+        result = _(array).difference(arrayParam, listParam, arrayParam);
 
         result = _(list).difference<TResult>();
-        result = _(list).difference<TResult>(list);
-        result = _(list).difference<TResult>(array, list);
-        result = _(list).difference<TResult>(list, array, list);
+        result = _(list).difference<TResult>(listParam);
+        result = _(list).difference<TResult>(arrayParam, listParam);
+        result = _(list).difference<TResult>(listParam, arrayParam, listParam);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
         result = _(array).chain().difference();
-        result = _(array).chain().difference(array);
-        result = _(array).chain().difference(list, array);
-        result = _(array).chain().difference(array, list, array);
+        result = _(array).chain().difference(arrayParam);
+        result = _(array).chain().difference(listParam, arrayParam);
+        result = _(array).chain().difference(arrayParam, listParam, arrayParam);
 
         result = _(list).chain().difference<TResult>();
-        result = _(list).chain().difference<TResult>(list);
-        result = _(list).chain().difference<TResult>(array, list);
-        result = _(list).chain().difference<TResult>(list, array, list);
+        result = _(list).chain().difference<TResult>(listParam);
+        result = _(list).chain().difference<TResult>(arrayParam, listParam);
+        result = _(list).chain().difference<TResult>(listParam, arrayParam, listParam);
     }
 }
 
 // _.differenceBy
 namespace TestDifferenceBy {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let arrayParam: TResult[] = [];
+    let listParam: _.List<TResult> = [];
     let iteratee: (value: TResult) => any = (value: TResult) => 1;
 
     {
@@ -298,11 +313,11 @@ namespace TestDifferenceBy {
         result = _.differenceBy<TResult>(array, array, list, array, list, array, 'a');
         result = _.differenceBy<TResult>(array, list, array, list, array, list, array, 'a');
 
-        result = _.differenceBy<TResult, {a: number}>(array, array, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, array, list, array, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, list, array, list, array, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(array, array, list, array, list, array, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(array, listParam, arrayParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, listParam, arrayParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(array, listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(array, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _.differenceBy<TResult>(array, list, array, list, array, list, array, {a: 1});
 
         result = _.differenceBy<TResult>(list, list);
@@ -326,11 +341,11 @@ namespace TestDifferenceBy {
         result = _.differenceBy<TResult>(list, list, array, list, array, list, 'a');
         result = _.differenceBy<TResult>(list, array, list, array, list, array, list, 'a');
 
-        result = _.differenceBy<TResult, {a: number}>(list, list, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, list, array, list, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, array, list, array, list, {a: 1});
-        result = _.differenceBy<TResult, {a: number}>(list, list, array, list, array, list, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(list, listParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(list, arrayParam, listParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(list, listParam, arrayParam, listParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(list, arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _.differenceBy<TResult, {a: number}>(list, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
         result = _.differenceBy<TResult>(list, array, list, array, list, array, list, {a: 1});
     }
 
@@ -358,11 +373,11 @@ namespace TestDifferenceBy {
         result = _(array).differenceBy<TResult>(array, list, array, list, array, 'a');
         result = _(array).differenceBy<TResult>(list, array, list, array, list, array, 'a');
 
-        result = _(array).differenceBy<TResult, {a: number}>(array, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(list, array, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(list, array, list, array, {a: 1});
-        result = _(array).differenceBy<TResult, {a: number}>(array, list, array, list, array, {a: 1});
+        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, {a: 1});
+        result = _(array).differenceBy<TResult, {a: number}>(listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).differenceBy<TResult>(list, array, list, array, list, array, {a: 1});
 
         result = _(list).differenceBy<TResult>(list);
@@ -386,11 +401,11 @@ namespace TestDifferenceBy {
         result = _(list).differenceBy<TResult>(list, array, list, array, list, 'a');
         result = _(list).differenceBy<TResult>(array, list, array, list, array, list, 'a');
 
-        result = _(list).differenceBy<TResult, {a: number}>(list, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(array, list, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(array, list, array, list, {a: 1});
-        result = _(list).differenceBy<TResult, {a: number}>(list, array, list, array, list, {a: 1});
+        result = _(list).differenceBy<TResult, {a: number}>(listParam, {a: 1});
+        result = _(list).differenceBy<TResult, {a: number}>(arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
         result = _(list).differenceBy<TResult>(array, list, array, list, array, list, {a: 1});
     }
 
@@ -418,11 +433,11 @@ namespace TestDifferenceBy {
         result = _(array).chain().differenceBy<TResult>(array, list, array, list, array, 'a');
         result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array, 'a');
 
-        result = _(array).chain().differenceBy<TResult, {a: number}>(array, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(list, array, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(array, list, array, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(list, array, list, array, {a: 1});
-        result = _(array).chain().differenceBy<TResult, {a: number}>(array, list, array, list, array, {a: 1});
+        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, {a: 1});
+        result = _(array).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, {a: 1});
+        result = _(array).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).chain().differenceBy<TResult>(list, array, list, array, list, array, {a: 1});
 
         result = _(list).chain().differenceBy<TResult>(list);
@@ -446,19 +461,19 @@ namespace TestDifferenceBy {
         result = _(list).chain().differenceBy<TResult>(list, array, list, array, list, 'a');
         result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list, 'a');
 
-        result = _(list).chain().differenceBy<TResult, {a: number}>(list, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(array, list, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(list, array, list, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(array, list, array, list, {a: 1});
-        result = _(list).chain().differenceBy<TResult, {a: number}>(list, array, list, array, list, {a: 1});
+        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, {a: 1});
+        result = _(list).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy<TResult, {a: number}>(arrayParam, listParam, arrayParam, listParam, {a: 1});
+        result = _(list).chain().differenceBy<TResult, {a: number}>(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
         result = _(list).chain().differenceBy<TResult>(array, list, array, list, array, list, {a: 1});
     }
 }
 
 // _.drop
 {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -492,8 +507,8 @@ namespace TestDifferenceBy {
 
 // _.dropRight
 namespace TestDropRight {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -528,8 +543,8 @@ namespace TestDropRight {
 
 // _.dropRightWhile
 namespace TestDropRightWhile {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
 
     {
@@ -577,8 +592,8 @@ namespace TestDropRightWhile {
 
 // _.dropWhile
 namespace TestDropWhile {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
 
     {
@@ -626,8 +641,8 @@ namespace TestDropWhile {
 
 // _.fill
 namespace TestFill {
-    let array: number[] = [];
-    let list: _.List<number> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: number[];
@@ -680,8 +695,8 @@ namespace TestFill {
 
 // _.findIndex
 namespace TestFindIndex {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
     let fromIndex: number = 0;
 
@@ -732,8 +747,8 @@ namespace TestFindIndex {
 
 // _.findLastIndex
 namespace TestFindLastIndex {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
     let fromIndex: number = 0;
@@ -785,18 +800,18 @@ namespace TestFindLastIndex {
 
 // _.first
 namespace TestFirst {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
-        let result: string;
+        let result: string | undefined;
 
         result = _.first('abc');
         result = _('abc').first();
     }
 
     {
-        let result: TResult;
+        let result: TResult | undefined;
 
         result = _.first<TResult>(array);
         result = _.first<TResult>(list);
@@ -821,6 +836,9 @@ namespace TestFirst {
 
 // _.flatten
 namespace TestFlatten {
+    let array: number[][] | null | undefined = [] as any;
+    let list: _.List<number[]> | null | undefined = [] as any;
+
     {
         let result: string[];
 
@@ -830,6 +848,10 @@ namespace TestFlatten {
     {
         let result: number[];
 
+        result = _.flatten<number>(array);
+        result = _.flatten<number>(list);
+        result = _.flatten<number>([1, 2, 3]);
+        result = _.flatten<number>([1, 2, 3]);
         result = _.flatten<number>([1, 2, 3]);
         result = _.flatten<number>([1, [2, 3]]);
         result = _.flatten<number>([1, [2, [3]]], true);
@@ -914,6 +936,9 @@ namespace TestFlatten {
 
 // _.flattenDeep
 namespace TestFlattenDeep {
+    let array: number[][] | null | undefined = [] as any;
+    let list: _.List<number[]> | null | undefined = [] as any;
+
     {
         let result: string[];
 
@@ -923,6 +948,8 @@ namespace TestFlattenDeep {
     {
         let result: number[];
 
+        result = _.flattenDeep<number>(array);
+        result = _.flattenDeep<number>(list);
         result = _.flattenDeep<number>([1, 2, 3]);
         result = _.flattenDeep<number>([1, [2, 3]]);
         result = _.flattenDeep<number>([1, [2, [3]]]);
@@ -997,8 +1024,8 @@ namespace TestFlattenDeep {
 
 // _.fromPairs
 namespace TestFromPairs {
-    let twoDimensionalArray: string[][] = [];
-    let numberTupleArray: [string, number][] = [];
+    let twoDimensionalArray: string[][] | null | undefined = [] as any;
+    let numberTupleArray: [string, number][] | null | undefined = [] as any;
     let stringDict: _.Dictionary<string>;
     let numberDict: _.Dictionary<number>;
 
@@ -1022,18 +1049,18 @@ namespace TestFromPairs {
 
 // _.head
 namespace TestHead {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
-        let result: string;
+        let result: string | undefined;
 
         result = _.head('abc');
         result = _('abc').head();
     }
 
     {
-        let result: TResult;
+        let result: TResult | undefined;
 
         result = _.head<TResult>(array);
         result = _.head<TResult>(list);
@@ -1058,8 +1085,8 @@ namespace TestHead {
 
 // _.indexOf
 namespace TestIndexOf {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let value: TResult = { a: 1, b: "", c: true };
 
     {
@@ -1097,8 +1124,8 @@ namespace TestIndexOf {
 
 // _.sortedIndexOf
 namespace TestIndexOf {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let value: TResult = { a: 1, b: "", c: true };
 
     {
@@ -1120,8 +1147,8 @@ namespace TestIndexOf {
 
 //_.initial
 namespace TestInitial {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1147,8 +1174,10 @@ namespace TestInitial {
 
 // _.intersection
 namespace TestIntersection {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let arrayParam: TResult[] = [] as any;
+    let listParam: _.List<TResult> = [] as any;
 
     {
         let result: TResult[];
@@ -1160,21 +1189,21 @@ namespace TestIntersection {
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        result = _(array).intersection<TResult>(array);
-        result = _(array).intersection<TResult>(list, array);
+        result = _(array).intersection<TResult>(arrayParam);
+        result = _(array).intersection<TResult>(listParam, arrayParam);
 
-        result = _(list).intersection<TResult>(array);
-        result = _(list).intersection<TResult>(list, array);
+        result = _(list).intersection<TResult>(arrayParam);
+        result = _(list).intersection<TResult>(listParam, arrayParam);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        result = _(array).chain().intersection<TResult>(array);
-        result = _(array).chain().intersection<TResult>(list, array);
+        result = _(array).chain().intersection<TResult>(arrayParam);
+        result = _(array).chain().intersection<TResult>(listParam, arrayParam);
 
-        result = _(list).chain().intersection<TResult>(array);
-        result = _(list).chain().intersection<TResult>(list, array);
+        result = _(list).chain().intersection<TResult>(arrayParam);
+        result = _(list).chain().intersection<TResult>(listParam, arrayParam);
     }
 }
 
@@ -1182,6 +1211,8 @@ namespace TestIntersection {
 namespace TestJoin {
     let array = [1, 2];
     let list = {0: 1, 1: 2, length: 2};
+    let nilArray: string[] | null | undefined = undefined as any;
+    let nilList: _.List<string> | null | undefined = undefined as any;
 
     {
         let result: string;
@@ -1192,6 +1223,10 @@ namespace TestJoin {
         result = _.join(array, '_');
         result = _.join(list);
         result = _.join(list, '_');
+        result = _.join(nilArray);
+        result = _.join(nilArray, '_');
+        result = _.join(nilList);
+        result = _.join(nilList, '_');
 
         result = _('abc').join();
         result = _('abc').join('_');
@@ -1215,18 +1250,18 @@ namespace TestJoin {
 
 // _.last
 namespace TestLast {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
-        let result: string;
+        let result: string | undefined;
 
         result = _.last('abc');
         result = _('abc').last();
     }
 
     {
-        let result: TResult;
+        let result: TResult | undefined;
 
         result = _.last<TResult>(array);
         result = _.last<TResult>(list);
@@ -1256,8 +1291,8 @@ namespace TestLast {
 
 // _.lastIndexOf
 namespace TestLastIndexOf {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let value: TResult = { a: 1, b: "", c: true };
 
     {
@@ -1295,12 +1330,12 @@ namespace TestLastIndexOf {
 
 // _.nth
 namespace TestNth {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let value: number = 0;
 
     {
-        let result: TResult;
+        let result: TResult | undefined;
 
         result = _.nth<TResult>(array);
 
@@ -1484,8 +1519,8 @@ namespace TestRemove {
 
 // _.tail
 namespace TestTail {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1511,12 +1546,12 @@ namespace TestTail {
 
 // _.slice
 namespace TestSlice {
-    let array: TResult[] = [];
+    let array: TResult[] | null | undefined = [] as any;
 
     {
         let result: TResult[];
 
-        result = _.slice(array);
+        result = _.slice<TResult>(array);
         result = _.slice(array, 42);
         result = _.slice(array, 42, 42);
     }
@@ -1742,8 +1777,8 @@ namespace TestSortedLastIndexBy {
 
 // _.tail
 namespace TestTail {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1769,8 +1804,8 @@ namespace TestTail {
 
 // _.take
 namespace TestTake {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1805,8 +1840,8 @@ namespace TestTake {
 
 // _.takeRight
 namespace TestTakeRight {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1841,8 +1876,8 @@ namespace TestTakeRight {
 
 // _.takeRightWhile
 namespace TestTakeRightWhile {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
 
     {
@@ -1890,8 +1925,8 @@ namespace TestTakeRightWhile {
 
 // _.takeWhile
 namespace TestTakeWhile {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let predicateFn = (value: TResult, index: number, collection: _.List<TResult>) => true;
 
     {
@@ -1939,8 +1974,8 @@ namespace TestTakeWhile {
 
 // _.union
 namespace TestUnion {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -1991,8 +2026,8 @@ namespace TestUnion {
 
 // _.unionBy
 namespace TestUnionBy {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
     let iteratee: (value: TResult) => any = (value: TResult) => 1;
 
     {
@@ -2156,8 +2191,8 @@ namespace TestUnionBy {
 namespace TestUniq {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
 
     {
         let result: string[];
@@ -2201,8 +2236,8 @@ namespace TestUniq {
 namespace TestUniqBy {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
 
     let stringIterator = (value: string, index: number, collection: string) => "";
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 0;
@@ -2275,8 +2310,8 @@ namespace TestUniqBy {
 namespace TestSortedUniq {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
 
     {
         let result: string[];
@@ -2316,8 +2351,8 @@ namespace TestSortedUniq {
 namespace TestSortedUniqBy {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
 
     let stringIterator = (value: string, index: number, collection: string) => "";
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 0;
@@ -2386,7 +2421,7 @@ namespace TestSortedUniqBy {
     }
 }
 
-// _.upzip
+// _.unzip
 namespace TestUnzip {
     let array = [['a', 'b'], [1, 2], [true, false]];
 
@@ -2396,6 +2431,15 @@ namespace TestUnzip {
         2: {0: true, 1: false, length: 2},
         length: 3
     };
+    let nilArray: TResult[][] | null | undefined = [] as any;
+    let nilList: _.List<_.List<TResult>> | null | undefined = [] as any;
+
+    {
+        let result: TResult[][];
+
+        result = _.unzip(nilArray);
+        result = _.unzip(nilList);
+    }
 
     {
         let result: (string|number|boolean)[][];
@@ -2421,8 +2465,8 @@ namespace TestUnzip {
 
 // _.unzipWith
 {
-    let testUnzipWithArray: (number[]|_.List<number>)[] = [];
-    let testUnzipWithList: _.List<number[]|_.List<number>> = [];
+    let testUnzipWithArray: (number[]|_.List<number>)[] | null | undefined = [] as any;
+    let testUnzipWithList: _.List<number[]|_.List<number>> | null | undefined = [] as any;
     let testUnzipWithIterator: {(prev: TResult, curr: number, index?: number, list?: number[]): TResult} = (prev: TResult, curr: number, index?: number, list?: number[]) => ({ a: 1, b: "", c: true });
     let result: TResult[];
     result = _.unzipWith<number, TResult>(testUnzipWithArray);
@@ -2435,8 +2479,8 @@ namespace TestUnzip {
 
 // _.without
 namespace TestWithout {
-    let array: number[] = [];
-    let list: _.List<number> = [];
+    let array: number[] | null | undefined = [] as any;
+    let list: _.List<number> | null | undefined = [] as any;
 
     {
         let result: number[];
@@ -2482,8 +2526,8 @@ namespace TestWithout {
 
 // _.xor
 namespace TestXor {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[];
@@ -2526,8 +2570,8 @@ namespace TestXor {
 
 // _.zip
 namespace TestZip {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
 
     {
         let result: TResult[][];
@@ -3254,9 +3298,9 @@ namespace TestValueOf {
 
 // _.at
 namespace TestAt {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let dictionary: _.Dictionary<TResult> | null | undefined = any;
 
     {
         let result: TResult[];
@@ -3285,10 +3329,11 @@ namespace TestAt {
 
 // _.countBy
 namespace TestCountBy {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
-    let numericDictionary: _.NumericDictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -3394,6 +3439,10 @@ namespace TestEach {
     let array: TResult[] = [];
     let list: _.List<TResult> = [];
     let dictionary: _.Dictionary<TResult> = {};
+    let nilArray: TResult[] | null | undefined = [] as any;
+    let nilList: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let nilDictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -3402,73 +3451,97 @@ namespace TestEach {
     {
         let result: string;
 
-        _.each('', stringIterator);
+        result = _.each('', stringIterator);
+    }
+
+    {
+        let result: string | null | undefined;
+
+        result = _.each('' as (string | null | undefined), stringIterator);
     }
 
     {
         let result: TResult[];
 
-        _.each<TResult>(array, listIterator);
+        result = _.each<TResult>(array, listIterator);
+    }
+
+    {
+        let result: TResult[] | null | undefined;
+
+        result = _.each<TResult>(nilArray, listIterator);
     }
 
     {
         let result: _.List<TResult>;
 
-        _.each<TResult>(list, listIterator);
+        result = _.each<TResult>(list, listIterator);
     }
 
     {
-        let result: _.Dictionary<TResult>;
+        let result: _.List<TResult> | null | undefined;
 
-        _.each<TResult>(dictionary, dictionaryIterator);
+        result = _.each<TResult>(nilList, listIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult | null | undefined>;
+
+        result = _.each<TResult>(dictionary, dictionaryIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult> | null | undefined;
+
+        result = _.each<TResult>(nilDictionary, dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
-        _('').each(stringIterator);
+        result = _('').each(stringIterator);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        _(array).each(listIterator);
+        result = _(array).each(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).each<TResult>(listIterator);
+        result = _(list).each<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).each<TResult>(dictionaryIterator);
+        result = _(dictionary).each<TResult>(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        _('').chain().each(stringIterator);
+        result = _('').chain().each(stringIterator);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        _(array).chain().each(listIterator);
+        result = _(array).chain().each(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).chain().each<TResult>(listIterator);
+        result = _(list).chain().each<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).chain().each<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().each<TResult>(dictionaryIterator);
     }
 }
 
@@ -3477,6 +3550,10 @@ namespace TestEachRight {
     let array: TResult[] = [];
     let list: _.List<TResult> = [];
     let dictionary: _.Dictionary<TResult> = {};
+    let nilArray: TResult[] | null | undefined = [] as any;
+    let nilList: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let nilDictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -3485,73 +3562,97 @@ namespace TestEachRight {
     {
         let result: string;
 
-        _.eachRight('', stringIterator);
+        result = _.eachRight('', stringIterator);
+    }
+
+    {
+        let result: string | null | undefined;
+
+        result = _.eachRight('' as (string | null | undefined), stringIterator);
     }
 
     {
         let result: TResult[];
 
-        _.eachRight<TResult>(array, listIterator);
+        result = _.eachRight<TResult>(array, listIterator);
+    }
+
+    {
+        let result: TResult[] | null | undefined;
+
+        result = _.eachRight<TResult>(nilArray, listIterator);
     }
 
     {
         let result: _.List<TResult>;
 
-        _.eachRight<TResult>(list, listIterator);
+        result = _.eachRight<TResult>(list, listIterator);
     }
 
     {
-        let result: _.Dictionary<TResult>;
+        let result: _.List<TResult> | null | undefined;
 
-        _.eachRight<TResult>(dictionary, dictionaryIterator);
+        result = _.eachRight<TResult>(nilList, listIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult | null | undefined>;
+
+        result = _.eachRight<TResult>(dictionary, dictionaryIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult> | null | undefined;
+
+        result = _.eachRight<TResult>(nilDictionary, dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
-        _('').eachRight(stringIterator);
+        result = _('').eachRight(stringIterator);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        _(array).eachRight(listIterator);
+        result = _(array).eachRight(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).eachRight<TResult>(listIterator);
+        result = _(list).eachRight<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).eachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).eachRight<TResult>(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        _('').chain().eachRight(stringIterator);
+        result = _('').chain().eachRight(stringIterator);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        _(array).chain().eachRight(listIterator);
+        result = _(array).chain().eachRight(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).chain().eachRight<TResult>(listIterator);
+        result = _(list).chain().eachRight<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).chain().eachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().eachRight<TResult>(dictionaryIterator);
     }
 }
 
@@ -3559,10 +3660,11 @@ namespace TestEachRight {
 namespace TestEvery {
     type SampleObject = {a: number; b: string; c: boolean;};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
-    let dictionary: _.Dictionary<SampleObject> = {};
-    let numericDictionary: _.NumericDictionary<SampleObject> = {};
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
@@ -3651,9 +3753,10 @@ namespace TestEvery {
 
 // _.filter
 namespace TestFilter {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -3737,9 +3840,10 @@ namespace TestFilter {
 
 // _.find
 namespace TestFind {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => true;
     let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => true;
@@ -3809,17 +3913,18 @@ result = <IFoodCombined>_(foodsCombined).findLast('organic', 1);
 
 // _.flatMap
 namespace TestFlatMap {
-    let numArray: (number|number[])[] = [1, [2, 3]];
-    let objArray: ({a: number}|{a: number}[])[] = [{a: 1}, [{a: 2}, {a: 3}]];
+    let numArray: (number|number[])[] | null | undefined = [1, [2, 3]] as any;
+    let objArray: ({a: number}|{a: number}[])[] | null | undefined = [{a: 1}, [{a: 2}, {a: 3}]] as any;
 
-    let numList: _.List<number|number[]> = {0: 1, 1: [2, 3], length: 2};
-    let objList: _.List<{a: number}|{a: number}[]> = {0: {a: 1}, 1: [{a: 2}, {a: 3}], length: 2};
+    let obj: any = {};
+    let numList: _.List<number|number[]> | null | undefined = obj;
+    let objList: _.List<{a: number}|{a: number}[]> | null | undefined = obj;
 
-    let numDictionary: _.Dictionary<number|number[]> = {a: 1, b: [2, 3]};
-    let objDictionary: _.Dictionary<{a: number}|{a: number}[]> = {a: {a: 1}, b: [{a: 2}, {a: 3}]};
+    let numDictionary: _.Dictionary<number|number[]> | null | undefined = obj;
+    let objDictionary: _.Dictionary<{a: number}|{a: number}[]> | null | undefined = obj;
 
-    let numNumericDictionary: _.NumericDictionary<number|number[]> = {0: 1, 1: [2, 3]};
-    let objNumericDictionary: _.NumericDictionary<{a: number}|{a: number}[]> = {0: {a: 1}, 1: [{a: 2}, {a: 3}]};
+    let numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = obj;
+    let objNumericDictionary: _.NumericDictionary<{a: number}|{a: number}[]> | null | undefined = obj;
 
     let stringIterator: (value: string, index: number, collection: _.List<string>) => string|string[] = (a, b, c) => "";
 
@@ -4003,6 +4108,10 @@ namespace TestForEach {
     let array: TResult[] = [];
     let list: _.List<TResult> = [];
     let dictionary: _.Dictionary<TResult> = {};
+    let nilArray: TResult[] | null | undefined = [] as any;
+    let nilList: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let nilDictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -4011,73 +4120,133 @@ namespace TestForEach {
     {
         let result: string;
 
-        _.forEach('', stringIterator);
+        result = _.forEach('', stringIterator);
+    }
+
+    {
+        let result: string | null | undefined;
+
+        result = _.forEach('' as (string | null | undefined), stringIterator);
     }
 
     {
         let result: TResult[];
 
-        _.forEach<TResult>(array, listIterator);
+        result = _.forEach<TResult>(array, listIterator);
+    }
+
+    {
+        let result: TResult[] | null | undefined;
+
+        result = _.forEach<TResult>(nilArray, listIterator);
     }
 
     {
         let result: _.List<TResult>;
 
-        _.forEach<TResult>(list, listIterator);
+        result = _.forEach<TResult>(list, listIterator);
     }
 
     {
-        let result: _.Dictionary<TResult>;
+        let result: _.List<TResult> | null | undefined;
 
-        _.forEach<TResult>(dictionary, dictionaryIterator);
+        result = _.forEach<TResult>(nilList, listIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult | null | undefined>;
+
+        result = _.forEach<TResult>(dictionary, dictionaryIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult> | null | undefined;
+
+        result = _.forEach<TResult>(nilDictionary, dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
-        _('').forEach(stringIterator);
+        result = _('').forEach(stringIterator);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        _(array).forEach(listIterator);
+        result = _(array).forEach(listIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableArrayWrapper<TResult>;
+
+        result = _(nilArray).forEach(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).forEach<TResult>(listIterator);
+        result = _(list).forEach<TResult>(listIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.List<TResult>>;
+
+        result = _(nilList).forEach<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).forEach<TResult>(dictionaryIterator);
+        result = _(dictionary).forEach<TResult>(dictionaryIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<TResult>>;
+
+        result = _(nilDictionary).forEach<TResult>(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        _('').chain().forEach(stringIterator);
+        result = _('').chain().forEach(stringIterator);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        _(array).chain().forEach(listIterator);
+        result = _(array).chain().forEach(listIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableArrayWrapper<TResult>;
+
+        result = _(nilArray).chain().forEach(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).chain().forEach<TResult>(listIterator);
+        result = _(list).chain().forEach<TResult>(listIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.List<TResult>>;
+
+        result = _(nilList).chain().forEach<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).chain().forEach<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().forEach<TResult>(dictionaryIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<TResult>>;
+
+        result = _(nilDictionary).chain().forEach<TResult>(dictionaryIterator);
     }
 }
 
@@ -4086,6 +4255,10 @@ namespace TestForEachRight {
     let array: TResult[] = [];
     let list: _.List<TResult> = [];
     let dictionary: _.Dictionary<TResult> = {};
+    let nilArray: TResult[] | null | undefined = [] as any;
+    let nilList: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let nilDictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -4094,73 +4267,133 @@ namespace TestForEachRight {
     {
         let result: string;
 
-        _.forEachRight('', stringIterator);
+        result = _.forEachRight('', stringIterator);
+    }
+
+    {
+        let result: string | null | undefined;
+
+        result = _.forEachRight('' as (string | null | undefined), stringIterator);
     }
 
     {
         let result: TResult[];
 
-        _.forEachRight<TResult>(array, listIterator);
+        result = _.forEachRight<TResult>(array, listIterator);
+    }
+
+    {
+        let result: TResult[] | null | undefined;
+
+        result = _.forEachRight<TResult>(nilArray, listIterator);
     }
 
     {
         let result: _.List<TResult>;
 
-        _.forEachRight<TResult>(list, listIterator);
+        result = _.forEachRight<TResult>(list, listIterator);
     }
 
     {
-        let result: _.Dictionary<TResult>;
+        let result: _.List<TResult> | null | undefined;
 
-        _.forEachRight<TResult>(dictionary, dictionaryIterator);
+        result = _.forEachRight<TResult>(nilList, listIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult | null | undefined>;
+
+        result = _.forEachRight<TResult>(dictionary, dictionaryIterator);
+    }
+
+    {
+        let result: _.Dictionary<TResult> | null | undefined;
+
+        result = _.forEachRight<TResult>(nilDictionary, dictionaryIterator);
     }
 
     {
         let result: _.LoDashImplicitWrapper<string>;
 
-        _('').forEachRight(stringIterator);
+        result = _('').forEachRight(stringIterator);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<TResult>;
 
-        _(array).forEachRight(listIterator);
+        result = _(array).forEachRight(listIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableArrayWrapper<TResult>;
+
+        result = _(nilArray).forEachRight(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).forEachRight<TResult>(listIterator);
+        result = _(list).forEachRight<TResult>(listIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.List<TResult>>;
+
+        result = _(nilList).forEachRight<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).forEachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).forEachRight<TResult>(dictionaryIterator);
+    }
+
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<TResult>>;
+
+        result = _(nilDictionary).forEachRight<TResult>(dictionaryIterator);
     }
 
     {
         let result: _.LoDashExplicitWrapper<string>;
 
-        _('').chain().forEachRight(stringIterator);
+        result = _('').chain().forEachRight(stringIterator);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<TResult>;
 
-        _(array).chain().forEachRight(listIterator);
+        result = _(array).chain().forEachRight(listIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableArrayWrapper<TResult>;
+
+        result = _(nilArray).chain().forEachRight(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<TResult>>;
 
-        _(list).chain().forEachRight<TResult>(listIterator);
+        result = _(list).chain().forEachRight<TResult>(listIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.List<TResult>>;
+
+        result = _(nilList).chain().forEachRight<TResult>(listIterator);
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<TResult>>;
 
-        _(dictionary).chain().forEachRight<TResult>(dictionaryIterator);
+        result = _(dictionary).chain().forEachRight<TResult>(dictionaryIterator);
+    }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<TResult>>;
+
+        result = _(nilDictionary).chain().forEachRight<TResult>(dictionaryIterator);
     }
 }
 
@@ -4168,9 +4401,10 @@ namespace TestForEachRight {
 namespace TestGroupBy {
     type SampleType = {a: number; b: string; c: boolean;};
 
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-    let dictionary: _.Dictionary<SampleType> = {};
+    let array: SampleType[] | null | undefined = [] as any;
+    let list: _.List<SampleType> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
 
     let stringIterator = (char: string, index: number, string: string) => 0;
     let listIterator = (value: SampleType, index: number, collection: _.List<SampleType>) => 0;
@@ -4290,9 +4524,10 @@ namespace TestGroupBy {
 namespace TestIncludes {
     type SampleType = {a: string; b: number; c: boolean;};
 
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-    let dictionary: _.Dictionary<SampleType> = {};
+    let array: SampleType[] | null | undefined = [] as any;
+    let list: _.List<SampleType> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
 
     let target: SampleType = { a: "", b: 1, c: true };
 
@@ -4336,10 +4571,11 @@ namespace TestIncludes {
 namespace TestKeyBy {
     type SampleObject = {a: number; b: string; c: boolean;};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
-    let dictionary: _.Dictionary<SampleObject> = {};
-    let numericDictionary: _.NumericDictionary<SampleObject> = {};
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
 
     let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: SampleObject, index: number, collection: _.List<SampleObject>) => any = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
@@ -4534,13 +4770,14 @@ namespace TestInvoke {
 
 //_.invokeMap
 namespace TestInvokeMap {
-    let numArray = [4, 2, 1, 3]
-    let numDict: _.Dictionary<number> = {
+    let numArray: number[] | null | undefined = [4, 2, 1, 3] as any;
+    let obj: _.Dictionary<number> = {
         a: 1,
         b: 2,
         c: 3,
         d: 4
-    }
+    };
+    let numDict: _.Dictionary<number> | null | undefined = obj as any;
 
     let result: string[];
     result = _.invokeMap<number, string>(numArray, 'toString');
@@ -4582,9 +4819,10 @@ namespace TestInvokeMap {
 
 // _.map
 namespace TestMap {
-    let array: number[] = [];
-    let list: _.List<number> = [];
-    let dictionary: _.Dictionary<number> = {};
+    let array: number[] | null | undefined = [] as any;
+    let list: _.List<number> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<number> | null | undefined = obj;
 
     let listIterator: (value: number, index: number, collection: _.List<number>) => TResult = (value: number, index: number, collection: _.List<number>) => ({ a: 1, b: "", c: true });
     let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => TResult = (value: number, key: string, collection: _.Dictionary<number>) => ({ a: 1, b: "", c: true });
@@ -4677,6 +4915,7 @@ result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}, length
 result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}, length: 2}, 'a', 2);
 result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}}, 'a');
 result = <{a: number}[][]>_.partition<{a: number}>({0: {a: 1}, 1: {a: 2}}, 'a', 2);
+result = <{a: number}[][]>_.partition<{a: number}>(null, 'a');
 result = <string[][]>_('abcd').partition((n) => n < 'c').value();
 result = <string[][]>_(['a', 'b', 'c', 'd']).partition((n) => n < 'c').value();
 result = <number[][]>_([1, 2, 3, 4]).partition((n) => n < 3).value();
@@ -4762,8 +5001,10 @@ namespace TestReduce {
     }
 
     result = <number>_.reduce<number, number>([1, 2, 3], (sum: number, num: number) => sum + num);
+    result = <number>_.reduce<number, number>(null, (sum: number, num: number) => sum + num);
 
     // chained
+    result = _([1, 2 ,3]).reduce((sum: number, num: number) => sum + num);
     result = _.chain([1, 2 ,3]).reduce((sum: number, num: number) => sum + num).value();
 
     result = <ABC>_.reduce({ 'a': 1, 'b': 2, 'c': 3 }, (r: ABC, num: number, key: string) => {
@@ -4781,9 +5022,10 @@ namespace TestReduce {
 }
 // _.reject
 namespace TestReject {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
     let listIterator: (value: TResult, index: number, collection: _.List<TResult>) => any = (value: TResult, index: number, collection: _.List<TResult>) => 1;
@@ -4858,13 +5100,14 @@ namespace TestReject {
 
 // _.sample
 namespace TestSample {
-    let array: string[] = [];
-    let list: _.List<string> = [];
-    let dictionary: _.Dictionary<string> = {};
-    let numericDictionary: _.NumericDictionary<string> = {};
+    let array: string[] | null | undefined = [] as any;
+    let list: _.List<string> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<string> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<string>  | null | undefined= obj;
 
     {
-        let result: string;
+        let result: string | undefined;
 
         result = _.sample('abc');
         result = _.sample(array);
@@ -4896,10 +5139,11 @@ namespace TestSample {
 
 // _.sampleSize
 namespace TestSampleSize {
-    let array: string[] = [];
-    let list: _.List<string> = [];
-    let dictionary: _.Dictionary<string> = {};
-    let numericDictionary: _.NumericDictionary<string> = {};
+    let array: string[] | null | undefined = [] as any;
+    let list: _.List<string> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<string> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<string> | null | undefined = obj;
 
     {
         let result: string[];
@@ -4957,9 +5201,10 @@ namespace TestSampleSize {
 
 // _.shuffle
 namespace TestShuffle {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     {
         let result: string[];
@@ -5008,9 +5253,10 @@ namespace TestShuffle {
 namespace TestSize {
     type SampleType = {a: string; b: number; c: boolean;};
 
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-    let dictionary: _.Dictionary<SampleType> = {};
+    let array: SampleType[] | null | undefined = [] as any;
+    let list: _.List<SampleType> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
 
     {
         let result: number;
@@ -5040,11 +5286,12 @@ namespace TestSize {
 namespace TestSome {
     type SampleObject = {a: number; b: string; c: boolean;};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
-    let dictionary: _.Dictionary<SampleObject> = {};
-    let numericDictionary: _.NumericDictionary<SampleObject> = {};
-    let sampleObject: SampleObject = { a: 1, b: "", c: true };
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
+    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
+    let sampleObject: SampleObject | null | undefined = obj;
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
@@ -5158,9 +5405,10 @@ namespace TestSome {
 
 // _.sortBy
 namespace TestSortBy {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<TResult> | null | undefined = obj;
 
     let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => 0;
     let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => 0;
@@ -5233,10 +5481,11 @@ result = <IFoodOrganic[]>_(foodsOrganic).sortBy('organic', (food) => food.name,
 namespace TestorderBy {
     type SampleObject = {a: number; b: string; c: boolean};
 
-    let array: SampleObject[] = [];
-    let list: _.List<SampleObject> = [];
-    let numericDictionary: _.NumericDictionary<SampleObject> = {};
-    let dictionary: _.Dictionary<SampleObject> = {};
+    let array: SampleObject[] | null | undefined = [] as any;
+    let list: _.List<SampleObject> | null | undefined = [] as any;
+    let obj: any = {};
+    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
+    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
     let orders: boolean|string|(boolean|string)[] = true as any;
 
     {
@@ -5674,15 +5923,14 @@ curryResult0 = _.curryRight(testCurryRightFn)(1, 2, 3);
 curryResult2 = _.curryRight(testCurryRightFn)(1);
 curryResult0 = _(testCurryRightFn).curryRight().value()(1, 2, 3);
 curryResult2 = _(testCurryRightFn).curryRight().value()(1);
-
-let curryResult7: _.CurriedFunction1<string, [string, number, boolean]>;
-let curryResult8: _.CurriedFunction2<number, string, [string, number, boolean]>;
-let curryResult9: _.CurriedFunction3<boolean, number, string, [string, number, boolean]>;
-curryResult3 = _.curryRight(testCurry2)(true, 2, "1");
-curryResult3 = _.curryRight(testCurry2)(true, 2)("1");
-curryResult3 = _.curryRight(testCurry2)(true)(2, "1");
+let curryResult7: _.RightCurriedFunction1<string, [string, number, boolean]>;
+let curryResult8: _.RightCurriedFunction2<string,number , [string, number, boolean]>;
+let curryResult9: _.RightCurriedFunction3<string, number, boolean, [string, number, boolean]>;
+curryResult3 = _.curryRight(testCurry2)("1", 2, true);
+curryResult3 = _.curryRight(testCurry2)( 2,true)("1");
+curryResult3 = _.curryRight(testCurry2)(true)( "1",2);
 curryResult3 = _.curryRight(testCurry2)(true)(2)("1");
-curryResult7 = _.curryRight(testCurry2)(true, 2);
+curryResult7 = _.curryRight(testCurry2)(2,true);
 curryResult7 = _.curryRight(testCurry2)(true)(2);
 curryResult8 = _.curryRight(testCurry2)(true);
 curryResult9 = _.curryRight(testCurry2);
@@ -6926,7 +7174,9 @@ namespace TestIsEqual {
 
 // _.isEqualWith
 namespace TestIsEqualWith {
-    let customizer = (value: any, other: any, indexOrKey?: number|string) => true;
+    let customizer = (value: any, other: any, indexOrKey: number|string|undefined, parent: any, otherParent: any, stack: any) => {
+        return value ? undefined : true;
+    };
 
     {
         let result: boolean;
@@ -7836,7 +8086,7 @@ namespace TestMax {
     let array: number[] = [];
     let list: _.List<number> = [];
 
-    let result: number;
+    let result: number | undefined;
 
     result = _.max<number>(array);
     result = _.max<number>(list);
@@ -7854,7 +8104,7 @@ namespace TestMaxBy {
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
     let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
 
-    let result: number;
+    let result: number | undefined;
 
     result = _.maxBy<number>(array);
     result = _.maxBy<number>(array, listIterator);
@@ -7903,7 +8153,7 @@ namespace TestMin {
     let array: number[] = [];
     let list: _.List<number> = [];
 
-    let result: number;
+    let result: number | undefined;
 
     result = _.min<number>(array);
     result = _.min<number>(list);
@@ -7921,7 +8171,7 @@ namespace TestMinBy {
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
     let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
 
-    let result: number;
+    let result: number | undefined;
 
     result = _.minBy<number>(array);
     result = _.minBy<number>(array, listIterator);
@@ -7976,9 +8226,10 @@ namespace TestRound {
 
 // _.sum
 namespace TestSum {
-    let array: number[] = [];
-    let list: _.List<number> = [];
-    let dictionary: _.Dictionary<number> = {};
+    let array: number[] | null | undefined = [] as any;
+    let list: _.List<number> | null | undefined = [] as any;
+    let obj: any = {};
+    let dictionary: _.Dictionary<number> | null | undefined = obj;
 
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
     let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
@@ -8012,11 +8263,11 @@ namespace TestSum {
 
 // _.sumBy
 namespace TestSumBy {
-    let array: number[] = [];
-    let objectArray: { 'age': number }[] = [];
+    let array: number[] | null | undefined = [] as any;
+    let objectArray: { 'age': number }[] | null | undefined = [] as any;
 
-    let list: _.List<number> = [];
-    let objectList: _.List<{ 'age': number }> = [];
+    let list: _.List<number> | null | undefined = [] as any;
+    let objectList: _.List<{ 'age': number }> | null | undefined = [] as any;
 
     let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
 
@@ -9043,8 +9294,9 @@ namespace TestExtendWith {
 // _.findKey
 namespace TestFindKey {
     {
+        let a: keyof undefined;
         let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: string;
+        let result: string | undefined;
 
         result = _.findKey<{a: string;}>({a: ''});
 
@@ -9065,7 +9317,7 @@ namespace TestFindKey {
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: string;
+        let result: string | undefined;
 
         result = _.findKey<string, {a: string;}>({a: ''}, predicateFn);
 
@@ -9074,7 +9326,7 @@ namespace TestFindKey {
 
     {
         let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _<{a: string;}>({a: ''}).chain().findKey();
 
@@ -9087,7 +9339,7 @@ namespace TestFindKey {
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _<{a: string;}>({a: ''}).chain().findKey<string>(predicateFn);
     }
@@ -9097,7 +9349,7 @@ namespace TestFindKey {
 namespace TestFindLastKey {
     {
         let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: string;
+        let result: string | undefined;
 
         result = _.findLastKey<{a: string;}>({a: ''});
 
@@ -9118,7 +9370,7 @@ namespace TestFindLastKey {
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: string;
+        let result: string | undefined;
 
         result = _.findLastKey<string, {a: string;}>({a: ''}, predicateFn);
 
@@ -9127,7 +9379,7 @@ namespace TestFindLastKey {
 
     {
         let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey();
 
@@ -9140,7 +9392,7 @@ namespace TestFindLastKey {
 
     {
         let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: _.LoDashExplicitWrapper<string>;
+        let result: _.LoDashExplicitWrapper<string | undefined>;
 
         result = _<{a: string;}>({a: ''}).chain().findLastKey<string>(predicateFn);
     }
@@ -9151,9 +9403,11 @@ namespace TestForIn {
     type SampleObject = {a: number; b: string; c: boolean;};
 
     let dictionary: _.Dictionary<number> = {};
+    let nilDictionary: _.Dictionary<number> | null | undefined = any;
     let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
 
     let object: SampleObject = { a: 1, b: "", c: true };
+    let nilObject: SampleObject | null | undefined = any;
     let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
 
     {
@@ -9163,6 +9417,13 @@ namespace TestForIn {
         result = _.forIn<number>(dictionary, dictionaryIterator);
     }
 
+    {
+        let result: _.Dictionary<number> | null | undefined;
+
+        result = _.forIn<number>(nilDictionary);
+        result = _.forIn<number>(nilDictionary, dictionaryIterator);
+    }
+
     {
         let result: SampleObject;
 
@@ -9170,6 +9431,13 @@ namespace TestForIn {
         result = _.forIn<SampleObject>(object, objectIterator);
     }
 
+    {
+        let result: SampleObject | null | undefined;
+
+        result = _.forIn<SampleObject | null | undefined>(nilObject);
+        result = _.forIn<SampleObject | null | undefined>(nilObject, objectIterator);
+    }
+
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
@@ -9177,12 +9445,26 @@ namespace TestForIn {
         result = _(dictionary).forIn<number>(dictionaryIterator);
     }
 
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).forIn<number>();
+        result = _(nilDictionary).forIn<number>(dictionaryIterator);
+    }
+
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
         result = _(dictionary).chain().forIn<number>();
         result = _(dictionary).chain().forIn<number>(dictionaryIterator);
     }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).chain().forIn<number>();
+        result = _(nilDictionary).chain().forIn<number>(dictionaryIterator);
+    }
 }
 
 // _.forInRight
@@ -9190,9 +9472,11 @@ namespace TestForInRight {
     type SampleObject = {a: number; b: string; c: boolean;};
 
     let dictionary: _.Dictionary<number> = {};
+    let nilDictionary: _.Dictionary<number> | null | undefined = any;
     let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
 
     let object: SampleObject = { a: 1, b: "", c: true };
+    let nilObject: SampleObject | null | undefined = any;
     let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
 
     {
@@ -9202,6 +9486,13 @@ namespace TestForInRight {
         result = _.forInRight<number>(dictionary, dictionaryIterator);
     }
 
+    {
+        let result: _.Dictionary<number> | null | undefined;
+
+        result = _.forInRight<number>(nilDictionary);
+        result = _.forInRight<number>(nilDictionary, dictionaryIterator);
+    }
+
     {
         let result: SampleObject;
 
@@ -9209,6 +9500,13 @@ namespace TestForInRight {
         result = _.forInRight<SampleObject>(object, objectIterator);
     }
 
+    {
+        let result: SampleObject | null | undefined;
+
+        result = _.forInRight<SampleObject | null | undefined>(nilObject);
+        result = _.forInRight<SampleObject | null | undefined>(nilObject, objectIterator);
+    }
+
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
@@ -9216,12 +9514,26 @@ namespace TestForInRight {
         result = _(dictionary).forInRight<number>(dictionaryIterator);
     }
 
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).forInRight<number>();
+        result = _(nilDictionary).forInRight<number>(dictionaryIterator);
+    }
+
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
         result = _(dictionary).chain().forInRight<number>();
         result = _(dictionary).chain().forInRight<number>(dictionaryIterator);
     }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).chain().forInRight<number>();
+        result = _(nilDictionary).chain().forInRight<number>(dictionaryIterator);
+    }
 }
 
 // _.forOwn
@@ -9229,9 +9541,11 @@ namespace TestForOwn {
     type SampleObject = {a: number; b: string; c: boolean;};
 
     let dictionary: _.Dictionary<number> = {};
+    let nilDictionary: _.Dictionary<number> | null | undefined = any;
     let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
 
     let object: SampleObject = { a: 1, b: "", c: true };
+    let nilObject: SampleObject | null | undefined = any;
     let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
 
     {
@@ -9241,6 +9555,13 @@ namespace TestForOwn {
         result = _.forOwn<number>(dictionary, dictionaryIterator);
     }
 
+    {
+        let result: _.Dictionary<number> | null | undefined;
+
+        result = _.forOwn<number>(nilDictionary);
+        result = _.forOwn<number>(nilDictionary, dictionaryIterator);
+    }
+
     {
         let result: SampleObject;
 
@@ -9248,6 +9569,13 @@ namespace TestForOwn {
         result = _.forOwn<SampleObject>(object, objectIterator);
     }
 
+    {
+        let result: SampleObject | null | undefined;
+
+        result = _.forOwn<SampleObject | null | undefined>(nilObject);
+        result = _.forOwn<SampleObject | null | undefined>(nilObject, objectIterator);
+    }
+
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
@@ -9255,12 +9583,26 @@ namespace TestForOwn {
         result = _(dictionary).forOwn<number>(dictionaryIterator);
     }
 
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).forOwn<number>();
+        result = _(nilDictionary).forOwn<number>(dictionaryIterator);
+    }
+
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
         result = _(dictionary).chain().forOwn<number>();
         result = _(dictionary).chain().forOwn<number>(dictionaryIterator);
     }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).chain().forOwn<number>();
+        result = _(nilDictionary).chain().forOwn<number>(dictionaryIterator);
+    }
 }
 
 // _.forOwnRight
@@ -9268,9 +9610,11 @@ namespace TestForOwnRight {
     type SampleObject = {a: number; b: string; c: boolean;};
 
     let dictionary: _.Dictionary<number> = {};
+    let nilDictionary: _.Dictionary<number> | null | undefined = any;
     let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
 
     let object: SampleObject = { a: 1, b: "", c: true };
+    let nilObject: SampleObject | null | undefined = any;
     let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
 
     {
@@ -9280,6 +9624,13 @@ namespace TestForOwnRight {
         result = _.forOwnRight<number>(dictionary, dictionaryIterator);
     }
 
+    {
+        let result: _.Dictionary<number> | null | undefined;
+
+        result = _.forOwnRight<number>(nilDictionary);
+        result = _.forOwnRight<number>(nilDictionary, dictionaryIterator);
+    }
+
     {
         let result: SampleObject;
 
@@ -9287,6 +9638,13 @@ namespace TestForOwnRight {
         result = _.forOwnRight<SampleObject>(object, objectIterator);
     }
 
+    {
+        let result: SampleObject | null | undefined;
+
+        result = _.forOwnRight<SampleObject | null | undefined>(nilObject);
+        result = _.forOwnRight<SampleObject | null | undefined>(nilObject, objectIterator);
+    }
+
     {
         let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
 
@@ -9294,12 +9652,26 @@ namespace TestForOwnRight {
         result = _(dictionary).forOwnRight<number>(dictionaryIterator);
     }
 
+    {
+        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).forOwnRight<number>();
+        result = _(nilDictionary).forOwnRight<number>(dictionaryIterator);
+    }
+
     {
         let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
 
         result = _(dictionary).chain().forOwnRight<number>();
         result = _(dictionary).chain().forOwnRight<number>(dictionaryIterator);
     }
+
+    {
+        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
+
+        result = _(nilDictionary).chain().forOwnRight<number>();
+        result = _(nilDictionary).chain().forOwnRight<number>(dictionaryIterator);
+    }
 }
 
 // _.functions
@@ -9623,7 +9995,7 @@ namespace TestInvertBy {
 
 // _.keys
 namespace TestKeys {
-    let object: _.Dictionary<any> = {};
+    let object: _.Dictionary<any> | null | undefined = any;
 
     {
         let result: string[];
@@ -9646,7 +10018,7 @@ namespace TestKeys {
 
 // _.keysIn
 namespace TestKeysIn {
-    let object: _.Dictionary<any> = {};
+    let object: _.Dictionary<any> | null | undefined = any;
 
     {
         let result: string[];
@@ -9669,9 +10041,9 @@ namespace TestKeysIn {
 
 // _.mapKeys
 namespace TestMapKeys {
-    let array: TResult[] = [];
-    let list: _.List<TResult> = [];
-    let dictionary: _.Dictionary<TResult> = {};
+    let array: TResult[] | null | undefined = [] as any;
+    let list: _.List<TResult>| null | undefined = [] as any;
+    let dictionary: _.Dictionary<TResult> | null | undefined = any;
 
     let listIterator = (value: TResult, index: number, collection: _.List<TResult>) => "";
     let dictionaryIterator = (value: TResult, key: string, collection: _.Dictionary<TResult>) => "";
@@ -9913,8 +10285,6 @@ namespace TestOmitBy {
 
 // _.pick
 namespace TestPick {
-    let predicate: (element: any, key: string, collection: any) => boolean;
-
     {
         let result: TResult;
 
diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index adb14ae209..e4c31c7f8d 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -11,6 +11,7 @@
 ************************************************/
 
 import * as core from "express-serve-static-core";
+import { NextFunction } from "express";
 
 declare function l(): l.LoopBackApplication;
 declare namespace l {
@@ -886,6 +887,18 @@ declare namespace l {
              * See  [Setting up a custom model](docs.strongloop.com/display/LB/Extending+built-in+models#Extendingbuilt-inmodels-Settingupacustommodel)
              */
             static setup(): void;
+
+            /**
+             * loopback 3.x Remote hooks
+             * http://loopback.io/doc/en/lb3/Remote-hooks.html
+             * @param method
+             * @param backback
+             */
+            beforeRemote(method: string, callback: (ctx: Context, modelInstanceOrNext: Model | NextFunction, next?: NextFunction) => void): void;
+
+            afterRemote(method: string, callback: (ctx: Context, modelInstanceOrNext: Model | NextFunction, next?: NextFunction) => void): void;
+
+            afterRemoteError(method: string, callback: NextFunction): void;
       }
 
       /**
diff --git a/types/magicsuggest/index.d.ts b/types/magicsuggest/index.d.ts
index 300201ed0d..9e3188c346 100644
--- a/types/magicsuggest/index.d.ts
+++ b/types/magicsuggest/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://nicolasbize.com/magicsuggest
 // Definitions by: Leonardo Chaia <http://github.com/leonardochaia>
 // Definitions: http://github.com/leonardochaia/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 interface JQuery {
diff --git a/types/mailcheck/index.d.ts b/types/mailcheck/index.d.ts
index ab85b6cf6d..d805705e64 100644
--- a/types/mailcheck/index.d.ts
+++ b/types/mailcheck/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mailcheck/mailcheck
 // Definitions by: Paulo Cesar <http://github.com/pocesar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 99c9854791..9438bfafac 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.35.1
+// Type definitions for Mapbox GL JS v0.38.0
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -57,10 +57,14 @@ declare namespace mapboxgl {
 
 		getStyle(): mapboxgl.Style;
 
+		isStyleLoaded(): boolean;
+
 		addSource(id: string, source: VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
 
 		isSourceLoaded(id: string): boolean;
 
+		areTilesLoaded(): boolean;
+
 		removeSource(id: string): this;
 
 		getSource(id: string): VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource;
@@ -252,7 +256,7 @@ declare namespace mapboxgl {
 		zoom?: number;
 	}
 
-	export class PaddingOptions extends Evented {
+	export interface PaddingOptions {
 		top: number;
 		bottom: number;
 		left: number;
@@ -513,7 +517,8 @@ declare namespace mapboxgl {
 	/**
 	 * VideoSource
 	 */
-	export class VideoSource implements Source, VideoSourceOptions {
+        export interface VideoSource extends VideoSourceOptions { }
+	export class VideoSource implements Source {
 		type: "video";
 
 		constructor(options?: mapboxgl.VideoSourceOptions);
@@ -532,7 +537,8 @@ declare namespace mapboxgl {
 	/**
 	 * ImageSource
 	 */
-	export class ImageSource implements Source, ImageSourceOptions {
+        export interface ImageSource extends ImageSourceOptions { }
+	export class ImageSource implements Source {
 		type: "image";
 
 		constructor(options?: mapboxgl.ImageSourceOptions);
@@ -598,8 +604,6 @@ declare namespace mapboxgl {
 		/** Return a new LngLat object whose longitude is wrapped to the range (-180, 180). */
 		wrap(): mapboxgl.LngLat;
 
-		wrapToBestWorld(center: mapboxgl.LngLat): mapboxgl.LngLat;
-
 		/** Return a LngLat as an array */
 		toArray(): number[];
 
@@ -686,19 +690,21 @@ declare namespace mapboxgl {
 
 		mag(): number;
 
-		equals(): boolean;
+		equals(p: Point): boolean;
 
-		dist(): number;
+		dist(p: Point): number;
 
-		distSqr(): number;
+		distSqr(p: Point): number;
 
 		angle(): number;
 
-		angleTo(): number;
+		angleTo(p: Point): number;
 
-		angleWidth(): number;
+		angleWidth(p: Point): number;
 
-		angleWidthSep(): number;
+		angleWithSep(x: number, y: number): number;
+		
+		convert(a: Array<number> | Point): Point;
 	}
 
 	export class Marker {
@@ -1036,7 +1042,7 @@ declare namespace mapboxgl {
 	export interface CirclePaint {
 		"circle-radius"?: number | StyleFunction;
 		"circle-radius-transition"?: Transition;
-		"circle-color"?: number | StyleFunction;
+		"circle-color"?: string;
 		"circle-blur"?: number | StyleFunction;
 		"circle-opacity"?: number | StyleFunction;
 		"circle-translate"?: number[];
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 9e7b715968..12fbac9010 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -51,7 +51,7 @@ map.on('load', function(){
 		}
 	});
 
-	var layers = [
+        var layers: [number, string][] = [
 		[150, '#f28cb1'],
 		[20, '#f1f075'],
 		[0, '#51bbd6']
@@ -369,4 +369,4 @@ let marker = new mapboxgl.Marker(null,{offset: [10, 0]})
 	.setLngLat([-50,50])
 	.addTo(map);
 
-marker.remove();
\ No newline at end of file
+marker.remove();
diff --git a/types/mariasql/mariasql-tests.ts b/types/mariasql/mariasql-tests.ts
index f29fc3f2d5..f8a795cc19 100644
--- a/types/mariasql/mariasql-tests.ts
+++ b/types/mariasql/mariasql-tests.ts
@@ -1,15 +1,13 @@
+declare var console: { log(x: any): void };
+declare var inspect: (x: any) => string;
+
 // These are the examples from the node-mariasql README transposed to TypeScript
 // https://github.com/mscdex/node-mariasql
 
-
-/// <reference types="node" />
-
 // Example 1 - SHOW DATABASES
-import util = require('util');
 import Client = require('mariasql');
 
-var c = new Client(),
-    inspect = util.inspect;
+var c = new Client();
 
 c.connect({
     host: '127.0.0.1',
diff --git a/types/markitup/index.d.ts b/types/markitup/index.d.ts
index d7884021a8..19a6d51514 100644
--- a/types/markitup/index.d.ts
+++ b/types/markitup/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/markitup/1.x
 // Definitions by: drillbits <https://github.com/drillbits>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
@@ -219,6 +220,9 @@ declare namespace MarkItUp {
          * Returns true if the Alt key is pressed when the callback is fired.
          */
         altKey?: boolean;
+
+        /** Not documented on the markitup site, but present in the tests */
+        separator?: string;
     }
 
     interface Static {
diff --git a/types/maskedinput/index.d.ts b/types/maskedinput/index.d.ts
index fdfe09cbc7..9e305c4eb0 100644
--- a/types/maskedinput/index.d.ts
+++ b/types/maskedinput/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://digitalbush.com/projects/masked-input-plugin
 // Definitions by: Lokesh Peta <https://github.com/lokeshpeta/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/masonry-layout/index.d.ts b/types/masonry-layout/index.d.ts
index 140dd7f257..212baa2471 100644
--- a/types/masonry-layout/index.d.ts
+++ b/types/masonry-layout/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/desandro/masonry
 // 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
 
 /// <reference types="jquery" />
 
diff --git a/types/masonry-layout/masonry-layout-tests.ts b/types/masonry-layout/masonry-layout-tests.ts
index 30378f356e..d21813a791 100644
--- a/types/masonry-layout/masonry-layout-tests.ts
+++ b/types/masonry-layout/masonry-layout-tests.ts
@@ -1,4 +1,3 @@
-import * as $ from "jquery";
 import Masonry = require("masonry-layout");
 
 // responsive layouts
diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index 512c9067e2..67be093bb0 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -1,105 +1,80 @@
-// Type definitions for massive-js 2.2
-// Project: https://github.com/robconery/massive-js
+// Type definitions for massive 3.0
+// Project: https://github.com/dmfay/massive-js.git
 // Definitions by: Pascal Birchler <https://github.com/swissspidy>
+//                 Clarence Ho <https://github.com/clarenceh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-export namespace massive {
-	interface ConnectionOptions {
-		connectionString?: string;
-		db?: string;
-	}
+/// <reference types="node" />
 
-	interface Doc {
-		findDoc(context: any, callback: ResultCallback): void;
-		searchDoc(
-			options: { keys: string[], term: string },
-			callback: ResultCallback): void;
-		saveDoc(context: string, callback: ResultCallback): void;
-		destroy(context: any, callback: ResultCallback): void;
-	}
+export = massive;
 
-	interface QueryFile {
-		schema: string;
-		name: string;
-		db: Massive;
-		delimitedName: string;
-		delimitedSchema: string;
-		fullname: string;
-		delimitedFullName: string;
-		sql: string;
-		filePath: string;
-	}
+declare function massive(
+  connection: massive.ConnectionInfo | string,
+  loaderConfig?: object,
+  driverConfig?: object): Promise<massive.Database>;
 
-	interface QueryFunction {
-		find(params: any|any[], callback: ResultCallback): void;
-	}
+declare namespace massive {
+  interface ConnectionInfo {
+    user?: string;
+    database?: string;
+    password?: string | null;
+    port?: number;
+    host?: string;
+    ssl?: boolean;
+    application_name?: string;
+    fallback_application_name?: boolean;
+  }
 
-	interface QueryArguments {
-		sql: string;
-		options: any;
-		params: any;
-		next: ResultCallback;
-	}
+  interface QueryOptions {
+    columns?: string[];
+    limit?: number;
+    offset?: number;
+    only?: boolean;
+    order?: string[];
+    orderBody?: boolean;
+    build?: boolean;
+    document?: boolean;
+    single?: boolean;
+    stream?: boolean;
+  }
+
+  interface SearchCriteria {
+    fields: string[];
+    term: string;
+  }
+
+  interface Table<T> {
+    find(criteria: object | {}, queryOptions?: QueryOptions): Promise<T[]>;
+    findOne(criteria: number | object, queryOptions?: QueryOptions): Promise<T>;
+    count(criteria: object): Promise<string>;
+    where(query: string, params: any[] | object): Promise<T[]>;
+    search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
+    save(data: object): Promise<T[]>;
+    insert(data: object): Promise<T[]>;
+    update(dataOrCriteria: object, changesMap?: object): Promise<T[]>;
+    destroy(criteria: object): Promise<T[]>;
+  }
+
+  interface Document {
+    countDoc(criteria: object): Promise<number>;
+    findDoc(criteria: number | string| object): Promise<object>;
+    searchDoc(criteria: SearchCriteria): Promise<object[]>;
+    saveDoc(doc: object): Promise<object>;
+    modify(docId: number | string, doc: object, fieldName?: string): Promise<object>;
+  }
+
+  interface Database {
+    attach(ctor: any, ...sources: any[]): Promise<any>;
+    detach(entity: string, collection: string): void;
+    reload(): void;
+    query(query: any, params: any, options: any): Promise<any>;
+    saveDoc(collectionName: string, doc: object): Promise<any>;
+    createDocumentTable(path: any): Promise<any>;
+    getObject(path: any, collection: any): object;
+    dropTable(table: string, options: any): void;
+    createSchema(schemaName: string): void;
+    dropSchema(schemaName: string, options: any): void;
+    run(query: string, params: any[] | object): Promise<object[]>;
+  }
 }
-
-export interface Massive {
-	custom: any;
-	comment: Table;
-	friendship: Table;
-	participation: Table;
-	person: Table;
-	practice: Table;
-	practicesession: Table;
-	sport: Table;
-	testdata(callback: ResultCallback): void;
-	team: Table;
-	teammember: Table;
-	teamsport: Table;
-	scriptsDir: string;
-	connectionString: string;
-	query(): void;
-	stream(): void;
-	executeSqlFile(args: any, next: ResultCallback): void;
-	end(): void;
-	tables: Array<massive.Doc|Table>;
-	views: any[];
-	queryFiles: massive.QueryFile[];
-	schemas: any[];
-	functions: any[];
-	allowedSchemas: string;
-	blacklist: string;
-	exceptions: string;
-	excludeFunctions: boolean;
-	functionBlacklist: string;
-}
-
-export type ResultCallback = (err: Error, res: any) => void;
-export type ConnectCallback = (err: Error, db: Massive) => void;
-
-export interface QueryOptions {
-	limit?: number;
-	order?: string;
-	offset?: number;
-	columns?: string[];
-}
-
-export interface Table {
-	count(context: any, callback: ResultCallback): void;
-	find(context: any, callback: ResultCallback): void;
-	find(context: any, options: QueryOptions, callback: ResultCallback): void;
-	findOne(context: any, callback: ResultCallback): void;
-	findOne(context: any, options: QueryOptions, callback: ResultCallback): void;
-	insert(context: any, callback: ResultCallback): void;
-	save(context: any, callback: ResultCallback): void;
-	update(context: any, callback: ResultCallback): void;
-	update(context: any, data: any, callback: ResultCallback): void;
-	destroy(context: any, callback: ResultCallback): void;
-}
-
-export function connectSync(options: massive.ConnectionOptions): Massive;
-
-export function connect(options: massive.ConnectionOptions, callback: ConnectCallback): void;
-
-export function run(context: string, filter: number|number[], callback: ResultCallback): void;
-
-export function saveDoc(name: string, data: any, callback: ResultCallback): void;
diff --git a/types/massive/massive-tests.ts b/types/massive/massive-tests.ts
index cb53e3e7c8..e43755b7f3 100644
--- a/types/massive/massive-tests.ts
+++ b/types/massive/massive-tests.ts
@@ -1,5 +1,10 @@
-import * as Massive from 'massive';
+import massive = require('massive');
 
-Massive.connect({connectionString: 'foo'}, (err: Error, db: Massive.Massive) => {});
+let dbconn: massive.Database;
 
-Massive.run('foo', 123, (err: Error, db: Massive.Massive) => {});
+massive('postgres://app:password@localhost:5432/app').then( db => {
+    console.log(`DB connected successfully`);
+    dbconn = db;
+}).catch(err => {
+    console.error(`Error connecting DB`);
+});
diff --git a/types/massive/tsconfig.json b/types/massive/tsconfig.json
index 7c91e19b44..cfa32399c8 100644
--- a/types/massive/tsconfig.json
+++ b/types/massive/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5"
+            "es2015"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -19,4 +19,4 @@
         "index.d.ts",
         "massive-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 832cdd04dd..a7b13f2bb4 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,8 +1,15 @@
 // Type definitions for material-ui v0.17.51
 // Project: https://github.com/callemall/material-ui
-// Definitions by: Nathan Brown <https://github.com/ngbrown>, Igor Belagorudsky <https://github.com/theigor>, Ali Taheri Moghaddar <https://github.com/alitaheri>, Oliver Herrmann <https://github.com/herrmanno>, Daniel Roth <https://github.com/DaIgeb>, Aurelién Allienne <https://github.com/allienna>
+// Definitions by: Nathan Brown <https://github.com/ngbrown>
+//                 Igor Beagorudsky <https://github.com/theigor>
+//                 Ali Taheri Moghaddar <https://github.com/alitaheri>
+//                 Oliver Herrmann <https://github.com/herrmanno>
+//                 Daniel Roth <https://github.com/DaIgeb>
+//                 Aurelién Allienne <https://github.com/allienna>
+//                 Matthias Schlesinger <https://github.com/schlesingermatthias>
+//                 Jonathon Kelly <https://github.com/InsidersByte>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 /// <reference types="react-addons-linked-state-mixin" />
@@ -102,7 +109,7 @@ declare namespace __MaterialUI {
     interface ThemeWrapperProps {
         theme: Styles.MuiTheme;
     }
-    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
+    export class ThemeWrapper extends React.Component<ThemeWrapperProps> {
     }
 
     export namespace Styles {
@@ -463,7 +470,7 @@ declare namespace __MaterialUI {
         interface MuiThemeProviderProps {
             muiTheme?: Styles.MuiTheme;
         }
-        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps, {}> {
+        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps> {
         }
 
         export function getMuiTheme(...muiTheme: MuiTheme[]): MuiTheme;
@@ -512,12 +519,12 @@ declare namespace __MaterialUI {
         titleStyle?: React.CSSProperties;
         zDepth?: number;
     }
-    export class AppBar extends React.Component<AppBarProps, {}> {
+    export class AppBar extends React.Component<AppBarProps> {
     }
 
     interface AppCanvasProps {
     }
-    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
+    export class AppCanvas extends React.Component<AppCanvasProps> {
     }
 
     namespace propTypes {
@@ -577,7 +584,7 @@ declare namespace __MaterialUI {
         targetOrigin?: propTypes.origin;
         textFieldStyle?: React.CSSProperties;
     }
-    export class AutoComplete extends React.Component<AutoCompleteProps<any>, {}> {
+    export class AutoComplete extends React.Component<AutoCompleteProps<any>> {
         static noFilter: () => boolean;
         static defaultFilter: (searchText: string, key: string) => boolean;
         static caseSensitiveFilter: (searchText: string, key: string) => boolean;
@@ -599,7 +606,7 @@ declare namespace __MaterialUI {
         src?: string;
         style?: React.CSSProperties;
     }
-    export class Avatar extends React.Component<AvatarProps, {}> {
+    export class Avatar extends React.Component<AvatarProps> {
     }
 
     interface BadgeProps {
@@ -610,7 +617,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class Badge extends React.Component<BadgeProps, {}> {
+    export class Badge extends React.Component<BadgeProps> {
     }
 
     interface BeforeAfterWrapperProps {
@@ -621,7 +628,7 @@ declare namespace __MaterialUI {
         elementType?: string;
         style?: React.CSSProperties;
     }
-    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
+    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps> {
     }
 
     // non generally overridden elements of EnhancedButton
@@ -655,7 +662,7 @@ declare namespace __MaterialUI {
         containerElement?: React.ReactNode | string;
         disabled?: boolean;
     }
-    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
+    export class EnhancedButton extends React.Component<EnhancedButtonProps> {
     }
 
     interface FlatButtonProps extends React.DOMAttributes<{}>, SharedEnhancedButtonProps<FlatButton> {
@@ -679,7 +686,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class FlatButton extends React.Component<FlatButtonProps, {}> {
+    export class FlatButton extends React.Component<FlatButtonProps> {
     }
 
     interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
@@ -709,7 +716,7 @@ declare namespace __MaterialUI {
         secondary?: boolean;
         style?: React.CSSProperties;
     }
-    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
+    export class RaisedButton extends React.Component<RaisedButtonProps> {
     }
 
     interface FloatingActionButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps<FloatingActionButton> {
@@ -731,7 +738,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         zDepth?: number;
     }
-    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
+    export class FloatingActionButton extends React.Component<FloatingActionButtonProps> {
     }
 
     interface IconButtonProps extends React.HTMLAttributes<{}>, SharedEnhancedButtonProps<IconButton> {
@@ -754,7 +761,7 @@ declare namespace __MaterialUI {
         tooltipStyles?: React.CSSProperties;
         touch?: boolean;
     }
-    export class IconButton extends React.Component<IconButtonProps, {}> {
+    export class IconButton extends React.Component<IconButtonProps> {
     }
 
     namespace BottomNavigation {
@@ -764,7 +771,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
         }
 
-        export class BottomNavigation extends React.Component<BottomNavigationProps, {}> { }
+        export class BottomNavigation extends React.Component<BottomNavigationProps> { }
 
         interface BottomNavigationItemProps extends SharedEnhancedButtonProps<BottomNavigationItem> {
             className?: string;
@@ -772,7 +779,7 @@ declare namespace __MaterialUI {
             label?: React.ReactNode;
         }
 
-        export class BottomNavigationItem extends React.Component<BottomNavigationItemProps, {}> { }
+        export class BottomNavigationItem extends React.Component<BottomNavigationItemProps> { }
     }
 
     namespace Card {
@@ -788,7 +795,7 @@ declare namespace __MaterialUI {
             showExpandableButton?: boolean;
             style?: React.CSSProperties;
         }
-        export class Card extends React.Component<CardProps, {}> {
+        export class Card extends React.Component<CardProps> {
         }
 
         interface CardActionsProps {
@@ -798,7 +805,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             className?: string;
         }
-        export class CardActions extends React.Component<CardActionsProps, {}> {
+        export class CardActions extends React.Component<CardActionsProps> {
         }
 
         interface CardExpandableProps {
@@ -806,7 +813,7 @@ declare namespace __MaterialUI {
             onExpanding?: (isExpanded: boolean) => void;
             style?: React.CSSProperties;
         }
-        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
+        export class CardExpandable extends React.Component<CardExpandableProps> {
         }
 
         interface CardHeaderProps {
@@ -825,8 +832,9 @@ declare namespace __MaterialUI {
             className?: string;
             openIcon?: React.ReactNode;
             closeIcon?: React.ReactNode;
+            iconStyle?: React.CSSProperties;
         }
-        export class CardHeader extends React.Component<CardHeaderProps, {}> {
+        export class CardHeader extends React.Component<CardHeaderProps> {
         }
 
         interface CardMediaProps {
@@ -839,7 +847,7 @@ declare namespace __MaterialUI {
             overlayStyle?: React.CSSProperties;
             style?: React.CSSProperties;
         }
-        export class CardMedia extends React.Component<CardMediaProps, {}> {
+        export class CardMedia extends React.Component<CardMediaProps> {
         }
 
         interface CardTextProps {
@@ -849,7 +857,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             className?: string;
         }
-        export class CardText extends React.Component<CardTextProps, {}> {
+        export class CardText extends React.Component<CardTextProps> {
         }
 
         interface CardTitleProps {
@@ -864,7 +872,7 @@ declare namespace __MaterialUI {
             titleColor?: string;
             titleStyle?: React.CSSProperties;
         }
-        export class CardTitle extends React.Component<CardTitleProps, {}> {
+        export class CardTitle extends React.Component<CardTitleProps> {
         }
     }
 
@@ -877,7 +885,7 @@ declare namespace __MaterialUI {
         onTouchTap?: React.TouchEventHandler<Chip>;
         style?: React.CSSProperties;
     }
-    export class Chip extends React.Component<ChipProps, {}> {
+    export class Chip extends React.Component<ChipProps> {
     }
 
     namespace DatePicker {
@@ -916,6 +924,7 @@ declare namespace __MaterialUI {
             floatingLabelStyle?: React.CSSProperties;
             floatingLabelText?: React.ReactNode;
             fullWidth?: boolean;
+            hideCalendarDate?: boolean;
             hintStyle?: React.CSSProperties;
             hintText?: React.ReactNode;
             id?: string;
@@ -932,7 +941,7 @@ declare namespace __MaterialUI {
             underlineStyle?: React.CSSProperties;
             utils?: propTypes.utils;
         }
-        export class DatePicker extends React.Component<DatePickerProps, {}> {
+        export class DatePicker extends React.Component<DatePickerProps> {
         }
 
         interface DatePickerDialogProps {
@@ -957,7 +966,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             utils?: propTypes.utils;
         }
-        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
+        export class DatePickerDialog extends React.Component<DatePickerDialogProps> {
             public show(): void;
             public dismiss(): void;
         }
@@ -995,7 +1004,7 @@ declare namespace __MaterialUI {
         titleClassName?: string;
         titleStyle?: React.CSSProperties;
     }
-    export class Dialog extends React.Component<DialogProps, {}> {
+    export class Dialog extends React.Component<DialogProps> {
     }
 
     interface DividerProps {
@@ -1003,7 +1012,7 @@ declare namespace __MaterialUI {
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Divider extends React.Component<DividerProps, {}> {
+    export class Divider extends React.Component<DividerProps> {
     }
 
     interface DrawerProps {
@@ -1022,7 +1031,7 @@ declare namespace __MaterialUI {
         width?: number | string;
         zDepth?: number;
     }
-    export class Drawer extends React.Component<DrawerProps, {}> {
+    export class Drawer extends React.Component<DrawerProps> {
     }
 
     namespace GridList {
@@ -1032,7 +1041,7 @@ declare namespace __MaterialUI {
             padding?: number;
             style?: React.CSSProperties;
         }
-        export class GridList extends React.Component<GridListProps, {}> {
+        export class GridList extends React.Component<GridListProps> {
         }
 
         interface GridTileProps {
@@ -1046,8 +1055,9 @@ declare namespace __MaterialUI {
             title?: React.ReactNode;
             titleBackground?: string;
             titlePosition?: "top" | "bottom";
+            onTouchTap?: TouchTapEventHandler;
         }
-        export class GridTile extends React.Component<GridTileProps, {}> {
+        export class GridTile extends React.Component<GridTileProps> {
         }
     }
 
@@ -1059,7 +1069,7 @@ declare namespace __MaterialUI {
         onMouseLeave?: React.MouseEventHandler<{}>;
         style?: React.CSSProperties;
     }
-    export class FontIcon extends React.Component<FontIconProps, {}> {
+    export class FontIcon extends React.Component<FontIconProps> {
     }
 
     interface SvgIconProps extends React.SVGAttributes<{}>, React.Props<SvgIcon> {
@@ -1071,7 +1081,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         viewBox?: string;
     }
-    export class SvgIcon extends React.Component<SvgIconProps, {}> {
+    export class SvgIcon extends React.Component<SvgIconProps> {
     }
 
     namespace List {
@@ -1079,7 +1089,7 @@ declare namespace __MaterialUI {
             // <Paper/> is the element that get the 'other' properties
             style?: React.CSSProperties;
         }
-        export class List extends React.Component<ListProps, {}> {
+        export class List extends React.Component<ListProps> {
         }
 
         interface ListItemProps extends EnhancedButtonProps {
@@ -1087,6 +1097,7 @@ declare namespace __MaterialUI {
             autoGenerateNestedIndicator?: boolean;
             disableKeyboardFocus?: boolean;
             disabled?: boolean;
+            hoverColor?: string;
             initiallyOpen?: boolean;
             innerDivStyle?: React.CSSProperties;
             insetChildren?: boolean;
@@ -1113,7 +1124,7 @@ declare namespace __MaterialUI {
             secondaryTextLines?: number; // 1 or 2
             style?: React.CSSProperties;
         }
-        export class ListItem extends React.Component<ListItemProps, {}> {
+        export class ListItem extends React.Component<ListItemProps> {
         }
 
         interface SelectableProps {
@@ -1146,7 +1157,7 @@ declare namespace __MaterialUI {
             valueLink?: ReactLink<any | any[]>;
             width?: string | number;
         }
-        export class Menu extends React.Component<MenuProps, {}> {
+        export class Menu extends React.Component<MenuProps> {
         }
 
         interface MenuItemProps extends List.ListItemProps {
@@ -1168,7 +1179,7 @@ declare namespace __MaterialUI {
             value?: any;
             containerElement?: React.ReactNode | string;
         }
-        export class MenuItem extends React.Component<MenuItemProps, {}> {
+        export class MenuItem extends React.Component<MenuItemProps> {
         }
 
         interface IconMenuProps {
@@ -1206,7 +1217,7 @@ declare namespace __MaterialUI {
             valueLink?: ReactLink<any | any[]>;
             width?: string | number;
         }
-        export class IconMenu extends React.Component<IconMenuProps, {}> {
+        export class IconMenu extends React.Component<IconMenuProps> {
         }
 
         interface DropDownMenuProps {
@@ -1222,12 +1233,13 @@ declare namespace __MaterialUI {
             maxHeight?: number;
             menuStyle?: React.CSSProperties;
             onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
+            onClose?: (e: TouchTapEvent) => void;
             openImmediately?: boolean;
             style?: React.CSSProperties;
             underlineStyle?: React.CSSProperties;
             value?: any;
         }
-        export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
+        export class DropDownMenu extends React.Component<DropDownMenuProps> {
         }
     }
 
@@ -1238,7 +1250,7 @@ declare namespace __MaterialUI {
         onClick?: React.MouseEventHandler<{}>;
         onTouchTap?: TouchTapEventHandler;
     }
-    export class Overlay extends React.Component<OverlayProps, {}> {
+    export class Overlay extends React.Component<OverlayProps> {
     }
 
     interface PaperProps extends React.HTMLAttributes<{}>, React.Props<Paper> {
@@ -1248,7 +1260,7 @@ declare namespace __MaterialUI {
         transitionEnabled?: boolean;
         zDepth?: number;
     }
-    export class Paper extends React.Component<PaperProps, {}> {
+    export class Paper extends React.Component<PaperProps> {
     }
 
     namespace Popover {
@@ -1272,7 +1284,7 @@ declare namespace __MaterialUI {
             useLayerForClickAway?: boolean;
             zDepth?: number;
         }
-        export class Popover extends React.Component<PopoverProps, {}> {
+        export class Popover extends React.Component<PopoverProps> {
         }
 
         interface PopoverAnimationVerticalProps extends PopoverAnimationProps {
@@ -1280,7 +1292,7 @@ declare namespace __MaterialUI {
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps, {}> {
+        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps> {
         }
 
         interface PopoverAnimationDefaultProps extends PopoverAnimationProps {
@@ -1288,7 +1300,7 @@ declare namespace __MaterialUI {
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps, {}> {
+        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps> {
         }
     }
 
@@ -1303,7 +1315,7 @@ declare namespace __MaterialUI {
         thickness?: number;
         value?: number;
     }
-    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
+    export class CircularProgress extends React.Component<CircularProgressProps> {
     }
 
     interface LinearProgressProps {
@@ -1314,7 +1326,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         value?: number;
     }
-    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
+    export class LinearProgress extends React.Component<LinearProgressProps> {
     }
 
     interface RefreshIndicatorProps {
@@ -1327,7 +1339,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         top: number;
     }
-    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
+    export class RefreshIndicator extends React.Component<RefreshIndicatorProps> {
     }
 
     interface SelectFieldProps {
@@ -1366,7 +1378,7 @@ declare namespace __MaterialUI {
         selectedMenuItemStyle?: React.CSSProperties;
         openImmediately?: boolean;
     }
-    export class SelectField extends React.Component<SelectFieldProps, {}> {
+    export class SelectField extends React.Component<SelectFieldProps> {
     }
 
     interface SliderProps {
@@ -1390,7 +1402,7 @@ declare namespace __MaterialUI {
         style?: React.CSSProperties;
         value?: number;
     }
-    export class Slider extends React.Component<SliderProps, {}> {
+    export class Slider extends React.Component<SliderProps> {
     }
 
     namespace Switches {
@@ -1433,7 +1445,7 @@ declare namespace __MaterialUI {
             trackStyle?: React.CSSProperties;
             value?: string;
         }
-        export class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {
+        export class EnhancedSwitch extends React.Component<EnhancedSwitchProps> {
             getValue(): string;
             isKeyboardFocused(): boolean;
             isSwitched(): boolean;
@@ -1454,7 +1466,7 @@ declare namespace __MaterialUI {
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             valueLink?: ReactLink<boolean>;
         }
-        export class Checkbox extends React.Component<CheckboxProps, {}> {
+        export class Checkbox extends React.Component<CheckboxProps> {
             /** @deprecated Use checked property instead */
             isChecked(): void;
 
@@ -1474,7 +1486,7 @@ declare namespace __MaterialUI {
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             value?: any;
         }
-        export class RadioButton extends React.Component<RadioButtonProps, {}> {
+        export class RadioButton extends React.Component<RadioButtonProps> {
             isChecked(): boolean;
 
             getValue(): string;
@@ -1489,7 +1501,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             valueSelected?: any;
         }
-        export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
+        export class RadioButtonGroup extends React.Component<RadioButtonGroupProps> {
             clearValue(): void;
 
             getSelectedValue(): string;
@@ -1517,7 +1529,7 @@ declare namespace __MaterialUI {
             trackStyle?: React.CSSProperties;
             valueLink?: ReactLink<boolean>;
         }
-        export class Toggle extends React.Component<ToggleProps, {}> {
+        export class Toggle extends React.Component<ToggleProps> {
             isToggled(): boolean;
 
             setToggled(newToggledValue: boolean): void;
@@ -1536,7 +1548,7 @@ declare namespace __MaterialUI {
         open: boolean;
         style?: React.CSSProperties;
     }
-    export class Snackbar extends React.Component<SnackbarProps, {}> {
+    export class Snackbar extends React.Component<SnackbarProps> {
     }
 
     namespace Stepper {
@@ -1546,7 +1558,7 @@ declare namespace __MaterialUI {
             disabled?: boolean;
             style?: React.CSSProperties;
         }
-        export class Step extends React.Component<StepProps, {}> {
+        export class Step extends React.Component<StepProps> {
         }
 
         interface StepButtonProps extends SharedEnhancedButtonProps<StepButton> {
@@ -1559,7 +1571,7 @@ declare namespace __MaterialUI {
             onTouchStart?: React.TouchEventHandler<{}>;
             style?: React.CSSProperties;
         }
-        export class StepButton extends React.Component<StepButtonProps, {}> {
+        export class StepButton extends React.Component<StepButtonProps> {
         }
 
         interface StepContentProps {
@@ -1567,7 +1579,7 @@ declare namespace __MaterialUI {
             last?: boolean;
             style?: React.CSSProperties;
         }
-        export class StepContent extends React.Component<StepContentProps, {}> {
+        export class StepContent extends React.Component<StepContentProps> {
         }
 
         interface StepLabelProps {
@@ -1578,7 +1590,7 @@ declare namespace __MaterialUI {
             iconContainerStyle?: React.CSSProperties;
             style?: React.CSSProperties;
         }
-        export class StepLabel extends React.Component<StepLabelProps, {}> {
+        export class StepLabel extends React.Component<StepLabelProps> {
         }
 
         interface SnackbarProps extends React.Props<Snackbar> {
@@ -1604,7 +1616,7 @@ declare namespace __MaterialUI {
             orientation?: "horizontal" | "vertical";
             style?: React.CSSProperties;
         }
-        export class Stepper extends React.Component<StepperProps, {}> {
+        export class Stepper extends React.Component<StepperProps> {
         }
     }
 
@@ -1612,7 +1624,7 @@ declare namespace __MaterialUI {
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Subheader extends React.Component<SubheaderProps, {}> {
+    export class Subheader extends React.Component<SubheaderProps> {
     }
 
     namespace Table {
@@ -1636,7 +1648,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             wrapperStyle?: React.CSSProperties;
         }
-        export class Table extends React.Component<TableProps, {}> {
+        export class Table extends React.Component<TableProps> {
         }
 
         interface TableRowProps {
@@ -1663,7 +1675,7 @@ declare namespace __MaterialUI {
             striped?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableRow extends React.Component<TableRowProps, {}> {
+        export class TableRow extends React.Component<TableRowProps> {
         }
 
         interface TableRowColumnProps {
@@ -1683,7 +1695,7 @@ declare namespace __MaterialUI {
             // useful attributes passed to <td/>
             colSpan?: number;
         }
-        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
+        export class TableRowColumn extends React.Component<TableRowColumnProps> {
         }
 
         interface TableHeaderProps {
@@ -1697,7 +1709,7 @@ declare namespace __MaterialUI {
             selectAllSelected?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableHeader extends React.Component<TableHeaderProps, {}> {
+        export class TableHeader extends React.Component<TableHeaderProps> {
         }
 
         interface TableHeaderColumnProps {
@@ -1713,7 +1725,7 @@ declare namespace __MaterialUI {
             // useful attributes passed to <th/>
             colSpan?: number;
         }
-        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
+        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps> {
         }
 
         interface TableBodyProps {
@@ -1743,7 +1755,7 @@ declare namespace __MaterialUI {
             stripedRows?: boolean;
             style?: React.CSSProperties;
         }
-        export class TableBody extends React.Component<TableBodyProps, {}> {
+        export class TableBody extends React.Component<TableBodyProps> {
         }
 
         interface TableFooterProps {
@@ -1752,7 +1764,7 @@ declare namespace __MaterialUI {
             className?: string;
             style?: React.CSSProperties;
         }
-        export class TableFooter extends React.Component<TableFooterProps, {}> {
+        export class TableFooter extends React.Component<TableFooterProps> {
         }
     }
 
@@ -1770,7 +1782,7 @@ declare namespace __MaterialUI {
             tabTemplateStyle?: React.CSSProperties;
             value?: any;
         }
-        export class Tabs extends React.Component<TabsProps, {}> {
+        export class Tabs extends React.Component<TabsProps> {
         }
 
         interface TabProps extends SharedEnhancedButtonProps<Tab> {
@@ -1812,6 +1824,7 @@ declare namespace __MaterialUI {
         onKeyDown?: React.KeyboardEventHandler<{}>;
         onKeyUp?: React.KeyboardEventHandler<{}>;
         onKeyPress?: React.KeyboardEventHandler<{}>;
+        required?: boolean;
         rows?: number,
         rowsMax?: number,
         style?: React.CSSProperties;
@@ -1826,8 +1839,9 @@ declare namespace __MaterialUI {
         min?: number;
         max?: number;
         step?: number;
+        autoComplete?: string;
     }
-    export class TextField extends React.Component<TextFieldProps, {}> {
+    export class TextField extends React.Component<TextFieldProps> {
         blur(): void;
 
         focus(): void;
@@ -1848,6 +1862,7 @@ declare namespace __MaterialUI {
         dialogStyle?: React.CSSProperties;
         disabled?: boolean;
         format?: "ampm" | "24hr";
+        minutesStep?: number;
         okLabel?: React.ReactNode;
         onChange?: (e: any, time: Date) => void;
         onDismiss?: () => void;
@@ -1886,7 +1901,7 @@ declare namespace __MaterialUI {
         underlineShow?: boolean;
         underlineStyle?: React.CSSProperties;
     }
-    export class TimePicker extends React.Component<TimePickerProps, {}> {
+    export class TimePicker extends React.Component<TimePickerProps> {
         focus(): void;
 
         openDialog(): void;
@@ -1898,7 +1913,7 @@ declare namespace __MaterialUI {
             noGutter?: boolean;
             style?: React.CSSProperties;
         }
-        export class Toolbar extends React.Component<ToolbarProps, {}> {
+        export class Toolbar extends React.Component<ToolbarProps> {
         }
 
         interface ToolbarGroupProps {
@@ -1908,14 +1923,14 @@ declare namespace __MaterialUI {
             lastChild?: boolean;
             style?: React.CSSProperties;
         }
-        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
+        export class ToolbarGroup extends React.Component<ToolbarGroupProps> {
         }
 
         interface ToolbarSeparatorProps {
             className?: string;
             style?: React.CSSProperties;
         }
-        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
+        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps> {
         }
 
         interface ToolbarTitleProps extends React.HTMLAttributes<{}>, React.Props<ToolbarTitle> {
@@ -1923,7 +1938,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             text?: string;
         }
-        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
+        export class ToolbarTitle extends React.Component<ToolbarTitleProps> {
         }
     }
 
@@ -8572,14 +8587,14 @@ declare module "material-ui/svg-icons" {
 
 declare module 'material-ui/internal/AppCanvas' {
     interface AppCanvasProps extends React.Props<AppCanvas> { }
-    class AppCanvas extends React.Component<AppCanvasProps, {}> { }
+    class AppCanvas extends React.Component<AppCanvasProps> { }
     export default AppCanvas;
 }
 declare module 'material-ui/internal/AutoLockScrolling' {
     interface AutoLockScrollingProps extends React.Props<AutoLockScrolling> {
         lock: boolean;
     }
-    class AutoLockScrolling extends React.Component<AutoLockScrollingProps, {}> { }
+    class AutoLockScrolling extends React.Component<AutoLockScrollingProps> { }
     export default AutoLockScrolling;
 }
 declare module 'material-ui/internal/BeforeAfterWrapper' {
@@ -8591,7 +8606,7 @@ declare module 'material-ui/internal/BeforeAfterWrapper' {
         elementType?: string,
         style?: React.CSSProperties,
     }
-    class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> { }
+    class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps> { }
     export default BeforeAfterWrapper;
 }
 declare module 'material-ui/internal/CircleRipple' {
@@ -8601,33 +8616,33 @@ declare module 'material-ui/internal/CircleRipple' {
         opacity?: number;
         style?: React.CSSProperties;
     }
-    class CircleRipple extends React.Component<CircleRippleProps, {}> { }
+    class CircleRipple extends React.Component<CircleRippleProps> { }
     export default CircleRipple;
 }
 declare module 'material-ui/internal/ClearFix' {
     interface ClearFixProps extends React.Props<ClearFix> {
         style?: React.CSSProperties;
     }
-    class ClearFix extends React.Component<ClearFixProps, {}> { }
+    class ClearFix extends React.Component<ClearFixProps> { }
     export default ClearFix;
 }
 declare module 'material-ui/internal/ClickAwayListener' {
     interface ClickAwayListenerProps extends React.Props<ClickAwayListener> {
         onClickAway?: any,
     }
-    class ClickAwayListener extends React.Component<ClickAwayListenerProps, {}> { }
+    class ClickAwayListener extends React.Component<ClickAwayListenerProps> { }
     export default ClickAwayListener;
 }
 declare module 'material-ui/internal/EnhancedButton' {
     interface EnhancedButtonProps extends __MaterialUI.SharedEnhancedButtonProps<EnhancedButton> {
     }
-    class EnhancedButton extends React.Component<EnhancedButtonProps, {}> { }
+    class EnhancedButton extends React.Component<EnhancedButtonProps> { }
     export default EnhancedButton;
 }
 declare module 'material-ui/internal/EnhancedSwitch' {
     interface EnhancedSwitchProps extends __MaterialUI.Switches.CommonEnhancedSwitchProps<EnhancedSwitch> {
     }
-    class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> { }
+    class EnhancedSwitch extends React.Component<EnhancedSwitchProps> { }
     export default EnhancedSwitch;
 }
 declare module 'material-ui/internal/ExpandTransition' {
@@ -8639,7 +8654,7 @@ declare module 'material-ui/internal/ExpandTransition' {
         transitionDelay?: number;
         transitionDuration?: number;
     }
-    class ExpandTransition extends React.Component<ExpandTransitionProps, {}> { }
+    class ExpandTransition extends React.Component<ExpandTransitionProps> { }
     export default ExpandTransition;
 }
 declare module 'material-ui/internal/ExpandTransitionChild' {
@@ -8649,7 +8664,7 @@ declare module 'material-ui/internal/ExpandTransitionChild' {
         transitionDelay?: number;
         transitionDuration?: number;
     }
-    class ExpandTransitionChild extends React.Component<ExpandTransitionChildProps, {}> { }
+    class ExpandTransitionChild extends React.Component<ExpandTransitionChildProps> { }
     export default ExpandTransitionChild;
 }
 declare module 'material-ui/internal/FocusRipple' {
@@ -8660,7 +8675,7 @@ declare module 'material-ui/internal/FocusRipple' {
         show?: boolean,
         style?: React.CSSProperties
     }
-    class FocusRipple extends React.Component<FocusRippleProps, {}> { }
+    class FocusRipple extends React.Component<FocusRippleProps> { }
     export default FocusRipple;
 }
 declare module 'material-ui/internal/Overlay' {
@@ -8672,7 +8687,7 @@ declare module 'material-ui/internal/Overlay' {
         onClick?: React.MouseEventHandler<{}>;
         onTouchTap?: __MaterialUI.TouchTapEventHandler;
     }
-    class Overlay extends React.Component<OverlayProps, {}> { }
+    class Overlay extends React.Component<OverlayProps> { }
     export default Overlay;
 }
 declare module 'material-ui/internal/RenderToLayer' {
@@ -8682,7 +8697,7 @@ declare module 'material-ui/internal/RenderToLayer' {
         render: Function;
         useLayerForClickAway?: boolean;
     }
-    class RenderToLayer extends React.Component<RenderToLayerProps, {}> { }
+    class RenderToLayer extends React.Component<RenderToLayerProps> { }
     export default RenderToLayer;
 }
 declare module 'material-ui/internal/ScaleIn' {
@@ -8692,7 +8707,7 @@ declare module 'material-ui/internal/ScaleIn' {
         maxScale?: number;
         minScale?: number;
     }
-    class ScaleIn extends React.Component<ScaleInProps, {}> { }
+    class ScaleIn extends React.Component<ScaleInProps> { }
     export default ScaleIn;
 }
 declare module 'material-ui/internal/ScaleInChild' {
@@ -8702,7 +8717,7 @@ declare module 'material-ui/internal/ScaleInChild' {
         minScale?: number;
         style?: React.CSSProperties;
     }
-    class ScaleInChild extends React.Component<ScaleInChildProps, {}> { }
+    class ScaleInChild extends React.Component<ScaleInChildProps> { }
     export default ScaleInChild;
 }
 declare module 'material-ui/internal/SlideIn' {
@@ -8712,7 +8727,7 @@ declare module 'material-ui/internal/SlideIn' {
         enterDelay?: number;
         style?: React.CSSProperties;
     }
-    class SlideIn extends React.Component<SlideInProps, {}> { }
+    class SlideIn extends React.Component<SlideInProps> { }
     export default SlideIn;
 }
 declare module 'material-ui/internal/SlideInChild' {
@@ -8722,7 +8737,7 @@ declare module 'material-ui/internal/SlideInChild' {
         getLeaveDirection: Function;
         style?: React.CSSProperties;
     }
-    class SlideInChild extends React.Component<SlideInChildProps, {}> { }
+    class SlideInChild extends React.Component<SlideInChildProps> { }
     export default SlideInChild;
 }
 declare module 'material-ui/internal/Tooltip' {
@@ -8735,7 +8750,7 @@ declare module 'material-ui/internal/Tooltip' {
         touch?: boolean;
         verticalPosition?: __MaterialUI.propTypes.vertical;
     }
-    class Tooltip extends React.Component<TooltipProps, {}> { }
+    class Tooltip extends React.Component<TooltipProps> { }
     export default Tooltip;
 }
 declare module 'material-ui/internal/TouchRipple' {
@@ -8746,6 +8761,6 @@ declare module 'material-ui/internal/TouchRipple' {
         opacity?: number;
         style?: React.CSSProperties
     }
-    class TouchRipple extends React.Component<TouchRippleProps, {}> { }
+    class TouchRipple extends React.Component<TouchRippleProps> { }
     export default TouchRipple;
 }
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index d81155dfcc..506d70bce8 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -305,7 +305,7 @@ const lightBaseTheme = {
 const lightMuiTheme = getMuiTheme(lightBaseTheme);
 
 
-class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}, {}> {
+class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}> {
   static propTypes: React.ValidationMap<any> = {
     muiTheme: React.PropTypes.object.isRequired,
   };
@@ -319,8 +319,8 @@ class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}, {}> {
   }
 }
 
-
-const MuiThemeableFunction = muiThemeable()((props: {label: string, muiTheme?: MuiTheme}) => {
+type Props = { label: string, muiTheme?: MuiTheme };
+const MuiThemeableFunction = muiThemeable()<React.StatelessComponent<Props>, Props>(props => {
   return (
       <span style={{color: props.muiTheme.palette.textColor}}>
         Applied the Theme to functional component: {props.label}.
@@ -329,7 +329,7 @@ const MuiThemeableFunction = muiThemeable()((props: {label: string, muiTheme?: M
 });
 
 @muiThemeable()
-class MuiThemeableClass extends React.Component<{label: string} & {muiTheme?: MuiTheme}, {}> {
+class MuiThemeableClass extends React.Component<{label: string} & {muiTheme?: MuiTheme}> {
   render() {
     return (
       <span style={{color: this.props.muiTheme.palette.textColor}}>
@@ -1075,7 +1075,7 @@ const ChipExampleSimple = () => (
   </div>
 );
 
-class ChipExampleComplex extends React.Component<{}, {}> {
+class ChipExampleComplex extends React.Component {
   handleRequestDelete = () => {
     alert('You clicked the delete button.');
   }
@@ -4854,6 +4854,11 @@ const TextFieldExampleSimple = () => (
       min={5}
       max={50}
       step={5}
+    /><br />
+    <TextField
+        hintText="Hint Text"
+        errorText="This field is required"
+        required
     />
   </div>
 );
diff --git a/types/materialize-css/index.d.ts b/types/materialize-css/index.d.ts
index 8b4c610e13..18a5ac1feb 100644
--- a/types/materialize-css/index.d.ts
+++ b/types/materialize-css/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://materializecss.com/
 // Definitions by: Erik Lieben <https://github.com/eriklieben>, Leon Yu <https://github.com/leonyu>, Sukhdeep Singh <https://github.com/SinghSukhdeep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference types="pickadate" />
@@ -316,8 +317,9 @@ declare namespace Materialize {
          * The string function call that you want to make when the user scrolls to the threshold.
          * It will only be called once.
          * Example: 'console.log("hello, world!")';
+         * or callback: () => { console.log('hello world'); }
          */
-        callback?: Function;
+        callback?: string | (() => void);
     }
 
     interface TabOptions {
@@ -393,7 +395,7 @@ declare namespace Materialize {
          *
          * @name options optional parameter with scroll fire options
          */
-        scrollFire(options?: ScrollFireOptions): void;
+        scrollFire(options?: ScrollFireOptions[]): void;
 
         /**
          * A staggered reveal effect for any UL Tag with list items
diff --git a/types/materialize-css/materialize-css-tests.ts b/types/materialize-css/materialize-css-tests.ts
index 9c7d7d1ea2..275edb38af 100644
--- a/types/materialize-css/materialize-css-tests.ts
+++ b/types/materialize-css/materialize-css-tests.ts
@@ -199,7 +199,7 @@ var scrollSpyHtml = '<div class="row">' +
   '</ul>' +
   '</div>' +
   '</div>';
-$(scrollSpyHtml, ".scrollspy").scrollSpy();
+// $(scrollSpyHtml, ".scrollspy").scrollSpy();
 
 // Side-Nav
 var sideNavHtml = '<nav>' +
@@ -275,4 +275,4 @@ $('.chips-autocomplete').material_chip({
   }
 });
 
-let chipData: Materialize.ChipDataObject | Materialize.ChipDataObject[] = $('.chips-initial').material_chip('data');
\ No newline at end of file
+let chipData: Materialize.ChipDataObject | Materialize.ChipDataObject[] = $('.chips-initial').material_chip('data');
diff --git a/types/mcustomscrollbar/index.d.ts b/types/mcustomscrollbar/index.d.ts
index 8952222642..9a5fa8df91 100644
--- a/types/mcustomscrollbar/index.d.ts
+++ b/types/mcustomscrollbar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/malihu/malihu-custom-scrollbar-plugin
 // Definitions by: Sarah Williams <https://github.com/flurg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/memcached/index.d.ts b/types/memcached/index.d.ts
index 3c46efe396..b6574a0dd4 100644
--- a/types/memcached/index.d.ts
+++ b/types/memcached/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-///<reference types="node" />
+/// <reference types="node" />
 
 import events = require("events");
 export = Memcached;
diff --git a/types/menubar/index.d.ts b/types/menubar/index.d.ts
index aa1187aeb1..82f9beb586 100644
--- a/types/menubar/index.d.ts
+++ b/types/menubar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/maxogden/menubar
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="electron" />
 /// <reference types="node" />
@@ -43,7 +44,7 @@ declare namespace Menubar {
 		showWindow(): void;
 		hideWindow(): void;
 	}
-	interface MenubarOptions extends Electron.BrowserWindowOptions {
+	interface MenubarOptions extends Electron.BrowserWindowConstructorOptions {
 		dir?: string;
 		index?: string;
 		tooltip?: string;
diff --git a/types/menubar/package.json b/types/menubar/package.json
new file mode 100644
index 0000000000..c30e03b53d
--- /dev/null
+++ b/types/menubar/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "electron": "^1.6.11"
+    }
+}
diff --git a/types/meteor/index.d.ts b/types/meteor/index.d.ts
index b33973f943..5f5963b164 100644
--- a/types/meteor/index.d.ts
+++ b/types/meteor/index.d.ts
@@ -1511,6 +1511,8 @@ declare module Mongo {
         new (hexString?: string): ObjectID;
     }
     interface ObjectID { }
+
+    function setConnectionOptions(options: any): void;
 }
 
 declare module "meteor/mongo" {
@@ -1620,6 +1622,8 @@ declare module "meteor/mongo" {
             new (hexString?: string): ObjectID;
         }
         interface ObjectID { }
+
+        function setConnectionOptions(options: any): void;
     }
 }
 
diff --git a/types/methods/index.d.ts b/types/methods/index.d.ts
new file mode 100644
index 0000000000..eb59911c82
--- /dev/null
+++ b/types/methods/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for methods 1.1
+// Project: https://github.com/jshttp/methods
+// Definitions by: Carlos Precioso <https://github.com/cprecioso>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const methods: string[];
+export = methods;
diff --git a/types/methods/methods-tests.ts b/types/methods/methods-tests.ts
new file mode 100644
index 0000000000..69fab6bd2e
--- /dev/null
+++ b/types/methods/methods-tests.ts
@@ -0,0 +1,5 @@
+import * as methods from "methods";
+
+methods
+    .slice(0)
+    .map(method => method.toUpperCase());
diff --git a/types/methods/tsconfig.json b/types/methods/tsconfig.json
new file mode 100644
index 0000000000..720595fa80
--- /dev/null
+++ b/types/methods/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "methods-tests.ts"
+    ]
+}
diff --git a/types/methods/tslint.json b/types/methods/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/methods/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/metismenu/index.d.ts b/types/metismenu/index.d.ts
index 8117328bf8..071e07f58c 100644
--- a/types/metismenu/index.d.ts
+++ b/types/metismenu/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://github.com/onokumus/metisMenu
 // Definitions by: onokums <https://github.com/onokumus/>, denis <https://github.com/denisname/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/mime/index.d.ts b/types/mime/index.d.ts
index 73a094492b..7debcca6f3 100644
--- a/types/mime/index.d.ts
+++ b/types/mime/index.d.ts
@@ -1,19 +1,20 @@
-// Type definitions for mime
+// Type definitions for mime 1.3
 // Project: https://github.com/broofa/node-mime
 // Definitions by: Jeff Goddard <https://github.com/jedigo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts
 
+export as namespace mime;
 
-export declare function lookup(path: string): string;
-export declare function extension(mime: string): string;
-export declare function load(filepath: string): void;
-export declare function define(mimes: Object): void;
+export function lookup(path: string, fallback?: string): string;
+export function extension(mime: string): string;
+export function load(filepath: string): void;
+export function define(mimes: { [key: string]: any }): void;
 
-interface Charsets {
+export interface Charsets {
     lookup(mime: string): string;
 }
 
-export declare var charsets: Charsets;
-export declare var default_type: string;
+export const charsets: Charsets;
+export const default_type: string;
diff --git a/types/mime/mime-tests.ts b/types/mime/mime-tests.ts
index abffa341f7..2eee9d9b12 100644
--- a/types/mime/mime-tests.ts
+++ b/types/mime/mime-tests.ts
@@ -1,10 +1,10 @@
-
 import * as mime from "mime";
 
-var str: string;
-var obj: Object;
+let str: string;
+const obj: {} = {};
+const fallback: string = '';
 
-str = mime.lookup(str);
+str = mime.lookup(str, fallback);
 str = mime.extension(str);
 mime.load(str);
 mime.define(obj);
diff --git a/types/mime/tslint.json b/types/mime/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mime/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mithril/index.d.ts b/types/mithril/index.d.ts
index 46fbb061ab..006e649d6e 100644
--- a/types/mithril/index.d.ts
+++ b/types/mithril/index.d.ts
@@ -44,6 +44,8 @@ declare namespace Mithril {
 		onbeforeupdate?(this: State, vnode: Vnode<Attrs, State>, old: VnodeDOM<Attrs, State>): boolean | void;
 		/** The onremove hook is called before a DOM element is removed from the document. */
 		onupdate?(this: State, vnode: VnodeDOM<Attrs, State>): any;
+		/** WORKAROUND: TypeScript 2.4 does not allow extending an interface with all-optional properties. */
+		[_: number]: any;
 	}
 
 	interface Hyperscript {
@@ -52,9 +54,9 @@ declare namespace Mithril {
 		/** Creates a virtual element (Vnode). */
 		(selector: string, attributes: Attributes, ...children: Children[]): Vnode<any, any>;
 		/** Creates a virtual element (Vnode). */
-		<Attrs, State>(component: ComponentTypes<Attrs, State>, attributes: Attrs & Lifecycle<Attrs, State> & { key?: string | number }, ...args: Children[]): Vnode<Attrs, State>;
-		/** Creates a virtual element (Vnode). */
 		<Attrs, State>(component: ComponentTypes<Attrs, State>, ...args: Children[]): Vnode<Attrs, State>;
+		/** Creates a virtual element (Vnode). */
+		<Attrs, State>(component: ComponentTypes<Attrs, State>, attributes: Attrs & Lifecycle<Attrs, State> & { key?: string | number }, ...args: Children[]): Vnode<Attrs, State>;
 		/** Creates a fragment virtual element (Vnode). */
 		fragment(attrs: Lifecycle<any, any> & { [key: string]: any }, children: ChildArrayOrPrimitive): Vnode<any, any>;
 		/** Turns an HTML string into a virtual element (Vnode). Do not use trust on unsanitized user input. */
diff --git a/types/mithril/test/test-component.ts b/types/mithril/test/test-component.ts
index 40fdfdfd5a..67e271329e 100644
--- a/types/mithril/test/test-component.ts
+++ b/types/mithril/test/test-component.ts
@@ -1,5 +1,6 @@
 import * as m from 'mithril';
-import {Component, Comp} from 'mithril';
+
+import {Comp, Component} from 'mithril';
 
 ///////////////////////////////////////////////////////////
 // 0.
@@ -45,6 +46,32 @@ const comp2: Component<Comp2Attrs, {}> = {
 	}
 };
 
+// Correct use
+m(comp2, {title: '', description: ''});
+
+// Correct use with lifecycle method
+m(comp2, {title: '', description: '', oncreate: (v) => v.attrs.title + '\n' + v.attrs.description});
+
+// Properties missing
+// $ExpectError
+m(comp2, {});
+
+// Property 'description' is missing in type '{ title: string; }'.
+// $ExpectError
+m(comp2, {title: ''});
+
+// Property 'title' is missing in type '{ description: string; }'.
+// $ExpectError
+m(comp2, {description: ''});
+
+// Type 'boolean' is not assignable to type 'string'.
+// $ExpectError
+m(comp2, {title: '', description: true});
+
+// Object literal may only specify known properties, and 'foo' does not exist in type 'Comp2Attrs & Lifecycle<Comp2Attrs, {}> & { key?: string | number | undefined; }'.
+// $ExpectError
+m(comp2, {title: '', description: '', foo: ''});
+
 ///////////////////////////////////////////////////////////
 // 3.
 // Declares attrs type inline.
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index b18a92212c..e3ca4e4aa6 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -59,7 +59,7 @@ route(document.body, '/', {
 			return h(component1);
 		}
 	},
-	'test3': {
+	test3: {
 		onmatch(args, path) {
 			return component2;
 		},
@@ -67,7 +67,7 @@ route(document.body, '/', {
 			return ['abc', 123, null, h(component2), ['nested', h('p', 123)]];
 		}
 	},
-	'test4': {
+	test4: {
 		onmatch(args, path) {
 			// Must provide a Promise type if we want type checking
 			return new Promise<Component<{title: string}, {}>>((resolve, reject) => {
diff --git a/types/mithril/tslint.json b/types/mithril/tslint.json
index 4f44991c3c..f60b65d69d 100644
--- a/types/mithril/tslint.json
+++ b/types/mithril/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        "object-literal-key-quotes": false,
         "no-empty-interface": false
     }
 }
diff --git a/types/mixpanel/index.d.ts b/types/mixpanel/index.d.ts
index 345f33bb46..ce1d31fb85 100644
--- a/types/mixpanel/index.d.ts
+++ b/types/mixpanel/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mixpanel
+// Type definitions for Mixpanel 2.11
 // Project: https://mixpanel.com/
 //          https://github.com/mixpanel/mixpanel-js
 // Definitions by: Knut Eirik Leira Hjelle <https://github.com/hjellek/>
@@ -24,6 +24,8 @@ interface Mixpanel
 
     register_once(params:{[index:string]:any}, defaultValue?:string, days?:number):void;
 
+    reset():void;
+
     unregister(propertyName:string):void;
 
     identify(id?:string):void;
diff --git a/types/mixpanel/mixpanel-tests.ts b/types/mixpanel/mixpanel-tests.ts
index f85406f3f8..d826478665 100644
--- a/types/mixpanel/mixpanel-tests.ts
+++ b/types/mixpanel/mixpanel-tests.ts
@@ -32,6 +32,8 @@ function mixpanel_base()
     mixpanel.get_config();
 
     mixpanel.get_property('device');
+
+    mixpanel.reset();
 }
 
 function mixpanel_people()
diff --git a/types/moment-duration-format/index.d.ts b/types/moment-duration-format/index.d.ts
index 76eb839cbd..402db8a75b 100644
--- a/types/moment-duration-format/index.d.ts
+++ b/types/moment-duration-format/index.d.ts
@@ -1,21 +1,55 @@
 // Type definitions for moment-duration-format 1.3
 // Project: https://github.com/jsmreese/moment-duration-format
-// Definitions by: Swint De Coninck <https://github.com/SwintDC>, Niklas Walter <https://github.com/TwoStone>
+// Definitions by: Swint De Coninck <https://github.com/SwintDC>, Niklas Walter <https://github.com/TwoStone>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as moment from "moment";
 
 declare module "moment" {
+    namespace duration {
+        const fn: Duration;
+    }
+
     interface Duration {
-        format(template: string, precision?: number, settings?: DurationFormatSettings): string;
-        format(template: string, settings?: DurationFormatSettings): string;
-        format(settings: DurationFormatSettings): string;
+        format: Format;
+    }
+
+    interface Format {
+        defaults: DurationFormatSettings;
+
+        (template: string | TemplateFunction, precision: number, settings?: DurationFormatSettings): string;
+        (template: string | TemplateFunction, settings?: DurationFormatSettings): string;
+        (settings?: DurationFormatSettings): string;
     }
 
     interface DurationFormatSettings {
-        template?: string;
+        escape?: RegExp;
+        years?: RegExp;
+        months?: RegExp;
+        weeks?: RegExp;
+        days?: RegExp;
+        hours?: RegExp;
+        minutes?: RegExp;
+        seconds?: RegExp;
+        milliseconds?: RegExp;
+        general?: RegExp;
+
+        types?: string;
+
+        // "left" - template tokens are trimmed from the left until the first moment token that has a value >= 1
+        // "right" - template tokens are trimmed from the right until the first moment token that has a value >= 1
+        // (the final moment token is not trimmed, regardless of value)
+        // `false` - template tokens are not trimmed
+        trim?: 'left' | 'right' | false;
+
+        // number of decimal digits to include after (to the right of) the decimal point (positive integer)
+        // or the number of digits to truncate to 0 before (to the left of) the decimal point (negative integer)
         precision?: number;
-        trim?: boolean | "right";
-        forceLength?: boolean;
+
+        // force first moment token with a value to render at full length even when template is trimmed and first moment token has length of 1
+        forceLength?: boolean | null;
+        template?: string | TemplateFunction;
     }
+
+    type TemplateFunction = ((this: DurationFormatSettings) => string);
 }
diff --git a/types/moment-duration-format/moment-duration-format-tests.ts b/types/moment-duration-format/moment-duration-format-tests.ts
new file mode 100644
index 0000000000..52f313b9b4
--- /dev/null
+++ b/types/moment-duration-format/moment-duration-format-tests.ts
@@ -0,0 +1,72 @@
+import * as moment from "moment";
+import 'moment-duration-format';
+
+moment.duration(123, "minutes").format();
+// "2:03:00"
+
+moment.duration(123, "months").format();
+// "10y 3m"
+
+moment.duration(123, "minutes").format("h:mm");
+// "2:03"
+
+moment.duration(123, "minutes").format("h [hrs], m [min]");
+// "2 hrs, 3 min"
+
+moment.duration(123, "minutes").format("h [hrs]");
+// "2 hrs"
+
+moment.duration(123, "minutes").format("h [hrs]", 2);
+// "2.04 hrs"
+
+moment.duration(123, "minutes").format("m [min]", -1);
+// "120 min"
+
+moment.duration(123, "minutes").format({ template: "h [hrs]", precision: 2 });
+// "2.04 hrs"
+
+moment.duration(123, "minutes").format("d[d] h:mm:ss");
+// "2:03:00"
+
+moment.duration(123, "minutes").format("d[d] h:mm:ss", { trim: false });
+// "0d 2:03:00"
+
+moment.duration(123, "minutes").format("[seconds:] s -- [minutes:] m -- [hours:] h -- [days:] d", { trim: "right" });
+// "seconds: 0 -- minutes: 3 -- hours: 2"
+
+moment.duration(123, "seconds").format("h:mm:ss");
+// "2:03"
+
+moment.duration(123, "seconds").format("hh:mm:ss");
+// "02:03"
+
+moment.duration(123, "seconds").format("h:mm:ss", { forceLength: true });
+// "02:03"
+
+moment.duration.fn.format.defaults.escape = /\((.+?)\)/;
+moment.duration(123, "seconds").format("m (minutes)", 2);
+// "2.04 minutes"
+
+moment.duration.fn.format.defaults.years = /[Aa]+/;
+moment.duration(123, "weeks").format("a [años]", 2);
+// "2.35 años"
+
+moment.duration.fn.format.defaults.months = /m+/;
+moment.duration(123, "weeks").format("m M", 2);
+// "28.36 M"
+
+moment.duration.fn.format.defaults.weeks = /w+/;
+moment.duration(123, "days").format("w W", 2);
+// "17.57 W"
+
+moment.duration.fn.format.defaults.days = /d+/;
+moment.duration(123, "hours").format("d D", 2);
+// "5.12 D"
+
+moment.duration.fn.format.defaults.hours = /h+/;
+moment.duration(123, "minutes").format("h H", 2);
+// "2.04 H"
+
+moment.duration.fn.format.defaults.minutes = /n+/;
+moment.duration(123, "seconds").format("n:ss");
+// "2:03"
diff --git a/types/moment-duration-format/tsconfig.json b/types/moment-duration-format/tsconfig.json
index 27e01ecd7b..07d419c2ea 100644
--- a/types/moment-duration-format/tsconfig.json
+++ b/types/moment-duration-format/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -16,6 +16,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "moment-duration-format-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/moment-range/index.d.ts b/types/moment-range/index.d.ts
index d6c3bde7b2..eb9bb30910 100644
--- a/types/moment-range/index.d.ts
+++ b/types/moment-range/index.d.ts
@@ -1,104 +1,67 @@
 // Type definitions for Moment-range.js 3.0
 // Project: https://github.com/gf3/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>
+// Definitions by: Bart van den Burg <https://github.com/Burgov>
+//                 Wilgert Velinga <https://github.com/wilgert>
+//                 Juan Francisco Adame <https://github.com/franjuan>
+//                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as moment from 'moment';
 
-export = moment;
+export class DateRange {
+    start: moment.Moment;
+    end: moment.Moment;
 
-declare module 'moment' {
-    class DateRange implements Range {
-        start: Moment;
-        end: Moment;
+    constructor(range: string | Date[] | moment.Moment[]);
+    constructor(start: Date | moment.Moment, end: Date | moment.Moment);
 
-        constructor(range: string | Date[] | Moment[]);
-        constructor(start: Date | Moment, end: Date | Moment);
+    contains(other: DateRange | moment.Moment | Date, options?: { exclusive?: boolean }): boolean;
 
-        contains(other: DateRange | Moment | Date, options?: { exclusive?: boolean }): boolean;
+    overlaps(range: DateRange, options?: { adjacent?: boolean }): boolean;
 
-        overlaps(range: DateRange, options?: { adjacent?: boolean }): boolean;
+    intersect(other: DateRange): DateRange;
 
-        intersect(other: DateRange): DateRange;
+    add(other: DateRange): DateRange;
 
-        add(other: DateRange): DateRange;
+    subtract(other: DateRange): DateRange[];
 
-        subtract(other: DateRange): DateRange[];
+    by(interval: moment.unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<moment.Moment>;
 
-        by(interval: unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
+    byRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<moment.Moment>;
 
-        byRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
+    isSame(other: DateRange): boolean;
 
-        isSame(other: DateRange): boolean;
+    diff(unit?: moment.unitOfTime.Diff, rounded?: boolean): number;
 
-        diff(unit?: unitOfTime.Diff, rounded?: boolean): number;
+    toDate(): Date[];
 
-        toDate(): Date[];
+    toString(): string;
 
-        toString(): string;
+    valueOf(): number;
 
-        valueOf(): number;
+    center(): moment.Moment;
 
-        center(): Moment;
+    clone(): DateRange;
 
-        clone(): DateRange;
+    isEqual(other: DateRange): boolean;
 
-        isEqual(other: DateRange): boolean;
+    adjacent(other: DateRange): boolean;
 
-        adjacent(other: DateRange): boolean;
+    duration(unit?: moment.unitOfTime.Diff, precise?: boolean): number;
 
-        duration(unit?: unitOfTime.Diff, precise?: boolean): number;
+    reverseBy(interval: moment.unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<moment.Moment>;
 
-        reverseBy(interval: unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-
-        reverseByRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-    }
-
-    interface Range {
-        start: Moment;
-        end: Moment;
-
-        contains(other: DateRange | Moment | Date, options?: { exclusive?: boolean }): boolean;
-
-        overlaps(range: DateRange, options?: { adjacent?: boolean }): boolean;
-
-        intersect(other: DateRange): DateRange;
-
-        add(other: DateRange): DateRange;
-
-        subtract(other: DateRange): DateRange[];
-
-        by(interval: unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-
-        byRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-
-        isSame(other: DateRange): boolean;
-
-        diff(unit?: unitOfTime.Diff, rounded?: boolean): number;
-
-        toDate(): Date[];
-
-        toString(): string;
-
-        valueOf(): number;
-
-        center(): Moment;
-
-        clone(): DateRange;
-
-        isEqual(other: DateRange): boolean;
-
-        adjacent(other: DateRange): boolean;
-
-        duration(unit?: unitOfTime.Diff, precise?: boolean): number;
-
-        reverseBy(interval: unitOfTime.Diff, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-
-        reverseByRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<Moment>;
-    }
-
-    function extendMoment(moment: any): any;
-
-    function range(range: string | Date[] | Moment[]): Range;
-    function range(start: Date | Moment, end: Date | Moment): Range;
+    reverseByRange(interval: DateRange, options?: { exclusive?: boolean, step?: number }): Iterable<moment.Moment>;
 }
+
+export interface MomentRangeMethods {
+    range(range: string | Date[] | moment.Moment[]): DateRange;
+    range(start: Date | moment.Moment, end: Date | moment.Moment): DateRange;
+    within(range: DateRange): boolean;
+}
+
+export interface MomentRangeExtends extends MomentRangeMethods {
+    (...args: any[]): MomentRangeMethods & moment.Moment;
+}
+
+export function extendMoment(momentInstance: moment.Moment | typeof moment): MomentRangeExtends & moment.Moment;
diff --git a/types/moment-range/moment-range-tests.ts b/types/moment-range/moment-range-tests.ts
index 7aa63c593f..6043d3b203 100644
--- a/types/moment-range/moment-range-tests.ts
+++ b/types/moment-range/moment-range-tests.ts
@@ -1,7 +1,14 @@
-import * as moment from 'moment';
+import * as moment from "moment";
 import * as momentRange from "moment-range";
 
 const range: momentRange.DateRange = new momentRange.DateRange(new Date(2012, 0, 15), new Date(2012, 4, 23));
+
+const extendedMoment = momentRange.extendMoment(moment);
+
+// Moment methods test
+extendedMoment.add();
+extendedMoment().add();
+
 const range2: momentRange.DateRange = new momentRange.DateRange(moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD"));
 const range3: momentRange.DateRange = new momentRange.DateRange([moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD")]);
 const range4: momentRange.DateRange = new momentRange.DateRange("2015-01-17T09:50:04+00:00/2015-04-17T08:29:55+00:00");
@@ -11,20 +18,20 @@ const date: moment.Moment = moment('2012-05-15');
 const res1: boolean = range.adjacent(range2);
 
 const it0: Iterable<moment.Moment> = range.by('days');
-const it1: Iterable<moment.Moment> = range.by('months', {exclusive: true});
-const it2: Iterable<moment.Moment> = range.by('years', {exclusive: false, step: 2});
+const it1: Iterable<moment.Moment> = range.by('months', { exclusive: true });
+const it2: Iterable<moment.Moment> = range.by('years', { exclusive: false, step: 2 });
 
 const it3: Iterable<moment.Moment> = range.byRange(range);
-const it4: Iterable<moment.Moment> = range.byRange(range, {exclusive: true});
-const it5: Iterable<moment.Moment> = range.byRange(range, {exclusive: false, step: 2});
+const it4: Iterable<moment.Moment> = range.byRange(range, { exclusive: true });
+const it5: Iterable<moment.Moment> = range.byRange(range, { exclusive: false, step: 2 });
 
 const res2: moment.Moment = range.center();
 
 const res3: momentRange.DateRange = range.clone();
 
 const res4: boolean = range.contains(range);
-const res5: boolean = range.contains(range, {exclusive: true});
-const res6: boolean = range.contains(range, {exclusive: false});
+const res5: boolean = range.contains(range, { exclusive: true });
+const res6: boolean = range.contains(range, { exclusive: false });
 
 const res10: number = range.diff('months', true);
 const res11: number = range.diff('days');
@@ -41,16 +48,16 @@ const res17: boolean = range.isSame(range2);
 const res18: boolean = range.isEqual(range2);
 
 const res20: boolean = range.overlaps(range2);
-const res21: boolean = range.overlaps(range2, {adjacent: true});
-const res22: boolean = range.overlaps(range2, {adjacent: false});
+const res21: boolean = range.overlaps(range2, { adjacent: true });
+const res22: boolean = range.overlaps(range2, { adjacent: false });
 
 const it6: Iterable<moment.Moment> = range.reverseBy('days');
-const it7: Iterable<moment.Moment> = range.reverseBy('months', {exclusive: true});
-const it8: Iterable<moment.Moment> = range.reverseBy('years', {exclusive: false, step: 2});
+const it7: Iterable<moment.Moment> = range.reverseBy('months', { exclusive: true });
+const it8: Iterable<moment.Moment> = range.reverseBy('years', { exclusive: false, step: 2 });
 
 const it9: Iterable<moment.Moment> = range.reverseByRange(range);
-const it10: Iterable<moment.Moment> = range.reverseByRange(range, {exclusive: true});
-const it11: Iterable<moment.Moment> = range.reverseByRange(range, {exclusive: false, step: 2});
+const it10: Iterable<moment.Moment> = range.reverseByRange(range, { exclusive: true });
+const it11: Iterable<moment.Moment> = range.reverseByRange(range, { exclusive: false, step: 2 });
 
 const res23: momentRange.DateRange = range.add(range2);
 
@@ -64,3 +71,7 @@ const res27: number = range.valueOf();
 
 const res28: moment.Moment = range.start;
 const res29: moment.Moment = range.end;
+
+const res30: boolean = extendedMoment.within(range);
+const res31: boolean = extendedMoment().within(range);
+const res32: momentRange.DateRange = extendedMoment().range(moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD"));
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 5fe6332350..18e627ebfc 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mongodb/node-mongodb-native/tree/2.2
 // Definitions by: Federico Caselli <https://github.com/CaselIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Documentation : http://mongodb.github.io/node-mongodb-native/2.2/api/
 
@@ -38,48 +39,61 @@ export class MongoError extends Error {
     code?: number;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
-export interface MongoClientOptions {
-    uri_decode_auth?: boolean;
-    db?: DbCreateOptions;
-    server?: ServerOptions;
-    replSet?: ReplSetOptions;
-    mongos?: MongosOptions;
-    promiseLibrary?: Object;
+// http://mongodb.github.io/node-mongodb-native/2.2/api/MongoClient.html#.connect
+export interface MongoClientOptions extends
+    DbCreateOptions,
+    ServerOptions,
+    MongosOptions,
+    ReplSetOptions,
+    SocketOptions,
+    SSLOptions,
+    HighAvailabilityOptions {
+    // The logging level (error/warn/info/debug)
+    loggerLevel?: string;
+    // Custom logger object
+    logger?: Object;
+    // Default: false;
+    validateOptions?: Object;
 }
 
-// See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
-export interface DbCreateOptions {
-    authSource?: string;
-    //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
-    w?: number | string;
-    // set the timeout for waiting for write concern to finish (combines with w option).
-    wtimeout?: number;
-    j?: boolean;
-    // use c++ bson parser. default:false.
-    native_parser?: boolean;
-    // force server to create _id fields instead of client. default:false.
-    forceServerObjectId?: boolean;
-    serializeFunctions?: boolean;
-    ignoreUndefined?: boolean;
-    // peform operations using raw bson buffers. default:false.
-    raw?: boolean;
-    // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
-    promoteLongs?: boolean;
-    bufferMaxEntries?: number;
-    // the prefered read preference. use 'ReadPreference' class.
-    readPreference?: ReadPreference | string;
-    // custom primary key factory to generate _id values (see Custom primary keys).
-    pkFactory?: Object;
-    promiseLibrary?: Object;
-    readConcern?: { level?: Object };
+export interface SSLOptions {
+    // Default:5; Number of connections for each server instance
+    poolSize?: number;
+    // Use ssl connection (needs to have a mongod server with ssl support)
+    ssl?: boolean;
+    // Default: true; Validate mongod server certificate against ca (mongod server >=2.4 with ssl support required)
+    sslValidate?: Object;
+    // Default: true; Server identity checking during SSL
+    checkServerIdentity?: boolean | Function;
+    // Array of valid certificates either as Buffers or Strings
+    sslCA?: Array<Buffer | string>;
+    // SSL Certificate revocation list binary buffer
+    sslCRL?: Buffer;
+    // SSL Certificate binary buffer
+    sslCert?: Buffer | string;
+    // SSL Key file binary buffer
+    sslKey?: Buffer | string;
+    // SSL Certificate pass phrase
+    sslPass?: Buffer | string;
+    // String containing the server name requested via TLS SNI.
+    servername?: string;
 }
 
-// See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
+export interface HighAvailabilityOptions {
+    // Default: true; Turn on high availability monitoring.
+    ha?: boolean;
+    // Default: 10000; The High availability period for replicaset inquiry
+    haInterval?: number;
+    // Default: false;
+    domainsEnabled?: boolean;
+}
+
+// See http://mongodb.github.io/node-mongodb-native/2.2/api/ReadPreference.html
 export class ReadPreference {
     constructor(mode: string, tags: Object);
     mode: string;
     tags: any;
+    options: { maxStalenessSeconds?: number }; // Max Secondary Read Stalleness in Seconds
     static PRIMARY: string;
     static PRIMARY_PREFERRED: string;
     static SECONDARY: string;
@@ -89,7 +103,44 @@ export class ReadPreference {
     static isValid(mode: string): boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html
+export interface DbCreateOptions {
+
+    // If the database authentication is dependent on another databaseName.
+    authSource?: string;
+    // Default: null;https://docs.mongodb.com/manual/reference/write-concern/#write-concern
+    w?: number | string;
+    // The write concern timeout to finish (combining with w option).
+    wtimeout?: number;
+    // Specify a journal write concern.
+    j?: boolean;
+    // Default: false; Force server to create _id fields instead of client.
+    forceServerObjectId?: boolean;
+    // Default: false; Use c++ bson parser.
+    native_parser?: boolean;
+    // Serialize functions on any object.
+    serializeFunctions?: boolean;
+    // Specify if the BSON serializer should ignore undefined fields.
+    ignoreUndefined?: boolean;
+    // Return document results as raw BSON buffers.
+    raw?: boolean;
+    // Default: true; Promotes Long values to number if they fit inside the 53 bits resolution.
+    promoteLongs?: boolean;
+    // Default: -1 (unlimited); Amount of operations the driver buffers up untill discard any new ones
+    promoteBuffers?: number;
+    // the prefered read preference. use 'ReadPreference' class.
+    readPreference?: ReadPreference | string;
+    // Default: true; Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+    promoteValues?: Object;
+    // Custom primary key factory to generate _id values (see Custom primary keys).
+    pkFactory?: Object;
+    // ES6 compatible promise constructor
+    promiseLibrary?: Object;
+    // https://docs.mongodb.com/manual/reference/read-concern/#read-concern
+    readConcern?: { level?: Object };
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
 export interface SocketOptions {
     // Reconnect on error. default:false
     autoReconnect?: boolean;
@@ -103,54 +154,37 @@ export interface SocketOptions {
     socketTimeoutMS?: number;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-export interface ServerOptions {
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
-    socketOptions?: SocketOptions;
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+export interface ServerOptions extends SSLOptions {
+    // Default: 30;
     reconnectTries?: number;
+    // Default: 1000;
     reconnectInterval?: number;
+    // Default: true;
+    monitoring?: boolean
+    socketOptions?: SocketOptions;
+    // Default: 10000; The High availability period for replicaset inquiry
+    haInterval?: number;
+    // Default: false;
+    domainsEnabled?: boolean;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-export interface ReplSetOptions {
-    ha?: boolean;
-    haInterval?: number;
+// http://mongodb.github.io/node-mongodb-native/2.2/api/Mongos.html
+export interface MongosOptions extends SSLOptions, HighAvailabilityOptions {
+    // Default: 15; Cutoff latency point in MS for MongoS proxy selection
+    acceptableLatencyMS?: number;
+    socketOptions?: SocketOptions;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.2/api/ReplSet.html
+export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
+    // The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+    maxStalenessSeconds?: number;
+    // The name of the replicaset to connect to.
     replicaSet?: string;
+    // Default: 15 ; Range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
     secondaryAcceptableLatencyMS?: number;
     connectWithNoPrimary?: boolean;
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
-    socketOptions?: SocketOptions;
-}
-
-//http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
-export interface MongosOptions {
-    ha?: boolean;
-    haInterval?: number;
-    // - specify the number of connections in the pool default:5
-    poolSize?: number;
-    ssl?: boolean;
-    sslValidate?: Object;
-    checkServerIdentity?: boolean | Function;
-    sslCA?: Array<Buffer | string>;
-    sslCert?: Buffer | string;
-    sslKey?: Buffer | string;
-    sslPass?: Buffer | string;
     socketOptions?: SocketOptions;
 }
 
@@ -181,20 +215,20 @@ export class Db extends EventEmitter {
     close(forceClose?: boolean): Promise<void>;
     close(forceClose: boolean, callback: MongoCallback<void>): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
-    collection(name: string): Collection;
-    collection(name: string, callback: MongoCallback<Collection>): Collection;
-    collection(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection>): Collection;
+    collection<TSchema = Default>(name: string): Collection<TSchema>;
+    collection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
+    collection<TSchema = Default>(name: string, options: DbCollectionOptions, callback: MongoCallback<Collection<TSchema>>): Collection<TSchema>;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
-    collections(): Promise<Collection[]>;
-    collections(callback: MongoCallback<Collection[]>): void;
+    collections(): Promise<Collection<Default>[]>;
+    collections(callback: MongoCallback<Collection<Default>[]>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
     command(command: Object, callback: MongoCallback<any>): void;
     command(command: Object, options?: { readPreference: ReadPreference | string }): Promise<any>;
     command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback<any>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
-    createCollection(name: string, callback: MongoCallback<Collection>): void;
-    createCollection(name: string, options?: CollectionCreateOptions): Promise<Collection>;
-    createCollection(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection>): void;
+    createCollection<TSchema = Default>(name: string, callback: MongoCallback<Collection<TSchema>>): void;
+    createCollection<TSchema = Default>(name: string, options?: CollectionCreateOptions): Promise<Collection<TSchema>>;
+    createCollection<TSchema = Default>(name: string, options: CollectionCreateOptions, callback: MongoCallback<Collection<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
     createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback<any>): void;
     createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise<any>;
@@ -236,9 +270,9 @@ export class Db extends EventEmitter {
     removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise<any>;
     removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback<any>): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
-    renameCollection(fromCollection: string, toCollection: string, callback: MongoCallback<Collection>): void;
-    renameCollection(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection>;
-    renameCollection(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, callback: MongoCallback<Collection<TSchema>>): void;
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
+    renameCollection<TSchema = Default>(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
     stats(callback: MongoCallback<any>): void;
     stats(options?: { scale?: number }): Promise<any>;
@@ -409,7 +443,7 @@ export interface FSyncOptions {
 }
 
 // Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
-export interface Collection {
+export interface Collection<TSchema = Default> {
     // Get the collection name.
     collectionName: string;
     // Get the full collection namespace.
@@ -421,10 +455,8 @@ export interface Collection {
     // Get current index hint for collection.
     hint: any;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
-    aggregate(pipeline: Object[], callback: MongoCallback<any>): AggregationCursor<any>;
-    aggregate(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<any>): AggregationCursor<any>;
-    aggregate<T>(pipeline: Object[], callback: MongoCallback<any>): AggregationCursor<T>;
-    aggregate<T>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<any>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<T[]>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<T[]>): AggregationCursor<T>;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
     bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void;
     bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>;
@@ -463,26 +495,25 @@ export interface Collection {
     dropIndexes(): Promise<any>;
     dropIndexes(callback?: MongoCallback<any>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#find
-    find(query?: Object): Cursor<any>;
-    find<T>(query?: Object): Cursor<T>;
+    find<T = TSchema>(query?: Object): Cursor<T>;
     /** @deprecated */
-    find(query: Object, fields?: Object, skip?: number, limit?: number, timeout?: number): Cursor<any>;
+    find<T = TSchema>(query: Object, fields?: Object, skip?: number, limit?: number, timeout?: number): Cursor<T>;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOne
-    findOne(filter: Object, callback: MongoCallback<any>): void;
-    findOne(filter: Object, options?: FindOneOptions): Promise<any>;
-    findOne(filter: Object, options: FindOneOptions, callback: MongoCallback<any>): void;
+    findOne<T = TSchema>(filter: Object, callback: MongoCallback<T>): void;
+    findOne<T = TSchema>(filter: Object, options?: FindOneOptions): Promise<T>;
+    findOne<T = TSchema>(filter: Object, options: FindOneOptions, callback: MongoCallback<T>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndDelete
-    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
-    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndUpdate
-    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
-    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject>;
-    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject>): void;
+    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
     geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
     geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
@@ -551,9 +582,9 @@ export interface Collection {
     /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
     remove(selector: Object, options?: CollectionOptions & { single?: boolean }, callback?: MongoCallback<WriteOpResult>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#rename
-    rename(newName: string, callback: MongoCallback<Collection>): void;
-    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection>;
-    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection>): void;
+    rename(newName: string, callback: MongoCallback<Collection<TSchema>>): void;
+    rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
+    rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
     replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
     replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
@@ -710,9 +741,9 @@ export interface DeleteWriteOpResultObject {
 }
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
-export interface FindAndModifyWriteOpResultObject {
+export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
     //Document returned from findAndModify command.
-    value?: any;
+    value?: TSchema;
     //The raw lastErrorObject returned from the command.
     lastErrorObject?: any;
     //Is 1 if the command executed correctly.
@@ -963,8 +994,10 @@ export interface WriteOpResult {
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
 export type CursorResult = any | void | boolean;
 
+type Default = any;
+
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
-export class Cursor<T> extends Readable {
+export class Cursor<T = Default> extends Readable {
 
     sortValue: string;
     timeout: boolean;
@@ -1015,8 +1048,8 @@ export class Cursor<T> extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#min
     min(min: number): Cursor<T>;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
-    next(): Promise<CursorResult>;
-    next(callback: MongoCallback<CursorResult>): void;
+    next(): Promise<T>;
+    next(callback: MongoCallback<T>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
     project(value: Object): Cursor<T>;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
@@ -1068,7 +1101,7 @@ export interface EndCallback {
 //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
 export type AggregationCursorResult = any | void;
 //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
-export class AggregationCursor<T> extends Readable {
+export class AggregationCursor<T = Default> extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
     batchSize(value: number): AggregationCursor<T>;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
@@ -1094,8 +1127,8 @@ export class AggregationCursor<T> extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#maxTimeMS
     maxTimeMS(value: number): AggregationCursor<T>;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#next
-    next(): Promise<AggregationCursorResult>;
-    next(callback: MongoCallback<AggregationCursorResult>): void;
+    next(): Promise<T>;
+    next(callback: MongoCallback<T>): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
     out(destination: string): AggregationCursor<T>;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
@@ -1204,7 +1237,7 @@ export interface GridFSBucketOpenUploadStreamOptions {
 
 // https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
 export class GridFSBucketReadStream extends Readable {
-    constructor(chunks: Collection, files: Collection, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
+    constructor(chunks: Collection<any>, files: Collection<any>, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
 }
 
 // https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index bf3f3e653f..549537812d 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -2,8 +2,32 @@
 import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
 
-var format = require('util').format;
-MongoClient.connect('mongodb://127.0.0.1:27017/test', function(err: mongodb.MongoError, db: mongodb.Db) {
+var format  = require('util').format;
+let options = {
+    authSource           : ' ',
+    w                    : 1,
+    wtimeout             : 300,
+    j                    : true,
+    bufferMaxEntries     : 1000,
+    readPreference       : 'ReadPreference | string',
+    promoteValues        : {},
+    pkFactory            : {},
+    poolSize             : 1,
+    
+    socketOptions        : {},
+    
+    reconnectTries       : 123456,
+    reconnectInterval    : 123456,
+    
+    ssl                  : true,
+    sslValidate          : {},
+    checkServerIdentity  : function (){ },
+    sslCA                : ['str'],
+    sslCert              : new Buffer(999),
+    sslKey               : new Buffer(999),
+    sslPass              : new Buffer(999)
+}
+    MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function(err: mongodb.MongoError, db: mongodb.Db) {
     if (err) throw err;
 
     var collection = db.collection('test_insert');
@@ -29,7 +53,7 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', function(err: mongodb.Mong
     });
 
     {
-    let cursor: mongodb.Cursor<any>;
+    let cursor: mongodb.Cursor;
         cursor = collection.find();
         cursor = cursor.addCursorFlag('',true);
         cursor = cursor.addQueryModifier('',true);
@@ -57,14 +81,16 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', function(err: mongodb.Mong
     // Collection .findM<T>() & .agggregate<T>() generic tests
     {
     let bag : {cost: number, color: string};
-   type bag = typeof bag;
+    type bag = typeof bag;
     let cursor: mongodb.Cursor<bag> = collection.find<bag>({color: 'black'})
         cursor.toArray(function (err,r) { r[0].cost} );
         cursor.forEach(function (bag  ) { bag.color }, () => {});
+        collection.findOne({ color: 'white' }).then(b => { let _b:bag = b; })
+        collection.findOne<bag>({ color: 'white' }).then(b => { b.cost; })
     }
     {
     let payment: {total: number};
-   type payment = typeof payment;
+    type payment = typeof payment;
     let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
     }
 })
diff --git a/types/mongoose-auto-increment/index.d.ts b/types/mongoose-auto-increment/index.d.ts
index 3604b2feaa..fc8813cba7 100644
--- a/types/mongoose-auto-increment/index.d.ts
+++ b/types/mongoose-auto-increment/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/codetunnel/mongoose-auto-increment
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 import { Connection, Schema, Mongoose } from 'mongoose';
 
diff --git a/types/mongoose-deep-populate/index.d.ts b/types/mongoose-deep-populate/index.d.ts
index 9c2de04b49..db01549d67 100644
--- a/types/mongoose-deep-populate/index.d.ts
+++ b/types/mongoose-deep-populate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/buunguyen/mongoose-deep-populate
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 import { Mongoose, Schema } from 'mongoose';
 
diff --git a/types/mongoose-mock/index.d.ts b/types/mongoose-mock/index.d.ts
index d5adb581d0..0358620566 100644
--- a/types/mongoose-mock/index.d.ts
+++ b/types/mongoose-mock/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JohanObrink/mongoose-mock
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 import mongoose = require('mongoose');
 
diff --git a/types/mongoose-paginate/index.d.ts b/types/mongoose-paginate/index.d.ts
index 6b06c65ac5..2b27c30ad5 100644
--- a/types/mongoose-paginate/index.d.ts
+++ b/types/mongoose-paginate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/edwardhotchkiss/mongoose-paginate
 // Definitions by: Linus Brolin <https://github.com/linusbrolin/>, simonxca <https://github.com/simonxca/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="mongoose" />
 
diff --git a/types/mongoose-promise/index.d.ts b/types/mongoose-promise/index.d.ts
index d730876e9f..a5e75ea4ab 100644
--- a/types/mongoose-promise/index.d.ts
+++ b/types/mongoose-promise/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://mongoosejs.com/
 // Definitions by: simonxca <https://github.com/simonxca/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="mongoose" />
 /// <reference types="mpromise" />
diff --git a/types/mongoose-sequence/index.d.ts b/types/mongoose-sequence/index.d.ts
index b01081944c..f4a4e77f1d 100644
--- a/types/mongoose-sequence/index.d.ts
+++ b/types/mongoose-sequence/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ramiel/mongoose-sequence
 // Definitions by: Linus Brolin <https://github.com/linusbrolin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="mongoose" />
 
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 42e3ca3742..12da9c180b 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://mongoosejs.com/
 // Definitions by: simonxca <https://github.com/simonxca/>, horiuchi <https://github.com/horiuchi/>, sindrenm <https://github.com/sindrenm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="mongodb" />
 /// <reference types="node" />
@@ -914,7 +914,8 @@ declare module "mongoose" {
    * section document.js
    * http://mongoosejs.com/docs/api.html#document-js
    */
-  class MongooseDocument implements MongooseDocumentOptionals {
+  interface MongooseDocument extends MongooseDocumentOptionals { }
+  class MongooseDocument {
     /** Checks if a path is set to its default. */
     $isDefault(path?: string): boolean;
 
@@ -1417,6 +1418,9 @@ declare module "mongoose" {
     circle(area: Object): this;
     circle(path: string, area: Object): this;
 
+    /** Adds a collation to this op (MongoDB 3.4 and up) */
+    collation(value: CollationOptions): this;
+
     /** Specifies the comment option. Cannot be used with distinct() */
     comment(val: string): this;
 
@@ -1472,33 +1476,33 @@ declare module "mongoose" {
      * @param criteria mongodb selector
      * @param projection optional fields to return
      */
-    findOne(callback?: (err: any, res: DocType) => void): DocumentQuery<DocType, DocType>;
+    findOne(callback?: (err: any, res: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOne(criteria: Object,
-      callback?: (err: any, res: DocType) => void): DocumentQuery<DocType, DocType>;
+      callback?: (err: any, res: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
      * Issues a mongodb findAndModify remove command.
      * Finds a matching document, removes it, passing the found document (if any) to the
      * callback. Executes immediately if callback is passed.
      */
-    findOneAndRemove(callback?: (error: any, doc: DocType, result: any) => void): DocumentQuery<DocType, DocType>;
+    findOneAndRemove(callback?: (error: any, doc: DocType | null, result: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndRemove(conditions: Object,
-      callback?: (error: any, doc: DocType, result: any) => void): DocumentQuery<DocType, DocType>;
+      callback?: (error: any, doc: DocType | null, result: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndRemove(conditions: Object, options: QueryFindOneAndRemoveOptions,
-      callback?: (error: any, doc: DocType, result: any) => void): DocumentQuery<DocType, DocType>;
+      callback?: (error: any, doc: DocType | null, result: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
      * Issues a mongodb findAndModify update command.
      * Finds a matching document, updates it according to the update arg, passing any options, and returns
      * the found document (if any) to the callback. The query executes immediately if callback is passed.
      */
-    findOneAndUpdate(callback?: (err: any, doc: DocType) => void): DocumentQuery<DocType, DocType>;
+    findOneAndUpdate(callback?: (err: any, doc: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(update: Object,
-      callback?: (err: any, doc: DocType) => void): DocumentQuery<DocType, DocType>;
+      callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(query: Object | Query<any>, update: Object,
-      callback?: (err: any, doc: DocType) => void): DocumentQuery<DocType, DocType>;
+      callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(query: Object | Query<any>, update: Object, options: QueryFindOneAndUpdateOptions,
-      callback?: (err: any, doc: DocType) => void): DocumentQuery<DocType, DocType>;
+      callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
      * Specifies a $geometry condition. geometry() must come after either intersects() or within().
@@ -1817,6 +1821,17 @@ declare module "mongoose" {
     context?: string;
   }
 
+  interface CollationOptions {
+    locale?: string;
+    caseLevel?: boolean;
+    caseFirst?: string;
+    strength?: number;
+    numericOrdering?: boolean;
+    alternate?: string;
+    maxVariable?: string;
+    backwards?: boolean;
+  }
+
   namespace Schema {
     namespace Types {
       /*
@@ -2089,6 +2104,9 @@ declare module "mongoose" {
      */
     append(...ops: Object[]): this;
 
+    /** Adds a collation. */
+    collation(options: CollationOptions): this;
+
     /**
      * Sets the cursor option option for the aggregation query (ignored for < 2.6.0).
      * Note the different syntax below: .exec() returns a cursor object, and no callback
@@ -2316,11 +2334,11 @@ declare module "mongoose" {
      * @param projection optional fields to return
      */
     findById(id: Object | string | number,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findById(id: Object | string | number, projection: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findById(id: Object | string | number, projection: Object, options: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
     model(name: string): Model<T>;
 
@@ -2377,9 +2395,9 @@ declare module "mongoose" {
      */
     find(callback?: (err: any, res: T[]) => void): DocumentQuery<T[], T>;
     find(conditions: Object, callback?: (err: any, res: T[]) => void): DocumentQuery<T[], T>;
-    find(conditions: Object, projection: Object,
+    find(conditions: Object, projection?: Object | null,
       callback?: (err: any, res: T[]) => void): DocumentQuery<T[], T>;
-    find(conditions: Object, projection: Object, options: Object,
+    find(conditions: Object, projection?: Object | null, options?: Object | null,
       callback?: (err: any, res: T[]) => void): DocumentQuery<T[], T>;
 
 
@@ -2391,27 +2409,27 @@ declare module "mongoose" {
      * Executes immediately if callback is passed, else a Query object is returned.
      * @param id value of _id to query by
      */
-    findByIdAndRemove(): DocumentQuery<T, T>;
+    findByIdAndRemove(): DocumentQuery<T | null, T>;
     findByIdAndRemove(id: Object | number | string,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findByIdAndRemove(id: Object | number | string, options: {
       /** if multiple docs are found by the conditions, sets the sort order to choose which doc to update */
       sort?: Object;
       /** sets the document fields to return */
       select?: Object;
-    }, callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+    }, callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
     /**
      * Issues a mongodb findAndModify update command by a document's _id field. findByIdAndUpdate(id, ...)
      * is equivalent to findOneAndUpdate({ _id: id }, ...).
      * @param id value of _id to query by
      */
-    findByIdAndUpdate(): DocumentQuery<T, T>;
+    findByIdAndUpdate(): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: Object | number | string, update: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: Object | number | string, update: Object,
       options: ModelFindByIdAndUpdateOptions,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
     /**
      * Finds one document.
@@ -2419,20 +2437,20 @@ declare module "mongoose" {
      * @param projection optional fields to return
      */
     findOne(conditions?: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findOne(conditions: Object, projection: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findOne(conditions: Object, projection: Object, options: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
     /**
      * Issue a mongodb findAndModify remove command.
      * Finds a matching document, removes it, passing the found document (if any) to the callback.
      * Executes immediately if callback is passed else a Query object is returned.
      */
-    findOneAndRemove(): DocumentQuery<T, T>;
+    findOneAndRemove(): DocumentQuery<T | null, T>;
     findOneAndRemove(conditions: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
     findOneAndRemove(conditions: Object, options: {
       /**
        * if multiple docs are found by the conditions, sets the sort order to choose
@@ -2443,7 +2461,7 @@ declare module "mongoose" {
       maxTimeMS?: number;
       /** sets the document fields to return */
       select?: Object;
-    }, callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+    }, callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
     /**
      * Issues a mongodb findAndModify update command.
@@ -2451,12 +2469,12 @@ declare module "mongoose" {
      * and returns the found document (if any) to the callback. The query executes immediately
      * if callback is passed else a Query object is returned.
      */
-    findOneAndUpdate(): DocumentQuery<T, T>;
+    findOneAndUpdate(): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: Object, update: Object,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: Object, update: Object,
       options: ModelFindOneAndUpdateOptions,
-      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
+      callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
 
     /**
      * geoNear support for Mongoose
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 7e3f815421..3763d5975e 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -71,7 +71,7 @@ mongoose.version.toLowerCase();
  * section querystream.js
  * http://mongoosejs.com/docs/api.html#querystream-js
  */
-var querystream: mongoose.QueryStream;
+var querystream = <mongoose.QueryStream> {};
 querystream.destroy(new Error());
 querystream.pause();
 querystream.pipe(process.stdout, {end: true}).end();
@@ -81,7 +81,7 @@ querystream.readable;
 /* inherited properties */
 querystream.getMaxListeners();
 /* practical examples */
-var QSModel: typeof mongoose.Model;
+var QSModel = <typeof mongoose.Model> {};
 var QSStream: mongoose.QueryStream = QSModel.find().stream();
 QSStream.on('data', function (doc: any) {
   doc.save();
@@ -97,7 +97,7 @@ QSModel.where('created').gte(20000).stream().pipe(process.stdout);
  * section drivers/node-mongodb-native/collection.js
  * http://mongoosejs.com/docs/api.html#drivers-node-mongodb-native-collection-js
  */
-var coll1: mongoose.Collection;
+var coll1 = <mongoose.Collection> {};
 coll1.$format(999).toLowerCase();
 coll1.$print('name', 'i', [1, 2, 3]);
 coll1.getIndexes();
@@ -109,7 +109,7 @@ coll1.ensureIndex();
 coll1.find({});
 coll1.insert({}, {});
 
-var coll2 = new mongoose.Collection('', new mongoose.Connection(null));
+var coll2 = new mongoose.Collection('', new mongoose.Connection(mongoose));
 coll2.$format(999).toLowerCase();
 /* inherited properties */
 coll2.initializeOrderedBulkOp;
@@ -155,7 +155,7 @@ conn1.addListener('close', cb);
  * section error/validation.js
  * http://mongoosejs.com/docs/api.html#error-validation-js
  */
-var validationError: mongoose.ValidationError;
+var validationError = <mongoose.ValidationError> {};
 validationError.toString().toLowerCase();
 /* inherited properties */
 validationError.stack;
@@ -178,7 +178,7 @@ mongoose.Error.Messages.hasOwnProperty('');
  * section querycursor.js
  * http://mongoosejs.com/docs/api.html#querycursor-js
  */
-var querycursor: mongoose.QueryCursor<any>;
+var querycursor = <mongoose.QueryCursor<any>> {};
 querycursor.close(function (error, result) {
   result.execPopulate();
 }).catch(cb);
@@ -267,8 +267,10 @@ schema.method('name', cb).method({
 schema.path('a', mongoose.Schema.Types.Buffer).path('a');
 schema.pathType('m1').toLowerCase();
 schema.plugin(function (schema, opts) {
-schema.get('path');
-  opts.hasOwnProperty('');
+  schema.get('path');
+  if (opts) {
+    opts.hasOwnProperty('');
+  }
 }).plugin(cb, {opts: true});
 
 schema
@@ -426,7 +428,7 @@ new mongoose.Schema({
  * section document.js
  * http://mongoosejs.com/docs/api.html#document-js
  */
-var doc: mongoose.MongooseDocument;
+var doc = <mongoose.MongooseDocument> {};
 doc.$isDefault('path').valueOf();
 doc.depopulate('path');
 doc.equals(doc).valueOf();
@@ -483,7 +485,9 @@ var MyModel = mongoose.model('test', new mongoose.Schema({
 doc = new MyModel();
 doc.$isDefault('name');
 MyModel.findOne().populate('author').exec(function (err, doc) {
-  doc.depopulate('author');
+  if (doc) {
+    doc.depopulate('author');
+  }
 });
 doc.populate('path');
 doc.populate({path: 'hello'});
@@ -540,7 +544,7 @@ interface MySubEntity extends mongoose.Types.Subdocument {
 interface MyEntity extends mongoose.Document {
   sub: mongoose.Types.Array<MySubEntity>
 }
-var myEntity: MyEntity;
+var myEntity = <MyEntity> {};
 var subDocArray = _.filter(myEntity.sub, function (sd) {
   sd.property1;
   sd.property2.toLowerCase();
@@ -570,7 +574,7 @@ interface MySubEntity1 extends mongoose.Types.Subdocument {
 interface MyEntity1 extends mongoose.Document {
   sub: mongoose.Types.DocumentArray<MySubEntity>
 }
-var newEnt: MyEntity1;
+var newEnt = <MyEntity1> {};
 var newSub: MySubEntity1 = newEnt.sub.create({ property1: "example", property2: "example" });
 
 /*
@@ -645,7 +649,7 @@ embeddedDocument.execPopulate();
  * section query.js
  * http://mongoosejs.com/docs/api.html#query-js
  */
-var query: mongoose.Query<mongoose.MongooseDocument[]>;
+var query = <mongoose.Query<mongoose.MongooseDocument[]>> {};
 query.$where('').$where(cb);
 query.all(99).all('path', 99);
 query.and([{ color: 'green' }, { status: 'ok' }]).and([]);
@@ -660,6 +664,7 @@ query.catch(cb).catch(cb);
 query.center({}).center({});
 query.centerSphere({ center: [50, 50], radius: 10 }).centerSphere('path', {});
 query.circle({ center: [50, 50], radius: 10 }).circle('path');
+query.collation({ locale: 'en_US', strength: 1 });
 query.comment('comment').comment('comment');
 query.where({color: 'black'}).count(function (err, count) {
   count.toFixed();
@@ -876,7 +881,7 @@ schemaArray.sparse(true);
  * section schema/string.js
  * http://mongoosejs.com/docs/api.html#schema-string-js
  */
-var MongoDocument: mongoose.Document;
+var MongoDocument = <mongoose.Document> {};
 var schemastring: mongoose.Schema.Types.String = new mongoose.Schema.Types.String('hello');
 schemastring.checkRequired(234, MongoDocument).valueOf();
 schemastring.enum(['hi', 'a', 'b']).enum('hi').enum({});
@@ -995,6 +1000,7 @@ aggregate.addCursorFlag('flag', true).addCursorFlag('', false);
 aggregate.allowDiskUse(true).allowDiskUse(false, []);
 aggregate.append({ $project: { field: 1 }}, { $limit: 2 });
 aggregate.append([{ $match: { daw: 'Logic Audio X' }} ]);
+aggregate.collation({ locale: 'en_US', strength: 1 });
 aggregate.cursor({ batchSize: 1000 }).exec().each(cb);
 aggregate.exec().then(cb).catch(cb);
 aggregate.explain(cb).then(cb).catch(cb);
@@ -1159,7 +1165,9 @@ mongoose.model('')
   .findOne({})
   .exec()
   .then(function (arg) {
-    arg.save;
+    if (arg) {
+      arg.save;
+    }
     return 1;
   }).then(function (num) {
     num.toFixed;
@@ -1170,7 +1178,9 @@ mongoose.model('')
     str.toLowerCase
     return (mongoose.model('')).findOne({}).exec();
   }).then(function (arg) {
-    arg.save;
+    if (arg) {
+      arg.save;
+    }
     return 1;
   }).catch(function (err) {
     return 1;
@@ -1186,7 +1196,9 @@ mongoose.model('')
 
 mongoose.model('').findOne({})
   .then(function (arg) {
-    arg.save;
+    if (arg) {
+      arg.save;
+    }
     return 2;
   }).then(function (num) {
     num.toFixed;
@@ -1235,6 +1247,9 @@ MongoModel.find({}).$where('indexOf("val") !== -1').exec(function (err, docs) {
 });
 MongoModel.findById(999, function (err, doc) {
   var handleSave = function(err: Error, product: mongoose.Document, numAffected: number) {};
+  if (!doc) {
+    return;
+  }
   doc.increment();
   doc.save(handleSave).then(cb).catch(cb);
   doc.save({ validateBeforeSave: false }, handleSave).then(cb).catch(cb);
@@ -1254,7 +1269,9 @@ var mongoModel = new MongoModel();
 mongoModel.remove(function (err, product) {
   if (err) throw(err);
   MongoModel.findById(product._id, function (err, product) {
-    product.remove();
+    if (product) {
+      product.remove();
+    }
   });
 });
 mongoModel.save().then(function (product) {
@@ -1302,11 +1319,15 @@ MongoModel.find({ name: /john/i }, null, { skip: 10 }).exec(function (err, docs)
 MongoModel.findById(999, function (err, adventure) {});
 MongoModel.findById(999).exec(cb);
 MongoModel.findById(999, 'name length', function (err, adventure) {
-  adventure.save();
+  if (adventure) {
+    adventure.save();
+  }
 });
 MongoModel.findById(999, 'name length').exec(cb);
 MongoModel.findById(999, '-length').exec(function (err, adventure) {
-  adventure.addListener('click', cb);
+  if (adventure) {
+    adventure.addListener('click', cb);
+  }
 });
 MongoModel.findById(999, 'name', { lean: true }, function (err, doc) {});
 MongoModel.findById(999, 'name').lean().exec(function (err, doc) {});
@@ -1370,6 +1391,9 @@ MongoModel.mapReduce({
    console.log(docs);
 }).then(null, cb);
 MongoModel.findById(999, function (err, user) {
+  if (!user) {
+    return;
+  }
   var opts = [
       { path: 'company', match: { x: 1 }, select: 'name' }
     , { path: 'notes', options: { limit: 10 }, model: 'override' }
@@ -1423,7 +1447,9 @@ mongoModel.addListener('event', cb);
 MongoModel.findOne({ title: /timex/i })
   .populate('_creator', 'name')
   .exec(function (err, story) {
-    story.execPopulate();
+    if (story) {
+      story.execPopulate();
+    }
   });
 MongoModel.find({
   id: 999
@@ -1458,6 +1484,9 @@ var LocModel = mongoose.model<Location>("Location", locationSchema);
 LocModel.findById(999)
   .select("-reviews -rating")
   .exec(function (err, location) {
+    if (!location) {
+      return;
+    }
     location.name = 'blah';
     location.address = 'blah';
     location.reviews.forEach(review => {});
@@ -1494,18 +1523,35 @@ LocModel.distinct('')
   .then(cb).catch(cb);
 LocModel.findByIdAndRemove()
   .exec(function (err, doc) {
+    if (!doc) {
+      return;
+    }
     doc.addListener;
     doc.openingTimes;
   });
 LocModel.findByIdAndUpdate()
   .select({})
   .exec(function (err, location) {
-    location.reviews;
+    if (location) {
+      location.reviews;
+    }
   });
-LocModel.findOne({}, function (err, doc) { doc.openingTimes; });
+LocModel.findOne({}, function (err, doc) {
+  if (doc) {
+    doc.openingTimes;
+  }
+});
 LocModel.findOneAndRemove()
-  .exec(function (err, location) { location.name; });
-LocModel.findOneAndUpdate().exec().then(function (arg) { arg.openingTimes; });
+  .exec(function (err, location) {
+    if (location) {
+      location.name;
+    }
+  });
+LocModel.findOneAndUpdate().exec().then(function (arg) {
+  if (arg) {
+    arg.openingTimes;
+  }
+});
 LocModel.geoSearch({}, {
   near: [1, 2],
   maxDistance: 22
@@ -1526,7 +1572,7 @@ interface ModelStruct {
   model: MyModel;
   method1: (callback: (model: MyModel, doc: MyDocument) => void) => MyModel;
 }
-var modelStruct1: ModelStruct;
+var modelStruct1 = <ModelStruct> {};
 var myModel1: MyModel;
 var myDocument1: MyDocument;
 modelStruct1.method1(function (myModel1, myDocument1) {
@@ -1553,8 +1599,8 @@ final2.method;interface ibase extends mongoose.Document {
 interface extended extends ibase {
   email: string;
 }
-const base: mongoose.Model<ibase> = mongoose.model<ibase>('testfour', null)
-const extended: mongoose.Model<extended> = base.discriminator<extended>('extendedS', null);
+const base: mongoose.Model<ibase> = mongoose.model<ibase>('testfour')
+const extended: mongoose.Model<extended> = base.discriminator<extended>('extendedS', schema);
 const x = new extended({
   username: 'hi',     // required in baseSchema
   email: 'beddiw',    // required in extededSchema
diff --git a/types/mongoose/tsconfig.json b/types/mongoose/tsconfig.json
index 0c7d49295c..de340232f7 100644
--- a/types/mongoose/tsconfig.json
+++ b/types/mongoose/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/moo/index.d.ts b/types/moo/index.d.ts
new file mode 100644
index 0000000000..8bdc583cc9
--- /dev/null
+++ b/types/moo/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for moo 0.3
+// Project: https://github.com/tjvr/moo#readme
+// Definitions by: Nikita Litvin <https://github.com/deltaidea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace moo;
+
+/**
+ * Reserved token for indicating a parse fail.
+ */
+export const error: { error: true };
+
+export function compile(rules: Rules): Lexer;
+
+export function states(states: {[x: string]: Rules}, start?: string): Lexer;
+
+export interface Rules {
+    [x: string]: RegExp | string | string[] | {
+        match: RegExp | string | string[],
+        /**
+         * Moo tracks detailed information about the input for you.
+         * It will track line numbers, as long as you apply the `lineBreaks: true`
+         * option to any tokens which might contain newlines. Moo will try to warn you if you forget to do this.
+         */
+        lineBreaks?: boolean,
+        /**
+         * Moves the lexer to a new state, and pushes the old state onto the stack.
+         */
+        push?: string,
+        /**
+         * Returns to a previous state, by removing one or more states from the stack.
+         */
+        pop?: number,
+        /**
+         * Moves to a new state, but does not affect the stack.
+         */
+        next?: string,
+        /**
+         * You can have a token type that both matches tokens and contains error values.
+         */
+        error?: true
+    };
+}
+
+export interface Lexer {
+    /**
+     * Returns a string with a pretty error message.
+     */
+    formatError(token: Token, message?: string): string;
+    /**
+     * Can be used by parsers like nearley to check whether a given token type can be parsed by this lexer.
+     */
+    has(tokenType: string): boolean;
+    /**
+     * When you reach the end of Moo's internal buffer, next() will return undefined.
+     * You can always reset() it and feed it more data when that happens.
+     */
+    next(): Token | undefined;
+    /**
+     * Empty the internal buffer of the lexer, and set the line, column, and offset counts back to their initial value.
+     */
+    reset(chunk: string, state?: LexerState): void;
+    /**
+     * Returns current state, which you can later pass it as the second argument
+     * to reset() to explicitly control the internal state of the lexer.
+     */
+    save(): LexerState;
+}
+
+export interface Token {
+    /**
+     * Returns value of the token, or its type if value isn't available.
+     */
+    toString(): string;
+    /**
+     * The name of the group, as passed to compile.
+     */
+    type?: string;
+    /**
+     * The contents of the capturing group (or the whole match, if the token RegExp doesn't define a capture).
+     */
+    value: string;
+    /**
+     * The number of bytes from the start of the buffer where the match starts.
+     */
+    offset: number;
+    /**
+     * The total length of the match (value may be shorter if you have capturing groups).
+     */
+    size: number;
+    /**
+     * The number of line breaks found in the match. (Always zero if this rule has lineBreaks: false.)
+     */
+    lineBreaks: boolean;
+    /**
+     * The line number of the beginning of the match, starting from 1.
+     */
+    line: number;
+    /**
+     * The column where the match begins, starting from 1.
+     */
+    col: number;
+}
+
+export interface LexerState {
+    line: number;
+    col: number;
+    state: string;
+}
diff --git a/types/moo/moo-tests.ts b/types/moo/moo-tests.ts
new file mode 100644
index 0000000000..2c1205d26e
--- /dev/null
+++ b/types/moo/moo-tests.ts
@@ -0,0 +1,32 @@
+import * as moo from 'moo';
+
+let lexer = moo.compile({
+    lparen: '(',
+    word:  /[a-z]+/,
+    rparen: ')',
+    keyword: ['while', 'if', 'else', 'moo', 'cows']
+});
+
+lexer = moo.states({
+    main: {
+        strstart: {match: '`', push: 'lit'},
+        ident:    /\w+/,
+        lbrace:   {match: '{', push: 'main'},
+        rbrace:   {match: '}', pop: 1},
+        colon:    ':',
+        space:    {match: /\s+/, lineBreaks: true},
+    },
+    lit: {
+        interp:   {match: '${', push: 'main'},
+        escape:   /\\./,
+        strend:   {match: '`', pop: 1},
+        const:    {match: /(?:[^$`]|\$(?!\{))+/, lineBreaks: true},
+    },
+});
+
+lexer.reset('some line\n');
+let info = lexer.save();
+lexer.next();
+lexer.next();
+lexer.reset('a different line\n', info);
+lexer.next();
diff --git a/types/moo/tsconfig.json b/types/moo/tsconfig.json
new file mode 100644
index 0000000000..18a86a36a5
--- /dev/null
+++ b/types/moo/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "moo-tests.ts"
+    ]
+}
diff --git a/types/moo/tslint.json b/types/moo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mousetrap/index.d.ts b/types/mousetrap/index.d.ts
index bcc8042834..afd0f42cf7 100644
--- a/types/mousetrap/index.d.ts
+++ b/types/mousetrap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://craig.is/killing/mice
 // Definitions by: Dániel Tar <https://github.com/qcz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface ExtendedKeyboardEvent extends KeyboardEvent {
     returnValue: boolean; // IE returnValue
diff --git a/types/moxios/index.d.ts b/types/moxios/index.d.ts
index d3d6dd5b51..94756158c9 100644
--- a/types/moxios/index.d.ts
+++ b/types/moxios/index.d.ts
@@ -189,4 +189,4 @@ declare let moxios: {
     wait(fn: () => void, delay?: number): void;
 };
 
-export default moxios;
+export = moxios;
diff --git a/types/moxios/moxios-tests.ts b/types/moxios/moxios-tests.ts
index 82ceb8535b..0e6820d287 100644
--- a/types/moxios/moxios-tests.ts
+++ b/types/moxios/moxios-tests.ts
@@ -1,7 +1,7 @@
 // from https://github.com/mzabriskie/moxios/blob/master/test.js
 import {equal, notEqual, deepEqual} from 'power-assert'; // compatible with 'assert';
 import axios from 'axios';
-import moxios from 'moxios';
+import * as moxios from 'moxios';
 
 declare const sinon: any;
 declare const describe: any;
diff --git a/types/mpromise/mpromise-tests.ts b/types/mpromise/mpromise-tests.ts
index bdcd0befa5..3f56b32a66 100644
--- a/types/mpromise/mpromise-tests.ts
+++ b/types/mpromise/mpromise-tests.ts
@@ -1,7 +1,10 @@
+declare var assert: {
+  equal<T>(a: T, b: T): void;
+  ok(cond: boolean): void;
+};
+declare var console: { log(x: any): void };
+declare function setTimeout(action: () => void, timeout: number): void;
 
-/// <reference types="node" />
-
-var assert = require('assert');
 import Promise = require('mpromise');
 
 function ex1() {
diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts
index 390f487444..63cbd69dc6 100644
--- a/types/mssql/index.d.ts
+++ b/types/mssql/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for mssql 4.0.1
+// Type definitions for mssql 4.0.2
 // Project: https://www.npmjs.com/package/mssql
 // Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>, Vitor Buzinaro <https://github.com/buzinas>, Matt Richardson <https://github.com/mrrichar/>, Jørgen Elgaard Larsen <https://github.com/elhaard/>, Peter Keuter <https://github.com/pkeuter/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -57,6 +57,7 @@ export declare var TVP: ISqlTypeFactoryWithTvpType;
 export declare var UDT: ISqlTypeFactoryWithNoParams;
 export declare var Geography: ISqlTypeFactoryWithNoParams;
 export declare var Geometry: ISqlTypeFactoryWithNoParams;
+export declare var Variant: ISqlTypeFactoryWithNoParams;
 
 export declare var TYPES: {
     VarChar: ISqlTypeFactoryWithLength;
@@ -91,6 +92,7 @@ export declare var TYPES: {
     UDT: ISqlTypeFactoryWithNoParams;
     Geography: ISqlTypeFactoryWithNoParams;
     Geometry: ISqlTypeFactoryWithNoParams;
+    Variant: ISqlTypeFactoryWithNoParams;
 };
 
 export declare var MAX: number;
@@ -109,7 +111,7 @@ export interface IColumnMetadata {
         index: number;
         name: string;
         length: number;
-        type: ISqlType;
+        type: (() => ISqlType) | ISqlType;
         udt?: any;
     }
 }
@@ -166,6 +168,7 @@ export interface config {
     connectionTimeout?: number;
     requestTimeout?: number;
     stream?: boolean;
+    parseJSON?: boolean;
     options?: IOptions;
     pool?: IPool;
 }
@@ -191,25 +194,38 @@ export declare class ConnectionError implements Error {
     public code: string;
 }
 
-declare class columns {
-    public add(name: string, type: any, options: any): void;
+export interface IColumnOptions {
+    nullable?: boolean;
+    primary?: boolean;
 }
 
+export interface IColumn extends ISqlType {
+    name: string;
+    nullable: boolean;
+    primary: boolean;
+}
+
+declare class columns {
+    public add(name: string, type: (() => ISqlType) | ISqlType, options?: IColumnOptions): number;
+}
+
+type IRow = (string | number | boolean | Date | Buffer)[];
+
 declare class rows {
-    public add(...row: any[]): void;
+    public add(...row: IRow): number;
 }
 
 export declare class Table {
     public create: boolean;
     public columns: columns;
     public rows: rows;
-    public constructor(tableName: string);
+    public constructor(tableName?: string);
 }
 
 interface IRequestParameters {
     [name: string]: {
         name: string;
-        type: any;
+        type: (() => ISqlType) | ISqlType;
         io: number;
         value: any;
         length: number;
@@ -233,8 +249,8 @@ export declare class Request extends events.EventEmitter {
     public execute<Entity>(procedure: string): Promise<IProcedureResult<Entity>>;
     public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: IProcedureResult<Entity>, returnValue?: any) => void): void;
     public input(name: string, value: any): Request;
-    public input(name: string, type: any, value: any): Request;
-    public output(name: string, type: any, value?: any): Request;
+    public input(name: string, type: (() => ISqlType) | ISqlType, value: any): Request;
+    public output(name: string, type: (() => ISqlType) | ISqlType, value?: any): Request;
     public pipe(stream: NodeJS.WritableStream): NodeJS.WritableStream;
     public query(command: string): Promise<IResult<any>>;
     public query<Entity>(command: string): Promise<IResult<Entity>>;
@@ -280,8 +296,8 @@ export declare class PreparedStatement extends events.EventEmitter {
     public parameters: IRequestParameters;
     public stream: any;
     public constructor(connection?: ConnectionPool);
-    public input(name: string, type: ISqlType): PreparedStatement;
-    public output(name: string, type: ISqlType): PreparedStatement;
+    public input(name: string, type: (() => ISqlType) | ISqlType): PreparedStatement;
+    public output(name: string, type: (() => ISqlType) | ISqlType): PreparedStatement;
     public prepare(statement?: string): Promise<void>;
     public prepare(statement?: string, callback?: (err?: Error) => void): PreparedStatement;
     public execute(values: Object): Promise<void>;
diff --git a/types/mssql/mssql-tests.ts b/types/mssql/mssql-tests.ts
index c5e4535e44..9922364dc1 100644
--- a/types/mssql/mssql-tests.ts
+++ b/types/mssql/mssql-tests.ts
@@ -1,6 +1,6 @@
-import sql = require('mssql');
+import * as sql from 'mssql';
 
-interface Entity{
+interface Entity {
     value: number;
 }
 
@@ -26,15 +26,14 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
         console.warn("Issue with connecting to SQL Server!");
     }
     else {
-        connection.query`SELECT ${1} as value`.then(res => {    });
+        connection.query`SELECT ${1} as value`.then(res => { });
         var requestQuery = new sql.Request(connection);
 
         var getArticlesQuery = "SELECT * FROM TABLE";
 
         requestQuery.query(getArticlesQuery, function (err, result) {
             if (err) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
-
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
             }
             // checking to see if the articles returned as at least one.
             else if (result.recordset.length > 0) {
@@ -45,7 +44,7 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
 
         requestQuery.query<Entity>(getArticlesQuery, function (err, result) {
             if (err) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
 
             }
             // checking to see if the articles returned as at least one.
@@ -63,7 +62,7 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
 
         requestStoredProcedure.execute('StoredProcedureName', function (err, recordsets, returnValue) {
             if (err != null) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
             }
             else {
                 console.info(returnValue);
@@ -72,7 +71,7 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
 
         requestStoredProcedure.execute<Entity>('StoredProcedureName', function (err, recordsets, returnValue) {
             if (err != null) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
             }
             else {
                 console.info(returnValue);
@@ -97,7 +96,7 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
 
         requestStoredProcedure.execute('StoredProcedureName', function (err, recordsets, returnValue) {
             if (err != null) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
             }
             else {
                 console.info(requestStoredProcedureWithOutput.parameters['output'].value);
@@ -106,7 +105,7 @@ var connection: sql.ConnectionPool = new sql.ConnectionPool(config, function (er
 
         requestStoredProcedure.execute<Entity>('StoredProcedureName', function (err, recordsets, returnValue) {
             if (err != null) {
-                console.error('Error happened calling Query: ' + err.name + " " + err.message);
+                console.error(`Error happened calling Query: ${err.name} ${err.message}`);
             }
             else {
                 console.info(requestStoredProcedureWithOutput.parameters['output'].value);
@@ -128,6 +127,25 @@ function test_table() {
     table.rows.add('name2', 7, 3.14);
 }
 
+function test_table2() {
+    var table = new sql.Table('#temp_table2');
+
+    table.create = true;
+
+    ([
+        { name: 'name', type: { typeName: 'VarChar', length: sql.MAX }, nullable: false },
+        { name: 'type', type: { typeName: 'Int' }, nullable: false },
+        { name: 'type', type: { typeName: 'Decimal', precision: 7, scale: 2 }, nullable: false }
+    ] as any[])
+        .forEach((col: sql.IColumn) =>
+            table.columns.add(col.name, _getSqlType(col.type), { nullable: col.nullable }));
+
+    [['name', 42, 3.50], ['name2', 7, 3.14]].forEach((row: sql.IRow) => table.rows.add(...row));
+}
+
+function _getSqlType(type: any): sql.ISqlType {
+    return sql.TYPES[type.typeName](type.length | type.precision, type.scale);
+}
 
 function test_promise_returns() {
     // Methods return a promises if the callback is omitted.
@@ -150,7 +168,7 @@ function test_promise_returns() {
     request.batch<Entity>('create procedure #temporary as select * from table;select 1 as value').then((recordset) => { });
     request.bulk(new sql.Table("table_name")).then(() => { });
     request.query('SELECT 1').then((recordset) => { });
-    request.query<Entity>('SELECT 1 as value').then(res => {    });
+    request.query<Entity>('SELECT 1 as value').then(res => { });
     request.execute('procedure_name').then((recordset) => { });
 }
 
diff --git a/types/mssql/tsconfig.json b/types/mssql/tsconfig.json
index fc4c11febd..0c0bd7a996 100644
--- a/types/mssql/tsconfig.json
+++ b/types/mssql/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "suppressImplicitAnyIndexErrors": true,
         "strictNullChecks": false,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,4 +20,4 @@
         "index.d.ts",
         "mssql-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts
index 53fdcd7add..f056323625 100644
--- a/types/multer/index.d.ts
+++ b/types/multer/index.d.ts
@@ -1,9 +1,12 @@
-// Type definitions for multer
+// Type definitions for multer 1.3
 // Project: https://github.com/expressjs/multer
-// Definitions by: jt000 <https://github.com/jt000>, vilicvane <https://vilic.github.io/>, David Broder-Rodgers <https://github.com/DavidBR-SW>
+// Definitions by: jt000 <https://github.com/jt000>
+//                 vilicvane <https://vilic.github.io/>
+//                 David Broder-Rodgers <https://github.com/DavidBR-SW>
+//                 Michael Ledin <https://github.com/mxl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import express = require('express');
+import * as express from 'express';
 
 declare namespace multer {
     interface Field {
@@ -18,7 +21,9 @@ declare namespace multer {
         dest?: string;
         /** The storage engine to use for uploaded files. */
         storage?: StorageEngine;
-        /** An object specifying the size limits of the following optional properties. This object is passed to busboy directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods */
+        /** An object specifying the size limits of the following optional properties. This object is passed to busboy
+         * directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods
+         */
         limits?: {
             /** Max field name size (Default: 100 bytes) */
             fieldNameSize?: number;
@@ -34,9 +39,11 @@ declare namespace multer {
             parts?: number;
             /** For multipart forms, the max number of header key=> value pairs to parse Default: 2000(same as node's http). */
             headerPairs?: number;
+            /** Keep the full path of files instead of just the base name (Default: false) */
+            preservePath?: boolean;
         };
         /** A function to control which files to upload and which to skip. */
-        fileFilter?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, acceptFile: boolean) => void) => void;
+        fileFilter?(req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, acceptFile: boolean) => void): void;
     }
 
     interface StorageEngine {
@@ -46,29 +53,25 @@ declare namespace multer {
 
     interface DiskStorageOptions {
         /** A function used to determine within which folder the uploaded files should be stored. Defaults to the system's default temporary directory. */
-        destination?: string | ((req: Express.Request, file: Express.Multer.File, callback: (error: Error, destination: string) => void) => void);
+        destination?: string | ((req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, destination: string) => void) => void);
         /** A function used to determine what the file should be named inside the folder. Defaults to a random name with no file extension. */
-        filename?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, filename: string) => void) => void;
+        filename?(req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, filename: string) => void): void;
     }
 
     interface Instance {
         /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
-        single(): express.RequestHandler;
-        /** Accept a single file with the name fieldname. The single file will be stored in req.file. */
-        single(fieldame: string): express.RequestHandler;
-        /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
-        array(): express.RequestHandler;
-        /** Accept an array of files, all with the name fieldname. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
-        array(fieldame: string, maxCount?: number): express.RequestHandler;
+        /** Accept a single file with the name fieldName. The single file will be stored in req.file. */
+        single(fieldName?: string): express.RequestHandler;
+        /** Accept an array of files, all with the name fieldName. Optionally error out if more than maxCount files are uploaded. The array of files will be stored in req.files. */
+        array(fieldName: string, maxCount?: number): express.RequestHandler;
         /** Accept a mix of files, specified by fields. An object with arrays of files will be stored in req.files. */
         fields(fields: Field[]): express.RequestHandler;
-        /** In case you need to handle a text-only multipart form, you can use any of the multer methods (.single(), .array(), fields()), req.body contains the text fields */
+        /** Accepts all files that comes over the wire. An array of files will be stored in req.files. */
         any(): express.RequestHandler;
     }
 }
 
 interface Multer {
-
     (options?: multer.Options): multer.Instance;
 
     /* The disk storage engine gives you full control on storing files to disk. */
@@ -77,21 +80,21 @@ interface Multer {
     memoryStorage(): multer.StorageEngine;
 }
 
-declare var multer: Multer;
+declare const multer: Multer;
 
 export = multer;
 
 declare global {
     namespace Express {
-        export interface Request {
+        interface Request {
             file: Multer.File;
             files: {
                 [fieldname: string]: Multer.File[];
-            };
+            } | Multer.File[];
         }
 
         namespace Multer {
-            export interface File {
+            interface File {
                 /** Field name specified in the form */
                 fieldname: string;
                 /** Name of the file on the user's computer */
@@ -113,4 +116,4 @@ declare global {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/types/multer/multer-tests.ts b/types/multer/multer-tests.ts
index 00cbc52b98..49d8ccc182 100644
--- a/types/multer/multer-tests.ts
+++ b/types/multer/multer-tests.ts
@@ -1,33 +1,35 @@
+import * as express from 'express';
+import * as multer from 'multer';
 
-
-
-import express = require('express');
-import multer = require('multer');
-
-var upload = multer({ dest: 'uploads/' });
-
-var app = express();
-
-app.post('/profile', upload.single('avatar'), (req, res, next) => {
+const upload = multer({
+    dest: 'uploads/',
+    fileFilter: (req, file, cb) => {
+        cb(null, true);
+    }
 });
 
-app.post('/photos/upload', upload.array('photos', 12), (req, res, next) => {
+const app = express();
+
+app.post('/profile', upload.single('avatar'), (req: express.Request, res: express.Response, next: express.NextFunction) => {
 });
 
-var cpUpload = upload.fields([{ name: 'avatar', maxCount: 1 }, { name: 'gallery', maxCount: 8 }])
-app.post('/cool-profile', cpUpload, (req, res, next) => {
+app.post('/photos/upload', upload.array('photos', 12), (req: express.Request, res: express.Response, next: express.NextFunction) => {
 });
 
-var diskStorage = multer.diskStorage({
+const cpUpload = upload.fields([{ name: 'avatar', maxCount: 1 }, { name: 'gallery', maxCount: 8 }]);
+app.post('/cool-profile', cpUpload, (req: express.Request, res: express.Response, next: express.NextFunction) => {
+});
+
+const diskStorage = multer.diskStorage({
     destination(req, file, cb) {
         cb(null, '/tmp/my-uploads');
     },
     filename(req, file, cb) {
         cb(null, file.fieldname + '-' + Date.now());
     }
-})
+});
 
-var diskUpload = multer({ storage: diskStorage });
+const diskUpload = multer({ storage: diskStorage });
 
-var memoryStorage = multer.memoryStorage();
-var memoryUpload = multer({ storage: memoryStorage });
+const memoryStorage = multer.memoryStorage();
+const memoryUpload = multer({ storage: memoryStorage });
diff --git a/types/multer/tsconfig.json b/types/multer/tsconfig.json
index 4a6fa797a4..500a8758a9 100644
--- a/types/multer/tsconfig.json
+++ b/types/multer/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "multer-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/multer/tslint.json b/types/multer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/multer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/multiplexjs/index.d.ts b/types/multiplexjs/index.d.ts
index eddd801609..0cc38c8c06 100644
--- a/types/multiplexjs/index.d.ts
+++ b/types/multiplexjs/index.d.ts
@@ -448,9 +448,9 @@ declare namespace multiplex {
 
         /**
         * Performs the specified action on each element of the List.
-        * @param action The action function to perform on each element of the List.
+        * @param action The action function to perform on each element of an List; the second parameter of the function represents the index of the source element.
         */
-        forEach(action: (item: T) => void): void
+        forEach(action: (item: T, index: number) => void): void
 
 
         /**
@@ -1741,14 +1741,6 @@ declare namespace multiplex {
         */
         firstOrDefault(predicate: (item: T) => boolean, defaultValue: T): T
 
-
-        /**
-        * Performs the specified action on each element of an Enumerable.
-        * @param action The action function to perform on each element of an Enumerable.
-        */
-        forEach(action: (item: T) => void): void
-
-
         /**
         * Performs the specified action on each element of an Enumerable.
         * @param action The action function to perform on each element of an Enumerable; the second parameter of the function represents the index of the source element.
diff --git a/types/nanoscroller/index.d.ts b/types/nanoscroller/index.d.ts
index ffa648b1ab..c12d493650 100644
--- a/types/nanoscroller/index.d.ts
+++ b/types/nanoscroller/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jamesflorentino.github.io/nanoScrollerJS/
 // Definitions by: Yannick Beauchamp-Hurtubise <https://github.com/zihark17>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/natsort/index.d.ts b/types/natsort/index.d.ts
new file mode 100644
index 0000000000..bf448f218d
--- /dev/null
+++ b/types/natsort/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for natsort 1.0
+// Project: https://github.com/bubkoo/natsort
+// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function natsort(options?: natsort.Options): (a: any, b: any) => number;
+
+declare namespace natsort {
+    interface Options {
+        desc?: boolean;
+        insensitive?: boolean;
+    }
+}
+
+export = natsort;
+export as namespace nasort;
diff --git a/types/natsort/natsort-tests.ts b/types/natsort/natsort-tests.ts
new file mode 100644
index 0000000000..4e9d0c0fcb
--- /dev/null
+++ b/types/natsort/natsort-tests.ts
@@ -0,0 +1,155 @@
+import * as natsort from "natsort";
+
+const someArr = [2, 5, 3, 4, 1, 'a', 'B'];
+
+someArr.sort(natsort());
+someArr.sort(natsort({ desc: true }));
+someArr.sort(natsort({ insensitive: true }));
+
+// sort with object array
+const objArr = [
+    { val: 'B' },
+    { val: 'a' },
+    { val: 'D' },
+    { val: 'c' }
+];
+
+const sorter = natsort();
+
+objArr.sort((a, b) => {
+    return sorter(a.val, b.val);
+});
+
+// simple numerics
+['10', 9, 2, '1', '4'].sort(natsort());
+// ['1',2,'4',9,'10']
+
+// floats
+[
+    '10.0401',
+    10.022,
+    10.042,
+    '10.021999'
+].sort(natsort());
+// [
+//  '10.021999',
+//  10.022,
+//  '10.0401',
+//  10.042
+// ]
+
+// float & decimal notation
+[
+    '10.04f',
+    '10.039F',
+    '10.038d',
+    '10.037D'
+].sort(natsort());
+// [
+//  '10.037D',
+//  '10.038d',
+//  '10.039F',
+//  '10.04f'
+// ]
+
+// scientific notation
+[
+    '1.528535047e5',
+    '1.528535047e7',
+    '1.528535047e3'
+].sort(natsort());
+// [
+//  '1.528535047e3',
+//  '1.528535047e5',
+//  '1.528535047e7'
+// ]
+
+// ip addresses
+[
+    '192.168.0.100',
+    '192.168.0.1',
+    '192.168.1.1'
+].sort(natsort());
+// [
+//  '192.168.0.1',
+//  '192.168.0.100',
+//  '192.168.1.1'
+// ]
+
+// Filenames
+[
+    'car.mov',
+    '01alpha.sgi',
+    '001alpha.sgi',
+    'my.string_41299.tif'
+].sort(natsort());
+// [
+//  '001alpha.sgi',
+//  '01alpha.sgi',
+//  'car.mov',
+//  'my.string_41299.tif'
+// ]
+
+// dates
+[
+    '10/12/2008',
+    '10/11/2008',
+    '10/11/2007',
+    '10/12/2007'
+].sort(natsort());
+// [
+//  '10/11/2007',
+//  '10/12/2007',
+//  '10/11/2008',
+//  '10/12/2008'
+// ]
+
+// money
+[
+    '$10002.00',
+    '$10001.02',
+    '$10001.01'
+].sort(natsort());
+// [
+//  '$10001.01',
+//  '$10001.02',
+//  '$10002.00'
+// ]
+
+// versions
+[
+    '1.0.2',
+    '1.0.1',
+    '1.0.0',
+    '1.0.9'
+].sort(natsort());
+// [
+//  '1.0.0',
+//  '1.0.1',
+//  '1.0.2',
+//  '1.0.9'
+// ]
+
+// movie titles
+[
+    '1 Title - The Big Lebowski',
+    '1 Title - Gattaca',
+    '1 Title - Last Picture Show'
+].sort(natsort());
+// [
+//  '1 Title - Gattaca',
+//  '1 Title - Last Picture Show',
+//  '1 Title - The Big Lebowski'
+// ]
+
+// by default - case-sensitive sorting
+['a', 'B'].sort(natsort());
+// ['B', 'a']
+
+// enable case-insensitive sorting
+['a', 'B'].sort(natsort({ insensitive: true }));
+// ['a', 'B']
+
+// desc
+[4, 2, 3, 5, 1].sort(natsort({ desc: true }));
+// [1, 2, 3, 4, 5]
diff --git a/types/natsort/tsconfig.json b/types/natsort/tsconfig.json
new file mode 100644
index 0000000000..8fd932f326
--- /dev/null
+++ b/types/natsort/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "natsort-tests.ts"
+    ]
+}
diff --git a/types/natsort/tslint.json b/types/natsort/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/natsort/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/navigation-react/index.d.ts b/types/navigation-react/index.d.ts
index a4dd084b84..0c85dac138 100644
--- a/types/navigation-react/index.d.ts
+++ b/types/navigation-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://grahammendick.github.io/navigation/
 // Definitions by: Graham Mendick <https://github.com/grahammendick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { StateNavigator } from 'navigation';
 import { Component, HTMLProps } from 'react';
@@ -58,7 +58,7 @@ export interface RefreshLinkProps extends LinkProps {
 /**
  * Hyperlink Component the navigates to the current State
  */
-export class RefreshLink extends Component<RefreshLinkProps, any> { }
+export class RefreshLink extends Component<RefreshLinkProps> { }
 
 /**
  * Defines the Navigation Link Props contract
@@ -73,7 +73,7 @@ export interface NavigationLinkProps extends RefreshLinkProps {
 /**
  * Hyperlink Component the navigates to a State
  */
-export class NavigationLink extends Component<NavigationLinkProps, any> { }
+export class NavigationLink extends Component<NavigationLinkProps> { }
 
 /**
  * Defines the Navigation Back Link Props contract
@@ -88,4 +88,4 @@ export interface NavigationBackLinkProps extends RefreshLinkProps {
 /**
  * Hyperlink Component the navigates back along the crumb trail
  */
-export class NavigationBackLink extends Component<NavigationBackLinkProps, any> { }
+export class NavigationBackLink extends Component<NavigationBackLinkProps> { }
diff --git a/types/nearley/index.d.ts b/types/nearley/index.d.ts
new file mode 100644
index 0000000000..3ea2a32ab5
--- /dev/null
+++ b/types/nearley/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for nearley 2.9
+// Project: https://github.com/Hardmath123/nearley#readme
+// Definitions by: Nikita Litvin <https://github.com/deltaidea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace nearley;
+
+export class Parser {
+    constructor(rules: Rule[], start: string, options?: ParserOptions);
+    constructor(grammar: Grammar, options?: ParserOptions);
+    /**
+     * The Parser object can be fed data in parts with .feed(data).
+     * You can then find an array of parsings with the .results property.
+     * If results is empty, then there are no parsings.
+     * If results contains multiple values, then that combination is ambiguous.
+     *
+     * @throws If there are no possible parsings, nearley will throw an error
+     * whose offset property is the index of the offending token.
+     */
+    feed(chunk: string): void;
+    finish(): any[];
+    restore(column: {[x: string]: any, lexerState: LexerState}): void;
+    save(): LexerState;
+
+    grammar: Grammar;
+    options: ParserOptions;
+    lexer: Lexer;
+    lexerState?: LexerState;
+    current: number;
+    /**
+     * An array of possible parsings. Each element is the thing returned by your grammar.
+     *
+     * Note that this is undefined before the first feed() call.
+     * It isn't typed as `any[] | undefined` to spare you the null checks when it's definitely an array.
+     */
+    results: any[];
+
+    /**
+     * Reserved token for indicating a parse fail.
+     */
+    static fail: {};
+}
+
+export interface ParserOptions {
+    keepHistory?: boolean;
+    lexer?: Lexer;
+}
+
+export class Rule {
+    constructor(name: any, symbols: any, postprocess: any);
+    toString(withCursorAt: any): any;
+    static highestId: number;
+}
+
+export class Grammar {
+    constructor(rules: Rule[], start: string);
+    rules: Rule[];
+    byName: {[x: string]: Rule};
+}
+
+export namespace Grammar {
+    function fromCompiled(rules: Rule[], start: string): Grammar;
+}
+
+export interface Lexer {
+    /**
+     * Sets the internal buffer to chunk, and restore line/col/state info taken from save().
+     */
+    reset(chunk: string, state?: LexerState): void;
+    /**
+     * Returns e.g. {type, value, line, col, …}. Only the value attribute is required.
+     */
+    next(): Token | undefined;
+    /**
+     * Returns an object describing the current line/col etc. This allows us
+     * to preserve this information between feed() calls, and also to support Parser#rewind().
+     * The exact structure is lexer-specific; nearley doesn't care what's in it.
+     */
+    save(): LexerState;
+    /**
+     * Returns a string with an error message describing the line/col of the offending token.
+     * You might like to include a preview of the line in question.
+     */
+    formatError(token: Token): string;
+    /**
+     * Returns true if the lexer can emit tokens with that name.
+     * Used to resolve %-specifiers in compiled nearley grammars.
+     */
+    has(tokenType: string): boolean;
+}
+
+export interface Token {
+    [x: string]: any;
+    value: string;
+}
+
+export interface LexerState {
+    [x: string]: any;
+}
diff --git a/types/nearley/nearley-tests.ts b/types/nearley/nearley-tests.ts
new file mode 100644
index 0000000000..7741df617f
--- /dev/null
+++ b/types/nearley/nearley-tests.ts
@@ -0,0 +1,18 @@
+import { Parser, Grammar, Rule, Lexer } from 'nearley';
+
+declare const parserRules: Rule[];
+declare const parserStart: string;
+declare const lexer: Lexer;
+declare const grammar: Grammar;
+
+let parser = new Parser(parserRules, parserStart, { lexer, keepHistory: false });
+parser = new Parser(grammar);
+
+try {
+    parser.feed("<123>");
+    if (parser.results) {
+        console.log(parser.results[0]);
+    }
+} catch (error) {
+    console.log(error);
+}
diff --git a/types/nearley/tsconfig.json b/types/nearley/tsconfig.json
new file mode 100644
index 0000000000..9a4feb8763
--- /dev/null
+++ b/types/nearley/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "nearley-tests.ts"
+    ]
+}
diff --git a/types/nearley/tslint.json b/types/nearley/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nearley/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nedb-logger/nedb-logger-tests.ts b/types/nedb-logger/nedb-logger-tests.ts
index 6aea3fd413..d7243bdf22 100644
--- a/types/nedb-logger/nedb-logger-tests.ts
+++ b/types/nedb-logger/nedb-logger-tests.ts
@@ -2,8 +2,6 @@
  * Created by Joe Vanderstelt 2017-02-22.
  */
 
-/// <reference types="node" />
-
 import * as es6styleimport from 'nedb-logger';
 
 import nedblogger = require('nedb-logger');
diff --git a/types/nedb/nedb-tests.ts b/types/nedb/nedb-tests.ts
index 47af1b137f..96c5e9f154 100644
--- a/types/nedb/nedb-tests.ts
+++ b/types/nedb/nedb-tests.ts
@@ -2,8 +2,6 @@
  * Created by stefansteinhart on 31.01.15.
  */
 
-/// <reference types="node" />
-
 import * as es6styleimport from 'nedb';
 
 import nedb = require('nedb');
@@ -165,8 +163,7 @@ db = new Datastore({ filename: 'path/to/datafile', autoload: true });
 
 // Type 4: Persistent datastore for a Node Webkit app called 'nwtest'
 // For example on Linux, the datafile will be ~/.config/nwtest/nedb-data/something.db
-import path = require('path');
-db = new Datastore({ filename: path.join(require('nw.gui').App.dataPath, 'something.db') });
+db = new Datastore({ filename: 'something.db' });
 
 // Of course you can create multiple datastores if you need several
 // collections. In this case it's usually a good idea to use autoload for all collections.
diff --git a/types/nes/index.d.ts b/types/nes/index.d.ts
index 87e428bc29..aab6827ed7 100644
--- a/types/nes/index.d.ts
+++ b/types/nes/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/hapijs/nes
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  +                                                                           +
diff --git a/types/ng-command/index.d.ts b/types/ng-command/index.d.ts
index a949a350b2..da13c38436 100644
--- a/types/ng-command/index.d.ts
+++ b/types/ng-command/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/stephenlautier/ng-command
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/ng-cordova/index.d.ts b/types/ng-cordova/index.d.ts
index 791b61144b..907ab93a88 100644
--- a/types/ng-cordova/index.d.ts
+++ b/types/ng-cordova/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/driftyco/ng-cordova
 // Definitions by: Kapil Sachdeva <https://github.com/ksachdeva>
 // Definitions: https://github.com/ksachdeva/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference path="device.d.ts"/>
 /// <reference path="toast.d.ts"/>
diff --git a/types/ng-dialog/index.d.ts b/types/ng-dialog/index.d.ts
index f165f31225..f00549f1be 100644
--- a/types/ng-dialog/index.d.ts
+++ b/types/ng-dialog/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/likeastore/ngDialog
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -110,6 +111,11 @@ declare module 'angular' {
 			 * It will be appended with the "ngdialog" class e.g. className is "default-theme flat-ui" it will be class="ngdialog default-theme flat-ui".
 			 */
 			className?: string;
+			
+			/**
+			 * Unlike the className property, which overrides any default classes specified through the setDefaults() method (see docs), appendClassName allows for the addition of a class on top of any defaults.
+			 */
+			appendClassName?: string;
 
 			/**
 			 * If true then animation for the dialog will be disabled, default false.
diff --git a/types/ng-facebook/index.d.ts b/types/ng-facebook/index.d.ts
index a367956a2d..4106136450 100644
--- a/types/ng-facebook/index.d.ts
+++ b/types/ng-facebook/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/GoDisco/ngFacebook
 // Definitions by: Crevil <https://github.com/Crevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="fb" />
diff --git a/types/ng-file-upload/index.d.ts b/types/ng-file-upload/index.d.ts
index cc5a59b2bf..85a055772b 100644
--- a/types/ng-file-upload/index.d.ts
+++ b/types/ng-file-upload/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: John Reilly <https://github.com/johnnyreilly>,
 //   Eduardo Garcia <https://github.com/thewarpaint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 import * as angular from 'angular';
diff --git a/types/ng-flow/index.d.ts b/types/ng-flow/index.d.ts
index f8e9e43eab..2699a99cd6 100644
--- a/types/ng-flow/index.d.ts
+++ b/types/ng-flow/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/flowjs/ng-flow
 // Definitions by: Ryan McNamara <https://github.com/ryan10132>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 /// <reference types="flowjs" />
 /// <reference types="angular" />
 
diff --git a/types/ng-grid/index.d.ts b/types/ng-grid/index.d.ts
index 2cad441edd..b2fe7fa6c4 100644
--- a/types/ng-grid/index.d.ts
+++ b/types/ng-grid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://angular-ui.github.io/ng-grid/
 // Definitions by: Ken Smith <https://github.com/smithkl42>, Roland Zwaga <https://github.com/rolandzwaga>, Kent Cooper <https://github.com/kentcooper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // These are very definitely preliminary. Please feel free to improve.
 
diff --git a/types/ng-notify/index.d.ts b/types/ng-notify/index.d.ts
index e196c8d211..5a1b00f807 100644
--- a/types/ng-notify/index.d.ts
+++ b/types/ng-notify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/matowens/ng-notify
 // Definitions by: Nick Zamosenchuk <https://github.com/nzamosenchuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular"/>
 
diff --git a/types/ng-stomp/index.d.ts b/types/ng-stomp/index.d.ts
index 3a91a64844..2a2e9c2496 100644
--- a/types/ng-stomp/index.d.ts
+++ b/types/ng-stomp/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/beevelop/ng-stomp
 // Definitions by: Lukasz Potapczuk <https://github.com/lpotapczuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/ngbootbox/index.d.ts b/types/ngbootbox/index.d.ts
index 31bcf2f670..2fbcf3c6cb 100644
--- a/types/ngbootbox/index.d.ts
+++ b/types/ngbootbox/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/eriktufvesson/ngBootbox
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="bootbox" />
 
diff --git a/types/ngmap/index.d.ts b/types/ngmap/index.d.ts
index 5d6e734266..011e415866 100644
--- a/types/ngmap/index.d.ts
+++ b/types/ngmap/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/allenhwkim/angularjs-google-maps
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="googlemaps" />
@@ -145,4 +146,4 @@ declare namespace angular.map {
          */
         setDefaultOptions(options: INgMapOptions): void;
     }
-}
\ No newline at end of file
+}
diff --git a/types/ngmap/ngmap-tests.ts b/types/ngmap/ngmap-tests.ts
index b78ff9071a..ca9cc1acfb 100644
--- a/types/ngmap/ngmap-tests.ts
+++ b/types/ngmap/ngmap-tests.ts
@@ -1,4 +1,4 @@
-class NgMapTestController {
+class NgMapTestController implements ng.IController {
     constructor(public $scope: ng.IScope, public $window: ng.IWindowService, public NgMap: angular.map.INgMap) {
         this.showMap();
     }
@@ -8,6 +8,8 @@ class NgMapTestController {
 		    console.log(map.getCenter());
 		});
     }
+    $onInit() {
+    }
 }
 
 var app = angular.module('angularLocalStorageTests', ['ngMap']);
@@ -21,4 +23,4 @@ app.config(function(NgMapProvider: angular.map.INgMapProvider) {
  });
 
 app.controller('testCtrl', ['$scope', '$window', 'ngMap',
-	($scope: ng.IScope, $window: ng.IWindowService, NgMap: angular.map.INgMap) => new NgMapTestController($scope, $window, NgMap)]);
\ No newline at end of file
+	($scope: ng.IScope, $window: ng.IWindowService, NgMap: angular.map.INgMap) => new NgMapTestController($scope, $window, NgMap)]);
diff --git a/types/ngprogress-lite/index.d.ts b/types/ngprogress-lite/index.d.ts
index 4fbca66622..a0586b1aad 100644
--- a/types/ngprogress-lite/index.d.ts
+++ b/types/ngprogress-lite/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/voronianski/ngprogress-lite
 // Definitions by: Luke Forder <https://github.com/LukeForder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as angular from 'angular';
 
diff --git a/types/ngreact/index.d.ts b/types/ngreact/index.d.ts
index b20a35cad2..cb39e45ee1 100644
--- a/types/ngreact/index.d.ts
+++ b/types/ngreact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ngReact/ngReact
 // Definitions by: Vicky Lai <https://github.com/velveret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="angular"/>
 /// <reference types="react"/>
diff --git a/types/ngstorage/index.d.ts b/types/ngstorage/index.d.ts
index 83c740ff0e..ca86f3d1a8 100644
--- a/types/ngstorage/index.d.ts
+++ b/types/ngstorage/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/gsklee/ngStorage
 // Definitions by: Jakub Pistek <https://github.com/kubiq>
 // Definitions: https://github.com/kubiq/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export namespace ngStorage {
     interface StorageService {
diff --git a/types/ngtoaster/index.d.ts b/types/ngtoaster/index.d.ts
index b33d6e7159..caf9bd0539 100644
--- a/types/ngtoaster/index.d.ts
+++ b/types/ngtoaster/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jirikavi/AngularJS-Toaster
 // Definitions by: Ben Tesser <https://github.com/btesser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 87bf8027d1..0dd7b31b97 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/segmentio/nightmare
 // Definitions by: horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 
diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 4e293993f7..4f2b5f0b7c 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for noble
 // Project: https://github.com/sandeepmistry/noble
-// Definitions by: Seon-Wook Park <https://github.com/swook>, Hans Bakker <https://github.com/wind-rider>, Shantanu Bhadoria <https://github.com/shantanubhadoria>
+// Definitions by: Seon-Wook Park <https://github.com/swook>
+//                 Hans Bakker <https://github.com/wind-rider>
+//                 Shantanu Bhadoria <https://github.com/shantanubhadoria>
+//                 Luke Libraro <https://github.com/lukel99>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -8,10 +11,10 @@
 
 import events = require("events");
 
-export declare function startScanning(): void;
-export declare function startScanning(serviceUUIDs: string[]): void;
-export declare function startScanning(serviceUUIDs: string[], allowDuplicates: boolean): void;
-export declare function stopScanning(): void;
+export declare function startScanning(callback?: (error?: Error) => void): void;
+export declare function startScanning(serviceUUIDs: string[], callback?: (error?: Error) => void): void;
+export declare function startScanning(serviceUUIDs: string[], allowDuplicates: boolean, callback?: (error?: Error) => void): void;
+export declare function stopScanning(callback?: () => void): void;
 
 export declare function on(event: string, listener: Function): events.EventEmitter;
 export declare function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
diff --git a/types/noble/noble-tests.ts b/types/noble/noble-tests.ts
index 9c3f403944..baa65c5662 100644
--- a/types/noble/noble-tests.ts
+++ b/types/noble/noble-tests.ts
@@ -4,14 +4,18 @@ import noble = require("noble");
 function test_startScanning(): void {
     "use strict";
     noble.startScanning();
+    noble.startScanning((err) => {});
     noble.startScanning(["0x180d"]);
+    noble.startScanning(["0x180d"], (err) => {});
     noble.startScanning(["0x180d"], true);
+    noble.startScanning(["0x180d"], true, (err) => {});
 }
 test_startScanning();
 
 function test_stopScanning(): void {
     "use strict";
     noble.stopScanning();
+    noble.stopScanning(() => {});
 }
 test_stopScanning();
 
diff --git a/types/noble/tsconfig.json b/types/noble/tsconfig.json
index 5821c4f99e..9b75c82d95 100644
--- a/types/noble/tsconfig.json
+++ b/types/noble/tsconfig.json
@@ -19,4 +19,4 @@
         "index.d.ts",
         "noble-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/node-feedparser/index.d.ts b/types/node-feedparser/index.d.ts
similarity index 94%
rename from node-feedparser/index.d.ts
rename to types/node-feedparser/index.d.ts
index bed830265c..775a4a7fa0 100644
--- a/node-feedparser/index.d.ts
+++ b/types/node-feedparser/index.d.ts
@@ -14,12 +14,16 @@ declare class FeedParser extends stream.Duplex {
     constructor(options: FeedParser.Options);
     options: FeedParser.Options;
     stream: SAXStream;
-    meta: object;
+    meta: {
+        [key: string]: any
+    };
     _emitted_meta: boolean;
     stack: any[];
     xmlbase: any[];
     in_xhtml: boolean;
-    xhtml: object;
+    xhtml: {
+        [key: string]: any
+    };
     errors: Error[];
 
     addListener(ev: any, fn: any): any;
@@ -79,7 +83,7 @@ declare class FeedParser extends stream.Duplex {
     setEncoding(enc: any): any;
 
     setMaxListeners(n: any): any;
-    
+
     uncork(): void;
 
     unpipe(dest: any): any;
@@ -88,9 +92,8 @@ declare class FeedParser extends stream.Duplex {
 
     wrap(stream: SAXStream, ...args: any[]): any;
 
-    private _transform(data: any, encoding: string, done: Function): void;
-    private _flush(done: Function): void;
-
+    private _transform(data: any, encoding: string, done: () => any): void;
+    private _flush(done: () => any): void;
 }
 
 declare namespace FeedParser {
@@ -104,7 +107,6 @@ declare namespace FeedParser {
         MAX_BUFFER_LENGTH?: number;
     }
 
-
     interface Node {
         [key: string]: any;
     }
@@ -161,6 +163,4 @@ declare namespace FeedParser {
         enclosures: string[];
         meta: Meta;
     }
-
 }
-
diff --git a/node-feedparser/node-feedparser-tests.ts b/types/node-feedparser/node-feedparser-tests.ts
similarity index 94%
rename from node-feedparser/node-feedparser-tests.ts
rename to types/node-feedparser/node-feedparser-tests.ts
index 25d652de8c..f36698372b 100644
--- a/node-feedparser/node-feedparser-tests.ts
+++ b/types/node-feedparser/node-feedparser-tests.ts
@@ -1,5 +1,5 @@
 import request = require('request');
-import * as FeedParser from "feedparser";
+import * as FeedParser from "node-feedparser";
 
 const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
 const feedparser = new FeedParser({});
diff --git a/node-feedparser/tsconfig.json b/types/node-feedparser/tsconfig.json
similarity index 100%
rename from node-feedparser/tsconfig.json
rename to types/node-feedparser/tsconfig.json
diff --git a/node-feedparser/tslint.json b/types/node-feedparser/tslint.json
similarity index 100%
rename from node-feedparser/tslint.json
rename to types/node-feedparser/tslint.json
diff --git a/types/node-getopt/index.d.ts b/types/node-getopt/index.d.ts
index 304f09bd4c..cb08791fc3 100644
--- a/types/node-getopt/index.d.ts
+++ b/types/node-getopt/index.d.ts
@@ -8,8 +8,8 @@
  */
 
 
-interface StringMap {
-    [index: string]: string;
+interface OptionMap {
+    [index: string]: string | string[] | boolean;
 }
 
 /**
@@ -17,14 +17,14 @@ interface StringMap {
  */
 declare class ParsedOption {
     public argv: string[];
-    public options: StringMap;
+    public options: OptionMap;
 
-    constructor(argv: string[], options: StringMap);
+    constructor(argv: string[], options: OptionMap);
     public empty(): boolean;
 }
 
 interface EventCallback {
-    (args: string[], options: StringMap): void;
+    (args: string[], options: OptionMap): void;
 }
 
 interface ErrorFunc {
@@ -122,7 +122,7 @@ declare class Getopt {
      * equals new Getopt(options)
      * @param options
      */
-    static create(options: string[]): Getopt;
+    static create(options: string[][]): Getopt;
 }
 
 export = Getopt;
diff --git a/types/node-getopt/node-getopt-tests.ts b/types/node-getopt/node-getopt-tests.ts
index 7427731ca8..2ba3afd01d 100644
--- a/types/node-getopt/node-getopt-tests.ts
+++ b/types/node-getopt/node-getopt-tests.ts
@@ -34,7 +34,7 @@ function help() {
 
 function onedragon() {
     // examples/onedragon.js
-    var opt = require('node-getopt').create([
+    var opt = Getopt.create([
         ['s' , ''                    , 'short option.'],
         [''  , 'long'                , 'long option.'],
         ['S' , 'short-with-arg=ARG'  , 'option with argument'],
@@ -52,7 +52,7 @@ function onedragon() {
 
 function online(){
     // node-getopt oneline example.
-    var opt = require('..').create([
+    var opt = Getopt.create([
         ['s' , ''                    , 'short option.'],
         [''  , 'long'                , 'long option.'],
         ['S' , 'short-with-arg=ARG'  , 'option with argument'],
diff --git a/types/node-mysql-wrapper/index.d.ts b/types/node-mysql-wrapper/index.d.ts
index 7785d8a7b4..c887da3368 100644
--- a/types/node-mysql-wrapper/index.d.ts
+++ b/types/node-mysql-wrapper/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nodets/node-mysql-wrapper
 // Definitions by: Makis Maropoulos <https://github.com/kataras>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference path="./my-meteor.d.ts" />
 
@@ -49,20 +50,20 @@ interface IQueryConstructor<T> {
 
 
 declare class Helper {
-    /** 
+    /**
      * Callback like forEach
      * @name valueCallback
      * @function
-     * @param {T} the value of the object's key 
+     * @param {T} the value of the object's key
      * @returnTye {U}
      * @return {U}
     */
-        
+
     /**
      * CallbaforEach
      * @name keyCallback
      * @function
-     * @param {string} the name of the object's key 
+     * @param {string} the name of the object's key
      * @returnTye {U}
      * @return {U}
     */
@@ -158,7 +159,7 @@ declare class CriteriaParts implements ICriteriaParts {
     noDatabaseProperties: string[];
 
     /**
-     * The converted/exported where clause. 
+     * The converted/exported where clause.
      */
     whereClause: string;
 
@@ -472,7 +473,7 @@ declare class Connection extends EventEmitter {
     eventTypes: string[];
 
     /**
-     * Force to fetch ONLY these Database table names {array of string}.  
+     * Force to fetch ONLY these Database table names {array of string}.
      */
     tableNamesToUseOnly: any[];
 
@@ -495,7 +496,7 @@ declare class Connection extends EventEmitter {
      * Attach a real connection.
      * @param {Mysql.IConnection} connection the real connection object.
      * @returnType {nothing}
-     * @return {nothing} 
+     * @return {nothing}
      */
     attach(connection: Mysql.IConnection): void;
 
@@ -503,13 +504,13 @@ declare class Connection extends EventEmitter {
      * Close the entire real connection and remove all event's listeners (if exist).
      * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
      * @returnType {nothing}
-     * @return {nothing} 
+     * @return {nothing}
      */
     end(callback?: (error: any) => void): void;
 
     /**
      * Close the entire real connection and remove all event's listeners (if exist).
-     * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+     * the difference from the 'end' is that this method doesn't care about errors so no callback passing here.
      */
     destroy(): void;
 
@@ -545,7 +546,7 @@ declare class Connection extends EventEmitter {
 
     /**
      * Escape the query column's value  and return it.
-     * @param {string} val the value which will be escaped. 
+     * @param {string} val the value which will be escaped.
      * @returnType {string}
      * @return {string}
      */
@@ -565,7 +566,7 @@ declare class Connection extends EventEmitter {
      * Adds an event listener/watcher on a table for a 'database event'.
      * @param {string} tableName the table name which you want to add the event listener.
      * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-     * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
+     * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)).
      * @returnType {nothing}
      * @return {nothing}
      */
@@ -573,7 +574,7 @@ declare class Connection extends EventEmitter {
 
     /**
      * Removes an event listener/watcher from a table for a specific event type.
-     * @param {string} tableName the table name which you want to remove the event listener. 
+     * @param {string} tableName the table name which you want to remove the event listener.
      * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
      * @param {function} callbackToRemove the callback that you were used for watch this event type.
      * @returnType {nothing}
@@ -587,13 +588,13 @@ declare class Connection extends EventEmitter {
      * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
      * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
      * @returnType {nothing}
-     * @return {nothing} 
+     * @return {nothing}
      */
     query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
 
     /**
      * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
-     * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
+     * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove).
      * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
      * @returnType {MysqlTable}
      * @return {MysqlTable}
@@ -602,7 +603,7 @@ declare class Connection extends EventEmitter {
 }
 
 declare class Table<T>  {
-    /** Private keywords here are useless but I put them. 
+    /** Private keywords here are useless but I put them.
      * If the developer wants to see the properties of the Table class, he/she just comes here.
     */
 
@@ -630,17 +631,17 @@ declare class Table<T>  {
     primaryKey: string;
 
     /**
-     * The MysqlConnection object which this MysqlTable belongs. 
+     * The MysqlConnection object which this MysqlTable belongs.
      */
     connection: Connection;
 
     /**
-     * The real database name of the table. Autofilled by library. 
+     * The real database name of the table. Autofilled by library.
      */
     name: string;
 
     /**
-     * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
+     * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table.
      * @return {SelectQueryRules}
      */
     rules: SelectQueryRules;
@@ -661,7 +662,7 @@ declare class Table<T>  {
     /**
     * Adds or turn on an event listener/watcher on a table for a 'database event'.
     * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-    * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
+    * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)).
     * @returnType {nothing}
     * @return {nothing}
     */
@@ -689,7 +690,7 @@ declare class Table<T>  {
      * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
      * @param {function} theFunction the function with any optional parameters you want to pass along.
      * @returnType {nothing}
-     * @return {nothing} 
+     * @return {nothing}
      */
     extend(functionName: string, theFunction: (...args: any[]) => any): void;
 
@@ -726,9 +727,9 @@ declare class Table<T>  {
     getPrimaryKeyValue(jsObject: any): number | string;
 
     /**
-     * 
+     *
      */
-    find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
+    find(criteriaRawJsObject: any): Promise<T[]>; // only criteria
     find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
     find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
 
@@ -792,7 +793,7 @@ declare class Database {
 
     /**
     * Close the entire real connection and remove all event's listeners (if exist).
-    * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+    * the difference from the 'end' is that this method doesn't care about errors so no callback passing here.
     */
     destroy(): void;
 
@@ -800,7 +801,7 @@ declare class Database {
    * Close the entire real connection and remove all event's listeners (if exist).
    * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
    * @returnType {nothing}
-   * @return {nothing} 
+   * @return {nothing}
    */
     end(maybeAcallbackError: (err: any) => void): void;
 
diff --git a/types/node-portscanner/index.d.ts b/types/node-portscanner/index.d.ts
new file mode 100644
index 0000000000..1993a2353c
--- /dev/null
+++ b/types/node-portscanner/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for portscanner 2.1
+// Project: https://github.com/baalexander/node-portscanner
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'portscanner' {
+    type Status = 'open' | 'closed';
+
+    type PortCallback = (error: Error | null, port: number) => void;
+    type StatusCallback = (error: Error | null, port: Status) => void;
+
+    interface Options {
+        host?: string;
+        timeout?: number;
+    }
+
+    function checkPortStatus(port: number): Promise<Status>;
+
+    function checkPortStatus(port: number, host: string): Promise<Status>;
+    function checkPortStatus(port: number, opts: Options): Promise<Status>;
+    function checkPortStatus(port: number, checkPortCallback: StatusCallback): void;
+
+    function checkPortStatus(port: number, host: string, opts: Options): Promise<Status>;
+    function checkPortStatus(port: number, host: string, checkPortCallback: StatusCallback): void;
+    function checkPortStatus(port: number, opts: Options, checkPortCallback: StatusCallback): void;
+
+    function checkPortStatus(port: number, host: string, opts: Options, checkPortCallback: StatusCallback): void;
+
+    function findAPortNotInUse(portList: number[]): Promise<number>;
+    function findAPortNotInUse(startPort: number): Promise<number>;
+
+    function findAPortNotInUse(portList: number[], findPortCallback: PortCallback): void;
+    function findAPortNotInUse(portList: number[], host: string): Promise<number>;
+    function findAPortNotInUse(startPort: number, findPortCallback: PortCallback): void;
+    function findAPortNotInUse(startPort: number, host: string): Promise<number>;
+    function findAPortNotInUse(startPort: number, endPort: number): Promise<number>;
+
+    function findAPortNotInUse(startPort: number, endPort: number, host: string): Promise<number>;
+    function findAPortNotInUse(startPort: number, endPort: number, findPortCallback: PortCallback): void;
+
+    function findAPortNotInUse(startPort: number, endPort: number, host: string, findPortCallback: PortCallback): void;
+
+    function findAPortInUse(portList: number[]): Promise<number>;
+    function findAPortInUse(startPort: number): Promise<number>;
+
+    function findAPortInUse(portList: number[], findPortCallback: PortCallback): void;
+    function findAPortInUse(portList: number[], host: string): Promise<number>;
+    function findAPortInUse(startPort: number, findPortCallback: PortCallback): void;
+    function findAPortInUse(startPort: number, host: string): Promise<number>;
+    function findAPortInUse(startPort: number, endPort: number): Promise<number>;
+
+    function findAPortInUse(startPort: number, endPort: number, host: string): Promise<number>;
+    function findAPortInUse(startPort: number, endPort: number, findPortCallback: PortCallback): void;
+
+    function findAPortInUse(startPort: number, endPort: number, host: string, findPortCallback: PortCallback): void;
+}
diff --git a/types/node-portscanner/node-portscanner-tests.ts b/types/node-portscanner/node-portscanner-tests.ts
new file mode 100644
index 0000000000..3eb4243e86
--- /dev/null
+++ b/types/node-portscanner/node-portscanner-tests.ts
@@ -0,0 +1,76 @@
+import * as portscanner from 'portscanner';
+declare function assert(cond: boolean): void;
+
+const checkPortCallback = (error: Error | null, status: portscanner.Status) => {
+    assert(error === null);
+    error && assert(error.message === '');
+    assert(status === 'open');
+    assert(status === 'closed');
+};
+
+const assertStatus = (status: portscanner.Status) => {
+    assert(status === 'open');
+    assert(status === 'closed');
+};
+
+portscanner.checkPortStatus(3000).then(assertStatus);
+
+portscanner.checkPortStatus(3000, '127.0.0.1').then(assertStatus);
+portscanner.checkPortStatus(3000, { host: '127.0.0.1' }).then(assertStatus);
+portscanner.checkPortStatus(3000, { timeout: 400 }).then(assertStatus);
+portscanner.checkPortStatus(3000, checkPortCallback);
+
+portscanner.checkPortStatus(3000, { host: '127.0.0.1' }, checkPortCallback);
+portscanner.checkPortStatus(3000, { timeout: 400 }, checkPortCallback);
+portscanner.checkPortStatus(3000, '127.0.0.1', checkPortCallback);
+
+portscanner.checkPortStatus(3000, '127.0.0.1', { timeout: 400 }).then(assertStatus);
+portscanner.checkPortStatus(3000, '127.0.0.1', { timeout: 400 }, checkPortCallback);
+
+const findPortCallback = (error: Error | null, port: number) => {
+    assert(error === null);
+    error && assert(error.message === '');
+    assert(port === 3005);
+};
+
+const assertPort = (port: number) => {
+    assert(port === 3005);
+};
+
+// one argument
+portscanner.findAPortNotInUse([3000, 3005, 3006]).then(assertPort);
+portscanner.findAPortNotInUse(3000).then(assertPort);
+
+// two arguments
+portscanner.findAPortNotInUse([3000, 3005, 3006], findPortCallback);
+portscanner.findAPortNotInUse([3000, 3005, 3006], '127.0.0.1').then(assertPort);
+
+portscanner.findAPortNotInUse(3000, findPortCallback);
+portscanner.findAPortNotInUse(3000, '127.0.0.1').then(assertPort);
+portscanner.findAPortNotInUse(3000, 3010).then(assertPort);
+
+// three arguments
+portscanner.findAPortNotInUse(3000, 3010, '127.0.0.1').then(assertPort);
+portscanner.findAPortNotInUse(3000, 3010, findPortCallback);
+
+// four argumentss
+portscanner.findAPortNotInUse(3000, 3010, '127.0.0.1', findPortCallback);
+
+// one argument
+portscanner.findAPortInUse([3000, 3005, 3006]).then(assertPort);
+portscanner.findAPortInUse(3000).then(assertPort);
+
+// two arguments
+portscanner.findAPortInUse([3000, 3005, 3006], findPortCallback);
+portscanner.findAPortInUse([3000, 3005, 3006], '127.0.0.1').then(assertPort);
+
+portscanner.findAPortInUse(3000, findPortCallback);
+portscanner.findAPortInUse(3000, '127.0.0.1').then(assertPort);
+portscanner.findAPortInUse(3000, 3010).then(assertPort);
+
+// three arguments
+portscanner.findAPortInUse(3000, 3010, '127.0.0.1').then(assertPort);
+portscanner.findAPortInUse(3000, 3010, findPortCallback);
+
+// four argumentss
+portscanner.findAPortInUse(3000, 3010, '127.0.0.1', findPortCallback);
diff --git a/types/node-portscanner/tsconfig.json b/types/node-portscanner/tsconfig.json
new file mode 100644
index 0000000000..f9ce1f0f99
--- /dev/null
+++ b/types/node-portscanner/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-portscanner-tests.ts"
+    ]
+}
diff --git a/types/node-portscanner/tslint.json b/types/node-portscanner/tslint.json
new file mode 100644
index 0000000000..73e1c17705
--- /dev/null
+++ b/types/node-portscanner/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-single-declare-module": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/node-ral/index.d.ts b/types/node-ral/index.d.ts
new file mode 100644
index 0000000000..27bad13293
--- /dev/null
+++ b/types/node-ral/index.d.ts
@@ -0,0 +1,207 @@
+// Type definitions for node-ral 0.18
+// Project: https://github.com/fex-team/node-ral
+// Definitions by: ssddi456 <https://github.com/ssddi456>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from 'events';
+import { Request, Response, NextFunction } from "express";
+
+export interface LogInfo {
+    service: string;
+    requestID: string;
+    conv: string;
+    prot: string;
+    method: string;
+    path: string;
+    proxy: string;
+    query: string;
+    remote: string;
+    cost: string;
+    talk: string;
+    write: string;
+    read: string;
+    pack: string;
+    unpack: string;
+    retry: string;
+}
+
+export function RAL(serviceName: string, options?: {}): RAL.RalRunner;
+export namespace RAL {
+    function appendExtPath(extPath: string): void;
+    function setConfigNormalizer(normalizers: ConfigNormalizer): void;
+    function getConf(name: string): Config;
+    function getRawConf(name: string): Config;
+    function init(options?: {}): void;
+    function reload(options?: {}): void;
+
+    class RalRunner extends EventEmitter {
+        constructor(serviceName: string, options?: {});
+        doRequest(): void;
+        getLogInfo(): LogInfo;
+        throwError(err: any): void;
+        callRetry(err: any): void;
+    }
+
+    class NormalizerManager {
+        constructor()
+        normalizers: string[];
+        setConfigNormalizer(normalizers: string[]): void;
+        needUpdate(config: any): boolean;
+        apply(config: {}): {};
+    }
+}
+
+export interface Config {
+    loadRawConf(config?: Service): Service;
+    load(confPath: string): {};
+    normalizerManager: RAL.NormalizerManager;
+    normalize(config?: Service): {};
+    getContext(serviceID: string, options?: Service): Service;
+    getConf(name: string): Service;
+    clearConf(): void;
+    getConfNames(): string[];
+    getRawConf(): any;
+    getUpdateNeededRawConf(): any;
+    enableUpdate(interval: number, all: boolean, cb: (err: any, confs: any) => any): void;
+    disableUpdate(): void;
+    isAutoUpdateEnabled(): boolean;
+}
+
+export const Config: Config;
+
+export abstract class RalModule {
+    constructor();
+
+    abstract getCategory(): string;
+
+    abstract getName(): string;
+
+    static clearCache(): void;
+
+    static load(pathOrModule: string | RalModule): void;
+
+    static modules: {
+        [key: string]: RalModule
+    };
+}
+
+export interface Server {
+    idc?: string;
+    host: string;
+    port: string | number;
+}
+
+export type buildInConverter = 'form' | 'formData' | 'json' | 'protobuf' | 'querystring' | 'raw' | 'redis' | 'stream' | 'string';
+export interface Service {
+    method?: 'GET' | 'POST';
+    server: Server[];
+    hybird?: boolean;
+    timeout?: number;
+    retry?: number;
+    unpack: buildInConverter;
+    pack: buildInConverter;
+    encoding?: 'utf-8' | 'GBK';
+    balance: 'random' | 'roundrobin' | 'hashring';
+    protocol: 'http' | 'https' | 'soap' | 'redis';
+    headers?: {
+        [key: string]: string | number
+    };
+    query?: any;
+    data?: any;
+    path?: string;
+}
+
+export type BalanceContextConstructor = new (serviceID: string, service: Service) => Balance.BalanceContextClass;
+
+export abstract class Balance {
+    constructor();
+
+    abstract fetchServer(balanceContext: Balance.BalanceContextClass, conf: any, prevBackend: Server): Server;
+
+    getCategory(): any;
+
+    getContextClass(): BalanceContextConstructor;
+
+    static BalanceContext: BalanceContextConstructor;
+}
+
+export namespace Balance {
+    class BalanceContextClass {
+        constructor(serviceID: string, service: Service)
+        currentIDC: string;
+        serviceID: string;
+        reqIDCServers: string[];
+        crossIDCServers: string[];
+    }
+}
+
+export abstract class Converter extends RalModule {
+    constructor();
+
+    getCategory(): string;
+
+    abstract pack(config: Service, data: any): Buffer;
+
+    abstract unpack(config: Service, data: any): any;
+
+    isStreamify: false;
+}
+
+export abstract class Protocol extends RalModule {
+    constructor();
+
+    beforeRequest(context: any): any;
+
+    getCategory(): string;
+
+    normalizeConfig(context: any): any;
+
+    talk(config: any, callback: any): any;
+
+    abstract _request(config: any, callback: (...param: any[]) => any): any;
+
+    static beforeRequest(context: any): any;
+
+    static normalizeConfig(context: any): any;
+}
+
+export interface LoggerFactory {
+    (prefix: string): RalLogger;
+    options: {
+        format_wf: string;
+        log_path: string;
+        app: string;
+        logInstance: RalLogger;
+    };
+}
+export interface RalLogger {
+    notice(...param: any[]): void;
+    warning(...param: any[]): void;
+    fatal(...param: any[]): void;
+    trace(...param: any[]): void;
+    debug(...param: any[]): void;
+}
+
+export const Logger: LoggerFactory;
+
+export abstract class ConfigNormalizer extends RalModule {
+    constructor();
+
+    getCategory(): string;
+
+    abstract normalizeConfig(config: any): Config;
+
+    abstract needUpdate(config?: any): boolean;
+}
+
+export function Middleware(options?: Service): (req: Request, resp: Response, next: NextFunction) => void;
+
+export function RALPromise<T>(name: string, options?: {}): Promise<T>;
+export namespace RALPromise {
+    import appendExtPath = RAL.appendExtPath;
+    import setConfigNormalizer = RAL.setConfigNormalizer;
+    import getConf = RAL.getConf;
+    import getRawConf = RAL.getRawConf;
+    import init = RAL.init;
+    import reload = RAL.reload;
+}
diff --git a/types/node-ral/node-ral-tests.ts b/types/node-ral/node-ral-tests.ts
new file mode 100644
index 0000000000..a625c37da4
--- /dev/null
+++ b/types/node-ral/node-ral-tests.ts
@@ -0,0 +1,70 @@
+import * as nodeRal from "node-ral";
+
+class FormConverter extends nodeRal.Converter {
+    pack(config: nodeRal.Service, data: {}) {
+        return new Buffer('123');
+    }
+    unpack(config: nodeRal.Service, data: {}) {
+        return {};
+    }
+    getName() {
+        return 'form';
+    }
+}
+
+class HashringBalance extends nodeRal.Balance {
+    getName() {
+        return 'hashring';
+    }
+    fetchServer(balanceContext: nodeRal.Balance.BalanceContextClass, conf: {}, prevBackend: nodeRal.Server) {
+        return <nodeRal.Server> {};
+    }
+}
+
+class HttpProtocol extends nodeRal.Protocol {
+    getName() {
+        return 'http';
+    }
+    _request(config: any, callback: (err: any, data: any) => any) {
+        callback(new Error(), '123');
+    }
+}
+
+class DefaultConfigNormalizer extends nodeRal.ConfigNormalizer {
+    getName() {
+        return 'default';
+    }
+    needUpdate() {
+        return false;
+    }
+    normalizeConfig(config: any) {
+        return config;
+    }
+}
+
+const runner = nodeRal.RAL('test', {});
+runner.on('data', function() {
+    // yeap
+});
+runner.doRequest();
+
+nodeRal.RAL.init();
+
+nodeRal.RALPromise('test', {}).then;
+
+nodeRal.Config.loadRawConf;
+nodeRal.Config.load;
+nodeRal.Config.normalizerManager;
+nodeRal.Config.normalize;
+nodeRal.Config.getContext;
+nodeRal.Config.getConf;
+nodeRal.Config.clearConf;
+nodeRal.Config.getConfNames;
+nodeRal.Config.getRawConf;
+nodeRal.Config.getUpdateNeededRawConf;
+nodeRal.Config.enableUpdate;
+nodeRal.Config.disableUpdate;
+nodeRal.Config.isAutoUpdateEnabled;
+
+const logger = nodeRal.Logger('some');
+logger.debug('test');
diff --git a/types/node-ral/tsconfig.json b/types/node-ral/tsconfig.json
new file mode 100644
index 0000000000..f5e25638b8
--- /dev/null
+++ b/types/node-ral/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-ral-tests.ts"
+    ]
+}
diff --git a/types/node-ral/tslint.json b/types/node-ral/tslint.json
new file mode 100644
index 0000000000..b3fc134bd9
--- /dev/null
+++ b/types/node-ral/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": [
+            false
+        ]
+    }
+}
\ No newline at end of file
diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
new file mode 100644
index 0000000000..faafdf7d24
--- /dev/null
+++ b/types/node-rsa/index.d.ts
@@ -0,0 +1,197 @@
+// Type definitions for node-rsa 0.4
+// Project: https://github.com/rzcoder/node-rsa
+// Definitions by: Ali Taheri <https://github.com/alitaheri>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+declare class NodeRSA {
+    /**
+     * Generate new key with length specified.
+     */
+    constructor(key?: NodeRSA.KeyBits);
+
+    /**
+     * Load key from string/buffer/components.
+     */
+    constructor(key: NodeRSA.Key, format?: NodeRSA.Format, options?: NodeRSA.Options);
+
+    /**
+     * @param bits Key size in bits. 2048 by default.
+     * @param exponent public exponent. 65537 by default.
+     */
+    generateKeyPair(bits?: number, exponent?: number): void;
+
+    /**
+     * Import key from PEM string, PEM/DER Buffer or components.
+     */
+    importKey(key: NodeRSA.Key, format?: NodeRSA.Format): void;
+
+    /**
+     * Export key to PEM string, PEM/DER Buffer or components.
+     */
+    exportKey(format?: NodeRSA.Format): NodeRSA.Key;
+
+    isPrivate(): boolean;
+
+    /**
+     * @param strict if true method will return false if key pair have private exponent. Default false.
+     */
+    isPublic(strict?: boolean): boolean;
+
+    /**
+     * Return true if key pair doesn't have any data.
+     */
+    isEmpty(): boolean;
+
+    /**
+     * Return key size in bits.
+     */
+    getKeySize(): number;
+
+    /**
+     * Return max data size for encrypt in bytes.
+     */
+    getMaxMessageSize(): number;
+
+    encrypt(data: NodeRSA.Data, encoding?: 'buffer'): Buffer;
+    encrypt(data: NodeRSA.Data, encoding: NodeRSA.Encoding): string;
+    encrypt(data: Buffer, encoding: 'buffer', sourceEncoding?: NodeRSA.Encoding): Buffer;
+    encrypt(data: Buffer, encoding: NodeRSA.Encoding, sourceEncoding?: NodeRSA.Encoding): string;
+
+    encryptPrivate(data: NodeRSA.Data, encoding?: 'buffer'): Buffer;
+    encryptPrivate(data: NodeRSA.Data, encoding: NodeRSA.Encoding): string;
+    encryptPrivate(data: Buffer, encoding: 'buffer', sourceEncoding?: NodeRSA.Encoding): Buffer;
+    encryptPrivate(data: Buffer, encoding: NodeRSA.Encoding, sourceEncoding?: NodeRSA.Encoding): string;
+
+    decrypt(data: Buffer | string, encoding?: 'buffer'): Buffer;
+    decrypt(data: Buffer | string, encoding: NodeRSA.Encoding): string;
+    decrypt<T extends object>(data: Buffer | string, encoding: 'json'): T;
+
+    decryptPublic(data: Buffer | string, encoding?: 'buffer'): Buffer;
+    decryptPublic(data: Buffer | string, encoding: NodeRSA.Encoding): string;
+    decryptPublic<T extends object>(data: Buffer | string, encoding: 'json'): T;
+
+    sign(data: NodeRSA.Data, encoding?: 'buffer'): Buffer;
+    sign(data: NodeRSA.Data, encoding: NodeRSA.Encoding): string;
+    sign(data: Buffer, encoding: 'buffer', sourceEncoding?: NodeRSA.Encoding): Buffer;
+    sign(data: Buffer, encoding: NodeRSA.Encoding, sourceEncoding?: NodeRSA.Encoding): string;
+
+    verify(data: NodeRSA.Data, signature: Buffer): boolean;
+    verify(data: Buffer, signature: Buffer, sourceEncoding?: NodeRSA.Encoding): boolean;
+    verify(data: Buffer, signature: string, sourceEncoding: NodeRSA.Encoding, signatureEncoding: NodeRSA.Encoding): boolean;
+    verify(data: NodeRSA.Data, signature: string, sourceEncoding: undefined, signatureEncoding: NodeRSA.Encoding): boolean;
+}
+
+declare namespace NodeRSA {
+    type Key = string | Buffer | KeyComponents;
+    type Data = string | object | any[];
+
+    type Format =
+        | 'private' | 'public'
+        | 'pkcs1' | 'pkcs1-pem' | 'pkcs1-der'
+        | 'pkcs1-private' | 'pkcs1-private-pem' | 'pkcs1-private-der'
+        | 'pkcs1-public' | 'pkcs1-public-pem' | 'pkcs1-public-der'
+        | 'pkcs8' | 'pkcs8-pem' | 'pkcs8-der'
+        | 'pkcs8-private' | 'pkcs8-private-pem' | 'pkcs8-private-der'
+        | 'pkcs8-public' | 'pkcs8-public-pem' | 'pkcs8-public-der'
+        | 'components' | 'components-pem' | 'components-der'
+        | 'components-private' | 'components-private-pem' | 'components-private-der'
+        | 'components-public' | 'components-public-pem' | 'components-public-der';
+
+    type EncryptionScheme = 'pkcs1_oaep' | 'pkcs1';
+
+    type HashingAlgorithm =
+        | 'ripemd160'
+        | 'md4' | 'md5'
+        | 'sha' | 'sha1'
+        | 'sha224' | 'sha256' | 'sha384' | 'sha512';
+
+    type SigningScheme = 'pkcs1' | 'pss';
+
+    type SigningSchemeHash =
+        | 'pkcs1-ripemd160'
+        | 'pkcs1-md4' | 'pkcs1-md5'
+        | 'pkcs1-sha' | 'pkcs1-sha1'
+        | 'pkcs1-sha224' | 'pkcs1-sha256' | 'pkcs1-sha384' | 'pkcs1-sha512'
+        | 'pss-ripemd160'
+        | 'pss-md4' | 'pss-md5'
+        | 'pss-sha' | 'pss-sha1'
+        | 'pss-sha224' | 'pss-sha256' | 'pss-sha384' | 'pss-sha512';
+
+    type Encoding =
+        | 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'latin1'
+        | 'base64' | 'hex' | 'binary';
+
+    interface KeyComponents {
+        n: Buffer;
+        e: Buffer | number;
+        d: Buffer;
+        p: Buffer;
+        q: Buffer;
+        dmp1: Buffer;
+        dmq1: Buffer;
+        coeff: Buffer;
+    }
+
+    interface KeyBits {
+        /**
+         * The length of the key in bits.
+         */
+        b: number;
+    }
+
+    interface AdvancedEncryptionSchemePKCS1 {
+        scheme: 'pkcs1';
+        padding: number;
+    }
+
+    interface AdvancedEncryptionSchemePKCS1OAEP {
+        scheme: 'pkcs1_oaep';
+        hash: HashingAlgorithm;
+
+        /**
+         * Mask generation function.
+         */
+        mgf?(data: Buffer, length: number, hash: HashingAlgorithm): Buffer;
+    }
+
+    type AdvancedEncryptionScheme =
+        | AdvancedEncryptionSchemePKCS1
+        | AdvancedEncryptionSchemePKCS1OAEP;
+
+    interface AdvancedSigningSchemePSS {
+        scheme: 'pss';
+        hash: HashingAlgorithm;
+        saltLength: number;
+    }
+
+    interface AdvancedSigningSchemePKCS1 {
+        scheme: 'pkcs1';
+        hash: HashingAlgorithm;
+    }
+
+    type AdvancedSigningScheme =
+        | AdvancedSigningSchemePSS
+        | AdvancedSigningSchemePKCS1;
+
+    interface Options {
+        /**
+         * Working environment. (auto detects by default)
+         */
+        environment?: 'browser' | 'node';
+
+        /**
+         * Padding scheme for encrypt/decrypt. Default is 'pkcs1_oaep'.
+         */
+        encryptionScheme?: EncryptionScheme | AdvancedEncryptionScheme;
+
+        /**
+         * scheme used for signing and verifying.. Default 'pkcs1-sha256', or, if chosen pss: 'pss-sha1'.
+         */
+        signingScheme?: SigningScheme | SigningSchemeHash | AdvancedSigningScheme;
+    }
+}
+
+export = NodeRSA;
diff --git a/types/node-rsa/node-rsa-tests.ts b/types/node-rsa/node-rsa-tests.ts
new file mode 100644
index 0000000000..798d0f6362
--- /dev/null
+++ b/types/node-rsa/node-rsa-tests.ts
@@ -0,0 +1,51 @@
+import * as NodeRSA from 'node-rsa';
+
+const key = new NodeRSA({ b: 512 });
+
+const text = 'Hello RSA!';
+const encrypted = key.encrypt(text, 'base64');
+const decrypted = key.decrypt(encrypted, 'utf8');
+
+const emptyKey = new NodeRSA();
+emptyKey.generateKeyPair();
+emptyKey.generateKeyPair(512);
+emptyKey.generateKeyPair(512, 65537);
+
+const newKey = new NodeRSA({ b: 512 });
+
+const keyFromPEM = new NodeRSA(
+	'-----BEGIN RSA PRIVATE KEY-----\n' +
+	'MIIBOQIBAAJAVY6quuzCwyOWzymJ7C4zXjeV/232wt2ZgJZ1kHzjI73wnhQ3WQcL\n' +
+	'DFCSoi2lPUW8/zspk0qWvPdtp6Jg5Lu7hwIDAQABAkBEws9mQahZ6r1mq2zEm3D/\n' +
+	'VM9BpV//xtd6p/G+eRCYBT2qshGx42ucdgZCYJptFoW+HEx/jtzWe74yK6jGIkWJ\n' +
+	'AiEAoNAMsPqwWwTyjDZCo9iKvfIQvd3MWnmtFmjiHoPtjx0CIQCIMypAEEkZuQUi\n' +
+	'pMoreJrOlLJWdc0bfhzNAJjxsTv/8wIgQG0ZqI3GubBxu9rBOAM5EoA4VNjXVigJ\n' +
+	'QEEk1jTkp8ECIQCHhsoq90mWM/p9L5cQzLDWkTYoPI49Ji+Iemi2T5MRqwIgQl07\n' +
+	'Es+KCn25OKXR/FJ5fu6A6A+MptABL3r8SEjlpLc=\n' +
+	'-----END RSA PRIVATE KEY-----'
+);
+
+const keyData = '-----BEGIN PUBLIC KEY----- ... -----END PUBLIC KEY-----';
+key.importKey(keyData, 'pkcs8');
+const publicDer = key.exportKey('pkcs8-public-der');
+const privateDer = key.exportKey('pkcs1-der');
+key.importKey({
+	n: new Buffer('0086fa9ba066685845fc03833a9699c8baefb53cfbf19052a7f10f1eaa30488cec1ceb752bdff2df9fad6c64b3498956e7dbab4035b4823c99a44cc57088a23783', 'hex'),
+	e: 65537,
+	d: new Buffer('5d2f0dd982596ef781affb1cab73a77c46985c6da2aafc252cea3f4546e80f40c0e247d7d9467750ea1321cc5aa638871b3ed96d19dcc124916b0bcb296f35e1', 'hex'),
+	p: new Buffer('00c59419db615e56b9805cc45673a32d278917534804171edcf925ab1df203927f', 'hex'),
+	q: new Buffer('00aee3f86b66087abc069b8b1736e38ad6af624f7ea80e70b95f4ff2bf77cd90fd', 'hex'),
+	dmp1: new Buffer('008112f5a969fcb56f4e3a4c51a60dcdebec157ee4a7376b843487b53844e8ac85', 'hex'),
+	dmq1: new Buffer('1a7370470e0f8a4095df40922a430fe498720e03e1f70d257c3ce34202249d21', 'hex'),
+	coeff: new Buffer('00b399675e5e81506b729a777cc03026f0b2119853dfc5eb124610c0ab82999e45', 'hex')
+}, 'components');
+const publicComponents = key.exportKey('components-public');
+
+key.isPrivate();
+key.isPublic(true);
+key.isPublic();
+
+key.isEmpty();
+
+key.getKeySize();
+key.getMaxMessageSize();
diff --git a/types/node-rsa/tsconfig.json b/types/node-rsa/tsconfig.json
new file mode 100644
index 0000000000..dd128fe3be
--- /dev/null
+++ b/types/node-rsa/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-rsa-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/node-rsa/tslint.json b/types/node-rsa/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-rsa/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-static/index.d.ts b/types/node-static/index.d.ts
new file mode 100644
index 0000000000..23e5ba1f87
--- /dev/null
+++ b/types/node-static/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for node-static 0.7
+// Project: https://github.com/cloudhead/node-static
+// Definitions by: Ben Davies <https://github.com/Morfent>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as events from 'events';
+import * as fs from 'fs';
+import * as http from 'http';
+import * as mime from 'mime';
+
+export interface Headers { [k: string]: any; }
+export type Finish = (status: number, headers?: Headers) => void;
+export type Callback = (e: Error) => void;
+
+export interface Options {
+	headers?: Headers;
+	indexFile?: string;
+	cache?: number | boolean;
+	serverInfo?: Buffer;
+	server?: string;
+	"cache-control"?: string;
+}
+
+export interface ByteRange {
+	from: number;
+	to: number;
+	valid: boolean;
+}
+
+export class Server {
+	root: string;
+	options: Options;
+	cache: number | boolean;
+	defaultHeaders: Headers;
+	serverInfo: string;
+	constructor(root: string, options?: Options);
+
+	serveDir: (pathname: string, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => void;
+	serveFile: (pathname: string, status: number, headers: Headers, req: http.ServerRequest, res: http.ServerResponse) => events.EventEmitter;
+	finish: (status: number, headers: Headers, req: http.ServerRequest, res: http.ServerResponse, promise: events.EventEmitter, callback: Callback) => void;
+	servePath: (pathname: string, status: number, headers: Headers, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => events.EventEmitter;
+	resolve: (pathname: string) => string;
+	serve: (req: http.ServerRequest, res: http.ServerResponse, callback: Callback) => events.EventEmitter;
+	gzipOk: (req: http.ServerRequest, contentType: string) => boolean;
+	respondGzip: (pathname: string, status: number, contentType: string, _headers: Headers, files: string[], stat: fs.Stats, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => void;
+	parseByteRange: (req: http.ServerRequest, stat: fs.Stats) => ByteRange;
+	// tslint:disable-next-line max-line-length
+	respondNoGzip: (pathname: string, status: number, contentType: string, _headers: Headers, files: string[], stat: fs.Stats, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => void;
+	respond: (pathname: string, status: number, _headers: Headers, files: string[], stat: fs.Stats, req: http.ServerRequest, res: http.ServerResponse, finish: Finish) => void;
+	stream: (pathname: string, files: string[], length: number, startByte: number, res: http.ServerResponse, callback: Callback) => void;
+}
+
+export const version: [number, number, number];
+export {mime};
diff --git a/types/node-static/node-static-tests.ts b/types/node-static/node-static-tests.ts
new file mode 100644
index 0000000000..471a8fde50
--- /dev/null
+++ b/types/node-static/node-static-tests.ts
@@ -0,0 +1,7 @@
+import {Server, version, mime} from 'node-static';
+
+let server = new Server(__dirname);
+let pathname = server.resolve('./tsconfig.json');
+let mimetype = mime.lookup(pathname, '');
+let versionNum = version.join('.');
+console.log(`The node-static server constructed an instance of itself, fetched the mimetype of ${pathname} (${mimetype}), and has a version of ${versionNum}! The package is working.`);
diff --git a/types/node-static/tsconfig.json b/types/node-static/tsconfig.json
new file mode 100644
index 0000000000..e857fac482
--- /dev/null
+++ b/types/node-static/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "node-static-tests.ts"
+  ]
+}
diff --git a/types/node-static/tslint.json b/types/node-static/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/node-static/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
new file mode 100644
index 0000000000..1a7d15ec34
--- /dev/null
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for node-telegram-bot-api 0.27
+// Project: https://github.com/yagop/node-telegram-bot-api
+// Definitions by: Alex Muench <https://github.com/ammuench>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare class TelegramBot {
+    constructor(token: string, opts?: any);
+
+    startPolling(options?: any): Promise<any>;
+    initPolling(options?: any): Promise<any>;
+    stopPolling(): Promise<any>;
+    isPolling(): boolean;
+    openWebHook(): Promise<any>;
+    closeWebHook(): Promise<any>;
+    hasOpenWebHook(): boolean;
+    getMe(): Promise<any>;
+    setWebHook(url: string, options?: any): Promise<any>;
+    deleteWebHook(): Promise<any>;
+    getWebHookInfo(): Promise<any>;
+    getUpdates(options?: any): Promise<any>;
+    processUpdate(update: any): void;
+    sendMessage(chatId: number | string, text: string, options?: any): Promise<any>;
+    answerInlineQuery(inlineQueryId: string, results: any[], options?: any): Promise<any>;
+    forwardMessage(chatId: number | string, fromChatId: number | string, messageId: number | string, options?: any): Promise<any>;
+    sendPhoto(chatId: number | string, photo: any, options?: any): Promise<any>;
+    sendAudio(chatId: number | string, audio: any, options?: any): Promise<any>;
+    sendDocument(chatId: number | string, doc: any, options?: any, fileOpts?: any): Promise<any>;
+    sendSticker(chatId: number | string, sticker: any, options?: any): Promise<any>;
+    sendVideo(chatId: number | string, video: any, options?: any): Promise<any>;
+    sendVoice(chatId: number | string, voice: any, options?: any): Promise<any>;
+    sendChatAction(chatId: number | string, action: string): Promise<any>;
+    kickChatMember(chatId: number | string, userId: string): Promise<any>;
+    unbanChatMember(chatId: number | string, userId: string): Promise<any>;
+    answerCallbackQuery(callbackQueryId: number | string, text: string, showAlert: boolean, options?: any): Promise<any>;
+    editMessageText(text: string, options?: any): Promise<any>;
+    editMessageCaption(caption: string, options?: any): Promise<any>;
+    editMessageReplyMarkup(replyMarkup: any, options?: any): Promise<any>;
+    getUserProfilePhotos(userId: string, options?: any): Promise<any>;
+    sendLocation(chatId: number | string, latitude: number, longitude: number, options?: any): Promise<any>;
+    sendVenue(chatId: number | string, latitude: number, longitude: number, title: string, address: string, options?: any): Promise<any>;
+    sendContact(chatId: number | string, phoneNumber: string, firstName: string, options?: any): Promise<any>;
+    getFile(fileId: string): Promise<any>;
+    getFileLink(fileId: string): Promise<any>;
+    downloadFile(fileId: string, downloadDir: string): Promise<any>;
+    onText(regexp: any, callback: ((msg: any, match: any[]) => void)): void;
+    onReplyToMessage(chatId: number | string, messageId: number | string, callback: ((msg: any) => void)): number;
+    removeReplyListener(replyListenerId: number): any;
+    getChat(chatId: number | string): Promise<any>;
+    getChatAdministrators(chatId: number | string): Promise<any>;
+    getChatMembersCount(chatId: number | string): Promise<any>;
+    getChatMember(chatId: number | string, userId: string): Promise<any>;
+    leaveChat(chatId: number | string): Promise<any>;
+    sendGame(chatId: number | string, gameShortName: string, options?: any): Promise<any>;
+    setGameScore(userId: string, score: number, options?: any): Promise<any>;
+    getGameHighScores(userId: string, options?: any): Promise<any>;
+}
+
+export = TelegramBot;
diff --git a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
new file mode 100644
index 0000000000..80b44216fb
--- /dev/null
+++ b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
@@ -0,0 +1,51 @@
+import TelegramBot = require("node-telegram-bot-api");
+
+const MyTelegramBot = new TelegramBot("token");
+
+MyTelegramBot.startPolling({ foo: "bar" });
+MyTelegramBot.initPolling({ foo: "bar" });
+MyTelegramBot.stopPolling();
+MyTelegramBot.isPolling();
+MyTelegramBot.openWebHook();
+MyTelegramBot.closeWebHook();
+MyTelegramBot.hasOpenWebHook();
+MyTelegramBot.getMe();
+MyTelegramBot.setWebHook("http://typescriptlang.org", { foo: "bar" });
+MyTelegramBot.deleteWebHook();
+MyTelegramBot.getWebHookInfo();
+MyTelegramBot.getUpdates({ foo: "bar" });
+MyTelegramBot.processUpdate("Update Method/Stream/Etc");
+MyTelegramBot.sendMessage(1234, "test-text", { foo: "bar" });
+MyTelegramBot.answerInlineQuery("queryId", ["test", "test", "test"], { foo: "bar" });
+MyTelegramBot.forwardMessage(1234, 5678, "memberID", { foo: "bar" });
+MyTelegramBot.sendPhoto(1234, "photo/path", { foo: "bar" });
+MyTelegramBot.sendAudio(1234, "audio/path", { foo: "bar" });
+MyTelegramBot.sendDocument(1234, "doc/path", { foo: "bar" }, { fileOption: true });
+MyTelegramBot.sendSticker(1234, "sticker/path", { foo: "bar" });
+MyTelegramBot.sendVideo(1234, "video/path", { foo: "bar" });
+MyTelegramBot.sendVoice(1234, "voice/path", { foo: "bar" });
+MyTelegramBot.sendChatAction(1234, "ACTION!");
+MyTelegramBot.kickChatMember(1234, "myUserID");
+MyTelegramBot.unbanChatMember(1234, "myUserID");
+MyTelegramBot.answerCallbackQuery("myCallbackQueryID", "test-text", false, { foo: "bar" });
+MyTelegramBot.editMessageText("test-text", { foo: "bar" });
+MyTelegramBot.editMessageCaption("My Witty Caption", { foo: "bar" });
+MyTelegramBot.editMessageReplyMarkup({ replyMarkup: "something" }, { foo: "bar" });
+MyTelegramBot.getUserProfilePhotos("myUserID", { foo: "bar" });
+MyTelegramBot.sendLocation(1234, 100, 200, { foo: "bar" });
+MyTelegramBot.sendVenue(1234, 100, 200, "Venue Title", "123 Fake St.", { foo: "bar" });
+MyTelegramBot.sendContact(1234, "345-555-0192", "John", { foo: "bar" });
+MyTelegramBot.getFile("My/File/ID");
+MyTelegramBot.getFileLink("My/File/ID");
+MyTelegramBot.downloadFile("My/File/ID", "mydownloaddir/");
+MyTelegramBot.onText(/regex/, (msg, match) => { });
+MyTelegramBot.onReplyToMessage(1234, "mymessageID", (msg) => { });
+MyTelegramBot.removeReplyListener(5466);
+MyTelegramBot.getChat(1234);
+MyTelegramBot.getChatAdministrators(1234);
+MyTelegramBot.getChatMembersCount(1234);
+MyTelegramBot.getChatMember(1234, "myUserID");
+MyTelegramBot.leaveChat(1234);
+MyTelegramBot.sendGame(1234, "MygameName", { foo: "bar" });
+MyTelegramBot.setGameScore("myUserID", 99, { foo: "bar" });
+MyTelegramBot.getGameHighScores("myUserID", { foo: "bar" });
diff --git a/types/node-telegram-bot-api/tsconfig.json b/types/node-telegram-bot-api/tsconfig.json
new file mode 100644
index 0000000000..253e5929e6
--- /dev/null
+++ b/types/node-telegram-bot-api/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-telegram-bot-api-tests.ts"
+    ]
+}
diff --git a/types/node-telegram-bot-api/tslint.json b/types/node-telegram-bot-api/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/node-telegram-bot-api/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 84c5773976..952cf98e4d 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,11 +1,17 @@
-// Type definitions for Node.js v7.x
+// Type definitions for Node.js v8.x
 // Project: http://nodejs.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Parambir Singh <https://github.com/parambirs>
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Roberto Desideri <https://github.com/RobDesideri>
+//                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /************************************************
 *                                               *
-*               Node.js v7.x API                *
+*               Node.js v8.x API                *
 *                                               *
 ************************************************/
 
@@ -13,7 +19,7 @@
 interface Console {
     Console: NodeJS.ConsoleConstructor;
     assert(value: any, message?: string, ...optionalParams: any[]): void;
-    dir(obj: any, options?: {showHidden?: boolean, depth?: number, colors?: boolean}): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message?: any, ...optionalParams: any[]): void;
     log(message?: any, ...optionalParams: any[]): void;
@@ -110,7 +116,7 @@ declare var SlowBuffer: {
 
 
 // Buffer class
-type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "binary" | "hex";
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
 interface Buffer extends NodeBuffer { }
 
 /**
@@ -258,6 +264,16 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
+
     export interface ConsoleConstructor {
         prototype: Console;
         new(stdout: WritableStream, stderr?: WritableStream): Console;
@@ -272,10 +288,10 @@ declare namespace NodeJS {
     }
 
     export class EventEmitter {
-        addListener(event: string | symbol, listener: Function): this;
-        on(event: string | symbol, listener: Function): this;
-        once(event: string | symbol, listener: Function): this;
-        removeListener(event: string | symbol, listener: Function): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
         removeAllListeners(event?: string | symbol): this;
         setMaxListeners(n: number): this;
         getMaxListeners(): number;
@@ -283,8 +299,8 @@ declare namespace NodeJS {
         emit(event: string | symbol, ...args: any[]): boolean;
         listenerCount(type: string | symbol): number;
         // Added in Node 6...
-        prependListener(event: string | symbol, listener: Function): this;
-        prependOnceListener(event: string | symbol, listener: Function): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
         eventNames(): (string | symbol)[];
     }
 
@@ -324,10 +340,10 @@ declare namespace NodeJS {
         intercept(cb: (data: any) => any): any;
         dispose(): void;
 
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => 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;
     }
 
@@ -362,6 +378,24 @@ declare namespace NodeJS {
                   | 'sunos'
                   | 'win32';
 
+    type Signals =
+        "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" |
+        "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" |
+        "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" |
+        "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
+
+    type BeforeExitListener = (code: number) => void;
+    type DisconnectListener = () => void;
+    type ExitListener = (code: number) => void;
+    type RejectionHandledListender = (promise: Promise<any>) => void;
+    type UncaughtExceptionListener = (error: Error) => void;
+    type UnhandledRejectionListener = (reason: any, promise: Promise<any>) => void;
+    type WarningListener = (warning: Error) => void;
+    type MessageListener = (message: any, sendHandle: any) => void;
+    type SignalsListener = () => void;
+    type NewListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+    type RemoveListenerListener = (type: string | symbol, listener: (...args: any[]) => void) => void;
+
     export interface Socket extends ReadWriteStream {
         isTTY?: true;
     }
@@ -370,6 +404,7 @@ declare namespace NodeJS {
         stdout: Socket;
         stderr: Socket;
         stdin: Socket;
+        openStdin(): Socket;
         argv: string[];
         argv0: string;
         execArgv: string[];
@@ -377,6 +412,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: any;
         exit(code?: number): never;
         exitCode: number;
@@ -432,6 +468,104 @@ declare namespace NodeJS {
         send?(message: any, sendHandle?: any): void;
         disconnect(): void;
         connected: boolean;
+
+        /**
+         * EventEmitter
+         *   1. beforeExit
+         *   2. disconnect
+         *   3. exit
+         *   4. message
+         *   5. rejectionHandled
+         *   6. uncaughtException
+         *   7. unhandledRejection
+         *   8. warning
+         *   9. message
+         *  10. <All OS Signals>
+         *  11. newListener/removeListener inherited from EventEmitter
+         */
+        addListener(event: "beforeExit", listener: BeforeExitListener): this;
+        addListener(event: "disconnect", listener: DisconnectListener): this;
+        addListener(event: "exit", listener: ExitListener): this;
+        addListener(event: "rejectionHandled", listener: RejectionHandledListender): this;
+        addListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        addListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        addListener(event: "warning", listener: WarningListener): this;
+        addListener(event: "message", listener: MessageListener): this;
+        addListener(event: Signals, listener: SignalsListener): this;
+        addListener(event: "newListener", listener: NewListenerListener): this;
+        addListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        emit(event: "beforeExit", code: number): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "exit", code: number): boolean;
+        emit(event: "rejectionHandled", promise: Promise<any>): boolean;
+        emit(event: "uncaughtException", error: Error): boolean;
+        emit(event: "unhandledRejection", reason: any, promise: Promise<any>): boolean;
+        emit(event: "warning", warning: Error): boolean;
+        emit(event: "message", message: any, sendHandle: any): this;
+        emit(event: Signals): boolean;
+        emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
+        emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
+
+        on(event: "beforeExit", listener: BeforeExitListener): this;
+        on(event: "disconnect", listener: DisconnectListener): this;
+        on(event: "exit", listener: ExitListener): this;
+        on(event: "rejectionHandled", listener: RejectionHandledListender): this;
+        on(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        on(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        on(event: "warning", listener: WarningListener): this;
+        on(event: "message", listener: MessageListener): this;
+        on(event: Signals, listener: SignalsListener): this;
+        on(event: "newListener", listener: NewListenerListener): this;
+        on(event: "removeListener", listener: RemoveListenerListener): this;
+
+        once(event: "beforeExit", listener: BeforeExitListener): this;
+        once(event: "disconnect", listener: DisconnectListener): this;
+        once(event: "exit", listener: ExitListener): this;
+        once(event: "rejectionHandled", listener: RejectionHandledListender): this;
+        once(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        once(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        once(event: "warning", listener: WarningListener): this;
+        once(event: "message", listener: MessageListener): this;
+        once(event: Signals, listener: SignalsListener): this;
+        once(event: "newListener", listener: NewListenerListener): this;
+        once(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependListener(event: "disconnect", listener: DisconnectListener): this;
+        prependListener(event: "exit", listener: ExitListener): this;
+        prependListener(event: "rejectionHandled", listener: RejectionHandledListender): this;
+        prependListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependListener(event: "warning", listener: WarningListener): this;
+        prependListener(event: "message", listener: MessageListener): this;
+        prependListener(event: Signals, listener: SignalsListener): this;
+        prependListener(event: "newListener", listener: NewListenerListener): this;
+        prependListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        prependOnceListener(event: "beforeExit", listener: BeforeExitListener): this;
+        prependOnceListener(event: "disconnect", listener: DisconnectListener): this;
+        prependOnceListener(event: "exit", listener: ExitListener): this;
+        prependOnceListener(event: "rejectionHandled", listener: RejectionHandledListender): this;
+        prependOnceListener(event: "uncaughtException", listener: UncaughtExceptionListener): this;
+        prependOnceListener(event: "unhandledRejection", listener: UnhandledRejectionListener): this;
+        prependOnceListener(event: "warning", listener: WarningListener): this;
+        prependOnceListener(event: "message", listener: MessageListener): this;
+        prependOnceListener(event: Signals, listener: SignalsListener): this;
+        prependOnceListener(event: "newListener", listener: NewListenerListener): this;
+        prependOnceListener(event: "removeListener", listener: RemoveListenerListener): this;
+
+        listeners(event: "beforeExit"): BeforeExitListener[];
+        listeners(event: "disconnect"): DisconnectListener[];
+        listeners(event: "exit"): ExitListener[];
+        listeners(event: "rejectionHandled"): RejectionHandledListender[];
+        listeners(event: "uncaughtException"): UncaughtExceptionListener[];
+        listeners(event: "unhandledRejection"): UnhandledRejectionListener[];
+        listeners(event: "warning"): WarningListener[];
+        listeners(event: "message"): MessageListener[];
+        listeners(event: Signals): SignalsListener[];
+        listeners(event: "newListener"): NewListenerListener[];
+        listeners(event: "removeListener"): RemoveListenerListener[];
     }
 
     export interface Global {
@@ -604,12 +738,12 @@ declare module "events" {
             static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
             static defaultMaxListeners: number;
 
-            addListener(event: string | symbol, listener: Function): this;
-            on(event: string | symbol, listener: Function): this;
-            once(event: string | symbol, listener: Function): this;
-            prependListener(event: string | symbol, listener: Function): this;
-            prependOnceListener(event: string | symbol, listener: Function): this;
-            removeListener(event: string | symbol, listener: Function): this;
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
             removeAllListeners(event?: string | symbol): this;
             setMaxListeners(n: number): this;
             getMaxListeners(): number;
@@ -656,6 +790,11 @@ declare module "http" {
     export interface ServerRequest extends IncomingMessage {
         connection: net.Socket;
     }
+
+    export interface ServerResponseHeaders {
+      [key: string]: number | string | string[];
+    }
+
     export interface ServerResponse extends stream.Writable {
         // Extended base methods
         write(buffer: Buffer): boolean;
@@ -664,20 +803,23 @@ declare module "http" {
         write(str: string, encoding?: string, cb?: Function): boolean;
         write(str: string, encoding?: string, fd?: string): boolean;
 
-        writeContinue(): void;
-        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-        writeHead(statusCode: number, headers?: any): void;
-        statusCode: number;
-        statusMessage: string;
+        addTrailers(headers: ServerResponseHeaders): void;
+        finished: boolean;
+        getHeader(name: string): number | string | string[] | undefined;
+        getHeaderNames(): string[]
+        getHeaders(): any
+        hasHeader(name: string): boolean
         headersSent: boolean;
+        removeHeader(name: string): void;
+        sendDate: boolean;
         setHeader(name: string, value: string | string[]): void;
         setTimeout(msecs: number, callback: Function): ServerResponse;
-        sendDate: boolean;
-        getHeader(name: string): string;
-        removeHeader(name: string): void;
+        statusCode: number;
+        statusMessage: string;
         write(chunk: any, encoding?: string): any;
-        addTrailers(headers: any): void;
-        finished: boolean;
+        writeContinue(): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: ServerResponseHeaders): void;
+        writeHead(statusCode: number, headers?: ServerResponseHeaders): void;
 
         // Extended base methods
         end(): void;
@@ -712,15 +854,18 @@ declare module "http" {
         end(str: string, encoding?: string, cb?: Function): void;
         end(data?: any, encoding?: string): void;
     }
+    export interface IncomingMessageHeaders {
+        [key: string]: string | string[] | undefined;
+    }
     export interface IncomingMessage extends stream.Readable {
         httpVersion: string;
         httpVersionMajor: number;
         httpVersionMinor: number;
         connection: net.Socket;
-        headers: any;
+        headers: IncomingMessageHeaders;
         rawHeaders: string[];
-        trailers: any;
-        rawTrailers: any;
+        trailers: { [key: string]: string };
+        rawTrailers: string[];
         setTimeout(msecs: number, callback: Function): NodeJS.Timer;
         /**
          * Only valid for request obtained from http.Server.
@@ -845,7 +990,7 @@ declare module "cluster" {
          *   5. message
          *   6. online
          */
-        addListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "disconnect", listener: () => void): this;
         addListener(event: "error", listener: (code: number, signal: string) => void): this;
         addListener(event: "exit", listener: (code: number, signal: string) => void): this;
@@ -853,15 +998,15 @@ declare module "cluster" {
         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, listener: Function): boolean
-        emit(event: "disconnect", listener: () => void): boolean
-        emit(event: "error", listener: (code: number, signal: string) => void): boolean
-        emit(event: "exit", listener: (code: number, signal: string) => void): boolean
-        emit(event: "listening", listener: (address: Address) => void): boolean
-        emit(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): boolean
-        emit(event: "online", listener: () => void): boolean
+        emit(event: string, listener: (...args: any[]) => void): boolean
+        emit(event: "disconnect"): boolean
+        emit(event: "error", code: number, signal: string): 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: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: "disconnect", listener: () => void): this;
         on(event: "error", listener: (code: number, signal: string) => void): this;
         on(event: "exit", listener: (code: number, signal: string) => void): this;
@@ -869,7 +1014,7 @@ declare module "cluster" {
         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: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         once(event: "disconnect", listener: () => void): this;
         once(event: "error", listener: (code: number, signal: string) => void): this;
         once(event: "exit", listener: (code: number, signal: string) => void): this;
@@ -877,7 +1022,7 @@ declare module "cluster" {
         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: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "disconnect", listener: () => void): this;
         prependListener(event: "error", listener: (code: number, signal: string) => void): this;
         prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
@@ -885,7 +1030,7 @@ declare module "cluster" {
         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: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "disconnect", listener: () => void): this;
         prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this;
         prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
@@ -903,8 +1048,8 @@ declare module "cluster" {
         // TODO: cluster.schedulingPolicy
         settings: ClusterSettings;
         setupMaster(settings?: ClusterSetupMasterSettings): void;
-        worker: Worker;
-        workers: {
+        worker?: Worker;
+        workers?: {
             [index: string]: Worker
         };
 
@@ -918,7 +1063,7 @@ declare module "cluster" {
          *   6. online
          *   7. setup
          */
-        addListener(event: string, listener: Function): this;
+        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;
@@ -927,16 +1072,16 @@ declare module "cluster" {
         addListener(event: "online", listener: (worker: Worker) => void): this;
         addListener(event: "setup", listener: (settings: any) => void): this;
 
-        emit(event: string, listener: Function): boolean;
-        emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-        emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-        emit(event: "fork", listener: (worker: Worker) => void): boolean;
-        emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-        emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-        emit(event: "online", listener: (worker: Worker) => void): boolean;
-        emit(event: "setup", listener: (settings: any) => void): boolean;
+        emit(event: string, listener: (...args: any[]) => void): 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: Function): this;
+        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;
@@ -945,7 +1090,7 @@ declare module "cluster" {
         on(event: "online", listener: (worker: Worker) => void): this;
         on(event: "setup", listener: (settings: any) => void): this;
 
-        once(event: string, listener: Function): 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;
@@ -954,7 +1099,7 @@ declare module "cluster" {
         once(event: "online", listener: (worker: Worker) => void): this;
         once(event: "setup", listener: (settings: any) => void): this;
 
-        prependListener(event: string, listener: Function): 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;
@@ -963,7 +1108,7 @@ declare module "cluster" {
         prependListener(event: "online", listener: (worker: Worker) => void): this;
         prependListener(event: "setup", listener: (settings: any) => void): this;
 
-        prependOnceListener(event: string, listener: Function): 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;
@@ -996,7 +1141,7 @@ declare module "cluster" {
      *   6. online
      *   7. setup
      */
-    export function addListener(event: string, listener: Function): Cluster;
+    export function addListener(event: string, listener: (...args: any[]) => void): Cluster;
     export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
     export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
     export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
@@ -1005,16 +1150,16 @@ declare module "cluster" {
     export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
     export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-    export function emit(event: string, listener: Function): boolean;
-    export function emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
-    export function emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
-    export function emit(event: "fork", listener: (worker: Worker) => void): boolean;
-    export function emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
-    export function emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
-    export function emit(event: "online", listener: (worker: Worker) => void): boolean;
-    export function emit(event: "setup", listener: (settings: any) => void): boolean;
+    export function emit(event: string, listener: (...args: any[]) => void): boolean;
+    export function emit(event: "disconnect", worker: Worker): boolean;
+    export function emit(event: "exit", worker: Worker, code: number, signal: string): boolean;
+    export function emit(event: "fork", worker: Worker): boolean;
+    export function emit(event: "listening", worker: Worker, address: Address): boolean;
+    export function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
+    export function emit(event: "online", worker: Worker): boolean;
+    export function emit(event: "setup", settings: any): boolean;
 
-    export function on(event: string, listener: Function): Cluster;
+    export function on(event: string, listener: (...args: any[]) => void): Cluster;
     export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
     export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
     export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
@@ -1023,7 +1168,7 @@ declare module "cluster" {
     export function on(event: "online", listener: (worker: Worker) => void): Cluster;
     export function on(event: "setup", listener: (settings: any) => void): Cluster;
 
-    export function once(event: string, listener: Function): Cluster;
+    export function once(event: string, listener: (...args: any[]) => void): Cluster;
     export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
     export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
     export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
@@ -1032,14 +1177,14 @@ declare module "cluster" {
     export function once(event: "online", listener: (worker: Worker) => void): Cluster;
     export function once(event: "setup", listener: (settings: any) => void): Cluster;
 
-    export function removeListener(event: string, listener: Function): Cluster;
+    export function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
     export function removeAllListeners(event?: string): Cluster;
     export function setMaxListeners(n: number): Cluster;
     export function getMaxListeners(): number;
     export function listeners(event: string): Function[];
     export function listenerCount(type: string): number;
 
-    export function prependListener(event: string, listener: Function): Cluster;
+    export function prependListener(event: string, listener: (...args: any[]) => void): Cluster;
     export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
     export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
     export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
@@ -1048,7 +1193,7 @@ declare module "cluster" {
     export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
     export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
 
-    export function prependOnceListener(event: string, listener: Function): Cluster;
+    export function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
     export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
     export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
     export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
@@ -1374,6 +1519,12 @@ declare module "https" {
         secureProtocol?: string;
     }
 
+    export interface ClientRequest extends http.ClientRequest {}
+
+    export interface IncomingMessage extends http.IncomingMessage {}
+
+    export interface ServerResponse extends http.ServerResponse { }
+
     export interface Agent extends http.Agent { }
 
     export interface AgentOptions extends http.AgentOptions {
@@ -1392,9 +1543,9 @@ declare module "https" {
         new (options?: AgentOptions): Agent;
     };
     export interface Server extends tls.Server { }
-    export function createServer(options: ServerOptions, requestListener?: Function): Server;
-    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
-    export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function createServer(options: ServerOptions, requestListener?: (req: IncomingMessage, res: ServerResponse) => void): Server;
+    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
 
@@ -1440,29 +1591,29 @@ declare module "repl" {
          * 2. reset
          **/
 
-        addListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "exit", listener: () => void): this;
-        addListener(event: "reset", listener: Function): this;
+        addListener(event: "reset", listener: (...args: any[]) => void): this;
 
         emit(event: string, ...args: any[]): boolean;
         emit(event: "exit"): boolean;
         emit(event: "reset", context: any): boolean;
 
-        on(event: string, listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: "exit", listener: () => void): this;
-        on(event: "reset", listener: Function): this;
+        on(event: "reset", listener: (...args: any[]) => void): this;
 
-        once(event: string, listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         once(event: "exit", listener: () => void): this;
-        once(event: "reset", listener: Function): this;
+        once(event: "reset", listener: (...args: any[]) => void): this;
 
-        prependListener(event: string, listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "exit", listener: () => void): this;
-        prependListener(event: "reset", listener: Function): this;
+        prependListener(event: "reset", listener: (...args: any[]) => void): this;
 
-        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "exit", listener: () => void): this;
-        prependOnceListener(event: "reset", listener: Function): this;
+        prependOnceListener(event: "reset", listener: (...args: any[]) => void): this;
     }
 
     export function start(options: ReplOptions): REPLServer;
@@ -1500,7 +1651,7 @@ declare module "readline" {
          * 7. SIGTSTP
          **/
 
-        addListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "close", listener: () => void): this;
         addListener(event: "line", listener: (input: any) => void): this;
         addListener(event: "pause", listener: () => void): this;
@@ -1518,7 +1669,7 @@ declare module "readline" {
         emit(event: "SIGINT"): boolean;
         emit(event: "SIGTSTP"): boolean;
 
-        on(event: string, listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: "close", listener: () => void): this;
         on(event: "line", listener: (input: any) => void): this;
         on(event: "pause", listener: () => void): this;
@@ -1527,7 +1678,7 @@ declare module "readline" {
         on(event: "SIGINT", listener: () => void): this;
         on(event: "SIGTSTP", listener: () => void): this;
 
-        once(event: string, listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         once(event: "close", listener: () => void): this;
         once(event: "line", listener: (input: any) => void): this;
         once(event: "pause", listener: () => void): this;
@@ -1536,7 +1687,7 @@ declare module "readline" {
         once(event: "SIGINT", listener: () => void): this;
         once(event: "SIGTSTP", listener: () => void): this;
 
-        prependListener(event: string, listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "close", listener: () => void): this;
         prependListener(event: "line", listener: (input: any) => void): this;
         prependListener(event: "pause", listener: () => void): this;
@@ -1545,7 +1696,7 @@ declare module "readline" {
         prependListener(event: "SIGINT", listener: () => void): this;
         prependListener(event: "SIGTSTP", listener: () => void): this;
 
-        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "close", listener: () => void): this;
         prependOnceListener(event: "line", listener: (input: any) => void): this;
         prependOnceListener(event: "pause", listener: () => void): this;
@@ -1636,7 +1787,7 @@ declare module "child_process" {
          * 5. message
          **/
 
-        addListener(event: string, listener: Function): this;
+        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;
@@ -1650,28 +1801,28 @@ declare module "child_process" {
         emit(event: "exit", code: number, signal: string): boolean;
         emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
 
-        on(event: string, listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: "close", listener: (code: number, signal: string) => void): this;
         on(event: "disconnect", listener: () => void): this;
         on(event: "error", listener: (err: Error) => void): this;
         on(event: "exit", listener: (code: number, signal: string) => void): this;
         on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-        once(event: string, listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         once(event: "close", listener: (code: number, signal: string) => void): this;
         once(event: "disconnect", listener: () => void): this;
         once(event: "error", listener: (err: Error) => void): this;
         once(event: "exit", listener: (code: number, signal: string) => void): this;
         once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-        prependListener(event: string, listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "close", listener: (code: number, signal: string) => void): this;
         prependListener(event: "disconnect", listener: () => void): this;
         prependListener(event: "error", listener: (err: Error) => void): this;
         prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
         prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
 
-        prependOnceListener(event: string, listener: Function): 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;
@@ -1853,10 +2004,31 @@ declare module "url" {
         path?: string;
     }
 
+    export interface UrlObject {
+        protocol?: string;
+        slashes?: boolean;
+        auth?: string;
+        host?: string;
+        hostname?: string;
+        port?: string | number;
+        pathname?: string;
+        search?: string;
+        query?: { [key: string]: any; };
+        hash?: string;
+    }
+
     export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
-    export function format(url: Url): string;
+    export function format(URL: URL, options?: URLFormatOptions): string;
+    export function format(urlObject: UrlObject): string;
     export function resolve(from: string, to: string): string;
 
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
     export class URLSearchParams implements Iterable<string[]> {
         constructor(init?: URLSearchParams | string | { [key: string]: string | string[] } | Iterable<string[]> );
         append(name: string, value: string): void;
@@ -2061,6 +2233,7 @@ declare module "net" {
         localPort: number;
         bytesRead: number;
         bytesWritten: number;
+        connecting: boolean;
         destroyed: boolean;
 
         // Extended base methods
@@ -2081,7 +2254,7 @@ declare module "net" {
          *   7. lookup
          *   8. timeout
          */
-        addListener(event: string, listener: Function): this;
+        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;
@@ -2101,7 +2274,7 @@ declare module "net" {
         emit(event: "lookup", err: Error, address: string, family: string | number, host: string): boolean;
         emit(event: "timeout"): boolean;
 
-        on(event: string, listener: Function): this;
+        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;
@@ -2111,7 +2284,7 @@ declare module "net" {
         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: Function): 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;
@@ -2121,7 +2294,7 @@ declare module "net" {
         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: Function): 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;
@@ -2131,7 +2304,7 @@ declare module "net" {
         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: Function): 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;
@@ -2155,10 +2328,10 @@ declare module "net" {
     }
 
     export interface Server extends events.EventEmitter {
-        listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-        listen(port: number, hostname?: string, listeningListener?: Function): Server;
-        listen(port: number, backlog?: number, listeningListener?: Function): Server;
-        listen(port: number, listeningListener?: Function): Server;
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
+        listen(port?: number, hostname?: string, listeningListener?: Function): Server;
+        listen(port?: number, backlog?: number, listeningListener?: Function): Server;
+        listen(port?: number, listeningListener?: Function): Server;
         listen(path: string, backlog?: number, listeningListener?: Function): Server;
         listen(path: string, listeningListener?: Function): Server;
         listen(options: ListenOptions, listeningListener?: Function): Server;
@@ -2180,7 +2353,7 @@ declare module "net" {
          *   3. error
          *   4. listening
          */
-        addListener(event: string, listener: Function): this;
+        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;
@@ -2192,25 +2365,25 @@ declare module "net" {
         emit(event: "error", err: Error): boolean;
         emit(event: "listening"): boolean;
 
-        on(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): 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;
@@ -2218,7 +2391,7 @@ declare module "net" {
     }
     export function createServer(connectionListener?: (socket: Socket) => void): Server;
     export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-    export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: number, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
     export function connect(port: number, host?: string, connectionListener?: Function): Socket;
     export function connect(path: string, connectionListener?: Function): Socket;
     export function createConnection(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
@@ -2250,12 +2423,14 @@ declare module "dgram" {
         exclusive?: boolean;
     }
 
+    type SocketType = "udp4" | "udp6";
+
     interface SocketOptions {
-        type: "udp4" | "udp6";
+        type: SocketType;
         reuseAddr?: boolean;
     }
 
-    export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
     export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
     export interface Socket extends events.EventEmitter {
@@ -2281,7 +2456,7 @@ declare module "dgram" {
          * 3. listening
          * 4. message
          **/
-        addListener(event: string, listener: Function): this;
+        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;
@@ -2293,25 +2468,25 @@ declare module "dgram" {
         emit(event: "listening"): boolean;
         emit(event: "message", msg: Buffer, rinfo: AddressInfo): boolean;
 
-        on(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): 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;
@@ -2355,23 +2530,23 @@ declare module "fs" {
          *   1. change
          *   2. error
          */
-        addListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
         addListener(event: "error", listener: (code: number, signal: string) => void): this;
 
-        on(event: string, listener: Function): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
         on(event: "error", listener: (code: number, signal: string) => void): this;
 
-        once(event: string, listener: Function): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
         once(event: "error", listener: (code: number, signal: string) => void): this;
 
-        prependListener(event: string, listener: Function): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
         prependListener(event: "error", listener: (code: number, signal: string) => void): this;
 
-        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
         prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this;
     }
@@ -2387,23 +2562,23 @@ declare module "fs" {
          *   1. open
          *   2. close
          */
-        addListener(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "open", listener: (fd: number) => void): this;
         prependOnceListener(event: "close", listener: () => void): this;
     }
@@ -2418,23 +2593,23 @@ declare module "fs" {
          *   1. open
          *   2. close
          */
-        addListener(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "open", listener: (fd: number) => void): this;
         prependOnceListener(event: "close", listener: () => void): this;
     }
@@ -2570,8 +2745,9 @@ declare module "fs" {
      * @returns Returns the created folder path.
      */
     export function mkdtempSync(prefix: string): string;
-    export function readdir(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-    export function readdirSync(path: string | Buffer): string[];
+    export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdir(path: string | Buffer, options: string | {}, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdirSync(path: string | Buffer, options?: string | {}): string[];
     export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
     export function closeSync(fd: number): void;
     export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
@@ -3004,6 +3180,25 @@ declare module "tls" {
         CN: string;
     }
 
+    export interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
+
+    export interface DetailedPeerCertificate extends PeerCertificate {
+      issuerCertificate: DetailedPeerCertificate;
+    }
+
     export interface CipherNameAndProtocol {
         /**
          * The cipher name.
@@ -3112,18 +3307,11 @@ declare module "tls" {
          * if false only the top certificate without issuer property.
          * If the peer does not provide a certificate, it returns null or an empty object.
          * @param {boolean} detailed - If true; the full chain with issuer property will be returned.
-         * @returns {any} - An object representing the peer's certificate.
+         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
          */
-        getPeerCertificate(detailed?: boolean): {
-            subject: Certificate;
-            issuerInfo: Certificate;
-            issuer: Certificate;
-            raw: any;
-            valid_from: string;
-            valid_to: string;
-            fingerprint: string;
-            serialNumber: string;
-        };
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
@@ -3184,7 +3372,7 @@ declare module "tls" {
          * 1. OCSPResponse
          * 2. secureConnect
          **/
-        addListener(event: string, listener: Function): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
         addListener(event: "secureConnect", listener: () => void): this;
 
@@ -3192,19 +3380,19 @@ declare module "tls" {
         emit(event: "OCSPResponse", response: Buffer): boolean;
         emit(event: "secureConnect"): boolean;
 
-        on(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
         prependOnceListener(event: "secureConnect", listener: () => void): this;
     }
@@ -3274,7 +3462,7 @@ declare module "tls" {
          * 4. resumeSession
          * 5. secureConnection
          **/
-        addListener(event: string, listener: Function): this;
+        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;
@@ -3288,28 +3476,28 @@ declare module "tls" {
         emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
         emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
 
-        on(event: string, listener: Function): this;
+        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: Function): 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: Function): 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: Function): 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;
@@ -3564,8 +3752,8 @@ declare module "stream" {
              *   4. readable
              *   5. error
              **/
-            addListener(event: string, listener: Function): this;
-            addListener(event: string, listener: Function): this;
+            addListener(event: string, listener: (...args: any[]) => void): this;
+            addListener(event: string, listener: (...args: any[]) => void): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             addListener(event: "end", listener: () => void): this;
@@ -3579,35 +3767,35 @@ declare module "stream" {
             emit(event: "readable"): boolean;
             emit(event: "error", err: Error): boolean;
 
-            on(event: string, listener: Function): this;
+            on(event: string, listener: (...args: any[]) => void): this;
             on(event: "close", listener: () => void): this;
             on(event: "data", listener: (chunk: Buffer | string) => void): this;
             on(event: "end", listener: () => void): this;
             on(event: "readable", listener: () => void): this;
             on(event: "error", listener: (err: Error) => void): this;
 
-            once(event: string, listener: Function): this;
+            once(event: string, listener: (...args: any[]) => void): this;
             once(event: "close", listener: () => void): this;
             once(event: "data", listener: (chunk: Buffer | string) => void): this;
             once(event: "end", listener: () => void): this;
             once(event: "readable", listener: () => void): this;
             once(event: "error", listener: (err: Error) => void): this;
 
-            prependListener(event: string, listener: Function): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
             prependListener(event: "close", listener: () => void): this;
             prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             prependListener(event: "end", listener: () => void): this;
             prependListener(event: "readable", listener: () => void): this;
             prependListener(event: "error", listener: (err: Error) => void): this;
 
-            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
             prependOnceListener(event: "close", listener: () => void): this;
             prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             prependOnceListener(event: "end", listener: () => void): this;
             prependOnceListener(event: "readable", listener: () => void): this;
             prependOnceListener(event: "error", listener: (err: Error) => void): this;
 
-            removeListener(event: string, listener: Function): this;
+            removeListener(event: string, listener: (...args: any[]) => void): this;
             removeListener(event: "close", listener: () => void): this;
             removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
             removeListener(event: "end", listener: () => void): this;
@@ -3644,7 +3832,7 @@ declare module "stream" {
              *   5. pipe
              *   6. unpipe
              **/
-            addListener(event: string, listener: Function): this;
+            addListener(event: string, listener: (...args: any[]) => void): this;
             addListener(event: "close", listener: () => void): this;
             addListener(event: "drain", listener: () => void): this;
             addListener(event: "error", listener: (err: Error) => void): this;
@@ -3660,7 +3848,7 @@ declare module "stream" {
             emit(event: "pipe", src: Readable): boolean;
             emit(event: "unpipe", src: Readable): boolean;
 
-            on(event: string, listener: Function): this;
+            on(event: string, listener: (...args: any[]) => void): this;
             on(event: "close", listener: () => void): this;
             on(event: "drain", listener: () => void): this;
             on(event: "error", listener: (err: Error) => void): this;
@@ -3668,7 +3856,7 @@ declare module "stream" {
             on(event: "pipe", listener: (src: Readable) => void): this;
             on(event: "unpipe", listener: (src: Readable) => void): this;
 
-            once(event: string, listener: Function): this;
+            once(event: string, listener: (...args: any[]) => void): this;
             once(event: "close", listener: () => void): this;
             once(event: "drain", listener: () => void): this;
             once(event: "error", listener: (err: Error) => void): this;
@@ -3676,7 +3864,7 @@ declare module "stream" {
             once(event: "pipe", listener: (src: Readable) => void): this;
             once(event: "unpipe", listener: (src: Readable) => void): this;
 
-            prependListener(event: string, listener: Function): this;
+            prependListener(event: string, listener: (...args: any[]) => void): this;
             prependListener(event: "close", listener: () => void): this;
             prependListener(event: "drain", listener: () => void): this;
             prependListener(event: "error", listener: (err: Error) => void): this;
@@ -3684,7 +3872,7 @@ declare module "stream" {
             prependListener(event: "pipe", listener: (src: Readable) => void): this;
             prependListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: string, listener: (...args: any[]) => void): this;
             prependOnceListener(event: "close", listener: () => void): this;
             prependOnceListener(event: "drain", listener: () => void): this;
             prependOnceListener(event: "error", listener: (err: Error) => void): this;
@@ -3692,7 +3880,7 @@ declare module "stream" {
             prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
             prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
 
-            removeListener(event: string, listener: Function): this;
+            removeListener(event: string, listener: (...args: any[]) => void): this;
             removeListener(event: "close", listener: () => void): this;
             removeListener(event: "drain", listener: () => void): this;
             removeListener(event: "error", listener: (err: Error) => void): this;
@@ -3737,20 +3925,14 @@ declare module "stream" {
 }
 
 declare module "util" {
-    export interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number;
-        colors?: boolean;
-        customInspect?: boolean;
-    }
-
+    export interface InspectOptions extends NodeJS.InspectOptions {}
     export function format(format: any, ...param: any[]): string;
     export function debug(string: string): void;
     export function error(...param: any[]): void;
     export function puts(...param: any[]): void;
     export function print(...param: any[]): void;
     export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
+    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
     export function inspect(object: any, options: InspectOptions): string;
     export function isArray(object: any): object is any[];
     export function isRegExp(object: any): object is RegExp;
@@ -3770,6 +3952,7 @@ declare module "util" {
     export function isSymbol(object: any): object is symbol;
     export function isUndefined(object: any): object is undefined;
     export function deprecate(fn: Function, message: string): Function;
+    export function promisify(fn: Function): Function;
 }
 
 declare module "assert" {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 55940e5a0c..aeefc2bbdc 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -88,7 +88,7 @@ namespace assert_tests {
 namespace events_tests {
     let emitter: events.EventEmitter;
     let event: string | symbol;
-    let listener: Function;
+    let listener: (...args: any[]) => void;
     let any: any;
 
     {
@@ -415,6 +415,9 @@ namespace url_tests {
             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 });
     }
 
     {
@@ -524,7 +527,23 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
+        util.inspect(["This is nice"], false, null);
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: 5,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: 10,
+          breakLength: 20
+        });
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: null,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: null,
+          breakLength: Infinity
+        })
     }
 }
 
@@ -962,7 +981,7 @@ namespace http_tests {
     }
 
     {
-        var request = http.request('http://0.0.0.0');
+        var request = http.request({ path: 'http://0.0.0.0' });
         request.once('error', function() { });
         request.setNoDelay(true);
         request.abort();
@@ -1871,6 +1890,24 @@ namespace process_tests {
         var module: NodeModule | undefined;
         module = process.mainModule;
     }
+    {
+        process.on("message", (req: any) => { });
+        process.addListener("beforeExit", (code: number) => { });
+        process.once("disconnect", () => { });
+        process.prependListener("exit", (code: number) => { });
+        process.prependOnceListener("rejectionHandled", (promise: Promise<any>) => { });
+        process.on("uncaughtException", (error: Error) => { });
+        process.addListener("unhandledRejection", (reason: any, promise: Promise<any>) => { });
+        process.once("warning", (warning: Error) => { });
+        process.prependListener("message", (message: any, sendHandle: any) => { });
+        process.prependOnceListener("SIGBREAK", () => { });
+        process.on("newListener", (event: string, listener: Function) => { });
+        process.once("removeListener", (event: string, listener: Function) => { });
+
+        const listeners = process.listeners('uncaughtException');
+        const oldHandler = listeners[listeners.length - 1];
+        process.addListener('uncaughtException', oldHandler);
+    }
 }
 
 ///////////////////////////////////////////////////////////
@@ -2076,6 +2113,7 @@ namespace net_tests {
         })
         _socket = _socket.prependOnceListener("timeout", () => { })
 
+        bool = _socket.connecting;
         bool = _socket.destroyed;
         _socket.destroy();
     }
diff --git a/types/node/tsconfig.json b/types/node/tsconfig.json
index 8cb1452030..ca401a560d 100644
--- a/types/node/tsconfig.json
+++ b/types/node/tsconfig.json
@@ -6,7 +6,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index f57066c97e..1e457a755e 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -9,6 +9,24 @@
 *                                               *
 ************************************************/
 
+interface Console {
+    Console: {
+        prototype: Console,
+        new(stdout: NodeJS.WritableStream, stderr?: NodeJS.WritableStream): Console;
+    };
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    time(label: string): void;
+    timeEnd(label: string): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
+}
+
+declare var console: Console;
+
 interface Error {
     stack?: string;
 }
@@ -159,6 +177,13 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -1791,20 +1816,14 @@ declare module "stream" {
 }
 
 declare module "util" {
-    export interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number;
-        colors?: boolean;
-        customInspect?: boolean;
-    }
-
+    export interface InspectOptions extends NodeJS.InspectOptions {}
     export function format(format: any, ...param: any[]): string;
     export function debug(string: string): void;
     export function error(...param: any[]): void;
     export function puts(...param: any[]): void;
     export function print(...param: any[]): void;
     export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
+    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
     export function inspect(object: any, options: InspectOptions): string;
     export function isArray(object: any): boolean;
     export function isRegExp(object: any): boolean;
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index e045f7c0ef..30dfd2bd72 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -132,7 +132,9 @@ assert.equal(helloUrl.query.hello, 'world');
 
 // 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 });
+util.inspect(["This is nice"], { colors: true, depth: null, customInspect: false });
 
 ////////////////////////////////////////////////////
 /// Stream tests : http://nodejs.org/api/stream.html
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index c74f8dcb0b..3c5a7745e9 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -16,7 +16,7 @@ interface Console {
         new(stdout: NodeJS.WritableStream, stderr?: NodeJS.WritableStream): Console;
     };
     assert(value: any, message?: string, ...optionalParams: any[]): void;
-    dir(obj: any, options?: {showHidden?: boolean, depth?: number, colors?: boolean}): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message?: any, ...optionalParams: any[]): void;
     log(message?: any, ...optionalParams: any[]): void;
@@ -103,7 +103,7 @@ declare var SlowBuffer: {
 
 
 // Buffer class
-type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "binary" | "hex";
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "binary" | "hex";
 interface Buffer extends NodeBuffer {}
 
 /**
@@ -228,6 +228,13 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+    }
+
     export interface ErrnoException extends Error {
         errno?: number;
         code?: string;
@@ -2237,20 +2244,15 @@ declare module "stream" {
 }
 
 declare module "util" {
-    export interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number;
-        colors?: boolean;
-        customInspect?: boolean;
-    }
 
+    export interface InspectOptions extends NodeJS.InspectOptions {}
     export function format(format: any, ...param: any[]): string;
     export function debug(string: string): void;
     export function error(...param: any[]): void;
     export function puts(...param: any[]): void;
     export function print(...param: any[]): void;
     export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
+    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
     export function inspect(object: any, options: InspectOptions): string;
     export function isArray(object: any): boolean;
     export function isRegExp(object: any): boolean;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 5274116452..b56bb224e1 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -312,7 +312,9 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], false, null);
         util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
+        util.inspect(["This is nice"], { colors: true, depth: null, customInspect: false });
     }
 }
 
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index ebc2b516d6..d0c3a44311 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Node.js v6.x
 // Project: http://nodejs.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Wilco Bakker <https://github.com/WilcoBakker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -13,7 +13,7 @@
 interface Console {
     Console: typeof NodeJS.Console;
     assert(value: any, message?: string, ...optionalParams: any[]): void;
-    dir(obj: any, options?: {showHidden?: boolean, depth?: number, colors?: boolean}): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message?: any, ...optionalParams: any[]): void;
     log(message?: any, ...optionalParams: any[]): void;
@@ -99,7 +99,7 @@ declare var SlowBuffer: {
 
 
 // Buffer class
-type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "binary" | "hex";
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
 interface Buffer extends NodeBuffer { }
 
 /**
@@ -247,6 +247,16 @@ declare var Buffer: {
 *                                               *
 ************************************************/
 declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
+
     export var Console: {
         prototype: Console;
         new(stdout: WritableStream, stderr?: WritableStream): Console;
@@ -281,8 +291,8 @@ declare namespace NodeJS {
         readable: boolean;
         read(size?: number): string | Buffer;
         setEncoding(encoding: string | null): void;
-        pause(): ReadableStream;
-        resume(): ReadableStream;
+        pause(): this;
+        resume(): this;
         isPaused(): boolean;
         pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
         unpipe<T extends WritableStream>(destination?: T): void;
@@ -301,10 +311,7 @@ declare namespace NodeJS {
         end(str: string, encoding?: string, cb?: Function): void;
     }
 
-    export interface ReadWriteStream extends ReadableStream, WritableStream {
-        pause(): ReadWriteStream;
-        resume(): ReadWriteStream;
-    }
+    export interface ReadWriteStream extends ReadableStream, WritableStream {}
 
     export interface Events extends EventEmitter { }
 
@@ -378,6 +385,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: any;
         exit(code?: number): void;
         exitCode: number;
@@ -1431,8 +1439,8 @@ declare module "readline" {
         setPrompt(prompt: string): void;
         prompt(preserveCursor?: boolean): void;
         question(query: string, callback: (answer: string) => void): void;
-        pause(): ReadLine;
-        resume(): ReadLine;
+        pause(): this;
+        resume(): this;
         close(): void;
         write(data: string | Buffer, key?: Key): void;
 
@@ -1801,8 +1809,21 @@ declare module "url" {
         path?: string;
     }
 
+    export interface UrlObject {
+        protocol?: string;
+        slashes?: boolean;
+        auth?: string;
+        host?: string;
+        hostname?: string;
+        port?: string | number;
+        pathname?: string;
+        search?: string;
+        query?: { [key: string]: any; };
+        hash?: string;
+    }
+
     export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
-    export function format(url: Url): string;
+    export function format(urlObject: UrlObject): string;
     export function resolve(from: string, to: string): string;
 }
 
@@ -1939,8 +1960,6 @@ declare module "net" {
         setEncoding(encoding?: string): void;
         write(data: any, encoding?: string, callback?: Function): void;
         destroy(): void;
-        pause(): Socket;
-        resume(): Socket;
         setTimeout(timeout: number, callback?: Function): void;
         setNoDelay(noDelay?: boolean): void;
         setKeepAlive(enable?: boolean, initialDelay?: number): void;
@@ -1955,6 +1974,7 @@ declare module "net" {
         localPort: number;
         bytesRead: number;
         bytesWritten: number;
+        connecting: boolean;
         destroyed: boolean;
 
         // Extended base methods
@@ -3432,8 +3452,8 @@ declare module "stream" {
             _read(size: number): void;
             read(size?: number): any;
             setEncoding(encoding: string): void;
-            pause(): Readable;
-            resume(): Readable;
+            pause(): this;
+            resume(): this;
             isPaused(): boolean;
             pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
             unpipe<T extends NodeJS.WritableStream>(destination?: T): void;
@@ -3623,20 +3643,14 @@ declare module "stream" {
 }
 
 declare module "util" {
-    export interface InspectOptions {
-        showHidden?: boolean;
-        depth?: number;
-        colors?: boolean;
-        customInspect?: boolean;
-    }
-
+    export interface InspectOptions extends NodeJS.InspectOptions {}
     export function format(format: any, ...param: any[]): string;
     export function debug(string: string): void;
     export function error(...param: any[]): void;
     export function puts(...param: any[]): void;
     export function print(...param: any[]): void;
     export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string;
+    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
     export function inspect(object: any, options: InspectOptions): string;
     export function isArray(object: any): boolean;
     export function isRegExp(object: any): boolean;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index b2ca08898c..f7474844e8 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -430,7 +430,23 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
+        util.inspect(["This is nice"], false, null);
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: 5,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: 10,
+          breakLength: 20
+        });
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: null,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: null,
+          breakLength: Infinity
+        })
     }
 }
 
@@ -542,6 +558,32 @@ function simplified_stream_ctor_test() {
     })
 }
 
+// Subclassing stream classes
+{
+    class SubclassedReadable extends stream.Readable {};
+
+    let subclassedReadable: SubclassedReadable = new SubclassedReadable();
+    subclassedReadable = subclassedReadable.pause();
+    subclassedReadable = subclassedReadable.resume();
+
+    class SubclassedTransform extends stream.Transform {};
+
+    let subclassedTransform: SubclassedTransform = new SubclassedTransform();
+    subclassedTransform = subclassedTransform.pause();
+    subclassedTransform = subclassedTransform.resume();
+
+    class SubclassedDuplex extends stream.Duplex {};
+
+    let subclassedDuplex: SubclassedDuplex = new SubclassedDuplex();
+    subclassedDuplex = subclassedDuplex.pause();
+    subclassedDuplex = subclassedDuplex.resume();
+
+    // assignability
+    let readable: stream.Readable = subclassedDuplex;
+    readable = subclassedTransform;
+    let duplex: stream.Duplex = subclassedTransform;
+}
+
 ////////////////////////////////////////////////////////
 /// Crypto tests : http://nodejs.org/api/crypto.html ///
 ////////////////////////////////////////////////////////
@@ -1942,6 +1984,7 @@ namespace net_tests {
         })
         _socket = _socket.prependOnceListener("timeout", () => { })
 
+        bool = _socket.connecting;
         bool = _socket.destroyed;
         _socket.destroy();
     }
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
new file mode 100644
index 0000000000..31e068cec8
--- /dev/null
+++ b/types/node/v7/index.d.ts
@@ -0,0 +1,4351 @@
+// Type definitions for Node.js v7.x
+// Project: http://nodejs.org/
+// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
+//                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
+//                 Parambir Singh <https://github.com/parambirs>
+//                 Roberto Desideri <https://github.com/RobDesideri>
+//                 Christian Vaagland Tellnes <https://github.com/tellnes>
+//                 Wilco Bakker <https://github.com/WilcoBakker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/************************************************
+*                                               *
+*               Node.js v7.x API                *
+*                                               *
+************************************************/
+
+// This needs to be global to avoid TS2403 in case lib.dom.d.ts is present in the same build
+interface Console {
+    Console: NodeJS.ConsoleConstructor;
+    assert(value: any, message?: string, ...optionalParams: any[]): void;
+    dir(obj: any, options?: NodeJS.InspectOptions): void;
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    time(label: string): void;
+    timeEnd(label: string): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
+}
+
+interface Error {
+    stack?: string;
+}
+
+interface ErrorConstructor {
+    captureStackTrace(targetObject: Object, constructorOpt?: Function): void;
+    stackTraceLimit: number;
+}
+
+// compat for TypeScript 1.8
+// if you use with --target es3 or --target es5 and use below definitions,
+// use the lib.es6.d.ts that is bundled with TypeScript 1.8.
+interface MapConstructor { }
+interface WeakMapConstructor { }
+interface SetConstructor { }
+interface WeakSetConstructor { }
+
+// Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
+interface Iterable<T> {}
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+}
+interface IteratorResult<T> {}
+interface SymbolConstructor {
+    readonly iterator: symbol;
+}
+declare var Symbol: SymbolConstructor;
+
+/************************************************
+*                                               *
+*                   GLOBAL                      *
+*                                               *
+************************************************/
+declare var process: NodeJS.Process;
+declare var global: NodeJS.Global;
+declare var console: Console;
+
+declare var __filename: string;
+declare var __dirname: string;
+
+declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare function clearTimeout(timeoutId: NodeJS.Timer): void;
+declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+declare function clearInterval(intervalId: NodeJS.Timer): void;
+declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+declare function clearImmediate(immediateId: any): void;
+
+interface NodeRequireFunction {
+    (id: string): any;
+}
+
+interface NodeRequire extends NodeRequireFunction {
+    resolve(id: string): string;
+    cache: any;
+    extensions: any;
+    main: NodeModule | undefined;
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule {
+    exports: any;
+    require: NodeRequireFunction;
+    id: string;
+    filename: string;
+    loaded: boolean;
+    parent: NodeModule | null;
+    children: NodeModule[];
+}
+
+declare var module: NodeModule;
+
+// Same as module.exports
+declare var exports: any;
+declare var SlowBuffer: {
+    new (str: string, encoding?: string): Buffer;
+    new (size: number): Buffer;
+    new (size: Uint8Array): Buffer;
+    new (array: any[]): Buffer;
+    prototype: Buffer;
+    isBuffer(obj: any): boolean;
+    byteLength(string: string, encoding?: string): number;
+    concat(list: Buffer[], totalLength?: number): Buffer;
+};
+
+
+// Buffer class
+type BufferEncoding = "ascii" | "utf8" | "utf16le" | "ucs2" | "base64" | "latin1" | "binary" | "hex";
+interface Buffer extends NodeBuffer { }
+
+/**
+ * Raw data is stored in instances of the Buffer class.
+ * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap.  A Buffer cannot be resized.
+ * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+ */
+declare var Buffer: {
+    /**
+     * Allocates a new buffer containing the given {str}.
+     *
+     * @param str String to store in buffer.
+     * @param encoding encoding to use, optional.  Default is 'utf8'
+     */
+    new (str: string, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     */
+    new (size: number): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new (array: Uint8Array): Buffer;
+    /**
+     * Produces a Buffer backed by the same allocated memory as
+     * the given {ArrayBuffer}.
+     *
+     *
+     * @param arrayBuffer The ArrayBuffer with which to share memory.
+     */
+    new (arrayBuffer: ArrayBuffer): Buffer;
+    /**
+     * Allocates a new buffer containing the given {array} of octets.
+     *
+     * @param array The octets to store.
+     */
+    new (array: any[]): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new {Buffer} instance.
+     *
+     * @param buffer The buffer to copy.
+     */
+    new (buffer: Buffer): Buffer;
+    prototype: Buffer;
+    /**
+     * Allocates a new Buffer using an {array} of octets.
+     *
+     * @param array
+     */
+    from(array: any[]): Buffer;
+    /**
+     * When passed a reference to the .buffer property of a TypedArray instance,
+     * the newly created Buffer will share the same allocated memory as the TypedArray.
+     * The optional {byteOffset} and {length} arguments specify a memory range
+     * within the {arrayBuffer} that will be shared by the Buffer.
+     *
+     * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer()
+     * @param byteOffset
+     * @param length
+     */
+    from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+    /**
+     * Copies the passed {buffer} data onto a new Buffer instance.
+     *
+     * @param buffer
+     */
+    from(buffer: Buffer): Buffer;
+    /**
+     * Creates a new Buffer containing the given JavaScript string {str}.
+     * If provided, the {encoding} parameter identifies the character encoding.
+     * If not provided, {encoding} defaults to 'utf8'.
+     *
+     * @param str
+     */
+    from(str: string, encoding?: string): Buffer;
+    /**
+     * Returns true if {obj} is a Buffer
+     *
+     * @param obj object to test.
+     */
+    isBuffer(obj: any): obj is Buffer;
+    /**
+     * Returns true if {encoding} is a valid encoding argument.
+     * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex'
+     *
+     * @param encoding string to test.
+     */
+    isEncoding(encoding: string): boolean;
+    /**
+     * Gives the actual byte length of a string. encoding defaults to 'utf8'.
+     * This is not the same as String.prototype.length since that returns the number of characters in a string.
+     *
+     * @param string string to test.
+     * @param encoding encoding used to evaluate (defaults to 'utf8')
+     */
+    byteLength(string: string, encoding?: string): number;
+    /**
+     * Returns a buffer which is the result of concatenating all the buffers in the list together.
+     *
+     * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer.
+     * If the list has exactly one item, then the first item of the list is returned.
+     * If the list has more than one item, then a new Buffer is created.
+     *
+     * @param list An array of Buffer objects to concatenate
+     * @param totalLength Total length of the buffers when concatenated.
+     *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
+     */
+    concat(list: Buffer[], totalLength?: number): Buffer;
+    /**
+     * The same as buf1.compare(buf2).
+     */
+    compare(buf1: Buffer, buf2: Buffer): number;
+    /**
+     * Allocates a new buffer of {size} octets.
+     *
+     * @param size count of octets to allocate.
+     * @param fill if specified, buffer will be initialized by calling buf.fill(fill).
+     *    If parameter is omitted, buffer will be filled with zeros.
+     * @param encoding encoding used for call to buf.fill while initalizing
+     */
+    alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer;
+    /**
+     * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafe(size: number): Buffer;
+    /**
+     * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents
+     * of the newly created Buffer are unknown and may contain sensitive data.
+     *
+     * @param size count of octets to allocate
+     */
+    allocUnsafeSlow(size: number): Buffer;
+};
+
+/************************************************
+*                                               *
+*               GLOBAL INTERFACES               *
+*                                               *
+************************************************/
+declare namespace NodeJS {
+    export interface InspectOptions {
+        showHidden?: boolean;
+        depth?: number | null;
+        colors?: boolean;
+        customInspect?: boolean;
+        showProxy?: boolean;
+        maxArrayLength?: number | null;
+        breakLength?: number;
+    }
+
+    export interface ConsoleConstructor {
+        prototype: Console;
+        new(stdout: WritableStream, stderr?: WritableStream): Console;
+    }
+
+    export interface ErrnoException extends Error {
+        errno?: number;
+        code?: string;
+        path?: string;
+        syscall?: string;
+        stack?: string;
+    }
+
+    export class EventEmitter {
+        addListener(event: string | symbol, listener: Function): this;
+        on(event: string | symbol, listener: Function): this;
+        once(event: string | symbol, listener: Function): this;
+        removeListener(event: string | symbol, listener: Function): this;
+        removeAllListeners(event?: string | symbol): this;
+        setMaxListeners(n: number): this;
+        getMaxListeners(): number;
+        listeners(event: string | symbol): Function[];
+        emit(event: string | symbol, ...args: any[]): boolean;
+        listenerCount(type: string | symbol): number;
+        // Added in Node 6...
+        prependListener(event: string | symbol, listener: Function): this;
+        prependOnceListener(event: string | symbol, listener: Function): this;
+        eventNames(): (string | symbol)[];
+    }
+
+    export interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: string | null): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean; }): T;
+        unpipe<T extends WritableStream>(destination?: T): this;
+        unshift(chunk: string): void;
+        unshift(chunk: Buffer): void;
+        wrap(oldStream: ReadableStream): ReadableStream;
+    }
+
+    export interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Buffer | string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+    }
+
+    export interface ReadWriteStream extends ReadableStream, WritableStream { }
+
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+    }
+
+    export interface MemoryUsage {
+        rss: number;
+        heapTotal: number;
+        heapUsed: number;
+    }
+
+    export interface CpuUsage {
+        user: number;
+        system: number;
+    }
+
+    export interface ProcessVersions {
+        http_parser: string;
+        node: string;
+        v8: string;
+        ares: string;
+        uv: string;
+        zlib: string;
+        modules: string;
+        openssl: string;
+    }
+
+    type Platform = 'aix'
+                  | 'android'
+                  | 'darwin'
+                  | 'freebsd'
+                  | 'linux'
+                  | 'openbsd'
+                  | 'sunos'
+                  | 'win32';
+
+    export interface Socket extends ReadWriteStream {
+        isTTY?: true;
+    }
+
+    export interface Process extends EventEmitter {
+        stdout: Socket;
+        stderr: Socket;
+        stdin: Socket;
+        openStdin(): Socket;
+        argv: string[];
+        argv0: string;
+        execArgv: string[];
+        execPath: string;
+        abort(): void;
+        chdir(directory: string): void;
+        cwd(): string;
+        emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
+        env: any;
+        exit(code?: number): never;
+        exitCode: number;
+        getgid(): number;
+        setgid(id: number): void;
+        setgid(id: string): void;
+        getuid(): number;
+        setuid(id: number): void;
+        setuid(id: string): void;
+        version: string;
+        versions: ProcessVersions;
+        config: {
+            target_defaults: {
+                cflags: any[];
+                default_configuration: string;
+                defines: string[];
+                include_dirs: string[];
+                libraries: string[];
+            };
+            variables: {
+                clang: number;
+                host_arch: string;
+                node_install_npm: boolean;
+                node_install_waf: boolean;
+                node_prefix: string;
+                node_shared_openssl: boolean;
+                node_shared_v8: boolean;
+                node_shared_zlib: boolean;
+                node_use_dtrace: boolean;
+                node_use_etw: boolean;
+                node_use_openssl: boolean;
+                target_arch: string;
+                v8_no_strict_aliasing: number;
+                v8_use_snapshot: boolean;
+                visibility: string;
+            };
+        };
+        kill(pid: number, signal?: string | number): void;
+        pid: number;
+        title: string;
+        arch: string;
+        platform: Platform;
+        mainModule?: NodeModule;
+        memoryUsage(): MemoryUsage;
+        cpuUsage(previousValue?: CpuUsage): CpuUsage;
+        nextTick(callback: Function, ...args: any[]): void;
+        umask(mask?: number): number;
+        uptime(): number;
+        hrtime(time?: [number, number]): [number, number];
+        domain: Domain;
+
+        // Worker
+        send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
+    }
+
+    export interface Global {
+        Array: typeof Array;
+        ArrayBuffer: typeof ArrayBuffer;
+        Boolean: typeof Boolean;
+        Buffer: typeof Buffer;
+        DataView: typeof DataView;
+        Date: typeof Date;
+        Error: typeof Error;
+        EvalError: typeof EvalError;
+        Float32Array: typeof Float32Array;
+        Float64Array: typeof Float64Array;
+        Function: typeof Function;
+        GLOBAL: Global;
+        Infinity: typeof Infinity;
+        Int16Array: typeof Int16Array;
+        Int32Array: typeof Int32Array;
+        Int8Array: typeof Int8Array;
+        Intl: typeof Intl;
+        JSON: typeof JSON;
+        Map: MapConstructor;
+        Math: typeof Math;
+        NaN: typeof NaN;
+        Number: typeof Number;
+        Object: typeof Object;
+        Promise: Function;
+        RangeError: typeof RangeError;
+        ReferenceError: typeof ReferenceError;
+        RegExp: typeof RegExp;
+        Set: SetConstructor;
+        String: typeof String;
+        Symbol: Function;
+        SyntaxError: typeof SyntaxError;
+        TypeError: typeof TypeError;
+        URIError: typeof URIError;
+        Uint16Array: typeof Uint16Array;
+        Uint32Array: typeof Uint32Array;
+        Uint8Array: typeof Uint8Array;
+        Uint8ClampedArray: Function;
+        WeakMap: WeakMapConstructor;
+        WeakSet: WeakSetConstructor;
+        clearImmediate: (immediateId: any) => void;
+        clearInterval: (intervalId: NodeJS.Timer) => void;
+        clearTimeout: (timeoutId: NodeJS.Timer) => void;
+        console: typeof console;
+        decodeURI: typeof decodeURI;
+        decodeURIComponent: typeof decodeURIComponent;
+        encodeURI: typeof encodeURI;
+        encodeURIComponent: typeof encodeURIComponent;
+        escape: (str: string) => string;
+        eval: typeof eval;
+        global: Global;
+        isFinite: typeof isFinite;
+        isNaN: typeof isNaN;
+        parseFloat: typeof parseFloat;
+        parseInt: typeof parseInt;
+        process: Process;
+        root: Global;
+        setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any;
+        setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer;
+        undefined: typeof undefined;
+        unescape: (str: string) => string;
+        gc: () => void;
+        v8debug?: any;
+    }
+
+    export interface Timer {
+        ref(): void;
+        unref(): void;
+    }
+}
+
+interface IterableIterator<T> { }
+
+/**
+ * @deprecated
+ */
+interface NodeBuffer extends Uint8Array {
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
+}
+
+/************************************************
+*                                               *
+*                   MODULES                     *
+*                                               *
+************************************************/
+declare module "buffer" {
+    export var INSPECT_MAX_BYTES: number;
+    var BuffType: typeof Buffer;
+    var SlowBuffType: typeof SlowBuffer;
+    export { BuffType as Buffer, SlowBuffType as SlowBuffer };
+}
+
+declare module "querystring" {
+    export interface StringifyOptions {
+        encodeURIComponent?: Function;
+    }
+
+    export interface ParseOptions {
+        maxKeys?: number;
+        decodeURIComponent?: Function;
+    }
+
+    export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
+    export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): any;
+    export function parse<T extends {}>(str: string, sep?: string, eq?: string, options?: ParseOptions): T;
+    export function escape(str: string): string;
+    export function unescape(str: string): string;
+}
+
+declare module "events" {
+    class internal extends NodeJS.EventEmitter { }
+
+    namespace internal {
+        export class EventEmitter extends internal {
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
+            static defaultMaxListeners: number;
+
+            addListener(event: string | symbol, listener: Function): this;
+            on(event: string | symbol, listener: Function): this;
+            once(event: string | symbol, listener: Function): this;
+            prependListener(event: string | symbol, listener: Function): this;
+            prependOnceListener(event: string | symbol, listener: Function): this;
+            removeListener(event: string | symbol, listener: Function): this;
+            removeAllListeners(event?: string | symbol): this;
+            setMaxListeners(n: number): this;
+            getMaxListeners(): number;
+            listeners(event: string | symbol): Function[];
+            emit(event: string | symbol, ...args: any[]): boolean;
+            eventNames(): (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";
+
+    export interface RequestOptions {
+        protocol?: string;
+        host?: string;
+        hostname?: string;
+        family?: number;
+        port?: number;
+        localAddress?: string;
+        socketPath?: string;
+        method?: string;
+        path?: string;
+        headers?: { [key: string]: any };
+        auth?: string;
+        agent?: Agent | boolean;
+        timeout?: number;
+    }
+
+    export interface Server extends net.Server {
+        setTimeout(msecs: number, callback: Function): void;
+        maxHeadersCount: number;
+        timeout: number;
+        listening: boolean;
+    }
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export interface ServerRequest extends IncomingMessage {
+        connection: net.Socket;
+    }
+    export interface ServerResponse extends stream.Writable {
+        // 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;
+
+        writeContinue(): void;
+        writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
+        writeHead(statusCode: number, headers?: any): void;
+        statusCode: number;
+        statusMessage: string;
+        headersSent: boolean;
+        setHeader(name: string, value: string | string[]): void;
+        setTimeout(msecs: number, callback: Function): ServerResponse;
+        sendDate: boolean;
+        getHeader(name: string): string;
+        removeHeader(name: string): void;
+        write(chunk: any, encoding?: string): any;
+        addTrailers(headers: any): void;
+        finished: boolean;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+    }
+    export interface ClientRequest extends stream.Writable {
+        // 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(chunk: any, encoding?: string): void;
+        abort(): void;
+        setTimeout(timeout: number, callback?: Function): void;
+        setNoDelay(noDelay?: boolean): void;
+        setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
+
+        setHeader(name: string, value: string | string[]): void;
+        getHeader(name: string): string;
+        removeHeader(name: string): void;
+        addTrailers(headers: any): void;
+
+        // 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;
+    }
+    export interface IncomingMessage extends stream.Readable {
+        httpVersion: string;
+        httpVersionMajor: number;
+        httpVersionMinor: number;
+        connection: net.Socket;
+        headers: any;
+        rawHeaders: string[];
+        trailers: any;
+        rawTrailers: any;
+        setTimeout(msecs: number, callback: Function): NodeJS.Timer;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        method?: string;
+        /**
+         * Only valid for request obtained from http.Server.
+         */
+        url?: string;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusCode?: number;
+        /**
+         * Only valid for response obtained from http.ClientRequest.
+         */
+        statusMessage?: string;
+        socket: net.Socket;
+        destroy(error?: Error): void;
+    }
+    /**
+     * @deprecated Use IncomingMessage
+     */
+    export interface ClientResponse extends IncomingMessage { }
+
+    export interface AgentOptions {
+        /**
+         * Keep sockets around in a pool to be used by other requests in the future. Default = false
+         */
+        keepAlive?: boolean;
+        /**
+         * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000.
+         * Only relevant if keepAlive is set to true.
+         */
+        keepAliveMsecs?: number;
+        /**
+         * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity
+         */
+        maxSockets?: number;
+        /**
+         * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
+         */
+        maxFreeSockets?: number;
+    }
+
+    export class Agent {
+        maxSockets: number;
+        sockets: any;
+        requests: any;
+
+        constructor(opts?: AgentOptions);
+
+        /**
+         * Destroy any sockets that are currently in use by the agent.
+         * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
+         * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
+         * sockets may hang open for quite a long time before the server terminates them.
+         */
+        destroy(): void;
+    }
+
+    export var METHODS: string[];
+
+    export var STATUS_CODES: {
+        [errorCode: number]: string;
+        [errorCode: string]: string;
+    };
+    export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
+    export function createClient(port?: number, host?: string): any;
+    export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "cluster" {
+    import * as child from "child_process";
+    import * as events from "events";
+    import * as net from "net";
+
+    // interfaces
+    export interface ClusterSettings {
+        execArgv?: string[]; // default: process.execArgv
+        exec?: string;
+        args?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+    }
+
+    export interface ClusterSetupMasterSettings {
+        exec?: string;  // default: process.argv[1]
+        args?: string[];  // default: process.argv.slice(2)
+        silent?: boolean;  // default: false
+        stdio?: any[];
+    }
+
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: number | "udp4" | "udp6";  // 4, 6, -1, "udp4", "udp6"
+    }
+
+    export class Worker extends events.EventEmitter {
+        id: string;
+        process: child.ChildProcess;
+        suicide: boolean;
+        send(message: any, sendHandle?: any): 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: Function): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (code: number, signal: string) => 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, listener: Function): boolean
+        emit(event: "disconnect", listener: () => void): boolean
+        emit(event: "error", listener: (code: number, signal: string) => void): boolean
+        emit(event: "exit", listener: (code: number, signal: string) => void): boolean
+        emit(event: "listening", listener: (address: Address) => void): boolean
+        emit(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): boolean
+        emit(event: "online", listener: () => void): boolean
+
+        on(event: string, listener: Function): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (code: number, signal: string) => 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: Function): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (code: number, signal: string) => 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: Function): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (code: number, signal: string) => 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: Function): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "listening", listener: (address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: () => void): this;
+    }
+
+    export interface Cluster extends events.EventEmitter {
+        Worker: Worker;
+        disconnect(callback?: Function): void;
+        fork(env?: any): Worker;
+        isMaster: boolean;
+        isWorker: boolean;
+        // TODO: cluster.schedulingPolicy
+        settings: ClusterSettings;
+        setupMaster(settings?: ClusterSetupMasterSettings): void;
+        worker: Worker;
+        workers: {
+            [index: string]: Worker
+        };
+
+        /**
+         * events.EventEmitter
+         *   1. disconnect
+         *   2. exit
+         *   3. fork
+         *   4. listening
+         *   5. message
+         *   6. online
+         *   7. setup
+         */
+        addListener(event: string, listener: Function): 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, listener: Function): boolean;
+        emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
+        emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
+        emit(event: "fork", listener: (worker: Worker) => void): boolean;
+        emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
+        emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
+        emit(event: "online", listener: (worker: Worker) => void): boolean;
+        emit(event: "setup", listener: (settings: any) => void): boolean;
+
+        on(event: string, listener: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): this;
+        prependOnceListener(event: "fork", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
+        prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
+        prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+
+    }
+
+    export function disconnect(callback?: Function): void;
+    export function fork(env?: any): Worker;
+    export var isMaster: boolean;
+    export var isWorker: boolean;
+    // TODO: cluster.schedulingPolicy
+    export var settings: ClusterSettings;
+    export function setupMaster(settings?: ClusterSetupMasterSettings): void;
+    export var worker: Worker;
+    export var workers: {
+        [index: string]: Worker
+    };
+
+    /**
+     * events.EventEmitter
+     *   1. disconnect
+     *   2. exit
+     *   3. fork
+     *   4. listening
+     *   5. message
+     *   6. online
+     *   7. setup
+     */
+    export function addListener(event: string, listener: Function): Cluster;
+    export function addListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function addListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function emit(event: string, listener: Function): boolean;
+    export function emit(event: "disconnect", listener: (worker: Worker) => void): boolean;
+    export function emit(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): boolean;
+    export function emit(event: "fork", listener: (worker: Worker) => void): boolean;
+    export function emit(event: "listening", listener: (worker: Worker, address: Address) => void): boolean;
+    export function emit(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): boolean;
+    export function emit(event: "online", listener: (worker: Worker) => void): boolean;
+    export function emit(event: "setup", listener: (settings: any) => void): boolean;
+
+    export function on(event: string, listener: Function): Cluster;
+    export function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function on(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function on(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function on(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function once(event: string, listener: Function): Cluster;
+    export function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function once(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function once(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function once(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function removeListener(event: string, listener: Function): Cluster;
+    export function removeAllListeners(event?: string): Cluster;
+    export function setMaxListeners(n: number): Cluster;
+    export function getMaxListeners(): number;
+    export function listeners(event: string): Function[];
+    export function listenerCount(type: string): number;
+
+    export function prependListener(event: string, listener: Function): Cluster;
+    export function prependListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function prependOnceListener(event: string, listener: Function): Cluster;
+    export function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "exit", listener: (worker: Worker, code: number, signal: string) => void): Cluster;
+    export function prependOnceListener(event: "fork", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
+    export function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
+    export function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
+    export function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+
+    export function eventNames(): string[];
+}
+
+declare module "zlib" {
+    import * as stream from "stream";
+
+    export interface ZlibOptions {
+      flush?: number; // default: zlib.constants.Z_NO_FLUSH
+      finishFlush?: number; // default: zlib.constants.Z_FINISH
+      chunkSize?: number; // default: 16*1024
+      windowBits?: number;
+      level?: number; // compression only
+      memLevel?: number; // compression only
+      strategy?: number; // compression only
+      dictionary?: any; // deflate/inflate only, empty dictionary by default
+    }
+
+    export interface Gzip extends stream.Transform { }
+    export interface Gunzip extends stream.Transform { }
+    export interface Deflate extends stream.Transform { }
+    export interface Inflate extends stream.Transform { }
+    export interface DeflateRaw extends stream.Transform { }
+    export interface InflateRaw extends stream.Transform { }
+    export interface Unzip extends stream.Transform { }
+
+    export function createGzip(options?: ZlibOptions): Gzip;
+    export function createGunzip(options?: ZlibOptions): Gunzip;
+    export function createDeflate(options?: ZlibOptions): Deflate;
+    export function createInflate(options?: ZlibOptions): Inflate;
+    export function createDeflateRaw(options?: ZlibOptions): DeflateRaw;
+    export function createInflateRaw(options?: ZlibOptions): InflateRaw;
+    export function createUnzip(options?: ZlibOptions): Unzip;
+
+    export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
+    export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function gzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function gunzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function gunzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function inflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function inflate(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function inflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function inflateRaw(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function unzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function unzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
+    export function unzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
+
+    export namespace constants {
+        // Allowed flush values.
+
+        export const Z_NO_FLUSH: number;
+        export const Z_PARTIAL_FLUSH: number;
+        export const Z_SYNC_FLUSH: number;
+        export const Z_FULL_FLUSH: number;
+        export const Z_FINISH: number;
+        export const Z_BLOCK: number;
+        export const Z_TREES: number;
+
+        // Return codes for the compression/decompression functions. Negative values are errors, positive values are used for special but normal events.
+
+        export const Z_OK: number;
+        export const Z_STREAM_END: number;
+        export const Z_NEED_DICT: number;
+        export const Z_ERRNO: number;
+        export const Z_STREAM_ERROR: number;
+        export const Z_DATA_ERROR: number;
+        export const Z_MEM_ERROR: number;
+        export const Z_BUF_ERROR: number;
+        export const Z_VERSION_ERROR: number;
+
+        // Compression levels.
+
+        export const Z_NO_COMPRESSION: number;
+        export const Z_BEST_SPEED: number;
+        export const Z_BEST_COMPRESSION: number;
+        export const Z_DEFAULT_COMPRESSION: number;
+
+        // Compression strategy.
+
+        export const Z_FILTERED: number;
+        export const Z_HUFFMAN_ONLY: number;
+        export const Z_RLE: number;
+        export const Z_FIXED: number;
+        export const Z_DEFAULT_STRATEGY: number;
+    }
+
+    // Constants
+    export var Z_NO_FLUSH: number;
+    export var Z_PARTIAL_FLUSH: number;
+    export var Z_SYNC_FLUSH: number;
+    export var Z_FULL_FLUSH: number;
+    export var Z_FINISH: number;
+    export var Z_BLOCK: number;
+    export var Z_TREES: number;
+    export var Z_OK: number;
+    export var Z_STREAM_END: number;
+    export var Z_NEED_DICT: number;
+    export var Z_ERRNO: number;
+    export var Z_STREAM_ERROR: number;
+    export var Z_DATA_ERROR: number;
+    export var Z_MEM_ERROR: number;
+    export var Z_BUF_ERROR: number;
+    export var Z_VERSION_ERROR: number;
+    export var Z_NO_COMPRESSION: number;
+    export var Z_BEST_SPEED: number;
+    export var Z_BEST_COMPRESSION: number;
+    export var Z_DEFAULT_COMPRESSION: number;
+    export var Z_FILTERED: number;
+    export var Z_HUFFMAN_ONLY: number;
+    export var Z_RLE: number;
+    export var Z_FIXED: number;
+    export var Z_DEFAULT_STRATEGY: number;
+    export var Z_BINARY: number;
+    export var Z_TEXT: number;
+    export var Z_ASCII: number;
+    export var Z_UNKNOWN: number;
+    export var Z_DEFLATED: number;
+}
+
+declare module "os" {
+    export interface CpuInfo {
+        model: string;
+        speed: number;
+        times: {
+            user: number;
+            nice: number;
+            sys: number;
+            idle: number;
+            irq: number;
+        };
+    }
+
+    export interface NetworkInterfaceInfo {
+        address: string;
+        netmask: string;
+        family: string;
+        mac: string;
+        internal: boolean;
+    }
+
+    export function hostname(): string;
+    export function loadavg(): number[];
+    export function uptime(): number;
+    export function freemem(): number;
+    export function totalmem(): number;
+    export function cpus(): CpuInfo[];
+    export function type(): string;
+    export function release(): string;
+    export function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
+    export function homedir(): string;
+    export function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string }
+    export var constants: {
+        UV_UDP_REUSEADDR: number,
+        signals: {
+            SIGHUP: number;
+            SIGINT: number;
+            SIGQUIT: number;
+            SIGILL: number;
+            SIGTRAP: number;
+            SIGABRT: number;
+            SIGIOT: number;
+            SIGBUS: number;
+            SIGFPE: number;
+            SIGKILL: number;
+            SIGUSR1: number;
+            SIGSEGV: number;
+            SIGUSR2: number;
+            SIGPIPE: number;
+            SIGALRM: number;
+            SIGTERM: number;
+            SIGCHLD: number;
+            SIGSTKFLT: number;
+            SIGCONT: number;
+            SIGSTOP: number;
+            SIGTSTP: number;
+            SIGTTIN: number;
+            SIGTTOU: number;
+            SIGURG: number;
+            SIGXCPU: number;
+            SIGXFSZ: number;
+            SIGVTALRM: number;
+            SIGPROF: number;
+            SIGWINCH: number;
+            SIGIO: number;
+            SIGPOLL: number;
+            SIGPWR: number;
+            SIGSYS: number;
+            SIGUNUSED: number;
+        },
+        errno: {
+            E2BIG: number;
+            EACCES: number;
+            EADDRINUSE: number;
+            EADDRNOTAVAIL: number;
+            EAFNOSUPPORT: number;
+            EAGAIN: number;
+            EALREADY: number;
+            EBADF: number;
+            EBADMSG: number;
+            EBUSY: number;
+            ECANCELED: number;
+            ECHILD: number;
+            ECONNABORTED: number;
+            ECONNREFUSED: number;
+            ECONNRESET: number;
+            EDEADLK: number;
+            EDESTADDRREQ: number;
+            EDOM: number;
+            EDQUOT: number;
+            EEXIST: number;
+            EFAULT: number;
+            EFBIG: number;
+            EHOSTUNREACH: number;
+            EIDRM: number;
+            EILSEQ: number;
+            EINPROGRESS: number;
+            EINTR: number;
+            EINVAL: number;
+            EIO: number;
+            EISCONN: number;
+            EISDIR: number;
+            ELOOP: number;
+            EMFILE: number;
+            EMLINK: number;
+            EMSGSIZE: number;
+            EMULTIHOP: number;
+            ENAMETOOLONG: number;
+            ENETDOWN: number;
+            ENETRESET: number;
+            ENETUNREACH: number;
+            ENFILE: number;
+            ENOBUFS: number;
+            ENODATA: number;
+            ENODEV: number;
+            ENOENT: number;
+            ENOEXEC: number;
+            ENOLCK: number;
+            ENOLINK: number;
+            ENOMEM: number;
+            ENOMSG: number;
+            ENOPROTOOPT: number;
+            ENOSPC: number;
+            ENOSR: number;
+            ENOSTR: number;
+            ENOSYS: number;
+            ENOTCONN: number;
+            ENOTDIR: number;
+            ENOTEMPTY: number;
+            ENOTSOCK: number;
+            ENOTSUP: number;
+            ENOTTY: number;
+            ENXIO: number;
+            EOPNOTSUPP: number;
+            EOVERFLOW: number;
+            EPERM: number;
+            EPIPE: number;
+            EPROTO: number;
+            EPROTONOSUPPORT: number;
+            EPROTOTYPE: number;
+            ERANGE: number;
+            EROFS: number;
+            ESPIPE: number;
+            ESRCH: number;
+            ESTALE: number;
+            ETIME: number;
+            ETIMEDOUT: number;
+            ETXTBSY: number;
+            EWOULDBLOCK: number;
+            EXDEV: number;
+        },
+    };
+    export function arch(): string;
+    export function platform(): NodeJS.Platform;
+    export function tmpdir(): string;
+    export var EOL: string;
+    export function endianness(): "BE" | "LE";
+}
+
+declare module "https" {
+    import * as tls from "tls";
+    import * as events from "events";
+    import * as http from "http";
+
+    export interface ServerOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        crl?: any;
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: any;
+        SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
+    }
+
+    export interface RequestOptions extends http.RequestOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+        secureProtocol?: string;
+    }
+
+    export interface Agent extends http.Agent { }
+
+    export interface AgentOptions extends http.AgentOptions {
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any;
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+        secureProtocol?: string;
+        maxCachedSessions?: number;
+    }
+
+    export var Agent: {
+        new (options?: AgentOptions): Agent;
+    };
+    export interface Server extends tls.Server { }
+    export function createServer(options: ServerOptions, requestListener?: Function): Server;
+    export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export var globalAgent: Agent;
+}
+
+declare module "punycode" {
+    export function decode(string: string): string;
+    export function encode(string: string): string;
+    export function toUnicode(domain: string): string;
+    export function toASCII(domain: string): string;
+    export var ucs2: ucs2;
+    interface ucs2 {
+        decode(string: string): number[];
+        encode(codePoints: number[]): string;
+    }
+    export var version: any;
+}
+
+declare module "repl" {
+    import * as stream from "stream";
+    import * as readline from "readline";
+
+    export interface ReplOptions {
+        prompt?: string;
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        terminal?: boolean;
+        eval?: Function;
+        useColors?: boolean;
+        useGlobal?: boolean;
+        ignoreUndefined?: boolean;
+        writer?: Function;
+        completer?: Function;
+        replMode?: any;
+        breakEvalOnSigint?: any;
+    }
+
+    export interface REPLServer extends readline.ReadLine {
+        defineCommand(keyword: string, cmd: Function | { help: string, action: Function }): void;
+        displayPrompt(preserveCursor?: boolean): void;
+
+        /**
+         * events.EventEmitter
+         * 1. exit
+         * 2. reset
+         **/
+
+        addListener(event: string, listener: Function): this;
+        addListener(event: "exit", listener: () => void): this;
+        addListener(event: "reset", listener: Function): this;
+
+        emit(event: string, ...args: any[]): boolean;
+        emit(event: "exit"): boolean;
+        emit(event: "reset", context: any): boolean;
+
+        on(event: string, listener: Function): this;
+        on(event: "exit", listener: () => void): this;
+        on(event: "reset", listener: Function): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "exit", listener: () => void): this;
+        once(event: "reset", listener: Function): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "exit", listener: () => void): this;
+        prependListener(event: "reset", listener: Function): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "exit", listener: () => void): this;
+        prependOnceListener(event: "reset", listener: Function): this;
+    }
+
+    export function start(options: ReplOptions): REPLServer;
+}
+
+declare module "readline" {
+    import * as events from "events";
+    import * as stream from "stream";
+
+    export interface Key {
+        sequence?: string;
+        name?: string;
+        ctrl?: boolean;
+        meta?: boolean;
+        shift?: boolean;
+    }
+
+    export interface ReadLine extends events.EventEmitter {
+        setPrompt(prompt: string): void;
+        prompt(preserveCursor?: boolean): void;
+        question(query: string, callback: (answer: string) => void): void;
+        pause(): ReadLine;
+        resume(): ReadLine;
+        close(): void;
+        write(data: string | Buffer, key?: Key): void;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. line
+         * 3. pause
+         * 4. resume
+         * 5. SIGCONT
+         * 6. SIGINT
+         * 7. SIGTSTP
+         **/
+
+        addListener(event: string, listener: Function): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "line", listener: (input: any) => void): this;
+        addListener(event: "pause", listener: () => void): this;
+        addListener(event: "resume", listener: () => void): this;
+        addListener(event: "SIGCONT", listener: () => void): this;
+        addListener(event: "SIGINT", listener: () => void): this;
+        addListener(event: "SIGTSTP", listener: () => void): this;
+
+        emit(event: string, ...args: any[]): boolean;
+        emit(event: "close"): boolean;
+        emit(event: "line", input: any): boolean;
+        emit(event: "pause"): boolean;
+        emit(event: "resume"): boolean;
+        emit(event: "SIGCONT"): boolean;
+        emit(event: "SIGINT"): boolean;
+        emit(event: "SIGTSTP"): boolean;
+
+        on(event: string, listener: Function): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "line", listener: (input: any) => void): this;
+        on(event: "pause", listener: () => void): this;
+        on(event: "resume", listener: () => void): this;
+        on(event: "SIGCONT", listener: () => void): this;
+        on(event: "SIGINT", listener: () => void): this;
+        on(event: "SIGTSTP", listener: () => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "line", listener: (input: any) => void): this;
+        once(event: "pause", listener: () => void): this;
+        once(event: "resume", listener: () => void): this;
+        once(event: "SIGCONT", listener: () => void): this;
+        once(event: "SIGINT", listener: () => void): this;
+        once(event: "SIGTSTP", listener: () => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "line", listener: (input: any) => void): this;
+        prependListener(event: "pause", listener: () => void): this;
+        prependListener(event: "resume", listener: () => void): this;
+        prependListener(event: "SIGCONT", listener: () => void): this;
+        prependListener(event: "SIGINT", listener: () => void): this;
+        prependListener(event: "SIGTSTP", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "line", listener: (input: any) => void): this;
+        prependOnceListener(event: "pause", listener: () => void): this;
+        prependOnceListener(event: "resume", listener: () => void): this;
+        prependOnceListener(event: "SIGCONT", listener: () => void): this;
+        prependOnceListener(event: "SIGINT", listener: () => void): this;
+        prependOnceListener(event: "SIGTSTP", listener: () => void): this;
+    }
+
+    type Completer = (line: string) => CompleterResult;
+    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+
+    export type CompleterResult = [string[], string];
+
+    export interface ReadLineOptions {
+        input: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+        completer?: Completer | AsyncCompleter;
+        terminal?: boolean;
+        historySize?: number;
+    }
+
+    export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
+    export function createInterface(options: ReadLineOptions): ReadLine;
+
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
+    export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
+    export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
+    export function clearScreenDown(stream: NodeJS.WritableStream): void;
+}
+
+declare module "vm" {
+    export interface Context { }
+    export interface ScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+        cachedData?: Buffer;
+        produceCachedData?: boolean;
+    }
+    export interface RunningScriptOptions {
+        filename?: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        displayErrors?: boolean;
+        timeout?: number;
+    }
+    export class Script {
+        constructor(code: string, options?: ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
+        runInThisContext(options?: RunningScriptOptions): any;
+    }
+    export function createContext(sandbox?: Context): Context;
+    export function isContext(sandbox: Context): boolean;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInDebugContext(code: string): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+}
+
+declare module "child_process" {
+    import * as events from "events";
+    import * as stream from "stream";
+    import * as net from "net";
+
+    export interface ChildProcess extends events.EventEmitter {
+        stdin: stream.Writable;
+        stdout: stream.Readable;
+        stderr: stream.Readable;
+        stdio: [stream.Writable, stream.Readable, stream.Readable];
+        pid: number;
+        kill(signal?: string): void;
+        send(message: any, sendHandle?: any): 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: Function): this;
+        addListener(event: "close", listener: (code: number, signal: string) => void): this;
+        addListener(event: "disconnect", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        addListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        addListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        emit(event: string, ...args: any[]): boolean;
+        emit(event: "close", code: number, signal: string): boolean;
+        emit(event: "disconnect"): boolean;
+        emit(event: "error", err: Error): boolean;
+        emit(event: "exit", code: number, signal: string): boolean;
+        emit(event: "message", message: any, sendHandle: net.Socket | net.Server): boolean;
+
+        on(event: string, listener: Function): this;
+        on(event: "close", listener: (code: number, signal: string) => void): this;
+        on(event: "disconnect", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        on(event: "exit", listener: (code: number, signal: string) => void): this;
+        on(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "close", listener: (code: number, signal: string) => void): this;
+        once(event: "disconnect", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        once(event: "exit", listener: (code: number, signal: string) => void): this;
+        once(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "disconnect", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "close", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "disconnect", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "exit", listener: (code: number, signal: string) => void): this;
+        prependOnceListener(event: "message", listener: (message: any, sendHandle: net.Socket | net.Server) => void): this;
+    }
+
+    export interface SpawnOptions {
+        cwd?: string;
+        env?: any;
+        stdio?: any;
+        detached?: boolean;
+        uid?: number;
+        gid?: number;
+        shell?: boolean | string;
+    }
+    export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
+
+    export interface ExecOptions {
+        cwd?: string;
+        env?: any;
+        shell?: string;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
+    export interface ExecOptionsWithStringEncoding extends ExecOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecOptionsWithBufferEncoding extends ExecOptions {
+        encoding: string; // specify `null`.
+    }
+    export function exec(command: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function exec(command: string, options: ExecOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    // usage. child_process.exec("tsc", {encoding: null as string}, (err, stdout, stderr) => {});
+    export function exec(command: string, options: ExecOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function exec(command: string, options: ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+
+    export interface ExecFileOptions {
+        cwd?: string;
+        env?: any;
+        timeout?: number;
+        maxBuffer?: number;
+        killSignal?: string;
+        uid?: number;
+        gid?: number;
+    }
+    export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileOptionsWithBufferEncoding extends ExecFileOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFile(file: string, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    // usage. child_process.execFile("file.sh", {encoding: null as string}, (err, stdout, stderr) => {});
+    export function execFile(file: string, options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args?: string[], callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithStringEncoding, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+    // usage. child_process.execFile("file.sh", ["foo"], {encoding: null as string}, (err, stdout, stderr) => {});
+    export function execFile(file: string, args?: string[], options?: ExecFileOptionsWithBufferEncoding, callback?: (error: Error, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, args?: string[], options?: ExecFileOptions, callback?: (error: Error, stdout: string, stderr: string) => void): ChildProcess;
+
+    export interface ForkOptions {
+        cwd?: string;
+        env?: any;
+        execPath?: string;
+        execArgv?: string[];
+        silent?: boolean;
+        stdio?: any[];
+        uid?: number;
+        gid?: number;
+    }
+    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+
+    export interface SpawnSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+        shell?: boolean | string;
+    }
+    export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface SpawnSyncOptionsWithBufferEncoding extends SpawnSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export interface SpawnSyncReturns<T> {
+        pid: number;
+        output: string[];
+        stdout: T;
+        stderr: T;
+        status: number;
+        signal: string;
+        error: Error;
+    }
+    export function spawnSync(command: string): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+
+    export interface ExecSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        shell?: string;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecSyncOptionsWithBufferEncoding extends ExecSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execSync(command: string): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptionsWithStringEncoding): string;
+    export function execSync(command: string, options?: ExecSyncOptionsWithBufferEncoding): Buffer;
+    export function execSync(command: string, options?: ExecSyncOptions): Buffer;
+
+    export interface ExecFileSyncOptions {
+        cwd?: string;
+        input?: string | Buffer;
+        stdio?: any;
+        env?: any;
+        uid?: number;
+        gid?: number;
+        timeout?: number;
+        killSignal?: string;
+        maxBuffer?: number;
+        encoding?: string;
+    }
+    export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
+        encoding: BufferEncoding;
+    }
+    export interface ExecFileSyncOptionsWithBufferEncoding extends ExecFileSyncOptions {
+        encoding: string; // specify `null`.
+    }
+    export function execFileSync(command: string): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+}
+
+declare module "url" {
+    export interface Url {
+        href?: string;
+        protocol?: string;
+        auth?: string;
+        hostname?: string;
+        port?: string;
+        host?: string;
+        pathname?: string;
+        search?: string;
+        query?: string | any;
+        slashes?: boolean;
+        hash?: string;
+        path?: string;
+    }
+
+    export interface UrlObject {
+        protocol?: string;
+        slashes?: boolean;
+        auth?: string;
+        host?: string;
+        hostname?: string;
+        port?: string | number;
+        pathname?: string;
+        search?: string;
+        query?: { [key: string]: any; };
+        hash?: string;
+    }
+
+    export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
+    export function format(URL: URL, options?: URLFormatOptions): string;
+    export function format(urlObject: UrlObject): string;
+    export function resolve(from: string, to: string): string;
+
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    export class URLSearchParams implements Iterable<string[]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] } | Iterable<string[]> );
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): Iterator<string[]>;
+        forEach(callback: (value: string, name: string) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): Iterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): Iterator<string>;
+        [Symbol.iterator](): Iterator<string[]>;
+    }
+
+    export class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
+}
+
+declare module "dns" {
+    // Supported getaddrinfo flags.
+    export const ADDRCONFIG: number;
+    export const V4MAPPED: number;
+
+    export interface LookupOptions {
+        family?: number;
+        hints?: number;
+        all?: boolean;
+    }
+
+    export interface LookupOneOptions extends LookupOptions {
+        all?: false;
+    }
+
+    export interface LookupAllOptions extends LookupOptions {
+        all: true;
+    }
+
+    export interface LookupAddress {
+        address: string;
+        family: number;
+    }
+
+    export function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+    export function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException, addresses: LookupAddress[]) => void): void;
+    export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
+    export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
+
+    export interface ResolveOptions {
+        ttl: boolean;
+    }
+
+    export interface ResolveWithTtlOptions extends ResolveOptions {
+        ttl: true;
+    }
+
+    export interface RecordWithTtl {
+        address: string;
+        ttl: number;
+    }
+
+    export interface MxRecord {
+        priority: number;
+        exchange: string;
+    }
+
+    export interface NaptrRecord {
+        flags: string;
+        service: string;
+        regexp: string;
+        replacement: string;
+        order: number;
+        preference: number;
+    }
+
+    export interface SoaRecord {
+        nsname: string;
+        hostmaster: string;
+        serial: number;
+        refresh: number;
+        retry: number;
+        expire: number;
+        minttl: number;
+    }
+
+    export interface SrvRecord {
+        priority: number;
+        weight: number;
+        port: number;
+        name: string;
+    }
+
+    export function resolve(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "A", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "AAAA", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "CNAME", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "MX", callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NAPTR", callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "NS", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "PTR", callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve(hostname: string, rrtype: "SOA", callback: (err: NodeJS.ErrnoException, addresses: SoaRecord) => void): void;
+    export function resolve(hostname: string, rrtype: "SRV", callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolve(hostname: string, rrtype: "TXT", callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][]) => void): void;
+
+    export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve4(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    export function resolve6(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveWithTtlOptions, callback: (err: NodeJS.ErrnoException, addresses: RecordWithTtl[]) => void): void;
+    export function resolve6(hostname: string, options: ResolveOptions, callback: (err: NodeJS.ErrnoException, addresses: string[] | RecordWithTtl[]) => void): void;
+
+    export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+
+    export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
+    export function setServers(servers: string[]): void;
+
+    //Error codes
+    export var NODATA: string;
+    export var FORMERR: string;
+    export var SERVFAIL: string;
+    export var NOTFOUND: string;
+    export var NOTIMP: string;
+    export var REFUSED: string;
+    export var BADQUERY: string;
+    export var BADNAME: string;
+    export var BADFAMILY: string;
+    export var BADRESP: string;
+    export var CONNREFUSED: string;
+    export var TIMEOUT: string;
+    export var EOF: string;
+    export var FILE: string;
+    export var NOMEM: string;
+    export var DESTRUCTION: string;
+    export var BADSTR: string;
+    export var BADFLAGS: string;
+    export var NONAME: string;
+    export var BADHINTS: string;
+    export var NOTINITIALIZED: string;
+    export var LOADIPHLPAPI: string;
+    export var ADDRGETNETWORKPARAMS: string;
+    export var CANCELLED: string;
+}
+
+declare module "net" {
+    import * as stream from "stream";
+    import * as events from "events";
+
+    export interface Socket extends stream.Duplex {
+        // 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;
+
+        connect(port: number, host?: string, connectionListener?: Function): void;
+        connect(path: string, connectionListener?: Function): void;
+        bufferSize: number;
+        setEncoding(encoding?: string): this;
+        write(data: any, encoding?: string, callback?: Function): void;
+        destroy(err?: any): void;
+        pause(): this;
+        resume(): this;
+        setTimeout(timeout: number, callback?: Function): void;
+        setNoDelay(noDelay?: boolean): void;
+        setKeepAlive(enable?: boolean, initialDelay?: number): void;
+        address(): { port: number; family: string; address: string; };
+        unref(): void;
+        ref(): void;
+
+        remoteAddress: string;
+        remoteFamily: string;
+        remotePort: number;
+        localAddress: string;
+        localPort: number;
+        bytesRead: number;
+        bytesWritten: number;
+        connecting: boolean;
+        destroyed: boolean;
+
+        // Extended base methods
+        end(): void;
+        end(buffer: Buffer, cb?: Function): void;
+        end(str: string, cb?: Function): void;
+        end(str: string, encoding?: string, cb?: Function): void;
+        end(data?: any, encoding?: string): void;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        addListener(event: string, listener: Function): 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, ...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: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: "close", listener: (had_error: boolean) => void): this;
+        prependOnceListener(event: "connect", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (data: Buffer) => void): this;
+        prependOnceListener(event: "drain", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "lookup", listener: (err: Error, address: string, family: string | number, host: string) => void): this;
+        prependOnceListener(event: "timeout", listener: () => void): this;
+    }
+
+    export var Socket: {
+        new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket;
+    };
+
+    export interface ListenOptions {
+        port?: number;
+        host?: string;
+        backlog?: number;
+        path?: string;
+        exclusive?: boolean;
+    }
+
+    export interface Server extends events.EventEmitter {
+        listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
+        listen(port: number, hostname?: string, listeningListener?: Function): Server;
+        listen(port: number, backlog?: number, listeningListener?: Function): Server;
+        listen(port: number, listeningListener?: Function): Server;
+        listen(path: string, backlog?: number, listeningListener?: Function): Server;
+        listen(path: string, listeningListener?: Function): Server;
+        listen(options: ListenOptions, listeningListener?: Function): Server;
+        listen(handle: any, backlog?: number, listeningListener?: Function): Server;
+        listen(handle: any, listeningListener?: Function): Server;
+        close(callback?: Function): Server;
+        address(): { port: number; family: string; address: string; };
+        getConnections(cb: (error: Error, count: number) => void): void;
+        ref(): Server;
+        unref(): Server;
+        maxConnections: number;
+        connections: number;
+        listening: boolean;
+
+        /**
+         * events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        addListener(event: string, listener: Function): 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, ...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: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "connection", listener: (socket: Socket) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: "listening", listener: () => void): this;
+    }
+    export function createServer(connectionListener?: (socket: Socket) => void): Server;
+    export function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
+    export function connect(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function connect(port: number, host?: string, connectionListener?: Function): Socket;
+    export function connect(path: string, connectionListener?: Function): Socket;
+    export function createConnection(options: { port: number, host?: string, localAddress?: string, localPort?: string, family?: number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket;
+    export function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
+    export function createConnection(path: string, connectionListener?: Function): Socket;
+    export function isIP(input: string): number;
+    export function isIPv4(input: string): boolean;
+    export function isIPv6(input: string): boolean;
+}
+
+declare module "dgram" {
+    import * as events from "events";
+
+    interface RemoteInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
+    interface BindOptions {
+        port: number;
+        address?: string;
+        exclusive?: boolean;
+    }
+
+    type SocketType = "udp4" | "udp6";
+
+    interface SocketOptions {
+        type: SocketType;
+        reuseAddr?: boolean;
+    }
+
+    export function createSocket(type: SocketType, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+    export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
+
+    export interface Socket extends events.EventEmitter {
+        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
+        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
+        bind(port?: number, address?: string, callback?: () => void): void;
+        bind(options: BindOptions, callback?: Function): void;
+        close(callback?: () => void): void;
+        address(): AddressInfo;
+        setBroadcast(flag: boolean): void;
+        setTTL(ttl: number): void;
+        setMulticastTTL(ttl: number): void;
+        setMulticastLoopback(flag: boolean): void;
+        addMembership(multicastAddress: string, multicastInterface?: string): void;
+        dropMembership(multicastAddress: string, multicastInterface?: string): void;
+        ref(): this;
+        unref(): this;
+
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         **/
+        addListener(event: string, listener: Function): 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, ...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: Function): 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: Function): 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: Function): 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: Function): 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";
+
+    interface 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;
+        atime: Date;
+        mtime: Date;
+        ctime: Date;
+        birthtime: Date;
+    }
+
+    interface FSWatcher extends events.EventEmitter {
+        close(): void;
+
+        /**
+         * events.EventEmitter
+         *   1. change
+         *   2. error
+         */
+        addListener(event: string, listener: Function): this;
+        addListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        addListener(event: "error", listener: (code: number, signal: string) => void): this;
+
+        on(event: string, listener: Function): this;
+        on(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        on(event: "error", listener: (code: number, signal: string) => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        once(event: "error", listener: (code: number, signal: string) => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependListener(event: "error", listener: (code: number, signal: string) => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "change", listener: (eventType: string, filename: string | Buffer) => void): this;
+        prependOnceListener(event: "error", listener: (code: number, signal: string) => void): this;
+    }
+
+    export interface ReadStream extends stream.Readable {
+        close(): void;
+        destroy(): void;
+        bytesRead: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: Function): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: Function): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    export interface WriteStream extends stream.Writable {
+        close(): void;
+        bytesWritten: number;
+        path: string | Buffer;
+
+        /**
+         * events.EventEmitter
+         *   1. open
+         *   2. close
+         */
+        addListener(event: string, listener: Function): this;
+        addListener(event: "open", listener: (fd: number) => void): this;
+        addListener(event: "close", listener: () => void): this;
+
+        on(event: string, listener: Function): this;
+        on(event: "open", listener: (fd: number) => void): this;
+        on(event: "close", listener: () => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "open", listener: (fd: number) => void): this;
+        once(event: "close", listener: () => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "open", listener: (fd: number) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "open", listener: (fd: number) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+    }
+
+    /**
+     * Asynchronous rename.
+     * @param oldPath
+     * @param newPath
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous rename
+     * @param oldPath
+     * @param newPath
+     */
+    export function renameSync(oldPath: string, newPath: string): void;
+    export function truncate(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncate(path: string | Buffer, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function truncateSync(path: string | Buffer, len?: number): void;
+    export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function ftruncateSync(fd: number, len?: number): void;
+    export function chown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chownSync(path: string | Buffer, uid: number, gid: number): void;
+    export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchownSync(fd: number, uid: number, gid: number): void;
+    export function lchown(path: string | Buffer, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchownSync(path: string | Buffer, uid: number, gid: number): void;
+    export function chmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function chmodSync(path: string | Buffer, mode: number): void;
+    export function chmodSync(path: string | Buffer, mode: string): void;
+    export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fchmodSync(fd: number, mode: number): void;
+    export function fchmodSync(fd: number, mode: string): void;
+    export function lchmod(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmod(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function lchmodSync(path: string | Buffer, mode: number): void;
+    export function lchmodSync(path: string | Buffer, mode: string): void;
+    export function stat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function lstat(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
+    export function statSync(path: string | Buffer): Stats;
+    export function lstatSync(path: string | Buffer): Stats;
+    export function fstatSync(fd: number): Stats;
+    export function link(srcpath: string | Buffer, dstpath: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function linkSync(srcpath: string | Buffer, dstpath: string | Buffer): void;
+    export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function symlinkSync(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): void;
+    export function readlink(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    export function readlinkSync(path: string | Buffer): string;
+    export function realpath(path: string | Buffer, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    export function realpath(path: string | Buffer, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    export function realpathSync(path: string | Buffer, cache?: { [path: string]: string }): string;
+    /**
+     * Asynchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function unlink(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous unlink - deletes the file specified in {path}
+     *
+     * @param path
+     */
+    export function unlinkSync(path: string | Buffer): void;
+    /**
+     * Asynchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function rmdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous rmdir - removes the directory specified in {path}
+     *
+     * @param path
+     */
+    export function rmdirSync(path: string | Buffer): void;
+    /**
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string | Buffer, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string | Buffer, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Asynchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdir(path: string | Buffer, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    /**
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string | Buffer, mode?: number): void;
+    /**
+     * Synchronous mkdir - creates the directory specified in {path}.  Parameter {mode} defaults to 0777.
+     *
+     * @param path
+     * @param mode
+     * @param callback No arguments other than a possible exception are given to the completion callback.
+     */
+    export function mkdirSync(path: string | Buffer, mode?: string): void;
+    /**
+     * Asynchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     *
+     * @param prefix
+     * @param callback The created folder path is passed as a string to the callback's second parameter.
+     */
+    export function mkdtemp(prefix: string, callback?: (err: NodeJS.ErrnoException, folder: string) => void): void;
+    /**
+     * Synchronous mkdtemp - Creates a unique temporary directory. Generates six random characters to be appended behind a required prefix to create a unique temporary directory.
+     *
+     * @param prefix
+     * @returns Returns the created folder path.
+     */
+    export function mkdtempSync(prefix: string): string;
+    export function readdir(path: string | Buffer, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdir(path: string | Buffer, options: string | {}, callback: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    export function readdirSync(path: string | Buffer, options?: string | {}): string[];
+    export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function closeSync(fd: number): void;
+    export function open(path: string | Buffer, flags: string | number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+    export function open(path: string | Buffer, flags: string | number, mode: number, callback: (err: NodeJS.ErrnoException, fd: number) => void): void;
+    export function openSync(path: string | Buffer, flags: string | number, mode?: number): number;
+    export function utimes(path: string | Buffer, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimes(path: string | Buffer, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function utimesSync(path: string | Buffer, atime: number, mtime: number): void;
+    export function utimesSync(path: string | Buffer, atime: Date, mtime: Date): void;
+    export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function futimesSync(fd: number, atime: number, mtime: number): void;
+    export function futimesSync(fd: number, atime: Date, mtime: Date): void;
+    export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    export function fsyncSync(fd: number): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void;
+    export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position?: number | null): number;
+    export function writeSync(fd: number, data: any, position?: number | null, enconding?: string): number;
+    export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number | null, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+    export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number | null): number;
+    /**
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /**
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    /**
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer.
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /**
+     * Asynchronous readFile - Asynchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file.
+     */
+    export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    /**
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param encoding
+     */
+    export function readFileSync(filename: string, encoding: string): string;
+    /**
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
+    /**
+     * Synchronous readFile - Synchronously reads the entire contents of a file.
+     *
+     * @param fileName
+     * @param options An object with optional {encoding} and {flag} properties.  If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer.
+     */
+    export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
+    export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
+    export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void;
+    export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void;
+    export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher;
+    export function watch(filename: string, encoding: string, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
+    export function watch(filename: string, options: { persistent?: boolean; recursive?: boolean; encoding?: string }, listener?: (event: string, filename: string | Buffer) => any): FSWatcher;
+    export function exists(path: string | Buffer, callback?: (exists: boolean) => void): void;
+    export function existsSync(path: string | Buffer): boolean;
+
+    export namespace constants {
+        // File Access Constants
+
+        /** Constant for fs.access(). File is visible to the calling process. */
+        export const F_OK: number;
+
+        /** Constant for fs.access(). File can be read by the calling process. */
+        export const R_OK: number;
+
+        /** Constant for fs.access(). File can be written by the calling process. */
+        export const W_OK: number;
+
+        /** Constant for fs.access(). File can be executed by the calling process. */
+        export const X_OK: number;
+
+        // File Open Constants
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
+        export const O_RDONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for write-only access. */
+        export const O_WRONLY: number;
+
+        /** Constant for fs.open(). Flag indicating to open a file for read-write access. */
+        export const O_RDWR: number;
+
+        /** Constant for fs.open(). Flag indicating to create the file if it does not already exist. */
+        export const O_CREAT: number;
+
+        /** Constant for fs.open(). Flag indicating that opening a file should fail if the O_CREAT flag is set and the file already exists. */
+        export const O_EXCL: number;
+
+        /** Constant for fs.open(). Flag indicating that if path identifies a terminal device, opening the path shall not cause that terminal to become the controlling terminal for the process (if the process does not already have one). */
+        export const O_NOCTTY: number;
+
+        /** Constant for fs.open(). Flag indicating that if the file exists and is a regular file, and the file is opened successfully for write access, its length shall be truncated to zero. */
+        export const O_TRUNC: number;
+
+        /** Constant for fs.open(). Flag indicating that data will be appended to the end of the file. */
+        export const O_APPEND: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is not a directory. */
+        export const O_DIRECTORY: number;
+
+        /** Constant for fs.open(). Flag indicating reading accesses to the file system will no longer result in an update to the atime information associated with the file. This flag is available on Linux operating systems only. */
+        export const O_NOATIME: number;
+
+        /** Constant for fs.open(). Flag indicating that the open should fail if the path is a symbolic link. */
+        export const O_NOFOLLOW: number;
+
+        /** Constant for fs.open(). Flag indicating that the file is opened for synchronous I/O. */
+        export const O_SYNC: number;
+
+        /** Constant for fs.open(). Flag indicating to open the symbolic link itself rather than the resource it is pointing to. */
+        export const O_SYMLINK: number;
+
+        /** Constant for fs.open(). When set, an attempt will be made to minimize caching effects of file I/O. */
+        export const O_DIRECT: number;
+
+        /** Constant for fs.open(). Flag indicating to open the file in nonblocking mode when possible. */
+        export const O_NONBLOCK: number;
+
+        // File Type Constants
+
+        /** Constant for fs.Stats mode property for determining a file's type. Bit mask used to extract the file type code. */
+        export const S_IFMT: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a regular file. */
+        export const S_IFREG: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a directory. */
+        export const S_IFDIR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a character-oriented device file. */
+        export const S_IFCHR: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a block-oriented device file. */
+        export const S_IFBLK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a FIFO/pipe. */
+        export const S_IFIFO: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a symbolic link. */
+        export const S_IFLNK: number;
+
+        /** Constant for fs.Stats mode property for determining a file's type. File type constant for a socket. */
+        export const S_IFSOCK: number;
+
+        // File Mode Constants
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by owner. */
+        export const S_IRWXU: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by owner. */
+        export const S_IRUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by owner. */
+        export const S_IWUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by owner. */
+        export const S_IXUSR: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by group. */
+        export const S_IRWXG: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by group. */
+        export const S_IRGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by group. */
+        export const S_IWGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by group. */
+        export const S_IXGRP: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable, writable and executable by others. */
+        export const S_IRWXO: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating readable by others. */
+        export const S_IROTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating writable by others. */
+        export const S_IWOTH: number;
+
+        /** Constant for fs.Stats mode property for determining access permissions for a file. File mode indicating executable by others. */
+        export const S_IXOTH: number;
+    }
+
+    /** Tests a user's permissions for the file specified by path. */
+    export function access(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
+    /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
+    export function accessSync(path: string | Buffer, mode?: number): void;
+    export function createReadStream(path: string | Buffer, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+        end?: number;
+    }): ReadStream;
+    export function createWriteStream(path: string | Buffer, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: number;
+        mode?: number;
+        autoClose?: boolean;
+        start?: number;
+    }): WriteStream;
+    export function fdatasync(fd: number, callback: Function): void;
+    export function fdatasyncSync(fd: number): void;
+}
+
+declare module "path" {
+
+    /**
+     * A parsed path object generated by path.parse() or consumed by path.format().
+     */
+    export interface ParsedPath {
+        /**
+         * The root of the path such as '/' or 'c:\'
+         */
+        root: string;
+        /**
+         * The full directory path such as '/home/user/dir' or 'c:\path\dir'
+         */
+        dir: string;
+        /**
+         * The file name including extension (if any) such as 'index.html'
+         */
+        base: string;
+        /**
+         * The file extension (if any) such as '.html'
+         */
+        ext: string;
+        /**
+         * The file name without extension (if any) such as 'index'
+         */
+        name: string;
+    }
+
+    /**
+     * Normalize a string path, reducing '..' and '.' parts.
+     * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used.
+     *
+     * @param p string path to normalize.
+     */
+    export function normalize(p: string): string;
+    /**
+     * Join all arguments together and normalize the resulting path.
+     * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown.
+     *
+     * @param paths paths to join.
+     */
+    export function join(...paths: string[]): string;
+    /**
+     * The right-most parameter is considered {to}.  Other parameters are considered an array of {from}.
+     *
+     * Starting from leftmost {from} paramter, resolves {to} to an absolute path.
+     *
+     * If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory.
+     *
+     * @param pathSegments string paths to join.  Non-string arguments are ignored.
+     */
+    export function resolve(...pathSegments: any[]): string;
+    /**
+     * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory.
+     *
+     * @param path path to test.
+     */
+    export function isAbsolute(path: string): boolean;
+    /**
+     * Solve the relative path from {from} to {to}.
+     * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve.
+     *
+     * @param from
+     * @param to
+     */
+    export function relative(from: string, to: string): string;
+    /**
+     * Return the directory name of a path. Similar to the Unix dirname command.
+     *
+     * @param p the path to evaluate.
+     */
+    export function dirname(p: string): string;
+    /**
+     * Return the last portion of a path. Similar to the Unix basename command.
+     * Often used to extract the file name from a fully qualified path.
+     *
+     * @param p the path to evaluate.
+     * @param ext optionally, an extension to remove from the result.
+     */
+    export function basename(p: string, ext?: string): string;
+    /**
+     * Return the extension of the path, from the last '.' to end of string in the last portion of the path.
+     * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string
+     *
+     * @param p the path to evaluate.
+     */
+    export function extname(p: string): string;
+    /**
+     * The platform-specific file separator. '\\' or '/'.
+     */
+    export var sep: string;
+    /**
+     * The platform-specific file delimiter. ';' or ':'.
+     */
+    export var delimiter: string;
+    /**
+     * Returns an object from a path string - the opposite of format().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function parse(pathString: string): ParsedPath;
+    /**
+     * Returns a path string from an object - the opposite of parse().
+     *
+     * @param pathString path to evaluate.
+     */
+    export function format(pathObject: ParsedPath): string;
+
+    export module posix {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: ParsedPath): string;
+    }
+
+    export module win32 {
+        export function normalize(p: string): string;
+        export function join(...paths: any[]): string;
+        export function resolve(...pathSegments: any[]): string;
+        export function isAbsolute(p: string): boolean;
+        export function relative(from: string, to: string): string;
+        export function dirname(p: string): string;
+        export function basename(p: string, ext?: string): string;
+        export function extname(p: string): string;
+        export var sep: string;
+        export var delimiter: string;
+        export function parse(p: string): ParsedPath;
+        export function format(pP: ParsedPath): string;
+    }
+}
+
+declare module "string_decoder" {
+    export interface NodeStringDecoder {
+        write(buffer: Buffer): string;
+        end(buffer?: Buffer): string;
+    }
+    export var StringDecoder: {
+        new (encoding?: string): NodeStringDecoder;
+    };
+}
+
+declare module "tls" {
+    import * as crypto from "crypto";
+    import * as net from "net";
+    import * as stream from "stream";
+
+    var CLIENT_RENEG_LIMIT: number;
+    var CLIENT_RENEG_WINDOW: number;
+
+    export interface Certificate {
+        /**
+         * Country code.
+         */
+        C: string;
+        /**
+         * Street.
+         */
+        ST: string;
+        /**
+         * Locality.
+         */
+        L: string;
+        /**
+         * Organization.
+         */
+        O: string;
+        /**
+         * Organizational unit.
+         */
+        OU: string;
+        /**
+         * Common name.
+         */
+        CN: string;
+    }
+
+    export interface PeerCertificate {
+        subject: Certificate;
+        issuer: Certificate;
+        subjectaltname: string;
+        infoAccess: { [index: string]: string[] };
+        modulus: string;
+        exponent: string;
+        valid_from: string;
+        valid_to: string;
+        fingerprint: string;
+        ext_key_usage: string[];
+        serialNumber: string;
+        raw: Buffer;
+    }
+
+    export interface DetailedPeerCertificate extends PeerCertificate {
+      issuerCertificate: DetailedPeerCertificate;
+    }
+
+    export interface CipherNameAndProtocol {
+        /**
+         * The cipher name.
+         */
+        name: string;
+        /**
+         * SSL/TLS protocol version.
+         */
+        version: string;
+    }
+
+    export class TLSSocket extends net.Socket {
+        /**
+         * Construct a new tls.TLSSocket object from an existing TCP socket.
+         */
+        constructor(socket:net.Socket, options?: {
+          /**
+           * An optional TLS context object from tls.createSecureContext()
+           */
+          secureContext?: SecureContext,
+          /**
+           * If true the TLS socket will be instantiated in server-mode.
+           * Defaults to false.
+           */
+          isServer?: boolean,
+          /**
+           * An optional net.Server instance.
+           */
+          server?: net.Server,
+          /**
+           * If true the server will request a certificate from clients that
+           * connect and attempt to verify that certificate. Defaults to
+           * false.
+           */
+          requestCert?: boolean,
+          /**
+           * If true the server will reject any connection which is not
+           * authorized with the list of supplied CAs. This option only has an
+           * effect if requestCert is true. Defaults to false.
+           */
+          rejectUnauthorized?: boolean,
+          /**
+           * An array of strings or a Buffer naming possible NPN protocols.
+           * (Protocols should be ordered by their priority.)
+           */
+          NPNProtocols?: string[] | Buffer,
+          /**
+           * An array of strings or a Buffer naming possible ALPN protocols.
+           * (Protocols should be ordered by their priority.) When the server
+           * receives both NPN and ALPN extensions from the client, ALPN takes
+           * precedence over NPN and the server does not send an NPN extension
+           * to the client.
+           */
+          ALPNProtocols?: string[] | Buffer,
+          /**
+           * SNICallback(servername, cb) <Function> A function that will be
+           * called if the client supports SNI TLS extension. Two arguments
+           * will be passed when called: servername and cb. SNICallback should
+           * invoke cb(null, ctx), where ctx is a SecureContext instance.
+           * (tls.createSecureContext(...) can be used to get a proper
+           * SecureContext.) If SNICallback wasn't provided the default callback
+           * with high-level API will be used (see below).
+           */
+          SNICallback?: Function,
+          /**
+           * 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
+        });
+        /**
+         * Returns the bound address, the address family name and port of the underlying socket as reported by
+         * the operating system.
+         * @returns {any} - An object with three properties, e.g. { port: 12346, family: 'IPv4', address: '127.0.0.1' }.
+         */
+        address(): { port: number; family: string; address: string };
+        /**
+         * A boolean that is true if the peer certificate was signed by one of the specified CAs, otherwise false.
+         */
+        authorized: boolean;
+        /**
+         * The reason why the peer's certificate has not been verified.
+         * This property becomes available only when tlsSocket.authorized === false.
+         */
+        authorizationError: Error;
+        /**
+         * Static boolean value, always true.
+         * May be used to distinguish TLS sockets from regular ones.
+         */
+        encrypted: boolean;
+        /**
+         * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
+         * @returns {CipherNameAndProtocol} - 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 {boolean} detailed - If true; the full chain with issuer property will be returned.
+         * @returns {PeerCertificate | DetailedPeerCertificate} - An object representing the peer's certificate.
+         */
+        getPeerCertificate(detailed: true): DetailedPeerCertificate;
+        getPeerCertificate(detailed?: false): PeerCertificate;
+        getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Could be used to speed up handshake establishment when reconnecting to the server.
+         * @returns {any} - ASN.1 encoded TLS session or undefined if none was negotiated.
+         */
+        getSession(): any;
+        /**
+         * NOTE: Works only with client TLS sockets.
+         * Useful only for debugging, for session reuse provide session option to tls.connect().
+         * @returns {any} - TLS session ticket or undefined if none was negotiated.
+         */
+        getTLSTicket(): any;
+        /**
+         * The string representation of the local IP address.
+         */
+        localAddress: string;
+        /**
+         * The numeric representation of the local port.
+         */
+        localPort: number;
+        /**
+         * The string representation of the remote IP address.
+         * For example, '74.125.127.100' or '2001:4860:a005::68'.
+         */
+        remoteAddress: string;
+        /**
+         * The string representation of the remote IP family. 'IPv4' or 'IPv6'.
+         */
+        remoteFamily: string;
+        /**
+         * The numeric representation of the remote port. For example, 443.
+         */
+        remotePort: number;
+        /**
+         * Initiate TLS renegotiation process.
+         *
+         * NOTE: Can be used to request peer's certificate after the secure connection has been established.
+         * ANOTHER NOTE: When running as the server, socket will be destroyed with an error after handshakeTimeout timeout.
+         * @param {TlsOptions} options - The options may contain the following fields: rejectUnauthorized,
+         * requestCert (See tls.createServer() for details).
+         * @param {Function} callback - callback(err) will be executed with null as err, once the renegotiation
+         * is successfully completed.
+         */
+        renegotiate(options: TlsOptions, callback: (err: Error) => any): 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 {number} size - TLS fragment size (default and maximum value is: 16384, minimum is: 512).
+         * @returns {boolean} - Returns true on success, false otherwise.
+         */
+        setMaxSendFragment(size: number): boolean;
+
+        /**
+         * events.EventEmitter
+         * 1. OCSPResponse
+         * 2. secureConnect
+         **/
+        addListener(event: string, listener: Function): this;
+        addListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        addListener(event: "secureConnect", listener: () => void): this;
+
+        emit(event: string, ...args: any[]): boolean;
+        emit(event: "OCSPResponse", response: Buffer): boolean;
+        emit(event: "secureConnect"): boolean;
+
+        on(event: string, listener: Function): this;
+        on(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        on(event: "secureConnect", listener: () => void): this;
+
+        once(event: string, listener: Function): this;
+        once(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        once(event: "secureConnect", listener: () => void): this;
+
+        prependListener(event: string, listener: Function): this;
+        prependListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependListener(event: "secureConnect", listener: () => void): this;
+
+        prependOnceListener(event: string, listener: Function): this;
+        prependOnceListener(event: "OCSPResponse", listener: (response: Buffer) => void): this;
+        prependOnceListener(event: "secureConnect", listener: () => void): this;
+    }
+
+    export interface TlsOptions {
+        host?: string;
+        port?: number;
+        pfx?: string | Buffer[];
+        key?: string | string[] | Buffer | any[];
+        passphrase?: string;
+        cert?: string | string[] | Buffer | Buffer[];
+        ca?: string | string[] | Buffer | Buffer[];
+        crl?: string | string[];
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+        requestCert?: boolean;
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: string[] | Buffer;
+        SNICallback?: (servername: string, cb: (err: Error, ctx: SecureContext) => any) => any;
+        ecdhCurve?: string;
+        dhparam?: string | Buffer;
+        handshakeTimeout?: number;
+        ALPNProtocols?: string[] | Buffer;
+        sessionTimeout?: number;
+        ticketKeys?: any;
+        sessionIdContext?: string;
+        secureProtocol?: string;
+    }
+
+    export interface ConnectionOptions {
+        host?: string;
+        port?: number;
+        socket?: net.Socket;
+        pfx?: string | Buffer
+        key?: string | string[] | Buffer | Buffer[];
+        passphrase?: string;
+        cert?: string | string[] | Buffer | Buffer[];
+        ca?: string | Buffer | (string | Buffer)[];
+        rejectUnauthorized?: boolean;
+        NPNProtocols?: (string | Buffer)[];
+        servername?: string;
+        path?: string;
+        ALPNProtocols?: (string | Buffer)[];
+        checkServerIdentity?: (servername: string, cert: string | Buffer | (string | Buffer)[]) => any;
+        secureProtocol?: string;
+        secureContext?: Object;
+        session?: Buffer;
+        minDHSize?: number;
+    }
+
+    export interface Server extends net.Server {
+        close(callback?: Function): Server;
+        address(): { port: number; family: string; address: string; };
+        addContext(hostName: string, credentials: {
+            key: string;
+            cert: string;
+            ca: string;
+        }): void;
+        maxConnections: number;
+        connections: number;
+
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         **/
+        addListener(event: string, listener: Function): 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, ...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: Function): 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: Function): 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: Function): 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: Function): this;
+        prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
+    }
+
+    export interface ClearTextStream extends stream.Duplex {
+        authorized: boolean;
+        authorizationError: Error;
+        getPeerCertificate(): any;
+        getCipher: {
+            name: string;
+            version: string;
+        };
+        address: {
+            port: number;
+            family: string;
+            address: string;
+        };
+        remoteAddress: string;
+        remotePort: number;
+    }
+
+    export interface SecurePair {
+        encrypted: any;
+        cleartext: any;
+    }
+
+    export interface SecureContextOptions {
+        pfx?: string | Buffer;
+        key?: string | Buffer;
+        passphrase?: string;
+        cert?: string | Buffer;
+        ca?: string | Buffer;
+        crl?: string | string[]
+        ciphers?: string;
+        honorCipherOrder?: boolean;
+    }
+
+    export interface SecureContext {
+        context: any;
+    }
+
+    export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
+    export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
+    export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
+    export function createSecureContext(details: SecureContextOptions): SecureContext;
+}
+
+declare module "crypto" {
+    export interface Certificate {
+        exportChallenge(spkac: string | Buffer): Buffer;
+        exportPublicKey(spkac: string | Buffer): Buffer;
+        verifySpkac(spkac: Buffer): boolean;
+    }
+    export var Certificate: {
+        new (): Certificate;
+        (): Certificate;
+    }
+
+    export var fips: boolean;
+
+    export interface CredentialDetails {
+        pfx: string;
+        key: string;
+        passphrase: string;
+        cert: string;
+        ca: string | string[];
+        crl: string | string[];
+        ciphers: string;
+    }
+    export interface Credentials { context?: any; }
+    export function createCredentials(details: CredentialDetails): Credentials;
+    export function createHash(algorithm: string): Hash;
+    export function createHmac(algorithm: string, key: string | Buffer): Hmac;
+
+    type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
+    type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
+    type Utf8AsciiBinaryEncoding = "utf8" | "ascii" | "binary";
+    type HexBase64BinaryEncoding = "binary" | "base64" | "hex";
+    type ECDHKeyFormat = "compressed" | "uncompressed" | "hybrid";
+
+    export interface Hash extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer): Hash;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hash;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export interface Hmac extends NodeJS.ReadWriteStream {
+        update(data: string | Buffer): Hmac;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
+        digest(): Buffer;
+        digest(encoding: HexBase64Latin1Encoding): string;
+    }
+    export function createCipher(algorithm: string, password: any): Cipher;
+    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export interface Cipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        getAuthTag(): Buffer;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createDecipher(algorithm: string, password: any): Decipher;
+    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export interface Decipher extends NodeJS.ReadWriteStream {
+        update(data: Buffer): Buffer;
+        update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
+        update(data: Buffer, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
+        final(): Buffer;
+        final(output_encoding: string): string;
+        setAutoPadding(auto_padding?: boolean): void;
+        setAuthTag(tag: Buffer): void;
+        setAAD(buffer: Buffer): void;
+    }
+    export function createSign(algorithm: string): Signer;
+    export interface Signer extends NodeJS.WritableStream {
+        update(data: string | Buffer): Signer;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string }, output_format: HexBase64Latin1Encoding): string;
+    }
+    export function createVerify(algorith: string): Verify;
+    export interface Verify extends NodeJS.WritableStream {
+        update(data: string | Buffer): Verify;
+        update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string, signature: Buffer): boolean;
+        verify(object: string, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+    }
+    export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: number | Buffer): DiffieHellman;
+    export function createDiffieHellman(prime: string, prime_encoding: HexBase64Latin1Encoding, generator: string, generator_encoding: HexBase64Latin1Encoding): DiffieHellman;
+    export interface DiffieHellman {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrime(): Buffer;
+        getPrime(encoding: HexBase64Latin1Encoding): string;
+        getGenerator(): Buffer;
+        getGenerator(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: string, encoding: string): void;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: string): void;
+        verifyError: number;
+    }
+    export function getDiffieHellman(group_name: string): DiffieHellman;
+    export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string): Buffer;
+    export function randomBytes(size: number): Buffer;
+    export function randomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function pseudoRandomBytes(size: number): Buffer;
+    export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFillSync(buffer: Buffer | Uint8Array, offset?: number, size?: number): Buffer;
+    export function randomFill(buffer: Buffer, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export function randomFill(buffer: Buffer, offset: number, size: number, callback: (err: Error, buf: Buffer) => void): void;
+    export function randomFill(buffer: Uint8Array, offset: number, size: number, callback: (err: Error, buf: Uint8Array) => void): void;
+    export interface RsaPublicKey {
+        key: string;
+        padding?: number;
+    }
+    export interface RsaPrivateKey {
+        key: string;
+        passphrase?: string,
+        padding?: number;
+    }
+    export function publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer): Buffer
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer): Buffer
+    export function getCiphers(): string[];
+    export function getCurves(): string[];
+    export function getHashes(): string[];
+    export interface ECDH {
+        generateKeys(): Buffer;
+        generateKeys(encoding: HexBase64Latin1Encoding): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
+        getPrivateKey(): Buffer;
+        getPrivateKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(): Buffer;
+        getPublicKey(encoding: HexBase64Latin1Encoding): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
+    }
+    export function createECDH(curve_name: string): ECDH;
+    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
+    export var DEFAULT_ENCODING: string;
+}
+
+declare module "stream" {
+    import * as events from "events";
+
+    class internal extends events.EventEmitter {
+        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+    }
+
+    namespace internal {
+
+        export class Stream extends internal { }
+
+        export interface ReadableOptions {
+            highWaterMark?: number;
+            encoding?: string;
+            objectMode?: boolean;
+            read?: (this: Readable, size?: number) => any;
+        }
+
+        export class Readable extends Stream implements NodeJS.ReadableStream {
+            readable: boolean;
+            constructor(opts?: ReadableOptions);
+            _read(size: number): void;
+            read(size?: number): any;
+            setEncoding(encoding: string): this;
+            pause(): this;
+            resume(): this;
+            isPaused(): boolean;
+            pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+            unpipe<T extends NodeJS.WritableStream>(destination?: T): this;
+            unshift(chunk: any): void;
+            wrap(oldStream: NodeJS.ReadableStream): Readable;
+            push(chunk: any, encoding?: string): boolean;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             *   1. close
+             *   2. data
+             *   3. end
+             *   4. readable
+             *   5. error
+             **/
+            addListener(event: string, listener: Function): this;
+            addListener(event: string, listener: Function): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            addListener(event: "end", listener: () => void): this;
+            addListener(event: "readable", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+
+            emit(event: string, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "end"): boolean;
+            emit(event: "readable"): boolean;
+            emit(event: "error", err: Error): boolean;
+
+            on(event: string, listener: Function): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "data", listener: (chunk: Buffer | string) => void): this;
+            on(event: "end", listener: () => void): this;
+            on(event: "readable", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+
+            once(event: string, listener: Function): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "data", listener: (chunk: Buffer | string) => void): this;
+            once(event: "end", listener: () => void): this;
+            once(event: "readable", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+
+            prependListener(event: string, listener: Function): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependListener(event: "end", listener: () => void): this;
+            prependListener(event: "readable", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+
+            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            prependOnceListener(event: "end", listener: () => void): this;
+            prependOnceListener(event: "readable", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+
+            removeListener(event: string, listener: Function): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+            removeListener(event: "end", listener: () => void): this;
+            removeListener(event: "readable", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+        }
+
+        export interface WritableOptions {
+            highWaterMark?: number;
+            decodeStrings?: boolean;
+            objectMode?: boolean;
+            write?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            writev?: (chunks: { chunk: string | Buffer, encoding: string }[], callback: Function) => any;
+        }
+
+        export class Writable extends Stream implements NodeJS.WritableStream {
+            writable: boolean;
+            constructor(opts?: WritableOptions);
+            _write(chunk: any, encoding: string, callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+
+            /**
+             * Event emitter
+             * The defined events on documents including:
+             *   1. close
+             *   2. drain
+             *   3. error
+             *   4. finish
+             *   5. pipe
+             *   6. unpipe
+             **/
+            addListener(event: string, listener: Function): this;
+            addListener(event: "close", listener: () => void): this;
+            addListener(event: "drain", listener: () => void): this;
+            addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: "finish", listener: () => void): this;
+            addListener(event: "pipe", listener: (src: Readable) => void): this;
+            addListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            emit(event: string, ...args: any[]): boolean;
+            emit(event: "close"): boolean;
+            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "error", err: Error): boolean;
+            emit(event: "finish"): boolean;
+            emit(event: "pipe", src: Readable): boolean;
+            emit(event: "unpipe", src: Readable): boolean;
+
+            on(event: string, listener: Function): this;
+            on(event: "close", listener: () => void): this;
+            on(event: "drain", listener: () => void): this;
+            on(event: "error", listener: (err: Error) => void): this;
+            on(event: "finish", listener: () => void): this;
+            on(event: "pipe", listener: (src: Readable) => void): this;
+            on(event: "unpipe", listener: (src: Readable) => void): this;
+
+            once(event: string, listener: Function): this;
+            once(event: "close", listener: () => void): this;
+            once(event: "drain", listener: () => void): this;
+            once(event: "error", listener: (err: Error) => void): this;
+            once(event: "finish", listener: () => void): this;
+            once(event: "pipe", listener: (src: Readable) => void): this;
+            once(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependListener(event: string, listener: Function): this;
+            prependListener(event: "close", listener: () => void): this;
+            prependListener(event: "drain", listener: () => void): this;
+            prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: "finish", listener: () => void): this;
+            prependListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            prependOnceListener(event: string, listener: Function): this;
+            prependOnceListener(event: "close", listener: () => void): this;
+            prependOnceListener(event: "drain", listener: () => void): this;
+            prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: "finish", listener: () => void): this;
+            prependOnceListener(event: "pipe", listener: (src: Readable) => void): this;
+            prependOnceListener(event: "unpipe", listener: (src: Readable) => void): this;
+
+            removeListener(event: string, listener: Function): this;
+            removeListener(event: "close", listener: () => void): this;
+            removeListener(event: "drain", listener: () => void): this;
+            removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: "finish", listener: () => void): this;
+            removeListener(event: "pipe", listener: (src: Readable) => void): this;
+            removeListener(event: "unpipe", listener: (src: Readable) => void): this;
+        }
+
+        export interface DuplexOptions extends ReadableOptions, WritableOptions {
+            allowHalfOpen?: boolean;
+            readableObjectMode?: boolean;
+            writableObjectMode?: boolean;
+        }
+
+        // Note: Duplex extends both Readable and Writable.
+        export class Duplex extends Readable implements Writable {
+            writable: boolean;
+            constructor(opts?: DuplexOptions);
+            _write(chunk: any, encoding: string, callback: Function): void;
+            write(chunk: any, cb?: Function): boolean;
+            write(chunk: any, encoding?: string, cb?: Function): boolean;
+            setDefaultEncoding(encoding: string): this;
+            end(): void;
+            end(chunk: any, cb?: Function): void;
+            end(chunk: any, encoding?: string, cb?: Function): void;
+        }
+
+        export interface TransformOptions extends DuplexOptions {
+            transform?: (chunk: string | Buffer, encoding: string, callback: Function) => any;
+            flush?: (callback: Function) => any;
+        }
+
+        export class Transform extends Duplex {
+            constructor(opts?: TransformOptions);
+            _transform(chunk: any, encoding: string, callback: Function): void;
+        }
+
+        export class PassThrough extends Transform { }
+    }
+
+    export = internal;
+}
+
+declare module "util" {
+    export interface InspectOptions extends NodeJS.InspectOptions {}
+    export function format(format: any, ...param: any[]): string;
+    export function debug(string: string): void;
+    export function error(...param: any[]): void;
+    export function puts(...param: any[]): void;
+    export function print(...param: any[]): void;
+    export function log(string: string): void;
+    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+    export function inspect(object: any, options: InspectOptions): string;
+    export function isArray(object: any): object is any[];
+    export function isRegExp(object: any): object is RegExp;
+    export function isDate(object: any): object is Date;
+    export function isError(object: any): object is Error;
+    export function inherits(constructor: any, superConstructor: any): void;
+    export function debuglog(key: string): (msg: string, ...param: any[]) => void;
+    export function isBoolean(object: any): object is boolean;
+    export function isBuffer(object: any): object is Buffer;
+    export function isFunction(object: any): boolean;
+    export function isNull(object: any): object is null;
+    export function isNullOrUndefined(object: any): object is null | undefined;
+    export function isNumber(object: any): object is number;
+    export function isObject(object: any): boolean;
+    export function isPrimitive(object: any): boolean;
+    export function isString(object: any): object is string;
+    export function isSymbol(object: any): object is symbol;
+    export function isUndefined(object: any): object is undefined;
+    export function deprecate(fn: Function, message: string): Function;
+}
+
+declare module "assert" {
+    function internal(value: any, message?: string): void;
+    namespace internal {
+        export class AssertionError implements Error {
+            name: string;
+            message: string;
+            actual: any;
+            expected: any;
+            operator: string;
+            generatedMessage: boolean;
+
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFunction?: Function
+            });
+        }
+
+        export function fail(actual: any, expected: any, message: string, operator: string): void;
+        export function ok(value: any, message?: string): void;
+        export function equal(actual: any, expected: any, message?: string): void;
+        export function notEqual(actual: any, expected: any, message?: string): void;
+        export function deepEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
+        export function strictEqual(actual: any, expected: any, message?: string): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string): void;
+        export var throws: {
+            (block: Function, message?: string): void;
+            (block: Function, error: Function, message?: string): void;
+            (block: Function, error: RegExp, message?: string): void;
+            (block: Function, error: (err: any) => boolean, message?: string): void;
+        };
+
+        export var doesNotThrow: {
+            (block: Function, message?: string): void;
+            (block: Function, error: Function, message?: string): void;
+            (block: Function, error: RegExp, message?: string): void;
+            (block: Function, error: (err: any) => boolean, message?: string): void;
+        };
+
+        export function ifError(value: any): void;
+    }
+
+    export = internal;
+}
+
+declare module "tty" {
+    import * as net from "net";
+
+    export function isatty(fd: number): boolean;
+    export interface ReadStream extends net.Socket {
+        isRaw: boolean;
+        setRawMode(mode: boolean): void;
+        isTTY: boolean;
+    }
+    export interface WriteStream extends net.Socket {
+        columns: number;
+        rows: number;
+        isTTY: boolean;
+    }
+}
+
+declare module "domain" {
+    import * as events from "events";
+
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
+        run(fn: Function): void;
+        add(emitter: events.EventEmitter): void;
+        remove(emitter: events.EventEmitter): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+        members: any[];
+        enter(): void;
+        exit(): void;
+    }
+
+    export function create(): Domain;
+}
+
+declare module "constants" {
+    export var E2BIG: number;
+    export var EACCES: number;
+    export var EADDRINUSE: number;
+    export var EADDRNOTAVAIL: number;
+    export var EAFNOSUPPORT: number;
+    export var EAGAIN: number;
+    export var EALREADY: number;
+    export var EBADF: number;
+    export var EBADMSG: number;
+    export var EBUSY: number;
+    export var ECANCELED: number;
+    export var ECHILD: number;
+    export var ECONNABORTED: number;
+    export var ECONNREFUSED: number;
+    export var ECONNRESET: number;
+    export var EDEADLK: number;
+    export var EDESTADDRREQ: number;
+    export var EDOM: number;
+    export var EEXIST: number;
+    export var EFAULT: number;
+    export var EFBIG: number;
+    export var EHOSTUNREACH: number;
+    export var EIDRM: number;
+    export var EILSEQ: number;
+    export var EINPROGRESS: number;
+    export var EINTR: number;
+    export var EINVAL: number;
+    export var EIO: number;
+    export var EISCONN: number;
+    export var EISDIR: number;
+    export var ELOOP: number;
+    export var EMFILE: number;
+    export var EMLINK: number;
+    export var EMSGSIZE: number;
+    export var ENAMETOOLONG: number;
+    export var ENETDOWN: number;
+    export var ENETRESET: number;
+    export var ENETUNREACH: number;
+    export var ENFILE: number;
+    export var ENOBUFS: number;
+    export var ENODATA: number;
+    export var ENODEV: number;
+    export var ENOENT: number;
+    export var ENOEXEC: number;
+    export var ENOLCK: number;
+    export var ENOLINK: number;
+    export var ENOMEM: number;
+    export var ENOMSG: number;
+    export var ENOPROTOOPT: number;
+    export var ENOSPC: number;
+    export var ENOSR: number;
+    export var ENOSTR: number;
+    export var ENOSYS: number;
+    export var ENOTCONN: number;
+    export var ENOTDIR: number;
+    export var ENOTEMPTY: number;
+    export var ENOTSOCK: number;
+    export var ENOTSUP: number;
+    export var ENOTTY: number;
+    export var ENXIO: number;
+    export var EOPNOTSUPP: number;
+    export var EOVERFLOW: number;
+    export var EPERM: number;
+    export var EPIPE: number;
+    export var EPROTO: number;
+    export var EPROTONOSUPPORT: number;
+    export var EPROTOTYPE: number;
+    export var ERANGE: number;
+    export var EROFS: number;
+    export var ESPIPE: number;
+    export var ESRCH: number;
+    export var ETIME: number;
+    export var ETIMEDOUT: number;
+    export var ETXTBSY: number;
+    export var EWOULDBLOCK: number;
+    export var EXDEV: number;
+    export var WSAEINTR: number;
+    export var WSAEBADF: number;
+    export var WSAEACCES: number;
+    export var WSAEFAULT: number;
+    export var WSAEINVAL: number;
+    export var WSAEMFILE: number;
+    export var WSAEWOULDBLOCK: number;
+    export var WSAEINPROGRESS: number;
+    export var WSAEALREADY: number;
+    export var WSAENOTSOCK: number;
+    export var WSAEDESTADDRREQ: number;
+    export var WSAEMSGSIZE: number;
+    export var WSAEPROTOTYPE: number;
+    export var WSAENOPROTOOPT: number;
+    export var WSAEPROTONOSUPPORT: number;
+    export var WSAESOCKTNOSUPPORT: number;
+    export var WSAEOPNOTSUPP: number;
+    export var WSAEPFNOSUPPORT: number;
+    export var WSAEAFNOSUPPORT: number;
+    export var WSAEADDRINUSE: number;
+    export var WSAEADDRNOTAVAIL: number;
+    export var WSAENETDOWN: number;
+    export var WSAENETUNREACH: number;
+    export var WSAENETRESET: number;
+    export var WSAECONNABORTED: number;
+    export var WSAECONNRESET: number;
+    export var WSAENOBUFS: number;
+    export var WSAEISCONN: number;
+    export var WSAENOTCONN: number;
+    export var WSAESHUTDOWN: number;
+    export var WSAETOOMANYREFS: number;
+    export var WSAETIMEDOUT: number;
+    export var WSAECONNREFUSED: number;
+    export var WSAELOOP: number;
+    export var WSAENAMETOOLONG: number;
+    export var WSAEHOSTDOWN: number;
+    export var WSAEHOSTUNREACH: number;
+    export var WSAENOTEMPTY: number;
+    export var WSAEPROCLIM: number;
+    export var WSAEUSERS: number;
+    export var WSAEDQUOT: number;
+    export var WSAESTALE: number;
+    export var WSAEREMOTE: number;
+    export var WSASYSNOTREADY: number;
+    export var WSAVERNOTSUPPORTED: number;
+    export var WSANOTINITIALISED: number;
+    export var WSAEDISCON: number;
+    export var WSAENOMORE: number;
+    export var WSAECANCELLED: number;
+    export var WSAEINVALIDPROCTABLE: number;
+    export var WSAEINVALIDPROVIDER: number;
+    export var WSAEPROVIDERFAILEDINIT: number;
+    export var WSASYSCALLFAILURE: number;
+    export var WSASERVICE_NOT_FOUND: number;
+    export var WSATYPE_NOT_FOUND: number;
+    export var WSA_E_NO_MORE: number;
+    export var WSA_E_CANCELLED: number;
+    export var WSAEREFUSED: number;
+    export var SIGHUP: number;
+    export var SIGINT: number;
+    export var SIGILL: number;
+    export var SIGABRT: number;
+    export var SIGFPE: number;
+    export var SIGKILL: number;
+    export var SIGSEGV: number;
+    export var SIGTERM: number;
+    export var SIGBREAK: number;
+    export var SIGWINCH: number;
+    export var SSL_OP_ALL: number;
+    export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number;
+    export var SSL_OP_CIPHER_SERVER_PREFERENCE: number;
+    export var SSL_OP_CISCO_ANYCONNECT: number;
+    export var SSL_OP_COOKIE_EXCHANGE: number;
+    export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number;
+    export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number;
+    export var SSL_OP_EPHEMERAL_RSA: number;
+    export var SSL_OP_LEGACY_SERVER_CONNECT: number;
+    export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number;
+    export var SSL_OP_MICROSOFT_SESS_ID_BUG: number;
+    export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number;
+    export var SSL_OP_NETSCAPE_CA_DN_BUG: number;
+    export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number;
+    export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number;
+    export var SSL_OP_NO_COMPRESSION: number;
+    export var SSL_OP_NO_QUERY_MTU: number;
+    export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number;
+    export var SSL_OP_NO_SSLv2: number;
+    export var SSL_OP_NO_SSLv3: number;
+    export var SSL_OP_NO_TICKET: number;
+    export var SSL_OP_NO_TLSv1: number;
+    export var SSL_OP_NO_TLSv1_1: number;
+    export var SSL_OP_NO_TLSv1_2: number;
+    export var SSL_OP_PKCS1_CHECK_1: number;
+    export var SSL_OP_PKCS1_CHECK_2: number;
+    export var SSL_OP_SINGLE_DH_USE: number;
+    export var SSL_OP_SINGLE_ECDH_USE: number;
+    export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number;
+    export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number;
+    export var SSL_OP_TLS_BLOCK_PADDING_BUG: number;
+    export var SSL_OP_TLS_D5_BUG: number;
+    export var SSL_OP_TLS_ROLLBACK_BUG: number;
+    export var ENGINE_METHOD_DSA: number;
+    export var ENGINE_METHOD_DH: number;
+    export var ENGINE_METHOD_RAND: number;
+    export var ENGINE_METHOD_ECDH: number;
+    export var ENGINE_METHOD_ECDSA: number;
+    export var ENGINE_METHOD_CIPHERS: number;
+    export var ENGINE_METHOD_DIGESTS: number;
+    export var ENGINE_METHOD_STORE: number;
+    export var ENGINE_METHOD_PKEY_METHS: number;
+    export var ENGINE_METHOD_PKEY_ASN1_METHS: number;
+    export var ENGINE_METHOD_ALL: number;
+    export var ENGINE_METHOD_NONE: number;
+    export var DH_CHECK_P_NOT_SAFE_PRIME: number;
+    export var DH_CHECK_P_NOT_PRIME: number;
+    export var DH_UNABLE_TO_CHECK_GENERATOR: number;
+    export var DH_NOT_SUITABLE_GENERATOR: number;
+    export var NPN_ENABLED: number;
+    export var RSA_PKCS1_PADDING: number;
+    export var RSA_SSLV23_PADDING: number;
+    export var RSA_NO_PADDING: number;
+    export var RSA_PKCS1_OAEP_PADDING: number;
+    export var RSA_X931_PADDING: number;
+    export var RSA_PKCS1_PSS_PADDING: number;
+    export var POINT_CONVERSION_COMPRESSED: number;
+    export var POINT_CONVERSION_UNCOMPRESSED: number;
+    export var POINT_CONVERSION_HYBRID: number;
+    export var O_RDONLY: number;
+    export var O_WRONLY: number;
+    export var O_RDWR: number;
+    export var S_IFMT: number;
+    export var S_IFREG: number;
+    export var S_IFDIR: number;
+    export var S_IFCHR: number;
+    export var S_IFBLK: number;
+    export var S_IFIFO: number;
+    export var S_IFSOCK: number;
+    export var S_IRWXU: number;
+    export var S_IRUSR: number;
+    export var S_IWUSR: number;
+    export var S_IXUSR: number;
+    export var S_IRWXG: number;
+    export var S_IRGRP: number;
+    export var S_IWGRP: number;
+    export var S_IXGRP: number;
+    export var S_IRWXO: number;
+    export var S_IROTH: number;
+    export var S_IWOTH: number;
+    export var S_IXOTH: number;
+    export var S_IFLNK: number;
+    export var O_CREAT: number;
+    export var O_EXCL: number;
+    export var O_NOCTTY: number;
+    export var O_DIRECTORY: number;
+    export var O_NOATIME: number;
+    export var O_NOFOLLOW: number;
+    export var O_SYNC: number;
+    export var O_SYMLINK: number;
+    export var O_DIRECT: number;
+    export var O_NONBLOCK: number;
+    export var O_TRUNC: number;
+    export var O_APPEND: number;
+    export var F_OK: number;
+    export var R_OK: number;
+    export var W_OK: number;
+    export var X_OK: number;
+    export var UV_UDP_REUSEADDR: number;
+    export var SIGQUIT: number;
+    export var SIGTRAP: number;
+    export var SIGIOT: number;
+    export var SIGBUS: number;
+    export var SIGUSR1: number;
+    export var SIGUSR2: number;
+    export var SIGPIPE: number;
+    export var SIGALRM: number;
+    export var SIGCHLD: number;
+    export var SIGSTKFLT: number;
+    export var SIGCONT: number;
+    export var SIGSTOP: number;
+    export var SIGTSTP: number;
+    export var SIGTTIN: number;
+    export var SIGTTOU: number;
+    export var SIGURG: number;
+    export var SIGXCPU: number;
+    export var SIGXFSZ: number;
+    export var SIGVTALRM: number;
+    export var SIGPROF: number;
+    export var SIGIO: number;
+    export var SIGPOLL: number;
+    export var SIGPWR: number;
+    export var SIGSYS: number;
+    export var SIGUNUSED: number;
+    export var defaultCoreCipherList: string;
+    export var defaultCipherList: string;
+    export var ENGINE_METHOD_RSA: number;
+    export var ALPN_ENABLED: number;
+}
+
+declare module "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;
+    }
+
+    export function getHeapStatistics(): HeapInfo;
+    export function getHeapSpaceStatistics(): HeapSpaceInfo[];
+    export function setFlagsFromString(flags: string): void;
+}
+
+declare module "timers" {
+    export function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearTimeout(timeoutId: NodeJS.Timer): void;
+    export function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
+    export function clearInterval(intervalId: NodeJS.Timer): void;
+    export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any;
+    export function clearImmediate(immediateId: any): void;
+}
+
+declare module "console" {
+    export = console;
+}
+
+/**
+ * _debugger module is not documented.
+ * Source code is at https://github.com/nodejs/node/blob/master/lib/_debugger.js
+ */
+declare module "_debugger" {
+    export interface Packet {
+        raw: string;
+        headers: string[];
+        body: Message;
+    }
+
+    export interface Message {
+        seq: number;
+        type: string;
+    }
+
+    export interface RequestInfo {
+        command: string;
+        arguments: any;
+    }
+
+    export interface Request extends Message, RequestInfo {
+    }
+
+    export interface Event extends Message {
+        event: string;
+        body?: any;
+    }
+
+    export interface Response extends Message {
+        request_seq: number;
+        success: boolean;
+        /** Contains error message if success === false. */
+        message?: string;
+        /** Contains message body if success === true. */
+        body?: any;
+    }
+
+    export interface BreakpointMessageBody {
+        type: string;
+        target: number;
+        line: number;
+    }
+
+    export class Protocol {
+        res: Packet;
+        state: string;
+        execute(data: string): void;
+        serialize(rq: Request): string;
+        onResponse: (pkt: Packet) => void;
+    }
+
+    export var NO_FRAME: number;
+    export var port: number;
+
+    export interface ScriptDesc {
+        name: string;
+        id: number;
+        isNative?: boolean;
+        handle?: number;
+        type: string;
+        lineOffset?: number;
+        columnOffset?: number;
+        lineCount?: number;
+    }
+
+    export interface Breakpoint {
+        id: number;
+        scriptId: number;
+        script: ScriptDesc;
+        line: number;
+        condition?: string;
+        scriptReq?: string;
+    }
+
+    export interface RequestHandler {
+        (err: boolean, body: Message, res: Packet): void;
+        request_seq?: number;
+    }
+
+    export interface ResponseBodyHandler {
+        (err: boolean, body?: any): void;
+        request_seq?: number;
+    }
+
+    export interface ExceptionInfo {
+        text: string;
+    }
+
+    export interface BreakResponse {
+        script?: ScriptDesc;
+        exception?: ExceptionInfo;
+        sourceLine: number;
+        sourceLineText: string;
+        sourceColumn: number;
+    }
+
+    export function SourceInfo(body: BreakResponse): string;
+
+    export interface ClientInstance extends NodeJS.EventEmitter {
+        protocol: Protocol;
+        scripts: ScriptDesc[];
+        handles: ScriptDesc[];
+        breakpoints: Breakpoint[];
+        currentSourceLine: number;
+        currentSourceColumn: number;
+        currentSourceLineText: string;
+        currentFrame: number;
+        currentScript: string;
+
+        connect(port: number, host: string): void;
+        req(req: any, cb: RequestHandler): void;
+        reqFrameEval(code: string, frame: number, cb: RequestHandler): void;
+        mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void;
+        setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void;
+        clearBreakpoint(rq: Request, cb: RequestHandler): void;
+        listbreakpoints(cb: RequestHandler): void;
+        reqSource(from: number, to: number, cb: RequestHandler): void;
+        reqScripts(cb: any): void;
+        reqContinue(cb: RequestHandler): void;
+    }
+
+    export var Client : {
+        new (): ClientInstance
+    }
+}
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
new file mode 100644
index 0000000000..de401eb0fc
--- /dev/null
+++ b/types/node/v7/node-tests.ts
@@ -0,0 +1,2467 @@
+import * as assert from "assert";
+import * as fs from "fs";
+import * as events from "events";
+import events2 = require("events");
+import * as zlib from "zlib";
+import * as url from "url";
+import * as util from "util";
+import * as crypto from "crypto";
+import * as tls from "tls";
+import * as http from "http";
+import * as https from "https";
+import * as net from "net";
+import * as tty from "tty";
+import * as dgram from "dgram";
+import * as querystring from "querystring";
+import * as path from "path";
+import * as readline from "readline";
+import * as childProcess from "child_process";
+import * as cluster from "cluster";
+import * as os from "os";
+import * as vm from "vm";
+import * as console2 from "console";
+import * as string_decoder from "string_decoder";
+import * as stream from "stream";
+import * as timers from "timers";
+import * as repl from "repl";
+import * as v8 from "v8";
+import * as dns from "dns";
+
+// Specifically test buffer module regression.
+import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
+
+//////////////////////////////////////////////////////////
+/// Global Tests : https://nodejs.org/api/global.html  ///
+//////////////////////////////////////////////////////////
+namespace global_tests {
+    {
+        let x: NodeModule;
+        let y: NodeModule;
+        x.children.push(y);
+        x.parent = require.main;
+        require.main = y;
+    }
+}
+
+//////////////////////////////////////////////////////////
+/// Assert Tests : https://nodejs.org/api/assert.html ///
+//////////////////////////////////////////////////////////
+
+namespace assert_tests {
+    {
+        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+
+        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+
+        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+
+        assert.doesNotThrow(() => {
+            const b = false;
+            if (b) { throw "a hammer at your face"; }
+        }, undefined, "What the...*crunch*");
+
+        assert.equal(3, "3", "uses == comparator");
+
+        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 "a hammer at your face"; }, undefined, "DODGED IT");
+    }
+}
+
+////////////////////////////////////////////////////
+/// Events tests : http://nodejs.org/api/events.html
+////////////////////////////////////////////////////
+
+namespace events_tests {
+    let emitter: events.EventEmitter;
+    let event: string | symbol;
+    let listener: Function;
+    let any: any;
+
+    {
+        let result: events.EventEmitter;
+
+        result = emitter.addListener(event, listener);
+        result = emitter.on(event, listener);
+        result = emitter.once(event, listener);
+        result = emitter.prependListener(event, listener);
+        result = emitter.prependOnceListener(event, listener);
+        result = emitter.removeListener(event, listener);
+        result = emitter.removeAllListeners();
+        result = emitter.removeAllListeners(event);
+        result = emitter.setMaxListeners(42);
+    }
+
+    {
+        let result: number;
+
+        result = events.EventEmitter.defaultMaxListeners;
+        result = events.EventEmitter.listenerCount(emitter, event); // deprecated
+
+        result = emitter.getMaxListeners();
+        result = emitter.listenerCount(event);
+    }
+
+    {
+        let result: Function[];
+
+        result = emitter.listeners(event);
+    }
+
+    {
+        let result: boolean;
+
+        result = emitter.emit(event);
+        result = emitter.emit(event, any);
+        result = emitter.emit(event, any, any);
+        result = emitter.emit(event, any, any, any);
+    }
+
+    {
+        let result: (string | symbol)[];
+
+        result = emitter.eventNames();
+    }
+
+    {
+        class Networker extends events.EventEmitter {
+            constructor() {
+                super();
+
+                this.emit("mingling");
+            }
+        }
+    }
+
+    {
+        new events2();
+    }
+}
+
+////////////////////////////////////////////////////
+/// File system tests : http://nodejs.org/api/fs.html
+////////////////////////////////////////////////////
+
+namespace fs_tests {
+    {
+        fs.writeFile("thebible.txt",
+            "Do unto others as you would have them do unto you.",
+            assert.ifError);
+
+        fs.write(1234, "test");
+
+        fs.writeFile("Harry Potter",
+            "\"You be wizzing, Harry,\" jived Dumbledore.",
+            {
+                encoding: "ascii"
+            },
+            assert.ifError);
+    }
+
+    {
+        var content: string;
+        var buffer: Buffer;
+
+        content = fs.readFileSync('testfile', 'utf8');
+        content = fs.readFileSync('testfile', { encoding: 'utf8' });
+        buffer = fs.readFileSync('testfile');
+        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', (err, data) => buffer = data);
+        fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
+    }
+
+    {
+        var errno: number;
+        fs.readFile('testfile', (err, data) => {
+            if (err && err.errno) {
+                errno = err.errno;
+            }
+        });
+    }
+
+    {
+        fs.mkdtemp('/tmp/foo-', (err, folder) => {
+            console.log(folder);
+            // Prints: /tmp/foo-itXde2
+        });
+    }
+
+    {
+        var tempDir: string;
+        tempDir = fs.mkdtempSync('/tmp/foo-');
+    }
+
+    {
+        fs.watch('/tmp/foo-', (event, filename) => {
+          console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
+          console.log(event, filename);
+        });
+
+        fs.watch('/tmp/foo-', {
+          recursive: true,
+          persistent: true,
+          encoding: 'utf8'
+        }, (event, filename) => {
+          console.log(event, filename);
+        });
+    }
+
+    {
+        fs.access('/path/to/folder', (err) => { });
+
+        fs.access(Buffer.from(''), (err) => { });
+
+        fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
+
+        fs.accessSync('/path/to/folder');
+
+        fs.accessSync(Buffer.from(''));
+
+        fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
+
+        fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
+    }
+}
+
+///////////////////////////////////////////////////////
+/// Buffer tests : https://nodejs.org/api/buffer.html
+///////////////////////////////////////////////////////
+
+function bufferTests() {
+    var utf8Buffer = new Buffer('test');
+    var base64Buffer = new Buffer('', 'base64');
+    var octets: Uint8Array = null;
+    var octetBuffer = new Buffer(octets);
+    var sharedBuffer = new Buffer(octets.buffer);
+    var copiedBuffer = new Buffer(utf8Buffer);
+    console.log(Buffer.isBuffer(octetBuffer));
+    console.log(Buffer.isEncoding('utf8'));
+    console.log(Buffer.byteLength('xyz123'));
+    console.log(Buffer.byteLength('xyz123', 'ascii'));
+    var result1 = Buffer.concat([utf8Buffer, base64Buffer]);
+    var result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
+
+    // Class Methods: Buffer.swap16(), Buffer.swa32(), Buffer.swap64()
+    {
+        const buf = Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]);
+        buf.swap16();
+        buf.swap32();
+        buf.swap64();
+    }
+
+    // Class Method: Buffer.from(array)
+    {
+        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+    }
+
+    // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
+    {
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+
+        let buf: Buffer;
+        buf = Buffer.from(arr.buffer);
+        buf = Buffer.from(arr.buffer, 1);
+        buf = Buffer.from(arr.buffer, 0, 1);
+    }
+
+    // Class Method: Buffer.from(buffer)
+    {
+        const buf1: Buffer = Buffer.from('buffer');
+        const buf2: Buffer = Buffer.from(buf1);
+    }
+
+    // Class Method: Buffer.from(str[, encoding])
+    {
+        const buf1: Buffer = Buffer.from('this is a tést');
+        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
+    }
+
+    // Test that TS 1.6 works with the 'as Buffer' annotation
+    // on isBuffer.
+    var a: Buffer | number;
+    a = new Buffer(10);
+    if (Buffer.isBuffer(a)) {
+        a.writeUInt8(3, 4);
+    }
+
+    // write* methods return offsets.
+    var b = new Buffer(16);
+    var result: number = b.writeUInt32LE(0, 0);
+    result = b.writeUInt16LE(0, 4);
+    result = b.writeUInt8(0, 6);
+    result = b.writeInt8(0, 7);
+    result = b.writeDoubleLE(0, 8);
+
+    // fill returns the input buffer.
+    b.fill('a').fill('b');
+
+    {
+        let buffer = new Buffer('123');
+        let index: number;
+        index = buffer.indexOf("23");
+        index = buffer.indexOf("23", 1);
+        index = buffer.indexOf("23", 1, "utf8");
+        index = buffer.indexOf(23);
+        index = buffer.indexOf(buffer);
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let index: number;
+        index = buffer.lastIndexOf("23");
+        index = buffer.lastIndexOf("23", 1);
+        index = buffer.lastIndexOf("23", 1, "utf8");
+        index = buffer.lastIndexOf(23);
+        index = buffer.lastIndexOf(buffer);
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: [number, number];
+
+        /* comment out for --target es5
+        for (let entry of buffer.entries()) {
+            val = entry;
+        }
+         */
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let includes: boolean;
+        includes = buffer.includes("23");
+        includes = buffer.includes("23", 1);
+        includes = buffer.includes("23", 1, "utf8");
+        includes = buffer.includes(23);
+        includes = buffer.includes(23, 1);
+        includes = buffer.includes(23, 1, "utf8");
+        includes = buffer.includes(buffer);
+        includes = buffer.includes(buffer, 1);
+        includes = buffer.includes(buffer, 1, "utf8");
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        /* comment out for --target es5
+        for (let key of buffer.keys()) {
+            val = key;
+        }
+         */
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        /* comment out for --target es5
+        for (let value of buffer.values()) {
+            val = value;
+        }
+         */
+    }
+
+    // Imported Buffer from buffer module works properly
+    {
+        let b = new ImportedBuffer('123');
+        b.writeUInt8(0, 6);
+        let sb = new ImportedSlowBuffer(43);
+        b.writeUInt8(0, 6);
+    }
+
+    // Buffer has Uint8Array's buffer field (an ArrayBuffer).
+    {
+      let buffer = new Buffer('123');
+      let octets = new Uint8Array(buffer.buffer);
+    }
+}
+
+
+////////////////////////////////////////////////////
+/// Url tests : http://nodejs.org/api/url.html
+////////////////////////////////////////////////////
+
+namespace url_tests {
+    {
+        url.format(url.parse('http://www.example.com/xyz'));
+
+        // https://google.com/search?q=you're%20a%20lizard%2C%20gary
+        url.format({
+            protocol: 'https',
+            host: "google.com",
+            pathname: 'search',
+            query: { q: "you're a lizard, gary" }
+        });
+
+        const myURL = new url.URL('https://a:b@你好你好?abc#foo');
+        url.format(myURL, { fragment: false, unicode: true, auth: false });
+    }
+
+    {
+        var helloUrl = url.parse('http://example.com/?hello=world', true)
+        assert.equal(helloUrl.query.hello, 'world');
+    }
+
+    {
+        let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.hash, '#bar');
+        assert.equal(myURL.host, 'example.org:81');
+        assert.equal(myURL.hostname, 'example.org');
+        assert.equal(myURL.href, 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.origin, 'https://example.org:81');
+        assert.equal(myURL.password, 'thepwd');
+        assert.equal(myURL.username, 'theuser');
+        assert.equal(myURL.pathname, '/foo/path');
+        assert.equal(myURL.port, "81");
+        assert.equal(myURL.protocol, "https:");
+        assert.equal(myURL.search, "?query=string");
+        assert.equal(myURL.toString(), 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert(myURL.searchParams instanceof url.URLSearchParams);
+
+        myURL.host = 'example.org:82';
+        myURL.hostname = 'example.com';
+        myURL.href = 'http://other.com';
+        myURL.hash = 'baz';
+        myURL.password = "otherpwd";
+        myURL.username = "otheruser";
+        myURL.pathname = "/otherPath";
+        myURL.port = "82";
+        myURL.protocol = "http";
+        myURL.search = "a=b";
+        assert.equal(myURL.href, 'http://otheruser:otherpwd@other.com:82/otherPath?a=b#baz');
+
+        myURL = new url.URL('/foo', 'https://example.org/');
+        assert.equal(myURL.href, 'https://example.org/foo');
+        assert.equal(myURL.toJSON(), myURL.href);
+    }
+
+    {
+        const searchParams = new url.URLSearchParams('abc=123');
+
+        assert.equal(searchParams.toString(), 'abc=123');
+        searchParams.forEach((value: string, name: string): void => {
+            assert.equal(name, 'abc');
+            assert.equal(value, '123');
+        });
+
+        assert.equal(searchParams.get('abc'), '123');
+
+        searchParams.append('abc', 'xyz');
+
+        assert.deepEqual(searchParams.getAll('abc'), ['123', 'xyz']);
+
+        const entries = searchParams.entries();
+        assert.deepEqual(entries.next(), { value: ["abc", "123"], done: false});
+        assert.deepEqual(entries.next(), { value: ["abc", "xyz"], done: false});
+        assert.deepEqual(entries.next(), { value: undefined, done: true});
+
+        const keys = searchParams.keys();
+        assert.deepEqual(keys.next(), { value: "abc", done: false});
+        assert.deepEqual(keys.next(), { value: "abc", done: false});
+        assert.deepEqual(keys.next(), { value: undefined, done: true});
+
+        const values = searchParams.values();
+        assert.deepEqual(values.next(), { value: "123", done: false});
+        assert.deepEqual(values.next(), { value: "xyz", done: false});
+        assert.deepEqual(values.next(), { value: undefined, done: true});
+
+        searchParams.set('abc', 'b');
+        assert.deepEqual(searchParams.getAll('abc'), ['b']);
+
+        searchParams.delete('a');
+        assert(!searchParams.has('a'));
+        assert.equal(searchParams.get('a'), null);
+
+        searchParams.sort();
+    }
+
+    {
+        const searchParams = new url.URLSearchParams({
+            user: 'abc',
+            query: ['first', 'second']
+        });
+
+        assert.equal(searchParams.toString(), 'user=abc&query=first%2Csecond');
+        assert.deepEqual(searchParams.getAll('query'), ['first,second']);
+    }
+
+    {
+        // Using an array
+        let params = new url.URLSearchParams([
+            ['user', 'abc'],
+            ['query', 'first'],
+            ['query', 'second']
+        ]);
+        assert.equal(params.toString(), 'user=abc&query=first&query=second');
+    }
+}
+
+/////////////////////////////////////////////////////
+/// util tests : https://nodejs.org/api/util.html ///
+/////////////////////////////////////////////////////
+
+namespace util_tests {
+    {
+        // Old and new util.inspect APIs
+        util.inspect(["This is nice"], false, 5);
+        util.inspect(["This is nice"], false, null);
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: 5,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: 10,
+          breakLength: 20
+        });
+        util.inspect(["This is nice"], {
+          colors: true,
+          depth: null,
+          customInspect: false,
+          showProxy: true,
+          maxArrayLength: null,
+          breakLength: Infinity
+        })
+    }
+}
+
+////////////////////////////////////////////////////
+/// Stream tests : http://nodejs.org/api/stream.html
+////////////////////////////////////////////////////
+
+// http://nodejs.org/api/stream.html#stream_readable_pipe_destination_options
+function stream_readable_pipe_test() {
+    var rs = fs.createReadStream(Buffer.from('file.txt'));
+    var r = fs.createReadStream('file.txt');
+    var z = zlib.createGzip({ finishFlush: zlib.constants.Z_FINISH });
+    var w = fs.createWriteStream('file.txt.gz');
+
+    assert(typeof r.bytesRead === 'number');
+    assert(typeof r.path === 'string');
+    assert(rs.path instanceof Buffer);
+
+    r.pipe(z).pipe(w);
+
+    r.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: function(size) {
+            size.toFixed();
+        }
+    });
+
+    new stream.Writable({
+        write: function(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb()
+        },
+        writev: function(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        }
+    });
+
+    new stream.Duplex({
+        read: function(size) {
+            size.toFixed();
+        },
+        write: function(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb()
+        },
+        writev: function(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        },
+        readableObjectMode: true,
+        writableObjectMode: true
+    });
+
+    new stream.Transform({
+        transform: function(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb();
+        },
+        flush: function(cb) {
+            cb()
+        },
+        read: function(size) {
+            size.toFixed();
+        },
+        write: function(chunk, enc, cb) {
+            chunk.slice(1);
+            enc.charAt(0);
+            cb()
+        },
+        writev: function(chunks, cb) {
+            chunks[0].chunk.slice(0);
+            chunks[0].encoding.charAt(0);
+            cb();
+        },
+        allowHalfOpen: true,
+        readableObjectMode: true,
+        writableObjectMode: true
+    })
+}
+
+////////////////////////////////////////////////////////
+/// Crypto tests : http://nodejs.org/api/crypto.html ///
+////////////////////////////////////////////////////////
+
+namespace crypto_tests {
+    {
+        var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
+    }
+
+    {
+        let hmac: crypto.Hmac;
+        (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
+            let hash: Buffer | string = hmac.read();
+        });
+    }
+
+    {
+        //crypto_cipher_decipher_string_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: string = "This is the clear text.";
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherText: string = cipher.update(clearText, "utf8", "hex");
+        cipherText += cipher.final("hex");
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let clearText2: string = decipher.update(cipherText, "hex", "utf8");
+        clearText2 += decipher.final("utf8");
+
+        assert.equal(clearText2, clearText);
+    }
+
+    {
+        //crypto_cipher_decipher_buffer_test
+        let key: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+        let clearText: Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+        let cipher: crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+        let cipherBuffers: Buffer[] = [];
+        cipherBuffers.push(cipher.update(clearText));
+        cipherBuffers.push(cipher.final());
+
+        let cipherText: Buffer = Buffer.concat(cipherBuffers);
+
+        let decipher: crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+        let decipherBuffers: Buffer[] = [];
+        decipherBuffers.push(decipher.update(cipherText));
+        decipherBuffers.push(decipher.final());
+
+        let clearText2: Buffer = Buffer.concat(decipherBuffers);
+
+        assert.deepEqual(clearText2, clearText);
+    }
+
+    {
+      let buffer1: Buffer = new Buffer([1, 2, 3, 4, 5]);
+      let buffer2: Buffer = new Buffer([1, 2, 3, 4, 5]);
+      let buffer3: Buffer = new Buffer([5, 4, 3, 2, 1]);
+
+      assert(crypto.timingSafeEqual(buffer1, buffer2))
+      assert(!crypto.timingSafeEqual(buffer1, buffer3))
+    }
+
+    {
+        let buffer: Buffer = new Buffer(10);
+        crypto.randomFillSync(buffer);
+        crypto.randomFillSync(buffer, 2);
+        crypto.randomFillSync(buffer, 2, 3);
+
+        crypto.randomFill(buffer, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, (err: Error, buf: Buffer) => void {});
+        crypto.randomFill(buffer, 2, 3, (err: Error, buf: Buffer) => void {});
+
+        let arr: Uint8Array = new Uint8Array(10);
+        crypto.randomFillSync(arr);
+        crypto.randomFillSync(arr, 2);
+        crypto.randomFillSync(arr, 2, 3);
+
+        crypto.randomFill(arr, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(arr, 2, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(arr, 2, 3, (err: Error, buf: Uint8Array) => void {});
+    }
+}
+
+//////////////////////////////////////////////////
+/// TLS tests : http://nodejs.org/api/tls.html ///
+//////////////////////////////////////////////////
+
+namespace tls_tests {
+    {
+        var ctx: tls.SecureContext = tls.createSecureContext({
+            key: "NOT REALLY A KEY",
+            cert: "SOME CERTIFICATE",
+        });
+        var blah = ctx.context;
+
+        var connOpts: tls.ConnectionOptions = {
+            host: "127.0.0.1",
+            port: 55
+        };
+        var tlsSocket = tls.connect(connOpts);
+    }
+
+    {
+        let _server: tls.Server;
+        let _boolean: boolean;
+        let _func1 = function(err: Error, resp: Buffer){};
+        let _func2 = function(err: Error, sessionData: any){};
+        /**
+         * events.EventEmitter
+         * 1. tlsClientError
+         * 2. newSession
+         * 3. OCSPRequest
+         * 4. resumeSession
+         * 5. secureConnection
+         **/
+
+        _server = _server.addListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+        _server = _server.addListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        })
+        _server = _server.addListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        })
+        _server = _server.addListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        })
+        _server = _server.addListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+
+        let _err: Error;
+        let _tlsSocket: tls.TLSSocket;
+        let _any: any;
+        let _func: Function;
+        let _buffer: Buffer;
+        _boolean = _server.emit("tlsClientError", _err, _tlsSocket);
+        _boolean = _server.emit("newSession", _any, _any, _func1);
+        _boolean = _server.emit("OCSPRequest", _buffer, _buffer, _func);
+        _boolean = _server.emit("resumeSession", _any, _func2);
+        _boolean = _server.emit("secureConnection", _tlsSocket);
+
+        _server = _server.on("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+        _server = _server.on("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        })
+        _server = _server.on("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        })
+        _server = _server.on("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        })
+        _server = _server.on("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+
+        _server = _server.once("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+        _server = _server.once("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        })
+        _server = _server.once("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        })
+        _server = _server.once("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        })
+        _server = _server.once("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+
+        _server = _server.prependListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+        _server = _server.prependListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        })
+        _server = _server.prependListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        })
+        _server = _server.prependListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        })
+        _server = _server.prependListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+
+        _server = _server.prependOnceListener("tlsClientError", (err, tlsSocket) => {
+            let _err: Error = err;
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+        _server = _server.prependOnceListener("newSession", (sessionId, sessionData, callback) => {
+            let _sessionId: any = sessionId;
+            let _sessionData: any = sessionData;
+            let _func1 = callback;
+        })
+        _server = _server.prependOnceListener("OCSPRequest", (certificate, issuer, callback) => {
+            let _certificate: Buffer = certificate;
+            let _issuer: Buffer = issuer;
+            let _callback: Function = callback;
+        })
+        _server = _server.prependOnceListener("resumeSession", (sessionId, callback) => {
+            let _sessionId: any = sessionId;
+            let _func2 = callback;
+        })
+        _server = _server.prependOnceListener("secureConnection", (tlsSocket) => {
+            let _tlsSocket: tls.TLSSocket = tlsSocket;
+        })
+
+        // close callback parameter is optional
+        _server = _server.close();
+
+        // close callback parameter doesn't specify any arguments, so any
+        // function is acceptable
+        _server = _server.close(() => {});
+        _server = _server.close((...args:any[]) => {});
+    }
+
+    {
+        let _TLSSocket: tls.TLSSocket;
+        let _boolean: boolean;
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         **/
+
+        _TLSSocket = _TLSSocket.addListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        })
+        _TLSSocket = _TLSSocket.addListener("secureConnect", () => { });
+
+        let _buffer: Buffer;
+        _boolean = _TLSSocket.emit("OCSPResponse", _buffer);
+        _boolean = _TLSSocket.emit("secureConnect");
+
+        _TLSSocket = _TLSSocket.on("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        })
+        _TLSSocket = _TLSSocket.on("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.once("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        })
+        _TLSSocket = _TLSSocket.once("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        })
+        _TLSSocket = _TLSSocket.prependListener("secureConnect", () => { });
+
+        _TLSSocket = _TLSSocket.prependOnceListener("OCSPResponse", (response) => {
+            let _response: Buffer = response;
+        })
+        _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// Http tests : http://nodejs.org/api/http.html ///
+////////////////////////////////////////////////////
+
+namespace http_tests {
+    {
+    // Status codes
+    var codeMessage = http.STATUS_CODES['400'];
+    var codeMessage = http.STATUS_CODES[400];
+    }
+
+    {
+	var agent: http.Agent = new http.Agent({
+		keepAlive: true,
+		keepAliveMsecs: 10000,
+		maxSockets: Infinity,
+		maxFreeSockets: 256
+	});
+
+	var agent: http.Agent = http.globalAgent;
+
+        http.request({ agent: false });
+        http.request({ agent: agent });
+        http.request({ agent: undefined });
+    }
+
+    {
+        // Make sure .listen() and .close() retuern a Server instance
+        http.createServer().listen(0).close().address();
+        net.createServer().listen(0).close().address();
+    }
+
+    {
+        var request = http.request('http://0.0.0.0');
+        request.once('error', function() { });
+        request.setNoDelay(true);
+        request.abort();
+    }
+
+	const options: http.RequestOptions = {
+        timeout: 30000
+	};
+}
+
+//////////////////////////////////////////////////////
+/// Https tests : http://nodejs.org/api/https.html ///
+//////////////////////////////////////////////////////
+
+namespace https_tests {
+    var agent: https.Agent = new https.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256,
+        maxCachedSessions: 100
+    });
+
+    var agent: https.Agent = https.globalAgent;
+
+    https.request({
+        agent: false
+    });
+    https.request({
+        agent: agent
+    });
+    https.request({
+        agent: undefined
+    });
+}
+
+////////////////////////////////////////////////////
+/// TTY tests : http://nodejs.org/api/tty.html
+////////////////////////////////////////////////////
+
+namespace tty_tests {
+    let rs: tty.ReadStream;
+    let ws: tty.WriteStream;
+
+    let rsIsRaw: boolean = rs.isRaw;
+    rs.setRawMode(true);
+
+    let wsColumns: number = ws.columns;
+    let wsRows: number = ws.rows;
+
+    let isTTY: boolean = tty.isatty(1);
+}
+
+////////////////////////////////////////////////////
+/// Dgram tests : http://nodejs.org/api/dgram.html
+////////////////////////////////////////////////////
+
+namespace dgram_tests {
+    {
+    var ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => {
+    });
+    ds.bind();
+    ds.bind(41234);
+    var ai: dgram.AddressInfo = ds.address();
+    ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
+    });
+    ds.send(new Buffer("hello"), 5000, "127.0.0.1");
+    }
+
+    {
+        let _socket: dgram.Socket;
+        let _boolean: boolean;
+        let _err: Error;
+        let _str: string;
+        let _rinfo: dgram.AddressInfo;
+        /**
+         * events.EventEmitter
+         * 1. close
+         * 2. error
+         * 3. listening
+         * 4. message
+         **/
+
+        _socket = _socket.addListener("close", () => {});
+        _socket = _socket.addListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _socket = _socket.addListener("listening", () => {});
+        _socket = _socket.addListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        })
+
+        _boolean = _socket.emit("close")
+        _boolean = _socket.emit("error", _err);
+        _boolean = _socket.emit("listening");
+        _boolean = _socket.emit("message", _str, _rinfo);
+
+        _socket = _socket.on("close", () => {});
+        _socket = _socket.on("error", (err) => {
+            let _err: Error = err;
+        })
+        _socket = _socket.on("listening", () => {});
+        _socket = _socket.on("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        })
+
+        _socket = _socket.once("close", () => {});
+        _socket = _socket.once("error", (err) => {
+            let _err: Error = err;
+        })
+        _socket = _socket.once("listening", () => {});
+        _socket = _socket.once("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        })
+
+        _socket = _socket.prependListener("close", () => {});
+        _socket = _socket.prependListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _socket = _socket.prependListener("listening", () => {});
+        _socket = _socket.prependListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        })
+
+        _socket = _socket.prependOnceListener("close", () => {});
+        _socket = _socket.prependOnceListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _socket = _socket.prependOnceListener("listening", () => {});
+        _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
+            let _msg: Buffer = msg;
+            let _rinfo: dgram.AddressInfo = rinfo;
+        })
+    }
+}
+
+////////////////////////////////////////////////////
+///Querystring tests : https://nodejs.org/api/querystring.html
+////////////////////////////////////////////////////
+
+namespace querystring_tests {
+    type SampleObject = { a: string; b: number; }
+
+    {
+        let obj: SampleObject;
+        let sep: string;
+        let eq: string;
+        let options: querystring.StringifyOptions;
+        let result: string;
+
+        result = querystring.stringify<SampleObject>(obj);
+        result = querystring.stringify<SampleObject>(obj, sep);
+        result = querystring.stringify<SampleObject>(obj, sep, eq);
+        result = querystring.stringify<SampleObject>(obj, sep, eq);
+        result = querystring.stringify<SampleObject>(obj, sep, eq, options);
+    }
+
+    {
+        let str: string;
+        let sep: string;
+        let eq: string;
+        let options: querystring.ParseOptions;
+        let result: SampleObject;
+
+        result = querystring.parse<SampleObject>(str);
+        result = querystring.parse<SampleObject>(str, sep);
+        result = querystring.parse<SampleObject>(str, sep, eq);
+        result = querystring.parse<SampleObject>(str, sep, eq, options);
+    }
+
+    {
+        let str: string;
+        let result: string;
+
+        result = querystring.escape(str);
+        result = querystring.unescape(str);
+    }
+}
+
+////////////////////////////////////////////////////
+/// path tests : http://nodejs.org/api/path.html
+////////////////////////////////////////////////////
+
+namespace path_tests {
+
+    path.normalize('/foo/bar//baz/asdf/quux/..');
+
+    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..');
+    // returns
+    //'/foo/bar/baz/asdf'
+
+    try {
+        path.join('foo', 'bar');
+    }
+    catch (error) {
+
+    }
+
+    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile');
+    //Is similar to:
+    //
+    //cd foo/bar
+    //cd /tmp/file/
+    //cd ..
+    //    cd a/../subfile
+    //pwd
+
+    path.resolve('/foo/bar', './baz')
+    // returns
+    //    '/foo/bar/baz'
+
+    path.resolve('/foo/bar', '/tmp/file/')
+    // returns
+    //    '/tmp/file'
+
+    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif')
+    // if currently in /home/myself/node, it returns
+    //    '/home/myself/node/wwwroot/static_files/gif/image.gif'
+
+    path.isAbsolute('/foo/bar') // true
+    path.isAbsolute('/baz/..')  // true
+    path.isAbsolute('qux/')     // false
+    path.isAbsolute('.')        // false
+
+    path.isAbsolute('//server')  // true
+    path.isAbsolute('C:/foo/..') // true
+    path.isAbsolute('bar\\baz')   // false
+    path.isAbsolute('.')         // false
+
+    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb')
+    // returns
+    //    '..\\..\\impl\\bbb'
+
+    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb')
+    // returns
+    //    '../../impl/bbb'
+
+    path.dirname('/foo/bar/baz/asdf/quux')
+    // returns
+    //    '/foo/bar/baz/asdf'
+
+    path.basename('/foo/bar/baz/asdf/quux.html')
+    // returns
+    //    'quux.html'
+
+    path.basename('/foo/bar/baz/asdf/quux.html', '.html')
+    // returns
+    //    'quux'
+
+    path.extname('index.html')
+    // returns
+    //    '.html'
+
+    path.extname('index.coffee.md')
+    // returns
+    //    '.md'
+
+    path.extname('index.')
+    // returns
+    //    '.'
+
+    path.extname('index')
+    // returns
+    //    ''
+
+    'foo/bar/baz'.split(path.sep)
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    'foo\\bar\\baz'.split(path.sep)
+    // returns
+    //        ['foo', 'bar', 'baz']
+
+    console.log(process.env.PATH)
+    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
+
+    process.env.PATH.split(path.delimiter)
+    // returns
+    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
+
+    console.log(process.env.PATH)
+    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
+
+    process.env.PATH.split(path.delimiter)
+    // returns
+    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+
+    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'
+}
+
+////////////////////////////////////////////////////
+/// readline tests : https://nodejs.org/api/readline.html
+////////////////////////////////////////////////////
+
+namespace readline_tests {
+    let rl: readline.ReadLine;
+
+    {
+        let options: readline.ReadLineOptions;
+        let input: NodeJS.ReadableStream;
+        let output: NodeJS.WritableStream;
+        let completer: readline.Completer;
+        let terminal: boolean;
+
+        let result: readline.ReadLine;
+
+        result = readline.createInterface(options);
+        result = readline.createInterface(input);
+        result = readline.createInterface(input, output);
+        result = readline.createInterface(input, output, completer);
+        result = readline.createInterface(input, output, completer, terminal);
+        result = readline.createInterface({
+            input: input,
+            completer: function(str: string): readline.CompleterResult {
+                return [['test'], 'test'];
+            }
+        });
+        result = readline.createInterface({
+            input: input,
+            completer: function(str: string, callback: (err: any, result: readline.CompleterResult) => void): any {
+                callback(null, [['test'], 'test']);
+            }
+        });
+    }
+
+    {
+        let prompt: string;
+
+        rl.setPrompt(prompt);
+    }
+
+    {
+        let preserveCursor: boolean;
+
+        rl.prompt();
+        rl.prompt(preserveCursor);
+    }
+
+    {
+        let query: string;
+        let callback: (answer: string) => void;
+
+        rl.question(query, callback);
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.pause();
+    }
+
+    {
+        let result: readline.ReadLine;
+
+        result = rl.resume();
+    }
+
+    {
+        rl.close();
+    }
+
+    {
+        let data: string | Buffer;
+        let key: readline.Key;
+
+        rl.write(data);
+        rl.write(null, key);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let x: number;
+        let y: number;
+
+        readline.cursorTo(stream, x, y);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let dx: number | string;
+        let dy: number | string;
+
+        readline.moveCursor(stream, dx, dy);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+        let dir: number;
+
+        readline.clearLine(stream, dir);
+    }
+
+    {
+        let stream: NodeJS.WritableStream;
+
+        readline.clearScreenDown(stream);
+    }
+
+    {
+        let _rl: readline.ReadLine;
+        let _boolean: boolean;
+
+        _rl = _rl.addListener("close", () => { });
+        _rl = _rl.addListener("line", (input) => {
+            let _input: any = input;
+        })
+        _rl = _rl.addListener("pause", () => { });
+        _rl = _rl.addListener("resume", () => { });
+        _rl = _rl.addListener("SIGCONT", () => { });
+        _rl = _rl.addListener("SIGINT", () => { });
+        _rl = _rl.addListener("SIGTSTP", () => { });
+
+        _boolean = _rl.emit("close", () => { });
+        _boolean = _rl.emit("line", () => { });
+        _boolean = _rl.emit("pause", () => { });
+        _boolean = _rl.emit("resume", () => { });
+        _boolean = _rl.emit("SIGCONT", () => { });
+        _boolean = _rl.emit("SIGINT", () => { });
+        _boolean = _rl.emit("SIGTSTP", () => { });
+
+        _rl = _rl.on("close", () => { });
+        _rl = _rl.on("line", (input) => {
+            let _input: any = input;
+        })
+        _rl = _rl.on("pause", () => { });
+        _rl = _rl.on("resume", () => { });
+        _rl = _rl.on("SIGCONT", () => { });
+        _rl = _rl.on("SIGINT", () => { });
+        _rl = _rl.on("SIGTSTP", () => { });
+
+        _rl = _rl.once("close", () => { });
+        _rl = _rl.once("line", (input) => {
+            let _input: any = input;
+        })
+        _rl = _rl.once("pause", () => { });
+        _rl = _rl.once("resume", () => { });
+        _rl = _rl.once("SIGCONT", () => { });
+        _rl = _rl.once("SIGINT", () => { });
+        _rl = _rl.once("SIGTSTP", () => { });
+
+        _rl = _rl.prependListener("close", () => { });
+        _rl = _rl.prependListener("line", (input) => {
+            let _input: any = input;
+        })
+        _rl = _rl.prependListener("pause", () => { });
+        _rl = _rl.prependListener("resume", () => { });
+        _rl = _rl.prependListener("SIGCONT", () => { });
+        _rl = _rl.prependListener("SIGINT", () => { });
+        _rl = _rl.prependListener("SIGTSTP", () => { });
+
+        _rl = _rl.prependOnceListener("close", () => { });
+        _rl = _rl.prependOnceListener("line", (input) => {
+            let _input: any = input;
+        })
+        _rl = _rl.prependOnceListener("pause", () => { });
+        _rl = _rl.prependOnceListener("resume", () => { });
+        _rl = _rl.prependOnceListener("SIGCONT", () => { });
+        _rl = _rl.prependOnceListener("SIGINT", () => { });
+        _rl = _rl.prependOnceListener("SIGTSTP", () => { });
+    }
+}
+
+////////////////////////////////////////////////////
+/// string_decoder tests : https://nodejs.org/api/string_decoder.html
+////////////////////////////////////////////////////
+
+namespace string_decoder_tests {
+    const StringDecoder = string_decoder.StringDecoder;
+    const buffer = new Buffer('test');
+    const decoder1 = new StringDecoder();
+    const decoder2 = new StringDecoder('utf8');
+    const part1: string = decoder1.write(new Buffer('test'));
+    const end1: string = decoder1.end();
+    const part2: string = decoder2.write(new Buffer('test'));
+    const end2: string = decoder1.end(new Buffer('test'));
+}
+
+//////////////////////////////////////////////////////////////////////
+/// Child Process tests: https://nodejs.org/api/child_process.html ///
+//////////////////////////////////////////////////////////////////////
+
+namespace child_process_tests {
+    {
+        childProcess.exec("echo test");
+        childProcess.spawnSync("echo test");
+    }
+
+    {
+        let _cp: childProcess.ChildProcess;
+        let _boolean: boolean;
+
+        _cp = _cp.addListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.addListener("disconnect", () => { });
+        _cp = _cp.addListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _cp = _cp.addListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.addListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        })
+
+        _boolean = _cp.emit("close", () => { });
+        _boolean = _cp.emit("disconnect", () => { });
+        _boolean = _cp.emit("error", () => { });
+        _boolean = _cp.emit("exit", () => { });
+        _boolean = _cp.emit("message", () => { });
+
+        _cp = _cp.on("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.on("disconnect", () => { });
+        _cp = _cp.on("error", (err) => {
+            let _err: Error = err;
+        })
+        _cp = _cp.on("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.on("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        })
+
+        _cp = _cp.once("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.once("disconnect", () => { });
+        _cp = _cp.once("error", (err) => {
+            let _err: Error = err;
+        })
+        _cp = _cp.once("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.once("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        })
+
+        _cp = _cp.prependListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.prependListener("disconnect", () => { });
+        _cp = _cp.prependListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _cp = _cp.prependListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.prependListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        })
+
+        _cp = _cp.prependOnceListener("close", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.prependOnceListener("disconnect", () => { });
+        _cp = _cp.prependOnceListener("error", (err) => {
+            let _err: Error = err;
+        })
+        _cp = _cp.prependOnceListener("exit", (code, signal) => {
+            let _code: number = code;
+            let _signal: string = signal;
+        })
+        _cp = _cp.prependOnceListener("message", (message, sendHandle) => {
+            let _message: any = message;
+            let _sendHandle: net.Socket | net.Server = sendHandle;
+        })
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
+/// cluster tests: https://nodejs.org/api/cluster.html ///
+//////////////////////////////////////////////////////////////////////
+
+namespace cluster_tests {
+    {
+        cluster.fork();
+        Object.keys(cluster.workers).forEach(key => {
+            const worker = cluster.workers[key];
+            if (worker.isDead()) {
+                console.log('worker %d is dead', worker.process.pid);
+            }
+        });
+    }
+}
+
+////////////////////////////////////////////////////
+/// os tests : https://nodejs.org/api/os.html
+////////////////////////////////////////////////////
+
+namespace os_tests {
+    {
+        let result: string;
+
+        result = os.tmpdir();
+        result = os.homedir();
+        result = os.endianness();
+        result = os.hostname();
+        result = os.type();
+        result = os.arch();
+        result = os.release();
+        result = os.EOL;
+    }
+
+    {
+        let result: number;
+
+        result = os.uptime();
+        result = os.totalmem();
+        result = os.freemem();
+    }
+
+    {
+        let result: number[];
+
+        result = os.loadavg();
+    }
+
+    {
+        let result: os.CpuInfo[];
+
+        result = os.cpus();
+    }
+
+    {
+        let result: { [index: string]: os.NetworkInterfaceInfo[] };
+
+        result = os.networkInterfaces();
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.signals.SIGHUP;
+        result = os.constants.signals.SIGINT;
+        result = os.constants.signals.SIGQUIT;
+        result = os.constants.signals.SIGILL;
+        result = os.constants.signals.SIGTRAP;
+        result = os.constants.signals.SIGABRT;
+        result = os.constants.signals.SIGIOT;
+        result = os.constants.signals.SIGBUS;
+        result = os.constants.signals.SIGFPE;
+        result = os.constants.signals.SIGKILL;
+        result = os.constants.signals.SIGUSR1;
+        result = os.constants.signals.SIGSEGV;
+        result = os.constants.signals.SIGUSR2;
+        result = os.constants.signals.SIGPIPE;
+        result = os.constants.signals.SIGALRM;
+        result = os.constants.signals.SIGTERM;
+        result = os.constants.signals.SIGCHLD;
+        result = os.constants.signals.SIGSTKFLT;
+        result = os.constants.signals.SIGCONT;
+        result = os.constants.signals.SIGSTOP;
+        result = os.constants.signals.SIGTSTP;
+        result = os.constants.signals.SIGTTIN;
+        result = os.constants.signals.SIGTTOU;
+        result = os.constants.signals.SIGURG;
+        result = os.constants.signals.SIGXCPU;
+        result = os.constants.signals.SIGXFSZ;
+        result = os.constants.signals.SIGVTALRM;
+        result = os.constants.signals.SIGPROF;
+        result = os.constants.signals.SIGWINCH;
+        result = os.constants.signals.SIGIO;
+        result = os.constants.signals.SIGPOLL;
+        result = os.constants.signals.SIGPWR;
+        result = os.constants.signals.SIGSYS;
+        result = os.constants.signals.SIGUNUSED;
+    }
+
+    {
+        let result: number;
+
+        result = os.constants.errno.E2BIG;
+        result = os.constants.errno.EACCES;
+        result = os.constants.errno.EADDRINUSE;
+        result = os.constants.errno.EADDRNOTAVAIL;
+        result = os.constants.errno.EAFNOSUPPORT;
+        result = os.constants.errno.EAGAIN;
+        result = os.constants.errno.EALREADY;
+        result = os.constants.errno.EBADF;
+        result = os.constants.errno.EBADMSG;
+        result = os.constants.errno.EBUSY;
+        result = os.constants.errno.ECANCELED;
+        result = os.constants.errno.ECHILD;
+        result = os.constants.errno.ECONNABORTED;
+        result = os.constants.errno.ECONNREFUSED;
+        result = os.constants.errno.ECONNRESET;
+        result = os.constants.errno.EDEADLK;
+        result = os.constants.errno.EDESTADDRREQ;
+        result = os.constants.errno.EDOM;
+        result = os.constants.errno.EDQUOT;
+        result = os.constants.errno.EEXIST;
+        result = os.constants.errno.EFAULT;
+        result = os.constants.errno.EFBIG;
+        result = os.constants.errno.EHOSTUNREACH;
+        result = os.constants.errno.EIDRM;
+        result = os.constants.errno.EILSEQ;
+        result = os.constants.errno.EINPROGRESS;
+        result = os.constants.errno.EINTR;
+        result = os.constants.errno.EINVAL;
+        result = os.constants.errno.EIO;
+        result = os.constants.errno.EISCONN;
+        result = os.constants.errno.EISDIR;
+        result = os.constants.errno.ELOOP;
+        result = os.constants.errno.EMFILE;
+        result = os.constants.errno.EMLINK;
+        result = os.constants.errno.EMSGSIZE;
+        result = os.constants.errno.EMULTIHOP;
+        result = os.constants.errno.ENAMETOOLONG;
+        result = os.constants.errno.ENETDOWN;
+        result = os.constants.errno.ENETRESET;
+        result = os.constants.errno.ENETUNREACH;
+        result = os.constants.errno.ENFILE;
+        result = os.constants.errno.ENOBUFS;
+        result = os.constants.errno.ENODATA;
+        result = os.constants.errno.ENODEV;
+        result = os.constants.errno.ENOENT;
+        result = os.constants.errno.ENOEXEC;
+        result = os.constants.errno.ENOLCK;
+        result = os.constants.errno.ENOLINK;
+        result = os.constants.errno.ENOMEM;
+        result = os.constants.errno.ENOMSG;
+        result = os.constants.errno.ENOPROTOOPT;
+        result = os.constants.errno.ENOSPC;
+        result = os.constants.errno.ENOSR;
+        result = os.constants.errno.ENOSTR;
+        result = os.constants.errno.ENOSYS;
+        result = os.constants.errno.ENOTCONN;
+        result = os.constants.errno.ENOTDIR;
+        result = os.constants.errno.ENOTEMPTY;
+        result = os.constants.errno.ENOTSOCK;
+        result = os.constants.errno.ENOTSUP;
+        result = os.constants.errno.ENOTTY;
+        result = os.constants.errno.ENXIO;
+        result = os.constants.errno.EOPNOTSUPP;
+        result = os.constants.errno.EOVERFLOW;
+        result = os.constants.errno.EPERM;
+        result = os.constants.errno.EPIPE;
+        result = os.constants.errno.EPROTO;
+        result = os.constants.errno.EPROTONOSUPPORT;
+        result = os.constants.errno.EPROTOTYPE;
+        result = os.constants.errno.ERANGE;
+        result = os.constants.errno.EROFS;
+        result = os.constants.errno.ESPIPE;
+        result = os.constants.errno.ESRCH;
+        result = os.constants.errno.ESTALE;
+        result = os.constants.errno.ETIME;
+        result = os.constants.errno.ETIMEDOUT;
+        result = os.constants.errno.ETXTBSY;
+        result = os.constants.errno.EWOULDBLOCK;
+        result = os.constants.errno.EXDEV;
+    }
+}
+
+////////////////////////////////////////////////////
+/// vm tests : https://nodejs.org/api/vm.html
+////////////////////////////////////////////////////
+
+namespace vm_tests {
+    {
+        const sandbox = {
+            animal: 'cat',
+            count: 2
+        };
+
+        const context = vm.createContext(sandbox);
+        console.log(vm.isContext(context));
+        const script = new vm.Script('count += 1; name = "kitty"');
+
+        for (let i = 0; i < 10; ++i) {
+            script.runInContext(context);
+        }
+
+        console.log(util.inspect(sandbox));
+
+        vm.runInNewContext('count += 1; name = "kitty"', sandbox);
+        console.log(util.inspect(sandbox));
+    }
+
+    {
+        const sandboxes = [{}, {}, {}];
+
+        const script = new vm.Script('globalVar = "set"');
+
+        sandboxes.forEach((sandbox) => {
+            script.runInNewContext(sandbox);
+            script.runInThisContext();
+        });
+
+        console.log(util.inspect(sandboxes));
+
+        var localVar = 'initial value';
+        vm.runInThisContext('localVar = "vm";');
+
+        console.log(localVar);
+    }
+
+    {
+        const Debug = vm.runInDebugContext('Debug');
+        Debug.scripts().forEach(function(script: any) { console.log(script.name); });
+    }
+}
+
+/////////////////////////////////////////////////////
+/// Timers tests : https://nodejs.org/api/timers.html
+/////////////////////////////////////////////////////
+
+namespace timers_tests {
+    {
+        let immediateId = timers.setImmediate(function() { console.log("immediate"); });
+        timers.clearImmediate(immediateId);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setInterval(function() { console.log("interval"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearInterval(timeout);
+    }
+    {
+        let counter = 0;
+        let timeout = timers.setTimeout(function() { console.log("timeout"); }, 20);
+        timeout.unref();
+        timeout.ref();
+        timers.clearTimeout(timeout);
+    }
+}
+
+/////////////////////////////////////////////////////////
+/// Errors Tests : https://nodejs.org/api/errors.html ///
+/////////////////////////////////////////////////////////
+
+namespace errors_tests {
+    {
+        Error.stackTraceLimit = Infinity;
+    }
+    {
+        const myObject = {};
+        Error.captureStackTrace(myObject);
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Process Tests : https://nodejs.org/api/process.html ///
+///////////////////////////////////////////////////////////
+
+import * as p from "process";
+namespace process_tests {
+    {
+        var eventEmitter: events.EventEmitter;
+        eventEmitter = process;                // Test that process implements EventEmitter...
+
+        var _p: NodeJS.Process = process;
+        _p = p;
+    }
+    {
+        assert(process.argv[0] === process.argv0);
+    }
+    {
+        var module: NodeModule | undefined;
+        module = process.mainModule;
+    }
+}
+
+///////////////////////////////////////////////////////////
+/// Console Tests : https://nodejs.org/api/console.html ///
+///////////////////////////////////////////////////////////
+
+import * as c from "console";
+namespace console_tests {
+    {
+        var _c: Console = console;
+        _c = c;
+    }
+    {
+        var writeStream     = fs.createWriteStream('./index.d.ts');
+        var consoleInstance = new console.Console(writeStream)
+
+    }
+}
+
+///////////////////////////////////////////////////
+/// Net Tests : https://nodejs.org/api/net.html ///
+///////////////////////////////////////////////////
+
+namespace net_tests {
+    {
+        let server = net.createServer();
+        // Check methods which return server instances by chaining calls
+        server = server.listen(0)
+                .close()
+                .ref()
+                .unref();
+
+        // close has an optional callback function. No callback parameters are
+        // specified, so any callback function is permissible.
+        server = server.close((...args: any[]) => {});
+
+        // test the types of the address object fields
+        let address = server.address();
+        address.port = 1234;
+        address.family = "ipv4";
+        address.address = "127.0.0.1";
+    }
+
+    {
+        /**
+         * net.Socket - events.EventEmitter
+         *   1. close
+         *   2. connect
+         *   3. data
+         *   4. drain
+         *   5. end
+         *   6. error
+         *   7. lookup
+         *   8. timeout
+         */
+        let _socket: net.Socket;
+
+        let bool: boolean;
+        let buffer: Buffer;
+        let error: Error;
+        let str: string;
+        let num: number;
+
+        /// addListener
+
+        _socket = _socket.addListener("close", had_error => {
+            bool = had_error;
+        })
+        _socket = _socket.addListener("connect", () => { })
+        _socket = _socket.addListener("data", data => {
+            buffer = data;
+        })
+        _socket = _socket.addListener("drain", () => { })
+        _socket = _socket.addListener("end", () => { })
+        _socket = _socket.addListener("error", err => {
+            error = err;
+        })
+        _socket = _socket.addListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        })
+        _socket = _socket.addListener("timeout", () => { })
+
+        /// emit
+        bool = _socket.emit("close", bool);
+        bool = _socket.emit("connect");
+        bool = _socket.emit("data", buffer);
+        bool = _socket.emit("drain");
+        bool = _socket.emit("end");
+        bool = _socket.emit("error", error);
+        bool = _socket.emit("lookup", error, str, str, str);
+        bool = _socket.emit("lookup", error, str, num, str);
+        bool = _socket.emit("timeout");
+
+        /// on
+        _socket = _socket.on("close", had_error => {
+            bool = had_error;
+        })
+        _socket = _socket.on("connect", () => { })
+        _socket = _socket.on("data", data => {
+            buffer = data;
+        })
+        _socket = _socket.on("drain", () => { })
+        _socket = _socket.on("end", () => { })
+        _socket = _socket.on("error", err => {
+            error = err;
+        })
+        _socket = _socket.on("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        })
+        _socket = _socket.on("timeout", () => { })
+
+        /// once
+        _socket = _socket.once("close", had_error => {
+            bool = had_error;
+        })
+        _socket = _socket.once("connect", () => { })
+        _socket = _socket.once("data", data => {
+            buffer = data;
+        })
+        _socket = _socket.once("drain", () => { })
+        _socket = _socket.once("end", () => { })
+        _socket = _socket.once("error", err => {
+            error = err;
+        })
+        _socket = _socket.once("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        })
+        _socket = _socket.once("timeout", () => { })
+
+        /// prependListener
+        _socket = _socket.prependListener("close", had_error => {
+            bool = had_error;
+        })
+        _socket = _socket.prependListener("connect", () => { })
+        _socket = _socket.prependListener("data", data => {
+            buffer = data;
+        })
+        _socket = _socket.prependListener("drain", () => { })
+        _socket = _socket.prependListener("end", () => { })
+        _socket = _socket.prependListener("error", err => {
+            error = err;
+        })
+        _socket = _socket.prependListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        })
+        _socket = _socket.prependListener("timeout", () => { })
+
+        /// prependOnceListener
+        _socket = _socket.prependOnceListener("close", had_error => {
+            bool = had_error;
+        })
+        _socket = _socket.prependOnceListener("connect", () => { })
+        _socket = _socket.prependOnceListener("data", data => {
+            buffer = data;
+        })
+        _socket = _socket.prependOnceListener("drain", () => { })
+        _socket = _socket.prependOnceListener("end", () => { })
+        _socket = _socket.prependOnceListener("error", err => {
+            error = err;
+        })
+        _socket = _socket.prependOnceListener("lookup", (err, address, family, host) => {
+            error = err;
+
+            if (typeof family === 'string') {
+                str = family;
+            } else if (typeof family === 'number') {
+                num = family;
+            }
+
+            str = host;
+        })
+        _socket = _socket.prependOnceListener("timeout", () => { })
+
+        bool = _socket.connecting;
+        bool = _socket.destroyed;
+        _socket.destroy();
+    }
+
+    {
+        /**
+         * net.Server - events.EventEmitter
+         *   1. close
+         *   2. connection
+         *   3. error
+         *   4. listening
+         */
+        let _server: net.Server;
+
+        let _socket: net.Socket;
+        let bool: boolean;
+        let error: Error;
+
+        /// addListener
+        _server = _server.addListener("close", () => { })
+        _server = _server.addListener("connection", socket => {
+            _socket = socket
+        })
+        _server = _server.addListener("error", err => {
+            error = err;
+        })
+        _server = _server.addListener("listening", () => { })
+
+        /// emit
+        bool = _server.emit("close")
+        bool = _server.emit("connection", _socket)
+        bool = _server.emit("error", error)
+        bool = _server.emit("listening")
+
+        /// once
+        _server = _server.once("close", () => { })
+        _server = _server.once("connection", socket => {
+            _socket = socket
+        })
+        _server = _server.once("error", err => {
+            error = err;
+        })
+        _server = _server.once("listening", () => { })
+
+        /// prependListener
+        _server = _server.prependListener("close", () => { })
+        _server = _server.prependListener("connection", socket => {
+            _socket = socket
+        })
+        _server = _server.prependListener("error", err => {
+            error = err;
+        })
+        _server = _server.prependListener("listening", () => { })
+
+        /// prependOnceListener
+        _server = _server.prependOnceListener("close", () => { })
+        _server = _server.prependOnceListener("connection", socket => {
+            _socket = socket
+        })
+        _server = _server.prependOnceListener("error", err => {
+            error = err;
+        })
+        _server = _server.prependOnceListener("listening", () => { })
+
+    }
+
+}
+
+/////////////////////////////////////////////////////
+/// repl Tests : https://nodejs.org/api/repl.html ///
+/////////////////////////////////////////////////////
+
+namespace repl_tests {
+    {
+        let _server: repl.REPLServer;
+        let _boolean: boolean;
+        let _ctx: any;
+
+        _server = _server.addListener("exit", () => { });
+        _server = _server.addListener("reset", () => { });
+
+        _boolean = _server.emit("exit", () => { });
+        _boolean = _server.emit("reset", _ctx);
+
+        _server = _server.on("exit", () => { });
+        _server = _server.on("reset", () => { });
+
+        _server = _server.once("exit", () => { });
+        _server = _server.once("reset", () => { });
+
+        _server = _server.prependListener("exit", () => { });
+        _server = _server.prependListener("reset", () => { });
+
+        _server = _server.prependOnceListener("exit", () => { });
+        _server = _server.prependOnceListener("reset", () => { });
+    }
+}
+
+///////////////////////////////////////////////////
+/// DNS Tests : https://nodejs.org/api/dns.html ///
+///////////////////////////////////////////////////
+
+namespace dns_tests {
+    dns.lookup("nodejs.org", (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 4, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", 6, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup("nodejs.org", {}, (err, address, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: string = address;
+        const _family: number = family;
+    });
+    dns.lookup(
+        "nodejs.org",
+        {
+            family: 4,
+            hints: dns.ADDRCONFIG | dns.V4MAPPED,
+            all: false
+        },
+        (err, address, family) => {
+            const _err: NodeJS.ErrnoException = err;
+            const _address: string = address;
+            const _family: number = family;
+        }
+    );
+    dns.lookup("nodejs.org", {all: true}, (err, addresses) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _address: dns.LookupAddress[] = addresses;
+    });
+
+    function trueOrFalse(): boolean {
+        return Math.random() > 0.5 ? true : false;
+    }
+    dns.lookup("nodejs.org", {all: trueOrFalse()}, (err, addresses, family) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _addresses: string | dns.LookupAddress[] = addresses;
+        const _family: number | undefined = family;
+    });
+
+    dns.resolve("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "A", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "AAAA", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve("nodejs.org", "MX", (err, addresses) => {
+        const _addresses: dns.MxRecord[] = addresses;
+    });
+
+    dns.resolve4("nodejs.org", (err, addresses) => {
+        const _addresses: string[] = addresses;
+    });
+    dns.resolve4("nodejs.org", {ttl: true}, (err, addresses) => {
+        const _addresses: dns.RecordWithTtl[] = addresses;
+    });
+    {
+        const ttl = false;
+        dns.resolve4("nodejs.org", {ttl: 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: ttl}, (err, addresses) => {
+            const _addresses: string[] | dns.RecordWithTtl[] = addresses;
+        });
+    }
+}
+
+/*****************************************************************************
+ *                                                                           *
+ * The following tests are the modules not mentioned in document but existed *
+ *                                                                           *
+ *****************************************************************************/
+
+///////////////////////////////////////////////////////////
+/// Constants Tests                                     ///
+///////////////////////////////////////////////////////////
+
+import * as constants from 'constants';
+namespace constants_tests {
+    var str: string;
+    var num: number;
+    num = constants.SIGHUP
+    num = constants.SIGINT
+    num = constants.SIGQUIT
+    num = constants.SIGILL
+    num = constants.SIGTRAP
+    num = constants.SIGABRT
+    num = constants.SIGIOT
+    num = constants.SIGBUS
+    num = constants.SIGFPE
+    num = constants.SIGKILL
+    num = constants.SIGUSR1
+    num = constants.SIGSEGV
+    num = constants.SIGUSR2
+    num = constants.SIGPIPE
+    num = constants.SIGALRM
+    num = constants.SIGTERM
+    num = constants.SIGCHLD
+    num = constants.SIGSTKFLT
+    num = constants.SIGCONT
+    num = constants.SIGSTOP
+    num = constants.SIGTSTP
+    num = constants.SIGTTIN
+    num = constants.SIGTTOU
+    num = constants.SIGURG
+    num = constants.SIGXCPU
+    num = constants.SIGXFSZ
+    num = constants.SIGVTALRM
+    num = constants.SIGPROF
+    num = constants.SIGWINCH
+    num = constants.SIGIO
+    num = constants.SIGPOLL
+    num = constants.SIGPWR
+    num = constants.SIGSYS
+    num = constants.SIGUNUSED
+    num = constants.O_RDONLY
+    num = constants.O_WRONLY
+    num = constants.O_RDWR
+    num = constants.S_IFMT
+    num = constants.S_IFREG
+    num = constants.S_IFDIR
+    num = constants.S_IFCHR
+    num = constants.S_IFBLK
+    num = constants.S_IFIFO
+    num = constants.S_IFLNK
+    num = constants.S_IFSOCK
+    num = constants.O_CREAT
+    num = constants.O_EXCL
+    num = constants.O_NOCTTY
+    num = constants.O_TRUNC
+    num = constants.O_APPEND
+    num = constants.O_DIRECTORY
+    num = constants.O_NOATIME
+    num = constants.O_NOFOLLOW
+    num = constants.O_SYNC
+    num = constants.O_DIRECT
+    num = constants.O_NONBLOCK
+    num = constants.S_IRWXU
+    num = constants.S_IRUSR
+    num = constants.S_IWUSR
+    num = constants.S_IXUSR
+    num = constants.S_IRWXG
+    num = constants.S_IRGRP
+    num = constants.S_IWGRP
+    num = constants.S_IXGRP
+    num = constants.S_IRWXO
+    num = constants.S_IROTH
+    num = constants.S_IWOTH
+    num = constants.S_IXOTH
+    num = constants.F_OK
+    num = constants.R_OK
+    num = constants.W_OK
+    num = constants.X_OK
+    num = constants.SSL_OP_ALL
+    num = constants.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
+    num = constants.SSL_OP_CIPHER_SERVER_PREFERENCE
+    num = constants.SSL_OP_CISCO_ANYCONNECT
+    num = constants.SSL_OP_COOKIE_EXCHANGE
+    num = constants.SSL_OP_CRYPTOPRO_TLSEXT_BUG
+    num = constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+    num = constants.SSL_OP_EPHEMERAL_RSA
+    num = constants.SSL_OP_LEGACY_SERVER_CONNECT
+    num = constants.SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
+    num = constants.SSL_OP_MICROSOFT_SESS_ID_BUG
+    num = constants.SSL_OP_MSIE_SSLV2_RSA_PADDING
+    num = constants.SSL_OP_NETSCAPE_CA_DN_BUG
+    num = constants.SSL_OP_NETSCAPE_CHALLENGE_BUG
+    num = constants.SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
+    num = constants.SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+    num = constants.SSL_OP_NO_COMPRESSION
+    num = constants.SSL_OP_NO_QUERY_MTU
+    num = constants.SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+    num = constants.SSL_OP_NO_SSLv2
+    num = constants.SSL_OP_NO_SSLv3
+    num = constants.SSL_OP_NO_TICKET
+    num = constants.SSL_OP_NO_TLSv1
+    num = constants.SSL_OP_NO_TLSv1_1
+    num = constants.SSL_OP_NO_TLSv1_2
+    num = constants.SSL_OP_PKCS1_CHECK_1
+    num = constants.SSL_OP_PKCS1_CHECK_2
+    num = constants.SSL_OP_SINGLE_DH_USE
+    num = constants.SSL_OP_SINGLE_ECDH_USE
+    num = constants.SSL_OP_SSLEAY_080_CLIENT_DH_BUG
+    num = constants.SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
+    num = constants.SSL_OP_TLS_BLOCK_PADDING_BUG
+    num = constants.SSL_OP_TLS_D5_BUG
+    num = constants.SSL_OP_TLS_ROLLBACK_BUG
+    num = constants.ENGINE_METHOD_RSA
+    num = constants.ENGINE_METHOD_DSA
+    num = constants.ENGINE_METHOD_DH
+    num = constants.ENGINE_METHOD_RAND
+    num = constants.ENGINE_METHOD_ECDH
+    num = constants.ENGINE_METHOD_ECDSA
+    num = constants.ENGINE_METHOD_CIPHERS
+    num = constants.ENGINE_METHOD_DIGESTS
+    num = constants.ENGINE_METHOD_STORE
+    num = constants.ENGINE_METHOD_PKEY_METHS
+    num = constants.ENGINE_METHOD_PKEY_ASN1_METHS
+    num = constants.ENGINE_METHOD_ALL
+    num = constants.ENGINE_METHOD_NONE
+    num = constants.DH_CHECK_P_NOT_SAFE_PRIME
+    num = constants.DH_CHECK_P_NOT_PRIME
+    num = constants.DH_UNABLE_TO_CHECK_GENERATOR
+    num = constants.DH_NOT_SUITABLE_GENERATOR
+    num = constants.NPN_ENABLED
+    num = constants.ALPN_ENABLED
+    num = constants.RSA_PKCS1_PADDING
+    num = constants.RSA_SSLV23_PADDING
+    num = constants.RSA_NO_PADDING
+    num = constants.RSA_PKCS1_OAEP_PADDING
+    num = constants.RSA_X931_PADDING
+    num = constants.RSA_PKCS1_PSS_PADDING
+    num = constants.POINT_CONVERSION_COMPRESSED
+    num = constants.POINT_CONVERSION_UNCOMPRESSED
+    num = constants.POINT_CONVERSION_HYBRID
+    str = constants.defaultCoreCipherList
+    str = constants.defaultCipherList
+}
+
+
+////////////////////////////////////////////////////
+/// v8 tests : https://nodejs.org/api/v8.html
+////////////////////////////////////////////////////
+
+namespace v8_tests {
+
+    const heapStats = v8.getHeapStatistics();
+    const heapSpaceStats = v8.getHeapSpaceStatistics();
+
+    const zapsGarbage: number = heapStats.does_zap_garbage;
+
+    v8.setFlagsFromString('--collect_maps');
+}
+
+///////////////////////////////////////////////////////////
+/// Debugger Tests                                      ///
+///////////////////////////////////////////////////////////
+
+import { Client } from  "_debugger";
+
+var client = new Client();
+
+client.connect(8888, 'localhost');
+client.listbreakpoints((err, body, packet) => {
+
+});
diff --git a/types/node/v7/tsconfig.json b/types/node/v7/tsconfig.json
new file mode 100644
index 0000000000..eb074775b7
--- /dev/null
+++ b/types/node/v7/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "files": [
+        "index.d.ts",
+        "node-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "node": [
+                "node/v7"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "isolatedModules": true
+    }
+}
diff --git a/types/node/v7/tslint.json b/types/node/v7/tslint.json
new file mode 100644
index 0000000000..7ca0a1dd7c
--- /dev/null
+++ b/types/node/v7/tslint.json
@@ -0,0 +1,33 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // All are TODOs
+    "adjacent-overload-signatures": false,
+    "align": false,
+    "array-type": false,
+    "ban-types": false,
+    "callable-types": false,
+    "comment-format": false,
+    "dt-header": false,
+    "import-spacing": false,
+    "interface-over-type-literal": false,
+    "jsdoc-format": false,
+    "max-line-length": false,
+    "no-consecutive-blank-lines": false,
+    "no-empty-interface": false,
+    "no-internal-module": false,
+    "no-namespace": false,
+    "no-padding": false,
+    "no-string-throw": false,
+    "no-var": false,
+    "object-literal-shorthand": false,
+    "one-line": false,
+    "only-arrow-functions": false,
+    "prefer-method-signature": false,
+    "semicolon": false,
+    "strict-export-declare-modifiers": false,
+    "typedef-whitespace": false,
+    "unified-signatures": false,
+    "whitespace": false
+  }
+}
diff --git a/types/nodegit/annotated-commit.d.ts b/types/nodegit/annotated-commit.d.ts
new file mode 100644
index 0000000000..0fb5465647
--- /dev/null
+++ b/types/nodegit/annotated-commit.d.ts
@@ -0,0 +1,38 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Reference } from './reference';
+
+export class AnnotatedCommit {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo - repository that contains the given commit
+     * @param {string} branchName - name of the (remote) branch
+     * @param {string} remoteUrl - 	url of the remote
+     * @param {Oid} id - the commit object id of the remote branch
+     * @returns {Promise<AnnotatedCommit>}
+     *
+     * @memberof AnnotatedCommit
+     */
+    static fromFetchhead(repo: Repository, branchName: string, remoteUrl: string, id: Oid): Promise<AnnotatedCommit>;
+    static fromRef(repo: Repository, ref: Reference): Promise<AnnotatedCommit>;
+    static fromRevspec(repo: Repository, revspec: string): Promise<AnnotatedCommit>;
+    static lookup(repo: Repository, id: Oid): Promise<AnnotatedCommit>;
+
+    /**
+     *
+     *
+     *
+     * @memberof AnnotatedCommit
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof AnnotatedCommit
+     */
+    id(): Oid;
+}
diff --git a/types/nodegit/attr.d.ts b/types/nodegit/attr.d.ts
new file mode 100644
index 0000000000..c7b2d3ea22
--- /dev/null
+++ b/types/nodegit/attr.d.ts
@@ -0,0 +1,73 @@
+import { Repository } from './repository';
+
+export namespace Attr {
+    const enum STATES {
+        UNSPECIFIED_T = 0,
+        TRUE_T = 1,
+        FALSE_T = 2,
+        VALUE_T = 3
+    }
+}
+
+export class Attr {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} values
+     * @returns {number}
+     *
+     * @memberof Attr
+     */
+    static addMacro(repo: Repository, name: string, values: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     *
+     * @memberof Attr
+     */
+    static cacheFlush(repo: Repository): void;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo - The repository containing the path.
+     * @param {number} flags - A combination of GIT_ATTR_CHECK... flags.
+     * @param {string} path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
+     * The file does not have to exist, but if it does not, then it will be treated as a plain file (not a directory).
+     * @param {string} name - The name of the attribute to look up.
+     * @returns {Promise<string>} - Output of the value of the attribute. Use the GIT_ATTR_...
+     *
+     * @memberof Attr
+     */
+    static get(repo: Repository, flags: number, path: string, name: string): Promise<string>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo - The repository containing the path.
+     * @param {number} flags - A combination of GIT_ATTR_CHECK... flags.
+     * @param {string} path - The path to check for attributes. Relative paths are interpreted relative to the repo root.
+     * The file does not have to exist, but if it does not, then it will be treated as a plain file (not a directory).
+     * @param {number} numAttr - The number of attributes being looked up
+     * @param {string} names - An array of num_attr strings containing attribute names.
+     * @returns {any[]}
+     *
+     * @memberof Attr
+     */
+    static getMany(repo: Repository, flags: number, path: string, numAttr: number, names: string): any[];
+    /**
+     *
+     *
+     * @static
+     * @param {string} attr - The attribute
+     * @returns {number}- the value type for the attribute
+     *
+     * @memberof Attr
+     */
+    static value(attr: string): number;
+}
diff --git a/types/nodegit/blame-hunk.d.ts b/types/nodegit/blame-hunk.d.ts
new file mode 100644
index 0000000000..83dd1cc410
--- /dev/null
+++ b/types/nodegit/blame-hunk.d.ts
@@ -0,0 +1,61 @@
+import { Oid } from './oid';
+import { Signature } from './signature';
+
+export class BlameHunk {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameHunk
+     */
+    linesInHunk: number;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof BlameHunk
+     */
+    finalCommitId: Oid;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameHunk
+     */
+    finalStartLineNumber: number;
+    /**
+     *
+     *
+     * @type {Signature}
+     * @memberof BlameHunk
+     */
+    finalSignature: Signature;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof BlameHunk
+     */
+    origCommitId: Oid;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof BlameHunk
+     */
+    origPath: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameHunk
+     */
+    origStartLineNumber: number;
+    /**
+     *
+     *
+     * @type {Signature}
+     * @memberof BlameHunk
+     */
+    origSignature: Signature;
+}
diff --git a/types/nodegit/blame-options.d.ts b/types/nodegit/blame-options.d.ts
new file mode 100644
index 0000000000..fdebbeff67
--- /dev/null
+++ b/types/nodegit/blame-options.d.ts
@@ -0,0 +1,53 @@
+import {Oid} from './oid';
+
+export class BlameOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameOptions
+     */
+    minMatchCharacters?: number;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof BlameOptions
+     */
+    newestCommit?: Oid;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof BlameOptions
+     */
+    oldestCommit?: Oid;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameOptions
+     */
+    minLine?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof BlameOptions
+     */
+    maxLine?: number;
+}
diff --git a/types/nodegit/blame.d.ts b/types/nodegit/blame.d.ts
new file mode 100644
index 0000000000..684db81b6c
--- /dev/null
+++ b/types/nodegit/blame.d.ts
@@ -0,0 +1,84 @@
+import { Repository } from './repository';
+import { BlameOptions } from './blame-options';
+import {BlameHunk} from './blame-hunk';
+
+export namespace Blame {
+    const enum FLAG {
+        NORMAL = 0,
+        TRACK_COPIES_SAME_FILE = 1,
+        TRACK_COPIES_SAME_COMMIT_MOVES = 2,
+        TRACK_COPIES_SAME_COMMIT_COPIES = 4,
+        TRACK_COPIES_ANY_COMMIT_COPIES = 8,
+        FIRST_PARENT = 16
+    }
+}
+
+export class Blame {
+    /**
+     * Retrieve the blame of a file
+     *
+     * @static
+     * @param {Repository} repo - Repository that contains the file
+     * @param {string} path - to the file to get the blame of
+     * @param {BlameOptions} [options] - Options for the blame
+     * @returns {Blame}
+     *
+     * @memberof Blame
+     */
+    static file(repo: Repository, path: string, options?: BlameOptions): Blame;
+    /**
+     *
+     *
+     * @static
+     * @param {BlameOptions} opts - The git_blame_options struct to initialize
+     * @param {number} version - Version of struct; pass GIT_BLAME_OPTIONS_VERSION
+     * @returns {number}
+     *
+     * @memberof Blame
+     */
+    static initOptions(opts: BlameOptions, version: number): number;
+
+    /**
+     *
+     *
+     * @param {string} buffer
+     * @param {number} bufferLen
+     * @returns {Promise<Blame>}
+     *
+     * @memberof Blame
+     */
+    buffer(buffer: string, bufferLen: number): Promise<Blame>;
+    /**
+     *
+     *
+     *
+     * @memberof Blame
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @param {number} index
+     * @returns {BlameHunk} - the hunk at the given index, or NULL on error
+     *
+     * @memberof Blame
+     */
+    getHunkByIndex(index: number): BlameHunk;
+    /**
+     *
+     *
+     * @param {number} lineNo
+     * @returns {BlameHunk} - 	the hunk that contains the given line, or NULL on error
+     *
+     * @memberof Blame
+     */
+    getHunkByLine(lineNo: number): BlameHunk;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Blame
+     */
+    getHunkCount(): number;
+}
diff --git a/types/nodegit/blob.d.ts b/types/nodegit/blob.d.ts
new file mode 100644
index 0000000000..edd0eb62f7
--- /dev/null
+++ b/types/nodegit/blob.d.ts
@@ -0,0 +1,157 @@
+import { WriteStream } from 'fs';
+
+import { Repository } from './repository';
+import { Oid } from './oid';
+
+export class Blob {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo - repository where to blob will be written
+     * @param {Buffer} buffer - data to be written into the blob
+     * @param {number} len - length of the data
+     * @returns {Oid} - return the id of the written blob
+     *
+     * @memberof Blob
+     */
+    static createFromBuffer(repo: Repository, buffer: Buffer, len: number): Oid;
+    /**
+     *
+     *
+     * @static
+     * @param {Oid} id - return the id of the written blob
+     * @param {Repository} repo - repository where the blob will be written. this repository can be bare or not
+     * @param {string} path - file from which the blob will be created
+     * @returns {number}
+     *
+     * @memberof Blob
+     */
+    static createFromDisk(id: Oid, repo: Repository, path: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} hintPath
+     * @returns {Promise<WriteStream>}
+     *
+     * @memberof Blob
+     */
+    static createFromStream(repo: Repository, hintPath: string): Promise<WriteStream>;
+    /**
+     *
+     *
+     * @static
+     * @param {Oid} id - return the id of the written blob
+     * @param {Repository} repo - repository where the blob will be written. this repository cannot be bare
+     * @param {string} relativePath - file from which the blob will be created, relative to the repository's working dir
+     * @returns {number} - 0 or an error code
+     *
+     * @memberof Blob
+     */
+    static createFromWorkdir(id: Oid, repo: Repository, relativePath: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Oid | Blob)} id
+     * @returns {Promise<Blob>}
+     *
+     * @memberof Blob
+     */
+    static lookup(repo: Repository, id: string | Oid | Blob): Promise<Blob>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} len
+     * @returns {Promise<Blob>}
+     *
+     * @memberof Blob
+     */
+    static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Blob>;
+
+    /**
+     *
+     *
+     *
+     * @memberof Blob
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Blob
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Blob
+     */
+    isBinary(): number;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Blob
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @returns {Buffer}
+     *
+     * @memberof Blob
+     */
+    rawcontent(): Buffer;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Blob
+     */
+    rawsize(): number;
+    /**
+     *
+     *
+     * @returns {Buffer}
+     *
+     * @memberof Blob
+     */
+    content(): Buffer;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Blob
+     */
+    toString(): string;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Blob
+     */
+    filemode(): number;
+    /**
+     *
+     *
+     * @returns {Promise<Blob>}
+     *
+     * @memberof Blob
+     */
+    dup(): Promise<Blob>;
+}
diff --git a/types/nodegit/branch.d.ts b/types/nodegit/branch.d.ts
new file mode 100644
index 0000000000..47bd1ec76f
--- /dev/null
+++ b/types/nodegit/branch.d.ts
@@ -0,0 +1,127 @@
+import { Repository } from './repository';
+import { Reference } from './reference';
+import { Commit } from './commit';
+import { AnnotatedCommit } from './annotated-commit';
+
+export namespace Branch {
+    const enum BRANCH {
+        LOCAL = 1,
+        REMOTE = 2,
+        ALL = 3
+    }
+}
+
+export class Branch {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} branchName
+     * @param {Commit} target
+     * @param {number} force
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Branch
+     */
+    static create(repo: Repository, branchName: string, target: Commit, force: number): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repository
+     * @param {string} branchName
+     * @param {AnnotatedCommit} commit
+     * @param {number} force
+     * @returns {Reference}
+     *
+     * @memberof Branch
+     */
+    static createFromAnnotated(repository: Repository, branchName: string, commit: AnnotatedCommit, force: number): Reference;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} branch
+     * @returns {number}
+     *
+     * @memberof Branch
+     */
+    static delete(branch: Reference): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} branch
+     * @returns {number}
+     *
+     * @memberof Branch
+     */
+    static isHead(branch: Reference): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {number} listFlags
+     * @returns {Promise<any>}
+     *
+     * @memberof Branch
+     */
+    static iteratorNew(repo: Repository, listFlags: number): Promise<any>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} branchName
+     * @param {Branch.BRANCH} branchType
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Branch
+     */
+    static lookup(repo: Repository, branchName: string, branchType: Branch.BRANCH): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} branch
+     * @param {string} newBranchName
+     * @param {number} force
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Branch
+     */
+    static move(branch: Reference, newBranchName: string, force: number): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} ref
+     * @returns {Promise<string>}
+     *
+     * @memberof Branch
+     */
+    static name(ref: Reference): Promise<string>;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} branch
+     * @param {string} upstreamName
+     * @returns {Promise<number>}
+     *
+     * @memberof Branch
+     */
+    static setUpstream(branch: Reference, upstreamName: string): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Reference} branch
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Branch
+     */
+    static upstream(branch: Reference): Promise<Reference>;
+}
diff --git a/types/nodegit/buf.d.ts b/types/nodegit/buf.d.ts
new file mode 100644
index 0000000000..380d76172b
--- /dev/null
+++ b/types/nodegit/buf.d.ts
@@ -0,0 +1,67 @@
+/// <reference types="node" />
+
+export class Buf {
+        /**
+         *
+         *
+         * @returns {number}
+         *
+         * @memberof Buf
+         */
+        containsNul(): number;
+        /**
+         *
+         *
+         *
+         * @memberof Buf
+         */
+        free(): void;
+        /**
+         *
+         *
+         * @param {number} targetSize
+         * @returns {Promise<Buf>}
+         *
+         * @memberof Buf
+         */
+        grow(targetSize: number): Promise<Buf>;
+        /**
+         *
+         *
+         * @returns {number}
+         *
+         * @memberof Buf
+         */
+        isBinary(): number;
+        /**
+         *
+         *
+         * @param {Buffer} data
+         * @param {number} datalen
+         * @returns {Promise<Buf>}
+         *
+         * @memberof Buf
+         */
+        set(data: Buffer, datalen: number): Promise<Buf>;
+        /**
+         *
+         *
+         * @type {string}
+         * @memberof Buf
+         */
+        ptr: string;
+        /**
+         *
+         *
+         * @type {number}
+         * @memberof Buf
+         */
+        asize: number;
+        /**
+         *
+         *
+         * @type {number}
+         * @memberof Buf
+         */
+        size: number;
+    }
diff --git a/types/nodegit/cert-host-key.d.ts b/types/nodegit/cert-host-key.d.ts
new file mode 100644
index 0000000000..f69210ca37
--- /dev/null
+++ b/types/nodegit/cert-host-key.d.ts
@@ -0,0 +1,26 @@
+import { Cert } from './cert';
+
+export class CertHostkey {
+    /**
+     *
+     *
+     * @type {Cert}
+     * @memberof CertHostkey
+     */
+    parent: Cert;
+    type: Cert.TYPE;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CertHostkey
+     */
+    hashMd5: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CertHostkey
+     */
+    hashSha1: string;
+}
diff --git a/types/nodegit/cert-x509.d.ts b/types/nodegit/cert-x509.d.ts
new file mode 100644
index 0000000000..dd395a755d
--- /dev/null
+++ b/types/nodegit/cert-x509.d.ts
@@ -0,0 +1,25 @@
+import { Cert } from './cert';
+
+export class CertX509 {
+    /**
+     *
+     *
+     * @type {Buffer}
+     * @memberof CertX509
+     */
+    data: Buffer;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CertX509
+     */
+    len: number;
+    /**
+     *
+     *
+     * @type {Cert}
+     * @memberof CertX509
+     */
+    parent: Cert;
+}
diff --git a/types/nodegit/cert.d.ts b/types/nodegit/cert.d.ts
new file mode 100644
index 0000000000..c368f83bb6
--- /dev/null
+++ b/types/nodegit/cert.d.ts
@@ -0,0 +1,23 @@
+export namespace Cert {
+    const enum TYPE {
+        NONE = 0,
+        X509 = 1,
+        HOSTKEY_LIBSSH2 = 2,
+        STRARRAY = 3
+    }
+
+    const enum SSH {
+        MD5 = 1,
+        SHA1 = 2
+    }
+}
+
+export class Cert {
+    /**
+     *
+     *
+     * @type {Cert.TYPE}
+     * @memberof Cert
+     */
+    certType: Cert.TYPE;
+}
diff --git a/types/nodegit/checkout-options.d.ts b/types/nodegit/checkout-options.d.ts
new file mode 100644
index 0000000000..253755d7fb
--- /dev/null
+++ b/types/nodegit/checkout-options.d.ts
@@ -0,0 +1,146 @@
+import { Strarray } from './str-array';
+import { Tree } from './tree';
+import { Index } from './index';
+
+export class CheckoutOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    checkoutStrategy?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    disableFilters?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    dirMode?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    fileMode?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    fileOpenFlags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CheckoutOptions
+     */
+    notifyFlags?: number;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof CheckoutOptions
+     */
+    notifyCb?: any;
+    /**
+     *
+     *
+     * @type {undefined}
+     * @memberof CheckoutOptions
+     */
+    notifyPayload?: undefined;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof CheckoutOptions
+     */
+    progressCb?: any;
+    /**
+     *
+     *
+     * @type {undefined}
+     * @memberof CheckoutOptions
+     */
+    progressPayload?: undefined;
+    /**
+     *
+     *
+     * @type {Strarray}
+     * @memberof CheckoutOptions
+     */
+    paths?: Strarray;
+    /**
+     *
+     *
+     * @type {Tree}
+     * @memberof CheckoutOptions
+     */
+    baseline?: Tree;
+    /**
+     *
+     *
+     * @type {Index}
+     * @memberof CheckoutOptions
+     */
+    baselineIndex?: Index;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CheckoutOptions
+     */
+    targetDirectory?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CheckoutOptions
+     */
+    ancestorLabel?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CheckoutOptions
+     */
+    ourLabel?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CheckoutOptions
+     */
+    theirLabel?: string;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof CheckoutOptions
+     */
+    perfdataCb?: any;
+    /**
+     *
+     *
+     * @type {undefined}
+     * @memberof CheckoutOptions
+     */
+    perfdataPayload?: undefined;
+}
diff --git a/types/nodegit/checkout.d.ts b/types/nodegit/checkout.d.ts
new file mode 100644
index 0000000000..a6ce5ff991
--- /dev/null
+++ b/types/nodegit/checkout.d.ts
@@ -0,0 +1,93 @@
+import { Repository } from './repository';
+import { CheckoutOptions } from './checkout-options';
+import { Reference } from './reference';
+import { Oid } from './oid';
+import { Tree } from './tree';
+import { Commit } from './commit';
+import { Index } from './index';
+
+export namespace Checkout {
+    const enum NOTIFY {
+        NONE = 0,
+        CONFLICT = 1,
+        DIRTY = 2,
+        UPDATED = 4,
+        UNTRACKED = 8,
+        IGNORED = 16,
+        ALL = 65535
+    }
+
+    const enum STRATEGY {
+        NONE = 0,
+        SAFE = 1,
+        FORCE = 2,
+        RECREATE_MISSING = 4,
+        ALLOW_CONFLICTS = 16,
+        REMOVE_UNTRACKED = 32,
+        REMOVE_IGNORED = 64,
+        UPDATE_ONLY = 128,
+        DONT_UPDATE_INDEX = 256,
+        NO_REFRESH = 512,
+        SKIP_UNMERGED = 1024,
+        USE_OURS = 2048,
+        USE_THEIRS = 4096,
+        DISABLE_PATHSPEC_MATCH = 8192,
+        SKIP_LOCKED_DIRECTORIES = 262144,
+        DONT_OVERWRITE_IGNORED = 524288,
+        CONFLICT_STYLE_MERGE = 1048576,
+        CONFLICT_STYLE_DIFF3 = 2097152,
+        DONT_REMOVE_EXISTING = 4194304,
+        DONT_WRITE_INDEX = 8388608,
+        UPDATE_SUBMODULES = 65536,
+        UPDATE_SUBMODULES_IF_CHANGED = 131072
+    }
+}
+
+export class Checkout {
+    /**
+     * Patch head checkout to automatically coerce objects.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {CheckoutOptions} [options]
+     * @returns {Promise<void>}
+     *
+     * @memberof Checkout
+     */
+    static head(repo: Repository, options?: CheckoutOptions): Promise<void>;
+    /**
+     * Patch index checkout to automatically coerce objects.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Index} The
+     * @param {CheckoutOptions} [options]
+     * @returns {Promise<void>}
+     *
+     * @memberof Checkout
+     */
+    static index(repo: Repository, The: Index, options?: CheckoutOptions): Promise<void>;
+    /**
+     *
+     *
+     * @static
+     * @param {CheckoutOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Checkout
+     */
+    static initOptions(opts: CheckoutOptions, version: number): number;
+    /**
+     * Patch tree checkout to automatically coerce objects.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(Oid | Tree | Commit | Reference)} treeish
+     * @param {CheckoutOptions} [options]
+     * @returns {Promise<void>}
+     *
+     * @memberof Checkout
+     */
+    static tree(repo: Repository, treeish: Oid | Tree | Commit | Reference, options?: CheckoutOptions): Promise<void>;
+}
diff --git a/types/nodegit/cherry-pick-options.d.ts b/types/nodegit/cherry-pick-options.d.ts
new file mode 100644
index 0000000000..5e91da0c55
--- /dev/null
+++ b/types/nodegit/cherry-pick-options.d.ts
@@ -0,0 +1,33 @@
+import { MergeOptions } from './merge-options';
+import { CheckoutOptions } from './checkout-options';
+
+export interface CherrypickOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CherrypickOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CherrypickOptions
+     */
+    mainline?: number;
+    /**
+     *
+     *
+     * @type {MergeOptions}
+     * @memberof CherrypickOptions
+     */
+    mergeOpts?: MergeOptions;
+    /**
+     *
+     *
+     * @type {CheckoutOptions}
+     * @memberof CherrypickOptions
+     */
+    checkoutOpts?: CheckoutOptions;
+}
diff --git a/types/nodegit/cherry-pick.d.ts b/types/nodegit/cherry-pick.d.ts
new file mode 100644
index 0000000000..b895845301
--- /dev/null
+++ b/types/nodegit/cherry-pick.d.ts
@@ -0,0 +1,44 @@
+import { Repository } from './repository';
+import { Commit } from './commit';
+import { MergeOptions } from './merge-options';
+import { CherrypickOptions } from './cherry-pick-options';
+
+export class Cherrypick {
+    /**
+     * Cherrypick a commit and, changing the index and working directory
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Commit} commit
+     * @param {CherrypickOptions} [options]
+     * @returns {Promise<number>}
+     *
+     * @memberof Cherrypick
+     */
+    static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise<number>;
+    /**
+     * Cherrypicks the given commit against "our" commit, producing an index that reflects the result of the cherrypick. The index is not backed by a repo.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Commit} cherrypickCommit
+     * @param {Commit} ourCommit
+     * @param {number} mainline
+     * @param {MergeOptions} [mergeOptions]
+     * @returns {Promise<number>}
+     *
+     * @memberof Cherrypick
+     */
+    static commit(repo: Repository, cherrypickCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {CherrypickOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Cherrypick
+     */
+    static initOptions(opts: CherrypickOptions, version: number): number;
+}
diff --git a/types/nodegit/clone-options.d.ts b/types/nodegit/clone-options.d.ts
new file mode 100644
index 0000000000..424a289cbe
--- /dev/null
+++ b/types/nodegit/clone-options.d.ts
@@ -0,0 +1,61 @@
+import { CheckoutOptions } from './checkout-options';
+import { FetchOptions } from './fetch-options';
+
+export class CloneOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CloneOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {CheckoutOptions}
+     * @memberof CloneOptions
+     */
+    checkoutOpts?: CheckoutOptions;
+    /**
+     *
+     *
+     * @type {FetchOptions}
+     * @memberof CloneOptions
+     */
+    fetchOpts?: FetchOptions;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CloneOptions
+     */
+    bare?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CloneOptions
+     */
+    local?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CloneOptions
+     */
+    checkoutBranch?: string;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof CloneOptions
+     */
+    repositoryCbPayload?: any;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof CloneOptions
+     */
+    remoteCbPayload?: any;
+}
diff --git a/types/nodegit/clone.d.ts b/types/nodegit/clone.d.ts
new file mode 100644
index 0000000000..7fe3b00a37
--- /dev/null
+++ b/types/nodegit/clone.d.ts
@@ -0,0 +1,37 @@
+import { Repository } from './repository';
+import { CloneOptions } from './clone-options';
+
+export namespace Clone {
+    const enum LOCAL {
+        AUTO = 0,
+        LOCAL = 1,
+        NO_LOCAL = 2,
+        NO_LINKS = 3
+    }
+}
+
+export class Clone {
+    /**
+     * Patch repository cloning to automatically coerce objects.
+     *
+     * @static
+     * @param {string} url
+     * @param {string} localPath
+     * @param {CloneOptions} [options]
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Clone
+     */
+    static clone(url: string, localPath: string, options?: CloneOptions): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {CloneOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Clone
+     */
+    static initOptions(opts: CloneOptions, version: number): number;
+}
diff --git a/types/nodegit/commit.d.ts b/types/nodegit/commit.d.ts
new file mode 100644
index 0000000000..59928817a6
--- /dev/null
+++ b/types/nodegit/commit.d.ts
@@ -0,0 +1,369 @@
+import { EventEmitter } from 'events';
+
+import { Repository } from './repository';
+import { Signature } from './signature';
+import { Oid } from './oid';
+import { Buf } from './buf';
+import { Object } from './object';
+import { Tree } from './tree';
+import { TreeEntry } from './tree-entry';
+import { Diff } from './diff';
+
+export class Commit {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} updateRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} messageEncoding
+     * @param {string} message
+     * @param {Tree} tree
+     * @param {number} parentCount
+     * @param {any[]} parents
+     * @returns {Oid}
+     *
+     * @memberof Commit
+     */
+    static create(repo: Repository, updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree, parentCount: number, parents: any[]): Oid;
+    /**
+     *
+     *
+     * @static
+     * @param {Oid} id
+     * @param {Repository} repo
+     * @param {string} updateRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} messageEncoding
+     * @param {string} message
+     * @param {Tree} tree
+     * @param {number} parentCount
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    static createV(id: Oid, repo: Repository, updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree, parentCount: number): number;
+    /**
+     * Retrieves the commit pointed to by the oid
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Oid | Commit)} id
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Commit
+     */
+    static lookup(repo: Repository, id: string | Oid | Commit): Promise<Commit>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} len
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Commit
+     */
+    static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Commit>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} commitContent
+     * @param {string} signature
+     * @param {string} signatureField
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Commit
+     */
+    static createWithSignature(repo: Repository, commitContent: string, signature: string, signatureField: string): Promise<Oid>;
+
+    /**
+     *
+     *
+     * @param {string} updateRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} messageEncoding
+     * @param {string} message
+     * @param {Tree} tree
+     * @returns {Oid}
+     *
+     * @memberof Commit
+     */
+    amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree): Oid;
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof Commit
+     */
+    author(): Signature;
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof Commit
+     */
+    committer(): Signature;
+    /**
+     *
+     *
+     *
+     * @memberof Commit
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @param {string} field
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Commit
+     */
+    headerField(field: string): Promise<Buf>;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Commit
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    message(): string;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    messageEncoding(): string;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    messageRaw(): string;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Commit
+     */
+    nthGenAncestor(n: number): Promise<Commit>;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Commit
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Commit
+     */
+    parent(n: number): Promise<Commit>;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {Oid}
+     *
+     * @memberof Commit
+     */
+    parentId(n: number): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    parentcount(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    rawHeader(): string;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    summary(): string;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    time(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    timeOffset(): number;
+    /**
+     *
+     *
+     * @param {Tree} treeOut
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    tree(treeOut: Tree): number;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Commit
+     */
+    treeId(): Oid;
+    /**
+     * Retrieve the SHA.
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    sha(): string;
+    /**
+     * Retrieve the commit time as a unix timestamp.
+     *
+     * @returns {number}
+     *
+     * @memberof Commit
+     */
+    timeMs(): number;
+    /**
+     * Retrieve the commit time as a Date object.
+     *
+     * @returns {Date}
+     *
+     * @memberof Commit
+     */
+    date(): Date;
+    /**
+     * Get the tree associated with this commit.
+     *
+     * @returns {Promise<Tree>}
+     *
+     * @memberof Commit
+     */
+    getTree(): Promise<Tree>;
+    /**
+     * Retrieve the entry represented by path for this commit. Path must be relative to repository root.
+     *
+     * @param {string} path
+     * @returns {Promise<TreeEntry>}
+     *
+     * @memberof Commit
+     */
+    getEntry(path: string): Promise<TreeEntry>;
+    /**
+     * Walk the history from this commit backwards.
+     * An EventEmitter is returned that will emit a "commit" event for each commit in the history, and one "end"
+     * event when the walk is completed. Don't forget to call start() on the returned event.
+     *
+     * @returns {EventEmitter}
+     *
+     * @memberof Commit
+     */
+    history(): EventEmitter;
+    /**
+     * Retrieve the commit's parents as commit objects.
+     *
+     * @param {number} limit
+     * @param {Function} callback
+     * @returns {Promise<Commit[]>}
+     *
+     * @memberof Commit
+     */
+    getParents(limit: number, callback: Function): Promise<Commit[]>;
+    /**
+     * Retrieve the commit's parent shas.
+     *
+     * @param {Function} callback
+     * @returns {Oid[]}
+     *
+     * @memberof Commit
+     */
+    parents(callback: Function): Oid[];
+    /**
+     * Generate an array of diff trees showing changes between this commit and its parent(s).
+     *
+     * @param {Function} callback
+     * @returns {Promise<Diff[]>}
+     *
+     * @memberof Commit
+     */
+    getDiff(callback: Function): Promise<Diff[]>;
+    /**
+     * Generate an array of diff trees showing changes between this commit and its parent(s).
+     *
+     * @param {Object} options
+     * @param {Function} callback
+     * @returns {Promise<Diff[]>}
+     *
+     * @memberof Commit
+     */
+    getDiffWithOptions(options: Object, callback: Function): Promise<Diff[]>;
+    /**
+     * The sha of this commit
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    toString(): string;
+    /**
+     *
+     *
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Commit
+     */
+    dup(): Promise<Commit>;
+    /**
+     * consists of a summary
+     *
+     * @returns {string}
+     *
+     * @memberof Commit
+     */
+    body(): string;
+}
diff --git a/types/nodegit/config.d.ts b/types/nodegit/config.d.ts
new file mode 100644
index 0000000000..eea13c6c70
--- /dev/null
+++ b/types/nodegit/config.d.ts
@@ -0,0 +1,91 @@
+import { Buf } from './buf';
+
+export namespace Config {
+    const enum LEVEL {
+        SYSTEM = 1,
+        XDG = 2,
+        GLOBAL = 3,
+        LOCAL = 4,
+        APP = 5,
+        HIGHEST_LEVEL = -1
+    }
+}
+
+export class Config {
+    /**
+     *
+     *
+     * @static
+     * @returns {Promise<Config>}
+     *
+     * @memberof Config
+     */
+    static openDefault(): Promise<Config>;
+    /**
+     *
+     *
+     * @static
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Config
+     */
+    static findProgramdata(): Promise<Buf>;
+
+    /**
+     *
+     *
+     * @param {string} name
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Config
+     */
+    getStringBuf(name: string): Promise<Buf>;
+    /**
+     *
+     *
+     * @param {string} name
+     * @param {number} value
+     * @returns {number}
+     *
+     * @memberof Config
+     */
+    setInt64(name: string, value: number): number;
+    /**
+     *
+     *
+     * @param {string} name
+     * @param {string} regexp
+     * @param {string} value
+     * @returns {number}
+     *
+     * @memberof Config
+     */
+    setMultivar(name: string, regexp: string, value: string): number;
+    /**
+     *
+     *
+     * @param {string} name
+     * @param {string} value
+     * @returns {Promise<number>}
+     *
+     * @memberof Config
+     */
+    setString(name: string, value: string): Promise<number>;
+    /**
+     *
+     *
+     * @returns {Promise<Config>}
+     *
+     * @memberof Config
+     */
+    snapshot(): Promise<Config>;
+    /**
+     *
+     *
+     * @param {*} transaction
+     * @returns {number}
+     *
+     * @memberof Config
+     */
+    lock(transaction: any): number;
+}
diff --git a/types/nodegit/convenient-patch.d.ts b/types/nodegit/convenient-patch.d.ts
new file mode 100644
index 0000000000..5d3a9fd03f
--- /dev/null
+++ b/types/nodegit/convenient-patch.d.ts
@@ -0,0 +1,140 @@
+import { DiffFile } from './diff-file';
+
+export class ConvenientPatch {
+    /**
+     * Old attributes of the file
+     *
+     * @returns {DiffFile}
+     *
+     * @memberof ConvenientPatch
+     */
+    oldFile(): DiffFile;
+    /**
+     * New attributes of the file
+     *
+     * @returns {DiffFile}
+     *
+     * @memberof ConvenientPatch
+     */
+    newFile(): DiffFile;
+    /**
+     * The number of hunks in this patch
+     *
+     * @returns {number}
+     *
+     * @memberof ConvenientPatch
+     */
+    size(): number;
+    /**
+     * The hunks in this patch
+     *
+     * @returns {Promise<any[]>}
+     *
+     * @memberof ConvenientPatch
+     */
+    hunks(): Promise<any[]>;
+    /**
+     * The status of this patch (unmodified, added, deleted)
+     *
+     * @returns {number}
+     *
+     * @memberof ConvenientPatch
+     */
+    status(): number;
+    /**
+     * The line statistics of this patch (#contexts, #added, #deleted)
+     *
+     * @returns {*}
+     *
+     * @memberof ConvenientPatch
+     */
+    lineStats(): any;
+    /**
+     * Is this an unmodified patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isUnmodified(): boolean;
+    /**
+     * Is this an added patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isAdded(): boolean;
+    /**
+     * Is this a deleted patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isDeleted(): boolean;
+    /**
+     * Is this an modified patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isModified(): boolean;
+    /**
+     * Is this a renamed patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isRenamed(): boolean;
+    /**
+     * Is this a copied patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isCopied(): boolean;
+    /**
+     * Is this an ignored patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isIgnored(): boolean;
+    /**
+     * Is this an untracked patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isUntracked(): boolean;
+    /**
+     * Is this a type change?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isTypeChange(): boolean;
+    /**
+     * Is this an undreadable patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isUnreadable(): boolean;
+    /**
+     * Is this a conflicted patch?
+     *
+     * @returns {boolean}
+     *
+     * @memberof ConvenientPatch
+     */
+    isConflicted(): boolean;
+}
diff --git a/types/nodegit/cred-user-pass-payload.d.ts b/types/nodegit/cred-user-pass-payload.d.ts
new file mode 100644
index 0000000000..fdf65b9342
--- /dev/null
+++ b/types/nodegit/cred-user-pass-payload.d.ts
@@ -0,0 +1,16 @@
+export class CredUserpassPayload {
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CredUserpassPayload
+     */
+    username: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CredUserpassPayload
+     */
+    password: string;
+}
diff --git a/types/nodegit/cred-username.d.ts b/types/nodegit/cred-username.d.ts
new file mode 100644
index 0000000000..2522b3968a
--- /dev/null
+++ b/types/nodegit/cred-username.d.ts
@@ -0,0 +1,18 @@
+import { Cred } from './cred';
+
+export class CredUsername {
+    /**
+     *
+     *
+     * @type {Cred}
+     * @memberof CredUsername
+     */
+    parent: Cred;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CredUsername
+     */
+    username: string;
+}
diff --git a/types/nodegit/cred.d.ts b/types/nodegit/cred.d.ts
new file mode 100644
index 0000000000..d7b96c9fd8
--- /dev/null
+++ b/types/nodegit/cred.d.ts
@@ -0,0 +1,96 @@
+export namespace Cred {
+    const enum TYPE {
+        USERPASS_PLAINTEXT = 1,
+        SSH_KEY = 2,
+        SSH_CUSTOM = 4,
+        DEFAULT = 8,
+        SSH_INTERACTIVE = 16,
+        USERNAME = 32,
+        SSH_MEMORY = 64
+    }
+}
+
+export class Cred {
+    /**
+     *
+     *
+     * @static
+     * @returns {Cred}
+     *
+     * @memberof Cred
+     */
+    static defaultNew(): Cred;
+    /**
+     *
+     *
+     * @static
+     * @param {string} username
+     * @returns {Cred}
+     *
+     * @memberof Cred
+     */
+    static sshKeyFromAgent(username: string): Cred;
+    /**
+     *
+     *
+     * @static
+     * @param {string} username
+     * @param {string} publicKey
+     * @param {string} privateKey
+     * @param {string} passphrase
+     * @returns {Promise<Cred>}
+     *
+     * @memberof Cred
+     */
+    static sshKeyMemoryNew(username: string, publicKey: string, privateKey: string, passphrase: string): Promise<Cred>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} username
+     * @param {string} publicKey
+     * @param {string} privateKey
+     * @param {string} passphrase
+     * @returns {Cred}
+     *
+     * @memberof Cred
+     */
+    static sshKeyNew(username: string, publicKey: string, privateKey: string, passphrase: string): Cred;
+    /**
+     *
+     *
+     * @static
+     * @param {string} username
+     * @returns {Promise<Cred>}
+     *
+     * @memberof Cred
+     */
+    static usernameNew(username: string): Promise<Cred>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} username
+     * @param {string} password
+     * @returns {Cred}
+     *
+     * @memberof Cred
+     */
+    static userpassPlaintextNew(username: string, password: string): Cred;
+
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Cred
+     */
+    hasUsername(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Cred
+     */
+    free(): void;
+}
diff --git a/types/nodegit/cvar-map.d.ts b/types/nodegit/cvar-map.d.ts
new file mode 100644
index 0000000000..2a5665dc6b
--- /dev/null
+++ b/types/nodegit/cvar-map.d.ts
@@ -0,0 +1,23 @@
+export class CvarMap {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CvarMap
+     */
+    cvarType: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof CvarMap
+     */
+    strMatch: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof CvarMap
+     */
+    mapValue: number;
+}
diff --git a/types/nodegit/describe-format-options.d.ts b/types/nodegit/describe-format-options.d.ts
new file mode 100644
index 0000000000..3f1989f0dd
--- /dev/null
+++ b/types/nodegit/describe-format-options.d.ts
@@ -0,0 +1,30 @@
+export class DescribeFormatOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeFormatOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeFormatOptions
+     */
+    abbreviatedSize?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeFormatOptions
+     */
+    alwaysUseLongFormat?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DescribeFormatOptions
+     */
+    dirtySuffix?: string;
+}
diff --git a/types/nodegit/describe-options.d.ts b/types/nodegit/describe-options.d.ts
new file mode 100644
index 0000000000..1a7518cd76
--- /dev/null
+++ b/types/nodegit/describe-options.d.ts
@@ -0,0 +1,44 @@
+export class DescribeOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeOptions
+     */
+    maxCandidatesTags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeOptions
+     */
+    describeStrategy?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DescribeOptions
+     */
+    pattern?: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeOptions
+     */
+    onlyFollowFirstParent?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DescribeOptions
+     */
+    showCommitOidAsFallback?: number;
+}
diff --git a/types/nodegit/diff-binary-file.d.ts b/types/nodegit/diff-binary-file.d.ts
new file mode 100644
index 0000000000..9774b99b87
--- /dev/null
+++ b/types/nodegit/diff-binary-file.d.ts
@@ -0,0 +1,30 @@
+export class DiffBinaryFile {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffBinaryFile
+     */
+    type: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DiffBinaryFile
+     */
+    data: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffBinaryFile
+     */
+    datalen: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffBinaryFile
+     */
+    inflatedlen: number;
+}
diff --git a/types/nodegit/diff-binary.d.ts b/types/nodegit/diff-binary.d.ts
new file mode 100644
index 0000000000..f447510165
--- /dev/null
+++ b/types/nodegit/diff-binary.d.ts
@@ -0,0 +1,33 @@
+import { DiffBinaryFile } from './diff-binary-file';
+
+export namespace DiffBinary {
+    const enum DIFF_BINARY {
+        NONE = 0,
+        LITERAL = 1,
+        DELTA = 2
+    }
+}
+
+export class DiffBinary {
+    /**
+     *
+     *
+     * @type {DiffBinaryFile}
+     * @memberof DiffBinary
+     */
+    oldFile: DiffBinaryFile;
+    /**
+     *
+     *
+     * @type {DiffBinaryFile}
+     * @memberof DiffBinary
+     */
+    newFile: DiffBinaryFile;
+    /**
+     *
+     *
+     * @type {DiffBinary.DIFF_BINARY}
+     * @memberof DiffBinary
+     */
+    containsData: DiffBinary.DIFF_BINARY;
+}
diff --git a/types/nodegit/diff-delta.d.ts b/types/nodegit/diff-delta.d.ts
new file mode 100644
index 0000000000..b09226c064
--- /dev/null
+++ b/types/nodegit/diff-delta.d.ts
@@ -0,0 +1,46 @@
+import { DiffFile } from './diff-file';
+
+export class DiffDelta {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffDelta
+     */
+    status: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffDelta
+     */
+    flags: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffDelta
+     */
+    similarity: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffDelta
+     */
+    nfiles: number;
+    /**
+     *
+     *
+     * @type {DiffFile}
+     * @memberof DiffDelta
+     */
+    oldFile: DiffFile;
+    /**
+     *
+     *
+     * @type {DiffFile}
+     * @memberof DiffDelta
+     */
+    newFile: DiffFile;
+}
diff --git a/types/nodegit/diff-file.d.ts b/types/nodegit/diff-file.d.ts
new file mode 100644
index 0000000000..7602f0dba9
--- /dev/null
+++ b/types/nodegit/diff-file.d.ts
@@ -0,0 +1,44 @@
+import { Oid } from './oid';
+
+export class DiffFile {
+    /**
+     * Returns the file's flags
+     *
+     * @returns {number}
+     *
+     * @memberof DiffFile
+     */
+    flags(): number;
+    /**
+     * Returns the file's Oid
+     *
+     * @returns {Oid}
+     *
+     * @memberof DiffFile
+     */
+    id(): Oid;
+    /**
+     * Returns the file's mode
+     *
+     * @returns {number}
+     *
+     * @memberof DiffFile
+     */
+    mode(): number;
+    /**
+     * Returns the file's path
+     *
+     * @returns {string}
+     *
+     * @memberof DiffFile
+     */
+    path(): string;
+    /**
+     * Returns the file's size
+     *
+     * @returns {number}
+     *
+     * @memberof DiffFile
+     */
+    size(): number;
+}
diff --git a/types/nodegit/diff-hunk.d.ts b/types/nodegit/diff-hunk.d.ts
new file mode 100644
index 0000000000..1a522ae8c6
--- /dev/null
+++ b/types/nodegit/diff-hunk.d.ts
@@ -0,0 +1,44 @@
+export class DiffHunk {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffHunk
+     */
+    oldStart: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffHunk
+     */
+    oldLines: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffHunk
+     */
+    newStart: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffHunk
+     */
+    newLines: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffHunk
+     */
+    headerLen: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DiffHunk
+     */
+    header: string;
+}
diff --git a/types/nodegit/diff-line.d.ts b/types/nodegit/diff-line.d.ts
new file mode 100644
index 0000000000..612041a92d
--- /dev/null
+++ b/types/nodegit/diff-line.d.ts
@@ -0,0 +1,60 @@
+export class DiffLine {
+    /**
+     * The relevant line
+     *
+     * @returns {string}
+     *
+     * @memberof DiffLine
+     */
+    content(): string;
+    /**
+     * The non utf8 translated text
+     *
+     * @returns {string}
+     *
+     * @memberof DiffLine
+     */
+    rawContent(): string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    origin: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    oldLineno: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    newLineno: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    numLines: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    contentLen: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffLine
+     */
+    contentOffset: number;
+}
diff --git a/types/nodegit/diff-options.d.ts b/types/nodegit/diff-options.d.ts
new file mode 100644
index 0000000000..c4f28f984f
--- /dev/null
+++ b/types/nodegit/diff-options.d.ts
@@ -0,0 +1,95 @@
+import { Strarray } from './str-array';
+
+export interface DiffOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    ignoreSubmodules?: number;
+    /**
+     *
+     *
+     * @type {Strarray}
+     * @memberof DiffOptions
+     */
+    pathspec?: Strarray;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof DiffOptions
+     */
+    notifyCb?: Function;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    contextLines?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    interhunkLines?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    idAbbrev?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffOptions
+     */
+    maxSize?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DiffOptions
+     */
+    oldPrefix?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof DiffOptions
+     */
+    newPrefix?: string;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof DiffOptions
+     */
+    payload?: any;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof DiffOptions
+     */
+    progressCb?: any;
+}
diff --git a/types/nodegit/diff-perf-data.d.ts b/types/nodegit/diff-perf-data.d.ts
new file mode 100644
index 0000000000..30bae1d2c9
--- /dev/null
+++ b/types/nodegit/diff-perf-data.d.ts
@@ -0,0 +1,23 @@
+export class DiffPerfdata {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffPerfdata
+     */
+    version: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffPerfdata
+     */
+    statCalls: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffPerfdata
+     */
+    oidCalculations: number;
+}
diff --git a/types/nodegit/diff.d.ts b/types/nodegit/diff.d.ts
new file mode 100644
index 0000000000..5c2b29a33b
--- /dev/null
+++ b/types/nodegit/diff.d.ts
@@ -0,0 +1,337 @@
+import { Blob } from './blob';
+import { Repository } from './repository';
+import { Tree } from './tree';
+import { Strarray } from './str-array';
+import { Index } from './index_';
+import { DiffDelta } from './diff-delta';
+import { DiffPerfdata } from './diff-perf-data';
+import { DiffOptions } from './diff-options';
+import { Buf } from './buf';
+
+export interface DiffFindOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    renameThreshold?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    renameFromRewriteThreshold?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    copyThreshold?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    breakRewriteThreshold?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof DiffFindOptions
+     */
+    renameLimit?: number;
+}
+
+export namespace Diff {
+    const enum DELTA {
+        UNMODIFIED = 0,
+        ADDED = 1,
+        DELETED = 2,
+        MODIFIED = 3,
+        RENAMED = 4,
+        COPIED = 5,
+        IGNORED = 6,
+        UNTRACKED = 7,
+        TYPECHANGE = 8,
+        UNREADABLE = 9,
+        CONFLICTED = 10
+    }
+
+    const enum FIND {
+        BY_CONFIG = 0,
+        RENAMES = 1,
+        RENAMES_FROM_REWRITES = 2,
+        COPIES = 4,
+        COPIES_FROM_UNMODIFIED = 8,
+        REWRITES = 16,
+        BREAK_REWRITES = 32,
+        AND_BREAK_REWRITES = 48,
+        FOR_UNTRACKED = 64,
+        ALL = 255,
+        IGNORE_LEADING_WHITESPACE = 0,
+        IGNORE_WHITESPACE = 4096,
+        DONT_IGNORE_WHITESPACE = 8192,
+        EXACT_MATCH_ONLY = 16384,
+        BREAK_REWRITES_FOR_RENAMES_ONLY = 32768,
+        REMOVE_UNMODIFIED = 65536
+    }
+
+    const enum FLAG {
+        BINARY = 1,
+        NOT_BINARY = 2,
+        VALID_ID = 4,
+        EXISTS = 8
+    }
+
+    const enum FORMAT {
+        PATCH = 1,
+        PATCH_HEADER = 2,
+        RAW = 3,
+        NAME_ONLY = 4,
+        NAME_STATUS = 5
+    }
+
+    const enum FORMAT_EMAIL_FLAGS {
+        FORMAT_EMAIL_NONE = 0,
+        FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER = 1
+    }
+
+    const enum LINE {
+        CONTEXT = 32,
+        ADDITION = 43,
+        DELETION = 45,
+        CONTEXT_EOFNL = 61,
+        ADD_EOFNL = 62,
+        DEL_EOFNL = 60,
+        FILE_HDR = 70,
+        HUNK_HDR = 72,
+        BINARY = 66
+    }
+
+    const enum OPTION {
+        NORMAL = 0,
+        REVERSE = 1,
+        INCLUDE_IGNORED = 2,
+        RECURSE_IGNORED_DIRS = 4,
+        INCLUDE_UNTRACKED = 8,
+        RECURSE_UNTRACKED_DIRS = 16,
+        INCLUDE_UNMODIFIED = 32,
+        INCLUDE_TYPECHANGE = 64,
+        INCLUDE_TYPECHANGE_TREES = 128,
+        IGNORE_FILEMODE = 256,
+        IGNORE_SUBMODULES = 512,
+        IGNORE_CASE = 1024,
+        INCLUDE_CASECHANGE = 2048,
+        DISABLE_PATHSPEC_MATCH = 4096,
+        SKIP_BINARY_CHECK = 8192,
+        ENABLE_FAST_UNTRACKED_DIRS = 16384,
+        UPDATE_INDEX = 32768,
+        INCLUDE_UNREADABLE = 65536,
+        INCLUDE_UNREADABLE_AS_UNTRACKED = 131072,
+        FORCE_TEXT = 1048576,
+        FORCE_BINARY = 2097152,
+        IGNORE_WHITESPACE = 4194304,
+        IGNORE_WHITESPACE_CHANGE = 8388608,
+        IGNORE_WHITESPACE_EOL = 16777216,
+        SHOW_UNTRACKED_CONTENT = 33554432,
+        SHOW_UNMODIFIED = 67108864,
+        PATIENCE = 268435456,
+        MINIMAL = 536870912,
+        SHOW_BINARY = 1073741824
+    }
+
+    const enum STATS_FORMAT {
+        STATS_NONE = 0,
+        STATS_FULL = 1,
+        STATS_SHORT = 2,
+        STATS_NUMBER = 4,
+        STATS_INCLUDE_SUMMARY = 8
+    }
+}
+
+export class Diff {
+    /**
+     * Directly run a diff between a blob and a buffer.
+     *
+     * @static
+     * @param {Blob} oldBlob
+     * @param {string} oldAsPath
+     * @param {string} buffer
+     * @param {string} bufferAsPath
+     * @param {DiffOptions} opts
+     * @param {Function} fileCb
+     * @param {Function} binaryCb
+     * @param {Function} hunkCb
+     * @param {Function} lineCb
+     * @returns {Promise<any>}
+     *
+     * @memberof Diff
+     */
+    static blobToBuffer(oldBlob: Blob, oldAsPath: string,
+                        buffer: string, bufferAsPath: string, opts: DiffOptions, fileCb: Function, binaryCb: Function, hunkCb: Function, lineCb: Function): Promise<any>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} content
+     * @param {number} contentLen
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static fromBuffer(content: string, contentLen: number): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Index} index
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static indexToWorkdir(repo: Repository, index: Index, opts: DiffOptions): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Index} oldIndex
+     * @param {Index} newIndex
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static indexToIndex(repo: Repository, oldIndex: Index, newIndex: Index, opts: DiffOptions): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} oldTree
+     * @param {Index} index
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static treeToIndex(repo: Repository, oldTree: Tree, index: Index, opts: DiffOptions): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} oldTree
+     * @param {Tree} new_tree
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static treeToTree(repo: Repository, oldTree: Tree, new_tree: Tree, opts: DiffOptions): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} oldTree
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static treeToWorkdir(repo: Repository, oldTree: Tree, opts: DiffOptions): Promise<Diff>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} oldTree
+     * @param {DiffOptions} opts
+     * @returns {Promise<Diff>}
+     *
+     * @memberof Diff
+     */
+    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree, opts: DiffOptions): Promise<Diff>;
+
+    /**
+     *
+     *
+     * @param {DiffFindOptions} options
+     * @returns {Promise<number>}
+     *
+     * @memberof Diff
+     */
+    findSimilar(options: DiffFindOptions): Promise<number>;
+    /**
+     *
+     *
+     * @param {number} idx
+     * @returns {DiffDelta}
+     *
+     * @memberof Diff
+     */
+    getDelta(idx: number): DiffDelta;
+    /**
+     *
+     *
+     * @returns {Promise<DiffPerfdata>}
+     *
+     * @memberof Diff
+     */
+    getPerfdata(): Promise<DiffPerfdata>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Diff
+     */
+    numDeltas(): number;
+    /**
+     * Retrieve patches in this difflist
+     *
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Diff
+     */
+    patches(): Promise<any[]>;
+    /**
+     *
+     *
+     * @param {Diff} from
+     * @returns {Promise<number>}
+     *
+     * @memberof Diff
+     */
+    merge(from: Diff): Promise<number>;
+    /**
+     *
+     *
+     * @param {Diff.FORMAT} format
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Diff
+     */
+    toBuf(format: Diff.FORMAT): Promise<Buf>;
+}
diff --git a/types/nodegit/enums.d.ts b/types/nodegit/enums.d.ts
new file mode 100644
index 0000000000..4fb44850ca
--- /dev/null
+++ b/types/nodegit/enums.d.ts
@@ -0,0 +1,41 @@
+export namespace Enums {
+    const enum CVAR {
+        FALSE = 0,
+        TRUE = 1,
+        INT32 = 2,
+        string = 3
+    }
+
+    const enum DIRECTION {
+        FETCH = 0,
+        PUSH = 1
+    }
+
+    const enum FEATURE {
+        THREADS = 1,
+        HTTPS = 2,
+        SSH = 4
+    }
+
+    const enum IDXENTRY_EXTENDED_FLAG {
+        IDXENTRY_INTENT_TO_ADD = 8192,
+        IDXENTRY_SKIP_WORKTREE = 16384,
+        IDXENTRY_EXTENDED2 = 32768,
+        S = 24576,
+        IDXENTRY_UPDATE = 1,
+        IDXENTRY_REMOVE = 2,
+        IDXENTRY_UPTODATE = 4,
+        IDXENTRY_ADDED = 8,
+        IDXENTRY_HASHED = 16,
+        IDXENTRY_UNHASHED = 32,
+        IDXENTRY_WT_REMOVE = 64,
+        IDXENTRY_CONFLICTED = 128,
+        IDXENTRY_UNPACKED = 256,
+        IDXENTRY_NEW_SKIP_WORKTREE = 512
+    }
+
+    const enum INDXENTRY_FLAG {
+        IDXENTRY_EXTENDED = 16384,
+        IDXENTRY_VALID = 32768
+    }
+}
diff --git a/types/nodegit/error.d.ts b/types/nodegit/error.d.ts
new file mode 100644
index 0000000000..9acf4cc2cd
--- /dev/null
+++ b/types/nodegit/error.d.ts
@@ -0,0 +1,80 @@
+export namespace Error {
+    const enum ERROR {
+        GITERR_NONE = 0,
+        GITERR_NOMEMORY = 1,
+        GITERR_OS = 2,
+        GITERR_INVALID = 3,
+        GITERR_REFERENCE = 4,
+        GITERR_ZLIB = 5,
+        GITERR_REPOSITORY = 6,
+        GITERR_CONFIG = 7,
+        GITERR_REGEX = 8,
+        GITERR_ODB = 9,
+        GITERR_INDEX = 10,
+        GITERR_OBJECT = 11,
+        GITERR_NET = 12,
+        GITERR_TAG = 13,
+        GITERR_TREE = 14,
+        GITERR_INDEXER = 15,
+        GITERR_SSL = 16,
+        GITERR_SUBMODULE = 17,
+        GITERR_THREAD = 18,
+        GITERR_STASH = 19,
+        GITERR_CHECKOUT = 20,
+        GITERR_FETCHHEAD = 21,
+        GITERR_MERGE = 22,
+        GITERR_SSH = 23,
+        GITERR_FILTER = 24,
+        GITERR_REVERT = 25,
+        GITERR_CALLBACK = 26,
+        GITERR_CHERRYPICK = 27,
+        GITERR_DESCRIBE = 28,
+        GITERR_REBASE = 29,
+        GITERR_FILESYSTEM = 30
+    }
+
+    const enum CODE {
+        OK = 0,
+        ERROR = -1,
+        ENOTFOUND = -3,
+        EEXISTS = -4,
+        EAMBIGUOUS = -5,
+        EBUFS = -6,
+        EUSER = -7,
+        EBAREREPO = -8,
+        EUNBORNBRANCH = -9,
+        EUNMERGED = -10,
+        ENONFASTFORWARD = -11,
+        EINVALIDSPEC = -12,
+        ECONFLICT = -13,
+        ELOCKED = -14,
+        EMODIFIED = -15,
+        EAUTH = -16,
+        ECERTIFICATE = -17,
+        EAPPLIED = -18,
+        EPEEL = -19,
+        EEOF = -20,
+        EINVALID = -21,
+        EUNCOMMITTED = -22,
+        EDIRECTORY = -23,
+        PASSTHROUGH = -30,
+        ITEROVER = -31
+    }
+}
+
+export class Error {
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof Error
+     */
+    message: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Error
+     */
+    klass: number;
+}
diff --git a/types/nodegit/fetch-options.d.ts b/types/nodegit/fetch-options.d.ts
new file mode 100644
index 0000000000..3b3a1b26c1
--- /dev/null
+++ b/types/nodegit/fetch-options.d.ts
@@ -0,0 +1,54 @@
+import { RemoteCallbacks } from './remote-callbacks';
+import { Strarray} from './str-array';
+
+export interface FetchOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof FetchOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {RemoteCallbacks}
+     * @memberof FetchOptions
+     */
+    callbacks?: RemoteCallbacks;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof FetchOptions
+     */
+    prune?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof FetchOptions
+     */
+    updateFetchhead?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof FetchOptions
+     */
+    downloadTags?: number;
+    /**
+     *
+     *
+     * @type {Strarray}
+     * @memberof FetchOptions
+     */
+    customHeaders?: Strarray;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof FetchOptions
+     */
+    proxyOpts?: any;
+}
diff --git a/types/nodegit/fetch.d.ts b/types/nodegit/fetch.d.ts
new file mode 100644
index 0000000000..b777066629
--- /dev/null
+++ b/types/nodegit/fetch.d.ts
@@ -0,0 +1,23 @@
+import { FetchOptions } from './fetch-options';
+
+export namespace Fetch {
+    const enum PRUNE {
+        GIT_FETCH_PRUNE_UNSPECIFIED = 0,
+        GIT_FETCH_PRUNE = 1,
+        GIT_FETCH_NO_PRUNE = 2
+    }
+}
+
+export class Fetch {
+    /**
+     *
+     *
+     * @static
+     * @param {FetchOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Fetch
+     */
+    static initOptions(opts: FetchOptions, version: number): number;
+}
diff --git a/types/nodegit/filter.d.ts b/types/nodegit/filter.d.ts
new file mode 100644
index 0000000000..7b73196ed0
--- /dev/null
+++ b/types/nodegit/filter.d.ts
@@ -0,0 +1,143 @@
+import { WriteStream } from 'fs';
+
+import { Repository } from './repository';
+import { Blob } from './blob';
+import { Buf } from './buf';
+
+export namespace Filter {
+    const enum FLAG {
+        DEFAULT = 0,
+        ALLOW_UNSAFE = 1
+    }
+
+    const enum MODE {
+        TO_WORKTREE = 0,
+        SMUDGE = 0,
+        TO_ODB = 1,
+        CLEAN = 1
+    }
+}
+
+export class Filter {
+    /**
+     *
+     *
+     * @static
+     * @param {*} filters
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static listContains(filters: any, name: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {*} fl
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static listLength(fl: any): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {number} mode
+     * @param {number} options
+     * @returns {Promise<any>}
+     *
+     * @memberof Filter
+     */
+    static listNew(repo: Repository, mode: number, options: number): Promise<any>;
+    /**
+     *
+     *
+     * @static
+     * @param {*} filters
+     * @param {Blob} blob
+     * @param {WriteStream} target
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static listStreamBlob(filters: any, blob: Blob, target: WriteStream): number;
+    /**
+     *
+     *
+     * @static
+     * @param {*} filters
+     * @param {Buf} data
+     * @param {WriteStream} target
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static listStreamData(filters: any, data: Buf, target: WriteStream): number;
+    /**
+     *
+     *
+     * @static
+     * @param {*} filters
+     * @param {Repository} repo
+     * @param {string} path
+     * @param {WriteStream} target
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static listStreamFile(filters: any, repo: Repository, path: string, target: WriteStream): number;
+    /**
+     *
+     *
+     * @static
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    static unregister(name: string): number;
+
+    /**
+     *
+     *
+     * @param {string} name
+     * @returns {Filter}
+     *
+     * @memberof Filter
+     */
+    lookup(name: string): Filter;
+    /**
+     *
+     *
+     * @param {string} name
+     * @param {number} priority
+     * @returns {number}
+     *
+     * @memberof Filter
+     */
+    register(name: string, priority: number): number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Filter
+     */
+    version: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof Filter
+     */
+    attributes: string;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof Filter
+     */
+    stream: Function;
+}
diff --git a/types/nodegit/git-err.d.ts b/types/nodegit/git-err.d.ts
new file mode 100644
index 0000000000..541a191e30
--- /dev/null
+++ b/types/nodegit/git-err.d.ts
@@ -0,0 +1,39 @@
+import { Error } from './error';
+
+export class Giterr {
+    /**
+     *
+     *
+     * @static
+     *
+     * @memberof Giterr
+     */
+    static errClear(): void;
+    /**
+     *
+     *
+     * @static
+     * @returns {Error}
+     *
+     * @memberof Giterr
+     */
+    static errLast(): Error;
+    /**
+     *
+     *
+     * @static
+     *
+     * @memberof Giterr
+     */
+    static errSetOom(): void;
+    /**
+     *
+     *
+     * @static
+     * @param {number} errorClass
+     * @param {string} string
+     *
+     * @memberof Giterr
+     */
+    static errSetString(errorClass: number, string: string): void;
+}
diff --git a/types/nodegit/graph.d.ts b/types/nodegit/graph.d.ts
new file mode 100644
index 0000000000..90639a5075
--- /dev/null
+++ b/types/nodegit/graph.d.ts
@@ -0,0 +1,29 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+
+export class Graph {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} local
+     * @param {Oid} upstream
+     * @returns {Promise<number>}
+     *
+     * @memberof Graph
+     */
+    static aheadBehind(repo: Repository, local: Oid, upstream: Oid): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} commit
+     * @param {Oid} ancestor
+     * @returns {Promise<number>}
+     *
+     * @memberof Graph
+     */
+    static descendantOf(repo: Repository, commit: Oid, ancestor: Oid): Promise<number>;
+}
diff --git a/types/nodegit/hash-sig.d.ts b/types/nodegit/hash-sig.d.ts
new file mode 100644
index 0000000000..86bfe5d64f
--- /dev/null
+++ b/types/nodegit/hash-sig.d.ts
@@ -0,0 +1,51 @@
+export namespace Hashsig {
+    const enum OPTION {
+        NORMAL = 0,
+        IGNORE_WHITESPACE = 1,
+        SMART_WHITESPACE = 2,
+        ALLOW_SMALL_FILES = 4
+    }
+}
+
+export class Hashsig {
+    /**
+     *
+     *
+     * @static
+     * @param {string} buf
+     * @param {number} buflen
+     * @param {number} opts
+     * @returns {Promise<Hashsig>}
+     *
+     * @memberof Hashsig
+     */
+    static create(buf: string, buflen: number, opts: number): Promise<Hashsig>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} path
+     * @param {number} opts
+     * @returns {Promise<Hashsig>}
+     *
+     * @memberof Hashsig
+     */
+    static createFromFile(path: string, opts: number): Promise<Hashsig>;
+
+    /**
+     *
+     *
+     * @param {Hashsig} b
+     * @returns {number}
+     *
+     * @memberof Hashsig
+     */
+    compare(b: Hashsig): number;
+    /**
+     *
+     *
+     *
+     * @memberof Hashsig
+     */
+    free(): void;
+}
diff --git a/types/nodegit/ignore.d.ts b/types/nodegit/ignore.d.ts
new file mode 100644
index 0000000000..017637c8d2
--- /dev/null
+++ b/types/nodegit/ignore.d.ts
@@ -0,0 +1,36 @@
+import { Repository } from './repository';
+
+export class Ignore {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} rules
+     * @returns {number}
+     *
+     * @memberof Ignore
+     */
+    static addRule(repo: Repository, rules: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {number}
+     *
+     * @memberof Ignore
+     */
+    static clearInternalRules(repo: Repository): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} path
+     * @returns {Promise<number>}
+     *
+     * @memberof Ignore
+     */
+    static pathIsIgnored(repo: Repository, path: string): Promise<number>;
+}
diff --git a/types/nodegit/index-entry.d.ts b/types/nodegit/index-entry.d.ts
new file mode 100644
index 0000000000..df42f9cbce
--- /dev/null
+++ b/types/nodegit/index-entry.d.ts
@@ -0,0 +1,105 @@
+import { Oid } from './oid';
+
+export interface IndexTime {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexTime
+     */
+    seconds: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexTime
+     */
+    nanoseconds: number;
+}
+
+export class IndexEntry {
+    /**
+     *
+     *
+     * @type {IndexTime}
+     * @memberof IndexEntry
+     */
+    ctime: IndexTime;
+    /**
+     *
+     *
+     * @type {IndexTime}
+     * @memberof IndexEntry
+     */
+    mtime: IndexTime;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    dev: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    ino: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    mode: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    uid: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    gid: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    fileSize: number;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof IndexEntry
+     */
+    id: Oid;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    flags: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof IndexEntry
+     */
+    flagsExtended: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof IndexEntry
+     */
+    path: string;
+}
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
new file mode 100644
index 0000000000..b0a68f67b5
--- /dev/null
+++ b/types/nodegit/index.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for nodegit 0.18
+// Project: https://github.com/nodegit/nodegit
+// Definitions by: Dolan Miu <https://github.com/dolanmiu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export { AnnotatedCommit } from './annotated-commit';
+export { Attr } from './attr';
+export { BlameHunk } from './blame-hunk';
+export { BlameOptions } from './blame-options';
+export { Blame } from './blame';
+export { Blob } from './blob';
+export { Branch } from './branch';
+export { Buf } from './buf';
+export { CertHostkey } from './cert-host-key';
+export { CertX509 } from './cert-x509';
+export { Cert } from './cert';
+export { CheckoutOptions } from './checkout-options';
+export { Checkout } from './checkout';
+export { CherrypickOptions } from './cherry-pick-options';
+export { Cherrypick } from './cherry-pick';
+export { CloneOptions } from './clone-options';
+export { Clone } from './clone';
+export { Commit } from './commit';
+export { Config } from './config';
+export { ConvenientPatch } from './convenient-patch';
+export { CredUserpassPayload } from './cred-user-pass-payload';
+export { CredUsername } from './cred-username';
+export { Cred } from './cred';
+export { CvarMap } from './cvar-map';
+export { DescribeFormatOptions } from './describe-format-options';
+export { DescribeOptions } from './describe-options';
+export { DiffBinaryFile } from './diff-binary-file';
+export { DiffBinary } from './diff-binary';
+export { DiffDelta } from './diff-delta';
+export { DiffFile } from './diff-file';
+export { DiffHunk } from './diff-hunk';
+export { DiffLine } from './diff-line';
+export { DiffOptions } from './diff-options';
+export { DiffPerfdata } from './diff-perf-data';
+export { Diff, DiffFindOptions } from './diff';
+export { Enums } from './enums';
+export { Error } from './error';
+export { FetchOptions } from './fetch-options';
+export { Fetch } from './fetch';
+export { Filter } from './filter';
+export { Giterr } from './git-err';
+export { Graph } from './graph';
+export { Hashsig } from './hash-sig';
+export { Index } from './index_';
+export { IndexEntry } from './index-entry';
+export { Ignore } from './ignore';
+export { Indexer } from './indexer';
+export { Libgit2 } from './lib-git2';
+export { MergeFileInput } from './merge-file-input';
+export { MergeFileOptions } from './merge-file-options';
+export { MergeFileResult } from './merge-file-result';
+export { MergeOptions } from './merge-options';
+export { Merge } from './merge';
+export { Note } from './note';
+export { Object } from './object';
+export { OdbExpandId } from './odb-expand-id';
+export { OdbObject } from './odb-object';
+export { Odb } from './odb';
+export { Oidarray } from './oid-array';
+export { Oid } from './oid';
+export { Openssl } from './open-ssl';
+export { Packbuilder } from './pack-builder';
+export { Pathspec } from './path-spec';
+export { ProxyOptions } from './proxy-options';
+export { Proxy } from './proxy';
+export { PushOptions } from './push-options';
+export { PushUpdate } from './push-update';
+export { Push } from './push';
+export { RebaseOperation } from './rebase-operation';
+export { Rebase, RebaseOptions } from './rebase';
+export { Refdb } from './ref-db';
+export { Reflog, ReflogEntry } from './ref-log';
+export { Refspec } from './ref-spec';
+export { Reference } from './reference';
+export { RemoteCallbacks } from './remote-callbacks';
+export { Remote } from './remote';
+export { Repository } from './repository';
+export { Reset } from './reset';
+export { Revparse } from './rev-parse';
+export { Revwalk } from './rev-walk';
+export { Revert } from './revert';
+export { Signature } from './signature';
+export { Stash } from './stash';
+export { StatusEntry } from './status-entry';
+export { StatusList } from './status-list';
+export { StatusOptions } from './status-options';
+export { Status } from './status';
+export { Strarray } from './str-array';
+export { SubmoduleUpdateOptions } from './submodule-update-options';
+export { Submodule } from './submodule';
+export { Tag } from './tag';
+export { Time } from './time';
+export { TransferProgress } from './transfer-progress';
+export { Transport } from './transport';
+export { Treebuilder } from './tree-builder';
+export { TreeEntry } from './tree-entry';
+export { TreeUpdate } from './tree-update';
+export { Tree } from './tree';
diff --git a/types/nodegit/index_.d.ts b/types/nodegit/index_.d.ts
new file mode 100644
index 0000000000..ebc7f692f2
--- /dev/null
+++ b/types/nodegit/index_.d.ts
@@ -0,0 +1,335 @@
+import { Oid } from './oid';
+import { IndexEntry } from './index-entry';
+import { Repository } from './repository';
+import { Tree } from './tree';
+import { Strarray } from './str-array';
+
+export namespace Index {
+    const enum ADD_OPTION {
+        ADD_DEFAULT = 0,
+        ADD_FORCE = 1,
+        ADD_DISABLE_PATHSPEC_MATCH = 2,
+        ADD_CHECK_PATHSPEC = 4
+    }
+
+    const enum CAP {
+        IGNORE_CASE = 1,
+        NO_FILEMODE = 2,
+        NO_SYMLINKS = 4,
+        FROM_OWNER = -1
+    }
+}
+
+export class Index {
+    /**
+     *
+     *
+     * @static
+     * @param {IndexEntry} entry
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    static entryIsConflict(entry: IndexEntry): number;
+    /**
+     *
+     *
+     * @static
+     * @param {IndexEntry} entry
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    static entryStage(entry: IndexEntry): number;
+    /**
+     *
+     *
+     * @static
+     * @param {string} indexPath
+     * @returns {Promise<Index>}
+     *
+     * @memberof Index
+     */
+    static open(indexPath: string): Promise<Index>;
+
+    /**
+     *
+     *
+     * @param {IndexEntry} sourceEntry
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    add(sourceEntry: IndexEntry): number;
+    /**
+     *
+     *
+     * @param {Strarray} pathspec
+     * @param {number} flags
+     * @param {Function} callback
+     * @param {void} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Index
+     */
+    addAll(pathspec: Strarray, flags: number, callback: Function, payload: void): Promise<number>;
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    addByPath(path: string): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    caps(): number;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Index
+     */
+    checksum(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    clear(): number;
+    /**
+     *
+     *
+     * @param {IndexEntry} ancestorEntry
+     * @param {IndexEntry} ourEntry
+     * @param {IndexEntry} theirEntry
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    conflictAdd(ancestorEntry: IndexEntry, ourEntry: IndexEntry, theirEntry: IndexEntry): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    conflictCleanup(): number;
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {Promise<IndexEntry>}
+     *
+     * @memberof Index
+     */
+    conflictGet(path: string): Promise<IndexEntry>;
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    conflictRemove(path: string): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    entryCount(): number;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {IndexEntry}
+     *
+     * @memberof Index
+     */
+    getByIndex(n: number): IndexEntry;
+    /**
+     *
+     *
+     * @param {string} path
+     * @param {number} stage
+     * @returns {IndexEntry}
+     *
+     * @memberof Index
+     */
+    getByPath(path: string, stage: number): IndexEntry;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    hasConflicts(): number;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Index
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Index
+     */
+    path(): string;
+    /**
+     *
+     *
+     * @param {number} force
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    read(force: number): number;
+    /**
+     *
+     *
+     * @param {Tree} tree
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    readTree(tree: Tree): number;
+    /**
+     *
+     *
+     * @param {string} path
+     * @param {number} stage
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    remove(path: string, stage: number): number;
+    /**
+     *
+     *
+     * @param {Strarray} pathspec
+     * @param {Function} callback
+     * @param {void} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Index
+     */
+    removeAll(pathspec: Strarray, callback: Function, payload: void): Promise<number>;
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    removeByPath(path: string): number;
+    /**
+     *
+     *
+     * @param {string} dir
+     * @param {number} stage
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    removeDirectory(dir: string, stage: number): number;
+    /**
+     *
+     *
+     * @param {number} caps
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    setCaps(caps: number): number;
+    /**
+     *
+     *
+     * @param {Strarray} pathspec
+     * @param {Function} callback
+     * @param {void} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Index
+     */
+    updateAll(pathspec: Strarray, callback: Function, payload: void): Promise<number>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    write(): number;
+    /**
+     *
+     *
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Index
+     */
+    writeTree(): Promise<Oid>;
+    /**
+     *
+     *
+     * @param {Repository} repo
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Index
+     */
+    writeTreeTo(repo: Repository): Promise<Oid>;
+    /**
+     *
+     *
+     * @returns {IndexEntry[]}
+     *
+     * @memberof Index
+     */
+    entries(): IndexEntry[];
+    /**
+     *
+     *
+     * @param {number} atPos
+     * @param {string} prefix
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    findPrefix(atPos: number, prefix: string): number;
+    /**
+     *
+     *
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    setVersion(version: number): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Index
+     */
+    version(): number;
+}
diff --git a/types/nodegit/indexer.d.ts b/types/nodegit/indexer.d.ts
new file mode 100644
index 0000000000..e776c0f508
--- /dev/null
+++ b/types/nodegit/indexer.d.ts
@@ -0,0 +1,29 @@
+import { TransferProgress } from './transfer-progress';
+import { Oid } from './oid';
+
+export class Indexer {
+    /**
+     *
+     *
+     * @param {TransferProgress} stats
+     * @returns {number}
+     *
+     * @memberof Indexer
+     */
+    commit(stats: TransferProgress): number;
+    /**
+     *
+     *
+     *
+     * @memberof Indexer
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Indexer
+     */
+    hash(): Oid;
+}
diff --git a/types/nodegit/lib-git2.d.ts b/types/nodegit/lib-git2.d.ts
new file mode 100644
index 0000000000..10ad4f864a
--- /dev/null
+++ b/types/nodegit/lib-git2.d.ts
@@ -0,0 +1,68 @@
+export namespace Libgit2 {
+    const enum OPT {
+        GET_MWINDOW_SIZE = 0,
+        SET_MWINDOW_SIZE = 1,
+        GET_MWINDOW_MAPPED_LIMIT = 2,
+        SET_MWINDOW_MAPPED_LIMIT = 3,
+        GET_SEARCH_PATH = 4,
+        SET_SEARCH_PATH = 5,
+        SET_CACHE_OBJECT_LIMIT = 6,
+        SET_CACHE_MAX_SIZE = 7,
+        ENABLE_CACHING = 8,
+        GET_CACHED_MEMORY = 9,
+        GET_TEMPLATE_PATH = 10,
+        SET_TEMPLATE_PATH = 11,
+        SET_SSL_CERT_LOCATIONS = 12
+    }
+}
+
+export class Libgit2 {
+    /**
+     *
+     *
+     * @static
+     * @returns {number}
+     *
+     * @memberof Libgit2
+     */
+    static features(): number;
+    /**
+     *
+     *
+     * @static
+     * @returns {number}
+     *
+     * @memberof Libgit2
+     */
+    static init(): number;
+    /**
+     *
+     *
+     * @static
+     * @param {number} option
+     * @returns {number}
+     *
+     * @memberof Libgit2
+     */
+    static opts(option: number): number;
+    /**
+     *
+     *
+     * @static
+     * @returns {number}
+     *
+     * @memberof Libgit2
+     */
+    static shutdown(): number;
+    /**
+     *
+     *
+     * @static
+     * @param {number} major
+     * @param {number} minor
+     * @param {number} rev
+     *
+     * @memberof Libgit2
+     */
+    static version(major: number, minor: number, rev: number): void;
+}
diff --git a/types/nodegit/merge-file-input.d.ts b/types/nodegit/merge-file-input.d.ts
new file mode 100644
index 0000000000..9401f8fd1d
--- /dev/null
+++ b/types/nodegit/merge-file-input.d.ts
@@ -0,0 +1,37 @@
+export interface MergeFileInput {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileInput
+     */
+    version: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileInput
+     */
+    ptr: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileInput
+     */
+    size: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileInput
+     */
+    path: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileInput
+     */
+    mode: number;
+}
diff --git a/types/nodegit/merge-file-options.d.ts b/types/nodegit/merge-file-options.d.ts
new file mode 100644
index 0000000000..6212c6275e
--- /dev/null
+++ b/types/nodegit/merge-file-options.d.ts
@@ -0,0 +1,44 @@
+export interface MergeFileOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileOptions
+     */
+    ancestorLabel?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileOptions
+     */
+    ourLabel?: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileOptions
+     */
+    theirLabel?: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileOptions
+     */
+    favor?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileOptions
+     */
+    flags?: number;
+}
diff --git a/types/nodegit/merge-file-result.d.ts b/types/nodegit/merge-file-result.d.ts
new file mode 100644
index 0000000000..da2410da01
--- /dev/null
+++ b/types/nodegit/merge-file-result.d.ts
@@ -0,0 +1,37 @@
+export class MergeFileResult {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileResult
+     */
+    automergeable: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileResult
+     */
+    path: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileResult
+     */
+    mode: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeFileResult
+     */
+    ptr: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeFileResult
+     */
+    len: number;
+}
diff --git a/types/nodegit/merge-options.d.ts b/types/nodegit/merge-options.d.ts
new file mode 100644
index 0000000000..31445857dd
--- /dev/null
+++ b/types/nodegit/merge-options.d.ts
@@ -0,0 +1,58 @@
+export class MergeOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    renameThreshold?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    targetLimit?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    fileFavor?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    fileFlags?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof MergeOptions
+     */
+    defaultDriver?: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof MergeOptions
+     */
+    recursionLimit?: number;
+}
diff --git a/types/nodegit/merge.d.ts b/types/nodegit/merge.d.ts
new file mode 100644
index 0000000000..ae4a7d053c
--- /dev/null
+++ b/types/nodegit/merge.d.ts
@@ -0,0 +1,138 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Tree } from './tree';
+import { Commit } from './commit';
+import { Index } from './index';
+import { AnnotatedCommit } from './annotated-commit';
+import { CheckoutOptions } from './checkout-options';
+import { Oidarray } from './oid-array';
+import { MergeOptions } from './merge-options';
+import { MergeFileInput } from './merge-file-input';
+
+export namespace Merge {
+    const enum ANALYSIS {
+        NONE = 0,
+        NORMAL = 1,
+        UP_TO_DATE = 2,
+        FASTFORWARD = 4,
+        UNBORN = 8
+    }
+
+    const enum FILE_FAVOR {
+        NORMAL = 0,
+        OURS = 1,
+        THEIRS = 2,
+        UNION = 3
+    }
+
+    const enum FILE_FLAGS {
+        FILE_DEFAULT = 0,
+        FILE_STYLE_MERGE = 1,
+        FILE_STYLE_DIFF3 = 2,
+        FILE_SIMPLIFY_ALNUM = 4,
+        FILE_IGNORE_WHITESPACE = 8,
+        FILE_IGNORE_WHITESPACE_CHANGE = 16,
+        FILE_IGNORE_WHITESPACE_EOL = 32,
+        FILE_DIFF_PATIENCE = 64,
+        FILE_DIFF_MINIMAL = 128
+    }
+
+    const enum PREFERENCE {
+        NONE = 0,
+        NO_FASTFORWARD = 1,
+        FASTFORWARD_ONLY = 2
+    }
+
+    const enum TREE_FLAG {
+        TREE_FIND_RENAMES = 1
+    }
+}
+
+export class Merge {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {AnnotatedCommit} theirHead
+     * @param {MergeOptions} [mergeOpts]
+     * @param {CheckoutOptions} [checkoutOpts]
+     * @returns {*}
+     *
+     * @memberof Merge
+     */
+    static merge(repo: Repository, theirHead: AnnotatedCommit, mergeOpts?: MergeOptions, checkoutOpts?: CheckoutOptions): any;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} one
+     * @param {Oid} two
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Merge
+     */
+    static base(repo: Repository, one: Oid, two: Oid): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} one
+     * @param {Oid} two
+     * @returns {Promise<Oidarray>}
+     *
+     * @memberof Merge
+     */
+    static bases(repo: Repository, one: Oid, two: Oid): Promise<Oidarray>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Commit} ourCommit
+     * @param {Commit} theirCommit
+     * @param {MergeOptions} [options]
+     * @returns {*}
+     *
+     * @memberof Merge
+     */
+    static commits(repo: Repository, ourCommit: Commit, theirCommit: Commit, options?: MergeOptions): any;
+    /**
+     *
+     *
+     * @static
+     * @param {MergeFileInput} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Merge
+     */
+    static fileInitInput(opts: MergeFileInput, version: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {MergeOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Merge
+     */
+    static initOptions(opts: MergeOptions, version: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} ancestorTree
+     * @param {Tree} ourTree
+     * @param {Tree} theirTree
+     * @param {MergeOptions} opts
+     * @returns {Promise<Index>}
+     *
+     * @memberof Merge
+     */
+    static trees(repo: Repository, ancestorTree: Tree, ourTree: Tree, theirTree: Tree, opts: MergeOptions): Promise<Index>;
+}
diff --git a/types/nodegit/nodegit-tests.ts b/types/nodegit/nodegit-tests.ts
new file mode 100644
index 0000000000..c10dfef127
--- /dev/null
+++ b/types/nodegit/nodegit-tests.ts
@@ -0,0 +1,53 @@
+import * as Git from 'nodegit';
+
+Git.Repository.discover("startPath", 1, "ceilingDirs").then((string) => {
+    // Use string
+});
+
+Git.Repository.init("path", true).then((repository) => {
+    // Use repository
+});
+
+const repo = new Git.Repository();
+const id = new Git.Oid();
+const ref = new Git.Reference();
+
+// AnnotatedCommit Tests
+
+Git.AnnotatedCommit.fromFetchhead(repo, "branch_name", "remote_url", id).then((annotatedCommit) => {
+    // Use annotatedCommit
+});
+
+Git.AnnotatedCommit.fromRef(repo, ref).then((annotatedCommit) => {
+    // Use annotatedCommit
+});
+
+Git.AnnotatedCommit.fromRevspec(repo, "revspec").then((annotatedCommit) => {
+    // Use annotatedCommit
+});
+
+Git.AnnotatedCommit.lookup(repo, id).then((annotatedCommit) => {
+    // Use annotatedCommit
+    annotatedCommit.free();
+    annotatedCommit.id();
+});
+
+// Attr tests
+
+let result = Git.Attr.addMacro(repo, "name", "values");
+
+Git.Attr.cacheFlush(repo);
+
+Git.Attr.get(repo, 1, "path", "name").then((string) => {
+    // Use string
+});
+
+let array = Git.Attr.getMany(repo, 1, "path", 1, "names");
+
+result = Git.Attr.value("attr");
+
+const blameOptions = new Git.BlameOptions();
+
+Git.Branch.lookup(repo, "branch_name", Git.Branch.BRANCH.LOCAL).then((reference) => {
+    // Use reference
+});
diff --git a/types/nodegit/note.d.ts b/types/nodegit/note.d.ts
new file mode 100644
index 0000000000..e1412afe3c
--- /dev/null
+++ b/types/nodegit/note.d.ts
@@ -0,0 +1,124 @@
+import {Repository} from './repository';
+import {Signature} from './signature';
+import {Oid} from './oid';
+
+export class Note {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} notesRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {Oid} oid
+     * @param {string} note
+     * @param {number} force
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Note
+     */
+    static create(repo: Repository, notesRef: string, author: Signature, committer: Signature, oid: Oid, note: string, force: number): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} notesRef
+     * @param {Function} noteCb
+     * @param {*} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Note
+     */
+    static foreach(repo: Repository, notesRef: string, noteCb: Function, payload: any): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} notesRef
+     * @returns {Promise<any>}
+     *
+     * @memberof Note
+     */
+    static iteratorNew(repo: Repository, notesRef: string): Promise<any>;
+    /**
+     *
+     *
+     * @static
+     * @param {Oid} noteId
+     * @param {Oid} annotatedId
+     * @param {*} it
+     * @returns {number}
+     *
+     * @memberof Note
+     */
+    static next(noteId: Oid, annotatedId: Oid, it: any): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} notesRef
+     * @param {Oid} oid
+     * @returns {Promise<Note>}
+     *
+     * @memberof Note
+     */
+    static read(repo: Repository, notesRef: string, oid: Oid): Promise<Note>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} notesRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {Oid} oid
+     * @returns {Promise<number>}
+     *
+     * @memberof Note
+     */
+    static remove(repo: Repository, notesRef: string, author: Signature, committer: Signature, oid: Oid): Promise<number>;
+
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof Note
+     */
+    author(): Signature;
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof Note
+     */
+    committer(): Signature;
+    /**
+     *
+     *
+     *
+     * @memberof Note
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Note
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Note
+     */
+    message(): string;
+}
diff --git a/types/nodegit/object.d.ts b/types/nodegit/object.d.ts
new file mode 100644
index 0000000000..747e4ffc28
--- /dev/null
+++ b/types/nodegit/object.d.ts
@@ -0,0 +1,138 @@
+import { Oid } from './oid';
+import { Repository } from './repository';
+import { Buf } from './buf';
+
+export class Object {
+    /**
+     *
+     *
+     * @static
+     * @param {number} type
+     * @returns {number}
+     *
+     * @memberof Object
+     */
+    static size(type: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} type
+     * @returns {Promise<Object>}
+     *
+     * @memberof Object
+     */
+    static lookup(repo: Repository, id: Oid, type: number): Promise<Object>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} len
+     * @param {number} type
+     * @returns {Promise<Object>}
+     *
+     * @memberof Object
+     */
+    static lookupPrefix(repo: Repository, id: Oid, len: number, type: number): Promise<Object>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} str
+     * @returns {number}
+     *
+     * @memberof Object
+     */
+    static string2type(str: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {number} type
+     * @returns {string}
+     *
+     * @memberof Object
+     */
+    static type2string(type: number): string;
+    /**
+     *
+     *
+     * @static
+     * @param {number} type
+     * @returns {number}
+     *
+     * @memberof Object
+     */
+    static typeisloose(type: number): number;
+
+    /**
+     *
+     *
+     * @returns {Promise<Object>}
+     *
+     * @memberof Object
+     */
+    dup(): Promise<Object>;
+    /**
+     *
+     *
+     *
+     * @memberof Object
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Object
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @param {string} path
+     * @param {number} type
+     * @returns {Promise<Object>}
+     *
+     * @memberof Object
+     */
+    lookupByPath(path: string, type: number): Promise<Object>;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Object
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @param {number} targetType
+     * @returns {Promise<Object>}
+     *
+     * @memberof Object
+     */
+    peel(targetType: number): Promise<Object>;
+    /**
+     *
+     *
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Object
+     */
+    shortId(): Promise<Buf>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Object
+     */
+    type(): number;
+}
diff --git a/types/nodegit/odb-expand-id.d.ts b/types/nodegit/odb-expand-id.d.ts
new file mode 100644
index 0000000000..d4fe264c3a
--- /dev/null
+++ b/types/nodegit/odb-expand-id.d.ts
@@ -0,0 +1,7 @@
+import { Oid } from './oid';
+
+export class OdbExpandId {
+    id: Oid;
+    length: number;
+    type: number;
+}
diff --git a/types/nodegit/odb-object.d.ts b/types/nodegit/odb-object.d.ts
new file mode 100644
index 0000000000..8b76274b00
--- /dev/null
+++ b/types/nodegit/odb-object.d.ts
@@ -0,0 +1,51 @@
+import { Oid } from './oid';
+
+export class OdbObject {
+    /**
+     *
+     *
+     * @returns {Buffer}
+     *
+     * @memberof OdbObject
+     */
+    data(): Buffer;
+    /**
+     *
+     *
+     * @returns {Promise<OdbObject>}
+     *
+     * @memberof OdbObject
+     */
+    dup(): Promise<OdbObject>;
+    /**
+     *
+     *
+     *
+     * @memberof OdbObject
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof OdbObject
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof OdbObject
+     */
+    size(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof OdbObject
+     */
+    type(): number;
+}
diff --git a/types/nodegit/odb.d.ts b/types/nodegit/odb.d.ts
new file mode 100644
index 0000000000..549bba872e
--- /dev/null
+++ b/types/nodegit/odb.d.ts
@@ -0,0 +1,71 @@
+import { Oid } from './oid';
+import { OdbObject } from './odb-object';
+import { OdbExpandId } from './odb-expand-id';
+
+export namespace Odb {
+    const enum STREAM {
+        RDONLY = 2,
+        WRONLY = 4,
+        RW = 6
+    }
+}
+
+export class Odb {
+    /**
+     *
+     *
+     * @static
+     * @param {string} objectsDir
+     * @returns {Promise<Odb>}
+     *
+     * @memberof Odb
+     */
+    static open(objectsDir: string): Promise<Odb>;
+
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Odb
+     */
+    addDiskAlternate(path: string): number;
+    /**
+     *
+     *
+     *
+     * @memberof Odb
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @returns {Promise<OdbObject>}
+     *
+     * @memberof Odb
+     */
+    read(id: Oid): Promise<OdbObject>;
+    /**
+     *
+     *
+     * @param {Buffer} data
+     * @param {number} len
+     * @param {number} type
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Odb
+     */
+    write(data: Buffer, len: number, type: number): Promise<Oid>;
+    /**
+     *
+     *
+     * @param {OdbExpandId} ids
+     * @param {number} count
+     * @returns {number}
+     *
+     * @memberof Odb
+     */
+    expandIds(ids: OdbExpandId, count: number): number;
+}
diff --git a/types/nodegit/oid-array.d.ts b/types/nodegit/oid-array.d.ts
new file mode 100644
index 0000000000..0b95d31a5d
--- /dev/null
+++ b/types/nodegit/oid-array.d.ts
@@ -0,0 +1,25 @@
+import { Oid } from './oid';
+
+export class Oidarray {
+    /**
+     *
+     *
+     *
+     * @memberof Oidarray
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof Oidarray
+     */
+    ids: Oid;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Oidarray
+     */
+    count: number;
+}
diff --git a/types/nodegit/oid.d.ts b/types/nodegit/oid.d.ts
new file mode 100644
index 0000000000..412a931f00
--- /dev/null
+++ b/types/nodegit/oid.d.ts
@@ -0,0 +1,73 @@
+export class Oid {
+    static fromString(str: string): Oid;
+    /**
+     *
+     *
+     * @param {Oid} b
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    cmp(b: Oid): number;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Oid
+     */
+    cpy(): Oid;
+    /**
+     *
+     *
+     * @param {Oid} b
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    equal(b: Oid): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    iszero(): number;
+    /**
+     *
+     *
+     * @param {Oid} b
+     * @param {number} len
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    ncmp(b: Oid, len: number): number;
+    /**
+     *
+     *
+     * @param {string} str
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    strcmp(str: string): number;
+    /**
+     *
+     *
+     * @param {string} str
+     * @returns {number}
+     *
+     * @memberof Oid
+     */
+    streq(str: string): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Oid
+     */
+    tostrS(): string;
+}
diff --git a/types/nodegit/open-ssl.d.ts b/types/nodegit/open-ssl.d.ts
new file mode 100644
index 0000000000..4b604a6f43
--- /dev/null
+++ b/types/nodegit/open-ssl.d.ts
@@ -0,0 +1,11 @@
+export class Openssl {
+    /**
+     *
+     *
+     * @static
+     * @returns {number}
+     *
+     * @memberof Openssl
+     */
+    static setLocking(): number;
+}
diff --git a/types/nodegit/pack-builder.d.ts b/types/nodegit/pack-builder.d.ts
new file mode 100644
index 0000000000..e528ccbf38
--- /dev/null
+++ b/types/nodegit/pack-builder.d.ts
@@ -0,0 +1,111 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Revwalk } from './rev-walk';
+
+export namespace Packbuilder {
+    const enum STAGE {
+        ADDING_OBJECTS = 0,
+        DELTAFICATION = 1
+    }
+}
+
+export class Packbuilder {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Packbuilder}
+     *
+     * @memberof Packbuilder
+     */
+    static create(repo: Repository): Packbuilder;
+
+    /**
+     *
+     *
+     *
+     * @memberof Packbuilder
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Packbuilder
+     */
+    hash(): Oid;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    insert(id: Oid, name: string): number;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    insertCommit(id: Oid): number;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    insertRecur(id: Oid, name: string): number;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    insertTree(id: Oid): number;
+    /**
+     *
+     *
+     * @param {Revwalk} walk
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    insertWalk(walk: Revwalk): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    objectCount(): number;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    setThreads(n: number): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Packbuilder
+     */
+    written(): number;
+}
diff --git a/types/nodegit/path-spec.d.ts b/types/nodegit/path-spec.d.ts
new file mode 100644
index 0000000000..0581523300
--- /dev/null
+++ b/types/nodegit/path-spec.d.ts
@@ -0,0 +1,142 @@
+import { DiffDelta } from './diff-delta';
+import { Tree } from './tree';
+import { Diff } from './diff';
+import { Repository } from './repository';
+import { Index } from './index';
+import { Strarray } from './str-array';
+
+export namespace Pathspec {
+    const enum FLAG {
+        DEFAULT = 0,
+        IGNORE_CASE = 1,
+        USE_CASE = 2,
+        NO_GLOB = 4,
+        NO_MATCH_ERROR = 8,
+        FIND_FAILURES = 16,
+        FAILURES_ONLY = 32
+    }
+}
+
+export class Pathspec {
+    /**
+     *
+     *
+     * @static
+     * @param {*} m
+     * @param {number} pos
+     * @returns {DiffDelta}
+     *
+     * @memberof Pathspec
+     */
+    static matchListDiffEntry(m: any, pos: number): DiffDelta;
+    /**
+     *
+     *
+     * @static
+     * @param {*} m
+     * @param {number} pos
+     * @returns {string}
+     *
+     * @memberof Pathspec
+     */
+    static matchListEntry(m: any, pos: number): string;
+    /**
+     *
+     *
+     * @static
+     * @param {*} m
+     * @returns {number}
+     *
+     * @memberof Pathspec
+     */
+    static matchListEntrycount(m: any): number;
+    /**
+     *
+     *
+     * @static
+     * @param {*} m
+     * @param {number} pos
+     * @returns {string}
+     *
+     * @memberof Pathspec
+     */
+    static matchListFailedEntry(m: any, pos: number): string;
+    /**
+     *
+     *
+     * @static
+     * @param {*} m
+     * @returns {number}
+     *
+     * @memberof Pathspec
+     */
+    static matchListFailedEntrycount(m: any): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Strarray} pathspec
+     * @returns {Pathspec}
+     *
+     * @memberof Pathspec
+     */
+    static create(pathspec: Strarray): Pathspec;
+
+    /**
+     *
+     *
+     *
+     * @memberof Pathspec
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @param {Diff} diff
+     * @param {number} flags
+     * @returns {Promise<any>}
+     *
+     * @memberof Pathspec
+     */
+    matchDiff(diff: Diff, flags: number): Promise<any>;
+    /**
+     *
+     *
+     * @param {Index} index
+     * @param {number} flags
+     * @returns {Promise<any>}
+     *
+     * @memberof Pathspec
+     */
+    matchIndex(index: Index, flags: number): Promise<any>;
+    /**
+     *
+     *
+     * @param {Tree} tree
+     * @param {number} flags
+     * @returns {Promise<any>}
+     *
+     * @memberof Pathspec
+     */
+    matchTree(tree: Tree, flags: number): Promise<any>;
+    /**
+     *
+     *
+     * @param {Repository} repo
+     * @param {number} flags
+     * @returns {Promise<any>}
+     *
+     * @memberof Pathspec
+     */
+    matchWorkdir(repo: Repository, flags: number): Promise<any>;
+    /**
+     *
+     *
+     * @param {number} flags
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Pathspec
+     */
+    matchesPath(flags: number, path: string): number;
+}
diff --git a/types/nodegit/proxy-options.d.ts b/types/nodegit/proxy-options.d.ts
new file mode 100644
index 0000000000..600b34cd04
--- /dev/null
+++ b/types/nodegit/proxy-options.d.ts
@@ -0,0 +1,44 @@
+export class ProxyOptions {
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof ProxyOptions
+     */
+    certificateCheck?: Function;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof ProxyOptions
+     */
+    credentials?: Function;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof ProxyOptions
+     */
+    payload?: any;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof ProxyOptions
+     */
+    type?: number;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof ProxyOptions
+     */
+    url?: string;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof ProxyOptions
+     */
+    version?: number;
+}
diff --git a/types/nodegit/proxy.d.ts b/types/nodegit/proxy.d.ts
new file mode 100644
index 0000000000..8b4806a2e0
--- /dev/null
+++ b/types/nodegit/proxy.d.ts
@@ -0,0 +1,5 @@
+import { ProxyOptions } from './proxy-options';
+
+export class Proxy {
+    static initOptions(opts: ProxyOptions, version: number): number;
+}
diff --git a/types/nodegit/push-options.d.ts b/types/nodegit/push-options.d.ts
new file mode 100644
index 0000000000..e9cc6e2dcb
--- /dev/null
+++ b/types/nodegit/push-options.d.ts
@@ -0,0 +1,41 @@
+import { RemoteCallbacks } from './remote-callbacks';
+import { Strarray } from './str-array';
+import { ProxyOptions } from './proxy-options';
+
+export interface PushOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof PushOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof PushOptions
+     */
+    pbParallelism?: number;
+    /**
+     *
+     *
+     * @type {RemoteCallbacks}
+     * @memberof PushOptions
+     */
+    callbacks?: RemoteCallbacks;
+    /**
+     *
+     *
+     * @type {Strarray}
+     * @memberof PushOptions
+     */
+    customHeaders: Strarray;
+    /**
+     *
+     *
+     * @type {ProxyOptions}
+     * @memberof PushOptions
+     */
+    proxyOpts: ProxyOptions;
+}
diff --git a/types/nodegit/push-update.d.ts b/types/nodegit/push-update.d.ts
new file mode 100644
index 0000000000..cdd393d9ba
--- /dev/null
+++ b/types/nodegit/push-update.d.ts
@@ -0,0 +1,32 @@
+import { Oid } from './oid';
+
+export class PushUpdate {
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof PushUpdate
+     */
+    srcRefname: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof PushUpdate
+     */
+    dstRefname: string;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof PushUpdate
+     */
+    src: Oid;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof PushUpdate
+     */
+    dst: Oid;
+}
diff --git a/types/nodegit/push.d.ts b/types/nodegit/push.d.ts
new file mode 100644
index 0000000000..4a4ce53dac
--- /dev/null
+++ b/types/nodegit/push.d.ts
@@ -0,0 +1,16 @@
+import { RemoteCallbacks } from './remote-callbacks';
+import { PushOptions } from './push-options';
+
+export class Push {
+    /**
+     *
+     *
+     * @static
+     * @param {PushOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Push
+     */
+    static initOptions(opts: PushOptions, version: number): number;
+}
diff --git a/types/nodegit/rebase-operation.d.ts b/types/nodegit/rebase-operation.d.ts
new file mode 100644
index 0000000000..e52542fb54
--- /dev/null
+++ b/types/nodegit/rebase-operation.d.ts
@@ -0,0 +1,36 @@
+import { Oid } from './oid';
+
+export namespace RebaseOperation {
+    const enum REBASE_OPERATION {
+        PICK = 0,
+        REWORD = 1,
+        EDIT = 2,
+        SQUASH = 3,
+        FIXUP = 4,
+        EXEC = 5
+    }
+}
+
+export class RebaseOperation {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof RebaseOperation
+     */
+    type: number;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof RebaseOperation
+     */
+    id: Oid;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof RebaseOperation
+     */
+    exec: string;
+}
diff --git a/types/nodegit/rebase.d.ts b/types/nodegit/rebase.d.ts
new file mode 100644
index 0000000000..e1d64ede01
--- /dev/null
+++ b/types/nodegit/rebase.d.ts
@@ -0,0 +1,125 @@
+import { CheckoutOptions } from './checkout-options';
+import { AnnotatedCommit } from './annotated-commit';
+import { Repository } from './repository';
+import { Signature } from './signature';
+import { Oid } from './oid';
+import { RebaseOperation } from './rebase-operation';
+import { Index } from './index';
+
+export interface RebaseOptions {
+    version: number;
+    quiet: number;
+    rewriteNotesRef: string;
+    checkoutOptions: CheckoutOptions;
+}
+
+export class Rebase {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {AnnotatedCommit} branch
+     * @param {AnnotatedCommit} upstream
+     * @param {AnnotatedCommit} onto
+     * @param {RebaseOptions} opts
+     * @returns {Promise<Rebase>}
+     *
+     * @memberof Rebase
+     */
+    static init(repo: Repository, branch: AnnotatedCommit, upstream: AnnotatedCommit, onto: AnnotatedCommit, opts: RebaseOptions): Promise<Rebase>;
+    /**
+     *
+     *
+     * @static
+     * @param {RebaseOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    static initOptions(opts: RebaseOptions, version: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {RebaseOptions} opts
+     * @returns {Promise<Rebase>}
+     *
+     * @memberof Rebase
+     */
+    static open(repo: Repository, opts: RebaseOptions): Promise<Rebase>;
+
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    abort(): number;
+    /**
+     *
+     *
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} messageEncoding
+     * @param {string} message
+     * @returns {Oid}
+     *
+     * @memberof Rebase
+     */
+    commit(author: Signature, committer: Signature, messageEncoding: string, message: string): Oid;
+    /**
+     *
+     *
+     * @param {Signature} signature
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    finish(signature: Signature): number;
+    /**
+     *
+     *
+     * @param {Index} index
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    inmemoryIndex(index: Index): number;
+    /**
+     *
+     *
+     * @returns {Promise<RebaseOperation>}
+     *
+     * @memberof Rebase
+     */
+    next(): Promise<RebaseOperation>;
+    /**
+     *
+     *
+     * @param {number} idx
+     * @returns {RebaseOperation}
+     *
+     * @memberof Rebase
+     */
+    operationByIndex(idx: number): RebaseOperation;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    operationCurrent(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Rebase
+     */
+    operationEntrycount(): number;
+}
diff --git a/types/nodegit/ref-db.d.ts b/types/nodegit/ref-db.d.ts
new file mode 100644
index 0000000000..de927eec58
--- /dev/null
+++ b/types/nodegit/ref-db.d.ts
@@ -0,0 +1,30 @@
+import { Repository } from './repository';
+
+export class Refdb {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Promise<Refdb>}
+     *
+     * @memberof Refdb
+     */
+    static open(repo: Repository): Promise<Refdb>;
+
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Refdb
+     */
+    compress(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Refdb
+     */
+    free(): void;
+}
diff --git a/types/nodegit/ref-log.d.ts b/types/nodegit/ref-log.d.ts
new file mode 100644
index 0000000000..78367ffccd
--- /dev/null
+++ b/types/nodegit/ref-log.d.ts
@@ -0,0 +1,129 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Signature } from './signature';
+
+export class Reflog {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    static delete(repo: Repository, name: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {Promise<Reflog>}
+     *
+     * @memberof Reflog
+     */
+    static read(repo: Repository, name: string): Promise<Reflog>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} oldName
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    static rename(repo: Repository, oldName: string, name: string): number;
+
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @param {Signature} committer
+     * @param {string} msg
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    append(id: Oid, committer: Signature, msg: string): number;
+    /**
+     *
+     *
+     * @param {number} idx
+     * @param {number} rewritePreviousEntry
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    drop(idx: number, rewritePreviousEntry: number): number;
+    /**
+     *
+     *
+     * @param {number} idx
+     * @returns {ReflogEntry}
+     *
+     * @memberof Reflog
+     */
+    entryByIndex(idx: number): ReflogEntry;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    entrycount(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Reflog
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reflog
+     */
+    write(): number;
+}
+
+export class ReflogEntry {
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof ReflogEntry
+     */
+    committer(): Signature;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof ReflogEntry
+     */
+    idNew(): Oid;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof ReflogEntry
+     */
+    idOld(): Oid;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof ReflogEntry
+     */
+    message(): string;
+}
diff --git a/types/nodegit/ref-spec.d.ts b/types/nodegit/ref-spec.d.ts
new file mode 100644
index 0000000000..e48c8cd2ac
--- /dev/null
+++ b/types/nodegit/ref-spec.d.ts
@@ -0,0 +1,52 @@
+export class Refspec {
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Refspec
+     */
+    direction(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Refspec
+     */
+    dst(): string;
+    /**
+     *
+     *
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Refspec
+     */
+    dstMatches(refname: string): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Refspec
+     */
+    force(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Refspec
+     */
+    src(): string;
+    /**
+     *
+     *
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Refspec
+     */
+    srcMatches(refname: string): number;
+}
diff --git a/types/nodegit/reference.d.ts b/types/nodegit/reference.d.ts
new file mode 100644
index 0000000000..cb449ee225
--- /dev/null
+++ b/types/nodegit/reference.d.ts
@@ -0,0 +1,383 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Object } from './object';
+
+export namespace Reference {
+    const enum TYPE {
+        INVALID = 0,
+        OID = 1,
+        SYMBOLIC = 2,
+        LISTALL = 3
+    }
+
+    const enum NORMALIZE {
+        REF_FORMAT_NORMAL = 0,
+        REF_FORMAT_ALLOW_ONELEVEL = 1,
+        REF_FORMAT_REFSPEC_PATTERN = 2,
+        REF_FORMAT_REFSPEC_SHORTHAND = 4
+    }
+}
+
+export class Reference {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {Oid} id
+     * @param {number} force
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static create(repo: Repository, name: string, id: Oid, force: number, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {Oid} id
+     * @param {number} force
+     * @param {Oid} currentId
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static createMatching(repo: Repository, name: string, id: Oid, force: number, currentId: Oid, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Reference)} id
+     * @param {Function} callback
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static dwim(repo: Repository, id: string | Reference, callback: Function): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    static ensureLog(repo: Repository, refname: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    static hasLog(repo: Repository, refname: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    static isValidName(refname: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Reference
+     */
+    static list(repo: Repository): Promise<any[]>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Reference)} id
+     * @param {Function} callback
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static lookup(repo: Repository, id: string | Reference, callback: Function): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Reference
+     */
+    static nameToId(repo: Repository, name: string): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} bufferOut
+     * @param {number} bufferSize
+     * @param {string} name
+     * @param {number} flags
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    static normalizeName(bufferOut: string, bufferSize: number, name: string, flags: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    static remove(repo: Repository, name: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} target
+     * @param {number} force
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static symbolicCreate(repo: Repository, name: string, target: string, force: number, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} target
+     * @param {number} force
+     * @param {string} currentValue
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    static symbolicCreateMatching(repo: Repository, name: string, target: string, force: number, currentValue: string, logMessage: string): Promise<Reference>;
+
+    /**
+     *
+     *
+     * @param {Reference} ref2
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    cmp(ref2: Reference): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    delete(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    isBranch(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    isNote(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    isRemote(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    isTag(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Reference
+     */
+    name(): string;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Reference
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @param {number} type
+     * @returns {Promise<Object>}
+     *
+     * @memberof Reference
+     */
+    peel(type: number): Promise<Object>;
+    /**
+     *
+     *
+     * @param {string} newName
+     * @param {number} force
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    rename(newName: string, force: number, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    resolve(): Promise<Reference>;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    setTarget(id: Oid, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Reference
+     */
+    shorthand(): string;
+    /**
+     *
+     *
+     * @param {string} target
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    symbolicSetTarget(target: string, logMessage: string): Promise<Reference>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Reference
+     */
+    symbolicTarget(): string;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Reference
+     */
+    target(): Oid;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Reference
+     */
+    targetPeel(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Reference
+     */
+    type(): number;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof Reference
+     */
+    isValid(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof Reference
+     */
+    isConcrete(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof Reference
+     */
+    isSymbolic(): boolean;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Reference
+     */
+    toString(): string;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof Reference
+     */
+    isHead(): boolean;
+    /**
+     *
+     *
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Reference
+     */
+    dup(): Promise<Reference>;
+}
diff --git a/types/nodegit/remote-callbacks.d.ts b/types/nodegit/remote-callbacks.d.ts
new file mode 100644
index 0000000000..b3cf3d9054
--- /dev/null
+++ b/types/nodegit/remote-callbacks.d.ts
@@ -0,0 +1,44 @@
+export class RemoteCallbacks {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof RemoteCallbacks
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof RemoteCallbacks
+     */
+    credentials?: Function;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof RemoteCallbacks
+     */
+    certificateCheck?: Function;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof RemoteCallbacks
+     */
+    transferProgress?: Function;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof RemoteCallbacks
+     */
+    transport?: Function;
+    /**
+     *
+     *
+     * @type {undefined}
+     * @memberof RemoteCallbacks
+     */
+    payload?: undefined;
+}
diff --git a/types/nodegit/remote.d.ts b/types/nodegit/remote.d.ts
new file mode 100644
index 0000000000..d1bee99365
--- /dev/null
+++ b/types/nodegit/remote.d.ts
@@ -0,0 +1,390 @@
+import { Repository } from './repository';
+import { RemoteCallbacks } from './remote-callbacks';
+import { Strarray } from './str-array';
+import { FetchOptions } from './fetch-options';
+import { Buf } from './buf';
+import { Enums } from './enums';
+import { TransferProgress } from './transfer-progress';
+import { PushOptions } from './push-options';
+import { Refspec } from './ref-spec';
+
+export namespace Remote {
+    const enum AUTOTAG_OPTION {
+        DOWNLOAD_TAGS_UNSPECIFIED = 0,
+        DOWNLOAD_TAGS_AUTO = 1,
+        DOWNLOAD_TAGS_NONE = 2,
+        DOWNLOAD_TAGS_ALL = 3
+    }
+
+    const enum COMPLETION_TYPE {
+        COMPLETION_DOWNLOAD = 0,
+        COMPLETION_INDEXING = 1,
+        COMPLETION_ERROR = 2
+    }
+}
+
+export class Remote {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} remote
+     * @param {string} refspec
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static addFetch(repo: Repository, remote: string, refspec: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} remote
+     * @param {string} refspec
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static addPush(repo: Repository, remote: string, refspec: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} url
+     * @returns {Remote}
+     *
+     * @memberof Remote
+     */
+    static create(repo: Repository, name: string, url: string): Remote;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} url
+     * @returns {Promise<Remote>}
+     *
+     * @memberof Remote
+     */
+    static createAnonymous(repo: Repository, url: string): Promise<Remote>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} url
+     * @param {string} fetch
+     * @returns {Promise<Remote>}
+     *
+     * @memberof Remote
+     */
+    static createWithFetchspec(repo: Repository, name: string, url: string, fetch: string): Promise<Remote>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {Promise<number>}
+     *
+     * @memberof Remote
+     */
+    static delete(repo: Repository, name: string): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {RemoteCallbacks} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static initCallbacks(opts: RemoteCallbacks, version: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {string} remoteName
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static isValidName(remoteName: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Remote
+     */
+    static list(repo: Repository): Promise<any[]>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Remote)} name
+     * @param {Function} callback
+     * @returns {Promise<Remote>}
+     *
+     * @memberof Remote
+     */
+    static lookup(repo: Repository, name: string | Remote, callback: Function): Promise<Remote>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} remote
+     * @param {number} value
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static setAutotag(repo: Repository, remote: string, value: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} remote
+     * @param {string} url
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static setPushurl(repo: Repository, remote: string, url: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} remote
+     * @param {string} url
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    static setUrl(repo: Repository, remote: string, url: string): number;
+
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    autotag(): number;
+    /**
+     *
+     *
+     * @param {Enums.DIRECTION} direction
+     * @param {RemoteCallbacks} callbacks
+     * @param {Function} callback
+     * @returns {Promise<number>}
+     *
+     * @memberof Remote
+     */
+    connect(direction: Enums.DIRECTION, callbacks: RemoteCallbacks, callback: Function): Promise<number>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    connected(): number;
+    /**
+     *
+     *
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Remote
+     */
+    defaultBranch(): Promise<Buf>;
+    /**
+     *
+     *
+     * @returns {Promise<void>}
+     *
+     * @memberof Remote
+     */
+    disconnect(): Promise<void>;
+    /**
+     *
+     *
+     * @param {any[]} refSpecs
+     * @param {FetchOptions} opts
+     * @param {Function} callback
+     * @returns {Promise<number>}
+     *
+     * @memberof Remote
+     */
+    download(refSpecs: any[], opts: FetchOptions, callback: Function): Promise<number>;
+    dup(): Promise<Remote>;
+    /**
+     *
+     *
+     * @param {any[]} refSpecs
+     * @param {FetchOptions} opts
+     * @param {string} message
+     * @param {Function} callback
+     * @returns {Promise<number>}
+     *
+     * @memberof Remote
+     */
+    fetch(refSpecs: any[], opts: FetchOptions, message: string, callback: Function): Promise<number>;
+    /**
+     *
+     *
+     *
+     * @memberof Remote
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Remote
+     */
+    getFetchRefspecs(): Promise<any[]>;
+    /**
+     *
+     *
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Remote
+     */
+    getPushRefspecs(): Promise<any[]>;
+    /**
+     *
+     *
+     * @param {number} n
+     * @returns {Refspec}
+     *
+     * @memberof Remote
+     */
+    getRefspec(n: number): Refspec;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Remote
+     */
+    name(): string;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Remote
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @param {RemoteCallbacks} callbacks
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    prune(callbacks: RemoteCallbacks): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    pruneRefs(): number;
+    /**
+     *
+     *
+     * @param {any[]} refSpecs
+     * @param {PushOptions} options
+     * @param {Function} callback
+     * @returns {Promise<number>}
+     *
+     * @memberof Remote
+     */
+    push(refSpecs: any[], options: PushOptions, callback: Function): Promise<number>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Remote
+     */
+    pushurl(): string;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    refspecCount(): number;
+    /**
+     *
+     *
+     * @returns {TransferProgress}
+     *
+     * @memberof Remote
+     */
+    stats(): TransferProgress;
+    /**
+     *
+     *
+     *
+     * @memberof Remote
+     */
+    stop(): void;
+    /**
+     *
+     *
+     * @param {RemoteCallbacks} callbacks
+     * @param {number} updateFetchhead
+     * @param {number} downloadTags
+     * @param {string} reflogMessage
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    updateTips(callbacks: RemoteCallbacks, updateFetchhead: number, downloadTags: number, reflogMessage: string): number;
+    /**
+     *
+     *
+     * @param {Strarray} refspecs
+     * @param {PushOptions} opts
+     * @returns {number}
+     *
+     * @memberof Remote
+     */
+    upload(refspecs: Strarray, opts: PushOptions): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Remote
+     */
+    url(): string;
+    /**
+     * Lists advertised references from a remote. You must connect to the remote before using referenceList.
+     *
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Remote
+     */
+    referenceList(): Promise<any[]>;
+}
diff --git a/types/nodegit/repository.d.ts b/types/nodegit/repository.d.ts
new file mode 100644
index 0000000000..a8882b5d55
--- /dev/null
+++ b/types/nodegit/repository.d.ts
@@ -0,0 +1,786 @@
+import { Oid } from './oid';
+import { Buf } from './buf';
+import { Reference } from './reference';
+import { Odb } from './odb';
+import { Object } from './object';
+import { Index } from './index_';
+import { Commit } from './commit';
+import { Blob } from './blob';
+import { Tree } from './tree';
+import { Signature } from './signature';
+import { AnnotatedCommit } from './annotated-commit';
+import { FetchOptions } from './fetch-options';
+import { CheckoutOptions } from './checkout-options';
+import { Remote } from './remote';
+import { Tag } from './tag';
+import { Config } from './config';
+import { Merge } from './merge';
+import { MergeOptions } from './merge-options';
+import { Refdb } from './ref-db';
+import { Revwalk } from './rev-walk';
+
+export interface RepositoryInitOptions {
+    description: string;
+    flags: number;
+    initialHead: string;
+    mode: number;
+    originUrl: string;
+    templatePath: string;
+    version: number;
+    workdirPath: string;
+}
+
+export class Repository {
+    /**
+     * Creates a branch with the passed in name pointing to the commit
+     *
+     * @static
+     * @param {string} startPath
+     * @param {number} acrossFs
+     * @param {string} ceilingDirs
+     * @returns {Promise<string>}
+     *
+     * @memberof Repository
+     */
+    static discover(startPath: string, acrossFs: number, ceilingDirs: string): Promise<Buf>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} path
+     * @param {boolean} [isBare]
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static init(path: string, isBare?: boolean): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} repoPath
+     * @param {RepositoryInitOptions} [options]
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static initExt(repoPath: string, options?: RepositoryInitOptions): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} path
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static open(path: string): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} barePath
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static openBare(barePath: string): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} path
+     * @param {number} [flags]
+     * @param {string} [ceilingDirs]
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static openExt(path: string, flags?: number, ceilingDirs?: string): Promise<Repository>;
+    /**
+     *
+     *
+     * @static
+     * @param {Odb} odb
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Repository
+     */
+    static wrapOdb(odb: Odb): Promise<Repository>;
+
+    /**
+     *
+     *
+     *
+     * @memberof Repository
+     */
+    cleanup(): void;
+    /**
+     *
+     *
+     * @returns {Promise<Config>}
+     *
+     * @memberof Repository
+     */
+    config(): Promise<Config>;
+    /**
+     *
+     *
+     * @returns {Promise<Config>}
+     *
+     * @memberof Repository
+     */
+    configSnapshot(): Promise<Config>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    detachHead(): number;
+    /**
+     *
+     *
+     * @param {Function} callback
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    fetchheadForeach(callback: Function): Promise<any>;
+    /**
+     *
+     *
+     *
+     * @memberof Repository
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Repository
+     */
+    getNamespace(): string;
+    /**
+     *
+     *
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    head(): Promise<Reference>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    headDetached(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    headUnborn(): number;
+    /**
+     *
+     *
+     * @returns {Promise<Index>}
+     *
+     * @memberof Repository
+     */
+    index(): Promise<Index>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    isBare(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    isEmpty(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    isShallow(): number;
+    /**
+     *
+     *
+     * @param {Function} callback
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    mergeheadForeach(callback: Function): Promise<any>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    messageRemove(): number;
+    /**
+     *
+     *
+     * @returns {Promise<Odb>}
+     *
+     * @memberof Repository
+     */
+    odb(): Promise<Odb>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Repository
+     */
+    path(): string;
+    /**
+     *
+     *
+     * @returns {Promise<Refdb>}
+     *
+     * @memberof Repository
+     */
+    refdb(): Promise<Refdb>;
+    /**
+     *
+     *
+     * @param {string} refname
+     * @returns {Promise<number>}
+     *
+     * @memberof Repository
+     */
+    setHead(refname: string): Promise<number>;
+    /**
+     *
+     *
+     * @param {Oid} commitish
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    setHeadDetached(commitish: Oid): number;
+    /**
+     *
+     *
+     * @param {AnnotatedCommit} commitish
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    setHeadDetachedFromAnnotated(commitish: AnnotatedCommit): number;
+    /**
+     *
+     *
+     * @param {string} name
+     * @param {string} email
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    setIdent(name: string, email: string): number;
+    /**
+     *
+     *
+     * @param {string} nmspace
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    setNamespace(nmspace: string): number;
+    /**
+     *
+     *
+     * @param {string} workdir
+     * @param {number} updateGitLink
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    setWorkdir(workdir: string, updateGitLink: number): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    state(): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Repository
+     */
+    stateCleanup(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Repository
+     */
+    workdir(): string;
+    /**
+     * Creates a branch with the passed in name pointing to the commit
+     *
+     * @param {string} name
+     * @param {(Commit | string | Oid)} commit
+     * @param {boolean} force
+     * @param {Signature} signature
+     * @param {string} logMessage
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    createBranch(name: string, commit: Commit | string | Oid, force: boolean, signature: Signature, logMessage: string): Promise<Reference>;
+    /**
+     * Look up a refs's commit.
+     *
+     * @param {(string | Reference)} name
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Repository
+     */
+    getReferenceCommit(name: string | Reference): Promise<Commit>;
+    /**
+     * Look up a branch. Alias for getReference
+     *
+     * @param {(string | Reference)} name
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    getBranch(name: string | Reference): Promise<Reference>;
+    /**
+     * Look up a branch's most recent commit. Alias to getReferenceCommit
+     *
+     * @param {(string | Reference)} name
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Repository
+     */
+    getBranchCommit(name: string | Reference): Promise<Commit>;
+    /**
+     * Gets the branch that HEAD currently points to Is an alias to head()
+     *
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    getCurrentBranch(): Promise<Reference>;
+    /**
+     * Lookup the reference with the given name.
+     *
+     * @param {(string | Reference)} name
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    getReference(name: string | Reference): Promise<Reference>;
+    /**
+     * Lookup references for a repository.
+     *
+     * @param {Reference.TYPE} type
+     * @returns {Promise<Reference[]>}
+     *
+     * @memberof Repository
+     */
+    getReferences(type: Reference.TYPE): Promise<Reference[]>;
+    /**
+     * Lookup reference names for a repository.
+     *
+     * @param {Reference.TYPE} type
+     * @returns {Promise<string[]>}
+     *
+     * @memberof Repository
+     */
+    getReferenceNames(type: Reference.TYPE): Promise<string[]>;
+    /**
+     *
+     *
+     * @param {(string | Oid)} string
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Repository
+     */
+    getCommit(string: string | Oid): Promise<Commit>;
+    /**
+     * Retrieve the blob represented by the oid.
+     *
+     * @param {(string | Oid)} string
+     * @returns {Promise<Blob>}
+     *
+     * @memberof Repository
+     */
+    getBlob(string: string | Oid): Promise<Blob>;
+    /**
+     * Retrieve the tree represented by the oid.
+     *
+     * @param {(string | Oid)} string
+     * @returns {Promise<Tree>}
+     *
+     * @memberof Repository
+     */
+    getTree(string: string | Oid): Promise<Tree>;
+    /**
+     *
+     *
+     * @param {(string | Oid)} string
+     * @param {string} name
+     * @param {string} message
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Repository
+     */
+    createTag(string: string | Oid, name: string, message: string): Promise<Tag>;
+    /**
+     * Creates a new lightweight tag
+     *
+     * @param {(string | Oid)} string
+     * @param {string} name
+     * @returns {Promise<Reference>}
+     *
+     * @memberof Repository
+     */
+    createLightweightTag(string: string | Oid, name: string): Promise<Reference>;
+    /**
+     * Retrieve the tag represented by the oid.
+     *
+     * @param {(string | Oid)} string
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Repository
+     */
+    getTag(string: string | Oid): Promise<Tag>;
+    /**
+     * Retrieve the tag represented by the tag name.
+     *
+     * @param {string} Short
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Repository
+     */
+    getTagByName(Short: string): Promise<Tag>;
+    /**
+     * Deletes a tag from a repository by the tag name.
+     *
+     * @param {string} Short
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    deleteTagByName(Short: string): Promise<any>;
+    /**
+     * Instantiate a new revision walker for browsing the Repository"s history. See also Commit.prototype.history()
+     *
+     * @param {(string | Oid)} string
+     * @returns {Revwalk}
+     *
+     * @memberof Repository
+     */
+    createRevWalk(string: string | Oid): Revwalk;
+    /**
+     * Retrieve the master branch commit.
+     *
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Repository
+     */
+    getMasterCommit(): Promise<Commit>;
+    /**
+     * Retrieve the commit that HEAD is currently pointing to
+     *
+     * @returns {Promise<Commit>}
+     *
+     * @memberof Repository
+     */
+    getHeadCommit(): Promise<Commit>;
+    /**
+     *
+     *
+     * @param {string} updateRef
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} message
+     * @param {(Tree | Oid | string)} Tree
+     * @param {any[]} parents
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Repository
+     */
+    createCommit(updateRef: string, author: Signature, committer: Signature, message: string, Tree: Tree | Oid | string, parents: any[]): Promise<Oid>;
+    /**
+     * Creates a new commit on HEAD from the list of passed in files
+     *
+     * @param {any[]} filesToAdd
+     * @param {Signature} author
+     * @param {Signature} committer
+     * @param {string} message
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Repository
+     */
+    createCommitOnHead(filesToAdd: any[], author: Signature, committer: Signature, message: string): Promise<Oid>;
+    /**
+     * Create a blob from a buffer
+     *
+     * @param {Buffer} buffer
+     * @returns {Oid}
+     *
+     * @memberof Repository
+     */
+    createBlobFromBuffer(buffer: Buffer): Oid;
+    /**
+     *
+     *
+     * @param {Tree} tree
+     * @returns {*}
+     *
+     * @memberof Repository
+     */
+    treeBuilder(tree: Tree): any;
+    /**
+     * Gets the default signature for the default user and now timestamp
+     *
+     * @returns {Signature}
+     *
+     * @memberof Repository
+     */
+    defaultSignature(): Signature;
+    /**
+     * Lists out the remotes in the given repository.
+     *
+     * @param {Function} Optional
+     * @returns {Promise<Object>}
+     *
+     * @memberof Repository
+     */
+    getRemotes(Optional: Function): Promise<Object>;
+    /**
+     * Gets a remote from the repo
+     *
+     * @param {(string | Remote)} remote
+     * @param {Function} callback
+     * @returns {Promise<Remote>}
+     *
+     * @memberof Repository
+     */
+    getRemote(remote: string | Remote, callback: Function): Promise<Remote>;
+    /**
+     * Fetches from a remote
+     *
+     * @param {(string | Remote)} remote
+     * @param {(Object | FetchOptions)} fetchOptions
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    fetch(remote: string | Remote, fetchOptions: Object | FetchOptions): Promise<void>;
+    /**
+     * Fetches from all remotes. This is done in series due to deadlocking issues with fetching from many remotes that can happen.
+     *
+     * @param {(Object | FetchOptions)} fetchOptions
+     * @param {Function} callback
+     * @returns {Promise<void>}
+     *
+     * @memberof Repository
+     */
+    fetchAll(fetchOptions: Object | FetchOptions, callback: Function): Promise<void>;
+    /**
+     *
+     *
+     * @param {(string | Reference)} to
+     * @param {(string | Reference)} from
+     * @param {Signature} signature
+     * @param {Merge.PREFERENCE} mergePreference
+     * @param {MergeOptions} mergeOptions
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Repository
+     */
+    mergeBranches(to: string | Reference, from: string | Reference, signature: Signature, mergePreference: Merge.PREFERENCE, mergeOptions: MergeOptions): Promise<Oid>;
+    /**
+     * Rebases a branch onto another branch
+     *
+     * @param {string} branch
+     * @param {string} upstream
+     * @param {string} onto
+     * @param {Signature} signature
+     * @param {Function} beforeNextFn
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Repository
+     */
+    rebaseBranches(branch: string, upstream: string, onto: string, signature: Signature, beforeNextFn: Function): Promise<Oid>;
+    /**
+     *
+     *
+     * @param {Signature} signature
+     * @param {Function} beforeNextFn
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Repository
+     */
+    continueRebase(signature: Signature, beforeNextFn: Function): Promise<Oid>;
+    /**
+     * Get the status of a repo to it's working directory
+     *
+     * @param {*} opts
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Repository
+     */
+    getStatus(opts: any): Promise<any[]>;
+    /**
+     * Get extended statuses of a repo to it's working directory. Status entries have status, headToIndex delta, and indexToWorkdir deltas
+     *
+     * @param {*} opts
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Repository
+     */
+    getStatusExt(opts: any): Promise<any[]>;
+    /**
+     * Get the names of the submodules in the repository.
+     *
+     * @returns {Promise<string[]>}
+     *
+     * @memberof Repository
+     */
+    getSubmoduleNames(): Promise<string[]>;
+    /**
+     * This will set the HEAD to point to the reference and then attempt to update the index and working tree to match the content of the latest commit on that reference
+     *
+     * @param {Reference} reference
+     * @param {(Object | CheckoutOptions)} opts
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    checkoutRef(reference: Reference, opts: Object | CheckoutOptions): Promise<any>;
+    /**
+     * This will set the HEAD to point to the local branch and then attempt to update the index and working tree to match the content of the latest commit on that branch
+     *
+     * @param {(string | Reference)} branch
+     * @param {(Object | CheckoutOptions)} opts
+     * @returns {Promise<any>}
+     *
+     * @memberof Repository
+     */
+    checkoutBranch(branch: string | Reference, opts: Object | CheckoutOptions): Promise<any>;
+    /**
+     * Stages or unstages line selection of a specified file
+     *
+     * @param {(string | any[])} filePath
+     * @param {boolean} stageNew
+     * @returns {Promise<number>}
+     *
+     * @memberof Repository
+     */
+    stageFilemode(filePath: string | any[], stageNew: boolean): Promise<number>;
+    /**
+     * Stages or unstages line selection of a specified file
+     *
+     * @param {string} filePath
+     * @param {any[]} newLines
+     * @param {boolean} isStaged
+     * @returns {Promise<number>}
+     *
+     * @memberof Repository
+     */
+    stageLines(filePath: string, newLines: any[], isStaged: boolean): Promise<number>;
+    /**
+     * Returns true if the repository is in the default NONE state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isDefaultState(): boolean;
+    /**
+     * Returns true if the repository is in the APPLY_MAILBOX or APPLY_MAILBOX_OR_REBASE state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isApplyingMailbox(): boolean;
+    /**
+     * Returns true if the repository is in the BISECT state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isBisecting(): boolean;
+    /**
+     * Returns true if the repository is in the CHERRYPICK state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isCherrypicking(): boolean;
+    /**
+     * Returns true if the repository is in the MERGE state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isMerging(): boolean;
+    /**
+     * Returns true if the repository is in the REBASE, REBASE_INTERACTIVE, or REBASE_MERGE state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isRebasing(): boolean;
+    /**
+     * Returns true if the repository is in the REVERT state.
+     *
+     * @returns {boolean}
+     *
+     * @memberof Repository
+     */
+    isReverting(): boolean;
+    /**
+     * Discard line selection of a specified file. Assumes selected lines are unstaged.
+     *
+     * @param {string} filePath
+     * @param {any[]} selectedLines
+     * @returns {Promise<number>}
+     *
+     * @memberof Repository
+     */
+    discardLines(filePath: string, selectedLines: any[]): Promise<number>;
+    /**
+     * Grabs a fresh copy of the index from the repository. Invalidates all previously grabbed indexes
+     *
+     * @returns {Promise<Index>}
+     *
+     * @memberof Repository
+     */
+    refreshIndex(): Promise<Index>;
+}
diff --git a/types/nodegit/reset.d.ts b/types/nodegit/reset.d.ts
new file mode 100644
index 0000000000..0fb3af1088
--- /dev/null
+++ b/types/nodegit/reset.d.ts
@@ -0,0 +1,56 @@
+import { AnnotatedCommit } from './annotated-commit';
+import { Repository } from './repository';
+import { Object } from './object';
+import { Strarray } from './str-array';
+import { CheckoutOptions } from './checkout-options';
+
+export namespace Reset {
+    const enum TYPE {
+        SOFT = 1,
+        MIXED = 2,
+        HARD = 3
+    }
+}
+
+export class Reset {
+    /**
+     * Look up a refs's commit.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Object} target
+     * @param {number} resetType
+     * @param {CheckoutOptions} checkoutOpts
+     * @returns {Promise<number>}
+     *
+     * @memberof Reset
+     */
+    static reset(repo: Repository, target: Object, resetType: number, checkoutOpts: CheckoutOptions): Promise<number>;
+    /**
+     * Look up a refs's commit.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Object} target
+     * @param {Strarray} pathspecs
+     * @returns {Promise<number>}
+     *
+     * @memberof Reset
+     */
+    static default(repo: Repository, target: Object, pathspecs: Strarray): Promise<number>;
+    /**
+     * Sets the current head to the specified commit oid and optionally resets the index and working tree to match.
+     * This behaves like reset but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.
+     * See the documentation for reset.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {AnnotatedCommit} commit
+     * @param {number} resetType
+     * @param {CheckoutOptions} checkoutOpts
+     * @returns {number}
+     *
+     * @memberof Reset
+     */
+    static fromAnnotated(repo: Repository, commit: AnnotatedCommit, resetType: number, checkoutOpts: CheckoutOptions): number;
+}
diff --git a/types/nodegit/rev-parse.d.ts b/types/nodegit/rev-parse.d.ts
new file mode 100644
index 0000000000..098f880cd0
--- /dev/null
+++ b/types/nodegit/rev-parse.d.ts
@@ -0,0 +1,38 @@
+import { Object } from './object';
+import { Repository } from './repository';
+import { Reference } from './reference';
+
+export namespace Revparse {
+    const enum MODE {
+        SINGLE = 1,
+        RANGE = 2,
+        MERGE_BASE = 4
+    }
+}
+
+export class Revparse {
+    /**
+     *
+     *
+     * @static
+     * @param {Object} objectOut
+     * @param {Reference} referenceOut
+     * @param {Repository} repo
+     * @param {string} spec
+     * @returns {number}
+     *
+     * @memberof Revparse
+     */
+    static ext(objectOut: Object, referenceOut: Reference, repo: Repository, spec: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} spec
+     * @returns {Promise<Object>}
+     *
+     * @memberof Revparse
+     */
+    static single(repo: Repository, spec: string): Promise<Object>;
+}
diff --git a/types/nodegit/rev-walk.d.ts b/types/nodegit/rev-walk.d.ts
new file mode 100644
index 0000000000..2736f57323
--- /dev/null
+++ b/types/nodegit/rev-walk.d.ts
@@ -0,0 +1,190 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Commit } from './commit';
+
+export namespace Revwalk {
+    const enum SORT {
+        NONE = 0,
+        TOPOLOGICAL = 1,
+        TIME = 2,
+        REVERSE = 4
+    }
+}
+
+export class Revwalk {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Revwalk}
+     *
+     * @memberof Revwalk
+     */
+    static create(repo: Repository): Revwalk;
+
+    /**
+     *
+     *
+     * @param {Oid} commitId
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    hide(commitId: Oid): number;
+    /**
+     *
+     *
+     * @param {string} glob
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    hideGlob(glob: string): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    hideHead(): number;
+    /**
+     *
+     *
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    hideRef(refname: string): number;
+    /**
+     *
+     *
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Revwalk
+     */
+    next(): Promise<Oid>;
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    push(id: Oid): number;
+    /**
+     *
+     *
+     * @param {string} glob
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    pushGlob(glob: string): number;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    pushHead(): number;
+    /**
+     *
+     *
+     * @param {string} range
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    pushRange(range: string): number;
+    /**
+     *
+     *
+     * @param {string} refname
+     * @returns {number}
+     *
+     * @memberof Revwalk
+     */
+    pushRef(refname: string): number;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Revwalk
+     */
+    repository(): Repository;
+    /**
+     *
+     *
+     *
+     * @memberof Revwalk
+     */
+    reset(): void;
+    /**
+     *
+     *
+     *
+     * @memberof Revwalk
+     */
+    simplifyFirstParent(): void;
+    /**
+     * Set the sort order for the revwalk. This function takes variable arguments like revwalk.sorting(NodeGit.RevWalk.Topological, NodeGit.RevWalk.Reverse).
+     *
+     * @param {number} sort
+     *
+     * @memberof Revwalk
+     */
+    sorting(sort: number): void;
+    /**
+     *
+     *
+     * @param {number} maxCount
+     * @returns {Promise<any>}
+     *
+     * @memberof Revwalk
+     */
+    fastWalk(maxCount: number): Promise<any>;
+    /**
+     *
+     *
+     * @param {string} filePath
+     * @param {number} maxCount
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Revwalk
+     */
+    fileHistoryWalk(filePath: string, maxCount: number): Promise<any[]>;
+    /**
+     * Walk the history from the given oid. The callback is invoked for each commit; When the walk is over, the callback is invoked with (null, null).
+     *
+     * @param {Oid} oid
+     * @param {Function} callback
+     * @returns {Commit}
+     *
+     * @memberof Revwalk
+     */
+    walk(oid: Oid, callback: Function): Commit;
+    /**
+     * Walk the history grabbing commits until the checkFn called with the current commit returns false.
+     *
+     * @param {Function} checkFn
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Revwalk
+     */
+    getCommitsUntil(checkFn: Function): Promise<any[]>;
+    /**
+     *
+     *
+     * @param {number} count
+     * @returns {Promise<Commit[]>}
+     *
+     * @memberof Revwalk
+     */
+    getCommits(count: number): Promise<Commit[]>;
+}
diff --git a/types/nodegit/revert.d.ts b/types/nodegit/revert.d.ts
new file mode 100644
index 0000000000..2e04f78758
--- /dev/null
+++ b/types/nodegit/revert.d.ts
@@ -0,0 +1,41 @@
+import { MergeOptions } from './merge-options';
+import { CheckoutOptions } from './checkout-options';
+import { Repository } from './repository';
+import { Commit } from './commit';
+import { Index } from './index';
+
+export interface RevertOptions {
+    version: number;
+    mainline: number;
+    mergeOpts: MergeOptions;
+    checkoutOpts: CheckoutOptions;
+}
+
+export class Revert {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Commit} commit
+     * @param {RevertOptions} givenOpts
+     * @returns {Promise<number>}
+     *
+     * @memberof Revert
+     */
+    static revert(repo: Repository, commit: Commit, givenOpts: RevertOptions): Promise<number>;
+    /**
+     * Reverts the given commit against the given "our" commit, producing an index that reflects the result of the revert.
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Commit} revertCommit
+     * @param {Commit} ourCommit
+     * @param {number} mainline
+     * @param {MergeOptions} mergeOptions
+     * @returns {Promise<Index>}
+     *
+     * @memberof Revert
+     */
+    static commit(repo: Repository, revertCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions: MergeOptions): Promise<Index>;
+}
diff --git a/types/nodegit/signature.d.ts b/types/nodegit/signature.d.ts
new file mode 100644
index 0000000000..6854760004
--- /dev/null
+++ b/types/nodegit/signature.d.ts
@@ -0,0 +1,94 @@
+import { Repository } from './repository';
+import { Time } from './time';
+
+export class Signature {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Signature}
+     *
+     * @memberof Signature
+     */
+    static default(repo: Repository): Signature;
+    /**
+     *
+     *
+     * @static
+     * @param {string} name
+     * @param {string} email
+     * @param {number} time
+     * @param {number} offset
+     * @returns {Signature}
+     *
+     * @memberof Signature
+     */
+    static create(name: string, email: string, time: number, offset: number): Signature;
+    /**
+     *
+     *
+     * @static
+     * @param {string} name
+     * @param {string} email
+     * @returns {Signature}
+     *
+     * @memberof Signature
+     */
+    static now(name: string, email: string): Signature;
+    /**
+     *
+     *
+     * @static
+     * @param {string} buf
+     * @returns {Promise<Signature>}
+     *
+     * @memberof Signature
+     */
+    static fromBuffer(buf: string): Promise<Signature>;
+
+    /**
+     *
+     *
+     * @returns {Promise<Signature>}
+     *
+     * @memberof Signature
+     */
+    dup(): Promise<Signature>;
+    /**
+     *
+     *
+     *
+     * @memberof Signature
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Signature
+     */
+    toString(): string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof Signature
+     */
+    name: string;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof Signature
+     */
+    email: string;
+    /**
+     *
+     *
+     * @type {Time}
+     * @memberof Signature
+     */
+    when: Time;
+}
diff --git a/types/nodegit/stash.d.ts b/types/nodegit/stash.d.ts
new file mode 100644
index 0000000000..1aae88bd85
--- /dev/null
+++ b/types/nodegit/stash.d.ts
@@ -0,0 +1,141 @@
+import { Repository } from './repository';
+import { Signature } from './signature';
+import { Oid } from './oid';
+import { CheckoutOptions } from './checkout-options';
+
+export namespace Stash {
+    const enum APPLY_FLAGS {
+        APPLY_DEFAULT = 0,
+        APPLY_REINSTATE_INDEX = 1
+    }
+
+    const enum APPLY_PROGRESS {
+        NONE = 0,
+        LOADING_STASH = 1,
+        ANALYZE_INDEX = 2,
+        ANALYZE_MODIFIED = 3,
+        ANALYZE_UNTRACKED = 4,
+        CHECKOUT_UNTRACKED = 5,
+        CHECKOUT_MODIFIED = 6,
+        DONE = 7
+    }
+
+    const enum FLAGS {
+        DEFAULT = 0,
+        KEEP_INDEX = 1,
+        INCLUDE_UNTRACKED = 2,
+        INCLUDE_IGNORED = 4
+    }
+}
+
+export interface StashApplyOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StashApplyOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StashApplyOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {CheckoutOptions}
+     * @memberof StashApplyOptions
+     */
+    checkoutOptions?: CheckoutOptions;
+    /**
+     *
+     *
+     * @type {Function}
+     * @memberof StashApplyOptions
+     */
+    progressCb?: Function;
+    /**
+     *
+     *
+     * @type {*}
+     * @memberof StashApplyOptions
+     */
+    progressPayload?: any;
+}
+
+export class Stash {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {number} index
+     * @param {StashApplyOptions} options
+     * @returns {Promise<number>}
+     *
+     * @memberof Stash
+     */
+    static apply(repo: Repository, index: number, options: StashApplyOptions): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {StashApplyOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Stash
+     */
+    static applyInitOptions(opts: StashApplyOptions, version: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {number} index
+     * @returns {Promise<number>}
+     *
+     * @memberof Stash
+     */
+    static drop(repo: Repository, index: number): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Function} callback
+     * @param {*} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Stash
+     */
+    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {number} index
+     * @param {StashApplyOptions} options
+     * @returns {Promise<number>}
+     *
+     * @memberof Stash
+     */
+    static pop(repo: Repository, index: number, options: StashApplyOptions): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Signature} stasher
+     * @param {string} message
+     * @param {number} flags
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Stash
+     */
+    static save(repo: Repository, stasher: Signature, message: string, flags: number): Promise<Oid>;
+}
diff --git a/types/nodegit/status-entry.d.ts b/types/nodegit/status-entry.d.ts
new file mode 100644
index 0000000000..70435d5de1
--- /dev/null
+++ b/types/nodegit/status-entry.d.ts
@@ -0,0 +1,25 @@
+import { DiffDelta } from './diff-delta';
+
+export class StatusEntry {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StatusEntry
+     */
+    status: number;
+    /**
+     *
+     *
+     * @type {DiffDelta}
+     * @memberof StatusEntry
+     */
+    headToIndex: DiffDelta;
+    /**
+     *
+     *
+     * @type {DiffDelta}
+     * @memberof StatusEntry
+     */
+    indexToWorkdir: DiffDelta;
+}
diff --git a/types/nodegit/status-list.d.ts b/types/nodegit/status-list.d.ts
new file mode 100644
index 0000000000..7847da4d1d
--- /dev/null
+++ b/types/nodegit/status-list.d.ts
@@ -0,0 +1,41 @@
+import { Repository } from './repository';
+import { DiffPerfdata } from './diff-perf-data';
+import { StatusOptions } from './status-options';
+
+export class StatusList {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {StatusOptions} opts
+     * @returns {Promise<StatusList>}
+     *
+     * @memberof StatusList
+     */
+    static create(repo: Repository, opts: StatusOptions): Promise<StatusList>;
+
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof StatusList
+     */
+    entrycount(): number;
+    /**
+     *
+     *
+     *
+     * @memberof StatusList
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Promise<DiffPerfdata>}
+     *
+     * @memberof StatusList
+     */
+    getPerfdata(): Promise<DiffPerfdata>;
+}
diff --git a/types/nodegit/status-options.d.ts b/types/nodegit/status-options.d.ts
new file mode 100644
index 0000000000..fe2f728737
--- /dev/null
+++ b/types/nodegit/status-options.d.ts
@@ -0,0 +1,32 @@
+import { Strarray } from './str-array';
+
+export interface StatusOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StatusOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StatusOptions
+     */
+    show?: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof StatusOptions
+     */
+    flags?: number;
+    /**
+     *
+     *
+     * @type {Strarray}
+     * @memberof StatusOptions
+     */
+    pathspec?: Strarray;
+}
diff --git a/types/nodegit/status.d.ts b/types/nodegit/status.d.ts
new file mode 100644
index 0000000000..892b1f1c36
--- /dev/null
+++ b/types/nodegit/status.d.ts
@@ -0,0 +1,110 @@
+import { Repository } from './repository';
+import { StatusList } from './status-list';
+import { StatusEntry } from './status-entry';
+import { StatusOptions } from './status-options';
+
+export namespace Status {
+    const enum STATUS {
+        CURRENT = 0,
+        INDEX_NEW = 1,
+        INDEX_MODIFIED = 2,
+        INDEX_DELETED = 4,
+        INDEX_RENAMED = 8,
+        INDEX_TYPECHANGE = 16,
+        WT_NEW = 128,
+        WT_MODIFIED = 256,
+        WT_DELETED = 512,
+        WT_TYPECHANGE = 1024,
+        WT_RENAMED = 2048,
+        WT_UNREADABLE = 4096,
+        IGNORED = 16384,
+        CONFLICTED = 32768
+    }
+
+    const enum OPT {
+        INCLUDE_UNTRACKED = 1,
+        INCLUDE_IGNORED = 2,
+        INCLUDE_UNMODIFIED = 4,
+        EXCLUDE_SUBMODULES = 8,
+        RECURSE_UNTRACKED_DIRS = 16,
+        DISABLE_PATHSPEC_MATCH = 32,
+        RECURSE_IGNORED_DIRS = 64,
+        RENAMES_HEAD_TO_INDEX = 128,
+        RENAMES_INDEX_TO_WORKDIR = 256,
+        SORT_CASE_SENSITIVELY = 512,
+        SORT_CASE_INSENSITIVELY = 1024,
+        RENAMES_FROM_REWRITES = 2048,
+        NO_REFRESH = 4096,
+        UPDATE_INDEX = 8192,
+        INCLUDE_UNREADABLE = 16384,
+        INCLUDE_UNREADABLE_AS_UNTRACKED = 32768
+    }
+
+    const enum SHOW {
+        INDEX_AND_WORKDIR = 0,
+        INDEX_ONLY = 1,
+        WORKDIR_ONLY = 2
+    }
+}
+
+export class Status {
+    /**
+     *
+     *
+     * @static
+     * @param {StatusList} statuslist
+     * @param {number} idx
+     * @returns {StatusEntry}
+     *
+     * @memberof Status
+     */
+    static byIndex(statuslist: StatusList, idx: number): StatusEntry;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Status
+     */
+    static file(repo: Repository, path: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Function} callback
+     * @param {*} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Status
+     */
+    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {StatusOptions} opts
+     * @param {Function} callback
+     * @param {*} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Status
+     */
+    static foreachExt(repo: Repository, opts: StatusOptions, callback: Function, payload: any): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {number} ignored
+     * @param {Repository} repo
+     * @param {string} path
+     * @returns {number}
+     *
+     * @memberof Status
+     */
+    static shouldIgnore(ignored: number, repo: Repository, path: string): number;
+}
diff --git a/types/nodegit/str-array.d.ts b/types/nodegit/str-array.d.ts
new file mode 100644
index 0000000000..603889f756
--- /dev/null
+++ b/types/nodegit/str-array.d.ts
@@ -0,0 +1,32 @@
+export class Strarray {
+    /**
+     *
+     *
+     * @param {Strarray} src
+     * @returns {number}
+     *
+     * @memberof Strarray
+     */
+    copy(src: Strarray): number;
+    /**
+     *
+     *
+     *
+     * @memberof Strarray
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @type {string[]}
+     * @memberof Strarray
+     */
+    strings: string[];
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Strarray
+     */
+    count: number;
+}
diff --git a/types/nodegit/submodule-update-options.d.ts b/types/nodegit/submodule-update-options.d.ts
new file mode 100644
index 0000000000..3b07383090
--- /dev/null
+++ b/types/nodegit/submodule-update-options.d.ts
@@ -0,0 +1,33 @@
+import { CheckoutOptions } from './checkout-options';
+import { FetchOptions } from './fetch-options';
+
+export interface SubmoduleUpdateOptions {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof SubmoduleUpdateOptions
+     */
+    version?: number;
+    /**
+     *
+     *
+     * @type {CheckoutOptions}
+     * @memberof SubmoduleUpdateOptions
+     */
+    checkoutOpts?: CheckoutOptions;
+    /**
+     *
+     *
+     * @type {FetchOptions}
+     * @memberof SubmoduleUpdateOptions
+     */
+    fetchOpts?: FetchOptions;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof SubmoduleUpdateOptions
+     */
+    cloneCheckoutStrategy?: number;
+}
diff --git a/types/nodegit/submodule.d.ts b/types/nodegit/submodule.d.ts
new file mode 100644
index 0000000000..a946e28fa4
--- /dev/null
+++ b/types/nodegit/submodule.d.ts
@@ -0,0 +1,352 @@
+import { Repository } from './repository';
+import { Buf } from './buf';
+import { Oid } from './oid';
+import { SubmoduleUpdateOptions } from './submodule-update-options';
+
+export namespace Submodule {
+    const enum IGNORE {
+        UNSPECIFIED = -1,
+        NONE = 1,
+        UNTRACKED = 2,
+        DIRTY = 3,
+        ALL = 4
+    }
+
+    const enum RECURSE {
+        NO = 0,
+        YES = 1,
+        ONDEMAND = 2
+    }
+
+    const enum STATUS {
+        IN_HEAD = 1,
+        IN_INDEX = 2,
+        IN_CONFIG = 4,
+        IN_WD = 8,
+        INDEX_ADDED = 16,
+        INDEX_DELETED = 32,
+        INDEX_MODIFIED = 64,
+        WD_UNINITIALIZED = 128,
+        WD_ADDED = 256,
+        WD_DELETED = 512,
+        WD_MODIFIED = 1024,
+        WD_INDEX_MODIFIED = 2048,
+        WD_WD_MODIFIED = 4096,
+        WD_UNTRACKED = 8192
+    }
+
+    const enum UPDATE {
+        CHECKOUT = 1,
+        REBASE = 2,
+        MERGE = 3,
+        NONE = 4,
+        DEFAULT = 0
+    }
+}
+
+export class Submodule {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} url
+     * @param {string} path
+     * @param {number} useGitLink
+     * @returns {Promise<Submodule>}
+     *
+     * @memberof Submodule
+     */
+    static addSetup(repo: Repository, url: string, path: string, useGitLink: number): Promise<Submodule>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Function} callback
+     * @param {*} payload
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    static foreach(repo: Repository, callback: Function, payload: any): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @returns {Promise<Submodule>}
+     *
+     * @memberof Submodule
+     */
+    static lookup(repo: Repository, name: string): Promise<Submodule>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} url
+     * @returns {Promise<Buf>}
+     *
+     * @memberof Submodule
+     */
+    static resolveUrl(repo: Repository, url: string): Promise<Buf>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} branch
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    static setBranch(repo: Repository, name: string, branch: string): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {number} fetchRecurseSubmodules
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    static setFetchRecurseSubmodules(repo: Repository, name: string, fetchRecurseSubmodules: number): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {number} ignore
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    static setIgnore(repo: Repository, name: string, ignore: number): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {number} update
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    static setUpdate(repo: Repository, name: string, update: number): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {string} url
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    static setUrl(repo: Repository, name: string, url: string): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} name
+     * @param {number} ignore
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    static status(repo: Repository, name: string, ignore: number): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {SubmoduleUpdateOptions} opts
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    static updateInitOptions(opts: SubmoduleUpdateOptions, version: number): number;
+
+    /**
+     *
+     *
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    addFinalize(): Promise<number>;
+    /**
+     *
+     *
+     * @param {number} writeIndex
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    addToIndex(writeIndex: number): Promise<number>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Submodule
+     */
+    branch(): string;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    fetchRecurseSubmodules(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Submodule
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Submodule
+     */
+    headId(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    ignore(): number;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Submodule
+     */
+    indexId(): Oid;
+    /**
+     *
+     *
+     * @param {number} overwrite
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    init(overwrite: number): Promise<number>;
+    /**
+     *
+     *
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    location(): Promise<number>;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Submodule
+     */
+    name(): string;
+    /**
+     *
+     *
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Submodule
+     */
+    open(): Promise<Repository>;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Submodule
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Submodule
+     */
+    path(): string;
+    /**
+     *
+     *
+     * @param {number} force
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    reload(force: number): number;
+    /**
+     *
+     *
+     * @param {number} useGitLink
+     * @returns {Promise<Repository>}
+     *
+     * @memberof Submodule
+     */
+    repoInit(useGitLink: number): Promise<Repository>;
+    /**
+     *
+     *
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    sync(): Promise<number>;
+    /**
+     * Updates a submodule
+     *
+     * @param {number} init
+     * @param {SubmoduleUpdateOptions} options
+     * @returns {Promise<number>}
+     *
+     * @memberof Submodule
+     */
+    update(init: number, options: SubmoduleUpdateOptions): Promise<number>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Submodule
+     */
+    updateStrategy(): number;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Submodule
+     */
+    url(): string;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Submodule
+     */
+    wdId(): Oid;
+}
diff --git a/types/nodegit/tag.d.ts b/types/nodegit/tag.d.ts
new file mode 100644
index 0000000000..f676c72ab5
--- /dev/null
+++ b/types/nodegit/tag.d.ts
@@ -0,0 +1,195 @@
+import { Repository } from './repository';
+import { Oid } from './oid';
+import { Object } from './object';
+import { Signature } from './signature';
+import { Strarray } from './str-array';
+
+export class Tag {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} tagName
+     * @param {Object} target
+     * @param {Signature} tagger
+     * @param {string} message
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Tag
+     */
+    static annotationCreate(repo: Repository, tagName: string, target: Object, tagger: Signature, message: string): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} tagName
+     * @param {Object} target
+     * @param {Signature} tagger
+     * @param {string} message
+     * @param {number} force
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Tag
+     */
+    static create(repo: Repository, tagName: string, target: Object, tagger: Signature, message: string, force: number): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} tagName
+     * @param {Object} target
+     * @param {number} force
+     * @returns {Promise<Oid>}
+     *
+     * @memberof Tag
+     */
+    static createLightweight(repo: Repository, tagName: string, target: Object, force: number): Promise<Oid>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {string} tagName
+     * @returns {Promise<number>}
+     *
+     * @memberof Tag
+     */
+    static delete(repo: Repository, tagName: string): Promise<number>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @returns {Promise<any[]>}
+     *
+     * @memberof Tag
+     */
+    static list(repo: Repository): Promise<any[]>;
+    /**
+     *
+     *
+     * @static
+     * @param {Strarray} tagNames
+     * @param {string} pattern
+     * @param {Repository} repo
+     * @returns {number}
+     *
+     * @memberof Tag
+     */
+    static listMatch(tagNames: Strarray, pattern: string, repo: Repository): number;
+    /**
+     * Retrieves the tag pointed to by the oid
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Oid | Tag)} id
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Tag
+     */
+    static lookup(repo: Repository, id: string | Oid | Tag): Promise<Tag>;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} len
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Tag
+     */
+    static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Tag>;
+
+    /**
+     *
+     *
+     * @returns {Promise<Tag>}
+     *
+     * @memberof Tag
+     */
+    dup(): Promise<Tag>;
+    /**
+     *
+     *
+     *
+     * @memberof Tag
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Tag
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Tag
+     */
+    message(): string;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof Tag
+     */
+    name(): string;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Tag
+     */
+    owner(): Repository;
+    /**
+     *
+     *
+     * @param {Object} tagTargetOut
+     * @returns {number}
+     *
+     * @memberof Tag
+     */
+    peel(tagTargetOut: Object): number;
+    /**
+     *
+     *
+     * @returns {Signature}
+     *
+     * @memberof Tag
+     */
+    tagger(): Signature;
+    /**
+     *
+     *
+     * @returns {Object}
+     *
+     * @memberof Tag
+     */
+    target(): Object;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Tag
+     */
+    targetId(): Oid;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Tag
+     */
+    targetType(): number;
+}
diff --git a/types/nodegit/time.d.ts b/types/nodegit/time.d.ts
new file mode 100644
index 0000000000..299bcfa35e
--- /dev/null
+++ b/types/nodegit/time.d.ts
@@ -0,0 +1,16 @@
+export class Time {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Time
+     */
+    time: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof Time
+     */
+    offset: number;
+}
diff --git a/types/nodegit/transfer-progress.d.ts b/types/nodegit/transfer-progress.d.ts
new file mode 100644
index 0000000000..f4c0d21065
--- /dev/null
+++ b/types/nodegit/transfer-progress.d.ts
@@ -0,0 +1,51 @@
+export class TransferProgress {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    totalObjects: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    indexedObjects: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    receivedObjects: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    localObjects: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    totalDeltas: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    indexedDeltas: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TransferProgress
+     */
+    receivedBytes: number;
+}
diff --git a/types/nodegit/transport.d.ts b/types/nodegit/transport.d.ts
new file mode 100644
index 0000000000..01dd4312ef
--- /dev/null
+++ b/types/nodegit/transport.d.ts
@@ -0,0 +1,53 @@
+import { Remote } from './remote';
+import { Strarray } from './str-array';
+import { Cert } from './cert';
+
+export namespace Transport {
+    const enum FLAGS {
+        NONE = 0
+    }
+}
+
+export class Transport {
+    /**
+     * å
+     *
+     * @static
+     * @param {Remote} owner
+     * @param {Strarray} payload
+     * @returns {Promise<Transport>}
+     *
+     * @memberof Transport
+     */
+    static sshWithPaths(owner: Remote, payload: Strarray): Promise<Transport>;
+    /**
+     *
+     *
+     * @static
+     * @param {string} prefix
+     * @returns {number}
+     *
+     * @memberof Transport
+     */
+    static unregister(prefix: string): number;
+    /**
+     *
+     *
+     * @param {number} version
+     * @returns {number}
+     *
+     * @memberof Transport
+     */
+    init(version: number): number;
+    /**
+     *
+     *
+     * @param {Cert} cert
+     * @param {number} valid
+     * @param {string} hostName
+     * @returns {number}
+     *
+     * @memberof Transport
+     */
+    smartCertificateCheck(cert: Cert, valid: number, hostName: string): number;
+}
diff --git a/types/nodegit/tree-builder.d.ts b/types/nodegit/tree-builder.d.ts
new file mode 100644
index 0000000000..4c50cdbd65
--- /dev/null
+++ b/types/nodegit/tree-builder.d.ts
@@ -0,0 +1,78 @@
+import { Oid } from './oid';
+import { Repository } from './repository';
+import { Tree } from './tree';
+import { TreeEntry } from './tree-entry';
+
+export class Treebuilder {
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Tree} source
+     * @returns {Promise<Treebuilder>}
+     *
+     * @memberof Treebuilder
+     */
+    static create(repo: Repository, source: Tree): Promise<Treebuilder>;
+
+    /**
+     *
+     *
+     *
+     * @memberof Treebuilder
+     */
+    clear(): void;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Treebuilder
+     */
+    entrycount(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Treebuilder
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @param {string} filename
+     * @returns {TreeEntry}
+     *
+     * @memberof Treebuilder
+     */
+    get(filename: string): TreeEntry;
+    /**
+     *
+     *
+     * @param {string} filename
+     * @param {Oid} id
+     * @param {number} filemode
+     * @returns {Promise<TreeEntry>}
+     *
+     * @memberof Treebuilder
+     */
+    insert(filename: string, id: Oid, filemode: number): Promise<TreeEntry>;
+    /**
+     *
+     *
+     * @param {string} filename
+     * @returns {number}
+     *
+     * @memberof Treebuilder
+     */
+    remove(filename: string): number;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Treebuilder
+     */
+    write(): Oid;
+}
diff --git a/types/nodegit/tree-entry.d.ts b/types/nodegit/tree-entry.d.ts
new file mode 100644
index 0000000000..3cf20499d3
--- /dev/null
+++ b/types/nodegit/tree-entry.d.ts
@@ -0,0 +1,162 @@
+import { Tree } from './tree';
+import { Oid } from './oid';
+import { Blob } from './blob';
+import { Repository } from './repository';
+
+export namespace TreeEntry {
+    const enum FILEMODE {
+        UNREADABLE = 0,
+        TREE = 16384,
+        BLOB = 33188,
+        EXECUTABLE = 33261,
+        LINK = 40960,
+        COMMIT = 57344
+    }
+}
+
+export class TreeEntry {
+    /**
+     *
+     *
+     * @returns {TreeEntry.FILEMODE}
+     *
+     * @memberof TreeEntry
+     */
+    filemode(): TreeEntry.FILEMODE;
+    /**
+     *
+     *
+     * @returns {TreeEntry.FILEMODE}
+     *
+     * @memberof TreeEntry
+     */
+    filemodeRaw(): TreeEntry.FILEMODE;
+    /**
+     *
+     *
+     *
+     * @memberof TreeEntry
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Promise<Blob>}
+     *
+     * @memberof TreeEntry
+     */
+    getBlob(): Promise<Blob>;
+    /**
+     *
+     *
+     * @returns {Promise<Tree>}
+     *
+     * @memberof TreeEntry
+     */
+    getTree(): Promise<Tree>;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof TreeEntry
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof TreeEntry
+     */
+    isBlob(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof TreeEntry
+     */
+    isFile(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof TreeEntry
+     */
+    isTree(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof TreeEntry
+     */
+    isDirectory(): boolean;
+    /**
+     *
+     *
+     * @returns {boolean}
+     *
+     * @memberof TreeEntry
+     */
+    isSubmodule(): boolean;
+    /**
+     * Retrieve the SHA for this TreeEntry.
+     *
+     * @returns {string}
+     *
+     * @memberof TreeEntry
+     */
+    sha(): string;
+    /**
+     *
+     *
+     * @returns {string}
+     *
+     * @memberof TreeEntry
+     */
+    name(): string;
+    /**
+     * Retrieve the SHA for this TreeEntry. Alias for sha
+     *
+     * @returns {string}
+     *
+     * @memberof TreeEntry
+     */
+    oid(): string;
+    /**
+     * Returns the path for this entry.
+     *
+     * @returns {string}
+     *
+     * @memberof TreeEntry
+     */
+    path(): string;
+    /**
+     * Alias for path
+     *
+     * @returns {string}
+     *
+     * @memberof TreeEntry
+     */
+    toString(): string;
+    /**
+     *
+     *
+     * @param {Repository} repo
+     * @returns {Object}
+     *
+     * @memberof TreeEntry
+     */
+    toObject(repo: Repository): Object;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof TreeEntry
+     */
+    type(): number;
+}
diff --git a/types/nodegit/tree-update.d.ts b/types/nodegit/tree-update.d.ts
new file mode 100644
index 0000000000..f8834513f4
--- /dev/null
+++ b/types/nodegit/tree-update.d.ts
@@ -0,0 +1,32 @@
+import { Oid } from './oid';
+
+export class TreeUpdate {
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TreeUpdate
+     */
+    action: number;
+    /**
+     *
+     *
+     * @type {number}
+     * @memberof TreeUpdate
+     */
+    filemode: number;
+    /**
+     *
+     *
+     * @type {Oid}
+     * @memberof TreeUpdate
+     */
+    id: Oid;
+    /**
+     *
+     *
+     * @type {string}
+     * @memberof TreeUpdate
+     */
+    path: string;
+}
diff --git a/types/nodegit/tree.d.ts b/types/nodegit/tree.d.ts
new file mode 100644
index 0000000000..057d3b2907
--- /dev/null
+++ b/types/nodegit/tree.d.ts
@@ -0,0 +1,221 @@
+import { Oid } from './oid';
+import { TreeEntry } from './tree-entry';
+import { Repository } from './repository';
+import { Object } from './object';
+import { Treebuilder } from './tree-builder';
+import { DiffFile } from './diff-file';
+import { TreeUpdate } from './tree-update';
+
+export namespace Tree {
+    const enum WALK_MODE {
+        WALK_PRE = 0,
+        WALK_POST = 1
+    }
+}
+
+export class Tree {
+    /**
+     *
+     *
+     * @static
+     * @param {TreeEntry} tree1
+     * @param {TreeEntry} tree2
+     * @returns {number}
+     *
+     * @memberof Tree
+     */
+    static entryCmp(tree1: TreeEntry, tree2: TreeEntry): number;
+    /**
+     *
+     *
+     * @static
+     * @param {TreeEntry} dest
+     * @param {TreeEntry} source
+     * @returns {number}
+     *
+     * @memberof Tree
+     */
+    static entryDup(dest: TreeEntry, source: TreeEntry): number;
+    /**
+     *
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {Oid} id
+     * @param {number} len
+     * @returns {Promise<Tree>}
+     *
+     * @memberof Tree
+     */
+    static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Tree>;
+    /**
+     * Retrieves the tree pointed to by the oid
+     *
+     * @static
+     * @param {Repository} repo
+     * @param {(string | Oid | Tree)} id
+     * @param {Function} callback
+     * @returns {Promise<Tree>}
+     *
+     * @memberof Tree
+     */
+    static lookup(repo: Repository, id: string | Oid | Tree, callback: Function): Promise<Tree>;
+
+    /**
+     *
+     *
+     * @param {Oid} id
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    entryById(id: Oid): TreeEntry;
+    /**
+     *
+     *
+     * @param {number} idx
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    _entryByIndex(idx: number): TreeEntry;
+    /**
+     * Get an entry by name; if the tree is a directory, the name is the filename.
+     *
+     * @param {string} name
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    entryByName(name: string): TreeEntry;
+    /**
+     *
+     *
+     * @param {string} filename
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    _entryByName(filename: string): TreeEntry;
+    /**
+     *
+     *
+     * @param {string} path
+     * @returns {Promise<TreeEntry>}
+     *
+     * @memberof Tree
+     */
+    entryByPath(path: string): Promise<TreeEntry>;
+    /**
+     *
+     *
+     * @returns {number}
+     *
+     * @memberof Tree
+     */
+    entryCount(): number;
+    /**
+     *
+     *
+     *
+     * @memberof Tree
+     */
+    free(): void;
+    /**
+     *
+     *
+     * @returns {Oid}
+     *
+     * @memberof Tree
+     */
+    id(): Oid;
+    /**
+     *
+     *
+     * @returns {Repository}
+     *
+     * @memberof Tree
+     */
+    owner(): Repository;
+    /**
+     * Diff two trees
+     *
+     * @param {Tree} tree
+     * @param {Function} callback
+     * @returns {Promise<DiffFile[]>}
+     *
+     * @memberof Tree
+     */
+    diff(tree: Tree, callback: Function): Promise<DiffFile[]>;
+    /**
+     * Diff two trees with options
+     *
+     * @param {Tree} tree
+     * @param {Object} options
+     * @param {Function} callback
+     * @returns {Promise<DiffFile[]>}
+     *
+     * @memberof Tree
+     */
+    diffWithOptions(tree: Tree, options: Object, callback: Function): Promise<DiffFile[]>;
+    /**
+     * Get an entry at the ith position.
+     *
+     * @param {number} i
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    entryByIndex(i: number): TreeEntry;
+    /**
+     * Get an entry at a path. Unlike by name, this takes a fully qualified path, like /foo/bar/baz.javascript
+     *
+     * @param {string} filePath
+     * @returns {TreeEntry}
+     *
+     * @memberof Tree
+     */
+    getEntry(filePath: string): TreeEntry;
+    /**
+     * Return an array of the entries in this tree (excluding its children).
+     *
+     * @returns {TreeEntry[]}
+     *
+     * @memberof Tree
+     */
+    entries(): TreeEntry[];
+    /**
+     * Recursively walk the tree in breadth-first order. Fires an event for each entry.
+     *
+     * @param {boolean} [blobsOnly]
+     * @returns {NodeJS.EventEmitter}
+     *
+     * @memberof Tree
+     */
+    walk(blobsOnly?: boolean): NodeJS.EventEmitter;
+    /**
+     * Return the path of this tree, like /lib/foo/bar
+     *
+     * @returns {string}
+     *
+     * @memberof Tree
+     */
+    path(): string;
+    /**
+     * Make builder. This is helpful for modifying trees.
+     *
+     * @returns {Treebuilder}
+     *
+     * @memberof Tree
+     */
+    builder(): Treebuilder;
+    /**
+     *
+     *
+     * @returns {Promise<Tree>}
+     *
+     * @memberof Tree
+     */
+    dup(): Promise<Tree>;
+    createUpdated(repo: Repository, nUpdates: number, updates: TreeUpdate): Promise<Oid>;
+}
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
new file mode 100644
index 0000000000..394ec731df
--- /dev/null
+++ b/types/nodegit/tsconfig.json
@@ -0,0 +1,119 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "annotated-commit.d.ts",
+        "attr.d.ts",
+        "blame-hunk.d.ts",
+        "blame-options.d.ts",
+        "blame.d.ts",
+        "blob.d.ts",
+        "branch.d.ts",
+        "buf.d.ts",
+        "cert-host-key.d.ts",
+        "cert-x509.d.ts",
+        "cert.d.ts",
+        "checkout-options.d.ts",
+        "checkout.d.ts",
+        "cherry-pick-options.d.ts",
+        "cherry-pick.d.ts",
+        "clone-options.d.ts",
+        "clone.d.ts",
+        "commit.d.ts",
+        "config.d.ts",
+        "convenient-patch.d.ts",
+        "cred-user-pass-payload.d.ts",
+        "cred-username.d.ts",
+        "cred.d.ts",
+        "cvar-map.d.ts",
+        "describe-format-options.d.ts",
+        "describe-options.d.ts",
+        "diff-binary-file.d.ts",
+        "diff-binary.d.ts",
+        "diff-delta.d.ts",
+        "diff-file.d.ts",
+        "diff-hunk.d.ts",
+        "diff-line.d.ts",
+        "diff-options.d.ts",
+        "diff-perf-data.d.ts",
+        "diff.d.ts",
+        "enums.d.ts",
+        "error.d.ts",
+        "fetch-options.d.ts",
+        "fetch.d.ts",
+        "filter.d.ts",
+        "git-err.d.ts",
+        "graph.d.ts",
+        "hash-sig.d.ts",
+        "ignore.d.ts",
+        "index-entry.d.ts",
+        "index.d.ts",
+        "indexer.d.ts",
+        "lib-git2.d.ts",
+        "merge-file-input.d.ts",
+        "merge-file-options.d.ts",
+        "merge-file-result.d.ts",
+        "merge-options.d.ts",
+        "merge.d.ts",
+        "nodegit-tests.ts",
+        "note.d.ts",
+        "object.d.ts",
+        "odb-expand-id.d.ts",
+        "odb-object.d.ts",
+        "odb.d.ts",
+        "oid-array.d.ts",
+        "oid.d.ts",
+        "open-ssl.d.ts",
+        "pack-builder.d.ts",
+        "path-spec.d.ts",
+        "proxy-options.d.ts",
+        "proxy.d.ts",
+        "push-options.d.ts",
+        "push-update.d.ts",
+        "push.d.ts",
+        "rebase-operation.d.ts",
+        "rebase.d.ts",
+        "ref-db.d.ts",
+        "ref-log.d.ts",
+        "ref-spec.d.ts",
+        "reference.d.ts",
+        "remote-callbacks.d.ts",
+        "remote.d.ts",
+        "repository.d.ts",
+        "reset.d.ts",
+        "rev-parse.d.ts",
+        "rev-walk.d.ts",
+        "revert.d.ts",
+        "signature.d.ts",
+        "stash.d.ts",
+        "status-entry.d.ts",
+        "status-list.d.ts",
+        "status-options.d.ts",
+        "status.d.ts",
+        "str-array.d.ts",
+        "submodule-update-options.d.ts",
+        "submodule.d.ts",
+        "tag.d.ts",
+        "time.d.ts",
+        "transfer-progress.d.ts",
+        "transport.d.ts",
+        "tree-builder.d.ts",
+        "tree-entry.d.ts",
+        "tree-update.d.ts",
+        "tree.d.ts"
+    ]
+}
diff --git a/types/nodegit/tslint.json b/types/nodegit/tslint.json
new file mode 100644
index 0000000000..a62d0d4e68
--- /dev/null
+++ b/types/nodegit/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false
+    }
+}
diff --git a/types/nodemailer-smtp-transport/index.d.ts b/types/nodemailer-smtp-transport/index.d.ts
index 7f0f8d7cca..4e4e11afe0 100644
--- a/types/nodemailer-smtp-transport/index.d.ts
+++ b/types/nodemailer-smtp-transport/index.d.ts
@@ -24,16 +24,16 @@ declare namespace smtpTransport {
 
         /** is the registered client secret of the application */
         clientSecret?: string;
-        
+
         /** is an optional refresh token. If it is provided then Nodemailer tries to generate a new access token if existing one expires or fails */
         refreshToken?: string;
-        
+
         /** is the access token for the user. Required only if refreshToken is not available and there is no token refresh callback specified */
         accessToken?: string;
-        
+
         /** is an optional expiration time for the current accessToken */
         expires?: number;
-        
+
         /** is an optional HTTP endpoint for requesting new access tokens. This value defaults to Gmail */
         accessUrl?: string;
 
diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index 88a82f073a..833873c45e 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -4,11 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
-/// <reference types="bluebird" />
 
 import directTransport = require("nodemailer-direct-transport");
 import smtpTransport = require("nodemailer-smtp-transport");
-import * as Promise from 'bluebird';
 
 /**
  * Transporter plugin
@@ -36,7 +34,7 @@ export interface Transporter {
 	 * Send mail using a template.
 	 */
 	templateSender(template?: any, defaults?: any): (mailData: any, context: any) => Promise<SentMessageInfo>;
-		
+
 	/**
 	 * Send mail using a template with a callback.
 	 */
@@ -50,7 +48,7 @@ export interface Transporter {
 	 * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
 	 */
 	use(step: string, plugin: Plugin): void;
-		
+
 	/**
 	 * Verifies connection with server
 	 */
diff --git a/types/nopt/nopt-tests.ts b/types/nopt/nopt-tests.ts
index f73a3d6159..b48bf938e2 100644
--- a/types/nopt/nopt-tests.ts
+++ b/types/nopt/nopt-tests.ts
@@ -2,9 +2,8 @@
 * Maintained by: jbondc <https://github.com/jbondc>
 */
 
-/// <reference types="node" />
-
 import nopt = require("nopt");
+declare var console: { log(x: any): void };
 
 nopt({"--foo" : String})
 
diff --git a/types/normalize-url/index.d.ts b/types/normalize-url/index.d.ts
new file mode 100644
index 0000000000..94cf9ee522
--- /dev/null
+++ b/types/normalize-url/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for normalize-url 1.9
+// Project: https://github.com/sindresorhus/normalize-url
+// Definitions by: odin3 <https://github.com/odin3>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace NormalizeUrl {
+  interface NormalizeUrlArgs {
+		normalizeProtocol?: boolean;
+		normalizeHttps?: boolean;
+		stripFragment?: boolean;
+		stripWWW?: boolean;
+		removeQueryParameters?: string[];
+		removeTrailingSlash?: boolean;
+		removeDirectoryIndex?: RegExp[];
+	}
+
+  // tslint:disable-next-line align
+	function normalizeUrl(url: string, args?: NormalizeUrlArgs): string;
+}
+
+export = NormalizeUrl.normalizeUrl;
diff --git a/types/sockjs-node/tsconfig.json b/types/normalize-url/tsconfig.json
similarity index 88%
rename from types/sockjs-node/tsconfig.json
rename to types/normalize-url/tsconfig.json
index 9f87470aa5..27e01ecd7b 100644
--- a/types/sockjs-node/tsconfig.json
+++ b/types/normalize-url/tsconfig.json
@@ -16,7 +16,6 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts",
-        "sockjs-node-tests.ts"
+        "index.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/normalize-url/tslint.json b/types/normalize-url/tslint.json
new file mode 100644
index 0000000000..279473e356
--- /dev/null
+++ b/types/normalize-url/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // This package uses the Function type, and it will take effort to fix.
+        "ban-types": false
+    }
+}
diff --git a/types/notify.js/index.d.ts b/types/notify.js/index.d.ts
index e462f32db7..997c2e4926 100644
--- a/types/notify.js/index.d.ts
+++ b/types/notify.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/notifyjs/notifyjs
 // Definitions by: Bahman Nikkhahan <https://github.com/bahman616>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/notify/index.d.ts b/types/notify/index.d.ts
index d5d91ebab2..ecb8a5b70e 100644
--- a/types/notify/index.d.ts
+++ b/types/notify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jpillora/notifyjs
 // Definitions by: Xiaohan Zhang <https://github.com/hellochar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/nouislider/v7/index.d.ts b/types/nouislider/v7/index.d.ts
index a05232da07..1603345364 100644
--- a/types/nouislider/v7/index.d.ts
+++ b/types/nouislider/v7/index.d.ts
@@ -2,11 +2,12 @@
 // Project: https://github.com/leongersen/noUiSlider
 // Definitions by: Corey Jepperson <https://github.com/acoreyj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 /// <reference types="jquery"/>
 /// <reference types="wnumb"/>
 
 
-interface noUiSliderInstance extends JQuery{
+interface JQuery{
     /**
      * For one-handle sliders, calling .val() will return the value. 
      * For two-handle sliders, an array[value, value] will be returned.
@@ -145,6 +146,6 @@ interface noUiSliderPipsOptions {
 
 
 interface JQuery {
-    noUiSlider(options?: noUiSliderOptions): noUiSliderInstance;
-    noUiSlider_pips(options?: noUiSliderPipsOptions): noUiSliderInstance;
-}
\ No newline at end of file
+    noUiSlider(options?: noUiSliderOptions): JQuery;
+    noUiSlider_pips(options?: noUiSliderPipsOptions): JQuery;
+}
diff --git a/types/numeral/index.d.ts b/types/numeral/index.d.ts
index f08f46b8c2..5e2970a0e7 100644
--- a/types/numeral/index.d.ts
+++ b/types/numeral/index.d.ts
@@ -22,6 +22,7 @@ interface NumeralJSLocale {
 	};
 }
 
+type RoundingFunction = (value: number) => number;
 
 // http://numeraljs.com/#custom-formats
 interface NumeralJsFormat {
@@ -29,7 +30,7 @@ interface NumeralJsFormat {
 		format: RegExp,
 		unformat: RegExp,
 	},
-	format: (value: any, format: string, roundingFunction: Function) => string,
+	format: (value: any, format: string, roundingFunction: RoundingFunction) => string,
 	unformat: (value: string) => number
 }
 
@@ -60,7 +61,7 @@ interface Numeral {
 	nullFormat(format: string): void;
 	defaultFormat(format: string): void;
 	clone(): Numeral;
-	format(inputString?: string): string;
+	format(inputString?: string, roundingFunction?: RoundingFunction): string;
 	formatCurrency(inputString?: string): string;
 	unformat(inputString: string): number;
 	value(): number;
diff --git a/types/numeral/numeral-tests.ts b/types/numeral/numeral-tests.ts
index 7be34cc8f9..b58d6e7411 100644
--- a/types/numeral/numeral-tests.ts
+++ b/types/numeral/numeral-tests.ts
@@ -6,6 +6,9 @@ var valueFormat: string = numeral(1000).format('0,0');
 var valueUnformat: number = numeral().unformat('($10,000.00)');
 // '-10000'
 
+var valueFormatFloor: string = numeral(1.357).format('0.00', Math.floor);
+// '1.35'
+
 var value3: Numeral = numeral(1000);
 var added: Numeral = value3.add(10);
 // 1010
diff --git a/types/o.js/index.d.ts b/types/o.js/index.d.ts
index 00a5f2b5ae..7cca909391 100644
--- a/types/o.js/index.d.ts
+++ b/types/o.js/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for o.js v0.2.2
+// Type definitions for o.js v0.3.3
 // Project: https://github.com/janhommes/o.js
-// Definitions by: Matteo Antony Mistretta <https://github.com/IceOnFire>, Brad Zacher <https://github.com/bradzacher>
+// Definitions by: Matteo Antony Mistretta <https://github.com/IceOnFire>, Brad Zacher <https://github.com/bradzacher>, Jan Hommes <https://github.com/janhommes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'o.js' {
@@ -8,13 +8,14 @@ declare module 'o.js' {
 
     interface Options {
         endpoint : string
-        json ?: boolean
+        format ?: string
+        autoFormat ?: boolean
         version ?: number
         strictMode ?: boolean
         start ?: () => any
         ready ?: () => any
         error ?: () => any
-        headers ?: string[]
+        headers ?: { name: string, value: string }[]
         username ?: string
         password ?: string
         isAsync ?: boolean
diff --git a/types/o.js/o.js-tests.ts b/types/o.js/o.js-tests.ts
index f40a84ac84..26cc187723 100644
--- a/types/o.js/o.js-tests.ts
+++ b/types/o.js/o.js-tests.ts
@@ -129,7 +129,7 @@ o().config({
 });
 // after you have set an endpoint, you can shorten your queries:
 o('Products').get<Product>(function(data) {
-    //same result like the first exmple on this page
+    //same result like the first example on this page
 });
 
 
@@ -137,13 +137,14 @@ o('Products').get<Product>(function(data) {
 //basic config
 o().config({
     endpoint:null,    // your odata endpoint for the service
-    json:true,        // currently only json is supported
+    format:'json',        // currently only json is supported
+    autoFormat: false,
     version:4,        // oData version (currently supported version 4. However most also work with version 3.)
     strictMode:true,  // strict mode throws exception, non strict mode only logs them
     start:null,       // a function which is executed on loading
     ready:null,       // a function which is executed on ready
     error:null,       // a function which is executed on error
-    headers:[],       // a array of additional headers e.g.: [{name:'headername',value:'headervalue'}]
+    headers:[{name: '', value: ''}],       // a array of additional headers e.g.: [{name:'headername',value:'headervalue'}]
     username:null,    // a basic auth username
     password:null,    // a basic auth password
     isAsync:true      //set this to false to make synced (a)jax calls. (dosn't work with basic auth!)
diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 0e3ff61006..d328e06fc4 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -1,423 +1,469 @@
-// Type definitions for Node OAuth2 Server
-// Project: https://github.com/thomseddon/node-oauth2-server
-// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+// Type definitions for Node OAuth2 Server 3.0
+// Project: https://github.com/oauthjs/node-oauth2-server
+// Definitions by:  Robbie Van Gorkom <https://github.com/vangorra>,
+//                  Charles Irick <https://github.com/cirick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* =================== USAGE ===================
+import { RequestHandler } from "express";
+import { Request } from "express";
 
- import * as oauthserver from "oauth2-server";
- var oauth = oauthserver();
+/**
+ * Represents an OAuth2 server instance.
+ */
+declare class OAuth2Server {
+    static OAuth2Server: typeof OAuth2Server;
 
- =============================================== */
+    /**
+     * Instantiates OAuth2Server using the supplied model
+     *
+     * @param options
+     */
+    constructor(options: OAuth2Server.ServerOptions);
 
+    /**
+     * Authenticates a request.
+     *
+     * @param request
+     * @param response
+     * @param options
+     * @param callback
+     */
+    authenticate(
+        request: OAuth2Server.Request,
+        response: OAuth2Server.Response,
+        options?: OAuth2Server.AuthenticateOptions,
+        callback?: OAuth2Server.Callback<OAuth2Server.Token>
+    ): Promise<OAuth2Server.Token>;
 
+    /**
+     * Authorizes a token request.
+     *
+     * @param request
+     * @param response
+     * @param options
+     * @param callback
+     */
+    authorize(
+        request: OAuth2Server.Request,
+        response: OAuth2Server.Response,
+        options?: OAuth2Server.AuthorizeOptions,
+        callback?: OAuth2Server.Callback<OAuth2Server.AuthorizationCode>
+    ): Promise<OAuth2Server.AuthorizationCode>;
 
+    /**
+     * Retrieves a new token for an authorized token request.
+     *
+     * @param request
+     * @param response
+     * @param options
+     * @param callback
+     */
+    token(
+        request: OAuth2Server.Request,
+        response: OAuth2Server.Response,
+        options?: OAuth2Server.TokenOptions,
+        callback?: OAuth2Server.Callback<OAuth2Server.Token>
+    ): Promise<OAuth2Server.Token>;
+}
 
-import {RequestHandler} from "express";
-import {Request} from "express";
+declare namespace OAuth2Server {
+    /**
+     * Represents an incoming HTTP request.
+     */
+    class Request {
+        body?: any;
+        headers?: { [key: string]: string; };
+        method?: string;
+        query?: { [key: string]: string; };
 
-declare function o(config: o.Config): o.OAuth2Server;
+        /**
+         * Instantiates Request using the supplied options.
+         *
+         * @param options
+         */
+        constructor(options?: { [key: string]: any } | Express.Request);
 
-declare namespace o {
-    interface OAuth2Server {
-        grant(): RequestHandler;
-        authorise(): any;
-        errorHandler(): any;
+        /**
+         * Returns the specified HTTP header field. The match is case-insensitive.
+         *
+         * @param field
+         */
+        get(field: string): any | undefined;
+
+        /**
+         * Checks if the request’s Content-Type HTTP header matches any of the given MIME types.
+         *
+         * @param types
+         */
+        is(types: string[]): string | false;
     }
 
-    interface Config {
+    /**
+     * Represents an outgoing HTTP response.
+     */
+    class Response {
+        body?: any;
+        headers?: { [key: string]: string; };
+        status?: number;
+
+        /**
+         * Instantiates Response using the supplied options.
+         *
+         * @param options
+         */
+        constructor(options?: { [key: string]: any; } | Express.Response);
+
+        /**
+         * Returns the specified HTTP header field. The match is case-insensitive.
+         *
+         * @param field
+         */
+        get(field: string): any | undefined;
+
+        /**
+         * Sets the specified HTTP header field. The match is case-insensitive.
+         *
+         * @param field
+         * @param value
+         */
+        set(field: string, value: string): void;
+
+        /**
+         * Redirects to the specified URL using 302 Found.
+         *
+         * @param url
+         */
+        redirect(url: string): void;
+    }
+
+    interface ServerOptions extends AuthenticateOptions, AuthorizeOptions, TokenOptions {
         /**
          * Model object
          */
-        model: {};
+        model: AuthorizationCodeModel | ClientCredentialsModel | RefreshTokenModel | PasswordModel | ExtensionModel;
+    }
 
+    interface AuthenticateOptions {
         /**
-         * grant types you wish to support, currently the module supports authorization_code,
-         * password, refresh_token and client_credentials
+         * The scope(s) to authenticate.
          */
-        grants: string[];
+        scope?: string | undefined;
 
         /**
-         * If true errors will be logged to console. You may also pass a custom function, in
-         * which case that function will be called with the error as its first argument
-         * Default: false
+         * Set the X-Accepted-OAuth-Scopes HTTP header on response objects.
          */
-        debug?: boolean;
+        addAcceptedScopesHeader?: boolean;
 
         /**
-         * Life of access tokens in seconds
-         * If null, tokens will considered to never expire
-         * Default: 3600
+         * Set the X-OAuth-Scopes HTTP header on response objects.
+         */
+        addAuthorizedScopesHeader?: boolean;
+
+        /**
+         * Allow clients to pass bearer tokens in the query string of a request.
+         */
+        allowBearerTokensInQueryString?: boolean;
+    }
+
+    interface AuthorizeOptions {
+        /**
+         * The authenticate handler
+         */
+        authenticateHandler?: {};
+
+        /**
+         * Allow clients to specify an empty state
+         */
+        allowEmptyState?: boolean;
+
+        /**
+         * Lifetime of generated authorization codes in seconds (default = 5 minutes).
+         */
+        authorizationCodeLifetime?: number;
+    }
+
+    interface TokenOptions {
+        /**
+         * Lifetime of generated access tokens in seconds (default = 1 hour)
          */
         accessTokenLifetime?: number;
 
         /**
-         * Life of refresh tokens in seconds
-         * If null, tokens will considered to never expire
-         * Default: 1209600
+         * Lifetime of generated refresh tokens in seconds (default = 2 weeks)
          */
         refreshTokenLifetime?: number;
 
         /**
-         * Life of auth codes in seconds
-         * Default: 30
+         * Allow extended attributes to be set on the returned token
          */
-        authCodeLifetime?: number;
+        allowExtendedTokenAttributes?: boolean;
 
         /**
-         * Regex to sanity check client id against before checking model. Note: the default
-         * just matches common client_id structures, change as needed
-         * Default: /^[a-z0-9-_]{3,40}$/i
+         * Require a client secret. Defaults to true for all grant types.
          */
-        clientIdRegex?: RegExp;
+        requireClientAuthentication?: {};
 
         /**
-         * If true, non grant errors will not be handled internally (so you can ensure a
-         * consistent format with the rest of your api)
+         * Always revoke the used refresh token and issue a new one for the refresh_token grant.
          */
-        passthroughErrors?: boolean;
-
-        /**
-         * If true, next will be called even if a response has been sent (you probably don't want this)
-         */
-        continueAfterResponse?: boolean;
+        alwaysIssueNewRefreshToken?: boolean;
     }
 
+    /**
+     * Represents a generic callback structure for model callbacks
+     */
+    type Callback<T> = (err?: any, result?: T) => void;
+
+    /**
+     * For returning falsey parameters in cases of failure
+     */
+    type Falsey = '' | 0 | false | null | undefined;
+
     interface BaseModel {
         /**
+         * Invoked to generate a new access token.
          *
-         * @param bearerToken - The bearer token (access token) that has been provided
-         * @param callback
-         */
-        getAccessToken(bearerToken: string,
-            callback: GetAccessTokenCallback): void;
-
-        /**
-         *
-         * @param clientId
-         * @param clientSecret - If null, omit from search query (only search by clientId)
-         * @param callback
-         */
-        getClient(clientId: string,
-            clientSecret: string,
-            callback: GetClientCallback): void;
-
-        /**
-         *
-         * @param clientId
-         * @param grantType
-         * @param callback
-         */
-        grantTypeAllowed(clientId: string,
-            grantType: string,
-            callback: GrantTypeAllowedCallback): void;
-
-        /**
-         *
-         * @param accessToken
-         * @param clientId
-         * @param expires
+         * @param client
          * @param user
+         * @param scope
          * @param callback
          */
-        saveAccessToken(accessToken: string,
-            clientId: string,
-            expires: Date,
-            user: User,
-            callback: SaveAccessTokenCallback): void;
-    }
-
-    interface AuthorizationCodeModel extends BaseModel {
-        /**
-         *
-         * @param authCode
-         * @param callback
-         */
-        getAuthCode(authCode: string,
-            callback: GetAuthCodeCallback): void;
+        generateAccessToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
-         *
-         * @param authCode
-         * @param clientId
-         * @param expires
-         * @param user - Whatever was passed as user to the codeGrant function (see example)
-         * @param callback
-         */
-        saveAuthCode(authCode: string,
-            clientId: string,
-            expires: Date,
-            user: User | string,
-            callback: SaveAuthCodeCallback): void;
-    }
-
-    interface PasswordModel extends BaseModel {
-        /**
-         *
-         * @param username
-         * @param password
-         * @param callback
-         */
-        getUser(username: string,
-            password: string,
-            callback: GetUserCallback): void;
-    }
-
-    interface RefreshTokenModel extends BaseModel {
-        /**
-         *
-         * @param refreshToken
-         * @param clientId
-         * @param expires
-         * @param user
-         * @param callback
-         */
-        saveRefreshToken(refreshToken: string,
-            clientId: string,
-            expires: Date,
-            user: User,
-            callback: SaveRefreshTokenCallback): void;
-
-        /**
-         *
-         * @param refreshToken - The bearer token (refresh token) that has been provided
-         * @param callback
-         */
-        getRefreshToken(refreshToken: string,
-            callback: GetRefreshTokenCallback): void;
-
-        /**
-         * The spec does not actually require that you revoke the old token - hence this is
-         * optional (Last paragraph: http://tools.ietf.org/html/rfc6749#section-6)
-         * @param refreshToken
-         * @param callback
-         */
-        revokeRefreshToken?(refreshToken: string,
-            callback: RevokeRefreshTokenCallback): void;
-    }
-
-    interface ExtensionModel extends BaseModel {
-        /**
-         *
-         * @param grantType
-         * @param req
-         * @param callback
-         */
-        extendedGrant(grantType: string,
-            req: Request,
-            callback: ExtendedGrantCallback): void;
-    }
-
-    interface ClientCredentialsModel extends BaseModel {
-        /**
+         * Invoked to retrieve a client using a client id or a client id/client secret combination, depending on the grant type.
          *
          * @param clientId
          * @param clientSecret
          * @param callback
          */
-        getUserFromClient(clientId: string,
-            clientSecret: string,
-            callback: GetUserFromClientCallback): void;
+        getClient(clientId: string, clientSecret: string, callback?: Callback<Client | Falsey>): Promise<Client | Falsey>;
 
         /**
+         * Invoked to save an access token and optionally a refresh token, depending on the grant type.
          *
-         * @param type - accessToken or refreshToken
-         * @param req - The current express request
+         * @param token
+         * @param client
+         * @param user
          * @param callback
          */
-        generateToken?(type: string,
-            req: Request,
-            callback: GenerateTokenCallback): void;
+        saveToken(token: Token, client: Client, user: User, callback?: Callback<Token>): Promise<Token>;
     }
 
-    interface GenerateTokenCallback {
+    interface RequestAuthenticationModel {
         /**
+         * Invoked to retrieve an existing access token previously saved through Model#saveToken().
          *
-         * @param error - Truthy to indicate an error
-         * @param token - string indicates success
-         * null indicates to revert to the default token generator
-         * object indicates a reissue (i.e. will not be passed to saveAccessToken/saveRefreshToken)
-         * Must contain the following keys (if object):
-         * string accessToken OR refreshToken dependant on type
+         * @param accessToken
+         * @param callback
          */
-        (error: any, token: string | Object): void;
-    }
+        getAccessToken(accessToken: string, callback?: Callback<Token>): Promise<Token>;
 
-    interface GetUserFromClientCallback {
         /**
+         * Invoked during request authentication to check if the provided access token was authorized the requested scopes.
          *
-         * @param error - Truthy to indicate an error
-         * @param user - The user retrieved from storage or falsey to indicate an invalid user
-         * Saved in req.user
+         * @param token
+         * @param scope
+         * @param callback
          */
-        (error: any, user: User): void;
+        verifyScope(token: Token, scope: string, callback?: Callback<boolean>): Promise<boolean>;
     }
 
-    interface ExtendedGrantCallback {
+    interface AuthorizationCodeModel extends BaseModel, RequestAuthenticationModel {
         /**
+         * Invoked to generate a new refresh token.
          *
-         * @param error - Truthy to indicate an error
-         * @param supported - Whether you support the grant type
-         * @param user - The user retrieved from storage or falsey to indicate an invalid user
-         * Saved in req.user
+         * @param client
+         * @param user
+         * @param scope
+         * @param callback
          */
-        (error: any, supported: boolean, user: User): void;
-    }
+        generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
-    interface RevokeRefreshTokenCallback {
-        /**
-         * Truthy to indicate an error
-         * @param error
-         */
-        (error: any): void;
-    }
-
-    interface GetRefreshTokenCallback {
         /**
+         * Invoked to generate a new authorization code.
          *
-         * @param error - Truthy to indicate an error
-         * @param refreshToken - The refresh token retrieved form storage or falsey to indicate invalid refresh token
+         * @param callback
          */
-        (error: any, refreshToken: RefreshToken): void;
-    }
+        generateAuthorizationCode?(callback?: Callback<string>): Promise<string>;
 
-    interface SaveRefreshTokenCallback {
         /**
+         * Invoked to retrieve an existing authorization code previously saved through Model#saveAuthorizationCode().
          *
-         * @param error - Truthy to indicate an error
+         * @param authorizationCode
+         * @param callback
          */
-        (error: any): void;
-    }
+        getAuthorizationCode(authorizationCode: string, callback?: Callback<AuthorizationCode>): Promise<AuthorizationCode>;
 
-    interface GetUserCallback {
         /**
+         * Invoked to save an authorization code.
          *
-         * @param error - Truthy to indicate an error
-         * @param user - The user retrieved from storage or falsey to indicate an invalid user
-         * Saved in req.user
+         * @param code
+         * @param client
+         * @param user
+         * @param callback
          */
-        (error: any, user: User): void;
-    }
+        saveAuthorizationCode(code: AuthorizationCode, client: Client, user: User, callback?: Callback<AuthorizationCode>): Promise<AuthorizationCode>;
 
-    interface SaveAuthCodeCallback {
         /**
+         * Invoked to revoke an authorization code.
          *
-         * @param error - Truthy to indicate an error
+         * @param code
+         * @param callback
          */
-        (error: any): void;
-    }
+        revokeAuthorizationCode(code: AuthorizationCode, callback?: Callback<boolean>): Promise<boolean>;
 
-    interface GetAuthCodeCallback {
         /**
+         * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
-         * @param error - Truthy to indicate an error
-         * @param authCode - The authorization code retrieved form storage or falsey to indicate invalid code
+         * @param user
+         * @param client
+         * @param string
+         * @param callback
          */
-        (error: String, authCode: AuthCode): void
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
 
-    interface SaveAccessTokenCallback {
+    interface PasswordModel extends BaseModel, RequestAuthenticationModel {
         /**
+         * Invoked to generate a new refresh token.
          *
-         * @param error - Truthy to indicate an error
+         * @param client
+         * @param user
+         * @param scope
+         * @param callback
          */
-        (error: any): void;
-    }
+        generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
-    interface GetAccessTokenCallback {
         /**
+         * Invoked to retrieve a user using a username/password combination.
          *
-         * @param error - Truthy to indicate an error
-         * @param accessToken - The access token retrieved form storage or falsey to indicate invalid access token
+         * @param username
+         * @param password
+         * @param callback
          */
-        (error: any, accessToken: AccessToken): void;
-    }
+        getUser(username: string, password: string, callback?: Callback<User | Falsey>): Promise<User | Falsey>;
 
-    interface GetClientCallback {
         /**
+         * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
-         * @param error - Truthy to indicate an error
-         * @param client - The client retrieved from storage or falsey to indicate an invalid client
-         * Saved in req.client
+         * @param user
+         * @param client
+         * @param string
+         * @param callback
          */
-        (error: any, client: Client): void;
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
 
-    interface GrantTypeAllowedCallback {
+    interface RefreshTokenModel extends BaseModel, RequestAuthenticationModel {
         /**
+         * Invoked to generate a new refresh token.
          *
-         * @param error - Truthy to indicate an error
-         * @param allowed - Indicates whether the grantType is allowed for this clientId
+         * @param client
+         * @param user
+         * @param scope
+         * @param callback
          */
-        (error: any, allowed: boolean): void;
-    }
-
-    interface RefreshToken {
-        /**
-         * client id associated with this token
-         */
-        clientId: string;
-
-        /**
-         * The date when it expires
-         * null to indicate the token never expires
-         */
-        expires: Date;
+        generateRefreshToken?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
+         * Invoked to retrieve an existing refresh token previously saved through Model#saveToken().
          *
+         * @param refreshToken
+         * @param callback
          */
-        userId: string;
+        getRefreshToken(refreshToken: string, callback?: Callback<RefreshToken>): Promise<RefreshToken>;
+
+        /**
+         * Invoked to revoke a refresh token.
+         *
+         * @param token
+         * @param callback
+         */
+        revokeToken(token: Token, callback?: Callback<boolean>): Promise<boolean>;
     }
 
-    interface AuthCode {
+    interface ClientCredentialsModel extends BaseModel, RequestAuthenticationModel {
         /**
-         * client id associated with this auth code
+         * Invoked to retrieve the user associated with the specified client.
+         *
+         * @param client
+         * @param callback
          */
-        clientId: string;
+        getUserFromClient(client: Client, callback?: Callback<User | Falsey>): Promise<User | Falsey>;
 
         /**
-         * The date when it expires
+         * Invoked to check if the requested scope is valid for a particular client/user combination.
+         *
+         * @param user
+         * @param client
+         * @param string
+         * @param callback
          */
-        expires: Date;
-
-        /**
-         * The userId
-         */
-        userId: string;
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
     }
 
+    interface ExtensionModel extends BaseModel, RequestAuthenticationModel {}
+
+    /**
+     * An interface representing the user.
+     * A user object is completely transparent to oauth2-server and is simply used as input to model functions.
+     */
     interface User {
         id: string;
+        [key: string]: any;
     }
 
+    /**
+     * An interface representing the client and associated data
+     */
     interface Client {
-        clientId: string;
-
-        /**
-         * authorization_code grant type only
-         */
-        redirectUri: string;
+        id: string;
+        redirectUris?: string[];
+        grants: string[];
+        accessTokenLifetime?: number;
+        refreshTokenLifetime?: number;
+        [key: string]: any;
     }
 
-    interface AccessToken {
-        /**
-         * The date when it expires
-         * null to indicate the token never expires
-         */
-        expires: Date;
+    /**
+     * An interface representing the authorization code and associated data.
+     */
+    interface AuthorizationCode {
+        authorizationCode: string;
+        expiresAt: Date;
+        redirectUri: string;
+        scope?: string;
+        client: Client;
+        user: User;
+        [key: string]: any;
+    }
 
-        /**
-         * If a user key exists, this is saved as req.user
-         */
-        user?: User;
+    /**
+     * An interface representing the token(s) and associated data.
+     */
+    interface Token {
+        accessToken: string;
+        accessTokenExpiresAt?: Date;
+        refreshToken?: string;
+        refreshTokenExpiresAt?: Date;
+        scope?: string;
+        client: Client;
+        user: User;
+        [key: string]: any;
+    }
 
-        /**
-         * If a user key exists, this is saved as req.user
-         * Otherwise a userId key must exist, which is saved in req.user.id
-         */
-        userId?: string;
+    /**
+     * An interface representing the refresh token and associated data.
+     */
+    interface RefreshToken {
+        refreshToken: string;
+        refreshTokenExpiresAt?: Date;
+        scope?: string;
+        client: Client;
+        user: User;
+        [key: string]: any;
     }
 }
 
-export = o;
+export = OAuth2Server;
diff --git a/types/oauth2-server/oauth2-server-tests.ts b/types/oauth2-server/oauth2-server-tests.ts
index 56216edc8f..be8fa83705 100644
--- a/types/oauth2-server/oauth2-server-tests.ts
+++ b/types/oauth2-server/oauth2-server-tests.ts
@@ -1,18 +1,95 @@
-
-
 import * as express from "express";
-import * as oauthserver from "oauth2-server";
+import * as OAuth2Server from "oauth2-server";
 
-var oauth = oauthserver({
-    model: {},
-    grants: ['password'],
-    debug: true
+const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
+        getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
+            return undefined;
+        },
+        saveToken: async (token: OAuth2Server.Token, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.Token> => {
+            return token;
+        },
+        getAccessToken: async (accessToken: string): Promise<OAuth2Server.Token> => {
+            return {
+                accessToken,
+                client: {id: "testClient", grants: ["access_token"]},
+                user: {id: "testUser"}
+            };
+        },
+        verifyScope: async (token: OAuth2Server.Token, scope: string): Promise<boolean> => {
+            return true;
+        },
+        getAuthorizationCode: async (authorizationCode: string): Promise<OAuth2Server.AuthorizationCode> => {
+            return {
+                authorizationCode,
+                expiresAt: new Date(),
+                redirectUri: "www.test.com",
+                client: {id: "testClient", grants: ["access_token"]},
+                user: {id: "testUser"}
+            };
+        },
+        saveAuthorizationCode: async (code: OAuth2Server.AuthorizationCode, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.AuthorizationCode> => {
+            return code;
+        },
+        revokeAuthorizationCode: async (code: OAuth2Server.AuthorizationCode): Promise<boolean> => {
+            return true;
+        }
+};
+
+const oauth2Server = new OAuth2Server({
+    model: oauth2Model
 });
 
-var app = express();
+// Authenticate user with supplied bearer token
+const authenticate = (authenticateOptions?: {}) => {
+    const options: undefined | {} = authenticateOptions || {};
+    return async (req: express.Request & {user: OAuth2Server.Token}, res: express.Response, next: express.NextFunction) => {
+        const request = new OAuth2Server.Request(req);
+        const response = new OAuth2Server.Response(res);
 
-app.all('/oauth/token', oauth.grant());
-app.get('/', oauth.authorise(), function (req, res) {
-    res.send('Secret area');
+        try {
+            // Test async method of accessing oauth2Server
+            const token = await oauth2Server.authenticate(request, response, options);
+            req.user = token;
+            next();
+        } catch (err) {
+            res.status(err.code || 500).json(err);
+        }
+    };
+};
+
+const app = express();
+app.all('/oauth2/token', (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    const request = new OAuth2Server.Request(req);
+    const response = new OAuth2Server.Response(res);
+
+    oauth2Server.token(request, response)
+        .then((token: OAuth2Server.Token) => {
+            res.json(token);
+        }).catch((err: any) => {
+            res.status(err.code || 500).json(err);
+        });
 });
-app.use(oauth.errorHandler());
+
+app.post('/oauth2/authorize', (req, res) => {
+    const request = new OAuth2Server.Request(req);
+    const response = new OAuth2Server.Response(res);
+
+    oauth2Server.authorize(request, response)
+        .then((success: OAuth2Server.AuthorizationCode) => {
+            res.json(success);
+        }).catch((err: any) => {
+            res.status(err.code || 500).json(err);
+        });
+});
+
+app.get('/secure', authenticate(), (req: express.Request & {user: OAuth2Server.Token}, res: express.Response, next: express.NextFunction) => {
+    res.json({message: 'Secure data'});
+});
+
+app.get('/profile', authenticate({scope: 'profile'}), (req: express.Request & {user: OAuth2Server.Token}, res: express.Response, next: express.NextFunction) => {
+    res.json({
+        profile: req.user
+    });
+});
+
+app.listen(3000);
diff --git a/types/oauth2-server/tsconfig.json b/types/oauth2-server/tsconfig.json
index 0345961931..fdafde9f35 100644
--- a/types/oauth2-server/tsconfig.json
+++ b/types/oauth2-server/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es2017"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -13,10 +13,11 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "target": "es6"
     },
     "files": [
         "index.d.ts",
         "oauth2-server-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/oauth2-server/tslint.json b/types/oauth2-server/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/oauth2-server/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/oblo-util/index.d.ts b/types/oblo-util/index.d.ts
index 9fa2a26b2c..7bc19a8ab8 100644
--- a/types/oblo-util/index.d.ts
+++ b/types/oblo-util/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Oblosys/oblo-util
 // Definitions by: Martijn Schrage <https://github.com/Oblosys/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/observe-js/index.d.ts b/types/observe-js/index.d.ts
index 4b668bec16..d3321c9a8c 100644
--- a/types/observe-js/index.d.ts
+++ b/types/observe-js/index.d.ts
@@ -102,7 +102,7 @@ declare namespace observejs {
 	}
 
 	interface ArrayObserver_instance extends Observable {
-		open(onChange:(splices:Array<splice>)=>any):void
+		open(onChange: (splices: Array<splice>, oldSplices: Array<splice>) => any): void
 	}
 
 	/**
diff --git a/types/oclazyload/index.d.ts b/types/oclazyload/index.d.ts
index c4ef1857e2..4733f56a06 100644
--- a/types/oclazyload/index.d.ts
+++ b/types/oclazyload/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ocombe/ocLazyLoad
 // Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/odata/index.d.ts b/types/odata/index.d.ts
new file mode 100644
index 0000000000..3f436667f9
--- /dev/null
+++ b/types/odata/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for odata v0.3.3
+// Project: https://github.com/janhommes/odata
+// Definitions by: Jan Hommes <https://github.com/janhommes>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'odata' {
+    import Q = require("q");
+
+    interface Options {
+        endpoint : string
+        format ?: string
+        autoFormat ?: boolean
+        version ?: number
+        strictMode ?: boolean
+        start ?: () => any
+        ready ?: () => any
+        error ?: () => any
+        headers ?: { name: string, value: string }[]
+        username ?: string
+        password ?: string
+        isAsync ?: boolean
+    }
+
+    interface OHandler<T> {
+        inlinecount : number
+        data : T
+
+        config<T>(options ?: Options) : OHandler<T>
+        progress<T>(callback : () => any) : OHandler<T>
+
+        get<T>(callback ?: (data : T) => void) : Q.Promise<OHandler<T>>
+        save<T>(callback ?: (data : T) => void) : Q.Promise<OHandler<T>>
+
+        post<T>(params : any) : OHandler<T>
+        patch<T>(params : any) : OHandler<T>
+        put<T>(params : any) : OHandler<T>
+        remove<T>(params ?: any) : OHandler<T>
+
+        routes<T>(path : string, callback ?: (data : T) => void) : OHandler<T>
+        route<T>(path : string, callback ?: (data : T) => void) : OHandler<T>
+        triggerRoute(hash : string) : OHandler<T>
+        beforeRouting(callback : (routeParams : any) => boolean) : OHandler<T>
+
+        isEndpoint() : boolean
+        loading<T>(startFn : () => any | boolean, endFn : () => any) : OHandler<T>
+
+        find<T>(selector : string|number) : OHandler<T>
+
+        top<T>(quantity : number) : OHandler<T>
+        take<T>(quantity : number) : OHandler<T>
+        skip<T>(quantity : number) : OHandler<T>
+        first<T>() : OHandler<T>
+
+        include<T>(column : string, data : string) : OHandler<T>
+        exclude<T>(column : string, data : string) : OHandler<T>
+        filterByList<T>(column : string, data : string) : OHandler<T>
+
+        filter<T>(filter : string) : OHandler<T>
+        where<T>(filter : string) : OHandler<T>
+        any<T>(filter : string, resource : string) : OHandler<T>
+        search<T>(columns : string[], term : string) : OHandler<T>
+
+        orderBy<T>(column : string, direction ?: boolean) : OHandler<T>
+        orderByDesc<T>(column : string) : OHandler<T>
+        select<T>(selectStr : string) : OHandler<T>
+
+        count<T>() : OHandler<T>
+        inlineCount<T>(paramName ?: string) : OHandler<T>
+
+        batch<T>(resource : string) : OHandler<T>
+        expand<T>(resource : string) : OHandler<T>
+        ref<T>(resource : string, id : string | number) : OHandler<T>
+        removeRef<T>(resource : string, id : string | number) : OHandler<T>
+        deleteRef<T>(resource : string, id : string | number) : OHandler<T>
+    }
+
+    interface OFn<T> extends OHandler<T> {
+        (options ?: string | Options) : OHandler<T>
+    }
+
+    var o : OFn<{}>;
+
+    export = o
+}
\ No newline at end of file
diff --git a/types/odata/odata-tests.ts b/types/odata/odata-tests.ts
new file mode 100644
index 0000000000..522dc3d529
--- /dev/null
+++ b/types/odata/odata-tests.ts
@@ -0,0 +1,151 @@
+import * as o from 'odata';
+import * as Q from "q";
+
+interface Product {
+    ID : number;
+    Name : string;
+    Description : string;
+    ReleaseDate : string;
+    DiscontinuedDate : Date;
+    Rating: number;
+    Price: number;
+}
+interface Category {
+    ID : number;
+    Name : string;
+}
+
+// copy pasta all the examples from the readme!
+
+o('http://services.odata.org/V4/OData/OData.svc/Products')
+    .get<Product>(function(data) {
+        console.log(data); //returns an array of Product data
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products')
+    .take(5)
+    .skip(2)
+    .get<Product>(function(data) {
+        console.log(data); //An array of 5 products skiped by 2
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products')
+    .find(':0')
+    .route<Product>('Product/Detail/:0/:1',function(data) {
+        console.log('Route Product/Detail/'+this.param[0]+'/'+this.param[1]+' triggered. Result:');
+        console.log(data);
+    });
+
+
+
+var oHandler = o('http://services.odata.org/V4/OData/OData.svc/Products');
+//do somehtting
+oHandler.find(1);
+// do some more................
+//get the data
+oHandler.get<Product>(function(data) {
+    console.log(data);
+    //or the saved var also contains the data:
+    console.log(oHandler.data);
+});
+
+
+
+Q.all<any>([
+    o('http://services.odata.org/V4/OData/OData.svc/Products(4)').get<Product>(),
+    o('http://services.odata.org/V4/OData/OData.svc/Categories').take(2).get<Category[]>()
+]).then(function(oHandlerArray) {
+    //The oHandler array contains the Product oHandler and the Group oHandler:
+    console.log(oHandlerArray[0].data); // 1 Product with id 4
+    console.log(oHandlerArray[1].data.length); // 2 Categories
+});
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products(2)')
+    .get<Product>()
+    .then(function(oHandler) {
+        console.log(oHandler.data);
+    }).fail(function(ex) {
+        console.log(ex);
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products')
+    .post({Name:'Example 1',Description:'a'})
+    .post({Name:'Example 2',Description:'b'})
+    .save<Product>(function(data) {
+        console.log("Two Products added");
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products(1)')
+    .patch({Name:'NewName'})
+    .save<Product>(function(data) {
+        console.log("Product Name changed");
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products(1)')
+    .remove()
+    .save<Product>(function(data) {
+        console.log("Product deleted");
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products(1)')
+    .ref('Categories', 2)
+    .save<Product>(function(data) {
+        console.log("Product(1) associated with Categories(2)");
+    });
+
+
+
+o('http://services.odata.org/V4/OData/OData.svc/Products')
+    .find(2)
+    .get<Product>()
+    .then(function(oHandler) {
+        oHandler.data.Name="NewName";
+        return(o.save<Product>());
+    }).then(function(oHandler) {
+        console.log(oHandler.data.Name); //NewName
+    }).fail(function(ex) {
+        console.log("error");
+    });
+
+
+
+// set an endpoint
+o().config({
+    endpoint:'http://services.odata.org/V4/OData/OData.svc'
+});
+// after you have set an endpoint, you can shorten your queries:
+o('Products').get<Product>(function(data) {
+    //same result like the first example on this page
+});
+
+
+
+//basic config
+o().config({
+    endpoint:null,    // your odata endpoint for the service
+    format: 'json',
+    autoFormat:false,        // currently only json is supported
+    version:4,        // oData version (currently supported version 4. However most also work with version 3.)
+    strictMode:true,  // strict mode throws exception, non strict mode only logs them
+    start:null,       // a function which is executed on loading
+    ready:null,       // a function which is executed on ready
+    error:null,       // a function which is executed on error
+    headers:[{name: '', value: ''}],       // a array of additional headers e.g.: [{name:'headername',value:'headervalue'}]
+    username:null,    // a basic auth username
+    password:null,    // a basic auth password
+    isAsync:true      //set this to false to make synced (a)jax calls. (dosn't work with basic auth!)
+});
\ No newline at end of file
diff --git a/types/odata/tsconfig.json b/types/odata/tsconfig.json
new file mode 100644
index 0000000000..6aac2e60a7
--- /dev/null
+++ b/types/odata/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "q": [ "q/v0" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "odata-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ofe/index.d.ts b/types/ofe/index.d.ts
new file mode 100644
index 0000000000..663bc0510c
--- /dev/null
+++ b/types/ofe/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for ofe 0.5
+// Project: https://github.com/trevnorris/node-ofe
+// Definitions by: Ben Davies <https://github.com/Morfent>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function call(): 'done';
diff --git a/types/ofe/ofe-tests.ts b/types/ofe/ofe-tests.ts
new file mode 100644
index 0000000000..002aecba23
--- /dev/null
+++ b/types/ofe/ofe-tests.ts
@@ -0,0 +1,8 @@
+/// <reference types="node" />
+
+import * as ofe from 'ofe';
+
+let ret = ofe.call();
+if (ret === 'done') {
+	console.log('The ofe module was successfully called to create a heapdump if the process runs out of memory.');
+}
diff --git a/types/ofe/tsconfig.json b/types/ofe/tsconfig.json
new file mode 100644
index 0000000000..9c1f9c174a
--- /dev/null
+++ b/types/ofe/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ofe-tests.ts"
+    ]
+}
diff --git a/types/ofe/tslint.json b/types/ofe/tslint.json
new file mode 100644
index 0000000000..b4b47a0378
--- /dev/null
+++ b/types/ofe/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "dtslint/dt.json"
+}
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 520928823e..935c7b3c35 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -2135,314 +2135,405 @@ declare namespace Office {
 
 
 ////////////////////////////////////////////////////////////////
-///////////////// Begin OfficeExtension runtime ////////////////
+//////////////// Begin OfficeExtension runtime /////////////////
 ////////////////////////////////////////////////////////////////
 
-
-declare module OfficeExtension {
-    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
-    class ClientObject {
-        /** The request context associated with the object */
-        context: ClientRequestContext;
-        /** Returns a boolean value for whether the corresponding object is a null object. You must call "context.sync()" before reading the isNullObject property. */
-        isNullObject: boolean;
-    }
+declare namespace OfficeExtension {
+	/** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
+	class ClientObject {
+		/** The request context associated with the object */
+		context: ClientRequestContext;
+		/** Returns a boolean value for whether the corresponding object is a null object. You must call "context.sync()" before reading the isNullObject property. */
+		isNullObject: boolean;
+	}
 }
-declare module OfficeExtension {
-    interface LoadOption {
-        select?: string | string[];
-        expand?: string | string[];
-        top?: number;
-        skip?: number;
-    }
-    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
-    class ClientRequestContext {
-        constructor(url?: string);
+declare namespace OfficeExtension {
+	interface LoadOption {
+		select?: string | string[];
+		expand?: string | string[];
+		top?: number;
+		skip?: number;
+	}
+	/** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
+	class ClientRequestContext {
+		constructor(url?: string);
 
-        /** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
-        trackedObjects: TrackedObjects;
+		/** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
+		trackedObjects: TrackedObjects;
 
-        /** Request headers */
-        requestHeaders: { [name: string]: string };
+		/** Request headers */
+		requestHeaders: { [name: string]: string };
 
-        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
-        load(object: ClientObject, option?: string | string[] | LoadOption): void;
+		/** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
+		load(object: ClientObject, option?: string | string[]| LoadOption): void;
 
-        /**
-        * Queues up a command to recursively load the specified properties of the object and its navigation properties.
-        * You must call "context.sync()" before reading the properties.
-        *
-        * @param object The object to be loaded.
-        * @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
-        * @param maxDepth The maximum recursive depth.
-        */
-        loadRecursive(object: ClientObject, options: { [typeName: string]: string | string[] | LoadOption }, maxDepth?: number): void;
+		/**
+		* Queues up a command to recursively load the specified properties of the object and its navigation properties.
+		* You must call "context.sync()" before reading the properties.
+		* 
+		* @param object The object to be loaded.
+		* @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
+		* @param maxDepth The maximum recursive depth.
+		*/
+		loadRecursive(object: ClientObject, options: { [typeName: string]: string | string[] | LoadOption }, maxDepth?: number): void;
 
-        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
-        trace(message: string): void;
+		/** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
+		trace(message: string): void;
 
-        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code. This method returns a promise, which is resolved when the synchronization is complete. */
-        sync<T>(passThroughValue?: T): IPromise<T>;
-    }
+		/** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
+		sync<T>(passThroughValue?: T): IPromise<T>;
+	}
 }
-declare module OfficeExtension {
-    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
-    class ClientResult<T> {
-        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
-        value: T;
-    }
+declare namespace OfficeExtension {
+	/** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
+	class ClientResult<T> {
+		/** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
+		value: T;
+	}
 }
-declare module OfficeExtension {
-    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
-    class Error {
-        /** Error name: "OfficeExtension.Error".*/
-        name: string;
-        /** The error message passed through from the host Office application. */
-        message: string;
-        /** Stack trace, if applicable. */
-        stack: string;
-        /** Error code string, such as "InvalidArgument". */
-        code: string;
-        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
-        traceMessages: Array<string>;
-        /** Debug info, if applicable. The ".errorLocation" property can describe the object and method or property that caused the error. */
-        debugInfo: {
-            /** If applicable, will return the object type and the name of the method or property that caused the error. */
-            errorLocation?: string;
-        };
-    }
+declare namespace OfficeExtension {
+	export interface DebugInfo {
+		/** Error code string, such as "InvalidArgument". */
+		code: string;
+		/** The error message passed through from the host Office application. */
+		message: string;
+		/** Inner error, if applicable. */
+		innerError?: DebugInfo | string;
+
+		/** The object type and property or method name (or similar information), if available. */
+		errorLocation?: string
+	}
+
+	/** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
+	class Error {
+		/** Error name: "OfficeExtension.Error".*/
+		name: string;
+		/** The error message passed through from the host Office application. */
+		message: string;
+		/** Stack trace, if applicable. */
+		stack: string;
+		/** Error code string, such as "InvalidArgument". */
+		code: string;
+		/** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
+		traceMessages: Array<string>;
+		/** Debug info (useful for detailed logging of the error, i.e., via JSON.stringify(...)). */
+		debugInfo: DebugInfo;
+		/** Inner error, if applicable. */
+		innerError: Error;
+	}
 }
-declare module OfficeExtension {
-    class ErrorCodes {
-        static accessDenied: string;
-        static generalException: string;
-        static activityLimitReached: string;
-    }
+declare namespace OfficeExtension {
+	class ErrorCodes {
+		public static accessDenied: string;
+		public static generalException: string;
+		public static activityLimitReached: string;
+		public static invalidObjectPath: string;
+		public static propertyNotLoaded: string;
+		public static valueNotLoaded: string;
+		public static invalidRequestContext: string;
+		public static invalidArgument: string;
+		public static runMustReturnPromise: string;
+		public static cannotRegisterEvent: string;
+		public static apiNotFound: string;
+		public static connectionFailure: string;
+	}
 }
-declare module OfficeExtension {
-    /** An IPromise object that represents a deferred interaction with the host Office application. */
-    interface IPromise<R> {
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+declare namespace OfficeExtension {
+	/** An IPromise object that represents a deferred interaction with the host Office application. */
+	interface IPromise<R> {
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
 
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => void): IPromise<U>;
+	}
 
-    /** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
-    export class Promise<R> implements IPromise<R>
-    {
-        /**
-         * Creates a new promise based on a function that accepts resolve and reject handlers.
-         */
-        constructor(func: (resolve: (value?: R | IPromise<R>) => void, reject: (error?: any) => void) => void);
+	/** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
+	export class Promise<R> implements IPromise<R>
+	{
+		/**
+		 * Creates a new promise based on a function that accepts resolve and reject handlers.
+		 */
+		constructor(func: (resolve: (value?: R | IPromise<R>) => void, reject: (error?: any) => void) => void);
 
-        /**
-         * Creates a promise that resolves when all of the child promises resolve.
-         */
-        static all<U>(promises: OfficeExtension.IPromise<U>[]): IPromise<U[]>;
+		/**
+		 * Creates a promise that resolves when all of the child promises resolve.
+		 */
+		static all<U>(promises: OfficeExtension.IPromise<U>[]): IPromise<U[]>;
 
-        /**
-         * Creates a promise that is resolved.
-         */
-        static resolve<U>(value: U): IPromise<U>;
+		/**
+		 * Creates a promise that is resolved.
+		 */
+		static resolve<U>(value: U): IPromise<U>;
 
-        /**
-         * Creates a promise that is rejected.
-         */
-        static reject<U>(error: any): IPromise<U>;
+		/**
+		 * Creates a promise that is rejected.
+		 */
+		static reject<U>(error: any): IPromise<U>;
 
-        /* This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/* This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+		/**
+		 * This method will be called once the previous promise has been resolved.
+		 * Both the onFulfilled on onRejected callbacks are optional.
+		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
 
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
+		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+		 */
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
 
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => U): IPromise<U>;
 
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
+		/**
+		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+		 * @param onRejected function to be called if or when the promise rejects.
+		 */
+		catch<U>(onRejected?: (error: any) => void): IPromise<U>;
+	}
 }
 
-declare module OfficeExtension {
-    /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
-    class TrackedObjects {
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(object: ClientObject): void;
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(objects: ClientObject[]): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(object: ClientObject): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(objects: ClientObject[]): void;
-    }
+declare namespace OfficeExtension {
+	/** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
+	class TrackedObjects {
+		/** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+		add(object: ClientObject): void;
+		/** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+		add(objects: ClientObject[]): void;
+		/** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+		remove(object: ClientObject): void;
+		/** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+		remove(objects: ClientObject[]): void;
+	}
 }
 
-declare module OfficeExtension {
-    export class EventHandlers<T> {
-        constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
-        add(handler: (args: T) => IPromise<any>): EventHandlerResult<T>;
-        remove(handler: (args: T) => IPromise<any>): void;
-    }
+declare namespace OfficeExtension {
+	export class EventHandlers<T> {
+		constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
+		add(handler: (args: T) => IPromise<any>): EventHandlerResult<T>;
+		remove(handler: (args: T) => IPromise<any>): void;
+	}
 
-    export class EventHandlerResult<T> {
-        constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => IPromise<any>);
-        remove(): void;
-    }
+	export class EventHandlerResult<T> {
+		constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => IPromise<any>);
+		remove(): void;
+	}
 
-    export interface EventInfo<T> {
-        registerFunc: (callback: (args: any) => void) => IPromise<any>;
-        unregisterFunc: (callback: (args: any) => void) => IPromise<any>;
-        eventArgsTransformFunc: (args: any) => IPromise<T>;
-    }
+	export interface EventInfo<T> {
+		registerFunc: (callback: (args: any) => void) => IPromise<any>;
+		unregisterFunc: (callback: (args: any) => void) => IPromise<any>;
+		eventArgsTransformFunc: (args: any) => IPromise<T>;
+	}
 }
-declare module OfficeExtension {
+declare namespace OfficeExtension {
+	/**
+	* Request URL and headers 
+	*/
+	interface RequestUrlAndHeaderInfo {
+		/** Request URL */
+		url: string;
+		/** Request headers */
+		headers?: {
+			[name: string]: string;
+		};
+	}
+}
+
+
+
+declare namespace OfficeCore {
     /**
-    * Request URL and headers
-    */
-    interface RequestUrlAndHeaderInfo {
-        /** Request URL */
-        url: string;
-        /** Request headers */
-        headers?: {
-            [name: string]: string;
+     * [Api set: Experiment 1.1 (PREVIEW)]
+     */
+    class FlightingService extends OfficeExtension.ClientObject {
+        getFeature(featureName: string, type: string, defaultValue: number | boolean | string, possibleValues?: Array<number> | Array<string> | Array<boolean> | Array<ScopedValue>): OfficeCore.ABType;
+        getFeatureGate(featureName: string, scope?: string): OfficeCore.ABType;
+        resetOverride(featureName: string): void;
+        setOverride(featureName: string, type: string, value: number | boolean | string): void;
+        /**
+         * Create a new instance of OfficeCore.FlightingService object
+         */
+        static newObject(context: OfficeExtension.ClientRequestContext): OfficeCore.FlightingService;
+        toJSON(): {};
+    }
+    /**
+     *
+     * Provides information about the scoped value.
+     *
+     * [Api set: Experiment 1.1 (PREVIEW)]
+     */
+    interface ScopedValue {
+        /**
+         *
+         * Gets the scope.
+         *
+         * [Api set: Experiment 1.1 (PREVIEW)]
+         */
+        scope: string;
+        /**
+         *
+         * Gets the value.
+         *
+         * [Api set: Experiment 1.1 (PREVIEW)]
+         */
+        value: string | number | boolean;
+    }
+    /**
+     * [Api set: Experiment 1.1 (PREVIEW)]
+     */
+    class ABType extends OfficeExtension.ClientObject {
+        readonly value: string | number | boolean;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): OfficeCore.ABType;
+        toJSON(): {
+            "value": string | number | boolean;
         };
     }
+    /**
+     * [Api set: Experiment 1.1 (PREVIEW)]
+     */
+    namespace FeatureType {
+        var boolean: string;
+        var integer: string;
+        var string: string;
+    }
+    namespace ExperimentErrorCodes {
+        var generalException: string;
+    }
+    module Interfaces {
+    }
+}
+declare namespace OfficeCore {
+    class RequestContext extends OfficeExtension.ClientRequestContext {
+        constructor(url?: string | OfficeExtension.RequestUrlAndHeaderInfo | any);
+        readonly flightingService: FlightingService;
+    }
 }
 
 
-
 ////////////////////////////////////////////////////////////////
-////////////////// End OfficeExtension runtime /////////////////
+///////////////// End OfficeExtension runtime //////////////////
 ////////////////////////////////////////////////////////////////
 
 
@@ -2631,7 +2722,7 @@ declare namespace Excel {
     /**
      * The RequestContext object facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
      */
-    class RequestContext extends OfficeExtension.ClientRequestContext {
+    class RequestContext extends OfficeCore.RequestContext {
         constructor(url?: string | Session);
         readonly workbook: Workbook;
         readonly application: Application;
@@ -2788,7 +2879,7 @@ declare namespace Excel {
          *
          * Suspends calculation until the next "context.sync()" is called. Once set, it is the developer's responsibility to re-calc the workbook, to ensure that any dependencies are propagated.
          *
-         * [Api set: ExcelApi 1.7 (PREVIEW)]
+         * [Api set: ExcelApi 1.6 (PREVIEW)]
          */
         suspendApiCalculationUntilNextSync(): void;
         /**
@@ -12804,6 +12895,7 @@ declare namespace Excel {
         var itemNotFound: string;
         var notImplemented: string;
         var unsupportedOperation: string;
+        var invalidOperationInCellEditMode: string;
     }
     module Interfaces {
         /** An interface for updating data on the Worksheet object, for use in "worksheet.set({ ... })". */
@@ -21794,4 +21886,4 @@ declare namespace OneNote {
 
 ////////////////////////////////////////////////////////////////
 /////////////////////// End OneNote APIs ///////////////////////
-////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 577e2f485a..42587298f0 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11154,7 +11154,7 @@ declare module ol {
      *     Array.<Array.<ol.Coordinate>>), ol.geom.SimpleGeometry=):
      *     ol.geom.SimpleGeometry}
      */
-    type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
+    type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
 
     /**
      * A function that takes an {@link ol.MapBrowserEvent} and returns a
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index de12feeb80..f0abcf28ce 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -19,6 +19,8 @@ let featureStyleFunction: ol.FeatureStyleFunction;
 let featureLoader: ol.FeatureLoader;
 let easingFunction: (t: number) => number;
 let drawGeometryFunction: ol.DrawGeometryFunctionType;
+drawGeometryFunction([0,0], new ol.geom.Point([0,0]));
+drawGeometryFunction([0,0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
diff --git a/types/openui5/index.d.ts b/types/openui5/index.d.ts
index b6c1a14d1c..ac0879ae97 100644
--- a/types/openui5/index.d.ts
+++ b/types/openui5/index.d.ts
@@ -2,7 +2,8 @@
 // Project: http://openui5.org/
 // Definitions by: Lukas May <https://www.dscsag.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference path="./sap.m.d.ts" />
 /// <reference path="./sap.ui.d.ts" />
-/// <reference path="./jquery.sap.d.ts" />
\ No newline at end of file
+/// <reference path="./jquery.sap.d.ts" />
diff --git a/types/orderedmap/index.d.ts b/types/orderedmap/index.d.ts
new file mode 100644
index 0000000000..3e957c14d4
--- /dev/null
+++ b/types/orderedmap/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for orderedmap 1.0
+// Project: https://github.com/marijnh/orderedmap
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export = OrderedMap;
+
+declare class OrderedMap<T> {
+  get(key: string): T | undefined;
+  update(key: string, value: T, newKey?: string): this;
+  remove(key: string): this;
+  addToStart(key: string, value: T): this;
+  addToEnd(key: string, value: T): this;
+  addBefore(place: string, key: string, value: T): this;
+  forEach(f: (key: string, value: T) => void): void;
+  prepend(map: { [key: string]: T } | OrderedMap<T>): this;
+  append(map: { [key: string]: T } | OrderedMap<T>): this;
+  subtract(map: { [key: string]: T } | OrderedMap<T>): this;
+  readonly size: number;
+
+  static from<T>(value?: { [key: string]: T } | OrderedMap<T>): OrderedMap<T>;
+}
diff --git a/types/orderedmap/orderedmap-tests.ts b/types/orderedmap/orderedmap-tests.ts
new file mode 100644
index 0000000000..2125c1f918
--- /dev/null
+++ b/types/orderedmap/orderedmap-tests.ts
@@ -0,0 +1,27 @@
+import OrderedMap = require('orderedmap');
+
+// Ensure .get() returns the correct type.
+OrderedMap
+    .from({ one: 1 })
+    .get('one')!.toExponential();
+OrderedMap
+    .from({ one: '1' })
+    .get('one')!.codePointAt(0);
+
+const om = OrderedMap.from({ key: 'value' });
+
+// Terminating methods / properties
+om.get('key');
+om.forEach((key: string, value: string) => {});
+om.size + 1;
+
+// Method chaining
+om
+    .update('key', 'value')
+    .remove('key')
+    .addToStart('key', 'value')
+    .addToEnd('key', 'value')
+    .addBefore('key', 'key', 'value')
+    .prepend({ key: 'value' })
+    .append({ key: 'value' })
+    .subtract({ key: 'value' });
diff --git a/types/orderedmap/tsconfig.json b/types/orderedmap/tsconfig.json
new file mode 100644
index 0000000000..cc31c6b296
--- /dev/null
+++ b/types/orderedmap/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "orderedmap-tests.ts"
+    ]
+}
diff --git a/types/orderedmap/tslint.json b/types/orderedmap/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/orderedmap/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/orientjs/index.d.ts b/types/orientjs/index.d.ts
index 571aeebe7c..679fc7c70a 100644
--- a/types/orientjs/index.d.ts
+++ b/types/orientjs/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/orientechnologies/orientjs
 // Definitions by: Saeed Tabrizi <https://github.com/saeedtabrizi>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
+// TypeScript Version: 2.3
+
 // Developed with love in www.nowcando.com
 
 /// <reference types="node" />
diff --git a/types/owlcarousel/index.d.ts b/types/owlcarousel/index.d.ts
index 66242aa888..94fead3e66 100644
--- a/types/owlcarousel/index.d.ts
+++ b/types/owlcarousel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/OwlFonk/OwlCarousel
 // Definitions by: Damian Piątkowski <https://github.com/dpiatkowski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/packery/index.d.ts b/types/packery/index.d.ts
index 9141bbfd52..6a6d6c6939 100644
--- a/types/packery/index.d.ts
+++ b/types/packery/index.d.ts
@@ -1,293 +1,298 @@
 // Type definitions for Packery v1.4.1
 // Project: http://packery.metafizzy.co
-// Definitions by: Piraveen Kamalathas from Kilix <https://github.com/piraveen>
+// Definitions by:  Piraveen Kamalathas from Kilix <https://github.com/piraveen>
+//                  Juliën Hanssens <https://github.com/hanssens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+/// <reference types="jquery" />
 
-interface PackeryOptions {
-    /**
-     * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
-     * @type {string}
-     */
-    itemSelector?: string;
+declare module 'packery' {
 
-    /**
-     * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
-     * @type {number}
-     */
-    columnWidth?: number;
+    export interface PackeryOptions {
+        /**
+         * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
+         * @type {string}
+         */
+        itemSelector?: string;
 
-    /**
-     * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
-     * @type {number}
-     */
-    rowHeight?: number;
+        /**
+         * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
+         * @type {number}
+         */
+        columnWidth?: number;
 
-    /**
-     * [gutter The space between item elements, both vertically and horizontally]
-     * @type {number}
-     */
-    gutter?: number;
+        /**
+         * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
+         * @type {number}
+         */
+        rowHeight?: number;
 
-    /**
-     * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
-     * @type {boolean}
-     */
-    percentPosition?: boolean;
+        /**
+         * [gutter The space between item elements, both vertically and horizontally]
+         * @type {number}
+         */
+        gutter?: number;
 
-    /**
-     * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
-     * @type {string}
-     */
-    stamp?: string;
+        /**
+         * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
+         * @type {boolean}
+         */
+        percentPosition?: boolean;
 
-    /**
-     * [isHorizontal Arranges items horizontally instead of vertically]
-     * @type {boolean}
-     */
-    isHorizontal?: boolean;
+        /**
+         * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
+         * @type {string}
+         */
+        stamp?: string;
 
-    /**
-     * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
-     * @type {boolean}
-     */
-    isOriginLeft?: boolean;
+        /**
+         * [isHorizontal Arranges items horizontally instead of vertically]
+         * @type {boolean}
+         */
+        isHorizontal?: boolean;
 
-    /**
-     * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
-     * @type {boolean}
-     */
-    isOriginTop?: boolean;
+        /**
+         * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
+         * @type {boolean}
+         */
+        isOriginLeft?: boolean;
 
-    /**
-     * [transitionDuration The time duration of transitions for item elements]
-     * @type {string}
-     */
-    transitionDuration?: string;
+        /**
+         * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
+         * @type {boolean}
+         */
+        isOriginTop?: boolean;
 
-    /**
-     * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
-     * @type {Object}
-     */
-    containerStyle?: Object;
+        /**
+         * [transitionDuration The time duration of transitions for item elements]
+         * @type {string}
+         */
+        transitionDuration?: string;
 
-    /**
-     * [isResizeBound Binds layout to window resizing]
-     * @type {boolean}
-     */
-    isResizeBound?: boolean;
+        /**
+         * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
+         * @type {Object}
+         */
+        containerStyle?: Object;
+
+        /**
+         * [isResizeBound Binds layout to window resizing]
+         * @type {boolean}
+         */
+        isResizeBound?: boolean;
+
+        /**
+         * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
+         * @type {boolean}
+         */
+        isInitLayout?: boolean;
+    }
+
+    export class Packery {
+        constructor(element: Element, options?: Object);
+
+        /**
+         * [addItems Add item elements to the Packery instance]
+         * @param {Element} elements [description]
+         */
+        addItems(elements: Element): void;
+
+        /**
+         * [addItems Add item elements to the Packery instance]
+         * @param {NodeList} elements [description]
+         */
+        addItems(elements: NodeList): void;
+
+        /**
+         * [addItems Add item elements to the Packery instance]
+         * @param {Array<Element>} elements [description]
+         */
+        addItems(elements: Array<Element>): void;
+
+        /**
+         * [appended Add and lay out newly appended item elements]
+         * @param {Element} elements [description]
+         */
+        appended(elements: Element): void;
+
+        /**
+         * [appended Add and lay out newly appended item elements]
+         * @param {NodeList} elements [description]
+         */
+        appended(elements: NodeList): void;
+
+        /**
+         * [appended Add and lay out newly appended item elements]
+         * @param {Array<Element>} elements [description]
+         */
+        appended(elements: Array<Element>): void;
+
+        /**
+         * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
+         * @param {any} draggie [description]
+         */
+        bindDraggabillyEvents(draggie: any): void;
+
+        /**
+         * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
+         */
+        bindResize(): void;
+
+        /**
+         * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
+         * @param {any} elements [jQuery UI]
+         */
+        bindUIDraggableEvents($element: any): void;
+
+        /**
+         * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
+         * @param  {Element} element [description]
+         * @return {Packery}         [description]
+         */
+        data(element: Element): Packery;
+
+        /**
+         * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
+         */
+        destroy(): void;
+
+        /**
+         * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
+         * @param {any}    element [description]
+         * @param {number} x       [description]
+         * @param {number} y       [description]
+         */
+        fit(element: Element, x?: number, y?: number): void;
+
+        /**
+         * [getItemElements Get an array of elements used as the Packery instance's items.]
+         * @return {Array<Element>}      [description]
+         */
+        getItemElements(): Array<Element>;
+
+        /**
+         * [getItem Get a Packery.Item from an element]
+         * @param  {Element} element [description]
+         * @return {any}             [Packery.item]
+         */
+        getItem(element: Element): any;
+
+        /**
+         * [layout Lay out all item elements.]
+         */
+        layout(): void;
+
+        /**
+         * [layoutItems Lay out specified items]
+         * @param {Array<Packery.items>} items [description]
+         */
+        layoutItems(items: Array<any>): void;
+
+        /**
+         * [off Remove an event listener]
+         * @param  {string}   eventName [description]
+         * @param  {Function} listener  [description]
+         * @return {Packery}            [description]
+         */
+        off(eventName: string, listener: Function): Packery;
+
+        /**
+         * [on Add an event listener for certain events]
+         * @param  {string}   eventName [description]
+         * @param  {Function} listener  [description]
+         * @return {Packery}            [description]
+         */
+        on(eventName: string, listener: Function): Packery;
+
+        /**
+         * [once Add an event listener for certain events, to be triggered once]
+         * @param {string}   eventName [description]
+         * @param {Function} listener  [description]
+         */
+        once(eventName: string, listener: Function): void;
+
+        /**
+         * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+         * @param {Element} elements [description]
+         */
+        prepended(elements: Element): void;
+
+        /**
+         * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+         * @param {NodeList} elements [description]
+         */
+        prepended(elements: NodeList): void;
+
+        /**
+         * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+         * @param {Array<Element>} elements [description]
+         */
+        prepended(elements: Array<Element>): void;
+
+        /**
+         * [reloadItems Recollect all item elements]
+         */
+        reloadItems(): void;
+
+        /**
+         * [remove Remove elements from the Packery instance, then from the DOM]
+         * @param {Element} elements [description]
+         */
+        remove(elements: Element): void;
+
+        /**
+         * [remove Remove elements from the Packery instance, then from the DOM]
+         * @param {NodeList} elements [description]
+         */
+        remove(elements: NodeList): void;
+
+        /**
+         * [remove Remove elements from the Packery instance, then from the DOM]
+         * @param {Array<Element>} elements [description]
+         */
+        remove(elements: Array<Element>): void;
+
+        /**
+         * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+         * @param {Element} elements [description]
+         */
+        stamp(elements: Element): void;
+
+        /**
+         * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+         * @param {NodeList} elements [description]
+         */
+        stamp(elements: NodeList): void;
+
+        /**
+         * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+         * @param {Array<Element>} elements [description]
+         */
+        stamp(elements: Array<Element>): void;
+
+        /**
+         * [unbindResize Un-bind layout to window resize event]
+         */
+        unbindResize(): void;
+
+        /**
+         * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+         * @param {Element} element [description]
+         */
+        unstamp(element: Element): void;
+
+        /**
+         * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+         * @param {NodeList} element [description]
+         */
+        unstamp(element: NodeList): void;
+
+        /**
+         * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+         * @param {Array<Element>} element [description]
+         */
+        unstamp(element: Array<Element>): void;
+    }
 
-    /**
-     * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
-     * @type {boolean}
-     */
-    isInitLayout?: boolean;
 }
-
-declare class Packery {
-    constructor(element: Element, options?: Object);
-
-    /**
-     * [addItems Add item elements to the Packery instance]
-     * @param {Element} elements [description]
-     */
-    addItems(elements: Element): void;
-
-    /**
-     * [addItems Add item elements to the Packery instance]
-     * @param {NodeList} elements [description]
-     */
-    addItems(elements: NodeList): void;
-
-    /**
-     * [addItems Add item elements to the Packery instance]
-     * @param {Array<Element>} elements [description]
-     */
-    addItems(elements: Array<Element>): void;
-
-    /**
-     * [appended Add and lay out newly appended item elements]
-     * @param {Element} elements [description]
-     */
-    appended(elements: Element): void;
-
-    /**
-     * [appended Add and lay out newly appended item elements]
-     * @param {NodeList} elements [description]
-     */
-    appended(elements: NodeList): void;
-
-    /**
-     * [appended Add and lay out newly appended item elements]
-     * @param {Array<Element>} elements [description]
-     */
-    appended(elements: Array<Element>): void;
-
-    /**
-     * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
-     * @param {any} draggie [description]
-     */
-    bindDraggabillyEvents(draggie: any): void;
-
-    /**
-     * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
-     */
-    bindResize(): void;
-
-    /**
-     * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
-     * @param {any} elements [jQuery UI]
-     */
-    bindUIDraggableEvents($element: any): void;
-
-    /**
-     * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
-     * @param  {Element} element [description]
-     * @return {Packery}         [description]
-     */
-    data(element: Element): Packery;
-
-    /**
-     * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
-     */
-    destroy(): void;
-
-    /**
-     * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
-     * @param {any}    element [description]
-     * @param {number} x       [description]
-     * @param {number} y       [description]
-     */
-    fit(element: Element, x?: number, y?: number): void;
-
-    /**
-     * [getItemElements Get an array of elements used as the Packery instance's items.]
-     * @return {Array<Element>}      [description]
-     */
-    getItemElements(): Array<Element>;
-
-    /**
-     * [getItem Get a Packery.Item from an element]
-     * @param  {Element} element [description]
-     * @return {any}             [Packery.item]
-     */
-    getItem(element: Element): any;
-
-    /**
-     * [layout Lay out all item elements.]
-     */
-    layout(): void;
-
-    /**
-     * [layoutItems Lay out specified items]
-     * @param {Array<Packery.items>} items [description]
-     */
-    layoutItems(items: Array<any>): void;
-
-    /**
-     * [off Remove an event listener]
-     * @param  {string}   eventName [description]
-     * @param  {Function} listener  [description]
-     * @return {Packery}            [description]
-     */
-    off(eventName: string, listener: Function): Packery;
-
-    /**
-     * [on Add an event listener for certain events]
-     * @param  {string}   eventName [description]
-     * @param  {Function} listener  [description]
-     * @return {Packery}            [description]
-     */
-    on(eventName: string, listener: Function): Packery;
-
-    /**
-     * [once Add an event listener for certain events, to be triggered once]
-     * @param {string}   eventName [description]
-     * @param {Function} listener  [description]
-     */
-    once(eventName: string, listener: Function): void;
-
-    /**
-     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-     * @param {Element} elements [description]
-     */
-    prepended(elements: Element): void;
-
-    /**
-     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-     * @param {NodeList} elements [description]
-     */
-    prepended(elements: NodeList): void;
-
-    /**
-     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-     * @param {Array<Element>} elements [description]
-     */
-    prepended(elements: Array<Element>): void;
-
-    /**
-     * [reloadItems Recollect all item elements]
-     */
-    reloadItems(): void;
-
-    /**
-     * [remove Remove elements from the Packery instance, then from the DOM]
-     * @param {Element} elements [description]
-     */
-    remove(elements: Element): void;
-
-    /**
-     * [remove Remove elements from the Packery instance, then from the DOM]
-     * @param {NodeList} elements [description]
-     */
-    remove(elements: NodeList): void;
-
-    /**
-     * [remove Remove elements from the Packery instance, then from the DOM]
-     * @param {Array<Element>} elements [description]
-     */
-    remove(elements: Array<Element>): void;
-
-    /**
-     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-     * @param {Element} elements [description]
-     */
-    stamp(elements: Element): void;
-
-    /**
-     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-     * @param {NodeList} elements [description]
-     */
-    stamp(elements: NodeList): void;
-
-    /**
-     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-     * @param {Array<Element>} elements [description]
-     */
-    stamp(elements: Array<Element>): void;
-
-    /**
-     * [unbindResize Un-bind layout to window resize event]
-     */
-    unbindResize(): void;
-
-    /**
-     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-     * @param {Element} element [description]
-     */
-    unstamp(element: Element): void;
-
-    /**
-     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-     * @param {NodeList} element [description]
-     */
-    unstamp(element: NodeList): void;
-
-    /**
-     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-     * @param {Array<Element>} element [description]
-     */
-    unstamp(element: Array<Element>): void;
-}
-
-export = Packery;
diff --git a/types/packery/packery-tests.ts b/types/packery/packery-tests.ts
index e8faff1b3f..b89fcecbe1 100644
--- a/types/packery/packery-tests.ts
+++ b/types/packery/packery-tests.ts
@@ -1,7 +1,4 @@
-
-/// <reference types="jquery" />
-
-import Packery = require('packery');
+import { Packery, PackeryOptions } from 'packery';
 
 // TODO Add Draggabilly to bind Draggabilly Events
 var container = document.querySelector('#container');
diff --git a/types/page/index.d.ts b/types/page/index.d.ts
index 229cfd273c..0f9317c6a4 100644
--- a/types/page/index.d.ts
+++ b/types/page/index.d.ts
@@ -26,6 +26,17 @@ declare namespace PageJS {
          *  Links that are not of the same origin are disregarded and will not be dispatched.
          */
         (path: string, ...callbacks: Callback[]): void;
+        /**
+         *  Defines a route mapping path to the given callback(s).
+         *
+         *      page('/', user.list)
+         *      page('/user/:id', user.load, user.show)
+         *      page('/user/:id/edit', user.load, user.edit)
+         *      page('*', notfound)
+         *
+         *  Links that are not of the same origin are disregarded and will not be dispatched.
+         */
+        (path: RegExp, ...callbacks: Callback[]): void;
         /**
          * This is equivalent to page('*', callback) for generic "middleware".
          */
diff --git a/types/paho-mqtt/index.d.ts b/types/paho-mqtt/index.d.ts
new file mode 100644
index 0000000000..7df5863532
--- /dev/null
+++ b/types/paho-mqtt/index.d.ts
@@ -0,0 +1,445 @@
+// Type definitions for paho-mqtt 1.0
+// Project: https://github.com/eclipse/paho.mqtt.javascript#readme
+// Definitions by: Alex Mikhalev <https://github.com/amikhalev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Paho {
+    /**
+     * Send and receive messages using web browsers.
+     * <p>
+     * This programming interface lets a JavaScript client application use the MQTT V3.1 or
+     * V3.1.1 protocol to connect to an MQTT-supporting messaging server.
+     *
+     * The function supported includes:
+     * <ol>
+     * <li>Connecting to and disconnecting from a server. The server is identified by its host name and port number.
+     * <li>Specifying options that relate to the communications link with the server,
+     * for example the frequency of keep-alive heartbeats, and whether SSL/TLS is required.
+     * <li>Subscribing to and receiving messages from MQTT Topics.
+     * <li>Publishing messages to MQTT Topics.
+     * </ol>
+     * <p>
+     * The API consists of two main objects:
+     * <dl>
+     * <dt><b>{@link Paho.MQTT.Client}</b></dt>
+     * <dd>This contains methods that provide the functionality of the API,
+     * including provision of callbacks that notify the application when a message
+     * arrives from or is delivered to the messaging server,
+     * or when the status of its connection to the messaging server changes.</dd>
+     * <dt><b>{@link Paho.MQTT.Message}</b></dt>
+     * <dd>This encapsulates the payload of the message along with various attributes
+     * associated with its delivery, in particular the destination to which it has
+     * been (or is about to be) sent.</dd>
+     * </dl>
+     * <p>
+     * The programming interface validates parameters passed to it, and will throw
+     * an Error containing an error message intended for developer use, if it detects
+     * an error with any parameter.
+     * <p>
+     *
+     * @namespace Paho.MQTT
+     */
+    namespace MQTT {
+        /**
+         * The Quality of Service used to deliver a message.
+         * <dl>
+         *    <dt>0 Best effort (default).</dt>
+         *    <dt>1 At least once.</dt>
+         *    <dt>2 Exactly once.</dt>
+         * </dl>
+         */
+        type Qos = 0 | 1 | 2;
+
+        interface MQTTError {
+            /** A number indicating the nature of the error. */
+            errorCode: number;
+
+            /** Text describing the error */
+            errorMessage: string;
+        }
+        interface WithInvocationContext {
+            /**
+             * <code>invocationContext</code> as passed in with the corresponding field in the connectOptions or
+             * subscribeOptions.
+             */
+            invocationContext: any;
+        }
+        interface ErrorWithInvocationContext extends MQTTError, WithInvocationContext {
+        }
+        interface OnSubscribeSuccessParams extends WithInvocationContext {
+            grantedQos: Qos;
+        }
+
+        /**
+         * Called when the connect acknowledgement has been received from the server.
+         * @param o
+         *  A single response object parameter is passed to the onSuccess callback containing the following fields:
+         *  <li><code>invocationContext</code> as passed in with the corresponding field in the connectOptions.
+         */
+        type OnSuccessCallback = (o: WithInvocationContext) => void;
+
+        /**
+         * Called when the subscribe acknowledgement has been received from the server.
+         * @param o
+         *  A single response object parameter is passed to the onSuccess callback containing the following fields:
+         *  <li><code>invocationContext</code> as passed in with the corresponding field in the connectOptions.
+         */
+        type OnSubscribeSuccessCallback = (o: OnSubscribeSuccessParams) => void;
+
+        /**
+         * Called when the connect request has failed or timed out.
+         * @param e
+         *  A single response object parameter is passed to the onFailure callback containing the following fields:
+         *  <li><code>invocationContext</code> as passed in with the corresponding field in the connectOptions.
+         *  <li><code>errorCode</code> a number indicating the nature of the error.
+         *  <li><code>errorMessage</code> text describing the error.
+         */
+        type OnFailureCallback = (e: ErrorWithInvocationContext) => void;
+
+        /**
+         * Called when a connection has been lost.
+         * @param error A single response object parameter is passed to the onConnectionLost callback containing the
+         *  following fields:
+         *  <li>errorCode
+         *  <li>errorMessage
+         */
+        type OnConnectionLostHandler = (error: MQTTError) => void;
+
+        /**
+         * Called when a message was delivered or has arrived.
+         * @param message The {@link Paho.MQTT.Message} that was delivered or has arrived.
+         */
+        type OnMessageHandler = (message: Message) => void;
+
+        /**
+         * Attributes used with a connection.
+         */
+        interface ConnectionOptions {
+            /**
+             * If the connect has not succeeded within this number of seconds, it is deemed to have failed.
+             * @default The default is 30 seconds.
+             */
+            timeout?: number;
+            /** Authentication username for this connection. */
+            userName?: string;
+            /** Authentication password for this connection. */
+            password?: string;
+            /** Sent by the server when the client disconnects abnormally. */
+            willMessage?: Message;
+            /**
+             * The server disconnects this client if there is no activity for this number of seconds.
+             * @default The default value of 60 seconds is assumed if not set.
+             */
+            keepAliveInterval?: number;
+            /**
+             * If true(default) the client and server persistent state is deleted on successful connect.
+             * @default true
+             */
+            cleanSession?: boolean;
+            /** If present and true, use an SSL Websocket connection. */
+            useSSL?: boolean;
+            /** Passed to the onSuccess callback or onFailure callback. */
+            invocationContext?: any;
+            /**
+             * Called when the connect acknowledgement has been received from the server.
+             */
+            onSuccess?: OnSuccessCallback;
+            /**
+             * Specifies the mqtt version to use when connecting
+             * <dl>
+             *     <dt>3 - MQTT 3.1</dt>
+             *     <dt>4 - MQTT 3.1.1 (default)</dt>
+             * </dl>
+             * @default 4
+             */
+            mqttVersion?: 3 | 4;
+            /**
+             * Called when the connect request has failed or timed out.
+             */
+            onFailure?: OnFailureCallback;
+            /**
+             * If present this contains either a set of hostnames or fully qualified
+             * WebSocket URIs (ws://example.com:1883/mqtt), that are tried in order in place of the host and port
+             * paramater on the construtor. The hosts are tried one at at time in order until one of then succeeds.
+             */
+            hosts?: string[];
+            /**
+             * If present the set of ports matching the hosts. If hosts contains URIs, this property is not used.
+             */
+            ports?: number[];
+        }
+
+        /**
+         * Used to control a subscription
+         */
+        interface SubscribeOptions {
+            /** the maximum qos of any publications sent as a result of making this subscription. */
+            qos?: Qos;
+            /** passed to the onSuccess callback or onFailure callback. */
+            invocationContext?: any;
+            /** called when the subscribe acknowledgement has been received from the server. */
+            onSuccess?: OnSubscribeSuccessCallback;
+            /** called when the subscribe request has failed or timed out. */
+            onFailure?: OnFailureCallback;
+            /**
+             * timeout which, if present, determines the number of seconds after which the onFailure calback is called.
+             * The presence of a timeout does not prevent the onSuccess callback from being called when the subscribe
+             * completes.
+             */
+            timeout?: number;
+        }
+
+        interface UnsubscribeOptions {
+            /** passed to the onSuccess callback or onFailure callback.  */
+            invocationContext?: any;
+            /** called when the unsubscribe acknowledgement has been received from the server. */
+            onSuccess?: OnSuccessCallback;
+            /** called when the unsubscribe request has failed or timed out. */
+            onFailure?: OnFailureCallback;
+            /**
+             * timeout which, if present, determines the number of seconds after which the onFailure calback is called.
+             * The presence of a timeout does not prevent the onSuccess callback from being called when the unsubscribe
+             * completes.
+             */
+            timeout?: number;
+        }
+
+        interface TraceElement {
+            severity: "Debug";
+            message: string;
+        }
+
+        type TraceFunction = (element: TraceElement) => void;
+
+        /**
+         * The JavaScript application communicates to the server using a {@link Paho.MQTT.Client} object.
+         *
+         * Most applications will create just one Client object and then call its connect() method,
+         * however applications can create more than one Client object if they wish.
+         * In this case the combination of host, port and clientId attributes must be different for each Client object.
+         *
+         * The send, subscribe and unsubscribe methods are implemented as asynchronous JavaScript methods
+         * (even though the underlying protocol exchange might be synchronous in nature).
+         * This means they signal their completion by calling back to the application,
+         * via Success or Failure callback functions provided by the application on the method in question.
+         * Such callbacks are called at most once per method invocation and do not persist beyond the lifetime
+         * of the script that made the invocation.
+         *
+         * In contrast there are some callback functions, most notably {@link onMessageArrived},
+         * that are defined on the {@link Paho.MQTT.Client} object.
+         * These may get called multiple times, and aren't directly related to specific method invocations made by the
+         * client.
+         *
+         */
+        class Client {
+            /** <i>read only</i> used when connecting to the server. */
+            readonly clientId: string;
+
+            /** <i>read only</i> the server's DNS hostname or dotted decimal IP address. */
+            readonly host: string;
+
+            /** <i>read only</i> the server's path. */
+            readonly path: string;
+
+            /** <i>read only</i> the server's port. */
+            readonly port: number;
+
+            /** function called with trace information, if set */
+            trace?: TraceFunction;
+
+            /**
+             * called when a connection has been lost. after a connect() method has succeeded.
+             * Establish the call back used when a connection has been lost. The connection may be
+             * lost because the client initiates a disconnect or because the server or network
+             * cause the client to be disconnected. The disconnect call back may be called without
+             * the connectionComplete call back being invoked if, for example the client fails to
+             * connect.
+             * A single response object parameter is passed to the onConnectionLost callback containing the following
+             * fields:
+             * <li>errorCode
+             * <li>errorMessage
+             */
+            onConnectionLost: OnConnectionLostHandler;
+
+            /**
+             * called when a message has been delivered.
+             * All processing that this Client will ever do has been completed. So, for example,
+             * in the case of a Qos=2 message sent by this client, the PubComp flow has been received from the server
+             * and the message has been removed from persistent storage before this callback is invoked.
+             * Parameters passed to the onMessageDelivered callback are:
+             * <li>{@link Paho.MQTT.Message} that was delivered.
+             */
+            onMessageDelivered: OnMessageHandler;
+
+            /**
+             * called when a message has arrived in this Paho.MQTT.client.
+             * Parameters passed to the onMessageArrived callback are:
+             * <li> {@link Paho.MQTT.Message} that has arrived.
+             */
+            onMessageArrived: OnMessageHandler;
+
+            /* tslint:disable:unified-signatures */
+            /* these cannot actually be neatly unified */
+
+            /**
+             * @param host - the address of the messaging server as a DNS name or dotted decimal IP address.
+             * @param port - the port number to connect to
+             * @param path - the path on the host to connect to - only used if host is not a URI. Default: '/mqtt'.
+             * @param clientId - the Messaging client identifier, between 1 and 23 characters in length.
+             */
+            constructor(host: string, port: number, path: string, clientId: string);
+
+            /**
+             * @param host - the address of the messaging server as a DNS name or dotted decimal IP address.
+             * @param port - the port number to connect to
+             * @param clientId - the Messaging client identifier, between 1 and 23 characters in length.
+             */
+            constructor(host: string, port: number, clientId: string);
+
+            /**
+             * @param hostUri - the address of the messaging server as a fully qualified WebSocket URI
+             * @param clientId - the Messaging client identifier, between 1 and 23 characters in length.
+             */
+            constructor(hostUri: string, clientId: string);
+
+            /* tslint:enable:unified-signatures */
+
+            /**
+             * Connect this Messaging client to its server.
+             * @throws {InvalidState} if the client is not in disconnected state. The client must have received
+             *      connectionLost or disconnected before calling connect for a second or subsequent time.
+             */
+            connect(connectionOptions?: ConnectionOptions): void;
+
+            /**
+             * Normal disconnect of this Messaging client from its server.
+             *
+             * @throws {InvalidState} if the client is already disconnected.
+             */
+            disconnect(): void;
+
+            /**
+             * @returns True if the client is currently connected
+             */
+            isConnected(): boolean;
+
+            /**
+             * Get the contents of the trace log.
+             *
+             *  @return {Object[]} tracebuffer containing the time ordered trace records.
+             */
+            getTraceLog(): any[];
+
+            /**
+             * Start tracing.
+             */
+            startTrace(): void;
+
+            /**
+             * Stop tracing.
+             */
+            stopTrace(): void;
+
+            /**
+             * Send a message to the consumers of the destination in the Message.
+             *
+             * @param {Paho.MQTT.Message} message - <b>mandatory</b> The {@link Paho.MQTT.Message} object to be sent.
+             * @throws {InvalidState} if the client is not connected.
+             */
+            send(message: Message): void;
+
+            /**
+             * Send a message to the consumers of the destination in the Message.
+             *
+             * @param {string} topic - <b>mandatory</b> The name of the destination to which the message is to be sent.
+             * @param {string|ArrayBuffer} payload - The message data to be sent.
+             * @param {number} qos The Quality of Service used to deliver the message.
+             *        <dl>
+             *            <dt>0 Best effort (default).
+             *            <dt>1 At least once.
+             *            <dt>2 Exactly once.
+             *        </dl>
+             * @param {Boolean} retained If true, the message is to be retained by the server and delivered to both
+             * current and future subscriptions. If false the server only delivers the message to current subscribers,
+             * this is the default for new Messages. A received message has the retained boolean set to true if the
+             * message was published with the retained boolean set to true and the subscrption was made after the
+             * message has been published.
+             * @throws {InvalidState} if the client is not connected.
+             */
+            send(topic: string, payload: string | ArrayBuffer, qos?: Qos, retained?: boolean): void;
+
+            /**
+             * Subscribe for messages, request receipt of a copy of messages sent to the destinations described by the
+             * filter.
+             *
+             * @param filter A filter describing the destinations to receive messages from.
+             * @param subcribeOptions Used to control the subscription
+             * @throws {InvalidState} if the client is not in connected state.
+             */
+            subscribe(filter: string, subcribeOptions?: SubscribeOptions): void;
+
+            /**
+             * Unsubscribe for messages, stop receiving messages sent to destinations described by the filter.
+             *
+             * @param filter - describing the destinations to receive messages from.
+             * @param unsubscribeOptions - used to control the subscription
+             * @throws {InvalidState} if the client is not in connected state.
+             */
+            unsubscribe(filter: string, unsubcribeOptions?: UnsubscribeOptions): void;
+        }
+
+        /**
+         * An application message, sent or received.
+         */
+        class Message {
+            /**
+             * <b>mandatory</b> The name of the destination to which the message is to be sent
+             * (for messages about to be sent) or the name of the destination from which the message has been received.
+             * (for messages received by the onMessage function).
+             */
+            destinationName?: string;
+
+            /**
+             * <i>read only</i> If true, this message might be a duplicate of one which has already been received.
+             * This is only set on messages received from the server.
+             */
+            readonly duplicate: boolean;
+
+            /** <i>read only</i> The payload as an ArrayBuffer. */
+            readonly payloadBytes: ArrayBuffer;
+
+            /**
+             *  <i>read only</i> The payload as a string if the payload consists of valid UTF-8 characters.
+             *  @throw {Error} if the payload is not valid UTF-8
+             */
+            readonly payloadString: string;
+
+            /**
+             * The Quality of Service used to deliver the message.
+             * <dl>
+             *     <dt>0 Best effort (default).
+             *     <dt>1 At least once.
+             *     <dt>2 Exactly once.
+             * </dl>
+             *
+             * @default 0
+             */
+            qos: number;
+
+            /**
+             * If true, the message is to be retained by the server and delivered to both current and future
+             * subscriptions. If false the server only delivers the message to current subscribers, this is the default
+             * for new Messages. A received message has the retained boolean set to true if the message was published
+             * with the retained boolean set to true and the subscription was made after the message has been published.
+             *
+             * @default false
+             */
+            retained: boolean;
+
+            /**
+             * @param {String|ArrayBuffer} payload The message data to be sent.
+             */
+            constructor(payload: string | ArrayBuffer);
+        }
+    }
+}
diff --git a/types/paho-mqtt/paho-mqtt-tests.ts b/types/paho-mqtt/paho-mqtt-tests.ts
new file mode 100644
index 0000000000..b06c36cd0e
--- /dev/null
+++ b/types/paho-mqtt/paho-mqtt-tests.ts
@@ -0,0 +1,87 @@
+let client = new Paho.MQTT.Client("ws://localhost/mqtt", "client-1");
+client = new Paho.MQTT.Client("localhost", 80, "client-2");
+client = new Paho.MQTT.Client("localhost", 80, "/mqtt", "client-3");
+
+const willMsg = new Paho.MQTT.Message("");
+
+declare var console: any;
+
+client.connect({
+    timeout: 10,
+    userName: "username",
+    password: "pa$$word",
+    willMessage: willMsg,
+    keepAliveInterval: 10,
+    cleanSession: true,
+    useSSL: true,
+    invocationContext: {
+        asdf: true
+    },
+    onSuccess: (o) => {
+        console.log("connected: ", o.invocationContext.asdf);
+    },
+    mqttVersion: 3,
+    onFailure: (e) => {
+        console.error("could not connect: ", e.errorMessage);
+    },
+    hosts: ["localhost", "8.8.8.8"],
+    ports: [80, 443],
+});
+
+console.log(`created new client on "${client.host}:${client.port}/${client.path}" with id "${client.clientId}"`);
+
+console.log(`connected?: ${client.isConnected()}`);
+
+client.trace = (msg) => {
+    console.log(`mqtt trace msg: ${msg}`);
+};
+
+client.startTrace();
+console.log(`trace log: ${client.getTraceLog()}`);
+client.stopTrace();
+
+client.onMessageArrived = (msg) => {
+    console.log(`arrived: ${msg.destinationName}: ${msg.payloadString}`);
+    console.log(`len: ${msg.payloadBytes.byteLength}, retained: ${msg.retained}, dup: ${msg.duplicate}, qos: ${msg.qos}`);
+};
+
+client.onConnectionLost = (err) => {
+    console.log(`connection lost (code ${err.errorCode}): ${err.errorMessage}`);
+};
+
+client.onMessageDelivered = (msg) => {
+    console.log(`delivered: ${msg.destinationName}: ${msg.payloadString}`);
+    console.log(`len: ${msg.payloadBytes.byteLength}, retained: ${msg.retained}, dup: ${msg.duplicate}, qos: ${msg.qos}`);
+};
+
+client.subscribe("test/topic", {
+    qos: 2,
+    invocationContext: { asdf: true },
+    onSuccess: (o) => {
+        console.log(`subscribed: ${o.invocationContext.asdf}`);
+    },
+    onFailure: (e) => {
+        console.error("error subscribing: ", e.errorMessage);
+    },
+    timeout: 10,
+});
+
+client.unsubscribe("test/topic", {
+    invocationContext: { asdf: true },
+    onSuccess: (o) => {
+        console.log(`subscribed: ${o.invocationContext.asdf}`);
+    },
+    onFailure: (e) => {
+        console.error("error subscribing: ", e.errorMessage);
+    },
+    timeout: 10,
+});
+
+client.send("test/topic2", "hello world!", 0, true);
+client.send("test/topic3", "hello world 2!", 1);
+client.send("test/topic4", new ArrayBuffer(3));
+const msg = new Paho.MQTT.Message(new ArrayBuffer(4));
+msg.destinationName = "test/topic5";
+msg.qos = 2;
+
+client.disconnect();
diff --git a/types/paho-mqtt/tsconfig.json b/types/paho-mqtt/tsconfig.json
new file mode 100644
index 0000000000..e4666b9ef5
--- /dev/null
+++ b/types/paho-mqtt/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "paho-mqtt-tests.ts"
+    ]
+}
diff --git a/types/paho-mqtt/tslint.json b/types/paho-mqtt/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/paho-mqtt/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/papaparse/index.d.ts b/types/papaparse/index.d.ts
index a529cb845e..bc1e1645a0 100644
--- a/types/papaparse/index.d.ts
+++ b/types/papaparse/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for PapaParse v4.1
 // Project: https://github.com/mholt/PapaParse
-// Definitions by: Pedro Flemming <https://github.com/torpedro>
+// Definitions by: Pedro Flemming <https://github.com/torpedro>, Rain Shen <https://github.com/rainshen49>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace PapaParse {
@@ -63,6 +63,7 @@ declare namespace PapaParse {
     interface ParseConfig {
         delimiter?: string;            // default: ""
         newline?: string;              // default: ""
+        quoteChar?: string;            // default: '"'
         header?: boolean;              // default: false
         dynamicTyping?: boolean;       // default: false
         preview?: number;              // default: 0
@@ -72,19 +73,20 @@ declare namespace PapaParse {
         download?: boolean;            // default: false
         skipEmptyLines?: boolean;      // default: false
         fastMode?: boolean;            // default: undefined
+        withCredentials?: boolean;     // default: undefined
 
         // Callbacks
         step?(results: ParseResult, parser: Parser): void;  // default: undefined
         complete?(results: ParseResult, file?: File): void; // default: undefined
         error?(error: ParseError, file?: File): void;       // default: undefined
         chunk?(results: ParseResult, parser: Parser): void; // default: undefined
-        beforeFirstChunk?(chunk: string): string|void;      // default: undefined
+        beforeFirstChunk?(chunk: string): string | void;    // default: undefined
     }
 
     interface UnparseConfig {
-        quotes: boolean;    // default: false
-        delimiter: string;  // default: ","
-        newline: string;    // default: "\r\n"
+        quotes?: boolean;    // default: false
+        delimiter?: string;  // default: ","
+        newline?: string;    // default: "\r\n"
     }
 
     interface UnparseObject {
@@ -123,7 +125,7 @@ declare namespace PapaParse {
     /**
      * Parser
      */
-    interface ParserConstructor { new(config: ParseConfig): Parser;    }
+    interface ParserConstructor { new (config: ParseConfig): Parser; }
     interface Parser {
         // Parses the input
         parse(input: string, baseIndex: number, ignoreLastRow: boolean): any;
diff --git a/types/papaparse/papaparse-tests.ts b/types/papaparse/papaparse-tests.ts
index 32de7e109f..a432fc7f09 100644
--- a/types/papaparse/papaparse-tests.ts
+++ b/types/papaparse/papaparse-tests.ts
@@ -13,7 +13,7 @@ Papa.parse("3,3,3", {
 	delimiter: ';',
 	comments: false,
 
-	step: function(results, p) {
+	step: function (results, p) {
 		p.abort();
 		results.data.length;
 	}
@@ -22,7 +22,7 @@ Papa.parse("3,3,3", {
 var file = new File(null, null, null);
 
 Papa.parse(file, {
-	complete: function(a, b) {
+	complete: function (a, b) {
 		a.meta.fields;
 		b.name;
 	}
@@ -31,13 +31,19 @@ Papa.parse(file, {
 /**
  * Unparsing
  */
-Papa.unparse([{a: 1, b: 1, c: 1}]);
+Papa.unparse([{ a: 1, b: 1, c: 1 }]);
 Papa.unparse([[1, 2, 3], [4, 5, 6]]);
 Papa.unparse({
 	fields: ["3"],
 	data: []
 });
 
+Papa.unparse([{ a: 1, b: 1, c: 1 }], { quotes: false });
+Papa.unparse([[1, 2, 3], [4, 5, 6]], { delimiter: "," });
+Papa.unparse({
+	fields: ["3"],
+	data: []
+}, { newline: "\n" });
 
 
 /**
diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 41b958fd50..197707058b 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Clark Stevenson <http://github.com/clark-stevenson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+type NativeMouseEvent = MouseEvent;
+
 declare module 'paper' {
 
     /**
@@ -285,7 +287,7 @@ declare module 'paper' {
          * Transforms a point and returns the result.
          * @param point - the point to be transformed
          */
-        transform(point: Point): Point;
+        transform(point: Point): Matrix;
 
         /**
          * Transforms an array of coordinates by this matrix and stores the results into the destination array, which is also returned.
@@ -299,7 +301,7 @@ declare module 'paper' {
          * Inverse transforms a point and returns the result.
          * @param point - the point to be transformed
          */
-        inverseTransform(point: Point): Point;
+        inverseTransform(point: Point): Matrix;
 
         /**
          * Attempts to decompose the affine transformation described by this matrix into scaling, rotation and shearing, and returns an object with these properties if it succeeded, null otherwise.
@@ -550,6 +552,36 @@ declare module 'paper' {
          */
         abs(): Point;
 
+        /*
+         * Returns a new point
+         * @param point - The point you want to add with
+         */
+        add(point: Point): Point;
+        add(point: number[]): Point;
+
+        /*
+         * Returns a new point
+         * @param point - The point you want to subtract with
+         */
+        subtract(point: Point): Point;
+        subtract(point: number[]): Point;
+
+        /*
+         * Returns the new multiplied point
+         * @param point - The point you want to multiply with
+         */
+        multiply(point: Point): Point;
+        multiply(point: number[]): Point;
+        multiply(point: number): Point;
+
+        /*
+         * Returns the new divided point
+         * @param point - The point you want to divide with
+         */
+        divide(point: Point): Point;
+        divide(point: number[]): Point;
+        divide(point: number): Point;
+
     }
     /**
      * A Rectangle specifies an area that is enclosed by it's top-left point (x, y), its width, and its height. It should not be confused with a rectangular path, it is not an item.
@@ -894,6 +926,22 @@ declare module 'paper' {
          */
         abs(): Size;
 
+        /*
+         * Returns the new multiplied size
+         * @param point - The size you want to multiply with
+         */
+        multiply(point: Size): Size;
+        multiply(point: number[]): Size;
+        multiply(point: number): Size;
+
+        /*
+         * Returns the new divided size
+         * @param point - The size you want to divide with
+         */
+        divide(point: Size): Size;
+        divide(point: number[]): Size;
+        divide(point: number): Size;
+
     }
     export interface IFrameEvent {
 
@@ -1223,6 +1271,11 @@ declare module 'paper' {
          */
         fillColor: Color | string;
 
+        /**
+         * The fill rule.
+         */
+        fillRule: string;
+
         /**
          * The color the item is highlighted with when selected. If the item does not specify its own color, the color defined by its layer is used instead.
          */
@@ -1432,6 +1485,20 @@ declare module 'paper' {
          */
         insertBelow(item: Item): Item;
 
+        /**
+         * Moves this item above the specified item. Returns true if the item
+         * was moved.
+         * @param item - the item above which it should be moved
+         */
+        moveAbove(item: Item): boolean;
+
+        /**
+         * Moves this item below the specified item. Returns true if the item
+         * was moved.
+         * @param item - the item below which it should be moved
+         */
+        moveBelow(item: Item): boolean;
+
         /**
          * Sends this item to the back of all other items within the same parent.
          */
@@ -1551,7 +1618,7 @@ declare module 'paper' {
          * Translates (moves) the item by the given offset point.
          * @param delta - the offset to translate the item by
          */
-        translate(delta: number): Point;
+        translate(delta: Point): Point;
 
         /**
          * Rotates the item by a given angle around the given point.
@@ -1561,6 +1628,11 @@ declare module 'paper' {
          */
         rotate(angle: number, center?: Point): void;
 
+        /**
+         * Gets the current rotation of the item.
+         */
+        getRotation(): number;
+
         /**
          * Scales the item by the given value from its center point, or optionally from a supplied point.
          * @param scale - the scale factor
@@ -1883,6 +1955,7 @@ declare module 'paper' {
          * @param position [optional] - the center position at which the raster item is placed
          */
         constructor(source?: HTMLImageElement | HTMLCanvasElement | string, position?: Point);
+        constructor(config: any);
 
         /**
          * The size of the raster in pixels.
@@ -2105,7 +2178,7 @@ declare module 'paper' {
          * @param handle2 - The second control point handle for the curve
          * @param to - The end control point of the curve
          */
-        cublicCurveTo(handle1: Point, handle2: Point, to: Point): void;
+        cubicCurveTo(handle1: Point, handle2: Point, to: Point): void;
 
         /**
          * Adds a quadratic bezier curve to the path, defined by a handle and a to point.
@@ -2168,7 +2241,7 @@ declare module 'paper' {
          * @param handle2 -
          * @param to -
          */
-        cublicCurveBy(handle1: Point, handle2: Point, to: Point): void;
+        cubicCurveBy(handle1: Point, handle2: Point, to: Point): void;
 
         /**
          *
@@ -2227,118 +2300,11 @@ declare module 'paper' {
      */
     export class Path extends PathItem {
 
-        /**
-         * Creates a linear path item from two points describing a line.
-         * @param from - the line's starting point
-         * @param to - the line's ending point
-         */
-        static Line(from: Point, to: Point): Path;
-
-        /**
-         * Creates a linear path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Line(object: any): Path;
-
-        /**
-         * Creates a circular path item.
-         * @param center - the center point of the circle
-         * @param radius - the radius of the circle
-         */
-        static Circle(center: Point, radius: number): Path;
-
-        /**
-         * Creates a circular path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Circle(object: any): Path;
-
-        /**
-         * Creates a rectangular path item, with optionally rounded corners.
-         * @param rectangle - the rectangle object describing the geometry of the rectangular path to be created.
-         * @param radius [optional] - the size of the rounded corners default: null
-         */
-        static Rectangle(rectangle: Rectangle, radius?: number): Path;
-
-        /**
-         * Creates a rectangular path item from a point and a size object.
-         * @param point - the rectangle's top-left corner.
-         * @param size - the rectangle's size.
-         */
-        static Rectangle(point: Point, size: Size): Path;
-
-        /**
-         * Creates a rectangular path item from the passed points. These do not necessarily need to be the top left and bottom right corners, the constructor figures out how to fit a rectangle between them.
-         * @param from - the first point defining the rectangle
-         * @param to - the second point defining the rectangle
-         */
-        static Rectangle(from: Point, to: Point): Path;
-
-        /**
-         * Creates a rectangular path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Rectangle(object: any): Path;
-
-        /**
-         * Creates an elliptical path item.
-         * @param rectangle - the rectangle circumscribing the ellipse
-         */
-        static Ellipse(rectangle: Rectangle): Path;
-
-        /**
-         * Creates an elliptical path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Ellipse(object: any): Path;
-        /**
-         * Creates a circular arc path item
-         * @param from - the starting point of the circular arc
-         * @param through - the point the arc passes through
-         * @param to - the end point of the arc
-         */
-        static Arc(from: Point, through: Point, to: Point): Path;
-
-        /**
-         * Creates an circular arc path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Arc(object: any): Path;
-
-        /**
-         * Creates a regular polygon shaped path item.
-         * @param center - the center point of the polygon
-         * @param sides - the number of sides of the polygon
-         * @param radius - the radius of the polygon
-         */
-        static RegularPolygon(center: Point, sides: number, radius: number): Path;
-
-        /**
-         * Creates a regular polygon shaped path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static RegularPolygon(object: any): Path;
-
-        /**
-         * Creates a star shaped path item. The largest of radius1 and radius2 will be the outer radius of the star. The smallest of radius1 and radius2 will be the inner radius.
-         * @param center - the center point of the star
-         * @param points - the number of points of the star
-         * @param radius1
-         * @param radius2
-         */
-        static Star(center: Point, points: number, radius1: number, radius2: number): Path;
-
-        /**
-         * Creates a star shaped path item from the properties described by an object literal.
-         * @param object - an object literal containing properties describing the path's attributes
-         */
-        static Star(object: any): Path;
-
         /**
          * Creates a new path item and places it at the top of the active layer.
          * @param segments [optional] - An array of segments (or points to be converted to segments) that will be added to the path
          */
-        constructor(segments?: Segment[]| Point[]);
+        constructor(segments?: Segment[] | Point[]);
 
         /**
          * Creates a new path item from an object description and places it at the top of the active layer.
@@ -2574,6 +2540,130 @@ declare module 'paper' {
 
 
     }
+    module Path {
+        export class Line extends Path {
+            /**
+             * Creates a linear path item from two points describing a line.
+             * @param from - the line's starting point
+             * @param to - the line's ending point
+             */
+            constructor(from: Point, to: Point);
+
+            /**
+             * Creates a linear path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class Circle extends Path {
+            /**
+             * Creates a circular path item.
+             * @param center - the center point of the circle
+             * @param radius - the radius of the circle
+             */
+            constructor(center: Point, radius: number);
+
+            /**
+             * Creates a circular path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class Rectangle extends Path {
+            /**
+             * Creates a rectangular path item, with optionally rounded corners.
+             * @param rectangle - the rectangle object describing the geometry of the rectangular path to be created.
+             * @param radius [optional] - the size of the rounded corners default: null
+             */
+            constructor(rectangle: Rectangle, radius?: number);
+
+            /**
+             * Creates a rectangular path item from a point and a size object.
+             * @param point - the rectangle's top-left corner.
+             * @param size - the rectangle's size.
+             */
+            constructor(point: Point, size: Size);
+
+            /**
+             * Creates a rectangular path item from the passed points. These do not necessarily need to be the top left and bottom right corners, the constructor figures out how to fit a rectangle between them.
+             * @param from - the first point defining the rectangle
+             * @param to - the second point defining the rectangle
+             */
+            constructor(from: Point, to: Point);
+
+            /**
+             * Creates a rectangular path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class Ellipse extends Path {
+            /**
+             * Creates an elliptical path item.
+             * @param rectangle - the rectangle circumscribing the ellipse
+             */
+            constructor(rectangle: Rectangle);
+
+            /**
+             * Creates an elliptical path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class Arc extends Path {
+            /**
+             * Creates a circular arc path item
+             * @param from - the starting point of the circular arc
+             * @param through - the point the arc passes through
+             * @param to - the end point of the arc
+             */
+            constructor(from: Point, through: Point, to: Point);
+
+            /**
+             * Creates an circular arc path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class RegularPolygon extends Path {
+            /**
+             * Creates a regular polygon shaped path item.
+             * @param center - the center point of the polygon
+             * @param sides - the number of sides of the polygon
+             * @param radius - the radius of the polygon
+             */
+            constructor(center: Point, sides: number, radius: number);
+
+            /**
+             * Creates a regular polygon shaped path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+
+        export class Star extends Path {
+            /**
+             * Creates a star shaped path item. The largest of radius1 and radius2 will be the outer radius of the star. The smallest of radius1 and radius2 will be the inner radius.
+             * @param center - the center point of the star
+             * @param points - the number of points of the star
+             * @param radius1
+             * @param radius2
+             */
+            constructor(center: Point, points: number, radius1: number, radius2: number);
+
+            /**
+             * Creates a star shaped path item from the properties described by an object literal.
+             * @param object - an object literal containing properties describing the path's attributes
+             */
+            constructor(object: any);
+        }
+    }
+
     /**
      * A compound path contains two or more paths, holes are drawn where the paths overlap. All the paths in a compound path take on the style of the backmost path and can be accessed through its item.children list.
      */
@@ -4005,4 +4095,79 @@ declare module 'paper' {
 
     }
 
+    /**
+     * A Javascript MouseEvent wrapper
+     */
+    export class MouseEvent extends Event {
+        constructor(type: string, event: NativeMouseEvent, point: Point, target: Item, delta: Point)
+
+        /**
+         * The JavaScript mouse event
+         */
+        event: NativeMouseEvent;
+
+        /**
+         * The position of the mouse in project coordinates when the event was
+         * fired.
+         */
+        point: Point;
+
+        /**
+         * The last event's position of the mouse in project coordinates when
+         * the event was fired.
+         */
+        lastPoint: Point;
+
+        /**
+         *
+         */
+        delta: Point;
+
+        /**
+         * The item that dispatched the event. It is different from
+         * currentTarget when the event handler is called during the bubbling
+         * phase of the event.
+         */
+        target: Item;
+
+        /**
+         * The current target for the event, as the event traverses the scene
+         * graph. It always refers to the element the event handler has been
+         * attached to as opposed to target which identifies the element on
+         * which the event occurred.
+         */
+        currentTarget: Item;
+
+        /**
+         * Type of mouse event
+         */
+        type: 'mousedown' | 'mouseup' | 'mousedrag' | 'click' | 'doubleclick' | 'mousemove' | 'mouseenter' | 'mouseleave';
+
+        /**
+         * The time at which the event was created, in milliseconds since the
+         * epoch.
+         */
+        timeStamp(): number;
+
+        /**
+         * Cancels the event if it is cancelable, without stopping further
+         * propagation of the event.
+         */
+        preventDefault(): void;
+
+        /**
+         * Prevents further propagation of the current event.
+         */
+        stopPropagation(): void;
+
+        /**
+         * Cancels the event if it is cancelable, and stops stopping further
+         * propagation of the event. This is has the same effect as calling
+         * both stopPropagation() and preventDefault().
+         *
+         * Any handler can also return false to indicate that stop() should be
+         * called right after.
+         */
+        stop(): void;
+    }
 }
diff --git a/types/paper/paper-tests.ts b/types/paper/paper-tests.ts
index 39d015db87..444ffb8725 100644
--- a/types/paper/paper-tests.ts
+++ b/types/paper/paper-tests.ts
@@ -5,7 +5,7 @@ var canvas = document.createElement('canvas')
 paper.setup(canvas);
 
 // Circle
-var path = paper.Path.Circle({
+var path = new paper.Path.Circle({
 	center: [80, 50],
 	radius: 35,
 	fillColor: 'red'
diff --git a/types/parse-git-config/index.d.ts b/types/parse-git-config/index.d.ts
new file mode 100644
index 0000000000..4d5897ca5b
--- /dev/null
+++ b/types/parse-git-config/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for parse-git-config 1.1
+// Project: https://github.com/jonschlinkert/parse-git-config
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare const parse: Parse;
+export = parse;
+
+interface Parse {
+    /**
+     * Asynchronously parse a .git/config file.
+     * If only the callback is passed, the .git/config file relative to process.cwd() is used.
+     */
+    (options: (Options | object) | string, cb: ParseCallback): void;
+    /**
+     * Asynchronously parse a .git/config file.
+     * If only the callback is passed, the .git/config file relative to process.cwd() is used.
+     */
+    (cb: ParseCallback): void;
+    /**
+     * Synchronously parse a .git/config file.
+     * If no arguments are passed, the .git/config file relative to process.cwd() is used.
+     */
+    sync(options?: (Options | object) | string): Config;
+    /**
+     * Returns an object with only the properties that had ini-style keys converted to objects.
+     */
+    keys(config: Config): Config;
+}
+
+// no-empty-interface is disabled for a better debugging experience. Empty interfaces are used to alias a type alias.
+// tslint:disable-next-line no-empty-interface
+interface Options extends Pick<_Options, keyof _Options> { }
+
+interface _Options {
+    cwd: string;
+    path: string;
+}
+
+type ParseCallback = ((err: Error | null, config: Config) => void);
+// TODO: Can this be defined more precisely?
+interface Config {
+    [key: string]: any;
+}
diff --git a/types/parse-git-config/parse-git-config-tests.ts b/types/parse-git-config/parse-git-config-tests.ts
new file mode 100644
index 0000000000..e08fce8029
--- /dev/null
+++ b/types/parse-git-config/parse-git-config-tests.ts
@@ -0,0 +1,78 @@
+import parse = require('parse-git-config');
+
+function test_parse_options() {
+    parse({ cwd: 'foo', path: '.git/config' }, (err, config) => {
+        if (err) {
+            throw err;
+        }
+
+        let origin = config['remote "origin"'];
+        if (origin && origin.url) {
+            origin.url.split('/');
+        }
+    }) === undefined;
+}
+
+function test_parse_cwd() {
+    parse('foo', (err, config) => {
+        if (err) {
+            throw err;
+        }
+
+        let origin = config['remote "origin"'];
+        if (origin && origin.url) {
+            origin.url.split('/');
+        }
+    }) === undefined;
+}
+
+function test_parse() {
+    parse((err, config) => {
+        if (err) {
+            throw err;
+        }
+
+        let origin = config['remote "origin"'];
+        if (origin && origin.url) {
+            origin.url.split('/');
+        }
+    }) === undefined;
+}
+
+function test_sync_options() {
+    const config = parse.sync({ cwd: 'foo', path: '.git/config' });
+
+    let origin = config['remote "origin"'];
+    if (origin && origin.url) {
+        origin.url.split('/');
+    }
+}
+
+function test_sync_cwd() {
+    const config = parse.sync('foo');
+
+    let origin = config['remote "origin"'];
+    if (origin && origin.url) {
+        origin.url.split('/');
+    }
+}
+
+function test_sync() {
+    const config = parse.sync();
+
+    let origin = config['remote "origin"'];
+    if (origin && origin.url) {
+        origin.url.split('/');
+    }
+}
+
+function test_keys() {
+    const config = {
+        'foo "bar"': { doStuff: true },
+        'foo "baz"': { doStuff: true }
+    };
+    const keys = parse.keys(config);
+
+    keys.foo.bar.doStuff === true;
+    keys.foo.baz.doStuff === true;
+}
diff --git a/types/parse-git-config/tsconfig.json b/types/parse-git-config/tsconfig.json
new file mode 100644
index 0000000000..453d805680
--- /dev/null
+++ b/types/parse-git-config/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse-git-config-tests.ts"
+    ]
+}
diff --git a/types/parse-git-config/tslint.json b/types/parse-git-config/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/parse-git-config/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/parse-mockdb/index.d.ts b/types/parse-mockdb/index.d.ts
index 3871dbae18..bff2e81935 100644
--- a/types/parse-mockdb/index.d.ts
+++ b/types/parse-mockdb/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for parse-mockdb v0.1.13
+// Type definitions for parse-mockdb v0.1.14
 // Project: https://github.com/HustleInc/parse-mockdb
 // Definitions by: David Poetzsch-Heffter <https://github.com/dpoetzsch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="parse" />
 
diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index e839515d79..b4cd725529 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for parse v1.9.2
+// Type definitions for parse 1.9
 // Project: https://parse.com/
 // Definitions by: Ullisen Media Group <http://ullisenmedia.com>, David Poetzsch-Heffter <https://github.com/dpoetzsch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="jquery" />
@@ -267,22 +268,22 @@ declare namespace Parse {
      * A class that is used to access all of the children of a many-to-many relationship.
      * Each instance of Parse.Relation is associated with a particular parent object and key.
      */
-    class Relation extends BaseObject {
+    class Relation<S extends Object = Object, T extends Object = Object> extends BaseObject {
 
-        parent: Object;
+        parent: S;
         key: string;
         targetClassName: string;
 
-        constructor(parent?: Object, key?: string);
+        constructor(parent?: S, key?: string);
 
         //Adds a Parse.Object or an array of Parse.Objects to the relation.
-        add(object: Object): void;
+        add(object: T): void;
 
         // Returns a Parse.Query that is limited to objects in this relation.
-        query(): Query;
+        query(): Query<T>;
 
         // Removes a Parse.Object or an array of Parse.Objects from this relation.
-        remove(object: Object): void;
+        remove(object: T): void;
     }
 
     /**
@@ -326,11 +327,12 @@ declare namespace Parse {
         constructor(attributes?: string[], options?: any);
 
         static extend(className: string, protoProps?: any, classProps?: any): any;
+        static fromJSON(json: any, override: boolean): any;
+
         static fetchAll<T extends Object>(list: T[], options: SuccessFailureOptions): Promise<T[]>;
         static fetchAllIfNeeded<T extends Object>(list: T[], options: SuccessFailureOptions): Promise<T[]>;
         static destroyAll<T>(list: T[], options?: Object.DestroyAllOptions): Promise<T[]>;
         static saveAll<T extends Object>(list: T[], options?: Object.SaveAllOptions): Promise<T[]>;
-
         static registerSubclass<T extends Object>(className: string, clazz: new (options?: any) => T): void;
 
         initialize(): void;
@@ -341,7 +343,7 @@ declare namespace Parse {
         clear(options: any): any;
         clone(): this;
         destroy(options?: Object.DestroyOptions): Promise<this>;
-        dirty(attr: String): boolean;
+        dirty(attr?: string): boolean;
         dirtyKeys(): string[];
         escape(attr: string): string;
         existed(): boolean;
@@ -355,7 +357,7 @@ declare namespace Parse {
         op(attr: string): any;
         previous(attr: string): any;
         previousAttributes(): any;
-        relation(attr: string): Relation;
+        relation(attr: string): Relation<this, Object>;
         remove(attr: string, item: any): any;
         save(attrs?: { [key: string]: any } | null, options?: Object.SaveOptions): Promise<this>;
         save(key: string, value: any, options?: Object.SaveOptions): Promise<this>;
@@ -429,7 +431,7 @@ declare namespace Parse {
 
         model: Object;
         models: Object[];
-        query: Query;
+        query: Query<Object>;
         comparator: (object: Object) => any;
 
         constructor(models?: Object[], options?: Collection.Options);
@@ -454,7 +456,7 @@ declare namespace Parse {
     namespace Collection {
         interface Options {
             model?: Object;
-            query?: Query;
+            query?: Query<Object>;
             comparator?: string;
         }
 
@@ -571,59 +573,59 @@ declare namespace Parse {
      *   }
      * });</pre></p>
      */
-    class Query extends BaseObject {
+    class Query<T extends Object = Object> extends BaseObject {
 
         objectClass: any;
         className: string;
 
         constructor(objectClass: string);
-        constructor(objectClass: new(...args: any[]) => Object);
+        constructor(objectClass: new(...args: any[]) => T);
 
-        static or<U extends Object>(...var_args: Query[]): Query;
+        static or<U extends Object>(...var_args: Query<U>[]): Query<U>;
 
-        addAscending(key: string): Query;
-        addAscending(key: string[]): Query;
-        addDescending(key: string): Query;
-        addDescending(key: string[]): Query;
-        ascending(key: string): Query;
-        ascending(key: string[]): Query;
+        addAscending(key: string): Query<T>;
+        addAscending(key: string[]): Query<T>;
+        addDescending(key: string): Query<T>;
+        addDescending(key: string[]): Query<T>;
+        ascending(key: string): Query<T>;
+        ascending(key: string[]): Query<T>;
         collection(items?: Object[], options?: Collection.Options): Collection<Object>;
-        containedIn(key: string, values: any[]): Query;
-        contains(key: string, substring: string): Query;
-        containsAll(key: string, values: any[]): Query;
+        containedIn(key: string, values: any[]): Query<T>;
+        contains(key: string, substring: string): Query<T>;
+        containsAll(key: string, values: any[]): Query<T>;
         count(options?: Query.CountOptions): Promise<number>;
-        descending(key: string): Query;
-        descending(key: string[]): Query;
-        doesNotExist(key: string): Query;
-        doesNotMatchKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query): Query;
-        doesNotMatchQuery<U extends Object>(key: string, query: Query): Query;
+        descending(key: string): Query<T>;
+        descending(key: string[]): Query<T>;
+        doesNotExist(key: string): Query<T>;
+        doesNotMatchKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query<U>): Query<T>;
+        doesNotMatchQuery<U extends Object>(key: string, query: Query<U>): Query<T>;
         each(callback: Function, options?: Query.EachOptions): Promise<void>;
-        endsWith(key: string, suffix: string): Query;
-        equalTo(key: string, value: any): Query;
-        exists(key: string): Query;
-        find(options?: Query.FindOptions): Promise<Object[]>;
-        first(options?: Query.FirstOptions): Promise<Object | undefined>;
-        get(objectId: string, options?: Query.GetOptions): Promise<Object>;
-        greaterThan(key: string, value: any): Query;
-        greaterThanOrEqualTo(key: string, value: any): Query;
-        include(key: string): Query;
-        include(keys: string[]): Query;
-        lessThan(key: string, value: any): Query;
-        lessThanOrEqualTo(key: string, value: any): Query;
-        limit(n: number): Query;
-        matches(key: string, regex: RegExp, modifiers: any): Query;
-        matchesKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query): Query;
-        matchesQuery<U extends Object>(key: string, query: Query): Query;
-        near(key: string, point: GeoPoint): Query;
-        notContainedIn(key: string, values: any[]): Query;
-        notEqualTo(key: string, value: any): Query;
-        select(...keys: string[]): Query;
-        skip(n: number): Query;
-        startsWith(key: string, prefix: string): Query;
-        withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query;
-        withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query;
-        withinMiles(key: string, point: GeoPoint, maxDistance: number): Query;
-        withinRadians(key: string, point: GeoPoint, maxDistance: number): Query;
+        endsWith(key: string, suffix: string): Query<T>;
+        equalTo(key: string, value: any): Query<T>;
+        exists(key: string): Query<T>;
+        find(options?: Query.FindOptions): Promise<T[]>;
+        first(options?: Query.FirstOptions): Promise<T | undefined>;
+        get(objectId: string, options?: Query.GetOptions): Promise<T>;
+        greaterThan(key: string, value: any): Query<T>;
+        greaterThanOrEqualTo(key: string, value: any): Query<T>;
+        include(key: string): Query<T>;
+        include(keys: string[]): Query<T>;
+        lessThan(key: string, value: any): Query<T>;
+        lessThanOrEqualTo(key: string, value: any): Query<T>;
+        limit(n: number): Query<T>;
+        matches(key: string, regex: RegExp, modifiers: any): Query<T>;
+        matchesKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query<U>): Query<T>;
+        matchesQuery<U extends Object>(key: string, query: Query<U>): Query<T>;
+        near(key: string, point: GeoPoint): Query<T>;
+        notContainedIn(key: string, values: any[]): Query<T>;
+        notEqualTo(key: string, value: any): Query<T>;
+        select(...keys: string[]): Query<T>;
+        skip(n: number): Query<T>;
+        startsWith(key: string, prefix: string): Query<T>;
+        withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query<T>;
+        withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query<T>;
+        withinMiles(key: string, point: GeoPoint, maxDistance: number): Query<T>;
+        withinRadians(key: string, point: GeoPoint, maxDistance: number): Query<T>;
     }
 
     namespace Query {
@@ -651,8 +653,8 @@ declare namespace Parse {
 
         constructor(name: string, acl: ACL);
 
-        getRoles(): Relation;
-        getUsers(): Relation;
+        getRoles(): Relation<Role, Role>;
+        getUsers(): Relation<Role, User>;
         getName(): string;
         setName(name: string, options?: SuccessFailureOptions): any;
     }
@@ -874,15 +876,18 @@ declare namespace Parse {
             value?: string;
         }
 
-        interface SaveRequest extends FunctionRequest {
+        interface TriggerRequest {
+            installationId?: String;
+            master?: boolean;
+            user?: User;
             object: Object;
         }
 
-        interface AfterSaveRequest extends SaveRequest {}
-        interface AfterDeleteRequest extends FunctionRequest {}
-        interface BeforeDeleteRequest extends FunctionRequest {}
+        interface AfterSaveRequest extends TriggerRequest {}
+        interface AfterDeleteRequest extends TriggerRequest {}
+        interface BeforeDeleteRequest extends TriggerRequest {}
         interface BeforeDeleteResponse extends FunctionResponse {}
-        interface BeforeSaveRequest extends SaveRequest {}
+        interface BeforeSaveRequest extends TriggerRequest {}
         interface BeforeSaveResponse extends FunctionResponse {
             success: () => void;
         }
@@ -1068,7 +1073,7 @@ declare namespace Parse {
             push_time?: Date;
             expiration_time?: Date;
             expiration_interval?: number;
-            where?: Query;
+            where?: Query<Installation>;
             data?: any;
             alert?: string;
             badge?: string;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 36dc7cb334..ad1a2a2a83 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -56,6 +56,8 @@ function test_object() {
     gameScore.addUnique("skills", "kungfu");
 
     game.set("gameScore", gameScore);
+
+    var gameCopy = Game.fromJSON(JSON.parse(JSON.stringify(game)), true);
 }
 
 function test_query() {
@@ -127,6 +129,14 @@ class TestCollection extends Parse.Collection<Object> {
     }
 }
 
+function return_a_generic_query(): Parse.Query<Game> {
+    return new Parse.Query(Game);
+}
+
+function return_a_query(): Parse.Query {
+    return new Parse.Query(Game);
+}
+
 function test_collections() {
 
     var collection = new TestCollection();
@@ -190,7 +200,7 @@ function test_file() {
         // The file either could n ot be read, or could not be saved to Parse.
     });
 
-    Parse.Cloud.httpRequest({ url: file.url() }).then((response: Parse.Promise<Parse.Cloud.HttpResponse>) => {
+    Parse.Cloud.httpRequest({ url: file.url() }).then((response: Parse.Cloud.HttpResponse) => {
         // result
     });
 
diff --git a/types/parsimmon/index.d.ts b/types/parsimmon/index.d.ts
index 21cd77ce2f..6bc93ae84a 100644
--- a/types/parsimmon/index.d.ts
+++ b/types/parsimmon/index.d.ts
@@ -1,10 +1,12 @@
-// Type definitions for Parsimmon 1.0
+// Type definitions for Parsimmon 1.3
 // Project: https://github.com/jneen/parsimmon
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
 //                 Boris Cherny <https://github.com/bcherny>
 //                 Benny van Reeven <https://github.com/bvanreeven>
+//                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /**
  * **NOTE:** You probably will never need to use this function. Most parsing
@@ -120,6 +122,18 @@ declare namespace Parsimmon {
 		 * expects otherParser after parser, but preserves the yield value of parser.
 		 */
 		skip<U>(otherParser: Parser<U>): Parser<T>;
+		/**
+		 * Returns a parser that looks for anything but whatever anotherParser wants to
+		 * parse, and does not consume it. Yields the same result as parser. Equivalent to
+		 * parser.skip(Parsimmon.notFollowedBy(anotherParser)).
+		 */
+		notFollowedBy(anotherParser: Parser<any>): Parser<T>;
+		/**
+		 * Returns a parser that looks for whatever arg wants to parse, but does not
+		 * consume it. Yields the same result as parser. Equivalent to
+		 * parser.skip(Parsimmon.lookahead(anotherParser)).
+		 */
+		lookahead(arg: Parser<any> | string | RegExp): Parser<T>;
 		/**
 		 * expects parser zero or more times, and yields an array of the results.
 		 */
@@ -174,7 +188,7 @@ declare namespace Parsimmon {
 	/**
 	 * Returns true if obj is a Parsimmon parser, otherwise false.
 	 */
-	function isParser(obj: any): boolean;
+	function isParser(obj: any): obj is Parser<any>;
 
 	/**
 	 * is a parser that expects to find "my-string", and will yield the same.
@@ -204,6 +218,17 @@ declare namespace Parsimmon {
 	 */
 	function regex(myregex: RegExp, group?: number): Parser<string>;
 
+	/**
+	 * Parses using parser, but does not consume what it parses. Yields null if the parser
+	 * does not match the input. Otherwise it fails.
+	 */
+	function notFollowedBy(parser: Parser<any>): Parser<null>;
+
+	/**
+	 * Parses using arg, but does not consume what it parses. Yields an empty string.
+	 */
+	function lookahead(arg: Parser<any> | string | RegExp): Parser<''>;
+
 	/**
 	 * Returns a parser that doesn't consume any of the string, and yields result.
 	 */
diff --git a/types/parsimmon/parsimmon-tests.ts b/types/parsimmon/parsimmon-tests.ts
index e0ce697909..4c8780f5fc 100644
--- a/types/parsimmon/parsimmon-tests.ts
+++ b/types/parsimmon/parsimmon-tests.ts
@@ -28,6 +28,8 @@ let strPar: Parser<string>;
 let numPar: Parser<number>;
 let voidPar: Parser<void>;
 let anyPar: Parser<any>;
+let nullPar: Parser<null>;
+let emptyStrPar: Parser<''>;
 let indexPar: Parser<Index>;
 
 let fooPar: Parser<Foo>;
@@ -168,6 +170,11 @@ strPar = P.regex(/foo/, 3);
 strPar = P.regexp(/bar/);
 strPar = P.regexp(/bar/, 3);
 
+nullPar = P.notFollowedBy(fooPar);
+emptyStrPar = P.lookahead(str);
+emptyStrPar = P.lookahead(/foo/);
+emptyStrPar = P.lookahead(fooPar);
+
 fooPar = P.of(foo);
 
 str = P.formatError('foo', strPar.parse('bar'));
diff --git a/types/passport-client-cert/index.d.ts b/types/passport-client-cert/index.d.ts
new file mode 100644
index 0000000000..5bb80c5027
--- /dev/null
+++ b/types/passport-client-cert/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for passport-jwt 2.0
+// Project: https://github.com/ripjar/passport-client-cert
+// Definitions by: Sean Warner <https://github.com/warnersean/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import {Strategy as PassportStrategy} from 'passport-strategy';
+import {Request} from 'express';
+
+export class Strategy extends PassportStrategy {
+    constructor(verify: PkiCallback);
+    constructor(opt: StrategyOptions, verify: PkiCallback | PkiCallbackWithRequest);
+}
+
+export interface StrategyOptions {
+    passReqToCallback?: boolean;
+}
+
+export type PkiCallback = (payload: ClientCert, done: PkiVerifiedCallback) => void;
+
+export type PkiCallbackWithRequest = (req: Request, payload: ClientCert, done: PkiVerifiedCallback) => void;
+
+export interface ClientCert {
+    exponent: string;
+    fingerprint: string;
+    issuer: any;
+    modulus: string;
+    raw: Uint8Array;
+    serialNumber: string;
+    subject: any;
+    valid_from: string;
+    valid_to: string;
+}
+
+export type PkiVerifiedCallback = (error: any, user?: any, info?: any) => void;
diff --git a/types/passport-client-cert/passport-client-cert-tests.ts b/types/passport-client-cert/passport-client-cert-tests.ts
new file mode 100644
index 0000000000..256d2ddcd6
--- /dev/null
+++ b/types/passport-client-cert/passport-client-cert-tests.ts
@@ -0,0 +1,14 @@
+import * as passport from "passport";
+import {ClientCert, PkiVerifiedCallback, Strategy as ClientCertStrategy} from "passport-client-cert";
+
+passport.use(new ClientCertStrategy( (clientCert: ClientCert, done: PkiVerifiedCallback) => {
+    let cn = clientCert.subject.cn;
+    let user = null;
+
+    // The CN will typically be checked against a database
+    if (cn === 'test-cn') {
+        user = { name: 'Test User' };
+    }
+
+    done(null, user);
+}));
diff --git a/types/passport-client-cert/tsconfig.json b/types/passport-client-cert/tsconfig.json
new file mode 100644
index 0000000000..614afd9842
--- /dev/null
+++ b/types/passport-client-cert/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-client-cert-tests.ts"
+    ]
+}
diff --git a/types/passport-client-cert/tslint.json b/types/passport-client-cert/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/passport-client-cert/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/passport-jwt/index.d.ts b/types/passport-jwt/index.d.ts
index e73bc89391..bbf96be851 100644
--- a/types/passport-jwt/index.d.ts
+++ b/types/passport-jwt/index.d.ts
@@ -43,4 +43,5 @@ export declare namespace ExtractJwt {
     export function fromUrlQueryParameter(param_name: string): JwtFromRequestFunction;
     export function fromAuthHeaderWithScheme(auth_scheme: string): JwtFromRequestFunction;
     export function fromAuthHeader(): JwtFromRequestFunction;
+    export function fromExtractors(extractors: JwtFromRequestFunction[]): JwtFromRequestFunction;
 }
diff --git a/types/passport-jwt/passport-jwt-tests.ts b/types/passport-jwt/passport-jwt-tests.ts
index c8989af54d..07b8deb1f4 100644
--- a/types/passport-jwt/passport-jwt-tests.ts
+++ b/types/passport-jwt/passport-jwt-tests.ts
@@ -31,6 +31,7 @@ opts.jwtFromRequest = ExtractJwt.fromHeader('x-api-key');
 opts.jwtFromRequest = ExtractJwt.fromBodyField('field_name');
 opts.jwtFromRequest = ExtractJwt.fromUrlQueryParameter('param_name');
 opts.jwtFromRequest = ExtractJwt.fromAuthHeaderWithScheme('param_name');
+opts.jwtFromRequest = ExtractJwt.fromExtractors([ExtractJwt.fromHeader('x-api-key'), ExtractJwt.fromBodyField('field_name'), ExtractJwt.fromUrlQueryParameter('param_name')]);
 opts.jwtFromRequest = (req: Request) => { return req.query.token; };
 
 declare function findUser(condition: {id: string}, callback: (error: any, user :any) => void): void;
diff --git a/types/passport-local-mongoose/index.d.ts b/types/passport-local-mongoose/index.d.ts
index acc61d0217..8a2d036c9f 100644
--- a/types/passport-local-mongoose/index.d.ts
+++ b/types/passport-local-mongoose/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/saintedlama/passport-local-mongoose
 // Definitions by: Linus Brolin <https://github.com/linusbrolin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="mongoose" />
 /// <reference types="passport-local" />
diff --git a/types/passport-local-mongoose/passport-local-mongoose-tests.ts b/types/passport-local-mongoose/passport-local-mongoose-tests.ts
index 7b428561fe..63c82a9913 100644
--- a/types/passport-local-mongoose/passport-local-mongoose-tests.ts
+++ b/types/passport-local-mongoose/passport-local-mongoose-tests.ts
@@ -31,13 +31,13 @@ interface User extends PassportLocalDocument {
     last: Date;
 }
 
-const UserSchema: PassportLocalSchema = new Schema({
+const UserSchema = new Schema({
     username: String,
     hash: String,
     salt: String,
     attempts: Number,
     last: Date
-});
+}) as PassportLocalSchema;
 
 let options: PassportLocalOptions = <PassportLocalOptions>{};
 options.iterations = 25000;
diff --git a/types/passport-unique-token/index.d.ts b/types/passport-unique-token/index.d.ts
new file mode 100644
index 0000000000..ace65042f1
--- /dev/null
+++ b/types/passport-unique-token/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for passport-unique-token 1.0
+// Project: https://github.com/Lughino/passport-unique-token
+// Definitions by: briman0094 <https://github.com/briman0094>
+//                 Maxime LUCE <https://github.com/SomaticIT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import passport = require('passport');
+import express = require('express');
+
+export interface StrategyOptions {
+    tokenField?: string;
+    tokenQuery?: string;
+    tokenParams?: string;
+    tokenHeader?: string;
+    failedOnMissing?: boolean;
+    passReqToCallback?: false;
+}
+
+export interface StrategyOptionsWithRequest {
+    tokenField?: string;
+    tokenQuery?: string;
+    tokenParams?: string;
+    tokenHeader?: string;
+    failedOnMissing?: boolean;
+    passReqToCallback: true;
+}
+
+export interface VerifyOptions {
+    message: string;
+}
+
+export type VerifyFunctionWithRequest = (req: express.Request, token: string, done: (error: any, user?: any, options?: VerifyOptions) => void) => void;
+export type VerifyFunction = (token: string, done: (error: any, user?: any, options?: VerifyOptions) => void) => void;
+
+export class Strategy implements passport.Strategy {
+    constructor(options: StrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
+    constructor(options: StrategyOptions, verify: VerifyFunction);
+    constructor(verify: VerifyFunction);
+
+    name: string;
+    authenticate: (req: express.Request, options?: object) => void;
+}
diff --git a/types/passport-unique-token/passport-unique-token-tests.ts b/types/passport-unique-token/passport-unique-token-tests.ts
new file mode 100644
index 0000000000..ff7c35c4ac
--- /dev/null
+++ b/types/passport-unique-token/passport-unique-token-tests.ts
@@ -0,0 +1,89 @@
+/**
+ * Created by briman0094 <https://github.com/briman0094>.
+ * Based on passport-local tests by Maxime LUCE <https://github.com/SomaticIT>.
+ */
+
+import express = require("express");
+import passport = require("passport");
+import uniqueToken = require("passport-unique-token");
+
+//#region Test Models
+interface BaseUser {
+    uniqueToken: string;
+}
+
+class User implements BaseUser {
+    uniqueToken: string;
+
+    static findOne(user: BaseUser & any, callback: (err: Error | null, user: User) => void): void {
+        callback(null, new User());
+    }
+
+    verifyPassword(password: string): boolean {
+        return true;
+    }
+}
+//#endregion
+
+// Sample from https://github.com/Lughino/passport-unique-token
+passport.use(new uniqueToken.Strategy((token: string, done: any) => {
+    User.findOne({
+        uniqueToken: token,
+        expireToken: {
+            $gt: Date.now()
+        }
+    }, (err, user) => {
+        if (err) {
+            return done(err);
+        }
+
+        if (!user) {
+            return done(null, false);
+        }
+
+        return done(null, user);
+    });
+}));
+
+passport.use(new uniqueToken.Strategy({
+    tokenField: "q",
+    passReqToCallback: true
+}, (req: express.Request, token: string, done: any) => {
+    User.findOne({
+        uniqueToken: token
+    }, (err, user) => {
+        if (err) {
+            return done(err);
+        }
+
+        if (!user) {
+            return done(null, false);
+        }
+
+        return done(null, user);
+    });
+}));
+
+// Sample from https://github.com/Lughino/passport-unique-token#authenticate
+let app = express();
+
+app.post('/login', authenticate, (req, res) => {
+    res.redirect('/');
+});
+
+function authenticate(req: express.Request, res: express.Response, next: express.NextFunction) {
+    passport.authenticate('token', (err: any, user: any, info: any) => {
+        if (err) {
+            return next(err);
+        }
+
+        if (!user) {
+            res.status(401).json({
+                message: "Incorrect token credentials"
+            });
+        }
+
+        req.user = user;
+        next();
+    });
+}
diff --git a/types/passport-unique-token/tsconfig.json b/types/passport-unique-token/tsconfig.json
new file mode 100644
index 0000000000..3277992cff
--- /dev/null
+++ b/types/passport-unique-token/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-unique-token-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/passport-unique-token/tslint.json b/types/passport-unique-token/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/passport-unique-token/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/pdf/index.d.ts b/types/pdfjs-dist/index.d.ts
similarity index 99%
rename from types/pdf/index.d.ts
rename to types/pdfjs-dist/index.d.ts
index c3d7bc8788..31c9ed7800 100644
--- a/types/pdf/index.d.ts
+++ b/types/pdfjs-dist/index.d.ts
@@ -474,3 +474,8 @@ interface PDFJSStatic {
 }
 
 declare var PDFJS: PDFJSStatic;
+
+declare module "pdfjs-dist" {
+  export = PDFJS;
+}
+
diff --git a/types/pdf/pdf-tests.ts b/types/pdfjs-dist/pdfjs-dist-tests.ts
similarity index 100%
rename from types/pdf/pdf-tests.ts
rename to types/pdfjs-dist/pdfjs-dist-tests.ts
diff --git a/types/pdf/tsconfig.json b/types/pdfjs-dist/tsconfig.json
similarity index 93%
rename from types/pdf/tsconfig.json
rename to types/pdfjs-dist/tsconfig.json
index ad7d35deb6..110e5b444a 100644
--- a/types/pdf/tsconfig.json
+++ b/types/pdfjs-dist/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "pdf-tests.ts"
+        "pdfjs-dist-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/perfect-scrollbar/index.d.ts b/types/perfect-scrollbar/index.d.ts
index 9e1cbad59b..74852a513c 100644
--- a/types/perfect-scrollbar/index.d.ts
+++ b/types/perfect-scrollbar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/noraesae/perfect-scrollbar
 // Definitions by: Kombu <https://github.com/aicest>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/perfect-scrollbar/perfect-scrollbar-tests.ts b/types/perfect-scrollbar/perfect-scrollbar-tests.ts
index b847b56ab2..6bd9854658 100644
--- a/types/perfect-scrollbar/perfect-scrollbar-tests.ts
+++ b/types/perfect-scrollbar/perfect-scrollbar-tests.ts
@@ -29,7 +29,6 @@ Ps.update(container)
  * https://github.com/noraesae/perfect-scrollbar#jquery
  */
 
-import * as $ from 'jquery'
 import mountJQuery = require('perfect-scrollbar/jquery')
 mountJQuery($)
 
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 6a2bd068d5..2b442b1227 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -42,6 +42,7 @@ export interface PoolConfig extends ClientConfig {
       reapIntervalMillis?: number;
       returnToHead?: boolean;
       application_name?: string;
+      Promise?: PromiseConstructorLike;
 }
 
 export interface QueryConfig {
@@ -71,7 +72,7 @@ export declare class Pool extends events.EventEmitter {
     connect(callback: (err: Error, client: Client, done: () => void) => void): void;
 
     end(): Promise<void>;
-    
+
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
     query(queryTextOrConfig: string | QueryConfig): Promise<QueryResult>;
     query(queryText: string, values: any[]): Promise<QueryResult>;
diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index bdf49ab240..73c18ac1b7 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -1,4 +1,3 @@
-
 import * as pg from "pg";
 
 var conString = "postgres://username:password@localhost/database";
@@ -54,6 +53,7 @@ var config = {
   port: 5432, //env var: PGPORT
   max: 10, // max number of clients in the pool
   idleTimeoutMillis: 30000, // how long a client is allowed to remain idle before being closed
+  Promise,
 };
 var pool = new pg.Pool(config);
 
diff --git a/types/photoswipe/dist/photoswipe-ui-default/index.d.ts b/types/photoswipe/dist/photoswipe-ui-default/index.d.ts
new file mode 100644
index 0000000000..ff01d7ecea
--- /dev/null
+++ b/types/photoswipe/dist/photoswipe-ui-default/index.d.ts
@@ -0,0 +1,288 @@
+import * as PhotoSwipe from '../../index';
+
+/**
+ * Default UI class for PhotoSwipe. This class is largely undocumented and doesn't seem to have a public facing API.
+ */
+declare class PhotoSwipeUI_Default implements PhotoSwipe.UI<PhotoSwipeUI_Default.Options> {
+    constructor(pswp: PhotoSwipe<PhotoSwipeUI_Default.Options>, framework: PhotoSwipe.UIFramework);
+    init(): void;
+
+    /**
+     * Call this method to update the UI after the items array has been modified in the original PhotoSwipe element.
+     */
+    update(): void;
+}
+
+declare namespace PhotoSwipeUI_Default {
+    /**
+     * Options for the PhotoSwipe Default UI. Derived from http://photoswipe.com/documentation/options.html
+     */
+    export interface Options extends PhotoSwipe.Options {
+        /**
+         * Size of top & bottom bars in pixels. "bottom" parameter can be 'auto' (will calculate height of caption).
+         * Option applies only when mouse is used, or when width of screen is more than 1200px.
+         * Also look at `parseVerticalMargin` event.
+         *
+         * Default {top: 44, bottom: "auto"}.
+         */
+        barsSize?: { top: number; bottom: number | string };
+
+        /**
+         * Adds class pswp__ui--idle to pswp__ui element when mouse isn't moving for timeToIdle milliseconds.
+         *
+         * Default 4000.
+         */
+        timeToIdle?: number;
+
+        /**
+         * Adds class pswp__ui--idle to pswp__ui element when mouse leaves the window for timeToIdleOutside milliseconds.
+         *
+         * Default 1000.
+         */
+        timeToIdleOutside?: number;
+
+        /**
+         * Delay in milliseconds until loading indicator is displayed.
+         *
+         * Default 1000.
+         */
+        loadingIndicatorDelay?: number;
+
+        /**
+         * Function to build caption markup. The function takes three parameters:
+         *
+         * item      - slide object
+         * captionEl - caption DOM element
+         * isFake    - true when content is added to fake caption container
+         *             (used to get size of next or previous caption)
+         *
+         * Return whether to show the caption or not.
+         *
+         * Default is:
+         *
+         * function(item, captionEl, isFake) {
+         *     if(!item.title) {
+         *         captionEl.children[0].innerHTML = '';
+         *         return false;
+         *     }
+         *     captionEl.children[0].innerHTML = item.title;
+         *     return true;
+         * }
+         *
+         */
+        addCaptionHTMLFn?: (item: Item, captionEl: HTMLElement, isFake: boolean) => boolean;
+
+        /**
+         * Whether to show the close button.
+         *
+         * Default true.
+         */
+        closeEl?: boolean;
+
+        /**
+         * Whether to show the caption.
+         *
+         * Default true.
+         */
+        captionEl?: boolean;
+
+        /**
+         * Whether to show the fullscreen button.
+         *
+         * Default true.
+         */
+        fullscreenEl?: boolean;
+
+        /**
+         * Whether to show the zoom button.
+         *
+         * Default true.
+         */
+        zoomEl?: boolean;
+
+        /**
+         * Whether to show the share button.
+         *
+         * Default true.
+         */
+        shareEl?: boolean;
+
+        /**
+         * Whether to show the current image's index in the gallery (located in top-left corner by default).
+         *
+         * Default true.
+         */
+        counterEl?: boolean;
+
+        /**
+         * Whether to show the left/right directional arrows.
+         *
+         * Default true.
+         */
+        arrowEl?: boolean;
+
+        /**
+         * Whether to show the preloader element.
+         *
+         * Default true.
+         */
+        preloaderEl?: boolean;
+
+        /**
+         * Tap on sliding area should close gallery.
+         *
+         * Default false.
+         */
+        tapToClose?: boolean;
+
+        /**
+         * Tap should toggle visibility of controls.
+         *
+         * Default true.
+         */
+        tapToToggleControls?: boolean;
+
+        /**
+         * Mouse click on image should close the gallery, only when image is smaller than size of the viewport.
+         *
+         * Default true.
+         */
+        clickToCloseNonZoomable?: boolean;
+
+        /**
+         * Element classes that should close PhotoSwipe when clicked on.
+         * In HTML markup, class should always start with "pswp__", e.g.: "pswp__item", "pswp__caption".
+         *
+         * "pswp__ui--over-close" class will be added to root element of UI when mouse is over one of these elements
+         * By default it's used to highlight the close button.
+         *
+         * Default ['item', 'caption', 'zoom-wrap', 'ui', 'top-bar'].
+         */
+        closeElClasses?: string[];
+
+        /**
+         * Separator for "1 of X" counter.
+         *
+         * Default ' / '.
+         */
+        indexIndicatorSep?: string;
+
+        /**
+         * The entries that show up when you click the Share button.
+         *
+         * Default is:
+         *
+         * [
+         *     {id:'facebook', label:'Share on Facebook', url:'https://www.facebook.com/sharer/sharer.php?u='},
+         *     {id:'twitter', label:'Tweet', url:'https://twitter.com/intent/tweet?text=&url='},
+         *     {id:'pinterest', label:'Pin it', url:'http://www.pinterest.com/pin/create/button/?url=&media=&description='},
+         *     {id:'download', label:'Download image', url:'', download:true}
+         * ]
+         *
+         */
+        shareButtons?: ShareButtonData[];
+
+        /**
+         * A callback that should return the URL for the currently selected image. The callback is passed
+         * the shareButtonData entry that was clicked on.
+         *
+         * Default is:
+         *
+         * function( shareButtonData ) {
+         *     // `shareButtonData` - object from shareButtons array
+         *     //
+         *     // `pswp` is the gallery instance object,
+         *     // you should define it by yourself
+         *     //
+         *     return pswp.currItem.src || '';
+         * }
+         *
+         */
+        getImageURLForShare?: (shareButtonData: ShareButtonData) => string;
+
+        /**
+         * A callback that should return the "Page" associated with the selected image. (e.g. on Facebook, the shared
+         * content will be associated with the returned page). The callback is passed the shareButtonData entry that
+         * was clicked on.
+         *
+         * Default is:
+         *
+         * function( shareButtonData ) {
+         *     return window.location.href;
+         * }
+         *
+         */
+        getPageURLForShare?: (shareButtonData: ShareButtonData) => string;
+
+        /**
+         * A callback that should return the Text associated with the selected image. The callback is passed
+         * the shareButtonData entry that was clicked on.
+         *
+         * Default is:
+         *
+         * function( shareButtonData ) {
+         *     return pswp.currItem.title || '';
+         * }
+         *
+         */
+        getTextForShare?: (shareButtonData: ShareButtonData) => string;
+
+        /**
+         * A final output callback that you can use to further modify the share button's HTML. The callback is passed
+         * (1) the shareButtonData entry being generated, and (2) the default HTML generated by PhotoSwipUI_Default.
+         *
+         * Default is:
+         *
+         * function(shareButtonData, shareButtonOut) {
+         *     return shareButtonOut;
+         * }
+         *
+         */
+        parseShareButtonOut?: (shareButtonData: ShareButtonData, shareButtonOut: string) => string;
+    }
+
+    export interface ShareButtonData {
+        /**
+         * An id for this share button entry. The share element associated with this entry will be classed with
+         * 'pswp__share--' + id
+         */
+        id: string;
+
+        /**
+         * The user-visible text to display for this entry.
+         */
+        label: string;
+
+        /**
+         * The full sharing endpoint URL for this social media site (e.g. Facebook's is facebook.com/sharer/sharer.php), with URL parameters.
+         * PhotoSwipUI_Default treats the URL specially. In the url string, any of the following text is treated specially:
+         * '{{url}}', '{{image_url}}, '{{raw_image_url}}, '{{text}}'. PhotoSwipeUI_Default will replace each of them with the following value:
+         *
+         * {{url}} becomes the (URIEncoded) url to the current "Page" (as returned by getPageURLForShare).
+         * {{image_url}} becomes the (URIEncoded) url of the selected image (as returned by getImageURLForShare).
+         * {{raw_image_url}} becomes the raw url of the selected image (as returned by getImageURLForShare).
+         * {{text}} becomes the (URIEncoded) share text of the selected image (as returned by getTextForShare).
+         */
+        url: string;
+
+        /**
+         * Whether this link is a direct download button or not.
+         *
+         * Default false.
+         */
+        download?: boolean;
+    }
+
+    /**
+     * Extra properties that the Default UI accepts.
+     */
+    export interface Item extends PhotoSwipe.Item {
+        /**
+         * The caption for this item.
+         */
+        title?: string;
+    }
+}
+
+export = PhotoSwipeUI_Default;
+export as namespace PhotoSwipeUI_Default;
diff --git a/types/photoswipe/index.d.ts b/types/photoswipe/index.d.ts
index 49145bf7c2..a0911e23f2 100644
--- a/types/photoswipe/index.d.ts
+++ b/types/photoswipe/index.d.ts
@@ -7,7 +7,7 @@ declare namespace PhotoSwipe {
     /**
      * A specific slide in the PhotoSwipe gallery. The terms "item", "slide", and "slide object" are used interchangeably.
      */
-    interface Item {
+    export interface Item {
         /**
          * The url of this image.
          */
@@ -56,7 +56,7 @@ declare namespace PhotoSwipe {
     /**
      * Options for the base PhotoSwipe class. Derived from http://photoswipe.com/documentation/options.html
      */
-    interface Options {
+    export interface Options {
         /**
          * Start slide index. 0 is the first slide. Must be integer, not a string.
          *
@@ -317,7 +317,7 @@ declare namespace PhotoSwipe {
         modal?: boolean;
     }
 
-    interface UIFramework {
+    export interface UIFramework {
         [name: string]: any;
     }
 
@@ -347,7 +347,7 @@ declare namespace PhotoSwipe {
      *
      * var pswpWithMyUI = new PhotoSwipe<MyUIOptions>(element, MyUI, items, {foo: 1, bar: "abc"});
      */
-    interface UI<T extends Options> {
+    export interface UI<T extends Options> {
         /**
          * Called by PhotoSwipe after it constructs the UI.
          */
@@ -634,290 +634,5 @@ declare class PhotoSwipe<T extends PhotoSwipe.Options> {
     shout(eventName: string, ...args: any[]): void;
 }
 
-/**
- * Default UI class for PhotoSwipe. This class is largely undocumented and doesn't seem to have a public facing API.
- */
-declare class PhotoSwipeUI_Default implements PhotoSwipe.UI<PhotoSwipeUI_Default.Options> {
-    constructor(pswp: PhotoSwipe<PhotoSwipeUI_Default.Options>, framework: PhotoSwipe.UIFramework);
-    init(): void;
-
-    /**
-     * Call this method to update the UI after the items array has been modified in the original PhotoSwipe element.
-     */
-    update(): void;
-}
-
-declare namespace PhotoSwipeUI_Default {
-    /**
-     * Options for the PhotoSwipe Default UI. Derived from http://photoswipe.com/documentation/options.html
-     */
-    interface Options extends PhotoSwipe.Options {
-        /**
-         * Size of top & bottom bars in pixels. "bottom" parameter can be 'auto' (will calculate height of caption).
-         * Option applies only when mouse is used, or when width of screen is more than 1200px.
-         * Also look at `parseVerticalMargin` event.
-         *
-         * Default {top: 44, bottom: "auto"}.
-         */
-        barsSize?: { top: number; bottom: number | string };
-
-        /**
-         * Adds class pswp__ui--idle to pswp__ui element when mouse isn't moving for timeToIdle milliseconds.
-         *
-         * Default 4000.
-         */
-        timeToIdle?: number;
-
-        /**
-         * Adds class pswp__ui--idle to pswp__ui element when mouse leaves the window for timeToIdleOutside milliseconds.
-         *
-         * Default 1000.
-         */
-        timeToIdleOutside?: number;
-
-        /**
-         * Delay in milliseconds until loading indicator is displayed.
-         *
-         * Default 1000.
-         */
-        loadingIndicatorDelay?: number;
-
-        /**
-         * Function to build caption markup. The function takes three parameters:
-         *
-         * item      - slide object
-         * captionEl - caption DOM element
-         * isFake    - true when content is added to fake caption container
-         *             (used to get size of next or previous caption)
-         *
-         * Return whether to show the caption or not.
-         *
-         * Default is:
-         *
-         * function(item, captionEl, isFake) {
-         *     if(!item.title) {
-         *         captionEl.children[0].innerHTML = '';
-         *         return false;
-         *     }
-         *     captionEl.children[0].innerHTML = item.title;
-         *     return true;
-         * }
-         *
-         */
-        addCaptionHTMLFn?: (item: Item, captionEl: HTMLElement, isFake: boolean) => boolean;
-
-        /**
-         * Whether to show the close button.
-         *
-         * Default true.
-         */
-        closeEl?: boolean;
-
-        /**
-         * Whether to show the caption.
-         *
-         * Default true.
-         */
-        captionEl?: boolean;
-
-        /**
-         * Whether to show the fullscreen button.
-         *
-         * Default true.
-         */
-        fullscreenEl?: boolean;
-
-        /**
-         * Whether to show the zoom button.
-         *
-         * Default true.
-         */
-        zoomEl?: boolean;
-
-        /**
-         * Whether to show the share button.
-         *
-         * Default true.
-         */
-        shareEl?: boolean;
-
-        /**
-         * Whether to show the current image's index in the gallery (located in top-left corner by default).
-         *
-         * Default true.
-         */
-        counterEl?: boolean;
-
-        /**
-         * Whether to show the left/right directional arrows.
-         *
-         * Default true.
-         */
-        arrowEl?: boolean;
-
-        /**
-         * Whether to show the preloader element.
-         *
-         * Default true.
-         */
-        preloaderEl?: boolean;
-
-        /**
-         * Tap on sliding area should close gallery.
-         *
-         * Default false.
-         */
-        tapToClose?: boolean;
-
-        /**
-         * Tap should toggle visibility of controls.
-         *
-         * Default true.
-         */
-        tapToToggleControls?: boolean;
-
-        /**
-         * Mouse click on image should close the gallery, only when image is smaller than size of the viewport.
-         *
-         * Default true.
-         */
-        clickToCloseNonZoomable?: boolean;
-
-        /**
-         * Element classes that should close PhotoSwipe when clicked on.
-         * In HTML markup, class should always start with "pswp__", e.g.: "pswp__item", "pswp__caption".
-         *
-         * "pswp__ui--over-close" class will be added to root element of UI when mouse is over one of these elements
-         * By default it's used to highlight the close button.
-         *
-         * Default ['item', 'caption', 'zoom-wrap', 'ui', 'top-bar'].
-         */
-        closeElClasses?: string[];
-
-        /**
-         * Separator for "1 of X" counter.
-         *
-         * Default ' / '.
-         */
-        indexIndicatorSep?: string;
-
-        /**
-         * The entries that show up when you click the Share button.
-         *
-         * Default is:
-         *
-         * [
-         *     {id:'facebook', label:'Share on Facebook', url:'https://www.facebook.com/sharer/sharer.php?u='},
-         *     {id:'twitter', label:'Tweet', url:'https://twitter.com/intent/tweet?text=&url='},
-         *     {id:'pinterest', label:'Pin it', url:'http://www.pinterest.com/pin/create/button/?url=&media=&description='},
-         *     {id:'download', label:'Download image', url:'', download:true}
-         * ]
-         *
-         */
-        shareButtons?: ShareButtonData[];
-
-        /**
-         * A callback that should return the URL for the currently selected image. The callback is passed
-         * the shareButtonData entry that was clicked on.
-         *
-         * Default is:
-         *
-         * function( shareButtonData ) {
-         *     // `shareButtonData` - object from shareButtons array
-         *     //
-         *     // `pswp` is the gallery instance object,
-         *     // you should define it by yourself
-         *     //
-         *     return pswp.currItem.src || '';
-         * }
-         *
-         */
-        getImageURLForShare?: (shareButtonData: ShareButtonData) => string;
-
-        /**
-         * A callback that should return the "Page" associated with the selected image. (e.g. on Facebook, the shared
-         * content will be associated with the returned page). The callback is passed the shareButtonData entry that
-         * was clicked on.
-         *
-         * Default is:
-         *
-         * function( shareButtonData ) {
-         *     return window.location.href;
-         * }
-         *
-         */
-        getPageURLForShare?: (shareButtonData: ShareButtonData) => string;
-
-        /**
-         * A callback that should return the Text associated with the selected image. The callback is passed
-         * the shareButtonData entry that was clicked on.
-         *
-         * Default is:
-         *
-         * function( shareButtonData ) {
-         *     return pswp.currItem.title || '';
-         * }
-         *
-         */
-        getTextForShare?: (shareButtonData: ShareButtonData) => string;
-
-        /**
-         * A final output callback that you can use to further modify the share button's HTML. The callback is passed
-         * (1) the shareButtonData entry being generated, and (2) the default HTML generated by PhotoSwipUI_Default.
-         *
-         * Default is:
-         *
-         * function(shareButtonData, shareButtonOut) {
-         *     return shareButtonOut;
-         * }
-         *
-         */
-        parseShareButtonOut?: (shareButtonData: ShareButtonData, shareButtonOut: string) => string;
-    }
-
-    interface ShareButtonData {
-        /**
-         * An id for this share button entry. The share element associated with this entry will be classed with
-         * 'pswp__share--' + id
-         */
-        id: string;
-
-        /**
-         * The user-visible text to display for this entry.
-         */
-        label: string;
-
-        /**
-         * The full sharing endpoint URL for this social media site (e.g. Facebook's is facebook.com/sharer/sharer.php), with URL parameters.
-         * PhotoSwipUI_Default treats the URL specially. In the url string, any of the following text is treated specially:
-         * '{{url}}', '{{image_url}}, '{{raw_image_url}}, '{{text}}'. PhotoSwipeUI_Default will replace each of them with the following value:
-         *
-         * {{url}} becomes the (URIEncoded) url to the current "Page" (as returned by getPageURLForShare).
-         * {{image_url}} becomes the (URIEncoded) url of the selected image (as returned by getImageURLForShare).
-         * {{raw_image_url}} becomes the raw url of the selected image (as returned by getImageURLForShare).
-         * {{text}} becomes the (URIEncoded) share text of the selected image (as returned by getTextForShare).
-         */
-        url: string;
-
-        /**
-         * Whether this link is a direct download button or not.
-         *
-         * Default false.
-         */
-        download?: boolean;
-    }
-
-    /**
-     * Extra properties that the Default UI accepts.
-     */
-    interface Item extends PhotoSwipe.Item {
-        /**
-         * The caption for this item.
-         */
-        title?: string;
-    }
-}
-
-declare module "photoswipe" {
-    export default PhotoSwipe;
-}
+export = PhotoSwipe;
+export as namespace PhotoSwipe;
diff --git a/types/photoswipe/photoswipe-tests.ts b/types/photoswipe/photoswipe-tests.ts
index ef480d8581..05cdb5db53 100644
--- a/types/photoswipe/photoswipe-tests.ts
+++ b/types/photoswipe/photoswipe-tests.ts
@@ -1,4 +1,5 @@
-
+import * as PhotoSwipeUI_Default from './dist/photoswipe-ui-default/index';
+import * as PhotoSwipe from './index';
 
 function test_defaultUI() {
     var items: PhotoSwipeUI_Default.Item[] = [
diff --git a/types/photoswipe/tsconfig.json b/types/photoswipe/tsconfig.json
index e7c4e42020..4317aba61f 100644
--- a/types/photoswipe/tsconfig.json
+++ b/types/photoswipe/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "dist/photoswipe-ui-default/index.d.ts",
         "photoswipe-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/pickadate/index.d.ts b/types/pickadate/index.d.ts
index 013b8e6101..b644678caf 100644
--- a/types/pickadate/index.d.ts
+++ b/types/pickadate/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for pickadate.js 3.5.5
 // Project: https://github.com/amsul/pickadate.js
-// Definitions by: Theodore Brown <https://github.com/theodorejb/>
+// Definitions by: Theodore Brown <https://github.com/theodorejb/>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
@@ -504,42 +505,53 @@ declare namespace Pickadate {
 
     export interface DatePicker extends Picker<DatePicker, DateItem, SetObject> { }
     export interface TimePicker extends Picker<TimePicker, TimeItem, TimeSetObject> { }
+
+    interface Pickadate {
+        defaults: DateOptions;
+
+        /**
+         * Access the API object on an initialized date picker element.
+         */
+        (keyword: "picker"): Pickadate.DatePicker;
+        (objectName: "$node"): JQuery;
+        (objectName: "$root"): JQuery;
+        (objectName: "_hidden"): HTMLInputElement;
+
+        /**
+         * Invoke API methods after date picker initialization.
+         */
+        (methodName: string, ...arguments: any[]): any;
+
+        /**
+         * Initialize a date picker.
+         */
+        (options?: Pickadate.DateOptions): JQuery;
+    }
+
+    interface Pickatime {
+        defaults: TimeOptions;
+
+        /**
+         * Access the API object on an initialized time picker element.
+         */
+        (keyword: "picker"): Pickadate.TimePicker;
+        (objectName: "$node"): JQuery;
+        (objectName: "$root"): JQuery;
+        (objectName: "_hidden"): HTMLInputElement;
+
+        /**
+         * Invoke API methods after time picker initialization.
+         */
+        (methodName: string, ...arguments: any[]): any;
+
+        /**
+         * Initialize a time picker.
+         */
+        (options?: Pickadate.TimeOptions): JQuery;
+    }
 }
 
 interface JQuery {
-    /**
-     * Access the API object on an initialized date picker element.
-     */
-    pickadate(keyword: "picker"): Pickadate.DatePicker;
-    pickadate(objectName: "$node"): JQuery;
-    pickadate(objectName: "$root"): JQuery;
-    pickadate(objectName: "_hidden"): HTMLInputElement;
-
-    /**
-     * Invoke API methods after date picker initialization.
-     */
-    pickadate(methodName: string, ...arguments: any[]): any;
-
-    /**
-     * Initialize a date picker.
-     */
-    pickadate(options?: Pickadate.DateOptions): JQuery;
-
-    /**
-     * Access the API object on an initialized time picker element.
-     */
-    pickatime(keyword: "picker"): Pickadate.TimePicker;
-    pickatime(objectName: "$node"): JQuery;
-    pickatime(objectName: "$root"): JQuery;
-    pickatime(objectName: "_hidden"): HTMLInputElement;
-
-    /**
-     * Invoke API methods after time picker initialization.
-     */
-    pickatime(methodName: string, ...arguments: any[]): any;
-
-    /**
-     * Initialize a time picker.
-     */
-    pickatime(options?: Pickadate.TimeOptions): JQuery;
+    pickadate: Pickadate.Pickadate;
+    pickatime: Pickadate.Pickatime;
 }
diff --git a/types/pify/pify-tests.ts b/types/pify/pify-tests.ts
index 2252005b85..87e1ba28ae 100644
--- a/types/pify/pify-tests.ts
+++ b/types/pify/pify-tests.ts
@@ -1,8 +1,4 @@
-
-/// <reference types="bluebird" />
-
 import * as pify from 'pify';
-import * as Bluebird from 'bluebird';
 
 function assert(actual: string, expected: string): void {
     if (actual !== expected) {
@@ -28,4 +24,4 @@ const fsP = pify(fs);
 fsP.readFile('foo.txt').then((result: string) => assert(result, 'foo'));
 
 pify(fs.readFile)('foo.txt').then((result: string) => assert(result, 'foo'));
-pify(fs.readFile, Bluebird)('bar.txt').then((result: string) => assert(result, 'bar'));
\ No newline at end of file
+pify(fs.readFile, Promise)('bar.txt').then((result: string) => assert(result, 'bar'));
\ No newline at end of file
diff --git a/types/pikaday/index.d.ts b/types/pikaday/index.d.ts
index 43d8b5384b..2464dbec93 100644
--- a/types/pikaday/index.d.ts
+++ b/types/pikaday/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/dbushell/Pikaday
 // Definitions by: Rudolph Gottesheim <http://midnight-design.at/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as moment from 'moment';
 
diff --git a/types/pinterest-sdk/index.d.ts b/types/pinterest-sdk/index.d.ts
index b24e4bee7b..bc5aed2627 100644
--- a/types/pinterest-sdk/index.d.ts
+++ b/types/pinterest-sdk/index.d.ts
@@ -40,6 +40,13 @@ declare namespace PDK {
     session?: OauthSession;
   }
 
+  interface PinData {
+    board: string;
+    note: string;
+    link: string;
+    image_url: string;
+  }
+
   /**
    * Get information on the currently authenticated user
    * @param cb     the callback export function to handle the response
@@ -69,7 +76,7 @@ declare namespace PDK {
    * @param path   URL path
    * @param httpMethod HTTP verb
    */
-  export function request(path: string, httpMethod?: string|HttpMethod, params?: OAuthRequestParams, callback?: Function): void;
+    export function request(path: string, httpMethod?: string|HttpMethod, data?: PinData, callback?: Function): void;
 
   /**
    * Show user login dialog, and save access token
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index 88ed75eced..bcf403d475 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Pixi.js 4.4
+// Type definitions for Pixi.js 4.5
 // Project: https://github.com/pixijs/pixi.js/tree/dev
 // Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -20,8 +20,10 @@ declare namespace PIXI {
     const GC_MODES: typeof CONST.GC_MODES;
     const SHAPES: typeof CONST.SHAPES;
     const TEXT_GRADIENT: typeof CONST.TEXT_GRADIENT;
+    const UPDATE_PRIORITY: typeof CONST.UPDATE_PRIORITY;
 
-    function autoDetectRenderer(width: number, height: number, options?: PIXI.IRendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, forceCanvas?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    function autoDetectRenderer(options?: PIXI.RendererOptions): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
     const loader: PIXI.loaders.Loader;
 
     //////////////////////////////////////////////////////////////////////////////
@@ -46,6 +48,9 @@ declare namespace PIXI {
             clearBeforeRender: boolean,
             preserveDrawingBuffer: boolean,
             roundPixels: boolean
+            width: number,
+            height: number,
+            legacy: boolean,
         };
         let TRANSFORM_MODE: number;
         let GC_MODE: number;
@@ -53,6 +58,8 @@ declare namespace PIXI {
         let GC_MAX_CHECK_COUNT: number;
         let WRAP_MODE: number;
         let SCALE_MODE: number;
+        let PRECISION_VERTEX: string;
+        let PRECISION_FRAGMENT: string;
         let PRECISION: string;
         let UPLOADS_PER_FRAME: number;
         let CAN_UPLOAD_SAME_BUFFER: boolean;
@@ -66,20 +73,19 @@ declare namespace PIXI {
         // accessibility
         class AccessibilityManager {
             constructor(renderer: CanvasRenderer | WebGLRenderer);
-
+            activate(): void;
+            deactivate(): void;
             protected div: HTMLElement;
             protected pool: HTMLElement[];
             protected renderId: number;
             debug: boolean;
             renderer: SystemRenderer;
-            protected children: IAccessibleTarget[];
+            protected children: AccessibleTarget[];
             protected isActive: boolean;
 
-            protected activate(): void;
-            protected deactivate(): void;
             protected updateAccessibleObjects(displayObject: DisplayObject): void;
             protected update(): void;
-            protected capHitArea(hitArea: IHitArea): void;
+            protected capHitArea(hitArea: HitArea): void;
             protected addChild(displayObject: DisplayObject): void;
             protected _onClick(e: interaction.InteractionEvent): void;
             protected _onFocus(e: interaction.InteractionEvent): void;
@@ -89,7 +95,7 @@ declare namespace PIXI {
 
             destroy(): void;
         }
-        interface IAccessibleTarget {
+        interface AccessibleTarget {
             accessible: boolean;
             accessibleTitle: string | null;
             accessibleHint: string | null;
@@ -132,6 +138,9 @@ declare namespace PIXI {
             SATURATION: number;
             COLOR: number;
             LUMINOSITY: number;
+            NORMAL_NPM: number;
+            ADD_NPM: number;
+            SCREEN_NPM: number;
         };
         const DRAW_MODES: {
             POINTS: number;
@@ -179,11 +188,18 @@ declare namespace PIXI {
             LINEAR_VERTICAL: number;
             LINEAR_HORIZONTAL: number;
         };
+        const UPDATE_PRIORITY: {
+            INTERACTION: number;
+            HIGH: number;
+            NORMAL: number;
+            LOW: number;
+            UTILITY: number;
+        };
     }
 
     // display
 
-    interface IApplicationOptions extends IRendererOptions {
+    interface ApplicationOptions extends RendererOptions {
         view?: HTMLCanvasElement;
         transparent?: boolean;
         autoResize?: boolean;
@@ -195,10 +211,16 @@ declare namespace PIXI {
         context?: WebGLRenderingContext;
         preserveDrawingBuffer?: boolean;
         legacy?: boolean;
+        width?: number;
+        height?: number;
+        forceCanvas?: boolean;
+        sharedTicker?: boolean;
+        sharedLoader?: boolean;
     }
 
     class Application {
-        constructor(width?: number, height?: number, options?: IApplicationOptions, noWebGL?: boolean, useSharedTicker?: boolean);
+        constructor(options?: ApplicationOptions)
+        constructor(width?: number, height?: number, options?: ApplicationOptions, noWebGL?: boolean, sharedTicker?: boolean, sharedLoader?: boolean);
 
         private _ticker: ticker.Ticker;
 
@@ -214,7 +236,7 @@ declare namespace PIXI {
         readonly view: HTMLCanvasElement;
     }
 
-    interface IDestroyOptions {
+    interface DestroyOptions {
         children?: boolean;
         texture?: boolean;
         baseTexture?: boolean;
@@ -266,17 +288,18 @@ declare namespace PIXI {
         protected _renderWebGL(renderer: WebGLRenderer): void;
         protected _renderCanvas(renderer: CanvasRenderer): void;
         renderCanvas(renderer: CanvasRenderer): void;
-        destroy(options?: IDestroyOptions | boolean): void;
+        destroy(options?: DestroyOptions | boolean): void;
 
-        once(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): this;
-        once(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): this;
+        once(event: "added" | "removed", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        //tslint:disable-next-line:ban-types forbidden-types
         once(event: string, fn: Function, context?: any): this;
-        on(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): this;
-        on(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): this;
+        on(event: "added" | "removed", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        //tslint:disable-next-line:ban-types forbidden-types
         on(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        //tslint:disable-next-line:ban-types forbidden-types
+        off(event: "added" | "removed" | string, fn?: Function, context?: any): this;
     }
-    class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget, accessibility.IAccessibleTarget {
+    class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget, accessibility.AccessibleTarget {
         // begin extras.cacheAsBitmap
         protected _cacheAsBitmap: boolean;
         protected _cacheData: boolean;
@@ -288,7 +311,7 @@ declare namespace PIXI {
         protected _calculateCachedBounds(): Rectangle;
         protected _getCachedLocalBounds(): Rectangle;
         protected _destroyCachedDisplayObject(): void;
-        protected _cacheAsBitmapDestroy(): void;
+        protected _cacheAsBitmapDestroy(options: boolean | any): void;
         // end extras.cacheAsBitmap
 
         // begin extras.getChildByName
@@ -332,14 +355,15 @@ declare namespace PIXI {
         protected _boundsRect: Rectangle;
         protected _localBoundsRect: Rectangle;
         protected _mask: PIXI.Graphics | PIXI.Sprite;
+        protected readonly _destroyed: boolean;
         x: number;
         y: number;
         worldTransform: Matrix;
         localTransform: Matrix;
-        position: Point;
-        scale: Point;
-        pivot: Point;
-        skew: Point;
+        position: Point | ObservablePoint;
+        scale: Point | ObservablePoint;
+        pivot: Point | ObservablePoint;
+        skew: ObservablePoint;
         rotation: number;
         worldVisible: boolean;
         mask: PIXI.Graphics | PIXI.Sprite;
@@ -350,55 +374,27 @@ declare namespace PIXI {
         protected _recursivePostUpdateTransform(): void;
         getBounds(skipUpdate?: boolean, rect?: Rectangle): Rectangle;
         getLocalBounds(rect?: Rectangle): Rectangle;
-        toGlobal(position: Point, point?: Point, skipUpdate?: boolean): Point;
-        toLocal(position: Point, from?: DisplayObject, point?: Point, skipUpdate?: boolean): Point;
+        //creates and returns a new point
+        toGlobal(position: PointLike): Point;
+        //modifies the x and y of the passed point and returns it
+        toGlobal<T extends PointLike>(position: PointLike, point?: T, skipUpdate?: boolean): T;
+        //creates and returns a new point
+        toLocal(position: PointLike, from?: DisplayObject): Point;
+        //modifies the x and y of the passed point and returns it
+        toLocal<T extends PointLike>(position: PointLike, from?: DisplayObject, point?: T, skipUpdate?: boolean): T;
         renderWebGL(renderer: WebGLRenderer): void;
         renderCanvas(renderer: CanvasRenderer): void;
         setParent(container: Container): Container;
         setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
         destroy(): void;
 
-        on(event: string, fn: Function, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
-
-        /*
-         on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-
-         once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): this;
-         */
+        on(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+        once(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
+        removeListener(event: interaction.InteractionEventTypes, fn?: (event: interaction.InteractionEvent) => void, context?: any): this;
+        removeAllListeners(event: interaction.InteractionEventTypes): this;
+        off(event: interaction.InteractionEventTypes, fn?: (event: interaction.InteractionEvent) => void, context?: any): this;
+        addListener(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): this;
     }
-
     class TransformBase {
         static IDENTITY: TransformBase;
 
@@ -429,7 +425,6 @@ declare namespace PIXI {
         updateLocalTransform(): void;
         updateTransform(parentTransform: TransformBase): void;
         setFromMatrix(matrix: Matrix): void;
-
         rotation: number;
     }
     class Transform extends TransformBase {
@@ -453,9 +448,7 @@ declare namespace PIXI {
 
         rotation: number;
     }
-
     // graphics
-
     class GraphicsData {
         constructor(
             lineWidth: number,
@@ -465,8 +458,7 @@ declare namespace PIXI {
             fillAlpha: number,
             fill: boolean,
             nativeLines: boolean,
-            shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon);
-
+            shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any);
         lineWidth: number;
         nativeLines: boolean;
         lineColor: number;
@@ -476,12 +468,12 @@ declare namespace PIXI {
         fillAlpha: number;
         protected _fillTint: number;
         fill: boolean;
-        protected holes: IShape[];
-        shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon;
+        protected holes: Circle[] | Rectangle[] | Ellipse[] | Polygon[] | RoundedRectangle[] | any[];
+        shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any;
         type?: number;
         clone(): GraphicsData;
-        addHole(shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon): void;
-        destroy(options?: IDestroyOptions | boolean): void;
+        addHole(shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any): void;
+        destroy(options?: DestroyOptions | boolean): void;
     }
     class Graphics extends Container {
         constructor(nativeLines?: boolean);
@@ -499,7 +491,7 @@ declare namespace PIXI {
         isMask: boolean;
         boundsPadding: number;
         protected _localBounds: Bounds;
-        dirty: boolean;
+        dirty: number;
         fastRectDirty: number;
         clearDirty: number;
         boundsDirty: number;
@@ -531,11 +523,11 @@ declare namespace PIXI {
         protected _renderSpriteRect(renderer: PIXI.SystemRenderer): void;
         containsPoint(point: Point): boolean;
         updateLocalBounds(): void;
-        drawShape(shape: IShape | Circle | Rectangle | Ellipse | Polygon | RoundedRectangle): GraphicsData;
+        drawShape(shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any): GraphicsData;
         generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
         protected closePath(): Graphics;
         protected addHole(): Graphics;
-        destroy(options?: IDestroyOptions | boolean): void;
+        destroy(options?: DestroyOptions | boolean): void;
     }
     class CanvasGraphicsRenderer {
         constructor(renderer: SystemRenderer);
@@ -556,10 +548,10 @@ declare namespace PIXI {
         destroy(): void;
         render(graphics: Graphics): void;
         protected updateGraphics(graphics: PIXI.Graphics): void;
-        getWebGLData(webGL: WebGLRenderingContext, type: number): WebGLGraphicsData;
+        getWebGLData(webGL: WebGLRenderingContext, type: number, nativeLines: number): WebGLGraphicsData;
     }
     class WebGLGraphicsData {
-        constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.IAttribState);
+        constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.AttribState);
 
         gl: WebGLRenderingContext;
         color: number[];
@@ -572,6 +564,7 @@ declare namespace PIXI {
         glIndices: number[];
         shader: glCore.GLShader;
         vao: glCore.VertexArrayObject;
+        nativeLines: boolean;
 
         reset(): void;
         upload(): void;
@@ -592,7 +585,6 @@ declare namespace PIXI {
         const NE: number;
         const MIRROR_HORIZONTAL: number;
         const MIRROR_VERTICAL: number;
-
         function uX(ind: number): number;
         function uY(ind: number): number;
         function vX(ind: number): number;
@@ -635,32 +627,24 @@ declare namespace PIXI {
         static IDENTITY: Matrix;
         static TEMP_MATRIX: Matrix;
     }
-    class ObservablePoint {
-        constructor(cb: Function, scope?: any, x?: number, y?: number);
-
+    class PointLike {
         x: number;
         y: number;
+
+        set(x?: number, y?: number): void;
+        copy(point: PointLike): void;
+    }
+    class ObservablePoint extends PointLike {
+        constructor(cb: () => any, scope?: any, x?: number, y?: number);
         cb: () => any;
         scope: any;
-
-        set(x?: number, y?: number): void;
-        copy(point: Point | ObservablePoint): void;
     }
-    class Point {
+    class Point extends PointLike {
         constructor(x?: number, y?: number);
-
-        x: number;
-        y: number;
-
         clone(): Point;
-        copy(p: Point): void;
-        equals(p: Point): boolean;
-        set(x?: number, y?: number): void;
+        equals(p: PointLike): boolean;
     }
-
-    interface IShape {
-    }
-    interface IHitArea extends IShape {
+    interface HitArea {
         contains(x: number, y: number): boolean;
     }
     class Circle {
@@ -690,7 +674,10 @@ declare namespace PIXI {
     }
     class Polygon {
         constructor(points: Point[] | number[]);
+        // Note - Rest Params cannot be combined with |
+        //tslint:disable-next-line:unified-signatures
         constructor(...points: Point[]);
+        //tslint:disable-next-line:unified-signatures
         constructor(...points: number[]);
 
         closed: boolean;
@@ -736,10 +723,8 @@ declare namespace PIXI {
         clone(): RoundedRectangle;
         contains(x: number, y: number): boolean;
     }
-
     // renderers
-
-    interface IRendererOptions {
+    interface RendererOptions {
         view?: HTMLCanvasElement;
         transparent?: boolean;
         autoResize?: boolean;
@@ -749,11 +734,16 @@ declare namespace PIXI {
         backgroundColor?: number;
         roundPixels?: boolean;
         context?: WebGLRenderingContext;
+        width?: number;
+        height?: number;
+        forceCanvas?: boolean;
     }
     class SystemRenderer extends utils.EventEmitter {
-        constructor(system: string, screenWidth?: number, screenHeight?: number, options?: IRendererOptions);
+        constructor(system: string, options?: RendererOptions);
+        constructor(system: string, screenWidth?: number, screenHeight?: number, options?: RendererOptions);
 
         type: number;
+        options: RendererOptions;
         screen: Rectangle;
         readonly width: number;
         readonly height: number;
@@ -770,7 +760,6 @@ declare namespace PIXI {
         protected _backgroundColorString: string;
         protected _tempDisplayObjectParent: Container;
         protected _lastObjectRendered: DisplayObject;
-        backgroundColor: number;
 
         resize(screenWidth: number, screenHeight: number): void;
         generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number): RenderTexture;
@@ -779,7 +768,8 @@ declare namespace PIXI {
     }
     class CanvasRenderer extends SystemRenderer {
         // plugintarget mixin start
-        static __plugins: Object;
+        static __plugins: any;
+        //tslint:disable-next-line:ban-types forbidden-types
         static registerPlugin(pluginName: string, ctor: Function): void;
         plugins: any;
         initPlugins(): void;
@@ -789,7 +779,8 @@ declare namespace PIXI {
         // from InteractionManager
         interaction?: interaction.InteractionManager;
 
-        constructor(screenWidth?: number, screenHeight?: number, options?: IRendererOptions);
+        constructor(options?: RendererOptions);
+        constructor(screenWidth?: number, screenHeight?: number, options?: RendererOptions);
 
         rootContext: CanvasRenderingContext2D;
         rootResolution?: number;
@@ -805,13 +796,12 @@ declare namespace PIXI {
         destroy(removeView?: boolean): void;
         clear(clearColor?: string): void;
 
-        on(event: "prerender", fn: () => void, context?: any): this;
-        on(event: "postrender", fn: () => void, context?: any): this;
-        on(event: string, fn: Function, context?: any): this;
-        once(event: "prerender", fn: () => void, context?: any): this;
-        once(event: "postrender", fn: () => void, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        on(event: "prerender" | "postrender", fn: () => void, context?: any): this;
+        once(event: "prerender" | "postrender", fn: () => void, context?: any): this;
+        removeListener(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
+        removeAllListeners(event: "prerender" | "postrender"): this;
+        off(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
+        addListener(event: "prerender" | "postrender", fn: () => void, context?: any): this;
     }
     class CanvasMaskManager {
         constructor(renderer: CanvasRenderer);
@@ -835,16 +825,25 @@ declare namespace PIXI {
         resize(width: number, height: number): void;
         destroy(): void;
     }
-
-    interface IWebGLRendererOptions extends IRendererOptions {
+    interface WebGLRendererOptions {
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        autoResize?: boolean;
+        antialias?: boolean;
         forceFXAA?: boolean;
+        resolution?: number;
+        clearBeforeRender?: boolean;
+        backgroundColor?: number;
         preserveDrawingBuffer?: boolean;
+        roundPixels?: boolean;
         legacy?: boolean;
+        width?: number;
+        height?: number;
     }
-
     class WebGLRenderer extends SystemRenderer {
         // plugintarget mixin start
-        static __plugins: Object;
+        static __plugins: any;
+        //tslint:disable-next-line:ban-types forbidden-types
         static registerPlugin(pluginName: string, ctor: Function): void;
         plugins: any;
         initPlugins(): void;
@@ -854,7 +853,8 @@ declare namespace PIXI {
         // from InteractionManager
         interaction: interaction.InteractionManager;
 
-        constructor(screenWidth?: number, screenHeight?: number, options?: IWebGLRendererOptions);
+        constructor(options?: WebGLRendererOptions);
+        constructor(screenWidth?: number, screenHeight?: number, options?: WebGLRendererOptions);
 
         protected _contextOptions: {
             alpha: boolean;
@@ -875,6 +875,7 @@ declare namespace PIXI {
         boundTextures: Texture[];
         filterManager: FilterManager;
         textureManager?: TextureManager;
+        textureGC?: TextureGarbageCollector;
         extract: extract.WebGLExtract;
         protected drawModes: any;
         protected _activeShader: Shader;
@@ -900,15 +901,17 @@ declare namespace PIXI {
         handleContextRestored: () => void;
         destroy(removeView?: boolean): void;
 
+        on(event: "prerender" | "postrender", fn: () => void, context?: any): this;
         on(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
-        on(event: "prerender", fn: () => void, context?: any): this;
-        on(event: "postrender", fn: () => void, context?: any): this;
-        on(event: string, fn: Function, context?: any): this;
+        once(event: "prerender" | "postrender", fn: () => void, context?: any): this;
         once(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
-        once(event: "prerender", fn: () => void, context?: any): this;
-        once(event: "postrender", fn: () => void, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        removeListener(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
+        removeListener(event: "context", fn?: (gl: WebGLRenderingContext) => void, context?: any): this;
+        removeAllListeners(event: "prerender" | "postrender" | "context"): this;
+        off(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
+        off(event: "context", fn?: (gl: WebGLRenderingContext) => void, context?: any): this;
+        addListener(event: "prerender" | "postrender", fn: () => void, context?: any): this;
+        addListener(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
     }
     class WebGLState {
         constructor(gl: WebGLRenderingContext);
@@ -919,7 +922,7 @@ declare namespace PIXI {
         stack: number[];
         gl: WebGLRenderingContext;
         maxAttribs: number;
-        attribState: glCore.IAttribState;
+        attribState: glCore.AttribState;
         nativeVaoExtension: any;
 
         push(): void;
@@ -938,7 +941,7 @@ declare namespace PIXI {
 
         renderer: WebGLRenderer;
         gl: WebGLRenderingContext;
-        protected _managedTextures: WebGLTexture[];
+        protected _managedTextures: Texture[];
 
         bindTexture(): void;
         getTexture(): WebGLTexture;
@@ -985,6 +988,11 @@ declare namespace PIXI {
         upload(): Quad;
         destroy(): void;
     }
+    interface FilterDataStackItem {
+        renderTarget: RenderTarget;
+        filter: any[];
+        bounds: Rectangle;
+    }
     class RenderTarget {
         constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root?: boolean);
 
@@ -1004,11 +1012,7 @@ declare namespace PIXI {
         stencilMaskStack: Graphics[];
         filterData: {
             index: number,
-            stack: Array<{
-                renderTarget: RenderTarget,
-                filter: any[];
-                bounds: Rectangle
-            }>
+            stack: FilterDataStackItem[];
         };
         scaleMode: number;
         root: boolean;
@@ -1029,19 +1033,19 @@ declare namespace PIXI {
 
         setBlendMode(blendMode: number): boolean;
     }
+    interface FilterManagerStackItem {
+        renderTarget: RenderTarget;
+        sourceFrame: Rectangle;
+        destinationFrame: Rectangle;
+        filters: Filter[];
+        target: any;
+        resolution: number;
+    }
     class FilterManager extends WebGLManager {
         constructor(renderer: WebGLRenderer);
-
         gl: WebGLRenderingContext;
         quad: Quad;
-        stack: Array<{
-            renderTarget: RenderTarget;
-            sourceFrame: Rectangle;
-            destinationFrame: Rectangle;
-            filters: Filter[];
-            target: any;
-            resolution: number;
-        }>;
+        stack: FilterManagerStackItem[];
         stackIndex: number;
         shaderCache: any;
         filterData: any;
@@ -1098,7 +1102,7 @@ declare namespace PIXI {
         onContextChange(): void;
         destroy(): void;
     }
-    interface IUniformData {
+    interface UniformData {
         type: string;
         value: any;
 
@@ -1106,19 +1110,20 @@ declare namespace PIXI {
         name?: string;
     }
     class Filter {
-        constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: { [name: string]: IUniformData });
+        constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: { [name: string]: UniformData });
 
         vertextSrc?: string;
         fragmentSrc: string;
         blendMode: number;
-        protected uniformData: { [name: string]: IUniformData };
+        protected uniformData: { [name: string]: UniformData };
         uniforms: { [name: string]: any } | any;
         glShaders: any;
         glShaderKey?: number;
         padding: number;
         resolution: number;
         enabled: boolean;
-        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
+        autoFit: boolean;
+        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean, currentState?: any): void;
 
         static defaultVertexSrc: string;
         static defaultFragmentSrc: string;
@@ -1167,7 +1172,7 @@ declare namespace PIXI {
         protected _renderCanvas(renderer: CanvasRenderer): void;
         getLocalBounds(): Rectangle;
         containsPoint(point: Point): boolean;
-        destroy(options?: IDestroyOptions | boolean): void;
+        destroy(options?: DestroyOptions | boolean): void;
 
         static from(source: number | string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Sprite;
         static fromFrame(frameId: string): Sprite;
@@ -1222,7 +1227,7 @@ declare namespace PIXI {
         let cacheStepsPerColorChannel: number;
         let convertTintToImage: boolean;
         let canUseMultiply: boolean;
-        let tintMethod: Function;
+        let tintMethod: number;
     }
 
     // text
@@ -1318,12 +1323,35 @@ declare namespace PIXI {
         wordWrap: boolean;
         protected _wordWrapWidth: number;
         wordWrapWidth: number;
+        toFontString(): string;
     }
+    class TextMetrics {
+        protected _canvas: HTMLCanvasElement;
+        protected _context: CanvasRenderingContext2D;
+        protected _fonts: FontMetrics;
 
+        text: string;
+        style: TextStyle;
+        width: number;
+        height: number;
+        lines: number[];
+        lineWidgets: number[];
+        lineHeight: number;
+        maxLineWidth: number;
+        fontProperties: any;
+
+        constructor(text: string, style: TextStyle, width: number, height: number, lines: number[], lineWidths: number[], lineHeight: number, maxLineWidth: number, fontProperties: any);
+
+        static measureText(text: string, style: TextStyle, wordWrap?: boolean, canvas?: HTMLCanvasElement): TextMetrics;
+        static wordWrap(text: string, style: TextStyle, canvas?: HTMLCanvasElement): string;
+        static measureFont(font: string): FontMetrics;
+    }
+    interface FontMetrics {
+        ascent: number;
+        descent: number;
+        fontSize: number;
+    }
     class Text extends Sprite {
-        static getFontStyle(style: TextStyleOptions): string;
-        static calculateFontProperties(style: string): any;
-
         constructor(text?: string, style?: TextStyleOptions, canvas?: HTMLCanvasElement);
 
         canvas: HTMLCanvasElement;
@@ -1331,14 +1359,11 @@ declare namespace PIXI {
         resolution: number;
         protected _text: string;
         protected _style: TextStyle;
+        //tslint:disable-next-line:ban-types forbidden-types
         protected _styleListener: Function;
         protected _font: string;
         protected localStyleID: number;
 
-        static fontPropertiesCache: any;
-        static fontPropertiesCanvas: HTMLCanvasElement;
-        static fontPropertiesContext: CanvasRenderingContext2D;
-
         width: number;
         height: number;
         style: TextStyle;
@@ -1349,17 +1374,14 @@ declare namespace PIXI {
         protected updateTexture(): void;
         renderWebGL(renderer: WebGLRenderer): void;
         protected _renderCanvas(renderer: CanvasRenderer): void;
-        protected wordWrap(text: string): string;
         getLocalBounds(rect?: Rectangle): Rectangle;
         protected _calculateBounds(): void;
         protected _onStyleChange: () => void;
         protected _generateFillStyle(style: TextStyle, lines: string[]): string | number | CanvasGradient;
-        destroy(options?: IDestroyOptions | boolean): void;
+        destroy(options?: DestroyOptions | boolean): void;
         dirty: boolean;
     }
-
     // textures
-
     class BaseRenderTexture extends BaseTexture {
         constructor(width?: number, height?: number, scaleMode?: number, resolution?: number);
 
@@ -1377,11 +1399,12 @@ declare namespace PIXI {
         resize(width: number, height: number): void;
         destroy(): void;
 
-        once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
         on(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
-        on(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        removeListener(event: "update", fn?: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        removeAllListeners(event: "update"): this;
+        off(event: "update", fn?: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        addListener(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
     }
     class BaseTexture extends utils.EventEmitter {
         static from(source: string | HTMLImageElement | HTMLCanvasElement, scaleMode?: number, sourceScale?: number): BaseTexture;
@@ -1411,6 +1434,9 @@ declare namespace PIXI {
         protected _glTextures: any;
         protected _enabled: number;
         protected _id?: number;
+        protected _virtualBoundId: number;
+        protected readonly _destroyed: boolean;
+        textureCacheIds: string[];
 
         update(): void;
         protected _updateDimensions(): void;
@@ -1426,19 +1452,16 @@ declare namespace PIXI {
         updateSourceImage(newSrc: string): void;
 
         static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number, sourceScale?: number): BaseTexture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number, origin?: string): BaseTexture;
+        static addToCache(baseTexture: BaseTexture, id: string): void;
+        static removeFromCache(baseTexture: string | BaseTexture): BaseTexture;
 
-        on(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        on(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        on(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        on(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        on(event: string, fn: Function, context?: any): this;
-        once(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        once(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        once(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        once(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        on(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        once(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
+        removeListener(event: "update" | "loaded" | "error" | "dispose", fn?: (baseTexture: BaseTexture) => void, context?: any): this;
+        removeAllListeners(event: "update" | "loaded" | "error" | "dispose"): this;
+        off(event: "update" | "loaded" | "error" | "dispose", fn?: (baseTexture: BaseTexture) => void, context?: any): this;
+        addListener(event: "update" | "loaded" | "error" | "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): this;
     }
     class RenderTexture extends Texture {
         constructor(baseRenderTexture: BaseRenderTexture, frame?: Rectangle);
@@ -1451,8 +1474,6 @@ declare namespace PIXI {
         static create(width?: number, height?: number, scaleMode?: number, resolution?: number): RenderTexture;
     }
     class Texture extends utils.EventEmitter {
-        static from(source: number | string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | BaseTexture): Texture;
-
         constructor(baseTexture: BaseTexture, frame?: Rectangle, orig?: Rectangle, trim?: Rectangle, rotate?: number);
 
         noFrame: boolean;
@@ -1465,6 +1486,7 @@ declare namespace PIXI {
         orig: Rectangle;
         protected _updateID: number;
         transform: any;
+        textureCacheIds: string[];
 
         update(): void;
         protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
@@ -1475,12 +1497,17 @@ declare namespace PIXI {
 
         static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
         static fromFrame(frameId: string): Texture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number, origin?: string): Texture;
         static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
         static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
+        static from(source: number | string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | BaseTexture): Texture;
         static fromLoader(source: HTMLImageElement | HTMLCanvasElement, imageUrl: string, name?: string): Texture;
+        static addToCache(texture: Texture, id: string): void;
+        static removeFromCache(texture: string | Texture): Texture;
+
+        // depreciation
         static addTextureToCache(texture: Texture, id: string): void;
-        static removeTextureFromCache(id: string): Texture | undefined;
+        static removeTextureFromCache(id: string): Texture;
 
         frame: Rectangle;
         protected _rotate: boolean | 0;
@@ -1489,12 +1516,14 @@ declare namespace PIXI {
         height: number;
 
         static EMPTY: Texture;
+        static WHITE: Texture;
 
         on(event: "update", fn: (texture: Texture) => void, context?: any): this;
-        on(event: string, fn: Function, context?: any): this;
         once(event: "update", fn: (texture: Texture) => void, context?: any): this;
-        once(event: string, fn: Function, context?: any): this;
-        off(event: string, fn: Function, context?: any): this;
+        removeListener(event: "update", fn?: (texture: Texture) => void, context?: any): this;
+        removeAllListeners(event: "update"): this;
+        off(event: "update", fn?: (texture: Texture) => void, context?: any): this;
+        addListener(event: "update", fn: (texture: Texture) => void, context?: any): this;
     }
     class TextureUvs {
         x0: number;
@@ -1560,16 +1589,26 @@ declare namespace PIXI {
     namespace ticker {
         const shared: Ticker;
 
+        class TickerListener {
+            constructor(fn: (deltaTime: number) => void, context?: any, priority?: number, once?: boolean);
+            fn: (deltaTime: number) => void;
+            context: any;
+            priority: number;
+            once: boolean;
+            next: TickerListener;
+            previous: TickerListener;
+            protected _destroyed: boolean;
+            match(fn: (deltaTime: number) => void, context?: any): boolean;
+            emit(deltaTime: number): TickerListener;
+            connect(previous: TickerListener): void;
+            destroy(hard?: boolean): void;
+        }
         class Ticker {
-            protected _tick(time: number): void;
-            protected _emitter: utils.EventEmitter;
+            protected _tick: (time: number) => void;
+            protected _head: TickerListener;
             protected _requestId: number | null;
             protected _maxElapsedMS: number;
 
-            protected _requestIfNeeded(): void;
-            protected _cancelIfNeeded(): void;
-            protected _startIfPossible(): void;
-
             autoStart: boolean;
             deltaTime: number;
             elapsedMS: number;
@@ -1577,15 +1616,22 @@ declare namespace PIXI {
             speed: number;
             started: boolean;
 
-            FPS: number;
+            protected _requestIfNeeded(): void;
+            protected _cancelIfNeeded(): void;
+            protected _startIfPossible(): void;
+
+            add(fn: (deltaTime: number) => void, context?: any, priority?: number): Ticker;
+            addOnce(fn: (deltaTime: number) => void, context?: any, priority?: number): Ticker;
+            //tslint:disable-next-line:ban-types forbidden-types
+            remove(fn: Function, context?: any, priority?: number): Ticker;
+            protected _addListener(listener: TickerListener): Ticker;
+            readonly FPS: number;
             minFPS: number;
 
-            add(fn: (deltaTime: number) => void, context?: any): Ticker;
-            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
-            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
             start(): void;
             stop(): void;
-            update(): void;
+            destroy(): void;
+            update(currentTime?: number): void;
         }
     }
 
@@ -1629,7 +1675,7 @@ declare namespace PIXI {
     //////////////////////////////////////////////////////////////////////////////
 
     namespace extras {
-        interface IBitmapTextStyle {
+        interface BitmapTextStyle {
             font?: string | {
                 name?: string;
                 size?: number;
@@ -1640,7 +1686,7 @@ declare namespace PIXI {
         class BitmapText extends Container {
             static registerFont(xml: XMLDocument, texture: Texture): any;
 
-            constructor(text: string, style?: IBitmapTextStyle);
+            constructor(text: string, style?: BitmapTextStyle);
 
             protected _textWidth: number;
             protected _textHeight: number;
@@ -1656,7 +1702,9 @@ declare namespace PIXI {
                 size?: number;
             };
             protected _text: string;
+            protected _maxWidth: number;
             maxWidth: number;
+            protected _maxLineHeight: number;
             maxLineHeight: number;
             protected _anchor: ObservablePoint;
             dirty: boolean;
@@ -1672,17 +1720,22 @@ declare namespace PIXI {
 
             static fonts: any;
         }
+        interface AnimatedSpriteTextureTimeObject {
+            texture: Texture;
+            time?: number;
+        }
         class AnimatedSprite extends Sprite {
-            constructor(textures: Texture[] | Array<{ texture: Texture, time?: number }>, autoUpdate?: boolean);
+            constructor(textures: Texture[] | AnimatedSpriteTextureTimeObject[], autoUpdate?: boolean);
 
             protected _autoUpdate: boolean;
             protected _textures: Texture[];
             protected _durations: number[];
-            textures: Texture[] | Array<{ texture: Texture, time?: number }>;
+            textures: Texture[] | AnimatedSpriteTextureTimeObject[];
             animationSpeed: number;
             loop: boolean;
             onComplete: () => void;
             onFrameChange: (currentFrame: number) => void;
+            onLoop: () => void;
             protected _currentTime: number;
             playing: boolean;
             totalFrames: number;
@@ -1692,7 +1745,7 @@ declare namespace PIXI {
             gotoAndStop(frameNumber: number): void;
             gotoAndPlay(frameNumber: number): void;
             protected update(deltaTime: number): void;
-            destroy(): void;
+            destroy(options?: DestroyOptions | boolean): void;
 
             static fromFrames(frame: string[]): AnimatedSprite;
             static fromImages(images: string[]): AnimatedSprite;
@@ -1711,7 +1764,7 @@ declare namespace PIXI {
 
             texture: Texture;
 
-            update(forceUpdate?: boolean): void;
+            update(forceUpdate?: boolean): boolean;
         }
         class TilingSprite extends Sprite {
             constructor(texture: Texture, width?: number, height?: number);
@@ -1727,13 +1780,14 @@ declare namespace PIXI {
             tileScale: Point | ObservablePoint;
             tilePosition: Point | ObservablePoint;
 
+            multiplyUvs(uvs: Float32Array, out: Float32Array): Float32Array;
             protected _onTextureUpdate(): void;
             protected _renderWebGL(renderer: WebGLRenderer): void;
             protected _renderCanvas(renderer: CanvasRenderer): void;
             protected _calculateBounds(): void;
             getLocalBounds(rect?: Rectangle): Rectangle;
             containsPoint(point: Point): boolean;
-            destroy(): void;
+            destroy(options?: DestroyOptions | boolean): void;
 
             static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement, width?: number, height?: number): TilingSprite;
             static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
@@ -1802,6 +1856,7 @@ declare namespace PIXI {
             protected _colorMatrix(matrix: number[]): void;
 
             matrix: number[];
+            alpha: number;
 
             brightness(b: number, multiply?: boolean): void;
             greyscale(scale: number, multiply?: boolean): void;
@@ -1837,7 +1892,9 @@ declare namespace PIXI {
         // pixi-filters.d.ts todo
         // https://github.com/pixijs/pixi-filters/
         class NoiseFilter extends Filter {
+            constructor(noise?: number, seed?: number);
             noise: number;
+            seed: number;
         }
     }
 
@@ -1876,11 +1933,33 @@ declare namespace PIXI {
         class InteractionData {
             global: Point;
             target: DisplayObject;
-            originalEvent: Event;
-            identifier?: number;
-
+            originalEvent: MouseEvent | TouchEvent | PointerEvent;
+            identifier: number;
+            isPrimary: boolean;
+            button: number;
+            buttons: number;
+            width: number;
+            height: number;
+            tiltX: number;
+            tiltY: number;
+            pointerType: string;
+            pressure: number;
+            rotationAngle: number;
+            twist: number;
+            tangentialPressure: number;
+            readonly pointerID: number;
+            protected _copyEvent(event: Touch | MouseEvent | PointerEvent): void;
+            protected _reset(): void;
             getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
         }
+        type InteractionPointerEvents = "pointerdown" | "pointercancel" | "pointerup" |
+            "pointertap" | "pointerupoutside" | "pointermove" | "pointerover" | "pointerout";
+        type InteractionTouchEvents = "touchstart" | "touchcancel" | "touchend" |
+            "touchendoutside" | "touchmove" | "tap";
+        type InteractionMouseEvents = "rightdown" | "mousedown" | "rightup" | "mouseup" |
+            "rightclick" | "click" | "rightupoutside" | "mouseupoutside" | "mousemove" |
+            "mouseover" | "mouseout" | "mouseover";
+        type InteractionEventTypes = InteractionPointerEvents | InteractionTouchEvents | InteractionMouseEvents;
         interface InteractionManagerOptions {
             autoPreventDefault?: boolean;
             interactionFrequency?: number;
@@ -1920,6 +1999,7 @@ declare namespace PIXI {
             cursor: string;
             protected _tempPoint: Point;
             resolution: number;
+            hitTest(globalPoint: Point, root?: Container): DisplayObject;
             protected setTargetElement(element: HTMLCanvasElement, resolution?: number): void;
             protected addEvents(): void;
             protected removeEvents(): void;
@@ -1927,15 +2007,22 @@ declare namespace PIXI {
             setCursorMode(mode: string): void;
             protected dispatchEvent(displayObject: Container | Sprite | extras.TilingSprite, eventString: string, eventData: any): void;
             mapPositionToPoint(point: Point, x: number, y: number): void;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected processInteractive(
                 interactionEvent: InteractionEvent,
                 displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite,
                 func?: Function,
                 hitTest?: boolean,
-                interactive?: boolean): boolean;
-            protected onPointerComplete(originalEvent: PointerEvent, cancelled: boolean, func: Function): void;
+                interactive?: boolean
+            ): boolean;
+            //tslint:disable-next-line:ban-types forbidden-types
+            protected onPointerComplete(
+                originalEvent: PointerEvent,
+                cancelled: boolean,
+                func: Function
+            ): void;
             protected getInteractionDataForPointerId(pointerId: number): InteractionData;
-            protected releaseInteractionDataForPointerId(pointerId: number): void;
+            protected releaseInteractionDataForPointerId(event: PointerEvent): void;
             protected configureInteractionEventForDOMEvent(interactionEvent: InteractionEvent, pointerEvent: PointerEvent, interactionData: InteractionData): InteractionEvent;
             protected normalizeToPointerData(event: TouchEvent | MouseEvent | PointerEvent): PointerEvent[];
             destroy(): void;
@@ -1955,8 +2042,10 @@ declare namespace PIXI {
     // 2.0.6
 
     class MiniSignalBinding {
+        //tslint:disable-next-line:ban-types forbidden-types
         constructor(fn: Function, once?: boolean, thisArg?: any);
 
+        //tslint:disable-next-line:ban-types forbidden-types
         protected _fn: Function;
         protected _once: boolean;
         protected _thisArg: any;
@@ -1978,14 +2067,16 @@ declare namespace PIXI {
 
         has(node: MiniSignalBinding): boolean;
         dispatch(): boolean;
+        //tslint:disable-next-line:ban-types forbidden-types
         add(fn: Function, thisArg?: any): any;
+        //tslint:disable-next-line:ban-types forbidden-types
         once(fn: Function, thisArg?: any): any;
         detach(node: MiniSignalBinding): MiniSignal;
         detachAll(): MiniSignal;
     }
 
     namespace loaders {
-        interface ILoaderOptions {
+        interface LoaderOptions {
             crossOrigin?: boolean | string;
             loadType?: number;
             xhrType?: string;
@@ -1993,7 +2084,7 @@ declare namespace PIXI {
             loadElement?: HTMLImageElement | HTMLAudioElement | HTMLVideoElement;
             skipSource?: boolean;
         }
-        interface IResourceDictionary {
+        interface ResourceDictionary {
             [index: string]: PIXI.loaders.Resource;
         }
 
@@ -2001,6 +2092,7 @@ declare namespace PIXI {
         // However, for depreciation reasons, it remains.
         class Loader extends utils.EventEmitter {
             // pixi overrides here
+            //tslint:disable-next-line:ban-types forbidden-types
             static addPixiMiddleware(fn: Function): void;
 
             // below this line is the original non-pixi loader
@@ -2016,13 +2108,16 @@ declare namespace PIXI {
             loading: boolean;
             defaultQueryString: string;
 
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _beforeMiddleware: Function[];
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _afterMiddleware: Function[];
             protected _resourcesParsing: Resource[];
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundLoadResource: (r: Resource, d: Function) => void;
             protected _queue: any;
 
-            resources: IResourceDictionary;
+            resources: ResourceDictionary;
 
             onProgress: MiniSignal;
             onError: MiniSignal;
@@ -2031,44 +2126,49 @@ declare namespace PIXI {
             onComplete: MiniSignal;
 
             add(...params: any[]): this;
-            add(name: string, url: string, options?: ILoaderOptions, cb?: Function): this;
-            add(url: string, options?: ILoaderOptions, cb?: Function): this;
-            add(obj: any | any[], options?: ILoaderOptions, cb?: Function): this;
+            //tslint:disable-next-line:ban-types forbidden-types
+            add(name: string, url: string, options?: LoaderOptions, cb?: Function): this;
+            //tslint:disable-next-line:ban-types forbidden-types
+            add(obj: string | any | any[], options?: LoaderOptions, cb?: Function): this;
 
+            //tslint:disable-next-line:ban-types forbidden-types
             pre(fn: Function): this;
+            //tslint:disable-next-line:ban-types forbidden-types
             use(fn: Function): this;
             reset(): this;
+            //tslint:disable-next-line:ban-types forbidden-types
             load(cb?: Function): this;
 
             protected _prepareUrl(url: string): string;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _loadResource(resource: Resource, dequeue: Function): void;
             protected _onComplete(): void;
             protected _onLoad(resource: Resource): void;
 
+            destroy(): void;
+
             // depreciation
 
             on(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
             on(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            on(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            on(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            on(event: "load" | "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
             on(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
-            on(event: string, fn: Function, context?: any): this;
 
             once(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
             once(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            once(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            once(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
+            once(event: "load" | "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
             once(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
-            once(event: string, fn: Function, context?: any): this;
+            //tslint:disable-next-line:ban-types forbidden-types
+            off(event: "complete" | "error" | "load" | "progress" | "start" | string, fn?: Function, context?: any): this;
         }
-        interface ITextureDictionary {
+        interface TextureDictionary {
             [index: string]: PIXI.Texture;
         }
         class Resource {
             static setExtensionLoadType(extname: string, loadType: number): void;
             static setExtensionXhrType(extname: string, xhrType: string): void;
 
-            constructor(name: string, url: string | string[], options?: ILoaderOptions);
+            constructor(name: string, url: string | string[], options?: LoaderOptions);
 
             protected _flags: number;
 
@@ -2086,14 +2186,23 @@ declare namespace PIXI {
             type: number;
             progressChunk: number;
 
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _dequeue: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _onLoadBinding: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundComplete: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundOnError: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundOnProgress: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundXhrOnError: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundXhrOnAbort: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundXhrOnLoad: Function;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected _boundXdrOnTimeout: Function;
 
             onStart: MiniSignal;
@@ -2106,6 +2215,7 @@ declare namespace PIXI {
             isLoading: boolean;
             complete(): void;
             abort(message?: string): void;
+            //tslint:disable-next-line:ban-types forbidden-types
             load(cb?: Function): void;
 
             protected _hasFlag(flag: number): boolean;
@@ -2165,7 +2275,7 @@ declare namespace PIXI {
             texture: Texture;
             spineAtlas: any;
             spineData: any;
-            textures?: ITextureDictionary;
+            textures?: TextureDictionary;
         }
     }
 
@@ -2192,6 +2302,11 @@ declare namespace PIXI {
             texture: Texture;
             tintRgb: Float32Array;
             protected _glDatas: { [n: number]: any; };
+            protected _uvTransform: extras.TextureTransform;
+            uploadUvTransform: boolean;
+            multiplyUvs(): void;
+            refresh(forceUpdate?: boolean): void;
+            protected _refresh(): void;
             protected _renderWebGL(renderer: WebGLRenderer): void;
             protected _renderCanvas(renderer: CanvasRenderer): void;
             protected _onTextureUpdate(): void;
@@ -2262,6 +2377,7 @@ declare namespace PIXI {
             updateHorizontalVertices(): void;
             updateVerticalVertices(): void;
             protected drawSegment(context: CanvasRenderingContext2D | WebGLRenderingContext, textureSource: any, w: number, h: number, x1: number, y1: number, x2: number, y2: number): void;
+            protected _refresh(): void;
         }
 
         class Rope extends Mesh {
@@ -2269,20 +2385,17 @@ declare namespace PIXI {
 
             points: Point[];
             colors: number[];
-            protected _ready: boolean;
-            refresh(): void;
+            autoUpdate: boolean;
+            protected _refresh(): void;
 
-            protected _onTextureUpdate(): void;
-            updateTransform(): void;
+            refreshVertices(): void;
         }
     }
-
     //////////////////////////////////////////////////////////////////////////////
     /////////////////////////////PARTICLES////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
-
     namespace particles {
-        interface IParticleContainerProperties {
+        interface ParticleContainerProperties {
             scale?: boolean;
             position?: boolean;
             rotation?: boolean;
@@ -2290,8 +2403,10 @@ declare namespace PIXI {
             alpha?: boolean;
         }
         class ParticleContainer extends Container {
-            constructor(size?: number, properties?: IParticleContainerProperties, batchSize?: number);
-
+            constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
+            protected _tint: number;
+            protected tintRgb: number | any[];
+            tint: number;
             protected _properties: boolean[];
             protected _maxSize: number;
             protected _batchSize: number;
@@ -2302,10 +2417,10 @@ declare namespace PIXI {
             roundPixels: boolean;
             baseTexture: BaseTexture;
 
-            setProperties(properties: IParticleContainerProperties): void;
+            setProperties(properties: ParticleContainerProperties): void;
             protected onChildrenChange: (smallestChildIndex?: number) => void;
 
-            destroy(options?: IDestroyOptions | boolean): void;
+            destroy(options?: DestroyOptions | boolean): void;
         }
         class ParticleBuffer {
             constructor(gl: WebGLRenderingContext, properties: any, dynamicPropertyFlags: any[], size: number);
@@ -2325,7 +2440,7 @@ declare namespace PIXI {
 
             destroy(): void;
         }
-        interface IParticleRendererProperty {
+        interface ParticleRendererProperty {
             attribute: number;
             size: number;
             uploadFunction(children: PIXI.DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
@@ -2336,7 +2451,7 @@ declare namespace PIXI {
 
             shader: glCore.GLShader;
             indexBuffer: WebGLBuffer;
-            properties: IParticleRendererProperty[];
+            properties: ParticleRendererProperty[];
             protected tempMatrix: Matrix;
 
             start(): void;
@@ -2350,13 +2465,10 @@ declare namespace PIXI {
 
             indices: Uint16Array;
         }
-        interface IParticleShader extends glCore.GLShader { }
     }
-
     //////////////////////////////////////////////////////////////////////////////
     ////////////////////////////PREPARE///////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
-
     namespace prepare {
         type AddHook = (item: any, queue: any[]) => boolean;
         type UploadHook<UploadHookSource> = (prepare: UploadHookSource, item: any) => boolean;
@@ -2369,14 +2481,20 @@ declare namespace PIXI {
             protected queue: any[];
             protected addHooks: AddHook[];
             protected uploadHooks: Array<UploadHook<UploadHookSource>>;
+            //tslint:disable-next-line:ban-types forbidden-types
             protected completes: Function[];
             protected ticking: boolean;
             protected delayedTick: () => void;
 
+            //tslint:disable-next-line:ban-types forbidden-types
             upload(item: Function | DisplayObject | Container | BaseTexture | Texture | Graphics | Text | any, done?: () => void): void;
             protected tick(): void;
             protected prepareItems(): void;
-            register(addHook?: AddHook, uploadHook?: UploadHook<UploadHookSource>): this;
+            registerFindHook(addHook: AddHook): this;
+            registerUploadHook(uploadHook: UploadHook<UploadHookSource>): this;
+            protected findMultipleBaseTextures(item: PIXI.DisplayObject, queue: any[]): boolean;
+            protected findBaseTexture(item: PIXI.DisplayObject, queue: any[]): boolean;
+            protected findTexture(item: PIXI.DisplayObject, queue: any[]): boolean;
             add(item: PIXI.DisplayObject | PIXI.Container | PIXI.BaseTexture | PIXI.Texture | PIXI.Graphics | PIXI.Text | any): this;
             destroy(): void;
         }
@@ -2410,7 +2528,7 @@ declare namespace PIXI {
     // sharedArrayBuffer as a type is not available yet.
     // need to fully define what an `Attrib` is.
     namespace glCore {
-        interface IContextOptions {
+        interface ContextOptions {
             /**
              * Boolean that indicates if the canvas contains an alpha buffer.
              */
@@ -2440,8 +2558,8 @@ declare namespace PIXI {
              */
             failIfMajorPerformanceCaveat?: boolean;
         }
-        function createContext(view: HTMLCanvasElement, options?: IContextOptions): WebGLRenderingContext;
-        function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: IAttrib[], state?: WebGLState): WebGLRenderingContext | undefined;
+        function createContext(view: HTMLCanvasElement, options?: ContextOptions): WebGLRenderingContext;
+        function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: Attrib[], state?: WebGLState): WebGLRenderingContext | undefined;
         class GLBuffer {
             constructor(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number);
 
@@ -2483,7 +2601,7 @@ declare namespace PIXI {
             static createFloat32(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
         }
         class GLShader {
-            constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[], precision: string, attributeLocations: { [key: string]: number });
+            constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[], precision?: string, attributeLocations?: { [key: string]: number });
 
             gl: WebGLRenderingContext;
             program?: WebGLProgram | null;
@@ -2507,7 +2625,7 @@ declare namespace PIXI {
             type: number;
 
             upload(source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement): void;
-            uploadData(data: number, width: number, height: number): void;
+            uploadData(data: ArrayBuffer | ArrayBufferView, width: number, height: number): void;
             bind(location?: number): void;
             unbind(): void;
             minFilter(linear: boolean): void;
@@ -2523,9 +2641,9 @@ declare namespace PIXI {
             static fromSource(gl: WebGLRenderingContext, source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement, premultipleAlpha?: boolean): GLTexture;
             static fromData(gl: WebGLRenderingContext, data: number[], width: number, height: number): GLTexture;
         }
-        interface IAttrib {
+        interface Attrib {
             attribute: {
-                location: boolean;
+                location: number;
                 size: number;
             };
             normalized: boolean;
@@ -2533,7 +2651,7 @@ declare namespace PIXI {
             start: number;
             buffer: ArrayBuffer;
         }
-        interface IWebGLRenderingContextAttribute {
+        interface WebGLRenderingContextAttribute {
             buffer: WebGLBuffer;
             attribute: any;
             type: number;
@@ -2541,28 +2659,27 @@ declare namespace PIXI {
             stride: number;
             start: number;
         }
-        interface IAttribState {
-            tempAttribState: IAttrib[];
-            attribState: IAttrib[];
+        interface AttribState {
+            tempAttribState: Attrib[];
+            attribState: Attrib[];
         }
-
         class VertexArrayObject {
             static FORCE_NATIVE: boolean;
 
             constructor(gl: WebGLRenderingContext, state: WebGLState);
 
             protected nativeVaoExtension: any;
-            protected nativeState: IAttribState;
+            protected nativeState: AttribState;
             protected nativeVao: VertexArrayObject;
             gl: WebGLRenderingContext;
-            attributes: IAttrib[];
+            attributes: Attrib[];
             indexBuffer: GLBuffer;
             dirty: boolean;
 
             bind(): VertexArrayObject;
             unbind(): VertexArrayObject;
             activate(): VertexArrayObject;
-            addAttribute(buffer: GLBuffer, attribute: IAttrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
+            addAttribute(buffer: GLBuffer, attribute: Attrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
             addIndex(buffer: GLBuffer, options?: any): VertexArrayObject;
             clear(): VertexArrayObject;
             draw(type: number, size: number, start: number): VertexArrayObject;
@@ -2574,7 +2691,7 @@ declare namespace PIXI {
     ///////////////////////////////UTILS//////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
 
-    interface IDecomposedDataUri {
+    interface DecomposedDataUri {
         mediaType: string;
         subType: string;
         encoding: string;
@@ -2585,11 +2702,11 @@ declare namespace PIXI {
         function uid(): number;
         function hex2rgb(hex: number, out?: number[]): number[];
         function hex2string(hex: number): string;
-        function rgb2hex(rgb: Number[]): number;
+        function rgb2hex(rgb: number[]): number;
         function canUseNewCanvasBlendModes(): boolean;
         function getResolutionOfUrl(url: string, defaultValue?: number): number;
         function getSvgSize(svgString: string): any;
-        function decomposeDataUri(dataUri: string): IDecomposedDataUri | void;
+        function decomposeDataUri(dataUri: string): DecomposedDataUri | void;
         function getUrlFileExtension(url: string): string | void;
         function sayHello(type: string): void;
         function skipHello(): void;
@@ -2635,22 +2752,107 @@ declare namespace PIXI {
             const phone: boolean;
             const tablet: boolean;
         }
-
         // https://github.com/primus/eventemitter3
         class EventEmitter {
-            listeners(event: string, exists?: boolean): Function[];
-            emit(event: string, ...args: any[]): boolean;
-            on(event: string, fn: Function, context?: any): this;
-            once(event: string, fn: Function, context?: any): this;
-            removeListener(event: string, fn: Function, context?: any, once?: boolean): this;
-            removeAllListeners(event?: string): this;
-            eventNames(): string[];
-
-            off(event: string, fn: Function, context?: any, once?: boolean): this;
-            addListener(event: string, fn: Function, context?: any): this;
+            static prefixed: string | boolean;
+            static EventEmitter: {
+                new (): EventEmitter;
+                prefixed: string | boolean;
+            };
+            /**
+             * Minimal EventEmitter interface that is molded against the Node.js
+             * EventEmitter interface.
+             *
+             * @constructor
+             * @api public
+             */
+            constructor();
+            /**
+             * Return an array listing the events for which the emitter has registered listeners.
+             *
+             * @returns {(string | symbol)[]}
+             */
+            eventNames(): Array<(string | symbol)>;
+            /**
+             * Return the listeners registered for a given event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @returns {Function[]}
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            listeners(event: string | symbol): Function[];
+            /**
+             * Check if there listeners for a given event.
+             * If `exists` argument is not `true` lists listeners.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @param {boolean} exists Only check if there are listeners.
+             * @returns {boolean}
+             */
+            listeners(event: string | symbol, exists: boolean): boolean;
+            /**
+             * Calls each of the listeners registered for a given event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @param {...*} args Arguments that are passed to registered listeners
+             * @returns {boolean} `true` if the event had listeners, else `false`.
+             */
+            emit(event: string | symbol, ...args: any[]): boolean;
+            /**
+             * Add a listener for a given event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @param {Function} fn The listener function.
+             * @param {*} [context=this] The context to invoke the listener with.
+             * @returns {EventEmitter} `this`.
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            on(event: string | symbol, fn: Function, context?: any): this;
+            /**
+             * Add a one-time listener for a given event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @param {Function} fn The listener function.
+             * @param {*} [context=this] The context to invoke the listener with.
+             * @returns {EventEmitter} `this`.
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            once(event: string | symbol, fn: Function, context?: any): this;
+            /**
+             * Remove the listeners of a given event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @param {Function} fn Only remove the listeners that match this function.
+             * @param {*} context Only remove the listeners that have this context.
+             * @param {boolean} once Only remove one-time listeners.
+             * @returns {EventEmitter} `this`.
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            removeListener(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
+            /**
+             * Remove all listeners, or those of the specified event.
+             *
+             * @param {(string | symbol)} event The event name.
+             * @returns {EventEmitter} `this`.
+             */
+            removeAllListeners(event?: string | symbol): this;
+            /**
+             * Alias method for `removeListener`
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            off(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
+            /**
+             * Alias method for `on`
+             */
+            //tslint:disable-next-line:ban-types forbidden-types
+            addListener(event: string | symbol, fn: Function, context?: any): this;
+            /**
+             * This function doesn't apply anymore.
+             * @deprecated
+             */
+            setMaxListeners(): this;
         }
     }
-
     //////////////////////////////////////////////////////////////////////////////
     /////////////////////////////depreciation/////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
@@ -2748,6 +2950,16 @@ declare namespace PIXI {
          */
         type TilingSprite = extras.TilingSprite;
 
+        /**
+         * @class
+         * @private
+         * @name BaseTextureCache
+         * @memberof PIXI
+         * @see PIXI.utils.BaseTextureCache
+         * @deprecated since version 3.0.0
+         */
+        type BaseTextureCache = any;
+
         /**
          * @class
          * @private
@@ -2857,6 +3069,15 @@ declare namespace PIXI {
          * @deprecated since version 4.2.0
          */
         type DEFAULT_RENDER_OPTIONS = number;
+
+        /**
+         * @static
+         * @name PRECISION
+         * @memberof PIXI.settings
+         * @see PIXI.PRECISION
+         * @deprecated since version 4.4.0
+         */
+        type PRECISION = string;
     }
 
     namespace extras {
@@ -2869,12 +3090,23 @@ declare namespace PIXI {
          */
         type MovieClip = extras.AnimatedSprite;
     }
+    namespace settings {
+        /**
+         * @static
+         * @name PRECISION
+         * @memberof PIXI.settings
+         * @see PIXI.PRECISION
+         * @deprecated since version 4.4.0
+         */
+        type PRECISION = number;
+    }
 }
 
 declare namespace pixi {
     const gl: typeof PIXI.glCore;
 }
 
+//tslint:disable-next-line:no-single-declare-module
 declare module "pixi.js" {
     export = PIXI;
 }
diff --git a/types/pixi.js/pixi.js-tests.ts b/types/pixi.js/pixi.js-tests.ts
index f73dfd7021..d14d3e0e71 100644
--- a/types/pixi.js/pixi.js-tests.ts
+++ b/types/pixi.js/pixi.js-tests.ts
@@ -24,7 +24,7 @@ function basics() {
         private renderer: PIXI.WebGLRenderer;
         constructor() {
             // Renderer should allow options from both WebGLRenderer and underlying SystemRenderer
-            this.renderer = new PIXI.WebGLRenderer(0, 0, { backgroundColor : 0x272d37, forceFXAA: true });
+            this.renderer = new PIXI.WebGLRenderer(0, 0, { backgroundColor: 0x272d37, forceFXAA: true });
         }
     }
 
@@ -1507,7 +1507,8 @@ function filters() {
                 maggot.position.y = Math.random() * bounds.height;
 
                 maggot.scale.set(1 + Math.random() * 0.3);
-                maggot.original = maggot.scale.clone();
+                //tslint:disable-next-line:whitespace
+                maggot.original = (<PIXI.Point>maggot.scale).clone();
                 this.maggots.push(maggot);
             }
 
diff --git a/types/pixi.js/tslint.json b/types/pixi.js/tslint.json
index 3d52e5ceec..6f863f926f 100644
--- a/types/pixi.js/tslint.json
+++ b/types/pixi.js/tslint.json
@@ -9,6 +9,7 @@
 
         "class-name": true,
         "indent": [true, "spaces"],
-        "quotemark": [true, "double"]
+        "quotemark": [true, "double"],
+        "comment-format": false
     }
 }
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index c35811aa4d..04de340c22 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for plotly.js 1.22
+// Type definitions for plotly.js 1.27
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>, Martin Duparc <https://github.com/martinduparc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -40,11 +40,27 @@ declare namespace Plotly {
         'xaxis.autorange': boolean;
         'yaxis.autorange': boolean;
         shapes: Array<Partial<Shape>>;
+        legend: Partial<Legend>;
+    }
+
+    interface Legend {
+        traceorder: "grouped" | "normal" | "reversed";
+        x: number;
+        y: number;
+        font: Partial<Font>;
+        bgcolor: string;
+        bordercolor: string;
+        borderwidth: number;
+        orientation: "v" | "h";
+        tracegroupgap: number;
+        xanchor: 'auto' | 'left' | 'center' | 'right';
+        yanchor: 'auto' | 'top' | 'middle' | 'bottom';
     }
 
     type AxisType = "date" | "log" | "linear";
 
     interface Axis {
+        title: string;
         showgrid: boolean;
         fixedrange: boolean;
         rangemode: "tozero" | 'normal' | 'nonnegative';
@@ -104,7 +120,7 @@ declare namespace Plotly {
 
     type Dash = 'solid' | 'dot' | 'dash' | 'longdash' | 'dashdot' | 'longdashdot';
 
-    type Data = ScatterData | BarData;
+    type Data = Partial<ScatterData> | Partial<BarData>;
 
     // Bar
     interface BarData {
@@ -132,9 +148,10 @@ declare namespace Plotly {
     }
 
     interface ScatterMarker {
-        symbol: ""; // Drawing.symbolList
-        opacity: number;
-        size: number;
+        symbol: string | string[]; // Drawing.symbolList
+        color: string | string[];
+        opacity: number | number[];
+        size: number | number[];
         maxdisplayed: number;
         sizeref: number;
         sizemin: number;
diff --git a/types/podium/podium-tests.ts b/types/podium/podium-tests.ts
index 1717d2af1a..9b071fa149 100644
--- a/types/podium/podium-tests.ts
+++ b/types/podium/podium-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="node" />
+declare var console: { log(...args: any[]): void };
 
 import Podium = require('podium');
 const podiumObject = new Podium(); // new emitter
diff --git a/types/polymer-ts/index.d.ts b/types/polymer-ts/index.d.ts
index b14ff58c4c..d5c91f4e80 100644
--- a/types/polymer-ts/index.d.ts
+++ b/types/polymer-ts/index.d.ts
@@ -105,7 +105,8 @@ declare namespace polymer {
         computed?: string;
         observer?: string;
     }
-    class Base extends polymer.PolymerBase implements polymer.Element {
+    interface Base extends polymer.Element { }
+    class Base extends polymer.PolymerBase {
         static create<T extends polymer.Base>(...args: any[]): T;
         static register(): void;
         is: string;
diff --git a/types/popper.js/index.d.ts b/types/popper.js/index.d.ts
index 96f93b3192..2af9ae2298 100644
--- a/types/popper.js/index.d.ts
+++ b/types/popper.js/index.d.ts
@@ -1,71 +1,103 @@
-// Type definitions for popper.js 1.8
+// Type definitions for popper.js 1.10
 // Project: https://github.com/FezVrasta/popper.js/
-// Definitions by: rhysd <https://rhysd.github.io>, joscha <https://github.com/joscha>, seckardt <https://github.com/seckardt>
+// Definitions by: rhysd <https://rhysd.github.io>, joscha <https://github.com/joscha>, seckardt <https://github.com/seckardt>, marcfallows <https://github.com/marcfallows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Popper {
+  type Position = 'top' | 'right' | 'bottom' | 'left';
+  type Placement = 'auto-start'
+      | 'auto'
+      | 'auto-end'
+      | 'top-start'
+      | 'top'
+      | 'top-end'
+      | 'right-start'
+      | 'right'
+      | 'right-end'
+      | 'bottom-end'
+      | 'bottom'
+      | 'bottom-start'
+      | 'left-end'
+      | 'left'
+      | 'left-start';
   interface PopperOptions {
-    placement?: string;
-    boundariesPadding?: number;
-    modifiers?: {
-      order?: number,
-      enabled?: boolean,
-      fn?: Function,
-      'function'?: Function,
-      onLoad?: Function,
-      applyStyle?: {
-        gpuAcceleration?: boolean
-      },
-      preventOverflow?: {
-        boundariesElement?: string | Element,
-        priority?: Array<'left' | 'right' | 'top' | 'bottom'>
-      },
-      offset?: {
-        offset?: number | string
-      },
-      flip?: {
-        behavior?: string | string[],
-        boundariesElement?: string | Element
-      },
-    };
-    modifiersIgnored?: string[];
+    placement?: Placement;
+    eventsEnabled?: boolean;
+    modifiers?: Modifiers;
     removeOnDestroy?: boolean;
-    arrowElement?: string | Element;
-    onCreate?(data: Popper.Data): void;
-    onUpdate?(data: Popper.Data): void;
+    onCreate?(data: Data): void;
+    onUpdate?(data: Data): void;
+  }
+  type ModifierFn = (data: Data, options: Object) => Data;
+  interface BaseModifier {
+    order?: number;
+    enabled?: boolean;
+    fn?: ModifierFn;
   }
   class Modifiers {
-    applyStyle(data: Object): Object;
-    shift(data: Object): Object;
-    preventOverflow(data: Object): Object;
-    keepTogether(data: Object): Object;
-    flip(data: Object): Object;
-    offset(data: Object): Object;
-    arrow(data: Object): Object;
+    shift?: BaseModifier;
+    offset?: BaseModifier & {
+      offset?: number | string,
+    };
+    preventOverflow?: BaseModifier & {
+      priority?: Position[],
+      padding?: number,
+      boundariesElement?: string | Element,
+    };
+    keepTogether?: BaseModifier;
+    arrow?: BaseModifier & {
+      element?: string | Element,
+    };
+    flip?: BaseModifier & {
+      behavior?: 'flip' | 'clockwise' | 'counterclockwise' | Position[],
+      padding?: number,
+      boundariesElement?: string | Element,
+    };
+    inner?: BaseModifier;
+    hide?: BaseModifier;
+    applyStyle?: BaseModifier & {
+      onLoad?: Function,
+      gpuAcceleration?: boolean,
+    };
+  }
+  interface Offset {
+    top: number;
+    left: number;
+    width: number;
+    height: number;
   }
   interface Data {
-    placement: string;
+    instance: Popper;
+    placement: Placement;
+    originalPlacement: Placement;
+    flipped: boolean;
+    hide: boolean;
+    arrowElement: Element;
+    styles: Object;
+    boundaries: Object;
     offsets: {
-      popper: {
-        position: string;
-        top: number;
-        left: number;
-      };
+      popper: Offset,
+      reference: Offset,
+      arrow: {
+        top: number,
+        left: number,
+      },
     };
   }
 }
 
 declare class Popper {
-  modifiers: Popper.Modifiers;
-  placement: string;
+  static modifiers: Object[];
+  static placements: Popper.Placement[];
+  static Defaults: Popper.PopperOptions;
 
   constructor(reference: Element, popper: Element | Object, options?: Popper.PopperOptions);
 
   destroy(): void;
   update(): void;
-  parse(config: Object): Element;
-  runModifiers(data: Object, modifiers: string[], ends: Function): void;
-  isModifierRequired(): boolean;
+  scheduleUpdate(): void;
+  enableEventListeners(): void;
+  disableEventListeners(): void;
 }
 
 declare module 'popper.js' {
diff --git a/types/popper.js/popper.js-tests.ts b/types/popper.js/popper.js-tests.ts
index 143de99ccc..484e7b43ef 100644
--- a/types/popper.js/popper.js-tests.ts
+++ b/types/popper.js/popper.js-tests.ts
@@ -1,27 +1,89 @@
 import Popper from 'popper.js';
 
 var reference = document.querySelector('.my-button');
+var popper = document.querySelector('.my-popper');
+var boundary = document.querySelector('.my-boundary');
+var arrow = document.querySelector('.my-arrow');
+
 var thePopper = new Popper(
-    reference, {
-        content: 'My awesome popper!'
-    }
+    reference,
+    popper,
 );
 thePopper.update();
+thePopper.scheduleUpdate();
 thePopper.destroy();
+thePopper.enableEventListeners();
+thePopper.disableEventListeners();
 
-var options = {
-        placement: 'bottom',
-        offset: 0,
-        arrowElement: document.querySelector('.arrow'),
-        modifiersIgnored: ['applyStyle'],
-    } as Popper.PopperOptions;
+Popper.modifiers.forEach(console.log.bind(console));
+Popper.placements.forEach(console.log.bind(console));
 
 var thePopperWithOptions = new Popper(
-    reference, {
-        content: 'My awesome popper!',
-    }, options);
+    reference,
+    popper,
+    {
+        placement: 'bottom',
+        eventsEnabled: true,
+        removeOnDestroy: true,
+        modifiers: {
+            shift: {
+                enabled: true,
+                fn: (data) => data,
+                order: 100,
+            },
+            offset: {
+                enabled: true,
+                fn: (data) => data,
+                order: 100,
+                offset: 0,
+            },
+            preventOverflow: {
+                enabled: true,
+                fn: (data) => data,
+                order: 100,
+                priority: ['top', 'bottom'],
+                padding: 1,
+                boundariesElement: boundary,
+            },
+            keepTogether: {
+                enabled: false,
+                fn: (data) => data,
+                order: 200,
+            },
+            arrow: {
+                enabled: true,
+                fn: (data) => data,
+                order: 400,
+                element: arrow,
+            },
+            flip: {
+                enabled: true,
+                fn: (data) => data,
+                order: 400,
+                behavior: ['top', 'right'],
+                padding: 5,
+                boundariesElement: boundary,
+            },
+            inner: {
+                enabled: true,
+                fn: (data) => data,
+                order: 400,
+            },
+            hide: {
+                enabled: true,
+                fn: (data) => data,
+                order: 400,
+            },
+            applyStyle: {
+                enabled: true,
+                fn: (data) => data,
+                order: 400,
+                onLoad: () => 0,
+            },
+        }
+    }
+);
 
-var popper = document.querySelector('.my-popper');
 var anotherPopper = new Popper(
     reference,
     popper
@@ -30,9 +92,15 @@ var anotherPopper = new Popper(
 var reference = document.querySelector('.my-button');
 var popper = document.querySelector('.my-popper');
 var anotherPopper = new Popper(reference, popper, {
+    modifiers: {
+        flip: {
+            behavior: 'clockwise'
+        }
+    },
     onCreate: (data => console.log(data)),
-    onUpdate: ((data) => {
+    onUpdate: (data => {
+        data.instance.scheduleUpdate();
         var p = data.offsets.popper;
-        console.log(`top: ${p.top}, left: ${p.left}`);
+        console.log(`top: ${p.top}, left: ${p.left}, width: ${p.width}, height: ${p.height}`);
     })
 });
diff --git a/types/pouch-redux-middleware/index.d.ts b/types/pouch-redux-middleware/index.d.ts
index 2e940e819d..e0e3691de6 100644
--- a/types/pouch-redux-middleware/index.d.ts
+++ b/types/pouch-redux-middleware/index.d.ts
@@ -1,34 +1,33 @@
-// Type definitions for pouch-redux-middleware 0.5.0
+// Type definitions for pouch-redux-middleware 0.5
 // Project: https://github.com/pgte/pouch-redux-middleware
 // Definitions by: Adam Charron <https://github.com/charrondev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { Dispatch, Action, Middleware } from 'redux'
-import * as PouchDB from 'pouchdb'
+import { Dispatch, Action, Middleware } from 'redux';
+import * as PouchDB from 'pouchdb';
 
 export interface Document {
   _id: any;
-  [field: string]: any
+  [field: string]: any;
 }
 
 export interface Path {
-  path: string
-  db: PouchDB.Database<any>
-  scheduleRemove?: (doc: Document) => void
-  scheduleInset?: (doc: Document) => void
-  propagateDelete?: (doc: Document, dispatch: Dispatch<any>) => void
-  propagateInsert?: (doc: Document, dispatch: Dispatch<any>) => void
-  propagateUpdate?: (doc: Document, dispatch: Dispatch<any>) => void
-  handleResponse?: (err: Error, data: any, errorCallback: (err: Error) => void) => void
-  queue?: Function
-  docs?: any
+  path: string;
+  db: PouchDB.Database<any>;
+  scheduleRemove?(doc: Document): void;
+  scheduleInset?(doc: Document): void;
+  propagateDelete?(doc: Document, dispatch: Dispatch<any>): void;
+  propagateInsert?(doc: Document, dispatch: Dispatch<any>): void;
+  propagateUpdate?(doc: Document, dispatch: Dispatch<any>): void;
+  handleResponse?(err: Error, data: any, errorCallback: (err: Error) => void): void;
+  queue?(...args: any[]): any;
+  docs?: any;
   actions: {
-    remove: (doc: Document) => Action
-    update: (doc: Document) => Action
-    insert: (doc: Document) => Action
-  }
+    remove(doc: Document): Action;
+    update(doc: Document): Action;
+    insert(doc: Document): Action;
+  };
 }
 
-export default function PouchMiddlewareFactory(paths?: Path[] | Path): Middleware
-
-
+export default function PouchMiddlewareFactory(paths?: Path[] | Path): Middleware;
diff --git a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
index 1ae6493175..bacd6c4b7a 100644
--- a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
+++ b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
@@ -1,22 +1,22 @@
-import * as redux from 'redux'
-import makePouchMiddleware, { Document, Path } from 'pouch-redux-middleware'
+import * as redux from 'redux';
+import makePouchMiddleware, { Document, Path } from 'pouch-redux-middleware';
 import * as PouchDB from 'pouchdb';
 
 const types = {
     DELETE_TODO: 'delete-todo',
     INSERT_TODO: 'insert-todo',
     UPDATE_TODO: 'update-todo'
-}
+};
 
 const path: Path = {
     path: "/test",
     db: new PouchDB('test'),
     actions: {
-        remove: doc => { return { type: types.DELETE_TODO, id: doc._id } },
-        insert: doc => { return { type: types.INSERT_TODO, todo: doc } },
-        update: doc => { return { type: types.UPDATE_TODO, todo: doc } },
+        remove: doc => ({ type: types.DELETE_TODO, id: doc._id }),
+        insert: doc => ({ type: types.INSERT_TODO, todo: doc }),
+        update: doc => ({ type: types.UPDATE_TODO, todo: doc }),
     }
-}
+};
 
-const middleware: redux.Middleware = makePouchMiddleware(path)
-const otherMiddleware: redux.Middleware = makePouchMiddleware([path, path, path])
+const middleware: redux.Middleware = makePouchMiddleware(path);
+const otherMiddleware: redux.Middleware = makePouchMiddleware([path, path, path]);
diff --git a/types/pouch-redux-middleware/tslint.json b/types/pouch-redux-middleware/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouch-redux-middleware/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 89fcd9d95b..63484904ac 100644
--- a/types/pouchdb-adapter-fruitdown/index.d.ts
+++ b/types/pouchdb-adapter-fruitdown/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-fruitdown v6.1.2
+// Type definitions for pouchdb-adapter-fruitdown 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace FruitDOWNAdapter {
         interface FruitDOWNAdapterConfiguration
@@ -14,9 +18,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: FruitDOWNAdapter.FruitDOWNAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: FruitDOWNAdapter.FruitDOWNAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-fruitdown/pouchdb-adapter-fruitdown-tests.ts b/types/pouchdb-adapter-fruitdown/pouchdb-adapter-fruitdown-tests.ts
index 645ec0b448..437d759d21 100644
--- a/types/pouchdb-adapter-fruitdown/pouchdb-adapter-fruitdown-tests.ts
+++ b/types/pouchdb-adapter-fruitdown/pouchdb-adapter-fruitdown-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
     let model: PouchDB.Core.Document<MyModel>;
 
     let db = new PouchDB<MyModel>(null, {
diff --git a/types/pouchdb-adapter-fruitdown/tslint.json b/types/pouchdb-adapter-fruitdown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-fruitdown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-http/index.d.ts b/types/pouchdb-adapter-http/index.d.ts
index f0125baf7c..07eb5bbbfb 100644
--- a/types/pouchdb-adapter-http/index.d.ts
+++ b/types/pouchdb-adapter-http/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-http v6.1.2
+// Type definitions for pouchdb-http 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace HttpAdapter {
         interface HttpAdapterConfiguration
@@ -14,9 +18,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: HttpAdapter.HttpAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: HttpAdapter.HttpAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-http/tslint.json b/types/pouchdb-adapter-http/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-http/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-idb/index.d.ts b/types/pouchdb-adapter-idb/index.d.ts
index a62cef3654..e8ad990b45 100644
--- a/types/pouchdb-adapter-idb/index.d.ts
+++ b/types/pouchdb-adapter-idb/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-idb v6.1.2
+// Type definitions for pouchdb-adapter-idb 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
@@ -26,9 +30,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: IdbAdapter.IdbAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: IdbAdapter.IdbAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-idb/tslint.json b/types/pouchdb-adapter-idb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-idb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-leveldb/index.d.ts b/types/pouchdb-adapter-leveldb/index.d.ts
index 6c89d0161e..a3dd9ad6d7 100644
--- a/types/pouchdb-adapter-leveldb/index.d.ts
+++ b/types/pouchdb-adapter-leveldb/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-leveldb v6.1.2
+// Type definitions for pouchdb-adapter-leveldb 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace LevelDbAdapter {
         interface LevelDbAdapterConfiguration extends Configuration.LocalDatabaseConfiguration {
@@ -13,9 +17,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: LevelDbAdapter.LevelDbAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: LevelDbAdapter.LevelDbAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-leveldb/pouchdb-adapter-leveldb-tests.ts b/types/pouchdb-adapter-leveldb/pouchdb-adapter-leveldb-tests.ts
index 49c4a84088..f7223616ac 100644
--- a/types/pouchdb-adapter-leveldb/pouchdb-adapter-leveldb-tests.ts
+++ b/types/pouchdb-adapter-leveldb/pouchdb-adapter-leveldb-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
 
     let db = new PouchDB<MyModel>(null, {
         adapter: 'leveldb',
@@ -8,4 +10,3 @@ function testConstructor() {
         adapter: 'leveldb',
     });
 }
-
diff --git a/types/pouchdb-adapter-leveldb/tslint.json b/types/pouchdb-adapter-leveldb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-leveldb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-localstorage/index.d.ts b/types/pouchdb-adapter-localstorage/index.d.ts
index 9e71c05a77..04823352de 100644
--- a/types/pouchdb-adapter-localstorage/index.d.ts
+++ b/types/pouchdb-adapter-localstorage/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-localstorage v6.1.2
+// Type definitions for pouchdb-adapter-localstorage 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace LocalStorageAdapter {
         interface LocalStorageAdapterConfiguration
@@ -14,9 +18,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: LocalStorageAdapter.LocalStorageAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: LocalStorageAdapter.LocalStorageAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-localstorage/pouchdb-adapter-localstorage-tests.ts b/types/pouchdb-adapter-localstorage/pouchdb-adapter-localstorage-tests.ts
index 71a60e987f..77f3701e57 100644
--- a/types/pouchdb-adapter-localstorage/pouchdb-adapter-localstorage-tests.ts
+++ b/types/pouchdb-adapter-localstorage/pouchdb-adapter-localstorage-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
 
     let db = new PouchDB<MyModel>(null, {
         adapter: 'localstorage',
diff --git a/types/pouchdb-adapter-localstorage/tslint.json b/types/pouchdb-adapter-localstorage/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-localstorage/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-memory/index.d.ts b/types/pouchdb-adapter-memory/index.d.ts
index 647ce5b434..3cbc0c664e 100644
--- a/types/pouchdb-adapter-memory/index.d.ts
+++ b/types/pouchdb-adapter-memory/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-memory v6.1.2
+// Type definitions for pouchdb-adapter-memory 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace MemoryAdapter {
         interface MemoryAdapterConfiguration
@@ -14,9 +18,9 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: MemoryAdapter.MemoryAdapterConfiguration
-            ): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: MemoryAdapter.MemoryAdapterConfiguration
+                               ): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-memory/pouchdb-adapter-memory-tests.ts b/types/pouchdb-adapter-memory/pouchdb-adapter-memory-tests.ts
index a920375bb8..82e1d0b5a1 100644
--- a/types/pouchdb-adapter-memory/pouchdb-adapter-memory-tests.ts
+++ b/types/pouchdb-adapter-memory/pouchdb-adapter-memory-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
 
     let db = new PouchDB<MyModel>(null, {
         adapter: 'memory',
diff --git a/types/pouchdb-adapter-memory/tslint.json b/types/pouchdb-adapter-memory/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-memory/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-node-websql/index.d.ts b/types/pouchdb-adapter-node-websql/index.d.ts
index bec01a6d8b..25dcc7d8cf 100644
--- a/types/pouchdb-adapter-node-websql/index.d.ts
+++ b/types/pouchdb-adapter-node-websql/index.d.ts
@@ -1,11 +1,15 @@
-// Type definitions for pouchdb-adapter-node-websql v6.1.2
+// Type definitions for pouchdb-adapter-node-websql 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-websql" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare module 'pouchdb-adapter-node-websql' {
     const plugin: PouchDB.Plugin;
     export = plugin;
diff --git a/types/pouchdb-adapter-node-websql/pouchdb-adapter-node-websql-tests.ts b/types/pouchdb-adapter-node-websql/pouchdb-adapter-node-websql-tests.ts
index b65fabca1b..94cb7b0c0c 100644
--- a/types/pouchdb-adapter-node-websql/pouchdb-adapter-node-websql-tests.ts
+++ b/types/pouchdb-adapter-node-websql/pouchdb-adapter-node-websql-tests.ts
@@ -6,7 +6,9 @@ function isString(someString: string) {
 }
 
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
 
     let db = new PouchDB<MyModel>(null, {
         adapter: 'websql',
diff --git a/types/pouchdb-adapter-node-websql/tslint.json b/types/pouchdb-adapter-node-websql/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-node-websql/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-adapter-websql/index.d.ts b/types/pouchdb-adapter-websql/index.d.ts
index 7148d65ea2..b7cc5af65b 100644
--- a/types/pouchdb-adapter-websql/index.d.ts
+++ b/types/pouchdb-adapter-websql/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for pouchdb-adapter-websql v6.1.2
+// Type definitions for pouchdb-adapter-websql 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
@@ -25,8 +29,8 @@ declare namespace PouchDB {
     }
 
     interface Static {
-        new<Content extends Core.Encodable>(name: string | void,
-            options: AdapterWebSql.Configuration): Database<Content>;
+        new<Content extends {}>(name: string | null,
+                                options: AdapterWebSql.Configuration): Database<Content>;
     }
 }
 
diff --git a/types/pouchdb-adapter-websql/pouchdb-adapter-websql-tests.ts b/types/pouchdb-adapter-websql/pouchdb-adapter-websql-tests.ts
index 4fcd195669..577b7c7e83 100644
--- a/types/pouchdb-adapter-websql/pouchdb-adapter-websql-tests.ts
+++ b/types/pouchdb-adapter-websql/pouchdb-adapter-websql-tests.ts
@@ -6,8 +6,6 @@ function isString(someString: string) {
 }
 
 function testConstructor() {
-    type MyModel = { numericProperty: number };
-
     let db = new PouchDB('basic');
     db = new PouchDB(null, {
         adapter: 'websql'
diff --git a/types/pouchdb-adapter-websql/tslint.json b/types/pouchdb-adapter-websql/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-adapter-websql/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-browser/index.d.ts b/types/pouchdb-browser/index.d.ts
index 94f942302c..3872feef98 100644
--- a/types/pouchdb-browser/index.d.ts
+++ b/types/pouchdb-browser/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for pouchdb-browser v6.1.2
+// Type definitions for pouchdb-browser 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-idb" />
@@ -10,6 +11,9 @@
 /// <reference types="pouchdb-mapreduce" />
 /// <reference types="pouchdb-replication" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare module 'pouchdb-browser' {
     const PouchDb: PouchDB.Static;
     export = PouchDb;
diff --git a/types/pouchdb-browser/pouchdb-browser-tests.ts b/types/pouchdb-browser/pouchdb-browser-tests.ts
index faaa5b5d21..29b8d55b5a 100644
--- a/types/pouchdb-browser/pouchdb-browser-tests.ts
+++ b/types/pouchdb-browser/pouchdb-browser-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
     let model: PouchDB.Core.Document<MyModel>;
 
     let db = new PouchDB<MyModel>(null, {
diff --git a/types/pouchdb-browser/tslint.json b/types/pouchdb-browser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-browser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 556fa71b5b..7352707324 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -1,25 +1,112 @@
-// Type definitions for pouchdb-core v6.1.2
+// Type definitions for pouchdb-core 6.1
 // Project: https://pouchdb.com/
-// 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>
+// 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-/// <reference types="node" />
 /// <reference types="debug" />
 
+interface Buffer extends Uint8Array {
+    write(string: string, offset?: number, length?: number, encoding?: string): number;
+    toString(encoding?: string, start?: number, end?: number): string;
+    toJSON(): { type: 'Buffer', data: any[] };
+    equals(otherBuffer: Buffer): boolean;
+    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    slice(start?: number, end?: number): Buffer;
+    writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    swap16(): Buffer;
+    swap32(): Buffer;
+    swap64(): Buffer;
+    writeUInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt8(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
+    writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
+    writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
+    writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
+    fill(value: any, offset?: number, end?: number): this;
+    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
+}
+
+// TODO: tslint doesn't like the listener: Function signatures but they are from the
+// original node declarations so I didn't want to touch them
+/* tslint:disable:ban-types */
+interface EventEmitter {
+    addListener(event: string | symbol, listener: Function): this;
+    on(event: string | symbol, listener: Function): this;
+    once(event: string | symbol, listener: Function): this;
+    removeListener(event: string | symbol, listener: Function): this;
+    removeAllListeners(event?: string | symbol): this;
+    setMaxListeners(n: number): this;
+    getMaxListeners(): number;
+    listeners(event: string | symbol): Function[];
+    emit(event: string | symbol, ...args: any[]): boolean;
+    listenerCount(type: string | symbol): number;
+    prependListener(event: string | symbol, listener: Function): this;
+    prependOnceListener(event: string | symbol, listener: Function): this;
+    eventNames(): Array<string | symbol>;
+}
+/* tslint:eisable:ban-types */
+
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace Core {
         interface Error {
+            /**
+             * HTTP Status Code during HTTP or HTTP-like operations
+             */
+            status?: number;
+            name?: string;
+            message?: string;
+            reason?: string;
+            error?: string | boolean;
+            id?: string;
+            rev?: RevisionId;
         }
-        interface Callback<E, R> {
-            (error: E | void, result: R | void): void;
-        }
-        type AnyCallback = Callback<any, any>;
+        type Callback<R> = (error: Error | null, result: R | null) => void;
         type DocumentId = string;
         type DocumentKey = string;
         type AttachmentId = string;
         type RevisionId = string;
         type Availability = 'available' | 'compacted' | 'not compacted' | 'missing';
-        type Encodable = { [propertyName: string]: any };
         type Attachment = string | Blob | Buffer;
 
         interface Options {
@@ -48,7 +135,7 @@ declare namespace PouchDB {
             update_seq: number | string;
         }
 
-        interface Revision<Content> {
+        interface Revision<Content extends {}> {
             ok: Document<Content> & RevisionIdMeta;
         }
         interface RevisionInfo {
@@ -56,14 +143,14 @@ declare namespace PouchDB {
             status: Availability;
         }
         interface RevisionDiffOptions {
-            [DocumentId : string]: string[];
+            [DocumentId: string]: string[];
         }
         interface RevisionDiff {
             missing?: string[];
             possible_ancestors?: string[];
         }
         interface RevisionDiffResponse {
-            [DocumentId : string]: RevisionDiff
+            [DocumentId: string]: RevisionDiff;
         }
 
         interface IdMeta {
@@ -85,7 +172,7 @@ declare namespace PouchDB {
             _revisions?: {
                 ids: RevisionId[];
                 start: number;
-            }
+            };
 
             /** Attachments where index is attachmentId */
             _attachments?: Attachments;
@@ -115,15 +202,15 @@ declare namespace PouchDB {
             [attachmentId: string]: AttachmentResponse;
         }
 
-        type NewDocument<Content extends Encodable> = Content;
-        type Document<Content extends Encodable> = Content & IdMeta;
-        type ExistingDocument<Content extends Encodable> =
+        type NewDocument<Content extends {}> = Content;
+        type Document<Content extends {}> = Content & IdMeta;
+        type ExistingDocument<Content extends {}> =
                 Document<Content> & RevisionIdMeta;
 
         /** Existing doc or just object with `_id` and `_rev` */
-        type RemoveDocument = Encodable & IdMeta & RevisionIdMeta;
+        type RemoveDocument = IdMeta & RevisionIdMeta;
 
-        type PostDocument<Content extends Encodable> = NewDocument<Content> & {
+        type PostDocument<Content extends {}> = NewDocument<Content> & {
             filters?: {[filterName: string]: string};
             views?: {[viewName: string]: string};
 
@@ -133,7 +220,7 @@ declare namespace PouchDB {
             _attachments?: {[attachmentId: string]: PutAttachment};
         };
 
-        type PutDocument<Content extends Encodable> = PostDocument<Content> & ChangesMeta & {
+        type PutDocument<Content extends {}> = PostDocument<Content> & ChangesMeta & {
             _id?: DocumentId;
         };
 
@@ -154,11 +241,13 @@ declare namespace PouchDB {
             /** Return attachments as Buffers.
              *
              * Requires `include_docs` to be `true`.
-             * Requires `attachments` to be `true`. */
+             * Requires `attachments` to be `true`.
+             */
             binary?: boolean;
             /** Include conflict information for each document.
              *
-             * Requires `include_docs` to be `true`. */
+             * Requires `include_docs` to be `true`.
+             */
             conflicts?: boolean;
             /** Reverse ordering of results. */
             descending?: boolean;
@@ -168,7 +257,8 @@ declare namespace PouchDB {
             limit?: number;
             /** Number of documents to skip before returning.
              *
-             * Causes poor performance on IndexedDB and LevelDB. */
+             * Causes poor performance on IndexedDB and LevelDB.
+             */
             skip?: number;
         }
         interface AllDocsWithKeyOptions extends AllDocsOptions {
@@ -186,21 +276,21 @@ declare namespace PouchDB {
             endkey: DocumentKey;
             /** Include any documents identified by `endkey`.
              *
-             * Defaults to `true`. */
+             * Defaults to `true`.
+             */
             inclusive_end?: boolean;
         }
         interface AllDocsMeta {
-
             /** Only present if `conflicts` is `true` */
             _conflicts?: RevisionId[];
 
             _attachments?: Attachments;
         }
-        interface AllDocsResponse<Content extends Core.Encodable> {
+        interface AllDocsResponse<Content extends {}> {
             /** The `skip` if provided, or in CouchDB the actual offset */
             offset: number;
             total_rows: number;
-            rows: {
+            rows: Array<{
                 /** Only present if `include_docs` was `true`. */
                 doc?: Document<Content & AllDocsMeta>;
                 id: DocumentId;
@@ -209,18 +299,24 @@ declare namespace PouchDB {
                     rev: RevisionId;
                     deleted?: boolean;
                 }
-            }[];
+            }>;
         }
 
-        interface BulkDocsOptions extends PutOptions {
+        interface BulkDocsOptions extends Options {
             new_edits?: boolean;
         }
 
         interface BulkGetOptions extends Options {
-            docs: any,
-            revs?: boolean,
-            attachments?: boolean,
-            binary?: boolean
+            docs: Array<{ id: string; rev: RevisionId }>;
+            revs?: boolean;
+            attachments?: boolean;
+            binary?: boolean;
+        }
+
+        interface BulkGetResponse<Content extends {}> {
+            results: {
+                docs: Array<{ ok: Content & GetMeta } | { error: Error }>;
+            };
         }
 
         interface ChangesMeta {
@@ -276,7 +372,7 @@ declare namespace PouchDB {
              * To use a view function, pass '_view' here and provide a reference to the view function in options.view.
              * See filtered changes for details.
              */
-            filter?: string | {(doc: any, params: any): any};
+            filter?: string | ((doc: any, params: any) => any);
 
             /** Only show changes for docs with these ids (array of strings). */
             doc_ids?: string[];
@@ -296,21 +392,21 @@ declare namespace PouchDB {
             view?: string;
         }
 
-        interface ChangesResponseChange<Content extends Core.Encodable> {
+        interface ChangesResponseChange<Content extends {}> {
             id: string;
             seq: number | string;
-            changes: { rev: string }[];
+            changes: Array<{ rev: string }>;
             deleted?: boolean;
             doc?: ExistingDocument<Content & ChangesMeta>;
         }
 
-        interface ChangesResponse<Content extends Core.Encodable> {
+        interface ChangesResponse<Content extends {}> {
             status: string;
             last_seq: number | string;
-            results: ChangesResponseChange<Content>[];
+            results: Array<ChangesResponseChange<Content>>;
         }
 
-        interface Changes<Content extends Core.Encodable> extends EventEmitter, Promise<ChangesResponse<Content>> {
+        interface Changes<Content extends {}> extends EventEmitter, Promise<ChangesResponse<Content>> {
             on(event: 'change', listener: (value: ChangesResponseChange<Content>) => any): this;
             on(event: 'complete', listener: (value: ChangesResponse<Content>) => any): this;
             on(event: 'error', listener: (value: any) => any): this;
@@ -318,9 +414,6 @@ declare namespace PouchDB {
             cancel(): void;
         }
 
-        interface DestroyOptions extends Options {
-        }
-
         interface GetOptions extends Options {
             /** Include list of conflicting leaf revisions. */
             conflicts?: boolean;
@@ -329,7 +422,8 @@ declare namespace PouchDB {
             /** Include revision history of the document. */
             revs?: boolean;
             /** Include a list of revisions of the document, and their
-             * availability. */
+             * availability.
+             */
             revs_info?: boolean;
 
             /** Include attachment data. */
@@ -345,18 +439,14 @@ declare namespace PouchDB {
         interface GetOpenRevisions extends Options {
             /** Fetch all leaf revisions if open_revs="all" or fetch all leaf
              * revisions specified in open_revs array. Leaves will be returned
-             * in the same order as specified in input array. */
+             * in the same order as specified in input array.
+             */
             open_revs: 'all' | Core.RevisionId[];
 
             /** Include revision history of the document. */
             revs?: boolean;
         }
 
-        interface PutOptions extends Options {
-        }
-        interface PostOptions extends PutOptions {
-        }
-
         interface CompactOptions extends Core.Options {
           interval?: number;
         }
@@ -369,7 +459,7 @@ declare namespace PouchDB {
     /**
      * Pass this to `PouchDB.plugin()`.
      */
-    export type Plugin = 'This should be passed to PouchDB.plugin()';
+    type Plugin = 'This should be passed to PouchDB.plugin()';
 
     namespace Configuration {
         interface CommonDatabaseConfiguration {
@@ -416,7 +506,7 @@ declare namespace PouchDB {
              */
             headers?: {
                 [name: string]: string;
-            }
+            };
 
             /**
              * Enables transferring cookies and HTTP Authorization information.
@@ -432,7 +522,7 @@ declare namespace PouchDB {
             auth?: {
                 username?: string;
                 password?: string;
-            }
+            };
             /**
              * Disables automatic creation of databases.
              */
@@ -443,51 +533,32 @@ declare namespace PouchDB {
                 RemoteDatabaseConfiguration;
     }
 
-    /** @todo: remove nodejs dep. */
-    interface EventEmitter extends NodeJS.EventEmitter {
-
-    }
-
     interface Static extends EventEmitter {
         plugin(plugin: Plugin): Static;
 
         version: string;
 
-        on(event: 'created', listener: (dbName: string) => any): this;
-        on(event: 'destroyed', listener: (dbName: string) => any): this;
+        on(event: 'created' | 'destroyed', listener: (dbName: string) => any): this;
 
         debug: debug.IDebug;
 
-        new<Content extends Core.Encodable>(name?: string,
-            options?: Configuration.DatabaseConfiguration): Database<Content>;
+        new<Content extends {} = {}>(name?: string,
+                                     options?: Configuration.DatabaseConfiguration): Database<Content>;
 
         /**
          * The returned object is a constructor function that works the same as PouchDB,
          * except that whenever you invoke it (e.g. with new), the given options will be passed in by default.
          */
         defaults(options: Configuration.DatabaseConfiguration): {
-            new<Content extends Core.Encodable>(name?: string,
-                options?: Configuration.DatabaseConfiguration): Database<Content>;
-        }
+            new<Content extends {} = {}>(name?: string,
+                                         options?: Configuration.DatabaseConfiguration): Database<Content>;
+        };
     }
 
-    interface Database<Content extends Core.Encodable>  {
-
-        /** Fetch all documents matching the given key. */
-        allDocs(options: Core.AllDocsWithKeyOptions):
-            Promise<Core.AllDocsResponse<Content>>;
-
-        /** Fetch all documents matching any of the given keys. */
-        allDocs(options: Core.AllDocsWithKeysOptions):
-            Promise<Core.AllDocsResponse<Content>>;
-
-        /** Fetch all documents matching the given key range. */
-        allDocs(options: Core.AllDocsWithinRangeOptions):
-            Promise<Core.AllDocsResponse<Content>>;
-
-        /** Fetch all documents. */
-        allDocs(options?: Core.AllDocsOptions):
-            Promise<Core.AllDocsResponse<Content>>;
+    interface Database<Content extends {} = {}>  {
+        /** Fetch all documents matching the given options. */
+        allDocs<Model>(options?: Core.AllDocsWithKeyOptions | Core.AllDocsWithKeysOptions | Core.AllDocsWithinRangeOptions | Core.AllDocsOptions):
+            Promise<Core.AllDocsResponse<Content & Model>>;
 
         /**
          * Create, update or delete multiple documents. The docs argument is an array of documents.
@@ -496,9 +567,9 @@ declare namespace PouchDB {
          * which should match the ID and revision of the document on which to base your updates.
          * Finally, to delete a document, include a _deleted parameter with the value true.
          */
-        bulkDocs(docs: Core.PutDocument<Content>[],
-                 options: Core.BulkDocsOptions | null,
-                 callback: Core.Callback<Core.Error, Core.Response[]>): void;
+        bulkDocs<Model>(docs: Array<Core.PutDocument<Content & Model>>,
+                        options: Core.BulkDocsOptions | null,
+                        callback: Core.Callback<Core.Response[]>): void;
 
         /**
          * Create, update or delete multiple documents. The docs argument is an array of documents.
@@ -507,45 +578,44 @@ declare namespace PouchDB {
          * which should match the ID and revision of the document on which to base your updates.
          * Finally, to delete a document, include a _deleted parameter with the value true.
          */
-        bulkDocs(docs: Core.PutDocument<Content>[],
-                 options?: Core.BulkDocsOptions): Promise<Core.Response[]>;
+        bulkDocs<Model>(docs: Array<Core.PutDocument<Content & Model>>,
+                        options?: Core.BulkDocsOptions): Promise<Core.Response[]>;
 
         /** Compact the database */
         compact(options?: Core.CompactOptions): Promise<Core.Response>;
 
         /** Compact the database */
         compact(options: Core.CompactOptions,
-                callback: Core.Callback<Core.Error, Core.Response>): void;
+                callback: Core.Callback<Core.Response>): void;
 
         /** Destroy the database */
-        destroy(options: Core.DestroyOptions | void,
-            callback: Core.AnyCallback): void;
+        destroy(options: Core.Options | null,
+                callback: Core.Callback<any>): void;
 
         /** Destroy the database */
-        destroy(options?: Core.DestroyOptions | void): Promise<void>;
+        destroy(options?: Core.Options | null): Promise<void>;
 
         /** Fetch a document */
-        get(docId: Core.DocumentId,
-            options: Core.GetOptions | null,
-            callback: Core.Callback<any, Core.Document<Content> & Core.GetMeta>
-            ): void;
+        get<Model>(docId: Core.DocumentId,
+                   options: Core.GetOptions | null,
+                   callback: Core.Callback<Core.Document<Content & Model> & Core.GetMeta>
+                  ): void;
 
         /** Fetch a document */
-        get(docId: Core.DocumentId,
-            options: Core.GetOptions
-            ): Promise<Core.Document<Content> & Core.GetMeta>;
+        get<Model>(docId: Core.DocumentId,
+                   options: Core.GetOpenRevisions,
+                   callback: Core.Callback<Array<Core.Revision<Content & Model>>>
+                  ): void;
 
         /** Fetch a document */
-        get(docId: Core.DocumentId): Promise<Core.Document<Content> & Core.GetMeta>;
+        get<Model>(docId: Core.DocumentId,
+                   options?: Core.GetOptions
+                  ): Promise<Core.Document<Content & Model> & Core.GetMeta>;
 
-        /** Fetch document open revs */
-        get(docId: Core.DocumentId,
-            options: Core.GetOpenRevisions,
-            callback: Core.Callback<any, Core.Revision<Content>[]>): void;
-
-        /** Fetch document open revs */
-        get(docId: Core.DocumentId,
-            options: Core.GetOpenRevisions): Promise<Core.Revision<Content>[]>;
+        /** Fetch a document */
+        get<Model>(docId: Core.DocumentId,
+                   options: Core.GetOpenRevisions
+                  ): Promise<Array<Core.Revision<Content & Model>>>;
 
         /** Create a new document without providing an id.
          *
@@ -555,9 +625,9 @@ declare namespace PouchDB {
          *
          * @see {@link https://pouchdb.com/2014/06/17/12-pro-tips-for-better-code-with-pouchdb.html|PouchDB Pro Tips}
          */
-        post(doc: Core.PostDocument<Content>,
-            options: Core.PostOptions | null,
-            callback: Core.Callback<Core.Error, Core.Response>): void;
+        post<Model>(doc: Core.PostDocument<Content & Model>,
+                    options: Core.Options | null,
+                    callback: Core.Callback<Core.Response>): void;
 
         /** Create a new document without providing an id.
          *
@@ -567,8 +637,8 @@ declare namespace PouchDB {
          *
          * @see {@link https://pouchdb.com/2014/06/17/12-pro-tips-for-better-code-with-pouchdb.html|PouchDB Pro Tips}
          */
-        post(doc: Core.PostDocument<Content>,
-            options?: Core.PostOptions): Promise<Core.Response>;
+        post<Model>(doc: Core.PostDocument<Content & Model>,
+                    options?: Core.Options): Promise<Core.Response>;
 
         /** Create a new document or update an existing document.
          *
@@ -578,9 +648,9 @@ declare namespace PouchDB {
          * If you try to store non-JSON data (for instance Date objects) you may
          * see inconsistent results.
          */
-        put(doc: Core.PutDocument<Content>,
-            options: Core.PutOptions | null,
-            callback: Core.Callback<Core.Error, Core.Response>): void;
+        put<Model>(doc: Core.PutDocument<Content & Model>,
+                   options: Core.Options | null,
+                   callback: Core.Callback<Core.Response>): void;
 
         /** Create a new document or update an existing document.
          *
@@ -590,19 +660,19 @@ declare namespace PouchDB {
          * If you try to store non-JSON data (for instance Date objects) you may
          * see inconsistent results.
          */
-        put(doc: Core.PutDocument<Content>,
-            options?: Core.PutOptions): Promise<Core.Response>;
+        put<Model>(doc: Core.PutDocument<Content & Model>,
+                   options?: Core.Options): Promise<Core.Response>;
 
         /** Remove a doc from the database */
         remove(doc: Core.RemoveDocument,
                options: Core.Options,
-               callback: Core.Callback<Core.Error, Core.Response>): void;
+               callback: Core.Callback<Core.Response>): void;
 
         /** Remove a doc from the database */
         remove(docId: Core.DocumentId,
                revision: Core.RevisionId,
                options: Core.Options,
-               callback: Core.Callback<Core.Error, Core.Response>): void;
+               callback: Core.Callback<Core.Response>): void;
 
         /** Remove a doc from the database */
         remove(doc: Core.RemoveDocument,
@@ -614,7 +684,7 @@ declare namespace PouchDB {
                options?: Core.Options): Promise<Core.Response>;
 
         /** Get database information */
-        info(callback: Core.Callback<any, Core.DatabaseInfo>): void;
+        info(callback: Core.Callback<Core.DatabaseInfo>): void;
 
         /** Get database information */
         info(): Promise<Core.DatabaseInfo>;
@@ -627,8 +697,8 @@ declare namespace PouchDB {
          * a 'complete' event when all the changes have been processed, and an 'error' event when an error occurs.
          * Calling cancel() will unsubscribe all event listeners automatically.
          */
-        changes(options: Core.ChangesOptions | null,
-            callback: Core.Callback<any, Core.Changes<Content>>): void;
+        changes<Model>(options: Core.ChangesOptions | null,
+                       callback: Core.Callback<Core.Changes<Content & Model>>): void;
 
         /**
          * A list of changes made to documents in the database, in the order they were made.
@@ -638,10 +708,10 @@ declare namespace PouchDB {
          * a 'complete' event when all the changes have been processed, and an 'error' event when an error occurs.
          * Calling cancel() will unsubscribe all event listeners automatically.
          */
-        changes(options?: Core.ChangesOptions): Core.Changes<Content>;
+        changes<Model>(options?: Core.ChangesOptions): Core.Changes<Content & Model>;
 
         /** Close the database */
-        close(callback: Core.AnyCallback): void;
+        close(callback: Core.Callback<any>): void;
 
         /** Close the database */
         close(): Promise<void>;
@@ -652,91 +722,88 @@ declare namespace PouchDB {
          * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
          */
         putAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            rev: Core.RevisionId,
-            attachment: Core.Attachment,
-            type: string,
-            callback: Core.Callback<Core.Error, Core.Response>): void;
+                      attachmentId: Core.AttachmentId,
+                      rev: Core.RevisionId,
+                      attachment: Core.Attachment,
+                      type: string,
+                      callback: Core.Callback<Core.Response>): void;
 
          /**
-         * Attaches a binary object to a document.
-         * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
-         * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
-         */
+          * Attaches a binary object to a document.
+          * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
+          * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
+          */
         putAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            rev: Core.RevisionId,
-            attachment: Core.Attachment,
-            type: string): Promise<Core.Response>;
+                      attachmentId: Core.AttachmentId,
+                      rev: Core.RevisionId,
+                      attachment: Core.Attachment,
+                      type: string): Promise<Core.Response>;
 
          /**
-         * Attaches a binary object to a document.
-         * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
-         * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
-         */
+          * Attaches a binary object to a document.
+          * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
+          * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
+          */
         putAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            attachment: Core.Attachment,
-            type: string,
-            callback: Core.Callback<Core.Error, Core.Response>): void;
+                      attachmentId: Core.AttachmentId,
+                      attachment: Core.Attachment,
+                      type: string,
+                      callback: Core.Callback<Core.Response>): void;
 
          /**
-         * Attaches a binary object to a document.
-         * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
-         * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
-         */
+          * Attaches a binary object to a document.
+          * This method will update an existing document to add the attachment, so it requires a rev if the document already exists.
+          * If the document doesn’t already exist, then this method will create an empty document containing the attachment.
+          */
         putAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            attachment: Core.Attachment,
-            type: string): Promise<Core.Response>;
+                      attachmentId: Core.AttachmentId,
+                      attachment: Core.Attachment,
+                      type: string): Promise<Core.Response>;
 
         /** Get attachment data */
         getAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            options: { rev?: Core.RevisionId},
-            callback: Core.Callback<Core.Error, Blob | Buffer>): void;
+                      attachmentId: Core.AttachmentId,
+                      options: { rev?: Core.RevisionId},
+                      callback: Core.Callback<Blob | Buffer>): void;
 
         /** Get attachment data */
         getAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            options: { rev?: Core.RevisionId}): Promise<Blob | Buffer>;
+                      attachmentId: Core.AttachmentId,
+                      options?: { rev?: Core.RevisionId}): Promise<Blob | Buffer>;
 
         /** Get attachment data */
         getAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            callback: Core.Callback<Core.Error, Blob | Buffer>): void;
-
-        /** Get attachment data */
-        getAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId): Promise<Blob | Buffer>;
+                      attachmentId: Core.AttachmentId,
+                      callback: Core.Callback<Blob | Buffer>): void;
 
         /** Delete an attachment from a doc. You must supply the rev of the existing doc. */
         removeAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            rev: Core.RevisionId,
-            callback: Core.Callback<Core.Error, Core.RemoveAttachmentResponse>): void;
+                         attachmentId: Core.AttachmentId,
+                         rev: Core.RevisionId,
+                         callback: Core.Callback<Core.RemoveAttachmentResponse>): void;
 
         /** Delete an attachment from a doc. You must supply the rev of the existing doc. */
         removeAttachment(docId: Core.DocumentId,
-            attachmentId: Core.AttachmentId,
-            rev: Core.RevisionId): Promise<Core.RemoveAttachmentResponse>;
+                         attachmentId: Core.AttachmentId,
+                         rev: Core.RevisionId): Promise<Core.RemoveAttachmentResponse>;
 
         /** Given a set of document/revision IDs, returns the document bodies (and, optionally, attachment data) for each ID/revision pair specified. */
-        bulkGet(options: Core.BulkGetOptions,
-            callback: Core.Callback<any, any>): void;
+        bulkGet<Model>(options: Core.BulkGetOptions,
+                       callback: Core.Callback<Core.BulkGetResponse<Content & Model>>): void;
 
         /** Given a set of document/revision IDs, returns the document bodies (and, optionally, attachment data) for each ID/revision pair specified. */
-        bulkGet(options: Core.BulkGetOptions): Promise<any>;
+        bulkGet<Model>(options: Core.BulkGetOptions): Promise<Core.BulkGetResponse<Content & Model>>;
 
         /** Given a set of document/revision IDs, returns the subset of those that do not correspond to revisions stored in the database */
-        revsDiff(diff : Core.RevisionDiffOptions,
-            callback: Core.Callback<Core.Error, Core.RevisionDiffResponse>): void;
+        revsDiff(diff: Core.RevisionDiffOptions,
+                 callback: Core.Callback<Core.RevisionDiffResponse>): void;
 
         /** Given a set of document/revision IDs, returns the subset of those that do not correspond to revisions stored in the database */
-        revsDiff(diff : Core.RevisionDiffOptions): Promise<Core.RevisionDiffResponse>;
+        revsDiff(diff: Core.RevisionDiffOptions): Promise<Core.RevisionDiffResponse>;
     }
 }
 
+//
 declare module 'pouchdb-core' {
   const PouchDb: PouchDB.Static;
   export = PouchDb;
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index ba06de7608..3b2e8d3542 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -1,3 +1,5 @@
+import * as PouchDB from 'pouchdb-core';
+
 function isString(someString: string) {
 }
 function isNumber(someNumber: number) {
@@ -17,7 +19,7 @@ function testAllDocs() {
 
             // check document property
             isNumber(doc!.foo);
-        })
+        });
     });
 
     db.allDocs({ startkey: "a", endkey: "b" });
@@ -37,7 +39,9 @@ function testAllDocs() {
 
 function testBulkDocs() {
     const db = new PouchDB<MyModel>();
-    type MyModel = { property: string };
+    interface MyModel {
+        property: string;
+    }
     let model = { property: 'test' };
     let model2 = { property: 'test' };
 
@@ -59,8 +63,8 @@ function testBulkGet() {
 }
 function testRevsDiff() {
     const db = new PouchDB<{}>();
-    db.revsDiff({'a': ['1-a', '2-b']}).then((result) => {});
-    db.revsDiff({'a': ['1-a', '2-b']}, (error, response) => {});
+    db.revsDiff({a: ['1-a', '2-b']}).then((result) => {});
+    db.revsDiff({a: ['1-a', '2-b']}, (error, response) => {});
 }
 
 function testCompact() {
@@ -84,7 +88,9 @@ function testDestroy() {
 }
 
 function testBasics() {
-    type MyModel = { property: string };
+    interface MyModel {
+        property: string;
+    }
     let model = { property: 'test' };
     const id = 'model';
 
@@ -114,7 +120,9 @@ function testBasics() {
 }
 
 function testRemove() {
-    type MyModel = { property: string };
+    interface MyModel {
+        property: string;
+    }
     const id = 'model';
     const rev = 'rev';
     let model = { _id: id, _rev: rev, existingDocProperty: 'any' };
@@ -141,7 +149,9 @@ function testRemove() {
 }
 
 function testChanges() {
-    type MyModel = { foo: string };
+    interface MyModel {
+        foo: string;
+    }
     const db = new PouchDB<MyModel>();
 
     db.changes({
@@ -164,7 +174,7 @@ function testChanges() {
         let _id: string = change.id;
         let _seq: number = change.seq as number;
         let _seq_couch20: string = change.seq as string;
-        let _changes: { rev: string }[] = change.changes;
+        let _changes: Array<{ rev: string }> = change.changes;
         let _foo: string = change.doc!.foo;
         let _deleted: boolean | undefined = change.doc!._deleted;
         let _attachments: PouchDB.Core.Attachments | undefined = change.doc!._attachments;
@@ -178,7 +188,7 @@ function testChanges() {
         let _id: string = change.id;
         let _seq: number = change.seq as number;
         let _seq_couch20: string = change.seq as string;
-        let _changes: { rev: string }[] = change.changes;
+        let _changes: Array<{ rev: string }> = change.changes;
         let _deleted: boolean | undefined = change.doc!._deleted;
         let _attachments: PouchDB.Core.Attachments | undefined = change.doc!._attachments;
     });
@@ -210,3 +220,30 @@ function testRemoteOptions() {
         skip_setup: true
     });
 }
+
+function heterogeneousGenericsDatabase(db: PouchDB.Database) {
+    interface Cat {
+        meow: string;
+    }
+
+    interface Boot {
+        thud: boolean;
+    }
+
+    db.allDocs<Cat>({ startkey: 'cat/', endkey: 'cat/\uffff', include_docs: true })
+        .then(cats => {
+            for (let row of cats.rows) {
+                if (row.doc) {
+                    row.doc.meow; // $ExpectType string
+                }
+            }
+        });
+    db.allDocs<Boot>({ startkey: 'boot/', endkey: 'boot/\uffff', include_docs: true })
+        .then(boots => {
+            for (let row of boots.rows) {
+                if (row.doc) {
+                    row.doc.thud; // $ExpectType boolean
+                }
+            }
+        });
+}
diff --git a/types/pouchdb-core/tslint.json b/types/pouchdb-core/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-core/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-find/index.d.ts b/types/pouchdb-find/index.d.ts
index a125d42ee4..f598b5311d 100644
--- a/types/pouchdb-find/index.d.ts
+++ b/types/pouchdb-find/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for pouchdb-find v0.10.0
+// Type definitions for pouchdb-find 0.10
 // Project: https://pouchdb.com/
 // Definitions by: Jakub Navratil <https://github.com/trubit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
-
     namespace Find {
-
         interface ConditionOperators {
             /** Match fields "less than" this one. */
             $lt?: any;
@@ -47,7 +49,7 @@ declare namespace PouchDB {
              * Non-integer values result in a 404 status.
              * Matches documents where (field % Divisor == Remainder) is true, and only when the document field is an integer.
              * [divisor, remainder]
-             * */
+             */
             $mod?: [number, number];
 
             /** A regular expression pattern to match against the document field. Only matches when the field is a string value and matches the supplied regular expression. */
@@ -79,7 +81,7 @@ declare namespace PouchDB {
             _id?: ConditionOperators;
         }
 
-        interface FindRequest<Content extends Core.Encodable> {
+        interface FindRequest<Content extends {}> {
             /** Defines a selector to filter the results. Required */
             selector: Selector;
 
@@ -96,8 +98,8 @@ declare namespace PouchDB {
             skip?: number;
         }
 
-        interface FindResponse<Content extends Core.Encodable> {
-            docs: Core.Document<Content>[];
+        interface FindResponse<Content extends {}> {
+            docs: Array<Core.Document<Content>>;
         }
 
         interface CreateIndexOptions {
@@ -113,10 +115,10 @@ declare namespace PouchDB {
 
                 /** Only supports 'json', and it's also the default */
                 type?: string;
-            }
+            };
         }
 
-        interface CreateIndexResponse<Content extends Core.Encodable> {
+        interface CreateIndexResponse<Content extends {}> {
             result: string;
         }
 
@@ -131,14 +133,14 @@ declare namespace PouchDB {
             type: string;
 
             def: {
-                fields: {
+                fields: Array<{
                     [fieldName: string]: string
-                }[]
-            }
+                }>;
+            };
         }
 
-        interface GetIndexesResponse<Content extends Core.Encodable> {
-            indexes: Index[]
+        interface GetIndexesResponse<Content extends {}> {
+            indexes: Index[];
         }
 
         interface DeleteIndexOptions {
@@ -152,33 +154,30 @@ declare namespace PouchDB {
             type?: string;
         }
 
-        interface DeleteIndexResponse<Content extends Core.Encodable> {
+        interface DeleteIndexResponse<Content extends {}> {
             [propertyName: string]: any;
         }
-
     }
 
-    interface Database<Content extends Core.Encodable> {
-
+    interface Database<Content extends {} = {}> {
         /** Query the API to find some documents. */
         find(request: Find.FindRequest<Content>,
-            callback: Core.Callback<any, Find.FindResponse<Content>>): void;
+             callback: Core.Callback<Find.FindResponse<Content>>): void;
         find(request?: Find.FindRequest<Content>): Promise<Find.FindResponse<Content>>;
 
         /** Create an index if it doesn't exist, or do nothing if it already exists. */
         createIndex(index: Find.CreateIndexOptions,
-            callback: Core.Callback<any, Find.CreateIndexResponse<Content>>): void;
+                    callback: Core.Callback<Find.CreateIndexResponse<Content>>): void;
         createIndex(index?: Find.CreateIndexOptions): Promise<Find.CreateIndexResponse<Content>>;
 
         /** Get a list of all the indexes you've created. Also tells you about the special _all_docs index, i.e. the default index on the _id field. */
-        getIndexes(callback: Core.Callback<any, Find.GetIndexesResponse<Content>>): void;
+        getIndexes(callback: Core.Callback<Find.GetIndexesResponse<Content>>): void;
         getIndexes(): Promise<Find.GetIndexesResponse<Content>>;
 
         /** Delete an index and clean up any leftover data on the disk. */
         deleteIndex(index: Find.DeleteIndexOptions,
-            callback: Core.Callback<any, Find.DeleteIndexResponse<Content>>): void;
+                    callback: Core.Callback<Find.DeleteIndexResponse<Content>>): void;
         deleteIndex(index?: Find.DeleteIndexOptions): Promise<Find.DeleteIndexResponse<Content>>;
-
     }
 }
 
diff --git a/types/pouchdb-find/pouchdb-find-tests.ts b/types/pouchdb-find/pouchdb-find-tests.ts
index d9fe07536f..411b6c1b00 100644
--- a/types/pouchdb-find/pouchdb-find-tests.ts
+++ b/types/pouchdb-find/pouchdb-find-tests.ts
@@ -7,11 +7,11 @@ function testFind() {
         sort: ['fieldName'],
         limit: 1,
         skip: 1
-    })
+    });
 
     db.find({
         selector: {},
-        sort: [{'fieldName': 'asc'}]
+        sort: [{fieldName: 'asc'}]
     });
 
     // test combinations of selectors
diff --git a/types/pouchdb-find/tslint.json b/types/pouchdb-find/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-find/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-http/index.d.ts b/types/pouchdb-http/index.d.ts
index 8dde8993e9..8c5dfd3104 100644
--- a/types/pouchdb-http/index.d.ts
+++ b/types/pouchdb-http/index.d.ts
@@ -1,11 +1,15 @@
-// Type definitions for pouchdb-http v6.1.2
+// Type definitions for pouchdb-http 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-http" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare module 'pouchdb-http' {
     const PouchDb: PouchDB.Static;
     export = PouchDb;
diff --git a/types/pouchdb-http/pouchdb-http-tests.ts b/types/pouchdb-http/pouchdb-http-tests.ts
index 05a0f1667d..ebf0b04bed 100644
--- a/types/pouchdb-http/pouchdb-http-tests.ts
+++ b/types/pouchdb-http/pouchdb-http-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
     let model: PouchDB.Core.Document<MyModel>;
 
     let db = new PouchDB<MyModel>('myDb', {
diff --git a/types/pouchdb-http/tslint.json b/types/pouchdb-http/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-http/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-mapreduce/index.d.ts b/types/pouchdb-mapreduce/index.d.ts
index 401f70afb0..3ac60c8293 100644
--- a/types/pouchdb-mapreduce/index.d.ts
+++ b/types/pouchdb-mapreduce/index.d.ts
@@ -1,21 +1,40 @@
-// Type definitions for pouchdb-mapreduce v6.1.2
+// Type definitions for pouchdb-mapreduce 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 
-declare namespace PouchDB {
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
 
-    interface Filter {
-        map: (doc: any) => void;
-        reduce?: (key: string, value: any) => any;
+declare namespace PouchDB {
+    type BuiltInReducers = '_sum' | '_count' | '_stats';
+    /**
+     * CouchDB-style Map function
+     *
+     * @param emit CouchDB does not support emit as an argument and maps defined this way will always run locally
+     */
+    type Map<Content extends {}, Result> = (doc: Content, emit?: (key: any, value: Content | Result) => void) => void;
+    /**
+     * CouchDB-style Reduction function
+     *
+     * @param keys From CouchDB documentation: Array of pairs of docid-key for related map function results;
+     *             PouchDB may pass a simple array and also supports complex keys.
+     */
+    type Reducer<Content extends {}, Reduction> = (keys: any | null, values: Content[] | Reduction[], rereduce: boolean) => Reduction[] | Reduction;
+
+    interface Filter<Content extends {}, Reduction> {
+        // Assume that Content | Reduction is enough leverage in most cases to handle intermediate map emits
+        map: Map<Content, Reduction>;
+        reduce?: Reducer<Content, Reduction> | BuiltInReducers | string;
     }
 
     namespace Query {
-        interface Options {
+        interface Options<Content extends {}, Reduction> {
             /** Reduce function, or the string name of a built-in function: '_sum', '_count', or '_stats'. */
-            reduce?: ((...args: any[]) => void) | '_sum' | '_count' | '_stats' | boolean;
+            reduce?: Reducer<Content, Reduction> | BuiltInReducers | boolean;
             /** Include the document in each row in the doc field. */
             include_docs?: boolean;
             /** Include conflicts in the _conflicts field of a doc. */
@@ -55,19 +74,19 @@ declare namespace PouchDB {
             stale?: 'ok' | 'update_after';
         }
 
-        interface Response<Content extends Core.Encodable> {
+        interface Response<Content extends {}> {
             total_rows: number;
             offset: number;
-            rows: {
+            rows: Array<{
                 id: any;
                 key: any;
                 value: any;
                 doc?: Core.ExistingDocument<Content & Core.AllDocsMeta>;
-            }[]
+            }>;
         }
     }
 
-    export interface Database<Content extends Core.Encodable> {
+    interface Database<Content extends {} = {}> {
         /**
          * Cleans up any stale map/reduce indexes.
          *
@@ -76,7 +95,7 @@ declare namespace PouchDB {
          * to take up space on disk. viewCleanup() removes these unnecessary
          * index files.
          */
-        viewCleanup(callback: PouchDB.Core.Callback<any,Core.BasicResponse>): void;
+        viewCleanup(callback: PouchDB.Core.Callback<Core.BasicResponse>): void;
         /**
          * Cleans up any stale map/reduce indexes.
          *
@@ -91,17 +110,17 @@ declare namespace PouchDB {
          * Invoke a map/reduce function, which allows you to perform more complex queries
          * on PouchDB than what you get with allDocs().
          */
-        query(fun: string | Filter | Function, opts: Query.Options, callback: (err: Core.Error, res: Query.Response<Content>) => void): void;
+        query<Result, Model = Content>(fun: string | Map<Model, Result> | Filter<Model, Result>, opts: Query.Options<Model, Result>, callback: Core.Callback<Query.Response<Result>>): void;
         /**
          * Invoke a map/reduce function, which allows you to perform more complex queries
          * on PouchDB than what you get with allDocs().
          */
-        query(fun: string | Filter | Function, callback: (err: Core.Error, res: Query.Response<Content>) => void): void;
+        query<Result, Model = Content>(fun: string | Map<Model, Result> | Filter<Model, Result>, callback: Core.Callback<Query.Response<Result>>): void;
         /**
          * Invoke a map/reduce function, which allows you to perform more complex queries
          * on PouchDB than what you get with allDocs().
          */
-        query(fun: string | Filter | Function, opts?: Query.Options): Promise<Query.Response<Content>>;
+        query<Result, Model = Content>(fun: string | Map<Model, Result> | Filter<Model, Result>, opts?: Query.Options<Model, Result>): Promise<Query.Response<Result>>;
     }
 }
 
diff --git a/types/pouchdb-mapreduce/pouchdb-mapreduce-tests.ts b/types/pouchdb-mapreduce/pouchdb-mapreduce-tests.ts
index 6f6d941e83..6c028a5d93 100644
--- a/types/pouchdb-mapreduce/pouchdb-mapreduce-tests.ts
+++ b/types/pouchdb-mapreduce/pouchdb-mapreduce-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
     let model: PouchDB.Core.Document<MyModel>;
 
     let db = new PouchDB<MyModel>('mydb');
@@ -8,14 +10,14 @@ function testConstructor() {
 }
 
 function testQuery() {
-    let pouch = new PouchDB<{}>('mydb');
+    let pouch = new PouchDB('mydb');
     // find pokemon with name === 'Pika pi!'
     pouch.query('my_index/by_name', {
         key          : 'Pika pi!',
         include_docs : true
-    }).then(function (result) {
+    }).then((result) => {
         // handle result
-    }).catch(function (err) {
+    }).catch((err) => {
         // handle errors
     });
 
@@ -25,10 +27,9 @@ function testQuery() {
         endkey       : 'P\uffff',
         limit        : 5,
         include_docs : true
-    }).then(function (result) {
+    }).then((result) => {
         // handle result
-    }).catch(function (err) {
+    }).catch((err) => {
         // handle errors
     });
-
 }
diff --git a/types/pouchdb-mapreduce/tslint.json b/types/pouchdb-mapreduce/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-mapreduce/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-node/index.d.ts b/types/pouchdb-node/index.d.ts
index aed20c7192..c0f48adb23 100644
--- a/types/pouchdb-node/index.d.ts
+++ b/types/pouchdb-node/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for pouchdb-node v6.1.2
+// Type definitions for pouchdb-node 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types="pouchdb-core" />
 /// <reference types="pouchdb-adapter-leveldb" />
@@ -9,6 +10,9 @@
 /// <reference types="pouchdb-mapreduce" />
 /// <reference types="pouchdb-replication" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
     namespace Core {
         interface DatabaseInfo {
diff --git a/types/pouchdb-node/pouchdb-node-tests.ts b/types/pouchdb-node/pouchdb-node-tests.ts
index 107dcf00e8..21b42558f0 100644
--- a/types/pouchdb-node/pouchdb-node-tests.ts
+++ b/types/pouchdb-node/pouchdb-node-tests.ts
@@ -1,5 +1,7 @@
 function testConstructor() {
-    type MyModel = { numericProperty: number };
+    interface MyModel {
+        numericProperty: number;
+    }
     let model: PouchDB.Core.Document<MyModel>;
 
     let db = new PouchDB<MyModel>('myDb', {
diff --git a/types/pouchdb-node/tslint.json b/types/pouchdb-node/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-node/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index c88ebd4e23..aeddd61872 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for pouchdb-replication v6.1.2
+// Type definitions for pouchdb-replication 6.1
 // Project: https://pouchdb.com/
 // Definitions by: Jakub Navratil <https://github.com/trubit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="pouchdb-core" />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare namespace PouchDB {
-
     namespace Replication {
-
         interface ReplicateOptions {
             /** If true, starts subscribing to future changes in the source database and continue replicating them. */
             live?: boolean;
@@ -25,7 +27,7 @@ declare namespace PouchDB {
              * To use a view function, pass '_view' here and provide a reference to the view function in options.view.
              * See filtered changes for details.
              */
-            filter?: string | {(doc: any, params: any): any};
+            filter?: string | ((doc: any, params: any) => any);
 
             /** Only show changes for docs with these ids (array of strings). */
             doc_ids?: string[];
@@ -76,38 +78,35 @@ declare namespace PouchDB {
              * Defaults to a function that chooses a random backoff between 0 and 2 seconds and doubles every time it fails to connect.
              * The default delay will never exceed 10 minutes.
              */
-            back_off_function?: (delay: number) => number;
+            back_off_function?(delay: number): number;
         }
 
-        interface ReplicationEventEmitter<Content extends Core.Encodable, C, F> extends EventEmitter {
+        interface ReplicationEventEmitter<Content extends {}, C, F> extends EventEmitter {
             on(event: 'change', listener: (info: C) => any): this;
-            on(event: 'paused', listener: (err: {}) => any): this;
+            on(event: 'paused' | 'denied' | 'error', listener: (err: {}) => any): this;
             on(event: 'active', listener: () => any): this;
-            on(event: 'denied', listener: (err: {}) => any): this;
             on(event: 'complete', listener: (info: F) => any): this;
-            on(event: 'error', listener: (err: {}) => any): this;
 
             cancel(): void;
         }
 
-        interface Replication<Content extends Core.Encodable>
+        interface Replication<Content extends {}>
             extends ReplicationEventEmitter<Content, ReplicationResult<Content>, ReplicationResultComplete<Content>>,
                     Promise<ReplicationResultComplete<Content>> {
-
         }
 
-        interface ReplicationResult<Content extends Core.Encodable> {
+        interface ReplicationResult<Content extends {}> {
             doc_write_failures: number;
             docs_read: number;
             docs_written: number;
-            last_seq: number,
-            start_time: Date,
-            ok: boolean,
+            last_seq: number;
+            start_time: Date;
+            ok: boolean;
             errors: any[];
-            docs: Core.ExistingDocument<Content>[];
+            docs: Array<Core.ExistingDocument<Content>>;
         }
 
-        interface ReplicationResultComplete<Content extends Core.Encodable> extends ReplicationResult<Content> {
+        interface ReplicationResultComplete<Content extends {}> extends ReplicationResult<Content> {
             end_time: Date;
             status: string;
         }
@@ -117,26 +116,23 @@ declare namespace PouchDB {
             pull?: ReplicateOptions;
         }
 
-        interface Sync<Content extends Core.Encodable>
+        interface Sync<Content extends {}>
             extends ReplicationEventEmitter<Content, SyncResult<Content>, SyncResultComplete<Content>>,
                     Promise<SyncResultComplete<Content>> {
-
         }
 
-        interface SyncResult<Content extends Core.Encodable> {
+        interface SyncResult<Content extends {}> {
             direction: 'push' | 'pull';
             change: ReplicationResult<Content>;
         }
 
-        interface SyncResultComplete<Content extends Core.Encodable> {
+        interface SyncResultComplete<Content extends {}> {
             push?: ReplicationResultComplete<Content>;
             pull?: ReplicationResultComplete<Content>;
         }
-
     }
 
     interface Static {
-
         /**
          * Replicate data from source to target. Both the source and target can be a PouchDB instance or a string
          * representing a CouchDB database URL or the name of a local PouchDB database. If options.live is true,
@@ -147,7 +143,7 @@ declare namespace PouchDB {
             source: string | Database<Content>,
             target: string | Database<Content>,
             options?: Replication.ReplicateOptions,
-            callback?: Core.Callback<any, Replication.ReplicationResultComplete<Content>>
+            callback?: Core.Callback<Replication.ReplicationResultComplete<Content>>
         ): Replication.Replication<Content>;
 
         /**
@@ -163,13 +159,11 @@ declare namespace PouchDB {
             source: string | Database<Content>,
             target: string | Database<Content>,
             options?: Replication.SyncOptions,
-            callback?: Core.Callback<any, Replication.SyncResultComplete<Content>>
+            callback?: Core.Callback<Replication.SyncResultComplete<Content>>
         ): Replication.Sync<Content>;
-
     }
 
-    interface Database<Content extends Core.Encodable> {
-
+    interface Database<Content extends {} = {}> {
         replicate: {
             /**
              * Replicate data to `target`. Both the source and target can be a PouchDB instance
@@ -180,7 +174,7 @@ declare namespace PouchDB {
             to<Content>(
                 target: string | Database<Content>,
                 options?: Replication.ReplicateOptions,
-                callback?: Core.Callback<any, Replication.ReplicationResultComplete<Content>>
+                callback?: Core.Callback<Replication.ReplicationResultComplete<Content>>
             ): Replication.Replication<Content>;
 
             /**
@@ -192,7 +186,7 @@ declare namespace PouchDB {
             from<Content>(
                 source: string | Database<Content>,
                 options?: Replication.ReplicateOptions,
-                callback?: Core.Callback<any, Replication.ReplicationResultComplete<Content>>
+                callback?: Core.Callback<Replication.ReplicationResultComplete<Content>>
             ): Replication.Replication<Content>;
         };
 
@@ -208,9 +202,8 @@ declare namespace PouchDB {
         sync<Content>(
             remote: string | Database<Content>,
             options?: Replication.SyncOptions,
-            callback?: Core.Callback<any, Replication.SyncResultComplete<Content>>
+            callback?: Core.Callback<Replication.SyncResultComplete<Content>>
         ): Replication.Sync<Content>;
-
     }
 }
 
diff --git a/types/pouchdb-replication/pouchdb-replication-tests.ts b/types/pouchdb-replication/pouchdb-replication-tests.ts
index 9cf352bed6..3eb4a0d86e 100644
--- a/types/pouchdb-replication/pouchdb-replication-tests.ts
+++ b/types/pouchdb-replication/pouchdb-replication-tests.ts
@@ -1,13 +1,13 @@
 /** @todo make some real tests */
 function testReplication() {
-    type Model = { foo: number };
+    interface Model {
+        foo: number;
+    }
     const db = new PouchDB<Model>();
 
     db.replicate.to('').then((res: PouchDB.Replication.ReplicationResultComplete<Model>) => {
-
     });
 
     db.replicate.from('').then((res: PouchDB.Replication.ReplicationResultComplete<Model>) => {
-
     });
 }
diff --git a/types/pouchdb-replication/tslint.json b/types/pouchdb-replication/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-replication/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb-upsert/index.d.ts b/types/pouchdb-upsert/index.d.ts
index 03f415ea90..e893a052aa 100644
--- a/types/pouchdb-upsert/index.d.ts
+++ b/types/pouchdb-upsert/index.d.ts
@@ -1,13 +1,16 @@
-// Type definitions for pouchdb-upsert v2.0.1
+// Type definitions for pouchdb-upsert 2.0
 // Project: https://github.com/pouchdb/upsert
 // Definitions by: Keith D. Moore <https://github.com/keithdmoore>, Andrew Mitchell <https://github.com/hotforfeature>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="pouchdb-core" />
 
-declare namespace PouchDB {
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
 
-  interface Database<Content extends Core.Encodable> {
+declare namespace PouchDB {
+  interface Database<Content extends {} = {}> {
     /**
      * Perform an upsert (update or insert) operation. Returns a Promise.
      *
@@ -17,7 +20,7 @@ declare namespace PouchDB {
      * If the document does not already exist, then {} will be the input to diffFunc.
      *
      */
-    upsert(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content>): Promise<Core.Response>;
+    upsert<Model>(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content & Model>): Promise<Core.Response>;
 
     /**
      * Perform an upsert (update or insert) operation. If a callback is not provided, the Promise based version
@@ -29,8 +32,8 @@ declare namespace PouchDB {
      * If the document does not already exist, then {} will be the input to diffFunc.
      * @param callback - called with the results after operation is completed.
      */
-    upsert(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content>,
-           callback: Core.Callback<Core.Error, Core.Response>): void;
+    upsert<Model>(docId: Core.DocumentId, diffFun: UpsertDiffCallback<Content & Model>,
+                  callback: Core.Callback<Core.Response>): void;
 
     /**
      * Put a new document with the given docId, if it doesn't already exist. Returns a Promise.
@@ -38,7 +41,7 @@ declare namespace PouchDB {
      * @param doc - the document to insert. Should contain an _id if docId is not specified
      * If the document already exists, then the Promise will just resolve immediately.
      */
-    putIfNotExists(doc: Core.Document<Content>): Promise<Core.Response>;
+    putIfNotExists<Model>(doc: Core.Document<Content & Model>): Promise<Core.Response>;
 
     //
     /**
@@ -51,13 +54,11 @@ declare namespace PouchDB {
      * If you don't specify a callback, then the Promise version of this function will be invoked and it
      * will return a Promise.
      */
-    putIfNotExists(doc: Core.Document<Content>,
-                   callback: Core.Callback<Core.Error, Core.Response>): void;
+    putIfNotExists<Model>(doc: Core.Document<Content & Model>,
+                          callback: Core.Callback<Core.Response>): void;
   }
 
-  interface UpsertDiffCallback<Content extends Core.Encodable> {
-    (doc: Core.Document<Content>): Core.Document<Content>|boolean;
-  }
+  type UpsertDiffCallback<Content extends {}> = (doc: Core.Document<Content>) => Core.Document<Content> | boolean;
 }
 
 declare module 'pouchdb-upsert' {
diff --git a/types/pouchdb-upsert/pouchdb-upsert-tests.ts b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
index 7da1c46267..52efc75099 100644
--- a/types/pouchdb-upsert/pouchdb-upsert-tests.ts
+++ b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
@@ -1,7 +1,10 @@
 import * as pouchdbUpsert from 'pouchdb-upsert';
 PouchDB.plugin(pouchdbUpsert);
 
-type UpsertDocModel = { _id: 'test-doc1', name: 'test' };
+interface UpsertDocModel {
+   _id: 'test-doc1';
+   name: 'test';
+}
 let docToUpsert: PouchDB.Core.Document<UpsertDocModel>;
 const db = new PouchDB<UpsertDocModel>();
 
@@ -14,7 +17,7 @@ function testUpsert_WithPromise_AndReturnDoc() {
 }
 
 function testUpsert_WithPromise_AndReturnBoolean() {
-  db.upsert(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+  db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return false;
   }).then((res: PouchDB.Core.Response) => {
@@ -22,7 +25,7 @@ function testUpsert_WithPromise_AndReturnBoolean() {
 }
 
 function testUpsert_WithCallback_AndReturnDoc() {
-  db.upsert(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+  db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return doc;
   }, (res: PouchDB.Core.Response) => {});
@@ -30,7 +33,7 @@ function testUpsert_WithCallback_AndReturnDoc() {
 
 function testUpsert_WithCallback_AndReturnBoolean() {
   // callback return boolean
-  db.upsert(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+  db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
     // Make some updates....
     return false;
   }, (res: PouchDB.Core.Response) => {});
diff --git a/types/pouchdb-upsert/tslint.json b/types/pouchdb-upsert/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb-upsert/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pouchdb/index.d.ts b/types/pouchdb/index.d.ts
index e14e4c421f..48bc6279ff 100644
--- a/types/pouchdb/index.d.ts
+++ b/types/pouchdb/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for pouchdb v6.1.2
+// Type definitions for pouchdb 6.1
 // Project: https://pouchdb.com/
 // 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
 
 /// <reference types='pouchdb-adapter-fruitdown' />
 /// <reference types='pouchdb-adapter-http' />
@@ -18,6 +19,9 @@
 /// <reference types='pouchdb-node' />
 /// <reference types='pouchdb-replication' />
 
+// TODO: Fixing this lint error will require a large refactor
+/* tslint:disable:no-single-declare-module */
+
 declare module 'pouchdb' {
     const plugin: PouchDB.Static;
     export = plugin;
diff --git a/types/pouchdb/pouchdb-tests.ts b/types/pouchdb/pouchdb-tests.ts
index ef7da0fd83..25e3861b99 100644
--- a/types/pouchdb/pouchdb-tests.ts
+++ b/types/pouchdb/pouchdb-tests.ts
@@ -19,7 +19,7 @@ function testAllDocs() {
 
             // check document property
             isNumber(doc.foo);
-        })
+        });
     });
 
     db.allDocs({ startkey: "a", endkey: "b" });
@@ -48,7 +48,9 @@ function testDestroy() {
 }
 
 function testBasics() {
-    type MyModel = { property: 'someProperty '};
+    interface MyModel {
+        property: 'someProperty ';
+    }
     let model: PouchDB.Core.Document<MyModel>;
     const id = 'model';
 
diff --git a/types/pouchdb/tslint.json b/types/pouchdb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pouchdb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/project-oxford/index.d.ts b/types/project-oxford/index.d.ts
index db322e3fa8..5a85f26ad6 100644
--- a/types/project-oxford/index.d.ts
+++ b/types/project-oxford/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/felixrieseberg/project-oxford
 // Definitions by: Scott Southwood <https://github.com/scsouthw/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/promise-dag/index.d.ts b/types/promise-dag/index.d.ts
new file mode 100644
index 0000000000..d5c401a8c5
--- /dev/null
+++ b/types/promise-dag/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for promise-dag 1.0
+// Project: https://github.com/vvvvalvalval/promise-dag#readme
+// Definitions by: Sjoerd Diepen <https://github.com/OSjoerdWie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Step = string | ((...args: any[]) => PromiseLike<any>);
+
+export type Run<P extends PromiseLike<any>> = (steps: { [name: string]: Step[]; }, required?: string[]) => { [name: string]: P; };
+
+export interface PromiseImplementation<P extends PromiseLike<any>> {
+	resolve(value: any): P;
+	reject(value: any): P;
+	all(values: any[]): P;
+}
+
+export const run: Run<Promise<any>>;
+
+export function implement<P extends PromiseLike<any>>(implementation: PromiseImplementation<P>): Run<P>;
diff --git a/types/promise-dag/promise-dag-tests.ts b/types/promise-dag/promise-dag-tests.ts
new file mode 100644
index 0000000000..4286915970
--- /dev/null
+++ b/types/promise-dag/promise-dag-tests.ts
@@ -0,0 +1,35 @@
+import * as promiseDag from "promise-dag";
+
+// describe the computation as steps which depend on previous steps.
+// in this cooking example, functions which return a promise are prefixed with `p_`.
+const mushroomPastaRecipe = {
+	hotWater: [(): Promise<string> => p_boilWater("1L")],
+	rawPasta: [(): Promise<string> => p_pickIngredient("pasta")],
+	cookedPasta: ["hotWater", "rawPasta", (hotWater: string, rawPasta: string) => p_boil(hotWater, rawPasta, "10 minutes")],
+
+	meal: ["cookedPasta", (preparedMeal: string): Promise<string> => Promise.resolve(preparedMeal)]
+};
+
+const runCustomPromise = promiseDag.implement({
+	resolve: (v: any): Promise<any> => Promise.resolve(v),
+	reject: (err: any): Promise<any> => Promise.resolve(err),
+	all: (ps: any[] | Array<PromiseLike<any>>): Promise<any[]> => Promise.all(ps)
+});
+
+runCustomPromise(mushroomPastaRecipe, ["meal"])["meal"].then(eat);
+
+function eat(meal: string) {
+	let consume = `eating ${meal}`;
+}
+
+function p_boilWater(volume: string): Promise<string> {
+	return Promise.resolve(volume);
+}
+
+function p_pickIngredient(ingredient: string): Promise<string> {
+	return Promise.resolve(ingredient);
+}
+
+function p_boil(volume: string, ingredient: string, duration: string): Promise<string> {
+	return Promise.resolve(`cooked ${ingredient} in ${volume} for ${duration}`);
+}
diff --git a/types/promise-dag/tsconfig.json b/types/promise-dag/tsconfig.json
new file mode 100644
index 0000000000..97423097e2
--- /dev/null
+++ b/types/promise-dag/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-dag-tests.ts"
+    ]
+}
diff --git a/types/promise-dag/tslint.json b/types/promise-dag/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promise-dag/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/promisify-supertest/index.d.ts b/types/promisify-supertest/index.d.ts
index 5c0ea6251a..9f59afdb89 100644
--- a/types/promisify-supertest/index.d.ts
+++ b/types/promisify-supertest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/promisify-supertest
 // Definitions by: Leo Liang <https://github.com/aleung/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.2
 
 // Mostly copy-pasted from supertest.d.ts
 
diff --git a/types/prosemirror-collab/index.d.ts b/types/prosemirror-collab/index.d.ts
index a04c72ecf8..039f9d3b8f 100644
--- a/types/prosemirror-collab/index.d.ts
+++ b/types/prosemirror-collab/index.d.ts
@@ -1,17 +1,16 @@
-// Type definitions for prosemirror-collab 0.18
+// Type definitions for prosemirror-collab 0.21
 // Project: https://github.com/ProseMirror/prosemirror-collab
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { Plugin } from 'prosemirror-state'
-import { EditorState } from 'prosemirror-state'
-import { Step } from 'prosemirror-transform'
-import { Transaction } from 'prosemirror-state'
+import { Plugin } from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
+import { Step } from 'prosemirror-transform';
+import { Transaction } from 'prosemirror-state';
 
-declare module "prosemirror-collab" {
-  export function collab(config?: { version?: number, clientID?: number }): Plugin
-  export function receiveTransaction(state: EditorState, steps: Step[], clientIDs: number[]): Transaction
-  export function sendableSteps(state: EditorState): { version: number, steps: Step[], clientID: number, origins: Transaction[] } | void
-  export function getVersion(state: EditorState): number
-
-}
\ No newline at end of file
+export function collab<T>(config?: { version?: number, clientID?: number | string }): Plugin<T>;
+export function receiveTransaction(state: EditorState, steps: Step[], clientIDs: Array<number | string>): Transaction;
+export function sendableSteps(state: EditorState): { version: number, steps: Step[], clientID: number | string, origins: Transaction[] } | null;
+export function getVersion(state: EditorState): number;
diff --git a/types/prosemirror-collab/prosemirror-collab-tests.ts b/types/prosemirror-collab/prosemirror-collab-tests.ts
index 43071590d6..8970399c59 100644
--- a/types/prosemirror-collab/prosemirror-collab-tests.ts
+++ b/types/prosemirror-collab/prosemirror-collab-tests.ts
@@ -3,3 +3,10 @@ import {EditorState} from 'prosemirror-state';
 
 let state = new EditorState();
 let version = collab.getVersion(state);
+
+let plugin;
+plugin = collab.collab();
+plugin = collab.collab({ version: 1 });
+plugin = collab.collab({ clientID: 1 });
+
+let sendableSteps = collab.sendableSteps(state);
diff --git a/types/prosemirror-collab/tsconfig.json b/types/prosemirror-collab/tsconfig.json
index f3d733cd97..1820ac70bd 100644
--- a/types/prosemirror-collab/tsconfig.json
+++ b/types/prosemirror-collab/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "prosemirror-collab-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/prosemirror-collab/tslint.json b/types/prosemirror-collab/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-collab/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-commands/index.d.ts b/types/prosemirror-commands/index.d.ts
index 662f43a045..9309a0522f 100644
--- a/types/prosemirror-commands/index.d.ts
+++ b/types/prosemirror-commands/index.d.ts
@@ -1,35 +1,33 @@
-// Type definitions for prosemirror-commands 0.18
+// Type definitions for prosemirror-commands 0.21
 // Project: https://github.com/ProseMirror/prosemirror-commands
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
+import { MarkType, Node, NodeType } from 'prosemirror-model';
+import { EditorState, Transaction } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
 
-import { EditorState } from 'prosemirror-state'
-import { Transaction } from 'prosemirror-state'
-import { EditorView } from 'prosemirror-view'
-import { NodeType } from 'prosemirror-model'
-import { MarkType } from 'prosemirror-model'
-import { ProsemirrorNode } from 'prosemirror-model'
-
-declare module "prosemirror-commands" {
-  export function deleteSelection(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function joinBackward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean
-  export function joinForward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean
-  export function joinUp(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function joinDown(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function lift(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function newlineInCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function exitCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function createParagraphNear(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function liftEmptyBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function splitBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function splitBlockKeepMarks(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function selectParentNode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function wrapIn(nodeType: NodeType, attrs?: Object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean
-  export function setBlockType(nodeType: NodeType, attrs?: Object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean
-  export function toggleMark(markType: MarkType, attrs?: Object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean
-  export function autoJoin(command: (state: EditorState, fn?: (tr: Transaction) => void) => boolean, isJoinable: ((before: ProsemirrorNode, after: ProsemirrorNode) => boolean) | string[]): (state: EditorState, fn?: (tr: Transaction) => void) => boolean
-  export function chainCommands(...commands: ((p1: EditorState, fn?: (tr: Transaction) => void) => boolean)[]): (p1: EditorState, fn?: (tr: Transaction) => void) => boolean
-  export let baseKeymap: Object;
-
-}
\ No newline at end of file
+export function deleteSelection(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function joinBackward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+export function joinForward(state: EditorState, dispatch?: (tr: Transaction) => void, view?: EditorView): boolean;
+export function joinUp(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function joinDown(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function lift(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function newlineInCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function exitCode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function createParagraphNear(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function liftEmptyBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function splitBlock(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function splitBlockKeepMarks(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function selectParentNode(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function selectAll(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function wrapIn(nodeType: NodeType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function setBlockType(nodeType: NodeType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function toggleMark(markType: MarkType, attrs?: object): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function autoJoin(
+    command: (state: EditorState, p1?: (tr: Transaction) => void) => boolean,
+    isJoinable: ((before: Node, after: Node) => boolean) | string[]): (state: EditorState, p1?: (tr: Transaction) => void) => boolean;
+export function chainCommands(...commands: Array<(p1: EditorState, p2?: (tr: Transaction) => void) => boolean>): (p1: EditorState, p2?: (tr: Transaction) => void) => boolean;
+export const baseKeymap: { [key: string]: any };
diff --git a/types/prosemirror-commands/prosemirror-commands-tests.ts b/types/prosemirror-commands/prosemirror-commands-tests.ts
index f013a51d79..648dfeed4c 100644
--- a/types/prosemirror-commands/prosemirror-commands-tests.ts
+++ b/types/prosemirror-commands/prosemirror-commands-tests.ts
@@ -1,5 +1,11 @@
 import * as commands from 'prosemirror-commands';
-import {EditorState} from 'prosemirror-state';
+import { NodeType } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+
+let nodeType = new NodeType();
 
 let state = new EditorState();
 commands.deleteSelection(state);
+
+commands.baseKeymap["Ctrl-h"];
+commands.wrapIn(nodeType, { attr: 'value' });
diff --git a/types/prosemirror-commands/tslint.json b/types/prosemirror-commands/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-commands/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-history/index.d.ts b/types/prosemirror-history/index.d.ts
index 4eee0f42dc..dbbbded32e 100644
--- a/types/prosemirror-history/index.d.ts
+++ b/types/prosemirror-history/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for prosemirror-history 0.18
+// Type definitions for prosemirror-history 0.21
 // Project: https://github.com/ProseMirror/prosemirror-history
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { Plugin } from 'prosemirror-state'
-import { EditorState } from 'prosemirror-state'
-import { Transaction } from 'prosemirror-state'
+import { Plugin } from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
+import { Transaction } from 'prosemirror-state';
 
-declare module "prosemirror-history" {
-  export function history(config?: { depth?: number, newGroupDelay: number, preserveItems?: boolean }): Plugin
-  export function undo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function redo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean
-  export function undoDepth(state: EditorState): number
-  export function redoDepth(state: EditorState): number
-
-}
\ No newline at end of file
+export function closeHistory(tr: Transaction): Transaction;
+export function history<T>(config?: { depth?: number, newGroupDelay: number, preserveItems?: boolean }): Plugin<T>;
+export function undo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function redo(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
+export function undoDepth(state: EditorState): number;
+export function redoDepth(state: EditorState): number;
diff --git a/types/prosemirror-history/tslint.json b/types/prosemirror-history/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-history/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-inputrules/index.d.ts b/types/prosemirror-inputrules/index.d.ts
index 252ba59b2b..d2c6d9c876 100644
--- a/types/prosemirror-inputrules/index.d.ts
+++ b/types/prosemirror-inputrules/index.d.ts
@@ -1,35 +1,30 @@
-// Type definitions for prosemirror-inputrules 0.18
+// Type definitions for prosemirror-inputrules 0.21
 // Project: https://github.com/ProseMirror/prosemirror-inputrules
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+import { Node, NodeType } from 'prosemirror-model';
+import { EditorState, Plugin, Transaction } from 'prosemirror-state';
 
-import { EditorState } from 'prosemirror-state'
-import { Transaction } from 'prosemirror-state'
-import { Plugin } from 'prosemirror-state'
-import { NodeType } from 'prosemirror-model'
-import { ProsemirrorNode } from 'prosemirror-model'
-
-declare module "prosemirror-inputrules" {
-  export class InputRule {
-    constructor(match: RegExp, handler: string | ((state: EditorState, match: string[], start: number, end: number) => Transaction))
-
-  }
-  export function inputRules(config: { rules: InputRule[] }): Plugin
-  export let emDash: InputRule;
-  export let ellipsis: InputRule;
-  export let openDoubleQuote: InputRule;
-  export let closeDoubleQuote: InputRule;
-  export let openSingleQuote: InputRule;
-  export let closeSingleQuote: InputRule;
-  export let smartQuotes: InputRule[];
-  export let allInputRules: InputRule[];
-  export function wrappingInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: Object | ((p: string[]) => Object | void), joinPredicate?: (p1: string[], p2: ProsemirrorNode) => boolean): InputRule
-  export function textblockTypeInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: Object | ((p: string[]) => Object | void)): InputRule
-  export function blockQuoteRule(nodeType: NodeType): InputRule
-  export function orderedListRule(nodeType: NodeType): InputRule
-  export function bulletListRule(nodeType: NodeType): InputRule
-  export function codeBlockRule(nodeType: NodeType): InputRule
-  export function headingRule(nodeType: NodeType, maxLevel: number): InputRule
-
-}
\ No newline at end of file
+export class InputRule {
+  constructor(match: RegExp, handler: string | ((state: EditorState, match: string[], start: number, end: number) => Transaction | null | undefined))
+}
+export function inputRules(config: { rules: InputRule[] }): Plugin;
+export function undoInputRule(state: EditorState, dispatch?: (p: Transaction) => void): boolean;
+export let emDash: InputRule;
+export let ellipsis: InputRule;
+export let openDoubleQuote: InputRule;
+export let closeDoubleQuote: InputRule;
+export let openSingleQuote: InputRule;
+export let closeSingleQuote: InputRule;
+export let smartQuotes: InputRule[];
+export let allInputRules: InputRule[];
+export function wrappingInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: object | ((p: string[]) => object | null | undefined), joinPredicate?: (p1: string[], p2: Node) => boolean): InputRule;
+export function textblockTypeInputRule(regexp: RegExp, nodeType: NodeType, getAttrs?: object | ((p: string[]) => object | null | undefined)): InputRule;
+export function blockQuoteRule(nodeType: NodeType): InputRule;
+export function orderedListRule(nodeType: NodeType): InputRule;
+export function bulletListRule(nodeType: NodeType): InputRule;
+export function codeBlockRule(nodeType: NodeType): InputRule;
+export function headingRule(nodeType: NodeType, maxLevel: number): InputRule;
diff --git a/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts b/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
index 85317eaa4c..406a311184 100644
--- a/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
+++ b/types/prosemirror-inputrules/prosemirror-inputrules-tests.ts
@@ -1,5 +1,5 @@
 import * as inputrules from 'prosemirror-inputrules';
-import { NodeType } from 'prosemirror-model'
+import { NodeType } from 'prosemirror-model';
 
 let nodeType = new NodeType();
 let rule = inputrules.blockQuoteRule(nodeType);
diff --git a/types/prosemirror-inputrules/tslint.json b/types/prosemirror-inputrules/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-inputrules/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-keymap/index.d.ts b/types/prosemirror-keymap/index.d.ts
index 8ae14961c5..b61c0ff1c7 100644
--- a/types/prosemirror-keymap/index.d.ts
+++ b/types/prosemirror-keymap/index.d.ts
@@ -1,13 +1,16 @@
-// Type definitions for prosemirror-keymap 0.18
+// Type definitions for prosemirror-keymap 0.21
 // Project: https://github.com/ProseMirror/prosemirror-keymap
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { Plugin } from 'prosemirror-state'
-import { EditorView } from 'prosemirror-view'
+import { Plugin } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
 
-declare module "prosemirror-keymap" {
-  export function keymap(bindings: Object): Plugin
-  export function keydownHandler(bindings: Object): (view: EditorView, event: Event) => boolean
+export interface Bindings {
+    [key: string]: any;
+}
 
-}
\ No newline at end of file
+export function keymap<T>(bindings: Bindings): Plugin<T>;
+export function keydownHandler(bindings: Bindings): (view: EditorView, event: Event) => boolean;
diff --git a/types/prosemirror-keymap/tslint.json b/types/prosemirror-keymap/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/prosemirror-keymap/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prosemirror-markdown/index.d.ts b/types/prosemirror-markdown/index.d.ts
new file mode 100644
index 0000000000..0f91962dd6
--- /dev/null
+++ b/types/prosemirror-markdown/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for prosemirror-markdown 0.21
+// Project: https://github.com/ProseMirror/prosemirror-markdown
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { MarkdownIt } from 'markdown-it';
+import { Mark, Node, Schema } from 'prosemirror-model';
+
+export class MarkdownParser {
+  constructor(schema: Schema, tokenizer: MarkdownIt, tokens: { [key: string]: any });
+}
+
+export type NodeSerializer = (state: MarkdownSerializerState, node?: Node, parent?: Node, index?: number) => void;
+
+export interface MarkSerializer {
+  open: string | ((state: MarkdownSerializerState, mark: Mark) => string);
+  close: string | ((state: MarkdownSerializerState, mark: Mark) => string);
+  mixable?: boolean;
+}
+
+export interface NodeSerializerSpec {
+    [ nodeName: string ]: NodeSerializer;
+}
+
+export interface MarkSerializerSpec {
+    [ markName: string ]: MarkSerializer;
+}
+
+export class MarkdownSerializer {
+  constructor(nodes: NodeSerializerSpec, marks: MarkSerializerSpec);
+  serialize(content: Node, options?: { [key: string]: any }): string;
+  nodes: any;
+  marks: any;
+}
+
+export const defaultMarkdownSerializer: MarkdownSerializer;
+
+export class MarkdownSerializerState {
+  constructor(nodes: NodeSerializerSpec, marks: MarkSerializerSpec, options?: object);
+  flushClose(size: number): void;
+  wrapBlock(delim: string, firstDelim: string | null, node: Node, f: (...args: any[]) => void): void;
+  atBlank(): boolean;
+  ensureNewLine(): void;
+  write(content?: string): void;
+  closeBlock(node: Node): void;
+  text(text: string, escape?: boolean): void;
+  render(node: Node, parent: Node, index: number): void;
+  renderContent(parent: Node): void;
+  renderInline(parent: Node): void;
+  renderList(node: Node, delim: string, firstDelim: (number: number) => string): void;
+  esc(str: string, startOfLine?: boolean): string;
+  quote(str: string): string;
+  repeat(str: string, n: number): string;
+  markString(mark: Mark, open: boolean): string;
+  out: any;
+  closed: any;
+  nodes: any;
+  marks: any;
+}
diff --git a/types/prosemirror-markdown/prosemirror-markdown-tests.ts b/types/prosemirror-markdown/prosemirror-markdown-tests.ts
new file mode 100644
index 0000000000..3a751ad096
--- /dev/null
+++ b/types/prosemirror-markdown/prosemirror-markdown-tests.ts
@@ -0,0 +1 @@
+import * as markdown from 'prosemirror-markdown';
diff --git a/types/prosemirror-markdown/tsconfig.json b/types/prosemirror-markdown/tsconfig.json
new file mode 100644
index 0000000000..bd2598f4c7
--- /dev/null
+++ b/types/prosemirror-markdown/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prosemirror-markdown-tests.ts"
+    ]
+}
diff --git a/types/prosemirror-markdown/tslint.json b/types/prosemirror-markdown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-markdown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-menu/index.d.ts b/types/prosemirror-menu/index.d.ts
index e4936130eb..3ed389f1f6 100644
--- a/types/prosemirror-menu/index.d.ts
+++ b/types/prosemirror-menu/index.d.ts
@@ -2,60 +2,51 @@
 // Project: https://github.com/ProseMirror/prosemirror-menu
 // Definitions by: David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+import { EditorView } from 'prosemirror-view';
+import { EditorState } from 'prosemirror-state';
+import { Transaction } from 'prosemirror-state';
+import { Plugin } from 'prosemirror-state';
+import { NodeType } from 'prosemirror-model';
+import { EditorProps } from 'prosemirror-view';
 
-import { ProsemirrorNode } from 'prosemirror-model'
-import { EditorView } from 'prosemirror-view'
-import { EditorState } from 'prosemirror-state'
-import { Transaction } from 'prosemirror-state'
-import { Plugin } from 'prosemirror-state'
-import { NodeType } from 'prosemirror-model'
-import { EditorProps } from 'prosemirror-view'
-
-declare module "prosemirror-menu" {
-  export interface MenuElement {
-    render(pm: any): Node
-
-  }
-  export class MenuItem {
-    constructor(spec: MenuItemSpec)
-    spec: MenuItemSpec;
-    render(view: EditorView): Node
-
-  }
-  export interface MenuItemSpec {
-    run(p1: EditorState, fn: (p: Transaction) => void, p2: EditorView, ev: Event): void
-    select?(p: EditorState): boolean
-    onDeselected?: string;
-    active?(p: EditorState): boolean
-    render?(p: EditorView): Node
-    icon?: Object;
-    label?: string;
-    title?: string | ((s: EditorState) => string);
-    class: string;
-    css: string;
-    execEvent: string;
-
-  }
-  export class Dropdown {
-    constructor(content: MenuElement[], options?: Object)
-    render(view: EditorView): Node
-
-  }
-  export class DropdownSubmenu {
-    constructor(content: MenuElement[], options?: Object)
-    render(view: EditorView): Node
-
-  }
-  export function renderGrouped(view: EditorView, content: MenuElement | MenuElement[][]): DocumentFragment
-  export let icons: Object;
-  export let joinUpItem: MenuItem;
-  export let liftItem: MenuItem;
-  export let selectParentNodeItem: MenuItem;
-  export function undoItem(p: Object): MenuItem
-  export function redoItem(p: Object): MenuItem
-  export function wrapItem(nodeType: NodeType, options: Object): MenuItem
-  export function blockTypeItem(nodeType: NodeType, options: Object): MenuItem
-  export function menuBar(options: { content: MenuElement[][], floating?: boolean }): Plugin
-
-}
\ No newline at end of file
+export interface MenuElement {
+  render(pm: any): Node;
+}
+export class MenuItem {
+  constructor(spec: MenuItemSpec)
+  spec: MenuItemSpec;
+  render(view: EditorView): Node;
+}
+export interface MenuItemSpec {
+  run(p1: EditorState, fn: (p: Transaction) => void, p2: EditorView, ev: Event): void;
+  select?(p: EditorState): boolean;
+  onDeselected?: string;
+  active?(p: EditorState): boolean;
+  render?(p: EditorView): Node;
+  icon?: { [key: string]: any };
+  label?: string;
+  title?: string | ((s: EditorState) => string);
+  class: string;
+  css: string;
+  execEvent: string;
+}
+export class Dropdown {
+  constructor(content: MenuElement[], options?: object)
+  render(view: EditorView): Node;
+}
+export class DropdownSubmenu {
+  constructor(content: MenuElement[], options?: object)
+  render(view: EditorView): Node;
+}
+export function renderGrouped(view: EditorView, content: MenuElement | MenuElement[][]): DocumentFragment;
+export let icons: { [key: string]: any };
+export let joinUpItem: MenuItem;
+export let liftItem: MenuItem;
+export let selectParentNodeItem: MenuItem;
+export function undoItem(p: object): MenuItem;
+export function redoItem(p: object): MenuItem;
+export function wrapItem(nodeType: NodeType, options: object): MenuItem;
+export function blockTypeItem(nodeType: NodeType, options: object): MenuItem;
+export function menuBar(options: { content: MenuElement[][], floating?: boolean }): Plugin;
diff --git a/types/prosemirror-menu/prosemirror-menu-tests.ts b/types/prosemirror-menu/prosemirror-menu-tests.ts
index 0fee71a9cf..961c89223e 100644
--- a/types/prosemirror-menu/prosemirror-menu-tests.ts
+++ b/types/prosemirror-menu/prosemirror-menu-tests.ts
@@ -1,3 +1,3 @@
 import * as menu from 'prosemirror-menu';
 
-let menuBarPlugin = menu.menuBar({ content: [], floating: false });
\ No newline at end of file
+let menuBarPlugin = menu.menuBar({ content: [], floating: false });
diff --git a/types/prosemirror-menu/tslint.json b/types/prosemirror-menu/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-menu/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-model/dom.d.ts b/types/prosemirror-model/dom.d.ts
new file mode 100644
index 0000000000..b4b02d1c24
--- /dev/null
+++ b/types/prosemirror-model/dom.d.ts
@@ -0,0 +1,21 @@
+export type DOMDataTransfer = DataTransfer;
+export type DOMDocument = Document;
+export type DOMElement = HTMLElement;
+export type DOMEvent = Event;
+export type DOMFragment = DocumentFragment;
+export type DOMKeyboardEvent = KeyboardEvent;
+export type DOMMouseEvent = MouseEvent;
+export type DOMMutationRecord = MutationRecord;
+export type DOMNode = Node;
+
+export {
+  DOMDataTransfer as DataTransfer,
+  DOMDocument as Document,
+  DOMElement as Element,
+  DOMEvent as Event,
+  DOMFragment as DocumentFragment,
+  DOMKeyboardEvent as KeyboardEvent,
+  DOMMouseEvent as MouseEvent,
+  DOMMutationRecord as MutationRecord,
+  DOMNode as Node,
+};
diff --git a/types/prosemirror-model/index.d.ts b/types/prosemirror-model/index.d.ts
index ff281cb2f9..e2b276fcb4 100644
--- a/types/prosemirror-model/index.d.ts
+++ b/types/prosemirror-model/index.d.ts
@@ -1,266 +1,283 @@
-// Type definitions for prosemirror-model 0.18
+// Type definitions for prosemirror-model 0.21
 // Project: https://github.com/ProseMirror/prosemirror-model
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-type OrderedMap<T> = T;
+import OrderedMap = require('orderedmap');
+import * as dom from './dom';
 
-declare module "prosemirror-model" {
-  export class ContentMatch {
-    matchNode(node: ProsemirrorNode): ContentMatch
-    matchType(type: NodeType, attrs?: Object, marks?: Mark[]): ContentMatch
-    matchFragment(fragment: Fragment, from?: number, to?: number): ContentMatch | boolean
-    matchToEnd(fragment: Fragment, start?: number, end?: number): boolean
-    validEnd(): boolean
-    fillBefore(after: Fragment, toEnd: boolean, startIndex?: number): Fragment
-    allowsMark(markType: MarkType): boolean
-    findWrapping(target: NodeType, targetAttrs?: Object, targetMarks?: Mark[]): { type: NodeType, attrs: Object }[]
-    findWrappingFor(node: ProsemirrorNode): { type: NodeType, attrs: Object }[]
+export interface AnyObject {
+  [key: string]: any;
+}
 
-  }
-  export class Fragment {
-    append(other: Fragment): Fragment
-    cut(from: number, to?: number): Fragment
-    replaceChild(index: number, node: ProsemirrorNode): Fragment
-    eq(other: Fragment): boolean
-    firstChild?: ProsemirrorNode;
-    lastChild?: ProsemirrorNode;
-    childCount: number;
-    child(index: number): ProsemirrorNode
-    offsetAt(index: number): number
-    maybeChild(index: number): ProsemirrorNode
-    forEach(f: (node: ProsemirrorNode, offset: number, index: number) => void): void
-    findDiffStart(other: Fragment): number
-    findDiffEnd(other: ProsemirrorNode): { a: number, b: number } | void
-    toString(): string
-    toJSON(): Object | void
-    static fromJSON(schema: Schema, value?: Object): Fragment
-    static fromArray(array: ProsemirrorNode[]): Fragment
-    static from(nodes?: Fragment | ProsemirrorNode | ProsemirrorNode[]): Fragment
-    static empty: Fragment;
-
-  }
-  export interface ParseRule {
-    tag?: string;
-    style?: string;
-    context?: string;
-    node?: string;
-    mark?: string;
-    priority?: number;
-    ignore?: boolean;
-    skip?: boolean;
-    attrs?: Object;
-    getAttrs?(p: Node | string): boolean | Object
-    contentElement?: string;
-    getContent?(p: Node): Fragment
-    preserveWhitespace?: boolean;
-
-  }
-  export class DOMParser {
-    constructor(schema: Schema, rules: ParseRule[])
-    schema: Schema;
-    rules: ParseRule[];
-    parse(dom: Node, options?: { preserveWhitespace?: boolean, findPositions?: { node: Node, offset: number }[], from?: number, to?: number, topNode?: ProsemirrorNode, topStart?: number, context?: ResolvedPos }): ProsemirrorNode
-    parseSlice(dom: Node, options?: Object): Slice
-    static schemaRules(schema: Schema): ParseRule[]
-    static fromSchema(schema: Schema): DOMParser
-
-  }
-  export class Mark {
-    type: MarkType;
-    attrs: Object;
-    addToSet(set: Mark[]): Mark[]
-    removeFromSet(set: Mark[]): Mark[]
-    isInSet(set: Mark[]): boolean
-    eq(other: Mark): boolean
-    toJSON(): Object
-    static fromJSON(schema: Schema, json: Object): Mark
-    static sameSet(a: Mark[], b: Mark[]): boolean
-    static setFrom(marks?: Mark | Mark[]): Mark[]
-    static none: Mark[];
-
-  }
-  export class ProsemirrorNode {
-    type: NodeType;
-    attrs: Object;
-    content: Fragment;
-    marks: Mark[];
-    text?: string;
-    nodeSize: number;
-    childCount: number;
-    child(index: number): ProsemirrorNode
-    maybeChild(index: number): ProsemirrorNode
-    forEach(f: (node: ProsemirrorNode, offset: number, index: number) => void): void
-    nodesBetween(from: number |  void, to: number |  void, f: (node: ProsemirrorNode, pos: number, parent: ProsemirrorNode, index: number) => void): void
-    descendants(f: (node: ProsemirrorNode, pos: number, parent: ProsemirrorNode) => void): void
-    textContent: string;
-    textBetween(from: number, to: number, blockSeparator?: string, leafText?: string): string
-    firstChild?: ProsemirrorNode;
-    lastChild?: ProsemirrorNode;
-    eq(other: ProsemirrorNode): boolean
-    sameMarkup(other: ProsemirrorNode): boolean
-    hasMarkup(type: NodeType, attrs?: Object, marks?: Mark[]): boolean
-    copy(content?: Fragment): ProsemirrorNode
-    mark(marks: Mark[]): ProsemirrorNode
-    cut(from: number, to?: number): ProsemirrorNode
-    slice(from: number, to?: number): Slice
-    replace(from: number, to: number, slice: Slice): ProsemirrorNode
-    nodeAt(pos: number): ProsemirrorNode
-    childAfter(pos: number): { node?: ProsemirrorNode, index: number, offset: number }
-    childBefore(pos: number): { node?: ProsemirrorNode, index: number, offset: number }
-    resolve(pos: number): ResolvedPos
-    rangeHasMark(from: number |  void, to: number |  void, type: MarkType): boolean
-    isBlock: boolean;
-    isTextblock: boolean;
-    isInline: boolean;
-    isText: boolean;
-    isLeaf: boolean;
-    isAtom: boolean;
-    toString(): string
-    contentMatchAt(index: number): ContentMatch
-    canReplace(from: number, to: number, replacement?: Fragment, start?: number, end?: number): boolean
-    canReplaceWith(from: number, to: number, type: NodeType, attrs?: Mark[]): boolean
-    canAppend(other: ProsemirrorNode): boolean
-    check(): void
-    toJSON(): Object
-    static fromJSON(schema: Schema, json: Object): ProsemirrorNode
-
-  }
-  export class ReplaceError extends Error {
-
-  }
-  export class Slice {
-    constructor(content: Fragment, openLeft: number, openRight: number)
-    content: Fragment;
-    openLeft: number;
-    openRight: number;
-    size: number;
-    toJSON(): Object | void
-    static fromJSON(schema: Schema, json?: Object): Slice
-    static maxOpen(fragment: Fragment): Slice
-    static empty: Slice;
-
-  }
-  export class ResolvedPos {
-    pos: number;
-    depth: number;
-    parentOffset: number;
-    parent: ProsemirrorNode;
-    node(depth?: number): ProsemirrorNode
-    index(depth?: number): number
-    indexAfter(depth?: number): number
-    start(depth?: number): number
-    end(depth?: number): number
-    before(depth?: number): number
-    after(depth?: number): number
-    textOffset: number;
-    nodeAfter?: ProsemirrorNode;
-    nodeBefore?: ProsemirrorNode;
-    marks(after?: boolean): Mark[]
-    sharedDepth(pos: number): number
-    blockRange(other?: ResolvedPos, pred?: (p: ProsemirrorNode) => boolean): NodeRange
-    sameParent(other: ResolvedPos): boolean
-
-  }
-  export class NodeRange {
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-    depth: number;
-    start: number;
-    end: number;
-    parent: ProsemirrorNode;
-    startIndex: number;
-    endIndex: number;
-
-  }
-  export class NodeType {
-    name: string;
-    schema: Schema;
-    spec: NodeSpec;
-    isBlock: boolean;
-    isText: boolean;
-    isInline: boolean;
-    isTextblock: boolean;
-    isLeaf: boolean;
-    isAtom: boolean;
-    create(attrs?: Object, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode
-    createChecked(attrs?: Object, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode
-    createAndFill(attrs?: Object, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode
-    validContent(content: Fragment, attrs?: Object): boolean
-
-  }
-  export class MarkType {
-    name: string;
-    schema: Schema;
-    spec: MarkSpec;
-    create(attrs?: Object): Mark
-    removeFromSet(set: Mark[]): Mark[]
-    isInSet(set: Mark[]): Mark
-    excludes: MarkType;
-
-  }
-  export interface SchemaSpec {
-    nodes: Object | OrderedMap<NodeSpec>;
-    marks?: Object | OrderedMap<MarkSpec>;
-    topNode?: string;
-
-  }
-  export interface NodeSpec {
-    content?: string;
-    group?: string;
-    inline?: boolean;
-    atom?: boolean;
-    attrs?: Object;
-    selectable?: boolean;
-    draggable?: boolean;
-    code?: boolean;
-    defining?: boolean;
-    toDOM?(p: ProsemirrorNode): DOMOutputSpec
-    parseDOM?: ParseRule[];
-
-  }
-  export interface MarkSpec {
-    attrs?: Object;
-    inclusiveRight?: boolean;
-    excludes?: string;
-    group?: string;
-    toDOM?(mark: Mark): DOMOutputSpec
-    parseDOM?: ParseRule[];
-
-  }
-  export interface AttributeSpec {
-    default?: any;
-    compute?(): any
-
-  }
-  export class Schema {
-    constructor(spec: SchemaSpec)
-    spec: SchemaSpec;
-    nodes: Object;
-    marks: Object;
-    cached: Object;
-    topNodeType: NodeType;
-    node(type: string | NodeType, attrs?: Object, content?: Fragment | ProsemirrorNode | ProsemirrorNode[], marks?: Mark[]): ProsemirrorNode
-    text(text: string, marks?: Mark[]): ProsemirrorNode
-    mark(type: string | MarkType, attrs?: Object): Mark
-    nodeFromJSON(json: Object): ProsemirrorNode
-    markFromJSON(json: Object): Mark
-
-  }
-  export interface DOMOutputSpec {
-
-  }
-  export class DOMSerializer {
-    constructor(nodes: Object, marks: Object)
-    nodes: Object;
-    marks: Object;
-    serializeFragment(fragment: Fragment, options?: Object): DocumentFragment
-    serializeNode(node: ProsemirrorNode, options?: Object): Node
-    static renderSpec(doc: Document, structure: DOMOutputSpec): { dom: Node, contentDOM?: Node }
-    static fromSchema(schema: Schema): DOMSerializer
-    static nodesFromSchema(schema: Schema): Object
-    static marksFromSchema(schema: Schema): Object
-
-  }
-
-}
\ No newline at end of file
+export class ContentMatch {
+  matchNode(node: Node): ContentMatch | null | undefined;
+  matchType(type: NodeType, attrs?: AnyObject, marks?: Mark[]): ContentMatch | null | undefined;
+  matchFragment(fragment: Fragment, from?: number, to?: number): ContentMatch | boolean | null | undefined;
+  matchToEnd(fragment: Fragment, start?: number, end?: number): boolean;
+  validEnd(): boolean;
+  fillBefore(after: Fragment, toEnd: boolean, startIndex?: number): Fragment | null | undefined;
+  allowsMark(markType: MarkType): boolean;
+  findWrapping(target: NodeType, targetAttrs?: AnyObject, targetMarks?: Mark[]): Array<{ type: NodeType, attrs: AnyObject }> | null | undefined;
+  findWrappingFor(node: Node): Array<{ type: NodeType, attrs: AnyObject }> | null | undefined;
+}
+export class Fragment {
+  nodesBetween(from: number, to: number, f: (node: Node, start: number, parent: Node, index: number) => boolean | null | void): void;
+  descendants(f: (node: Node, pos: number, parent: Node) => boolean | null | void): void;
+  append(other: Fragment): Fragment;
+  cut(from: number, to?: number): Fragment;
+  replaceChild(index: number, node: Node): Fragment;
+  eq(other: Fragment): boolean;
+  firstChild?: Node | null;
+  lastChild?: Node | null;
+  childCount: number;
+  child(index: number): Node;
+  offsetAt(index: number): number;
+  maybeChild(index: number): Node | null | undefined;
+  forEach(f: (node: Node, offset: number, index: number) => void): void;
+  findDiffStart(other: Fragment): number | null | undefined;
+  findDiffEnd(other: Node): { a: number, b: number } | null | undefined;
+  toString(): string;
+  toJSON(): AnyObject | null | undefined;
+  static fromJSON(schema: Schema, value?: AnyObject): Fragment;
+  static fromArray(array: Node[]): Fragment;
+  static from(nodes?: Fragment | Node | Node[]): Fragment;
+  static empty: Fragment;
+}
+export interface ParseRule {
+  tag?: string | null;
+  namespace?: string | null;
+  style?: string | null;
+  context?: string | null;
+  node?: string | null;
+  mark?: string | null;
+  priority?: number | null;
+  ignore?: boolean | null;
+  skip?: boolean | null;
+  attrs?: AnyObject | null;
+  getAttrs?: ((p: dom.Node | string) => boolean | AnyObject | null | void) | null;
+  contentElement?: string | null;
+  getContent?: ((p: dom.Node) => Fragment) | null;
+  preserveWhitespace?: boolean | 'full' | null;
+}
+export class DOMParser {
+  constructor(schema: Schema, rules: ParseRule[])
+  schema: Schema;
+  rules: ParseRule[];
+  parse(dom: dom.Node, options?: {
+    preserveWhitespace?: boolean | 'full' | null,
+    findPositions?: Array<{ node: Node, offset: number }> | null,
+    from?: number | null,
+    to?: number | null,
+    topNode?: Node | null,
+    topStart?: number | null,
+    context?: ResolvedPos | null
+  }): Node;
+  parseSlice(dom: dom.Node, options?: AnyObject): Slice;
+  static schemaRules(schema: Schema): ParseRule[];
+  static fromSchema(schema: Schema): DOMParser;
+}
+export class Mark {
+  type: MarkType;
+  attrs: AnyObject;
+  addToSet(set: Mark[]): Mark[];
+  removeFromSet(set: Mark[]): Mark[];
+  isInSet(set: Mark[]): boolean;
+  eq(other: Mark): boolean;
+  toJSON(): AnyObject;
+  static fromJSON(schema: Schema, json: AnyObject): Mark;
+  static sameSet(a: Mark[], b: Mark[]): boolean;
+  static setFrom(marks?: Mark | Mark[]): Mark[];
+  static none: Mark[];
+}
+export class Node {
+  type: NodeType;
+  attrs: { [key: string]: any };
+  content: Fragment;
+  marks: Mark[];
+  text?: string | null;
+  nodeSize: number;
+  childCount: number;
+  child(index: number): Node;
+  maybeChild(index: number): Node | null | undefined;
+  forEach(f: (node: Node, offset: number, index: number) => void): void;
+  nodesBetween(from: number | undefined, to: number | undefined, f: (node: Node, pos: number, parent: Node, index: number) => boolean | null | void): void;
+  descendants(f: (node: Node, pos: number, parent: Node) => boolean | null | void): void;
+  textContent: string;
+  textBetween(from: number, to: number, blockSeparator?: string, leafText?: string): string;
+  firstChild?: Node | null;
+  lastChild?: Node | null;
+  eq(other: Node): boolean;
+  sameMarkup(other: Node): boolean;
+  hasMarkup(type: NodeType, attrs?: AnyObject, marks?: Mark[]): boolean;
+  copy(content?: Fragment): Node;
+  mark(marks: Mark[]): Node;
+  cut(from: number, to?: number): Node;
+  slice(from: number, to?: number): Slice;
+  replace(from: number, to: number, slice: Slice): Node;
+  nodeAt(pos: number): Node | null | undefined;
+  childAfter(pos: number): { node?: Node | null, index: number, offset: number };
+  childBefore(pos: number): { node?: Node | null, index: number, offset: number };
+  resolve(pos: number): ResolvedPos;
+  rangeHasMark(from: number | undefined, to: number | undefined, type: MarkType): boolean;
+  isBlock: boolean;
+  isTextblock: boolean;
+  inlineContent: boolean;
+  isInline: boolean;
+  isText: boolean;
+  isLeaf: boolean;
+  isAtom: boolean;
+  toString(): string;
+  contentMatchAt(index: number): ContentMatch;
+  canReplace(from: number, to: number, replacement?: Fragment, start?: number, end?: number): boolean;
+  canReplaceWith(from: number, to: number, type: NodeType, attrs?: Mark[]): boolean;
+  canAppend(other: Node): boolean;
+  check(): void;
+  toJSON(): AnyObject;
+  static fromJSON(schema: Schema, json: AnyObject): Node;
+}
+export class ReplaceError extends Error {
+}
+export class Slice {
+  constructor(content: Fragment, openStart: number, openEnd: number)
+  content: Fragment;
+  openStart: number;
+  openEnd: number;
+  size: number;
+  eq(other: Slice): boolean;
+  toJSON(): AnyObject | null | undefined;
+  static fromJSON(schema: Schema, json?: AnyObject): Slice;
+  static maxOpen(fragment: Fragment): Slice;
+  static empty: Slice;
+}
+export class ResolvedPos {
+  pos: number;
+  depth: number;
+  parentOffset: number;
+  parent: Node;
+  doc: Node;
+  node(depth?: number): Node;
+  index(depth?: number): number;
+  indexAfter(depth?: number): number;
+  start(depth?: number): number;
+  end(depth?: number): number;
+  before(depth?: number): number;
+  after(depth?: number): number;
+  textOffset: number;
+  nodeAfter?: Node | null;
+  nodeBefore?: Node | null;
+  marks(after?: boolean): Mark[];
+  sharedDepth(pos: number): number;
+  blockRange(other?: ResolvedPos, pred?: (p: Node) => boolean): NodeRange | null | undefined;
+  sameParent(other: ResolvedPos): boolean;
+  max(other: ResolvedPos): ResolvedPos;
+  min(other: ResolvedPos): ResolvedPos;
+}
+export class NodeRange {
+  $from: ResolvedPos;
+  $to: ResolvedPos;
+  depth: number;
+  start: number;
+  end: number;
+  parent: Node;
+  startIndex: number;
+  endIndex: number;
+}
+export class NodeType {
+  name: string;
+  schema: Schema;
+  spec: NodeSpec;
+  isBlock: boolean;
+  isText: boolean;
+  isInline: boolean;
+  isTextblock: boolean;
+  inlineContent: boolean;
+  isLeaf: boolean;
+  isAtom: boolean;
+  create(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
+  createChecked(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
+  createAndFill(attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node | null | undefined;
+  validContent(content: Fragment, attrs?: AnyObject): boolean;
+}
+export class MarkType {
+  name: string;
+  schema: Schema;
+  spec: MarkSpec;
+  create(attrs?: AnyObject): Mark;
+  removeFromSet(set: Mark[]): Mark[];
+  isInSet(set: Mark[]): Mark | null | undefined;
+  excludes(other: MarkType): boolean;
+}
+export interface SchemaSpec {
+  nodes: { [name: string]: NodeSpec } | OrderedMap<NodeSpec>;
+  marks?: { [name: string]: MarkSpec } | OrderedMap<MarkSpec> | null;
+  topNode?: string | null;
+}
+export interface NodeSpec {
+  content?: string | null;
+  group?: string | null;
+  inline?: boolean | null;
+  atom?: boolean | null;
+  attrs?: { [name: string]: AttributeSpec } | null;
+  selectable?: boolean | null;
+  draggable?: boolean | null;
+  code?: boolean | null;
+  defining?: boolean | null;
+  isolating?: boolean | null;
+  toDOM?: ((node: Node) => DOMOutputSpec) | null;
+  parseDOM?: ParseRule[] | null;
+}
+export interface MarkSpec {
+  attrs?: { [name: string]: AttributeSpec } | null;
+  inclusive?: boolean | null;
+  excludes?: string | null;
+  group?: string | null;
+  toDOM?: ((mark: Mark, inline: boolean) => DOMOutputSpec) | null;
+  parseDOM?: ParseRule[] | null;
+}
+export interface AttributeSpec {
+  default?: any | null;
+  compute?: (() => any) | null;
+}
+export class Schema {
+  constructor(spec: SchemaSpec)
+  spec: SchemaSpec;
+  nodes: { [name: string]: NodeType };
+  marks: { [name: string]: MarkType };
+  cached: AnyObject;
+  topNodeType: NodeType;
+  node(type: string | NodeType, attrs?: AnyObject, content?: Fragment | Node | Node[], marks?: Mark[]): Node;
+  text(text: string, marks?: Mark[]): Node;
+  mark(type: string | MarkType, attrs?: AnyObject): Mark;
+  nodeFromJSON(json: AnyObject): Node;
+  markFromJSON(json: AnyObject): Mark;
+}
+export interface DOMOutputSpecArray {
+  0: string;
+  1?: DOMOutputSpec | 0 | { [attr: string]: string };
+  2?: DOMOutputSpec | 0;
+  3?: DOMOutputSpec | 0;
+  4?: DOMOutputSpec | 0;
+  5?: DOMOutputSpec | 0;
+  6?: DOMOutputSpec | 0;
+  7?: DOMOutputSpec | 0;
+  8?: DOMOutputSpec | 0;
+  9?: DOMOutputSpec | 0;
+}
+export type DOMOutputSpec
+    = string
+    | dom.Node
+    | DOMOutputSpecArray;
+export class DOMSerializer {
+  constructor(nodes: { [name: string]: (node: Node) => DOMOutputSpec }, marks: { [name: string]: (mark: Mark, inline: boolean) => DOMOutputSpec })
+  nodes: { [name: string]: (node: Node) => DOMOutputSpec };
+  marks: { [name: string]: (mark: Mark) => DOMOutputSpec };
+  serializeFragment(fragment: Fragment, options?: AnyObject): DocumentFragment;
+  serializeNode(node: Node, options?: AnyObject): Node;
+  static renderSpec(doc: Document, structure: DOMOutputSpec): { dom: Node, contentDOM?: Node | null };
+  static fromSchema(schema: Schema): DOMSerializer;
+  static nodesFromSchema(schema: Schema): { [name: string]: (node: Node) => DOMOutputSpec };
+  static marksFromSchema(schema: Schema): { [name: string]: (mark: Mark) => DOMOutputSpec };
+}
diff --git a/types/prosemirror-model/prosemirror-model-tests.ts b/types/prosemirror-model/prosemirror-model-tests.ts
index 1850a259e9..4eccff1511 100644
--- a/types/prosemirror-model/prosemirror-model-tests.ts
+++ b/types/prosemirror-model/prosemirror-model-tests.ts
@@ -1,3 +1,40 @@
 import * as model from 'prosemirror-model';
 
 let fragment = new model.Fragment();
+
+let domOutputSpec: model.DOMOutputSpec;
+
+domOutputSpec = ['div'];
+domOutputSpec = ['div', { class: 'foo' }];
+domOutputSpec = ['div', { class: 'foo' }, 0];
+domOutputSpec = ['div', 0];
+domOutputSpec = ['div', ['div', 0]];
+domOutputSpec = ['div', ['div', { class: 'foo' }]];
+domOutputSpec = ['div', ['div', { class: 'foo' }, 0]];
+
+export const nodeSpec: model.NodeSpec = {
+  attrs: {
+    name: { default: '' },
+  },
+  parseDOM: [{
+    tag: 'span[data-name]',
+    getAttrs(dom) {
+      if (dom instanceof HTMLElement) {
+        return {
+          name: dom.getAttribute('data-name')!
+        };
+      }
+    }
+  }],
+  toDOM(node) {
+    const { name } = node.attrs;
+    const attrs = {
+      'data-emoji-name': name,
+    };
+    return ['span', attrs, 0];
+  }
+};
+
+let node = new model.Node();
+node.nodesBetween(0, 1, () => {});
+node.descendants(() => {});
diff --git a/types/prosemirror-model/tslint.json b/types/prosemirror-model/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-model/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-schema-basic/index.d.ts b/types/prosemirror-schema-basic/index.d.ts
new file mode 100644
index 0000000000..e5db9ffb80
--- /dev/null
+++ b/types/prosemirror-schema-basic/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for prosemirror-schema-basic 0.21
+// Project: https://github.com/ProseMirror/prosemirror-schema-basic
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import { MarkSpec, NodeSpec, Schema } from 'prosemirror-model';
+
+export let nodes: {
+    doc: NodeSpec,
+    paragraph: NodeSpec,
+    blockquote: NodeSpec,
+    horizontal_rule: NodeSpec,
+    heading: NodeSpec,
+    code_block: NodeSpec,
+    text: NodeSpec,
+    image: NodeSpec,
+    hard_break: NodeSpec
+};
+export let marks: {
+    link: MarkSpec,
+    em: MarkSpec,
+    strong: MarkSpec,
+    code: MarkSpec
+};
+export let schema: Schema;
diff --git a/types/prosemirror-schema-basic/prosemirror-schema-basic-tests.ts b/types/prosemirror-schema-basic/prosemirror-schema-basic-tests.ts
new file mode 100644
index 0000000000..1a93bf8ecb
--- /dev/null
+++ b/types/prosemirror-schema-basic/prosemirror-schema-basic-tests.ts
@@ -0,0 +1,5 @@
+import { nodes, marks, schema } from 'prosemirror-schema-basic';
+
+nodes.blockquote;
+marks.code;
+schema.mark;
diff --git a/types/prosemirror-schema-basic/tsconfig.json b/types/prosemirror-schema-basic/tsconfig.json
new file mode 100644
index 0000000000..0c90a14f5c
--- /dev/null
+++ b/types/prosemirror-schema-basic/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prosemirror-schema-basic-tests.ts"
+    ]
+}
diff --git a/types/prosemirror-schema-basic/tslint.json b/types/prosemirror-schema-basic/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-schema-basic/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-schema-list/index.d.ts b/types/prosemirror-schema-list/index.d.ts
new file mode 100644
index 0000000000..2378dc8b3c
--- /dev/null
+++ b/types/prosemirror-schema-list/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for prosemirror-schema-list 0.21
+// Project: https://github.com/ProseMirror/prosemirror-schema-list
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import OrderedMap = require('orderedmap');
+import { NodeSpec, NodeType } from 'prosemirror-model';
+import { EditorState, Transaction } from 'prosemirror-state';
+
+export let orderedList: NodeSpec;
+export let bulletList: NodeSpec;
+export let listItem: NodeSpec;
+export function addListNodes<T>(nodes: OrderedMap<T>, itemContent: string, listGroup?: string): OrderedMap<T>;
+export function wrapInList(listType: NodeType, attrs?: { [key: string]: any }): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function splitListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function liftListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+export function sinkListItem(itemType: NodeType): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
diff --git a/types/prosemirror-schema-list/prosemirror-schema-list-tests.ts b/types/prosemirror-schema-list/prosemirror-schema-list-tests.ts
new file mode 100644
index 0000000000..a96d3b9a04
--- /dev/null
+++ b/types/prosemirror-schema-list/prosemirror-schema-list-tests.ts
@@ -0,0 +1,10 @@
+import {
+    orderedList,
+    bulletList,
+    listItem,
+    addListNodes,
+    wrapInList,
+    splitListItem,
+    liftListItem,
+    sinkListItem
+} from 'prosemirror-schema-list';
diff --git a/types/prosemirror-schema-list/tsconfig.json b/types/prosemirror-schema-list/tsconfig.json
new file mode 100644
index 0000000000..a02b0a9255
--- /dev/null
+++ b/types/prosemirror-schema-list/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prosemirror-schema-list-tests.ts"
+    ]
+}
diff --git a/types/prosemirror-schema-list/tslint.json b/types/prosemirror-schema-list/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-schema-list/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-state/index.d.ts b/types/prosemirror-state/index.d.ts
index 8a71756edb..4cdcfc4723 100644
--- a/types/prosemirror-state/index.d.ts
+++ b/types/prosemirror-state/index.d.ts
@@ -1,109 +1,165 @@
-// Type definitions for prosemirror-state 0.18
+// Type definitions for prosemirror-state 0.21
 // Project: https://github.com/ProseMirror/prosemirror-state
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { EditorProps } from 'prosemirror-view'
-import { EditorView } from 'prosemirror-view'
-import { ResolvedPos } from 'prosemirror-model'
-import { ProsemirrorNode } from 'prosemirror-model'
-import { Mappable } from 'prosemirror-transform'
-import { Mark } from 'prosemirror-model'
-import { Schema } from 'prosemirror-model'
-import { Transform } from 'prosemirror-transform'
-import { Slice } from 'prosemirror-model'
-import { MarkType } from 'prosemirror-model'
+import { Mark, MarkType, Node, ResolvedPos, Schema, Slice } from 'prosemirror-model';
+import { Mappable, Mapping, Transform } from 'prosemirror-transform';
+import { EditorProps, EditorView } from 'prosemirror-view';
 
-declare module "prosemirror-state" {
-  export type PluginSpec = { props?: EditorProps, state?: StateField<any>, key?: PluginKey, view?(p: EditorView): { update?(view: EditorView, prevState: EditorState): void, destroy?(): void }, filterTransaction?(p1: Transaction, p2: EditorState): boolean, appendTransaction?(transactions: Transaction[], oldState: EditorState, newState: EditorState): Transaction };
-  export class Plugin {
-    constructor(spec: PluginSpec)
-    props: EditorProps;
-    spec: Object;
-    getState(state: EditorState): any
+export interface AnyObject {
+  [key: string]: any;
+}
 
-  }
-  export interface StateField<T> {
-    init(config: Object, instance: EditorState): T
-    apply(tr: Transaction, value: T, oldState: EditorState, newState: EditorState): T
-    toJSON?(value: T): any
-    fromJSON?(config: Object, value: any, state: EditorState): T
+export interface PluginSpecProps {
+  // State is not part of this type.
+  // state: EditorProps["state"];
+  // dispatchTransaction?: EditorProps["dispatchTransaction"];
+  handleDOMEvents?: EditorProps["handleDOMEvents"];
+  handleKeyDown?: EditorProps["handleKeyDown"];
+  handleKeyPress?: EditorProps["handleKeyPress"];
+  handleTextInput?: EditorProps["handleTextInput"];
+  handleClickOn?: EditorProps["handleClickOn"];
+  handleClick?: EditorProps["handleClick"];
+  handleDoubleClickOn?: EditorProps["handleDoubleClickOn"];
+  handleDoubleClick?: EditorProps["handleDoubleClick"];
+  handleTripleClickOn?: EditorProps["handleTripleClickOn"];
+  handleTripleClick?: EditorProps["handleTripleClick"];
+  handleContextMenu?: EditorProps["handleContextMenu"];
+  handlePaste?: EditorProps["handlePaste"];
+  handleDrop?: EditorProps["handleDrop"];
+  onFocus?: EditorProps["onFocus"];
+  onBlur?: EditorProps["onBlur"];
+  createSelectionBetween?: EditorProps["createSelectionBetween"];
+  domParser?: EditorProps["domParser"];
+  clipboardParser?: EditorProps["clipboardParser"];
+  transformPasted?: EditorProps["transformPasted"];
+  transformPastedHTML?: EditorProps["transformPastedHTML"];
+  transformPastedText?: EditorProps["transformPastedText"];
+  nodeViews?: EditorProps["nodeViews"];
+  clipboardSerializer?: EditorProps["clipboardSerializer"];
+  decorations?: EditorProps["decorations"];
+  editable?: EditorProps["editable"];
+  attributes?: EditorProps["attributes"];
+  scrollThreshold?: EditorProps["scrollThreshold"];
+  scrollMargin?: EditorProps["scrollMargin"];
+}
 
-  }
-  export class PluginKey {
-    constructor(name?: string)
-    get(state: EditorState): Plugin
-    getState(state: EditorState): any
+export interface PluginSpec<T = any> {
+  props?: PluginSpecProps | null;
+  state?: StateField<T> | null;
+  key?: PluginKey | null;
+  view?: ((p: EditorView) => {
+    update?: ((view: EditorView, prevState: EditorState) => void) | null,
+    destroy?: (() => void) | null
+  }) | null;
+  filterTransaction?: ((p1: Transaction, p2: EditorState) => boolean) | null;
+  appendTransaction?: ((transactions: Transaction[], oldState: EditorState, newState: EditorState) => Transaction | null | undefined) | null;
+}
 
-  }
-  export class Selection {
-    from: number;
-    to: number;
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-    empty: boolean;
-    eq(other: Selection): boolean
-    map(doc: ProsemirrorNode, mapping: Mappable): Selection
-    toJSON(): Object
-    static findFrom($pos: ResolvedPos, dir: number, textOnly?: boolean): Selection
-    static near($pos: ResolvedPos, bias?: number, textOnly?: boolean): Selection
-    static atStart(doc: ProsemirrorNode, textOnly?: boolean): Selection
-    static atEnd(doc: ProsemirrorNode, textOnly?: boolean): Selection
-    static between($anchor: ResolvedPos, $head: ResolvedPos, bias?: number): Selection
-    static fromJSON(doc: ProsemirrorNode, json: Object): Selection
+export class Plugin<T = any> {
+  constructor(spec: PluginSpec<T>)
+  props: PluginSpecProps;
+  spec: AnyObject;
+  getState(state: EditorState): any;
+}
 
-  }
-  export class TextSelection extends Selection {
-    constructor($anchor: ResolvedPos, $head?: ResolvedPos)
-    anchor: number;
-    head: number;
-    $anchor: ResolvedPos;
-    $head: ResolvedPos;
-    static create(doc: ProsemirrorNode, anchor: number, head?: number): TextSelection
-
-  }
-  export class NodeSelection extends Selection {
-    constructor($from: ResolvedPos)
-    node: ProsemirrorNode;
-    static create(doc: ProsemirrorNode, from: number, p1?: number): TextSelection
-    static isSelectable(node: ProsemirrorNode): boolean
-
-  }
-  export class EditorState {
-    doc: ProsemirrorNode;
-    selection: Selection;
-    storedMarks?: Mark[];
-    schema: Schema;
-    plugins: Plugin[];
-    apply(tr: Transaction): EditorState
-    applyTransaction(tr: Transaction): { state: EditorState, transactions: Transaction[] }
-    tr: Transaction;
-    reconfigure(config: Object): EditorState
-    toJSON(pluginFields?: Object): Object
-    static create(config: Object): EditorState
-    static fromJSON(config: Object, json: Object, pluginFields?: Object): EditorState
-
-  }
-  export class Transaction extends Transform {
-    time: number;
-    storedMarks?: Mark[];
-    selection: Selection;
-    setSelection(selection: Selection): Transaction
-    selectionSet: boolean;
-    setStoredMarks(marks?: Mark[]): Transaction
-    storedMarksSet: boolean;
-    setTime(time: number): Transaction
-    replaceSelection(slice: Slice): Transaction
-    replaceSelectionWith(node: ProsemirrorNode, inheritMarks?: boolean): Transaction
-    deleteSelection(): Transaction
-    insertText(text: string, from?: number, to?: number): Transaction
-    setMeta(key: string | Plugin | PluginKey, value: any): Transaction
-    getMeta(key: string | Plugin | PluginKey): any
-    isGeneric: boolean;
-    scrollIntoView(): Transaction
-    addStoredMark(mark: Mark): Transaction
-    removeStoredMark(mark: Mark | MarkType): Transaction
-
-  }
-
-}
\ No newline at end of file
+export interface StateField <T> {
+  init(config: AnyObject, instance: EditorState): T;
+  apply(tr: Transaction, value: T, oldState: EditorState, newState: EditorState): T;
+  toJSON?: ((value: T) => any) | null;
+  fromJSON?: ((config: AnyObject, value: any, state: EditorState) => T) | null;
+}
+export class PluginKey {
+  constructor(name?: string)
+  get(state: EditorState): Plugin | null | undefined;
+  getState(state: EditorState): any | null | undefined;
+}
+export class Selection {
+  constructor($anchor: ResolvedPos, $head: ResolvedPos, ranges?: SelectionRange[])
+  ranges: SelectionRange[];
+  $anchor: ResolvedPos;
+  $head: ResolvedPos;
+  anchor: number;
+  head: number;
+  from: number;
+  to: number;
+  $from: ResolvedPos;
+  $to: ResolvedPos;
+  empty: boolean;
+  eq(p: Selection): boolean;
+  map(doc: Node, mapping: Mappable): Selection;
+  content: Slice;
+  replace(tr: Transaction, content?: Slice): void;
+  replaceWith(tr: Transaction, node: Node): void;
+  toJSON(): AnyObject;
+  getBookmark(): SelectionBookmark;
+  visible: boolean;
+  static findFrom($pos: ResolvedPos, dir: number, textOnly?: boolean): Selection | null | undefined;
+  static near($pos: ResolvedPos, bias?: number): Selection;
+  static atStart(doc: Node): Selection;
+  static atEnd(doc: Node): Selection;
+  static fromJSON(doc: Node, json: AnyObject): Selection;
+  static jsonID(id: string, selectionClass: { new(...args: any[]): Selection }): void;
+}
+export interface SelectionBookmark {
+  map(mapping: Mapping): SelectionBookmark;
+  resolve(doc: Node): Selection;
+}
+export class SelectionRange {
+  constructor($from: ResolvedPos, $to: ResolvedPos)
+  $from: ResolvedPos;
+  $to: ResolvedPos;
+}
+export class TextSelection extends Selection {
+  constructor($anchor: ResolvedPos, $head?: ResolvedPos)
+  $cursor?: ResolvedPos | null;
+  static create(doc: Node, anchor: number, head?: number): TextSelection;
+  static between($anchor: ResolvedPos, $head: ResolvedPos, bias?: number): Selection;
+}
+export class NodeSelection extends Selection {
+  constructor($pos: ResolvedPos)
+  node: Node;
+  static create(doc: Node, from: number, p1?: number): NodeSelection;
+  static isSelectable(node: Node): boolean;
+}
+export class AllSelection extends Selection {
+  constructor(doc: Node)
+}
+export class EditorState {
+  doc: Node;
+  selection: Selection;
+  storedMarks?: Mark[] | null;
+  schema: Schema;
+  plugins: Plugin[];
+  apply(tr: Transaction): EditorState;
+  applyTransaction(tr: Transaction): { state: EditorState, transactions: Transaction[] };
+  tr: Transaction;
+  reconfigure(config: AnyObject): EditorState;
+  toJSON(pluginFields?: { [name: string]: Plugin }): AnyObject;
+  static create(config: AnyObject): EditorState;
+  static fromJSON(config: AnyObject, json: AnyObject, pluginFields?: { [name: string]: Plugin }): EditorState;
+}
+export class Transaction extends Transform {
+  time: number;
+  storedMarks?: Mark[] | null;
+  selection: Selection;
+  setSelection(selection: Selection): Transaction;
+  selectionSet: boolean;
+  setStoredMarks(marks?: Mark[]): Transaction;
+  ensureMarks(marks: Mark[]): Transaction;
+  storedMarksSet: boolean;
+  setTime(time: number): Transaction;
+  replaceSelection(slice: Slice): Transaction;
+  replaceSelectionWith(node: Node, inheritMarks?: boolean): Transaction;
+  deleteSelection(): Transaction;
+  insertText(text: string, from?: number, to?: number): Transaction;
+  setMeta(key: string | Plugin | PluginKey, value: any): Transaction;
+  getMeta(key: string | Plugin | PluginKey): any;
+  isGeneric: boolean;
+  scrollIntoView(): Transaction;
+  addStoredMark(mark: Mark): Transaction;
+  removeStoredMark(mark: Mark | MarkType): Transaction;
+}
diff --git a/types/prosemirror-state/prosemirror-state-tests.ts b/types/prosemirror-state/prosemirror-state-tests.ts
index 9daf2b56c5..92989a132e 100644
--- a/types/prosemirror-state/prosemirror-state-tests.ts
+++ b/types/prosemirror-state/prosemirror-state-tests.ts
@@ -1,4 +1,8 @@
 import * as state from 'prosemirror-state';
 
-let spec: state.PluginSpec = {};
-let plugin = new state.Plugin(spec);
+let plugin: state.Plugin;
+
+plugin = new state.Plugin({});
+plugin = new state.Plugin({
+    props: {}
+});
diff --git a/types/prosemirror-state/tslint.json b/types/prosemirror-state/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-state/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-transform/index.d.ts b/types/prosemirror-transform/index.d.ts
index 26c912ccd7..ff84a3a6de 100644
--- a/types/prosemirror-transform/index.d.ts
+++ b/types/prosemirror-transform/index.d.ts
@@ -1,120 +1,100 @@
-// Type definitions for prosemirror-transform 0.18
+// Type definitions for prosemirror-transform 0.21
 // Project: https://github.com/ProseMirror/prosemirror-transform
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+import { Fragment, Mark, MarkType, Node, NodeRange, NodeType, Schema, Slice } from 'prosemirror-model';
 
-import { ProsemirrorNode } from 'prosemirror-model'
-import { Mark } from 'prosemirror-model'
-import { MarkType } from 'prosemirror-model'
-import { Slice } from 'prosemirror-model'
-import { Fragment } from 'prosemirror-model'
-import { NodeRange } from 'prosemirror-model'
-import { NodeType } from 'prosemirror-model'
-import { Schema } from 'prosemirror-model'
-
-declare module "prosemirror-transform" {
-  export interface Mappable {
-    map(pos: number, assoc?: number): number
-    mapResult(pos: number, assoc?: number): MapResult
-
-  }
-  export class MapResult {
-    pos: number;
-    deleted: boolean;
-
-  }
-  export class StepMap {
-    constructor(ranges: number[])
-    mapResult(pos: number, assoc?: number): MapResult
-    map(pos: number, assoc?: number): number
-    forEach(f: (oldStart: number, oldEnd: number, newStart: number, newEnd: number) => void): void
-    invert(): StepMap
-
-  }
-  export class Mapping {
-    constructor(maps?: StepMap[])
-    maps: StepMap[];
-    from: number;
-    to: number;
-    slice(from?: number, to?: number): Mapping
-    appendMap(map: StepMap, mirrors?: number): void
-    appendMapping(mapping: Mapping): void
-    appendMappingInverted(mapping: Mapping): void
-    map(pos: number, assoc?: number): number
-    mapResult(pos: number, assoc?: number): MapResult
-
-  }
-  export class Transform {
-    constructor(doc: ProsemirrorNode)
-    addMark(from: number, to: number, mark: Mark): Transform
-    removeMark(from: number, to: number, mark?: Mark | MarkType): Transform
-    clearMarkup(from: number, to: number): Transform
-    replaceRange(from: number, to: number, slice: Slice): Transform
-    replaceRangeWith(from: number, to: number, node: ProsemirrorNode): Transform
-    deleteRange(from: number, to: number): Transform
-    delete(from: number, to: number): Transform
-    replace(from: number, to?: number, slice?: Slice): Transform
-    replaceWith(from: number, to: number, content: Fragment | ProsemirrorNode | ProsemirrorNode[]): Transform
-    insert(pos: number, content: Fragment | ProsemirrorNode | ProsemirrorNode[]): Transform
-    lift(range: NodeRange, target: number): Transform
-    wrap(range: NodeRange, wrappers: { type: NodeType, attrs?: Object }[]): Transform
-    setBlockType(from: number, to: number |  void, type: NodeType, attrs?: Object): Transform
-    setNodeType(pos: number, type?: NodeType, attrs?: Object, marks?: Mark[]): Transform
-    split(pos: number, depth?: number, typesAfter?: { type: NodeType, attrs?: Object }[]): Transform
-    join(pos: number, depth?: number, p1?: boolean): Transform
-    doc: ProsemirrorNode;
-    steps: Step[];
-    docs: ProsemirrorNode[];
-    mapping: Mapping;
-    before: ProsemirrorNode;
-    step(step: Step): Transform
-    maybeStep(step: Step): StepResult
-    docChanged: boolean;
-
-  }
-  export class AddMarkStep extends Step {
-    constructor(from: number, to: number, mark: Mark)
-
-  }
-  export class RemoveMarkStep extends Step {
-    constructor(from: number, to: number, mark: Mark)
-
-  }
-  export function replaceStep(doc: ProsemirrorNode, from: number, to?: number, slice?: Slice): Step
-  export class ReplaceStep extends Step {
-    constructor(from: number, to: number, slice: Slice, structure?: boolean)
-
-  }
-  export class ReplaceAroundStep extends Step {
-    constructor(from: number, to: number, gapFrom: number, gapTo: number, slice: Slice, insert: number, structure?: boolean)
-
-  }
-  export class Step {
-    apply(doc: ProsemirrorNode): StepResult
-    getMap(): StepMap
-    invert(doc: ProsemirrorNode): Step
-    map(mapping: Mappable): Step
-    merge(other: Step): Step
-    offset(n: number): Step
-    toJSON(): Object
-    static fromJSON(schema: Schema, json: Object): Step
-    static jsonID(id: string, stepClass: Step): void
-
-  }
-  export class StepResult {
-    doc?: ProsemirrorNode;
-    failed?: string;
-    static ok(doc: ProsemirrorNode): StepResult
-    static fail(message: string): StepResult
-    static fromReplace(doc: ProsemirrorNode, from: number, to: number, slice: Slice): StepResult
-
-  }
-  export function liftTarget(range: NodeRange): number
-  export function findWrapping(range: NodeRange, nodeType: NodeType, attrs?: Object): { type: NodeType, attrs?: Object }[]
-  export function canSplit(doc: ProsemirrorNode, pos: number, depth?: { type: NodeType, attrs?: Object }[]): boolean
-  export function canJoin(doc: ProsemirrorNode, pos: number): boolean
-  export function joinPoint(doc: ProsemirrorNode, pos: number, dir?: number): number
-  export function insertPoint(doc: ProsemirrorNode, pos: number, nodeType: NodeType, attrs?: Object): number
-
-}
\ No newline at end of file
+export interface Mappable {
+  map(pos: number, assoc?: number): number;
+  mapResult(pos: number, assoc?: number): MapResult;
+}
+export class MapResult {
+  pos: number;
+  deleted: boolean;
+}
+export class StepMap {
+  constructor(ranges: number[])
+  mapResult(pos: number, assoc?: number): MapResult;
+  map(pos: number, assoc?: number): number;
+  forEach(f: (oldStart: number, oldEnd: number, newStart: number, newEnd: number) => void): void;
+  invert(): StepMap;
+}
+export class Mapping {
+  constructor(maps?: StepMap[])
+  maps: StepMap[];
+  from: number;
+  to: number;
+  slice(from?: number, to?: number): Mapping;
+  appendMap(map: StepMap, mirrors?: number): void;
+  appendMapping(mapping: Mapping): void;
+  appendMappingInverted(mapping: Mapping): void;
+  map(pos: number, assoc?: number): number;
+  mapResult(pos: number, assoc?: number): MapResult;
+}
+export class AddMarkStep extends Step {
+  constructor(from: number, to: number, mark: Mark)
+}
+export class RemoveMarkStep extends Step {
+  constructor(from: number, to: number, mark: Mark)
+}
+export class Transform {
+  constructor(doc: Node)
+  addMark(from: number, to: number, mark: Mark): Transform;
+  removeMark(from: number, to: number, mark?: Mark | MarkType): Transform;
+  clearMarkup(from: number, to: number): Transform;
+  replaceRange(from: number, to: number, slice: Slice): Transform;
+  replaceRangeWith(from: number, to: number, node: Node): Transform;
+  deleteRange(from: number, to: number): Transform;
+  delete(from: number, to: number): Transform;
+  replace(from: number, to?: number, slice?: Slice): Transform;
+  replaceWith(from: number, to: number, content: Fragment | Node | Node[]): Transform;
+  insert(pos: number, content: Fragment | Node | Node[]): Transform;
+  lift(range: NodeRange, target: number): Transform;
+  wrap(range: NodeRange, wrappers: Array<{ type: NodeType, attrs?: object | null }>): Transform;
+  setBlockType(from: number, to: number | undefined, type: NodeType, attrs?: object): Transform;
+  setNodeType(pos: number, type?: NodeType, attrs?: object, marks?: Mark[]): Transform;
+  split(pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: object | null }>): Transform;
+  join(pos: number, depth?: number, p1?: boolean): Transform;
+  doc: Node;
+  steps: Step[];
+  docs: Node[];
+  mapping: Mapping;
+  before: Node;
+  step(step: Step): Transform;
+  maybeStep(step: Step): StepResult;
+  docChanged: boolean;
+}
+export class ReplaceStep extends Step {
+  constructor(from: number, to: number, slice: Slice, structure?: boolean)
+}
+export class ReplaceAroundStep extends Step {
+  constructor(from: number, to: number, gapFrom: number, gapTo: number, slice: Slice, insert: number, structure?: boolean)
+}
+export function replaceStep(doc: Node, from: number, to?: number, slice?: Slice): Step | null | undefined;
+export class Step {
+  apply(doc: Node): StepResult;
+  getMap(): StepMap;
+  invert(doc: Node): Step;
+  map(mapping: Mappable): Step | null | undefined;
+  merge(other: Step): Step | null | undefined;
+  offset(n: number): Step;
+  toJSON(): object;
+  static fromJSON(schema: Schema, json: object): Step;
+  static jsonID(id: string, stepClass: { new(...args: any[]): Step }): void;
+}
+export class StepResult {
+  doc?: Node | null;
+  failed?: string | null;
+  static ok(doc: Node): StepResult;
+  static fail(message: string): StepResult;
+  static fromReplace(doc: Node, from: number, to: number, slice: Slice): StepResult;
+}
+export function liftTarget(range: NodeRange): number | null | undefined;
+export function findWrapping(range: NodeRange, nodeType: NodeType, attrs?: object): Array<{ type: NodeType, attrs?: object | null }> | null | undefined;
+export function canSplit(doc: Node, pos: number, depth?: number, typesAfter?: Array<{ type: NodeType, attrs?: object | null }>): boolean;
+export function canJoin(doc: Node, pos: number): boolean;
+export function joinPoint(doc: Node, pos: number, dir?: number): number | null | undefined;
+export function insertPoint(doc: Node, pos: number, nodeType: NodeType, attrs?: object): number | null | undefined;
diff --git a/types/prosemirror-transform/tslint.json b/types/prosemirror-transform/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-transform/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prosemirror-view/dom.d.ts b/types/prosemirror-view/dom.d.ts
new file mode 100644
index 0000000000..b4b02d1c24
--- /dev/null
+++ b/types/prosemirror-view/dom.d.ts
@@ -0,0 +1,21 @@
+export type DOMDataTransfer = DataTransfer;
+export type DOMDocument = Document;
+export type DOMElement = HTMLElement;
+export type DOMEvent = Event;
+export type DOMFragment = DocumentFragment;
+export type DOMKeyboardEvent = KeyboardEvent;
+export type DOMMouseEvent = MouseEvent;
+export type DOMMutationRecord = MutationRecord;
+export type DOMNode = Node;
+
+export {
+  DOMDataTransfer as DataTransfer,
+  DOMDocument as Document,
+  DOMElement as Element,
+  DOMEvent as Event,
+  DOMFragment as DocumentFragment,
+  DOMKeyboardEvent as KeyboardEvent,
+  DOMMouseEvent as MouseEvent,
+  DOMMutationRecord as MutationRecord,
+  DOMNode as Node,
+};
diff --git a/types/prosemirror-view/index.d.ts b/types/prosemirror-view/index.d.ts
index 7e0fc118e0..c5fda64a87 100644
--- a/types/prosemirror-view/index.d.ts
+++ b/types/prosemirror-view/index.d.ts
@@ -1,100 +1,92 @@
-// Type definitions for prosemirror-view 0.18
+// Type definitions for prosemirror-view 0.21
 // Project: https://github.com/ProseMirror/prosemirror-view
-// Definitions by: David Hahn <https://github.com/davidka>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+//                 David Hahn <https://github.com/davidka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
+import { DOMParser, DOMSerializer, Node, ResolvedPos, Slice } from 'prosemirror-model';
+import { EditorState, Selection, Transaction } from 'prosemirror-state';
+import { Mapping } from 'prosemirror-transform';
+import * as dom from './dom';
 
-import { ProsemirrorNode } from 'prosemirror-model'
-import { Mapping } from 'prosemirror-transform'
-import { EditorState } from 'prosemirror-state'
-import { Transaction } from 'prosemirror-state'
-import { DOMParser } from 'prosemirror-model'
-import { Slice } from 'prosemirror-model'
-import { DOMSerializer } from 'prosemirror-model'
-
-declare module "prosemirror-view" {
-  export class Decoration {
-    spec: Object;
-    static widget(pos: number, dom: Node, spec?: { associative?: string, stopEvent?(event: Event): boolean, key?: string }): Decoration
-    static inline(from: number, to: number, attrs: DecorationAttrs, spec?: { inclusiveLeft?: boolean, inclusiveRight?: boolean }): Decoration
-    static node(from: number, to: number, attrs: DecorationAttrs, spec?: Object): Decoration
-
-  }
-  export interface DecorationAttrs {
-    class?: string;
-    style?: string;
-    nodeName?: string;
-
-  }
-  export class DecorationSet {
-    find(start?: number, end?: number): Decoration[]
-    map(mapping: Mapping, doc: ProsemirrorNode, options?: { onRemove?(decorationSpec: Object): void }): DecorationSet
-    add(doc: ProsemirrorNode, decorations: Decoration[]): DecorationSet
-    remove(decorations: Decoration[]): DecorationSet
-    static create(doc: ProsemirrorNode, decorations: Decoration[]): DecorationSet
-    static empty: DecorationSet;
-
-  }
-  export class EditorView {
-    constructor(place: Node | ((p: Node) => void) | { mount: Node } |  void, props: EditorProps)
-    state: EditorState;
-    dom: Element;
-    props: EditorProps;
-    update(props: EditorProps): void
-    setProps(props: EditorProps): void
-    updateState(state: EditorState): void
-    hasFocus(): boolean
-    someProp(propName: string, f: (prop: any) => any): any
-    focus(): void
-    root: Document | DocumentFragment;
-    posAtCoords(coords: { left: number, top: number }): { pos: number, inside: number } | void
-    coordsAtPos(pos: number): { left: number, right: number, top: number, bottom: number }
-    endOfTextblock(dir: "up" | "down" | "left" | "right" | "forward" | "backward", state?: EditorState): boolean
-    destroy(): void
-    dispatch(tr: Transaction): void
-
-  }
-  export interface EditorProps {
-    state: EditorState;
-    dispatchTransaction?(tr: Transaction): void
-    handleDOMEvents?: Object;
-    handleKeyDown?(view: EditorView, event: KeyboardEvent): boolean
-    handleKeyPress?(view: EditorView, event: KeyboardEvent): boolean
-    handleTextInput?(view: EditorView, from: number, to: number, text: string): boolean
-    handleClickOn?(view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean): boolean
-    handleClick?(view: EditorView, pos: number, event: MouseEvent): boolean
-    handleDoubleClickOn?(view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean): boolean
-    handleDoubleClick?(view: EditorView, pos: number, event: MouseEvent): boolean
-    handleTripleClickOn?(view: EditorView, pos: number, node: ProsemirrorNode, nodePos: number, event: MouseEvent, direct: boolean): boolean
-    handleTripleClick?(view: EditorView, pos: number, event: MouseEvent): boolean
-    handleContextMenu?(view: EditorView, pos: number, event: MouseEvent): boolean
-    onFocus?(view: EditorView, event: Event): void
-    onBlur?(view: EditorView, event: Event): void
-    domParser?: DOMParser;
-    clipboardParser?: DOMParser;
-    transformPasted?(p: Slice): Slice
-    transformPastedHTML?(p: string): string
-    transformPastedText?(p: string): string
-    nodeViews?: Object;
-    clipboardSerializer?: DOMSerializer;
-    decorations?(p: EditorState): DecorationSet
-    editable?(p: EditorState): boolean
-    attributes?: Object | ((p: EditorState) => Object | void);
-    scrollThreshold?: number;
-    scrollMargin?: number;
-
-  }
-  export interface NodeView {
-    dom?: Node;
-    contentDOM?: Node;
-    update?(node: ProsemirrorNode, decorations: Decoration[]): boolean
-    selectNode?(): void
-    deselectNode?(): void
-    setSelection?(anchor: number, head: number, root: Document): void
-    stopEvent?(event: Event): boolean
-    ignoreMutation?(p: MutationRecord): boolean
-    destroy?(): void
-
-  }
-
-}
\ No newline at end of file
+export class Decoration {
+  spec: object;
+  static widget(pos: number, dom: Node, spec?: { side?: number | null, stopEvent?: ((event: Event) => boolean) | null, key?: string | null }): Decoration;
+  static inline(from: number, to: number, attrs: DecorationAttrs, spec?: { inclusiveStart?: boolean | null, inclusiveEnd?: boolean | null }): Decoration;
+  static node(from: number, to: number, attrs: DecorationAttrs, spec?: object): Decoration;
+}
+export interface DecorationAttrs {
+  class?: string | null;
+  style?: string | null;
+  nodeName?: string | null;
+}
+export class DecorationSet {
+  find(start?: number, end?: number): Decoration[];
+  map(mapping: Mapping, doc: Node, options?: { onRemove?: ((decorationSpec: object) => void) | null }): DecorationSet;
+  add(doc: Node, decorations: Decoration[]): DecorationSet;
+  remove(decorations: Decoration[]): DecorationSet;
+  static create(doc: Node, decorations: Decoration[]): DecorationSet;
+  static empty: DecorationSet;
+}
+export class EditorView {
+  constructor(place: dom.Node | ((p: dom.Node) => void) | { mount: dom.Node } | undefined, props: EditorProps)
+  state: EditorState;
+  dom: Element;
+  props: EditorProps;
+  update(props: EditorProps): void;
+  setProps(props: EditorProps): void;
+  updateState(state: EditorState): void;
+  hasFocus(): boolean;
+  someProp(propName: string, f: (prop: any) => any): any;
+  focus(): void;
+  root: Document | DocumentFragment;
+  posAtCoords(coords: { left: number, top: number }): { pos: number, inside: number } | null | undefined;
+  coordsAtPos(pos: number): { left: number, right: number, top: number, bottom: number };
+  endOfTextblock(dir: 'up' | 'down' | 'left' | 'right' | 'forward' | 'backward', state?: EditorState): boolean;
+  destroy(): void;
+  dispatch(tr: Transaction): void;
+}
+export interface EditorProps {
+  state: EditorState;
+  dispatchTransaction?: ((tr: Transaction) => void) | null;
+  handleDOMEvents?: { [name: string]: (view: EditorView, event: Event) => boolean } | null;
+  handleKeyDown?: ((view: EditorView, event: KeyboardEvent) => boolean) | null;
+  handleKeyPress?: ((view: EditorView, event: KeyboardEvent) => boolean) | null;
+  handleTextInput?: ((view: EditorView, from: number, to: number, text: string) => boolean) | null;
+  handleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  handleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
+  handleDoubleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  handleDoubleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
+  handleTripleClickOn?: ((view: EditorView, pos: number, node: Node, nodePos: number, event: MouseEvent, direct: boolean) => boolean) | null;
+  handleTripleClick?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
+  handleContextMenu?: ((view: EditorView, pos: number, event: MouseEvent) => boolean) | null;
+  handlePaste?: ((view: EditorView, event: Event, slice: Slice) => boolean) | null;
+  handleDrop?: ((view: EditorView, event: Event, slice: Slice, moved: boolean) => boolean) | null;
+  onFocus?: ((view: EditorView, event: Event) => void) | null;
+  onBlur?: ((view: EditorView, event: Event) => void) | null;
+  createSelectionBetween?: ((view: EditorView, anchor: ResolvedPos, head: ResolvedPos) => Selection | null | undefined) | null;
+  domParser?: DOMParser | null;
+  clipboardParser?: DOMParser | null;
+  transformPasted?: ((p: Slice) => Slice) | null;
+  transformPastedHTML?: ((p: string) => string) | null;
+  transformPastedText?: ((p: string) => string) | null;
+  nodeViews?: { [name: string]: (node: Node, view: EditorView, getPos: () => number, decorations: Decoration[]) => NodeView } | null;
+  clipboardSerializer?: DOMSerializer | null;
+  decorations?: ((p: EditorState) => DecorationSet | null | undefined) | null;
+  editable?: ((p: EditorState) => boolean) | null;
+  attributes?: { [name: string]: string } | ((p: EditorState) => { [name: string]: string } | null | undefined) | null;
+  scrollThreshold?: number | null;
+  scrollMargin?: number | null;
+}
+export interface NodeView {
+  dom?: dom.Node | null;
+  contentDOM?: dom.Node | null;
+  update?: ((node: Node, decorations: Decoration[]) => boolean) | null;
+  selectNode?: (() => void) | null;
+  deselectNode?: (() => void) | null;
+  setSelection?: ((anchor: number, head: number, root: Document) => void) | null;
+  stopEvent?: ((event: Event) => boolean) | null;
+  ignoreMutation?: ((p: MutationRecord) => boolean) | null;
+  destroy?: (() => void) | null;
+}
diff --git a/types/prosemirror-view/tslint.json b/types/prosemirror-view/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prosemirror-view/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/purl/index.d.ts b/types/purl/index.d.ts
index 2849b17a8c..307ee68426 100644
--- a/types/purl/index.d.ts
+++ b/types/purl/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/allmarkedup/purl
 // Definitions by: Daniel Ferreira Monteiro Alves <https://github.com/danfma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace purl {
 
diff --git a/types/q/index.d.ts b/types/q/index.d.ts
index c4c1af5ec0..2a04f56847 100644
--- a/types/q/index.d.ts
+++ b/types/q/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kriskowal/q
 // Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export = Q;
 export as namespace Q;
diff --git a/types/q/q-tests.ts b/types/q/q-tests.ts
index 5f79d7f1e4..5acb354c80 100644
--- a/types/q/q-tests.ts
+++ b/types/q/q-tests.ts
@@ -100,7 +100,7 @@ declare var jPromise: JQueryPromise<string>;
 
 // if jQuery promises definition supported generics, this could be more interesting example
 Q<string>(jPromise).then(str => str.split(','));
-jPromise.then<number>(returnsNumPromise);
+jPromise.then(returnsNumPromise);
 
 // watch the typing flow through from jQueryPromise to Q.Promise
 Q(jPromise).then(str => str.split(','));
@@ -234,4 +234,4 @@ Q.try(function () {
 })
 .catch(function (error) {
     console.error("Couldn't sync to the cloud", error);
-});
\ No newline at end of file
+});
diff --git a/types/q/v0/index.d.ts b/types/q/v0/index.d.ts
index 6b2deb3161..11bf8fa7f7 100644
--- a/types/q/v0/index.d.ts
+++ b/types/q/v0/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kriskowal/q
 // Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export = Q;
 export as namespace Q;
diff --git a/types/q/v0/q-tests.ts b/types/q/v0/q-tests.ts
index 7ebc35adb3..5c64fa1ace 100644
--- a/types/q/v0/q-tests.ts
+++ b/types/q/v0/q-tests.ts
@@ -100,7 +100,7 @@ declare var jPromise: JQueryPromise<string>;
 
 // if jQuery promises definition supported generics, this could be more interesting example
 Q<string>(jPromise).then(str => str.split(','));
-jPromise.then<number>(returnsNumPromise);
+jPromise.then(returnsNumPromise);
 
 // watch the typing flow through from jQueryPromise to Q.Promise
 Q(jPromise).then(str => str.split(','));
diff --git a/types/qiniu/index.d.ts b/types/qiniu/index.d.ts
new file mode 100644
index 0000000000..03eedd4914
--- /dev/null
+++ b/types/qiniu/index.d.ts
@@ -0,0 +1,262 @@
+// Type definitions for qiniu 6.1
+// Project: https://github.com/qiniu/nodejs-sdk
+// Definitions by: xialeistudio <https://github.com/xialeistudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace qiniu {
+    type onret = (e?: any, result?: any, res?: any) => void;
+    class conf {
+        static ACCESS_KEY: string;
+        static SECRET_KEY: string;
+        static USER_AGENT: string;
+        static UP_HOST: string;
+        static RS_HOST: string;
+        static RSF_HOST: string;
+        static API_HOST: string;
+        static RPC_TIMEOUT: number;
+        static UC_HOST: string;
+        static UP_HTTPS_HOST: string;
+        static SCHEME: string;
+        static AUTOZONE: boolean;
+        static BUCKET: string | null;
+        static EXPIRE: number;
+    }
+    namespace auth {
+        class Mac {
+            accessKey: string;
+            secretKey: string;
+
+            constructor(accessKey: string, secretKey: string);
+        }
+    }
+    namespace io {
+        const UNDEFINED_KEY: string;
+        class PutExtra {
+            params: any;
+            mimeType?: string;
+            crc32?: string;
+            checkCrc?: number;
+
+            constructor(params?: any, mimeType?: string, crc32?: string, checkCrc?: number);
+        }
+        class PutRet {
+            hash?: string;
+            key?: string;
+
+            constructor(hash?: string, key?: string);
+        }
+
+        function putReadable(uptoken: string, key?: string, rs?: any, extra?: any, onret?: onret): any;
+
+        function put(uptoken: string, key?: string, body?: any, extra?: any, onret?: onret): any;
+
+        function putWithoutKey(uptoken: string, body?: any, extra?: any, onret?: onret): any;
+
+        function putFile(uptoken: string, key?: string, localFile?: string, extra?: any, onret?: onret): any;
+
+        function putFileWithoutKey(uptoken: string, localFile?: string, extra?: any, onret?: onret): any;
+    }
+    namespace util {
+        function urlsafeBase64Encode(jsonFlags: any): string;
+
+        function base64ToUrlSafe(v: string): string;
+
+        function hmacSha1(encodedFlags: any, secretKey: string): string;
+
+        function generateAccessToken(uri: string, body?: any): string;
+
+        function isQiniuCallback(path: string, body: any, callbackAuth: any): boolean;
+    }
+    namespace zone {
+        function up_host(uptoken: string, conf: conf): void;
+    }
+    namespace rsf {
+        function listPrefix(bucket: string, prefix?: string, marker?: any, limit?: any, delimiter?: any, onret?: onret): void;
+    }
+    namespace rpc {
+        function postMultipart(uri: string, form: any, onret?: onret): any;
+
+        function postWithForm(uri: string, form: any, token?: string, onret?: onret): any;
+
+        function postWithoutForm(uri: string, token?: string, onret?: onret): any;
+    }
+    namespace fop {
+        class ImageView {
+            mode: number;
+            width: number;
+            height: number;
+            quality: number;
+            format: any;
+
+            constructor(mode?: number, width?: number, height?: number, quality?: number, format?: any);
+
+            makeRequest(url: string): string;
+        }
+
+        class ImageInfo {
+            makeRequest(url: string): string;
+        }
+        class Exif {
+            makeRequest(url: string): string;
+        }
+
+        function pfop(bucket: string, key: string, fops: any, opts?: any, onret?: onret): void;
+    }
+    namespace rs {
+        import Mac = qiniu.auth.Mac;
+        class Client {
+            client?: Client;
+
+            constructor(client?: Client);
+
+            stat(bucket: string, key: string, onret?: onret): void;
+
+            remove(bucket: string, key: string, onret?: onret): void;
+
+            move(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, onret?: onret): void;
+
+            forceMove(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, force: boolean, onret?: onret): void;
+
+            copy(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, onret?: onret): void;
+
+            forceCopy(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, force: boolean, onret?: onret): void;
+
+            fetch(url: string, bucket: string, key: string, onret?: onret): void;
+
+            batchStat(entries: any[], onret?: onret): void;
+
+            batchDelete(entries: any[], onret?: onret): void;
+
+            batchMove(entries: any[], onret?: onret): void;
+
+            forceBatchMove(entries: any[], force: boolean, onret?: onret): void;
+
+            batchCopy(entries: any[], onret?: onret): void;
+
+            forceBatchCopy(entries: any[], force: boolean, onret?: onret): void;
+        }
+        class Entry {
+            hash?: string;
+            fsize?: number;
+            putTime?: number;
+            mimeType?: string;
+            endUser?: any;
+
+            constructor(hash?: string, fsize?: number, putTime?: number, mimeType?: string, endUser?: any);
+        }
+        class EntryPath {
+            bucket?: string;
+            key?: string;
+
+            constructor(bucket?: string, key?: string);
+
+            encode(): string;
+
+            toStr(op: string): string;
+        }
+        class EntryPathPair {
+            src?: string;
+            dest?: string;
+
+            constructor(src?: string, desc?: string);
+
+            toStr(op: string, force?: boolean): string;
+        }
+        class BatchItemRet {
+            error?: any;
+            code?: number;
+
+            constructor(error?: any, code?: number);
+        }
+        class BatchStatItemRet {
+            data: any;
+            error: any;
+            code: number;
+
+            constructor(data: any, error: any, code: number);
+        }
+        class PutPolicy {
+            scope?: string;
+            callbackUrl?: string;
+            callbackBody?: any;
+            returnUrl?: string;
+            returnBody?: any;
+            endUser?: any;
+            expires: number;
+            persistentOps?: any;
+            persistentNotifyUrl?: string;
+
+            constructor(score?: string,
+                        callbackUrl?: string,
+                        callbackBody?: any,
+                        returnUrl?: string,
+                        returnBody?: any,
+                        endUser?: any,
+                        expires?: number,
+                        persistentOps?: any,
+                        persistentNotifyUrl?: string);
+
+            token(mac?: Mac): string;
+
+            getFlags(): any;
+        }
+        interface putPolicyObj {
+            scope?: string;
+            expires?: number;
+            insertOnly?: boolean;
+            saveKey?: string;
+            endUser?: any;
+            returnUrl?: string;
+            returnBody?: any;
+            callbackUrl?: string;
+            callbackHost?: string;
+            callbackBody?: any;
+            callbackBodyType?: string;
+            callbackFetchKey?: string;
+            persistentOps?: any;
+            persistentNotifyUrl?: string;
+            persistentPipeline?: string;
+            fsizeLimit?: number;
+            fsizeMin?: any;
+            detectMime?: any;
+            mimeLimit?: any;
+            deleteAfterDays?: number;
+        }
+        class PutPolicy2 {
+            scope?: string;
+            expires: number;
+            insertOnly?: boolean;
+            saveKey?: string;
+            endUser?: any;
+            returnUrl?: string;
+            returnBody?: any;
+            callbackUrl?: string;
+            callbackHost?: string;
+            callbackBody?: any;
+            callbackBodyType?: string;
+            callbackFetchKey?: string;
+            persistentOps?: any;
+            persistentNotifyUrl?: string;
+            persistentPipeline?: string;
+            fsizeLimit?: number;
+            fsizeMin?: any;
+            detectMime?: any;
+            mimeLimit?: any;
+            deleteAfterDays?: number;
+
+            constructor(putPolicyObj: putPolicyObj);
+
+            token(mac?: Mac): string;
+
+            getFlags(): any;
+        }
+        class GetPolicy {
+            expires: number;
+
+            constructor(expires?: number);
+
+            makeRequest(baseUrl: string, mac?: Mac): string;
+        }
+        function makeBaseUrl(domain: string, key: string, query?: string): string;
+    }
+}
diff --git a/types/qiniu/qiniu-tests.ts b/types/qiniu/qiniu-tests.ts
new file mode 100644
index 0000000000..ea4c3fe202
--- /dev/null
+++ b/types/qiniu/qiniu-tests.ts
@@ -0,0 +1,156 @@
+// test for qiniu.conf
+function testConf() {
+    qiniu.conf.ACCESS_KEY = 'Access_Key';
+    qiniu.conf.SECRET_KEY = 'Secret_Key';
+}
+
+// test for qiniu.auth
+function testAuth() {
+    // test for auth.Mac
+    const mac = new qiniu.auth.Mac(qiniu.conf.ACCESS_KEY, qiniu.conf.SECRET_KEY);
+}
+
+// test for qiniu.io
+function testIo() {
+    // test for PutExtra
+    const putExtra = new qiniu.io.PutExtra();
+    // test for PutRet
+    const putRet = new qiniu.io.PutRet();
+    // test for putReadable
+    qiniu.io.putReadable('xxx', undefined, undefined, undefined, (e?: any, result?: any, res?: any) => {
+    });
+    // test for put
+    qiniu.io.put('xxx', undefined, 'test-data', undefined, (e?: any, result?: any, res?: any) => {
+    });
+    // test for putWithoutKey
+    qiniu.io.putWithoutKey('xxx', 'test-data', undefined, (e?: any, result?: any, res?: any) => {
+    });
+    // test for putFile
+    qiniu.io.putFile('xxx', undefined, 'tslint.json', undefined, (e?: any, result?: any, res?: any) => {
+    });
+    // test for putFileWithoutKey
+    qiniu.io.putFileWithoutKey('xxx', 'tslint.json', undefined, (e?: any, result?: any, res?: any) => {
+    });
+}
+
+// test for qiniu.util
+function testUtil() {
+    // test for urlsafeBase64Encode
+    qiniu.util.urlsafeBase64Encode(null);
+    // test for base64ToUrlSafe
+    qiniu.util.base64ToUrlSafe('https://example.com');
+    // test for hmacSha1
+    qiniu.util.hmacSha1(null, 'test');
+    // test for generateAccessToken
+    qiniu.util.generateAccessToken('https://example.com');
+    // test for isQiniuCallback
+    qiniu.util.isQiniuCallback('/key', 'test-data', 'test-auth');
+}
+
+// test for qiniu.zone
+function testZone() {
+    qiniu.zone.up_host('test', {ACCESS_KEY: 'xx', SECRET_KEY: 'ss'});
+}
+
+// test for qiniu.rsf
+function testRsf() {
+    qiniu.rsf.listPrefix('test');
+}
+
+// test for qiniu.rpc
+function testRpc() {
+    // test for postMultipart
+    qiniu.rpc.postMultipart('https://up.qbox.me', 'test');
+    // test for postWithForm
+    qiniu.rpc.postWithForm('https://up.qbox.me', 'test');
+    // test for postWithoutForm
+    qiniu.rpc.postWithoutForm('https://up.qbox.me');
+}
+
+// test for qiniu.fop
+function testFop() {
+    // test for ImageView
+    const imageView = new qiniu.fop.ImageView(1, 1, 1, 1);
+    imageView.makeRequest('https://up.qbox.me');
+    // test for ImageInfo
+    const imageInfo = new qiniu.fop.ImageInfo();
+    imageInfo.makeRequest('https://up.qbox.me');
+    // test for Exif
+    const exif = new qiniu.fop.Exif();
+    exif.makeRequest('https://up.qbox.me');
+    //  test for fop
+    qiniu.fop.pfop('test', 'test', 'test');
+}
+
+// test for qiniu.rs
+function testRs() {
+    // test for Client
+    const client = new qiniu.rs.Client();
+    // test for Client.stat
+    client.stat('test', 'test', (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.remove
+    client.remove('test', 'test', (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.move
+    client.move('test-src', 'test-src', 'test-dest', 'test-dest', (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.forceMove
+    client.forceMove('test-src', 'test-src', 'test-dest', 'test-dest', true, (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.copy
+    client.copy('test-src', 'test-src', 'test-dest', 'test-dest', (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.forceCopy
+    client.forceCopy('test-src', 'test-src', 'test-dest', 'test-dest', true, (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.fetch
+    client.fetch('https://up.qbox.me', 'test', 'test', (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.batchStat
+    client.batchStat(['data'], (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.batchDelete
+    client.batchDelete(['data'], (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.batchMove
+    client.batchMove(['data'], (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.forceBatchMove
+    client.forceBatchMove(['data'], true, (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.batchCopy
+    client.batchCopy(['data'], (e?: any, result?: any, res?: any) => {
+    });
+    // test for Client.forceBatchMove
+    client.forceBatchCopy(['data'], true, (e?: any, result?: any, res?: any) => {
+    });
+    // test for Entry
+    const entry = new qiniu.rs.Entry('xx', 1, 1);
+    // test for EntryPath
+    const entryPath = new qiniu.rs.EntryPath('test', 'test');
+    entryPath.encode();
+    entryPath.toStr('x');
+    // test for EntryPathPair
+    const entryPathPair = new qiniu.rs.EntryPathPair('xxx', 'xxx');
+    entryPathPair.toStr('x', false);
+    // test for BatchItemRet
+    const batchItemRet = new qiniu.rs.BatchItemRet('xx', 0);
+    // test for BatchStatItemRet
+    const batchStatItemRet = new qiniu.rs.BatchStatItemRet('xx', 'xxx', 0);
+    // test for PutPolicy
+    const putPolicy = new qiniu.rs.PutPolicy();
+    putPolicy.token();
+    putPolicy.getFlags();
+    // test for PutPolicy2
+    const putPolicy2 = new qiniu.rs.PutPolicy2({
+        scope: 'xxx'
+    });
+    putPolicy2.token();
+    putPolicy2.getFlags();
+    // test for GetPolicy
+    const getPolicy = new qiniu.rs.GetPolicy(10);
+    getPolicy.makeRequest('https://up.qbox.me');
+    // test for makeBaseUrl
+    qiniu.rs.makeBaseUrl('up.qbox.me', 'test');
+}
diff --git a/types/qiniu/tsconfig.json b/types/qiniu/tsconfig.json
new file mode 100644
index 0000000000..d862b59b98
--- /dev/null
+++ b/types/qiniu/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "qiniu-tests.ts"
+    ]
+}
diff --git a/types/qiniu/tslint.json b/types/qiniu/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/qiniu/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/qlik-engineapi/index.d.ts b/types/qlik-engineapi/index.d.ts
similarity index 98%
rename from qlik-engineapi/index.d.ts
rename to types/qlik-engineapi/index.d.ts
index 4baf80e8fe..6b6adc25d8 100644
--- a/qlik-engineapi/index.d.ts
+++ b/types/qlik-engineapi/index.d.ts
@@ -101,7 +101,7 @@ declare namespace EngineAPI {
     interface IGenericProperties {
         qInfo: INxInfo;
 
-        //?Dynamic properties?
+        // ?Dynamic properties?
         [qMetaDef: string]: any;
     }
 
@@ -1021,10 +1021,10 @@ declare namespace EngineAPI {
     }
 
     interface IImplementOn {
-        //? nicht in der docu
-        on(event: "changed" | "closed", func: () => void);
+        // ? not in Docu
+        on(event: "changed" | "closed", func: () => void): void;
 
-        //? not in Docu
+        // ? not in Docu
         id: string;
     }
 
@@ -1053,7 +1053,13 @@ declare namespace EngineAPI {
         getChild(qId: string): Promise<IGenericObject>;
         getEffectiveProperties(): Promise<IGenericObjectProperties>;
         getFullPropertyTree(): Promise<IGenericObjectEntry>;
-        getHyperCubeBinnedData(qPath: string, qPages: INxPage[], qViewport: INxViewPort, qDataRanges: INxDataAreaPage, qMaxNbrCells: number, qQueryLevel: number, qBinningMethod: number): Promise<INxDataPage[]>;
+        getHyperCubeBinnedData(qPath: string,
+                               qPages: INxPage[],
+                               qViewport: INxViewPort,
+                               qDataRanges: INxDataAreaPage,
+                               qMaxNbrCells: number,
+                               qQueryLevel: number,
+                               qBinningMethod: number): Promise<INxDataPage[]>;
         getHyperCubeContinuousData(qPath: string, qOptions: IContinuousDataOptions[]): Promise<boolean> | Promise<INxDataPage[]> | Promise<INxAxisData[]>;
         getHyperCubeData(qPath: string, qPages: INxPage[]): Promise<INxDataPage[]>;
         getHyperCubePivotData(qPath: string, qPages: INxPage[]): Promise<INxPivotPage[]>;
@@ -1287,13 +1293,13 @@ declare namespace EngineAPI {
         cancelRequest(qRequestId: number): Promise<void>;
         configureReload(qCancelOnScriptError: boolean, qUseErrorData: boolean, qInteractOnError: boolean): Promise<void>;
         copyApp(qTargetAppId: string, qSrcAppId: string, qIds: string[]): Promise<boolean>;
-        createApp(qAppName: string, qLocalizedScriptMainSection: string): Promise<any>; //?Result
+        createApp(qAppName: string, qLocalizedScriptMainSection: string): Promise<any>; // ?Result
         createDocEx(qDocName: string, qUserName?: string, qPassword?: string, qSerial?: string, qLocalizedScriptMainSection?: string): Promise<IApp>;
         createSessionApp(): Promise<IApp>;
         createSessionAppFromApp(qSrcAppId: string): Promise<IApp>;
         deleteApp(qAppId: string): Promise<boolean>;
         exportApp(qTargetPath: string, qSrcAppId: string, qIds: string[]): Promise<boolean>;
-        getActiveDoc(): Promise<IApp | string>; //?Result
+        getActiveDoc(): Promise<IApp | string>; // ?Result
         getAppEntry(qAppID: string): Promise<IAppEntry>;
         getAuthenticatedUser(): Promise<string>;
         getBNF(qBnfType: BnfType): Promise<IBNFDef>;
@@ -1595,7 +1601,7 @@ declare namespace EngineAPI {
          * Validation error.
          * REF(NxValidationError)
          */
-        //?Type = REF(NxValidationError)?
+        // ?Type = REF(NxValidationError)?
         qError: INxValidationError;
     }
 
@@ -1743,8 +1749,8 @@ declare namespace EngineAPI {
         qAttributeExpressions?: INxAttrExprDef[];
         qAttributeDimensions?: INxAttrDimDef[];
 
-        qIncludeElemValue?: boolean; //?Nicht in Doku
-        qShowTotal?: boolean; //?Nicht in Doku
+        qIncludeElemValue?: boolean; // ?Nicht in Doku
+        qShowTotal?: boolean; // ?Nicht in Doku
     }
 
     interface INxCellPosition {
@@ -1765,7 +1771,7 @@ declare namespace EngineAPI {
         qSortByExpression?: TypeSortDirection;
         qExpression?: IValueExpr;
 
-        qSortByGreyness?: TypeSortDirection; //?Nicht in Doku
+        qSortByGreyness?: TypeSortDirection; // ?Nicht in Doku
     }
 
     interface IStringExpressionContainer {
@@ -1825,20 +1831,20 @@ declare namespace EngineAPI {
         qData: T;
     }
 
-    //public enum NxHypercubeMode {
+    // public enum NxHypercubeMode {
     //    [QixName("P:
     //        DATA_MODE_PIVOT = 1,
     //    [QixName("K:
     //        DATA_MODE_PIVOT_STACK = 2,
     //    [QixName("S:
     //        DATA_MODE_STRAIGHT = 0
-    //}
+    // }
 
-    //public enum SortDirection {
+    // public enum SortDirection {
     //    Ascending = 1,
     //    Descending = -1,
     //    None = 0
-    //}
+    // }
 }
 
 //#region Prototype Interfaces for Class definitions
@@ -1957,8 +1963,8 @@ declare namespace EngineAPI {
         qCalcCond: IValueExpr;
         qSortbyYValue: string;
 
-        qPseudoDimPos: number; //?Dokufehler
-        qReductionMode: ReductionModeType; //?Dokufehler
+        qPseudoDimPos: number; // ?Dokufehler
+        qReductionMode: ReductionModeType; // ?Dokufehler
     }
 
     interface IVisualizationHyperCubeDef extends IHyperCubeDef {
@@ -2059,7 +2065,7 @@ declare namespace EngineAPI {
 
     interface IBookmarkListDef {
         qType: "bookmark";
-        // qData: //?nicht dokumentiert
+        // qData: nicht dokumentiert
         // example from websocket
         // qData: { title: "/qMetaDef/title", description: "/qMetaDef/description", sheetId: "/sheetId", title: "/qMetaDef/title" }
     }
@@ -2101,7 +2107,7 @@ declare namespace EngineAPI {
 
     interface IMeasureListDef {
         qType: "measure";
-        // qData: INxMeasure[]; //?nicht dokumentiert
+        // qData: INxMeasure[]; nicht dokumentiert
         // example from websocket
         // qData : { title: "/qMetaDef/title", tags: "/qMetaDef/tags" }
     }
@@ -2143,7 +2149,7 @@ declare namespace EngineAPI {
 
     interface IDimensionListDef {
         qType: "dimension";
-        //qData: INxDimension[]; //?nicht dokumentiert
+        // qData: INxDimension[]; nicht dokumentiert
     }
 
     interface IDimensionListObject extends IGenericObject {
@@ -2167,7 +2173,7 @@ declare namespace EngineAPI {
         qIsReserved?: boolean;
         qMeta?: INxMeta;
         qInfo: INxInfo;
-        qData: any; //?nicht dokumentiert
+        qData: any; // ? nicht dokumentiert
         qIsScriptCreated: boolean;
     }
 
@@ -2187,7 +2193,7 @@ declare namespace EngineAPI {
         qType: string;
         qShowReserved: boolean;
         qShowConfig: boolean;
-        qData: any; //?nicht dokumentiert
+        qData: any; // ?nicht dokumentiert
     }
 
     interface IVariableListObject extends IGenericObject {
@@ -2271,23 +2277,3 @@ declare namespace EngineAPI {
     }
 }
 //#endregion
-
-// extens the AppAPI Namespace with the access of the EnigmaModel
-
-declare namespace AppAPI {
-    interface IApp {
-        model: IModel;
-    }
-
-    interface IModel {
-        enigmaModel: Enigma.IApp;
-    }
-}
-
-declare namespace ExtensionAPI {
-
-    interface IExtensionModel {
-        enigmaModel: Enigma.IGenericObject;
-    }
-
-}
\ No newline at end of file
diff --git a/types/qlik-engineapi/qlik-engineapi-tests.ts b/types/qlik-engineapi/qlik-engineapi-tests.ts
new file mode 100644
index 0000000000..3484d95073
--- /dev/null
+++ b/types/qlik-engineapi/qlik-engineapi-tests.ts
@@ -0,0 +1 @@
+let app: EngineAPI.IApp;
diff --git a/qlik-engineapi/tsconfig.json b/types/qlik-engineapi/tsconfig.json
similarity index 100%
rename from qlik-engineapi/tsconfig.json
rename to types/qlik-engineapi/tsconfig.json
diff --git a/qlik-engineapi/tslint.json b/types/qlik-engineapi/tslint.json
similarity index 55%
rename from qlik-engineapi/tslint.json
rename to types/qlik-engineapi/tslint.json
index cae1bdf2ad..9a48ae7955 100644
--- a/qlik-engineapi/tslint.json
+++ b/types/qlik-engineapi/tslint.json
@@ -1,8 +1,8 @@
-{ 
-  "extends": "../tslint.json",
+{
+  "extends": "dtslint/dt.json",
   "rules": {
-        "forbidden-types": false,
+        "ban-types": false,
         "no-empty-interface": false,
         "interface-name": false
   }
-}
\ No newline at end of file
+}
diff --git a/types/qlik-visualizationextensions/index.d.ts b/types/qlik-visualizationextensions/index.d.ts
index d4296fca5b..741e9db805 100644
--- a/types/qlik-visualizationextensions/index.d.ts
+++ b/types/qlik-visualizationextensions/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://help.qlik.com/en-US/sense-developer/3.2/Subsystems/Extensions/Content/extensions-introduction.htm
 // Definitions by: Konrad Mattheis <https://github.com/konne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/qlik/index.d.ts b/types/qlik/index.d.ts
new file mode 100644
index 0000000000..6d9eeb0148
--- /dev/null
+++ b/types/qlik/index.d.ts
@@ -0,0 +1,914 @@
+// Type definitions for 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
+// TypeScript Version: 2.3
+
+import 'jquery';
+
+export interface Size {
+    qcx: number;
+    qcy: number;
+}
+
+export interface NxValidationError {
+    qErrorCode: number;
+    qContext: string;
+    qExtendedMessage: string;
+}
+
+export interface NxStateCounts {
+    qLocked: number;
+    qSelected: number;
+    qOption: number;
+    qDeselected: number;
+    qAlternative: number;
+    qExcluded: number;
+    qSelectedExcluded: number;
+    qLockedExcluded: number;
+}
+
+export interface FieldAttributes {
+    qType: 'U' | 'A' | 'I' | 'R' | 'F' | 'M' | 'D' | 'T' | 'TS' | 'IV';
+    qnDec: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15;
+    qUseThou: 0 | 1;
+    qFmt: string;
+    qDec: string;
+    qThou: string;
+    qSAFEARRAY: any[];
+}
+
+export interface CharRange {
+    qCharPos: number;
+    qCharCount: number;
+}
+
+export interface NxHighlightRanges {
+    qRanges: CharRange[];
+}
+
+export interface NxSimpleValue {
+    qText: string;
+    qNum: number;
+}
+
+export interface NxAttributeExpressionValues {
+    qValues: NxSimpleValue[];
+}
+
+export type NxCellRows = NxCell[];
+
+export interface NxGroupTail {
+    qUp: number;
+    qDown: number;
+}
+
+export interface Rect {
+    qLeft: number;
+    qTop: number;
+    qWdith: number;
+    qHeight: number;
+}
+
+export interface NxPivotDimensioncell {
+    qText: string;
+    qElemNo: number;
+    qValue: number;
+    qCanExpand: boolean;
+    qCanCollapse: boolean;
+    qType: 'V' | 'E' | 'N' | 'T' | 'P' | 'R' | 'U';
+    qUp: number;
+    qDown: number;
+    qSubNodes: NxPivotDimensioncell[];
+    qAttrExps: NxAttributeExpressionValues[];
+    qAttrDims: NxAttributeDimValues[];
+}
+
+export interface NxPivotValuePoint {
+    qLabel?: string;
+    qText: string;
+    qNum: number;
+    qType: 'V' | 'E' | 'N' | 'T' | 'P' | 'R' | 'U';
+    qAttrExps: NxAttributeExpressionValues;
+}
+
+export interface NxPivotPage {
+    qLeft: NxPivotDimensioncell[];
+    qTop: NxPivotDimensioncell[];
+    qData: NxPivotValuePoint[];
+    qArea: Rect;
+}
+
+export interface NxStackedPivotCell {
+    qText: string;
+    qElemNo: number;
+    qValue: number;
+    qCanExpand: boolean;
+    qCanCollapse: boolean;
+    qType: 'V' | 'E' | 'N' | 'T' | 'P' | 'R' | 'U';
+    qMaxPos: number;
+    qMinNeg: number;
+    qUp: number;
+    qDown: number;
+    qRow: number;
+    qSubNodes: NxStackedPivotCell[];
+    qAttrExps: NxAttributeExpressionValues;
+    qAttrDims: NxAttributeDimValues;
+}
+
+export interface NxStackPage {
+    qData: NxStackedPivotCell[];
+    qArea: Rect;
+}
+
+export interface NxCellPosition {
+    qx: number;
+    qy: number;
+}
+
+export interface NxDataPage {
+    qMatrix: NxCellRows[];
+    qTails: NxGroupTail[];
+    qArea: Rect;
+    qIsReduced: boolean;
+}
+
+export interface NxAttributeDimValues {
+    qValues: NxSimpleDimValue[];
+}
+
+export interface NxSimpleDimValue {
+    qText: string;
+    qElemNo: number;
+}
+
+export interface NxCell {
+    qText: string;
+    qNum: number;
+    qElemNumber: number;
+    qState: 'L' | 'S' | 'O' | 'D' | 'A' | 'X' | 'XS' | 'XL';
+    qIsEmpty: boolean;
+    qIsTotalCell: boolean;
+    qIsOtherCell: boolean;
+    qFrequency: string;
+    qHighlightRanges: NxHighlightRanges;
+    qAttrExps: NxAttributeExpressionValues;
+    qIsNull: boolean;
+    qAttrDims: NxAttributeDimValues;
+}
+
+export interface NxAttrExprInfo {
+    qMin: number;
+    qMax: number;
+    qContinuousAxes: boolean;
+    qIsCyclic: boolean;
+    qFallbackTitle: string;
+}
+
+export interface NxAttrDimInfo {
+    qCardinal: number;
+    qSize: Size;
+    qFallbackTitle: string;
+    qLocked: boolean;
+    qError: NxValidationError;
+}
+
+export interface ColumnInfo {
+    qFallbackTitle: string;
+    qApprMaxGlyphCount: number;
+    qCardinal: string;
+    qSortIndicator: 'N' | 'A' | 'D';
+    qNumFormat: FieldAttributes;
+    qIsAutoFormat: boolean;
+    qMin: number;
+    qMax: number;
+    qError: NxValidationError;
+    qReverseSort: boolean;
+    qAttrExprInfo: NxAttrExprInfo[];
+    qAttrDimInfo: NxAttrDimInfo[];
+}
+
+export interface NxDimensionInfo extends ColumnInfo {
+    qLocker: string;
+    qGroupFallbackTitles: string[];
+    qGroupPos: number;
+    qStateCounts: NxStateCounts;
+    qTags: string[];
+    qDimensionType: 'D' | 'N' | 'T';
+    qGrouping: 'N' | 'H' | 'C';
+    qIsSemantic: boolean;
+    qGroupFieldDefs: string[];
+    qContinuousAxes: boolean;
+    qIsCyclic: boolean;
+    qDerivedField: boolean;
+}
+
+export type NxMeasureInfo = ColumnInfo;
+
+export interface HyperCube {
+    qStateName: string;
+    qSize: Size;
+    qError: NxValidationError;
+    qDimensionInfo: NxDimensionInfo[];
+    qMeasureInfo: NxMeasureInfo[];
+    qEffectiveInterColumnSortOrder: number[];
+    qGrandTotalRow: NxCell[];
+    qDataPages: NxDataPage[];
+    qPivotDataPages: NxPivotPage[];
+    qStackedDataPages: NxStackPage[];
+    qMode: 'S' | 'P' | 'K';
+    qNoOfLeftDims: number;
+    qIndentMode: boolean;
+    qLastExpandedPos: NxCellPosition;
+    qHasOtherValues: boolean;
+}
+
+export interface NxInfo {
+    qId: string;
+    qType: string;
+}
+
+export interface NxCurrentSelectionItem {
+    qTotal: number;
+    qIsNum?: boolean;
+    qField: string;
+    qLocked?: boolean;
+    qOneAndOnlyOne?: boolean;
+    qTextSearch?: string;
+    qSelectedCount: number;
+    qSelected: string;
+    qRangeInfo: RangeSelectInfo[];
+    qSortIndex: number;
+    qStateCounts: NxStateCounts;
+    qSelectedFieldSelectionInfo: NxFieldSelectionInfo[];
+    qNotSelectedFieldSelectionInfo: NxFieldSelectionInfo[];
+    qSelectionThreshold: number;
+}
+
+export interface RangeSelectInfo {
+    qRangeLo: number;
+    qRangeHi: number;
+    qMeasure: string;
+}
+
+export interface NxFieldSelectionInfo {
+    qName: string;
+    qFieldSelectionmode: 'NORMAL' | 'AND' | 'NOT';
+}
+
+export interface Selectionobject {
+    qBackCount: number;
+    qForwardCount: number;
+    qSelections: NxCurrentSelectionItem[];
+}
+
+export interface Layout {
+    qHyperCube: HyperCube;
+    qInfo: NxInfo;
+    qSelectionInfo: Selectionobject;
+}
+
+export interface ValueExpr {
+    qv: string;
+}
+
+export interface SortCriteria {
+    qSortByState: -1 | 0 | 1;
+    qSortByFrequency: -1 | 0 | 1;
+    qSortByNumeric: -1 | 0 | 1;
+    qSortByAscii: -1 | 0 | 1;
+    qSortByLoadOrder: -1 | 0 | 1;
+    qSortByExpression: -1 | 0 | 1;
+    qExpression: ValueExpr;
+}
+
+export interface NxInlineDimensionDef {
+    qGrouping: 'N' | 'H' | 'C';
+    qFieldDefs: string[];
+    qSortCriteries: SortCriteria[];
+    qNumberPresentations: FieldAttributes[];
+    qReverseSort: boolean;
+    qActiveField: number;
+}
+
+export interface OtherTotalSpecProp {
+    qOtherMode: 'OTHER_OFF' | 'OTHER_COUNTED'
+    | 'OTHER_ABS_LIMITED' | 'OTHER_ABS_ACC_TARGET'
+    | 'OTHER_REL_LIMITED' | 'OTHER_REL_ACC_TARGET';
+    qOtherCounted: ValueExpr;
+    qOtherLimit: ValueExpr;
+    qOtherLimitMode: 'OTHER_GE_LIMIT' | 'OTHER_LE_LIMIT' | 'OTHER_GT_LIMIT' | 'OTHER_LT_LIMIT';
+    qSupressOther: boolean;
+    qForceBadValueKeeping: boolean;
+    qApplyEvenWhenPossiblyWrongResult: boolean;
+    qGlobalOtherGrouping: boolean;
+    qOtherCollapseInnerDimensions: boolean;
+    qOtherSortMode: 'OTHER_SORT_DEFAULT' | 'OTHER_SORT_DESCENDING' | 'OTHER_SORT_ASCENDING';
+    qTotalMode: 'TOTAL_OFF' | 'TOTAL_EXPR';
+    qReferencedExpression: string;
+}
+
+export interface NxAttrExprDef {
+    qExpression: string;
+    qLibraryId: string;
+}
+
+export interface NxAttrDimDef {
+    qDef: string;
+    qLibraryId: string;
+    qSortBy: SortCriteria;
+}
+
+export interface NxDimension {
+    qLibraryId: string;
+    qDef: NxInlineDimensionDef;
+    qNullSuppression: boolean;
+    qOtherTotalSpec: OtherTotalSpecProp;
+    qShowAll: boolean;
+    qOtherLabel: string;
+    qTotalLabel: string;
+    qCalcCond: ValueExpr;
+    qAttributeExpressions: NxAttrExprDef[];
+    qAttributeDimensions: NxAttrDimDef[];
+}
+
+export interface NxMeasure {
+    qLibraryId: string;
+    qDef: NxInlineMeasureDef;
+    qSortBy: SortCriteria;
+    qAttributeExpressions: NxAttrExprDef[];
+    qCalcCond: ValueExpr;
+    qAttributeDimensions: NxAttrDimDef[];
+}
+
+export interface NxInlineMeasureDef {
+    qcx: number;
+    qcy: number;
+}
+
+export interface NxPage {
+    qLeft?: number;
+    qTop?: number;
+    qWidth?: number;
+    qHeight?: number;
+}
+
+export interface HyperCubeDef {
+    qStateName?: string;
+    qDimensions?: NxDimension[];
+    qMeasures?: NxMeasure[];
+    qInterColumnSortOrder?: number[];
+    qSuppressZero?: boolean;
+    qSupressMissing?: boolean;
+    qInitialDataFetch?: NxPage[];
+    qMode?: 'S' | 'P' | 'K';
+    qNoOfLeftDims?: number;
+    qAlwaysFullyExpanded?: boolean;
+    qMaxStackedCells?: number;
+    qPopulateMissing?: boolean;
+    qShowTotalsAbove?: boolean;
+    qIndentMode?: boolean;
+    qCalcCond?: ValueExpr;
+    qSortByYValue?: -1 | 0 | 1;
+}
+
+export interface NxAutoSortByStateDef {
+    qDisplayNumberOfRows: number;
+}
+
+export interface NxListobjectExpressionDef {
+    qExpr: string;
+    qLibraryId: string;
+}
+
+export interface ListobjectDef {
+    qStateName: string;
+    qLibraryId: string;
+    qDef: NxInlineDimensionDef;
+    qAutoSortByState: NxAutoSortByStateDef;
+    qFrequencyMode: 'NX_FREQUENCY_NONE' | 'NX_FREQUENCY_VALUE' | 'NX_FREQUENCY_PERCENT' | 'NX_FREQUENCY_RELATIVE';
+    qShowAlternatives: boolean;
+    qInitialDataFetch: NxPage[];
+    qExpressions: NxListobjectExpressionDef[];
+}
+
+export interface InitialPropertiesHyperCube {
+    qHyperCubeDef: HyperCubeDef;
+
+    [key: string]: any;
+}
+
+export interface InitialPropertiesListobject {
+    qListobjectDef: ListobjectDef;
+
+    [key: string]: any;
+}
+
+export type InitialProperties = InitialPropertiesHyperCube | InitialPropertiesListobject;
+
+export interface SnapshotLegacy {
+    canTakeSnapshot: boolean;
+}
+
+export type SupportFunction = (layout: Layout) => boolean;
+export type SupportItem = boolean | SupportFunction;
+
+export interface Support {
+    snapshot: SupportItem | SnapshotLegacy;
+    export: SupportItem;
+    exportData: SupportItem;
+}
+
+export type Paint = (
+    this: ExtensionContext,
+    $element?: JQuery,
+    layout?: Layout,
+    qDimensionInfo?: NxDimensionInfo,
+    qMeasureInfo?: NxDimensionInfo,
+    qMatrix?: NxCellRows[],
+    dimensions?: NxCell[],
+    measures?: NxCell[],
+    qSize?: Size,
+    qId?: string,
+    qSelectionInfo?: Selectionobject
+) => void;
+
+export interface VisualizationCommon {
+    qHyperCubeDef: HyperCubeDef;
+    title: string;
+    showTitles: boolean;
+    subtitle: string;
+    footnote: string;
+}
+
+// TODO: Other types of visualizations
+export type VisualizationOptions = VisualizationCommon;
+
+// TODO: Figure out other types
+export type ShowFunction = (layout: Layout, cls: any, obj: any) => boolean
+    | ((measure: NxMeasure) => boolean);
+
+export interface CustomPropertyCommon {
+    type?: 'string' | 'integer' | 'number' | 'array' | 'boolean' | 'items';
+    ref?: string;
+    label?: string;
+    show?: boolean | ShowFunction;
+}
+
+export interface CustomPropertyString extends CustomPropertyCommon {
+    type: 'string';
+    expression?: 'always' | 'optional' | '';
+    maxLength?: number;
+    defaultValue?: string;
+}
+
+export interface CustomPropertyInteger extends CustomPropertyCommon {
+    type: 'integer';
+    component?: string;
+    min?: string;
+    max?: string;
+    defaultValue?: number;
+}
+
+export interface CustomPropertyNumber extends CustomPropertyCommon {
+    type: 'number';
+    component?: string;
+    min?: string;
+    max?: string;
+    defaultValue?: number;
+}
+
+export interface CustomPropertyArray extends CustomPropertyCommon {
+    type: 'array';
+    component?: undefined;
+    itemTitleRef?: string;
+    allowAdd?: boolean;
+    allowRemove?: boolean;
+    addTranslation?: string;
+    allowMove?: boolean;
+}
+
+export interface CustomPropertyButton extends CustomPropertyCommon {
+    component: 'button';
+    action(data: VisualizationOptions): void;
+}
+
+export interface ButtonGroupOption {
+    value: string;
+    label: string;
+    tooltip: string;
+}
+
+export interface CustomPropertyButtonGroup extends CustomPropertyCommon {
+    type: 'string';
+    component: 'buttongroup';
+    defaultValue?: string;
+    options?: ButtonGroupOption[] | (() => ButtonGroupOption[]);
+}
+
+export interface CustomPropertyCheckbox extends CustomPropertyCommon {
+    type: 'boolean';
+    defaultValue?: boolean;
+}
+
+export interface CustomPropertyColorPicker extends CustomPropertyCommon {
+    type: 'integer';
+    component: 'color-picker';
+    defaultValue?: number;
+}
+
+export interface CustomPropertyOption {
+    value: string;
+    label: string;
+}
+
+export type CustomPropertyOptions = CustomPropertyOption[] | (() => CustomPropertyOption[]);
+
+export interface CustomPropertyDropdown extends CustomPropertyCommon {
+    type: 'string';
+    ref: string;
+    component: 'dropdown';
+    defaultValue?: string;
+    options?: CustomPropertyOptions;
+}
+
+export interface CustomPropertyLink extends CustomPropertyCommon {
+    component: 'link';
+    url?: string;
+}
+
+export interface CustomProperyMedia extends CustomPropertyCommon {
+    type: 'string';
+    component: 'media';
+    layoutRef?: string;
+}
+
+export interface CustomPropertyRadio extends CustomPropertyCommon {
+    type: 'string';
+    component: 'radiobuttons';
+    defaultValue?: string;
+    options?: CustomPropertyOptions;
+}
+
+export interface CustomPropertySlider extends CustomPropertyCommon {
+    type: 'number';
+    component: 'slider';
+    defaultValue?: number;
+    min?: number;
+    max?: number;
+    step?: number;
+}
+
+export interface CustomPropertyRangeSlider extends CustomPropertyCommon {
+    type: 'array';
+    component: 'slider';
+    defaultValue?: number;
+    min?: number;
+    max?: number;
+    step?: number;
+}
+
+export interface CustomPropertySwitch extends CustomPropertyCommon {
+    type: 'boolean';
+    component: 'switch';
+    defaultValue?: string;
+    options?: CustomPropertyOptions;
+}
+
+export interface CustomPropertyText extends CustomPropertyCommon {
+    component: 'text';
+}
+
+export interface CustomPropertyTextArea extends CustomPropertyCommon {
+    type: 'string';
+    component: 'textarea';
+    rows?: number;
+    maxlength?: number;
+    defaultValue?: string;
+}
+
+export interface CustomPropertyExpression extends CustomPropertyCommon {
+    type: undefined;
+    component: 'expression';
+    expressionType: 'dimension' | 'measure' | 'StringExpr' | 'ValueExpr' | 'ValueExpression' | 'StringExpression';
+    defaultValue?: string;
+}
+
+export interface CustomPropertyItems extends CustomPropertyCommon {
+    type: 'items';
+    items: {
+        [key: string]: CustomProperty;
+    };
+}
+
+export type CustomProperty = CustomPropertyString | CustomPropertyInteger | CustomPropertyNumber
+    | CustomPropertyArray | CustomPropertyButton | CustomPropertyButtonGroup
+    | CustomPropertyCheckbox | CustomPropertyColorPicker | CustomPropertyDropdown
+    | CustomPropertyLink | CustomProperyMedia | CustomPropertyRadio
+    | CustomPropertySlider | CustomPropertyRangeSlider | CustomPropertySwitch
+    | CustomPropertyText | CustomPropertyTextArea | CustomPropertyExpression
+    | CustomPropertyItems;
+
+export interface Definition {
+    type: 'items';
+    component: 'accordion';
+    items: {
+        data?: {
+            uses: 'data';
+        };
+        dimensions?: {
+            uses: 'dimensions';
+            ref?: string;
+            min?: number;
+            max?: number;
+            items?: {
+                [key: string]: CustomProperty;
+            }
+        };
+        measures?: {
+            uses: 'measures';
+            ref?: string;
+            min?: number;
+            max?: number;
+            items?: {
+                [key: string]: CustomProperty;
+            }
+        };
+        sorting?: {
+            uses: 'sorting';
+            items?: {
+                [key: string]: CustomProperty;
+            }
+        };
+        settings?: {
+            uses: 'settings';
+            items?: {
+                [key: string]: CustomProperty;
+            }
+        };
+    };
+}
+
+export interface Extension {
+    initialProperties: InitialProperties;
+    definition: Definition;
+    paint: Paint;
+    support?: Support;
+}
+
+export interface Patch {
+    qOp: 'add' | 'remove' | 'replace';
+    qPath: string;
+    qValue: string;
+}
+
+export interface BackendApi {
+    abortSearch(): void;
+    acceptSearch(toggleMode: boolean): void;
+    applyPatches(qPatches: Patch[], qSoftPatch: boolean): Promise<any>;
+    clearSelections(): void;
+    clearSoftPatches(): Promise<any>;
+    collapseLeft(qRow: number, qCol: number, qAll?: boolean): Promise<any>;
+    collapseTop(qRow: number, qCol: number, qAll?: boolean): Promise<any>;
+    eachDataRow(callback: (i: number, d: NxCellRows) => boolean | void): NxCellRows;
+    expandLeft(qRow: number, qCol: number, qAll?: boolean): Promise<any>;
+    expandTop(qRow: number, qCol: number, qAll?: boolean): Promise<any>;
+    getData(qPages: NxPage[]): Promise<NxDataPage[]>;
+    getDataRow(rownum: number): NxCellRows | null;
+    getDimensionInfos(): NxDimensionInfo[];
+    getMeasureInfos(): NxMeasureInfo[];
+    getPivotData(qPages: NxPage[]): Promise<NxPivotPage>;
+    // TODO: getProperties(): Promise<Properties>;
+    // TODO: getReducedData(qPages: NxPage[], qZoomFactor: number, qReductionMode: 'N' | 'D1' | 'S' | 'C' | 'ST'): Promise<ReducedDataPage>;
+    getRowCount(): number;
+    getStackeddata(qPages: NxPage[], qMaxNbrCells: number): Promise<NxStackPage>;
+    hasSelections(): boolean;
+    save(): Promise<undefined>;
+    search(term: string): void;
+    // TODO: selectRange(qRanges: Ranges, qOrMode: boolean): void;
+    selectValues(qDimNo: number, qValues: number[], qToggleMode: boolean): void;
+    selectProperties(props: {}): Promise<any>;
+}
+
+export interface ExtensionContext {
+    $element: JQuery;
+    $scope: any;
+    _inAnalysisState: boolean;
+    _inEditState: boolean;
+    _interactionState: number;
+    _on: boolean;
+    backendApi: BackendApi;
+    // TODO: options: ExtensionOptions;
+    paint: Paint;
+    selectionsEnabled: boolean;
+    toggleLasso(): void;
+
+    selectValues(dimNo: number, values: number[], toggleMode: boolean): void;
+
+    // TODO: LOTS MORE
+}
+
+export interface QDimensionCell {
+    qText: string;
+    qElemNumber: number;
+    qState: string;
+    qNum?: number;
+
+    select(): void;
+}
+
+export interface QMeasureCell {
+    qText: string;
+    qNum?: number;
+
+    getPercent(): number;
+    getPercentOfMax(): number;
+}
+
+export interface QRow {
+    dimensions: QDimensionCell[];
+    measures: QMeasureCell[];
+    cells: Array<QDimensionCell | QMeasureCell>;
+}
+
+export interface QHeader {
+    qFallbackTitle: string;
+    qSortIndicator: 'A' | 'B';
+    isOrderedBy: boolean;
+    qReverseSort: boolean;
+    col: number;
+    qCardinal?: number;
+    qStateCounts?: { [state: string]: number };
+    // field?: Field
+    qMin?: number;
+    qMax?: number;
+    errorCode?: number;
+    errorMessage?: number;
+
+    orderBy(): void;
+    reverseOrder(): void;
+    selectRange(min: number, max: number, inclMin: boolean, inclMax: boolean): Promise<any>;
+}
+
+export interface ExportDataOptions {
+    format: 'OOXML' | 'CSV_C' | 'CSV_T';
+    filename?: string;
+    state: 'A' | 'P';
+    download: boolean;
+}
+
+export interface QTable {
+    rows: QRow[];
+    headers: QHeader[];
+    totals: QMeasureCell[];
+    rowCount: number;
+    colCount: number;
+
+    exportData(options: ExportDataOptions, callback: (url: string) => void): void;
+    getColByName(fld: string): number | undefined;
+    getMoreData(): void;
+}
+
+export interface Variable {
+    qContent: {
+        qIsNum: boolean;
+        qString: string;
+    };
+}
+
+export interface QFieldValue {
+    qText: string;
+    qElemNumber: number;
+    qState: any; // TODO
+    qNum?: string;
+    qFrequency?: string;
+
+    select(toggle?: boolean, softlock?: boolean): Promise<any>;
+}
+
+export interface GetDataOptions {
+    rows: number;
+    frequencyMode: 'V' | 'P' | 'R' | 'N';
+}
+
+export interface QField {
+    rows?: QFieldValue[];
+    rowCount?: number;
+    qStateCounts?: { [state: string]: number; };
+
+    clear(): Promise<any>;
+    clearOther(softlock: boolean): Promise<any>;
+    getData(options: GetDataOptions): this;
+    getMoreData(): this;
+    lock(): Promise<any>;
+    select(values: number[], toggle?: boolean, softlock?: boolean): Promise<any>;
+    selectAll(softlock?: boolean): Promise<any>;
+    selectAlternative(softlock?: boolean): Promise<any>;
+    selectExcluded(softlock?: boolean): Promise<any>;
+    selectMatch(match: string, softlock?: boolean): Promise<any>;
+    selectPossible(softlock?: boolean): Promise<any>;
+    selectValues(values: QFieldValue[], toggle?: boolean, softlock?: boolean): Promise<any>;
+    toggleSelect(match: string, softlock?: boolean): Promise<any>;
+    unlock(): Promise<any>;
+}
+
+export type ListTypes = 'FieldList' | 'MeasureList' | 'DimensionList' | 'BookmarkList'
+    | 'Selectionobject' | 'SnapshotList' | 'MediaList' | 'sheet'
+    | 'Materobject' | 'VariableList' | 'story';
+
+export interface App {
+    addAlternateState(qStateName: string): Promise<any>;
+    back(): Promise<any>;
+    clearrAll(lockedAlso?: boolean, state?: string): Promise<any>;
+    close(): void;
+    createCube(qHyperCubeDef: HyperCubeDef, callback?: (hypercube: HyperCube) => void): Promise<any>; // TODO: Returns Promise<object Model>
+    // TODO: createGenericobject
+    // TODO: createList(qListobjectDef: ListobjectDef, callback?: (hypercube: TODO) => void): Promise<any>;
+    // TODO: createTable(dimensions: Array<string | NxDimension>, measures: Array<string | NxMeasure>, options?: object): QTable;
+    destroySession(id: string): Promise<any>;
+    doReload(qMode?: '0' | '1' | '2', qPartial?: boolean, qDebug?: boolean): Promise<any>;
+    doSave(qFileName?: string): Promise<any>;
+    field(field: string, state?: string): QField;
+    forward(): Promise<any>;
+    getAppLayout(callback: (layout: Layout) => void): Promise<any>;
+    // getAppobjectList(type: 'sheet' | 'masterobject', callback: (list: ))
+    getFullPropertyTree(id: string): Promise<any>;
+    // getList(type: ListTypes, callback): Promise<any>;
+    getobject(elem?: HTMLElement | string, id?: string | 'CurrentSelections', options?: { noInteraction?: boolean, noSelections?: boolean }): Promise<any>;
+    getobjectProperties(id: string): Promise<any>;
+    getSnapshot(elem?: HTMLElement | string, id?: string): Promise<any>;
+    lockAll(state?: string): Promise<any>;
+    removeAlternateState(qStateName: string): Promise<any>;
+    // searchResults(qTerms: any[], qPage)
+    // searchSuggest(qTerms: any[], qOptions: { qSearchFields: any[] }, ): Promise<any>;
+    // selectAssociations
+    // selectionState(state?: string): QSelectionState;
+    unlockAll(state?: string): Promise<any>;
+
+    variable: {
+        getContent(variable: string, callback: (value: Variable, app: App) => void): Promise<any>;
+        setContent(variable: string, value: string): void;
+    };
+}
+
+export function callRepository(path: string, method: string, body: string): Promise<any>;
+export function currApp(reference: object): App;
+
+export interface GetAppConfig {
+    host?: string;
+    port: string | number;
+    prefix?: string;
+    isSecure?: boolean;
+    openWithoutData?: boolean;
+    identity?: string;
+}
+
+export function getAppList(callback: App[], config: GetAppConfig): void;
+
+// TODO: fix any
+export function getExtensionList(callback: any[]): Promise<any>;
+
+export type Global = any;
+
+export interface GetGlobalConfig {
+    host: string;
+    port: string;
+    prefix: string;
+    isSecure: boolean;
+    identity: string;
+}
+
+export function getGlobal(config: GetGlobalConfig): Global;
+export function openApp(appId: string, config: GetAppConfig): App;
+export function registerExtension(id: string, impl: Extension, metadata: object): void;
+export function resize(ID?: string): void;
+
+export namespace LanguageCodes {
+    type German = 'de' | 'de-DE';
+    type English = 'en' | 'en-US';
+    type Spanish = 'es' | 'es-ES';
+    type French = 'fr' | 'fr-FR';
+    type Italian = 'it' | 'it-IT';
+    type Japanese = 'ja' | 'ja-JP';
+    type Korean = 'ko' | 'ko-KR';
+    type Dutch = 'nl' | 'nl-NL';
+    type Polish = 'pl' | 'pl-PL';
+    type BrazilianPortuguese = 'pt' | 'pt-BR';
+    type Russian = 'ru' | 'ru-RU';
+    type Swedish = 'sv' | 'sv-SE';
+    type Turkish = 'ts' | 'ts-TR';
+    type SimplifiedChinese = 'zh-CN';
+    type TraditionalChinese = 'zh-TW';
+
+    type ALL = German | English | Spanish | French | Italian | Japanese
+        | Korean | Dutch | Polish | BrazilianPortuguese | Russian
+        | Swedish | Turkish | SimplifiedChinese | TraditionalChinese;
+}
+export function setLanguage(lang: LanguageCodes.ALL): void;
+
+export interface Error {
+    code: any; // TODO: Find out if String or number
+    message: string;
+}
+export function setOnError(onError: (error: Error) => void, onWarning: (warning: string) => void): void;
+export function table(ext: object, path?: string): void;
diff --git a/types/qlik/qlik-tests.ts b/types/qlik/qlik-tests.ts
new file mode 100644
index 0000000000..3256ac477f
--- /dev/null
+++ b/types/qlik/qlik-tests.ts
@@ -0,0 +1,53 @@
+import * as Qlik from 'qlik';
+
+// Extension API Test
+() => {
+    const definition: Qlik.Definition = {
+        type: 'items',
+        component: 'accordion',
+        items: {
+            dimensions: {
+                uses: 'dimensions',
+                min: 1,
+                ref: "qHyperCubeDef.qDimensions",
+                items: {
+                    isGrouping: {
+                        type: 'boolean',
+                        ref: 'qDef.isGrouping',
+                        label: 'Is Grouping',
+                        defaultValue: false,
+                    },
+                },
+            },
+            measures: {
+                uses: 'measures',
+                ref: "qHyperCubeDef.qMeasures",
+                min: 0,
+            },
+        }
+    };
+
+    const initialProperties: Qlik.InitialProperties = {
+        qHyperCubeDef: {
+            qDimensions: [],
+            qMeasures: [],
+            qInitialDataFetch: [{
+                qWidth: 10,
+                qHeight: 100,
+            }],
+        },
+    };
+
+    function paint(this: Qlik.ExtensionContext, $element: JQuery, layout: Qlik.Layout) {
+        const dataRow = this.backendApi.getDataRow(0);
+        if (dataRow) {
+            $element.html(dataRow[0].qText);
+        }
+    }
+
+    const e: Qlik.Extension = {
+        definition,
+        initialProperties,
+        paint,
+    };
+};
diff --git a/types/qlik/tsconfig.json b/types/qlik/tsconfig.json
new file mode 100644
index 0000000000..88e56e6236
--- /dev/null
+++ b/types/qlik/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "qlik-tests.ts"
+  ]
+}
diff --git a/types/qlik/tslint.json b/types/qlik/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/qlik/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/qrcode.react/index.d.ts b/types/qrcode.react/index.d.ts
index 4de6ba60db..7771e04293 100644
--- a/types/qrcode.react/index.d.ts
+++ b/types/qrcode.react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zpao/qrcode.react
 // Definitions by: Mleko <https://github.com/mleko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index f3f355d90b..cb2ce4a9b7 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -1,35 +1,203 @@
-// Type definitions for qrcode
+// Type definitions for qrcode 0.8.2
 // Project: https://github.com/soldair/node-qrcode
 // Definitions by: York Yao <https://github.com/plantain-00/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-type QRCodeOptions = {
-    errorCorrectLevel?: "minimum" | "medium" | "high" | "max";
+/// <reference types="node" />
+
+import * as stream from "stream";
+
+export interface QRCodeOptions {
+    /**
+     * QR Code version. If not specified the more suitable value will be calculated.
+     */
+    version?: number;
+    /**
+     * Error correction level.
+     * Possible values are low, medium, quartile, high or L, M, Q, H.
+     * Default: M
+     */
+    errorCorrectionLevel?: "low" | "medium" | "quartile" | "high" | "L" | "M" | "Q" | "H";
+    /**
+     * Helper function used internally to convert a kanji to its Shift JIS value.
+     * Provide this function if you need support for Kanji mode.
+     */
+    toSJISFunc?: Function;
 }
 
-declare module "qrcode" {
-    var qrcode: {
-        toDataURL(text: string, callback: (error: Error, dataURL: string) => void): void;
-        toDataURL(text: string, options: QRCodeOptions, callback: (error: Error, dataURL: string) => void): void;
-        draw(text: string, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
-        draw(text: string, options: QRCodeOptions, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
-        drawSvg(text: string, callback: (error: Error, svgString: string) => void): void;
-        drawSvg(text: string, options: QRCodeOptions, callback: (error: Error, svgString: string) => void): void;
-        save(path: string, text: string, callback: (error: Error, written: any) => void): void;
-        save(path: string, text: string, options: QRCodeOptions, callback: (error: Error, written: any) => void): void;
-        drawText(text: string, callback: (error: Error) => void): void;
-        drawText(text: string, options: QRCodeOptions, callback: (error: Error) => void): void;
-        drawBitArray(text: string, callback: (error: Error, bits: any, width: number) => void): void;
-        drawBitArray(text: string, options: QRCodeOptions, callback: (error: Error, bits: any, width: number) => void): void;
+export interface QRCodeToDataURLOptions extends QRCodeRenderersOptions {
+    /**
+     * Data URI format.
+     * Default: image/png
+     */
+    type?: "image/png" | "image/jpeg" | "image/webp";
+    rendererOpts?: {
+        /**
+         * A Number between 0 and 1 indicating image quality if the requested type is image/jpeg or image/webp.
+         * Default: 0.92
+         */
+        quality?: number;
     };
-    export = qrcode;
 }
 
-declare var QRCodeLib: {
-    QRCodeDraw: {
-        new (): {
-            draw(element: HTMLCanvasElement, text: string, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
-            draw(element: HTMLCanvasElement, text: string, options: QRCodeOptions, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
-        }
+export interface QRCodeToStringOptions extends QRCodeOptions {
+    /**
+     * Output format.
+     * Default: utf8
+     */
+    type?: "utf8" | "svg" | "terminal";
+}
+
+export interface QRCodeToFileOptions extends QRCodeRenderersOptions {
+    /**
+     * Output format.
+     * Default: png
+     */
+    type?: "png" | "svg" | "utf8";
+    rendererOpts?: {
+        /**
+         * Compression level for deflate.
+         * Default: 9
+         */
+        deflateLevel?: number;
+        /**
+         * Compression strategy for deflate.
+         * Default: 3
+         */
+        deflateStrategy?: number;
     };
-};
+}
+
+export interface QRCodeRenderersOptions extends QRCodeOptions {
+    /**
+     * Define how much wide the quiet zone should be.
+     * Default: 4
+     */
+    margin?: number;
+    /**
+     * Scale factor. A value of 1 means 1px per modules (black dots).
+     * Default: 4
+     */
+    scale?: number;
+    color?: {
+        /**
+         * Color of dark module. Value must be in hex format (RGBA).
+         * Note: dark color should always be darker than color.light.
+         * Default: #000000ff
+         */
+        dark?: string;
+        /**
+         * Color of light module. Value must be in hex format (RGBA).
+         * Default: #ffffffff
+         */
+        light?: string;
+    };
+}
+
+export interface QRCodeSegment {
+    data: string;
+    mode: 'alphanumeric' | 'numeric';
+}
+
+export interface QRCode {
+    /**
+     * Bitmatrix class with modules data
+     */
+    modules: any;
+    /**
+     * Calculated QR Code version
+     */
+    version: number;
+    /**
+     * Error Correction Level
+     */
+    errorCorrectionLevel: number;
+    /**
+     * Calculated Mask pattern
+     */
+    maskPattern: any;
+    /**
+     * Generated segments
+     */
+    segments: QRCodeSegment[];
+}
+
+/**
+ * Creates QR Code symbol and returns a qrcode object.
+ */
+export function create(text: string | QRCodeSegment[], options: QRCodeOptions): QRCode;
+
+/**
+ * Draws qr code symbol to canvas.
+ */
+export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], callback: (error: Error) => void): void;
+/**
+ * Draws qr code symbol to canvas.
+ */
+export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error) => void): void;
+/**
+ * Draws qr code symbol to canvas.
+ */
+export function toCanvas(text: string | QRCodeSegment[], callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
+/**
+ * Draws qr code symbol to canvas.
+ */
+export function toCanvas(text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
+/**
+ * Draws qr code symbol to node canvas.
+ */
+export function toCanvas(canvas: any, text: string | QRCodeSegment[], callback: (error: Error) => void): void;
+/**
+ * Draws qr code symbol to node canvas.
+ */
+export function toCanvas(canvas: any, text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error) => void): void;
+
+/**
+ * Returns a Data URI containing a representation of the QR Code image.
+ */
+export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], callback: (error: Error, url: string) => void): void;
+/**
+ * Returns a Data URI containing a representation of the QR Code image.
+ */
+export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeToDataURLOptions, callback: (error: Error, url: string) => void): void;
+/**
+ * Returns a Data URI containing a representation of the QR Code image.
+ */
+export function toDataURL(text: string | QRCodeSegment[], callback: (error: Error, url: string) => void): void;
+/**
+ * Returns a Data URI containing a representation of the QR Code image.
+ */
+export function toDataURL(text: string | QRCodeSegment[], options: QRCodeToDataURLOptions, callback: (error: Error, url: string) => void): void;
+
+/**
+ * Returns a string representation of the QR Code.
+ * If choosen output format is svg it will returns a string containing xml code.
+ */
+export function toString(text: string | QRCodeSegment[], callback: (error: Error, string: string) => void): void;
+/**
+ * Returns a string representation of the QR Code.
+ * If choosen output format is svg it will returns a string containing xml code.
+ */
+export function toString(text: string | QRCodeSegment[], options: QRCodeToStringOptions, callback: (error: Error, string: string) => void): void;
+
+/**
+ * Saves QR Code to image file.
+ * If options.type is not specified, the format will be guessed from file extension.
+ * Recognized extensions are png, svg, txt.
+ */
+export function toFile(path: string, text: string | QRCodeSegment[], callback: (error: Error) => void): void;
+/**
+ * Saves QR Code to image file.
+ * If options.type is not specified, the format will be guessed from file extension.
+ * Recognized extensions are png, svg, txt.
+ */
+export function toFile(path: string, text: string | QRCodeSegment[], options: QRCodeToFileOptions, callback: (error: Error) => void): void;
+
+/**
+ * Writes QR Code image to stream. Only works with png format for now.
+ */
+export function toFileStream(stream: stream.Writable, text: string | QRCodeSegment[], callback: (error: Error) => void): void;
+/**
+ * Writes QR Code image to stream. Only works with png format for now.
+ */
+export function toFileStream(stream: stream.Writable, text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error) => void): void;
diff --git a/types/qrcode/qrcode-tests.ts b/types/qrcode/qrcode-tests.ts
index eecfb4a0d1..6a94a5f580 100644
--- a/types/qrcode/qrcode-tests.ts
+++ b/types/qrcode/qrcode-tests.ts
@@ -1,14 +1,56 @@
 import * as QRCode from 'qrcode';
 
-QRCode.toDataURL('i am a pony!', function (err, url) {
+const canvas = document.getElementById('canvas') as HTMLCanvasElement;
+
+QRCode.toCanvas(canvas, 'sample text', function (error) {
+    if (error) console.error(error)
+    console.log('success!');
+});
+
+QRCode.toDataURL('I am a pony!', function (err, url) {
     console.log(url);
 });
 
-var qrcodedraw = new QRCodeLib.QRCodeDraw();
-
-qrcodedraw.draw(document.getElementById('test') as HTMLCanvasElement, "this text will be in the code!", function (error, canvas) {
-    if (error) {
-        return console.log('Error =( ', error);
-    }
-    console.log('success!');
+QRCode.toDataURL('some text', { errorCorrectionLevel: 'H' }, function (err, url) {
+    console.log(url);
+});
+
+QRCode.toDataURL('some text', { version: 2 }, function (err, url) {
+    console.log(url);
+});
+
+QRCode.toDataURL([
+    { data: 'ABCDEFG', mode: 'alphanumeric' },
+    { data: '0123456', mode: 'numeric' }
+], function (err, url) {
+    console.log(url);
+});
+
+QRCode.toCanvas('text', { errorCorrectionLevel: 'H' }, function (err, canvas) {
+    if (err) throw err;
+});
+
+QRCode.toDataURL('text', {
+    errorCorrectionLevel: 'H',
+    type: 'image/jpeg',
+    rendererOpts: {
+        quality: 0.3
+    }
+}, function (err, url) {
+    if (err) throw err;
+});
+
+QRCode.toString('http://www.google.com', function (err, string) {
+    if (err) throw err;
+    console.log(string);
+});
+
+QRCode.toFile('path/to/filename.png', 'Some text', {
+    color: {
+        dark: '#00F',  // Blue dots
+        light: '#0000' // Transparent background
+    }
+}, function (err) {
+    if (err) throw err;
+    console.log('done');
 });
diff --git a/types/qtip2/index.d.ts b/types/qtip2/index.d.ts
index 40e6cd0bf6..1221f17678 100644
--- a/types/qtip2/index.d.ts
+++ b/types/qtip2/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for qtip2 v2.2.1
 // Project: http://qtip2.com/
-// Definitions by: Nathan Pitman <https://github.com/Seltzer>
+// Definitions by: Nathan Pitman <https://github.com/Seltzer>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 // Notes:
 //   - Type bindings for the QTip2 API and options are included. Bindings for global settings aren't required.
 //   - Deprecated functionality is not supported.
@@ -275,135 +276,141 @@ declare namespace QTip2 {
 
 		destroy(immediate?: boolean): Api;
 	}
+
+	interface Plugin {
+		defaults: QTipOptions;
+
+		(methodName: 'api'): QTip2.Api;
+
+		(methodName: 'option', propertyName: 'id'): string | boolean;
+		(methodName: 'option', propertyName: 'prerender'): boolean;
+		(methodName: 'option', propertyName: 'overwrite'): boolean;
+		(methodName: 'option', propertyName: 'suppress'): boolean;
+		(methodName: 'option', propertyName: 'metadata'): any;
+		(methodName: 'option', propertyName: 'content'): QTip2.Content;
+		(methodName: 'option', propertyName: 'content.text'): QTip2.Text;
+		(methodName: 'option', propertyName: 'content.attr'): string;
+		(methodName: 'option', propertyName: 'content.title'): QTip2.Title;
+		(methodName: 'option', propertyName: 'content.button'): string | JQuery | boolean;
+		(methodName: 'option', propertyName: 'position'): QTip2.Position;
+		(methodName: 'option', propertyName: 'position.my'): string | boolean;
+		(methodName: 'option', propertyName: 'position.at'): string | boolean;
+		(methodName: 'option', propertyName: 'position.target'): QTip2.Target | boolean;
+		(methodName: 'option', propertyName: 'position.container'): JQuery | boolean;
+		(methodName: 'option', propertyName: 'position.viewport'): JQuery | boolean;
+		(methodName: 'option', propertyName: 'position.effect'): boolean | ((api: QTip2.Api, pos: any, viewport: any) => void);
+		(methodName: 'option', propertyName: 'position.adjust'): QTip2.PositionAdjust;
+		(methodName: 'option', propertyName: 'show'): QTip2.Show;
+		(methodName: 'option', propertyName: 'show.target'): JQuery | boolean;
+		(methodName: 'option', propertyName: 'show.event'): string | boolean;
+		(methodName: 'option', propertyName: 'show.delay'): number;
+		(methodName: 'option', propertyName: 'show.solo'): JQuery | string | boolean;
+		(methodName: 'option', propertyName: 'show.ready'): boolean;
+		(methodName: 'option', propertyName: 'show.effect'): boolean | ((offset: any) => void);
+		(methodName: 'option', propertyName: 'show.modal'): boolean | QTip2.Modal;
+		(methodName: 'option', propertyName: 'hide'): QTip2.Hide;
+		(methodName: 'option', propertyName: 'hide.target'): JQuery | boolean;
+		(methodName: 'option', propertyName: 'hide.event'): string | boolean;
+		(methodName: 'option', propertyName: 'hide.delay'): number;
+		(methodName: 'option', propertyName: 'hide.leave'): string | boolean;
+		(methodName: 'option', propertyName: 'hide.distance'): number | boolean;
+		(methodName: 'option', propertyName: 'hide.effect'): boolean | ((offset: any) => void);
+		(methodName: 'option', propertyName: 'style'): QTip2.Style;
+		(methodName: 'option', propertyName: 'style.classes'): string | boolean;
+		(methodName: 'option', propertyName: 'style.def'): boolean;
+		(methodName: 'option', propertyName: 'style.widget'): boolean;
+		(methodName: 'option', propertyName: 'style.width'): string | number | boolean;
+		(methodName: 'option', propertyName: 'style.height'): string | number | boolean;
+		(methodName: 'option', propertyName: 'style.tip'): string | boolean | QTip2.Tip;
+		(methodName: 'option', propertyName: 'events'): QTip2.Events;
+		(methodName: 'option', propertyName: 'events.render'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.show'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.hide'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.toggle'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.visible'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.hidden'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.move'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.focus'): QTip2.EventApiFunc;
+		(methodName: 'option', propertyName: 'events.blur'): QTip2.EventApiFunc;
+
+		(methodName: 'option', properties: QTip2.QTipOptions): QTip2.Api;
+		(methodName: 'option', propertyName: 'id', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'prerender', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'overwrite', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'suppress', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'metadata', value: any): QTip2.Api;
+		(methodName: 'option', propertyName: 'content', value: QTip2.Text | QTip2.Content): QTip2.Api;
+		(methodName: 'option', propertyName: 'content.title', value: QTip2.Title | { text: QTip2.Title }): QTip2.Api;
+		(methodName: 'option', propertyName: 'content.text', value: QTip2.Text): QTip2.Api;
+		(methodName: 'option', propertyName: 'content.attr', value: string): QTip2.Api;
+		(methodName: 'option', propertyName: 'content.button', value: string | JQuery | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position', value: QTip2.Position): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.my', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.at', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.target', value: QTip2.Target | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.container', value: JQuery | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.viewport', value: JQuery | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.effect', value: boolean | ((api: QTip2.Api, pos: any, viewport: any) => void) ): QTip2.Api;
+		(methodName: 'option', propertyName: 'position.adjust', value: QTip2.PositionAdjust): QTip2.Api;
+		(methodName: 'option', propertyName: 'show', value: QTip2.Show): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.target', value: JQuery | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.event', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.delay', value: number): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.solo', value: JQuery | string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.ready', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.effect', value: boolean | ((offset: any) => void)): QTip2.Api;
+		(methodName: 'option', propertyName: 'show.modal', value: boolean | QTip2.Modal): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide', value: QTip2.Hide): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.target', value: JQuery | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.event', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.inactive', value: number | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.fixed', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.leave', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.distance', value: number | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): QTip2.Api
+		(methodName: 'option', propertyName: 'style', value: QTip2.Style): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.classes', value: string | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.def', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.widget', value: boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.width', value: string | number | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.height', value: string | number | boolean): QTip2.Api;
+		(methodName: 'option', propertyName: 'style.tip', value: string | boolean | QTip2.Tip): QTip2.Api;
+		(methodName: 'option', propertyName: 'events', value: QTip2.Events): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.render', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.show', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.hide', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.toggle', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.visible', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.hidden', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.move', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.focus', value: QTip2.EventApiFunc): QTip2.Api;
+		(methodName: 'option', propertyName: 'events.blur', value: QTip2.EventApiFunc): QTip2.Api;
+
+		(methodName: 'toggle', state?: boolean, event?: Event): JQuery;
+
+		(methodName: 'show', event?: Event): JQuery;
+
+		(methodName: 'hide', event?: Event): JQuery;
+
+		(methodName: 'disable', state?: boolean): JQuery;
+
+		(methodName: 'enable'): JQuery
+
+		(methodName: 'reposition', event?: Event, effect?: boolean): JQuery;
+
+		(methodName: 'focus', event?: Event): JQuery;
+
+		(methodName: 'blur', event?: Event): JQuery;
+
+		(methodName: 'destroy', immediate?: boolean): JQuery;
+
+		(methodName: string, p1?: any, p2?: any, p3?: any): any;
+
+		(options?: QTip2.QTipOptions): JQuery;
+	}
 }
 
 
 interface JQuery {
-	qtip(options?: QTip2.QTipOptions): JQuery;
-
-	qtip(methodName: 'api'): QTip2.Api;
-
-	qtip(methodName: 'option', propertyName: 'id'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'prerender'): boolean;
-	qtip(methodName: 'option', propertyName: 'overwrite'): boolean;
-	qtip(methodName: 'option', propertyName: 'suppress'): boolean;
-	qtip(methodName: 'option', propertyName: 'metadata'): any;
-	qtip(methodName: 'option', propertyName: 'content'): QTip2.Content;
-	qtip(methodName: 'option', propertyName: 'content.text'): QTip2.Text;
-	qtip(methodName: 'option', propertyName: 'content.attr'): string;
-	qtip(methodName: 'option', propertyName: 'content.title'): QTip2.Title;
-	qtip(methodName: 'option', propertyName: 'content.button'): string | JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position'): QTip2.Position;
-	qtip(methodName: 'option', propertyName: 'position.my'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'position.at'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'position.target'): QTip2.Target | boolean;
-	qtip(methodName: 'option', propertyName: 'position.container'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position.viewport'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'position.effect'): boolean | ((api: QTip2.Api, pos: any, viewport: any) => void);
-	qtip(methodName: 'option', propertyName: 'position.adjust'): QTip2.PositionAdjust;
-	qtip(methodName: 'option', propertyName: 'show'): QTip2.Show;
-	qtip(methodName: 'option', propertyName: 'show.target'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'show.event'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'show.delay'): number;
-	qtip(methodName: 'option', propertyName: 'show.solo'): JQuery | string | boolean;
-	qtip(methodName: 'option', propertyName: 'show.ready'): boolean;
-	qtip(methodName: 'option', propertyName: 'show.effect'): boolean | ((offset: any) => void);
-	qtip(methodName: 'option', propertyName: 'show.modal'): boolean | QTip2.Modal;
-	qtip(methodName: 'option', propertyName: 'hide'): QTip2.Hide;
-	qtip(methodName: 'option', propertyName: 'hide.target'): JQuery | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.event'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.delay'): number;
-	qtip(methodName: 'option', propertyName: 'hide.leave'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.distance'): number | boolean;
-	qtip(methodName: 'option', propertyName: 'hide.effect'): boolean | ((offset: any) => void);
-	qtip(methodName: 'option', propertyName: 'style'): QTip2.Style;
-	qtip(methodName: 'option', propertyName: 'style.classes'): string | boolean;
-	qtip(methodName: 'option', propertyName: 'style.def'): boolean;
-	qtip(methodName: 'option', propertyName: 'style.widget'): boolean;
-	qtip(methodName: 'option', propertyName: 'style.width'): string | number | boolean;
-	qtip(methodName: 'option', propertyName: 'style.height'): string | number | boolean;
-	qtip(methodName: 'option', propertyName: 'style.tip'): string | boolean | QTip2.Tip;
-	qtip(methodName: 'option', propertyName: 'events'): QTip2.Events;
-	qtip(methodName: 'option', propertyName: 'events.render'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.show'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.hide'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.toggle'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.visible'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.hidden'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.move'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.focus'): QTip2.EventApiFunc;
-	qtip(methodName: 'option', propertyName: 'events.blur'): QTip2.EventApiFunc;
-
-	qtip(methodName: 'option', properties: QTip2.QTipOptions): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'id', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'prerender', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'overwrite', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'suppress', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'metadata', value: any): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content', value: QTip2.Text | QTip2.Content): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.title', value: QTip2.Title | { text: QTip2.Title }): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.text', value: QTip2.Text): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.attr', value: string): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'content.button', value: string | JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position', value: QTip2.Position): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.my', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.at', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.target', value: QTip2.Target | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.container', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.viewport', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.effect', value: boolean | ((api: QTip2.Api, pos: any, viewport: any) => void) ): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'position.adjust', value: QTip2.PositionAdjust): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show', value: QTip2.Show): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.target', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.event', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.delay', value: number): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.solo', value: JQuery | string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.ready', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.effect', value: boolean | ((offset: any) => void)): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'show.modal', value: boolean | QTip2.Modal): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide', value: QTip2.Hide): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.target', value: JQuery | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.event', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.inactive', value: number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.fixed', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.leave', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.distance', value: number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'hide.effect', value: boolean | ((offset: any) => void)): QTip2.Api
-	qtip(methodName: 'option', propertyName: 'style', value: QTip2.Style): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.classes', value: string | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.def', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.widget', value: boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.width', value: string | number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.height', value: string | number | boolean): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'style.tip', value: string | boolean | QTip2.Tip): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events', value: QTip2.Events): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.render', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.show', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.hide', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.toggle', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.visible', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.hidden', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.move', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.focus', value: QTip2.EventApiFunc): QTip2.Api;
-	qtip(methodName: 'option', propertyName: 'events.blur', value: QTip2.EventApiFunc): QTip2.Api;
-
-	qtip(methodName: 'toggle', state?: boolean, event?: Event): JQuery;
-
-	qtip(methodName: 'show', event?: Event): JQuery;
-
-	qtip(methodName: 'hide', event?: Event): JQuery;
-
-	qtip(methodName: 'disable', state?: boolean): JQuery;
-
-	qtip(methodName: 'enable'): JQuery
-
-	qtip(methodName: 'reposition', event?: Event, effect?: boolean): JQuery;
-
-	qtip(methodName: 'focus', event?: Event): JQuery;
-
-	qtip(methodName: 'blur', event?: Event): JQuery;
-
-	qtip(methodName: 'destroy', immediate?: boolean): JQuery;
-
-	qtip(methodName: string, p1?: any, p2?: any, p3?: any): any;
+	qtip: QTip2.Plugin;
 }
diff --git a/types/quill/index.d.ts b/types/quill/index.d.ts
index cf7440f428..73a877815f 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -7,7 +7,21 @@ declare namespace Quill {
 
     type Key = { key: string, shortKey?: boolean };
     type Sources = "api" | "user" | "silent";
-    type Formats = { [key: string]: any };
+    type StringMap = { [key: string]: any };
+    type OptionalAttributes = { attributes?: StringMap };
+    /**
+     * A stricter type definition would be:
+     *
+     *   type DeltaOperation ({ insert: any } | { delete: number } | { retain: number }) & OptionalAttributes;
+     *
+     *  But this would break a lot of existing code as it would require manual discrimination of the union types.
+     */
+    type DeltaOperation = { insert?: any, delete?: number, retain?: number } & OptionalAttributes;
+
+    type TextChangeHandler = (delta: DeltaStatic, oldContents: DeltaStatic, source: Sources) => any;
+    type SelectionChangeHandler = (range: RangeStatic, oldRange: RangeStatic, source: Sources) => any;
+    type EditorChangeHandler = ((name: "text-change", delta: DeltaStatic, oldContents: DeltaStatic, source: Sources) => any)
+                             | ((name: "selection-change", range: RangeStatic, oldRange: RangeStatic, source: Sources) => any);
 
     export interface KeyboardStatic {
         addBinding(key: Key, callback: (range: RangeStatic, context: any) => void): void;
@@ -23,7 +37,7 @@ declare namespace Quill {
 
     export interface QuillOptionsStatic {
         debug?: string,
-        modules?: Formats,
+        modules?: StringMap,
         placeholder?: string,
         readOnly?: boolean,
         theme?: string,
@@ -38,26 +52,26 @@ declare namespace Quill {
     }
 
     export interface DeltaStatic {
-        new (ops: Array<any>) : DeltaStatic;
-        new (ops: any) : DeltaStatic;
-        ops?: Array<any>;
-        retain(length: number, attributes: any) : DeltaStatic;
+        new (ops?: DeltaOperation[] | { ops: DeltaOperation[] }) : DeltaStatic;
+        ops?: DeltaOperation[];
+        retain(length: number, attributes?: StringMap) : DeltaStatic;
         delete(length: number) : DeltaStatic;
-        filter(predicate: any) : DeltaStatic;
-        forEach(predicate: any) : DeltaStatic;
-        insert(text: any, attributes: any): DeltaStatic;
-        map(predicate: any) : DeltaStatic;
-        partition(predicate: any) : DeltaStatic;
-        reduce(predicate: any, initial: number): DeltaStatic;
+        filter(predicate: (op: DeltaOperation) => boolean) : DeltaOperation[];
+        forEach(predicate: (op: DeltaOperation) => void) : void;
+        insert(text: any, attributes?: StringMap): DeltaStatic;
+        map<T>(predicate: (op: DeltaOperation) => T) : T[];
+        partition(predicate: (op: DeltaOperation) => boolean) : [DeltaOperation[], DeltaOperation[]];
+        reduce<T>(predicate: (acc: T, curr: DeltaOperation, idx: number, arr: DeltaOperation[]) => T, initial: T): T;
         chop() : DeltaStatic;
         length(): number;
-        slice(start: number, end: number): DeltaStatic;
-        compose(other: any): DeltaStatic;
+        slice(start?: number, end?: number): DeltaStatic;
+        compose(other: DeltaStatic): DeltaStatic;
         concat(other: DeltaStatic): DeltaStatic;
-        diff(other: DeltaStatic, index: number) : DeltaStatic;
-        eachLine(predicate: any, newline: any) : DeltaStatic;
-        transform(other: any, priority: any) : DeltaStatic;
-        transformPosition(index: number, priority: any) : DeltaStatic;
+        diff(other: DeltaStatic, index?: number) : DeltaStatic;
+        eachLine(predicate: (line: DeltaStatic, attributes: StringMap, idx: number) => any, newline?: string) : DeltaStatic;
+        transform(index: number) : number;
+        transform(other: DeltaStatic, priority: boolean) : DeltaStatic;
+        transformPosition(index: number) : number;
     }
 
     export interface RangeStatic {
@@ -66,7 +80,19 @@ declare namespace Quill {
         length: number;
     }
 
-    export interface Quill {
+    export interface EventEmitter {
+        on(eventName: "text-change", handler: TextChangeHandler): EventEmitter;
+        on(eventName: "selection-change", handler: SelectionChangeHandler): EventEmitter;
+        on(eventName: "editor-change", handler: EditorChangeHandler): EventEmitter;
+        once(eventName: "text-change", handler: TextChangeHandler): EventEmitter;
+        once(eventName: "selection-change", handler: SelectionChangeHandler): EventEmitter;
+        once(eventName: "editor-change", handler: EditorChangeHandler): EventEmitter;
+        off(eventName: "text-change", handler: TextChangeHandler): EventEmitter;
+        off(eventName: "selection-change", handler: SelectionChangeHandler): EventEmitter;
+        off(eventName: "editor-change", handler: EditorChangeHandler): EventEmitter;
+    }
+
+    export interface Quill extends EventEmitter {
         new (container: string | Element, options?: QuillOptionsStatic): Quill;
         deleteText(index: number, length: number, source?: Sources): void;
         disable(): void;
@@ -77,7 +103,7 @@ declare namespace Quill {
         insertEmbed(index: number, type: string, value: any, source?: Sources): void;
         insertText(index: number, text: string, source?: Sources): DeltaStatic;
         insertText(index: number, text: string, format: string, value: any, source?: Sources): DeltaStatic;
-        insertText(index: number, text: string, formats: Formats, source?: Sources): DeltaStatic;
+        insertText(index: number, text: string, formats: StringMap, source?: Sources): DeltaStatic;
         /**
         * @deprecated Use clipboard.dangerouslyPasteHTML(index: number, html: string, source: Sources)
         */
@@ -94,12 +120,12 @@ declare namespace Quill {
         format(name: string, value: any, source?: Sources): DeltaStatic;
         formatLine(index: number, length: number, source?: Sources): DeltaStatic;
         formatLine(index: number, length: number, format: string, value: any, source?: Sources): DeltaStatic;
-        formatLine(index: number, length: number, formats: Formats, source?: Sources): DeltaStatic;
+        formatLine(index: number, length: number, formats: StringMap, source?: Sources): DeltaStatic;
         formatText(index: number, length: number, source?: Sources): DeltaStatic;
         formatText(index: number, length: number, format: string, value: any, source?: Sources): DeltaStatic;
-        formatText(index: number, length: number, formats: Formats, source?: Sources): DeltaStatic;
-        getFormat(range?: RangeStatic): Formats;
-        getFormat(index: number, length?: number): Formats;
+        formatText(index: number, length: number, formats: StringMap, source?: Sources): DeltaStatic;
+        getFormat(range?: RangeStatic): StringMap;
+        getFormat(index: number, length?: number): StringMap;
         removeFormat(index: number, length: number, source?: Sources): void;
 
         blur(): void;
@@ -110,15 +136,10 @@ declare namespace Quill {
         setSelection(index: number, length: number, source?: Sources): void;
         setSelection(range: RangeStatic, source?: Sources): void;
 
-        on(eventName: string, callback: (<T>(delta: T, oldContents: T, source: string) => void) |
-            ((name: string, ...args: any[]) => void)): Quill;
-        once(eventName: string, callback: (delta: DeltaStatic, source: string) => void): Quill;
-        off(eventName: string, callback: (delta: DeltaStatic, source: string) => void): Quill;
-
         debug(level: string): void;
         import(path: string): any;
         register(path: string, def: any, suppressWarning?: boolean): void;
-        register(defs: Formats, suppressWarning?: boolean): void;
+        register(defs: StringMap, suppressWarning?: boolean): void;
         addContainer(className: string, refNode?: any): any;
         addContainer(domNode: any, refNode?: any): any;
         getModule(name: string): any
diff --git a/types/quill/quill-tests.ts b/types/quill/quill-tests.ts
index b16c90b384..f45781a685 100644
--- a/types/quill/quill-tests.ts
+++ b/types/quill/quill-tests.ts
@@ -168,12 +168,22 @@ function test_addContainer()
     quillEditor.addContainer('ql-custom');
 }
 
-function test_on_EventType1(){
-    var quillEditor = new Quill('#editor');
-    quillEditor.on('text-change', (newDelta, oldDelta, source)=>{
-        // happened
-    });
+function test_on_Events(){
+    var textChangeHandler = function(newDelta: Quill.DeltaStatic, oldDelta: Quill.DeltaStatic, source: string) { };
+    var selectionChangeHandler = function(newRange: Quill.RangeStatic, oldRange: Quill.RangeStatic, source: string) { };
+    var editorChangeHandler = function(name: string, ...args: any[]) { };
 
+    var quillEditor = new Quill('#editor');
+    quillEditor
+      .on('text-change', textChangeHandler)
+      .off('text-change', textChangeHandler)
+      .once('text-change', textChangeHandler)
+      .on('selection-change', selectionChangeHandler)
+      .off('selection-change', selectionChangeHandler)
+      .once('selection-change', selectionChangeHandler)
+      .on('editor-change', editorChangeHandler)
+      .off('editor-change', editorChangeHandler)
+      .once('editor-change', editorChangeHandler);
 }
 
 function test_PasteHTML()
@@ -187,3 +197,141 @@ function test_PasteHTML2()
     var quillEditor = new Quill('#editor');
     quillEditor.pasteHTML(5, '<h1>Quill Rocks</h1>');
 }
+
+function test_DeltaChaining() {
+    var delta = new Delta()
+        .insert('Hello', { bold: true })
+        .insert('World')
+        .delete(5)
+        .retain(5)
+        .retain(5, { color: '#0c6' });
+
+}
+
+function test_DeltaFilter() {
+    var delta = new Delta().insert('Hello', { bold: true })
+        .insert({ image: 'https://octodex.github.com/images/labtocat.png' })
+        .insert('World!');
+
+    var text = delta.filter(function(op) {
+        return typeof op.insert === 'string';
+    }).map(function(op) {
+        return op.insert;
+    }).join('');
+}
+
+function test_DeltaForEach() {
+    var delta = new Delta();
+    delta.forEach(function(op) {
+        console.log(op);
+    });
+}
+
+function test_DeltaMap() {
+    var delta = new Delta()
+        .insert('Hello', { bold: true })
+        .insert({ image: 'https://octodex.github.com/images/labtocat.png' })
+        .insert('World!');
+
+    var text = delta.map(function(op) {
+      if (typeof op.insert === 'string') {
+          return op.insert;
+      } else {
+          return '';
+      }
+    }).join('');
+}
+
+function test_DeltaPartition() {
+    var delta = new Delta().insert('Hello', { bold: true })
+        .insert({ image: 'https://octodex.github.com/images/labtocat.png' })
+        .insert('World!');
+
+    var results = delta.partition(function(op) {
+        return typeof op.insert === 'string';
+    });
+    var passed = results[0];  // [{ insert: 'Hello', attributes: { bold: true }}, { insert: 'World'}]
+    var failed = results[1];  // [{ insert: { image: 'https://octodex.github.com/images/labtocat.png' }}]
+}
+
+function test_DeltaReduce() {
+    var delta = new Delta().insert('Hello', { bold: true })
+                           .insert({ image: 'https://octodex.github.com/images/labtocat.png' })
+                           .insert('World!');
+
+    var length = delta.reduce(function(length, op) {
+      return length + (op.insert.length || 1);
+    }, 0);
+}
+
+function test_DeltaSlice() {
+    var delta = new Delta().insert('Hello', { bold: true }).insert(' World');
+
+    // {
+    //   ops: [
+    //     { insert: 'Hello', attributes: { bold: true } },
+    //     { insert: ' World' }
+    //   ]
+    // }
+    var copy = delta.slice();
+    console.log(copy.ops);
+
+    // { ops: [{ insert: 'World' }] }
+    var world = delta.slice(6);
+    console.log(world.ops);
+
+    // { ops: [{ insert: ' ' }] }
+    var space = delta.slice(5, 6);
+    console.log(space.ops);
+}
+
+function test_DeltaCompose() {
+    var a = new Delta().insert('abc');
+    var b = new Delta().retain(1).delete(1);
+
+    var composed = a.compose(b);  // composed == new Delta().insert('ac');
+}
+
+function test_DeltaDiff() {
+    var a = new Delta().insert('Hello');
+    var b = new Delta().insert('Hello!');
+
+    var diff = a.diff(b);  // { ops: [{ retain: 5 }, { insert: '!' }] }
+                           // a.compose(diff) == b
+    var diff2 = a.diff(b, 0);  // { ops: [{ retain: 5 }, { insert: '!' }] }
+                               // a.compose(diff) == b
+}
+
+function test_DeltaEachLine() {
+    var delta = new Delta().insert('Hello\n\n')
+                           .insert('World')
+                           .insert({ image: 'octocat.png' })
+                           .insert('\n', { align: 'right' })
+                           .insert('!');
+
+    delta.eachLine(function(line, attributes, i) {
+        console.log(line, attributes, i);
+        // Can return false to exit loop early
+    });
+    // Should log:
+    // { ops: [{ insert: 'Hello' }] }, {}, 0
+    // { ops: [] }, {}, 1
+    // { ops: [{ insert: 'World' }, { insert: { image: 'octocat.png' } }] }, { align: 'right' }, 2
+    // { ops: [{ insert: '!' }] }, {}, 3
+}
+
+function test_DeltaTransform() {
+    var a = new Delta().insert('a');
+    var b = new Delta().insert('b').retain(5).insert('c');
+
+    var d1: Quill.DeltaStatic = a.transform(b, true);  // new Delta().retain(1).insert('b').retain(5).insert('c');
+    var d2: Quill.DeltaStatic = a.transform(b, false); // new Delta().insert('b').retain(6).insert('c');
+    var n1: number = a.transform(5);
+
+}
+
+function test_DeltatransformPosition() {
+    var delta = new Delta().retain(5).insert('a');
+    var n1: number = delta.transformPosition(4); // 4
+    var n2: number = delta.transformPosition(5); // 6
+}
diff --git a/types/quill/tsconfig.json b/types/quill/tsconfig.json
index 5c353f17a3..cfef2d65ab 100644
--- a/types/quill/tsconfig.json
+++ b/types/quill/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/radium/index.d.ts b/types/radium/index.d.ts
index 58f9045923..b875d797e3 100644
--- a/types/radium/index.d.ts
+++ b/types/radium/index.d.ts
@@ -2,10 +2,9 @@
 // Project: https://github.com/formidablelabs/radium
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev/>, Philipp Holzer <https://github.com/nupplaphil/>, Alexey Svetliakov <https://github.com/asvetliakov/>, Mikael Hermansson <https://github.com/mihe/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import React = require('react');
-import ReactComponent = React.Component;
+import * as React from 'react';
 
 export = Radium;
 
@@ -37,7 +36,7 @@ declare namespace Radium {
     /**
      * <Style />
      */
-    export class Style extends React.Component<StyleProps, any> {
+    export class Style extends React.Component<StyleProps> {
     }
 
     /**
@@ -49,7 +48,7 @@ declare namespace Radium {
     /**
      * <StyleRoot />
      */
-    export class StyleRoot extends React.Component<StyleRootProps, any> {
+    export class StyleRoot extends React.Component<StyleRootProps> {
     }
 
     /**
diff --git a/types/radium/radium-tests.tsx b/types/radium/radium-tests.tsx
index 7fffa1b187..0b1b1408c2 100644
--- a/types/radium/radium-tests.tsx
+++ b/types/radium/radium-tests.tsx
@@ -3,7 +3,7 @@ import { StyleRoot, Style } from "radium";
 import * as Radium from 'radium';
 
 @Radium
-class TestComponent extends React.Component<{ a: number }, any> {
+class TestComponent extends React.Component<{ a: number }> {
 
     render() {
         return (
@@ -24,7 +24,7 @@ TestStatelessComponent = Radium(TestStatelessComponent);
     userAgent: "test",
     matchMedia: window.matchMedia
 })
-class TestComponentWithConfig extends React.Component<{ a?: number }, {}> {
+class TestComponentWithConfig extends React.Component<{ a?: number }> {
     render() {
         return (
             <div>
@@ -54,7 +54,7 @@ class TestComponentWithConfig extends React.Component<{ a?: number }, {}> {
 <TestComponentWithConfig a={5} />
 
 class TestComponentWithConfigInStyleRoot
-    extends React.Component<{ a?: number }, {}> {
+    extends React.Component<{ a?: number }> {
     render() {
         return (
             <div>
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 9468024013..ba6908d57c 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1,61 +1,51 @@
-// Type definitions for ramda
+// Type definitions for ramda 0.24
 // Project: https://github.com/donnut/typescript-ramda
-// Definitions by: Erwin Poeze <https://github.com/donnut>, Matt DeKrey <https://github.com/mdekrey>, Liam Goodacre <https://github.com/LiamGoodacre>
+// Definitions by: Erwin Poeze <https://github.com/donnut>
+//                 Matt DeKrey <https://github.com/mdekrey>
+//                 Liam Goodacre <https://github.com/LiamGoodacre>
+//                 Matt Dziuban <https://github.com/mrdziuban>
+//                 Stephen King <https://github.com/sbking>
+//                 Alejandro Fernandez Haro <https://github.com/afharo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-declare var R: R.Static;
+declare let R: R.Static;
 
 declare namespace R {
     type Ord = number | string | boolean;
 
-    type Path = (number | string)[];
-
-    interface ListIterator<T, TResult> {
-        (value: T, index: number, list: T[]): TResult;
-    }
+    type Path = Array<(number | string)>;
 
     interface Functor<T> {
         map<U>(fn: (t: T) => U): Functor<U>;
     }
 
-    interface ObjectIterator<T, TResult> {
-        (element: T, key: string, obj: Dictionary<T>): Dictionary<TResult>;
+    interface KeyValuePair<K, V> extends Array<K | V> {
+        0: K;
+        1: V;
     }
 
-    interface KeyValuePair<K, V> extends Array<K | V> { 0 : K; 1 : V; }
-
     interface ArrayLike {
         nodeType: number;
     }
 
-    interface Arity0Fn {
-        (): any
-    }
+    type Arity0Fn = () => any;
 
-    interface Arity1Fn {
-        (a: any): any
-    }
+    type Arity1Fn = (a: any) => any;
 
-    interface Arity2Fn {
-        (a: any, b: any): any
-    }
+    type Arity2Fn = (a: any, b: any) => any;
 
     interface ObjFunc {
-        [index:string]: Function;
+        [index: string]: (...a: any[]) => any;
     }
 
     interface ObjFunc2 {
-        [index:string]: (x: any, y: any) => boolean;
+        [index: string]: (x: any, y: any) => boolean;
     }
 
-    interface Pred {
-        (...a: any[]): boolean;
-    }
+    type Pred = (...a: any[]) => boolean;
 
-    interface ObjPred {
-        (value: any, key: string): boolean;
-    }
+    type ObjPred = (value: any, key: string) => boolean;
 
     interface Dictionary<T> {
         [index: string]: T;
@@ -66,15 +56,50 @@ declare namespace R {
     }
 
     interface Nested<U> {
-        [index: string]: Nested<U>|{<U>(value: any): U};
+        [index: string]: Nested<U> | (<U>(value: any) => U);
     }
 
     interface Lens {
-        <T,U>(obj: T): U;
-        set<T,U>(str: string, obj: T): U;
+        <T, U>(obj: T): U;
+        set<T, U>(str: string, obj: T): U;
     }
 
     // @see https://gist.github.com/donnut/fd56232da58d25ceecf1, comment by @albrow
+    interface CurriedTypeGuard2<T1, T2, R extends T2> {
+        (t1: T1): (t2: T2) => t2 is R;
+        (t1: T1, t2: T2): t2 is R;
+    }
+
+    interface CurriedTypeGuard3<T1, T2, T3, R extends T3> {
+        (t1: T1): CurriedTypeGuard2<T2, T3, R>;
+        (t1: T1, t2: T2): (t3: T3) => t3 is R;
+        (t1: T1, t2: T2, t3: T3): t3 is R;
+    }
+
+    interface CurriedTypeGuard4<T1, T2, T3, T4, R extends T4> {
+        (t1: T1): CurriedTypeGuard3<T2, T3, T4, R>;
+        (t1: T1, t2: T2): CurriedTypeGuard2<T3, T4, R>;
+        (t1: T1, t2: T2, t3: T3): (t4: T4) => t4 is R;
+        (t1: T1, t2: T2, t3: T3, t4: T4): t4 is R;
+    }
+
+    interface CurriedTypeGuard5<T1, T2, T3, T4, T5, R extends T5> {
+        (t1: T1): CurriedTypeGuard4<T2, T3, T4, T5, R>;
+        (t1: T1, t2: T2): CurriedTypeGuard3<T3, T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedTypeGuard2<T4, T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): (t5: T5) => t5 is R;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): t5 is R;
+    }
+
+    interface CurriedTypeGuard6<T1, T2, T3, T4, T5, T6, R extends T6> {
+        (t1: T1): CurriedTypeGuard5<T2, T3, T4, T5, T6, R>;
+        (t1: T1, t2: T2): CurriedTypeGuard4<T3, T4, T5, T6, R>;
+        (t1: T1, t2: T2, t3: T3): CurriedTypeGuard3<T4, T5, T6, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedTypeGuard2<T5, T6, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): (t6: T6) => t6 is R;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): t6 is R;
+    }
+
     interface CurriedFunction2<T1, T2, R> {
         (t1: T1): (t2: T2) => R;
         (t1: T1, t2: T2): R;
@@ -110,30 +135,29 @@ declare namespace R {
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): R;
     }
 
-    interface Reduced {}
+    interface Reduced {
+        [index: number]: any;
+        [index: string]: any;
+    }
 
     interface Static {
+        /**
+         * Adds two numbers (or strings). Equivalent to a + b but curried.
+         */
+        add(a: number, b: number): number;
+        add(a: string, b: string): string;
+        add(a: number): (b: number) => number;
+        add(a: string): (b: string) => string;
 
-       /**
-        * Adds two numbers (or strings). Equivalent to a + b but curried.
-        */
-       add(a: number, b: number): number;
-       add(a: string, b: string): string;
-       add(a: number): (b: number) => number;
-       add(a: string): (b: string) => string;
-
-       /**
-        * Creates a new list iteration function from an existing one by adding two new parameters to its callback
-        * function: the current index, and the entire list.
-        */
-       addIndex<T,U>(fn: (f: (item: T) => U, list: T[]) => U[] )
-         : CurriedFunction2<(item: T, idx: number, list?: T[]) => U, T[], U[]>;
-       /* Special case for forEach */
-       addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[])
-         : CurriedFunction2<(item: T, idx: number, list?: T[]) => void, T[], T[]>;
-       /* Special case for reduce */
-       addIndex<T,U>(fn: (f: (acc:U, item: T) => U, aci:U, list: T[]) => U)
-         : CurriedFunction3<(acc:U, item: T, idx: number, list?: T[]) => U, U, T[], U>;
+        /**
+         * Creates a new list iteration function from an existing one by adding two new parameters to its callback
+         * function: the current index, and the entire list.
+         */
+        addIndex<T, U>(fn: (f: (item: T) => U, list: T[]) => U[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => U, T[], U[]>;
+        /* Special case for forEach */
+        addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => void, T[], T[]>;
+        /* Special case for reduce */
+        addIndex<T, U>(fn: (f: (acc: U, item: T) => U, aci: U, list: T[]) => U): CurriedFunction3<(acc: U, item: T, idx: number, list?: T[]) => U, U, T[], U>;
 
         /**
          * Applies a function to the value at the given index of an array, returning a new copy of the array with the
@@ -153,18 +177,17 @@ declare namespace R {
          */
         allPass(preds: Pred[]): Pred;
 
-       /**
-        * Returns a function that always returns the given value.
-        */
+        /**
+         * Returns a function that always returns the given value.
+         */
         always<T>(val: T): () => T;
 
-
         /**
          * A function that returns the first argument if it's falsy otherwise the second argument. Note that this is
          * NOT short-circuited, meaning that if expressions are passed they are both evaluated.
          */
-        and<T extends {and?: Function;}>(fn1: T, val2: boolean|any): boolean;
-        and<T extends {and?: Function;}>(fn1: T): (val2: boolean|any) => boolean;
+        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string>(fn1: T, val2: boolean | any): boolean;
+        and<T extends { and?: ((...a: any[]) => any); } | number | boolean | string>(fn1: T): (val2: boolean | any) => boolean;
 
         /**
          * Returns true if at least one of elements of the list match the predicate, false otherwise.
@@ -180,9 +203,8 @@ declare namespace R {
         /**
          * ap applies a list of functions to a list of values.
          */
-        ap<T,U>(fns: ((a: T) => U)[], vs: T[]): U[];
-        ap<T,U>(fns: ((a: T) => U)[]): (vs: T[]) => U[];
-
+        ap<T, U>(fns: Array<((a: T) => U)>, vs: T[]): U[];
+        ap<T, U>(fns: Array<((a: T) => U)>): (vs: T[]) => U[];
 
         /**
          * Returns a new list, composed of n-tuples of consecutive elements If n is greater than the length of the list,
@@ -194,9 +216,9 @@ declare namespace R {
         /**
          * Returns a new list containing the contents of the given list, followed by the given element.
          */
-        append<T, U>(el: U, list: T[]): (T & U)[];
-        append<U>(el: U): <T>(list: T[]) => (T & U)[];
-        append<U>(el: U): <T>(list: T[]) => (T & U)[];
+        append<T, U>(el: U, list: T[]): Array<(T & U)>;
+        append<U>(el: U): <T>(list: T[]) => Array<(T & U)>;
+        append<U>(el: U): <T>(list: T[]) => Array<(T & U)>;
 
         /**
          * Applies function fn to the argument list args. This is useful for creating a fixed-arity function from
@@ -212,27 +234,32 @@ declare namespace R {
          */
         applySpec<T>(obj: any): (...args: any[]) => T;
 
+        /**
+         * Makes an ascending comparator function out of a function that returns a value that can be compared with < and >.
+         */
+        ascend<T>(fn: (obj: T) => any, a: T, b: T): number;
+        ascend<T>(fn: (obj: T) => any): (a: T, b: T) => number;
+
         /**
          * Makes a shallow clone of an object, setting or overriding the specified property with the given value.
          */
-        assoc<T,U,K extends string>(prop: K, val: T, obj: U): Record<K, T> & U;
-        assoc<K extends string>(prop: K): <T,U>(val: T, obj: U) => Record<K, T> & U;
-        assoc<T,K extends string>(prop: K, val: T): <U>(obj: U) => Record<K, T> & U;
-
+        assoc<T, U, K extends string>(prop: K, val: T, obj: U): Record<K, T> & U;
+        assoc<K extends string>(prop: K): <T, U>(val: T, obj: U) => Record<K, T> & U;
+        assoc<T, K extends string>(prop: K, val: T): <U>(obj: U) => Record<K, T> & U;
 
         /**
          * Makes a shallow clone of an object, setting or overriding the nodes required to create the given path, and
          * placing the specific value at the tail end of that path.
          */
-        assocPath<T,U>(path: Path, val: T, obj: U): U;
-        assocPath<T,U>(path: Path, val: T): (obj: U) => U;
-        assocPath<T,U>(path: Path): CurriedFunction2<T, U, U>;
+        assocPath<T, U>(path: Path, val: T, obj: U): U;
+        assocPath<T, U>(path: Path, val: T): (obj: U) => U;
+        assocPath<T, U>(path: Path): CurriedFunction2<T, U, U>;
 
         /**
          * Wraps a function of any arity (including nullary) in a function that accepts exactly 2
          * parameters. Any extraneous parameters will not be passed to the supplied function.
          */
-        binary(fn: (...args: any[]) => any): Function;
+        binary(fn: (...args: any[]) => any): (...a: any[]) => any;
 
         /**
          * Creates a function that is bound to a context. Note: R.bind does not provide the additional argument-binding
@@ -240,7 +267,6 @@ declare namespace R {
          */
         bind<T>(thisObj: T, fn: (...args: any[]) => any): (...args: any[]) => any;
 
-
         /**
          * A function wrapping calls to the two functions in an && operation, returning the result of the first function
          * if it is false-y and the result of the second function otherwise. Note that this is short-circuited, meaning
@@ -254,7 +280,7 @@ declare namespace R {
          * as a converging function for R.converge: the left branch can produce a function while the right branch
          * produces a value to be passed to that function as an argument.
          */
-        call(fn: (...args: any[])=> (...args: any[]) => any, ...args: any[]): any;
+        call(fn: (...args: any[]) => (...args: any[]) => any, ...args: any[]): any;
 
         /**
          * `chain` maps a function over a list and concatenates the results.
@@ -291,12 +317,12 @@ declare namespace R {
          * - applying g to zero or more arguments will give false if applying the same arguments to f gives
          *   a logical true value.
          */
-        complement(pred: (...args: any[]) => boolean): (...args: any[]) => boolean
+        complement(pred: (...args: any[]) => boolean): (...args: any[]) => boolean;
 
         /**
          * Performs right-to-left function composition. The rightmost function may have any arity; the remaining
          * functions must be unary.
-        */
+         */
         compose<V0, T1>(fn0: (x0: V0) => T1): (x0: V0) => T1;
         compose<V0, V1, T1>(fn0: (x0: V0, x1: V1) => T1): (x0: V0, x1: V1) => T1;
         compose<V0, V1, V2, T1>(fn0: (x0: V0, x1: V1, x2: V2) => T1): (x0: V0, x1: V1, x2: V2) => T1;
@@ -318,8 +344,18 @@ declare namespace R {
         compose<V0, V1, V2, T1, T2, T3, T4, T5>(fn4: (x: T4) => T5, fn3: (x: T3) => T4, fn2: (x: T2) => T3, fn1: (x: T1) => T2, fn0: (x0: V0, x1: V1, x2: V2) => T1): (x0: V0, x1: V1, x2: V2) => T5;
 
         compose<V0, T1, T2, T3, T4, T5, T6>(fn5: (x: T5) => T6, fn4: (x: T4) => T5, fn3: (x: T3) => T4, fn2: (x: T2) => T3, fn1: (x: T1) => T2, fn0: (x: V0) => T1): (x: V0) => T6;
-        compose<V0, V1, T1, T2, T3, T4, T5, T6>(fn5: (x: T5) => T6, fn4: (x: T4) => T5, fn3: (x: T3) => T4, fn2: (x: T2) => T3, fn1: (x: T1) => T2, fn0: (x0: V0, x1: V1) => T1): (x0: V0, x1: V1) => T6;
-        compose<V0, V1, V2, T1, T2, T3, T4, T5, T6>(fn5: (x: T5) => T6, fn4: (x: T4) => T5, fn3: (x: T3) => T4, fn2: (x: T2) => T3, fn1: (x: T1) => T2, fn0: (x0: V0, x1: V1, x2: V2) => T1): (x0: V0, x1: V1, x2: V2) => T6;
+        compose<V0, V1, T1, T2, T3, T4, T5, T6>(fn5: (x: T5) => T6,
+                                                fn4: (x: T4) => T5,
+                                                fn3: (x: T3) => T4,
+                                                fn2: (x: T2) => T3,
+                                                fn1: (x: T1) => T2,
+                                                fn0: (x0: V0, x1: V1) => T1): (x0: V0, x1: V1) => T6;
+        compose<V0, V1, V2, T1, T2, T3, T4, T5, T6>(fn5: (x: T5) => T6,
+                                                    fn4: (x: T4) => T5,
+                                                    fn3: (x: T3) => T4,
+                                                    fn2: (x: T2) => T3,
+                                                    fn1: (x: T1) => T2,
+                                                    fn0: (x0: V0, x1: V1, x2: V2) => T1): (x0: V0, x1: V1, x2: V2) => T6;
 
         /**
          * TODO composeK
@@ -329,7 +365,6 @@ declare namespace R {
          * TODO composeP
          */
 
-
         /**
          * Returns a new list consisting of the elements of the first list followed by the elements
          * of the second.
@@ -345,21 +380,18 @@ declare namespace R {
          * point fn returns the result of applying its arguments to the corresponding transformer. If none of the predicates
          * matches, fn returns undefined.
          */
-        cond(fns: [Pred, Function][]): Function;
-
+        cond(fns: Array<[Pred, (...a: any[]) => any]>): (...a: any[]) => any;
 
         /**
          * Wraps a constructor function inside a curried function that can be called with the same arguments and returns the same type.
          */
-        construct(fn: Function): Function;
-
+        construct(fn: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * Wraps a constructor function inside a curried function that can be called with the same arguments and returns the same type.
          * The arity of the function returned is specified to allow using variadic constructor functions.
          */
-        constructN(n: number, fn: Function): Function;
-
+        constructN(n: number, fn: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * Returns `true` if the specified item is somewhere in the list, `false` otherwise.
@@ -376,7 +408,7 @@ declare namespace R {
          * function is applied to those same arguments. The results of each branching function
          * are passed as arguments to the converging function to produce the return value.
          */
-        converge(after: Function, fns: Function[]): Function;
+        converge(after: ((...a: any[]) => any), fns: Array<((...a: any[]) => any)>): (...a: any[]) => any;
 
         /**
          * Counts the elements of a list according to how many match each value
@@ -385,27 +417,30 @@ declare namespace R {
          * the list. Note that all keys are coerced to strings because of how
          * JavaScript objects work.
          */
-        countBy(fn: (a: any) => string|number, list: any[]): any;
-        countBy(fn: (a: any) => string|number): (list: any[]) => any;
+        countBy(fn: (a: any) => string | number, list: any[]): any;
+        countBy(fn: (a: any) => string | number): (list: any[]) => any;
 
         /**
          * Returns a curried equivalent of the provided function. The curried function has two unusual capabilities.
          * First, its arguments needn't be provided one at a time.
          */
-        curry<T1, T2, TResult>(fn: (a: T1, b: T2) => TResult): CurriedFunction2<T1,T2, TResult>
-        curry<T1, T2, T3, TResult>(fn: (a: T1, b: T2, c: T3) => TResult): CurriedFunction3<T1,T2, T3, TResult>
-        curry<T1, T2, T3, T4, TResult>(fn: (a: T1, b: T2, c: T3, d: T4) => TResult): CurriedFunction4<T1,T2, T3, T4, TResult>
-        curry<T1, T2, T3, T4, T5, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => TResult): CurriedFunction5<T1,T2, T3, T4, T5, TResult>
-        curry<T1, T2, T3, T4, T5, T6, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => TResult): CurriedFunction6<T1,T2, T3, T4, T5, T6, TResult>
-        curry(fn: Function): Function
-
+        curry<T1, T2, TResult extends T2>(fn: (a: T1, b: T2) => b is TResult): CurriedTypeGuard2<T1, T2, TResult>;
+        curry<T1, T2, T3, TResult extends T3>(fn: (a: T1, b: T2, c: T3) => c is TResult): CurriedTypeGuard3<T1, T2, T3, TResult>;
+        curry<T1, T2, T3, T4, TResult extends T4>(fn: (a: T1, b: T2, c: T3, d: T4) => d is TResult): CurriedTypeGuard4<T1, T2, T3, T4, TResult>;
+        curry<T1, T2, T3, T4, T5, TResult extends T5>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => e is TResult): CurriedTypeGuard5<T1, T2, T3, T4, T5, TResult>;
+        curry<T1, T2, T3, T4, T5, T6, TResult extends T6>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => f is TResult): CurriedTypeGuard6<T1, T2, T3, T4, T5, T6, TResult>;
+        curry<T1, T2, TResult>(fn: (a: T1, b: T2) => TResult): CurriedFunction2<T1, T2, TResult>;
+        curry<T1, T2, T3, TResult>(fn: (a: T1, b: T2, c: T3) => TResult): CurriedFunction3<T1, T2, T3, TResult>;
+        curry<T1, T2, T3, T4, TResult>(fn: (a: T1, b: T2, c: T3, d: T4) => TResult): CurriedFunction4<T1, T2, T3, T4, TResult>;
+        curry<T1, T2, T3, T4, T5, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => TResult): CurriedFunction5<T1, T2, T3, T4, T5, TResult>;
+        curry<T1, T2, T3, T4, T5, T6, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => TResult): CurriedFunction6<T1, T2, T3, T4, T5, T6, TResult>;
+        curry(fn: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * Returns a curried equivalent of the provided function, with the specified arity. The curried function has
          * two unusual capabilities. First, its arguments needn't be provided one at a time.
          */
-        curryN(length: number, fn: (...args: any[]) => any): Function;
-
+        curryN(length: number, fn: (...args: any[]) => any): (...a: any[]) => any;
 
         /**
          * Decrements its argument.
@@ -416,8 +451,14 @@ declare namespace R {
          * Returns the second argument if it is not null or undefined. If it is null or undefined, the
          * first (default) argument is returned.
          */
-        defaultTo<T,U>(a: T, b: U): T|U
-        defaultTo<T>(a: T): <U>(b: U) => T|U
+        defaultTo<T, U>(a: T, b: U): T | U;
+        defaultTo<T>(a: T): <U>(b: U) => T | U;
+
+        /**
+         * Makes a descending comparator function out of a function that returns a value that can be compared with < and >.
+         */
+        descend<T>(fn: (obj: T) => any, a: T, b: T): number;
+        descend<T>(fn: (obj: T) => any): (a: T, b: T) => number;
 
         /**
          * Finds the set (i.e. no duplicates) of all elements in the first list not contained in the second list.
@@ -459,7 +500,7 @@ declare namespace R {
         drop<T>(n: number): {
             (xs: string): string;
             (xs: T[]): T[];
-        }
+        };
 
         /**
          * Returns a list containing all but the last n elements of the given list.
@@ -469,7 +510,7 @@ declare namespace R {
         dropLast<T>(n: number): {
             (xs: T[]): T[];
             (xs: string): string;
-        }
+        };
 
         /**
          * Returns a new list containing all but last then elements of a given list, passing each value from the
@@ -512,8 +553,8 @@ declare namespace R {
         /**
          * Reports whether two functions have the same value for the specified property.
          */
-        eqProps<T,U>(prop: string, obj1: T, obj2: U): boolean;
-        eqProps(prop: string): <T,U>(obj1: T, obj2: U) => boolean;
+        eqProps<T, U>(prop: string, obj1: T, obj2: U): boolean;
+        eqProps(prop: string): <T, U>(obj1: T, obj2: U) => boolean;
         eqProps<T>(prop: string, obj1: T): <U>(obj2: U) => boolean;
 
         /**
@@ -543,9 +584,8 @@ declare namespace R {
          * Returns the first element of the list which matches the predicate, or `undefined` if no
          * element matches.
          */
-        find<T>(fn: (a: T) => boolean, list: T[]): T;
-        find<T>(fn: (a: T) => boolean): (list: T[]) => T;
-
+        find<T>(fn: (a: T) => boolean, list: T[]): T | undefined;
+        find<T>(fn: (a: T) => boolean): (list: T[]) => T | undefined;
 
         /**
          * Returns the index of the first element of the list which matches the predicate, or `-1`
@@ -558,8 +598,8 @@ declare namespace R {
          * Returns the last element of the list which matches the predicate, or `undefined` if no
          * element matches.
          */
-        findLast<T>(fn: (a: T) => boolean, list: T[]): T;
-        findLast<T>(fn: (a: T) => boolean): (list: T[]) => T;
+        findLast<T>(fn: (a: T) => boolean, list: T[]): T | undefined;
+        findLast<T>(fn: (a: T) => boolean): (list: T[]) => T | undefined;
 
         /**
          * Returns the index of the last element of the list which matches the predicate, or
@@ -572,16 +612,14 @@ declare namespace R {
          * Returns a new list by pulling every item out of it (and all its sub-arrays) and putting
          * them in a new array, depth-first.
          */
-        flatten<T>(x: T[][]): T[];
-        flatten<T>(x: T[]): T[];
+        flatten<T>(x: T[] | T[][]): T[];
 
         /**
          * Returns a new function much like the supplied one, except that the first two arguments'
          * order is reversed.
          */
-        flip<T,U,TResult>(fn: (arg0: T, arg1: U) => TResult): (arg1: U, arg0?: T) => TResult;
-        flip<T,U,TResult>(fn: (arg0: T, arg1: U, ...args: any[]) => TResult): (arg1: U, arg0?: T, ...args: any[]) => TResult;
-
+        flip<T, U, TResult>(fn: (arg0: T, arg1: U) => TResult): (arg1: U, arg0?: T) => TResult;
+        flip<T, U, TResult>(fn: (arg0: T, arg1: U, ...args: any[]) => TResult): (arg1: U, arg0?: T, ...args: any[]) => TResult;
 
         /**
          * Iterate over an input list, calling a provided function fn for each element in the list.
@@ -592,22 +630,22 @@ declare namespace R {
         /**
          * Creates a new object out of a list key-value pairs.
          */
-        fromPairs<V>(pairs: KeyValuePair<string, V>[]): {[index: string]: V};
-        fromPairs<V>(pairs: KeyValuePair<number, V>[]): {[index: number]: V};
+        fromPairs<V>(pairs: Array<KeyValuePair<string, V>>): { [index: string]: V };
+        fromPairs<V>(pairs: Array<KeyValuePair<number, V>>): { [index: number]: V };
 
         /**
          * Splits a list into sublists stored in an object, based on the result of
          * calling a String-returning function
          * on each element, and grouping the results according to values returned.
          */
-        groupBy<T>(fn: (a: T) => string, list: T[]): {[index: string]: T[]}
-        groupBy<T>(fn: (a: T) => string): <T>(list: T[]) => {[index: string]: T[]}
+        groupBy<T>(fn: (a: T) => string, list: T[]): { [index: string]: T[] };
+        groupBy<T>(fn: (a: T) => string): <T>(list: T[]) => { [index: string]: T[] };
 
         /**
          * Takes a list and returns a list of lists where each sublist's elements are all "equal" according to the provided equality function
          */
-        groupWith<T>(fn: (x: T, y: T) => boolean, list: T[]): T[][]
-        groupWith<T>(fn: (x: T, y: T) => boolean, list: string): string[]
+        groupWith<T>(fn: (x: T, y: T) => boolean, list: T[]): T[][];
+        groupWith<T>(fn: (x: T, y: T) => boolean, list: string): string[];
 
         /**
          * Returns true if the first parameter is greater than the second.
@@ -647,7 +685,6 @@ declare namespace R {
         identical<T>(a: T, b: T): boolean;
         identical<T>(a: T): (b: T) => boolean;
 
-
         /**
          * A function that does nothing but return the parameter supplied to it. Good as a default
          * or placeholder function.
@@ -660,7 +697,6 @@ declare namespace R {
          */
         ifElse(fn: Pred, onTrue: Arity1Fn, onFalse: Arity1Fn): Arity1Fn;
 
-
         /**
          * Increments its argument.
          */
@@ -670,7 +706,7 @@ declare namespace R {
          * Given a function that generates a key, turns a list of objects into an object indexing the objects
          * by the given key.
          */
-        indexBy<T,U>(fn: (a: T) => string, list: T[]): U;
+        indexBy<T, U>(fn: (a: T) => string, list: T[]): U;
         indexBy<T>(fn: (a: T) => string): <U>(list: T[]) => U;
 
         /**
@@ -703,13 +739,11 @@ declare namespace R {
         insertAll<T>(index: number, elts: T[]): (list: T[]) => T[];
         insertAll(index: number): <T>(elts: T[], list: T[]) => T[];
 
-
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of those elements common to both lists.
          */
         intersection<T>(list1: T[], list2: T[]): T[];
 
-
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of those
          * elements common to both lists.  Duplication is determined according
@@ -728,21 +762,19 @@ declare namespace R {
          * Transforms the items of the list with the transducer and appends the transformed items to the accumulator
          * using an appropriate iterator function based on the accumulator type.
          */
-        into<T>(acc: any, xf: Function, list: T[]): T[];
-        into(acc: any, xf: Function): <T>(list: T[]) => T[];
-        into(acc: any): <T>(xf: Function, list: T[]) => T[];
+        into<T>(acc: any, xf: (...a: any[]) => any, list: T[]): T[];
+        into(acc: any, xf: (...a: any[]) => any): <T>(list: T[]) => T[];
+        into(acc: any): <T>(xf: (...a: any[]) => any, list: T[]) => T[];
 
         /**
-        * Same as R.invertObj, however this accounts for objects with duplicate values by putting the values into an array.
-        */
-        invert<T>(obj: T): {[index:string]: string[]};
+         * Same as R.invertObj, however this accounts for objects with duplicate values by putting the values into an array.
+         */
+        invert<T>(obj: T): { [index: string]: string[] };
 
         /**
-        * Returns a new object with the keys of the given object as values, and the values of the given object as keys.
-        */
-        invertObj(obj: any): {[index:string]: string};
-        invertObj(obj: {[index: number]: string}): {[index:string]: string};
-
+         * Returns a new object with the keys of the given object as values, and the values of the given object as keys.
+         */
+        invertObj(obj: any | { [index: number]: string }): { [index: string]: string };
 
         /**
          * Turns a named method of an object (or object prototype) into a function that can be
@@ -752,8 +784,8 @@ declare namespace R {
          * The returned function is curried and accepts `len + 1` parameters (or `method.length + 1`
          * when `len` is not specified), and the final parameter is the target object.
          */
-        invoker(name: string, obj: any, len?: number): Function;
-        invoker(name: string): (obj: any, len?: number) => Function;
+        invoker(name: string, obj: any, len?: number): (...a: any[]) => any;
+        invoker(name: string): (obj: any, len?: number) => (...a: any[]) => any;
 
         /**
          * See if an object (`val`) is an instance of the supplied constructor.
@@ -772,7 +804,6 @@ declare namespace R {
          */
         isEmpty(value: any): boolean;
 
-
         /**
          * Returns true if the input value is NaN.
          */
@@ -793,8 +824,7 @@ declare namespace R {
         /**
          * Applies a list of functions to a list of values.
          */
-        juxt<T,U>(fns: {(...args: T[]): U}[]): (...args: T[]) => U[];
-
+        juxt<T, U>(fns: Array<(...args: T[]) => U>): (...args: T[]) => U[];
 
         /**
          * Returns a list containing the names of all the enumerable own
@@ -830,7 +860,7 @@ declare namespace R {
          * "gets" the value of the focus; the setter "sets" the value of the focus.
          * The setter should not mutate the data structure.
          */
-        lens<T,U,V>(getter: (s: T) => U, setter: (a: U, s: T) => V): Lens;
+        lens<T, U, V>(getter: (s: T) => U, setter: (a: U, s: T) => V): Lens;
 
         /**
          * Creates a lens that will focus on index n of the source array.
@@ -848,22 +878,21 @@ declare namespace R {
          */
         lensProp(str: string): {
             <T, U>(obj: T): U;
-            set<T,U,V>(val: T, obj: U): V;
-            /*map<T>(fn: Function, obj: T): T*/
-        }
+            set<T, U, V>(val: T, obj: U): V;
+            /*map<T>(fn: (...a: any[]) => any, obj: T): T*/
+        };
 
         /**
          * "lifts" a function of arity > 1 so that it may "map over" a list, Function or other object that satisfies
          * the FantasyLand Apply spec.
          */
-        lift(fn: Function, ...args: any[]): any;
+        lift(fn: ((...a: any[]) => any), ...args: any[]): any;
 
         /**
          * "lifts" a function to be the specified arity, so that it may "map over" that many lists, Functions or other
          * objects that satisfy the FantasyLand Apply spec.
          */
-        liftN(n: number, fn: Function, ...args: any[]): any;
-
+        liftN(n: number, fn: ((...a: any[]) => any), ...args: any[]): any;
 
         /**
          * Returns true if the first parameter is less than the second.
@@ -898,12 +927,11 @@ declare namespace R {
         mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult]): (acc: U, list: T[]) => [U, TResult[]];
         mapAccumRight<T, U, TResult>(fn: (acc: U, value: T) => [U, TResult], acc: U): (list: T[]) => [U, TResult[]];
 
-
         /**
          * Like mapObj, but but passes additional arguments to the predicate function.
          */
-        mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult, obj: any): {[index:string]: TResult};
-        mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult): (obj: any) => {[index:string]: TResult};
+        mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult, obj: any): { [index: string]: TResult };
+        mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult): (obj: any) => { [index: string]: TResult };
 
         /**
          * Tests a regular expression agains a String
@@ -911,7 +939,6 @@ declare namespace R {
         match(regexp: RegExp, str: string): any[];
         match(regexp: RegExp): (str: string) => any[];
 
-
         /**
          * mathMod behaves like the modulo operator should mathematically, unlike the `%`
          * operator (and by extension, R.modulo). So while "-17 % 5" is -2,
@@ -921,7 +948,6 @@ declare namespace R {
         mathMod(a: number, b: number): number;
         mathMod(a: number): (b: number) => number;
 
-
         /**
          * Returns the larger of its two arguments.
          */
@@ -934,7 +960,7 @@ declare namespace R {
          */
         maxBy<T>(keyFn: (a: T) => Ord, a: T, b: T): T;
         maxBy<T>(keyFn: (a: T) => Ord, a: T): (b: T) => T;
-        maxBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>
+        maxBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>;
 
         /**
          * Returns the mean of the given list of numbers.
@@ -951,7 +977,7 @@ declare namespace R {
          * returns the result. Subsequent calls to the memoized fn with the same argument set will not result in an
          * additional call to fn; instead, the cached result for that set of arguments will be returned.
          */
-        memoize(fn: Function): Function;
+        memoize(fn: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * Create a new object with the own properties of a
@@ -961,7 +987,6 @@ declare namespace R {
         merge<T1, T2>(a: T1, b: T2): T1 & T2;
         merge<T1>(a: T1): <T2>(b: T2) => T1 & T2;
 
-
         /**
          * Merges a list of objects together into one object.
          */
@@ -973,9 +998,9 @@ declare namespace R {
          * the value associated with the key in the returned object. The key will be excluded from the returned object if the
          * resulting value is undefined.
          */
-        mergeWith<U,V>(fn: (x: any, z: any) => any, a: U, b: V): U & V;
+        mergeWith<U, V>(fn: (x: any, z: any) => any, a: U, b: V): U & V;
         mergeWith<U>(fn: (x: any, z: any) => any, a: U): <V>(b: V) => U & V;
-        mergeWith(fn: (x: any, z: any) => any): <U,V>(a: U, b: V) => U & V;
+        mergeWith(fn: (x: any, z: any) => any): <U, V>(a: U, b: V) => U & V;
 
         /**
          * Creates a new object with the own properties of the two provided objects. If a key exists in both objects,
@@ -983,9 +1008,9 @@ declare namespace R {
          * result being used as the value associated with the key in the returned object. The key will be excluded from
          * the returned object if the resulting value is undefined.
          */
-        mergeWithKey<U,V>(fn: (str: string, x: any, z: any) => any, a: U, b: V): U & V;
+        mergeWithKey<U, V>(fn: (str: string, x: any, z: any) => any, a: U, b: V): U & V;
         mergeWithKey<U>(fn: (str: string, x: any, z: any) => any, a: U): <V>(b: V) => U & V;
-        mergeWithKey(fn: (str: string, x: any, z: any) => any): <U,V>(a: U, b: V) => U & V;
+        mergeWithKey(fn: (str: string, x: any, z: any) => any): <U, V>(a: U, b: V) => U & V;
 
         /**
          * Returns the smaller of its two arguments.
@@ -999,7 +1024,7 @@ declare namespace R {
          */
         minBy<T>(keyFn: (a: T) => Ord, a: T, b: T): T;
         minBy<T>(keyFn: (a: T) => Ord, a: T): (b: T) => T;
-        minBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>
+        minBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>;
 
         /**
          * Divides the second parameter by the first and returns the remainder.
@@ -1016,26 +1041,23 @@ declare namespace R {
         multiply(a: number, b: number): number;
         multiply(a: number): (b: number) => number;
 
-
         /**
          * 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.
          */
-        nAry(n: number, fn: (...arg: any[]) => any): Function;
+        nAry(n: number, fn: (...arg: any[]) => any): (...a: any[]) => any;
 
         /**
          * Negates its argument.
          */
         negate(n: number): number;
 
-
         /**
          * Returns true if no elements of the list match the predicate, false otherwise.
          */
         none<T>(fn: (a: T) => boolean, list: T[]): boolean;
         none<T>(fn: (a: T) => boolean): (list: T[]) => boolean;
 
-
         /**
          * A function wrapping a call to the given function in a `!` operation.  It will return `true` when the
          * underlying function would return a false-y value, and `false` when it would return a truth-y one.
@@ -1063,7 +1085,6 @@ declare namespace R {
          * Returns a singleton array containing the value provided.
          */
         of<T>(x: T): T[];
-        //of<T>(x: T[]): T[][]; unnecessary typing and introduced error in unless example
 
         /**
          * Returns a partial copy of an object omitting the keys specified.
@@ -1076,18 +1097,17 @@ declare namespace R {
          * called once, no matter how many times the returned function is invoked. The first value calculated is
          * returned in subsequent invocations.
          */
-        once(fn: Function): Function;
+        once(fn: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * A function that returns the first truthy of two arguments otherwise the last argument. Note that this is
          * NOT short-circuited, meaning that if expressions are passed they are both evaluated.
          * Dispatches to the or method of the first argument if applicable.
          */
-        or<T, U>(a: T, b: U): T|U;
-        or<T>(a: T): <U>(b: U) => T|U;
-        or<T extends {or?: Function;}, U>(fn1: T, val2: U): T|U;
-        or<T extends {or?: Function;}>(fn1: T): <U>(val2: U) => T|U;
-
+        or<T, U>(a: T, b: U): T | U;
+        or<T>(a: T): <U>(b: U) => T | U;
+        or<T extends { or?: ((...a: any[]) => any); }, U>(fn1: T, val2: U): T | U;
+        or<T extends { or?: ((...a: any[]) => any); }>(fn1: T): <U>(val2: U) => T | U;
 
         /**
          * Returns the result of "setting" the portion of the given data structure
@@ -1100,25 +1120,24 @@ declare namespace R {
         over(lens: Lens): <T>(fn: Arity1Fn, value: T) => T;
         over(lens: Lens): <T>(fn: Arity1Fn, value: T[]) => T[];
 
-
         /**
          * Takes two arguments, fst and snd, and returns [fst, snd].
          */
-        pair<F,S>(fst: F, snd: S): [F, S];
+        pair<F, S>(fst: F, snd: S): [F, S];
 
         /**
          * Accepts as its arguments a function and any number of values and returns a function that,
          * when invoked, calls the original function with all of the values prepended to the
          * original function's arguments list. In some libraries this function is named `applyLeft`.
          */
-        partial(fn: Function, ...args: any[]): Function;
+        partial(fn: (...a: any[]) => any, ...args: any[]): (...a: any[]) => any;
 
         /**
          * Accepts as its arguments a function and any number of values and returns a function that,
          * when invoked, calls the original function with all of the values appended to the original
          * function's arguments list.
          */
-        partialRight(fn: Function, ...args: any[]): Function;
+        partialRight(fn: (...a: any[]) => any, ...args: any[]): (...a: any[]) => any;
 
         /**
          * Takes a predicate and a list and returns the pair of lists of elements
@@ -1136,9 +1155,9 @@ declare namespace R {
         path<T>(path: Path): (obj: any) => T;
 
         /**
-        * Determines whether a nested path on an object has a specific value,
-        * in `R.equals` terms. Most likely used to filter a list.
-        */
+         * Determines whether a nested path on an object has a specific value,
+         * in `R.equals` terms. Most likely used to filter a list.
+         */
         pathEq(path: Path, val: any, obj: any): boolean;
         pathEq(path: Path, val: any): (obj: any) => boolean;
         pathEq(path: Path): CurriedFunction2<any, any, boolean>;
@@ -1147,31 +1166,35 @@ declare namespace R {
          * If the given, non-null object has a value at the given path, returns the value at that path.
          * Otherwise returns the provided default value.
          */
-        pathOr<T>(d: T, p: Path, obj: any): T|any;
-        pathOr<T>(d: T, p: Path): (obj: any) => T|any;
-        pathOr<T>(d: T): CurriedFunction2<Path, any, T|any>;
+        pathOr<T>(d: T, p: Path, obj: any): T | any;
+        pathOr<T>(d: T, p: Path): (obj: any) => T | any;
+        pathOr<T>(d: T): CurriedFunction2<Path, any, T | any>;
+
+        /**
+         * Returns true if the specified object property at given path satisfies the given predicate; false otherwise.
+         */
+        pathSatisfies<T, U>(pred: (val: T) => boolean, path: Path, obj: U): boolean;
+        pathSatisfies<T, U>(pred: (val: T) => boolean, path: Path): (obj: U) => boolean;
+        pathSatisfies<T, U>(pred: (val: T) => boolean): CurriedFunction2<Path, U, boolean>;
 
         /**
          * Returns a partial copy of an object containing only the keys specified.  If the key does not exist, the
          * property is ignored.
          */
-        pick<T,U>(names: string[], obj: T): U;
+        pick<T, U>(names: string[], obj: T): U;
         pick(names: string[]): <T, U>(obj: T) => U;
 
-
         /**
          * Similar to `pick` except that this one includes a `key: undefined` pair for properties that don't exist.
          */
-        pickAll<T,U>(names: string[], obj: T): U;
-        pickAll(names: string[]): <T,U>(obj: T) => U;
-
+        pickAll<T, U>(names: string[], obj: T): U;
+        pickAll(names: string[]): <T, U>(obj: T) => U;
 
         /**
          * Returns a partial copy of an object containing only the keys that satisfy the supplied predicate.
          */
-        pickBy<T,U>(pred: ObjPred, obj: T): U;
-        pickBy(pred: ObjPred): <T,U>(obj: T) => U;
-
+        pickBy<T, U>(pred: ObjPred, obj: T): U;
+        pickBy(pred: ObjPred): <T, U>(obj: T) => U;
 
         /**
          * Creates a new function that runs each of the functions supplied as parameters in turn,
@@ -1200,22 +1223,65 @@ declare namespace R {
 
         pipe<V0, T1, T2, T3, T4, T5, T6>(fn0: (x: V0) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6): (x: V0) => T6;
         pipe<V0, V1, T1, T2, T3, T4, T5, T6>(fn0: (x0: V0, x1: V1) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6): (x0: V0, x1: V1) => T6;
-        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6>(fn0: (x0: V0, x1: V1, x2: V2) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6): (x0: V0, x1: V1, x2: V2) => T6;
+        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6>(fn0: (x0: V0, x1: V1, x2: V2) => T1,
+                                                 fn1: (x: T1) => T2,
+                                                 fn2: (x: T2) => T3,
+                                                 fn3: (x: T3) => T4,
+                                                 fn4: (x: T4) => T5,
+                                                 fn5: (x: T5) => T6): (x0: V0, x1: V1, x2: V2) => T6;
 
-        pipe<V0, T1, T2, T3, T4, T5, T6, T7>(fn0: (x: V0) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn: (x: T6) => T7): (x: V0) => T7;
-        pipe<V0, V1, T1, T2, T3, T4, T5, T6, T7>(fn0: (x0: V0, x1: V1) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn6: (x: T6) => T7): (x0: V0, x1: V1) => T7;
-        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6, T7>(fn0: (x0: V0, x1: V1, x2: V2) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn6: (x: T6) => T7): (x0: V0, x1: V1, x2: V2) => T7;
-
-        pipe<V0, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x: V0) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn6: (x: T6) => T7, fn: (x: T7) => T8): (x: V0) => T8;
-        pipe<V0, V1, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x0: V0, x1: V1) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn6: (x: T5) => T6, fn7: (x: T7) => T8): (x0: V0, x1: V1) => T8;
-        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x0: V0, x1: V1, x2: V2) => T1, fn1: (x: T1) => T2, fn2: (x: T2) => T3, fn3: (x: T3) => T4, fn4: (x: T4) => T5, fn5: (x: T5) => T6, fn6: (x: T5) => T6, fn7: (x: T7) => T8): (x0: V0, x1: V1, x2: V2) => T8;
+        pipe<V0, T1, T2, T3, T4, T5, T6, T7>(fn0: (x: V0) => T1,
+                                             fn1: (x: T1) => T2,
+                                             fn2: (x: T2) => T3,
+                                             fn3: (x: T3) => T4,
+                                             fn4: (x: T4) => T5,
+                                             fn5: (x: T5) => T6,
+                                             fn: (x: T6) => T7): (x: V0) => T7;
+        pipe<V0, V1, T1, T2, T3, T4, T5, T6, T7>(fn0: (x0: V0, x1: V1) => T1,
+                                                 fn1: (x: T1) => T2,
+                                                 fn2: (x: T2) => T3,
+                                                 fn3: (x: T3) => T4,
+                                                 fn4: (x: T4) => T5,
+                                                 fn5: (x: T5) => T6,
+                                                 fn6: (x: T6) => T7): (x0: V0, x1: V1) => T7;
+        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6, T7>(fn0: (x0: V0, x1: V1, x2: V2) => T1,
+                                                     fn1: (x: T1) => T2,
+                                                     fn2: (x: T2) => T3,
+                                                     fn3: (x: T3) => T4,
+                                                     fn4: (x: T4) => T5,
+                                                     fn5: (x: T5) => T6,
+                                                     fn6: (x: T6) => T7): (x0: V0, x1: V1, x2: V2) => T7;
 
+        pipe<V0, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x: V0) => T1,
+                                                 fn1: (x: T1) => T2,
+                                                 fn2: (x: T2) => T3,
+                                                 fn3: (x: T3) => T4,
+                                                 fn4: (x: T4) => T5,
+                                                 fn5: (x: T5) => T6,
+                                                 fn6: (x: T6) => T7,
+                                                 fn: (x: T7) => T8): (x: V0) => T8;
+        pipe<V0, V1, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x0: V0, x1: V1) => T1,
+                                                     fn1: (x: T1) => T2,
+                                                     fn2: (x: T2) => T3,
+                                                     fn3: (x: T3) => T4,
+                                                     fn4: (x: T4) => T5,
+                                                     fn5: (x: T5) => T6,
+                                                     fn6: (x: T5) => T6,
+                                                     fn7: (x: T7) => T8): (x0: V0, x1: V1) => T8;
+        pipe<V0, V1, V2, T1, T2, T3, T4, T5, T6, T7, T8>(fn0: (x0: V0, x1: V1, x2: V2) => T1,
+                                                         fn1: (x: T1) => T2,
+                                                         fn2: (x: T2) => T3,
+                                                         fn3: (x: T3) => T4,
+                                                         fn4: (x: T4) => T5,
+                                                         fn5: (x: T5) => T6,
+                                                         fn6: (x: T5) => T6,
+                                                         fn7: (x: T7) => T8): (x0: V0, x1: V1, x2: V2) => T8;
 
         /**
          * Returns a new list by plucking the same named property off all objects in the list supplied.
          */
-        pluck<T>(p: string|number, list: any[]): T[];
-        pluck(p: string|number): <T>(list: any[]) => T[];
+        pluck<T>(p: string | number, list: any[]): T[];
+        pluck(p: string | number): <T>(list: any[]) => T[];
 
         /**
          * Returns a new list with the given element at the front, followed by the contents of the
@@ -1229,11 +1295,10 @@ declare namespace R {
          */
         product(list: number[]): number;
 
-
         /**
          * Reasonable analog to SQL `select` statement.
          */
-        project<T,U>(props: string[], objs: T[]): U[];
+        project<T, U>(props: string[], objs: T[]): U[];
 
         /**
          * Returns a function that when supplied an object returns the indicated property of that object, if it exists.
@@ -1264,15 +1329,15 @@ declare namespace R {
         propIs(type: any): {
             (name: string, obj: any): boolean;
             (name: string): (obj: any) => boolean;
-        }
+        };
 
         /**
          * If the given, non-null object has an own property with the specified name, returns the value of that property.
          * Otherwise returns the provided default value.
          */
-        propOr<T,U,V>(val: T, p: string, obj: U): V;
-        propOr<T>(val: T, p: string): <U,V>(obj: U) => V;
-        propOr<T>(val: T): <U,V>(p: string, obj: U) => V;
+        propOr<T, U, V>(val: T, p: string, obj: U): V;
+        propOr<T>(val: T, p: string): <U, V>(obj: U) => V;
+        propOr<T>(val: T): <U, V>(p: string, obj: U) => V;
 
         /**
          * Returns the value at the specified property.
@@ -1285,9 +1350,9 @@ declare namespace R {
         /**
          * Returns true if the specified object property satisfies the given predicate; false otherwise.
          */
-        propSatisfies<T,U>(pred: (val: T) => boolean, name: string, obj: U): boolean;
-        propSatisfies<T,U>(pred: (val: T) => boolean, name: string): (obj: U) => boolean;
-        propSatisfies<T,U>(pred: (val: T) => boolean): CurriedFunction2<string, U, boolean>;
+        propSatisfies<T, U>(pred: (val: T) => boolean, name: string, obj: U): boolean;
+        propSatisfies<T, U>(pred: (val: T) => boolean, name: string): (obj: U) => boolean;
+        propSatisfies<T, U>(pred: (val: T) => boolean): CurriedFunction2<string, U, boolean>;
 
         /**
          * Returns a list of numbers from `from` (inclusive) to `to`
@@ -1302,18 +1367,18 @@ declare namespace R {
          * function and passing it an accumulator value and the current value from the array, and
          * then passing the result to the next call.
          */
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult|Reduced, acc: TResult, list: T[]): TResult;
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult|Reduced): (acc: TResult, list: T[]) => TResult;
-        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult|Reduced, acc: TResult): (list: T[]) => TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced, acc: TResult, list: T[]): TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced): (acc: TResult, list: T[]) => TResult;
+        reduce<T, TResult>(fn: (acc: TResult, elem: T) => TResult | Reduced, acc: TResult): (list: T[]) => TResult;
 
         /**
          * Groups the elements of the list according to the result of calling the String-returning function keyFn on each
          * element and reduces the elements of each group to a single value via the reducer function valueFn.
          */
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string, list: T[]): {[index: string]: TResult};
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string): (list: T[]) => {[index: string]: TResult};
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): CurriedFunction2<(elem: T) => string, T[], {[index: string]: TResult}>;
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): CurriedFunction3<TResult, (elem: T) => string, T[], {[index: string]: TResult}>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string, list: T[]): { [index: string]: TResult };
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string): (list: T[]) => { [index: string]: TResult };
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): CurriedFunction2<(elem: T) => string, T[], { [index: string]: TResult }>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): CurriedFunction3<TResult, (elem: T) => string, T[], { [index: string]: TResult }>;
 
         /**
          * Returns a value wrapped to indicate that it is the final value of the reduce and
@@ -1351,17 +1416,12 @@ declare namespace R {
         repeat<T>(a: T, n: number): T[];
         repeat<T>(a: T): (n: number) => T[];
 
-
         /**
          * Replace a substring or regex match in a string with a replacement.
          */
-        replace(pattern: RegExp, replacement: string, str: string): string;
-        replace(pattern: RegExp, replacement: string): (str: string) => string;
-        replace(pattern: RegExp): (replacement: string) => (str: string) => string;
-        replace(pattern: String, replacement: string, str: string): string;
-        replace(pattern: String, replacement: string): (str: string) => string;
-        replace(pattern: 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) => (str: string) => string;
 
         /**
          * Returns a new list with the same elements as the original list, just in the reverse order.
@@ -1379,17 +1439,17 @@ declare namespace R {
          * Returns the result of "setting" the portion of the given data structure focused by the given lens to the
          * given value.
          */
-        set<T,U>(lens: Lens, a: U, obj: T): T;
+        set<T, U>(lens: Lens, a: U, obj: T): T;
         set<U>(lens: Lens, a: U): <T>(obj: T) => T;
-        set(lens: Lens): <T,U>(a: U, obj: T) => T;
+        set(lens: Lens): <T, U>(a: U, obj: T) => T;
 
         /**
          * Returns the elements from `xs` starting at `a` and ending at `b - 1`.
          */
         slice(a: number, b: number, list: string): string;
         slice<T>(a: number, b: number, list: T[]): T[];
-        slice(a: number, b: number): <T>(list: string|T[]) => string|T[];
-        slice(a: number): <T>(b: number, list: string|T[]) => string|T[];
+        slice(a: number, b: number): <T>(list: string | T[]) => string | T[];
+        slice(a: number): <T>(b: number, list: string | T[]) => string | T[];
 
         /**
          * Returns a copy of the list, sorted according to the comparator function, which should accept two values at a
@@ -1399,21 +1459,24 @@ declare namespace R {
         sort<T>(fn: (a: T, b: T) => number, list: T[]): T[];
         sort<T>(fn: (a: T, b: T) => number): (list: T[]) => T[];
 
-
         /**
          * Sorts the list according to a key generated by the supplied function.
          */
         sortBy<T>(fn: (a: any) => Ord, list: T[]): T[];
         sortBy(fn: (a: any) => Ord): <T>(list: T[]) => T[];
 
+        /**
+         * Sorts a list according to a list of comparators.
+         */
+        sortWith<T>(fns: Array<((a: T, b: T) => number)>, list: T[]): T[];
+        sortWith<T>(fns: Array<((a: T, b: T) => number)>): (list: T[]) => T[];
+
         /**
          * Splits a string into an array of strings based on the given
          * separator.
          */
-        split(sep: string): (str: string) => string[];
-        split(sep: RegExp): (str: string) => string[];
-        split(sep: string, str: string): string[];
-        split(sep: RegExp, str: string): string[];
+        split(sep: string | RegExp): (str: string) => string[];
+        split(sep: string | RegExp, str: string): string[];
 
         /**
          * Splits a given list or string at a given index.
@@ -1429,14 +1492,13 @@ declare namespace R {
         splitEvery<T>(a: number, list: T[]): T[][];
         splitEvery(a: number): <T>(list: T[]) => T[][];
 
-
         /**
          * Takes a list and a predicate and returns a pair of lists with the following properties:
          * - the result of concatenating the two output lists is equivalent to the input list;
          * - none of the elements of the first output list satisfies the predicate; and
          * - if the second output list is non-empty, its first element satisfies the predicate.
          */
-        splitWhen<T,U>(pred: (val: T) => boolean, list: U[]): U[][];
+        splitWhen<T, U>(pred: (val: T) => boolean, list: U[]): U[][];
         splitWhen<T>(pred: (val: T) => boolean): <U>(list: U[]) => U[][];
 
         /**
@@ -1483,8 +1545,7 @@ declare namespace R {
         take<T>(n: number): {
             (xs: string): string;
             (xs: T[]): T[];
-        }
-
+        };
 
         /**
          * Returns a new list containing the last n elements of the given list. If n > list.length,
@@ -1495,7 +1556,7 @@ declare namespace R {
         takeLast(n: number): {
             <T>(xs: T[]): T[];
             (xs: string): string;
-        }
+        };
 
         /**
          * Returns a new list containing the last n elements of a given list, passing each value
@@ -1503,8 +1564,8 @@ declare namespace R {
          * false. Excludes the element that caused the predicate function to fail. The predicate
          * function is passed one argument: (value).
          */
-        takeLastWhile<T>(pred: (a: T) => Boolean, list: T[]): T[];
-        takeLastWhile<T>(pred: (a: T) => Boolean): <T>(list: T[]) => T[];
+        takeLastWhile<T>(pred: (a: T) => boolean, list: T[]): T[];
+        takeLastWhile<T>(pred: (a: T) => boolean): <T>(list: T[]) => T[];
 
         /**
          * Returns a new list containing the first `n` elements of a given list, passing each value
@@ -1533,7 +1594,6 @@ declare namespace R {
         times<T>(fn: (i: number) => T, n: number): T[];
         times<T>(fn: (i: number) => T): (n: number) => T[];
 
-
         /**
          * The lower case version of a string.
          */
@@ -1545,7 +1605,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairs<F,S>(obj: {[k: string]: S} | {[k: number]: S} | any): [F,S][];
+        toPairs<F, S>(obj: { [k: string]: S } | { [k: number]: S } | any): Array<[F, S]>;
 
         /**
          * Converts an object into an array of key, value arrays.
@@ -1553,7 +1613,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairsIn<F,S>(obj: {[k: string]: S} | {[k: number]: S} | any): [F,S][];
+        toPairsIn<F, S>(obj: { [k: string]: S } | { [k: number]: S } | any): Array<[F, S]>;
 
         /**
          * Returns the string representation of the given value. eval'ing the output should
@@ -1577,10 +1637,10 @@ declare namespace R {
          * list, successively calling the transformed iterator function and passing it an accumulator value and the
          * current value from the array, and then passing the result to the next call.
          */
-        transduce<T,U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[], list: T[]): U;
-        transduce<T,U>(xf: (arg: T[]) => T[]): (fn: (acc: U[], val: U) => U[], acc: T[], list: T[]) => U;
-        transduce<T,U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[]): (acc: T[], list: T[]) => U;
-        transduce<T,U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[]): (list: T[]) => U;
+        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[], list: T[]): U;
+        transduce<T, U>(xf: (arg: T[]) => T[]): (fn: (acc: U[], val: U) => U[], acc: T[], list: T[]) => U;
+        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[]): (acc: T[], list: T[]) => U;
+        transduce<T, U>(xf: (arg: T[]) => T[], fn: (acc: U[], val: U) => U[], acc: T[]): (list: T[]) => U;
 
         /**
          * Transposes the rows and columns of a 2D list. When passed a list of n lists of length x, returns a list of x lists of length n.
@@ -1598,7 +1658,7 @@ declare namespace R {
          * function and returns its result. Note that for effective composition with this function, both the tryer and
          * catcher functions must return the same type of results.
          */
-        tryCatch<T>(tryer: (...args: any[]) => T, catcher: (...args: any[]) => T, x: any): T;
+        tryCatch<T>(tryer: (...args: any[]) => T, catcher: (...args: any[]) => T): (...args: any[]) => T;
 
         /**
          * Gives a single-word string description of the (native) type of a value, returning such answers as 'Object',
@@ -1621,7 +1681,7 @@ declare namespace R {
          * Wraps a function of any arity (including nullary) in a function that accepts exactly 1 parameter.
          * Any extraneous parameters will not be passed to the supplied function.
          */
-        unary<T>(fn: (a: T, ...args: any[]) => any): (a: T) => any
+        unary<T>(fn: (a: T, ...args: any[]) => any): (a: T) => any;
 
         /**
          * Returns a function of arity n from a (manually) curried function.
@@ -1633,8 +1693,8 @@ declare namespace R {
          * to stop iteration or an array of length 2 containing the value to add to the resulting
          * list and the seed to be used in the next call to the iterator function.
          */
-        unfold<T, TResult>(fn: (seed: T) => TResult[]|boolean, seed: T): TResult[];
-        unfold<T, TResult>(fn: (seed: T) => TResult[]|boolean): (seed: T) => TResult[];
+        unfold<T, TResult>(fn: (seed: T) => TResult[] | boolean, seed: T): TResult[];
+        unfold<T, TResult>(fn: (seed: T) => TResult[] | boolean): (seed: T) => TResult[];
 
         /**
          * Combines two lists into a set (i.e. no duplicates) composed of the
@@ -1648,7 +1708,7 @@ declare namespace R {
          * determined according to the value returned by applying the supplied predicate to two list elements.
          */
         unionWith<T>(pred: (a: T, b: T) => boolean, list1: T[], list2: T[]): T[];
-        unionWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<T[], T[], T[]>
+        unionWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<T[], T[], T[]>;
 
         /**
          * Returns a new list containing only one copy of each element in the original list.
@@ -1656,40 +1716,42 @@ declare namespace R {
         uniq<T>(list: T[]): T[];
 
         /**
-         * Returns a new list containing only one copy of each element in the original list, based upon the value returned by applying the supplied function to each list element. Prefers the first item if the supplied function produces the same value on two items. R.equals is used for comparison.
+         * Returns a new list containing only one copy of each element in the original list,
+         * based upon the value returned by applying the supplied function to each list element.
+         * Prefers the first item if the supplied function produces the same value on two items.
+         * R.equals is used for comparison.
          */
-        uniqBy<T,U>(fn: (a: T) => U, list: T[]): T[];
-        uniqBy<T,U>(fn: (a: T) => U): (list: T[]) => T[];
+        uniqBy<T, U>(fn: (a: T) => U, list: T[]): T[];
+        uniqBy<T, U>(fn: (a: T) => U): (list: T[]) => T[];
 
         /**
          * Returns a new list containing only one copy of each element in the original list, based upon the value
          * returned by applying the supplied predicate to two list elements.
          */
-        uniqWith<T,U>(pred: (x: T, y: T) => boolean, list: T[]): T[];
-        uniqWith<T,U>(pred: (x: T, y: T) => boolean): (list: T[]) => T[];
+        uniqWith<T, U>(pred: (x: T, y: T) => boolean, list: T[]): T[];
+        uniqWith<T, U>(pred: (x: T, y: T) => boolean): (list: T[]) => T[];
 
         /**
          * Tests the final argument by passing it to the given predicate function. If the predicate is not satisfied,
          * the function will return the result of calling the whenFalseFn function with the same argument. If the
          * predicate is satisfied, the argument is returned as is.
          */
-        unless<T,U>(pred: (a: T) => boolean, whenFalseFn: (a: T) => U, obj: T): U;
-        unless<T,U>(pred: (a: T) => boolean, whenFalseFn: (a: T) => U): (obj: T) => U;
+        unless<T, U>(pred: (a: T) => boolean, whenFalseFn: (a: T) => U, obj: T): U;
+        unless<T, U>(pred: (a: T) => boolean, whenFalseFn: (a: T) => U): (obj: T) => U;
 
         /**
          * Returns a new list by pulling every item at the first level of nesting out, and putting
          * them in a new array.
          */
-        unnest<T>(x: T[][]): T[];
-        unnest<T>(x: T[]): T[];
+        unnest<T>(x: T[][] | T[]): T[];
 
         /**
          * Takes a predicate, a transformation function, and an initial value, and returns a value of the same type as
          * the initial value. It does so by applying the transformation until the predicate is satisfied, at which point
          * it returns the satisfactory value.
          */
-        until<T,U>(pred: (val: T) => boolean, fn: (val: T) => U, init: U): U;
-        until<T,U>(pred: (val: T) => boolean, fn: (val: T) => U): (init: U) => U;
+        until<T, U>(pred: (val: T) => boolean, fn: (val: T) => U, init: U): U;
+        until<T, U>(pred: (val: T) => boolean, fn: (val: T) => U): (init: U) => U;
 
         /**
          * Returns a new copy of the array with the element at the provided index replaced with the given value.
@@ -1707,15 +1769,14 @@ declare namespace R {
          * need to be transformed, although you can ignore them, it's best to pass an identity function so
          * that the new function reports the correct arity.
          */
-        useWith(fn: Function, transformers: Function[]): Function;
+        useWith(fn: ((...a: any[]) => any), transformers: Array<((...a: any[]) => any)>): (...a: any[]) => any;
 
         /**
          * Returns a list of all the enumerable own properties of the supplied object.
          * Note that the order of the output array is not guaranteed across
          * different JS platforms.
          */
-        values<T>(obj: {[index: string]: T}): T[];
-        values<T>(obj: any): T[];
+        values<T>(obj: { [index: string]: T } | any): T[];
 
         /**
          * Returns a list of all the properties, including prototype properties, of the supplied
@@ -1727,16 +1788,16 @@ declare namespace R {
          * Returns a "view" of the given data structure, determined by the given lens. The lens's focus determines which
          * portion of the data structure is visible.
          */
-        view<T,U>(lens: Lens): (obj: T) => U;
-        view<T,U>(lens: Lens, obj: T): U;
+        view<T, U>(lens: Lens): (obj: T) => U;
+        view<T, U>(lens: Lens, obj: T): U;
 
         /**
          * Tests the final argument by passing it to the given predicate function. If the predicate is satisfied, the function
          * will return the result of calling the whenTrueFn function with the same argument. If the predicate is not satisfied,
          * the argument is returned as is.
          */
-        when<T,U>(pred: (a: T) => boolean, whenTrueFn: (a: T) => U, obj: T): U;
-        when<T,U>(pred: (a: T) => boolean, whenTrueFn: (a: T) => U): (obj: T) => U;
+        when<T, U>(pred: (a: T) => boolean, whenTrueFn: (a: T) => U, obj: T): U;
+        when<T, U>(pred: (a: T) => boolean, whenTrueFn: (a: T) => U): (obj: T) => U;
 
         /**
          * Takes a spec object and a test object and returns true if the test satisfies the spec.
@@ -1749,18 +1810,18 @@ declare namespace R {
          * `where` is well suited to declarativley expressing constraints for other functions, e.g.,
          * `filter`, `find`, `pickWith`, etc.
          */
-        where<T,U>(spec: T, testObj: U): boolean;
+        where<T, U>(spec: T, testObj: U): boolean;
         where<T>(spec: T): <U>(testObj: U) => boolean;
-        where<ObjFunc2,U>(spec: ObjFunc2, testObj: U): boolean;
+        where<ObjFunc2, U>(spec: ObjFunc2, testObj: U): boolean;
         where<ObjFunc2>(spec: ObjFunc2): <U>(testObj: U) => boolean;
 
-       /**
-        * Takes a spec object and a test object; returns true if the test satisfies the spec,
-        * false otherwise. An object satisfies the spec if, for each of the spec's own properties,
-        * accessing that property of the object gives the same value (in R.eq terms) as accessing
-        * that property of the spec.
-        */
-        whereEq<T,U>(spec: T, obj: U): boolean;
+        /**
+         * Takes a spec object and a test object; returns true if the test satisfies the spec,
+         * false otherwise. An object satisfies the spec if, for each of the spec's own properties,
+         * accessing that property of the object gives the same value (in R.eq terms) as accessing
+         * that property of the spec.
+         */
+        whereEq<T, U>(spec: T, obj: U): boolean;
         whereEq<T>(spec: T): <U>(obj: U) => boolean;
 
         /**
@@ -1774,28 +1835,27 @@ declare namespace R {
          * Wrap a function inside another to allow you to make adjustments to the parameters, or do other processing
          * either before the internal function is called or with its results.
          */
-        wrap(fn: Function, wrapper: Function): Function;
+        wrap(fn: (...a: any[]) => any, wrapper: (...a: any[]) => any): (...a: any[]) => any;
 
         /**
          * Creates a new list out of the two supplied by creating each possible pair from the lists.
          */
-        xprod<K,V>(as: K[], bs: V[]): KeyValuePair<K,V>[];
-        xprod<K>(as: K[]): <V>(bs: V[]) => KeyValuePair<K,V>[];
+        xprod<K, V>(as: K[], bs: V[]): Array<KeyValuePair<K, V>>;
+        xprod<K>(as: K[]): <V>(bs: V[]) => Array<KeyValuePair<K, V>>;
 
         /**
          * Creates a new list out of the two supplied by pairing up equally-positioned items from
          * both lists. Note: `zip` is equivalent to `zipWith(function(a, b) { return [a, b] })`.
          */
-        zip<K,V>(list1: K[], list2: V[]): KeyValuePair<K,V>[];
-        zip<K>(list1: K[]): <V>(list2: V[]) => KeyValuePair<K,V>[];
+        zip<K, V>(list1: K[], list2: V[]): Array<KeyValuePair<K, V>>;
+        zip<K>(list1: K[]): <V>(list2: V[]) => Array<KeyValuePair<K, V>>;
 
         /**
          * Creates a new object out of a list of keys and a list of values.
          */
         // TODO: Dictionary<T> as a return value is to specific, any seems to loose
-        zipObj<T>(keys: string[], values: T[]): {[index:string]: T};
-        zipObj(keys: string[]): <T>(values: T[]) => {[index:string]: T};
-
+        zipObj<T>(keys: string[], values: T[]): { [index: string]: T };
+        zipObj(keys: string[]): <T>(values: T[]) => { [index: string]: T };
 
         /**
          * Creates a new list out of the two supplied by applying the function to each
@@ -1804,7 +1864,6 @@ declare namespace R {
         zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: T[], list2: U[]): TResult[];
         zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult, list1: T[]): (list2: U[]) => TResult[];
         zipWith<T, U, TResult>(fn: (x: T, y: U) => TResult): (list1: T[], list2: U[]) => TResult[];
-
     }
 }
 
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 9afa47ba04..70298f53e6 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1,2017 +1,2208 @@
-import * as R from 'ramda';
+import * as R from "ramda";
 
-var double = function(x: number): number {
-    return x + x
-};
+function double(x: number): number {
+    return x + x;
+}
 
-var shout = function(x: number): string {
-    return x >= 10
-        ? 'big'
-        : 'small'
-};
+function shout(x: number): string {
+    return x >= 10 ? "big" : "small";
+}
 
 class F {
-    x = 'X';
-    y = 'Y';
+    x = "X";
+    y = "Y";
 }
 class F2 {
     a = 100;
     y = 1;
-    x(){};
-    z() {};
+
+    x() {
+    }
+
+    z() {
+    }
 }
 
 (() => {
-    var x: boolean;
-    x = R.isArrayLike('a');
-    x = R.isArrayLike([1,2,3]);
+    let x: boolean;
+    x = R.isArrayLike("a");
+    x = R.isArrayLike([1, 2, 3]);
     x = R.isArrayLike([]);
 });
 
 (() => {
-    R.propIs(Number, 'x', {x: 1, y: 2});  //=> true
-    R.propIs(Number, 'x')({x: 1, y: 2});  //=> true
-    R.propIs(Number)('x', {x: 1, y: 2});  //=> true
-    R.propIs(Number)('x')({x: 1, y: 2});  //=> true
-    R.propIs(Number, 'x', {x: 'foo'});    //=> false
-    R.propIs(Number, 'x', {});            //=> false
+    R.propIs(Number, "x", {x: 1, y: 2});  // => true
+    R.propIs(Number, "x")({x: 1, y: 2});  // => true
+    R.propIs(Number)("x", {x: 1, y: 2});  // => true
+    R.propIs(Number)("x")({x: 1, y: 2});  // => true
+    R.propIs(Number, "x", {x: "foo"});    // => false
+    R.propIs(Number, "x", {});            // => false
 });
 
 (() => {
-    R.type({}); //=> "Object"
-    R.type(1); //=> "Number"
-    R.type(false); //=> "Boolean"
-    R.type('s'); //=> "String"
-    R.type(null); //=> "Null"
-    R.type([]); //=> "Array"
-    R.type(/[A-z]/); //=> "RegExp"
+    R.type({}); // => "Object"
+    R.type(1); // => "Number"
+    R.type(false); // => "Boolean"
+    R.type("s"); // => "String"
+    R.type(null); // => "Null"
+    R.type([]); // => "Array"
+    R.type(/[A-z]/); // => "RegExp"
 });
 
 () => {
-    var takesNoArg = function() { return true; };
-    var takesOneArg = function(a: number) { return [a]; };
-    var takesTwoArgs = function(a: number, b: number) { return [a, b]; };
-    var takesThreeArgs = function(a: number, b: number, c: number) { return [a, b, c]; };
+    function takesNoArg() {
+        return true;
+    }
+    function takesOneArg(a: number) {
+        return [a];
+    }
+    function takesTwoArgs(a: number, b: number) {
+        return [a, b];
+    }
+    function takesThreeArgs(a: number, b: number, c: number) {
+        return [a, b, c];
+    }
 
-    var addFourNumbers = function(a: number, b: number, c: number, d: number): number {
-      return a + b + c + d;
-    };
+    function addFourNumbers(a: number, b: number, c: number, d: number): number {
+        return a + b + c + d;
+    }
 
-    var x1: Function = R.curry(addFourNumbers)
+    let x1: (a: number, b: number, c: number, d: number) => number = R.curry(addFourNumbers);
     // because of the current way of currying, the following call results in a type error
-    // var x2: Function = R.curry(addFourNumbers)(1,2,4)
-    var x3: Function = R.curry(addFourNumbers)(1)(2)
-    var x4: Function = R.curry(addFourNumbers)(1)(2)(3)
-    var y1: number = R.curry(addFourNumbers)(1)(2)(3)(4)
-    var y2: number = R.curry(addFourNumbers)(1,2)(3,4)
-    var y3: number = R.curry(addFourNumbers)(1,2,3)(4)
+    // let x2: Function = R.curry(addFourNumbers)(1,2,4)
+    let x3: (c: number, d: number) => number = R.curry(addFourNumbers)(1)(2);
+    let x4: (d: number) => number = R.curry(addFourNumbers)(1)(2)(3);
+    let y1: number   = R.curry(addFourNumbers)(1)(2)(3)(4);
+    let y2: number   = R.curry(addFourNumbers)(1, 2)(3, 4);
+    let y3: number   = R.curry(addFourNumbers)(1, 2, 3)(4);
 
     R.nAry(0, takesNoArg);
     R.nAry(0, takesOneArg);
     R.nAry(1, takesTwoArgs);
     R.nAry(1, takesThreeArgs);
 
-    var u1: {(a: any): any} = R.unary(takesOneArg);
-    var u2: {(a: any): any} = R.unary(takesTwoArgs);
-    var u3: {(a: any): any} = R.unary(takesThreeArgs);
+    let u1: (a: any) => any = R.unary(takesOneArg);
+    let u2: (a: any) => any = R.unary(takesTwoArgs);
+    let u3: (a: any) => any = R.unary(takesThreeArgs);
 
     R.binary(takesTwoArgs);
     R.binary(takesThreeArgs);
 
-    var addTwoNumbers = function(a:number, b:number) { return a + b; }
-    var addTwoNumbersCurried = R.curry(addTwoNumbers);
+    function addTwoNumbers(a: number, b: number) {
+        return a + b;
+    }
 
-    var inc = addTwoNumbersCurried(1);
-    var z1:number = inc(2);
-    var z2:number = addTwoNumbersCurried(2,3);
-}
+    let addTwoNumbersCurried = R.curry(addTwoNumbers);
+
+    let inc        = addTwoNumbersCurried(1);
+    let z1: number = inc(2);
+    let z2: number = addTwoNumbersCurried(2, 3);
+};
 
 () => {
-    const addFour = (a:number) => (b:number) => (c:number) => (d:number) => a + b + c + d;
+    interface Car { speed?: number;
+    }
+    interface FastCar { speed: number;
+    }
+
+    function typeGuard(a: number, b: number, c: number, d: number, e: number, car: Car): car is FastCar {
+        return car.speed !== undefined;
+    }
+
+    const typeGuardCurried = R.curry(typeGuard);
+
+    function drive(fastCar: FastCar) {
+    }
+
+    const cars: Car[] = [{speed: 65}, {}];
+    for (const car of cars) {
+        if (typeGuardCurried(1)(2)(3)(4)(5)(car)) {
+            drive(car);
+        }
+    }
+};
+
+() => {
+    const addFour          = (a: number) => (b: number) => (c: number) => (d: number) => a + b + c + d;
     const uncurriedAddFour = R.uncurryN<number>(4, addFour);
-    const res: number = uncurriedAddFour(1, 2, 3, 4); //=> 10
-}
+    const res: number      = uncurriedAddFour(1, 2, 3, 4); // => 10
+};
 
 () => {
     // coerceArray :: (a|[a]) -> [a]
     const coerceArray = R.unless(R.isArrayLike, R.of);
-    const a: number[] = coerceArray([1, 2, 3]); //=> [1, 2, 3]
-    const b: number[] = coerceArray(1);         //=> [1]
-}
+    const a: number[] = coerceArray([1, 2, 3]); // => [1, 2, 3]
+    const b: number[] = coerceArray(1);         // => [1]
+};
 
 (() => {
-    R.nthArg(1)('a', 'b', 'c'); //=> 'b'
-    R.nthArg(-1)('a', 'b', 'c'); //=> 'c'
+    R.nthArg(1)("a", "b", "c"); // => 'b'
+    R.nthArg(-1)("a", "b", "c"); // => 'c'
 });
 
 () => {
-    const fn: (...args: string[])=>string = R.unapply(JSON.stringify);
-    const res: string = R.unapply(JSON.stringify)(1, 2, 3); //=> '[1,2,3]'
-}
+    const fn: (...args: string[]) => string = R.unapply(JSON.stringify);
+    const res: string                       = R.unapply(JSON.stringify)(1, 2, 3); // => '[1,2,3]'
+};
 
 () => {
-    const a: number = R.until(R.flip(R.gt)(100), R.multiply(2))(1) // => 128
-}
+    const a: number = R.until(R.flip(R.gt)(100), R.multiply(2))(1); // => 128
+};
 
 () => {
-    const truncate = R.when(
-        R.propSatisfies(R.flip(R.gt)(10), 'length'),
-        R.pipe(R.take(10), R.append('…'), R.join(''))
+    const truncate  = R.when(
+        R.propSatisfies(R.flip(R.gt)(10), "length"),
+        R.pipe(R.take(10), R.append("…"), R.join(""))
     );
-    const a: string = truncate('12345');         //=> '12345'
-    const b: string = truncate('0123456789ABC'); //=> '0123456789…'
-}
+    const a: string = truncate("12345");         // => '12345'
+    const b: string = truncate("0123456789ABC"); // => '0123456789…'
+};
 
 /* compose */
 () => {
-    var double = function(x: number): number {
-        return x + x
+    function double(x: number): number {
+        return x + x;
     }
-    var limit10 = function(x: number): boolean {
-        return x >= 10
+
+    function limit10(x: number): boolean {
+        return x >= 10;
     }
-    var func: (x: number) => boolean = R.compose(limit10, double)
-    var res: boolean = R.compose(limit10, double)(10)
+
+    let func: (x: number) => boolean = R.compose(limit10, double);
+    let res: boolean                 = R.compose(limit10, double)(10);
 
     const f0 = (s: string) => +s;      // string -> number
     const f1 = (n: number) => n === 1; // number -> boolean
     const f2 = R.compose(f1, f0);      // string -> boolean
 
     // akward example that bounces types between number and string
-    const g0 = (list: number[]) => R.map(R.inc, list);
-    const g1 = R.dropWhile(R.gt(10));
-    const g2 = R.map((i: number) => i > 5 ? 'bigger' : 'smaller');
-    const g3 = R.all((i: string) => i === 'smaller');
-    const g = R.compose(g3, g2, g1, g0);
+    const g0             = (list: number[]) => R.map(R.inc, list);
+    const g1             = R.dropWhile(R.gt(10));
+    const g2             = R.map((i: number) => i > 5 ? "bigger" : "smaller");
+    const g3             = R.all((i: string) => i === "smaller");
+    const g              = R.compose(g3, g2, g1, g0);
     const g_res: boolean = g([1, 2, 10, 13]);
-}
+};
 
 /* pipe */
 () => {
-    var func: (x: number) => string = R.pipe(double, double, shout)
-    var res: string = R.pipe(double, double, shout)(10);
+    let func: (x: number) => string = R.pipe(double, double, shout);
+    let res: string                 = R.pipe(double, double, shout)(10);
 
     const capitalize = (str: string) => R.pipe(
-        R.split(''),
+        R.split(""),
         R.adjust(R.toUpper, 0),
-        R.join('')
+        R.join("")
     )(str);
 
-    var f = R.pipe(Math.pow, R.negate, R.inc);
-    var fr: number = f(3, 4); // -(3^4) + 1
-}
+    let f          = R.pipe(Math.pow, R.negate, R.inc);
+    let fr: number = f(3, 4); // -(3^4) + 1
+};
 
 () => {
-    R.invoker('charAt', String.prototype);
-    R.invoker('charAt', String.prototype, 1);
-}
+    R.invoker("charAt", String.prototype);
+    R.invoker("charAt", String.prototype, 1);
+};
 
 (() => {
     const range = R.juxt([Math.min, Math.max]);
-    range(3, 4, 9, -3); //=> [-3, 9]
+    range(3, 4, 9, -3); // => [-3, 9]
 
     const chopped = R.juxt([R.head, R.last]);
-    chopped('longstring'); // => ["l", "g"]
+    chopped("longstring"); // => ["l", "g"]
 });
 
-var square = function(x: number) { return x * x; };
-var add = function(a: number, b: number) { return a + b; };
+function square(x: number) {
+    return x * x;
+}
+function add(a: number, b: number) {
+    return a + b;
+}
 // Adds any number of arguments together
-var addAll = function() {
-  return 0;
-};
+function addAll() {
+    return 0;
+}
 
 // Basic example
-R.useWith(addAll, [ double, square ]);
+R.useWith(addAll, [double, square]);
 
 (() => {
-  var printXPlusFive = function(x: number) { console.log(x + 5); };
-  R.forEach(printXPlusFive, [1, 2, 3]);
-  R.clone([{},{},{}])
-  R.clone([1,2,3]);
+    function printXPlusFive(x: number) {
+        console.log(x + 5);
+    }
+
+    R.forEach(printXPlusFive, [1, 2, 3]);
+    R.clone([{}, {}, {}]);
+    R.clone([1, 2, 3]);
 })();
 
 // (() => {
-//   var printXPlusFive = function(x, i) { console.log(i + 5); };
+//   function printXPlusFive(x, i) { console.log(i + 5); }
 //   R.forEach.idx(printXPlusFive, [{name: 1}, {name: 2}, {name: 3}]);
 // })();
 
-var i = function(x: number) {return x;};
+function i(x: number) {
+    return x;
+}
 R.times(i, 5);
 
 (() => {
-  var triple = function(x: number): number { return x * 3; };
-  var square = function(x: number): number { return x * x; };
-  var squareThenDoubleThenTriple = R.pipe(square, double, triple);
-  squareThenDoubleThenTriple(5); //=> 150
+    function triple(x: number): number {
+        return x * 3;
+    }
 
+    function square(x: number): number {
+        return x * x;
+    }
 
+    let squareThenDoubleThenTriple = R.pipe(square, double, triple);
+    squareThenDoubleThenTriple(5); // => 150
 })();
 
 (() => {
-    var multiply = function(a: number, b: number) { return a * b; };
-    var double = R.partial(multiply, 2);
-    double(2); //=> 4
+    function multiply(a: number, b: number) {
+        return a * b;
+    }
 
-    var greet = function(salutation: string, title: string, firstName: string, lastName: string) {
-      return salutation + ', ' + title + ' ' + firstName + ' ' + lastName + '!';
-    };
-    var sayHello = R.partial(greet, 'Hello');
-    var sayHelloToMs = R.partial(sayHello, 'Ms.');
-    sayHelloToMs('Jane', 'Jones'); //=> 'Hello, Ms. Jane Jones!'
+    let double = R.partial(multiply, 2);
+    double(2); // => 4
 
-    var greetMsJaneJones = R.partialRight(greet, 'Ms.', 'Jane', 'Jones');
-    greetMsJaneJones('Hello'); //=> 'Hello, Ms. Jane Jones!'
+    function greet(salutation: string, title: string, firstName: string, lastName: string) {
+        return salutation + ", " + title + " " + firstName + " " + lastName + "!";
+    }
+
+    let sayHello     = R.partial(greet, "Hello");
+    let sayHelloToMs = R.partial(sayHello, "Ms.");
+    sayHelloToMs("Jane", "Jones"); // => 'Hello, Ms. Jane Jones!'
+
+    let greetMsJaneJones = R.partialRight(greet, "Ms.", "Jane", "Jones");
+    greetMsJaneJones("Hello"); // => 'Hello, Ms. Jane Jones!'
 })();
 
 (() => {
-    var numberOfCalls = 0;
-    var trackedAdd = function(a: number, b: number) {
-      numberOfCalls += 1;
-      return a + b;
-    };
-    var memoTrackedAdd = R.memoize(trackedAdd);
+    let numberOfCalls = 0;
 
-    memoTrackedAdd(1, 2); //=> 3
-    numberOfCalls; //=> 1
-    memoTrackedAdd(1, 2); //=> 3
-    numberOfCalls; //=> 1
-    memoTrackedAdd(2, 3); //=> 5
-    numberOfCalls; //=> 2
+    function trackedAdd(a: number, b: number) {
+        numberOfCalls += 1;
+        return a + b;
+    }
+
+    let memoTrackedAdd = R.memoize(trackedAdd);
+
+    memoTrackedAdd(1, 2); // => 3
+    numberOfCalls; // => 1
+    memoTrackedAdd(1, 2); // => 3
+    numberOfCalls; // => 1
+    memoTrackedAdd(2, 3); // => 5
+    numberOfCalls; // => 2
 
     // Note that argument order matters
-    memoTrackedAdd(2, 1); //=> 3
-    numberOfCalls; //=> 3
+    memoTrackedAdd(2, 1); // => 3
+    numberOfCalls; // => 3
 })();
 
 (() => {
-    var addOneOnce = R.once(function(x: number){ return x + 1; });
-    addOneOnce(10); //=> 11
-    addOneOnce(addOneOnce(50)); //=> 11
+    let addOneOnce = R.once((x: number) => x + 1);
+    addOneOnce(10); // => 11
+    addOneOnce(addOneOnce(50)); // => 11
 })();
 
 (() => {
-    var slashify = R.wrap(R.flip(R.add)('/'), function(f: Function, x: string) {
-      return R.match(/\/$/, x) ? x : f(x);
-    });
+    let slashify = R.wrap(R.flip(R.add)("/"), (f: (x: string) => string, x: string) => R.match(/\/$/, x) ? x : f(x));
 
-    slashify('a');  //=> 'a/'
-    slashify('a/'); //=> 'a/'
-})();
-
-
-
-(() => {
-    var numbers = [1, 2, 3];
-    var add = function(a: number, b: number) {
-        return a + b
-    };
-    R.reduce(add, 10, numbers); //=> 16;
+    slashify("a");  // => 'a/'
+    slashify("a/"); // => 'a/'
 })();
 
 (() => {
-    var plus3 = R.add(3);
+    let numbers = [1, 2, 3];
+    let add     = (a: number, b: number) => a + b;
+    R.reduce(add, 10, numbers); // => 16;
 })();
 
 (() => {
-    var pairs = [ ['a', 1], ['b', 2], ['c', 3] ];
-    var flattenPairs = function(acc: [string, number], pair: [string, number]) {
-      return acc.concat(pair);
-    };
-    R.reduceRight(flattenPairs, [], pairs); //=> [ 'c', 3, 'b', 2, 'a', 1 ]
+    let plus3 = R.add(3);
 })();
 
 (() => {
-    var values = { x: 1, y: 2, z: 3 };
-    var prependKeyAndDouble = function(num: number, key: string, obj: any) {
+    let pairs = [["a", 1], ["b", 2], ["c", 3]];
+
+    function flattenPairs(acc: [string, number], pair: [string, number]) {
+        return acc.concat(pair);
+    }
+
+    R.reduceRight(flattenPairs, [], pairs); // => [ 'c', 3, 'b', 2, 'a', 1 ]
+})();
+
+(() => {
+    let values = {x: 1, y: 2, z: 3};
+
+    function prependKeyAndDouble(num: number, key: string, obj: any) {
         return key + (num * 2);
-    };
-    R.mapObjIndexed(prependKeyAndDouble, values); //=> { x: 'x2', y: 'y4', z: 'z6' }
+    }
+
+    R.mapObjIndexed(prependKeyAndDouble, values); // => { x: 'x2', y: 'y4', z: 'z6' }
 });
 
 (() => {
-    const a: number[] = R.ap([R.multiply(2), R.add(3)], [1,2,3]); //=> [2, 4, 6, 4, 5, 6]
-    const b: number[][] = R.of([1]); //=> [[1]]
-    const c: number[] = R.of(1);
-
+    const a: number[]   = R.ap([R.multiply(2), R.add(3)], [1, 2, 3]); // => [2, 4, 6, 4, 5, 6]
+    const b: number[][] = R.of([1]); // => [[1]]
+    const c: number[]   = R.of(1);
 });
 
 () => {
-    const a1 = R.empty([1,2,3,4,5]); //=> []
-    const a2 = R.empty([1, 2, 3]);     //=> []
-    const a3 = R.empty('unicorns');    //=> ''
-    const a4 = R.empty({x: 1, y: 2});  //=> {}
-}
+    const a1 = R.empty([1, 2, 3, 4, 5]); // => []
+    const a2 = R.empty([1, 2, 3]);     // => []
+    const a3 = R.empty("unicorns");    // => ''
+    const a4 = R.empty({x: 1, y: 2});  // => {}
+};
 
 (() => {
-    R.length([1, 2, 3]); //=> 3
+    R.length([1, 2, 3]); // => 3
 });
 
 (() => {
-    const isEven = function(n: number) {
+    function isEven(n: number) {
         return n % 2 === 0;
-    };
+    }
+
     const filterIndexed = R.addIndex(R.filter);
 
-    R.filter(isEven, [1, 2, 3, 4]); //=> [2, 4]
+    R.filter(isEven, [1, 2, 3, 4]); // => [2, 4]
 
-    var lastTwo = function(val: number, idx: number, list: number[]) {
-      return list.length - idx <= 2;
-    };
-    filterIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); //=> [0, 9]
+    function lastTwo(val: number, idx: number, list: number[]) {
+        return list.length - idx <= 2;
+    }
 
-    var isOdd = function(n: number) {
-      return n % 2 === 1;
-    };
-    R.reject(isOdd, [1, 2, 3, 4]); //=> [2, 4]
+    filterIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); // => [0, 9]
+
+    function isOdd(n: number) {
+        return n % 2 === 1;
+    }
+
+    R.reject(isOdd, [1, 2, 3, 4]); // => [2, 4]
 });
 (() => {
-    var isNotFour = function(x: number) {
-      return !(x === 4);
-    };
-    R.takeWhile(isNotFour, [1, 2, 3, 4]); //=> [1, 2, 3]
-    R.take(2, [1, 2, 3, 4]); //=> [1, 2]
+    function isNotFour(x: number) {
+        return !(x === 4);
+    }
+
+    R.takeWhile(isNotFour, [1, 2, 3, 4]); // => [1, 2, 3]
+    R.take(2, [1, 2, 3, 4]); // => [1, 2]
 });
 (() => {
-    var f = function(n: number) { return n > 50 ? false : [-n, n + 10] };
-    let a = R.unfold(f, 10); //=> [-10, -20, -30, -40, -50]
-    let b = R.unfold(f); //=> [-10, -20, -30, -40, -50]
+    function f(n: number) {
+        return n > 50 ? false : [-n, n + 10];
+    }
+
+    let a = R.unfold(f, 10); // => [-10, -20, -30, -40, -50]
+    let b = R.unfold(f); // => [-10, -20, -30, -40, -50]
     let c = b(10);
 });
 /*****************************************************************
  * Function category
  */
+() => {
+    function mergeThree(a: number, b: number, c: number): number[] {
+        return ([]).concat(a, b, c);
+    }
 
-
- () => {
-     var mergeThree = function(a: number, b: number, c: number): number[] {
-       return ([]).concat(a, b, c);
-     };
-     mergeThree(1, 2, 3); //=> [1, 2, 3]
-     var flipped = R.flip(mergeThree);
-     flipped(1, 2, 3); //=> [2, 1, 3]
- }
+    mergeThree(1, 2, 3); // => [1, 2, 3]
+    let flipped = R.flip(mergeThree);
+    flipped(1, 2, 3); // => [2, 1, 3]
+};
 
 /*********************
  * List category
  ********************/
 () => {
-    var lessThan2 = R.flip(R.lt)(2);
-    var lessThan3 = R.flip(R.lt)(3);
-    R.all(lessThan2)([1, 2]); //=> false
-    R.all(lessThan3)([1, 2]); //=> true
-}
+    let lessThan2 = R.flip(R.lt)(2);
+    let lessThan3 = R.flip(R.lt)(3);
+    R.all(lessThan2)([1, 2]); // => false
+    R.all(lessThan3)([1, 2]); // => true
+};
 
 () => {
-    var lessThan0 = R.flip(R.lt)(0);
-    var lessThan2 = R.flip(R.lt)(2);
-    R.any(lessThan0)([1, 2]); //=> false
-    R.any(lessThan2)([1, 2]); //=> true
-}
+    let lessThan0 = R.flip(R.lt)(0);
+    let lessThan2 = R.flip(R.lt)(2);
+    R.any(lessThan0)([1, 2]); // => false
+    R.any(lessThan2)([1, 2]); // => true
+};
 
 () => {
-    R.aperture(2, [1, 2, 3, 4, 5]); //=> [[1, 2], [2, 3], [3, 4], [4, 5]]
-    R.aperture(3, [1, 2, 3, 4, 5]); //=> [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
-    R.aperture(7, [1, 2, 3, 4, 5]); //=> []
-    R.aperture(7)([1, 2, 3, 4, 5]); //=> []
-}
+    R.aperture(2, [1, 2, 3, 4, 5]); // => [[1, 2], [2, 3], [3, 4], [4, 5]]
+    R.aperture(3, [1, 2, 3, 4, 5]); // => [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
+    R.aperture(7, [1, 2, 3, 4, 5]); // => []
+    R.aperture(7)([1, 2, 3, 4, 5]); // => []
+};
 
 () => {
-    R.append('tests', ['write', 'more']); //=> ['write', 'more', 'tests']
-    R.append('tests')(['write', 'more']); //=> ['write', 'more', 'tests']
-    R.append('tests', []); //=> ['tests']
-    R.append<string, string[]>(['tests'], ['write', 'more']); //=> ['write', 'more', ['tests']]
-    R.append(['tests'], ['write', 'more']); //=> ['write', 'more', ['tests']]
-    R.append<string[]>(['tests'])(['write', 'more']); //=> ['write', 'more', ['tests']]
-    R.append(['tests'])(['write', 'more']); //=> ['write', 'more', ['tests']]
-}
+    R.append("tests", ["write", "more"]); // => ['write', 'more', 'tests']
+    R.append("tests")(["write", "more"]); // => ['write', 'more', 'tests']
+    R.append("tests", []); // => ['tests']
+    R.append<string, string[]>(["tests"], ["write", "more"]); // => ['write', 'more', ['tests']]
+    R.append(["tests"], ["write", "more"]); // => ['write', 'more', ['tests']]
+    R.append<string[]>(["tests"])(["write", "more"]); // => ['write', 'more', ['tests']]
+    R.append(["tests"])(["write", "more"]); // => ['write', 'more', ['tests']]
+};
 
 () => {
-    var duplicate = function(n: number) {
+    function duplicate(n: number) {
         return [n, n];
-    };
-    R.chain(duplicate, [1, 2, 3]); //=> [1, 1, 2, 2, 3, 3]
-    R.chain(duplicate)([1, 2, 3]); //=> [1, 1, 2, 2, 3, 3]
-}
+    }
+
+    R.chain(duplicate, [1, 2, 3]); // => [1, 1, 2, 2, 3, 3]
+    R.chain(duplicate)([1, 2, 3]); // => [1, 1, 2, 2, 3, 3]
+};
 
 () => {
-    R.clamp(1, 10, -1) // => 1
-    R.clamp(1, 10)(11) // => 10
-    R.clamp(1)(10, 4)  // => 4
-    R.clamp('a', 'd', 'e')  // => 'd'
-}
+    R.clamp(1, 10, -1); // => 1
+    R.clamp(1, 10)(11); // => 10
+    R.clamp(1)(10, 4);  // => 4
+    R.clamp("a", "d", "e");  // => 'd'
+};
 
 () => {
-    R.concat([], []); //=> []
-    R.concat([4, 5, 6], [1, 2, 3]); //=> [4, 5, 6, 1, 2, 3]
-    R.concat([4, 5, 6])([1, 2, 3]); //=> [4, 5, 6, 1, 2, 3]
-    R.concat('ABC')('DEF'); // 'ABCDEF'
-}
+    R.concat([], []); // => []
+    R.concat([4, 5, 6], [1, 2, 3]); // => [4, 5, 6, 1, 2, 3]
+    R.concat([4, 5, 6])([1, 2, 3]); // => [4, 5, 6, 1, 2, 3]
+    R.concat("ABC")("DEF"); // 'ABCDEF'
+};
 
 () => {
-    R.contains(3)([1, 2, 3]); //=> true
-    R.contains(3, [1, 2, 3]); //=> true
-    R.contains(4)([1, 2, 3]); //=> false
-    R.contains({})([{}, {}]); //=> false
-    var obj = {};
-    R.contains(obj)([{}, obj, {}]); //=> true
-}
+    R.contains(3)([1, 2, 3]); // => true
+    R.contains(3, [1, 2, 3]); // => true
+    R.contains(4)([1, 2, 3]); // => false
+    R.contains({})([{}, {}]); // => false
+    let obj = {};
+    R.contains(obj)([{}, obj, {}]); // => true
+};
 
 () => {
-    R.drop(3, [1,2,3,4,5,6,7]); //=> [4,5,6,7]
-    R.drop(3)([1,2,3,4,5,6,7]); //=> [4,5,6,7]
-    R.drop(3, 'ramda'); //=> 'ram'
-    R.drop(3)('ramda'); //=> 'ram'
-}
+    R.drop(3, [1, 2, 3, 4, 5, 6, 7]); // => [4,5,6,7]
+    R.drop(3)([1, 2, 3, 4, 5, 6, 7]); // => [4,5,6,7]
+    R.drop(3, "ramda"); // => 'ram'
+    R.drop(3)("ramda"); // => 'ram'
+};
 
 (() => {
-    R.dropLast(1, ['foo', 'bar', 'baz']); //=> ['foo', 'bar']
-    R.dropLast(2)(['foo', 'bar', 'baz']); //=> ['foo']
-    R.dropLast(3, 'ramda');               //=> 'ra'
-    R.dropLast(3)('ramda');               //=> 'ra'
+    R.dropLast(1, ["foo", "bar", "baz"]); // => ['foo', 'bar']
+    R.dropLast(2)(["foo", "bar", "baz"]); // => ['foo']
+    R.dropLast(3, "ramda");               // => 'ra'
+    R.dropLast(3)("ramda");               // => 'ra'
 });
 
 (() => {
-    var lteThree = (x: number) => x <= 3;
-    R.dropLastWhile(lteThree, [1, 2, 3, 4, 3, 2, 1]); //=> [1, 2, 3, 4]
+    let lteThree = (x: number) => x <= 3;
+    R.dropLastWhile(lteThree, [1, 2, 3, 4, 3, 2, 1]); // => [1, 2, 3, 4]
 });
 
 () => {
-    var lteTwo = function(x: number) {
+    function lteTwo(x: number) {
         return x <= 2;
-    };
-    R.dropWhile(lteTwo, [1, 2, 3, 4]); //=> [3, 4]
-    R.dropWhile(lteTwo)([1, 2, 3, 4]); //=> [3, 4]
-}
+    }
+
+    R.dropWhile(lteTwo, [1, 2, 3, 4]); // => [3, 4]
+    R.dropWhile(lteTwo)([1, 2, 3, 4]); // => [3, 4]
+};
 
 () => {
-    var isEven = function(n: number) {
+    function isEven(n: number) {
         return n % 2 === 0;
-    };
-    R.filter(isEven, [1, 2, 3, 4]); //=> [2, 4]
-    var isEvenFn = R.filter(isEven);
+    }
+    R.filter(isEven, [1, 2, 3, 4]); // => [2, 4]
+    let isEvenFn = R.filter(isEven);
     isEvenFn([1, 2, 3, 4]);
-}
+};
 
 () => {
-    var lastTwo = function(val: number, idx: number, list: number[]) {
+    function lastTwo(val: number, idx: number, list: number[]) {
         return list.length - idx <= 2;
-    };
-    var filterIndexed = R.addIndex(R.filter);
+    }
 
-    filterIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); //=> [0, 9]
-    var lastTwoFn = filterIndexed(lastTwo);
+    let filterIndexed = R.addIndex(R.filter);
+
+    filterIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); // => [0, 9]
+    let lastTwoFn = filterIndexed(lastTwo);
     lastTwoFn([8, 6, 7, 5, 3, 0, 9]);
-}
+};
 
 () => {
-    var xs = [{a: 1}, {a: 2}, {a: 3}];
-    R.find(R.propEq('a', 2))(xs); //=> {a: 2}
-    R.find(R.propEq('a', 4))(xs); //=> undefined
-}
+    let xs = [{a: 1}, {a: 2}, {a: 3}];
+    R.find(R.propEq("a", 2))(xs); // => {a: 2}
+    R.find(R.propEq("a", 4))(xs); // => undefined
+};
 
 () => {
-    var xs = [{a: 1}, {a: 2}, {a: 3}];
-    R.findIndex(R.propEq('a', 2))(xs); //=> 1
-    R.findIndex(R.propEq('a', 4))(xs); //=> -1
+    let xs = [{a: 1}, {a: 2}, {a: 3}];
+    R.findIndex(R.propEq("a", 2))(xs); // => 1
+    R.findIndex(R.propEq("a", 4))(xs); // => -1
 
     R.findIndex((x: number) => x === 1, [1, 2, 3]);
-}
+};
 
 () => {
-    var xs = [{a: 1, b: 0}, {a:1, b: 1}];
-    R.findLast(R.propEq('a', 1))(xs); //=> {a: 1, b: 1}
-    R.findLast(R.propEq('a', 4))(xs); //=> undefined
-}
+    let xs = [{a: 1, b: 0}, {a: 1, b: 1}];
+    R.findLast(R.propEq("a", 1))(xs); // => {a: 1, b: 1}
+    R.findLast(R.propEq("a", 4))(xs); // => undefined
+};
 
 () => {
-    var xs = [{a: 1, b: 0}, {a:1, b: 1}];
-    R.findLastIndex(R.propEq('a', 1))(xs); //=> 1
-    R.findLastIndex(R.propEq('a', 4))(xs); //=> -1
+    let xs = [{a: 1, b: 0}, {a: 1, b: 1}];
+    R.findLastIndex(R.propEq("a", 1))(xs); // => 1
+    R.findLastIndex(R.propEq("a", 4))(xs); // => -1
     R.findLastIndex((x: number) => x === 1, [1, 2, 3]);
-}
+};
+
 () => {
-    const testPath = ['x', 0, 'y'];
-    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+    const testPath = ["x", 0, "y"];
+    const testObj  = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
 
     R.pathEq(testPath, 2, testObj); // => true
     R.pathEq(testPath, 2)(testObj); // => true
     R.pathEq(testPath)(2)(testObj); // => true
     R.pathEq(testPath)(2, testObj); // => true
 
-    var user1 = { address: { zipCode: 90210 } };
-    var user2 = { address: { zipCode: 55555 } };
-    var user3 = { name: 'Bob' };
-    var users = [ user1, user2, user3 ];
-    var isFamous = R.pathEq(['address', 'zipCode'], 90210);
-    R.filter(isFamous, users); //=> [ user1 ]
-}
+    let user1    = {address: {zipCode: 90210}};
+    let user2    = {address: {zipCode: 55555}};
+    let user3    = {name: "Bob"};
+    let users    = [user1, user2, user3];
+    let isFamous = R.pathEq(["address", "zipCode"], 90210);
+    R.filter(isFamous, users); // => [ user1 ]
+};
+
 () => {
-    var xs: {[key:string]: string} = {a: '1', b: '0'};
-    R.propEq('a', '1', xs);//=> true
-    R.propEq('a', '4', xs); //=> false
-}
+    let xs: { [key: string]: string } = {a: "1", b: "0"};
+    R.propEq("a", "1", xs); // => true
+    R.propEq("a", "4", xs); // => false
+};
+
 () => {
-    var xs: {[key:string]: number} = {a: 1, b: 0};
-    R.propEq('a', 1, xs);//=> true
-    R.propEq('a', 4, xs); //=> false
-}
+    let xs: { [key: string]: number } = {a: 1, b: 0};
+    R.propEq("a", 1, xs); // => true
+    R.propEq("a", 4, xs); // => false
+};
+
 () => {
-    var xs = {a: '1', b: '0'};
-    R.propEq('a', '1', xs);//=> true
-    R.propEq('a', '4', xs); //=> false
-}
+    let xs = {a: "1", b: "0"};
+    R.propEq("a", "1", xs); // => true
+    R.propEq("a", "4", xs); // => false
+};
+
 () => {
-    var xs = {a: 1, b: 0};
-    R.propEq('a', 1, xs);//=> true
-    R.propEq('a', 4, xs); //=> false
+    let xs = {a: 1, b: 0};
+    R.propEq("a", 1, xs); // => true
+    R.propEq("a", 4, xs); // => false
+};
+
+interface Obj {
+    a: number;
+    b: number;
 }
 
-interface Obj { a: number; b: number };
 () => {
-    var xs: Obj = {a: 1, b: 0};
-    R.propEq('a', 1, xs);//=> true
-    R.propEq('a', 4, xs); //=> false
-}
+    let xs: Obj = {a: 1, b: 0};
+    R.propEq("a", 1, xs); // => true
+    R.propEq("a", 4, xs); // => false
+};
 
 () => {
     R.flatten([1, 2, [3, 4], 5, [6, [7, 8, [9, [10, 11], 12]]]]);
-    //=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-}
+    // => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+};
 
 () => {
-    var printXPlusFive = function(x: number) { console.log(x + 5); };
-    R.forEach(printXPlusFive, [1, 2, 3]); //=> [1, 2, 3]
-    R.forEach(printXPlusFive)([1, 2, 3]); //=> [1, 2, 3]
-    //-> 6
-    //-> 7
-    //-> 8
-}
+    function printXPlusFive(x: number) {
+        console.log(x + 5);
+    }
+
+    R.forEach(printXPlusFive, [1, 2, 3]); // => [1, 2, 3]
+    R.forEach(printXPlusFive)([1, 2, 3]); // => [1, 2, 3]
+    // -> 6
+    // -> 7
+    // -> 8
+};
 
 () => {
-    var plusFive = function(num: number, idx: number, list: number[]) { list[idx] = num + 5 };
-    R.addIndex(R.forEach)(plusFive)([1, 2, 3]); //=> [6, 7, 8]
-}
+    function plusFive(num: number, idx: number, list: number[]) {
+        list[idx] = num + 5;
+    }
+
+    R.addIndex(R.forEach)(plusFive)([1, 2, 3]); // => [6, 7, 8]
+};
 
 () => {
-    var byGrade = R.groupBy(function(student: {score: number; name: string}) {
-        var score = student.score;
-        return score < 65 ? 'F' :
-        score < 70 ? 'D' :
-        score < 80 ? 'C' :
-        score < 90 ? 'B' : 'A';
+    let byGrade  = R.groupBy((student: { score: number; name: string }) => {
+        let score = student.score;
+        return score < 65 ? "F" :
+            score < 70 ? "D" :
+                score < 80 ? "C" :
+                    score < 90 ? "B" : "A";
     });
-    var students = [{name: 'Abby', score: 84},
-    {name: 'Eddy', score: 58},
-    {name: 'Jack', score: 69}];
+    let students = [{name: "Abby", score: 84},
+        {name: "Eddy", score: 58},
+        {name: "Jack", score: 69}];
     byGrade(students);
-}
+};
 
 () => {
-    R.groupWith(R.equals, [0, 1, 1, 2, 3, 5, 8, 13, 21])
+    R.groupWith(R.equals, [0, 1, 1, 2, 3, 5, 8, 13, 21]);
     // [[0], [1, 1], [2, 3, 5, 8, 13, 21]]
 
-    R.groupWith((a: number, b: number) => a % 2 === b % 2, [0, 1, 1, 2, 3, 5, 8, 13, 21])
+    R.groupWith((a: number, b: number) => a % 2 === b % 2, [0, 1, 1, 2, 3, 5, 8, 13, 21]);
     // [[0], [1, 1], [2], [3, 5], [8], [13, 21]]
 
-    const isVowel = (a: string) => R.contains(a, 'aeiou') ? a : '';
-    R.groupWith(R.eqBy<string>(isVowel), 'aestiou')
+    const isVowel = (a: string) => R.contains(a, "aeiou") ? a : "";
+    R.groupWith(R.eqBy<string>(isVowel), "aestiou");
     // ['ae', 'st', 'iou']
-}
+};
 
 () => {
-    R.head(['fi', 'fo', 'fum']); //=> 'fi'
-    R.head([10, 'ten']); // => 10
-    R.head(['10', 10]); // => '10'
-    R.head('abc'); //=> 'a'
-    R.head(''); //=> ''
-}
+    R.head(["fi", "fo", "fum"]); // => 'fi'
+    R.head([10, "ten"]); // => 10
+    R.head(["10", 10]); // => '10'
+    R.head("abc"); // => 'a'
+    R.head(""); // => ''
+};
 
 (() => {
-    let list = [{id: 'xyz', title: 'A'}, {id: 'abc', title: 'B'}];
-    const a1 = R.indexBy(R.prop<string>('id'), list);
-    const a2 = R.indexBy(R.prop<string>('id'))(list);
-    const a3 = R.indexBy<{id:string}>(R.prop<string>('id'))(list);
+    let list = [{id: "xyz", title: "A"}, {id: "abc", title: "B"}];
+    const a1 = R.indexBy(R.prop<string>("id"), list);
+    const a2 = R.indexBy(R.prop<string>("id"))(list);
+    const a3 = R.indexBy<{ id: string }>(R.prop<string>("id"))(list);
 });
 
 () => {
-    R.indexOf(3, [1,2,3,4]); //=> 2
-    R.indexOf(10)([1,2,3,4]); //=> -1
-}
+    R.indexOf(3, [1, 2, 3, 4]); // => 2
+    R.indexOf(10)([1, 2, 3, 4]); // => -1
+};
 
 () => {
-    R.init(['fi', 'fo', 'fum']); //=> ['fi', 'fo']
-    R.init('abc'); //=> 'ab'
-    R.init(''); //=> ''
-}
+    R.init(["fi", "fo", "fum"]); // => ['fi', 'fo']
+    R.init("abc"); // => 'ab'
+    R.init(""); // => ''
+};
 
 () => {
-    R.insert(2, 5, [1,2,3,4]); //=> [1,2,5,3,4]
-    R.insert(2)(5, [1,2,3,4]); //=> [1,2,5,3,4]
-    R.insert(2, 5)([1,2,3,4]); //=> [1,2,5,3,4]
-}
+    R.insert(2, 5, [1, 2, 3, 4]); // => [1,2,5,3,4]
+    R.insert(2)(5, [1, 2, 3, 4]); // => [1,2,5,3,4]
+    R.insert(2, 5)([1, 2, 3, 4]); // => [1,2,5,3,4]
+};
 
 () => {
-    R.insertAll(2, [10,11,12], [1,2,3,4]);
-    R.insertAll(2)([10,11,12], [1,2,3,4]);
-    R.insertAll(2, [10,11,12])([1,2,3,4]);
-}
+    R.insertAll(2, [10, 11, 12], [1, 2, 3, 4]);
+    R.insertAll(2)([10, 11, 12], [1, 2, 3, 4]);
+    R.insertAll(2, [10, 11, 12])([1, 2, 3, 4]);
+};
 
 () => {
-    var numbers = [1, 2, 3, 4];
-    var transducer = R.compose(R.map(R.add(1)), R.take(2));
+    let numbers    = [1, 2, 3, 4];
+    let transducer = R.compose(R.map(R.add(1)), R.take(2));
 
-    R.into([], transducer, numbers); //=> [2, 3]
+    R.into([], transducer, numbers); // => [2, 3]
 
-    var intoArray = R.into([]);
-    intoArray(transducer, numbers); //=> [2, 3]
-}
+    let intoArray = R.into([]);
+    intoArray(transducer, numbers); // => [2, 3]
+};
 
 () => {
-    var spacer = R.join(' ');
-    spacer(['a', 2, 3.4]);   //=> 'a 2 3.4'
-    R.join('|', [1, 2, 3]);    //=> '1|2|3'
-}
+    let spacer = R.join(" ");
+    spacer(["a", 2, 3.4]);   // => 'a 2 3.4'
+    R.join("|", [1, 2, 3]);    // => '1|2|3'
+};
 
 () => {
-    R.last(['fi', 'fo', 'fum']); //=> 'fum'
-    R.last('abc'); //=> 'c'
-    R.last(''); //=> ''
-}
+    R.last(["fi", "fo", "fum"]); // => 'fum'
+    R.last("abc"); // => 'c'
+    R.last(""); // => ''
+};
 
 () => {
-    R.lastIndexOf(3, [-1,3,3,0,1,2,3,4]); //=> 6
-    R.lastIndexOf(10, [1,2,3,4]); //=> -1
-}
+    R.lastIndexOf(3, [-1, 3, 3, 0, 1, 2, 3, 4]); // => 6
+    R.lastIndexOf(10, [1, 2, 3, 4]); // => -1
+};
 
 () => {
-    R.length([]); //=> 0
-    R.length([1, 2, 3]); //=> 3
-}
+    R.length([]); // => 0
+    R.length([1, 2, 3]); // => 3
+};
 
 () => {
-    var headLens = R.lensIndex(0);
-    headLens([10, 20, 30, 40]); //=> 10
-    headLens.set('mu', [10, 20, 30, 40]); //=> ['mu', 20, 30, 40]
-    R.view(headLens, ['a', 'b', 'c']);            //=> 'a'
-    R.set(headLens, 'x', ['a', 'b', 'c']);        //=> ['x', 'b', 'c']
-    R.over(headLens, R.toUpper, ['a', 'b', 'c']); //=> ['A', 'b', 'c']
-}
+    let headLens = R.lensIndex(0);
+    headLens([10, 20, 30, 40]); // => 10
+    headLens.set("mu", [10, 20, 30, 40]); // => ['mu', 20, 30, 40]
+    R.view(headLens, ["a", "b", "c"]);            // => 'a'
+    R.set(headLens, "x", ["a", "b", "c"]);        // => ['x', 'b', 'c']
+    R.over(headLens, R.toUpper, ["a", "b", "c"]); // => ['A', 'b', 'c']
+};
 
 () => {
-    var double = function(x: number) {
+    function double(x: number) {
         return x * 2;
-    };
-    R.map(double, [1, 2, 3]); //=> [2, 4, 6]
+    }
+
+    R.map(double, [1, 2, 3]); // => [2, 4, 6]
 
     // functor
     const stringFunctor = {
         map: (fn: (c: number) => number) => {
-            var chars = "Ifmmp!Xpsme".split("");
+            let chars = "Ifmmp!Xpsme".split("");
             return chars.map((char) => String.fromCharCode(fn(char.charCodeAt(0)))).join("") as any;
         }
     };
-    R.map((x: number) => x-1, stringFunctor); // => "Hello World"
-}
+    R.map((x: number) => x - 1, stringFunctor); // => "Hello World"
+};
 
 () => {
-    var digits = ['1', '2', '3', '4'];
-    var append = function(a: string, b: string): [string, string]{
-        return [a + b, a + b];
-    }
-    R.mapAccum(append, '0', digits); //=> ['01234', ['01', '012', '0123', '01234']]
-    R.mapAccum(append)('0', digits); //=> ['01234', ['01', '012', '0123', '01234']]
-    R.mapAccum(append, '0')(digits); //=> ['01234', ['01', '012', '0123', '01234']]
-}
+    let digits = ["1", "2", "3", "4"];
 
-() => {
-    var digits = ['1', '2', '3', '4'];
-    var append = function(a: string, b: string): [string, string] {
+    function append(a: string, b: string): [string, string] {
         return [a + b, a + b];
     }
 
-    R.mapAccumRight(append, '0', digits); //=> ['04321', ['04321', '0432', '043', '04']]
-    R.mapAccumRight(append)('0', digits); //=> ['04321', ['04321', '0432', '043', '04']]
-    R.mapAccumRight(append, '0')(digits); //=> ['04321', ['04321', '0432', '043', '04']]
-}
+    R.mapAccum(append, "0", digits); // => ['01234', ['01', '012', '0123', '01234']]
+    R.mapAccum(append)("0", digits); // => ['01234', ['01', '012', '0123', '01234']]
+    R.mapAccum(append, "0")(digits); // => ['01234', ['01', '012', '0123', '01234']]
+};
 
 () => {
-    var squareEnds = function(elt: number, idx: number, list: number[]) {
+    let digits = ["1", "2", "3", "4"];
+
+    function append(a: string, b: string): [string, string] {
+        return [a + b, a + b];
+    }
+
+    R.mapAccumRight(append, "0", digits); // => ['04321', ['04321', '0432', '043', '04']]
+    R.mapAccumRight(append)("0", digits); // => ['04321', ['04321', '0432', '043', '04']]
+    R.mapAccumRight(append, "0")(digits); // => ['04321', ['04321', '0432', '043', '04']]
+};
+
+() => {
+    function squareEnds(elt: number, idx: number, list: number[]) {
         if (idx === 0 || idx === list.length - 1) {
             return elt * elt;
         }
         return elt;
-    };
-    R.addIndex(R.map)(squareEnds, [8, 5, 3, 0, 9]); //=> [64, 5, 3, 0, 81]
-    R.addIndex(R.map)(squareEnds)([8, 5, 3, 0, 9]); //=> [64, 5, 3, 0, 81]
-}
+    }
+
+    R.addIndex(R.map)(squareEnds, [8, 5, 3, 0, 9]); // => [64, 5, 3, 0, 81]
+    R.addIndex(R.map)(squareEnds)([8, 5, 3, 0, 9]); // => [64, 5, 3, 0, 81]
+};
 
 () => {
-    R.none(R.isNaN, [1, 2, 3]); //=> true
-    R.none(R.isNaN, [1, 2, 3, NaN]); //=> false
-    R.none(R.isNaN)([1, 2, 3, NaN]); //=> false
-}
+    R.none(R.isNaN, [1, 2, 3]); // => true
+    R.none(R.isNaN, [1, 2, 3, NaN]); // => false
+    R.none(R.isNaN)([1, 2, 3, NaN]); // => false
+};
 
 () => {
-    var list = ['foo', 'bar', 'baz', 'quux'];
-    R.nth(1, list); //=> 'bar'
-    R.nth(-1, list); //=> 'quux'
-    R.nth(-99, list); //=> undefined
-    R.nth(-99)(list); //=> undefined
-}
+    let list = ["foo", "bar", "baz", "quux"];
+    R.nth(1, list); // => 'bar'
+    R.nth(-1, list); // => 'quux'
+    R.nth(-99, list); // => undefined
+    R.nth(-99)(list); // => undefined
+};
 
 () => {
-    R.partition(R.contains('s'), ['sss', 'ttt', 'foo', 'bars']);
-    R.partition(R.contains('s'))(['sss', 'ttt', 'foo', 'bars']);
+    R.partition(R.contains("s"), ["sss", "ttt", "foo", "bars"]);
+    R.partition(R.contains("s"))(["sss", "ttt", "foo", "bars"]);
     R.partition((x: number) => x > 2, [1, 2, 3, 4]);
     R.partition((x: number) => x > 2)([1, 2, 3, 4]);
-}
+};
 
 () => {
-    const a = R.pluck('a')([{a: 1}, {a: 2}]); //=> [1, 2]
-    const b = R.pluck(0)([[1, 2], [3, 4]]);   //=> [1, 3]
-}
+    const a = R.pluck("a")([{a: 1}, {a: 2}]); // => [1, 2]
+    const b = R.pluck(0)([[1, 2], [3, 4]]);   // => [1, 3]
+};
 
 () => {
-    R.prepend('fee', ['fi', 'fo', 'fum']); //=> ['fee', 'fi', 'fo', 'fum']
-    R.prepend('fee')(['fi', 'fo', 'fum']); //=> ['fee', 'fi', 'fo', 'fum']
-}
+    R.prepend("fee", ["fi", "fo", "fum"]); // => ['fee', 'fi', 'fo', 'fum']
+    R.prepend("fee")(["fi", "fo", "fum"]); // => ['fee', 'fi', 'fo', 'fum']
+};
 
 () => {
-    R.range(1, 5);    //=> [1, 2, 3, 4]
-    R.range(50)(53);  //=> [50, 51, 52]
-}
+    R.range(1, 5);    // => [1, 2, 3, 4]
+    R.range(50)(53);  // => [50, 51, 52]
+};
 
 () => {
-    var numbers = [1, 2, 3];
-    var add = function(a: number, b: number) {
+    let numbers = [1, 2, 3];
+
+    function add(a: number, b: number) {
         return a + b;
-    };
-    R.reduce(add, 10, numbers); //=> 16
-    R.reduce(add)(10, numbers); //=> 16
-    R.reduce(add, 10)(numbers); //=> 16
-}
+    }
+
+    R.reduce(add, 10, numbers); // => 16
+    R.reduce(add)(10, numbers); // => 16
+    R.reduce(add, 10)(numbers); // => 16
+};
 
 interface Student {
     name: string;
     score: number;
 }
+
 () => {
     const reduceToNamesBy = R.reduceBy((acc: string[], student: Student) => acc.concat(student.name), []);
-    const namesByGrade = reduceToNamesBy(function(student) {
-          let score = student.score;
-          return score < 65 ? 'F' :
-                 score < 70 ? 'D' :
-                 score < 80 ? 'C' :
-                 score < 90 ? 'B' : 'A';
+    const namesByGrade    = reduceToNamesBy((student) => {
+        let score = student.score;
+        return score < 65 ? "F" :
+            score < 70 ? "D" :
+                score < 80 ? "C" :
+                    score < 90 ? "B" : "A";
     });
-    let students = [{name: 'Lucy', score: 92},
-                    {name: 'Drew', score: 85},
-                    {name: 'Bart', score: 62}];
-    const names = namesByGrade(students);
+    let students          = [{name: "Lucy", score: 92},
+        {name: "Drew", score: 85},
+        {name: "Bart", score: 62}];
+    const names           = namesByGrade(students);
     // {
     //   'A': ['Lucy'],
     //   'B': ['Drew']
     //   'F': ['Bart']
     // }
-}
+};
 
 () => {
-    var reduceIndexed = R.addIndex(R.reduce);
-    var letters = ['a', 'b', 'c'];
-    var objectify = function(accObject: {[elem:string]: number}, elem: string, idx: number, list: string[]) {
+    let reduceIndexed = R.addIndex(R.reduce);
+    let letters       = ["a", "b", "c"];
+
+    function objectify(accObject: { [elem: string]: number }, elem: string, idx: number, list: string[]) {
         accObject[elem] = idx;
         return accObject;
-    };
-    reduceIndexed(objectify, {}, letters); //=> { 'a': 0, 'b': 1, 'c': 2 }
-    reduceIndexed(objectify)({}, letters); //=> { 'a': 0, 'b': 1, 'c': 2 }
-    reduceIndexed(objectify, {})(letters); //=> { 'a': 0, 'b': 1, 'c': 2 }
-}
+    }
+
+    reduceIndexed(objectify, {}, letters); // => { 'a': 0, 'b': 1, 'c': 2 }
+    reduceIndexed(objectify)({}, letters); // => { 'a': 0, 'b': 1, 'c': 2 }
+    reduceIndexed(objectify, {})(letters); // => { 'a': 0, 'b': 1, 'c': 2 }
+};
+
+interface KeyValuePair<K, V> extends Array<K | V> {
+    0: K;
+    1: V;
+}
+type Pair = KeyValuePair<string, number>;
 
-interface KeyValuePair<K, V> extends Array<K | V> { 0 : K; 1 : V; }
-type Pair = KeyValuePair<string, number>
 () => {
-    var pairs: Pair[] = [ ['a', 1], ['b', 2], ['c', 3] ];
-    var flattenPairs = function(acc: Pair[], pair: Pair): Pair[] {
+    let pairs: Pair[] = [["a", 1], ["b", 2], ["c", 3]];
+
+    function flattenPairs(acc: Pair[], pair: Pair): Pair[] {
         return acc.concat(pair);
-    };
-    R.reduceRight(flattenPairs, [], pairs); //=> [ 'c', 3, 'b', 2, 'a', 1 ]
-    R.reduceRight(flattenPairs, [])(pairs); //=> [ 'c', 3, 'b', 2, 'a', 1 ]
-    R.reduceRight(flattenPairs)([], pairs); //=> [ 'c', 3, 'b', 2, 'a', 1 ]
-}
+    }
+
+    R.reduceRight(flattenPairs, [], pairs); // => [ 'c', 3, 'b', 2, 'a', 1 ]
+    R.reduceRight(flattenPairs, [])(pairs); // => [ 'c', 3, 'b', 2, 'a', 1 ]
+    R.reduceRight(flattenPairs)([], pairs); // => [ 'c', 3, 'b', 2, 'a', 1 ]
+};
 
 () => {
-    var isOdd = function(n: number) {
+    function isOdd(n: number) {
         return n % 2 === 1;
-    };
-    R.reject(isOdd, [1, 2, 3, 4]); //=> [2, 4]
-    R.reject(isOdd)([1, 2, 3, 4]); //=> [2, 4]
-}
+    }
+
+    R.reject(isOdd, [1, 2, 3, 4]); // => [2, 4]
+    R.reject(isOdd)([1, 2, 3, 4]); // => [2, 4]
+};
 
 () => {
-    const lastTwo = function(val: number, idx: number, list: number[]) {
+    function lastTwo(val: number, idx: number, list: number[]) {
         return list.length - idx <= 2;
-    };
+    }
+
     const rejectIndexed = R.addIndex(R.reject);
-    rejectIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); //=> [8, 6, 7, 5, 3]
-    rejectIndexed(lastTwo)([8, 6, 7, 5, 3, 0, 9]); //=> [8, 6, 7, 5, 3]
-}
+    rejectIndexed(lastTwo, [8, 6, 7, 5, 3, 0, 9]); // => [8, 6, 7, 5, 3]
+    rejectIndexed(lastTwo)([8, 6, 7, 5, 3, 0, 9]); // => [8, 6, 7, 5, 3]
+};
 
 () => {
-    R.remove(2, 3, [1,2,3,4,5,6,7,8]); //=> [1,2,6,7,8]
-    R.remove(2, 3)([1,2,3,4,5,6,7,8]); //=> [1,2,6,7,8]
-    R.remove(2)(3, [1,2,3,4,5,6,7,8]); //=> [1,2,6,7,8]
-}
+    R.remove(2, 3, [1, 2, 3, 4, 5, 6, 7, 8]); // => [1,2,6,7,8]
+    R.remove(2, 3)([1, 2, 3, 4, 5, 6, 7, 8]); // => [1,2,6,7,8]
+    R.remove(2)(3, [1, 2, 3, 4, 5, 6, 7, 8]); // => [1,2,6,7,8]
+};
 
 () => {
-    R.repeat('hi', 5); //=> ['hi', 'hi', 'hi', 'hi', 'hi']
-    var obj = {};
-    var repeatedObjs = R.repeat(obj, 5); //=> [{}, {}, {}, {}, {}]
-    repeatedObjs[0] === repeatedObjs[1]; //=> true
-}
+    R.repeat("hi", 5); // => ['hi', 'hi', 'hi', 'hi', 'hi']
+    let obj          = {};
+    let repeatedObjs = R.repeat(obj, 5); // => [{}, {}, {}, {}, {}]
+    repeatedObjs[0] === repeatedObjs[1]; // => true
+};
 
 () => {
-    R.reverse([1, 2, 3]);  //=> [3, 2, 1]
-    R.reverse([1, 2]);     //=> [2, 1]
-    R.reverse([1]);        //=> [1]
-    R.reverse([]);         //=> []
-}
+    R.reverse([1, 2, 3]);  // => [3, 2, 1]
+    R.reverse([1, 2]);     // => [2, 1]
+    R.reverse([1]);        // => [1]
+    R.reverse([]);         // => []
+};
 
 () => {
-    var numbers = [1, 2, 3, 4];
-    R.scan(R.multiply, 1, numbers); //=> [1, 1, 2, 6, 24]
-    R.scan(R.multiply, 1)(numbers); //=> [1, 1, 2, 6, 24]
-    R.scan(R.multiply)(1, numbers); //=> [1, 1, 2, 6, 24]
-}
+    let numbers = [1, 2, 3, 4];
+    R.scan(R.multiply, 1, numbers); // => [1, 1, 2, 6, 24]
+    R.scan(R.multiply, 1)(numbers); // => [1, 1, 2, 6, 24]
+    R.scan(R.multiply)(1, numbers); // => [1, 1, 2, 6, 24]
+};
 
 () => {
-    var xs = R.range(0, 10);
-    R.slice(2, 5, xs); //=> [2, 3, 4]
-    R.slice(2, 5)(xs); //=> [2, 3, 4]
-    R.slice(2)(5, xs); //=> [2, 3, 4]
+    let xs = R.range(0, 10);
+    R.slice(2, 5, xs); // => [2, 3, 4]
+    R.slice(2, 5)(xs); // => [2, 3, 4]
+    R.slice(2)(5, xs); // => [2, 3, 4]
 
-    var str = 'Hello World';
-    R.slice(2, 5, str); //=> 'llo'
-    R.slice(2, 5)(str); //=> 'llo'
-    R.slice(2)(5, str); //=> 'llo'
-}
+    let str = "Hello World";
+    R.slice(2, 5, str); // => 'llo'
+    R.slice(2, 5)(str); // => 'llo'
+    R.slice(2)(5, str); // => 'llo'
+};
 
 () => {
-    var diff = function(a: number, b: number) { return a - b; };
-    R.sort(diff, [4,2,7,5]); //=> [2, 4, 5, 7]
-    R.sort(diff)([4,2,7,5]); //=> [2, 4, 5, 7]
-}
+    function diff(a: number, b: number) {
+        return a - b;
+    }
+
+    R.sort(diff, [4, 2, 7, 5]); // => [2, 4, 5, 7]
+    R.sort(diff)([4, 2, 7, 5]); // => [2, 4, 5, 7]
+};
 
 () => {
-    const fn = R.cond([
-        [R.equals(0),   R.always('water freezes at 0°C')],
-        [R.equals(100), R.always('water boils at 100°C')],
-        [R.T,           (temp: number) => 'nothing special happens at ' + temp + '°C']
+    const fn        = R.cond([
+        [R.equals(0), R.always("water freezes at 0°C")],
+        [R.equals(100), R.always("water boils at 100°C")],
+        [R.T, (temp: number) => "nothing special happens at " + temp + "°C"]
     ]);
-    const a: string = fn(0); //=> 'water freezes at 0°C'
-    const b: string = fn(50); //=> 'nothing special happens at 50°C'
-    const c: string = fn(100); //=> 'water boils at 100°C'
-}
+    const a: string = fn(0); // => 'water freezes at 0°C'
+    const b: string = fn(50); // => 'nothing special happens at 50°C'
+    const c: string = fn(100); // => 'water boils at 100°C'
+};
 
 () => {
-    R.tail(['fi', 'fo', 'fum']); //=> ['fo', 'fum']
-    R.tail([1, 2, 3]); //=> [2, 3]
-    R.tail('abc');  //=> 'bc'
-    R.tail('');     //=> ''
-}
+    R.tail(["fi", "fo", "fum"]); // => ['fo', 'fum']
+    R.tail([1, 2, 3]); // => [2, 3]
+    R.tail("abc");  // => 'bc'
+    R.tail("");     // => ''
+};
 
 () => {
-    R.take(3,[1,2,3,4,5]); //=> [1,2,3]
-
-    var members= [ "Paul Desmond","Bob Bates","Joe Dodge","Ron Crotty","Lloyd Davis","Joe Morello","Norman Bates",
-    "Eugene Wright","Gerry Mulligan","Jack Six","Alan Dawson","Darius Brubeck","Chris Brubeck",
-    "Dan Brubeck","Bobby Militello","Michael Moore","Randy Jones"];
-    var takeFive = R.take(5);
-    takeFive(members); //=> ["Paul Desmond","Bob Bates","Joe Dodge","Ron Crotty","Lloyd Davis"]
-}
-() => {
-    R.take(3,"Example"); //=> "Exa"
-
-    var takeThree = R.take(3);
-    takeThree("Example"); //=> "Exa"
-}
-
+    R.take(3, [1, 2, 3, 4, 5]); // => [1,2,3]
 
+    let members  = ["Paul Desmond", "Bob Bates", "Joe Dodge", "Ron Crotty", "Lloyd Davis", "Joe Morello", "Norman Bates",
+        "Eugene Wright", "Gerry Mulligan", "Jack Six", "Alan Dawson", "Darius Brubeck", "Chris Brubeck",
+        "Dan Brubeck", "Bobby Militello", "Michael Moore", "Randy Jones"];
+    let takeFive = R.take(5);
+    takeFive(members); // => ["Paul Desmond","Bob Bates","Joe Dodge","Ron Crotty","Lloyd Davis"]
+};
 
 () => {
-	const a: string[] = R.takeLast(1, ['foo', 'bar', 'baz']); //=> ['baz']
-    const b: string[] = R.takeLast(2)(['foo', 'bar', 'baz']); //=> ['bar', 'baz']
-    const c: string = R.takeLast(3, 'ramda');               //=> 'mda'
-    const d: string = R.takeLast(3)('ramda');               //=> 'mda'
-}
+    R.take(3, "Example"); // => "Exa"
+
+    let takeThree = R.take(3);
+    takeThree("Example"); // => "Exa"
+};
 
 () => {
-	const isNotOne = (x: number) => x !== 1;
-	const a: number[] = R.takeLastWhile(isNotOne, [1, 2, 3, 4]); //=> [2, 3, 4]
-	const b: number[] = R.takeLastWhile(isNotOne)([1, 2, 3, 4]); //=> [2, 3, 4]
-}
+    const a: string[] = R.takeLast(1, ["foo", "bar", "baz"]); // => ['baz']
+    const b: string[] = R.takeLast(2)(["foo", "bar", "baz"]); // => ['bar', 'baz']
+    const c: string   = R.takeLast(3, "ramda");               // => 'mda'
+    const d: string   = R.takeLast(3)("ramda");               // => 'mda'
+};
 
 () => {
-    var isNotFour = function(x: number) {
+    const isNotOne    = (x: number) => x !== 1;
+    const a: number[] = R.takeLastWhile(isNotOne, [1, 2, 3, 4]); // => [2, 3, 4]
+    const b: number[] = R.takeLastWhile(isNotOne)([1, 2, 3, 4]); // => [2, 3, 4]
+};
+
+() => {
+    function isNotFour(x: number) {
         return !(x === 4);
-    };
+    }
 
-    R.takeWhile(isNotFour, [1, 2, 3, 4]); //=> [1, 2, 3]
-    R.takeWhile(isNotFour)([1, 2, 3, 4]); //=> [1, 2, 3]
-}
+    R.takeWhile(isNotFour, [1, 2, 3, 4]); // => [1, 2, 3]
+    R.takeWhile(isNotFour)([1, 2, 3, 4]); // => [1, 2, 3]
+};
 
 () => {
-	const sayX = (x: number) => console.log('x is ' + x);
-    const a: number = R.tap(sayX, 100); //=> 100
-}
+    const sayX      = (x: number) => console.log("x is " + x);
+    const a: number = R.tap(sayX, 100); // => 100
+};
 
 () => {
-	const a: boolean = R.test(/^x/, 'xyz'); //=> true
-    const b: boolean = R.test(/^y/)('xyz'); //=> false
-}
+    const a: boolean = R.test(/^x/, "xyz"); // => true
+    const b: boolean = R.test(/^y/)("xyz"); // => false
+};
 
 () => {
-    const a1 = R.times(R.identity, 5); //=> [0, 1, 2, 3, 4]
-    const a2 = R.times(R.identity)(5); //=> [0, 1, 2, 3, 4]
-}
+    const a1 = R.times(R.identity, 5); // => [0, 1, 2, 3, 4]
+    const a2 = R.times(R.identity)(5); // => [0, 1, 2, 3, 4]
+};
 
 () => {
-	class Point {
-		constructor(public x: number, public y: number) {
-    		this.x = x;
-        	this.y = y;
-		}
-		toStringn() {
-        	return 'new Point(' + this.x + ', ' + this.y + ')';
-		}
-    };
-    R.toString(new Point(1, 2)); //=> 'new Point(1, 2)'
+    class Point {
+        constructor(public x: number, public y: number) {
+            this.x = x;
+            this.y = y;
+        }
 
-    R.toString(42); //=> '42'
-    R.toString('abc'); //=> '"abc"'
-    R.toString([1, 2, 3]); //=> '[1, 2, 3]'
-    R.toString({foo: 1, bar: 2, baz: 3}); //=> '{"bar": 2, "baz": 3, "foo": 1}'
-    R.toString(new Date('2001-02-03T04:05:06Z')); //=> 'new Date("2001-02-03T04:05:06.000Z")'
-}
+        toStringn() {
+            return "new Point(" + this.x + ", " + this.y + ")";
+        }
+    }
+    R.toString(new Point(1, 2)); // => 'new Point(1, 2)'
+
+    R.toString(42); // => '42'
+    R.toString("abc"); // => '"abc"'
+    R.toString([1, 2, 3]); // => '[1, 2, 3]'
+    R.toString({foo: 1, bar: 2, baz: 3}); // => '{"bar": 2, "baz": 3, "foo": 1}'
+    R.toString(new Date("2001-02-03T04:05:06Z")); // => 'new Date("2001-02-03T04:05:06.000Z")'
+};
 
 () => {
-    var numbers = [1, 2, 3, 4];
-    var transducer = R.compose(R.map(R.add(1)), R.take(2));
-    var fn = R.flip<number, number[], number[]>(R.append);
-    R.transduce(transducer, fn, [], numbers); //=> [2, 3]
-    R.transduce(transducer, fn, [])(numbers); //=> [2, 3]
-    R.transduce(transducer, fn)([], numbers); //=> [2, 3]
-    R.transduce(transducer)(fn, [], numbers); //=> [2, 3]
-}
+    let numbers    = [1, 2, 3, 4];
+    let transducer = R.compose(R.map(R.add(1)), R.take(2));
+    let fn         = R.flip<number, number[], number[]>(R.append);
+    R.transduce(transducer, fn, [], numbers); // => [2, 3]
+    R.transduce(transducer, fn, [])(numbers); // => [2, 3]
+    R.transduce(transducer, fn)([], numbers); // => [2, 3]
+    R.transduce(transducer)(fn, [], numbers); // => [2, 3]
+};
 
 () => {
-    const a: (number | string)[][] = R.transpose<number | string>([[1, 'a'], [2, 'b'], [3, 'c']]) //=> [[1, 2, 3], ['a', 'b', 'c']]
-    const b: (number | string)[][] = R.transpose<number | string>([[1, 2, 3], ['a', 'b', 'c']]) //=> [[1, 'a'], [2, 'b'], [3, 'c']]
-    const c: number[][] = R.transpose([[10, 11], [20], [], [30, 31, 32]]) //=> [[10, 20, 30], [11, 31], [32]]
-}
+    const a: Array<Array<number | string>> = R.transpose<number | string>([[1, "a"], [2, "b"], [3, "c"]]); // => [[1, 2, 3], ['a', 'b', 'c']]
+    const b: Array<Array<number | string>> = R.transpose<number | string>([[1, 2, 3], ["a", "b", "c"]]); // => [[1, 'a'], [2, 'b'], [3, 'c']]
+    const c: number[][]            = R.transpose([[10, 11], [20], [], [30, 31, 32]]); // => [[10, 20, 30], [11, 31], [32]]
+};
 
 () => {
-    const x = R.prop('x');
-    const a: boolean = R.tryCatch<boolean>(R.prop('x'), R.F, {x: true}); //=> true
-    const b: boolean = R.tryCatch<boolean>(R.prop('x'), R.F, null);      //=> false
-}
+    const x          = R.prop("x");
+    const a: boolean = R.tryCatch<boolean>(R.prop("x"), R.F)({x: true}); // => true
+    const b: boolean = R.tryCatch<boolean>(R.prop("x"), R.F)(null);      // => false
+    const c: boolean = R.tryCatch<boolean>(R.and, R.F)(true, true);      // => true
+};
 
 () => {
-    R.uniq([1, 1, 2, 1]); //=> [1, 2]
-    R.uniq([{}, {}]);     //=> [{}, {}]
-    R.uniq([1, '1']);     //=> [1, '1']
-}
+    R.uniq([1, 1, 2, 1]); // => [1, 2]
+    R.uniq([{}, {}]);     // => [{}, {}]
+    R.uniq([1, "1"]);     // => [1, '1']
+};
 
 () => {
-    var strEq = function(a: any, b: any) { return String(a) === String(b); };
-    R.uniqWith(strEq, [1, '1', 2, 1]); //=> [1, 2]
-    R.uniqWith(strEq)([1, '1', 2, 1]); //=> [1, 2]
-    R.uniqWith(strEq)([{}, {}]);       //=> [{}]
-    R.uniqWith(strEq)([1, '1', 1]);    //=> [1]
-    R.uniqWith(strEq)(['1', 1, 1]);    //=> ['1']
-}
+    function strEq(a: any, b: any) {
+        return String(a) === String(b);
+    }
+
+    R.uniqWith(strEq, [1, "1", 2, 1]); // => [1, 2]
+    R.uniqWith(strEq)([1, "1", 2, 1]); // => [1, 2]
+    R.uniqWith(strEq)([{}, {}]);       // => [{}]
+    R.uniqWith(strEq)([1, "1", 1]);    // => [1]
+    R.uniqWith(strEq)(["1", 1, 1]);    // => ['1']
+};
 
 () => {
-    R.equals(R.unnest([1, [2], [[3]]]), [1,2,[3]]); //=> true
-    R.equals(R.unnest([[1, 2], [3, 4], [5, 6]]),[1,2,3,4,5,6]); //=> true
-}
+    R.equals(R.unnest([1, [2], [[3]]]), [1, 2, [3]]); // => true
+    R.equals(R.unnest<number>([[1, 2], [3, 4], [5, 6]]), [1, 2, 3, 4, 5, 6]); // => true
+};
 
 () => {
-    R.xprod([1, 2], ['a', 'b']); //=> [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
-    R.xprod([1, 2])(['a', 'b']); //=> [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
-}
+    R.xprod([1, 2], ["a", "b"]); // => [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
+    R.xprod([1, 2])(["a", "b"]); // => [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
+};
 
 () => {
-    R.zip([1, 2, 3], ['a', 'b', 'c']); //=> [[1, 'a'], [2, 'b'], [3, 'c']]
-    R.zip([1, 2, 3])(['a', 'b', 'c']); //=> [[1, 'a'], [2, 'b'], [3, 'c']]
-}
+    R.zip([1, 2, 3], ["a", "b", "c"]); // => [[1, 'a'], [2, 'b'], [3, 'c']]
+    R.zip([1, 2, 3])(["a", "b", "c"]); // => [[1, 'a'], [2, 'b'], [3, 'c']]
+};
 
 () => {
-    R.zipObj(['a', 'b', 'c'], [1, 2, 3]); //=> {a: 1, b: 2, c: 3}
-    R.zipObj(['a', 'b', 'c'])([1, 2, 3]); //=> {a: 1, b: 2, c: 3}
-}
+    R.zipObj(["a", "b", "c"], [1, 2, 3]); // => {a: 1, b: 2, c: 3}
+    R.zipObj(["a", "b", "c"])([1, 2, 3]); // => {a: 1, b: 2, c: 3}
+};
 
 () => {
-    var f = function(x:number, y:string) {
+    function f(x: number, y: string) {
         // ...
-    };
-    R.zipWith(f, [1, 2, 3], ['a', 'b', 'c']); //=> [f(1, 'a'), f(2, 'b'), f(3, 'c')]
-    R.zipWith(f)([1, 2, 3], ['a', 'b', 'c']); //=> [f(1, 'a'), f(2, 'b'), f(3, 'c')]
-    R.zipWith(f, [1, 2, 3])(['a', 'b', 'c']); //=> [f(1, 'a'), f(2, 'b'), f(3, 'c')]
-}
+    }
+
+    R.zipWith(f, [1, 2, 3], ["a", "b", "c"]); // => [f(1, 'a'), f(2, 'b'), f(3, 'c')]
+    R.zipWith(f)([1, 2, 3], ["a", "b", "c"]); // => [f(1, 'a'), f(2, 'b'), f(3, 'c')]
+    R.zipWith(f, [1, 2, 3])(["a", "b", "c"]); // => [f(1, 'a'), f(2, 'b'), f(3, 'c')]
+};
 
 /*****************************************************************
  * Object category
  */
 () => {
-    type ABC = {a: number, b: number, c: number}
-    const a: ABC = R.assoc('c', 3, {a: 1, b: 2}); //=> {a: 1, b: 2, c: 3}
-    const b: ABC = R.assoc('c')(3, {a: 1, b: 2}); //=> {a: 1, b: 2, c: 3}
-    const c: ABC = R.assoc('c', 3)({a: 1, b: 2}); //=> {a: 1, b: 2, c: 3}
-}
+    interface ABC { a: number; b: number; c: number; }
+    const a: ABC = R.assoc("c", 3, {a: 1, b: 2}); // => {a: 1, b: 2, c: 3}
+    const b: ABC = R.assoc("c")(3, {a: 1, b: 2}); // => {a: 1, b: 2, c: 3}
+    const c: ABC = R.assoc("c", 3)({a: 1, b: 2}); // => {a: 1, b: 2, c: 3}
+};
 
 () => {
-    const a1 = R.dissoc<{a:number, c:number}>('b', {a: 1, b: 2, c: 3}); //=> {a: 1, c: 3}
-    const a2 = R.dissoc('b', {a: 1, b: 2, c: 3}); //=> {a: 1, c: 3}
-    const a4 = R.dissoc('b')<{a:number, c:number}>({a: 1, b: 2, c: 3}); //=> {a: 1, c: 3}
-}
+    const a1 = R.dissoc<{ a: number, c: number }>("b", {a: 1, b: 2, c: 3}); // => {a: 1, c: 3}
+    const a2 = R.dissoc("b", {a: 1, b: 2, c: 3}); // => {a: 1, c: 3}
+    const a4 = R.dissoc("b")<{ a: number, c: number }>({a: 1, b: 2, c: 3}); // => {a: 1, c: 3}
+};
 
 () => {
-    const testPath = ['x', 0, 'y'];
-    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+    const testPath = ["x", 0, "y"];
+    const testObj  = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
 
-    R.assocPath(testPath, 42, testObj); //=> {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
-    R.assocPath(testPath, 42)(testObj); //=> {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
-    R.assocPath(testPath)(42)(testObj); //=> {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
-    R.assocPath(testPath)(42, testObj); //=> {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
-}
+    R.assocPath(testPath, 42, testObj); // => {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
+    R.assocPath(testPath, 42)(testObj); // => {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
+    R.assocPath(testPath)(42)(testObj); // => {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
+    R.assocPath(testPath)(42, testObj); // => {x: [{y: 42, z: 3}, {y: 4, z: 5}]}
+};
 
 () => {
-    const a1 = R.dissocPath(['a', 'b', 'c'], {a: {b: {c: 42}}}); //=> {a: {b: {}}}
+    const a1 = R.dissocPath(["a", "b", "c"], {a: {b: {c: 42}}}); // => {a: {b: {}}}
     // optionally specify return type
-    const a2 = R.dissocPath<{a :{ b: number}}>(['a', 'b', 'c'], {a: {b: {c: 42}}}); //=> {a: {b: {}}}
-    const a3 = R.dissocPath(['a', 'b', 'c'])({a: {b: {c: 42}}}); //=> {a: {b: {}}}
+    const a2 = R.dissocPath<{ a: { b: number } }>(["a", "b", "c"], {a: {b: {c: 42}}}); // => {a: {b: {}}}
+    const a3 = R.dissocPath(["a", "b", "c"])({a: {b: {c: 42}}}); // => {a: {b: {}}}
 
-    const testPath = ['x', 0, 'y'];
-    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+    const testPath = ["x", 0, "y"];
+    const testObj  = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
 
-    R.dissocPath(testPath, testObj); //=> {x: [{z: 3}, {y: 4, z: 5}]}
-    R.dissocPath(testPath)(testObj); //=> {x: [{z: 3}, {y: 4, z: 5}]}
-}
+    R.dissocPath(testPath, testObj); // => {x: [{z: 3}, {y: 4, z: 5}]}
+    R.dissocPath(testPath)(testObj); // => {x: [{z: 3}, {y: 4, z: 5}]}
+};
 
 () => {
-    var obj1 = [{}, {}, {}];
-    var obj2 = [{a:1}, {a:2}, {a:3}];
-    const a1: any[] = R.clone(obj1);
-    const a2: {a: number}[] = R.clone(obj2);
-    const a3: any = R.clone({});
-    const a4: number = R.clone(10);
-    const a5: string = R.clone('foo');
-    const a6: number = R.clone(Date.now());
-}
+    let obj1                  = [{}, {}, {}];
+    let obj2                  = [{a: 1}, {a: 2}, {a: 3}];
+    const a1: any[]           = R.clone(obj1);
+    const a2: Array<{ a: number }> = R.clone(obj2);
+    const a3: any             = R.clone({});
+    const a4: number          = R.clone(10);
+    const a5: string          = R.clone("foo");
+    const a6: number          = R.clone(Date.now());
+};
 
 () => {
-    var o1 = { a: 1, b: 2, c: 3, d: 4 };
-    var o2 = { a: 10, b: 20, c: 3, d: 40 };
-    const a1 = R.eqProps('a', o1, o2); //=> false
-    const a2 = R.eqProps('c', o1, o2); //=> true
-    const a3: {<T,U>(obj1: T, obj2: U): boolean} = R.eqProps('c');
-    const a4: {<U>(obj2: U): boolean} = R.eqProps('c', o1);
-}
+    let o1                                        = {a: 1, b: 2, c: 3, d: 4};
+    let o2                                        = {a: 10, b: 20, c: 3, d: 40};
+    const a1                                      = R.eqProps("a", o1, o2); // => false
+    const a2                                      = R.eqProps("c", o1, o2); // => true
+    const a3: <T, U>(obj1: T, obj2: U) => boolean = R.eqProps("c");
+    const a4: <U>(obj2: U) => boolean             = R.eqProps("c", o1);
+};
 
 () => {
-    const a1 = R.evolve({ elapsed: R.add(1), remaining: R.add(-1) }, { name: 'Tomato', elapsed: 100, remaining: 1400 });
-    const a2 = R.evolve({ elapsed: R.add(1), remaining: R.add(-1) })({ name: 'Tomato', elapsed: 100, remaining: 1400 });
-}
+    const a1 = R.evolve({elapsed: R.add(1), remaining: R.add(-1)}, {name: "Tomato", elapsed: 100, remaining: 1400});
+    const a2 = R.evolve({elapsed: R.add(1), remaining: R.add(-1)})({name: "Tomato", elapsed: 100, remaining: 1400});
+};
 
 () => {
-    // var tomato = {firstName: 'Tomato ', data: {elapsed: 100, remaining: 1400}, id:123};
-    // var transformations = {
+    // let tomato = {firstName: 'Tomato ', data: {elapsed: 100, remaining: 1400}, id:123};
+    // let transformations = {
     //     firstName: R.trim,
     //     lastName: R.trim, // Will not get invoked.
     //     data: {elapsed: R.add(1), remaining: R.add(-1)}
     // };
-    // const a = R.evolve(transformations, tomato); //=> {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
-    // const b = R.evolve(transformations)(tomato); //=> {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
-}
+    // const a = R.evolve(transformations, tomato); // => {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
+    // const b = R.evolve(transformations)(tomato); // => {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
+};
 
 () => {
-    const hasName = R.has('name');
-    const a1: boolean = hasName({name: 'alice'});   //=> true
-    const a2: boolean = hasName({name: 'bob'});     //=> true
-    const a3: boolean = hasName({});                //=> false
+    const hasName     = R.has("name");
+    const a1: boolean = hasName({name: "alice"});   // => true
+    const a2: boolean = hasName({name: "bob"});     // => true
+    const a3: boolean = hasName({});                // => false
 
-    const point = {x: 0, y: 0};
-    const pointHas = R.flip(R.has)(point);
-    const b1: boolean = pointHas('x');  //=> true
-    const b2: boolean = pointHas('y');  //=> true
-    const b3: boolean = pointHas('z');  //=> false
-}
+    const point       = {x: 0, y: 0};
+    const pointHas    = R.flip(R.has)(point);
+    const b1: boolean = pointHas("x");  // => true
+    const b2: boolean = pointHas("y");  // => true
+    const b3: boolean = pointHas("z");  // => false
+};
 
 class Rectangle {
     constructor(public width: number, public height: number) {
-        this.width = width;
+        this.width  = width;
         this.height = height;
     }
-    area():number {
+
+    area(): number {
         return this.width * this.height;
     }
-};
-() => {
-
-    var square = new Rectangle(2, 2);
-    R.hasIn('width', square);  //=> true
-    R.hasIn('area', square);  //=> true
-    R.flip(R.hasIn)(square)('area');  //=> true
 }
 
 () => {
-    var raceResultsByFirstName = {
-      first: 'alice',
-      second: 'jake',
-      third: 'alice',
+    let square = new Rectangle(2, 2);
+    R.hasIn("width", square);  // => true
+    R.hasIn("area", square);  // => true
+    R.flip(R.hasIn)(square)("area");  // => true
+};
+
+() => {
+    let raceResultsByFirstName = {
+        first : "alice",
+        second: "jake",
+        third : "alice",
     };
     R.invert(raceResultsByFirstName);
-    //=> { 'alice': ['first', 'third'], 'jake':['second'] }
-}
+    // => { 'alice': ['first', 'third'], 'jake':['second'] }
+};
 
 () => {
     let raceResults0 = {
-      first: 'alice',
-      second: 'jake'
+        first : "alice",
+        second: "jake"
     };
     R.invertObj(raceResults0);
-    //=> { 'alice': 'first', 'jake':'second' }
+    // => { 'alice': 'first', 'jake':'second' }
 
     // Alternatively:
-    let raceResults1 = ['alice', 'jake'];
+    let raceResults1 = ["alice", "jake"];
     R.invertObj(raceResults1);
-    //=> { 'alice': '0', 'jake':'1' }
-}
+    // => { 'alice': '0', 'jake':'1' }
+};
 
 () => {
-    R.keys({a: 1, b: 2, c: 3}); //=> ['a', 'b', 'c']
-}
+    R.keys({a: 1, b: 2, c: 3}); // => ['a', 'b', 'c']
+};
 
 () => {
-    var f = new F();
-    R.keysIn(f); //=> ['x', 'y']
-}
+    let f = new F();
+    R.keysIn(f); // => ['x', 'y']
+};
 
 () => {
-    var xLens = R.lens(R.prop('x'), R.assoc('x'));
-    R.view(xLens, {x: 1, y: 2});            //=> 1
-    R.view(xLens)({x: 1, y: 2});            //=> 1
-    R.set(xLens, 4, {x: 1, y: 2});          //=> {x: 4, y: 2}
-    R.set(xLens)(4, {x: 1, y: 2});          //=> {x: 4, y: 2}
-    R.set(xLens, 4)({x: 1, y: 2});          //=> {x: 4, y: 2}
-    R.over(xLens, R.negate, {x: 1, y: 2});  //=> {x: -1, y: 2}
-    R.over(xLens, R.negate)({x: 1, y: 2});  //=> {x: -1, y: 2}
-    R.over(xLens)(R.negate, {x: 1, y: 2});  //=> {x: -1, y: 2}
-}
-() => {
-    var headLens = R.lensIndex(0);
-    R.view(headLens, ['a', 'b', 'c']);            //=> 'a'
-    R.set(headLens, 'x', ['a', 'b', 'c']);        //=> ['x', 'b', 'c']
-    R.over(headLens, R.toUpper, ['a', 'b', 'c']); //=> ['A', 'b', 'c']
-}
-() => {
-    var xLens = R.lensProp('x');
-    R.view(xLens, {x: 1, y: 2});            //=> 1
-    R.set(xLens, 4, {x: 1, y: 2});          //=> {x: 4, y: 2}
-    R.over(xLens, R.negate, {x: 1, y: 2});  //=> {x: -1, y: 2}
-}
+    let xLens = R.lens(R.prop("x"), R.assoc("x"));
+    R.view(xLens, {x: 1, y: 2});            // => 1
+    R.view(xLens)({x: 1, y: 2});            // => 1
+    R.set(xLens, 4, {x: 1, y: 2});          // => {x: 4, y: 2}
+    R.set(xLens)(4, {x: 1, y: 2});          // => {x: 4, y: 2}
+    R.set(xLens, 4)({x: 1, y: 2});          // => {x: 4, y: 2}
+    R.over(xLens, R.negate, {x: 1, y: 2});  // => {x: -1, y: 2}
+    R.over(xLens, R.negate)({x: 1, y: 2});  // => {x: -1, y: 2}
+    R.over(xLens)(R.negate, {x: 1, y: 2});  // => {x: -1, y: 2}
+};
 
 () => {
-  const xyLens = R.lensPath(['x', 0, 'y']);
-  const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
-
-  R.view(xyLens, testObj);            //=> 2
-  R.set(xyLens, 4, testObj);          //=> {x: [{y: 4, z: 3}, {y: 4, z: 5}]}
-  R.over(xyLens, R.negate, testObj);  //=> {x: [{y: -2, z: 3}, {y: 4, z: 5}]}
-}
+    let headLens = R.lensIndex(0);
+    R.view(headLens, ["a", "b", "c"]);            // => 'a'
+    R.set(headLens, "x", ["a", "b", "c"]);        // => ['x', 'b', 'c']
+    R.over(headLens, R.toUpper, ["a", "b", "c"]); // => ['A', 'b', 'c']
+};
 
 () => {
-    R.keys({a: 1, b: 2, c: 3}); //=> ['a', 'b', 'c']
-}
+    let xLens = R.lensProp("x");
+    R.view(xLens, {x: 1, y: 2});            // => 1
+    R.set(xLens, 4, {x: 1, y: 2});          // => {x: 4, y: 2}
+    R.over(xLens, R.negate, {x: 1, y: 2});  // => {x: -1, y: 2}
+};
 
 () => {
-    var f = new F();
-    R.keysIn(f); //=> ['x', 'y']
-}
+    const xyLens  = R.lensPath(["x", 0, "y"]);
+    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+
+    R.view(xyLens, testObj);            // => 2
+    R.set(xyLens, 4, testObj);          // => {x: [{y: 4, z: 3}, {y: 4, z: 5}]}
+    R.over(xyLens, R.negate, testObj);  // => {x: [{y: -2, z: 3}, {y: 4, z: 5}]}
+};
 
 () => {
-    var headLens = R.lens(
-      function get(arr: number[]) { return arr[0]; },
-      function set(val: number, arr: number[]) { return [val].concat(arr.slice(1)); }
+    R.keys({a: 1, b: 2, c: 3}); // => ['a', 'b', 'c']
+};
+
+() => {
+    let f = new F();
+    R.keysIn(f); // => ['x', 'y']
+};
+
+() => {
+    let headLens = R.lens(
+        function get(arr: number[]) {
+            return arr[0];
+        },
+        function set(val: number, arr: number[]) {
+            return [val].concat(arr.slice(1));
+        }
     );
-    headLens([10, 20, 30, 40]); //=> 10
-    headLens.set('mu', [10, 20, 30, 40]); //=> ['mu', 20, 30, 40]
+    headLens([10, 20, 30, 40]); // => 10
+    headLens.set("mu", [10, 20, 30, 40]); // => ['mu', 20, 30, 40]
 
-    var phraseLens = R.lens(
-      function get(obj: any) { return obj.phrase; },
-      function set(val: string, obj: any) {
-        var out = R.clone(obj);
-        out.phrase = val;
-        return out;
-      }
+    let phraseLens = R.lens(
+        function get(obj: any) {
+            return obj.phrase;
+        },
+        function set(val: string, obj: any) {
+            let out    = R.clone(obj);
+            out.phrase = val;
+            return out;
+        }
     );
-    var obj1 = { phrase: 'Absolute filth . . . and I LOVED it!'};
-    var obj2 = { phrase: "What's all this, then?"};
+    let obj1       = {phrase: "Absolute filth . . . and I LOVED it!"};
+    let obj2       = {phrase: "What's all this, then?"};
     phraseLens(obj1); // => 'Absolute filth . . . and I LOVED it!'
     phraseLens(obj2); // => "What's all this, then?"
-    phraseLens.set('Ooh Betty', obj1); //=> { phrase: 'Ooh Betty'}
-}
-
+    phraseLens.set("Ooh Betty", obj1); // => { phrase: 'Ooh Betty'}
+};
 
 () => {
-    var phraseLens = R.lensProp('phrase');
-    var obj1 = { phrase: 'Absolute filth . . . and I LOVED it!'};
-    var obj2 = { phrase: "What's all this, then?"};
+    let phraseLens = R.lensProp("phrase");
+    let obj1       = {phrase: "Absolute filth . . . and I LOVED it!"};
+    let obj2       = {phrase: "What's all this, then?"};
     phraseLens(obj1); // => 'Absolute filth . . . and I LOVED it!'
     phraseLens(obj2); // => "What's all this, then?"
-    phraseLens.set('Ooh Betty', obj1); //=> { phrase: 'Ooh Betty'}
-}
+    phraseLens.set("Ooh Betty", obj1); // => { phrase: 'Ooh Betty'}
+};
 
 () => {
-    R.merge({ 'name': 'fred', 'age': 10 }, { 'age': 40 });
-    //=> { 'name': 'fred', 'age': 40 }
+    R.merge({name: "fred", age: 10}, {age: 40});
+    // => { 'name': 'fred', 'age': 40 }
 
-    var resetToDefault = R.flip(R.merge)({x: 0});
-    resetToDefault({x: 5, y: 2}); //=> {x: 0, y: 2}
-}
+    let resetToDefault = R.flip(R.merge)({x: 0});
+    resetToDefault({x: 5, y: 2}); // => {x: 0, y: 2}
+};
 
 () => {
-    const a = R.mergeAll([{foo:1},{bar:2},{baz:3}]); //=> {foo:1,bar:2,baz:3}
-    const b = R.mergeAll([{foo:1},{foo:2},{bar:2}]); //=> {foo:2,bar:2}
-}
+    const a = R.mergeAll([{foo: 1}, {bar: 2}, {baz: 3}]); // => {foo:1,bar:2,baz:3}
+    const b = R.mergeAll([{foo: 1}, {foo: 2}, {bar: 2}]); // => {foo:2,bar:2}
+};
 
 () => {
     const a = R.mergeWith(R.concat,
-        { a: true, values: [10, 20] },
-        { b: true, values: [15, 35] });
-        //=> { a: true, b: true, values: [10, 20, 15, 35] }
-}
+        {a: true, values: [10, 20]},
+        {b: true, values: [15, 35]});
+    // => { a: true, b: true, values: [10, 20, 15, 35] }
+};
 
 () => {
-    let concatValues = (k:string, l: string, r: string) => k == 'values' ? R.concat(l, r) : r;
+    let concatValues = (k: string, l: string, r: string) => k === "values" ? R.concat(l, r) : r;
     R.mergeWithKey(concatValues,
-        { a: true, thing: 'foo', values: [10, 20] },
-        { b: true, thing: 'bar', values: [15, 35] });
+        {a: true, thing: "foo", values: [10, 20]},
+        {b: true, thing: "bar", values: [15, 35]});
     const merge = R.mergeWithKey(concatValues);
-    merge({ a: true, thing: 'foo', values: [10, 20] }, { b: true, thing: 'bar', values: [15, 35] });
-}
+    merge({a: true, thing: "foo", values: [10, 20]}, {b: true, thing: "bar", values: [15, 35]});
+};
 
 () => {
-    const orValue = 'N/A';
-    const testPath = ['x', 0, 'y'];
-    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+    const orValue  = "N/A";
+    const testPath = ["x", 0, "y"];
+    const testObj  = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
 
-    R.pathOr(orValue, testPath, testObj); //=> 2
-    R.pathOr(orValue, testPath)(testObj); //=> 2
-    R.pathOr(orValue)(testPath)(testObj); //=> 2
-    R.pathOr(orValue)(testPath, testObj); //=> 2
-    R.pathOr(orValue, testPath, {c: {b: 2}}); //=> "N/A"
-}
+    R.pathOr(orValue, testPath, testObj); // => 2
+    R.pathOr(orValue, testPath)(testObj); // => 2
+    R.pathOr(orValue)(testPath)(testObj); // => 2
+    R.pathOr(orValue)(testPath, testObj); // => 2
+    R.pathOr(orValue, testPath, {c: {b: 2}}); // => "N/A"
+};
 
 () => {
-    var isPositive = function(n: number) {
+    const a: boolean = R.pathSatisfies(x => x > 0, ["x"], {x: 1, y: 2}); // => true
+    const b: boolean = R.pathSatisfies(x => x > 0, ["x"])({x: 1, y: 2}); // => true
+    const c: boolean = R.pathSatisfies(x => x > 0)(["x"])({x: 1, y: 2}); // => true
+};
+
+() => {
+    function isPositive(n: number) {
         return n > 0;
-    };
-    const a1 = R.pickBy(isPositive, {a: 1, b: 2, c: -1, d: 0, e: 5}); //=> {a: 1, b: 2, e: 5}
-    var containsBackground = function(val: any) {
+    }
+
+    const a1 = R.pickBy(isPositive, {a: 1, b: 2, c: -1, d: 0, e: 5}); // => {a: 1, b: 2, e: 5}
+    function containsBackground(val: any) {
         return val.bgcolor;
-    };
-    var colors = {1: {color: 'read'}, 2: {color: 'black', bgcolor: 'yellow'}};
-    R.pickBy(containsBackground, colors); //=> {2: {color: 'black', bgcolor: 'yellow'}}
+    }
 
-    var isUpperCase = function(val: number, key: string) { return key.toUpperCase() === key; }
-    R.pickBy(isUpperCase, {a: 1, b: 2, A: 3, B: 4}); //=> {A: 3, B: 4}
-}
+    let colors = {1: {color: "read"}, 2: {color: "black", bgcolor: "yellow"}};
+    R.pickBy(containsBackground, colors); // => {2: {color: 'black', bgcolor: 'yellow'}}
 
+    function isUpperCase(val: number, key: string) {
+        return key.toUpperCase() === key;
+    }
+
+    R.pickBy(isUpperCase, {a: 1, b: 2, A: 3, B: 4}); // => {A: 3, B: 4}
+};
 
 () => {
-    const a1 = R.pick(['a', 'd'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, d: 4}
-    const a2 = R.pick<any, {a: number}>(['a', 'e', 'f'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1}
-    const a3 = R.pick(['a', 'e', 'f'])({a: 1, b: 2, c: 3, d: 4}); //=> {a: 1}
-    const a4 = R.pick(['a', 'e', 'f'], [1, 2, 3, 4]); //=> {a: 1}
-}
+    const a1 = R.pick(["a", "d"], {a: 1, b: 2, c: 3, d: 4}); // => {a: 1, d: 4}
+    const a2 = R.pick<any, { a: number }>(["a", "e", "f"], {a: 1, b: 2, c: 3, d: 4}); // => {a: 1}
+    const a3 = R.pick(["a", "e", "f"])({a: 1, b: 2, c: 3, d: 4}); // => {a: 1}
+    const a4 = R.pick(["a", "e", "f"], [1, 2, 3, 4]); // => {a: 1}
+};
 
 () => {
-    const matchPhrases = (xs: string[]) => R.objOf('must',
+    const matchPhrases = (xs: string[]) => R.objOf("must",
         R.map(
-            (x: string) => R.objOf('match_phrase', x),
+            (x: string) => R.objOf("match_phrase", x),
             xs
         )
-    )
-
-    const out: {must: Array<{match_phrase: string}>} =
-        matchPhrases(['foo', 'bar', 'baz']);
-}
-() => {
-    R.omit(['a', 'd'], {a: 1, b: 2, c: 3, d: 4}); //=> {b: 2, c: 3}
-    R.omit(['a', 'd'])({a: 1, b: 2, c: 3, d: 4}); //=> {b: 2, c: 3}
-}
+    );
 
+    const out: { must: Array<{ match_phrase: string }> } =
+              matchPhrases(["foo", "bar", "baz"]);
+};
 
 () => {
-    R.fromPairs([['a', 1], ['b', 2],  ['c', 3]]); //=> {a: 1, b: 2, c: 3}
-}
+    R.omit(["a", "d"], {a: 1, b: 2, c: 3, d: 4}); // => {b: 2, c: 3}
+    R.omit(["a", "d"])({a: 1, b: 2, c: 3, d: 4}); // => {b: 2, c: 3}
+};
 
 () => {
-    R.pair('foo', 'bar'); //=> ['foo', 'bar']
-    let p = R.pair('foo', 1); //=> ['foo', 'bar']
+    R.fromPairs([["a", 1], ["b", 2], ["c", 3]]); // => {a: 1, b: 2, c: 3}
+};
+
+() => {
+    R.pair("foo", "bar"); // => ['foo', 'bar']
+    let p         = R.pair("foo", 1); // => ['foo', 'bar']
     let x: string = p[0];
     let y: number = p[1];
-}
+};
 
 () => {
-    var headLens = R.lensIndex(0);
-    R.over(headLens, R.toUpper, ['foo', 'bar', 'baz']); //=> ['FOO', 'bar', 'baz']
-}
+    let headLens = R.lensIndex(0);
+    R.over(headLens, R.toUpper, ["foo", "bar", "baz"]); // => ['FOO', 'bar', 'baz']
+};
 
 () => {
-    R.pickAll(['a', 'd'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, d: 4}
-    R.pickAll(['a', 'd'])({a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, d: 4}
-    R.pickAll(['a', 'e', 'f'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, e: undefined, f: undefined}
-    R.pickAll(['a', 'e', 'f'])({a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, e: undefined, f: undefined}
-}
+    R.pickAll(["a", "d"], {a: 1, b: 2, c: 3, d: 4}); // => {a: 1, d: 4}
+    R.pickAll(["a", "d"])({a: 1, b: 2, c: 3, d: 4}); // => {a: 1, d: 4}
+    R.pickAll(["a", "e", "f"], {a: 1, b: 2, c: 3, d: 4}); // => {a: 1, e: undefined, f: undefined}
+    R.pickAll(["a", "e", "f"])({a: 1, b: 2, c: 3, d: 4}); // => {a: 1, e: undefined, f: undefined}
+};
 
 () => {
-    var isUpperCase = function(val: number, key: string) { return key.toUpperCase() === key; }
-    R.pickBy(isUpperCase, {a: 1, b: 2, A: 3, B: 4}); //=> {A: 3, B: 4}
-}
+    function isUpperCase(val: number, key: string) {
+        return key.toUpperCase() === key;
+    }
+
+    R.pickBy(isUpperCase, {a: 1, b: 2, A: 3, B: 4}); // => {A: 3, B: 4}
+};
 
 () => {
-    var abby = {name: 'Abby', age: 7, hair: 'blond', grade: 2};
-    var fred = {name: 'Fred', age: 12, hair: 'brown', grade: 7};
-    var kids = [abby, fred];
-    R.project(['name', 'grade'], kids); //=> [{name: 'Abby', grade: 2}, {name: 'Fred', grade: 7}]
-}
+    let abby = {name: "Abby", age: 7, hair: "blond", grade: 2};
+    let fred = {name: "Fred", age: 12, hair: "brown", grade: 7};
+    let kids = [abby, fred];
+    R.project(["name", "grade"], kids); // => [{name: 'Abby', grade: 2}, {name: 'Fred', grade: 7}]
+};
 
 () => {
-    var x: number = <number>R.prop('x', {x: 100}); //=> 100
-    const a = R.prop('x', {}); //=> undefined
-}
+    let x: number = <number> R.prop("x", {x: 100}); // => 100
+    const a       = R.prop("x", {}); // => undefined
+};
 
 () => {
-    var alice = {
-      name: 'ALICE',
-      age: 101
+    let alice               = {
+        name: "ALICE",
+        age : 101
     };
-    var favorite = R.prop('favoriteLibrary');
-    var favoriteWithDefault = R.propOr('Ramda', 'favoriteLibrary');
+    let favorite            = R.prop("favoriteLibrary");
+    let favoriteWithDefault = R.propOr("Ramda", "favoriteLibrary");
 
-    const s1 = favorite(alice);  //=> undefined
-    const s2 = favoriteWithDefault(alice);  //=> 'Ramda'
-}
+    const s1 = favorite(alice);  // => undefined
+    const s2 = favoriteWithDefault(alice);  // => 'Ramda'
+};
 
 () => {
-    const a: boolean = R.propSatisfies(x => x > 0, 'x', {x: 1, y: 2}); //=> true
-    const b: boolean = R.propSatisfies(x => x > 0, 'x')({x: 1, y: 2}); //=> true
-    const c: boolean = R.propSatisfies(x => x > 0)('x')({x: 1, y: 2}); //=> true
-}
+    const a: boolean = R.propSatisfies(x => x > 0, "x", {x: 1, y: 2}); // => true
+    const b: boolean = R.propSatisfies(x => x > 0, "x")({x: 1, y: 2}); // => true
+    const c: boolean = R.propSatisfies(x => x > 0)("x")({x: 1, y: 2}); // => true
+};
 
 () => {
-    R.props(['x', 'y'], {x: 1, y: 2}); //=> [1, 2]
-    R.props(['c', 'a', 'b'], {b: 2, a: 1}); //=> [undefined, 1, 2]
+    R.props(["x", "y"], {x: 1, y: 2}); // => [1, 2]
+    R.props(["c", "a", "b"], {b: 2, a: 1}); // => [undefined, 1, 2]
 
-    var fullName = R.compose(R.join(' '), R.props(['first', 'last']));
-    fullName({last: 'Bullet-Tooth', age: 33, first: 'Tony'}); //=> 'Tony Bullet-Tooth'
-}
+    let fullName = R.compose(R.join(" "), R.props(["first", "last"]));
+    fullName({last: "Bullet-Tooth", age: 33, first: "Tony"}); // => 'Tony Bullet-Tooth'
+};
 
 () => {
-    const a = R.toPairs<string,number>({a: 1, b: 2, c: 3}); //=> [['a', 1], ['b', 2], ['c', 3]]
-}
+    const a = R.toPairs<string, number>({a: 1, b: 2, c: 3}); // => [['a', 1], ['b', 2], ['c', 3]]
+};
 
 () => {
-    var f = new F();
-    const a1 = R.toPairsIn(f); //=> [['x','X'], ['y','Y']]
-    const a2 = R.toPairsIn<string,string>(f); //=> [['x','X'], ['y','Y']]
-}
+    let f    = new F();
+    const a1 = R.toPairsIn(f); // => [['x','X'], ['y','Y']]
+    const a2 = R.toPairsIn<string, string>(f); // => [['x','X'], ['y','Y']]
+};
 
 () => {
-    const a = R.values({a: 1, b: 2, c: 3}); //=> [1, 2, 3]
-}
-() => {
-    var f = new F();
-    const a = R.valuesIn(f); //=> ['X', 'Y']
-}
+    const a = R.values({a: 1, b: 2, c: 3}); // => [1, 2, 3]
+};
 
 () => {
-    var spec = {x: 2};
-    var x1: boolean = R.where(spec, {w: 10, x: 2, y: 300}); //=> true
-    var x2: boolean = R.where(spec, {x: 1, y: 'moo', z: true}); //=> false
-    var x3: boolean = R.where(spec)({w: 10, x: 2, y: 300}); //=> true
-    var x4: boolean = R.where(spec)({x: 1, y: 'moo', z: true}); //=> false
+    let f   = new F();
+    const a = R.valuesIn(f); // => ['X', 'Y']
+};
+
+() => {
+    let spec        = {x: 2};
+    let x1: boolean = R.where(spec, {w: 10, x: 2, y: 300}); // => true
+    let x2: boolean = R.where(spec, {x: 1, y: "moo", z: true}); // => false
+    let x3: boolean = R.where(spec)({w: 10, x: 2, y: 300}); // => true
+    let x4: boolean = R.where(spec)({x: 1, y: "moo", z: true}); // => false
 
     // There's no way to represent the below functionality in typescript
     // per http://stackoverflow.com/a/29803848/632495
     // will need a work around.
 
-    var spec2 = {x: function(val: number, obj: any) { return  val + obj.y > 10; }};
-    R.where(spec2, {x: 2, y: 7}); //=> false
-    R.where(spec2, {x: 3, y: 8}); //=> true
+    let spec2 = {
+        x: (val: number, obj: any) => val + obj.y > 10
+    };
+    R.where(spec2, {x: 2, y: 7}); // => false
+    R.where(spec2, {x: 3, y: 8}); // => true
 
-    var xs = [{x: 2, y: 1}, {x: 10, y: 2}, {x: 8, y: 3}, {x: 10, y: 4}];
+    let xs = [{x: 2, y: 1}, {x: 10, y: 2}, {x: 8, y: 3}, {x: 10, y: 4}];
     R.filter(R.where({x: 10}), xs); // ==> [{x: 10, y: 2}, {x: 10, y: 4}]
     R.filter(R.where({x: 10}))(xs); // ==> [{x: 10, y: 2}, {x: 10, y: 4}]
-}
+};
 
 () => {
     // pred :: Object -> Boolean
-    var pred = R.whereEq({a: 1, b: 2});
-    pred({a: 1});              //=> false
-    pred({a: 1, b: 2});        //=> true
-    pred({a: 1, b: 2, c: 3});  //=> true
-    pred({a: 1, b: 1});        //=> false
-    R.whereEq({a: 'one'}, {a: 'one'}); // => true
-}
+    let pred = R.whereEq({a: 1, b: 2});
+    pred({a: 1});              // => false
+    pred({a: 1, b: 2});        // => true
+    pred({a: 1, b: 2, c: 3});  // => true
+    pred({a: 1, b: 1});        // => false
+    R.whereEq({a: "one"}, {a: "one"}); // => true
+};
 
 () => {
-    const a: number[] = R.without([1, 2], [1, 2, 1, 3, 4]); //=> [3, 4]
-}
+    const a: number[] = R.without([1, 2], [1, 2, 1, 3, 4]); // => [3, 4]
+};
 
 () => {
-    var mapIndexed = R.addIndex(R.map);
-    mapIndexed(function(val: string, idx: number) {return idx + '-' + val;})(['f', 'o', 'o', 'b', 'a', 'r']);
-      //=> ['0-f', '1-o', '2-o', '3-b', '4-a', '5-r']
-    mapIndexed((rectangle: Rectangle, idx: number):number => rectangle.area()*idx, [new Rectangle(1,2), new Rectangle(4,7)]);
-      //=> [2, 56]
-}
+    let mapIndexed = R.addIndex(R.map);
+    mapIndexed((val: string, idx: number) => idx + "-" + val)(["f", "o", "o", "b", "a", "r"]);
+    // => ['0-f', '1-o', '2-o', '3-b', '4-a', '5-r']
+    mapIndexed((rectangle: Rectangle, idx: number): number => rectangle.area() * idx, [new Rectangle(1, 2), new Rectangle(4, 7)]);
+    // => [2, 56]
+};
 
 () => {
-    var reduceIndexed = R.addIndex(R.reduce);
-    reduceIndexed(function(acc: string, val: string, idx: number) {
-        return acc + ',' + idx + '-' + val;
-        }
-        ,''
-        ,['f', 'o', 'o', 'b', 'a', 'r']);
-      //=> ['0-f,1-o,2-o,3-b,4-a,5-r']
-}
-
-
+    let reduceIndexed = R.addIndex(R.reduce);
+    reduceIndexed((acc: string, val: string, idx: number) => acc + "," + idx + "-" + val, "", ["f", "o", "o", "b", "a", "r"]);
+    // => ['0-f,1-o,2-o,3-b,4-a,5-r']
+};
 
 () => {
-    var t = R.always('Tee');
-    const x: string = t(); //=> 'Tee'
-}
+    let t           = R.always("Tee");
+    const x: string = t(); // => 'Tee'
+};
 
 () => {
-    const x: number[] = R.ap([R.multiply(2), R.add(3)], [1,2,3]); //=> [2, 4, 6, 4, 5, 6]
-    const y: number[] = R.ap([R.multiply(2), R.add(3)])([1,2,3]); //=> [2, 4, 6, 4, 5, 6]
-}
+    const x: number[] = R.ap([R.multiply(2), R.add(3)], [1, 2, 3]); // => [2, 4, 6, 4, 5, 6]
+    const y: number[] = R.ap([R.multiply(2), R.add(3)])([1, 2, 3]); // => [2, 4, 6, 4, 5, 6]
+};
 
 () => {
-    var nums = [1, 2, 3, -99, 42, 6, 7];
-    R.apply(Math.max, nums); //=> 42
-    R.apply(Math.max)(nums); //=> 42
-}
+    let nums = [1, 2, 3, -99, 42, 6, 7];
+    R.apply(Math.max, nums); // => 42
+    R.apply(Math.max)(nums); // => 42
+};
 
 () => {
-    type T = {sum: number, nested: {mul: number}};
+    interface T { sum: number; nested: { mul: number; }; }
     const getMetrics = R.applySpec<T>({
-        sum: R.add, nested: { mul: R.multiply }
+        sum: R.add, nested: {mul: R.multiply}
     });
-    const result = getMetrics(2, 4); // => { sum: 6, nested: { mul: 8 } }
-}
+    const result     = getMetrics(2, 4); // => { sum: 6, nested: { mul: 8 } }
+};
 
 () => {
-    var takesThreeArgs = function(a: number, b: number, c: number) {
+    function takesThreeArgs(a: number, b: number, c: number) {
         return [a, b, c];
-    };
-    takesThreeArgs.length; //=> 3
-    takesThreeArgs(1, 2, 3); //=> [1, 2, 3]
+    }
 
-    var takesTwoArgs = R.binary(takesThreeArgs);
-    takesTwoArgs.length; //=> 2
+    takesThreeArgs.length; // => 3
+    takesThreeArgs(1, 2, 3); // => [1, 2, 3]
+
+    let takesTwoArgs = R.binary(takesThreeArgs);
+    takesTwoArgs.length; // => 2
     // Only 2 arguments are passed to the wrapped function
-    takesTwoArgs(1, 2, 3); //=> [1, 2, undefined]
-}
+    takesTwoArgs(1, 2, 3); // => [1, 2, undefined]
+};
 
 () => {
-    var indentN = R.pipe(R.times(R.always(' ')),
-         R.join(''),
-         R.replace(/^(?!$)/gm)
+    let indentN = R.pipe(R.times(R.always(" ")),
+        R.join(""),
+        R.replace(/^(?!$)/gm)
     );
 
-    var format = R.converge(
+    let format = R.converge(
         R.call, [
-            R.pipe(R.prop('indent'), indentN),
-            R.prop('value')
+            R.pipe(R.prop("indent"), indentN),
+            R.prop("value")
         ]
     );
 
-    format({indent: 2, value: 'foo\nbar\nbaz\n'}); //=> '  foo\n  bar\n  baz\n'
-}
+    format({indent: 2, value: "foo\nbar\nbaz\n"}); // => '  foo\n  bar\n  baz\n'
+};
 
 () => {
-    type T = {age: number};
-    var cmp = R.comparator(function(a: T, b: T) {
-      return a.age < b.age;
-    });
-    var people = [
-      {name: 'Agy', age:33}, {name: 'Bib', age: 15}, {name: 'Cari', age: 16}
+    interface T { age: number; }
+    let cmp    = R.comparator((a: T, b: T) => a.age < b.age);
+    let people = [
+        {name: "Agy", age: 33}, {name: "Bib", age: 15}, {name: "Cari", age: 16}
     ];
     R.sort(cmp, people);
-}
+};
 
 () => {
-    var add = function(a: number, b: number) { return a + b; };
-    var multiply = function(a: number, b: number) { return a * b; };
-    var subtract = function(a: number, b: number) { return a - b; };
+    let people = [
+        {name: 'Agy', age: 33}, {name: 'Bib', age: 15}, {name: 'Cari', age: 16}
+    ];
 
-    //≅ multiply( add(1, 2), subtract(1, 2) );
-    const x: number = R.converge(multiply, [ add, subtract ])(1, 2); //=> -3
-
-    var add3 = function(a: number, b: number, c: number) { return a + b + c; };
-    const y: number = R.converge(add3, [ multiply, add, subtract ])(1, 2); //=> 4
-}
+    R.sortWith([R.ascend(R.prop('age')), R.descend(R.prop('name'))], people);
+};
 
 () => {
-    const f0 = R.compose(Math.pow);
-    const f1 = R.compose(R.negate, Math.pow);
-    const f2 = R.compose(R.inc, R.negate, Math.pow);
-    const f3 = R.compose(R.inc, R.inc, R.negate, Math.pow);
-    const f4 = R.compose(R.inc, R.inc, R.inc, R.negate, Math.pow);
-    const f5 = R.compose(R.inc, R.inc, R.inc, R.inc, R.negate, Math.pow);
+    function add(a: number, b: number) {
+        return a + b;
+    }
+
+    function multiply(a: number, b: number) {
+        return a * b;
+    }
+
+    function subtract(a: number, b: number) {
+        return a - b;
+    }
+
+    // ≅ multiply( add(1, 2), subtract(1, 2) );
+    const x: number = R.converge(multiply, [add, subtract])(1, 2); // => -3
+
+    function add3(a: number, b: number, c: number) {
+        return a + b + c;
+    }
+
+    const y: number = R.converge(add3, [multiply, add, subtract])(1, 2); // => 4
+};
+
+() => {
+    const f0         = R.compose(Math.pow);
+    const f1         = R.compose(R.negate, Math.pow);
+    const f2         = R.compose(R.inc, R.negate, Math.pow);
+    const f3         = R.compose(R.inc, R.inc, R.negate, Math.pow);
+    const f4         = R.compose(R.inc, R.inc, R.inc, R.negate, Math.pow);
+    const f5         = R.compose(R.inc, R.inc, R.inc, R.inc, R.negate, Math.pow);
     const x0: number = f0(3, 4); // -(3^4) + 1
     const x1: number = f1(3, 4); // -(3^4) + 1
     const x2: number = f2(3, 4); // -(3^4) + 1
     const x3: number = f3(3, 4); // -(3^4) + 1
     const x4: number = f4(3, 4); // -(3^4) + 1
     const x5: number = f5(3, 4); // -(3^4) + 1
-}
+};
 
 () => {
-    const fn = function(a: string, b: number, c: string) {
-        return [a,b,c];
+    function fn(a: string, b: number, c: string) {
+        return [a, b, c];
     }
-    const gn = R.compose(R.length, fn);
-    const x: number = gn('Hello', 4, "world");
-}
+
+    const gn        = R.compose(R.length, fn);
+    const x: number = gn("Hello", 4, "world");
+};
 
 (() => {
-    var Circle = function(r: number) {
-        this.r = r;
+    function Circle(r: number) {
+        this.r      = r;
         this.colors = Array.prototype.slice.call(arguments, 1);
-    };
-    Circle.prototype.area = function() {return Math.PI * Math.pow(this.r, 2);};
-    var circleN = R.constructN(2, Circle);
-    var c1 = circleN(1, 'red');
-    var circle = R.construct(Circle);
-    var c1 = circle(1, 'red');
+    }
+
+    Circle.prototype.area = () => Math.PI * Math.pow(this.r, 2);
+
+    let circleN = R.constructN(2, Circle);
+    let c1      = circleN(1, "red");
+    let circle  = R.construct(Circle);
+    c1          = circle(1, "red");
 })();
 
 /*****************************************************************
  * Relation category
  */
+() => {
+    let numbers = [1.0, 1.1, 1.2, 2.0, 3.0, 2.2];
+    let letters = R.split("", "abcABCaaaBBc");
+    R.countBy(Math.floor)(numbers);    // => {'1': 3, '2': 2, '3': 1}
+    R.countBy(R.toLower)(letters);   // => {'a': 5, 'b': 4, 'c': 3}
+};
 
 () => {
-    var numbers = [1.0, 1.1, 1.2, 2.0, 3.0, 2.2];
-    var letters = R.split('', 'abcABCaaaBBc');
-    R.countBy(Math.floor)(numbers);    //=> {'1': 3, '2': 2, '3': 1}
-    R.countBy(R.toLower)(letters);   //=> {'a': 5, 'b': 4, 'c': 3}
-}
+    R.difference([1, 2, 3, 4], [7, 6, 5, 4, 3]); // => [1,2]
+    R.difference([7, 6, 5, 4, 3], [1, 2, 3, 4]); // => [7,6,5]
+};
 
 () => {
-    R.difference([1,2,3,4], [7,6,5,4,3]); //=> [1,2]
-    R.difference([7,6,5,4,3], [1,2,3,4]); //=> [7,6,5]
-}
+    function cmp(x: any, y: any) {
+        return x.a === y.a;
+    }
+
+    let l1 = [{a: 1}, {a: 2}, {a: 3}];
+    let l2 = [{a: 3}, {a: 4}];
+    R.differenceWith(cmp, l1, l2); // => [{a: 1}, {a: 2}]
+};
 
 () => {
-    function cmp(x: any, y: any) { return x.a === y.a; }
-    var l1 = [{a: 1}, {a: 2}, {a: 3}];
-    var l2 = [{a: 3}, {a: 4}];
-    R.differenceWith(cmp, l1, l2); //=> [{a: 1}, {a: 2}]
-}
+    R.equals(1, 1); // => true
+    R.equals("2", "1"); // => false
+    R.equals([1, 2, 3], [1, 2, 3]); // => true
+
+    let a: any = {};
+    a.v        = a;
+    let b: any = {};
+    b.v        = b;
+    R.equals(a, b); // => true
+};
 
 () => {
-    R.equals(1, 1); //=> true
-    R.equals('2', '1'); //=> false
-    R.equals([1, 2, 3], [1, 2, 3]); //=> true
-
-    var a: any = {}; a.v = a;
-    var b: any = {}; b.v = b;
-    R.equals(a, b); //=> true
-}
+    const a1 = R.identity(1); // => 1
+    let obj  = {};
+    const a2 = R.identity([1, 2, 3]);
+    const a3 = R.identity(["a", "b", "c"]);
+    const a4 = R.identity(obj) === obj; // => true
+};
 
 () => {
-    const a1 = R.identity(1); //=> 1
-    let obj = {};
-    const a2 = R.identity([1,2,3]);
-    const a3 = R.identity(['a','b','c']);
-    const a4 = R.identity(obj) === obj; //=> true
-}
+    let o = {};
+    R.identical(o, o); // => true
+    R.identical(1, 1); // => true
+    R.identical("2", "1"); // => false
+    R.identical([], []); // => false
+    R.identical(0, -0); // => false
+    R.identical(NaN, NaN); // => true
+};
 
 () => {
-    var o = {};
-    R.identical(o, o); //=> true
-    R.identical(1, 1); //=> true
-    R.identical('2', '1'); //=> false
-    R.identical([], []); //=> false
-    R.identical(0, -0); //=> false
-    R.identical(NaN, NaN); //=> true
-}
+    const testPath = ["x", 0, "y"];
+    const testObj  = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
+
+    R.path(testPath, testObj); // => 2
+    R.path(testPath)(testObj); // => 2
+};
 
 () => {
-    const testPath = ['x', 0, 'y'];
-    const testObj = {x: [{y: 2, z: 3}, {y: 4, z: 5}]};
-
-    R.path(testPath, testObj); //=> 2
-    R.path(testPath)(testObj); //=> 2
-}
-
-() => {
-    var sortByAgeDescending = R.sortBy(R.compose(R.negate, R.prop('age')));
-    var alice = {
-      name: 'ALICE',
-      age: 101
+    let sortByAgeDescending = R.sortBy(R.compose(R.negate, R.prop("age")));
+    let alice               = {
+        name: "ALICE",
+        age : 101
     };
-    var bob = {
-      name: 'Bob',
-      age: -10
+    let bob                 = {
+        name: "Bob",
+        age : -10
     };
-    var clara = {
-      name: 'clara',
-      age: 314.159
+    let clara               = {
+        name: "clara",
+        age : 314.159
     };
-    var people = [clara, bob, alice];
-    sortByAgeDescending(people); //=> [alice, bob, clara]
-}
+    let people              = [clara, bob, alice];
+    sortByAgeDescending(people); // => [alice, bob, clara]
+};
 
 () => {
-    var sortByNameCaseInsensitive = R.sortBy(R.compose(R.toLower, R.prop('name')));
-    var alice = {
-      name: 'ALICE',
-      age: 101
+    let sortByNameCaseInsensitive = R.sortBy(R.compose(R.toLower, R.prop("name")));
+    let alice                     = {
+        name: "ALICE",
+        age : 101
     };
-    var bob = {
-      name: 'Bob',
-      age: -10
+    let bob                       = {
+        name: "Bob",
+        age : -10
     };
-    var clara = {
-      name: 'clara',
-      age: 314.159
+    let clara                     = {
+        name: "clara",
+        age : 314.159
     };
-    var people = [clara, bob, alice];
-    sortByNameCaseInsensitive(people); //=> [alice, bob, clara]
-}
+    let people                    = [clara, bob, alice];
+    sortByNameCaseInsensitive(people); // => [alice, bob, clara]
+};
 
 () => {
-	const a: number[][] = R.splitAt(1, [1, 2, 3]);        //=> [[1], [2, 3]]
-	const b: number[][] = R.splitAt(1)([1, 2, 3]);        //=> [[1], [2, 3]]
-    const c: string[] = R.splitAt(5, 'hello world');      //=> ['hello', ' world']
-    const d: string[] = R.splitAt(-1, 'foobar');          //=> ['fooba', 'r']
-}
+    const a: number[][] = R.splitAt(1, [1, 2, 3]);        // => [[1], [2, 3]]
+    const b: number[][] = R.splitAt(1)([1, 2, 3]);        // => [[1], [2, 3]]
+    const c: string[]   = R.splitAt(5, "hello world");      // => ['hello', ' world']
+    const d: string[]   = R.splitAt(-1, "foobar");          // => ['fooba', 'r']
+};
 
 () => {
-	const a: number[][] = R.splitWhen(R.equals(2), [1, 2, 3, 1, 2, 3]);   //=> [[1], [2, 3, 1, 2, 3]]
-	const b: number[][] = R.splitWhen(R.equals(2))([1, 2, 3, 1, 2, 3]);   //=> [[1], [2, 3, 1, 2, 3]]
-}
+    const a: number[][] = R.splitWhen(R.equals(2), [1, 2, 3, 1, 2, 3]);   // => [[1], [2, 3, 1, 2, 3]]
+    const b: number[][] = R.splitWhen(R.equals(2))([1, 2, 3, 1, 2, 3]);   // => [[1], [2, 3, 1, 2, 3]]
+};
 
 () => {
-    R.add(2, 3);       //=>  5
-    R.add(7)(10);      //=> 17
-    R.add("Hello", " World");  //=>  "Hello World"
-    R.add("Hello")(" World");  //=>  "Hello World"
-}
+    R.add(2, 3);       // =>  5
+    R.add(7)(10);      // => 17
+    R.add("Hello", " World");  // =>  "Hello World"
+    R.add("Hello")(" World");  // =>  "Hello World"
+};
 
 () => {
-    R.dec(42); //=> 41
-}
+    R.dec(42); // => 41
+};
 
 () => {
-    R.divide(71, 100); //=> 0.71
+    R.divide(71, 100); // => 0.71
 
-    var half = R.flip(R.divide)(2);
-    half(42); //=> 21
+    let half = R.flip(R.divide)(2);
+    half(42); // => 21
 
-    var reciprocal = R.divide(1);
-    reciprocal(4);   //=> 0.25
-}
+    let reciprocal = R.divide(1);
+    reciprocal(4);   // => 0.25
+};
 
 () => {
-    R.gt(2, 6); //=> false
-    R.gt(2, 0); //=> true
-    R.gt(2, 2); //=> false
-    R.flip(R.gt)(2)(10); //=> true
-    R.gt(2)(10); //=> false
-}
+    R.gt(2, 6); // => false
+    R.gt(2, 0); // => true
+    R.gt(2, 2); // => false
+    R.flip(R.gt)(2)(10); // => true
+    R.gt(2)(10); // => false
+};
 
 () => {
-    R.gte(2, 6); //=> false
-    R.gte(2, 0); //=> true
-    R.gte(2, 2); //=> false
-    R.flip(R.gte)(2)(10); //=> true
-    R.gte(2)(10); //=> false
-}
+    R.gte(2, 6); // => false
+    R.gte(2, 0); // => true
+    R.gte(2, 2); // => false
+    R.flip(R.gte)(2)(10); // => true
+    R.gte(2)(10); // => false
+};
 
 () => {
-    R.isNaN(NaN);        //=> true
-    R.isNaN(undefined);  //=> false
-    R.isNaN({});         //=> false
-}
+    R.isNaN(NaN);        // => true
+    R.isNaN(undefined);  // => false
+    R.isNaN({});         // => false
+};
 
 () => {
-    R.lt(2, 6); //=> true
-    R.lt(2, 0); //=> false
-    R.lt(2, 2); //=> false
-    R.lt(5)(10); //=> true
-    R.flip(R.lt)(5)(10); //=> false // right-sectioned currying
-}
+    R.lt(2, 6); // => true
+    R.lt(2, 0); // => false
+    R.lt(2, 2); // => false
+    R.lt(5)(10); // => true
+    R.flip(R.lt)(5)(10); // => false // right-sectioned currying
+};
 
 () => {
-    R.lte(2, 6); //=> true
-    R.lte(2, 0); //=> false
-    R.lte(2, 2); //=> true
-    R.flip(R.lte)(2)(1); //=> true
-    R.lte(2)(10); //=> true
-}
+    R.lte(2, 6); // => true
+    R.lte(2, 0); // => false
+    R.lte(2, 2); // => true
+    R.flip(R.lte)(2)(1); // => true
+    R.lte(2)(10); // => true
+};
 
 () => {
-    R.mathMod(-17, 5);  //=> 3
-    R.mathMod(17, 5);   //=> 2
-    R.mathMod(17, -5);  //=> NaN
-    R.mathMod(17, 0);   //=> NaN
-    R.mathMod(17.2, 5); //=> NaN
-    R.mathMod(17, 5.3); //=> NaN
+    R.mathMod(-17, 5);  // => 3
+    R.mathMod(17, 5);   // => 2
+    R.mathMod(17, -5);  // => NaN
+    R.mathMod(17, 0);   // => NaN
+    R.mathMod(17.2, 5); // => NaN
+    R.mathMod(17, 5.3); // => NaN
 
-    var clock = R.flip(R.mathMod)(12);
-    clock(15); //=> 3
-    clock(24); //=> 0
+    let clock = R.flip(R.mathMod)(12);
+    clock(15); // => 3
+    clock(24); // => 0
 
-    var seventeenMod = R.mathMod(17);
-    seventeenMod(3);  //=> 2
-}
+    let seventeenMod = R.mathMod(17);
+    seventeenMod(3);  // => 2
+};
 
 () => {
-    var hasName = R.has('name');
-    hasName({name: 'alice'});   //=> true
-    hasName({name: 'bob'});     //=> true
-    hasName({});                //=> false
+    let hasName = R.has("name");
+    hasName({name: "alice"});   // => true
+    hasName({name: "bob"});     // => true
+    hasName({});                // => false
 
-    var point = {x: 0, y: 0};
-    var pointHas = R.flip(R.has)(point);
-    pointHas('x');  //=> true
-    pointHas('y');  //=> true
-    pointHas('z');  //=> false
-}
+    let point    = {x: 0, y: 0};
+    let pointHas = R.flip(R.has)(point);
+    pointHas("x");  // => true
+    pointHas("y");  // => true
+    pointHas("z");  // => false
+};
 
 () => {
-    let x: R.Ord = R.max(7, 3); //=> 7
-    let y: R.Ord = R.max('a', 'z'); //=> 'z'
-}
+    let x: R.Ord = R.max(7, 3); // => 7
+    let y: R.Ord = R.max("a", "z"); // => 'z'
+};
 
 () => {
-    function cmp(obj: { x: R.Ord }) { return obj.x; }
-    var a = {x: 1}, b = {x: 2}, c = {x: 3}, d = {x: "a"}, e = {x:"z"};
-    R.maxBy(cmp, a, c); //=> {x: 3}
-    R.maxBy(cmp)(a, c); //=> {x: 3}
+    function cmp(obj: { x: R.Ord }) {
+        return obj.x;
+    }
+
+    let a = {x: 1};
+    let b = {x: 2};
+    let c = {x: 3};
+    let d = {x: "a"};
+    let e = {x: "z"};
+    R.maxBy(cmp, a, c); // => {x: 3}
+    R.maxBy(cmp)(a, c); // => {x: 3}
     R.maxBy(cmp)(a)(b);
     R.maxBy(cmp)(d)(e);
-}
+};
 
 () => {
-    const a: number = R.mean([2, 7, 9]); //=> 6
-    const b: number = R.mean([]); //=> NaN
-}
+    const a: number = R.mean([2, 7, 9]); // => 6
+    const b: number = R.mean([]); // => NaN
+};
 
 () => {
-    const a: number = R.median([7, 2, 10, 9]); //=> 8
-    const b: number = R.median([]); //=> NaN
-}
+    const a: number = R.median([7, 2, 10, 9]); // => 8
+    const b: number = R.median([]); // => NaN
+};
 
 () => {
-    let x: R.Ord = R.min(9, 3); //=> 3
-    let y: R.Ord = R.min('a', 'z'); //=> 'a'
-}
+    let x: R.Ord = R.min(9, 3); // => 3
+    let y: R.Ord = R.min("a", "z"); // => 'a'
+};
 
 () => {
-    function cmp(obj: {x: R.Ord}) { return obj.x; }
-    var a = {x: 1}, b = {x: 2}, c = {x: 3}, d = {x: "a"}, e = {x: "z"};
-    R.minBy(cmp, a, b); //=> {x: 1}
-    R.minBy(cmp)(a, b); //=> {x: 1}
+    function cmp(obj: { x: R.Ord }) {
+        return obj.x;
+    }
+
+    let a = {x: 1};
+    let b = {x: 2};
+    let c = {x: 3};
+    let d = {x: "a"};
+    let e = {x: "z"};
+    R.minBy(cmp, a, b); // => {x: 1}
+    R.minBy(cmp)(a, b); // => {x: 1}
     R.minBy(cmp)(a)(c);
     R.minBy(cmp, d, e);
-}
+};
 
 () => {
-    R.modulo(17, 3); //=> 2
+    R.modulo(17, 3); // => 2
     // JS behavior:
-    R.modulo(-17, 3); //=> -2
-    R.modulo(17, -3); //=> 2
+    R.modulo(-17, 3); // => -2
+    R.modulo(17, -3); // => 2
 
-    var isOdd = R.flip(R.modulo)(2);
-    isOdd(42); //=> 0
-    isOdd(21); //=> 1
-}
+    let isOdd = R.flip(R.modulo)(2);
+    isOdd(42); // => 0
+    isOdd(21); // => 1
+};
 
 () => {
-    var double = R.multiply(2);
-    var triple = R.multiply(3);
-    double(3);       //=>  6
-    triple(4);       //=> 12
-    R.multiply(2, 5);  //=> 10
-}
+    let double = R.multiply(2);
+    let triple = R.multiply(3);
+    double(3);       // =>  6
+    triple(4);       // => 12
+    R.multiply(2, 5);  // => 10
+};
 
 () => {
-    R.negate(42); //=> -42
-}
+    R.negate(42); // => -42
+};
 
 () => {
-    R.product([2,4,6,8,100,1]); //=> 38400
-}
+    R.product([2, 4, 6, 8, 100, 1]); // => 38400
+};
 
 () => {
-    R.subtract(10, 8); //=> 2
+    R.subtract(10, 8); // => 2
 
-    var minus5 = R.flip(R.subtract)(5);
-    minus5(17); //=> 12
+    let minus5 = R.flip(R.subtract)(5);
+    minus5(17); // => 12
 
-    var complementaryAngle = R.subtract(90);
-    complementaryAngle(30); //=> 60
-    complementaryAngle(72); //=> 18
-}
+    let complementaryAngle = R.subtract(90);
+    complementaryAngle(30); // => 60
+    complementaryAngle(72); // => 18
+};
 
 () => {
-    R.sum([2,4,6,8,100,1]); //=> 121
-}
+    R.sum([2, 4, 6, 8, 100, 1]); // => 121
+};
 
 () => {
-	const a: number[] = R.symmetricDifference([1,2,3,4], [7,6,5,4,3]); //=> [1,2,7,6,5]
-	const b: number[] = R.symmetricDifference([7,6,5,4,3])([1,2,3,4]); //=> [7,6,5,1,2]
-}
+    const a: number[] = R.symmetricDifference([1, 2, 3, 4], [7, 6, 5, 4, 3]); // => [1,2,7,6,5]
+    const b: number[] = R.symmetricDifference([7, 6, 5, 4, 3])([1, 2, 3, 4]); // => [7,6,5,1,2]
+};
 
 () => {
-	const eqA = R.eqBy(R.prop('a'));
-	const l1 = [{a: 1}, {a: 2}, {a: 3}, {a: 4}];
-	const l2 = [{a: 3}, {a: 4}, {a: 5}, {a: 6}];
-	R.symmetricDifferenceWith(eqA, l1, l2); //=> [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
-	R.symmetricDifferenceWith(eqA)(l1, l2); //=> [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
-	const c: (a: any[]) => any[] = R.symmetricDifferenceWith(eqA)(l1); //=> [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
-}
+    const eqA = R.eqBy(R.prop("a"));
+    const l1  = [{a: 1}, {a: 2}, {a: 3}, {a: 4}];
+    const l2  = [{a: 3}, {a: 4}, {a: 5}, {a: 6}];
+    R.symmetricDifferenceWith(eqA, l1, l2); // => [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
+    R.symmetricDifferenceWith(eqA)(l1, l2); // => [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
+    const c: (a: any[]) => any[] = R.symmetricDifferenceWith(eqA)(l1); // => [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
+};
 
 /*****************************************************************
  * String category
  */
-
 () => {
-    R.replace('foo', 'bar', 'foo foo foo'); //=> 'bar foo foo'
-    R.replace('foo', 'bar')('foo foo foo'); //=> 'bar foo foo'
-    R.replace('foo')('bar')('foo foo foo'); //=> 'bar foo foo'
-    R.replace(/foo/, 'bar', 'foo foo foo'); //=> 'bar foo foo'
+    R.replace("foo", "bar", "foo foo foo"); // => 'bar foo foo'
+    R.replace("foo", "bar")("foo foo foo"); // => 'bar foo foo'
+    R.replace("foo")("bar")("foo foo foo"); // => 'bar foo foo'
+    R.replace(/foo/, "bar", "foo foo foo"); // => 'bar foo foo'
 
     // Use the "g" (global) flag to replace all occurrences:
-    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'
-}
+    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'
+};
 
 /*****************************************************************
  * Is category
  */
-
 () => {
-    R.is(Object, {}); //=> true
-    R.is(Object)({}); //=> true
-    R.is(Number, 1); //=> true
-    R.is(Number)(1); //=> true
-    R.is(Object, 1); //=> false
-    R.is(Object)(1); //=> false
-    R.is(String, 's'); //=> true
-    R.is(String)('s'); //=> true
-    R.is(String, new String('')); //=> true
-    R.is(String)(new String('')); //=> true
-    R.is(Object, new String('')); //=> true
-    R.is(Object)(new String('')); //=> true
-    R.is(Object, 's'); //=> false
-    R.is(Object)('s'); //=> false
-    R.is(Number, {}); //=> false
-    R.is(Number)({}); //=> false
-}
+    R.is(Object, {}); // => true
+    R.is(Object)({}); // => true
+    R.is(Number, 1); // => true
+    R.is(Number)(1); // => true
+    R.is(Object, 1); // => false
+    R.is(Object)(1); // => false
+    R.is(String, "s"); // => true
+    R.is(String)("s"); // => true
+    R.is(String, new String("")); // => true
+    R.is(String)(new String("")); // => true
+    R.is(Object, new String("")); // => true
+    R.is(Object)(new String("")); // => true
+    R.is(Object, "s"); // => false
+    R.is(Object)("s"); // => false
+    R.is(Number, {}); // => false
+    R.is(Number)({}); // => false
+};
 
 /*****************************************************************
  * Logic category
  */
 () => {
-    var gt10 = function(x: number) { return x > 10; };
-    var even = function(x: number) { return x % 2 === 0};
-    var f = R.allPass([gt10, even]);
-    f(11); //=> false
-    f(12); //=> true
-}
+    function gt10(x: number) {
+        return x > 10;
+    }
+
+    function even(x: number) {
+        return x % 2 === 0;
+    }
+
+    let f = R.allPass([gt10, even]);
+    f(11); // => false
+    f(12); // => true
+};
 
 () => {
-    R.and(false, true); //=> false
-    R.and(0, []); //=> 0
-    R.and(0)([]); //=> 0
-    R.and(null, ''); //=> null
-    var Why: any = (function(val: boolean) {
-        var why: any;
+    R.and(false, true); // => false
+    R.and(0, []); // => 0
+    R.and(0)([]); // => 0
+    R.and(null, ""); // => null
+    let Why: any = ((val: boolean) => {
+        let why: any;
         why.val = val;
-        why.and = function(x: boolean) {
-            return this.val && x;
-        }
+        why.and = (x: boolean) => this.val && x;
         return Why;
     })(true);
-    var why = new Why(true);
+    let why      = new Why(true);
     R.and(why, false); // false
-}
-() => {
-    var gt10 = function(x: number) { return x > 10; };
-    var even = function(x: number) { return x % 2 === 0};
-    var f = R.anyPass([gt10, even]);
-    f(11); //=> true
-    f(8); //=> true
-    f(9); //=> false
-}
+};
 
 () => {
-    var gt10 = function(x: number) { return x > 10; };
-    var even = function(x: number) { return x % 2 === 0 };
-    var f = R.both(gt10, even);
-    var g = R.both(gt10)(even);
-    f(100); //=> true
-    f(101); //=> false
-}
+    function gt10(x: number) {
+        return x > 10;
+    }
+
+    function even(x: number) {
+        return x % 2 === 0;
+    }
+
+    let f = R.anyPass([gt10, even]);
+    f(11); // => true
+    f(8); // => true
+    f(9); // => false
+};
+
 () => {
-    var isEven = function(n: number) { return n % 2 === 0; };
-    var isOdd = R.complement(isEven);
-    isOdd(21); //=> true
-    isOdd(42); //=> false
-}
+    function gt10(x: number) {
+        return x > 10;
+    }
+
+    function even(x: number) {
+        return x % 2 === 0;
+    }
+
+    let f = R.both(gt10, even);
+    let g = R.both(gt10)(even);
+    f(100); // => true
+    f(101); // => false
+};
+
+() => {
+    function isEven(n: number) {
+        return n % 2 === 0;
+    }
+
+    let isOdd = R.complement(isEven);
+    isOdd(21); // => true
+    isOdd(42); // => false
+};
 
 (() => {
-    R.eqBy(Math.abs, 5, -5); //=> true
+    R.eqBy(Math.abs, 5, -5); // => true
 });
 
 () => {
-    var defaultTo42 = R.defaultTo(42);
-    defaultTo42(null);  //=> 42
-    defaultTo42(undefined);  //=> 42
-    defaultTo42('Ramda');  //=> 'Ramda'
-}
+    let defaultTo42 = R.defaultTo(42);
+    defaultTo42(null);  // => 42
+    defaultTo42(undefined);  // => 42
+    defaultTo42("Ramda");  // => 'Ramda'
+};
+
 () => {
-    var gt10 = function(x: number) { return x > 10; };
-    var even = function(x: number) { return x % 2 === 0 };
-    var f = R.either(gt10, even);
-    var g = R.either(gt10)(even);
-    f(101); //=> true
-    f(8); //=> true
-}
+    function gt10(x: number) {
+        return x > 10;
+    }
+
+    function even(x: number) {
+        return x % 2 === 0;
+    }
+
+    let f = R.either(gt10, even);
+    let g = R.either(gt10)(even);
+    f(101); // => true
+    f(8); // => true
+};
+
 () => {
     // Flatten all arrays in the list but leave other values alone.
-    var flattenArrays = R.map(R.ifElse(Array.isArray, R.flatten, R.identity));
+    let flattenArrays = R.map(R.ifElse(Array.isArray, R.flatten, R.identity));
 
-    flattenArrays([[0], [[10], [8]], 1234, {}]); //=> [[0], [10, 8], 1234, {}]
-    flattenArrays([[[10], 123], [8, [10]], "hello"]); //=> [[10, 123], [8, 10], "hello"]
-}
-() => {
-    R.isEmpty([1, 2, 3]); //=> false
-    R.isEmpty([]); //=> true
-    R.isEmpty(''); //=> true
-    R.isEmpty(null); //=> false
-    R.isEmpty({}); //=>true
-    R.isEmpty({a:1}); //=> false
-}
+    flattenArrays([[0], [[10], [8]], 1234, {}]); // => [[0], [10, 8], 1234, {}]
+    flattenArrays([[[10], 123], [8, [10]], "hello"]); // => [[10, 123], [8, 10], "hello"]
+};
 
 () => {
-    R.not(true); //=> false
-    R.not(false); //=> true
+    R.isEmpty([1, 2, 3]); // => false
+    R.isEmpty([]); // => true
+    R.isEmpty(""); // => true
+    R.isEmpty(null); // => false
+    R.isEmpty({}); // =>true
+    R.isEmpty({a: 1}); // => false
+};
+
+() => {
+    R.not(true); // => false
+    R.not(false); // => true
     R.not(0); // => true
     R.not(1); // => false
-}
+};
 
 class Why {
     val: boolean;
+
     constructor(val: boolean) {
         this.val = val;
     }
+
     or(x: boolean) {
         return this.val && x;
     }
 }
 () => {
-    const x0: boolean = R.or(false, true); //=> false
-    const x1: number|any[] = R.or(0, []); //=> []
-    const x2: number|any[] = R.or(0)([]); //=> []
-    const x3: string = R.or(null, ''); //=> ''
+    const x0: boolean        = R.or(false, true); // => false
+    const x1: number | any[] = R.or(0, []); // => []
+    const x2: number | any[] = R.or(0)([]); // => []
+    const x3: string         = R.or(null, ""); // => ''
 
-    var why = new Why(true);
-    why.or(true)
-    const x4: Why|boolean = R.or(why, false); // false
-}
+    let why = new Why(true);
+    why.or(true);
+    const x4: Why | boolean = R.or(why, false); // false
+};
 
 () => {
-    R.intersperse(',', ['foo', 'bar']); //=> ['foo', ',', 'bar']
-    R.intersperse(0, [1, 2]); //=> [1, 0, 2]
-    R.intersperse(0, [1]); //=> [1]
-}
+    R.intersperse(",", ["foo", "bar"]); // => ['foo', ',', 'bar']
+    R.intersperse(0, [1, 2]); // => [1, 0, 2]
+    R.intersperse(0, [1]); // => [1]
+};
 
 {
     const functor = {
         map: (fn: (x: string) => string) => functor
-    }
-    R.map(x => x.trim(), functor)
+    };
+    R.map(x => x.trim(), functor);
 }
diff --git a/types/ramda/tslint.json b/types/ramda/tslint.json
new file mode 100644
index 0000000000..6356421ec0
--- /dev/null
+++ b/types/ramda/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-construct": false // Required for R.is function testing
+  }
+}
diff --git a/types/random-js/random-js-tests.ts b/types/random-js/random-js-tests.ts
index 177a037dee..1b9e27c177 100644
--- a/types/random-js/random-js-tests.ts
+++ b/types/random-js/random-js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node"/>
-
 // Examples taken from the documentation at https://github.com/ckknight/random-js
 // create a Mersenne Twister-19937 that is auto-seeded based on time and other random values
 import Engine = Random.Engine;
diff --git a/types/randomstring/index.d.ts b/types/randomstring/index.d.ts
index e683cef6b7..173b311465 100644
--- a/types/randomstring/index.d.ts
+++ b/types/randomstring/index.d.ts
@@ -11,7 +11,7 @@ declare namespace Randomstring {
         capitalization?: string;
     }
 
-    function generate(options?: GenerateOptions): string;
+    function generate(options?: GenerateOptions | number): string;
 }
 
 declare module "randomstring" {
diff --git a/types/rangy/index.d.ts b/types/rangy/index.d.ts
index b6615b9aad..4a3afc08a1 100644
--- a/types/rangy/index.d.ts
+++ b/types/rangy/index.d.ts
@@ -31,6 +31,7 @@ interface RangyRange extends Range {
     equals(range:RangyRange):boolean;
     refresh():any;
     select():any;
+    toCharacterRange(containerNode:Node):{start:number, end:number};
 }
 
 interface RangySelection extends Selection {
diff --git a/types/rangy/rangy-tests.ts b/types/rangy/rangy-tests.ts
index de2ec468f0..3b177a46b3 100644
--- a/types/rangy/rangy-tests.ts
+++ b/types/rangy/rangy-tests.ts
@@ -74,6 +74,7 @@ function testRangyRange() {
     rangyRange.splitBoundaries();
     assertString(rangyRange.toHtml());
     assertRangyRange(rangyRange.union(rangyRange));
+    let characterRange:{start:number, end:number} = rangyRange.toCharacterRange(new Node);
 }
 
 function testSelection() {
diff --git a/types/rangyinputs/index.d.ts b/types/rangyinputs/index.d.ts
index 4178b45e7b..17df268f02 100644
--- a/types/rangyinputs/index.d.ts
+++ b/types/rangyinputs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/timdown/rangyinputs
 // Definitions by: Eric Simonton <https://github.com/ersimont>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/rappid/index.d.ts b/types/rappid/index.d.ts
index d70023e055..321dbed671 100644
--- a/types/rappid/index.d.ts
+++ b/types/rappid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://jointjs.com/about-rappid
 // Definitions by: Ewout Van Gossum <https://github.com/DenEwout>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jointjs" />
 
diff --git a/types/raty/index.d.ts b/types/raty/index.d.ts
index 146671e3f9..202c183b11 100644
--- a/types/raty/index.d.ts
+++ b/types/raty/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/wbotelhos/raty
 // Definitions by: Matt Wheatley <http://github.com/terrawheat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/rc-select/index.d.ts b/types/rc-select/index.d.ts
index d9d9723b5b..18dfb46e67 100644
--- a/types/rc-select/index.d.ts
+++ b/types/rc-select/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for React Select v5.9.0
-// Project: https://github.com/react-component/select 
+// Project: https://github.com/react-component/select
 // Definitions by: Denis Tirilis <https://github.com/DenisTirilis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -50,19 +50,19 @@ declare namespace RcSelect {
         defaultActiveFirstOption?: boolean;
         getPopupContainer?: (trigger: Node) => Node;
     }
-    export class Select extends React.Component<SelectProps, any> { }
+    export class Select extends React.Component<SelectProps> { }
     interface OptionProps {
         className?: string;
         disabled?: boolean;
         key?: string;
         value?: string;
     }
-    export class Option extends React.Component<OptionProps, any> { }
+    export class Option extends React.Component<OptionProps> { }
 
     interface OptGroupProps {
         label?: string | React.ReactElement<any>;
         key?: string;
         value?: string;
     }
-    export class OptGroup extends React.Component<OptGroupProps, any> { }
+    export class OptGroup extends React.Component<OptGroupProps> { }
 }
diff --git a/types/rc-select/rc-select-tests.ts b/types/rc-select/rc-select-tests.ts
index 976d789c2c..5416919a6f 100644
--- a/types/rc-select/rc-select-tests.ts
+++ b/types/rc-select/rc-select-tests.ts
@@ -1,7 +1,7 @@
-import React = require('react');
-import RcSelect = require('rc-select');
+import * as React from 'react';
+import * as RcSelect from 'rc-select';
 
-class Component extends React.Component<any, any> {
+class Component extends React.Component {
 
     private onChange(value: any) {
         console.log('selected', value);
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index 1077faf3c9..34cfc22056 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/slider
 // Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -144,11 +144,11 @@ declare namespace RcSliderClass {
     }
 }
 
-declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps, {}> { }
+declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps> { }
 
 declare namespace RcSliderClass {
-    class Range extends React.Component<RcSliderClass.RangeProps, {}> { }
-    class Handle extends React.Component<RcSliderClass.HandleProps, {}> { }
+    class Range extends React.Component<RcSliderClass.RangeProps> { }
+    class Handle extends React.Component<RcSliderClass.HandleProps> { }
 }
 
 export = RcSliderClass;
diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index 3916c8cfd6..84068dd920 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/tooltip
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -33,7 +33,7 @@ declare namespace Tooltip {
 	}
 }
 
-declare class Tooltip extends React.Component<Tooltip.Props, {}> {}
+declare class Tooltip extends React.Component<Tooltip.Props> {}
 
 declare module "rc-tooltip" {
 	export = Tooltip
diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index a485371062..822e3eff7f 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/tree
 // Definitions by: John Reilly <https://github.com/johnnyreilly/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import {
     Component,
@@ -36,7 +36,7 @@ export interface TreeNodeProps extends Props<TreeNode> {
     isLeaf?: boolean;
 }
 
-export class TreeNode extends Component<TreeNodeProps, {}> { }
+export class TreeNode extends Component<TreeNodeProps> { }
 
 export interface ExpandData {
     expanded: boolean;
@@ -151,4 +151,4 @@ export interface TreeProps extends Props<Tree> {
     draggable?: boolean;
 }
 
-export default class Tree extends Component<TreeProps, {}> { }
+export default class Tree extends Component<TreeProps> { }
diff --git a/types/react-addons-create-fragment/index.d.ts b/types/react-addons-create-fragment/index.d.ts
index 928ddc3a5d..6c998ebc12 100644
--- a/types/react-addons-create-fragment/index.d.ts
+++ b/types/react-addons-create-fragment/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/react-addons-css-transition-group/index.d.ts b/types/react-addons-css-transition-group/index.d.ts
index b5feaf33df..f4857926bd 100644
--- a/types/react-addons-css-transition-group/index.d.ts
+++ b/types/react-addons-css-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import 'react-addons-transition-group';
 import { ComponentClass, CSSTransitionGroupProps } from 'react';
diff --git a/types/react-addons-linked-state-mixin/index.d.ts b/types/react-addons-linked-state-mixin/index.d.ts
index d1b0a1b6c7..50e4b3ec5a 100644
--- a/types/react-addons-linked-state-mixin/index.d.ts
+++ b/types/react-addons-linked-state-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-pure-render-mixin/index.d.ts b/types/react-addons-pure-render-mixin/index.d.ts
index 73c87ed592..3ffff6f17f 100644
--- a/types/react-addons-pure-render-mixin/index.d.ts
+++ b/types/react-addons-pure-render-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-shallow-compare/index.d.ts b/types/react-addons-shallow-compare/index.d.ts
index 9d16c35de1..d640b68ac5 100644
--- a/types/react-addons-shallow-compare/index.d.ts
+++ b/types/react-addons-shallow-compare/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Component } from 'react';
 
diff --git a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
index 6d4b9e7013..c1c5d902cc 100644
--- a/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
+++ b/types/react-addons-shallow-compare/react-addons-shallow-compare-tests.tsx
@@ -1,7 +1,7 @@
-import React = require('react');
-import shallowCompare = require('react-addons-shallow-compare');
+import * as React from 'react';
+import * as shallowCompare from 'react-addons-shallow-compare';
 
-export class MyComponent extends React.Component<{}, {}> {
+export class MyComponent extends React.Component {
     shouldComponentUpdate(nextProps: any, nextState: any, nextContext: any): boolean {
         return shallowCompare(this, nextProps, nextState);
     }
diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index c7899210bf..97131130eb 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { AbstractView, Component, ComponentClass,
     ReactElement, ReactInstance, ClassType,
@@ -62,7 +62,7 @@ declare namespace TestUtils {
     }
 
     export interface EventSimulator {
-        (element: Element | Component<any, any>, eventData?: SyntheticEventData): void;
+        (element: Element | Component<any>, eventData?: SyntheticEventData): void;
     }
 
     export interface MockedComponentClass {
@@ -119,10 +119,10 @@ declare namespace TestUtils {
         element: DOMElement<any, T>): T;
     export function renderIntoDocument(
         element: SFCElement<any>): void;
-    export function renderIntoDocument<T extends Component<any, any>>(
+    export function renderIntoDocument<T extends Component<any>>(
         element: CElement<any, T>): T;
     export function renderIntoDocument<P>(
-        element: ReactElement<P>): Component<P, {}> | Element | void;
+        element: ReactElement<P>): Component<P> | Element | void;
 
     export function mockComponent(
         mocked: MockedComponentClass, mockTagName?: string): typeof TestUtils;
@@ -133,38 +133,38 @@ declare namespace TestUtils {
         element: ReactElement<any>, type: string): element is DOMElement<P, T>;
     export function isElementOfType<P>(
         element: ReactElement<any>, type: SFC<P>): element is SFCElement<P>;
-    export function isElementOfType<P, T extends Component<P, {}>, C extends ComponentClass<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>;
 
     export function isDOMComponent(instance: ReactInstance): instance is Element;
-    export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
-    export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
+    export function isCompositeComponent(instance: ReactInstance): instance is Component<any>;
+    export function isCompositeComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
         instance: ReactInstance, type: ClassType<any, T, C>): T;
 
     export function findAllInRenderedTree(
-        root: Component<any, any>,
+        root: Component<any>,
         fn: (i: ReactInstance) => boolean): ReactInstance[];
 
     export function scryRenderedDOMComponentsWithClass(
-        root: Component<any, any>,
+        root: Component<any>,
         className: string): Element[];
     export function findRenderedDOMComponentWithClass(
-        root: Component<any, any>,
+        root: Component<any>,
         className: string): Element;
 
     export function scryRenderedDOMComponentsWithTag(
-        root: Component<any, any>,
+        root: Component<any>,
         tagName: string): Element[];
     export function findRenderedDOMComponentWithTag(
-        root: Component<any, any>,
+        root: Component<any>,
         tagName: string): Element;
 
-    export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-        root: Component<any, any>,
+    export function scryRenderedComponentsWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+        root: Component<any>,
         type: ClassType<any, T, C>): T[];
 
-    export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-        root: Component<any, any>,
+    export function findRenderedComponentWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+        root: Component<any>,
         type: ClassType<any, T, C>): T;
 
     export function createRenderer(): ShallowRenderer;
diff --git a/types/react-addons-transition-group/index.d.ts b/types/react-addons-transition-group/index.d.ts
index a4ca108b48..c3149f87e3 100644
--- a/types/react-addons-transition-group/index.d.ts
+++ b/types/react-addons-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, TransitionGroupProps } from 'react';
 
diff --git a/types/react-addons-update/index.d.ts b/types/react-addons-update/index.d.ts
index 76f5b32d3c..3b9285a704 100644
--- a/types/react-addons-update/index.d.ts
+++ b/types/react-addons-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -19,7 +19,7 @@ declare module 'react' {
         [key: string]: UpdateSpec;
     }
 
-    type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+    type UpdateSpec = number[][] | UpdateSpecCommand | UpdateSpecPath;
 
     interface UpdateArraySpec extends UpdateSpecCommand {
         $push?: any[];
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index 165262eb39..2afbd1960d 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -2,10 +2,10 @@
 // Project: http://react-autosuggest.js.org/
 // Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>, Philip Ottesen <https://github.com/pjo256>, Robert Essig <https://github.com/robessog>, Terry Bayne <https://github.com/tbayne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
-declare class Autosuggest extends React.Component<any, any> {}
+declare class Autosuggest extends React.Component<any> {}
 
 export = Autosuggest;
 
diff --git a/types/react-autosuggest/react-autosuggest-tests.tsx b/types/react-autosuggest/react-autosuggest-tests.tsx
index 1488163ba0..dc1859392b 100644
--- a/types/react-autosuggest/react-autosuggest-tests.tsx
+++ b/types/react-autosuggest/react-autosuggest-tests.tsx
@@ -1,7 +1,7 @@
 // region Imports
-import React = require('react');
-import ReactDOM = require('react-dom');
-import Autosuggest = require('react-autosuggest');
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as Autosuggest from 'react-autosuggest';
 // endregion
 
 interface Language {
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 75508cae5e..646826bee4 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/intljusticemission/react-big-calendar
 // Definitions by: Piotr Witek <http://piotrwitek.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-big-calendar' {
     import * as React from 'react';
@@ -42,7 +42,7 @@ declare module 'react-big-calendar' {
         elementProps?: React.HTMLAttributes<HTMLElement>;
     }
 
-    class BigCalendar extends React.Component<BigCalendarProps, {}> {
+    class BigCalendar extends React.Component<BigCalendarProps> {
         /**
          * Setup the localizer by providing the moment Object
          */
diff --git a/types/react-body-classname/index.d.ts b/types/react-body-classname/index.d.ts
index b7f0856df9..6088e99cb7 100644
--- a/types/react-body-classname/index.d.ts
+++ b/types/react-body-classname/index.d.ts
@@ -2,13 +2,13 @@
 // Project: https://github.com/PactCoffee/react-body-classname
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import React = require("react");
+import * as React from "react";
 
 export = BodyClassName;
 
-declare class BodyClassName extends React.Component<{ className: string }, any> {
+declare class BodyClassName extends React.Component<{ className: string }> {
     static canUseDOM: boolean;
     static displayName: string;
     static peek(): any;
diff --git a/types/react-body-classname/react-body-classname-tests.tsx b/types/react-body-classname/react-body-classname-tests.tsx
index 019105bee6..c59e438a86 100644
--- a/types/react-body-classname/react-body-classname-tests.tsx
+++ b/types/react-body-classname/react-body-classname-tests.tsx
@@ -1,5 +1,5 @@
-import React = require("react");
-import BodyClassName  = require("react-body-classname");
+import * as React from "react";
+import BodyClassName = require("react-body-classname");
 
 class SomeComponent {
   render() {
diff --git a/types/react-bootstrap-date-picker/index.d.ts b/types/react-bootstrap-date-picker/index.d.ts
index 28a5b0c72b..26bd907df7 100644
--- a/types/react-bootstrap-date-picker/index.d.ts
+++ b/types/react-bootstrap-date-picker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pushtell/react-bootstrap-date-picker#readme
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, StatelessComponent, ReactNode, FocusEventHandler, HTMLAttributes } from "react";
 
diff --git a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
index d37cde8fc7..4f60e7d665 100644
--- a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
+++ b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
@@ -2,11 +2,11 @@ import * as React from "react";
 import { DropdownMenu } from "react-bootstrap";
 import * as DatePicker from "react-bootstrap-date-picker";
 
-const Custom: React.StatelessComponent<{}> = () => {
+const Custom: React.StatelessComponent = () => {
     return (<div />);
 };
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     render() {
         return (
             <DatePicker autoFocus={ false }
diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index baec72795b..aaf6a5089e 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/skratchdot/react-bootstrap-daterangepicker
 // Definitions by: Ian Ker-Seymer <https://github.com/ianks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 /// <reference types="daterangepicker" />
@@ -21,7 +21,7 @@ declare namespace ReactBootstrapDaterangepicker {
         onEvent?: EventHandler;
     }
 
-    export class DateRangePicker extends React.Component<Props, {}> { }
+    export class DateRangePicker extends React.Component<Props> { }
 }
 
 declare var DateRangePicker: typeof ReactBootstrapDaterangepicker.DateRangePicker;
diff --git a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
index f287f5c041..65e44c6086 100644
--- a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
+++ b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.ts
@@ -1,7 +1,7 @@
 import DateRangePicker = require("react-bootstrap-daterangepicker");
 import * as React from "react";
 
-class IntegrationTest extends React.Component<{}, {}> {
+class IntegrationTest extends React.Component {
   render() {
     const props = {
       onEvent: (ev: any, picker: any) => true,
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index bd2a356d91..06e965c04b 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/AllenFang/react-bootstrap-table
 // Definitions by: Frank Laub <https://github.com/flaub>, Aleksander Lode <https://github.com/alelode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 /// <reference types="node" />
@@ -304,11 +304,11 @@ export interface Options {
 	/**
 	To define the pagination bar length, default is 5.
 	*/
+    paginationSize?: number;
 	/**
 	To define where to start counting the pages.
 	*/
-	pageStartIndex?: string;
-    paginationSize?: number;
+    pageStartIndex?: number;
 	/**
 	Assign a callback function which will be called after page changed.
 	This function taking two argument: page and sizePerPage.
@@ -462,9 +462,9 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
 	Set align in column, value is left, center, right, start and end.
 	*/
     dataAlign?: DataAlignType;
-	
+
 	/**
-	 * Alignment of text in the column header.  
+	 * Alignment of text in the column header.
 	 */
 	headerAlign?: DataAlignType;
 	/**
@@ -486,7 +486,7 @@ 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<any>, customEditorParameters?: Object} ;
 	/**
 	To customize the column. This callback function should return a String or a React Component.
 	In addition, this function taking two argument: cell and row.
@@ -557,27 +557,27 @@ export interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
     onSort?: Function;
 
 	/**
-	 * Header for column in generated CSV file 
+	 * Header for column in generated CSV file
 	 */
 	csvHeader?: string;
     csvFormat?: Function;
     columnTitle?: boolean;
     sort?: SortOrder;
     formatExtraData?: any;
-	
+
 	/**
-	 * Row in the header on which this header column present. 
+	 * Row in the header on which this header column present.
 	 */
 	row?: number;
 
 	/**
-	 * Indicates how many rows this column takes. 
+	 * Indicates how many rows this column takes.
 	 * Default: 1
 	 */
 	rowSpan?: number;
 
 	/**
-	 * Indicates how many columns this column takes. 
+	 * Indicates how many columns this column takes.
 	 * Default: 1
 	 */
 	colSpan?: number;
diff --git a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
index 0b5d58166c..e501d8de14 100644
--- a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -38,7 +38,7 @@ function enumFormatter(cell: any, row: any, enumObject: any) {
   return enumObject[cell];
 }
 
-class SelectFilterWithDefaultValue extends React.Component<any, any> {
+class SelectFilterWithDefaultValue extends React.Component {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -51,7 +51,7 @@ class SelectFilterWithDefaultValue extends React.Component<any, any> {
   }
 }
 
-class TextFilterWithCondition extends React.Component<any, any> {
+class TextFilterWithCondition extends React.Component {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -69,7 +69,7 @@ function getCustomFilter(filterHandler: (parameters?: ApplyFilterParameter) => v
   );
 }
 
-class CustomFilter extends React.Component<any, any> {
+class CustomFilter extends React.Component {
   render() {
     return (
       <BootstrapTable data={ products }>
@@ -82,7 +82,7 @@ class CustomFilter extends React.Component<any, any> {
 }
 
 // Adopted from https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-header-span/column-header-span-complex.js
-export default class ColumnHeaderSpanComplex extends React.Component<any, any> {
+export default class ColumnHeaderSpanComplex extends React.Component {
   render() {
     const selectRow = {
       mode: 'checkbox',
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index a11abcd38d..3030e7d6a5 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-bootstrap
 // Definitions by: Walker Burgin <https://github.com/walkerburgin>, Vincent Siao <https://github.com/vsiao>, Danilo Barros <https://github.com/danilojrr>, Batbold Gansukh <https://github.com/Batbold-Gansukh>, Raymond May Jr. <https://github.com/octatone>, Cheng Sieu Ly <https://github.com/chengsieuly>, Kat Busch <https://github.com/katbusch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 export = ReactBootstrap;
@@ -47,7 +47,7 @@ declare namespace ReactBootstrap {
         footer?: any; // TODO: Add more specific type
         header?: any; // TODO: Add more specific type
     }
-    type Accordion = React.ClassicComponent<AccordionProps, {}>;
+    type Accordion = React.ClassicComponent<AccordionProps>;
     var Accordion: React.ClassicComponentClass<AccordionProps>;
 
 
@@ -58,7 +58,7 @@ declare namespace ReactBootstrap {
     interface BreadcrumbClass extends React.ClassicComponentClass<BreadcrumbProps> {
         Item: typeof BreadcrumbItem;
     }
-    type Breadcrumb = React.ClassicComponent<BreadcrumbProps, {}>;
+    type Breadcrumb = React.ClassicComponent<BreadcrumbProps>;
     var Breadcrumb: BreadcrumbClass;
 
 
@@ -70,7 +70,7 @@ declare namespace ReactBootstrap {
         title?: React.ReactNode;
         target?: string;
     }
-    type BreadcrumbItem = React.ClassicComponent<BreadcrumbItemProps, {}>;
+    type BreadcrumbItem = React.ClassicComponent<BreadcrumbItemProps>;
     var BreadcrumbItem: React.ClassicComponentClass<BreadcrumbItemProps>;
 
 
@@ -84,7 +84,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType;
         disabled?: boolean;
     }
-    type Button = React.ClassicComponent<ButtonProps, {}>;
+    type Button = React.ClassicComponent<ButtonProps>;
     var Button: React.ClassicComponentClass<ButtonProps>;
 
 
@@ -96,7 +96,7 @@ declare namespace ReactBootstrap {
         justified?: boolean;
         vertical?: boolean;
     }
-    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
+    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps>;
     var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
 
 
@@ -108,7 +108,7 @@ declare namespace ReactBootstrap {
         justified?: boolean;
         vertical?: boolean;
     }
-    type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
+    type ButtonGroup = React.ClassicComponent<ButtonGroupProps>;
     var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
 
 
@@ -120,7 +120,7 @@ declare namespace ReactBootstrap {
         role?: string;
         componentClass?: React.ReactType;
     }
-    type SafeAnchor = React.ClassicComponent<SafeAnchorProps, {}>;
+    type SafeAnchor = React.ClassicComponent<SafeAnchorProps>;
     const SafeAnchor: React.ClassicComponentClass<SafeAnchorProps>;
 
 
@@ -132,7 +132,7 @@ declare namespace ReactBootstrap {
         inputRef?: (instance: HTMLInputElement) => void;
         validationState?: "success" | "warning" | "error";
     }
-    class Checkbox extends React.Component<CheckboxProps, {}> { }
+    class Checkbox extends React.Component<CheckboxProps> { }
 
 
     // <Clearfix />
@@ -143,7 +143,7 @@ declare namespace ReactBootstrap {
         visibleMdBlock?: boolean;
         visibleLgBlock?: boolean;
     }
-    class Clearfix extends React.Component<ClearfixProps, {}> { }
+    class Clearfix extends React.Component<ClearfixProps> { }
 
 
     // <Collapse />
@@ -155,7 +155,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Collapse extends React.Component<CollapseProps, {}> { }
+    class Collapse extends React.Component<CollapseProps> { }
 
 
     // <Dropdown />
@@ -173,7 +173,7 @@ declare namespace ReactBootstrap {
         role?: string;
     }
     type DropdownProps = DropdownBaseProps & React.HTMLProps<Dropdown>;
-    class Dropdown extends React.Component<DropdownProps, any> {
+    class Dropdown extends React.Component<DropdownProps> {
         public static Menu: typeof DropdownMenu;
         public static Toggle: typeof DropdownToggle;
     }
@@ -189,7 +189,7 @@ declare namespace ReactBootstrap {
         pullRight?: boolean;
     }
     type DropdownButtonProps = DropdownButtonBaseProps & React.HTMLProps<DropdownButton>;
-    class DropdownButton extends React.Component<DropdownButtonProps, {}> { }
+    class DropdownButton extends React.Component<DropdownButtonProps> { }
 
 
     // <Dropdown.Menu />
@@ -200,7 +200,7 @@ declare namespace ReactBootstrap {
         open?: boolean;
         pullRight?: boolean;
     }
-    class DropdownMenu extends React.Component<DropdownMenuProps, any> { }
+    class DropdownMenu extends React.Component<DropdownMenuProps> { }
 
 
     // <Dropdown.Toggle />
@@ -213,7 +213,7 @@ declare namespace ReactBootstrap {
         bsClass?:string; // Added since v0.30.0
         bsStyle?:string;
     }
-    class DropdownToggle extends React.Component<DropdownToggleProps, any> { }
+    class DropdownToggle extends React.Component<DropdownToggleProps> { }
 
 
     // <Fade />
@@ -223,7 +223,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Fade extends React.Component<FadeProps, {}> { }
+    class Fade extends React.Component<FadeProps> { }
 
 
     // <MenuItem />
@@ -239,7 +239,7 @@ declare namespace ReactBootstrap {
         target?: string;
         title?: string;
     }
-    class MenuItem extends React.Component<MenuItemProps, {}> { }
+    class MenuItem extends React.Component<MenuItemProps> { }
 
 
     // <Panel />
@@ -255,7 +255,7 @@ declare namespace ReactBootstrap {
         header?: React.ReactNode;
         onSelect?: SelectCallback;
     }
-    type Panel = React.ClassicComponent<PanelProps, {}>;
+    type Panel = React.ClassicComponent<PanelProps>;
     var Panel: React.ClassicComponentClass<PanelProps>;
 
 
@@ -268,7 +268,7 @@ declare namespace ReactBootstrap {
         defaultActiveKey?: any;
         onSelect?: SelectCallback;
     }
-    type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
+    type PanelGroup = React.ClassicComponent<PanelGroupProps>;
     var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
 
 
@@ -280,7 +280,7 @@ declare namespace ReactBootstrap {
         dropup?: boolean;
         pullRight?: boolean;
     }
-    class SplitButton extends React.Component<SplitButtonProps, {}> { }
+    class SplitButton extends React.Component<SplitButtonProps> { }
 
 
     // <Modal.Dialog />
@@ -294,7 +294,7 @@ declare namespace ReactBootstrap {
         onExited?: Function;
         onExiting?: Function;
     }
-    type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
+    type ModalDialog = React.ClassicComponent<ModalDialogProps>;
     var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
 
 
@@ -305,7 +305,7 @@ declare namespace ReactBootstrap {
         onHide?: Function;
         // undefined?: string;
     }
-    class ModalHeader extends React.Component<ModalHeaderProps, {}> {
+    class ModalHeader extends React.Component<ModalHeaderProps> {
     }
 
 
@@ -313,21 +313,21 @@ declare namespace ReactBootstrap {
     interface ModalTitleProps extends React.HTMLProps<ModalTitle> {
         modalClassName?: string;
     }
-    class ModalTitle extends React.Component<ModalTitleProps, {}> {
+    class ModalTitle extends React.Component<ModalTitleProps> {
     }
 
     // <Modal.Body />
     interface ModalBodyProps extends React.HTMLProps<ModalBody> {
         modalClassName?: string;
     }
-    class ModalBody extends React.Component<ModalBodyProps, {}> {
+    class ModalBody extends React.Component<ModalBodyProps> {
     }
 
     // <Modal.Footer />
     interface ModalFooterProps extends React.HTMLProps<ModalFooter> {
         modalClassName?: string;
     }
-    class ModalFooter extends React.Component<ModalFooterProps, {}> {
+    class ModalFooter extends React.Component<ModalFooterProps> {
     }
 
     // <Modal />
@@ -369,7 +369,7 @@ declare namespace ReactBootstrap {
         Footer: typeof ModalFooter;
         Dialog: typeof ModalDialog;
     }
-    type Modal = React.ClassicComponent<ModalProps, {}>;
+    type Modal = React.ClassicComponent<ModalProps>;
     var Modal: ModalClass;
 
     // <OverlayTrigger />
@@ -395,7 +395,7 @@ declare namespace ReactBootstrap {
         rootClose?: boolean;
         trigger?: string | string[];
     }
-    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
+    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps>;
     var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
 
     // <Tooltip />
@@ -409,7 +409,7 @@ declare namespace ReactBootstrap {
         positionLeft?: number;
         positionTop?: number;
     }
-    type Tooltip = React.ClassicComponent<TooltipProps, {}>;
+    type Tooltip = React.ClassicComponent<TooltipProps>;
     var Tooltip: React.ClassicComponentClass<TooltipProps>;
 
     // <Popover/>
@@ -423,7 +423,7 @@ declare namespace ReactBootstrap {
         positionLeft?: number | string; // String support added since v0.30.0
         positionTop?: number | string; // String support added since v0.30.0
     }
-    type Popover = React.ClassicComponent<PopoverProps, {}>;
+    type Popover = React.ClassicComponent<PopoverProps>;
     var Popover: React.ClassicComponentClass<PopoverProps>;
 
     // <Overlay />
@@ -442,10 +442,10 @@ declare namespace ReactBootstrap {
         placement?: string;
         rootClose?: boolean;
         show?: boolean;
-        target?: Function;
+        target?: Function | React.ReactInstance;
         shouldUpdatePosition?: boolean;
     }
-    class Overlay extends React.Component<OverlayProps, {}> {
+    class Overlay extends React.Component<OverlayProps> {
     }
 
     // <ProgressBar />
@@ -461,7 +461,7 @@ declare namespace ReactBootstrap {
         srOnly?: boolean;
         striped?: boolean;
     }
-    class ProgressBar extends React.Component<ProgressBarProps, {}> {
+    class ProgressBar extends React.Component<ProgressBarProps> {
     }
 
     // <Nav />
@@ -483,7 +483,7 @@ declare namespace ReactBootstrap {
         ulClassName?: string;
         ulId?: string;
     }
-    class Nav extends React.Component<NavProps, {}> {
+    class Nav extends React.Component<NavProps> {
     }
 
     // <NavItem />
@@ -507,32 +507,32 @@ declare namespace ReactBootstrap {
         toggleButton?: any; // TODO: Add more specific type
         toggleNavKey?: string | number;
     }
-    type NavItem = React.ClassicComponent<NavItemProps, {}>;
+    type NavItem = React.ClassicComponent<NavItemProps>;
     var NavItem: React.ClassicComponentClass<NavItemProps>;
 
     // <Navbar.Brand />
     interface NavbarBrandProps extends React.HTMLProps<NavbarBrand> {
     }
-    class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
+    class NavbarBrand extends React.Component<NavbarBrandProps> {
     }
 
     // <Navbar.Collapse />
     interface NavbarCollapseProps {
     }
-    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
+    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps>;
     var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
 
     // <Navbar.Header />
     interface NavbarHeaderProps extends React.HTMLProps<NavbarHeader> {
     }
-    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
+    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps>;
     var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
 
     // <Navbar.Toggle />
     interface NavbarToggleProps {
         onClick?: React.MouseEventHandler<HTMLButtonElement>;
     }
-    type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
+    type NavbarToggle = React.ClassicComponent<NavbarToggleProps>;
     var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
 
     // <Navbar.Link />
@@ -540,14 +540,14 @@ declare namespace ReactBootstrap {
         href: string;
         onClick?: React.MouseEventHandler<HTMLAnchorElement>;
     }
-    type NavbarLink = React.ClassicComponent<NavbarLinkProps, {}>;
+    type NavbarLink = React.ClassicComponent<NavbarLinkProps>;
     const NavbarLink: React.ClassicComponentClass<NavbarLinkProps>;
 
     // <Navbar.Text />
     interface NavbarTextProps {
         pullRight?: boolean;
     }
-    type NavbarText = React.ClassicComponent<NavbarTextProps, {}>;
+    type NavbarText = React.ClassicComponent<NavbarTextProps>;
     const NavbarText: React.ClassicComponentClass<NavbarTextProps>;
 
     // <Navbar.Form />
@@ -555,7 +555,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType;
         pullRight?: boolean;
     }
-    type NavbarForm = React.ClassicComponent<NavbarFormProps, {}>;
+    type NavbarForm = React.ClassicComponent<NavbarFormProps>;
     const NavbarForm: React.ClassicComponentClass<NavbarFormProps>;
 
     // <Navbar />
@@ -585,7 +585,7 @@ declare namespace ReactBootstrap {
         Text: typeof NavbarText;
         Form: typeof NavbarForm;
     }
-    type Navbar = React.ClassicComponent<NavbarProps, {}>;
+    type Navbar = React.ClassicComponent<NavbarProps>;
     var Navbar: NavbarClass;
 
 
@@ -596,7 +596,7 @@ declare namespace ReactBootstrap {
         eventKey?: any;
     }
     type NavDropdownProps = NavDropdownBaseProps & React.HTMLProps<NavDropdown>;
-    class NavDropdown extends React.Component<NavDropdownProps, {}> { }
+    class NavDropdown extends React.Component<NavDropdownProps> { }
 
     // <Tabs />
     interface TabsProps extends React.HTMLProps<Tabs> {
@@ -611,7 +611,7 @@ declare namespace ReactBootstrap {
         unmountOnExit?: boolean;
         justified?: boolean;
     }
-    type Tabs = React.ClassicComponent<TabsProps, {}>;
+    type Tabs = React.ClassicComponent<TabsProps>;
     var Tabs: React.ClassicComponentClass<TabsProps>;
 
     // <Tab />
@@ -671,7 +671,7 @@ declare namespace ReactBootstrap {
     interface PagerClass extends React.ClassicComponentClass<PagerProps> {
         Item: typeof PageItem // Added since v0.30.0
     }
-    type Pager = React.ClassicComponent<PagerProps, {}>;
+    type Pager = React.ClassicComponent<PagerProps>;
     var Pager: PagerClass;
 
 
@@ -684,7 +684,7 @@ declare namespace ReactBootstrap {
         previous?: boolean;
         target?: string;
     }
-    type PageItem = React.ClassicComponent<PageItemProps, {}>;
+    type PageItem = React.ClassicComponent<PageItemProps>;
     /** @deprecated since v0.30.0, should use <Pager.Item> instead of <PageItem>*/
     var PageItem: React.ClassicComponentClass<PageItemProps>;
 
@@ -705,7 +705,7 @@ declare namespace ReactBootstrap {
         onSelect?: SelectCallback;
         prev?: React.ReactNode;
     }
-    type Pagination = React.ClassicComponent<PaginationProps, {}>;
+    type Pagination = React.ClassicComponent<PaginationProps>;
     var Pagination: React.ClassicComponentClass<PaginationProps>;
 
 
@@ -717,7 +717,7 @@ declare namespace ReactBootstrap {
         /** @deprecated since v0.29.0 */ dismissAfter?: number;
         onDismiss?: Function;
     }
-    type Alert = React.ClassicComponent<AlertProps, {}>;
+    type Alert = React.ClassicComponent<AlertProps>;
     var Alert: React.ClassicComponentClass<AlertProps>;
 
 
@@ -743,7 +743,7 @@ declare namespace ReactBootstrap {
         Caption: typeof CarouselCaption;
         Item: typeof CarouselItem;
     }
-    type Carousel = React.ClassicComponent<CarouselProps, {}>;
+    type Carousel = React.ClassicComponent<CarouselProps>;
     var Carousel: CarouselClass;
 
     // <CarouselItem />
@@ -755,14 +755,14 @@ declare namespace ReactBootstrap {
         index?: number;
         onAnimateOutEnd?: Function;
     }
-    type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
+    type CarouselItem = React.ClassicComponent<CarouselItemProps>;
     var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
 
     // <CarouselCaption />
     interface CarouselCaptionProps extends React.HTMLProps<CarouselCaption> {
         componentClass?: React.ReactType;
     }
-    type CarouselCaption = React.ClassicComponent<CarouselCaptionProps, {}>;
+    type CarouselCaption = React.ClassicComponent<CarouselCaptionProps>;
     var CarouselCaption: React.ClassicComponentClass<CarouselCaptionProps>;
 
     // <Grid />
@@ -771,14 +771,14 @@ declare namespace ReactBootstrap {
         fluid?: boolean;
         bsClass?: string;
     }
-    type Grid = React.ClassicComponent<GridProps, {}>;
+    type Grid = React.ClassicComponent<GridProps>;
     var Grid: React.ClassicComponentClass<GridProps>;
 
     // <Row />
     interface RowProps extends React.HTMLProps<Row> {
         componentClass?: React.ReactType;
     }
-    type Row = React.ClassicComponent<RowProps, {}>;
+    type Row = React.ClassicComponent<RowProps>;
     var Row: React.ClassicComponentClass<RowProps>;
 
     // <Col />
@@ -805,7 +805,7 @@ declare namespace ReactBootstrap {
         xsPull?: number;
         xsPush?: number;
     }
-    type Col = React.ClassicComponent<ColProps, {}>;
+    type Col = React.ClassicComponent<ColProps>;
     var Col: React.ClassicComponentClass<ColProps>;
 
     // <Thumbnail />
@@ -813,7 +813,7 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
+    type Thumbnail = React.ClassicComponent<ThumbnailProps>;
     var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
 
     // <ListGroup />
@@ -821,7 +821,7 @@ declare namespace ReactBootstrap {
         componentClass?: React.ReactType; // Added since v0.30.0
         fill?: boolean; // TODO: Add more specific type
     }
-    class ListGroup extends React.Component<ListGroupProps, {}> {
+    class ListGroup extends React.Component<ListGroupProps> {
     }
 
     // <ListGroupItem />
@@ -834,7 +834,7 @@ declare namespace ReactBootstrap {
         key?: any; // TODO: Add more specific type
         listItem?: boolean;
     }
-    class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
+    class ListGroupItem extends React.Component<ListGroupItemProps> {
     }
 
     // <Label />
@@ -842,21 +842,21 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    class Label extends React.Component<LabelProps, {}> {
+    class Label extends React.Component<LabelProps> {
     }
 
     // <Badge />
     interface BadgeProps extends React.HTMLProps<Badge> {
         pullRight?: boolean;
     }
-    type Badge = React.ClassicComponent<BadgeProps, {}>;
+    type Badge = React.ClassicComponent<BadgeProps>;
     var Badge: React.ClassicComponentClass<BadgeProps>;
 
     // <Jumbotron />
     interface JumbotronProps extends React.HTMLProps<Jumbotron> {
         componentClass?: React.ReactType;
     }
-    type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
+    type Jumbotron = React.ClassicComponent<JumbotronProps>;
     var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
 
     // <Image />
@@ -866,7 +866,7 @@ declare namespace ReactBootstrap {
         rounded?: boolean;
         thumbnail?: boolean;
     }
-    type Image = React.ClassicComponent<ImageProps, {}>;
+    type Image = React.ClassicComponent<ImageProps>;
     var Image: React.ClassicComponentClass<ImageProps>;
 
     // <ResponsiveEmbed />
@@ -875,13 +875,13 @@ declare namespace ReactBootstrap {
         a4by3?: boolean;
         bsClass?: string;
     }
-    class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps, {}> {
+    class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps> {
     }
 
     // <PageHeader />
     interface PageHeaderProps extends React.HTMLProps<PageHeader> {
     }
-    class PageHeader extends React.Component<PageHeaderProps, {}> {
+    class PageHeader extends React.Component<PageHeaderProps> {
     }
 
     // <Well />
@@ -889,7 +889,7 @@ declare namespace ReactBootstrap {
         bsSize?: Sizes;
         bsStyle?: string;
     }
-    class Well extends React.Component<WellProps, {}> {
+    class Well extends React.Component<WellProps> {
     }
 
     // <Glyphicon />
@@ -897,7 +897,7 @@ declare namespace ReactBootstrap {
         // Required
         glyph: string;
     }
-    type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
+    type Glyphicon = React.ClassicComponent<GlyphiconProps>;
     var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
 
     // <Table />
@@ -909,7 +909,7 @@ declare namespace ReactBootstrap {
         striped?: boolean;
         fill?: boolean;
     }
-    type Table = React.ClassicComponent<TableProps, {}>;
+    type Table = React.ClassicComponent<TableProps>;
     var Table: React.ClassicComponentClass<TableProps>;
 
     // <InputGroup />
@@ -921,19 +921,19 @@ declare namespace ReactBootstrap {
         Addon: typeof InputGroupAddon;
         Button: typeof InputGroupButton;
     }
-    type InputGroup = React.Component<InputGroupProps, {}>;
+    type InputGroup = React.Component<InputGroupProps>;
     var InputGroup: InputGroupClass;
 
 
     // <InputGroup.Addon />
     interface InputGroupAddonProps extends React.HTMLProps<InputGroupAddon> { }
-    type InputGroupAddon = React.ClassicComponent<InputGroupAddonProps, {}>;
+    type InputGroupAddon = React.ClassicComponent<InputGroupAddonProps>;
     var InputGroupAddon: React.ClassicComponentClass<InputGroupAddonProps>;
 
 
     // <InputGroup.Button />
     interface InputGroupButtonProps extends React.HTMLProps<InputGroupButton> { }
-    type InputGroupButton = React.ClassicComponent<InputGroupButtonProps, {}>;
+    type InputGroupButton = React.ClassicComponent<InputGroupButtonProps>;
     var InputGroupButton: React.ClassicComponentClass<InputGroupButtonProps>;
 
 
@@ -944,7 +944,7 @@ declare namespace ReactBootstrap {
         horizontal?: boolean;
         inline?: boolean;
     }
-    class Form extends React.Component<FormProps, {}> { }
+    class Form extends React.Component<FormProps> { }
 
     // <FormGroup />
     interface FormGroupProps extends React.HTMLProps<FormGroup> {
@@ -953,7 +953,7 @@ declare namespace ReactBootstrap {
         controlId?: string;
         validationState?: "success" | "warning" | "error";
     }
-    class FormGroup extends React.Component<FormGroupProps, {}> { }
+    class FormGroup extends React.Component<FormGroupProps> { }
 
     // <ControlLabel />
     interface ControlLabelProps extends React.HTMLProps<ControlLabel> {
@@ -961,7 +961,7 @@ declare namespace ReactBootstrap {
         htmlFor?: string;
         srOnly?: boolean;
     }
-    class ControlLabel extends React.Component<ControlLabelProps, {}> { }
+    class ControlLabel extends React.Component<ControlLabelProps> { }
 
     // <FormControl />
     interface FormControlProps extends React.HTMLProps<FormControl> {
@@ -976,13 +976,13 @@ declare namespace ReactBootstrap {
         Feedback: typeof FormControlFeedback;
         Static: typeof FormControlStatic;
     }
-    type FormControl = React.Component<FormControlProps, {}>;
+    type FormControl = React.Component<FormControlProps>;
     var FormControl: FormControlClass;
 
     // <FormControl.Feedback />
     interface FormControlFeedbackProps extends React.HTMLProps<FormControlFeedback> {
     }
-    class FormControlFeedback extends React.Component<FormControlFeedbackProps, {}> {
+    class FormControlFeedback extends React.Component<FormControlFeedbackProps> {
     }
 
     // <FormControl.Static />
@@ -990,14 +990,14 @@ declare namespace ReactBootstrap {
         bsClass?: string;
         componentClass?: React.ReactType;
     }
-    class FormControlStatic extends React.Component<FormControlStaticProps, {}> { }
+    class FormControlStatic extends React.Component<FormControlStaticProps> { }
 
 
     // <HelpBlock />
     interface HelpBlockProps extends React.HTMLProps<HelpBlock> {
         bsClass?: string;
     }
-    class HelpBlock extends React.Component<HelpBlockProps, {}> { }
+    class HelpBlock extends React.Component<HelpBlockProps> { }
 
 
     // <Radio />
@@ -1008,7 +1008,7 @@ declare namespace ReactBootstrap {
         inputRef?: (instance: HTMLInputElement) => void;
         validationState?: "success" | "warning" | "error";
     }
-    class Radio extends React.Component<RadioProps, {}> { }
+    class Radio extends React.Component<RadioProps> { }
 
 
     // <Portal />
@@ -1027,7 +1027,7 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    type Portal = React.ClassicComponent<PortalProps, {}>;
+    type Portal = React.ClassicComponent<PortalProps>;
     var Portal: React.ClassicComponentClass<PortalProps>;
 
     // <Position />
@@ -1040,47 +1040,47 @@ declare namespace ReactBootstrap {
         transitionAppear?: boolean;
         unmountOnExit?: boolean;
     }
-    class Position extends React.Component<PositionProps, {}> {
+    class Position extends React.Component<PositionProps> {
     }
     // <Media.Left />
     interface MediaLeftProps {
         align?: string;
     }
-    type MediaLeft = React.ClassicComponent<MediaLeftProps, {}>;
+    type MediaLeft = React.ClassicComponent<MediaLeftProps>;
     var MediaLeft: React.ClassicComponentClass<MediaLeftProps>;
 
     // <Media.Right />
     interface MediaRightProps {
         align?: string;
     }
-    type MediaRight = React.ClassicComponent<MediaRightProps, {}>;
+    type MediaRight = React.ClassicComponent<MediaRightProps>;
     var MediaRight: React.ClassicComponentClass<MediaRightProps>;
 
     // <Media.Heading />
     interface MediaHeadingProps {
         componentClass?: React.ReactType;
     }
-    type MediaHeading = React.ClassicComponent<MediaHeadingProps, {}>;
+    type MediaHeading = React.ClassicComponent<MediaHeadingProps>;
     var MediaHeading: React.ClassicComponentClass<MediaHeadingProps>;
 
     // <Media.Body />
     interface MediaBodyProps {
         componentClass?: React.ReactType;
     }
-    type MediaBody = React.ClassicComponent<MediaBodyProps, {}>;
+    type MediaBody = React.ClassicComponent<MediaBodyProps>;
     var MediaBody: React.ClassicComponentClass<MediaBodyProps>;
 
     // <Media.List />
     interface MediaListProps {
     }
-    type MediaList = React.ClassicComponent<MediaListProps, {}>;
+    type MediaList = React.ClassicComponent<MediaListProps>;
     var MediaList: React.ClassicComponentClass<MediaListProps>;
 
     // <Media.ListItem />
     interface MediaListItemProps {
         componentClass?: React.ReactType;
     }
-    type MediaListItem = React.ClassicComponent<MediaListItemProps, {}>;
+    type MediaListItem = React.ClassicComponent<MediaListItemProps>;
     var MediaListItem: React.ClassicComponentClass<MediaListItemProps>;
 
     // <Media />
@@ -1095,7 +1095,7 @@ declare namespace ReactBootstrap {
         List: typeof MediaList;
         ListItem: typeof MediaListItem;
     }
-    type Media = React.ClassicComponent<MediaProps, {}>;
+    type Media = React.ClassicComponent<MediaProps>;
     var Media: MediaClass;
 
     /* Utils */
diff --git a/types/react-bootstrap/react-bootstrap-tests.tsx b/types/react-bootstrap/react-bootstrap-tests.tsx
index 14784f9a3d..c93628c7b6 100644
--- a/types/react-bootstrap/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/react-bootstrap-tests.tsx
@@ -16,7 +16,7 @@ import {
 } from 'react-bootstrap';
 
 
-export class ReactBootstrapTest extends Component<any, any> {
+export class ReactBootstrapTest extends Component {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
     }
diff --git a/types/react-breadcrumbs/index.d.ts b/types/react-breadcrumbs/index.d.ts
index 6fecdb7dc2..01a91fed5d 100644
--- a/types/react-breadcrumbs/index.d.ts
+++ b/types/react-breadcrumbs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/svenanders/react-breadcrumbs
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as ReactRouter from "react-router";
diff --git a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
index d81877fccf..b8a51bf36e 100644
--- a/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
+++ b/types/react-breadcrumbs/react-breadcrumbs-tests.tsx
@@ -7,7 +7,7 @@ interface MyComponentProps extends ReactRouter.RouteComponentProps<{}, { id: num
 }
 
 
-class MyComponent extends React.Component<MyComponentProps, {}> {
+class MyComponent extends React.Component<MyComponentProps> {
     render() {
         return (
             <div>
diff --git a/types/react-bytesize-icons/index.d.ts b/types/react-bytesize-icons/index.d.ts
index b2e5a3b8ae..d1176b810b 100644
--- a/types/react-bytesize-icons/index.d.ts
+++ b/types/react-bytesize-icons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/abdelhai/react-bytesize-icons
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -16,7 +16,7 @@ interface BytesizeIconsProps extends React.Props<any> {
     strokeLinecap?: StrokeLinecap;
     color?: string;
 }
-export class BytesizeIconComponent extends React.Component<BytesizeIconsProps, {}> {}
+export class BytesizeIconComponent extends React.Component<BytesizeIconsProps> {}
 
 export class Activity extends BytesizeIconComponent {}
 export class Alert extends BytesizeIconComponent {}
diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index c8269f9cf1..a8f76daca1 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/namespace-ee/react-calendar-timeline
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
diff --git a/types/react-calendar-timeline/react-calendar-timeline-tests.tsx b/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
index f2bd8efab4..0814bb3afe 100644
--- a/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
+++ b/types/react-calendar-timeline/react-calendar-timeline-tests.tsx
@@ -14,7 +14,7 @@ const items = [
   {id: 3, group: 1, title: 'item 3', start_time: moment().add(2, 'hour'), end_time: moment().add(3, 'hour')}
 ]
 
-class ExampleOfUsingReactCalendarTimeline extends React.Component<{}, {}> {
+class ExampleOfUsingReactCalendarTimeline extends React.Component {
      render(){
          return(
              <div>
diff --git a/types/react-chartjs-2/index.d.ts b/types/react-chartjs-2/index.d.ts
index e3e2da896c..d6b0fe41c4 100644
--- a/types/react-chartjs-2/index.d.ts
+++ b/types/react-chartjs-2/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for react-chartjs-2 2.0
 // Project: https://github.com/gor181/react-chartjs-2
 // Definitions by: Alexandre Paré <https://github.com/apare>
+//                 Fabien Lavocat <https://github.com/FabienLavocat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as chartjs from "chart.js";
@@ -25,10 +26,10 @@ export interface ChartComponentProps {
 }
 
 export interface LinearComponentProps extends ChartComponentProps {
-    data: ChartData<chartjs.LinearChartData>;
+    data: ChartData<chartjs.ChartData>;
 }
 
-export default class ChartComponent<P extends ChartComponentProps> extends React.Component<P, {}> {
+export default class ChartComponent<P extends ChartComponentProps> extends React.Component<P> {
     chart_instance: chartjs;
 }
 
diff --git a/types/react-chartjs-2/test/doughnut.tsx b/types/react-chartjs-2/test/doughnut.tsx
index 4051310185..268ddfe40e 100755
--- a/types/react-chartjs-2/test/doughnut.tsx
+++ b/types/react-chartjs-2/test/doughnut.tsx
@@ -14,7 +14,7 @@ const data = {
 		'#36A2EB',
 		'#FFCE56'
 		],
-		hoverBackgroundColor: [
+		pointHoverBackgroundColor: [
 		'#FF6384',
 		'#36A2EB',
 		'#FFCE56'
diff --git a/types/react-chartjs-2/test/dynamic-doughnut.tsx b/types/react-chartjs-2/test/dynamic-doughnut.tsx
index 8c22df6e4a..977c5a9801 100755
--- a/types/react-chartjs-2/test/dynamic-doughnut.tsx
+++ b/types/react-chartjs-2/test/dynamic-doughnut.tsx
@@ -26,7 +26,7 @@ const getState = () => ({
   }]
 });
 
-export default class DynamicDoughnutExample extends React.Component<any, any> {
+export default class DynamicDoughnutExample extends React.Component {
   getInitialState() {
     return getState();
   }
diff --git a/types/react-chartjs-2/test/index.tsx b/types/react-chartjs-2/test/index.tsx
index 0376218e1d..4032fe82e2 100644
--- a/types/react-chartjs-2/test/index.tsx
+++ b/types/react-chartjs-2/test/index.tsx
@@ -13,7 +13,7 @@ import BubbleExample from './bubble';
 import MixedDataExample from './mix';
 import RandomizedDataLineExample from './randomizedLine';
 
-class App extends React.Component<any, any> {
+class App extends React.Component {
 	render() {
 		return (
 			<div>
diff --git a/types/react-chartjs-2/test/pie.tsx b/types/react-chartjs-2/test/pie.tsx
index ba0a23ffb3..454088331d 100755
--- a/types/react-chartjs-2/test/pie.tsx
+++ b/types/react-chartjs-2/test/pie.tsx
@@ -14,7 +14,7 @@ const data = {
 		'#36A2EB',
 		'#FFCE56'
 		],
-		hoverBackgroundColor: [
+		pointHoverBackgroundColor: [
 		'#FF6384',
 		'#36A2EB',
 		'#FFCE56'
diff --git a/types/react-codemirror/index.d.ts b/types/react-codemirror/index.d.ts
index 841fc34a0e..2a9eae6667 100644
--- a/types/react-codemirror/index.d.ts
+++ b/types/react-codemirror/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JedWatson/react-codemirror
 // Definitions by: Vicky Lai <https://github.com/velveret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 /// <reference types="codemirror"/>
@@ -19,7 +19,7 @@ declare namespace ReactCodeMirror {
         codeMirrorInstance?: CodeMirror.Editor; // the CodeMirror instance
     }
 
-    interface ReactCodeMirror extends React.Component<ReactCodeMirrorProps, {}> {
+    interface ReactCodeMirror extends React.Component<ReactCodeMirrorProps> {
         /** Focuses the CodeMirror instance. */
         focus(): void;
 
diff --git a/types/react-codemirror/react-codemirror-tests.tsx b/types/react-codemirror/react-codemirror-tests.tsx
index 2924ae4d5c..a5be69d882 100644
--- a/types/react-codemirror/react-codemirror-tests.tsx
+++ b/types/react-codemirror/react-codemirror-tests.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as Codemirror from "react-codemirror";
 
-class CodemirrorTest extends React.Component<React.Props<{}>, {}> {
+class CodemirrorTest extends React.Component<React.Props<{}>> {
     private editorRef: ReactCodeMirror.ReactCodeMirror;
 
     componentDidMount() {
diff --git a/types/react-color/index.d.ts b/types/react-color/index.d.ts
index 798f44d6eb..f29529cc09 100644
--- a/types/react-color/index.d.ts
+++ b/types/react-color/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for react-color 2.11
 // Project: https://github.com/casesandberg/react-color/
-// Definitions by: Karol Janyst <https://github.com/LKay>
+// Definitions by: Karol Janyst <https://github.com/LKay>, Marks Polakovs <https://github.com/markspolakovs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, ClassAttributes, StatelessComponent, ReactNode } from "react";
 
diff --git a/types/react-color/lib/components/alpha/Alpha.d.ts b/types/react-color/lib/components/alpha/Alpha.d.ts
index 2856f077b9..c3d5f278ca 100644
--- a/types/react-color/lib/components/alpha/Alpha.d.ts
+++ b/types/react-color/lib/components/alpha/Alpha.d.ts
@@ -6,4 +6,4 @@ export interface AlphaPickerProps extends ColorPickerProps<AlphaPicker> {
     width?: string;
 }
 
-export default class AlphaPicker extends Component<AlphaPickerProps, any> {}
+export default class AlphaPicker extends Component<AlphaPickerProps> {}
diff --git a/types/react-color/lib/components/block/Block.d.ts b/types/react-color/lib/components/block/Block.d.ts
index edb3c72347..9b3633265b 100644
--- a/types/react-color/lib/components/block/Block.d.ts
+++ b/types/react-color/lib/components/block/Block.d.ts
@@ -6,4 +6,4 @@ export interface BlockPickerProps extends ColorPickerProps<BlockPicker> {
     width?: string;
 }
 
-export default class BlockPicker extends Component<BlockPickerProps, any> {}
+export default class BlockPicker extends Component<BlockPickerProps> {}
diff --git a/types/react-color/lib/components/chrome/Chrome.d.ts b/types/react-color/lib/components/chrome/Chrome.d.ts
index fa214d1b14..4493173845 100644
--- a/types/react-color/lib/components/chrome/Chrome.d.ts
+++ b/types/react-color/lib/components/chrome/Chrome.d.ts
@@ -5,4 +5,4 @@ export interface ChromePickerProps extends ColorPickerProps<ChromePicker> {
     disableAlpha?: boolean;
 }
 
-export default class ChromePicker extends Component<ChromePickerProps, any> {}
+export default class ChromePicker extends Component<ChromePickerProps> {}
diff --git a/types/react-color/lib/components/circle/Circle.d.ts b/types/react-color/lib/components/circle/Circle.d.ts
index 204842d72a..045c5a93bb 100644
--- a/types/react-color/lib/components/circle/Circle.d.ts
+++ b/types/react-color/lib/components/circle/Circle.d.ts
@@ -6,4 +6,4 @@ export interface CirclePickerProps extends ColorPickerProps<CirclePicker> {
     width?: string;
 }
 
-export default class CirclePicker extends Component<CirclePickerProps, any> {}
+export default class CirclePicker extends Component<CirclePickerProps> {}
diff --git a/types/react-color/lib/components/common/Alpha.d.ts b/types/react-color/lib/components/common/Alpha.d.ts
index da20010497..a86a6c4231 100644
--- a/types/react-color/lib/components/common/Alpha.d.ts
+++ b/types/react-color/lib/components/common/Alpha.d.ts
@@ -3,4 +3,4 @@ import { CustomPickerProps } from "react-color";
 
 export type AlphaProps = CustomPickerProps<Alpha>;
 
-export default class Alpha extends Component<AlphaProps, any> {}
+export default class Alpha extends Component<AlphaProps> {}
diff --git a/types/react-color/lib/components/common/Checkboard.d.ts b/types/react-color/lib/components/common/Checkboard.d.ts
index 40d8f26913..96cf0d56f4 100644
--- a/types/react-color/lib/components/common/Checkboard.d.ts
+++ b/types/react-color/lib/components/common/Checkboard.d.ts
@@ -6,4 +6,4 @@ export interface CheckboardProps extends ClassAttributes<Checkboard> {
     white?: string;
 }
 
-export default class Checkboard extends Component<CheckboardProps, any> {}
+export default class Checkboard extends Component<CheckboardProps> {}
diff --git a/types/react-color/lib/components/common/EditableInput.d.ts b/types/react-color/lib/components/common/EditableInput.d.ts
index f786399c9e..d1c5154c90 100644
--- a/types/react-color/lib/components/common/EditableInput.d.ts
+++ b/types/react-color/lib/components/common/EditableInput.d.ts
@@ -11,8 +11,10 @@ export interface EditableInputProps extends ClassAttributes<EditableInput> {
     color?: Color;
     label?: string;
     onChange?: ColorChangeHandler;
-    styles?: EditableInputStyles;
+    style?: EditableInputStyles;
     value?: any;
+    dragLabel?: string;
+    dragMax?: string;
 }
 
-export default class EditableInput extends Component<EditableInputProps, any> {}
+export default class EditableInput extends Component<EditableInputProps> {}
diff --git a/types/react-color/lib/components/common/Hue.d.ts b/types/react-color/lib/components/common/Hue.d.ts
index 1f61841107..741db9e95f 100644
--- a/types/react-color/lib/components/common/Hue.d.ts
+++ b/types/react-color/lib/components/common/Hue.d.ts
@@ -5,4 +5,4 @@ export interface HueProps extends CustomPickerProps<Hue> {
     direction?: "horizontal" | "vertical";
 }
 
-export default class Hue extends Component<HueProps, any> {}
+export default class Hue extends Component<HueProps> {}
diff --git a/types/react-color/lib/components/common/Saturation.d.ts b/types/react-color/lib/components/common/Saturation.d.ts
index c90a7d9685..a58e47179d 100644
--- a/types/react-color/lib/components/common/Saturation.d.ts
+++ b/types/react-color/lib/components/common/Saturation.d.ts
@@ -3,4 +3,4 @@ import { CustomPickerProps } from "react-color";
 
 export type SaturationProps = CustomPickerProps<Saturation>;
 
-export default class Saturation extends Component<SaturationProps, any> {}
+export default class Saturation extends Component<SaturationProps> {}
diff --git a/types/react-color/lib/components/compact/Compact.d.ts b/types/react-color/lib/components/compact/Compact.d.ts
index 3f9ff74f60..a661972a41 100644
--- a/types/react-color/lib/components/compact/Compact.d.ts
+++ b/types/react-color/lib/components/compact/Compact.d.ts
@@ -5,4 +5,4 @@ export interface CompactPickerProps extends ColorPickerProps<CompactPicker> {
     colors?: string[];
 }
 
-export default class CompactPicker extends Component<CompactPickerProps, any> {}
+export default class CompactPicker extends Component<CompactPickerProps> {}
diff --git a/types/react-color/lib/components/github/Github.d.ts b/types/react-color/lib/components/github/Github.d.ts
index fd1479abad..c4b6e7c27c 100644
--- a/types/react-color/lib/components/github/Github.d.ts
+++ b/types/react-color/lib/components/github/Github.d.ts
@@ -4,6 +4,7 @@ import { ColorPickerProps } from "react-color";
 export interface GithubPickerProps extends ColorPickerProps<GithubPicker> {
     colors?: string[];
     width?: string;
+    triangle?: 'hide' | 'top-left' | 'top-right';
 }
 
-export default class GithubPicker extends Component<GithubPickerProps, any> {}
+export default class GithubPicker extends Component<GithubPickerProps> {}
diff --git a/types/react-color/lib/components/hue/Hue.d.ts b/types/react-color/lib/components/hue/Hue.d.ts
index 6aab83baea..a8ff4d60dd 100644
--- a/types/react-color/lib/components/hue/Hue.d.ts
+++ b/types/react-color/lib/components/hue/Hue.d.ts
@@ -6,4 +6,4 @@ export interface HuePickerProps extends ColorPickerProps<HuePicker> {
     width?: string;
 }
 
-export default class HuePicker extends Component<HuePickerProps, any> {}
+export default class HuePicker extends Component<HuePickerProps> {}
diff --git a/types/react-color/lib/components/material/Material.d.ts b/types/react-color/lib/components/material/Material.d.ts
index 4ae849b910..46b42ba5ad 100644
--- a/types/react-color/lib/components/material/Material.d.ts
+++ b/types/react-color/lib/components/material/Material.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type MaterialPickerProps = ColorPickerProps<MaterialPicker>;
 
-export default class MaterialPicker extends Component<MaterialPickerProps, any> {}
+export default class MaterialPicker extends Component<MaterialPickerProps> {}
diff --git a/types/react-color/lib/components/photoshop/Photoshop.d.ts b/types/react-color/lib/components/photoshop/Photoshop.d.ts
index c3abaf0ccd..6e544d4969 100644
--- a/types/react-color/lib/components/photoshop/Photoshop.d.ts
+++ b/types/react-color/lib/components/photoshop/Photoshop.d.ts
@@ -7,4 +7,4 @@ export interface PhotoshopPickerProps extends ColorPickerProps<PhotoshopPicker>
     onCancel?: ColorChangeHandler;
 }
 
-export default class PhotoshopPicker extends Component<PhotoshopPickerProps, any> {}
+export default class PhotoshopPicker extends Component<PhotoshopPickerProps> {}
diff --git a/types/react-color/lib/components/sketch/Sketch.d.ts b/types/react-color/lib/components/sketch/Sketch.d.ts
index 229b2b2b51..3a1ac6c3fe 100644
--- a/types/react-color/lib/components/sketch/Sketch.d.ts
+++ b/types/react-color/lib/components/sketch/Sketch.d.ts
@@ -7,4 +7,4 @@ export interface SketchPickerProps extends ColorPickerProps<SketchPicker> {
     width?: string;
 }
 
-export default class SketchPicker extends Component<SketchPickerProps, any> {}
+export default class SketchPicker extends Component<SketchPickerProps> {}
diff --git a/types/react-color/lib/components/slider/Slider.d.ts b/types/react-color/lib/components/slider/Slider.d.ts
index 913f30692a..1832cc7f24 100644
--- a/types/react-color/lib/components/slider/Slider.d.ts
+++ b/types/react-color/lib/components/slider/Slider.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type SliderPickerProps = ColorPickerProps<SliderPicker>;
 
-export default class SliderPicker extends Component<SliderPickerProps, any> {}
+export default class SliderPicker extends Component<SliderPickerProps> {}
diff --git a/types/react-color/lib/components/swatches/Swatches.d.ts b/types/react-color/lib/components/swatches/Swatches.d.ts
index 22e9d1704c..d821fc7c3d 100644
--- a/types/react-color/lib/components/swatches/Swatches.d.ts
+++ b/types/react-color/lib/components/swatches/Swatches.d.ts
@@ -7,4 +7,4 @@ export interface SwatchesPickerProps extends ColorPickerProps<SwatchesPicker> {
     width?: number;
 }
 
-export default class SwatchesPicker extends Component<SwatchesPickerProps, any> {}
+export default class SwatchesPicker extends Component<SwatchesPickerProps> {}
diff --git a/types/react-color/lib/components/twitter/Twitter.d.ts b/types/react-color/lib/components/twitter/Twitter.d.ts
index b4e6bb2308..84b53dbc7a 100644
--- a/types/react-color/lib/components/twitter/Twitter.d.ts
+++ b/types/react-color/lib/components/twitter/Twitter.d.ts
@@ -3,4 +3,4 @@ import { ColorPickerProps } from "react-color";
 
 export type TwitterPickerProps = ColorPickerProps<TwitterPicker>;
 
-export default class TwitterPicker extends Component<TwitterPickerProps, any> {}
+export default class TwitterPicker extends Component<TwitterPickerProps> {}
diff --git a/types/react-copy-to-clipboard/index.d.ts b/types/react-copy-to-clipboard/index.d.ts
index 67b70b0ad1..f8cab84517 100644
--- a/types/react-copy-to-clipboard/index.d.ts
+++ b/types/react-copy-to-clipboard/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nkbt/react-copy-to-clipboard
 // Definitions by: Meno Abels <https://github.com/mabels>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -23,5 +23,5 @@ declare namespace CopyToClipboard {
   }
 }
 
-declare class CopyToClipboard extends React.Component<CopyToClipboard.Props, {}> {
+declare class CopyToClipboard extends React.Component<CopyToClipboard.Props> {
 }
diff --git a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
index 4d412f0257..a3459a66a5 100644
--- a/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
+++ b/types/react-copy-to-clipboard/react-copy-to-clipboard-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as CopyToClipboard from "react-copy-to-clipboard";
 
-export class Test extends React.Component<any, any> {
+export class Test extends React.Component {
     render() {
         return (
           <CopyToClipboard text={"Hello World"}
diff --git a/types/react-cropper/index.d.ts b/types/react-cropper/index.d.ts
index a9c6ba5b24..43f2cac063 100644
--- a/types/react-cropper/index.d.ts
+++ b/types/react-cropper/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/roadmanfong/react-cropper
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import cropperjs = require('cropperjs');
-import React = require("react");
+import * as cropperjs from 'cropperjs';
+import * as React from 'react';
 
 import Data = cropperjs.Data;
 import ContainerData = cropperjs.ContainerData;
@@ -16,7 +16,7 @@ import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
 type ReactCropperProps = cropperjs.CropperOptions & React.HTMLProps<HTMLImageElement>;
 
 interface ReactCropper extends cropperjs {} // tslint:disable-line no-empty-interface
-declare class ReactCropper extends React.Component<ReactCropperProps, {}> {
+declare class ReactCropper extends React.Component<ReactCropperProps> {
     on(eventname: string, callback: () => void): void;
 }
 export default ReactCropper;
diff --git a/types/react-cropper/react-cropper-tests.tsx b/types/react-cropper/react-cropper-tests.tsx
index aa46343b36..90fdf788b8 100644
--- a/types/react-cropper/react-cropper-tests.tsx
+++ b/types/react-cropper/react-cropper-tests.tsx
@@ -3,7 +3,7 @@ import Cropper from 'react-cropper';
 // If you choose not to use import, you need to assign Cropper to default
 // var Cropper = require('react-cropper').default
 
-class Demo extends React.Component<{}, {}> {
+class Demo extends React.Component {
     crop() {
         // image in dataUrl
         console.log((this.refs['cropper'] as any).getCroppedCanvas().toDataURL());
diff --git a/types/react-css-modules/index.d.ts b/types/react-css-modules/index.d.ts
index 32835f0c1d..6363a5797d 100644
--- a/types/react-css-modules/index.d.ts
+++ b/types/react-css-modules/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gajus/react-css-modules
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>, Tadas Dailyda <https://github.com/skirsdeda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 interface TypeOptions {
     allowMultiple?: boolean;
diff --git a/types/react-css-modules/react-css-modules-tests.tsx b/types/react-css-modules/react-css-modules-tests.tsx
index 18f4cd04e3..da191799c7 100644
--- a/types/react-css-modules/react-css-modules-tests.tsx
+++ b/types/react-css-modules/react-css-modules-tests.tsx
@@ -7,7 +7,7 @@ interface TableProps extends CSSModules.InjectedCSSModuleProps {
 
 }
 
-class Table extends React.Component<TableProps, {}> {
+class Table extends React.Component<TableProps> {
     render () {
         const { styles } = this.props;
 
@@ -29,7 +29,7 @@ interface TableDecoratedProps extends CSSModules.InjectedCSSModuleProps {
 }
 
 @CSSModules(styles)
-class TableDecorated extends React.Component<TableDecoratedProps, {}> {
+class TableDecorated extends React.Component<TableDecoratedProps> {
     render () {
         const { styles } = this.props;
 
@@ -47,7 +47,7 @@ interface TableProps extends CSSModules.InjectedCSSModuleProps {
 
 }
 
-class Svg extends React.Component<TableProps, {}> {
+class Svg extends React.Component<TableProps> {
     render () {
         const { styles } = this.props;
 
diff --git a/types/react-css-transition-replace/index.d.ts b/types/react-css-transition-replace/index.d.ts
index ce09917fbe..96f0952391 100644
--- a/types/react-css-transition-replace/index.d.ts
+++ b/types/react-css-transition-replace/index.d.ts
@@ -1,14 +1,15 @@
-// Type definitions for react-css-transition-replace 2.0.1
+// Type definitions for react-css-transition-replace 2.1
 // Project: http://marnusw.github.io/react-css-transition-replace/
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as CSSTransitionGroup from "react-addons-css-transition-group";
 
 declare namespace CSSTransitionReplace {
     interface Props extends React.CSSTransitionGroupProps {
+        changeWidth?: boolean
         overflowHidden?: boolean
     }
 }
diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts
index 88ed144561..4af4d37d06 100644
--- a/types/react-custom-scrollbars/index.d.ts
+++ b/types/react-custom-scrollbars/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by:  David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 //                  kittimiyo <https://github.com/kittimiyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -47,7 +47,7 @@ declare module "react-custom-scrollbars" {
         autoHeightMax?: number;
     }
 
-    export default class Scrollbars extends React.Component<ScrollbarProps, {}> {
+    export default class Scrollbars extends React.Component<ScrollbarProps> {
         scrollTop(top: number): void;
         scrollLeft(left: number): void;
         scrollToTop(): void;
diff --git a/types/react-custom-scrollbars/v3/index.d.ts b/types/react-custom-scrollbars/v3/index.d.ts
index a5ae0da8b2..6c408ec6f8 100644
--- a/types/react-custom-scrollbars/v3/index.d.ts
+++ b/types/react-custom-scrollbars/v3/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/malte-wessel/react-custom-scrollbars
 // Definitions by: David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -40,7 +40,7 @@ declare module "react-custom-scrollbars" {
         universal?: boolean;
     }
 
-    export default class Scrollbars extends React.Component<ScrollbarProps, {}> {
+    export default class Scrollbars extends React.Component<ScrollbarProps> {
         scrollTop(top: number): void;
         scrollLeft(left: number): void;
         scrollToTop(): void;
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index e22d8743a3..5e4f23f5f5 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>, Kieran Peat <https://github.com/KieranPeat>, Martin Novak <https://github.com/martinnov92/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -425,7 +425,7 @@ declare namespace AdazzleReactDataGrid {
      * Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like
      * http://adazzle.github.io/react-data-grid/
      */
-    export class ReactDataGrid extends React.Component<GridProps, {}> { }
+    export class ReactDataGrid extends React.Component<GridProps> { }
     export namespace ReactDataGrid {
         // Useful types
         export import Column = AdazzleReactDataGrid.Column;
@@ -443,29 +443,29 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A react component that renders a row of the grid
          */
-        export class Row extends React.Component<any, any> { }
+        export class Row extends React.Component<any> { }
         /**
          * A react coponent that renders a cell of the grid
          */
-        export class Cell extends React.Component<any, any> { }
+        export class Cell extends React.Component<any> { }
     }
 }
 
 declare namespace AdazzleReactDataGridPlugins {
     // TODO: refine types for these addons
     export namespace Editors {
-        export class AutoComplete extends React.Component<any, {}> { }
-        export class DropDownEditor extends React.Component<any, {}> { }
-        export class SimpleTextEditor extends React.Component<any, {}> { }
-        export class CheckboxEditor extends React.Component<any, {}> { }
+        export class AutoComplete extends React.Component<any> { }
+        export class DropDownEditor extends React.Component<any> { }
+        export class SimpleTextEditor extends React.Component<any> { }
+        export class CheckboxEditor extends React.Component<any> { }
     }
     export namespace Formatters {
-        export class ImageFormatter extends React.Component<any, {}> { }
-        export class DropDownFormatter extends React.Component<any, {}> { }
+        export class ImageFormatter extends React.Component<any> { }
+        export class DropDownFormatter extends React.Component<any> { }
     }
-    export class Toolbar extends React.Component<any, any> {}
+    export class Toolbar extends React.Component<any> {}
     export namespace DraggableHeader {
-        export class DraggableContainer extends React.Component<any, any>{ }
+        export class DraggableContainer extends React.Component<any>{ }
     }
     export namespace Data {
         export const Selectors: {
@@ -476,10 +476,10 @@ declare namespace AdazzleReactDataGridPlugins {
     // TODO: re-export the react-contextmenu typings once those exist
     // https://github.com/vkbansal/react-contextmenu/issues/10
     export namespace Menu {
-        export class ContextMenu extends React.Component<any, {}> { }
-        export class MenuHeader extends React.Component<any, {}> { }
-        export class MenuItem extends React.Component<any, {}> { }
-        export class SubMenu extends React.Component<any, {}> { }
+        export class ContextMenu extends React.Component<any> { }
+        export class MenuHeader extends React.Component<any> { }
+        export class MenuItem extends React.Component<any> { }
+        export class SubMenu extends React.Component<any> { }
         export const monitor: {
             getItem(): any
             getPosition(): any
diff --git a/types/react-data-grid/v1/index.d.ts b/types/react-data-grid/v1/index.d.ts
index 3ec11776f9..20ffef6c2b 100644
--- a/types/react-data-grid/v1/index.d.ts
+++ b/types/react-data-grid/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -406,7 +406,7 @@ declare namespace AdazzleReactDataGrid {
      * Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like
      * http://adazzle.github.io/react-data-grid/
      */
-    export class ReactDataGrid extends React.Component<GridProps, {}> { }
+    export class ReactDataGrid extends React.Component<GridProps> { }
     export namespace ReactDataGrid {
         // Useful types
         export import Column = AdazzleReactDataGrid.Column;
@@ -424,34 +424,34 @@ declare namespace AdazzleReactDataGrid {
         /**
          * A react component that renders a row of the grid
          */
-        export class Row extends React.Component<any, any> { }
+        export class Row extends React.Component<any> { }
         /**
          * A react coponent that renders a cell of the grid
          */
-        export class Cell extends React.Component<any, any> { }
+        export class Cell extends React.Component<any> { }
     }
 }
 
 declare namespace AdazzleReactDataGridPlugins {
     // TODO: refine types for these addons
     export namespace Editors {
-        export class AutoComplete extends React.Component<any, {}> { }
-        export class DropDownEditor extends React.Component<any, {}> { }
-        export class SimpleTextEditor extends React.Component<any, {}> { }
-        export class CheckboxEditor extends React.Component<any, {}> { }
+        export class AutoComplete extends React.Component<any> { }
+        export class DropDownEditor extends React.Component<any> { }
+        export class SimpleTextEditor extends React.Component<any> { }
+        export class CheckboxEditor extends React.Component<any> { }
     }
     export namespace Formatters {
-        export class ImageFormatter extends React.Component<any, {}> { }
-        export class DropDownFormatter extends React.Component<any, {}> { }
+        export class ImageFormatter extends React.Component<any> { }
+        export class DropDownFormatter extends React.Component<any> { }
     }
-    export class Toolbar extends React.Component<any, any> {}
+    export class Toolbar extends React.Component<any> {}
     // TODO: re-export the react-contextmenu typings once those exist
     // https://github.com/vkbansal/react-contextmenu/issues/10
     export namespace Menu {
-        export class ContextMenu extends React.Component<any, {}> { }
-        export class MenuHeader extends React.Component<any, {}> { }
-        export class MenuItem extends React.Component<any, {}> { }
-        export class SubMenu extends React.Component<any, {}> { }
+        export class ContextMenu extends React.Component<any> { }
+        export class MenuHeader extends React.Component<any> { }
+        export class MenuItem extends React.Component<any> { }
+        export class SubMenu extends React.Component<any> { }
         export const monitor: {
             getItem(): any
             getPosition(): any
diff --git a/types/react-datagrid/index.d.ts b/types/react-datagrid/index.d.ts
index eddd5701fa..e3c8d983ea 100644
--- a/types/react-datagrid/index.d.ts
+++ b/types/react-datagrid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-datagrid.git
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
@@ -303,6 +303,6 @@ declare namespace ReactDataGrid {
 				}
     }
 
-    export class DataGrid extends React.Component<DataGridProps, {}> {
+    export class DataGrid extends React.Component<DataGridProps> {
     }
 }
diff --git a/types/react-datagrid/react-datagrid-tests.tsx b/types/react-datagrid/react-datagrid-tests.tsx
index bdbca39f01..1505961d81 100644
--- a/types/react-datagrid/react-datagrid-tests.tsx
+++ b/types/react-datagrid/react-datagrid-tests.tsx
@@ -14,7 +14,7 @@ var selected = {};
 var sortInfo = [ { name: 'country', dir: 'asc'}]
 
 export module X {
-export class ExampleBasic extends React.Component<{},{}> {
+export class ExampleBasic extends React.Component {
   render(): React.ReactElement<any> {
       return (
           <ReactDataGrid
@@ -28,7 +28,7 @@ export class ExampleBasic extends React.Component<{},{}> {
 }
 }
 
-class ExampleFull extends React.Component<{},{}> {
+class ExampleFull extends React.Component {
 
     render(): React.ReactElement<any> {
 		    return (
diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index ab6242b2b0..f31f0316e1 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -4,7 +4,7 @@
 //     Andrey Balokha <https://github.com/andrewBalekha>,
 //     Greg Smith <https://github.com/smrq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as moment from "moment";
diff --git a/types/react-daterange-picker/index.d.ts b/types/react-daterange-picker/index.d.ts
index 280c730df1..53618277d6 100644
--- a/types/react-daterange-picker/index.d.ts
+++ b/types/react-daterange-picker/index.d.ts
@@ -1,16 +1,18 @@
-// Type definitions for React Daterange Picker v1.1.0
+// Type definitions for React Daterange Picker 1.1
 // Project: https://github.com/onefinestay/react-daterange-picker
 // Definitions by: UNCOVER TRUTH Inc. <https://github.com/uncovertruth/>
+//                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
-import * as moment from "moment-range";
+import * as moment from "moment";
+import * as momentRange from "moment-range";
 
-export default class DateRangePicker extends React.Component<Props, {}> {}
+export default class DateRangePicker extends React.Component<Props> { }
 export as namespace ReactDateRangePicker;
 
-interface Props extends React.Props<{}> {
+export interface Props extends React.Props<{}> {
     bemBlock?: string;
     bemNamespace?: string;
     dateStates?: DateState[];
@@ -30,37 +32,35 @@ interface Props extends React.Props<{}> {
     onHighlightDate?(date: Date): void;
     onHighlightRange?(date: Date): void;
     onSelect?(value: Props): void;
-    onSelectStart?(value: moment.Moment): void;
+    onSelectStart?(value: momentRange.MomentRangeExtends): void;
     paginationArrowComponent?: PaginationArrow;
     selectedLabel?: string;
-    selectionType?: 'single' |'range';
+    selectionType?: 'single' | 'range';
     singleDateRange?: boolean;
     showLegend?: boolean;
     stateDefinitions?: StateDefinitions;
-    value?: moment.Moment | moment.Range;
+    value?: momentRange.MomentRangeExtends | momentRange.DateRange;
 }
 
-interface DateState {
+export interface DateState {
     state: string;
-    range: moment.Range;
+    range: momentRange.DateRange;
 }
 
-interface StateDefinitions {
+export interface StateDefinitions {
     [key: string]: StateDefinition;
 }
 
-interface StateDefinition {
+export interface StateDefinition {
     color: string;
     label: string;
     selectable?: boolean;
 }
 
-interface PaginationArrowProps extends React.Props<{}> {
+export interface PaginationArrowProps extends React.Props<{}> {
     disabled?: boolean;
     onTrigger?(): void;
     direction?: 'next' | 'previous';
 }
 
-declare class PaginationArrow extends React.Component<PaginationArrowProps, {}> {
-}
-
+export class PaginationArrow extends React.Component<PaginationArrowProps> { }
diff --git a/types/react-daterange-picker/package.json b/types/react-daterange-picker/package.json
new file mode 100644
index 0000000000..62e9ccc7dd
--- /dev/null
+++ b/types/react-daterange-picker/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "moment": "^2.18.1"
+    }
+}
\ No newline at end of file
diff --git a/types/react-daterange-picker/react-daterange-picker-tests.tsx b/types/react-daterange-picker/react-daterange-picker-tests.tsx
index 1bb372d4db..e1259dd81e 100644
--- a/types/react-daterange-picker/react-daterange-picker-tests.tsx
+++ b/types/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -1,12 +1,15 @@
-// Test app from https://github.com/onefinestay/react-daterange-picker/blob/master/example/index.jsx
+// test app from https://github.com/onefinestay/react-daterange-picker/blob/master/example/index.jsx
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import * as moment from 'moment-range';
 import DateRangePicker from "react-daterange-picker";
 import * as ReactDateRangePicker from "react-daterange-picker";
 
-interface AppProps extends ReactDateRangePicker.Props {
-}
+import * as MomentRange from "moment-range";
+import * as Moment from "moment";
+
+const moment = MomentRange.extendMoment(Moment);
+
+type AppProps = ReactDateRangePicker.Props;
 
 class App extends React.Component<AppProps, any> {
     constructor(props: AppProps, context: any) {
@@ -16,7 +19,7 @@ class App extends React.Component<AppProps, any> {
     }
 
     handleSelect(value: AppProps, states: any): void {
-        this.setState({value, states});
+        this.setState({ value, states });
     }
 
     render(): any {
@@ -29,8 +32,8 @@ class App extends React.Component<AppProps, any> {
                     <input type="text"
                         value={this.state.value ? this.state.value.start.format('LL') : ""}
                         readOnly={true}
-                        placeholder="Start date"/>
-                  <input type="text"
+                        placeholder="Start date" />
+                    <input type="text"
                         value={this.state.value ? this.state.value.end.format('LL') : ""}
                         readOnly={true}
                         placeholder="End date" />
@@ -41,33 +44,32 @@ class App extends React.Component<AppProps, any> {
 }
 
 class DateSinglePicker extends React.Component<AppProps, any> {
-    constructor(props : AppProps, context: any) {
+    constructor(props: AppProps, context: any) {
         super(props, context);
 
         this.state = {};
     }
 
     handleSelect(value: AppProps) {
-        this.setState({value: value});
+        this.setState({ value });
     }
 
     render() {
         return (
             <div>
                 <DateRangePicker {...this.props} onSelect={this.handleSelect.bind(this)}
-                  value={this.state.value} />
+                    value={this.state.value} />
                 <div>
-                  <input type="text"
-                    value={this.state.value ? this.state.value.format('LL') : ""}
-                    readOnly={true} />
+                    <input type="text"
+                        value={this.state.value ? this.state.value.format('LL') : ""}
+                        readOnly={true} />
                 </div>
             </div>
         );
     }
 }
 
-export class Main extends React.Component<any, any> {
-
+export class Main extends React.Component {
     render() {
         const stateDefinitions: ReactDateRangePicker.StateDefinitions = {
             available: {
diff --git a/types/react-daterange-picker/tslint.json b/types/react-daterange-picker/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/react-daterange-picker/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index d64d9cdbca..d290c84995 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -1,38 +1,40 @@
-// Type definitions for react-dates v10.0.1
+// Type definitions for react-dates v12.1.0
 // Project: https://github.com/airbnb/react-dates
 // Definitions by: Artur Ampilogov <https://github.com/Artur-A>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as moment from "moment";
 
 export = ReactDates;
 
-declare namespace momentPropTypes{
+declare namespace momentPropTypes {
     type momentObj = moment.Moment;
     type momentString = any;
     type momentDurationObj = any;
 }
 
-    
-declare namespace ReactDates{
+
+declare namespace ReactDates {
     type AnchorDirectionShape = 'left' | 'right';
     type FocusedInputShape = 'startDate' | 'endDate';
-    type OrientationShape = 'horizontal' | 'vertical';        
-    type ScrollableOrientationShape = 'horizontal' | 'vertical' | 'verticalScrollable'; 
-    
+    type OrientationShape = 'horizontal' | 'vertical';
+    type ScrollableOrientationShape = 'horizontal' | 'vertical' | 'verticalScrollable';
 
-    interface DateRangePickerShape{
+
+    interface DateRangePickerShape {
         // REQUIRED props
         startDate: momentPropTypes.momentObj | null,
         endDate: momentPropTypes.momentObj | null,
-        onDatesChange: (arg: { startDate: momentPropTypes.momentObj | null, 
-                                endDate: momentPropTypes.momentObj | null }
-                       ) => void,
+        onDatesChange: (arg: {
+            startDate: momentPropTypes.momentObj | null,
+            endDate: momentPropTypes.momentObj | null
+        }
+        ) => void,
         focusedInput: FocusedInputShape | null,
         onFocusChange: (arg: FocusedInputShape | null) => void,
-        
+
         // input related props
         startDateId?: string,
         startDatePlaceholderText?: string,
@@ -40,6 +42,7 @@ declare namespace ReactDates{
         endDatePlaceholderText?: string,
         disabled?: boolean,
         required?: boolean,
+        readOnly?: boolean,
         screenReaderInputMessage?: string,
         showClearDates?: boolean,
         showDefaultInputIcon?: boolean,
@@ -57,13 +60,16 @@ declare namespace ReactDates{
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
-        renderCalendarInfo?: () => (string | JSX.Element), 
+        renderCalendarInfo?: () => (string | JSX.Element),
+        hideKeyboardShortcutsPanel?: boolean,
+        isRTL?: boolean,
 
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
 
         // day presentation and interaction related props
         renderDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
@@ -72,10 +78,10 @@ declare namespace ReactDates{
         isDayBlocked?: (day: any) => boolean,
         isOutsideRange?: (day: any) => boolean,
         isDayHighlighted?: (day: any) => boolean,
-        
+
 
         // internationalization props
-        displayFormat?: (string | (()=> string)),
+        displayFormat?: (string | (() => string)),
         monthFormat?: string,
         phrases?: {
             closeDatePicker: string,
@@ -111,22 +117,25 @@ declare namespace ReactDates{
     type DateRangePicker = React.ClassicComponentClass<DateRangePickerShape>;
     var DateRangePicker: React.ClassicComponentClass<DateRangePickerShape>;
 
-    interface SingleDatePickerShape{
+    interface SingleDatePickerShape {
         // REQUIRED props
         date: momentPropTypes.momentObj | null,
         onDateChange: (date: momentPropTypes.momentObj | null) => void,
         focused: boolean,
         onFocusChange: (arg: { focused: boolean | null }) => void,
-        
+
         id: string,
 
         // input related props
         placeholder?: string,
         disabled?: boolean,
         required?: boolean,
+        readOnly?: boolean,
         screenReaderInputMessage?: string,
         showClearDate?: boolean,
         customCloseIcon?: string | JSX.Element,
+        showDefaultInputIcon?: boolean,
+        customInputIcon?: string | JSX.Element,
 
         // calendar presentation and interaction related props
         orientation?: OrientationShape,
@@ -138,24 +147,26 @@ declare namespace ReactDates{
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
-        renderCalendarInfo?: () => (string | JSX.Element), 
+        renderCalendarInfo?: () => (string | JSX.Element),
+        hideKeyboardShortcutsPanel?: boolean,
+        isRTL?: boolean,
 
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
+        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
 
-        // day presentation and interaction related props            
+        // day presentation and interaction related props
         renderDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         enableOutsideDays?: boolean,
         isDayBlocked?: (day: any) => boolean,
         isOutsideRange?: (day: any) => boolean,
         isDayHighlighted?: (day: any) => boolean,
 
-
         // internationalization props
-        displayFormat?: (string | (()=> string)),
+        displayFormat?: (string | (() => string)),
         monthFormat?: string,
         phrases?: {
             closeDatePicker: string,
@@ -194,9 +205,11 @@ declare namespace ReactDates{
         // REQUIRED props
         startDate: momentPropTypes.momentObj | null,
         endDate: momentPropTypes.momentObj | null,
-        onDatesChange: (arg: { startDate: momentPropTypes.momentObj | null, 
-                        endDate: momentPropTypes.momentObj | null }
-                        ) => void,
+        onDatesChange: (arg: {
+            startDate: momentPropTypes.momentObj | null,
+            endDate: momentPropTypes.momentObj | null
+        }
+        ) => void,
         focusedInput: FocusedInputShape | null,
         onFocusChange: (arg: FocusedInputShape | null) => void,
 
@@ -206,10 +219,10 @@ declare namespace ReactDates{
         orientation?: ScrollableOrientationShape,
         withPortal?: boolean,
         initialVisibleMonth?: () => momentPropTypes.momentObj,
-        renderCalendarInfo?: () => (string | JSX.Element), 
+        renderCalendarInfo?: () => (string | JSX.Element),
         onOutsideClick?: (e: any) => void,
         keepOpenOnDateSelect?: boolean,
-  
+
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
@@ -234,7 +247,7 @@ declare namespace ReactDates{
 
     type DayPickerRangeController = React.ClassicComponentClass<DayPickerRangeControllerShape>;
     var DayPickerRangeController: React.ClassicComponentClass<DayPickerRangeControllerShape>;
-    
+
 
 
 
@@ -245,6 +258,6 @@ declare namespace ReactDates{
 
     var toISODateString: (date: moment.MomentInput, currentFormat: moment.MomentFormatSpecification) => string | null;
     var toLocalizedDateString: (date: moment.MomentInput, currentFormat: moment.MomentFormatSpecification) => string | null;
-    
-    var toMomentObject: (dateString: moment.MomentInput, customFormat: moment.MomentFormatSpecification) => moment.Moment | null;    
+
+    var toMomentObject: (dateString: moment.MomentInput, customFormat: moment.MomentFormatSpecification) => moment.Moment | null;
 }
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index 8063e208d6..d8d6691b45 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -1,10 +1,10 @@
 import * as React from "react";
 import * as moment from "moment";
 
-import { 
-        SingleDatePicker, 
+import {
+        SingleDatePicker,
         DateRangePicker,
-        DayPickerRangeController,     
+        DayPickerRangeController,
         isInclusivelyAfterDay,
         isInclusivelyBeforeDay,
         isNextDay,
@@ -16,9 +16,9 @@ import {
 
 
 
-class SingleDatePickerMinimumTest extends React.Component<{}, {}> {
+class SingleDatePickerMinimumTest extends React.Component {
     render() {
-        return <SingleDatePicker 
+        return <SingleDatePicker
                     id="SingleDatePickerInput"
                     date={moment()}
                     onDateChange={d => {}}
@@ -28,17 +28,17 @@ class SingleDatePickerMinimumTest extends React.Component<{}, {}> {
     }
 }
 
-class SingleDatePickerFullTest extends React.Component<{}, {}> {
+class SingleDatePickerFullTest extends React.Component {
     render() {
         return <SingleDatePicker
-                    id="SingleDatePickerInput" 
+                    id="SingleDatePickerInput"
                     disabled={false}
                     displayFormat="dd.mm.yyyy"
                     anchorDirection="right"
                     date={moment()}
                     enableOutsideDays={true}
                     horizontalMargin={20}
-                    initialVisibleMonth={() => moment()}   
+                    initialVisibleMonth={() => moment()}
                     placeholder="test"
                     required={false}
                     showClearDate={true}
@@ -64,24 +64,24 @@ class SingleDatePickerFullTest extends React.Component<{}, {}> {
     }
 }
 
-class DateRangePickerMinimumTest extends React.Component<{}, {}> {
+class DateRangePickerMinimumTest extends React.Component {
     render() {
         return <DateRangePicker
                     startDate={moment()}
                     endDate={moment()}
                     onDatesChange={(arg)=> {}}
                     focusedInput="startDate"
-                    onFocusChange={(arg) => {}} 
+                    onFocusChange={(arg) => {}}
                      />
     }
 }
 
 
-class DateRangePickerFullTest extends React.Component<{}, {}> {
+class DateRangePickerFullTest extends React.Component {
     render() {
         return <DateRangePicker
                     disabled={false}
-                    startDateId="id1" 
+                    startDateId="id1"
                     endDateId="id2"
                     startDatePlaceholderText="placeholder"
                     endDatePlaceholderText="placeholder"
@@ -97,7 +97,7 @@ class DateRangePickerFullTest extends React.Component<{}, {}> {
                     displayFormat="dd.mm.yyyy"
                     enableOutsideDays={true}
                     horizontalMargin={20}
-                    initialVisibleMonth={() => moment()}   
+                    initialVisibleMonth={() => moment()}
                     isDayBlocked={(day:any)=> false}
                     isOutsideRange={(day:any)=> false}
                     keepOpenOnDateSelect={true}
@@ -116,14 +116,14 @@ class DateRangePickerFullTest extends React.Component<{}, {}> {
     }
 }
 
-class DayPickerRangeControllerMinimumTest extends React.Component<{}, {}> {
+class DayPickerRangeControllerMinimumTest extends React.Component {
     render() {
         return <DayPickerRangeController
                     startDate={moment()}
                     endDate={moment()}
                     onDatesChange={(arg)=> {}}
                     focusedInput="startDate"
-                    onFocusChange={(arg) => {}} 
+                    onFocusChange={(arg) => {}}
                     />
     }
 }
@@ -146,5 +146,4 @@ const isSameDayResult: boolean = isSameDay(moment(),moment());
 const toISODateStringResult: string | null = toISODateString(moment(), "dd.mm.yyyy");
 const toLocalizedDateStringResult: string | null = toLocalizedDateString(moment(), "dd.mm.yyyy");
 const toMomentObjectResult: moment.Moment | null = toMomentObject(moment(), "dd.mm.yyyy");
-        
-        
\ No newline at end of file
+
diff --git a/types/react-dnd-html5-backend/index.d.ts b/types/react-dnd-html5-backend/index.d.ts
index 299e47dbae..6789ab3a19 100644
--- a/types/react-dnd-html5-backend/index.d.ts
+++ b/types/react-dnd-html5-backend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-dnd
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as ReactDnd from "react-dnd";
 
diff --git a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
index 198909b7e9..47fa6ab5d4 100644
--- a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ b/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
@@ -1,8 +1,8 @@
 // Test adapted from the ReactDnD chess game tutorial:
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
-import React = require("react");
-import ReactDnd = require("react-dnd");
+import * as React from "react";
+import * as ReactDnd from "react-dnd";
 
 const r = React.DOM;
 
@@ -75,7 +75,7 @@ namespace Knight {
         };
     }
 
-    export class Knight extends React.Component<KnightP, {}> {
+    export class Knight extends React.Component<KnightP> {
         static defaultProps: KnightP;
 
         static create = React.createFactory(Knight);
@@ -111,7 +111,7 @@ namespace Square {
         black: boolean;
     }
 
-    export class Square extends React.Component<SquareP, {}> {
+    export class Square extends React.Component<SquareP> {
         render() {
             const fill = this.props.black ? 'black' : 'white';
             return r.div({
@@ -150,7 +150,7 @@ namespace BoardSquare {
         };
     }
 
-    export class BoardSquare extends React.Component<BoardSquareP, {}> {
+    export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
         private _renderOverlay = (color: string) => {
@@ -210,7 +210,7 @@ namespace CustomDragLayer {
         };
     }
 
-    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
         render() {
             return r.div(null, this.props.isDragging ? this.props.item : null);
         }
@@ -229,7 +229,7 @@ namespace Board {
         knightPosition: number[];
     }
 
-    export class Board extends React.Component<BoardP, {}> {
+    export class Board extends React.Component<BoardP> {
         private _renderPiece = (x: number, y: number) => {
             const knightX = this.props.knightPosition[0];
             const knightY = this.props.knightPosition[1];
diff --git a/types/react-dnd/index.d.ts b/types/react-dnd/index.d.ts
index 0b98006be3..13402d440f 100644
--- a/types/react-dnd/index.d.ts
+++ b/types/react-dnd/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-dnd
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
@@ -80,8 +80,8 @@ declare module __ReactDnd {
     // ----------------------------------------------------------------------
 
     interface DragSourceSpec<P> {
-        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): Object;
-        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P, any>): void;
+        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): Object;
+        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): void;
         canDrag?(props: P, monitor?: DragSourceMonitor): boolean;
         isDragging?(props: P, monitor?: DragSourceMonitor): boolean;
     }
@@ -126,8 +126,8 @@ declare module __ReactDnd {
     // ----------------------------------------------------------------------
 
     interface DropTargetSpec<P> {
-        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): Object|void;
-        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P, any>): void;
+        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): Object|void;
+        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): void;
         canDrop?(props: P, monitor?: DropTargetMonitor): boolean;
     }
 
diff --git a/types/react-dnd/react-dnd-tests.ts b/types/react-dnd/react-dnd-tests.ts
index 0aabefd26e..127f4c9904 100644
--- a/types/react-dnd/react-dnd-tests.ts
+++ b/types/react-dnd/react-dnd-tests.ts
@@ -1,8 +1,8 @@
 // Test adapted from the ReactDnD chess game tutorial:
 // http://gaearon.github.io/react-dnd/docs-tutorial.html
 
-import React = require("react");
-import ReactDnd = require("react-dnd");
+import * as React from "react";
+import * as ReactDnd from "react-dnd";
 
 var r = React.DOM;
 
@@ -87,7 +87,7 @@ namespace Knight {
         };
     }
 
-    export class Knight extends React.Component<KnightP, {}> {
+    export class Knight extends React.Component<KnightP> {
         static defaultProps: KnightP;
 
         static create = React.createFactory(Knight);
@@ -123,7 +123,7 @@ namespace Square {
         black: boolean;
     }
 
-    export class Square extends React.Component<SquareP, {}> {
+    export class Square extends React.Component<SquareP> {
         render() {
             var fill = this.props.black ? 'black' : 'white';
             return r.div({
@@ -162,7 +162,7 @@ namespace BoardSquare {
         };
     }
 
-    export class BoardSquare extends React.Component<BoardSquareP, {}> {
+    export class BoardSquare extends React.Component<BoardSquareP> {
         static defaultProps: BoardSquareP;
 
         private _renderOverlay = (color: string) => {
@@ -225,7 +225,7 @@ namespace CustomDragLayer {
         };
     }
 
-    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
         render() {
             return r.div(null, this.props.isDragging ? this.props.item : null);
         }
@@ -244,7 +244,7 @@ namespace Board {
         knightPosition: number[];
     }
 
-    export class Board extends React.Component<BoardP, {}> {
+    export class Board extends React.Component<BoardP> {
         private _renderPiece = (x: number, y: number) => {
             var knightX = this.props.knightPosition[0];
             var knightY = this.props.knightPosition[1];
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index 6adb9da76b..796314e19f 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -1,8 +1,11 @@
 // Type definitions for React (react-dom) 15.5
 // 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>
+// Definitions by: Asana <https://asana.com>
+//                 AssureSign <http://www.assuresign.com>
+//                 Microsoft <https://microsoft.com>
+//                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 export as namespace ReactDOM;
 
@@ -36,7 +39,7 @@ export function render<P>(
     callback?: (component?: Component<P, ComponentState> | Element) => any
 ): Component<P, ComponentState> | Element | void;
 export function render<P>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: SFCElement<P>,
     container: Element,
     callback?: () => any
@@ -51,17 +54,17 @@ export function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
 export function unstable_batchedUpdates(callback: () => any): void;
 
 export function unstable_renderSubtreeIntoContainer<P extends DOMAttributes<T>, T extends Element>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: DOMElement<P, T>,
     container: Element,
     callback?: (element: T) => any): T;
 export function unstable_renderSubtreeIntoContainer<P, T extends Component<P, ComponentState>>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: CElement<P, T>,
     container: Element,
     callback?: (component: T) => any): T;
 export function unstable_renderSubtreeIntoContainer<P>(
-    parentComponent: Component<any, any>,
+    parentComponent: Component<any>,
     element: ReactElement<P>,
     container: Element,
     callback?: (component?: Component<P, ComponentState> | Element) => any): Component<P, ComponentState> | Element | void;
diff --git a/types/react-dom/react-dom-tests.ts b/types/react-dom/react-dom-tests.ts
index c38f307a4e..534b847787 100644
--- a/types/react-dom/react-dom-tests.ts
+++ b/types/react-dom/react-dom-tests.ts
@@ -6,7 +6,7 @@ import * as ReactTestUtils from 'react-dom/test-utils';
 declare function describe(desc: string, f: () => void): void;
 declare function it(desc: string, f: () => void): void;
 
-class TestComponent extends React.Component<{}, {}> { }
+class TestComponent extends React.Component { }
 
 describe('ReactDOM', () => {
     it('render', () => {
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index 3153b3dba7..b45dd56759 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -56,7 +56,7 @@ export interface SyntheticEventData extends OptionalEventProperties {
     which?: number;
 }
 
-export type EventSimulator = (element: Element | Component<any, any>, eventData?: SyntheticEventData) => void;
+export type EventSimulator = (element: Element | Component<any>, eventData?: SyntheticEventData) => void;
 
 export interface MockedComponentClass {
     new (): any;
@@ -126,10 +126,10 @@ export function renderIntoDocument<T extends Element>(
     element: DOMElement<any, T>): T;
 export function renderIntoDocument(
     element: SFCElement<any>): void;
-export function renderIntoDocument<T extends Component<any, any>>(
+export function renderIntoDocument<T extends Component<any>>(
     element: CElement<any, T>): T;
 export function renderIntoDocument<P>(
-    element: ReactElement<P>): Component<P, {}> | Element | void;
+    element: ReactElement<P>): Component<P> | Element | void;
 
 /**
  * Pass a mocked component module to this method to augment it with useful methods that allow it to
@@ -162,7 +162,7 @@ export function isElementOfType<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>>(
+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>;
 
 /**
@@ -172,11 +172,11 @@ export function isDOMComponent(instance: ReactInstance): instance is Element;
 /**
  * Returns `true` if `instance` is a user-defined component, such as a class or a function.
  */
-export function isCompositeComponent(instance: ReactInstance): instance is Component<any, any>;
+export function isCompositeComponent(instance: ReactInstance): instance is Component<any>;
 /**
  * Returns `true` if `instance` is a component whose type is of a React `componentClass`.
  */
-export function isCompositeComponentWithType<T extends Component<any, any>, C extends ComponentClass<any>>(
+export function isCompositeComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
     instance: ReactInstance, type: ClassType<any, T, C>): boolean;
 
 /**
@@ -185,7 +185,7 @@ export function isCompositeComponentWithType<T extends Component<any, any>, C ex
  * as a primitive for other test utils.
  */
 export function findAllInRenderedTree(
-    root: Component<any, any>,
+    root: Component<any>,
     fn: (i: ReactInstance) => boolean): ReactInstance[];
 
 /**
@@ -193,7 +193,7 @@ export function findAllInRenderedTree(
  * DOM components with the class name matching `className`.
  */
 export function scryRenderedDOMComponentsWithClass(
-    root: Component<any, any>,
+    root: Component<any>,
     className: string): Element[];
 /**
  * Like `scryRenderedDOMComponentsWithClass()` but expects there to be one result,
@@ -201,7 +201,7 @@ export function scryRenderedDOMComponentsWithClass(
  * number of matches besides one.
  */
 export function findRenderedDOMComponentWithClass(
-    root: Component<any, any>,
+    root: Component<any>,
     className: string): Element;
 
 /**
@@ -209,7 +209,7 @@ export function findRenderedDOMComponentWithClass(
  * DOM components with the tag name matching `tagName`.
  */
 export function scryRenderedDOMComponentsWithTag(
-    root: Component<any, any>,
+    root: Component<any>,
     tagName: string): Element[];
 /**
  * Like `scryRenderedDOMComponentsWithTag()` but expects there to be one result,
@@ -217,14 +217,14 @@ export function scryRenderedDOMComponentsWithTag(
  * number of matches besides one.
  */
 export function findRenderedDOMComponentWithTag(
-    root: Component<any, any>,
+    root: Component<any>,
     tagName: string): Element;
 
 /**
  * Finds all instances of components with type equal to `componentClass`.
  */
-export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-    root: Component<any, any>,
+export function scryRenderedComponentsWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    root: Component<any>,
     type: ClassType<any, T, C>): T[];
 
 /**
@@ -232,8 +232,8 @@ export function scryRenderedComponentsWithType<T extends Component<{}, {}>, C ex
  * and returns that one result, or throws exception if there is any other
  * number of matches besides one.
  */
-export function findRenderedComponentWithType<T extends Component<{}, {}>, C extends ComponentClass<{}>>(
-    root: Component<any, any>,
+export function findRenderedComponentWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    root: Component<any>,
     type: ClassType<any, T, C>): T;
 
 /**
diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 77356ef9e9..0c944b99cd 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/okonet/react-dropzone
 // Definitions by: Mathieu Larouche Dube <https://github.com/matdube>, Ivo Jesus <https://github.com/LynxEyes>, Luís Rodrigues <https://github.com/goblindegook>
 // Definitions: https://github.com/Vooban/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
+
 /// <reference types="react"/>
 
 declare module "react-dropzone" {
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index ec6d5fa763..aaa499a3e3 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as Dropzone from 'react-dropzone';
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component {
   constructor(props: any) {
     super(props);
   }
diff --git a/types/react-easy-chart/index.d.ts b/types/react-easy-chart/index.d.ts
index 66914c9cd5..9c254c6a28 100644
--- a/types/react-easy-chart/index.d.ts
+++ b/types/react-easy-chart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rma-consulting/react-easy-chart
 // Definitions by: Dave Leaver <https://github.com/danzel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -80,7 +80,7 @@ declare module "react-easy-chart" {
 		/** The amount of ticks to be shown on the y axis */
 		yTickNumber?: number;
 	}
-	class BarChart extends React.Component<BarChartProps, {}> {
+	class BarChart extends React.Component<BarChartProps> {
 	}
 
 	interface PieData {
@@ -113,7 +113,7 @@ declare module "react-easy-chart" {
 
 		styles?: { [cssSelector: string]: React.CSSProperties };
 	}
-	class PieChart extends React.Component<PieChartProps, {}> {
+	class PieChart extends React.Component<PieChartProps> {
 	}
 
 	interface LineData {
@@ -184,14 +184,14 @@ declare module "react-easy-chart" {
 		/** What data type the x axis is */
 		yType?: 'time' | 'text' | 'linear';
 	}
-	class LineChart extends React.Component<LineChartProps, {}> {
+	class LineChart extends React.Component<LineChartProps> {
 	}
 
 	interface AreaChartProps extends LineChartProps {
 		/** Make the gradient area a solid fill rather than a gradient */
 		noAreaGradient?: boolean;
 	}
-	class AreaChart extends React.Component<AreaChartProps, {}> {
+	class AreaChart extends React.Component<AreaChartProps> {
 	}
 
 	interface ScatterplotData {
@@ -253,7 +253,7 @@ declare module "react-easy-chart" {
 		/** What data type the x axis is */
 		yType?: 'time' | 'text' | 'linear';
 	}
-	class ScatterplotChart extends React.Component<ScatterplotChartProps, {}> {
+	class ScatterplotChart extends React.Component<ScatterplotChartProps> {
 	}
 
 	interface LegendProps {
@@ -270,7 +270,7 @@ declare module "react-easy-chart" {
 		/** Override the css styles of individual components, see http://rma-consulting.github.io/react-easy-chart/legend/index.html */
 		styles?: { [cssSelector: string]: React.CSSProperties };
 	}
-	class Legend extends React.Component<LegendProps, {}> {
+	class Legend extends React.Component<LegendProps> {
 
 	}
 
diff --git a/types/react-easy-chart/react-easy-chart-tests.tsx b/types/react-easy-chart/react-easy-chart-tests.tsx
index 65ab377ccc..fa90402eb1 100644
--- a/types/react-easy-chart/react-easy-chart-tests.tsx
+++ b/types/react-easy-chart/react-easy-chart-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AreaChart, BarChart, Legend, LineChart, PieChart, ScatterplotChart } from 'react-easy-chart';
 
-class BarChartData extends React.Component<{}, {}> {
+class BarChartData extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -19,7 +19,7 @@ class BarChartData extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartHeightAndWidth extends React.Component<{}, {}> {
+class BarChartHeightAndWidth extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -40,7 +40,7 @@ class BarChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartColorBars extends React.Component<{}, {}> {
+class BarChartColorBars extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -62,7 +62,7 @@ class BarChartColorBars extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartMargin extends React.Component<{}, {}> {
+class BarChartMargin extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -76,7 +76,7 @@ class BarChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartOverridingBarColors extends React.Component<{}, {}> {
+class BarChartOverridingBarColors extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -94,7 +94,7 @@ class BarChartOverridingBarColors extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartAxes extends React.Component<{}, {}> {
+class BarChartAxes extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -116,7 +116,7 @@ class BarChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartAxesLabels extends React.Component<{}, {}> {
+class BarChartAxesLabels extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -137,7 +137,7 @@ class BarChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxisOrientation extends React.Component<{}, {}> {
+class BarChartYAxisOrientation extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -161,7 +161,7 @@ class BarChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxesType extends React.Component<{}, {}> {
+class BarChartYAxesType extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -181,7 +181,7 @@ class BarChartYAxesType extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartYAxesType2 extends React.Component<{}, {}> {
+class BarChartYAxesType2 extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -201,7 +201,7 @@ class BarChartYAxesType2 extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartDatePattern extends React.Component<{}, {}> {
+class BarChartDatePattern extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -222,7 +222,7 @@ class BarChartDatePattern extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartBarWidth extends React.Component<{}, {}> {
+class BarChartBarWidth extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -244,7 +244,7 @@ class BarChartBarWidth extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartDomainRange extends React.Component<{}, {}> {
+class BarChartDomainRange extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -267,7 +267,7 @@ class BarChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartTickDisplayFormat extends React.Component<{}, {}> {
+class BarChartTickDisplayFormat extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -290,7 +290,7 @@ class BarChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartNumberOfTicks extends React.Component<{}, {}> {
+class BarChartNumberOfTicks extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -314,7 +314,7 @@ class BarChartNumberOfTicks extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartGrid extends React.Component<{}, {}> {
+class BarChartGrid extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -339,7 +339,7 @@ class BarChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartBarAndLine extends React.Component<{}, {}> {
+class BarChartBarAndLine extends React.Component {
 	render(): any {
 		return (
 			<BarChart
@@ -376,7 +376,7 @@ class BarChartBarAndLine extends React.Component<{}, {}> {
 	}
 }
 
-class BarChartMouseHandlers extends React.Component<{}, {}> {
+class BarChartMouseHandlers extends React.Component {
 	mouseOverHandler(d: any, e: any) {
 	}
 
@@ -416,7 +416,7 @@ class BarChartMouseHandlers extends React.Component<{}, {}> {
 }
 
 
-class PieChartData extends React.Component<{}, {}> {
+class PieChartData extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -430,7 +430,7 @@ class PieChartData extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartColor extends React.Component<{}, {}> {
+class PieChartColor extends React.Component {
 	render(): any {
 		return (
 
@@ -445,7 +445,7 @@ class PieChartColor extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartSize extends React.Component<{}, {}> {
+class PieChartSize extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -460,7 +460,7 @@ class PieChartSize extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartDonut extends React.Component<{}, {}> {
+class PieChartDonut extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -476,7 +476,7 @@ class PieChartDonut extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartPadding extends React.Component<{}, {}> {
+class PieChartPadding extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -491,7 +491,7 @@ class PieChartPadding extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartLabels extends React.Component<{}, {}> {
+class PieChartLabels extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -512,7 +512,7 @@ class PieChartLabels extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartStyle extends React.Component<{}, {}> {
+class PieChartStyle extends React.Component {
 	render(): any {
 		return (
 			<PieChart
@@ -537,7 +537,7 @@ class PieChartStyle extends React.Component<{}, {}> {
 	}
 }
 
-class PieChartMouseHandlers extends React.Component<{}, {}> {
+class PieChartMouseHandlers extends React.Component {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -561,7 +561,7 @@ class PieChartMouseHandlers extends React.Component<{}, {}> {
 }
 
 
-class LineChartData extends React.Component<{}, {}> {
+class LineChartData extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -577,7 +577,7 @@ class LineChartData extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartData2 extends React.Component<{}, {}> {
+class LineChartData2 extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -597,7 +597,7 @@ class LineChartData2 extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartHeightAndWidth extends React.Component<{}, {}> {
+class LineChartHeightAndWidth extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -619,7 +619,7 @@ class LineChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartMargin extends React.Component<{}, {}> {
+class LineChartMargin extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -642,7 +642,7 @@ class LineChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartAxes extends React.Component<{}, {}> {
+class LineChartAxes extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -665,7 +665,7 @@ class LineChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartAxesLabels extends React.Component<{}, {}> {
+class LineChartAxesLabels extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -690,7 +690,7 @@ class LineChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYAxisOrientation extends React.Component<{}, {}> {
+class LineChartYAxisOrientation extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -715,7 +715,7 @@ class LineChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartInterpolate extends React.Component<{}, {}> {
+class LineChartInterpolate extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -741,7 +741,7 @@ class LineChartInterpolate extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartXType extends React.Component<{}, {}> {
+class LineChartXType extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -770,7 +770,7 @@ class LineChartXType extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartXTypeTime extends React.Component<{}, {}> {
+class LineChartXTypeTime extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -799,7 +799,7 @@ class LineChartXTypeTime extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYTypeText extends React.Component<{}, {}> {
+class LineChartYTypeText extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -825,7 +825,7 @@ class LineChartYTypeText extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartYTypeTime extends React.Component<{}, {}> {
+class LineChartYTypeTime extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -853,7 +853,7 @@ class LineChartYTypeTime extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartGrid extends React.Component<{}, {}> {
+class LineChartGrid extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -882,7 +882,7 @@ class LineChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartVerticalGrid extends React.Component<{}, {}> {
+class LineChartVerticalGrid extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -913,7 +913,7 @@ class LineChartVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartDomainRange extends React.Component<{}, {}> {
+class LineChartDomainRange extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -946,7 +946,7 @@ class LineChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartTickDisplayFormat extends React.Component<{}, {}> {
+class LineChartTickDisplayFormat extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -976,7 +976,7 @@ class LineChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartNumberOfTicks extends React.Component<{}, {}> {
+class LineChartNumberOfTicks extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -1010,7 +1010,7 @@ class LineChartNumberOfTicks extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartLineColors extends React.Component<{}, {}> {
+class LineChartLineColors extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -1042,7 +1042,7 @@ class LineChartLineColors extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartDataPoints extends React.Component<{}, {}> {
+class LineChartDataPoints extends React.Component {
 	render(): any {
 		return (
 			<LineChart
@@ -1075,7 +1075,7 @@ class LineChartDataPoints extends React.Component<{}, {}> {
 	}
 }
 
-class LineChartMouseEvents extends React.Component<{}, {}> {
+class LineChartMouseEvents extends React.Component {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1117,7 +1117,7 @@ class LineChartMouseEvents extends React.Component<{}, {}> {
 }
 
 
-class AreaChartData extends React.Component<{}, {}> {
+class AreaChartData extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1133,7 +1133,7 @@ class AreaChartData extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartData2 extends React.Component<{}, {}> {
+class AreaChartData2 extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1153,7 +1153,7 @@ class AreaChartData2 extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartHeightAndWidth extends React.Component<{}, {}> {
+class AreaChartHeightAndWidth extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1175,7 +1175,7 @@ class AreaChartHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartMargin extends React.Component<{}, {}> {
+class AreaChartMargin extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1198,7 +1198,7 @@ class AreaChartMargin extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxes extends React.Component<{}, {}> {
+class AreaChartAxes extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1221,7 +1221,7 @@ class AreaChartAxes extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxesLabels extends React.Component<{}, {}> {
+class AreaChartAxesLabels extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1246,7 +1246,7 @@ class AreaChartAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartYAxisOrientation extends React.Component<{}, {}> {
+class AreaChartYAxisOrientation extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1271,7 +1271,7 @@ class AreaChartYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartInterpolate extends React.Component<{}, {}> {
+class AreaChartInterpolate extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1297,7 +1297,7 @@ class AreaChartInterpolate extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxisType extends React.Component<{}, {}> {
+class AreaChartAxisType extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1326,7 +1326,7 @@ class AreaChartAxisType extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartAxisTypeXTime extends React.Component<{}, {}> {
+class AreaChartAxisTypeXTime extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1355,7 +1355,7 @@ class AreaChartAxisTypeXTime extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartYTypeText extends React.Component<{}, {}> {
+class AreaChartYTypeText extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1381,7 +1381,7 @@ class AreaChartYTypeText extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartGrid extends React.Component<{}, {}> {
+class AreaChartGrid extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1411,7 +1411,7 @@ class AreaChartGrid extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartVerticalGrid extends React.Component<{}, {}> {
+class AreaChartVerticalGrid extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1442,7 +1442,7 @@ class AreaChartVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartDomainRange extends React.Component<{}, {}> {
+class AreaChartDomainRange extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1475,7 +1475,7 @@ class AreaChartDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartTickDisplayFormat extends React.Component<{}, {}> {
+class AreaChartTickDisplayFormat extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1506,7 +1506,7 @@ class AreaChartTickDisplayFormat extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartTickNumbers extends React.Component<{}, {}> {
+class AreaChartTickNumbers extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1539,7 +1539,7 @@ class AreaChartTickNumbers extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartDataPoints extends React.Component<{}, {}> {
+class AreaChartDataPoints extends React.Component {
 	render(): any {
 		return (
 			<AreaChart
@@ -1573,7 +1573,7 @@ class AreaChartDataPoints extends React.Component<{}, {}> {
 	}
 }
 
-class AreaChartMouseHandlers extends React.Component<{}, {}> {
+class AreaChartMouseHandlers extends React.Component {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1668,7 +1668,7 @@ const data = [
 	}
 ];
 
-class ScatterplotData extends React.Component<{}, {}> {
+class ScatterplotData extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart data={data} />
@@ -1676,7 +1676,7 @@ class ScatterplotData extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotHeightAndWidth extends React.Component<{}, {}> {
+class ScatterplotHeightAndWidth extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart data={data} width={160} height={90} />
@@ -1684,7 +1684,7 @@ class ScatterplotHeightAndWidth extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotMargin extends React.Component<{}, {}> {
+class ScatterplotMargin extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1694,7 +1694,7 @@ class ScatterplotMargin extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxes extends React.Component<{}, {}> {
+class ScatterplotAxes extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1706,7 +1706,7 @@ class ScatterplotAxes extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotYAxisOrientation extends React.Component<{}, {}> {
+class ScatterplotYAxisOrientation extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1721,7 +1721,7 @@ class ScatterplotYAxisOrientation extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxesLabels extends React.Component<{}, {}> {
+class ScatterplotAxesLabels extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1735,7 +1735,7 @@ class ScatterplotAxesLabels extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotDotRadius extends React.Component<{}, {}> {
+class ScatterplotDotRadius extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1750,7 +1750,7 @@ class ScatterplotDotRadius extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotConfig extends React.Component<{}, {}> {
+class ScatterplotConfig extends React.Component {
 	config = [
 		{
 			type: 'One',
@@ -1775,7 +1775,7 @@ class ScatterplotConfig extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotGrid extends React.Component<{}, {}> {
+class ScatterplotGrid extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1791,7 +1791,7 @@ class ScatterplotGrid extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotVerticalGrid extends React.Component<{}, {}> {
+class ScatterplotVerticalGrid extends React.Component {
 	render(): any {
 		return (
 			<ScatterplotChart
@@ -1808,7 +1808,7 @@ class ScatterplotVerticalGrid extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotAxisType extends React.Component<{}, {}> {
+class ScatterplotAxisType extends React.Component {
 
 	typedData = [
 		{
@@ -1849,7 +1849,7 @@ class ScatterplotAxisType extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotDomainRange extends React.Component<{}, {}> {
+class ScatterplotDomainRange extends React.Component {
 
 	typedData = [
 		{
@@ -1896,7 +1896,7 @@ class ScatterplotDomainRange extends React.Component<{}, {}> {
 	}
 }
 
-class ScatterplotMouseEvents extends React.Component<{}, {}> {
+class ScatterplotMouseEvents extends React.Component {
 	mouseOverHandler(d: any, e: any) { }
 	mouseMoveHandler(e: any) { }
 	mouseOutHandler() { }
@@ -1927,7 +1927,7 @@ const pieData = [
 	{ key: 'Other', value: 50 }
 ];
 
-class LegendData extends React.Component<{}, {}> {
+class LegendData extends React.Component {
 	render(): any {
 		return (
 			<Legend data={pieData} dataId={'key'} />
@@ -1935,7 +1935,7 @@ class LegendData extends React.Component<{}, {}> {
 	}
 }
 
-class LegendHorizontal extends React.Component<{}, {}> {
+class LegendHorizontal extends React.Component {
 	render(): any {
 		return (
 			<Legend data={pieData} dataId={'key'} horizontal />
@@ -1955,7 +1955,7 @@ const config = [
 	{ color: '#e3a51a' }
 ];
 
-class LegendConfig extends React.Component<{}, {}> {
+class LegendConfig extends React.Component {
 	render(): any {
 		return (
 			<Legend data={pieDataCustom} dataId={'key'} config={config} />
@@ -2006,7 +2006,7 @@ const customStyle = {
 	}
 };
 
-class LegendStyles extends React.Component<{}, {}> {
+class LegendStyles extends React.Component {
 	render(): any {
 		return (
 			<Legend
diff --git a/types/react-event-listener/index.d.ts b/types/react-event-listener/index.d.ts
index ce45c2612d..abfee41683 100644
--- a/types/react-event-listener/index.d.ts
+++ b/types/react-event-listener/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oliviertassinari/react-event-listener
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -224,4 +224,4 @@ export interface EventListenerProps {
     target: Window | Document | string;
 }
 
-export default class EventListener extends React.Component<EventListenerProps, {}> { }
+export default class EventListener extends React.Component<EventListenerProps> { }
diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts
index bab8fec196..ae4baa322e 100644
--- a/types/react-fa/index.d.ts
+++ b/types/react-fa/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/andreypopp/react-fa
 // Definitions by: Frank Laub <https://github.com/flaub>, Pat Sissons <http://github.com/patsissons>, Karol Janyst <http://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import { Component, ComponentClass, HTMLProps, StatelessComponent } from "react";
+import { Component, ComponentClass, HTMLProps, StatelessComponent, ReactElement } from "react";
 
 // fake intermediate interface to remove typing on size, as the typing
 // is overrided by react-fa
@@ -32,15 +32,15 @@ export interface IconProps extends SizeOverrideHTMLProps<Icon> {
     Component?: CustomComponent;
 }
 
-export type Icon = Component<IconProps, any>;
+export type Icon = Component<IconProps>;
 export const Icon: ComponentClass<IconProps>;
 
 export interface IconStackProps extends SizeOverrideHTMLProps<IconStack> {
     size?: IconSize;
-    children?: IconProps[];
+    children?: ReactElement<IconProps> | Array<ReactElement<IconProps>>;
 }
 
-export type IconStack = Component<IconStackProps, any>;
+export type IconStack = Component<IconStackProps>;
 export const IconStack: ComponentClass<IconStackProps>;
 
 export default Icon;
diff --git a/types/react-fa/react-fa-tests.tsx b/types/react-fa/react-fa-tests.tsx
index 66158099e6..f623a09734 100644
--- a/types/react-fa/react-fa-tests.tsx
+++ b/types/react-fa/react-fa-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Icon, IconStack, IconProps } from 'react-fa';
 import DefaultIcon from 'react-fa';
 
-export class ReactFATest extends React.Component<any, any> {
+export class ReactFATest extends React.Component {
     render() {
         const defaultProps = {
             name: 'flask',
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index b5bfebac5d..d8fd4a0c8b 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/keppelen/react-facebook-login
 // Definitions by: Alexandre Paré <https://github.com/apare>, Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -29,7 +30,7 @@ interface ReactFacebookLoginProps {
     version?: string;
     xfbml?: boolean;
     isMobile?: boolean;
-    tag?: Node | React.Component<any, any>;
+    tag?: Node | React.Component<any>;
 }
 
 export interface ReactFacebookLoginInfo {
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 0efd5aa548..a016901edf 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -58,7 +58,7 @@ ReactDOM.render(
     document.getElementById('demo')
 );
 
-class MyComponent extends React.Component<any, any> {
+class MyComponent extends React.Component {
     private responseFacebook(response: ReactFacebookLoginInfo) {
         console.log(response);
     }
@@ -76,7 +76,7 @@ class MyComponent extends React.Component<any, any> {
     }
 }
 
-class MyComponent2 extends React.Component<any, any> {
+class MyComponent2 extends React.Component {
     private responseFacebook(response: ReactFacebookLoginInfo) {
         console.log(response);
     }
diff --git a/types/react-faux-dom/index.d.ts b/types/react-faux-dom/index.d.ts
index ccfd52cbd9..0a363de3f0 100644
--- a/types/react-faux-dom/index.d.ts
+++ b/types/react-faux-dom/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Olical/react-faux-dom
 // Definitions by: Ali Taheri Moghaddar <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
diff --git a/types/react-faux-dom/react-faux-dom-tests.tsx b/types/react-faux-dom/react-faux-dom-tests.tsx
index 5541da849d..0410306f6b 100644
--- a/types/react-faux-dom/react-faux-dom-tests.tsx
+++ b/types/react-faux-dom/react-faux-dom-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as d3 from 'd3';
 import { createElement, Element } from 'react-faux-dom';
 
-class SomeChart extends React.Component<any, any> {
+class SomeChart extends React.Component {
   render() {
     const el = createElement('div');
 
diff --git a/types/react-file-input/index.d.ts b/types/react-file-input/index.d.ts
index 3ae22e055f..48c9854e55 100644
--- a/types/react-file-input/index.d.ts
+++ b/types/react-file-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-file-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
@@ -16,7 +16,7 @@ declare module "react-file-input" {
         onChange: (event: React.SyntheticEvent<any>) => void;
     }
 
-    class FileInput extends React.Component<FileInputProps, {}> {
+    class FileInput extends React.Component<FileInputProps> {
     }
 
     export = FileInput;
diff --git a/types/react-file-input/react-file-input-tests.tsx b/types/react-file-input/react-file-input-tests.tsx
index 857a86d4e2..1ffd8193b8 100644
--- a/types/react-file-input/react-file-input-tests.tsx
+++ b/types/react-file-input/react-file-input-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import FileInput = require('react-file-input');
 
-class Form extends React.Component<{}, {}> {
+class Form extends React.Component {
     handleChange = (event: React.SyntheticEvent<any>) => {
         const target: any = event.target;
         console.log('Selected file:', target.files[0]);
diff --git a/types/react-file-reader-input/index.d.ts b/types/react-file-reader-input/index.d.ts
index 3caed3dc67..af87636234 100644
--- a/types/react-file-reader-input/index.d.ts
+++ b/types/react-file-reader-input/index.d.ts
@@ -2,11 +2,11 @@
 // Project: https://www.npmjs.com/package/react-file-reader-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>, Ali Taheri <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
-declare class FileInput extends React.Component<FileInput.Props, {}> {
+declare class FileInput extends React.Component<FileInput.Props> {
 }
 
 declare namespace FileInput {
diff --git a/types/react-file-reader-input/react-file-reader-input-tests.tsx b/types/react-file-reader-input/react-file-reader-input-tests.tsx
index 1ee4f2f699..5170780d8b 100644
--- a/types/react-file-reader-input/react-file-reader-input-tests.tsx
+++ b/types/react-file-reader-input/react-file-reader-input-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as FileReaderInput from 'react-file-reader-input';
 
-class MyComponent extends React.Component<{}, {}> {
+class MyComponent extends React.Component {
   handleChange = (event: React.SyntheticEvent<any>, results: FileReaderInput.Result[]) => {
     results.forEach(result => {
       const [event, file] = result;
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 8d77c689cb..68b2d793f8 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Component } from 'react';
 import { EventCallback, Options } from 'flatpickr';
@@ -14,4 +14,4 @@ export interface DateTimePickerProps {
     value?: string;
 }
 
-export default class DatePicker extends Component<DateTimePickerProps, void> {}
+export default class DatePicker extends Component<DateTimePickerProps> {}
diff --git a/types/react-flex/index.d.ts b/types/react-flex/index.d.ts
index 5cfd68da2b..446445b2ba 100644
--- a/types/react-flex/index.d.ts
+++ b/types/react-flex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-flex
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -67,7 +67,7 @@ export interface CommonFlexProps {
 export interface FlexProps extends React.Props<Flex>, CommonFlexProps {
 }
 
-export class Flex extends React.Component<FlexProps, {}> {
+export class Flex extends React.Component<FlexProps> {
 }
 
 export interface ItemProps extends React.Props<Flex>, CommonFlexProps {
@@ -88,6 +88,6 @@ export interface ItemProps extends React.Props<Flex>, CommonFlexProps {
     flexBasis?: number | "none" | "auto" | "content" | "fit-content" | "min-content" | "max-content" | "fit";
 }
 
-export class Item extends React.Component<ItemProps, {}> {
+export class Item extends React.Component<ItemProps> {
 }
 
diff --git a/types/react-flexr/index.d.ts b/types/react-flexr/index.d.ts
index a0ec7128c0..4b610711f6 100644
--- a/types/react-flexr/index.d.ts
+++ b/types/react-flexr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kodyl/react-flexr
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -31,7 +31,7 @@ declare namespace __ReactFlexr {
         flexCells?: boolean;
     }
 
-    export class Grid extends React.Component<GridProps, {}> {
+    export class Grid extends React.Component<GridProps> {
     }
 
     interface CellProps extends React.Props<Cell> {
@@ -80,7 +80,7 @@ declare namespace __ReactFlexr {
         desk?: string | number;
     }
 
-    export class Cell extends React.Component<CellProps, {}> {
+    export class Cell extends React.Component<CellProps> {
     }
 
     /**
diff --git a/types/react-flexr/react-flexr-tests.tsx b/types/react-flexr/react-flexr-tests.tsx
index 224ceb686c..0a8006a58a 100644
--- a/types/react-flexr/react-flexr-tests.tsx
+++ b/types/react-flexr/react-flexr-tests.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 import * as ReactDOMServer from "react-dom/server";
 import { Grid, Cell, findMatch, setBreakpoints, findBreakpoints, getCurrentBreakpoints, optimizedResize, palm, lap, portable, desk } from "react-flexr";
 
-class Example extends React.Component<any, any> {
+class Example extends React.Component {
     render() {
         return (
             <Grid>
@@ -16,7 +16,7 @@ class Example extends React.Component<any, any> {
     }
 }
 
-class Example2 extends React.Component<any, any> {
+class Example2 extends React.Component {
     render() {
         return (
             <Grid>
@@ -52,7 +52,7 @@ class Example2 extends React.Component<any, any> {
     }
 }
 
-class App1 extends React.Component<any, any> {
+class App1 extends React.Component {
     render() {
         const isPalm = findMatch("palm");
 
@@ -89,7 +89,7 @@ function textFxn(req: any, res: any): void {
 
 const breakpoints: string[] | boolean = findBreakpoints();
 
-class App2 extends React.Component<any, any> {
+class App2 extends React.Component {
     componentDidMount() {
         optimizedResize.init( () => {
             if ( findBreakpoints() ) {
diff --git a/types/react-flip-move/index.d.ts b/types/react-flip-move/index.d.ts
index 81170d8f22..8480d50c28 100644
--- a/types/react-flip-move/index.d.ts
+++ b/types/react-flip-move/index.d.ts
@@ -2,14 +2,14 @@
 // Project: https://github.com/joshwcomeau/react-flip-move
 // Definitions by: Joey Hain <https://github.com/jmhain>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Component, ReactElement } from "react";
 
 export as namespace FlipMove;
 export = FlipMove;
 
-declare class FlipMove extends Component<FlipMove.FlipMoveProps, any> { }
+declare class FlipMove extends Component<FlipMove.FlipMoveProps> { }
 
 declare namespace FlipMove {
     type AnimationPreset = "elevator" | "fade" | "accordionVertical" | "accordionHorizontal" | "none";
diff --git a/types/react-flip-move/react-flip-move-tests.tsx b/types/react-flip-move/react-flip-move-tests.tsx
index c17c4f7bcc..19dac88a65 100644
--- a/types/react-flip-move/react-flip-move-tests.tsx
+++ b/types/react-flip-move/react-flip-move-tests.tsx
@@ -1,13 +1,13 @@
 import * as React from "react";
 import * as FlipMove from "react-flip-move";
 
-class DefaultTest extends React.Component<any, any> {
+class DefaultTest extends React.Component {
     render() {
         return <FlipMove />;
     }
 }
 
-class PresetTest extends React.Component<any, any> {
+class PresetTest extends React.Component {
     render() {
         return (
             <FlipMove
@@ -19,7 +19,7 @@ class PresetTest extends React.Component<any, any> {
     }
 }
 
-class CustomAnimationTest extends React.Component<any, any> {
+class CustomAnimationTest extends React.Component {
     render() {
         const enterAnimation: FlipMove.Animation = {
             from: { opacity: "0" },
@@ -41,7 +41,7 @@ class CustomAnimationTest extends React.Component<any, any> {
     }
 }
 
-class FlipMoveTest extends React.Component<any, any> {
+class FlipMoveTest extends React.Component {
     onStart = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
 
     onFinish = (childElement: React.ReactElement<any>, domNode: HTMLElement) => {};
diff --git a/types/react-fontawesome/index.d.ts b/types/react-fontawesome/index.d.ts
index d866eddfad..bc1fa7b3b6 100644
--- a/types/react-fontawesome/index.d.ts
+++ b/types/react-fontawesome/index.d.ts
@@ -2,12 +2,11 @@
 // Project: https://github.com/danawoodman/react-fontawesome
 // Definitions by: Timur Rustamov <https://github.com/timurrustamov>, Anton Kandybo <https://github.com/dublicator>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-fontawesome" {
 
-  //Import react
-  import React = require('react');
+  import * as React from 'react';
 
   type FontAwesomeSize = 'lg' | '2x' | '3x' | '4x' | '5x';
   type FontAwesomeStack = "1x" | "2x";
@@ -30,7 +29,7 @@ declare module "react-fontawesome" {
     tag?: string
   }
 
-  class FontAwesome extends React.Component<FontAwesomeProps, {}> {}
+  class FontAwesome extends React.Component<FontAwesomeProps> {}
 
   export = FontAwesome;
 }
diff --git a/types/react-fontawesome/react-fontawesome-tests.tsx b/types/react-fontawesome/react-fontawesome-tests.tsx
index 32aad1ddb7..3ec0ded7a2 100644
--- a/types/react-fontawesome/react-fontawesome-tests.tsx
+++ b/types/react-fontawesome/react-fontawesome-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import FontAwesome = require('react-fontawesome');
 
-class TestComponent extends React.Component<{}, {}> {
+class TestComponent extends React.Component {
 
   render() {
 
diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index 9307c6fb93..d7941f9224 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://kyleamathews.github.io/react-gravatar/
 // Definitions by: invliD <https://github.com/invliD>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -13,7 +13,7 @@ export = Gravatar;
 /**
  * React component for rendering a gravatar profile image. Adjusts automatically to HiDPI displays.
  */
-declare class Gravatar extends React.Component<Gravatar.Props, void> {
+declare class Gravatar extends React.Component<Gravatar.Props> {
 	static readonly displayName: string;
 
 	static readonly defaultProps: Gravatar.Props;
diff --git a/types/react-gravatar/react-gravatar-tests.tsx b/types/react-gravatar/react-gravatar-tests.tsx
index 1dee72f2c9..1482af274d 100644
--- a/types/react-gravatar/react-gravatar-tests.tsx
+++ b/types/react-gravatar/react-gravatar-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Gravatar from "react-gravatar";
 
-class GravatarEmailTest extends React.Component<void, void> {
+class GravatarEmailTest extends React.Component {
 	render() {
 		return (
 			<Gravatar
@@ -17,7 +17,7 @@ class GravatarEmailTest extends React.Component<void, void> {
 	}
 }
 
-class GravatarHashTest extends React.Component<void, void> {
+class GravatarHashTest extends React.Component {
 	render() {
 		return (
 			<Gravatar
@@ -33,7 +33,7 @@ class GravatarHashTest extends React.Component<void, void> {
 	}
 }
 
-class GravatarMinimalTest extends React.Component<void, void> {
+class GravatarMinimalTest extends React.Component {
 	render() {
 		return <Gravatar email="test@example.com" />;
 	}
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index 3ed852e765..63a6d0e6d7 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -2,14 +2,14 @@
 // Project: https://github.com/STRML/react-grid-layout
 // Definitions by: Andrew Birkholz <https://github.com/abirkholz>, Ali Taheri <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
 export as namespace ReactGridLayout;
 export = ReactGridLayout;
 
-declare class ReactGridLayout extends React.Component<ReactGridLayout.ReactGridLayoutProps, any> { }
+declare class ReactGridLayout extends React.Component<ReactGridLayout.ReactGridLayoutProps> { }
 
 declare namespace ReactGridLayout {
     type Breakpoints = 'lg' | 'md' | 'sm' | 'xs' | 'xxs';
@@ -275,7 +275,7 @@ declare namespace ReactGridLayout {
         ): void;
     }
 
-    class Responsive extends React.Component<ResponsiveProps, any> { }
+    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 081da57e9c..629769970c 100644
--- a/types/react-grid-layout/react-grid-layout-tests.tsx
+++ b/types/react-grid-layout/react-grid-layout-tests.tsx
@@ -4,7 +4,7 @@ import { Responsive, WidthProvider } from 'react-grid-layout';
 
 const ResponsiveWidth = WidthProvider(Responsive);
 
-class DefaultGridTest extends React.Component<any, any> {
+class DefaultGridTest extends React.Component {
   render() {
     const layout = [
       { i: 'a', x: 0, y: 0, w: 1, h: 2, static: true },
@@ -29,7 +29,7 @@ class DefaultGridTest extends React.Component<any, any> {
   }
 }
 
-class ResponsiveGridTest extends React.Component<any, any> {
+class ResponsiveGridTest extends React.Component {
   render() {
     return (
       <Responsive
@@ -45,7 +45,7 @@ class ResponsiveGridTest extends React.Component<any, any> {
   }
 }
 
-class ResponsiveGridWidthProviderTest extends React.Component<any, any> {
+class ResponsiveGridWidthProviderTest extends React.Component {
   render() {
     return (
       <ResponsiveWidth
diff --git a/types/react-hamburger-menu/index.d.ts b/types/react-hamburger-menu/index.d.ts
new file mode 100644
index 0000000000..1f91e6e8f0
--- /dev/null
+++ b/types/react-hamburger-menu/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for react-hamburger-menu 0.0
+// Project: https://github.com/cameronbourke/react-hamburger-menu
+// Definitions by: Grzegorz Kielak <https://github.com/grzesie2k>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export default HamburgerMenu;
+
+declare class HamburgerMenu extends React.PureComponent<HamburgerMenuProps> {
+}
+
+export interface HamburgerMenuProps {
+    /**
+     * Determines whether the menu is a hamburger or cross icon
+     */
+    isOpen: boolean;
+    /**
+     * The width of the icon
+     * @default 36
+     */
+    width?: number;
+    /**
+     * The height of the icon
+     * @default 30
+     */
+    height?: number;
+    /**
+     * The stroke width of the lines
+     * @default 2
+     */
+    strokeWidth?: number;
+    /**
+     * The rotation of the icon, eg {45} would be 45deg
+     * @default 0
+     */
+    rotate?: number;
+    /**
+     * The border radius of the lines
+     * @default 0
+     */
+    borderRadius?: number;
+    /**
+     * The color of both icons
+     * @default #000
+     */
+    color: string;
+    /**
+     * The length of time it takes for the icon transitions to complete.
+     * @default 0.4
+     */
+    animationDuration?: number;
+    /**
+     * Will be invoked when the component is clicked
+     */
+    menuClicked(): void;
+}
diff --git a/types/react-hamburger-menu/react-hamburger-menu-tests.tsx b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
new file mode 100644
index 0000000000..26d91e344c
--- /dev/null
+++ b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+import HamburgerMenu, {HamburgerMenuProps} from "react-hamburger-menu";
+
+export class ReactHamburgerMenuTest extends React.PureComponent<{}, State> {
+    state: State = {isOpen: false};
+
+    render(): JSX.Element {
+        const props: HamburgerMenuProps = {
+            isOpen: this.state.isOpen,
+            menuClicked: this.menuClicked,
+            width: 30,
+            height: 30,
+            strokeWidth: 1,
+            rotate: 90,
+            borderRadius: 5,
+            color: "red",
+            animationDuration: 0.5
+        };
+        return <HamburgerMenu {...props}/>;
+    }
+
+    private menuClicked = (): void => this.setState({isOpen: !this.state.isOpen});
+}
+
+interface State {
+    isOpen: boolean;
+}
diff --git a/types/react-hamburger-menu/tsconfig.json b/types/react-hamburger-menu/tsconfig.json
new file mode 100644
index 0000000000..ec25dd6737
--- /dev/null
+++ b/types/react-hamburger-menu/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "jsx": "react",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "react-hamburger-menu-tests.tsx"
+  ]
+}
diff --git a/types/react-hamburger-menu/tslint.json b/types/react-hamburger-menu/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-hamburger-menu/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts
index 0d4a75878b..359836bea8 100644
--- a/types/react-helmet/index.d.ts
+++ b/types/react-helmet/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>, François Nguyen <https://github.com/lith-light-g>, Kok Sam <https://github.com/sammkj>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -23,7 +23,7 @@ interface HelmetProps {
     titleTemplate?: string;
 }
 
-export class Helmet extends React.Component<HelmetProps, any> {
+export class Helmet extends React.Component<HelmetProps> {
     static peek(): HelmetData;
     static rewind(): HelmetData;
     static renderStatic(): HelmetData;
@@ -45,7 +45,7 @@ export interface HelmetData {
 
 export interface HelmetDatum {
     toString(): string;
-    toComponent(): React.Component<any, any>;
+    toComponent(): React.Component<any>;
 }
 
 export interface HelmetHTMLBodyDatum {
diff --git a/types/react-helmet/v4/index.d.ts b/types/react-helmet/v4/index.d.ts
index 0b013f25bf..ab5ea373df 100644
--- a/types/react-helmet/v4/index.d.ts
+++ b/types/react-helmet/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -39,10 +39,10 @@ declare namespace ReactHelmet {
 
     interface HelmetDatum {
         toString(): string;
-        toComponent(): React.Component<any, any>;
+        toComponent(): React.Component<any>;
     }
 
-    class HelmetComponent extends React.Component<HelmetProps, any> {}
+    class HelmetComponent extends React.Component<HelmetProps> {}
 }
 
 export = ReactHelmet;
diff --git a/types/react-highlight-words/index.d.ts b/types/react-highlight-words/index.d.ts
index 220c245638..3f37a70aaf 100644
--- a/types/react-highlight-words/index.d.ts
+++ b/types/react-highlight-words/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/bvaughn/react-highlight-words#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import React = require("react");
+import * as React from "react";
 
 export = Highlighter;
 
@@ -29,6 +29,6 @@ interface HighlighterProps {
     textToHighlight: string;
 }
 
-declare class Highlighter extends React.Component<HighlighterProps, any> {
+declare class Highlighter extends React.Component<HighlighterProps> {
     static propTypes: any;
 }
diff --git a/types/react-highlight-words/react-highlight-words-tests.tsx b/types/react-highlight-words/react-highlight-words-tests.tsx
index 51d1f82374..a63e9b877b 100644
--- a/types/react-highlight-words/react-highlight-words-tests.tsx
+++ b/types/react-highlight-words/react-highlight-words-tests.tsx
@@ -1,4 +1,4 @@
-import React = require("react");
+import * as React from "react";
 import Highlighter = require("react-highlight-words");
 
 <Highlighter
diff --git a/types/react-highlighter/index.d.ts b/types/react-highlighter/index.d.ts
index 6e34a4dbe3..8e918d87b7 100644
--- a/types/react-highlighter/index.d.ts
+++ b/types/react-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/helior/react-highlighter
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
diff --git a/types/react-highlighter/react-highlighter-tests.tsx b/types/react-highlighter/react-highlighter-tests.tsx
index 79760228dd..fb1ece6d06 100644
--- a/types/react-highlighter/react-highlighter-tests.tsx
+++ b/types/react-highlighter/react-highlighter-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as Highlight from 'react-highlighter';
 
-export class ReactHolderTest extends React.Component<any, any> {
+export class ReactHolderTest extends React.Component {
     render() {
         return (
             <div>
diff --git a/types/react-holder/index.d.ts b/types/react-holder/index.d.ts
index 1f4f773783..a82731f8ba 100644
--- a/types/react-holder/index.d.ts
+++ b/types/react-holder/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Moeriki/react-holder
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react"/>
 
@@ -26,7 +26,7 @@ interface ReactHolderProp extends React.HTMLAttributes<ReactHolder> {
     lineWrap?: number;
 }
 
-declare class ReactHolder extends React.Component<ReactHolderProp, any> {
+declare class ReactHolder extends React.Component<ReactHolderProp> {
 
 }
 export default ReactHolder;
diff --git a/types/react-holder/react-holder-tests.tsx b/types/react-holder/react-holder-tests.tsx
index 93b009eaa5..ac3818362a 100644
--- a/types/react-holder/react-holder-tests.tsx
+++ b/types/react-holder/react-holder-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Holder from "react-holder";
 
-export class ReactHolderTest extends React.Component<any, any> {
+export class ReactHolderTest extends React.Component {
     public render() {
         return (
             <div>
diff --git a/types/react-hot-loader/index.d.ts b/types/react-hot-loader/index.d.ts
index 3355ec47e6..214bd23f73 100644
--- a/types/react-hot-loader/index.d.ts
+++ b/types/react-hot-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/react-hot-loader
 // Definitions by: Jacek Jagiello <https://github.com/jacekjagiello/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react"
 
@@ -15,4 +15,4 @@ export interface AppContainerProps {
   errorReporter?: React.ComponentClass<ErrorReporterProps> | React.StatelessComponent<ErrorReporterProps>
 }
 
-export class AppContainer extends React.Component<AppContainerProps, {}> {}
+export class AppContainer extends React.Component<AppContainerProps> {}
diff --git a/types/react-hot-loader/react-hot-loader-tests.tsx b/types/react-hot-loader/react-hot-loader-tests.tsx
index 08866fcbb9..771f4fdd26 100644
--- a/types/react-hot-loader/react-hot-loader-tests.tsx
+++ b/types/react-hot-loader/react-hot-loader-tests.tsx
@@ -5,7 +5,7 @@ interface ErrorReporterProps {
   error: any
 }
 
-class ErrorReporterComponent extends React.Component<ErrorReporterProps, any> {
+class ErrorReporterComponent extends React.Component<ErrorReporterProps> {
   public render() {
     return <p>{this.props.error.message}</p>
   }
@@ -14,7 +14,7 @@ class ErrorReporterComponent extends React.Component<ErrorReporterProps, any> {
 const DummyComponent = () => <p>Dummy component</p>
 const ErrorReporter = ({ error } : ErrorReporterProps) => <ErrorReporterComponent error={error} />
 
-class AppContainerTest extends React.Component<any, any> {
+class AppContainerTest extends React.Component {
   public render() {
     return (
       <div>
diff --git a/types/react-i18next/index.d.ts b/types/react-i18next/index.d.ts
index 930fa7ae3c..cf56874445 100644
--- a/types/react-i18next/index.d.ts
+++ b/types/react-i18next/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as I18next from "i18next";
 import * as React from "react";
@@ -24,7 +24,7 @@ interface I18nextProviderProps {
     children?: React.ReactElement<any>;
 }
 
-export class I18nextProvider extends React.Component<I18nextProviderProps, {}> { }
+export class I18nextProvider extends React.Component<I18nextProviderProps> { }
 
 
 type InterpolateValue = string | JSX.Element;
@@ -42,7 +42,7 @@ interface InterpolateProps {
     [regexKey: string]: InterpolateValue | RegExp | I18next.TranslationOptions | boolean | undefined;
 }
 
-export class Interpolate extends React.Component<InterpolateProps, {}> { }
+export class Interpolate extends React.Component<InterpolateProps> { }
 
 interface TranslateOptions {
     withRef?: boolean;
diff --git a/types/react-i18next/react-i18next-tests.tsx b/types/react-i18next/react-i18next-tests.tsx
index fa2e36fcb1..950e29d293 100644
--- a/types/react-i18next/react-i18next-tests.tsx
+++ b/types/react-i18next/react-i18next-tests.tsx
@@ -24,7 +24,7 @@ interface InnerAnotherComponentProps {
     _?: TranslationFunction;
 }
 
-class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps, {}> {
+class InnerAnotherComponent extends React.Component<InnerAnotherComponentProps> {
     render() {
         const _ = this.props._!;
 
@@ -39,7 +39,7 @@ const AnotherComponent = translate('view', { wait: true, translateFuncName: '_'
 interface InnerYetAnotherComponentProps extends InjectedTranslateProps {
 }
 
-class InnerYetAnotherComponent extends React.Component<InnerYetAnotherComponentProps, {}> {
+class InnerYetAnotherComponent extends React.Component<InnerYetAnotherComponentProps> {
     render() {
         const t = this.props.t!;
 
@@ -53,7 +53,7 @@ interface TranslatableViewProps extends InjectedTranslateProps {
 }
 
 @translate(['view', 'nav'], { wait: true })
-class TranslatableView extends React.Component<TranslatableViewProps, {}> {
+class TranslatableView extends React.Component<TranslatableViewProps> {
     render() {
         const t = this.props.t!;
 
@@ -84,7 +84,7 @@ class TranslatableView extends React.Component<TranslatableViewProps, {}> {
     }
 }
 
-class App extends React.Component<{}, {}> {
+class App extends React.Component {
     render() {
         return (
             <div className='main'>
diff --git a/types/react-icon-base/index.d.ts b/types/react-icon-base/index.d.ts
index 600d33dff7..7697b42bb5 100644
--- a/types/react-icon-base/index.d.ts
+++ b/types/react-icon-base/index.d.ts
@@ -1,15 +1,20 @@
 // Type definitions for react-icon-base 2.0
 // Project: https://github.com/gorangajic/react-icon-base#readme
-// Definitions by: Alexandre Paré <https://github.com/apare>
+// Definitions by: Alexandre Paré <https://github.com/apare>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import * as React from 'react';
+import * as React from "react";
 
-export interface IconBaseProps {
-    color?: string;
-    size?: string | number;
-    style?: React.CSSProperties;
+export = IconBaseClass;
+
+declare namespace IconBaseClass {
+    interface IconBaseProps {
+        color?: string;
+        size?: string | number;
+        style?: React.CSSProperties;
+        viewBox?: string;
+    }
 }
 
-export default class IconBase extends React.Component<IconBaseProps, any> {}
+declare class IconBaseClass extends React.Component<IconBaseClass.IconBaseProps> {}
diff --git a/types/react-icon-base/react-icon-base-tests.tsx b/types/react-icon-base/react-icon-base-tests.tsx
index 16ebafd133..c0d56f03f2 100644
--- a/types/react-icon-base/react-icon-base-tests.tsx
+++ b/types/react-icon-base/react-icon-base-tests.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
-import IconBase from 'react-icon-base';
+import * as React from "react";
+import * as IconBase from "react-icon-base";
 
-export default <IconBase size={30} color='aliceblue' style={{ margin: "30px" }} />;
+export default <IconBase size={ 30 } color="aliceblue" style={ { margin: "30px" } } />;
diff --git a/types/react-icons/fa/500px.d.ts b/types/react-icons/fa/500px.d.ts
index 5a4aacdeb1..29c3f639f8 100644
--- a/types/react-icons/fa/500px.d.ts
+++ b/types/react-icons/fa/500px.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class Fa500px extends React.Component<IconBaseProps, any> { }
+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
index 62dc2a6364..7ca3d2cf03 100644
--- a/types/react-icons/fa/adjust.d.ts
+++ b/types/react-icons/fa/adjust.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAdjust extends React.Component<IconBaseProps, any> { }
+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
index dab7f2651b..c2c5676047 100644
--- a/types/react-icons/fa/adn.d.ts
+++ b/types/react-icons/fa/adn.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAdn extends React.Component<IconBaseProps, any> { }
+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
index d5e93b957e..718d401bcc 100644
--- a/types/react-icons/fa/align-center.d.ts
+++ b/types/react-icons/fa/align-center.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignCenter extends React.Component<IconBaseProps, any> { }
+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
index 9cdf6b0aef..87df2f26fc 100644
--- a/types/react-icons/fa/align-justify.d.ts
+++ b/types/react-icons/fa/align-justify.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignJustify extends React.Component<IconBaseProps, any> { }
+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
index e54e1ede41..7a1c956b3f 100644
--- a/types/react-icons/fa/align-left.d.ts
+++ b/types/react-icons/fa/align-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignLeft extends React.Component<IconBaseProps, any> { }
+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
index e53f12bf17..0ec0226c13 100644
--- a/types/react-icons/fa/align-right.d.ts
+++ b/types/react-icons/fa/align-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAlignRight extends React.Component<IconBaseProps, any> { }
+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
index e9a07e7efc..d514c69672 100644
--- a/types/react-icons/fa/amazon.d.ts
+++ b/types/react-icons/fa/amazon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmazon extends React.Component<IconBaseProps, any> { }
+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
index 0f0c105dda..fbaa0eec3b 100644
--- a/types/react-icons/fa/ambulance.d.ts
+++ b/types/react-icons/fa/ambulance.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmbulance extends React.Component<IconBaseProps, any> { }
+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
index 6a758d1823..06925c79e5 100644
--- a/types/react-icons/fa/american-sign-language-interpreting.d.ts
+++ b/types/react-icons/fa/american-sign-language-interpreting.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAmericanSignLanguageInterpreting extends React.Component<IconBaseProps, any> { }
+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
index b20e1fb1e5..8812734dc4 100644
--- a/types/react-icons/fa/anchor.d.ts
+++ b/types/react-icons/fa/anchor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAnchor extends React.Component<IconBaseProps, any> { }
+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
index 9a1c445a20..2ee9f5fb18 100644
--- a/types/react-icons/fa/android.d.ts
+++ b/types/react-icons/fa/android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAndroid extends React.Component<IconBaseProps, any> { }
+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
index eba5851b3f..ce8afe7eda 100644
--- a/types/react-icons/fa/angellist.d.ts
+++ b/types/react-icons/fa/angellist.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngellist extends React.Component<IconBaseProps, any> { }
+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
index 695ccfe69f..93ce66d6b4 100644
--- a/types/react-icons/fa/angle-double-down.d.ts
+++ b/types/react-icons/fa/angle-double-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleDown extends React.Component<IconBaseProps, any> { }
+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
index d675101472..ff9d38e1ad 100644
--- a/types/react-icons/fa/angle-double-left.d.ts
+++ b/types/react-icons/fa/angle-double-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleLeft extends React.Component<IconBaseProps, any> { }
+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
index b03b760bc9..2642210681 100644
--- a/types/react-icons/fa/angle-double-right.d.ts
+++ b/types/react-icons/fa/angle-double-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleRight extends React.Component<IconBaseProps, any> { }
+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
index 8e5e6655a2..9a3af8e4bf 100644
--- a/types/react-icons/fa/angle-double-up.d.ts
+++ b/types/react-icons/fa/angle-double-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDoubleUp extends React.Component<IconBaseProps, any> { }
+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
index 9b87a36ae9..d9e5083f2a 100644
--- a/types/react-icons/fa/angle-down.d.ts
+++ b/types/react-icons/fa/angle-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleDown extends React.Component<IconBaseProps, any> { }
+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
index 92047a4c57..bea87f2edd 100644
--- a/types/react-icons/fa/angle-left.d.ts
+++ b/types/react-icons/fa/angle-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleLeft extends React.Component<IconBaseProps, any> { }
+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
index f40e616dde..c5ecf220c6 100644
--- a/types/react-icons/fa/angle-right.d.ts
+++ b/types/react-icons/fa/angle-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleRight extends React.Component<IconBaseProps, any> { }
+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
index 49f12fa066..cdbc2fd506 100644
--- a/types/react-icons/fa/angle-up.d.ts
+++ b/types/react-icons/fa/angle-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAngleUp extends React.Component<IconBaseProps, any> { }
+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
index d4b5aa80d7..81a903285f 100644
--- a/types/react-icons/fa/apple.d.ts
+++ b/types/react-icons/fa/apple.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaApple extends React.Component<IconBaseProps, any> { }
+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
index 90b6169e16..a86eaae4d2 100644
--- a/types/react-icons/fa/archive.d.ts
+++ b/types/react-icons/fa/archive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArchive extends React.Component<IconBaseProps, any> { }
+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
index 49a3443184..989eaa3b5d 100644
--- a/types/react-icons/fa/area-chart.d.ts
+++ b/types/react-icons/fa/area-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAreaChart extends React.Component<IconBaseProps, any> { }
+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
index b6ca1f14c5..e5551c84a8 100644
--- a/types/react-icons/fa/arrow-circle-down.d.ts
+++ b/types/react-icons/fa/arrow-circle-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleDown extends React.Component<IconBaseProps, any> { }
+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
index 47bc4d1e5f..af722a058d 100644
--- a/types/react-icons/fa/arrow-circle-left.d.ts
+++ b/types/react-icons/fa/arrow-circle-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleLeft extends React.Component<IconBaseProps, any> { }
+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
index f27e36225b..3e06f22917 100644
--- a/types/react-icons/fa/arrow-circle-o-down.d.ts
+++ b/types/react-icons/fa/arrow-circle-o-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleODown extends React.Component<IconBaseProps, any> { }
+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
index 30d005b713..687373f29c 100644
--- a/types/react-icons/fa/arrow-circle-o-left.d.ts
+++ b/types/react-icons/fa/arrow-circle-o-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOLeft extends React.Component<IconBaseProps, any> { }
+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
index f7234d7b7b..c1378c89b6 100644
--- a/types/react-icons/fa/arrow-circle-o-right.d.ts
+++ b/types/react-icons/fa/arrow-circle-o-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleORight extends React.Component<IconBaseProps, any> { }
+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
index 18864ab4c1..6d67c2f160 100644
--- a/types/react-icons/fa/arrow-circle-o-up.d.ts
+++ b/types/react-icons/fa/arrow-circle-o-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleOUp extends React.Component<IconBaseProps, any> { }
+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
index 990cb83941..0916b5328d 100644
--- a/types/react-icons/fa/arrow-circle-right.d.ts
+++ b/types/react-icons/fa/arrow-circle-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleRight extends React.Component<IconBaseProps, any> { }
+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
index 7ede244783..1d4af5320c 100644
--- a/types/react-icons/fa/arrow-circle-up.d.ts
+++ b/types/react-icons/fa/arrow-circle-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowCircleUp extends React.Component<IconBaseProps, any> { }
+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
index 358368b51f..845ae5bda7 100644
--- a/types/react-icons/fa/arrow-down.d.ts
+++ b/types/react-icons/fa/arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowDown extends React.Component<IconBaseProps, any> { }
+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
index 697e5fbad9..b5333dd62c 100644
--- a/types/react-icons/fa/arrow-left.d.ts
+++ b/types/react-icons/fa/arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index f9d6e60f15..7cad9380d5 100644
--- a/types/react-icons/fa/arrow-right.d.ts
+++ b/types/react-icons/fa/arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowRight extends React.Component<IconBaseProps, any> { }
+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
index ae3333dad0..eb96f4b47d 100644
--- a/types/react-icons/fa/arrow-up.d.ts
+++ b/types/react-icons/fa/arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 65be6f1ef5..0497e59469 100644
--- a/types/react-icons/fa/arrows-alt.d.ts
+++ b/types/react-icons/fa/arrows-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsAlt extends React.Component<IconBaseProps, any> { }
+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
index ce9deb10f5..53e31e5671 100644
--- a/types/react-icons/fa/arrows-h.d.ts
+++ b/types/react-icons/fa/arrows-h.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsH extends React.Component<IconBaseProps, any> { }
+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
index 96d6efab65..6b4cb60249 100644
--- a/types/react-icons/fa/arrows-v.d.ts
+++ b/types/react-icons/fa/arrows-v.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrowsV extends React.Component<IconBaseProps, any> { }
+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
index f049f7c995..16175f7688 100644
--- a/types/react-icons/fa/arrows.d.ts
+++ b/types/react-icons/fa/arrows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaArrows extends React.Component<IconBaseProps, any> { }
+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
index 952f9da9ad..f6e1649de6 100644
--- a/types/react-icons/fa/assistive-listening-systems.d.ts
+++ b/types/react-icons/fa/assistive-listening-systems.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAssistiveListeningSystems extends React.Component<IconBaseProps, any> { }
+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
index 26bdb65714..89fc42ca05 100644
--- a/types/react-icons/fa/asterisk.d.ts
+++ b/types/react-icons/fa/asterisk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAsterisk extends React.Component<IconBaseProps, any> { }
+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
index 9711ed1693..a871055990 100644
--- a/types/react-icons/fa/at.d.ts
+++ b/types/react-icons/fa/at.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAt extends React.Component<IconBaseProps, any> { }
+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
index a14bb0678e..476ef84b6a 100644
--- a/types/react-icons/fa/audio-description.d.ts
+++ b/types/react-icons/fa/audio-description.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAudioDescription extends React.Component<IconBaseProps, any> { }
+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
index a1af9a37fd..4a6a259ff3 100644
--- a/types/react-icons/fa/automobile.d.ts
+++ b/types/react-icons/fa/automobile.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaAutomobile extends React.Component<IconBaseProps, any> { }
+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
index e9ee917d5c..ac9bc7b820 100644
--- a/types/react-icons/fa/backward.d.ts
+++ b/types/react-icons/fa/backward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBackward extends React.Component<IconBaseProps, any> { }
+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
index 1261184bc0..ae8446ed1b 100644
--- a/types/react-icons/fa/balance-scale.d.ts
+++ b/types/react-icons/fa/balance-scale.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBalanceScale extends React.Component<IconBaseProps, any> { }
+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
index c2ae0ba603..b2f668bcef 100644
--- a/types/react-icons/fa/ban.d.ts
+++ b/types/react-icons/fa/ban.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBan extends React.Component<IconBaseProps, any> { }
+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
index c71ec18f35..0d3a14ebf8 100644
--- a/types/react-icons/fa/bank.d.ts
+++ b/types/react-icons/fa/bank.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBank extends React.Component<IconBaseProps, any> { }
+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
index c9a1d86697..b184edbda5 100644
--- a/types/react-icons/fa/bar-chart.d.ts
+++ b/types/react-icons/fa/bar-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBarChart extends React.Component<IconBaseProps, any> { }
+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
index 15fa81c417..4f764358a7 100644
--- a/types/react-icons/fa/barcode.d.ts
+++ b/types/react-icons/fa/barcode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBarcode extends React.Component<IconBaseProps, any> { }
+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
index 809ca12438..5a3272c896 100644
--- a/types/react-icons/fa/bars.d.ts
+++ b/types/react-icons/fa/bars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBars extends React.Component<IconBaseProps, any> { }
+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
index 0a3abd2652..c7ad0b12b1 100644
--- a/types/react-icons/fa/battery-0.d.ts
+++ b/types/react-icons/fa/battery-0.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery0 extends React.Component<IconBaseProps, any> { }
+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
index e3e99832d8..a7db7a950f 100644
--- a/types/react-icons/fa/battery-1.d.ts
+++ b/types/react-icons/fa/battery-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery1 extends React.Component<IconBaseProps, any> { }
+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
index d655880f25..345d261889 100644
--- a/types/react-icons/fa/battery-2.d.ts
+++ b/types/react-icons/fa/battery-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery2 extends React.Component<IconBaseProps, any> { }
+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
index a6594b8dfb..bc2a62de56 100644
--- a/types/react-icons/fa/battery-3.d.ts
+++ b/types/react-icons/fa/battery-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery3 extends React.Component<IconBaseProps, any> { }
+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
index fcef606132..0541fd5f79 100644
--- a/types/react-icons/fa/battery-4.d.ts
+++ b/types/react-icons/fa/battery-4.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBattery4 extends React.Component<IconBaseProps, any> { }
+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
index 4debb9d120..5eab8918d4 100644
--- a/types/react-icons/fa/bed.d.ts
+++ b/types/react-icons/fa/bed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBed extends React.Component<IconBaseProps, any> { }
+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
index 06c93ddb2b..79bbeb09d2 100644
--- a/types/react-icons/fa/beer.d.ts
+++ b/types/react-icons/fa/beer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBeer extends React.Component<IconBaseProps, any> { }
+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
index e1448d2634..550cb6b841 100644
--- a/types/react-icons/fa/behance-square.d.ts
+++ b/types/react-icons/fa/behance-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBehanceSquare extends React.Component<IconBaseProps, any> { }
+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
index 5eaf8e6b5b..e51df4de64 100644
--- a/types/react-icons/fa/behance.d.ts
+++ b/types/react-icons/fa/behance.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBehance extends React.Component<IconBaseProps, any> { }
+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
index 088cddb92d..13f162cd71 100644
--- a/types/react-icons/fa/bell-o.d.ts
+++ b/types/react-icons/fa/bell-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellO extends React.Component<IconBaseProps, any> { }
+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
index 3b6be9e180..49ae89d8d4 100644
--- a/types/react-icons/fa/bell-slash-o.d.ts
+++ b/types/react-icons/fa/bell-slash-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlashO extends React.Component<IconBaseProps, any> { }
+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
index fef3482cc2..305b77912b 100644
--- a/types/react-icons/fa/bell-slash.d.ts
+++ b/types/react-icons/fa/bell-slash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBellSlash extends React.Component<IconBaseProps, any> { }
+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
index a167678ae6..4ec0031ae6 100644
--- a/types/react-icons/fa/bell.d.ts
+++ b/types/react-icons/fa/bell.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBell extends React.Component<IconBaseProps, any> { }
+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
index 685336e504..e0017c15ca 100644
--- a/types/react-icons/fa/bicycle.d.ts
+++ b/types/react-icons/fa/bicycle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBicycle extends React.Component<IconBaseProps, any> { }
+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
index f91dfa1d92..5dd06d8ed4 100644
--- a/types/react-icons/fa/binoculars.d.ts
+++ b/types/react-icons/fa/binoculars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBinoculars extends React.Component<IconBaseProps, any> { }
+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
index 6d4859aeb8..24af4a13f7 100644
--- a/types/react-icons/fa/birthday-cake.d.ts
+++ b/types/react-icons/fa/birthday-cake.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBirthdayCake extends React.Component<IconBaseProps, any> { }
+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
index 400effa21a..e9c80979f9 100644
--- a/types/react-icons/fa/bitbucket-square.d.ts
+++ b/types/react-icons/fa/bitbucket-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucketSquare extends React.Component<IconBaseProps, any> { }
+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
index 707e082f39..3e46e9e0a9 100644
--- a/types/react-icons/fa/bitbucket.d.ts
+++ b/types/react-icons/fa/bitbucket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitbucket extends React.Component<IconBaseProps, any> { }
+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
index fa297818b9..34e0ee64b3 100644
--- a/types/react-icons/fa/bitcoin.d.ts
+++ b/types/react-icons/fa/bitcoin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBitcoin extends React.Component<IconBaseProps, any> { }
+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
index 406fc04113..4586a07039 100644
--- a/types/react-icons/fa/black-tie.d.ts
+++ b/types/react-icons/fa/black-tie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBlackTie extends React.Component<IconBaseProps, any> { }
+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
index 6f6d074c91..eb3606ac4c 100644
--- a/types/react-icons/fa/blind.d.ts
+++ b/types/react-icons/fa/blind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBlind extends React.Component<IconBaseProps, any> { }
+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
index 6cc9c4cef7..4ca6448c1a 100644
--- a/types/react-icons/fa/bluetooth-b.d.ts
+++ b/types/react-icons/fa/bluetooth-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetoothB extends React.Component<IconBaseProps, any> { }
+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
index d7e7ae46ee..0aba8d08f5 100644
--- a/types/react-icons/fa/bluetooth.d.ts
+++ b/types/react-icons/fa/bluetooth.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBluetooth extends React.Component<IconBaseProps, any> { }
+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
index 3ce1cefdbf..65c28daedc 100644
--- a/types/react-icons/fa/bold.d.ts
+++ b/types/react-icons/fa/bold.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBold extends React.Component<IconBaseProps, any> { }
+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
index 94e7c939de..f4ecb5e36e 100644
--- a/types/react-icons/fa/bolt.d.ts
+++ b/types/react-icons/fa/bolt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBolt extends React.Component<IconBaseProps, any> { }
+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
index 99e7be0bdd..7d8f3fff70 100644
--- a/types/react-icons/fa/bomb.d.ts
+++ b/types/react-icons/fa/bomb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBomb extends React.Component<IconBaseProps, any> { }
+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
index 93d09cb357..2925f2f925 100644
--- a/types/react-icons/fa/book.d.ts
+++ b/types/react-icons/fa/book.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBook extends React.Component<IconBaseProps, any> { }
+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
index 2db36e9b7a..07b10ae683 100644
--- a/types/react-icons/fa/bookmark-o.d.ts
+++ b/types/react-icons/fa/bookmark-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmarkO extends React.Component<IconBaseProps, any> { }
+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
index b4debb2afe..60f758e9ae 100644
--- a/types/react-icons/fa/bookmark.d.ts
+++ b/types/react-icons/fa/bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBookmark extends React.Component<IconBaseProps, any> { }
+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
index f37b220020..4619546218 100644
--- a/types/react-icons/fa/braille.d.ts
+++ b/types/react-icons/fa/braille.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBraille extends React.Component<IconBaseProps, any> { }
+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
index 91e32a3c8f..ef7d7a3e67 100644
--- a/types/react-icons/fa/briefcase.d.ts
+++ b/types/react-icons/fa/briefcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBriefcase extends React.Component<IconBaseProps, any> { }
+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
index 84ebc29984..3a386909a9 100644
--- a/types/react-icons/fa/bug.d.ts
+++ b/types/react-icons/fa/bug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBug extends React.Component<IconBaseProps, any> { }
+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
index b4d5eec8e3..1dab73f883 100644
--- a/types/react-icons/fa/building-o.d.ts
+++ b/types/react-icons/fa/building-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuildingO extends React.Component<IconBaseProps, any> { }
+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
index 166460893c..1094d0547b 100644
--- a/types/react-icons/fa/building.d.ts
+++ b/types/react-icons/fa/building.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuilding extends React.Component<IconBaseProps, any> { }
+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
index f2cbb27670..83424c5116 100644
--- a/types/react-icons/fa/bullhorn.d.ts
+++ b/types/react-icons/fa/bullhorn.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBullhorn extends React.Component<IconBaseProps, any> { }
+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
index 322f34eb11..eaa9ba66fe 100644
--- a/types/react-icons/fa/bullseye.d.ts
+++ b/types/react-icons/fa/bullseye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBullseye extends React.Component<IconBaseProps, any> { }
+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
index 90881ad03a..7fc2f7bfc5 100644
--- a/types/react-icons/fa/bus.d.ts
+++ b/types/react-icons/fa/bus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBus extends React.Component<IconBaseProps, any> { }
+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
index ef154d02e1..304c070cce 100644
--- a/types/react-icons/fa/buysellads.d.ts
+++ b/types/react-icons/fa/buysellads.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaBuysellads extends React.Component<IconBaseProps, any> { }
+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
index 68d845989f..cd6af6ddd4 100644
--- a/types/react-icons/fa/cab.d.ts
+++ b/types/react-icons/fa/cab.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCab extends React.Component<IconBaseProps, any> { }
+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
index 5bf47645dc..ed26af229f 100644
--- a/types/react-icons/fa/calculator.d.ts
+++ b/types/react-icons/fa/calculator.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalculator extends React.Component<IconBaseProps, any> { }
+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
index 0d02a074e2..9829dc60c3 100644
--- a/types/react-icons/fa/calendar-check-o.d.ts
+++ b/types/react-icons/fa/calendar-check-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarCheckO extends React.Component<IconBaseProps, any> { }
+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
index 2fc6228935..64a2d3a3e3 100644
--- a/types/react-icons/fa/calendar-minus-o.d.ts
+++ b/types/react-icons/fa/calendar-minus-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarMinusO extends React.Component<IconBaseProps, any> { }
+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
index 845d49bc9c..8a70d1c368 100644
--- a/types/react-icons/fa/calendar-o.d.ts
+++ b/types/react-icons/fa/calendar-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarO extends React.Component<IconBaseProps, any> { }
+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
index fcdb7b45f4..0ff42b4d29 100644
--- a/types/react-icons/fa/calendar-plus-o.d.ts
+++ b/types/react-icons/fa/calendar-plus-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarPlusO extends React.Component<IconBaseProps, any> { }
+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
index f17ef31832..2a81539d66 100644
--- a/types/react-icons/fa/calendar-times-o.d.ts
+++ b/types/react-icons/fa/calendar-times-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendarTimesO extends React.Component<IconBaseProps, any> { }
+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
index bbb48e3027..deec1eaeb4 100644
--- a/types/react-icons/fa/calendar.d.ts
+++ b/types/react-icons/fa/calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCalendar extends React.Component<IconBaseProps, any> { }
+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
index 1232b4607a..64821f1f67 100644
--- a/types/react-icons/fa/camera-retro.d.ts
+++ b/types/react-icons/fa/camera-retro.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCameraRetro extends React.Component<IconBaseProps, any> { }
+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
index 32fbbe0aa1..4928697191 100644
--- a/types/react-icons/fa/camera.d.ts
+++ b/types/react-icons/fa/camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCamera extends React.Component<IconBaseProps, any> { }
+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
index 9a18214c81..dbc43f0466 100644
--- a/types/react-icons/fa/caret-down.d.ts
+++ b/types/react-icons/fa/caret-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretDown extends React.Component<IconBaseProps, any> { }
+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
index 299dee9838..420ce16ba3 100644
--- a/types/react-icons/fa/caret-left.d.ts
+++ b/types/react-icons/fa/caret-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretLeft extends React.Component<IconBaseProps, any> { }
+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
index 8c92443f22..44e7429916 100644
--- a/types/react-icons/fa/caret-right.d.ts
+++ b/types/react-icons/fa/caret-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretRight extends React.Component<IconBaseProps, any> { }
+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
index a17ce8c130..dd6d132183 100644
--- a/types/react-icons/fa/caret-square-o-down.d.ts
+++ b/types/react-icons/fa/caret-square-o-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareODown extends React.Component<IconBaseProps, any> { }
+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
index c4210536c3..042ada389c 100644
--- a/types/react-icons/fa/caret-square-o-left.d.ts
+++ b/types/react-icons/fa/caret-square-o-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOLeft extends React.Component<IconBaseProps, any> { }
+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
index f30139981f..12cee8faf7 100644
--- a/types/react-icons/fa/caret-square-o-right.d.ts
+++ b/types/react-icons/fa/caret-square-o-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareORight extends React.Component<IconBaseProps, any> { }
+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
index 91e22ea223..36e0c7bee6 100644
--- a/types/react-icons/fa/caret-square-o-up.d.ts
+++ b/types/react-icons/fa/caret-square-o-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretSquareOUp extends React.Component<IconBaseProps, any> { }
+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
index 6b538604c4..4eaad4bb41 100644
--- a/types/react-icons/fa/caret-up.d.ts
+++ b/types/react-icons/fa/caret-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCaretUp extends React.Component<IconBaseProps, any> { }
+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
index 34be765a89..539933f702 100644
--- a/types/react-icons/fa/cart-arrow-down.d.ts
+++ b/types/react-icons/fa/cart-arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCartArrowDown extends React.Component<IconBaseProps, any> { }
+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
index 5c304d3d02..00e645e840 100644
--- a/types/react-icons/fa/cart-plus.d.ts
+++ b/types/react-icons/fa/cart-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCartPlus extends React.Component<IconBaseProps, any> { }
+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
index df60844a2f..daede8980e 100644
--- a/types/react-icons/fa/cc-amex.d.ts
+++ b/types/react-icons/fa/cc-amex.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcAmex extends React.Component<IconBaseProps, any> { }
+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
index 8cd8ad8a7b..5263120cb0 100644
--- a/types/react-icons/fa/cc-diners-club.d.ts
+++ b/types/react-icons/fa/cc-diners-club.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDinersClub extends React.Component<IconBaseProps, any> { }
+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
index ff824da77e..0d5e5d6daa 100644
--- a/types/react-icons/fa/cc-discover.d.ts
+++ b/types/react-icons/fa/cc-discover.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcDiscover extends React.Component<IconBaseProps, any> { }
+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
index af7948e1fb..3aeb4c483f 100644
--- a/types/react-icons/fa/cc-jcb.d.ts
+++ b/types/react-icons/fa/cc-jcb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcJcb extends React.Component<IconBaseProps, any> { }
+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
index 7b516edda3..58e0e375c0 100644
--- a/types/react-icons/fa/cc-mastercard.d.ts
+++ b/types/react-icons/fa/cc-mastercard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcMastercard extends React.Component<IconBaseProps, any> { }
+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
index 2d7ff3e067..4fb116f8ab 100644
--- a/types/react-icons/fa/cc-paypal.d.ts
+++ b/types/react-icons/fa/cc-paypal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcPaypal extends React.Component<IconBaseProps, any> { }
+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
index efaada02d2..afb2d4cac8 100644
--- a/types/react-icons/fa/cc-stripe.d.ts
+++ b/types/react-icons/fa/cc-stripe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcStripe extends React.Component<IconBaseProps, any> { }
+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
index 4314c53f54..4e5b06b45f 100644
--- a/types/react-icons/fa/cc-visa.d.ts
+++ b/types/react-icons/fa/cc-visa.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCcVisa extends React.Component<IconBaseProps, any> { }
+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
index 0300041bbd..e2c4036439 100644
--- a/types/react-icons/fa/cc.d.ts
+++ b/types/react-icons/fa/cc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCc extends React.Component<IconBaseProps, any> { }
+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
index a895188167..c8845fb117 100644
--- a/types/react-icons/fa/certificate.d.ts
+++ b/types/react-icons/fa/certificate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCertificate extends React.Component<IconBaseProps, any> { }
+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
index 7f764b6acf..87a8310d0a 100644
--- a/types/react-icons/fa/chain-broken.d.ts
+++ b/types/react-icons/fa/chain-broken.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChainBroken extends React.Component<IconBaseProps, any> { }
+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
index 089e30e7e4..8359a5f773 100644
--- a/types/react-icons/fa/chain.d.ts
+++ b/types/react-icons/fa/chain.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChain extends React.Component<IconBaseProps, any> { }
+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
index b7d923e778..32390d5c4c 100644
--- a/types/react-icons/fa/check-circle-o.d.ts
+++ b/types/react-icons/fa/check-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircleO extends React.Component<IconBaseProps, any> { }
+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
index b6f6458598..c30263a3be 100644
--- a/types/react-icons/fa/check-circle.d.ts
+++ b/types/react-icons/fa/check-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckCircle extends React.Component<IconBaseProps, any> { }
+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
index c9e3a5c3ba..b4aef21d8c 100644
--- a/types/react-icons/fa/check-square-o.d.ts
+++ b/types/react-icons/fa/check-square-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquareO extends React.Component<IconBaseProps, any> { }
+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
index 3e27a367b7..f6ba4ce0bd 100644
--- a/types/react-icons/fa/check-square.d.ts
+++ b/types/react-icons/fa/check-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheckSquare extends React.Component<IconBaseProps, any> { }
+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
index d21ec83f07..b30727c61c 100644
--- a/types/react-icons/fa/check.d.ts
+++ b/types/react-icons/fa/check.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCheck extends React.Component<IconBaseProps, any> { }
+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
index d8b3739962..35eb978aec 100644
--- a/types/react-icons/fa/chevron-circle-down.d.ts
+++ b/types/react-icons/fa/chevron-circle-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleDown extends React.Component<IconBaseProps, any> { }
+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
index 7aca71e22d..e84cdd9146 100644
--- a/types/react-icons/fa/chevron-circle-left.d.ts
+++ b/types/react-icons/fa/chevron-circle-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleLeft extends React.Component<IconBaseProps, any> { }
+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
index 3d05dbea9c..d5e4d2429c 100644
--- a/types/react-icons/fa/chevron-circle-right.d.ts
+++ b/types/react-icons/fa/chevron-circle-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleRight extends React.Component<IconBaseProps, any> { }
+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
index e768ea7722..bedcb877d6 100644
--- a/types/react-icons/fa/chevron-circle-up.d.ts
+++ b/types/react-icons/fa/chevron-circle-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronCircleUp extends React.Component<IconBaseProps, any> { }
+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
index ac968ffca0..5c9ae23cf8 100644
--- a/types/react-icons/fa/chevron-down.d.ts
+++ b/types/react-icons/fa/chevron-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronDown extends React.Component<IconBaseProps, any> { }
+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
index ebd3967f9f..b07fae8a5e 100644
--- a/types/react-icons/fa/chevron-left.d.ts
+++ b/types/react-icons/fa/chevron-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronLeft extends React.Component<IconBaseProps, any> { }
+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
index d7e5ef0db8..27f6264560 100644
--- a/types/react-icons/fa/chevron-right.d.ts
+++ b/types/react-icons/fa/chevron-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronRight extends React.Component<IconBaseProps, any> { }
+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
index a1d1a4b327..3847054d06 100644
--- a/types/react-icons/fa/chevron-up.d.ts
+++ b/types/react-icons/fa/chevron-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChevronUp extends React.Component<IconBaseProps, any> { }
+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
index 45d8a8f446..08209ee585 100644
--- a/types/react-icons/fa/child.d.ts
+++ b/types/react-icons/fa/child.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChild extends React.Component<IconBaseProps, any> { }
+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
index 31dab1db75..703caadb19 100644
--- a/types/react-icons/fa/chrome.d.ts
+++ b/types/react-icons/fa/chrome.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaChrome extends React.Component<IconBaseProps, any> { }
+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
index c03a4c202a..ed18a9f78d 100644
--- a/types/react-icons/fa/circle-o-notch.d.ts
+++ b/types/react-icons/fa/circle-o-notch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleONotch extends React.Component<IconBaseProps, any> { }
+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
index 587f6a08b3..05001b7669 100644
--- a/types/react-icons/fa/circle-o.d.ts
+++ b/types/react-icons/fa/circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleO extends React.Component<IconBaseProps, any> { }
+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
index f6877fb753..017b8a0e4d 100644
--- a/types/react-icons/fa/circle-thin.d.ts
+++ b/types/react-icons/fa/circle-thin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircleThin extends React.Component<IconBaseProps, any> { }
+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
index 29dc5aa971..14b042ae0b 100644
--- a/types/react-icons/fa/circle.d.ts
+++ b/types/react-icons/fa/circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCircle extends React.Component<IconBaseProps, any> { }
+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
index 5ee17f3646..6a15d300fb 100644
--- a/types/react-icons/fa/clipboard.d.ts
+++ b/types/react-icons/fa/clipboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClipboard extends React.Component<IconBaseProps, any> { }
+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
index ae640541b9..021deeb65e 100644
--- a/types/react-icons/fa/clock-o.d.ts
+++ b/types/react-icons/fa/clock-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClockO extends React.Component<IconBaseProps, any> { }
+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
index e22e7a9c76..60b8d9d0b9 100644
--- a/types/react-icons/fa/clone.d.ts
+++ b/types/react-icons/fa/clone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClone extends React.Component<IconBaseProps, any> { }
+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
index 968f0fa04c..81b3c24102 100644
--- a/types/react-icons/fa/close.d.ts
+++ b/types/react-icons/fa/close.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaClose extends React.Component<IconBaseProps, any> { }
+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
index ef8b3b2df1..76834995ef 100644
--- a/types/react-icons/fa/cloud-download.d.ts
+++ b/types/react-icons/fa/cloud-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudDownload extends React.Component<IconBaseProps, any> { }
+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
index 5e7e010ae0..68e7a59934 100644
--- a/types/react-icons/fa/cloud-upload.d.ts
+++ b/types/react-icons/fa/cloud-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloudUpload extends React.Component<IconBaseProps, any> { }
+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
index 4eb50300d0..555b3f5a09 100644
--- a/types/react-icons/fa/cloud.d.ts
+++ b/types/react-icons/fa/cloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCloud extends React.Component<IconBaseProps, any> { }
+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
index 32874d0c6c..816523c44e 100644
--- a/types/react-icons/fa/cny.d.ts
+++ b/types/react-icons/fa/cny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCny extends React.Component<IconBaseProps, any> { }
+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
index 7029fa9f19..520f347006 100644
--- a/types/react-icons/fa/code-fork.d.ts
+++ b/types/react-icons/fa/code-fork.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodeFork extends React.Component<IconBaseProps, any> { }
+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
index 9728e95e57..5a9b025804 100644
--- a/types/react-icons/fa/code.d.ts
+++ b/types/react-icons/fa/code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCode extends React.Component<IconBaseProps, any> { }
+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
index 8bcf594dc6..e317fd7e6e 100644
--- a/types/react-icons/fa/codepen.d.ts
+++ b/types/react-icons/fa/codepen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodepen extends React.Component<IconBaseProps, any> { }
+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
index 62a958c379..74deac600a 100644
--- a/types/react-icons/fa/codiepie.d.ts
+++ b/types/react-icons/fa/codiepie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCodiepie extends React.Component<IconBaseProps, any> { }
+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
index 4580c89a51..defdc05087 100644
--- a/types/react-icons/fa/coffee.d.ts
+++ b/types/react-icons/fa/coffee.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCoffee extends React.Component<IconBaseProps, any> { }
+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
index d7798c90b0..1fe2c08345 100644
--- a/types/react-icons/fa/cog.d.ts
+++ b/types/react-icons/fa/cog.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCog extends React.Component<IconBaseProps, any> { }
+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
index 0dffee3e5f..daf4b449d3 100644
--- a/types/react-icons/fa/cogs.d.ts
+++ b/types/react-icons/fa/cogs.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCogs extends React.Component<IconBaseProps, any> { }
+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
index f7041951e1..8e88628b63 100644
--- a/types/react-icons/fa/columns.d.ts
+++ b/types/react-icons/fa/columns.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaColumns extends React.Component<IconBaseProps, any> { }
+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
index d5d7cc53df..e627ec6248 100644
--- a/types/react-icons/fa/comment-o.d.ts
+++ b/types/react-icons/fa/comment-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentO extends React.Component<IconBaseProps, any> { }
+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
index a1f9b11afd..82043adb6a 100644
--- a/types/react-icons/fa/comment.d.ts
+++ b/types/react-icons/fa/comment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaComment extends React.Component<IconBaseProps, any> { }
+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
index c5f8b1216b..40a4c3f058 100644
--- a/types/react-icons/fa/commenting-o.d.ts
+++ b/types/react-icons/fa/commenting-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentingO extends React.Component<IconBaseProps, any> { }
+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
index 03b75d224b..1031cc0ad6 100644
--- a/types/react-icons/fa/commenting.d.ts
+++ b/types/react-icons/fa/commenting.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommenting extends React.Component<IconBaseProps, any> { }
+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
index 2d0fdb4adf..191de8b6a3 100644
--- a/types/react-icons/fa/comments-o.d.ts
+++ b/types/react-icons/fa/comments-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCommentsO extends React.Component<IconBaseProps, any> { }
+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
index 5cde474736..e77e9f4b42 100644
--- a/types/react-icons/fa/comments.d.ts
+++ b/types/react-icons/fa/comments.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaComments extends React.Component<IconBaseProps, any> { }
+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
index 2ed1d54105..36d4843b21 100644
--- a/types/react-icons/fa/compass.d.ts
+++ b/types/react-icons/fa/compass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCompass extends React.Component<IconBaseProps, any> { }
+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
index d29e0b63e8..7f2f48ca22 100644
--- a/types/react-icons/fa/compress.d.ts
+++ b/types/react-icons/fa/compress.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCompress extends React.Component<IconBaseProps, any> { }
+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
index b22d80be66..aae5bfa48c 100644
--- a/types/react-icons/fa/connectdevelop.d.ts
+++ b/types/react-icons/fa/connectdevelop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaConnectdevelop extends React.Component<IconBaseProps, any> { }
+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
index 650a6fd54a..c99ab675b4 100644
--- a/types/react-icons/fa/contao.d.ts
+++ b/types/react-icons/fa/contao.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaContao extends React.Component<IconBaseProps, any> { }
+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
index 0a70c128a4..3e6e11bf31 100644
--- a/types/react-icons/fa/copy.d.ts
+++ b/types/react-icons/fa/copy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCopy extends React.Component<IconBaseProps, any> { }
+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
index 1031174a26..630383979f 100644
--- a/types/react-icons/fa/copyright.d.ts
+++ b/types/react-icons/fa/copyright.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCopyright extends React.Component<IconBaseProps, any> { }
+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
index 87380c8a73..eecacfd23c 100644
--- a/types/react-icons/fa/creative-commons.d.ts
+++ b/types/react-icons/fa/creative-commons.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreativeCommons extends React.Component<IconBaseProps, any> { }
+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
index 6b9b29a423..c9d2f20993 100644
--- a/types/react-icons/fa/credit-card-alt.d.ts
+++ b/types/react-icons/fa/credit-card-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCardAlt extends React.Component<IconBaseProps, any> { }
+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
index 63b00d5918..374f9efdda 100644
--- a/types/react-icons/fa/credit-card.d.ts
+++ b/types/react-icons/fa/credit-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCreditCard extends React.Component<IconBaseProps, any> { }
+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
index 42c9e9ab5b..aa47690da9 100644
--- a/types/react-icons/fa/crop.d.ts
+++ b/types/react-icons/fa/crop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCrop extends React.Component<IconBaseProps, any> { }
+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
index 8bfe8bf588..c54203bb33 100644
--- a/types/react-icons/fa/crosshairs.d.ts
+++ b/types/react-icons/fa/crosshairs.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCrosshairs extends React.Component<IconBaseProps, any> { }
+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
index faa7a33b4a..361b20e295 100644
--- a/types/react-icons/fa/css3.d.ts
+++ b/types/react-icons/fa/css3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCss3 extends React.Component<IconBaseProps, any> { }
+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
index 972f72f38d..ad9dc6b033 100644
--- a/types/react-icons/fa/cube.d.ts
+++ b/types/react-icons/fa/cube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCube extends React.Component<IconBaseProps, any> { }
+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
index 9f454f42e3..a2cdf49c8c 100644
--- a/types/react-icons/fa/cubes.d.ts
+++ b/types/react-icons/fa/cubes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCubes extends React.Component<IconBaseProps, any> { }
+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
index 52882a60b1..0c93d3cbc2 100644
--- a/types/react-icons/fa/cut.d.ts
+++ b/types/react-icons/fa/cut.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCut extends React.Component<IconBaseProps, any> { }
+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
index 714cc59952..f4496c61e3 100644
--- a/types/react-icons/fa/cutlery.d.ts
+++ b/types/react-icons/fa/cutlery.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaCutlery extends React.Component<IconBaseProps, any> { }
+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
index 93220c695e..d763edb50d 100644
--- a/types/react-icons/fa/dashboard.d.ts
+++ b/types/react-icons/fa/dashboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDashboard extends React.Component<IconBaseProps, any> { }
+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
index 6ee0b22a56..ed15f887b2 100644
--- a/types/react-icons/fa/dashcube.d.ts
+++ b/types/react-icons/fa/dashcube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDashcube extends React.Component<IconBaseProps, any> { }
+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
index edbba2475d..cfb7bcbedd 100644
--- a/types/react-icons/fa/database.d.ts
+++ b/types/react-icons/fa/database.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDatabase extends React.Component<IconBaseProps, any> { }
+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
index 7e08cadc5e..a53c48b057 100644
--- a/types/react-icons/fa/deaf.d.ts
+++ b/types/react-icons/fa/deaf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDeaf extends React.Component<IconBaseProps, any> { }
+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
index 5a8d02ee14..30db3c96d4 100644
--- a/types/react-icons/fa/dedent.d.ts
+++ b/types/react-icons/fa/dedent.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDedent extends React.Component<IconBaseProps, any> { }
+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
index ea10930a89..7a069105b3 100644
--- a/types/react-icons/fa/delicious.d.ts
+++ b/types/react-icons/fa/delicious.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDelicious extends React.Component<IconBaseProps, any> { }
+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
index 98e8d24294..7ada5afec8 100644
--- a/types/react-icons/fa/desktop.d.ts
+++ b/types/react-icons/fa/desktop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDesktop extends React.Component<IconBaseProps, any> { }
+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
index 0b5b029451..d3d8521e04 100644
--- a/types/react-icons/fa/deviantart.d.ts
+++ b/types/react-icons/fa/deviantart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDeviantart extends React.Component<IconBaseProps, any> { }
+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
index 4ab2c3bca9..1d54c78101 100644
--- a/types/react-icons/fa/diamond.d.ts
+++ b/types/react-icons/fa/diamond.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDiamond extends React.Component<IconBaseProps, any> { }
+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
index 17574f0e2e..7ba32cbe41 100644
--- a/types/react-icons/fa/digg.d.ts
+++ b/types/react-icons/fa/digg.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDigg extends React.Component<IconBaseProps, any> { }
+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
index f78a435410..339fc41f86 100644
--- a/types/react-icons/fa/dollar.d.ts
+++ b/types/react-icons/fa/dollar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDollar extends React.Component<IconBaseProps, any> { }
+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
index ccd711bc4a..8479c5a1c1 100644
--- a/types/react-icons/fa/dot-circle-o.d.ts
+++ b/types/react-icons/fa/dot-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDotCircleO extends React.Component<IconBaseProps, any> { }
+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
index 83c3e618e1..bd458b4c21 100644
--- a/types/react-icons/fa/download.d.ts
+++ b/types/react-icons/fa/download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDownload extends React.Component<IconBaseProps, any> { }
+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
index 7f6a1009d8..97c095c7f0 100644
--- a/types/react-icons/fa/dribbble.d.ts
+++ b/types/react-icons/fa/dribbble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDribbble extends React.Component<IconBaseProps, any> { }
+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
index 3f2a76aab3..1534075582 100644
--- a/types/react-icons/fa/dropbox.d.ts
+++ b/types/react-icons/fa/dropbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDropbox extends React.Component<IconBaseProps, any> { }
+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
index 950a9248f9..c4318c69ed 100644
--- a/types/react-icons/fa/drupal.d.ts
+++ b/types/react-icons/fa/drupal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaDrupal extends React.Component<IconBaseProps, any> { }
+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
index 7b319315bb..bfe0ccba18 100644
--- a/types/react-icons/fa/edge.d.ts
+++ b/types/react-icons/fa/edge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEdge extends React.Component<IconBaseProps, any> { }
+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
index 58b9674643..e207eca02c 100644
--- a/types/react-icons/fa/edit.d.ts
+++ b/types/react-icons/fa/edit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEdit extends React.Component<IconBaseProps, any> { }
+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
index 154369be09..6a8ba89e5b 100644
--- a/types/react-icons/fa/eject.d.ts
+++ b/types/react-icons/fa/eject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEject extends React.Component<IconBaseProps, any> { }
+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
index ff21ed1b93..6c97cce7ac 100644
--- a/types/react-icons/fa/ellipsis-h.d.ts
+++ b/types/react-icons/fa/ellipsis-h.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisH extends React.Component<IconBaseProps, any> { }
+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
index 35aac8f985..a6a862fcc0 100644
--- a/types/react-icons/fa/ellipsis-v.d.ts
+++ b/types/react-icons/fa/ellipsis-v.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEllipsisV extends React.Component<IconBaseProps, any> { }
+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
index 2d7fb9ec7f..c898a570aa 100644
--- a/types/react-icons/fa/empire.d.ts
+++ b/types/react-icons/fa/empire.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEmpire extends React.Component<IconBaseProps, any> { }
+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
index 16598ccde0..91552afcb2 100644
--- a/types/react-icons/fa/envelope-o.d.ts
+++ b/types/react-icons/fa/envelope-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeO extends React.Component<IconBaseProps, any> { }
+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
index f33eb74369..c984bceac4 100644
--- a/types/react-icons/fa/envelope-square.d.ts
+++ b/types/react-icons/fa/envelope-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelopeSquare extends React.Component<IconBaseProps, any> { }
+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
index a028dfcdac..c93f0c144b 100644
--- a/types/react-icons/fa/envelope.d.ts
+++ b/types/react-icons/fa/envelope.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvelope extends React.Component<IconBaseProps, any> { }
+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
index 8ba179d33e..8ccf1e8183 100644
--- a/types/react-icons/fa/envira.d.ts
+++ b/types/react-icons/fa/envira.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEnvira extends React.Component<IconBaseProps, any> { }
+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
index 1e6eebedf5..1751f58630 100644
--- a/types/react-icons/fa/eraser.d.ts
+++ b/types/react-icons/fa/eraser.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEraser extends React.Component<IconBaseProps, any> { }
+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
index a08fd0e9fb..466c340a42 100644
--- a/types/react-icons/fa/eur.d.ts
+++ b/types/react-icons/fa/eur.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEur extends React.Component<IconBaseProps, any> { }
+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
index 134c75c186..61f666fcc6 100644
--- a/types/react-icons/fa/exchange.d.ts
+++ b/types/react-icons/fa/exchange.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExchange extends React.Component<IconBaseProps, any> { }
+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
index 2f2a00d0d7..074285abc3 100644
--- a/types/react-icons/fa/exclamation-circle.d.ts
+++ b/types/react-icons/fa/exclamation-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationCircle extends React.Component<IconBaseProps, any> { }
+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
index f016a58cbd..0e6a2039ef 100644
--- a/types/react-icons/fa/exclamation-triangle.d.ts
+++ b/types/react-icons/fa/exclamation-triangle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamationTriangle extends React.Component<IconBaseProps, any> { }
+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
index 0c55bee6ca..822c50b207 100644
--- a/types/react-icons/fa/exclamation.d.ts
+++ b/types/react-icons/fa/exclamation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExclamation extends React.Component<IconBaseProps, any> { }
+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
index a0ccf39aca..4648b519b9 100644
--- a/types/react-icons/fa/expand.d.ts
+++ b/types/react-icons/fa/expand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExpand extends React.Component<IconBaseProps, any> { }
+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
index 68a59f3b49..e30594333e 100644
--- a/types/react-icons/fa/expeditedssl.d.ts
+++ b/types/react-icons/fa/expeditedssl.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExpeditedssl extends React.Component<IconBaseProps, any> { }
+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
index 0eb2034852..f49858db95 100644
--- a/types/react-icons/fa/external-link-square.d.ts
+++ b/types/react-icons/fa/external-link-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLinkSquare extends React.Component<IconBaseProps, any> { }
+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
index 8192fd7c0a..69b539a542 100644
--- a/types/react-icons/fa/external-link.d.ts
+++ b/types/react-icons/fa/external-link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaExternalLink extends React.Component<IconBaseProps, any> { }
+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
index f3d25de844..cbf60ac206 100644
--- a/types/react-icons/fa/eye-slash.d.ts
+++ b/types/react-icons/fa/eye-slash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEyeSlash extends React.Component<IconBaseProps, any> { }
+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
index 54d79b9fcc..bec2d41708 100644
--- a/types/react-icons/fa/eye.d.ts
+++ b/types/react-icons/fa/eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEye extends React.Component<IconBaseProps, any> { }
+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
index e68d53104e..87b2d74f41 100644
--- a/types/react-icons/fa/eyedropper.d.ts
+++ b/types/react-icons/fa/eyedropper.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaEyedropper extends React.Component<IconBaseProps, any> { }
+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
index dad6a7213b..3424fb90dd 100644
--- a/types/react-icons/fa/facebook-official.d.ts
+++ b/types/react-icons/fa/facebook-official.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookOfficial extends React.Component<IconBaseProps, any> { }
+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
index c97875533a..fb5c101a6b 100644
--- a/types/react-icons/fa/facebook-square.d.ts
+++ b/types/react-icons/fa/facebook-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebookSquare extends React.Component<IconBaseProps, any> { }
+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
index 60732c2709..d837e533dd 100644
--- a/types/react-icons/fa/facebook.d.ts
+++ b/types/react-icons/fa/facebook.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFacebook extends React.Component<IconBaseProps, any> { }
+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
index 953f878056..73f95fd419 100644
--- a/types/react-icons/fa/fast-backward.d.ts
+++ b/types/react-icons/fa/fast-backward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFastBackward extends React.Component<IconBaseProps, any> { }
+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
index 523e4aac69..c28ea39eb7 100644
--- a/types/react-icons/fa/fast-forward.d.ts
+++ b/types/react-icons/fa/fast-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFastForward extends React.Component<IconBaseProps, any> { }
+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
index 52074c14c5..9ca411f7f9 100644
--- a/types/react-icons/fa/fax.d.ts
+++ b/types/react-icons/fa/fax.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFax extends React.Component<IconBaseProps, any> { }
+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
index ba7db20eea..448c3a2e24 100644
--- a/types/react-icons/fa/feed.d.ts
+++ b/types/react-icons/fa/feed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFeed extends React.Component<IconBaseProps, any> { }
+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
index aecfc8c520..d18a20d305 100644
--- a/types/react-icons/fa/female.d.ts
+++ b/types/react-icons/fa/female.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFemale extends React.Component<IconBaseProps, any> { }
+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
index 72eb08bac8..124b4d63e3 100644
--- a/types/react-icons/fa/fighter-jet.d.ts
+++ b/types/react-icons/fa/fighter-jet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFighterJet extends React.Component<IconBaseProps, any> { }
+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
index fe4121612d..6a3390c936 100644
--- a/types/react-icons/fa/file-archive-o.d.ts
+++ b/types/react-icons/fa/file-archive-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileArchiveO extends React.Component<IconBaseProps, any> { }
+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
index 537909a9ec..a360a79960 100644
--- a/types/react-icons/fa/file-audio-o.d.ts
+++ b/types/react-icons/fa/file-audio-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileAudioO extends React.Component<IconBaseProps, any> { }
+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
index 6a97a7d831..754fcb2d04 100644
--- a/types/react-icons/fa/file-code-o.d.ts
+++ b/types/react-icons/fa/file-code-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileCodeO extends React.Component<IconBaseProps, any> { }
+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
index 2b6a07b5fc..dd41811e82 100644
--- a/types/react-icons/fa/file-excel-o.d.ts
+++ b/types/react-icons/fa/file-excel-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileExcelO extends React.Component<IconBaseProps, any> { }
+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
index 4f939dd36a..7c6b77a296 100644
--- a/types/react-icons/fa/file-image-o.d.ts
+++ b/types/react-icons/fa/file-image-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileImageO extends React.Component<IconBaseProps, any> { }
+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
index 69e7aa0f99..ec9a9e0e0d 100644
--- a/types/react-icons/fa/file-movie-o.d.ts
+++ b/types/react-icons/fa/file-movie-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileMovieO extends React.Component<IconBaseProps, any> { }
+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
index a0a80f66f5..726de80769 100644
--- a/types/react-icons/fa/file-o.d.ts
+++ b/types/react-icons/fa/file-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileO extends React.Component<IconBaseProps, any> { }
+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
index a6d91228c5..79ae492b23 100644
--- a/types/react-icons/fa/file-pdf-o.d.ts
+++ b/types/react-icons/fa/file-pdf-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePdfO extends React.Component<IconBaseProps, any> { }
+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
index a21c3d3599..fd4016615c 100644
--- a/types/react-icons/fa/file-powerpoint-o.d.ts
+++ b/types/react-icons/fa/file-powerpoint-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilePowerpointO extends React.Component<IconBaseProps, any> { }
+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
index c7457d092a..5bf9475839 100644
--- a/types/react-icons/fa/file-text-o.d.ts
+++ b/types/react-icons/fa/file-text-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileTextO extends React.Component<IconBaseProps, any> { }
+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
index 4060acf04e..287aa5d5e9 100644
--- a/types/react-icons/fa/file-text.d.ts
+++ b/types/react-icons/fa/file-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileText extends React.Component<IconBaseProps, any> { }
+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
index 93f34d2f3c..e8790d5988 100644
--- a/types/react-icons/fa/file-word-o.d.ts
+++ b/types/react-icons/fa/file-word-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFileWordO extends React.Component<IconBaseProps, any> { }
+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
index e1a3303fa3..92fb6d073a 100644
--- a/types/react-icons/fa/file.d.ts
+++ b/types/react-icons/fa/file.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFile extends React.Component<IconBaseProps, any> { }
+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
index c927f32621..639ec938b8 100644
--- a/types/react-icons/fa/film.d.ts
+++ b/types/react-icons/fa/film.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilm extends React.Component<IconBaseProps, any> { }
+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
index 2ec3528ecd..971ec8a2ab 100644
--- a/types/react-icons/fa/filter.d.ts
+++ b/types/react-icons/fa/filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFilter extends React.Component<IconBaseProps, any> { }
+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
index 9cdf3990e3..347abc3091 100644
--- a/types/react-icons/fa/fire-extinguisher.d.ts
+++ b/types/react-icons/fa/fire-extinguisher.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFireExtinguisher extends React.Component<IconBaseProps, any> { }
+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
index f3cda66143..361e6b3f2a 100644
--- a/types/react-icons/fa/fire.d.ts
+++ b/types/react-icons/fa/fire.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFire extends React.Component<IconBaseProps, any> { }
+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
index b8a18b542b..fb5b6faf5b 100644
--- a/types/react-icons/fa/firefox.d.ts
+++ b/types/react-icons/fa/firefox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFirefox extends React.Component<IconBaseProps, any> { }
+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
index 5c4304aeab..ad9439fe74 100644
--- a/types/react-icons/fa/flag-checkered.d.ts
+++ b/types/react-icons/fa/flag-checkered.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagCheckered extends React.Component<IconBaseProps, any> { }
+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
index 8578397d88..4af124ebe3 100644
--- a/types/react-icons/fa/flag-o.d.ts
+++ b/types/react-icons/fa/flag-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlagO extends React.Component<IconBaseProps, any> { }
+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
index a2be5ae6fb..05b3a41500 100644
--- a/types/react-icons/fa/flag.d.ts
+++ b/types/react-icons/fa/flag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlag extends React.Component<IconBaseProps, any> { }
+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
index 9389f368e1..53edd95b1c 100644
--- a/types/react-icons/fa/flask.d.ts
+++ b/types/react-icons/fa/flask.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlask extends React.Component<IconBaseProps, any> { }
+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
index 6525950834..0642e63424 100644
--- a/types/react-icons/fa/flickr.d.ts
+++ b/types/react-icons/fa/flickr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFlickr extends React.Component<IconBaseProps, any> { }
+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
index 89daa260e2..a36898567d 100644
--- a/types/react-icons/fa/floppy-o.d.ts
+++ b/types/react-icons/fa/floppy-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFloppyO extends React.Component<IconBaseProps, any> { }
+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
index bb15938245..86c2f0853c 100644
--- a/types/react-icons/fa/folder-o.d.ts
+++ b/types/react-icons/fa/folder-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderO extends React.Component<IconBaseProps, any> { }
+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
index df4721290e..13c270457c 100644
--- a/types/react-icons/fa/folder-open-o.d.ts
+++ b/types/react-icons/fa/folder-open-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpenO extends React.Component<IconBaseProps, any> { }
+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
index 46e7aca138..27eefcf390 100644
--- a/types/react-icons/fa/folder-open.d.ts
+++ b/types/react-icons/fa/folder-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolderOpen extends React.Component<IconBaseProps, any> { }
+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
index 467f653653..348ac25522 100644
--- a/types/react-icons/fa/folder.d.ts
+++ b/types/react-icons/fa/folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFolder extends React.Component<IconBaseProps, any> { }
+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
index 832ade832a..70459022df 100644
--- a/types/react-icons/fa/font.d.ts
+++ b/types/react-icons/fa/font.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFont extends React.Component<IconBaseProps, any> { }
+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
index 620828ee51..a124cfb0c2 100644
--- a/types/react-icons/fa/fonticons.d.ts
+++ b/types/react-icons/fa/fonticons.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFonticons extends React.Component<IconBaseProps, any> { }
+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
index 46e8afe344..a88e6a0118 100644
--- a/types/react-icons/fa/fort-awesome.d.ts
+++ b/types/react-icons/fa/fort-awesome.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFortAwesome extends React.Component<IconBaseProps, any> { }
+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
index 73892524a8..58b96a9d83 100644
--- a/types/react-icons/fa/forumbee.d.ts
+++ b/types/react-icons/fa/forumbee.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaForumbee extends React.Component<IconBaseProps, any> { }
+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
index 718678c825..12eacceb4b 100644
--- a/types/react-icons/fa/forward.d.ts
+++ b/types/react-icons/fa/forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaForward extends React.Component<IconBaseProps, any> { }
+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
index 74ae7eaa58..8c2bf2cbf5 100644
--- a/types/react-icons/fa/foursquare.d.ts
+++ b/types/react-icons/fa/foursquare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFoursquare extends React.Component<IconBaseProps, any> { }
+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
index 0662ee7227..06ebd02274 100644
--- a/types/react-icons/fa/frown-o.d.ts
+++ b/types/react-icons/fa/frown-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFrownO extends React.Component<IconBaseProps, any> { }
+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
index 588d5a55da..eaa4922a85 100644
--- a/types/react-icons/fa/futbol-o.d.ts
+++ b/types/react-icons/fa/futbol-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaFutbolO extends React.Component<IconBaseProps, any> { }
+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
index 873458cddb..9acea2828f 100644
--- a/types/react-icons/fa/gamepad.d.ts
+++ b/types/react-icons/fa/gamepad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGamepad extends React.Component<IconBaseProps, any> { }
+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
index 79365cb297..66e5593ffa 100644
--- a/types/react-icons/fa/gavel.d.ts
+++ b/types/react-icons/fa/gavel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGavel extends React.Component<IconBaseProps, any> { }
+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
index dedad39ded..1fb48290e3 100644
--- a/types/react-icons/fa/gbp.d.ts
+++ b/types/react-icons/fa/gbp.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGbp extends React.Component<IconBaseProps, any> { }
+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
index a06c813d70..5ad672ddb3 100644
--- a/types/react-icons/fa/genderless.d.ts
+++ b/types/react-icons/fa/genderless.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGenderless extends React.Component<IconBaseProps, any> { }
+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
index 452b12a03a..1f04b2974b 100644
--- a/types/react-icons/fa/get-pocket.d.ts
+++ b/types/react-icons/fa/get-pocket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGetPocket extends React.Component<IconBaseProps, any> { }
+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
index 34fa7a46d8..580b37668c 100644
--- a/types/react-icons/fa/gg-circle.d.ts
+++ b/types/react-icons/fa/gg-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGgCircle extends React.Component<IconBaseProps, any> { }
+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
index 303572f740..2aaf1c7b23 100644
--- a/types/react-icons/fa/gg.d.ts
+++ b/types/react-icons/fa/gg.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGg extends React.Component<IconBaseProps, any> { }
+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
index f57406993b..79b22324f5 100644
--- a/types/react-icons/fa/gift.d.ts
+++ b/types/react-icons/fa/gift.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGift extends React.Component<IconBaseProps, any> { }
+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
index 1ff9e49e6d..28cf85a92a 100644
--- a/types/react-icons/fa/git-square.d.ts
+++ b/types/react-icons/fa/git-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGitSquare extends React.Component<IconBaseProps, any> { }
+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
index f1398b2d12..427ad2a4b8 100644
--- a/types/react-icons/fa/git.d.ts
+++ b/types/react-icons/fa/git.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGit extends React.Component<IconBaseProps, any> { }
+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
index d8a659101b..8f3b4c4175 100644
--- a/types/react-icons/fa/github-alt.d.ts
+++ b/types/react-icons/fa/github-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubAlt extends React.Component<IconBaseProps, any> { }
+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
index d4086ae417..8feea6aea6 100644
--- a/types/react-icons/fa/github-square.d.ts
+++ b/types/react-icons/fa/github-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithubSquare extends React.Component<IconBaseProps, any> { }
+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
index e2a9acafea..6e5ff98328 100644
--- a/types/react-icons/fa/github.d.ts
+++ b/types/react-icons/fa/github.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGithub extends React.Component<IconBaseProps, any> { }
+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
index b6b8a9cd2d..1d185afb32 100644
--- a/types/react-icons/fa/gitlab.d.ts
+++ b/types/react-icons/fa/gitlab.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGitlab extends React.Component<IconBaseProps, any> { }
+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
index 13a722bc70..c96eaa0026 100644
--- a/types/react-icons/fa/gittip.d.ts
+++ b/types/react-icons/fa/gittip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGittip extends React.Component<IconBaseProps, any> { }
+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
index fe0744d35d..7f0fa030d9 100644
--- a/types/react-icons/fa/glass.d.ts
+++ b/types/react-icons/fa/glass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlass extends React.Component<IconBaseProps, any> { }
+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
index 0dcedba0ec..c5601a2e6f 100644
--- a/types/react-icons/fa/glide-g.d.ts
+++ b/types/react-icons/fa/glide-g.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlideG extends React.Component<IconBaseProps, any> { }
+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
index 67ffedac87..7a7e2300f7 100644
--- a/types/react-icons/fa/glide.d.ts
+++ b/types/react-icons/fa/glide.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlide extends React.Component<IconBaseProps, any> { }
+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
index 7e9e34ae39..e71a1f6bd9 100644
--- a/types/react-icons/fa/globe.d.ts
+++ b/types/react-icons/fa/globe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGlobe extends React.Component<IconBaseProps, any> { }
+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
index 099691bc4d..9d3428ec25 100644
--- a/types/react-icons/fa/google-plus-square.d.ts
+++ b/types/react-icons/fa/google-plus-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlusSquare extends React.Component<IconBaseProps, any> { }
+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
index b5848530cd..3c1eba715e 100644
--- a/types/react-icons/fa/google-plus.d.ts
+++ b/types/react-icons/fa/google-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGooglePlus extends React.Component<IconBaseProps, any> { }
+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
index 7c81be3c67..8ab0d78a56 100644
--- a/types/react-icons/fa/google-wallet.d.ts
+++ b/types/react-icons/fa/google-wallet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogleWallet extends React.Component<IconBaseProps, any> { }
+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
index d3648a3298..3879f1c233 100644
--- a/types/react-icons/fa/google.d.ts
+++ b/types/react-icons/fa/google.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGoogle extends React.Component<IconBaseProps, any> { }
+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
index 0acab6add7..5c489d1118 100644
--- a/types/react-icons/fa/graduation-cap.d.ts
+++ b/types/react-icons/fa/graduation-cap.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGraduationCap extends React.Component<IconBaseProps, any> { }
+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
index cd1781712f..554bfb5fe6 100644
--- a/types/react-icons/fa/group.d.ts
+++ b/types/react-icons/fa/group.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaGroup extends React.Component<IconBaseProps, any> { }
+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
index 8ef8f82045..0269ea9ebf 100644
--- a/types/react-icons/fa/h-square.d.ts
+++ b/types/react-icons/fa/h-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHSquare extends React.Component<IconBaseProps, any> { }
+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
index 07f1b12da7..70ce441a26 100644
--- a/types/react-icons/fa/hacker-news.d.ts
+++ b/types/react-icons/fa/hacker-news.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHackerNews extends React.Component<IconBaseProps, any> { }
+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
index 0d1f76dac3..44d508b041 100644
--- a/types/react-icons/fa/hand-grab-o.d.ts
+++ b/types/react-icons/fa/hand-grab-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandGrabO extends React.Component<IconBaseProps, any> { }
+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
index 08231c9fa8..633375b976 100644
--- a/types/react-icons/fa/hand-lizard-o.d.ts
+++ b/types/react-icons/fa/hand-lizard-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandLizardO extends React.Component<IconBaseProps, any> { }
+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
index 568ed4d4e3..d2a8580c81 100644
--- a/types/react-icons/fa/hand-o-down.d.ts
+++ b/types/react-icons/fa/hand-o-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandODown extends React.Component<IconBaseProps, any> { }
+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
index 4d2357559f..ffce9da58b 100644
--- a/types/react-icons/fa/hand-o-left.d.ts
+++ b/types/react-icons/fa/hand-o-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOLeft extends React.Component<IconBaseProps, any> { }
+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
index d473b50217..4cc734bfe4 100644
--- a/types/react-icons/fa/hand-o-right.d.ts
+++ b/types/react-icons/fa/hand-o-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandORight extends React.Component<IconBaseProps, any> { }
+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
index 4df6df165b..4c108e1765 100644
--- a/types/react-icons/fa/hand-o-up.d.ts
+++ b/types/react-icons/fa/hand-o-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandOUp extends React.Component<IconBaseProps, any> { }
+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
index 856c7649ba..634685b3ba 100644
--- a/types/react-icons/fa/hand-paper-o.d.ts
+++ b/types/react-icons/fa/hand-paper-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPaperO extends React.Component<IconBaseProps, any> { }
+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
index 40894b2ffc..f5f4c083e0 100644
--- a/types/react-icons/fa/hand-peace-o.d.ts
+++ b/types/react-icons/fa/hand-peace-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPeaceO extends React.Component<IconBaseProps, any> { }
+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
index d2b3603971..98d03e1641 100644
--- a/types/react-icons/fa/hand-pointer-o.d.ts
+++ b/types/react-icons/fa/hand-pointer-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandPointerO extends React.Component<IconBaseProps, any> { }
+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
index 847ea8f9b4..8f95ce7463 100644
--- a/types/react-icons/fa/hand-scissors-o.d.ts
+++ b/types/react-icons/fa/hand-scissors-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandScissorsO extends React.Component<IconBaseProps, any> { }
+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
index 5fc90810a7..e1ae444a79 100644
--- a/types/react-icons/fa/hand-spock-o.d.ts
+++ b/types/react-icons/fa/hand-spock-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHandSpockO extends React.Component<IconBaseProps, any> { }
+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
index 7bc049322a..c7c9be99a9 100644
--- a/types/react-icons/fa/hashtag.d.ts
+++ b/types/react-icons/fa/hashtag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHashtag extends React.Component<IconBaseProps, any> { }
+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
index a3856203ea..1a04908493 100644
--- a/types/react-icons/fa/hdd-o.d.ts
+++ b/types/react-icons/fa/hdd-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHddO extends React.Component<IconBaseProps, any> { }
+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
index a54d46291b..6f2e5d9137 100644
--- a/types/react-icons/fa/header.d.ts
+++ b/types/react-icons/fa/header.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeader extends React.Component<IconBaseProps, any> { }
+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
index 33ddbb19f9..9e6b4dc42a 100644
--- a/types/react-icons/fa/headphones.d.ts
+++ b/types/react-icons/fa/headphones.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeadphones extends React.Component<IconBaseProps, any> { }
+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
index a98cfbd22b..e965f0636c 100644
--- a/types/react-icons/fa/heart-o.d.ts
+++ b/types/react-icons/fa/heart-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartO extends React.Component<IconBaseProps, any> { }
+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
index ee565e2e9f..495c26a5b3 100644
--- a/types/react-icons/fa/heart.d.ts
+++ b/types/react-icons/fa/heart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeart extends React.Component<IconBaseProps, any> { }
+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
index bcdaee175e..74d47f94b1 100644
--- a/types/react-icons/fa/heartbeat.d.ts
+++ b/types/react-icons/fa/heartbeat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHeartbeat extends React.Component<IconBaseProps, any> { }
+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
index 0418cfc5f9..8af7a784c9 100644
--- a/types/react-icons/fa/history.d.ts
+++ b/types/react-icons/fa/history.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHistory extends React.Component<IconBaseProps, any> { }
+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
index 72192298ab..404898ad6c 100644
--- a/types/react-icons/fa/home.d.ts
+++ b/types/react-icons/fa/home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHome extends React.Component<IconBaseProps, any> { }
+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
index e0d78c9501..1016140f7a 100644
--- a/types/react-icons/fa/hospital-o.d.ts
+++ b/types/react-icons/fa/hospital-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHospitalO extends React.Component<IconBaseProps, any> { }
+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
index d9297cbefe..8ec87f4877 100644
--- a/types/react-icons/fa/hourglass-1.d.ts
+++ b/types/react-icons/fa/hourglass-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass1 extends React.Component<IconBaseProps, any> { }
+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
index 9858c4ea06..600933c5e6 100644
--- a/types/react-icons/fa/hourglass-2.d.ts
+++ b/types/react-icons/fa/hourglass-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass2 extends React.Component<IconBaseProps, any> { }
+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
index ad8ea5f7fc..31e8de7b99 100644
--- a/types/react-icons/fa/hourglass-3.d.ts
+++ b/types/react-icons/fa/hourglass-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass3 extends React.Component<IconBaseProps, any> { }
+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
index 44e1782988..5f2962e102 100644
--- a/types/react-icons/fa/hourglass-o.d.ts
+++ b/types/react-icons/fa/hourglass-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglassO extends React.Component<IconBaseProps, any> { }
+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
index 76910594fc..8bdcd7c8db 100644
--- a/types/react-icons/fa/hourglass.d.ts
+++ b/types/react-icons/fa/hourglass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHourglass extends React.Component<IconBaseProps, any> { }
+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
index 5272a3d0b6..ec4c55aecb 100644
--- a/types/react-icons/fa/houzz.d.ts
+++ b/types/react-icons/fa/houzz.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHouzz extends React.Component<IconBaseProps, any> { }
+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
index 40d26cbf5d..3b8bfcacbe 100644
--- a/types/react-icons/fa/html5.d.ts
+++ b/types/react-icons/fa/html5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaHtml5 extends React.Component<IconBaseProps, any> { }
+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
index 99b1c5ae1c..77e0964814 100644
--- a/types/react-icons/fa/i-cursor.d.ts
+++ b/types/react-icons/fa/i-cursor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaICursor extends React.Component<IconBaseProps, any> { }
+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
index a4b5acfa67..966e8bb384 100644
--- a/types/react-icons/fa/ils.d.ts
+++ b/types/react-icons/fa/ils.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIls extends React.Component<IconBaseProps, any> { }
+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
index 3b730a7043..69e435b56a 100644
--- a/types/react-icons/fa/image.d.ts
+++ b/types/react-icons/fa/image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaImage extends React.Component<IconBaseProps, any> { }
+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
index f0c9afe39a..401aba5577 100644
--- a/types/react-icons/fa/inbox.d.ts
+++ b/types/react-icons/fa/inbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInbox extends React.Component<IconBaseProps, any> { }
+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
index 3fdacedc22..c3022d3fc3 100644
--- a/types/react-icons/fa/indent.d.ts
+++ b/types/react-icons/fa/indent.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIndent extends React.Component<IconBaseProps, any> { }
+export default class FaIndent extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/fa/industry.d.ts b/types/react-icons/fa/industry.d.ts
index 89a868e8dc..70d7057743 100644
--- a/types/react-icons/fa/industry.d.ts
+++ b/types/react-icons/fa/industry.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIndustry extends React.Component<IconBaseProps, any> { }
+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
index 6e3f3a80d6..7ed29e6eec 100644
--- a/types/react-icons/fa/info-circle.d.ts
+++ b/types/react-icons/fa/info-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInfoCircle extends React.Component<IconBaseProps, any> { }
+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
index 7515da7747..c67b3190a9 100644
--- a/types/react-icons/fa/info.d.ts
+++ b/types/react-icons/fa/info.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInfo extends React.Component<IconBaseProps, any> { }
+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
index 8693209837..b47cb31531 100644
--- a/types/react-icons/fa/inr.d.ts
+++ b/types/react-icons/fa/inr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInr extends React.Component<IconBaseProps, any> { }
+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
index be40e2f86c..7770e19043 100644
--- a/types/react-icons/fa/instagram.d.ts
+++ b/types/react-icons/fa/instagram.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInstagram extends React.Component<IconBaseProps, any> { }
+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
index 1a617e4501..924654fee2 100644
--- a/types/react-icons/fa/internet-explorer.d.ts
+++ b/types/react-icons/fa/internet-explorer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaInternetExplorer extends React.Component<IconBaseProps, any> { }
+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
index 5c5674e11b..77580bbb2d 100644
--- a/types/react-icons/fa/intersex.d.ts
+++ b/types/react-icons/fa/intersex.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIntersex extends React.Component<IconBaseProps, any> { }
+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
index b7f5882821..b713d2c54a 100644
--- a/types/react-icons/fa/ioxhost.d.ts
+++ b/types/react-icons/fa/ioxhost.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaIoxhost extends React.Component<IconBaseProps, any> { }
+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
index 3f888aa77a..57572f5dbc 100644
--- a/types/react-icons/fa/italic.d.ts
+++ b/types/react-icons/fa/italic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaItalic extends React.Component<IconBaseProps, any> { }
+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
index fe70056b51..cdf3539275 100644
--- a/types/react-icons/fa/joomla.d.ts
+++ b/types/react-icons/fa/joomla.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaJoomla extends React.Component<IconBaseProps, any> { }
+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
index 282d68df31..e17414bd20 100644
--- a/types/react-icons/fa/jsfiddle.d.ts
+++ b/types/react-icons/fa/jsfiddle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaJsfiddle extends React.Component<IconBaseProps, any> { }
+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
index 6ce95c2786..b1fc11d702 100644
--- a/types/react-icons/fa/key.d.ts
+++ b/types/react-icons/fa/key.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKey extends React.Component<IconBaseProps, any> { }
+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
index ed2c38a0be..d8676809fd 100644
--- a/types/react-icons/fa/keyboard-o.d.ts
+++ b/types/react-icons/fa/keyboard-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKeyboardO extends React.Component<IconBaseProps, any> { }
+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
index 1ad697e9e9..a23710bcfd 100644
--- a/types/react-icons/fa/krw.d.ts
+++ b/types/react-icons/fa/krw.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaKrw extends React.Component<IconBaseProps, any> { }
+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
index a8a96b23d6..a04950506c 100644
--- a/types/react-icons/fa/language.d.ts
+++ b/types/react-icons/fa/language.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLanguage extends React.Component<IconBaseProps, any> { }
+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
index d1dff3ac1b..d13d583fb7 100644
--- a/types/react-icons/fa/laptop.d.ts
+++ b/types/react-icons/fa/laptop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLaptop extends React.Component<IconBaseProps, any> { }
+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
index 110542010d..057f801895 100644
--- a/types/react-icons/fa/lastfm-square.d.ts
+++ b/types/react-icons/fa/lastfm-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfmSquare extends React.Component<IconBaseProps, any> { }
+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
index 2a72f53fee..c8124c95ce 100644
--- a/types/react-icons/fa/lastfm.d.ts
+++ b/types/react-icons/fa/lastfm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLastfm extends React.Component<IconBaseProps, any> { }
+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
index c8f9758b90..9c4514a54f 100644
--- a/types/react-icons/fa/leaf.d.ts
+++ b/types/react-icons/fa/leaf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLeaf extends React.Component<IconBaseProps, any> { }
+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
index fccde86ac6..de2024c7a8 100644
--- a/types/react-icons/fa/leanpub.d.ts
+++ b/types/react-icons/fa/leanpub.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLeanpub extends React.Component<IconBaseProps, any> { }
+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
index 9b76cc24bb..74886cb79c 100644
--- a/types/react-icons/fa/lemon-o.d.ts
+++ b/types/react-icons/fa/lemon-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLemonO extends React.Component<IconBaseProps, any> { }
+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
index 903600d3c6..caba9cef44 100644
--- a/types/react-icons/fa/level-down.d.ts
+++ b/types/react-icons/fa/level-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelDown extends React.Component<IconBaseProps, any> { }
+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
index 1699cb8cd9..977a2d2c97 100644
--- a/types/react-icons/fa/level-up.d.ts
+++ b/types/react-icons/fa/level-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLevelUp extends React.Component<IconBaseProps, any> { }
+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
index 1519fca77b..85205b3e62 100644
--- a/types/react-icons/fa/life-bouy.d.ts
+++ b/types/react-icons/fa/life-bouy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLifeBouy extends React.Component<IconBaseProps, any> { }
+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
index 8d03ddb689..48646e6261 100644
--- a/types/react-icons/fa/lightbulb-o.d.ts
+++ b/types/react-icons/fa/lightbulb-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLightbulbO extends React.Component<IconBaseProps, any> { }
+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
index 14e70eb927..f0109467e2 100644
--- a/types/react-icons/fa/line-chart.d.ts
+++ b/types/react-icons/fa/line-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLineChart extends React.Component<IconBaseProps, any> { }
+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
index df31e213bd..2c538f5349 100644
--- a/types/react-icons/fa/linkedin-square.d.ts
+++ b/types/react-icons/fa/linkedin-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedinSquare extends React.Component<IconBaseProps, any> { }
+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
index 2300c9ec4d..7e011b8f8f 100644
--- a/types/react-icons/fa/linkedin.d.ts
+++ b/types/react-icons/fa/linkedin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinkedin extends React.Component<IconBaseProps, any> { }
+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
index 4406a9e20e..55eb44cddb 100644
--- a/types/react-icons/fa/linux.d.ts
+++ b/types/react-icons/fa/linux.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLinux extends React.Component<IconBaseProps, any> { }
+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
index eff28fd455..4987907f75 100644
--- a/types/react-icons/fa/list-alt.d.ts
+++ b/types/react-icons/fa/list-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListAlt extends React.Component<IconBaseProps, any> { }
+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
index 1312c8f293..25c4509dd8 100644
--- a/types/react-icons/fa/list-ol.d.ts
+++ b/types/react-icons/fa/list-ol.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListOl extends React.Component<IconBaseProps, any> { }
+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
index a15eada6aa..be0d49470c 100644
--- a/types/react-icons/fa/list-ul.d.ts
+++ b/types/react-icons/fa/list-ul.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaListUl extends React.Component<IconBaseProps, any> { }
+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
index 6eb286d833..9b98e5d332 100644
--- a/types/react-icons/fa/list.d.ts
+++ b/types/react-icons/fa/list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaList extends React.Component<IconBaseProps, any> { }
+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
index 993281b15b..67e69c5917 100644
--- a/types/react-icons/fa/location-arrow.d.ts
+++ b/types/react-icons/fa/location-arrow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLocationArrow extends React.Component<IconBaseProps, any> { }
+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
index 73ca91cfd7..751ba49fd6 100644
--- a/types/react-icons/fa/lock.d.ts
+++ b/types/react-icons/fa/lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLock extends React.Component<IconBaseProps, any> { }
+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
index af77f06a0a..81282ef698 100644
--- a/types/react-icons/fa/long-arrow-down.d.ts
+++ b/types/react-icons/fa/long-arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowDown extends React.Component<IconBaseProps, any> { }
+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
index ce350f40d7..673d2e6a36 100644
--- a/types/react-icons/fa/long-arrow-left.d.ts
+++ b/types/react-icons/fa/long-arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index e24070b8b3..1fafea7de3 100644
--- a/types/react-icons/fa/long-arrow-right.d.ts
+++ b/types/react-icons/fa/long-arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowRight extends React.Component<IconBaseProps, any> { }
+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
index af34950221..6982118eef 100644
--- a/types/react-icons/fa/long-arrow-up.d.ts
+++ b/types/react-icons/fa/long-arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLongArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 7d3cf3bc61..60f19827fa 100644
--- a/types/react-icons/fa/low-vision.d.ts
+++ b/types/react-icons/fa/low-vision.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaLowVision extends React.Component<IconBaseProps, any> { }
+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
index ca7e61801d..7dca91beb2 100644
--- a/types/react-icons/fa/magic.d.ts
+++ b/types/react-icons/fa/magic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMagic extends React.Component<IconBaseProps, any> { }
+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
index 6026595ba8..11cc56ef42 100644
--- a/types/react-icons/fa/magnet.d.ts
+++ b/types/react-icons/fa/magnet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMagnet extends React.Component<IconBaseProps, any> { }
+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
index e13dead03d..84585713b8 100644
--- a/types/react-icons/fa/mail-forward.d.ts
+++ b/types/react-icons/fa/mail-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailForward extends React.Component<IconBaseProps, any> { }
+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
index 72761d7043..7c8c4ed7eb 100644
--- a/types/react-icons/fa/mail-reply-all.d.ts
+++ b/types/react-icons/fa/mail-reply-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReplyAll extends React.Component<IconBaseProps, any> { }
+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
index 0ea292c4ac..571aa76b4f 100644
--- a/types/react-icons/fa/mail-reply.d.ts
+++ b/types/react-icons/fa/mail-reply.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMailReply extends React.Component<IconBaseProps, any> { }
+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
index 9ba294592a..9bb9f216af 100644
--- a/types/react-icons/fa/male.d.ts
+++ b/types/react-icons/fa/male.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMale extends React.Component<IconBaseProps, any> { }
+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
index 228259b080..116680b4b7 100644
--- a/types/react-icons/fa/map-marker.d.ts
+++ b/types/react-icons/fa/map-marker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapMarker extends React.Component<IconBaseProps, any> { }
+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
index 8584026831..366c05d45b 100644
--- a/types/react-icons/fa/map-o.d.ts
+++ b/types/react-icons/fa/map-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapO extends React.Component<IconBaseProps, any> { }
+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
index b1ca8b2286..e46a8ca0e3 100644
--- a/types/react-icons/fa/map-pin.d.ts
+++ b/types/react-icons/fa/map-pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapPin extends React.Component<IconBaseProps, any> { }
+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
index a395792d26..4c4a9c2f69 100644
--- a/types/react-icons/fa/map-signs.d.ts
+++ b/types/react-icons/fa/map-signs.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMapSigns extends React.Component<IconBaseProps, any> { }
+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
index 75883765c0..52c55baf7f 100644
--- a/types/react-icons/fa/map.d.ts
+++ b/types/react-icons/fa/map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMap extends React.Component<IconBaseProps, any> { }
+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
index 682cc9bd0d..c6f7f4aa5d 100644
--- a/types/react-icons/fa/mars-double.d.ts
+++ b/types/react-icons/fa/mars-double.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsDouble extends React.Component<IconBaseProps, any> { }
+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
index e6c850fc15..e6d9f035d0 100644
--- a/types/react-icons/fa/mars-stroke-h.d.ts
+++ b/types/react-icons/fa/mars-stroke-h.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeH extends React.Component<IconBaseProps, any> { }
+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
index d44297c604..cc1a01a592 100644
--- a/types/react-icons/fa/mars-stroke-v.d.ts
+++ b/types/react-icons/fa/mars-stroke-v.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStrokeV extends React.Component<IconBaseProps, any> { }
+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
index 8b260998ef..69e9aec8b5 100644
--- a/types/react-icons/fa/mars-stroke.d.ts
+++ b/types/react-icons/fa/mars-stroke.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMarsStroke extends React.Component<IconBaseProps, any> { }
+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
index a89aaba440..7e21f481b4 100644
--- a/types/react-icons/fa/mars.d.ts
+++ b/types/react-icons/fa/mars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMars extends React.Component<IconBaseProps, any> { }
+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
index 6ae26c64e3..ee9c0b0546 100644
--- a/types/react-icons/fa/maxcdn.d.ts
+++ b/types/react-icons/fa/maxcdn.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMaxcdn extends React.Component<IconBaseProps, any> { }
+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
index 93b6e81b93..f479c77a85 100644
--- a/types/react-icons/fa/meanpath.d.ts
+++ b/types/react-icons/fa/meanpath.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMeanpath extends React.Component<IconBaseProps, any> { }
+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
index 7dcece2f22..a272177d20 100644
--- a/types/react-icons/fa/medium.d.ts
+++ b/types/react-icons/fa/medium.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMedium extends React.Component<IconBaseProps, any> { }
+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
index dc3d6fa29e..4de9fc61f9 100644
--- a/types/react-icons/fa/medkit.d.ts
+++ b/types/react-icons/fa/medkit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMedkit extends React.Component<IconBaseProps, any> { }
+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
index 374c58e216..2a07cde429 100644
--- a/types/react-icons/fa/meh-o.d.ts
+++ b/types/react-icons/fa/meh-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMehO extends React.Component<IconBaseProps, any> { }
+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
index 5254f84b52..616714b2fb 100644
--- a/types/react-icons/fa/mercury.d.ts
+++ b/types/react-icons/fa/mercury.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMercury extends React.Component<IconBaseProps, any> { }
+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
index b87c525bad..39ddcefe4b 100644
--- a/types/react-icons/fa/microphone-slash.d.ts
+++ b/types/react-icons/fa/microphone-slash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophoneSlash extends React.Component<IconBaseProps, any> { }
+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
index 6591ae9de4..b12fcd389c 100644
--- a/types/react-icons/fa/microphone.d.ts
+++ b/types/react-icons/fa/microphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMicrophone extends React.Component<IconBaseProps, any> { }
+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
index 09034721a5..839cee0dbe 100644
--- a/types/react-icons/fa/minus-circle.d.ts
+++ b/types/react-icons/fa/minus-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusCircle extends React.Component<IconBaseProps, any> { }
+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
index b7772023b4..d2bfd3dbba 100644
--- a/types/react-icons/fa/minus-square-o.d.ts
+++ b/types/react-icons/fa/minus-square-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquareO extends React.Component<IconBaseProps, any> { }
+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
index 9095105655..8946d33f30 100644
--- a/types/react-icons/fa/minus-square.d.ts
+++ b/types/react-icons/fa/minus-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinusSquare extends React.Component<IconBaseProps, any> { }
+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
index 59fa397fdb..e7ae38ca8e 100644
--- a/types/react-icons/fa/minus.d.ts
+++ b/types/react-icons/fa/minus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMinus extends React.Component<IconBaseProps, any> { }
+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
index 5a85810877..51b4f23bf2 100644
--- a/types/react-icons/fa/mixcloud.d.ts
+++ b/types/react-icons/fa/mixcloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMixcloud extends React.Component<IconBaseProps, any> { }
+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
index f713727f6b..e15d976418 100644
--- a/types/react-icons/fa/mobile.d.ts
+++ b/types/react-icons/fa/mobile.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMobile extends React.Component<IconBaseProps, any> { }
+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
index 95faba0e78..c08b2d39fa 100644
--- a/types/react-icons/fa/modx.d.ts
+++ b/types/react-icons/fa/modx.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaModx extends React.Component<IconBaseProps, any> { }
+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
index a0312dab6b..4e14ce5956 100644
--- a/types/react-icons/fa/money.d.ts
+++ b/types/react-icons/fa/money.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMoney extends React.Component<IconBaseProps, any> { }
+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
index 36b1b27173..c1c2371ed0 100644
--- a/types/react-icons/fa/moon-o.d.ts
+++ b/types/react-icons/fa/moon-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMoonO extends React.Component<IconBaseProps, any> { }
+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
index e47a896d8a..2fd0d87361 100644
--- a/types/react-icons/fa/motorcycle.d.ts
+++ b/types/react-icons/fa/motorcycle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMotorcycle extends React.Component<IconBaseProps, any> { }
+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
index b7e12d5244..8c220aa32b 100644
--- a/types/react-icons/fa/mouse-pointer.d.ts
+++ b/types/react-icons/fa/mouse-pointer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMousePointer extends React.Component<IconBaseProps, any> { }
+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
index 7288438630..711455b587 100644
--- a/types/react-icons/fa/music.d.ts
+++ b/types/react-icons/fa/music.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaMusic extends React.Component<IconBaseProps, any> { }
+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
index 1cbc2bb183..a5ce0a9c93 100644
--- a/types/react-icons/fa/neuter.d.ts
+++ b/types/react-icons/fa/neuter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaNeuter extends React.Component<IconBaseProps, any> { }
+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
index 8322dcf5f1..6f7f62737e 100644
--- a/types/react-icons/fa/newspaper-o.d.ts
+++ b/types/react-icons/fa/newspaper-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaNewspaperO extends React.Component<IconBaseProps, any> { }
+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
index edd616e20a..5454030a44 100644
--- a/types/react-icons/fa/object-group.d.ts
+++ b/types/react-icons/fa/object-group.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectGroup extends React.Component<IconBaseProps, any> { }
+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
index 8cb9fa55d5..705abb0623 100644
--- a/types/react-icons/fa/object-ungroup.d.ts
+++ b/types/react-icons/fa/object-ungroup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaObjectUngroup extends React.Component<IconBaseProps, any> { }
+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
index e0925c7e56..d6d1c3fb5e 100644
--- a/types/react-icons/fa/odnoklassniki-square.d.ts
+++ b/types/react-icons/fa/odnoklassniki-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassnikiSquare extends React.Component<IconBaseProps, any> { }
+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
index 7737465353..c9cdfc3f99 100644
--- a/types/react-icons/fa/odnoklassniki.d.ts
+++ b/types/react-icons/fa/odnoklassniki.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOdnoklassniki extends React.Component<IconBaseProps, any> { }
+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
index e5323a4c4c..dde7963cd7 100644
--- a/types/react-icons/fa/opencart.d.ts
+++ b/types/react-icons/fa/opencart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpencart extends React.Component<IconBaseProps, any> { }
+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
index 798fd4df32..763d13e24d 100644
--- a/types/react-icons/fa/openid.d.ts
+++ b/types/react-icons/fa/openid.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpenid extends React.Component<IconBaseProps, any> { }
+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
index 10e6484662..c66bee6dca 100644
--- a/types/react-icons/fa/opera.d.ts
+++ b/types/react-icons/fa/opera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOpera extends React.Component<IconBaseProps, any> { }
+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
index 2297e6664a..3a4973ca67 100644
--- a/types/react-icons/fa/optin-monster.d.ts
+++ b/types/react-icons/fa/optin-monster.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaOptinMonster extends React.Component<IconBaseProps, any> { }
+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
index 778e4699e7..b9db5fd4ab 100644
--- a/types/react-icons/fa/pagelines.d.ts
+++ b/types/react-icons/fa/pagelines.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPagelines extends React.Component<IconBaseProps, any> { }
+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
index a4945c6d6a..4d56d06006 100644
--- a/types/react-icons/fa/paint-brush.d.ts
+++ b/types/react-icons/fa/paint-brush.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaintBrush extends React.Component<IconBaseProps, any> { }
+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
index 83e9eb2f8b..5fa53c13f7 100644
--- a/types/react-icons/fa/paper-plane-o.d.ts
+++ b/types/react-icons/fa/paper-plane-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlaneO extends React.Component<IconBaseProps, any> { }
+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
index d5e7f8a6cd..18d0a9fada 100644
--- a/types/react-icons/fa/paper-plane.d.ts
+++ b/types/react-icons/fa/paper-plane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperPlane extends React.Component<IconBaseProps, any> { }
+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
index 61a3f002ae..e037d9d2a9 100644
--- a/types/react-icons/fa/paperclip.d.ts
+++ b/types/react-icons/fa/paperclip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaperclip extends React.Component<IconBaseProps, any> { }
+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
index 3fa3651ca1..2895b28ecb 100644
--- a/types/react-icons/fa/paragraph.d.ts
+++ b/types/react-icons/fa/paragraph.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaParagraph extends React.Component<IconBaseProps, any> { }
+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
index d52c134e20..4b02099cf7 100644
--- a/types/react-icons/fa/pause-circle-o.d.ts
+++ b/types/react-icons/fa/pause-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircleO extends React.Component<IconBaseProps, any> { }
+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
index 20c4d1d074..96fcbf12d2 100644
--- a/types/react-icons/fa/pause-circle.d.ts
+++ b/types/react-icons/fa/pause-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPauseCircle extends React.Component<IconBaseProps, any> { }
+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
index 4200bb0848..87af546f21 100644
--- a/types/react-icons/fa/pause.d.ts
+++ b/types/react-icons/fa/pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPause extends React.Component<IconBaseProps, any> { }
+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
index 41a7a69f35..6f88ab466f 100644
--- a/types/react-icons/fa/paw.d.ts
+++ b/types/react-icons/fa/paw.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaw extends React.Component<IconBaseProps, any> { }
+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
index e23b5da684..d2878fe144 100644
--- a/types/react-icons/fa/paypal.d.ts
+++ b/types/react-icons/fa/paypal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPaypal extends React.Component<IconBaseProps, any> { }
+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
index 32ba205b4c..ae8d368315 100644
--- a/types/react-icons/fa/pencil-square.d.ts
+++ b/types/react-icons/fa/pencil-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPencilSquare extends React.Component<IconBaseProps, any> { }
+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
index 0156c40095..bae947d1d9 100644
--- a/types/react-icons/fa/pencil.d.ts
+++ b/types/react-icons/fa/pencil.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPencil extends React.Component<IconBaseProps, any> { }
+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
index 9ca5330183..447838a4d4 100644
--- a/types/react-icons/fa/percent.d.ts
+++ b/types/react-icons/fa/percent.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPercent extends React.Component<IconBaseProps, any> { }
+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
index e9330edd91..8595e9338b 100644
--- a/types/react-icons/fa/phone-square.d.ts
+++ b/types/react-icons/fa/phone-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPhoneSquare extends React.Component<IconBaseProps, any> { }
+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
index 91bf6e4614..985d9a8867 100644
--- a/types/react-icons/fa/phone.d.ts
+++ b/types/react-icons/fa/phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPhone extends React.Component<IconBaseProps, any> { }
+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
index 3c578c1ff0..b5bd5b2c5c 100644
--- a/types/react-icons/fa/pie-chart.d.ts
+++ b/types/react-icons/fa/pie-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPieChart extends React.Component<IconBaseProps, any> { }
+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
index 1dbf6002dd..8a23255cad 100644
--- a/types/react-icons/fa/pied-piper-alt.d.ts
+++ b/types/react-icons/fa/pied-piper-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiperAlt extends React.Component<IconBaseProps, any> { }
+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
index e96c02a0cb..e925634cd2 100644
--- a/types/react-icons/fa/pied-piper.d.ts
+++ b/types/react-icons/fa/pied-piper.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPiedPiper extends React.Component<IconBaseProps, any> { }
+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
index 522aa512e9..c53adc8749 100644
--- a/types/react-icons/fa/pinterest-p.d.ts
+++ b/types/react-icons/fa/pinterest-p.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestP extends React.Component<IconBaseProps, any> { }
+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
index 69699e4516..a90c930b91 100644
--- a/types/react-icons/fa/pinterest-square.d.ts
+++ b/types/react-icons/fa/pinterest-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterestSquare extends React.Component<IconBaseProps, any> { }
+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
index dbd90f97c6..c380cf2092 100644
--- a/types/react-icons/fa/pinterest.d.ts
+++ b/types/react-icons/fa/pinterest.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPinterest extends React.Component<IconBaseProps, any> { }
+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
index 5475230590..13373d06d7 100644
--- a/types/react-icons/fa/plane.d.ts
+++ b/types/react-icons/fa/plane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlane extends React.Component<IconBaseProps, any> { }
+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
index dff542aeac..7fa9627c4c 100644
--- a/types/react-icons/fa/play-circle-o.d.ts
+++ b/types/react-icons/fa/play-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircleO extends React.Component<IconBaseProps, any> { }
+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
index 913fa796b1..ea4f568b34 100644
--- a/types/react-icons/fa/play-circle.d.ts
+++ b/types/react-icons/fa/play-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlayCircle extends React.Component<IconBaseProps, any> { }
+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
index c63b874824..f6c6dafb12 100644
--- a/types/react-icons/fa/play.d.ts
+++ b/types/react-icons/fa/play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlay extends React.Component<IconBaseProps, any> { }
+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
index 8b5674fe7b..e88fc8c2ae 100644
--- a/types/react-icons/fa/plug.d.ts
+++ b/types/react-icons/fa/plug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlug extends React.Component<IconBaseProps, any> { }
+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
index cf51de1282..9bf8af4e8d 100644
--- a/types/react-icons/fa/plus-circle.d.ts
+++ b/types/react-icons/fa/plus-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusCircle extends React.Component<IconBaseProps, any> { }
+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
index 586b18b0a4..e9b582ec2d 100644
--- a/types/react-icons/fa/plus-square-o.d.ts
+++ b/types/react-icons/fa/plus-square-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquareO extends React.Component<IconBaseProps, any> { }
+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
index 78ce9aa57a..b69d337311 100644
--- a/types/react-icons/fa/plus-square.d.ts
+++ b/types/react-icons/fa/plus-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlusSquare extends React.Component<IconBaseProps, any> { }
+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
index 3d735d4a02..f6649123fb 100644
--- a/types/react-icons/fa/plus.d.ts
+++ b/types/react-icons/fa/plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPlus extends React.Component<IconBaseProps, any> { }
+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
index 6a38de1461..538e8c9886 100644
--- a/types/react-icons/fa/power-off.d.ts
+++ b/types/react-icons/fa/power-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPowerOff extends React.Component<IconBaseProps, any> { }
+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
index d83fe503fb..5e49c43315 100644
--- a/types/react-icons/fa/print.d.ts
+++ b/types/react-icons/fa/print.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPrint extends React.Component<IconBaseProps, any> { }
+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
index 917d260999..2d790f199c 100644
--- a/types/react-icons/fa/product-hunt.d.ts
+++ b/types/react-icons/fa/product-hunt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaProductHunt extends React.Component<IconBaseProps, any> { }
+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
index 6c23a1fb44..f25059cc09 100644
--- a/types/react-icons/fa/puzzle-piece.d.ts
+++ b/types/react-icons/fa/puzzle-piece.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaPuzzlePiece extends React.Component<IconBaseProps, any> { }
+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
index 0357e8d97c..ff62c8cf78 100644
--- a/types/react-icons/fa/qq.d.ts
+++ b/types/react-icons/fa/qq.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQq extends React.Component<IconBaseProps, any> { }
+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
index fb579f1642..23c52561db 100644
--- a/types/react-icons/fa/qrcode.d.ts
+++ b/types/react-icons/fa/qrcode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQrcode extends React.Component<IconBaseProps, any> { }
+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
index 325c4b907e..e3176c764b 100644
--- a/types/react-icons/fa/question-circle-o.d.ts
+++ b/types/react-icons/fa/question-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircleO extends React.Component<IconBaseProps, any> { }
+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
index 7d61f2941e..a3474eab77 100644
--- a/types/react-icons/fa/question-circle.d.ts
+++ b/types/react-icons/fa/question-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestionCircle extends React.Component<IconBaseProps, any> { }
+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
index 179a64a947..c825b26b4f 100644
--- a/types/react-icons/fa/question.d.ts
+++ b/types/react-icons/fa/question.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuestion extends React.Component<IconBaseProps, any> { }
+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
index 6f10066254..904a81703f 100644
--- a/types/react-icons/fa/quote-left.d.ts
+++ b/types/react-icons/fa/quote-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteLeft extends React.Component<IconBaseProps, any> { }
+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
index 24634a73ea..3a4e38743d 100644
--- a/types/react-icons/fa/quote-right.d.ts
+++ b/types/react-icons/fa/quote-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaQuoteRight extends React.Component<IconBaseProps, any> { }
+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
index b2b99227d5..da2bd43b87 100644
--- a/types/react-icons/fa/ra.d.ts
+++ b/types/react-icons/fa/ra.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRa extends React.Component<IconBaseProps, any> { }
+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
index 8e5a295fc8..02c7c7465e 100644
--- a/types/react-icons/fa/random.d.ts
+++ b/types/react-icons/fa/random.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRandom extends React.Component<IconBaseProps, any> { }
+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
index e387bc87fb..3f2c35bb45 100644
--- a/types/react-icons/fa/recycle.d.ts
+++ b/types/react-icons/fa/recycle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRecycle extends React.Component<IconBaseProps, any> { }
+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
index 3772904952..0c6152a524 100644
--- a/types/react-icons/fa/reddit-alien.d.ts
+++ b/types/react-icons/fa/reddit-alien.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditAlien extends React.Component<IconBaseProps, any> { }
+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
index 8a8926f037..2fe217fd2f 100644
--- a/types/react-icons/fa/reddit-square.d.ts
+++ b/types/react-icons/fa/reddit-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRedditSquare extends React.Component<IconBaseProps, any> { }
+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
index fb5b29d2a3..485e46b5b0 100644
--- a/types/react-icons/fa/reddit.d.ts
+++ b/types/react-icons/fa/reddit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaReddit extends React.Component<IconBaseProps, any> { }
+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
index 4637379e58..ebf74b1515 100644
--- a/types/react-icons/fa/refresh.d.ts
+++ b/types/react-icons/fa/refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRefresh extends React.Component<IconBaseProps, any> { }
+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
index fbe0f9c806..801dc66200 100644
--- a/types/react-icons/fa/registered.d.ts
+++ b/types/react-icons/fa/registered.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRegistered extends React.Component<IconBaseProps, any> { }
+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
index 5ab0857bda..25055289d9 100644
--- a/types/react-icons/fa/renren.d.ts
+++ b/types/react-icons/fa/renren.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRenren extends React.Component<IconBaseProps, any> { }
+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
index 34e7afa145..c3f51ad288 100644
--- a/types/react-icons/fa/repeat.d.ts
+++ b/types/react-icons/fa/repeat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRepeat extends React.Component<IconBaseProps, any> { }
+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
index de4f5c58e3..f18d4bda7b 100644
--- a/types/react-icons/fa/retweet.d.ts
+++ b/types/react-icons/fa/retweet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRetweet extends React.Component<IconBaseProps, any> { }
+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
index b7ccf4526b..0715ec2e7e 100644
--- a/types/react-icons/fa/road.d.ts
+++ b/types/react-icons/fa/road.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRoad extends React.Component<IconBaseProps, any> { }
+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
index 8c58a94b38..2f1c2dc834 100644
--- a/types/react-icons/fa/rocket.d.ts
+++ b/types/react-icons/fa/rocket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRocket extends React.Component<IconBaseProps, any> { }
+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
index 5a4a77bc85..2a93784c4e 100644
--- a/types/react-icons/fa/rotate-left.d.ts
+++ b/types/react-icons/fa/rotate-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRotateLeft extends React.Component<IconBaseProps, any> { }
+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
index a03f6e984b..9e61df412e 100644
--- a/types/react-icons/fa/rouble.d.ts
+++ b/types/react-icons/fa/rouble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRouble extends React.Component<IconBaseProps, any> { }
+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
index c69ee424f4..c840ec5513 100644
--- a/types/react-icons/fa/rss-square.d.ts
+++ b/types/react-icons/fa/rss-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaRssSquare extends React.Component<IconBaseProps, any> { }
+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
index 7579ae4e27..6bb95a70f0 100644
--- a/types/react-icons/fa/safari.d.ts
+++ b/types/react-icons/fa/safari.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSafari extends React.Component<IconBaseProps, any> { }
+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
index 577d478e17..39fc8c40a6 100644
--- a/types/react-icons/fa/scribd.d.ts
+++ b/types/react-icons/fa/scribd.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaScribd extends React.Component<IconBaseProps, any> { }
+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
index 79c667273f..b0045c94f4 100644
--- a/types/react-icons/fa/search-minus.d.ts
+++ b/types/react-icons/fa/search-minus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchMinus extends React.Component<IconBaseProps, any> { }
+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
index 6063d473ca..3aaacffaea 100644
--- a/types/react-icons/fa/search-plus.d.ts
+++ b/types/react-icons/fa/search-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearchPlus extends React.Component<IconBaseProps, any> { }
+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
index ed04cf2fb2..14c1b8eb87 100644
--- a/types/react-icons/fa/search.d.ts
+++ b/types/react-icons/fa/search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSearch extends React.Component<IconBaseProps, any> { }
+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
index a9ae5ef731..9eb86d3b41 100644
--- a/types/react-icons/fa/sellsy.d.ts
+++ b/types/react-icons/fa/sellsy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSellsy extends React.Component<IconBaseProps, any> { }
+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
index c2e853673f..f34b2bef92 100644
--- a/types/react-icons/fa/server.d.ts
+++ b/types/react-icons/fa/server.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaServer extends React.Component<IconBaseProps, any> { }
+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
index 1914a8bf53..31dc918f6c 100644
--- a/types/react-icons/fa/share-alt-square.d.ts
+++ b/types/react-icons/fa/share-alt-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAltSquare extends React.Component<IconBaseProps, any> { }
+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
index bc72b4bd1c..e95e1b249e 100644
--- a/types/react-icons/fa/share-alt.d.ts
+++ b/types/react-icons/fa/share-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareAlt extends React.Component<IconBaseProps, any> { }
+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
index 7ee6526be7..fbe2893547 100644
--- a/types/react-icons/fa/share-square-o.d.ts
+++ b/types/react-icons/fa/share-square-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquareO extends React.Component<IconBaseProps, any> { }
+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
index 4a50973f48..553b8b7d88 100644
--- a/types/react-icons/fa/share-square.d.ts
+++ b/types/react-icons/fa/share-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShareSquare extends React.Component<IconBaseProps, any> { }
+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
index 9f11e81102..0358946bb0 100644
--- a/types/react-icons/fa/shield.d.ts
+++ b/types/react-icons/fa/shield.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShield extends React.Component<IconBaseProps, any> { }
+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
index d5ee1f9920..bbac7fa963 100644
--- a/types/react-icons/fa/ship.d.ts
+++ b/types/react-icons/fa/ship.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShip extends React.Component<IconBaseProps, any> { }
+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
index d0cb22b3dc..1cdac4b3b2 100644
--- a/types/react-icons/fa/shirtsinbulk.d.ts
+++ b/types/react-icons/fa/shirtsinbulk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShirtsinbulk extends React.Component<IconBaseProps, any> { }
+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
index 2de2dd219c..0e9ec2fd0d 100644
--- a/types/react-icons/fa/shopping-bag.d.ts
+++ b/types/react-icons/fa/shopping-bag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBag extends React.Component<IconBaseProps, any> { }
+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
index e15f3ceeae..05b7d1417d 100644
--- a/types/react-icons/fa/shopping-basket.d.ts
+++ b/types/react-icons/fa/shopping-basket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingBasket extends React.Component<IconBaseProps, any> { }
+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
index 6f9fdf2329..17d623f44d 100644
--- a/types/react-icons/fa/shopping-cart.d.ts
+++ b/types/react-icons/fa/shopping-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaShoppingCart extends React.Component<IconBaseProps, any> { }
+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
index d46da47d03..6122e57cab 100644
--- a/types/react-icons/fa/sign-in.d.ts
+++ b/types/react-icons/fa/sign-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignIn extends React.Component<IconBaseProps, any> { }
+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
index e9dc9376cd..92f5afb348 100644
--- a/types/react-icons/fa/sign-language.d.ts
+++ b/types/react-icons/fa/sign-language.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignLanguage extends React.Component<IconBaseProps, any> { }
+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
index 06f6010ff3..0432e2a806 100644
--- a/types/react-icons/fa/sign-out.d.ts
+++ b/types/react-icons/fa/sign-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignOut extends React.Component<IconBaseProps, any> { }
+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
index 043ff3341a..ff8c9215db 100644
--- a/types/react-icons/fa/signal.d.ts
+++ b/types/react-icons/fa/signal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSignal extends React.Component<IconBaseProps, any> { }
+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
index 631d2e7d04..2f6a53cab7 100644
--- a/types/react-icons/fa/simplybuilt.d.ts
+++ b/types/react-icons/fa/simplybuilt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSimplybuilt extends React.Component<IconBaseProps, any> { }
+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
index 01e21f050f..e6a3891028 100644
--- a/types/react-icons/fa/sitemap.d.ts
+++ b/types/react-icons/fa/sitemap.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSitemap extends React.Component<IconBaseProps, any> { }
+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
index 0d49d6d153..58a376bec4 100644
--- a/types/react-icons/fa/skyatlas.d.ts
+++ b/types/react-icons/fa/skyatlas.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSkyatlas extends React.Component<IconBaseProps, any> { }
+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
index f7aa81fa23..3e4b8465ce 100644
--- a/types/react-icons/fa/skype.d.ts
+++ b/types/react-icons/fa/skype.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSkype extends React.Component<IconBaseProps, any> { }
+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
index 5498c9fd05..05ae812154 100644
--- a/types/react-icons/fa/slack.d.ts
+++ b/types/react-icons/fa/slack.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSlack extends React.Component<IconBaseProps, any> { }
+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
index 62ab9b3c9b..5b77a2c246 100644
--- a/types/react-icons/fa/sliders.d.ts
+++ b/types/react-icons/fa/sliders.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSliders extends React.Component<IconBaseProps, any> { }
+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
index c066db9835..678418e560 100644
--- a/types/react-icons/fa/slideshare.d.ts
+++ b/types/react-icons/fa/slideshare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSlideshare extends React.Component<IconBaseProps, any> { }
+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
index b424417f84..8db866e669 100644
--- a/types/react-icons/fa/smile-o.d.ts
+++ b/types/react-icons/fa/smile-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSmileO extends React.Component<IconBaseProps, any> { }
+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
index 79761b8b23..83ca65e891 100644
--- a/types/react-icons/fa/snapchat-ghost.d.ts
+++ b/types/react-icons/fa/snapchat-ghost.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatGhost extends React.Component<IconBaseProps, any> { }
+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
index d8e99721d9..7c1ac2dbc4 100644
--- a/types/react-icons/fa/snapchat-square.d.ts
+++ b/types/react-icons/fa/snapchat-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchatSquare extends React.Component<IconBaseProps, any> { }
+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
index 1c66f719c6..bbc8bb62e3 100644
--- a/types/react-icons/fa/snapchat.d.ts
+++ b/types/react-icons/fa/snapchat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSnapchat extends React.Component<IconBaseProps, any> { }
+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
index 83932509d0..6b44132473 100644
--- a/types/react-icons/fa/sort-alpha-asc.d.ts
+++ b/types/react-icons/fa/sort-alpha-asc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaAsc extends React.Component<IconBaseProps, any> { }
+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
index 879797e4d4..2830f1986e 100644
--- a/types/react-icons/fa/sort-alpha-desc.d.ts
+++ b/types/react-icons/fa/sort-alpha-desc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAlphaDesc extends React.Component<IconBaseProps, any> { }
+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
index d041baf371..05da03032c 100644
--- a/types/react-icons/fa/sort-amount-asc.d.ts
+++ b/types/react-icons/fa/sort-amount-asc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountAsc extends React.Component<IconBaseProps, any> { }
+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
index 1dac754fe9..c7e7242565 100644
--- a/types/react-icons/fa/sort-amount-desc.d.ts
+++ b/types/react-icons/fa/sort-amount-desc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAmountDesc extends React.Component<IconBaseProps, any> { }
+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
index c92f339fd5..ce2c9fe0a2 100644
--- a/types/react-icons/fa/sort-asc.d.ts
+++ b/types/react-icons/fa/sort-asc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortAsc extends React.Component<IconBaseProps, any> { }
+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
index 40a230a9d2..0b4842a8f9 100644
--- a/types/react-icons/fa/sort-desc.d.ts
+++ b/types/react-icons/fa/sort-desc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortDesc extends React.Component<IconBaseProps, any> { }
+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
index cb5de782bc..b7fa62fe1c 100644
--- a/types/react-icons/fa/sort-numeric-asc.d.ts
+++ b/types/react-icons/fa/sort-numeric-asc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericAsc extends React.Component<IconBaseProps, any> { }
+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
index d75af357b9..2c124abd75 100644
--- a/types/react-icons/fa/sort-numeric-desc.d.ts
+++ b/types/react-icons/fa/sort-numeric-desc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSortNumericDesc extends React.Component<IconBaseProps, any> { }
+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
index c11deab86d..ad64fd0c52 100644
--- a/types/react-icons/fa/sort.d.ts
+++ b/types/react-icons/fa/sort.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSort extends React.Component<IconBaseProps, any> { }
+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
index 8139a54d20..c357e174b0 100644
--- a/types/react-icons/fa/soundcloud.d.ts
+++ b/types/react-icons/fa/soundcloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSoundcloud extends React.Component<IconBaseProps, any> { }
+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
index 8ab64f83b1..0ce2f24916 100644
--- a/types/react-icons/fa/space-shuttle.d.ts
+++ b/types/react-icons/fa/space-shuttle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpaceShuttle extends React.Component<IconBaseProps, any> { }
+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
index 6b3abac36a..36e2dd9285 100644
--- a/types/react-icons/fa/spinner.d.ts
+++ b/types/react-icons/fa/spinner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpinner extends React.Component<IconBaseProps, any> { }
+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
index 12692d04f8..1112916912 100644
--- a/types/react-icons/fa/spoon.d.ts
+++ b/types/react-icons/fa/spoon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpoon extends React.Component<IconBaseProps, any> { }
+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
index 944ec7c520..94c862a866 100644
--- a/types/react-icons/fa/spotify.d.ts
+++ b/types/react-icons/fa/spotify.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSpotify extends React.Component<IconBaseProps, any> { }
+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
index cf89d832d8..0d49bd6c23 100644
--- a/types/react-icons/fa/square-o.d.ts
+++ b/types/react-icons/fa/square-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSquareO extends React.Component<IconBaseProps, any> { }
+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
index 0c9b97390e..d95485831d 100644
--- a/types/react-icons/fa/square.d.ts
+++ b/types/react-icons/fa/square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSquare extends React.Component<IconBaseProps, any> { }
+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
index 37eb0f1aa8..a1f2d0e265 100644
--- a/types/react-icons/fa/stack-exchange.d.ts
+++ b/types/react-icons/fa/stack-exchange.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStackExchange extends React.Component<IconBaseProps, any> { }
+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
index a8dce2a715..fd71beea7f 100644
--- a/types/react-icons/fa/stack-overflow.d.ts
+++ b/types/react-icons/fa/stack-overflow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStackOverflow extends React.Component<IconBaseProps, any> { }
+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
index 8c63b66cb9..6e4b26ad53 100644
--- a/types/react-icons/fa/star-half-empty.d.ts
+++ b/types/react-icons/fa/star-half-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalfEmpty extends React.Component<IconBaseProps, any> { }
+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
index 4781e57e63..d373ba6a07 100644
--- a/types/react-icons/fa/star-half.d.ts
+++ b/types/react-icons/fa/star-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarHalf extends React.Component<IconBaseProps, any> { }
+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
index 9210086b77..cf950d4867 100644
--- a/types/react-icons/fa/star-o.d.ts
+++ b/types/react-icons/fa/star-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStarO extends React.Component<IconBaseProps, any> { }
+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
index 246fc25582..3113155a96 100644
--- a/types/react-icons/fa/star.d.ts
+++ b/types/react-icons/fa/star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStar extends React.Component<IconBaseProps, any> { }
+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
index e42152f738..3ac2c21b30 100644
--- a/types/react-icons/fa/steam-square.d.ts
+++ b/types/react-icons/fa/steam-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSteamSquare extends React.Component<IconBaseProps, any> { }
+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
index 60b2e27623..e1aa2f3313 100644
--- a/types/react-icons/fa/steam.d.ts
+++ b/types/react-icons/fa/steam.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSteam extends React.Component<IconBaseProps, any> { }
+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
index e2bb8baca6..fe571ab271 100644
--- a/types/react-icons/fa/step-backward.d.ts
+++ b/types/react-icons/fa/step-backward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStepBackward extends React.Component<IconBaseProps, any> { }
+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
index 7ae9a56794..b8b01f06a8 100644
--- a/types/react-icons/fa/step-forward.d.ts
+++ b/types/react-icons/fa/step-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStepForward extends React.Component<IconBaseProps, any> { }
+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
index 7afd394120..3f8cdcba2e 100644
--- a/types/react-icons/fa/stethoscope.d.ts
+++ b/types/react-icons/fa/stethoscope.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStethoscope extends React.Component<IconBaseProps, any> { }
+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
index 00979d80c7..5d54ced4ec 100644
--- a/types/react-icons/fa/sticky-note-o.d.ts
+++ b/types/react-icons/fa/sticky-note-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNoteO extends React.Component<IconBaseProps, any> { }
+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
index 5ca82a3565..d30fedcdd7 100644
--- a/types/react-icons/fa/sticky-note.d.ts
+++ b/types/react-icons/fa/sticky-note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStickyNote extends React.Component<IconBaseProps, any> { }
+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
index 1d7d901d61..244ffeb6cc 100644
--- a/types/react-icons/fa/stop-circle-o.d.ts
+++ b/types/react-icons/fa/stop-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircleO extends React.Component<IconBaseProps, any> { }
+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
index 7ddebd29d4..ef7a92d310 100644
--- a/types/react-icons/fa/stop-circle.d.ts
+++ b/types/react-icons/fa/stop-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStopCircle extends React.Component<IconBaseProps, any> { }
+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
index 9fbcb4af8a..fd4356c3df 100644
--- a/types/react-icons/fa/stop.d.ts
+++ b/types/react-icons/fa/stop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStop extends React.Component<IconBaseProps, any> { }
+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
index 7b36dfed38..d989035bde 100644
--- a/types/react-icons/fa/street-view.d.ts
+++ b/types/react-icons/fa/street-view.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStreetView extends React.Component<IconBaseProps, any> { }
+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
index 6149d13e3c..f472c0fd77 100644
--- a/types/react-icons/fa/strikethrough.d.ts
+++ b/types/react-icons/fa/strikethrough.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStrikethrough extends React.Component<IconBaseProps, any> { }
+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
index 95781ea188..ecc4d2122e 100644
--- a/types/react-icons/fa/stumbleupon-circle.d.ts
+++ b/types/react-icons/fa/stumbleupon-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleuponCircle extends React.Component<IconBaseProps, any> { }
+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
index 473187b562..64185df0f3 100644
--- a/types/react-icons/fa/stumbleupon.d.ts
+++ b/types/react-icons/fa/stumbleupon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaStumbleupon extends React.Component<IconBaseProps, any> { }
+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
index ea18a7fcff..ac03fe6b89 100644
--- a/types/react-icons/fa/subscript.d.ts
+++ b/types/react-icons/fa/subscript.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSubscript extends React.Component<IconBaseProps, any> { }
+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
index 2807f5e8af..ce4b09edbf 100644
--- a/types/react-icons/fa/subway.d.ts
+++ b/types/react-icons/fa/subway.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSubway extends React.Component<IconBaseProps, any> { }
+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
index 35fd7ee24c..0bf3807780 100644
--- a/types/react-icons/fa/suitcase.d.ts
+++ b/types/react-icons/fa/suitcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSuitcase extends React.Component<IconBaseProps, any> { }
+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
index 030aa24e36..3ac6bfbdd3 100644
--- a/types/react-icons/fa/sun-o.d.ts
+++ b/types/react-icons/fa/sun-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSunO extends React.Component<IconBaseProps, any> { }
+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
index 287d5f6810..07a901912e 100644
--- a/types/react-icons/fa/superscript.d.ts
+++ b/types/react-icons/fa/superscript.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaSuperscript extends React.Component<IconBaseProps, any> { }
+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
index a8a547081b..a8ff4e9bf5 100644
--- a/types/react-icons/fa/table.d.ts
+++ b/types/react-icons/fa/table.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTable extends React.Component<IconBaseProps, any> { }
+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
index be4dc00fb7..37ea453d17 100644
--- a/types/react-icons/fa/tablet.d.ts
+++ b/types/react-icons/fa/tablet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTablet extends React.Component<IconBaseProps, any> { }
+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
index ae2dce1845..247756142e 100644
--- a/types/react-icons/fa/tag.d.ts
+++ b/types/react-icons/fa/tag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTag extends React.Component<IconBaseProps, any> { }
+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
index 28d909b14a..3518af839a 100644
--- a/types/react-icons/fa/tags.d.ts
+++ b/types/react-icons/fa/tags.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTags extends React.Component<IconBaseProps, any> { }
+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
index 52dfef62a6..f0b59f374e 100644
--- a/types/react-icons/fa/tasks.d.ts
+++ b/types/react-icons/fa/tasks.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTasks extends React.Component<IconBaseProps, any> { }
+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
index 0f386040d9..88b8693a6a 100644
--- a/types/react-icons/fa/television.d.ts
+++ b/types/react-icons/fa/television.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTelevision extends React.Component<IconBaseProps, any> { }
+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
index 229fec2bcd..ce9a04848c 100644
--- a/types/react-icons/fa/tencent-weibo.d.ts
+++ b/types/react-icons/fa/tencent-weibo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTencentWeibo extends React.Component<IconBaseProps, any> { }
+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
index 646c300550..75daa58c87 100644
--- a/types/react-icons/fa/terminal.d.ts
+++ b/types/react-icons/fa/terminal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTerminal extends React.Component<IconBaseProps, any> { }
+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
index b77a51bcae..69271e359f 100644
--- a/types/react-icons/fa/text-height.d.ts
+++ b/types/react-icons/fa/text-height.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTextHeight extends React.Component<IconBaseProps, any> { }
+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
index e95cebe3c3..820357df60 100644
--- a/types/react-icons/fa/text-width.d.ts
+++ b/types/react-icons/fa/text-width.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTextWidth extends React.Component<IconBaseProps, any> { }
+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
index 03b8e2ccb9..f059da9990 100644
--- a/types/react-icons/fa/th-large.d.ts
+++ b/types/react-icons/fa/th-large.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThLarge extends React.Component<IconBaseProps, any> { }
+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
index a23029f304..09ef167885 100644
--- a/types/react-icons/fa/th-list.d.ts
+++ b/types/react-icons/fa/th-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThList extends React.Component<IconBaseProps, any> { }
+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
index a780fe8cfd..9d6674b5d3 100644
--- a/types/react-icons/fa/th.d.ts
+++ b/types/react-icons/fa/th.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTh extends React.Component<IconBaseProps, any> { }
+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
index 43ecdde3f2..b84e262f77 100644
--- a/types/react-icons/fa/thumb-tack.d.ts
+++ b/types/react-icons/fa/thumb-tack.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbTack extends React.Component<IconBaseProps, any> { }
+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
index ca44108fd0..c684e7ad5c 100644
--- a/types/react-icons/fa/thumbs-down.d.ts
+++ b/types/react-icons/fa/thumbs-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsDown extends React.Component<IconBaseProps, any> { }
+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
index 686d6f51a4..0c9f640d18 100644
--- a/types/react-icons/fa/thumbs-o-down.d.ts
+++ b/types/react-icons/fa/thumbs-o-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsODown extends React.Component<IconBaseProps, any> { }
+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
index e43e026a17..9d5a487ae1 100644
--- a/types/react-icons/fa/thumbs-o-up.d.ts
+++ b/types/react-icons/fa/thumbs-o-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsOUp extends React.Component<IconBaseProps, any> { }
+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
index 5f0197bf44..84348d3ac2 100644
--- a/types/react-icons/fa/thumbs-up.d.ts
+++ b/types/react-icons/fa/thumbs-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaThumbsUp extends React.Component<IconBaseProps, any> { }
+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
index 2d39d114a0..275a38e4dd 100644
--- a/types/react-icons/fa/ticket.d.ts
+++ b/types/react-icons/fa/ticket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTicket extends React.Component<IconBaseProps, any> { }
+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
index e0a0c641a4..5a96466de6 100644
--- a/types/react-icons/fa/times-circle-o.d.ts
+++ b/types/react-icons/fa/times-circle-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircleO extends React.Component<IconBaseProps, any> { }
+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
index e5089a3be8..d73596cfb8 100644
--- a/types/react-icons/fa/times-circle.d.ts
+++ b/types/react-icons/fa/times-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTimesCircle extends React.Component<IconBaseProps, any> { }
+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
index ca7e829524..b4155f948c 100644
--- a/types/react-icons/fa/tint.d.ts
+++ b/types/react-icons/fa/tint.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTint extends React.Component<IconBaseProps, any> { }
+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
index eae0292e4e..e4bd987307 100644
--- a/types/react-icons/fa/toggle-off.d.ts
+++ b/types/react-icons/fa/toggle-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOff extends React.Component<IconBaseProps, any> { }
+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
index a04f05f476..69324fdd13 100644
--- a/types/react-icons/fa/toggle-on.d.ts
+++ b/types/react-icons/fa/toggle-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaToggleOn extends React.Component<IconBaseProps, any> { }
+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
index 5475688000..c8ddb8dbf6 100644
--- a/types/react-icons/fa/trademark.d.ts
+++ b/types/react-icons/fa/trademark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrademark extends React.Component<IconBaseProps, any> { }
+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
index 603cdc66a3..a686d3a677 100644
--- a/types/react-icons/fa/train.d.ts
+++ b/types/react-icons/fa/train.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrain extends React.Component<IconBaseProps, any> { }
+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
index b958fc301a..0794285d19 100644
--- a/types/react-icons/fa/transgender-alt.d.ts
+++ b/types/react-icons/fa/transgender-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTransgenderAlt extends React.Component<IconBaseProps, any> { }
+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
index 04febeccc8..c76a07e3f8 100644
--- a/types/react-icons/fa/trash-o.d.ts
+++ b/types/react-icons/fa/trash-o.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrashO extends React.Component<IconBaseProps, any> { }
+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
index a84ad901fd..f2f4ce4117 100644
--- a/types/react-icons/fa/trash.d.ts
+++ b/types/react-icons/fa/trash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrash extends React.Component<IconBaseProps, any> { }
+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
index 8894d074cd..7b94f9f52e 100644
--- a/types/react-icons/fa/tree.d.ts
+++ b/types/react-icons/fa/tree.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTree extends React.Component<IconBaseProps, any> { }
+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
index 2335fb3f10..a231c272aa 100644
--- a/types/react-icons/fa/trello.d.ts
+++ b/types/react-icons/fa/trello.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrello extends React.Component<IconBaseProps, any> { }
+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
index 1939751902..95ad22d7eb 100644
--- a/types/react-icons/fa/tripadvisor.d.ts
+++ b/types/react-icons/fa/tripadvisor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTripadvisor extends React.Component<IconBaseProps, any> { }
+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
index 65bb4b05bb..48f48edec1 100644
--- a/types/react-icons/fa/trophy.d.ts
+++ b/types/react-icons/fa/trophy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTrophy extends React.Component<IconBaseProps, any> { }
+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
index a48bef405d..00bc370441 100644
--- a/types/react-icons/fa/truck.d.ts
+++ b/types/react-icons/fa/truck.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTruck extends React.Component<IconBaseProps, any> { }
+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
index 0c4915a3fa..fa4492d24b 100644
--- a/types/react-icons/fa/try.d.ts
+++ b/types/react-icons/fa/try.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTry extends React.Component<IconBaseProps, any> { }
+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
index d9c5be6020..76ec94f74e 100644
--- a/types/react-icons/fa/tty.d.ts
+++ b/types/react-icons/fa/tty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTty extends React.Component<IconBaseProps, any> { }
+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
index aef7366b2b..2bf15bf460 100644
--- a/types/react-icons/fa/tumblr-square.d.ts
+++ b/types/react-icons/fa/tumblr-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblrSquare extends React.Component<IconBaseProps, any> { }
+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
index d327a6a365..c60ae76806 100644
--- a/types/react-icons/fa/tumblr.d.ts
+++ b/types/react-icons/fa/tumblr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTumblr extends React.Component<IconBaseProps, any> { }
+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
index 0c2d77160f..3e46ebac6c 100644
--- a/types/react-icons/fa/twitch.d.ts
+++ b/types/react-icons/fa/twitch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitch extends React.Component<IconBaseProps, any> { }
+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
index 5601582d8c..fb77d182e6 100644
--- a/types/react-icons/fa/twitter-square.d.ts
+++ b/types/react-icons/fa/twitter-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitterSquare extends React.Component<IconBaseProps, any> { }
+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
index 3ad9ef8e28..e3d5259918 100644
--- a/types/react-icons/fa/twitter.d.ts
+++ b/types/react-icons/fa/twitter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaTwitter extends React.Component<IconBaseProps, any> { }
+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
index a453c4201a..74fefd9404 100644
--- a/types/react-icons/fa/umbrella.d.ts
+++ b/types/react-icons/fa/umbrella.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUmbrella extends React.Component<IconBaseProps, any> { }
+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
index be3eb8eab8..af907eba18 100644
--- a/types/react-icons/fa/underline.d.ts
+++ b/types/react-icons/fa/underline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnderline extends React.Component<IconBaseProps, any> { }
+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
index 548f8a8cf3..a02ba6c3be 100644
--- a/types/react-icons/fa/universal-access.d.ts
+++ b/types/react-icons/fa/universal-access.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUniversalAccess extends React.Component<IconBaseProps, any> { }
+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
index 06fd852050..9d84986727 100644
--- a/types/react-icons/fa/unlock-alt.d.ts
+++ b/types/react-icons/fa/unlock-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlockAlt extends React.Component<IconBaseProps, any> { }
+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
index 886538ce99..5b1979f0cd 100644
--- a/types/react-icons/fa/unlock.d.ts
+++ b/types/react-icons/fa/unlock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUnlock extends React.Component<IconBaseProps, any> { }
+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
index d7d795d512..566ab8a65d 100644
--- a/types/react-icons/fa/upload.d.ts
+++ b/types/react-icons/fa/upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUpload extends React.Component<IconBaseProps, any> { }
+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
index d71eb0388c..6ca16d94e8 100644
--- a/types/react-icons/fa/usb.d.ts
+++ b/types/react-icons/fa/usb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUsb extends React.Component<IconBaseProps, any> { }
+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
index 23313c624a..0d6f2d9781 100644
--- a/types/react-icons/fa/user-md.d.ts
+++ b/types/react-icons/fa/user-md.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserMd extends React.Component<IconBaseProps, any> { }
+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
index e031ceca63..659b2ecb13 100644
--- a/types/react-icons/fa/user-plus.d.ts
+++ b/types/react-icons/fa/user-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserPlus extends React.Component<IconBaseProps, any> { }
+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
index 2b4e774088..43bf4e4ac3 100644
--- a/types/react-icons/fa/user-secret.d.ts
+++ b/types/react-icons/fa/user-secret.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserSecret extends React.Component<IconBaseProps, any> { }
+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
index 7bbff57df1..d235fd5463 100644
--- a/types/react-icons/fa/user-times.d.ts
+++ b/types/react-icons/fa/user-times.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUserTimes extends React.Component<IconBaseProps, any> { }
+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
index 42472b850e..cf7b5ac689 100644
--- a/types/react-icons/fa/user.d.ts
+++ b/types/react-icons/fa/user.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaUser extends React.Component<IconBaseProps, any> { }
+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
index 4304d33fb9..5a3602b516 100644
--- a/types/react-icons/fa/venus-double.d.ts
+++ b/types/react-icons/fa/venus-double.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusDouble extends React.Component<IconBaseProps, any> { }
+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
index 899acbebfb..70d7448d7e 100644
--- a/types/react-icons/fa/venus-mars.d.ts
+++ b/types/react-icons/fa/venus-mars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenusMars extends React.Component<IconBaseProps, any> { }
+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
index e63e21c25b..e80ab6053c 100644
--- a/types/react-icons/fa/venus.d.ts
+++ b/types/react-icons/fa/venus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVenus extends React.Component<IconBaseProps, any> { }
+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
index 9be7071123..c9f1bef6f3 100644
--- a/types/react-icons/fa/viacoin.d.ts
+++ b/types/react-icons/fa/viacoin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViacoin extends React.Component<IconBaseProps, any> { }
+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
index dab909edeb..7f10d8302f 100644
--- a/types/react-icons/fa/viadeo-square.d.ts
+++ b/types/react-icons/fa/viadeo-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeoSquare extends React.Component<IconBaseProps, any> { }
+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
index 547e7207d3..551545f5cc 100644
--- a/types/react-icons/fa/viadeo.d.ts
+++ b/types/react-icons/fa/viadeo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaViadeo extends React.Component<IconBaseProps, any> { }
+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
index 3170455e01..f3cf036582 100644
--- a/types/react-icons/fa/video-camera.d.ts
+++ b/types/react-icons/fa/video-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVideoCamera extends React.Component<IconBaseProps, any> { }
+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
index 6fe0a71c8c..9b0357e7ca 100644
--- a/types/react-icons/fa/vimeo-square.d.ts
+++ b/types/react-icons/fa/vimeo-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeoSquare extends React.Component<IconBaseProps, any> { }
+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
index add3e1ab98..7331ef98e8 100644
--- a/types/react-icons/fa/vimeo.d.ts
+++ b/types/react-icons/fa/vimeo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVimeo extends React.Component<IconBaseProps, any> { }
+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
index 1fe71d907e..b329619d15 100644
--- a/types/react-icons/fa/vine.d.ts
+++ b/types/react-icons/fa/vine.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVine extends React.Component<IconBaseProps, any> { }
+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
index e812acd6d5..07b3cdb5a9 100644
--- a/types/react-icons/fa/vk.d.ts
+++ b/types/react-icons/fa/vk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVk extends React.Component<IconBaseProps, any> { }
+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
index b909bc2738..5212a54d80 100644
--- a/types/react-icons/fa/volume-control-phone.d.ts
+++ b/types/react-icons/fa/volume-control-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeControlPhone extends React.Component<IconBaseProps, any> { }
+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
index c65d33a251..31c63f8901 100644
--- a/types/react-icons/fa/volume-down.d.ts
+++ b/types/react-icons/fa/volume-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeDown extends React.Component<IconBaseProps, any> { }
+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
index 88ff401a42..c0e0d7605e 100644
--- a/types/react-icons/fa/volume-off.d.ts
+++ b/types/react-icons/fa/volume-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeOff extends React.Component<IconBaseProps, any> { }
+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
index 82ce70d485..957cdc648b 100644
--- a/types/react-icons/fa/volume-up.d.ts
+++ b/types/react-icons/fa/volume-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaVolumeUp extends React.Component<IconBaseProps, any> { }
+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
index 9f6889bad4..35b902956e 100644
--- a/types/react-icons/fa/wechat.d.ts
+++ b/types/react-icons/fa/wechat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWechat extends React.Component<IconBaseProps, any> { }
+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
index fd0dfe12fa..afbebd68a5 100644
--- a/types/react-icons/fa/weibo.d.ts
+++ b/types/react-icons/fa/weibo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWeibo extends React.Component<IconBaseProps, any> { }
+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
index acf6c0f673..d4491b527e 100644
--- a/types/react-icons/fa/whatsapp.d.ts
+++ b/types/react-icons/fa/whatsapp.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWhatsapp extends React.Component<IconBaseProps, any> { }
+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
index bf1e1c819e..beb76b7b56 100644
--- a/types/react-icons/fa/wheelchair-alt.d.ts
+++ b/types/react-icons/fa/wheelchair-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchairAlt extends React.Component<IconBaseProps, any> { }
+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
index 3c746f962a..b93d14b52d 100644
--- a/types/react-icons/fa/wheelchair.d.ts
+++ b/types/react-icons/fa/wheelchair.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWheelchair extends React.Component<IconBaseProps, any> { }
+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
index 90d6046285..001d3cfc85 100644
--- a/types/react-icons/fa/wifi.d.ts
+++ b/types/react-icons/fa/wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWifi extends React.Component<IconBaseProps, any> { }
+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
index 173f26afde..279a74f1af 100644
--- a/types/react-icons/fa/wikipedia-w.d.ts
+++ b/types/react-icons/fa/wikipedia-w.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWikipediaW extends React.Component<IconBaseProps, any> { }
+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
index 7437e1a645..7e201a440e 100644
--- a/types/react-icons/fa/windows.d.ts
+++ b/types/react-icons/fa/windows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWindows extends React.Component<IconBaseProps, any> { }
+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
index ad23f80429..6419cd1638 100644
--- a/types/react-icons/fa/wordpress.d.ts
+++ b/types/react-icons/fa/wordpress.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWordpress extends React.Component<IconBaseProps, any> { }
+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
index 8c52c92f09..cccbdae9db 100644
--- a/types/react-icons/fa/wpbeginner.d.ts
+++ b/types/react-icons/fa/wpbeginner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWpbeginner extends React.Component<IconBaseProps, any> { }
+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
index 184e24d356..1ec4e76460 100644
--- a/types/react-icons/fa/wpforms.d.ts
+++ b/types/react-icons/fa/wpforms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWpforms extends React.Component<IconBaseProps, any> { }
+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
index 25a85abd80..0264b8d26b 100644
--- a/types/react-icons/fa/wrench.d.ts
+++ b/types/react-icons/fa/wrench.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaWrench extends React.Component<IconBaseProps, any> { }
+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
index 7e3099d42b..5f462112ea 100644
--- a/types/react-icons/fa/xing-square.d.ts
+++ b/types/react-icons/fa/xing-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaXingSquare extends React.Component<IconBaseProps, any> { }
+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
index e4160be196..1974b8c345 100644
--- a/types/react-icons/fa/xing.d.ts
+++ b/types/react-icons/fa/xing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaXing extends React.Component<IconBaseProps, any> { }
+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
index e7817f87b2..00fbccab76 100644
--- a/types/react-icons/fa/y-combinator.d.ts
+++ b/types/react-icons/fa/y-combinator.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYCombinator extends React.Component<IconBaseProps, any> { }
+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
index 0cbc24e550..20c14e5e13 100644
--- a/types/react-icons/fa/yahoo.d.ts
+++ b/types/react-icons/fa/yahoo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYahoo extends React.Component<IconBaseProps, any> { }
+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
index 5c491aa271..72ade5360d 100644
--- a/types/react-icons/fa/yelp.d.ts
+++ b/types/react-icons/fa/yelp.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYelp extends React.Component<IconBaseProps, any> { }
+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
index d31d5a4b15..f1829960cf 100644
--- a/types/react-icons/fa/youtube-play.d.ts
+++ b/types/react-icons/fa/youtube-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubePlay extends React.Component<IconBaseProps, any> { }
+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
index 5906ada2d6..c0ccac4e45 100644
--- a/types/react-icons/fa/youtube-square.d.ts
+++ b/types/react-icons/fa/youtube-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutubeSquare extends React.Component<IconBaseProps, any> { }
+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
index 378dbe576f..7aee8011f5 100644
--- a/types/react-icons/fa/youtube.d.ts
+++ b/types/react-icons/fa/youtube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class FaYoutube extends React.Component<IconBaseProps, any> { }
+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
index ccb74b7008..7380b75f13 100644
--- a/types/react-icons/go/alert.d.ts
+++ b/types/react-icons/go/alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlert extends React.Component<IconBaseProps, any> { }
+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
index d4ec248090..b0279982e2 100644
--- a/types/react-icons/go/alignment-align.d.ts
+++ b/types/react-icons/go/alignment-align.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlign extends React.Component<IconBaseProps, any> { }
+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
index 730e566725..4d42f9aff5 100644
--- a/types/react-icons/go/alignment-aligned-to.d.ts
+++ b/types/react-icons/go/alignment-aligned-to.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentAlignedTo extends React.Component<IconBaseProps, any> { }
+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
index 66c2fd7219..fcc4e84501 100644
--- a/types/react-icons/go/alignment-unalign.d.ts
+++ b/types/react-icons/go/alignment-unalign.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoAlignmentUnalign extends React.Component<IconBaseProps, any> { }
+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
index d6d7bb99e1..88395ee5f4 100644
--- a/types/react-icons/go/arrow-down.d.ts
+++ b/types/react-icons/go/arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowDown extends React.Component<IconBaseProps, any> { }
+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
index cda4110bb9..4bbebb5f65 100644
--- a/types/react-icons/go/arrow-left.d.ts
+++ b/types/react-icons/go/arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index 76dfac1968..484a4f9317 100644
--- a/types/react-icons/go/arrow-right.d.ts
+++ b/types/react-icons/go/arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowRight extends React.Component<IconBaseProps, any> { }
+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
index 4dc8002b4d..d4aa907034 100644
--- a/types/react-icons/go/arrow-small-down.d.ts
+++ b/types/react-icons/go/arrow-small-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallDown extends React.Component<IconBaseProps, any> { }
+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
index ab60750a46..a3700b5837 100644
--- a/types/react-icons/go/arrow-small-left.d.ts
+++ b/types/react-icons/go/arrow-small-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallLeft extends React.Component<IconBaseProps, any> { }
+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
index e96fcc0ffb..0ada4d71ee 100644
--- a/types/react-icons/go/arrow-small-right.d.ts
+++ b/types/react-icons/go/arrow-small-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallRight extends React.Component<IconBaseProps, any> { }
+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
index 2f940ce937..2bd6cdb4f3 100644
--- a/types/react-icons/go/arrow-small-up.d.ts
+++ b/types/react-icons/go/arrow-small-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowSmallUp extends React.Component<IconBaseProps, any> { }
+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
index 7d0282c95c..67a6866297 100644
--- a/types/react-icons/go/arrow-up.d.ts
+++ b/types/react-icons/go/arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoArrowUp extends React.Component<IconBaseProps, any> { }
+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
index a3a96e55de..71baf9a3ac 100644
--- a/types/react-icons/go/beer.d.ts
+++ b/types/react-icons/go/beer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBeer extends React.Component<IconBaseProps, any> { }
+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
index 8612f7a506..cd181328b6 100644
--- a/types/react-icons/go/book.d.ts
+++ b/types/react-icons/go/book.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBook extends React.Component<IconBaseProps, any> { }
+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
index 98e68f4e2c..d3b156181f 100644
--- a/types/react-icons/go/bookmark.d.ts
+++ b/types/react-icons/go/bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBookmark extends React.Component<IconBaseProps, any> { }
+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
index 820f8f9530..984092ba9b 100644
--- a/types/react-icons/go/briefcase.d.ts
+++ b/types/react-icons/go/briefcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBriefcase extends React.Component<IconBaseProps, any> { }
+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
index cd49c616d5..6c40834a02 100644
--- a/types/react-icons/go/broadcast.d.ts
+++ b/types/react-icons/go/broadcast.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBroadcast extends React.Component<IconBaseProps, any> { }
+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
index 75671aff1b..c268f36ec0 100644
--- a/types/react-icons/go/browser.d.ts
+++ b/types/react-icons/go/browser.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBrowser extends React.Component<IconBaseProps, any> { }
+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
index 98311df890..8159ff886d 100644
--- a/types/react-icons/go/bug.d.ts
+++ b/types/react-icons/go/bug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoBug extends React.Component<IconBaseProps, any> { }
+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
index 67a2d49fbb..5c52a2bf67 100644
--- a/types/react-icons/go/calendar.d.ts
+++ b/types/react-icons/go/calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCalendar extends React.Component<IconBaseProps, any> { }
+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
index ecabf03c63..f1f9c1536b 100644
--- a/types/react-icons/go/check.d.ts
+++ b/types/react-icons/go/check.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCheck extends React.Component<IconBaseProps, any> { }
+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
index 90f5de1c74..e1bfc3a76e 100644
--- a/types/react-icons/go/checklist.d.ts
+++ b/types/react-icons/go/checklist.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChecklist extends React.Component<IconBaseProps, any> { }
+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
index c7023e99ce..4879ed7129 100644
--- a/types/react-icons/go/chevron-down.d.ts
+++ b/types/react-icons/go/chevron-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronDown extends React.Component<IconBaseProps, any> { }
+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
index 092fcbb58b..36a6c0f96a 100644
--- a/types/react-icons/go/chevron-left.d.ts
+++ b/types/react-icons/go/chevron-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronLeft extends React.Component<IconBaseProps, any> { }
+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
index 54f3f2ff55..55e19d951a 100644
--- a/types/react-icons/go/chevron-right.d.ts
+++ b/types/react-icons/go/chevron-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronRight extends React.Component<IconBaseProps, any> { }
+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
index e972c3ddd8..2eba9e55c4 100644
--- a/types/react-icons/go/chevron-up.d.ts
+++ b/types/react-icons/go/chevron-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoChevronUp extends React.Component<IconBaseProps, any> { }
+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
index 79da27b246..4400a217f6 100644
--- a/types/react-icons/go/circle-slash.d.ts
+++ b/types/react-icons/go/circle-slash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCircleSlash extends React.Component<IconBaseProps, any> { }
+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
index 6c23365f05..396c2dc8e8 100644
--- a/types/react-icons/go/circuit-board.d.ts
+++ b/types/react-icons/go/circuit-board.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCircuitBoard extends React.Component<IconBaseProps, any> { }
+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
index 8a2bdc99f6..3483e7754e 100644
--- a/types/react-icons/go/clippy.d.ts
+++ b/types/react-icons/go/clippy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoClippy extends React.Component<IconBaseProps, any> { }
+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
index f20070fe4e..3cac2ddd8a 100644
--- a/types/react-icons/go/clock.d.ts
+++ b/types/react-icons/go/clock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoClock extends React.Component<IconBaseProps, any> { }
+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
index 921dde9051..a04b70acac 100644
--- a/types/react-icons/go/cloud-download.d.ts
+++ b/types/react-icons/go/cloud-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudDownload extends React.Component<IconBaseProps, any> { }
+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
index a16d3defbc..07ac4f6286 100644
--- a/types/react-icons/go/cloud-upload.d.ts
+++ b/types/react-icons/go/cloud-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCloudUpload extends React.Component<IconBaseProps, any> { }
+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
index 8fa8a54dae..7bbb2b7348 100644
--- a/types/react-icons/go/code.d.ts
+++ b/types/react-icons/go/code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCode extends React.Component<IconBaseProps, any> { }
+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
index 3a2af9a1f5..f047381423 100644
--- a/types/react-icons/go/color-mode.d.ts
+++ b/types/react-icons/go/color-mode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoColorMode extends React.Component<IconBaseProps, any> { }
+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
index 89155ae775..62be81f952 100644
--- a/types/react-icons/go/comment-discussion.d.ts
+++ b/types/react-icons/go/comment-discussion.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCommentDiscussion extends React.Component<IconBaseProps, any> { }
+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
index 09dca516b1..2e14daa806 100644
--- a/types/react-icons/go/comment.d.ts
+++ b/types/react-icons/go/comment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoComment extends React.Component<IconBaseProps, any> { }
+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
index 115a007c92..d7dbb4127c 100644
--- a/types/react-icons/go/credit-card.d.ts
+++ b/types/react-icons/go/credit-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoCreditCard extends React.Component<IconBaseProps, any> { }
+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
index d73d99d4d0..c7c6ca094f 100644
--- a/types/react-icons/go/dash.d.ts
+++ b/types/react-icons/go/dash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDash extends React.Component<IconBaseProps, any> { }
+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
index bcd4bdedb3..ab328f0213 100644
--- a/types/react-icons/go/dashboard.d.ts
+++ b/types/react-icons/go/dashboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDashboard extends React.Component<IconBaseProps, any> { }
+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
index 476faa6e92..34758c332d 100644
--- a/types/react-icons/go/database.d.ts
+++ b/types/react-icons/go/database.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDatabase extends React.Component<IconBaseProps, any> { }
+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
index 388deedd19..9274c81fdd 100644
--- a/types/react-icons/go/device-camera-video.d.ts
+++ b/types/react-icons/go/device-camera-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCameraVideo extends React.Component<IconBaseProps, any> { }
+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
index 1014976068..65a3f9aa8c 100644
--- a/types/react-icons/go/device-camera.d.ts
+++ b/types/react-icons/go/device-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceCamera extends React.Component<IconBaseProps, any> { }
+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
index d7802c4346..7c75dfe2f1 100644
--- a/types/react-icons/go/device-desktop.d.ts
+++ b/types/react-icons/go/device-desktop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceDesktop extends React.Component<IconBaseProps, any> { }
+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
index 3cbe06321a..046f63558d 100644
--- a/types/react-icons/go/device-mobile.d.ts
+++ b/types/react-icons/go/device-mobile.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDeviceMobile extends React.Component<IconBaseProps, any> { }
+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
index 79b16b8e12..bde41f0f53 100644
--- a/types/react-icons/go/diff-added.d.ts
+++ b/types/react-icons/go/diff-added.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffAdded extends React.Component<IconBaseProps, any> { }
+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
index e44096adc8..2508e07fa9 100644
--- a/types/react-icons/go/diff-ignored.d.ts
+++ b/types/react-icons/go/diff-ignored.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffIgnored extends React.Component<IconBaseProps, any> { }
+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
index 48455d7e5f..af95e1337d 100644
--- a/types/react-icons/go/diff-modified.d.ts
+++ b/types/react-icons/go/diff-modified.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffModified extends React.Component<IconBaseProps, any> { }
+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
index 38ec561f5b..46b1e78387 100644
--- a/types/react-icons/go/diff-removed.d.ts
+++ b/types/react-icons/go/diff-removed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRemoved extends React.Component<IconBaseProps, any> { }
+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
index a88bf04a98..c73850d52c 100644
--- a/types/react-icons/go/diff-renamed.d.ts
+++ b/types/react-icons/go/diff-renamed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiffRenamed extends React.Component<IconBaseProps, any> { }
+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
index 08351fa4d5..ebc0f14e2d 100644
--- a/types/react-icons/go/diff.d.ts
+++ b/types/react-icons/go/diff.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoDiff extends React.Component<IconBaseProps, any> { }
+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
index 8ea1cf0767..b8a40f3e30 100644
--- a/types/react-icons/go/ellipsis.d.ts
+++ b/types/react-icons/go/ellipsis.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoEllipsis extends React.Component<IconBaseProps, any> { }
+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
index c7554713ba..91e5fe5385 100644
--- a/types/react-icons/go/eye.d.ts
+++ b/types/react-icons/go/eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoEye extends React.Component<IconBaseProps, any> { }
+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
index af736ed759..b5ab33f79a 100644
--- a/types/react-icons/go/file-binary.d.ts
+++ b/types/react-icons/go/file-binary.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileBinary extends React.Component<IconBaseProps, any> { }
+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
index a5d64a7df0..297e89de52 100644
--- a/types/react-icons/go/file-code.d.ts
+++ b/types/react-icons/go/file-code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileCode extends React.Component<IconBaseProps, any> { }
+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
index 5a05417d79..a64af8f137 100644
--- a/types/react-icons/go/file-directory.d.ts
+++ b/types/react-icons/go/file-directory.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileDirectory extends React.Component<IconBaseProps, any> { }
+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
index c64e14ac22..8cf5535220 100644
--- a/types/react-icons/go/file-media.d.ts
+++ b/types/react-icons/go/file-media.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileMedia extends React.Component<IconBaseProps, any> { }
+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
index 29fa0ec0f4..43ae39d5a7 100644
--- a/types/react-icons/go/file-pdf.d.ts
+++ b/types/react-icons/go/file-pdf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFilePdf extends React.Component<IconBaseProps, any> { }
+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
index 86d14839dd..5a9499dbac 100644
--- a/types/react-icons/go/file-submodule.d.ts
+++ b/types/react-icons/go/file-submodule.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSubmodule extends React.Component<IconBaseProps, any> { }
+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
index 9221b15ba6..5337059393 100644
--- a/types/react-icons/go/file-symlink-directory.d.ts
+++ b/types/react-icons/go/file-symlink-directory.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkDirectory extends React.Component<IconBaseProps, any> { }
+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
index 8a232274e3..0116f9d2f0 100644
--- a/types/react-icons/go/file-symlink-file.d.ts
+++ b/types/react-icons/go/file-symlink-file.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileSymlinkFile extends React.Component<IconBaseProps, any> { }
+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
index ebf1ca555e..23b59dfcfd 100644
--- a/types/react-icons/go/file-text.d.ts
+++ b/types/react-icons/go/file-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileText extends React.Component<IconBaseProps, any> { }
+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
index 138f9f5bb6..e4f588b5db 100644
--- a/types/react-icons/go/file-zip.d.ts
+++ b/types/react-icons/go/file-zip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFileZip extends React.Component<IconBaseProps, any> { }
+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
index 73058fe285..baa5aa3739 100644
--- a/types/react-icons/go/flame.d.ts
+++ b/types/react-icons/go/flame.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFlame extends React.Component<IconBaseProps, any> { }
+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
index 097e8d1940..7ae869e942 100644
--- a/types/react-icons/go/fold.d.ts
+++ b/types/react-icons/go/fold.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoFold extends React.Component<IconBaseProps, any> { }
+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
index c89ce24d3f..7fd837ffbc 100644
--- a/types/react-icons/go/gear.d.ts
+++ b/types/react-icons/go/gear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGear extends React.Component<IconBaseProps, any> { }
+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
index c077186cfa..98b9deb223 100644
--- a/types/react-icons/go/gift.d.ts
+++ b/types/react-icons/go/gift.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGift extends React.Component<IconBaseProps, any> { }
+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
index bfaeb5578a..c69f135efd 100644
--- a/types/react-icons/go/gist-secret.d.ts
+++ b/types/react-icons/go/gist-secret.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGistSecret extends React.Component<IconBaseProps, any> { }
+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
index dad046b414..8f1ff4e827 100644
--- a/types/react-icons/go/gist.d.ts
+++ b/types/react-icons/go/gist.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGist extends React.Component<IconBaseProps, any> { }
+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
index d9b5cad0c1..52a90bd2a5 100644
--- a/types/react-icons/go/git-branch.d.ts
+++ b/types/react-icons/go/git-branch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitBranch extends React.Component<IconBaseProps, any> { }
+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
index dd254d2048..a1ad866ee2 100644
--- a/types/react-icons/go/git-commit.d.ts
+++ b/types/react-icons/go/git-commit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCommit extends React.Component<IconBaseProps, any> { }
+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
index 19a961766c..4336af1b22 100644
--- a/types/react-icons/go/git-compare.d.ts
+++ b/types/react-icons/go/git-compare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitCompare extends React.Component<IconBaseProps, any> { }
+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
index bde9ff06d8..f7d3457db7 100644
--- a/types/react-icons/go/git-merge.d.ts
+++ b/types/react-icons/go/git-merge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitMerge extends React.Component<IconBaseProps, any> { }
+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
index f83719463b..0c79ca8175 100644
--- a/types/react-icons/go/git-pull-request.d.ts
+++ b/types/react-icons/go/git-pull-request.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGitPullRequest extends React.Component<IconBaseProps, any> { }
+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
index b51b52c0c1..b1893d7685 100644
--- a/types/react-icons/go/globe.d.ts
+++ b/types/react-icons/go/globe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGlobe extends React.Component<IconBaseProps, any> { }
+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
index 66c7013ac6..8f1c24ba75 100644
--- a/types/react-icons/go/graph.d.ts
+++ b/types/react-icons/go/graph.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoGraph extends React.Component<IconBaseProps, any> { }
+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
index 48a5850053..8f56d447ef 100644
--- a/types/react-icons/go/heart.d.ts
+++ b/types/react-icons/go/heart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHeart extends React.Component<IconBaseProps, any> { }
+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
index 49cb455417..c91e923a69 100644
--- a/types/react-icons/go/history.d.ts
+++ b/types/react-icons/go/history.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHistory extends React.Component<IconBaseProps, any> { }
+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
index 2434275174..97d032716f 100644
--- a/types/react-icons/go/home.d.ts
+++ b/types/react-icons/go/home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHome extends React.Component<IconBaseProps, any> { }
+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
index 0774be9654..336e1f4eeb 100644
--- a/types/react-icons/go/horizontal-rule.d.ts
+++ b/types/react-icons/go/horizontal-rule.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHorizontalRule extends React.Component<IconBaseProps, any> { }
+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
index de5f490938..ad0fdf8563 100644
--- a/types/react-icons/go/hourglass.d.ts
+++ b/types/react-icons/go/hourglass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHourglass extends React.Component<IconBaseProps, any> { }
+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
index 3f70bf444f..984cc59a02 100644
--- a/types/react-icons/go/hubot.d.ts
+++ b/types/react-icons/go/hubot.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoHubot extends React.Component<IconBaseProps, any> { }
+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
index 17af80eb10..fe75bf017e 100644
--- a/types/react-icons/go/inbox.d.ts
+++ b/types/react-icons/go/inbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoInbox extends React.Component<IconBaseProps, any> { }
+export default class GoInbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/go/info.d.ts b/types/react-icons/go/info.d.ts
index ff1cb98646..2359f0e299 100644
--- a/types/react-icons/go/info.d.ts
+++ b/types/react-icons/go/info.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoInfo extends React.Component<IconBaseProps, any> { }
+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
index ca31c12384..b06460c581 100644
--- a/types/react-icons/go/issue-closed.d.ts
+++ b/types/react-icons/go/issue-closed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueClosed extends React.Component<IconBaseProps, any> { }
+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
index 8bda857c01..331e3754a9 100644
--- a/types/react-icons/go/issue-opened.d.ts
+++ b/types/react-icons/go/issue-opened.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueOpened extends React.Component<IconBaseProps, any> { }
+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
index bbbae3d1f0..460fb426c8 100644
--- a/types/react-icons/go/issue-reopened.d.ts
+++ b/types/react-icons/go/issue-reopened.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoIssueReopened extends React.Component<IconBaseProps, any> { }
+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
index ae3d82766b..2c85c72ff0 100644
--- a/types/react-icons/go/jersey.d.ts
+++ b/types/react-icons/go/jersey.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJersey extends React.Component<IconBaseProps, any> { }
+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
index 3332b0f4c4..8d0497969e 100644
--- a/types/react-icons/go/jump-down.d.ts
+++ b/types/react-icons/go/jump-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpDown extends React.Component<IconBaseProps, any> { }
+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
index be3ce83498..9be1e1ded5 100644
--- a/types/react-icons/go/jump-left.d.ts
+++ b/types/react-icons/go/jump-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpLeft extends React.Component<IconBaseProps, any> { }
+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
index ba060d1ea9..efdbf77170 100644
--- a/types/react-icons/go/jump-right.d.ts
+++ b/types/react-icons/go/jump-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpRight extends React.Component<IconBaseProps, any> { }
+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
index 370b6ca4b6..f8ee7030f0 100644
--- a/types/react-icons/go/jump-up.d.ts
+++ b/types/react-icons/go/jump-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoJumpUp extends React.Component<IconBaseProps, any> { }
+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
index c9219a54a0..635b754f56 100644
--- a/types/react-icons/go/key.d.ts
+++ b/types/react-icons/go/key.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoKey extends React.Component<IconBaseProps, any> { }
+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
index 81a2ed5539..48e2f695ed 100644
--- a/types/react-icons/go/keyboard.d.ts
+++ b/types/react-icons/go/keyboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoKeyboard extends React.Component<IconBaseProps, any> { }
+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
index 8c322a4996..59e6dd09c6 100644
--- a/types/react-icons/go/law.d.ts
+++ b/types/react-icons/go/law.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLaw extends React.Component<IconBaseProps, any> { }
+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
index 7fb474f9d2..b020b05d25 100644
--- a/types/react-icons/go/light-bulb.d.ts
+++ b/types/react-icons/go/light-bulb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLightBulb extends React.Component<IconBaseProps, any> { }
+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
index f756a02364..9e93717352 100644
--- a/types/react-icons/go/link-external.d.ts
+++ b/types/react-icons/go/link-external.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLinkExternal extends React.Component<IconBaseProps, any> { }
+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
index 042e630f90..7def9d9bd3 100644
--- a/types/react-icons/go/link.d.ts
+++ b/types/react-icons/go/link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLink extends React.Component<IconBaseProps, any> { }
+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
index 4d8dd28ccc..31a2859733 100644
--- a/types/react-icons/go/list-ordered.d.ts
+++ b/types/react-icons/go/list-ordered.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoListOrdered extends React.Component<IconBaseProps, any> { }
+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
index dba5bdb668..59b89e921e 100644
--- a/types/react-icons/go/list-unordered.d.ts
+++ b/types/react-icons/go/list-unordered.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoListUnordered extends React.Component<IconBaseProps, any> { }
+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
index c28407905a..a382326479 100644
--- a/types/react-icons/go/location.d.ts
+++ b/types/react-icons/go/location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLocation extends React.Component<IconBaseProps, any> { }
+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
index f33270a6c1..623ec47b53 100644
--- a/types/react-icons/go/lock.d.ts
+++ b/types/react-icons/go/lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLock extends React.Component<IconBaseProps, any> { }
+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
index 24b54c29b2..f57a2d07f7 100644
--- a/types/react-icons/go/logo-github.d.ts
+++ b/types/react-icons/go/logo-github.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoLogoGithub extends React.Component<IconBaseProps, any> { }
+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
index 3eb77cf5a9..e6820b2732 100644
--- a/types/react-icons/go/mail-read.d.ts
+++ b/types/react-icons/go/mail-read.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMailRead extends React.Component<IconBaseProps, any> { }
+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
index 2134543376..794cc6dca4 100644
--- a/types/react-icons/go/mail-reply.d.ts
+++ b/types/react-icons/go/mail-reply.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMailReply extends React.Component<IconBaseProps, any> { }
+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
index 5934767847..bca60de455 100644
--- a/types/react-icons/go/mail.d.ts
+++ b/types/react-icons/go/mail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMail extends React.Component<IconBaseProps, any> { }
+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
index fa16809ce8..999521b725 100644
--- a/types/react-icons/go/mark-github.d.ts
+++ b/types/react-icons/go/mark-github.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkGithub extends React.Component<IconBaseProps, any> { }
+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
index df48d243be..5533fd8deb 100644
--- a/types/react-icons/go/markdown.d.ts
+++ b/types/react-icons/go/markdown.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMarkdown extends React.Component<IconBaseProps, any> { }
+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
index b7fb2454d3..c76f98d900 100644
--- a/types/react-icons/go/megaphone.d.ts
+++ b/types/react-icons/go/megaphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMegaphone extends React.Component<IconBaseProps, any> { }
+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
index ac750f3e6e..988f97ec6f 100644
--- a/types/react-icons/go/mention.d.ts
+++ b/types/react-icons/go/mention.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMention extends React.Component<IconBaseProps, any> { }
+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
index d2512a5304..79f91de4ab 100644
--- a/types/react-icons/go/microscope.d.ts
+++ b/types/react-icons/go/microscope.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMicroscope extends React.Component<IconBaseProps, any> { }
+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
index b2775844aa..a5df7c65b1 100644
--- a/types/react-icons/go/milestone.d.ts
+++ b/types/react-icons/go/milestone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMilestone extends React.Component<IconBaseProps, any> { }
+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
index 77a6bcc33c..c8f5f3a988 100644
--- a/types/react-icons/go/mirror.d.ts
+++ b/types/react-icons/go/mirror.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMirror extends React.Component<IconBaseProps, any> { }
+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
index f06eba5401..e435c2f899 100644
--- a/types/react-icons/go/mortar-board.d.ts
+++ b/types/react-icons/go/mortar-board.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMortarBoard extends React.Component<IconBaseProps, any> { }
+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
index bfc81cc390..cceb4a2fc6 100644
--- a/types/react-icons/go/move-down.d.ts
+++ b/types/react-icons/go/move-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveDown extends React.Component<IconBaseProps, any> { }
+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
index 2f0284c69a..81c57b58d1 100644
--- a/types/react-icons/go/move-left.d.ts
+++ b/types/react-icons/go/move-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveLeft extends React.Component<IconBaseProps, any> { }
+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
index 07dcc03b4e..b9baed854c 100644
--- a/types/react-icons/go/move-right.d.ts
+++ b/types/react-icons/go/move-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveRight extends React.Component<IconBaseProps, any> { }
+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
index db01b93ef1..b649bd2bca 100644
--- a/types/react-icons/go/move-up.d.ts
+++ b/types/react-icons/go/move-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMoveUp extends React.Component<IconBaseProps, any> { }
+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
index c93107077e..96aa49027f 100644
--- a/types/react-icons/go/mute.d.ts
+++ b/types/react-icons/go/mute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoMute extends React.Component<IconBaseProps, any> { }
+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
index 718ba08083..2953cea8b0 100644
--- a/types/react-icons/go/no-newline.d.ts
+++ b/types/react-icons/go/no-newline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoNoNewline extends React.Component<IconBaseProps, any> { }
+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
index 26f31a5b97..466708f844 100644
--- a/types/react-icons/go/octoface.d.ts
+++ b/types/react-icons/go/octoface.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoOctoface extends React.Component<IconBaseProps, any> { }
+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
index 920efb0177..321899f2bd 100644
--- a/types/react-icons/go/organization.d.ts
+++ b/types/react-icons/go/organization.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoOrganization extends React.Component<IconBaseProps, any> { }
+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
index d7a519cded..ecea623c3b 100644
--- a/types/react-icons/go/package.d.ts
+++ b/types/react-icons/go/package.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPackage extends React.Component<IconBaseProps, any> { }
+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
index a8506f4081..b38f9aa673 100644
--- a/types/react-icons/go/paintcan.d.ts
+++ b/types/react-icons/go/paintcan.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPaintcan extends React.Component<IconBaseProps, any> { }
+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
index f83e90d337..9a2cc3fe1c 100644
--- a/types/react-icons/go/pencil.d.ts
+++ b/types/react-icons/go/pencil.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPencil extends React.Component<IconBaseProps, any> { }
+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
index 3e90e995cb..177c738660 100644
--- a/types/react-icons/go/person.d.ts
+++ b/types/react-icons/go/person.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPerson extends React.Component<IconBaseProps, any> { }
+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
index 1e71e6a451..f083f58df7 100644
--- a/types/react-icons/go/pin.d.ts
+++ b/types/react-icons/go/pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPin extends React.Component<IconBaseProps, any> { }
+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
index e0413248d8..faa2293f90 100644
--- a/types/react-icons/go/playback-fast-forward.d.ts
+++ b/types/react-icons/go/playback-fast-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackFastForward extends React.Component<IconBaseProps, any> { }
+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
index faedc171f4..43c3830eae 100644
--- a/types/react-icons/go/playback-pause.d.ts
+++ b/types/react-icons/go/playback-pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPause extends React.Component<IconBaseProps, any> { }
+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
index a1728cef8f..6d90eadb63 100644
--- a/types/react-icons/go/playback-play.d.ts
+++ b/types/react-icons/go/playback-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackPlay extends React.Component<IconBaseProps, any> { }
+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
index 1dce237641..92080152af 100644
--- a/types/react-icons/go/playback-rewind.d.ts
+++ b/types/react-icons/go/playback-rewind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlaybackRewind extends React.Component<IconBaseProps, any> { }
+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
index e04a6ef59e..da0ec12aa1 100644
--- a/types/react-icons/go/plug.d.ts
+++ b/types/react-icons/go/plug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlug extends React.Component<IconBaseProps, any> { }
+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
index c03f31a17c..867c30b643 100644
--- a/types/react-icons/go/plus.d.ts
+++ b/types/react-icons/go/plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPlus extends React.Component<IconBaseProps, any> { }
+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
index 4349940882..1c16142450 100644
--- a/types/react-icons/go/podium.d.ts
+++ b/types/react-icons/go/podium.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPodium extends React.Component<IconBaseProps, any> { }
+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
index e0166675fe..9a74108de7 100644
--- a/types/react-icons/go/primitive-dot.d.ts
+++ b/types/react-icons/go/primitive-dot.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveDot extends React.Component<IconBaseProps, any> { }
+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
index 73129a7416..4a387621dd 100644
--- a/types/react-icons/go/primitive-square.d.ts
+++ b/types/react-icons/go/primitive-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPrimitiveSquare extends React.Component<IconBaseProps, any> { }
+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
index a022a835f5..111540b6ea 100644
--- a/types/react-icons/go/pulse.d.ts
+++ b/types/react-icons/go/pulse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPulse extends React.Component<IconBaseProps, any> { }
+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
index 2c79df6221..759922a96d 100644
--- a/types/react-icons/go/puzzle.d.ts
+++ b/types/react-icons/go/puzzle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoPuzzle extends React.Component<IconBaseProps, any> { }
+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
index 6b13066ed1..7dd4302a96 100644
--- a/types/react-icons/go/question.d.ts
+++ b/types/react-icons/go/question.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoQuestion extends React.Component<IconBaseProps, any> { }
+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
index 1e91156e4a..47a6f2765a 100644
--- a/types/react-icons/go/quote.d.ts
+++ b/types/react-icons/go/quote.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoQuote extends React.Component<IconBaseProps, any> { }
+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
index 250bcccc92..fee3702338 100644
--- a/types/react-icons/go/radio-tower.d.ts
+++ b/types/react-icons/go/radio-tower.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRadioTower extends React.Component<IconBaseProps, any> { }
+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
index 08cf239d8c..fb9957a21d 100644
--- a/types/react-icons/go/repo-clone.d.ts
+++ b/types/react-icons/go/repo-clone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoClone extends React.Component<IconBaseProps, any> { }
+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
index f346d64e71..6b1bf3a2c1 100644
--- a/types/react-icons/go/repo-force-push.d.ts
+++ b/types/react-icons/go/repo-force-push.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForcePush extends React.Component<IconBaseProps, any> { }
+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
index f6bcae6f1f..e68f5a3df6 100644
--- a/types/react-icons/go/repo-forked.d.ts
+++ b/types/react-icons/go/repo-forked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoForked extends React.Component<IconBaseProps, any> { }
+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
index 79d104ebba..916310f2bc 100644
--- a/types/react-icons/go/repo-pull.d.ts
+++ b/types/react-icons/go/repo-pull.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPull extends React.Component<IconBaseProps, any> { }
+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
index 473cfad2ff..5e9a25d3a6 100644
--- a/types/react-icons/go/repo-push.d.ts
+++ b/types/react-icons/go/repo-push.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepoPush extends React.Component<IconBaseProps, any> { }
+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
index 9bb6c6c3c4..87dd983849 100644
--- a/types/react-icons/go/repo.d.ts
+++ b/types/react-icons/go/repo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRepo extends React.Component<IconBaseProps, any> { }
+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
index e92a7802b6..04a9f8fbbb 100644
--- a/types/react-icons/go/rocket.d.ts
+++ b/types/react-icons/go/rocket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRocket extends React.Component<IconBaseProps, any> { }
+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
index 9210f442ed..d18a40a2fb 100644
--- a/types/react-icons/go/rss.d.ts
+++ b/types/react-icons/go/rss.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRss extends React.Component<IconBaseProps, any> { }
+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
index 7088211cba..467aecdce6 100644
--- a/types/react-icons/go/ruby.d.ts
+++ b/types/react-icons/go/ruby.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoRuby extends React.Component<IconBaseProps, any> { }
+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
index b56e719737..f3eae2a63e 100644
--- a/types/react-icons/go/screen-full.d.ts
+++ b/types/react-icons/go/screen-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenFull extends React.Component<IconBaseProps, any> { }
+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
index bd638f0e59..59e38edc81 100644
--- a/types/react-icons/go/screen-normal.d.ts
+++ b/types/react-icons/go/screen-normal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoScreenNormal extends React.Component<IconBaseProps, any> { }
+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
index 2406d7990b..54d1144369 100644
--- a/types/react-icons/go/search.d.ts
+++ b/types/react-icons/go/search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSearch extends React.Component<IconBaseProps, any> { }
+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
index e7011da7d3..1de141c1a2 100644
--- a/types/react-icons/go/server.d.ts
+++ b/types/react-icons/go/server.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoServer extends React.Component<IconBaseProps, any> { }
+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
index 3dad6171f4..a583ebe0fe 100644
--- a/types/react-icons/go/settings.d.ts
+++ b/types/react-icons/go/settings.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSettings extends React.Component<IconBaseProps, any> { }
+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
index ab88981f15..f1788d6395 100644
--- a/types/react-icons/go/sign-in.d.ts
+++ b/types/react-icons/go/sign-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSignIn extends React.Component<IconBaseProps, any> { }
+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
index ac84ac924c..dd87a41f43 100644
--- a/types/react-icons/go/sign-out.d.ts
+++ b/types/react-icons/go/sign-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSignOut extends React.Component<IconBaseProps, any> { }
+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
index c1e33d8760..4b930df74c 100644
--- a/types/react-icons/go/split.d.ts
+++ b/types/react-icons/go/split.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSplit extends React.Component<IconBaseProps, any> { }
+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
index d84b261ab8..2c1bfdc544 100644
--- a/types/react-icons/go/squirrel.d.ts
+++ b/types/react-icons/go/squirrel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSquirrel extends React.Component<IconBaseProps, any> { }
+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
index 39146ea5c3..a5f1a3718e 100644
--- a/types/react-icons/go/star.d.ts
+++ b/types/react-icons/go/star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoStar extends React.Component<IconBaseProps, any> { }
+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
index 7731a5947e..ae1bd0f758 100644
--- a/types/react-icons/go/steps.d.ts
+++ b/types/react-icons/go/steps.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSteps extends React.Component<IconBaseProps, any> { }
+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
index 7919522a0d..6036ca3c7f 100644
--- a/types/react-icons/go/stop.d.ts
+++ b/types/react-icons/go/stop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoStop extends React.Component<IconBaseProps, any> { }
+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
index 5611dda112..7a0ab4e316 100644
--- a/types/react-icons/go/sync.d.ts
+++ b/types/react-icons/go/sync.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoSync extends React.Component<IconBaseProps, any> { }
+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
index 6de6570346..ff161ead97 100644
--- a/types/react-icons/go/tag.d.ts
+++ b/types/react-icons/go/tag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTag extends React.Component<IconBaseProps, any> { }
+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
index 2a3cbfdbc3..943c1764db 100644
--- a/types/react-icons/go/telescope.d.ts
+++ b/types/react-icons/go/telescope.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTelescope extends React.Component<IconBaseProps, any> { }
+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
index bc032af10e..e21c5a9461 100644
--- a/types/react-icons/go/terminal.d.ts
+++ b/types/react-icons/go/terminal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTerminal extends React.Component<IconBaseProps, any> { }
+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
index 823bfd5253..75fe787e3f 100644
--- a/types/react-icons/go/three-bars.d.ts
+++ b/types/react-icons/go/three-bars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoThreeBars extends React.Component<IconBaseProps, any> { }
+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
index 2771922016..8229abce20 100644
--- a/types/react-icons/go/tools.d.ts
+++ b/types/react-icons/go/tools.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTools extends React.Component<IconBaseProps, any> { }
+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
index cb835603f0..4b27fba299 100644
--- a/types/react-icons/go/trashcan.d.ts
+++ b/types/react-icons/go/trashcan.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTrashcan extends React.Component<IconBaseProps, any> { }
+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
index c441287bf6..de19ba459a 100644
--- a/types/react-icons/go/triangle-down.d.ts
+++ b/types/react-icons/go/triangle-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleDown extends React.Component<IconBaseProps, any> { }
+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
index 1017fd09c7..309b832111 100644
--- a/types/react-icons/go/triangle-left.d.ts
+++ b/types/react-icons/go/triangle-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleLeft extends React.Component<IconBaseProps, any> { }
+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
index d1ed233599..989f428fb3 100644
--- a/types/react-icons/go/triangle-right.d.ts
+++ b/types/react-icons/go/triangle-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleRight extends React.Component<IconBaseProps, any> { }
+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
index 6ce79c93fa..fae4ac1c25 100644
--- a/types/react-icons/go/triangle-up.d.ts
+++ b/types/react-icons/go/triangle-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoTriangleUp extends React.Component<IconBaseProps, any> { }
+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
index 1cf1946063..1c00f170d5 100644
--- a/types/react-icons/go/unfold.d.ts
+++ b/types/react-icons/go/unfold.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoUnfold extends React.Component<IconBaseProps, any> { }
+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
index 80142f4fcb..90eda20972 100644
--- a/types/react-icons/go/unmute.d.ts
+++ b/types/react-icons/go/unmute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoUnmute extends React.Component<IconBaseProps, any> { }
+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
index 695e54c515..d11586398f 100644
--- a/types/react-icons/go/versions.d.ts
+++ b/types/react-icons/go/versions.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoVersions extends React.Component<IconBaseProps, any> { }
+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
index 3fd2c744a1..379cb94d5c 100644
--- a/types/react-icons/go/x.d.ts
+++ b/types/react-icons/go/x.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoX extends React.Component<IconBaseProps, any> { }
+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
index 52afc496bf..9dafc26355 100644
--- a/types/react-icons/go/zap.d.ts
+++ b/types/react-icons/go/zap.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class GoZap extends React.Component<IconBaseProps, any> { }
+export default class GoZap extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/index.d.ts b/types/react-icons/index.d.ts
index 1d8b8573cb..5068bb226b 100644
--- a/types/react-icons/index.d.ts
+++ b/types/react-icons/index.d.ts
@@ -2,4 +2,4 @@
 // Project: https://github.com/gorangajic/react-icons#readme
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
diff --git a/types/react-icons/io/alert-circled.d.ts b/types/react-icons/io/alert-circled.d.ts
index c79766b3f5..1fc164cf30 100644
--- a/types/react-icons/io/alert-circled.d.ts
+++ b/types/react-icons/io/alert-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAlertCircled extends React.Component<IconBaseProps, any> { }
+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
index 4d69c70996..f3f236a07b 100644
--- a/types/react-icons/io/alert.d.ts
+++ b/types/react-icons/io/alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAlert extends React.Component<IconBaseProps, any> { }
+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
index d18b4e3f3b..83301fe5b9 100644
--- a/types/react-icons/io/android-add-circle.d.ts
+++ b/types/react-icons/io/android-add-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAddCircle extends React.Component<IconBaseProps, any> { }
+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
index 6371fd661a..d6ec32e120 100644
--- a/types/react-icons/io/android-add.d.ts
+++ b/types/react-icons/io/android-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAdd extends React.Component<IconBaseProps, any> { }
+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
index 2824ec957b..ba7424414a 100644
--- a/types/react-icons/io/android-alarm-clock.d.ts
+++ b/types/react-icons/io/android-alarm-clock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlarmClock extends React.Component<IconBaseProps, any> { }
+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
index c9c343c9c5..23f9c0fc85 100644
--- a/types/react-icons/io/android-alert.d.ts
+++ b/types/react-icons/io/android-alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAlert extends React.Component<IconBaseProps, any> { }
+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
index e53e9ee2c0..4ce9dca7c6 100644
--- a/types/react-icons/io/android-apps.d.ts
+++ b/types/react-icons/io/android-apps.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidApps extends React.Component<IconBaseProps, any> { }
+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
index 19f95459a1..bd86f53213 100644
--- a/types/react-icons/io/android-archive.d.ts
+++ b/types/react-icons/io/android-archive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArchive extends React.Component<IconBaseProps, any> { }
+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
index ddf17babf0..ccf8a5dc52 100644
--- a/types/react-icons/io/android-arrow-back.d.ts
+++ b/types/react-icons/io/android-arrow-back.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowBack extends React.Component<IconBaseProps, any> { }
+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
index f7cdff2e8a..71d5471bb6 100644
--- a/types/react-icons/io/android-arrow-down.d.ts
+++ b/types/react-icons/io/android-arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDown extends React.Component<IconBaseProps, any> { }
+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
index 9921c9756b..6a11a88c20 100644
--- a/types/react-icons/io/android-arrow-dropdown-circle.d.ts
+++ b/types/react-icons/io/android-arrow-dropdown-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdownCircle extends React.Component<IconBaseProps, any> { }
+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
index e3c1734b9e..ec91403322 100644
--- a/types/react-icons/io/android-arrow-dropdown.d.ts
+++ b/types/react-icons/io/android-arrow-dropdown.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropdown extends React.Component<IconBaseProps, any> { }
+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
index e9c7ade0ed..a972b89ae8 100644
--- a/types/react-icons/io/android-arrow-dropleft-circle.d.ts
+++ b/types/react-icons/io/android-arrow-dropleft-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleftCircle extends React.Component<IconBaseProps, any> { }
+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
index f27bda0f88..0477b93c0b 100644
--- a/types/react-icons/io/android-arrow-dropleft.d.ts
+++ b/types/react-icons/io/android-arrow-dropleft.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropleft extends React.Component<IconBaseProps, any> { }
+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
index e9efe30977..2e53387d79 100644
--- a/types/react-icons/io/android-arrow-dropright-circle.d.ts
+++ b/types/react-icons/io/android-arrow-dropright-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDroprightCircle extends React.Component<IconBaseProps, any> { }
+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
index 5b699c82eb..b1ebcac3a3 100644
--- a/types/react-icons/io/android-arrow-dropright.d.ts
+++ b/types/react-icons/io/android-arrow-dropright.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropright extends React.Component<IconBaseProps, any> { }
+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
index ecdba4d76b..cb8d87c3b7 100644
--- a/types/react-icons/io/android-arrow-dropup-circle.d.ts
+++ b/types/react-icons/io/android-arrow-dropup-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropupCircle extends React.Component<IconBaseProps, any> { }
+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
index ef88f5a8a4..b52c196650 100644
--- a/types/react-icons/io/android-arrow-dropup.d.ts
+++ b/types/react-icons/io/android-arrow-dropup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowDropup extends React.Component<IconBaseProps, any> { }
+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
index 988054fdba..a2e4cfcf3c 100644
--- a/types/react-icons/io/android-arrow-forward.d.ts
+++ b/types/react-icons/io/android-arrow-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowForward extends React.Component<IconBaseProps, any> { }
+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
index 6a5d8bce91..8d30e1f1d6 100644
--- a/types/react-icons/io/android-arrow-up.d.ts
+++ b/types/react-icons/io/android-arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 2a81eff025..42b704ef71 100644
--- a/types/react-icons/io/android-attach.d.ts
+++ b/types/react-icons/io/android-attach.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidAttach extends React.Component<IconBaseProps, any> { }
+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
index 609cdb9248..0dbc0148db 100644
--- a/types/react-icons/io/android-bar.d.ts
+++ b/types/react-icons/io/android-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBar extends React.Component<IconBaseProps, any> { }
+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
index 77e1f18d89..7e8c1ef911 100644
--- a/types/react-icons/io/android-bicycle.d.ts
+++ b/types/react-icons/io/android-bicycle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBicycle extends React.Component<IconBaseProps, any> { }
+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
index 3aa0aa406d..59bf285c2b 100644
--- a/types/react-icons/io/android-boat.d.ts
+++ b/types/react-icons/io/android-boat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBoat extends React.Component<IconBaseProps, any> { }
+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
index d42d693947..1585e691ac 100644
--- a/types/react-icons/io/android-bookmark.d.ts
+++ b/types/react-icons/io/android-bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBookmark extends React.Component<IconBaseProps, any> { }
+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
index e3e9eba871..04b9d70acb 100644
--- a/types/react-icons/io/android-bulb.d.ts
+++ b/types/react-icons/io/android-bulb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBulb extends React.Component<IconBaseProps, any> { }
+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
index da0b843827..2e93dc479b 100644
--- a/types/react-icons/io/android-bus.d.ts
+++ b/types/react-icons/io/android-bus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidBus extends React.Component<IconBaseProps, any> { }
+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
index 7f0e7bb40d..a884f3ff51 100644
--- a/types/react-icons/io/android-calendar.d.ts
+++ b/types/react-icons/io/android-calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCalendar extends React.Component<IconBaseProps, any> { }
+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
index dc68618566..2b13615abf 100644
--- a/types/react-icons/io/android-call.d.ts
+++ b/types/react-icons/io/android-call.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCall extends React.Component<IconBaseProps, any> { }
+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
index b478052454..042a0b2694 100644
--- a/types/react-icons/io/android-camera.d.ts
+++ b/types/react-icons/io/android-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCamera extends React.Component<IconBaseProps, any> { }
+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
index e6a4e25a94..067a2a32f0 100644
--- a/types/react-icons/io/android-cancel.d.ts
+++ b/types/react-icons/io/android-cancel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCancel extends React.Component<IconBaseProps, any> { }
+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
index 0f5240f2cd..fcb7c849d8 100644
--- a/types/react-icons/io/android-car.d.ts
+++ b/types/react-icons/io/android-car.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCar extends React.Component<IconBaseProps, any> { }
+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
index c7e438e03b..7d944a55c5 100644
--- a/types/react-icons/io/android-cart.d.ts
+++ b/types/react-icons/io/android-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCart extends React.Component<IconBaseProps, any> { }
+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
index 4280161927..8789c4f12b 100644
--- a/types/react-icons/io/android-chat.d.ts
+++ b/types/react-icons/io/android-chat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidChat extends React.Component<IconBaseProps, any> { }
+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
index d8e5fa3b26..2651183ba1 100644
--- a/types/react-icons/io/android-checkbox-blank.d.ts
+++ b/types/react-icons/io/android-checkbox-blank.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxBlank extends React.Component<IconBaseProps, any> { }
+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
index b4dab15b4e..cf6a3a3d5e 100644
--- a/types/react-icons/io/android-checkbox-outline-blank.d.ts
+++ b/types/react-icons/io/android-checkbox-outline-blank.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutlineBlank extends React.Component<IconBaseProps, any> { }
+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
index d3ff55b64e..3a6347a302 100644
--- a/types/react-icons/io/android-checkbox-outline.d.ts
+++ b/types/react-icons/io/android-checkbox-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckboxOutline extends React.Component<IconBaseProps, any> { }
+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
index cd2e04372e..cb21d62e65 100644
--- a/types/react-icons/io/android-checkbox.d.ts
+++ b/types/react-icons/io/android-checkbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckbox extends React.Component<IconBaseProps, any> { }
+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
index 0326c449b1..3671ada3d0 100644
--- a/types/react-icons/io/android-checkmark-circle.d.ts
+++ b/types/react-icons/io/android-checkmark-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCheckmarkCircle extends React.Component<IconBaseProps, any> { }
+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
index 79ce34630e..3d93506b17 100644
--- a/types/react-icons/io/android-clipboard.d.ts
+++ b/types/react-icons/io/android-clipboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClipboard extends React.Component<IconBaseProps, any> { }
+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
index ac1381120f..ad32b8b302 100644
--- a/types/react-icons/io/android-close.d.ts
+++ b/types/react-icons/io/android-close.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidClose extends React.Component<IconBaseProps, any> { }
+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
index 8d4bb2307f..9c30f64677 100644
--- a/types/react-icons/io/android-cloud-circle.d.ts
+++ b/types/react-icons/io/android-cloud-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudCircle extends React.Component<IconBaseProps, any> { }
+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
index 3ae02722be..6900251eec 100644
--- a/types/react-icons/io/android-cloud-done.d.ts
+++ b/types/react-icons/io/android-cloud-done.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudDone extends React.Component<IconBaseProps, any> { }
+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
index ca8186f50c..a8144aad15 100644
--- a/types/react-icons/io/android-cloud-outline.d.ts
+++ b/types/react-icons/io/android-cloud-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloudOutline extends React.Component<IconBaseProps, any> { }
+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
index 2620fc41c8..e0fc48bfd5 100644
--- a/types/react-icons/io/android-cloud.d.ts
+++ b/types/react-icons/io/android-cloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCloud extends React.Component<IconBaseProps, any> { }
+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
index 4c523d3d29..79ddef8b10 100644
--- a/types/react-icons/io/android-color-palette.d.ts
+++ b/types/react-icons/io/android-color-palette.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidColorPalette extends React.Component<IconBaseProps, any> { }
+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
index 7db3c51fc6..c577a6a3fd 100644
--- a/types/react-icons/io/android-compass.d.ts
+++ b/types/react-icons/io/android-compass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCompass extends React.Component<IconBaseProps, any> { }
+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
index 16e643e556..933faca311 100644
--- a/types/react-icons/io/android-contact.d.ts
+++ b/types/react-icons/io/android-contact.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContact extends React.Component<IconBaseProps, any> { }
+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
index bbfb1f9839..22f23054ff 100644
--- a/types/react-icons/io/android-contacts.d.ts
+++ b/types/react-icons/io/android-contacts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContacts extends React.Component<IconBaseProps, any> { }
+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
index 16752c3b45..87c6a88fa1 100644
--- a/types/react-icons/io/android-contract.d.ts
+++ b/types/react-icons/io/android-contract.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidContract extends React.Component<IconBaseProps, any> { }
+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
index 2943e30d94..38c4a7fa79 100644
--- a/types/react-icons/io/android-create.d.ts
+++ b/types/react-icons/io/android-create.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidCreate extends React.Component<IconBaseProps, any> { }
+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
index 0bac16d761..1863649507 100644
--- a/types/react-icons/io/android-delete.d.ts
+++ b/types/react-icons/io/android-delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDelete extends React.Component<IconBaseProps, any> { }
+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
index aa0d7bb119..a8233e4c61 100644
--- a/types/react-icons/io/android-desktop.d.ts
+++ b/types/react-icons/io/android-desktop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDesktop extends React.Component<IconBaseProps, any> { }
+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
index 90fb968de7..b2a4c4d5a3 100644
--- a/types/react-icons/io/android-document.d.ts
+++ b/types/react-icons/io/android-document.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDocument extends React.Component<IconBaseProps, any> { }
+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
index cbdb1617e9..9759331f5e 100644
--- a/types/react-icons/io/android-done-all.d.ts
+++ b/types/react-icons/io/android-done-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDoneAll extends React.Component<IconBaseProps, any> { }
+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
index 8c04dc4e50..ef68fc8e34 100644
--- a/types/react-icons/io/android-done.d.ts
+++ b/types/react-icons/io/android-done.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDone extends React.Component<IconBaseProps, any> { }
+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
index 237fd8da1b..35caf226ba 100644
--- a/types/react-icons/io/android-download.d.ts
+++ b/types/react-icons/io/android-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDownload extends React.Component<IconBaseProps, any> { }
+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
index ef5fe14394..c143e50a3d 100644
--- a/types/react-icons/io/android-drafts.d.ts
+++ b/types/react-icons/io/android-drafts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidDrafts extends React.Component<IconBaseProps, any> { }
+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
index c5453f4a60..ad1c1fa91e 100644
--- a/types/react-icons/io/android-exit.d.ts
+++ b/types/react-icons/io/android-exit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExit extends React.Component<IconBaseProps, any> { }
+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
index 02a070b6f1..01e32a17c5 100644
--- a/types/react-icons/io/android-expand.d.ts
+++ b/types/react-icons/io/android-expand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidExpand extends React.Component<IconBaseProps, any> { }
+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
index add7672c57..9d26146836 100644
--- a/types/react-icons/io/android-favorite-outline.d.ts
+++ b/types/react-icons/io/android-favorite-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavoriteOutline extends React.Component<IconBaseProps, any> { }
+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
index fa90450daa..17fd1ebcb0 100644
--- a/types/react-icons/io/android-favorite.d.ts
+++ b/types/react-icons/io/android-favorite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFavorite extends React.Component<IconBaseProps, any> { }
+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
index b8814dc756..d78bd6bf92 100644
--- a/types/react-icons/io/android-film.d.ts
+++ b/types/react-icons/io/android-film.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFilm extends React.Component<IconBaseProps, any> { }
+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
index 832f40b2ec..b494784e58 100644
--- a/types/react-icons/io/android-folder-open.d.ts
+++ b/types/react-icons/io/android-folder-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolderOpen extends React.Component<IconBaseProps, any> { }
+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
index 9a71066927..19fa386920 100644
--- a/types/react-icons/io/android-folder.d.ts
+++ b/types/react-icons/io/android-folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFolder extends React.Component<IconBaseProps, any> { }
+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
index d8d0aa995b..a43e13c0e5 100644
--- a/types/react-icons/io/android-funnel.d.ts
+++ b/types/react-icons/io/android-funnel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidFunnel extends React.Component<IconBaseProps, any> { }
+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
index 37bd8e4c99..7d27e58cc1 100644
--- a/types/react-icons/io/android-globe.d.ts
+++ b/types/react-icons/io/android-globe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidGlobe extends React.Component<IconBaseProps, any> { }
+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
index 671fd3b684..280652d333 100644
--- a/types/react-icons/io/android-hand.d.ts
+++ b/types/react-icons/io/android-hand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHand extends React.Component<IconBaseProps, any> { }
+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
index 5e48c38ce1..452158902c 100644
--- a/types/react-icons/io/android-hangout.d.ts
+++ b/types/react-icons/io/android-hangout.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHangout extends React.Component<IconBaseProps, any> { }
+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
index 4a32954709..7343ceb5dd 100644
--- a/types/react-icons/io/android-happy.d.ts
+++ b/types/react-icons/io/android-happy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHappy extends React.Component<IconBaseProps, any> { }
+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
index d17476a81e..75cc1ed488 100644
--- a/types/react-icons/io/android-home.d.ts
+++ b/types/react-icons/io/android-home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidHome extends React.Component<IconBaseProps, any> { }
+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
index a6a19f5dce..46d20ffdc2 100644
--- a/types/react-icons/io/android-image.d.ts
+++ b/types/react-icons/io/android-image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidImage extends React.Component<IconBaseProps, any> { }
+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
index e4c5f6172e..749f603ebc 100644
--- a/types/react-icons/io/android-laptop.d.ts
+++ b/types/react-icons/io/android-laptop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLaptop extends React.Component<IconBaseProps, any> { }
+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
index acd0cd1dbb..d366495d98 100644
--- a/types/react-icons/io/android-list.d.ts
+++ b/types/react-icons/io/android-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidList extends React.Component<IconBaseProps, any> { }
+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
index db365a9766..b99c14cf66 100644
--- a/types/react-icons/io/android-locate.d.ts
+++ b/types/react-icons/io/android-locate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLocate extends React.Component<IconBaseProps, any> { }
+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
index 216bcf491c..5447214ecf 100644
--- a/types/react-icons/io/android-lock.d.ts
+++ b/types/react-icons/io/android-lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidLock extends React.Component<IconBaseProps, any> { }
+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
index d328b78b49..29529c349f 100644
--- a/types/react-icons/io/android-mail.d.ts
+++ b/types/react-icons/io/android-mail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMail extends React.Component<IconBaseProps, any> { }
+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
index cee30e8499..521561d56e 100644
--- a/types/react-icons/io/android-map.d.ts
+++ b/types/react-icons/io/android-map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMap extends React.Component<IconBaseProps, any> { }
+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
index 3abb7b89e9..f14d3f29fa 100644
--- a/types/react-icons/io/android-menu.d.ts
+++ b/types/react-icons/io/android-menu.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMenu extends React.Component<IconBaseProps, any> { }
+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
index 78b93d0391..57ea0597db 100644
--- a/types/react-icons/io/android-microphone-off.d.ts
+++ b/types/react-icons/io/android-microphone-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophoneOff extends React.Component<IconBaseProps, any> { }
+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
index 412dd5bbf2..2e9105f34a 100644
--- a/types/react-icons/io/android-microphone.d.ts
+++ b/types/react-icons/io/android-microphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMicrophone extends React.Component<IconBaseProps, any> { }
+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
index 137678be72..4bdb7f35fd 100644
--- a/types/react-icons/io/android-more-horizontal.d.ts
+++ b/types/react-icons/io/android-more-horizontal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreHorizontal extends React.Component<IconBaseProps, any> { }
+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
index a57cca8df7..f3b900b03a 100644
--- a/types/react-icons/io/android-more-vertical.d.ts
+++ b/types/react-icons/io/android-more-vertical.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidMoreVertical extends React.Component<IconBaseProps, any> { }
+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
index faac7b355d..c062fdb9a2 100644
--- a/types/react-icons/io/android-navigate.d.ts
+++ b/types/react-icons/io/android-navigate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNavigate extends React.Component<IconBaseProps, any> { }
+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
index cf9a4d4c28..a5df08d48a 100644
--- a/types/react-icons/io/android-notifications-none.d.ts
+++ b/types/react-icons/io/android-notifications-none.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsNone extends React.Component<IconBaseProps, any> { }
+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
index 524064f2d6..38e64be76b 100644
--- a/types/react-icons/io/android-notifications-off.d.ts
+++ b/types/react-icons/io/android-notifications-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotificationsOff extends React.Component<IconBaseProps, any> { }
+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
index 92f62c1e91..f3fdc7b4fe 100644
--- a/types/react-icons/io/android-notifications.d.ts
+++ b/types/react-icons/io/android-notifications.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidNotifications extends React.Component<IconBaseProps, any> { }
+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
index 113da5cf68..8ef0abebde 100644
--- a/types/react-icons/io/android-open.d.ts
+++ b/types/react-icons/io/android-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOpen extends React.Component<IconBaseProps, any> { }
+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
index 8553b91d89..61640a419f 100644
--- a/types/react-icons/io/android-options.d.ts
+++ b/types/react-icons/io/android-options.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidOptions extends React.Component<IconBaseProps, any> { }
+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
index 8d0cd776ea..4f19a67eda 100644
--- a/types/react-icons/io/android-people.d.ts
+++ b/types/react-icons/io/android-people.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPeople extends React.Component<IconBaseProps, any> { }
+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
index 454ab6b205..4fe6408fe0 100644
--- a/types/react-icons/io/android-person-add.d.ts
+++ b/types/react-icons/io/android-person-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPersonAdd extends React.Component<IconBaseProps, any> { }
+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
index cb350fa2bd..ad0e00481a 100644
--- a/types/react-icons/io/android-person.d.ts
+++ b/types/react-icons/io/android-person.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPerson extends React.Component<IconBaseProps, any> { }
+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
index 6acef0a41a..bfff8ac323 100644
--- a/types/react-icons/io/android-phone-landscape.d.ts
+++ b/types/react-icons/io/android-phone-landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhoneLandscape extends React.Component<IconBaseProps, any> { }
+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
index 4455170837..4a14130c8d 100644
--- a/types/react-icons/io/android-phone-portrait.d.ts
+++ b/types/react-icons/io/android-phone-portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPhonePortrait extends React.Component<IconBaseProps, any> { }
+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
index 5d1d318cee..5819b33b52 100644
--- a/types/react-icons/io/android-pin.d.ts
+++ b/types/react-icons/io/android-pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPin extends React.Component<IconBaseProps, any> { }
+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
index 7c997b0c46..4b436e096b 100644
--- a/types/react-icons/io/android-plane.d.ts
+++ b/types/react-icons/io/android-plane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlane extends React.Component<IconBaseProps, any> { }
+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
index 56f79b7a0e..99174ccab2 100644
--- a/types/react-icons/io/android-playstore.d.ts
+++ b/types/react-icons/io/android-playstore.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPlaystore extends React.Component<IconBaseProps, any> { }
+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
index 284ed4358d..b2f5807f06 100644
--- a/types/react-icons/io/android-print.d.ts
+++ b/types/react-icons/io/android-print.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidPrint extends React.Component<IconBaseProps, any> { }
+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
index 2523903935..fc2f705ff1 100644
--- a/types/react-icons/io/android-radio-button-off.d.ts
+++ b/types/react-icons/io/android-radio-button-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOff extends React.Component<IconBaseProps, any> { }
+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
index 66362881fd..be28d7626e 100644
--- a/types/react-icons/io/android-radio-button-on.d.ts
+++ b/types/react-icons/io/android-radio-button-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRadioButtonOn extends React.Component<IconBaseProps, any> { }
+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
index 79bfa2640a..eee0a2b96f 100644
--- a/types/react-icons/io/android-refresh.d.ts
+++ b/types/react-icons/io/android-refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRefresh extends React.Component<IconBaseProps, any> { }
+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
index 7305e74d55..7c525668f8 100644
--- a/types/react-icons/io/android-remove-circle.d.ts
+++ b/types/react-icons/io/android-remove-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemoveCircle extends React.Component<IconBaseProps, any> { }
+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
index 66d9d5862a..3767b079d3 100644
--- a/types/react-icons/io/android-remove.d.ts
+++ b/types/react-icons/io/android-remove.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRemove extends React.Component<IconBaseProps, any> { }
+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
index af24a2981c..5bb7a6ef15 100644
--- a/types/react-icons/io/android-restaurant.d.ts
+++ b/types/react-icons/io/android-restaurant.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidRestaurant extends React.Component<IconBaseProps, any> { }
+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
index ac67cec33e..dc45162222 100644
--- a/types/react-icons/io/android-sad.d.ts
+++ b/types/react-icons/io/android-sad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSad extends React.Component<IconBaseProps, any> { }
+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
index 549114ceaf..b5158286a1 100644
--- a/types/react-icons/io/android-search.d.ts
+++ b/types/react-icons/io/android-search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSearch extends React.Component<IconBaseProps, any> { }
+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
index 59429824cf..eebec03631 100644
--- a/types/react-icons/io/android-send.d.ts
+++ b/types/react-icons/io/android-send.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSend extends React.Component<IconBaseProps, any> { }
+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
index df818f97c0..c302aedf0c 100644
--- a/types/react-icons/io/android-settings.d.ts
+++ b/types/react-icons/io/android-settings.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSettings extends React.Component<IconBaseProps, any> { }
+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
index eb43d0601d..dcdb8a648c 100644
--- a/types/react-icons/io/android-share-alt.d.ts
+++ b/types/react-icons/io/android-share-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShareAlt extends React.Component<IconBaseProps, any> { }
+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
index 92bd1683d5..6b61e7c4e9 100644
--- a/types/react-icons/io/android-share.d.ts
+++ b/types/react-icons/io/android-share.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidShare extends React.Component<IconBaseProps, any> { }
+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
index 925a9584da..6a9ce4048a 100644
--- a/types/react-icons/io/android-star-half.d.ts
+++ b/types/react-icons/io/android-star-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarHalf extends React.Component<IconBaseProps, any> { }
+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
index a7a2407841..3413a8803c 100644
--- a/types/react-icons/io/android-star-outline.d.ts
+++ b/types/react-icons/io/android-star-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStarOutline extends React.Component<IconBaseProps, any> { }
+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
index a2825e6b05..0c6beadab5 100644
--- a/types/react-icons/io/android-star.d.ts
+++ b/types/react-icons/io/android-star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStar extends React.Component<IconBaseProps, any> { }
+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
index 3b874f3a7d..1094ca3036 100644
--- a/types/react-icons/io/android-stopwatch.d.ts
+++ b/types/react-icons/io/android-stopwatch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidStopwatch extends React.Component<IconBaseProps, any> { }
+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
index c565c39998..1939fd06d3 100644
--- a/types/react-icons/io/android-subway.d.ts
+++ b/types/react-icons/io/android-subway.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSubway extends React.Component<IconBaseProps, any> { }
+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
index 96b6acf251..382cc921aa 100644
--- a/types/react-icons/io/android-sunny.d.ts
+++ b/types/react-icons/io/android-sunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSunny extends React.Component<IconBaseProps, any> { }
+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
index f152288539..27b8493ecf 100644
--- a/types/react-icons/io/android-sync.d.ts
+++ b/types/react-icons/io/android-sync.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidSync extends React.Component<IconBaseProps, any> { }
+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
index f8d23c2ccc..8020ed572a 100644
--- a/types/react-icons/io/android-textsms.d.ts
+++ b/types/react-icons/io/android-textsms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTextsms extends React.Component<IconBaseProps, any> { }
+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
index 600df38624..741d66a005 100644
--- a/types/react-icons/io/android-time.d.ts
+++ b/types/react-icons/io/android-time.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTime extends React.Component<IconBaseProps, any> { }
+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
index b77afae4f5..c55e985bdd 100644
--- a/types/react-icons/io/android-train.d.ts
+++ b/types/react-icons/io/android-train.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidTrain extends React.Component<IconBaseProps, any> { }
+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
index edbd492d39..5eec9a875c 100644
--- a/types/react-icons/io/android-unlock.d.ts
+++ b/types/react-icons/io/android-unlock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUnlock extends React.Component<IconBaseProps, any> { }
+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
index ebdb5560ab..d5e092172f 100644
--- a/types/react-icons/io/android-upload.d.ts
+++ b/types/react-icons/io/android-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidUpload extends React.Component<IconBaseProps, any> { }
+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
index 695ad96bd7..ce256873be 100644
--- a/types/react-icons/io/android-volume-down.d.ts
+++ b/types/react-icons/io/android-volume-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeDown extends React.Component<IconBaseProps, any> { }
+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
index 1bdf48718f..0675809779 100644
--- a/types/react-icons/io/android-volume-mute.d.ts
+++ b/types/react-icons/io/android-volume-mute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeMute extends React.Component<IconBaseProps, any> { }
+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
index ddcb3ed017..76cbb85947 100644
--- a/types/react-icons/io/android-volume-off.d.ts
+++ b/types/react-icons/io/android-volume-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeOff extends React.Component<IconBaseProps, any> { }
+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
index d352b200e2..ff3531cf02 100644
--- a/types/react-icons/io/android-volume-up.d.ts
+++ b/types/react-icons/io/android-volume-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidVolumeUp extends React.Component<IconBaseProps, any> { }
+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
index c10d44b925..2d9c9fdfeb 100644
--- a/types/react-icons/io/android-walk.d.ts
+++ b/types/react-icons/io/android-walk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWalk extends React.Component<IconBaseProps, any> { }
+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
index 1e0550d3c8..ae0512a305 100644
--- a/types/react-icons/io/android-warning.d.ts
+++ b/types/react-icons/io/android-warning.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWarning extends React.Component<IconBaseProps, any> { }
+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
index 2d9ebe445f..fd4f03a21d 100644
--- a/types/react-icons/io/android-watch.d.ts
+++ b/types/react-icons/io/android-watch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWatch extends React.Component<IconBaseProps, any> { }
+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
index 40f5fd245e..52f56bfd92 100644
--- a/types/react-icons/io/android-wifi.d.ts
+++ b/types/react-icons/io/android-wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAndroidWifi extends React.Component<IconBaseProps, any> { }
+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
index 7c1a0b31fd..433117938f 100644
--- a/types/react-icons/io/aperture.d.ts
+++ b/types/react-icons/io/aperture.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAperture extends React.Component<IconBaseProps, any> { }
+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
index b7acf30f77..90863a6615 100644
--- a/types/react-icons/io/archive.d.ts
+++ b/types/react-icons/io/archive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArchive extends React.Component<IconBaseProps, any> { }
+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
index 43b998182c..eadf0800bb 100644
--- a/types/react-icons/io/arrow-down-a.d.ts
+++ b/types/react-icons/io/arrow-down-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownA extends React.Component<IconBaseProps, any> { }
+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
index c6794f4276..281147e627 100644
--- a/types/react-icons/io/arrow-down-b.d.ts
+++ b/types/react-icons/io/arrow-down-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownB extends React.Component<IconBaseProps, any> { }
+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
index 4633ea8b4d..ab561572b2 100644
--- a/types/react-icons/io/arrow-down-c.d.ts
+++ b/types/react-icons/io/arrow-down-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowDownC extends React.Component<IconBaseProps, any> { }
+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
index 857104510b..273819c731 100644
--- a/types/react-icons/io/arrow-expand.d.ts
+++ b/types/react-icons/io/arrow-expand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowExpand extends React.Component<IconBaseProps, any> { }
+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
index 3107c60da3..db6c5aed00 100644
--- a/types/react-icons/io/arrow-graph-down-left.d.ts
+++ b/types/react-icons/io/arrow-graph-down-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownLeft extends React.Component<IconBaseProps, any> { }
+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
index 99c75f4234..f64ec5a4b5 100644
--- a/types/react-icons/io/arrow-graph-down-right.d.ts
+++ b/types/react-icons/io/arrow-graph-down-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphDownRight extends React.Component<IconBaseProps, any> { }
+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
index bf3f3c3cdb..d4c1f87aee 100644
--- a/types/react-icons/io/arrow-graph-up-left.d.ts
+++ b/types/react-icons/io/arrow-graph-up-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpLeft extends React.Component<IconBaseProps, any> { }
+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
index 34f616c9a8..2b79959860 100644
--- a/types/react-icons/io/arrow-graph-up-right.d.ts
+++ b/types/react-icons/io/arrow-graph-up-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowGraphUpRight extends React.Component<IconBaseProps, any> { }
+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
index f4f368deff..3e7fb51bdd 100644
--- a/types/react-icons/io/arrow-left-a.d.ts
+++ b/types/react-icons/io/arrow-left-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftA extends React.Component<IconBaseProps, any> { }
+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
index 7515a0a898..537365c037 100644
--- a/types/react-icons/io/arrow-left-b.d.ts
+++ b/types/react-icons/io/arrow-left-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftB extends React.Component<IconBaseProps, any> { }
+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
index eee7edea2d..a831c73c50 100644
--- a/types/react-icons/io/arrow-left-c.d.ts
+++ b/types/react-icons/io/arrow-left-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowLeftC extends React.Component<IconBaseProps, any> { }
+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
index 537b182b6d..1a61a6c75c 100644
--- a/types/react-icons/io/arrow-move.d.ts
+++ b/types/react-icons/io/arrow-move.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowMove extends React.Component<IconBaseProps, any> { }
+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
index 2dab95a0ef..a8efbc36cf 100644
--- a/types/react-icons/io/arrow-resize.d.ts
+++ b/types/react-icons/io/arrow-resize.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowResize extends React.Component<IconBaseProps, any> { }
+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
index f40dfed04d..9e0a076927 100644
--- a/types/react-icons/io/arrow-return-left.d.ts
+++ b/types/react-icons/io/arrow-return-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnLeft extends React.Component<IconBaseProps, any> { }
+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
index b4bee5c253..0bab75e6e9 100644
--- a/types/react-icons/io/arrow-return-right.d.ts
+++ b/types/react-icons/io/arrow-return-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowReturnRight extends React.Component<IconBaseProps, any> { }
+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
index 19caf9f44e..e91a2984da 100644
--- a/types/react-icons/io/arrow-right-a.d.ts
+++ b/types/react-icons/io/arrow-right-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightA extends React.Component<IconBaseProps, any> { }
+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
index ead12c523e..e85dce6f12 100644
--- a/types/react-icons/io/arrow-right-b.d.ts
+++ b/types/react-icons/io/arrow-right-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightB extends React.Component<IconBaseProps, any> { }
+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
index e923885361..5673e8df4c 100644
--- a/types/react-icons/io/arrow-right-c.d.ts
+++ b/types/react-icons/io/arrow-right-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowRightC extends React.Component<IconBaseProps, any> { }
+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
index ba763aca10..5fa8093af3 100644
--- a/types/react-icons/io/arrow-shrink.d.ts
+++ b/types/react-icons/io/arrow-shrink.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowShrink extends React.Component<IconBaseProps, any> { }
+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
index 53ff7eb8fe..885a2c27ad 100644
--- a/types/react-icons/io/arrow-swap.d.ts
+++ b/types/react-icons/io/arrow-swap.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowSwap extends React.Component<IconBaseProps, any> { }
+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
index 89c131a6b0..a3967e9d42 100644
--- a/types/react-icons/io/arrow-up-a.d.ts
+++ b/types/react-icons/io/arrow-up-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpA extends React.Component<IconBaseProps, any> { }
+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
index 1eabcaf460..1c91d058f7 100644
--- a/types/react-icons/io/arrow-up-b.d.ts
+++ b/types/react-icons/io/arrow-up-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpB extends React.Component<IconBaseProps, any> { }
+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
index 0386c9d4cb..9ca25a35a9 100644
--- a/types/react-icons/io/arrow-up-c.d.ts
+++ b/types/react-icons/io/arrow-up-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoArrowUpC extends React.Component<IconBaseProps, any> { }
+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
index 2d89adce5b..a5b58bd24e 100644
--- a/types/react-icons/io/asterisk.d.ts
+++ b/types/react-icons/io/asterisk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAsterisk extends React.Component<IconBaseProps, any> { }
+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
index 21073d748c..cb7284b40f 100644
--- a/types/react-icons/io/at.d.ts
+++ b/types/react-icons/io/at.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoAt extends React.Component<IconBaseProps, any> { }
+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
index 5f2002740f..8ce9f476c5 100644
--- a/types/react-icons/io/backspace-outline.d.ts
+++ b/types/react-icons/io/backspace-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspaceOutline extends React.Component<IconBaseProps, any> { }
+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
index 37c3c54c9a..a1d19677b8 100644
--- a/types/react-icons/io/backspace.d.ts
+++ b/types/react-icons/io/backspace.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBackspace extends React.Component<IconBaseProps, any> { }
+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
index 9048c53ecf..538f19a520 100644
--- a/types/react-icons/io/bag.d.ts
+++ b/types/react-icons/io/bag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBag extends React.Component<IconBaseProps, any> { }
+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
index 86b945206d..b950673aae 100644
--- a/types/react-icons/io/battery-charging.d.ts
+++ b/types/react-icons/io/battery-charging.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryCharging extends React.Component<IconBaseProps, any> { }
+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
index a670ac79f5..0a8268869c 100644
--- a/types/react-icons/io/battery-empty.d.ts
+++ b/types/react-icons/io/battery-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryEmpty extends React.Component<IconBaseProps, any> { }
+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
index 714f2d51b8..493488adf3 100644
--- a/types/react-icons/io/battery-full.d.ts
+++ b/types/react-icons/io/battery-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryFull extends React.Component<IconBaseProps, any> { }
+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
index 75752f0a4a..0671295096 100644
--- a/types/react-icons/io/battery-half.d.ts
+++ b/types/react-icons/io/battery-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryHalf extends React.Component<IconBaseProps, any> { }
+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
index 0d2f1da625..3c2964a52b 100644
--- a/types/react-icons/io/battery-low.d.ts
+++ b/types/react-icons/io/battery-low.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBatteryLow extends React.Component<IconBaseProps, any> { }
+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
index 1ae78d39ab..5f68a801f8 100644
--- a/types/react-icons/io/beaker.d.ts
+++ b/types/react-icons/io/beaker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBeaker extends React.Component<IconBaseProps, any> { }
+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
index 3a4ca984ef..9f2f5739ac 100644
--- a/types/react-icons/io/beer.d.ts
+++ b/types/react-icons/io/beer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBeer extends React.Component<IconBaseProps, any> { }
+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
index a6c7b3179e..58eb2659e0 100644
--- a/types/react-icons/io/bluetooth.d.ts
+++ b/types/react-icons/io/bluetooth.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBluetooth extends React.Component<IconBaseProps, any> { }
+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
index f272013c65..c0ef9d7cae 100644
--- a/types/react-icons/io/bonfire.d.ts
+++ b/types/react-icons/io/bonfire.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBonfire extends React.Component<IconBaseProps, any> { }
+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
index 6edc38366c..3479c40e67 100644
--- a/types/react-icons/io/bookmark.d.ts
+++ b/types/react-icons/io/bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBookmark extends React.Component<IconBaseProps, any> { }
+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
index 9c053cf7d5..6f983612ce 100644
--- a/types/react-icons/io/bowtie.d.ts
+++ b/types/react-icons/io/bowtie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBowtie extends React.Component<IconBaseProps, any> { }
+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
index 9d95b94c0d..baa5708abd 100644
--- a/types/react-icons/io/briefcase.d.ts
+++ b/types/react-icons/io/briefcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBriefcase extends React.Component<IconBaseProps, any> { }
+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
index a48a35b45b..a97e391988 100644
--- a/types/react-icons/io/bug.d.ts
+++ b/types/react-icons/io/bug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoBug extends React.Component<IconBaseProps, any> { }
+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
index 545127c1ea..17bc0695d2 100644
--- a/types/react-icons/io/calculator.d.ts
+++ b/types/react-icons/io/calculator.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCalculator extends React.Component<IconBaseProps, any> { }
+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
index b610a70508..48de2d1402 100644
--- a/types/react-icons/io/calendar.d.ts
+++ b/types/react-icons/io/calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCalendar extends React.Component<IconBaseProps, any> { }
+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
index ffcf223185..f362c37794 100644
--- a/types/react-icons/io/camera.d.ts
+++ b/types/react-icons/io/camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCamera extends React.Component<IconBaseProps, any> { }
+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
index 163cf08cbe..4aa32829b4 100644
--- a/types/react-icons/io/card.d.ts
+++ b/types/react-icons/io/card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCard extends React.Component<IconBaseProps, any> { }
+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
index 329e48a87b..8c8a23acfd 100644
--- a/types/react-icons/io/cash.d.ts
+++ b/types/react-icons/io/cash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCash extends React.Component<IconBaseProps, any> { }
+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
index 7bd00d64d0..6574ba5b9c 100644
--- a/types/react-icons/io/chatbox-working.d.ts
+++ b/types/react-icons/io/chatbox-working.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxWorking extends React.Component<IconBaseProps, any> { }
+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
index 3a9a887b31..71907bcada 100644
--- a/types/react-icons/io/chatbox.d.ts
+++ b/types/react-icons/io/chatbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbox extends React.Component<IconBaseProps, any> { }
+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
index e03ed11a22..6a4aff2857 100644
--- a/types/react-icons/io/chatboxes.d.ts
+++ b/types/react-icons/io/chatboxes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatboxes extends React.Component<IconBaseProps, any> { }
+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
index 00d1356f17..667fb7fcde 100644
--- a/types/react-icons/io/chatbubble-working.d.ts
+++ b/types/react-icons/io/chatbubble-working.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbleWorking extends React.Component<IconBaseProps, any> { }
+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
index 4e2d2da324..08ecb48df7 100644
--- a/types/react-icons/io/chatbubble.d.ts
+++ b/types/react-icons/io/chatbubble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubble extends React.Component<IconBaseProps, any> { }
+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
index 8fa888084a..ebf87a1cc5 100644
--- a/types/react-icons/io/chatbubbles.d.ts
+++ b/types/react-icons/io/chatbubbles.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChatbubbles extends React.Component<IconBaseProps, any> { }
+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
index d71f238419..892e19a107 100644
--- a/types/react-icons/io/checkmark-circled.d.ts
+++ b/types/react-icons/io/checkmark-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkCircled extends React.Component<IconBaseProps, any> { }
+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
index 197bd609e5..1311db9d47 100644
--- a/types/react-icons/io/checkmark-round.d.ts
+++ b/types/react-icons/io/checkmark-round.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmarkRound extends React.Component<IconBaseProps, any> { }
+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
index 01ca59e306..0eda0d12da 100644
--- a/types/react-icons/io/checkmark.d.ts
+++ b/types/react-icons/io/checkmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCheckmark extends React.Component<IconBaseProps, any> { }
+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
index 6e40a3a226..0d9546467d 100644
--- a/types/react-icons/io/chevron-down.d.ts
+++ b/types/react-icons/io/chevron-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronDown extends React.Component<IconBaseProps, any> { }
+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
index a723b8bb21..96fbe2a03f 100644
--- a/types/react-icons/io/chevron-left.d.ts
+++ b/types/react-icons/io/chevron-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronLeft extends React.Component<IconBaseProps, any> { }
+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
index cda640e1e9..a83489fa83 100644
--- a/types/react-icons/io/chevron-right.d.ts
+++ b/types/react-icons/io/chevron-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronRight extends React.Component<IconBaseProps, any> { }
+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
index 19ac1ca74b..a56e43a584 100644
--- a/types/react-icons/io/chevron-up.d.ts
+++ b/types/react-icons/io/chevron-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoChevronUp extends React.Component<IconBaseProps, any> { }
+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
index 0786e41954..79fc2dd2f7 100644
--- a/types/react-icons/io/clipboard.d.ts
+++ b/types/react-icons/io/clipboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClipboard extends React.Component<IconBaseProps, any> { }
+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
index f8c2c3937d..50d4dd2af1 100644
--- a/types/react-icons/io/clock.d.ts
+++ b/types/react-icons/io/clock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClock extends React.Component<IconBaseProps, any> { }
+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
index d1a93a2d8d..dd6fb5e9d2 100644
--- a/types/react-icons/io/close-circled.d.ts
+++ b/types/react-icons/io/close-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseCircled extends React.Component<IconBaseProps, any> { }
+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
index e763fd7a6a..a918a8e534 100644
--- a/types/react-icons/io/close-round.d.ts
+++ b/types/react-icons/io/close-round.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloseRound extends React.Component<IconBaseProps, any> { }
+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
index eb0c318d7f..acc49f00ac 100644
--- a/types/react-icons/io/close.d.ts
+++ b/types/react-icons/io/close.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClose extends React.Component<IconBaseProps, any> { }
+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
index 56d8e72446..5a2b68d149 100644
--- a/types/react-icons/io/closed-captioning.d.ts
+++ b/types/react-icons/io/closed-captioning.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoClosedCaptioning extends React.Component<IconBaseProps, any> { }
+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
index 097b4c751a..837051ce2f 100644
--- a/types/react-icons/io/cloud.d.ts
+++ b/types/react-icons/io/cloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCloud extends React.Component<IconBaseProps, any> { }
+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
index 52e4018d3d..765b401172 100644
--- a/types/react-icons/io/code-download.d.ts
+++ b/types/react-icons/io/code-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeDownload extends React.Component<IconBaseProps, any> { }
+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
index 2dd005c00b..48cf64ecd5 100644
--- a/types/react-icons/io/code-working.d.ts
+++ b/types/react-icons/io/code-working.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCodeWorking extends React.Component<IconBaseProps, any> { }
+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
index 8d5dbb322b..3d89e7aec1 100644
--- a/types/react-icons/io/code.d.ts
+++ b/types/react-icons/io/code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCode extends React.Component<IconBaseProps, any> { }
+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
index 3618fad4e6..f3122b5343 100644
--- a/types/react-icons/io/coffee.d.ts
+++ b/types/react-icons/io/coffee.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCoffee extends React.Component<IconBaseProps, any> { }
+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
index 09e85aa7eb..c0b78dd711 100644
--- a/types/react-icons/io/compass.d.ts
+++ b/types/react-icons/io/compass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCompass extends React.Component<IconBaseProps, any> { }
+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
index 96e7eddca7..5250bbf5f9 100644
--- a/types/react-icons/io/compose.d.ts
+++ b/types/react-icons/io/compose.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCompose extends React.Component<IconBaseProps, any> { }
+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
index 252afa9acc..2484005cf3 100644
--- a/types/react-icons/io/connectbars.d.ts
+++ b/types/react-icons/io/connectbars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoConnectbars extends React.Component<IconBaseProps, any> { }
+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
index 75aa14661b..871e34e2b5 100644
--- a/types/react-icons/io/contrast.d.ts
+++ b/types/react-icons/io/contrast.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoContrast extends React.Component<IconBaseProps, any> { }
+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
index f93cf3f6b5..1d9f6fe16f 100644
--- a/types/react-icons/io/crop.d.ts
+++ b/types/react-icons/io/crop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCrop extends React.Component<IconBaseProps, any> { }
+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
index 0c56865c9e..0e20a500a0 100644
--- a/types/react-icons/io/cube.d.ts
+++ b/types/react-icons/io/cube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoCube extends React.Component<IconBaseProps, any> { }
+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
index 2c4242e6a4..adb12527e7 100644
--- a/types/react-icons/io/disc.d.ts
+++ b/types/react-icons/io/disc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDisc extends React.Component<IconBaseProps, any> { }
+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
index 76174a0bce..4c419e9766 100644
--- a/types/react-icons/io/document-text.d.ts
+++ b/types/react-icons/io/document-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDocumentText extends React.Component<IconBaseProps, any> { }
+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
index 15b211a8e9..098ab00b2a 100644
--- a/types/react-icons/io/document.d.ts
+++ b/types/react-icons/io/document.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDocument extends React.Component<IconBaseProps, any> { }
+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
index 13f5af9832..628c38c338 100644
--- a/types/react-icons/io/drag.d.ts
+++ b/types/react-icons/io/drag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoDrag extends React.Component<IconBaseProps, any> { }
+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
index ad66307d27..5d502a5882 100644
--- a/types/react-icons/io/earth.d.ts
+++ b/types/react-icons/io/earth.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEarth extends React.Component<IconBaseProps, any> { }
+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
index 190546caf2..dc8b3ff32d 100644
--- a/types/react-icons/io/easel.d.ts
+++ b/types/react-icons/io/easel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEasel extends React.Component<IconBaseProps, any> { }
+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
index 1456c7452e..ea10d7df2a 100644
--- a/types/react-icons/io/edit.d.ts
+++ b/types/react-icons/io/edit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEdit extends React.Component<IconBaseProps, any> { }
+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
index 49579cde7f..39e63c2f48 100644
--- a/types/react-icons/io/egg.d.ts
+++ b/types/react-icons/io/egg.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEgg extends React.Component<IconBaseProps, any> { }
+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
index ee3e7c2930..1f859a0b76 100644
--- a/types/react-icons/io/eject.d.ts
+++ b/types/react-icons/io/eject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEject extends React.Component<IconBaseProps, any> { }
+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
index 9d51a0e644..acdaefd764 100644
--- a/types/react-icons/io/email-unread.d.ts
+++ b/types/react-icons/io/email-unread.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEmailUnread extends React.Component<IconBaseProps, any> { }
+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
index fc0d8771ab..7323479361 100644
--- a/types/react-icons/io/email.d.ts
+++ b/types/react-icons/io/email.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEmail extends React.Component<IconBaseProps, any> { }
+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
index 34564641a1..fed2da9f1f 100644
--- a/types/react-icons/io/erlenmeyer-flask-bubbles.d.ts
+++ b/types/react-icons/io/erlenmeyer-flask-bubbles.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlaskBubbles extends React.Component<IconBaseProps, any> { }
+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
index b84b359668..0de1fd7c42 100644
--- a/types/react-icons/io/erlenmeyer-flask.d.ts
+++ b/types/react-icons/io/erlenmeyer-flask.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoErlenmeyerFlask extends React.Component<IconBaseProps, any> { }
+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
index 0d32bfaec1..3bf20def2a 100644
--- a/types/react-icons/io/eye-disabled.d.ts
+++ b/types/react-icons/io/eye-disabled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEyeDisabled extends React.Component<IconBaseProps, any> { }
+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
index 0f0461d1f5..270c59505f 100644
--- a/types/react-icons/io/eye.d.ts
+++ b/types/react-icons/io/eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoEye extends React.Component<IconBaseProps, any> { }
+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
index cd4d24d0a6..cb795e884b 100644
--- a/types/react-icons/io/female.d.ts
+++ b/types/react-icons/io/female.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFemale extends React.Component<IconBaseProps, any> { }
+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
index cc4255960c..ba69d4eb8b 100644
--- a/types/react-icons/io/filing.d.ts
+++ b/types/react-icons/io/filing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFiling extends React.Component<IconBaseProps, any> { }
+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
index e912a514fe..4e4a7158f2 100644
--- a/types/react-icons/io/film-marker.d.ts
+++ b/types/react-icons/io/film-marker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFilmMarker extends React.Component<IconBaseProps, any> { }
+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
index 6bb32f064f..e7056b1534 100644
--- a/types/react-icons/io/fireball.d.ts
+++ b/types/react-icons/io/fireball.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFireball extends React.Component<IconBaseProps, any> { }
+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
index bb9df02197..c06630b1a6 100644
--- a/types/react-icons/io/flag.d.ts
+++ b/types/react-icons/io/flag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlag extends React.Component<IconBaseProps, any> { }
+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
index 089960aa34..d49d1bd2db 100644
--- a/types/react-icons/io/flame.d.ts
+++ b/types/react-icons/io/flame.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlame extends React.Component<IconBaseProps, any> { }
+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
index 480acfd853..2b12ebe578 100644
--- a/types/react-icons/io/flash-off.d.ts
+++ b/types/react-icons/io/flash-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlashOff extends React.Component<IconBaseProps, any> { }
+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
index 25645d6816..32901f5a9d 100644
--- a/types/react-icons/io/flash.d.ts
+++ b/types/react-icons/io/flash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFlash extends React.Component<IconBaseProps, any> { }
+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
index 76eaa2a79e..dd14763f19 100644
--- a/types/react-icons/io/folder.d.ts
+++ b/types/react-icons/io/folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFolder extends React.Component<IconBaseProps, any> { }
+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
index 36cbe0fd27..19dfd6a33c 100644
--- a/types/react-icons/io/fork-repo.d.ts
+++ b/types/react-icons/io/fork-repo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoForkRepo extends React.Component<IconBaseProps, any> { }
+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
index a1b8eba37e..b06aa1f455 100644
--- a/types/react-icons/io/fork.d.ts
+++ b/types/react-icons/io/fork.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFork extends React.Component<IconBaseProps, any> { }
+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
index 0bd58772e5..1b36aa1de7 100644
--- a/types/react-icons/io/forward.d.ts
+++ b/types/react-icons/io/forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoForward extends React.Component<IconBaseProps, any> { }
+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
index 1bfb1bf73f..be56fcd18c 100644
--- a/types/react-icons/io/funnel.d.ts
+++ b/types/react-icons/io/funnel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoFunnel extends React.Component<IconBaseProps, any> { }
+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
index 4cff871a5b..b04f6af6c2 100644
--- a/types/react-icons/io/gear-a.d.ts
+++ b/types/react-icons/io/gear-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGearA extends React.Component<IconBaseProps, any> { }
+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
index 1e9db54e76..b580d2bc7c 100644
--- a/types/react-icons/io/gear-b.d.ts
+++ b/types/react-icons/io/gear-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGearB extends React.Component<IconBaseProps, any> { }
+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
index c69fea18b8..b30f3a11c2 100644
--- a/types/react-icons/io/grid.d.ts
+++ b/types/react-icons/io/grid.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoGrid extends React.Component<IconBaseProps, any> { }
+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
index c2dbecb6c2..4ea6d0c306 100644
--- a/types/react-icons/io/hammer.d.ts
+++ b/types/react-icons/io/hammer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHammer extends React.Component<IconBaseProps, any> { }
+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
index 7677f2a3fe..3207610467 100644
--- a/types/react-icons/io/happy-outline.d.ts
+++ b/types/react-icons/io/happy-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHappyOutline extends React.Component<IconBaseProps, any> { }
+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
index 48e45acf8a..f773c9e528 100644
--- a/types/react-icons/io/happy.d.ts
+++ b/types/react-icons/io/happy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHappy extends React.Component<IconBaseProps, any> { }
+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
index 746f72d02b..e1ebdc9185 100644
--- a/types/react-icons/io/headphone.d.ts
+++ b/types/react-icons/io/headphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeadphone extends React.Component<IconBaseProps, any> { }
+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
index eaded2a8fc..822a928ac6 100644
--- a/types/react-icons/io/heart-broken.d.ts
+++ b/types/react-icons/io/heart-broken.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeartBroken extends React.Component<IconBaseProps, any> { }
+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
index e4e509c581..e543207ae6 100644
--- a/types/react-icons/io/heart.d.ts
+++ b/types/react-icons/io/heart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHeart extends React.Component<IconBaseProps, any> { }
+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
index 79fde03761..9a84933640 100644
--- a/types/react-icons/io/help-buoy.d.ts
+++ b/types/react-icons/io/help-buoy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpBuoy extends React.Component<IconBaseProps, any> { }
+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
index 8232b5bb47..f36a8fd5f8 100644
--- a/types/react-icons/io/help-circled.d.ts
+++ b/types/react-icons/io/help-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelpCircled extends React.Component<IconBaseProps, any> { }
+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
index d6781cca43..8eee2581c6 100644
--- a/types/react-icons/io/help.d.ts
+++ b/types/react-icons/io/help.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHelp extends React.Component<IconBaseProps, any> { }
+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
index a3d2639ebe..337bace8fa 100644
--- a/types/react-icons/io/home.d.ts
+++ b/types/react-icons/io/home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoHome extends React.Component<IconBaseProps, any> { }
+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
index 17c1b8c2fc..1c3f0bd2af 100644
--- a/types/react-icons/io/icecream.d.ts
+++ b/types/react-icons/io/icecream.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIcecream extends React.Component<IconBaseProps, any> { }
+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
index 4e30072405..3fbf7da59a 100644
--- a/types/react-icons/io/image.d.ts
+++ b/types/react-icons/io/image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoImage extends React.Component<IconBaseProps, any> { }
+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
index f613138f8c..ae80a81b1e 100644
--- a/types/react-icons/io/images.d.ts
+++ b/types/react-icons/io/images.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoImages extends React.Component<IconBaseProps, any> { }
+export default class IoImages extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/io/informatcircled.d.ts b/types/react-icons/io/informatcircled.d.ts
index 5467f0745c..2ef20abca7 100644
--- a/types/react-icons/io/informatcircled.d.ts
+++ b/types/react-icons/io/informatcircled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoInformatcircled extends React.Component<IconBaseProps, any> { }
+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
index 5a4784e2c3..02652a360f 100644
--- a/types/react-icons/io/information.d.ts
+++ b/types/react-icons/io/information.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoInformation extends React.Component<IconBaseProps, any> { }
+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
index dae6388dab..9e19c402cf 100644
--- a/types/react-icons/io/ionic.d.ts
+++ b/types/react-icons/io/ionic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIonic extends React.Component<IconBaseProps, any> { }
+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
index 759acf86c3..c211ebccee 100644
--- a/types/react-icons/io/ios-alarm-outline.d.ts
+++ b/types/react-icons/io/ios-alarm-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarmOutline extends React.Component<IconBaseProps, any> { }
+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
index b57e4aa26c..c61987318d 100644
--- a/types/react-icons/io/ios-alarm.d.ts
+++ b/types/react-icons/io/ios-alarm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlarm extends React.Component<IconBaseProps, any> { }
+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
index 3da01c70c1..48e06ad4b8 100644
--- a/types/react-icons/io/ios-albums-outline.d.ts
+++ b/types/react-icons/io/ios-albums-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbumsOutline extends React.Component<IconBaseProps, any> { }
+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
index 42a497948b..be7c86317a 100644
--- a/types/react-icons/io/ios-albums.d.ts
+++ b/types/react-icons/io/ios-albums.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAlbums extends React.Component<IconBaseProps, any> { }
+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
index 8f363c2f58..d7041c17d3 100644
--- a/types/react-icons/io/ios-americanfootball-outline.d.ts
+++ b/types/react-icons/io/ios-americanfootball-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootballOutline extends React.Component<IconBaseProps, any> { }
+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
index 38efbb1ea2..4af77520ff 100644
--- a/types/react-icons/io/ios-americanfootball.d.ts
+++ b/types/react-icons/io/ios-americanfootball.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAmericanfootball extends React.Component<IconBaseProps, any> { }
+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
index 5337842d05..6192de6c58 100644
--- a/types/react-icons/io/ios-analytics-outline.d.ts
+++ b/types/react-icons/io/ios-analytics-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalyticsOutline extends React.Component<IconBaseProps, any> { }
+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
index 1842203b26..9f3d9e110e 100644
--- a/types/react-icons/io/ios-analytics.d.ts
+++ b/types/react-icons/io/ios-analytics.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAnalytics extends React.Component<IconBaseProps, any> { }
+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
index 6556d42aa5..1466e59a6d 100644
--- a/types/react-icons/io/ios-arrow-back.d.ts
+++ b/types/react-icons/io/ios-arrow-back.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowBack extends React.Component<IconBaseProps, any> { }
+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
index ed2b7a9b82..91773f927b 100644
--- a/types/react-icons/io/ios-arrow-down.d.ts
+++ b/types/react-icons/io/ios-arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowDown extends React.Component<IconBaseProps, any> { }
+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
index a33c985c90..a2bf7fe213 100644
--- a/types/react-icons/io/ios-arrow-forward.d.ts
+++ b/types/react-icons/io/ios-arrow-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowForward extends React.Component<IconBaseProps, any> { }
+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
index af36f8ce7e..0588edeed0 100644
--- a/types/react-icons/io/ios-arrow-left.d.ts
+++ b/types/react-icons/io/ios-arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index 11f5b76ec6..5642202b5c 100644
--- a/types/react-icons/io/ios-arrow-right.d.ts
+++ b/types/react-icons/io/ios-arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowRight extends React.Component<IconBaseProps, any> { }
+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
index 87f39e9662..183b547848 100644
--- a/types/react-icons/io/ios-arrow-thin-down.d.ts
+++ b/types/react-icons/io/ios-arrow-thin-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinDown extends React.Component<IconBaseProps, any> { }
+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
index e4d890a746..4fea91fe45 100644
--- a/types/react-icons/io/ios-arrow-thin-left.d.ts
+++ b/types/react-icons/io/ios-arrow-thin-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinLeft extends React.Component<IconBaseProps, any> { }
+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
index ebf9f34510..5e70abd099 100644
--- a/types/react-icons/io/ios-arrow-thin-right.d.ts
+++ b/types/react-icons/io/ios-arrow-thin-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinRight extends React.Component<IconBaseProps, any> { }
+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
index 8094a81add..412e0b53a2 100644
--- a/types/react-icons/io/ios-arrow-thin-up.d.ts
+++ b/types/react-icons/io/ios-arrow-thin-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowThinUp extends React.Component<IconBaseProps, any> { }
+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
index 285f7d29cb..2adf431795 100644
--- a/types/react-icons/io/ios-arrow-up.d.ts
+++ b/types/react-icons/io/ios-arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 88fddc8920..7d20c06912 100644
--- a/types/react-icons/io/ios-at-outline.d.ts
+++ b/types/react-icons/io/ios-at-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAtOutline extends React.Component<IconBaseProps, any> { }
+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
index 082be92fd4..5789d0b976 100644
--- a/types/react-icons/io/ios-at.d.ts
+++ b/types/react-icons/io/ios-at.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosAt extends React.Component<IconBaseProps, any> { }
+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
index 95f3a24a93..a82a5b88c8 100644
--- a/types/react-icons/io/ios-barcode-outline.d.ts
+++ b/types/react-icons/io/ios-barcode-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcodeOutline extends React.Component<IconBaseProps, any> { }
+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
index 38d8fe8a38..20a769e78e 100644
--- a/types/react-icons/io/ios-barcode.d.ts
+++ b/types/react-icons/io/ios-barcode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBarcode extends React.Component<IconBaseProps, any> { }
+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
index 343cebd532..99856309a9 100644
--- a/types/react-icons/io/ios-baseball-outline.d.ts
+++ b/types/react-icons/io/ios-baseball-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseballOutline extends React.Component<IconBaseProps, any> { }
+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
index adfe8cdf04..1470fd138c 100644
--- a/types/react-icons/io/ios-baseball.d.ts
+++ b/types/react-icons/io/ios-baseball.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBaseball extends React.Component<IconBaseProps, any> { }
+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
index 2fd0cf43cd..5b2d8845df 100644
--- a/types/react-icons/io/ios-basketball-outline.d.ts
+++ b/types/react-icons/io/ios-basketball-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketballOutline extends React.Component<IconBaseProps, any> { }
+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
index b0eccd71aa..294798f648 100644
--- a/types/react-icons/io/ios-basketball.d.ts
+++ b/types/react-icons/io/ios-basketball.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBasketball extends React.Component<IconBaseProps, any> { }
+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
index 961075e9f3..c03c49121e 100644
--- a/types/react-icons/io/ios-bell-outline.d.ts
+++ b/types/react-icons/io/ios-bell-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBellOutline extends React.Component<IconBaseProps, any> { }
+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
index 662cb687a5..d1b90b21f9 100644
--- a/types/react-icons/io/ios-bell.d.ts
+++ b/types/react-icons/io/ios-bell.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBell extends React.Component<IconBaseProps, any> { }
+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
index dbfe906ead..235ed9bca0 100644
--- a/types/react-icons/io/ios-body-outline.d.ts
+++ b/types/react-icons/io/ios-body-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBodyOutline extends React.Component<IconBaseProps, any> { }
+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
index 0a12cef225..89712f6b0e 100644
--- a/types/react-icons/io/ios-body.d.ts
+++ b/types/react-icons/io/ios-body.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBody extends React.Component<IconBaseProps, any> { }
+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
index baad67027d..acc1db40e6 100644
--- a/types/react-icons/io/ios-bolt-outline.d.ts
+++ b/types/react-icons/io/ios-bolt-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoltOutline extends React.Component<IconBaseProps, any> { }
+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
index 89dc51b85b..a953af8901 100644
--- a/types/react-icons/io/ios-bolt.d.ts
+++ b/types/react-icons/io/ios-bolt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBolt extends React.Component<IconBaseProps, any> { }
+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
index 03a2577753..d6587de870 100644
--- a/types/react-icons/io/ios-book-outline.d.ts
+++ b/types/react-icons/io/ios-book-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookOutline extends React.Component<IconBaseProps, any> { }
+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
index cb8ca44a0a..9bcddd9e60 100644
--- a/types/react-icons/io/ios-book.d.ts
+++ b/types/react-icons/io/ios-book.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBook extends React.Component<IconBaseProps, any> { }
+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
index 2426c53087..c999d5cdd5 100644
--- a/types/react-icons/io/ios-bookmarks-outline.d.ts
+++ b/types/react-icons/io/ios-bookmarks-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarksOutline extends React.Component<IconBaseProps, any> { }
+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
index fc14e05523..42a926adda 100644
--- a/types/react-icons/io/ios-bookmarks.d.ts
+++ b/types/react-icons/io/ios-bookmarks.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBookmarks extends React.Component<IconBaseProps, any> { }
+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
index 7f5d60c522..02b34cefc1 100644
--- a/types/react-icons/io/ios-box-outline.d.ts
+++ b/types/react-icons/io/ios-box-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBoxOutline extends React.Component<IconBaseProps, any> { }
+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
index 3170b180b9..67ab43d367 100644
--- a/types/react-icons/io/ios-box.d.ts
+++ b/types/react-icons/io/ios-box.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBox extends React.Component<IconBaseProps, any> { }
+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
index 448f18a2f5..bcba814767 100644
--- a/types/react-icons/io/ios-briefcase-outline.d.ts
+++ b/types/react-icons/io/ios-briefcase-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcaseOutline extends React.Component<IconBaseProps, any> { }
+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
index 81720fc95c..03409c1dc4 100644
--- a/types/react-icons/io/ios-briefcase.d.ts
+++ b/types/react-icons/io/ios-briefcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBriefcase extends React.Component<IconBaseProps, any> { }
+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
index 48af65eee6..a85fd4dfc9 100644
--- a/types/react-icons/io/ios-browsers-outline.d.ts
+++ b/types/react-icons/io/ios-browsers-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsersOutline extends React.Component<IconBaseProps, any> { }
+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
index 15c36baa72..155d546472 100644
--- a/types/react-icons/io/ios-browsers.d.ts
+++ b/types/react-icons/io/ios-browsers.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosBrowsers extends React.Component<IconBaseProps, any> { }
+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
index 25630cdd92..19453725e5 100644
--- a/types/react-icons/io/ios-calculator-outline.d.ts
+++ b/types/react-icons/io/ios-calculator-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculatorOutline extends React.Component<IconBaseProps, any> { }
+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
index 257d1f2622..736a4f431f 100644
--- a/types/react-icons/io/ios-calculator.d.ts
+++ b/types/react-icons/io/ios-calculator.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalculator extends React.Component<IconBaseProps, any> { }
+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
index 0b4acad834..131eba8430 100644
--- a/types/react-icons/io/ios-calendar-outline.d.ts
+++ b/types/react-icons/io/ios-calendar-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendarOutline extends React.Component<IconBaseProps, any> { }
+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
index 77c34b32b5..3275cc770c 100644
--- a/types/react-icons/io/ios-calendar.d.ts
+++ b/types/react-icons/io/ios-calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCalendar extends React.Component<IconBaseProps, any> { }
+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
index 830c647091..194cacb253 100644
--- a/types/react-icons/io/ios-camera-outline.d.ts
+++ b/types/react-icons/io/ios-camera-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCameraOutline extends React.Component<IconBaseProps, any> { }
+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
index 4e3837b412..346d035f8c 100644
--- a/types/react-icons/io/ios-camera.d.ts
+++ b/types/react-icons/io/ios-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCamera extends React.Component<IconBaseProps, any> { }
+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
index 720a8d9eac..d7f76296dd 100644
--- a/types/react-icons/io/ios-cart-outline.d.ts
+++ b/types/react-icons/io/ios-cart-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCartOutline extends React.Component<IconBaseProps, any> { }
+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
index 8f8dfbc3f1..918b941efc 100644
--- a/types/react-icons/io/ios-cart.d.ts
+++ b/types/react-icons/io/ios-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCart extends React.Component<IconBaseProps, any> { }
+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
index 45453ce29e..1db97e7086 100644
--- a/types/react-icons/io/ios-chatboxes-outline.d.ts
+++ b/types/react-icons/io/ios-chatboxes-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxesOutline extends React.Component<IconBaseProps, any> { }
+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
index 6e9d7a11cc..a32fdd72c4 100644
--- a/types/react-icons/io/ios-chatboxes.d.ts
+++ b/types/react-icons/io/ios-chatboxes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatboxes extends React.Component<IconBaseProps, any> { }
+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
index caa0a7dfdc..ba2b57a053 100644
--- a/types/react-icons/io/ios-chatbubble-outline.d.ts
+++ b/types/react-icons/io/ios-chatbubble-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubbleOutline extends React.Component<IconBaseProps, any> { }
+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
index c2555b012e..bb9d024821 100644
--- a/types/react-icons/io/ios-chatbubble.d.ts
+++ b/types/react-icons/io/ios-chatbubble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosChatbubble extends React.Component<IconBaseProps, any> { }
+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
index 699edb92f7..328adb1f00 100644
--- a/types/react-icons/io/ios-checkmark-empty.d.ts
+++ b/types/react-icons/io/ios-checkmark-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkEmpty extends React.Component<IconBaseProps, any> { }
+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
index e71ccee8e0..cb19eebc9b 100644
--- a/types/react-icons/io/ios-checkmark-outline.d.ts
+++ b/types/react-icons/io/ios-checkmark-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmarkOutline extends React.Component<IconBaseProps, any> { }
+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
index bb7c001db4..3fcabda1bf 100644
--- a/types/react-icons/io/ios-checkmark.d.ts
+++ b/types/react-icons/io/ios-checkmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCheckmark extends React.Component<IconBaseProps, any> { }
+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
index 4e72fb033d..4b4192096d 100644
--- a/types/react-icons/io/ios-circle-filled.d.ts
+++ b/types/react-icons/io/ios-circle-filled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleFilled extends React.Component<IconBaseProps, any> { }
+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
index cd53646743..99a0ae723f 100644
--- a/types/react-icons/io/ios-circle-outline.d.ts
+++ b/types/react-icons/io/ios-circle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCircleOutline extends React.Component<IconBaseProps, any> { }
+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
index a9adb0ee25..2d5febf0a9 100644
--- a/types/react-icons/io/ios-clock-outline.d.ts
+++ b/types/react-icons/io/ios-clock-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClockOutline extends React.Component<IconBaseProps, any> { }
+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
index 00be78b7dd..aa160a4bd7 100644
--- a/types/react-icons/io/ios-clock.d.ts
+++ b/types/react-icons/io/ios-clock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClock extends React.Component<IconBaseProps, any> { }
+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
index 939c7bd477..44a0c8d17b 100644
--- a/types/react-icons/io/ios-close-empty.d.ts
+++ b/types/react-icons/io/ios-close-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseEmpty extends React.Component<IconBaseProps, any> { }
+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
index 22976b5c79..323c5b9d4a 100644
--- a/types/react-icons/io/ios-close-outline.d.ts
+++ b/types/react-icons/io/ios-close-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloseOutline extends React.Component<IconBaseProps, any> { }
+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
index a4e88f4185..21ed802d2a 100644
--- a/types/react-icons/io/ios-close.d.ts
+++ b/types/react-icons/io/ios-close.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosClose extends React.Component<IconBaseProps, any> { }
+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
index 6fea04bc88..3e4358be6d 100644
--- a/types/react-icons/io/ios-cloud-download-outline.d.ts
+++ b/types/react-icons/io/ios-cloud-download-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownloadOutline extends React.Component<IconBaseProps, any> { }
+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
index 388c5b68b3..593e0c7730 100644
--- a/types/react-icons/io/ios-cloud-download.d.ts
+++ b/types/react-icons/io/ios-cloud-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudDownload extends React.Component<IconBaseProps, any> { }
+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
index 5edec89ac5..c70f0794c3 100644
--- a/types/react-icons/io/ios-cloud-outline.d.ts
+++ b/types/react-icons/io/ios-cloud-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudOutline extends React.Component<IconBaseProps, any> { }
+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
index f0f2708b43..2796f586ec 100644
--- a/types/react-icons/io/ios-cloud-upload-outline.d.ts
+++ b/types/react-icons/io/ios-cloud-upload-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUploadOutline extends React.Component<IconBaseProps, any> { }
+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
index 6a5528302b..b34cc692a2 100644
--- a/types/react-icons/io/ios-cloud-upload.d.ts
+++ b/types/react-icons/io/ios-cloud-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudUpload extends React.Component<IconBaseProps, any> { }
+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
index 2b5fd03bb4..a802116f9f 100644
--- a/types/react-icons/io/ios-cloud.d.ts
+++ b/types/react-icons/io/ios-cloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloud extends React.Component<IconBaseProps, any> { }
+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
index 05d19d9d2f..4845f7470d 100644
--- a/types/react-icons/io/ios-cloudy-night-outline.d.ts
+++ b/types/react-icons/io/ios-cloudy-night-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNightOutline extends React.Component<IconBaseProps, any> { }
+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
index 4a81c00193..9298dc5823 100644
--- a/types/react-icons/io/ios-cloudy-night.d.ts
+++ b/types/react-icons/io/ios-cloudy-night.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyNight extends React.Component<IconBaseProps, any> { }
+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
index 910091a07c..cfcfd72e69 100644
--- a/types/react-icons/io/ios-cloudy-outline.d.ts
+++ b/types/react-icons/io/ios-cloudy-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudyOutline extends React.Component<IconBaseProps, any> { }
+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
index 399da8060c..1d30070268 100644
--- a/types/react-icons/io/ios-cloudy.d.ts
+++ b/types/react-icons/io/ios-cloudy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCloudy extends React.Component<IconBaseProps, any> { }
+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
index 4eeda49c36..8553742da2 100644
--- a/types/react-icons/io/ios-cog-outline.d.ts
+++ b/types/react-icons/io/ios-cog-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCogOutline extends React.Component<IconBaseProps, any> { }
+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
index e106ed6419..b834fcb3c8 100644
--- a/types/react-icons/io/ios-cog.d.ts
+++ b/types/react-icons/io/ios-cog.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCog extends React.Component<IconBaseProps, any> { }
+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
index becb5117f8..a3a38a75c9 100644
--- a/types/react-icons/io/ios-color-filter-outline.d.ts
+++ b/types/react-icons/io/ios-color-filter-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilterOutline extends React.Component<IconBaseProps, any> { }
+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
index 2acca53bf8..20fcdef6df 100644
--- a/types/react-icons/io/ios-color-filter.d.ts
+++ b/types/react-icons/io/ios-color-filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorFilter extends React.Component<IconBaseProps, any> { }
+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
index 7672c27f45..ddb1cb938c 100644
--- a/types/react-icons/io/ios-color-wand-outline.d.ts
+++ b/types/react-icons/io/ios-color-wand-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWandOutline extends React.Component<IconBaseProps, any> { }
+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
index 5e40349b59..2cffa4f89e 100644
--- a/types/react-icons/io/ios-color-wand.d.ts
+++ b/types/react-icons/io/ios-color-wand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosColorWand extends React.Component<IconBaseProps, any> { }
+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
index 40b91a6f30..30d416ed90 100644
--- a/types/react-icons/io/ios-compose-outline.d.ts
+++ b/types/react-icons/io/ios-compose-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosComposeOutline extends React.Component<IconBaseProps, any> { }
+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
index 3b3c464db4..9445eed5c1 100644
--- a/types/react-icons/io/ios-compose.d.ts
+++ b/types/react-icons/io/ios-compose.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCompose extends React.Component<IconBaseProps, any> { }
+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
index 6c4249897f..7eb6eb546f 100644
--- a/types/react-icons/io/ios-contact-outline.d.ts
+++ b/types/react-icons/io/ios-contact-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContactOutline extends React.Component<IconBaseProps, any> { }
+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
index 87e82e51d2..59c2798235 100644
--- a/types/react-icons/io/ios-contact.d.ts
+++ b/types/react-icons/io/ios-contact.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosContact extends React.Component<IconBaseProps, any> { }
+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
index 3b8c7ce6ff..5af5717e89 100644
--- a/types/react-icons/io/ios-copy-outline.d.ts
+++ b/types/react-icons/io/ios-copy-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopyOutline extends React.Component<IconBaseProps, any> { }
+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
index e6b7a44377..2523a14f88 100644
--- a/types/react-icons/io/ios-copy.d.ts
+++ b/types/react-icons/io/ios-copy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCopy extends React.Component<IconBaseProps, any> { }
+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
index 9e91e4322e..b0126c2482 100644
--- a/types/react-icons/io/ios-crop-strong.d.ts
+++ b/types/react-icons/io/ios-crop-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCropStrong extends React.Component<IconBaseProps, any> { }
+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
index 5c28a70339..ab76318d3a 100644
--- a/types/react-icons/io/ios-crop.d.ts
+++ b/types/react-icons/io/ios-crop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosCrop extends React.Component<IconBaseProps, any> { }
+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
index 0565e382d6..4498357495 100644
--- a/types/react-icons/io/ios-download-outline.d.ts
+++ b/types/react-icons/io/ios-download-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownloadOutline extends React.Component<IconBaseProps, any> { }
+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
index 4b7b23ed0a..35aaac4be0 100644
--- a/types/react-icons/io/ios-download.d.ts
+++ b/types/react-icons/io/ios-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDownload extends React.Component<IconBaseProps, any> { }
+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
index f9e522ca3c..17979b680a 100644
--- a/types/react-icons/io/ios-drag.d.ts
+++ b/types/react-icons/io/ios-drag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosDrag extends React.Component<IconBaseProps, any> { }
+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
index e92bf0938d..3ad2b9cb16 100644
--- a/types/react-icons/io/ios-email-outline.d.ts
+++ b/types/react-icons/io/ios-email-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmailOutline extends React.Component<IconBaseProps, any> { }
+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
index 402d1b5273..ac81192fe0 100644
--- a/types/react-icons/io/ios-email.d.ts
+++ b/types/react-icons/io/ios-email.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEmail extends React.Component<IconBaseProps, any> { }
+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
index 7b0f189e17..8f83b25a13 100644
--- a/types/react-icons/io/ios-eye-outline.d.ts
+++ b/types/react-icons/io/ios-eye-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEyeOutline extends React.Component<IconBaseProps, any> { }
+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
index 4836a5b658..2a3db8b839 100644
--- a/types/react-icons/io/ios-eye.d.ts
+++ b/types/react-icons/io/ios-eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosEye extends React.Component<IconBaseProps, any> { }
+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
index 7e6cdd2144..ebc30ba915 100644
--- a/types/react-icons/io/ios-fastforward-outline.d.ts
+++ b/types/react-icons/io/ios-fastforward-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforwardOutline extends React.Component<IconBaseProps, any> { }
+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
index a5f63d22d0..2fedece46c 100644
--- a/types/react-icons/io/ios-fastforward.d.ts
+++ b/types/react-icons/io/ios-fastforward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFastforward extends React.Component<IconBaseProps, any> { }
+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
index f21297be6e..07291ebfd3 100644
--- a/types/react-icons/io/ios-filing-outline.d.ts
+++ b/types/react-icons/io/ios-filing-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilingOutline extends React.Component<IconBaseProps, any> { }
+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
index b88f0104cf..0ccb6e3e3b 100644
--- a/types/react-icons/io/ios-filing.d.ts
+++ b/types/react-icons/io/ios-filing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFiling extends React.Component<IconBaseProps, any> { }
+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
index 0ab4d7fd7d..5528977dce 100644
--- a/types/react-icons/io/ios-film-outline.d.ts
+++ b/types/react-icons/io/ios-film-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilmOutline extends React.Component<IconBaseProps, any> { }
+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
index 78882be67c..447ebbe08e 100644
--- a/types/react-icons/io/ios-film.d.ts
+++ b/types/react-icons/io/ios-film.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFilm extends React.Component<IconBaseProps, any> { }
+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
index 0c375e7ba2..f602c44993 100644
--- a/types/react-icons/io/ios-flag-outline.d.ts
+++ b/types/react-icons/io/ios-flag-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlagOutline extends React.Component<IconBaseProps, any> { }
+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
index 8ffae82acd..d6095c22f3 100644
--- a/types/react-icons/io/ios-flag.d.ts
+++ b/types/react-icons/io/ios-flag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlag extends React.Component<IconBaseProps, any> { }
+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
index 53864032d9..0e8b7410e9 100644
--- a/types/react-icons/io/ios-flame-outline.d.ts
+++ b/types/react-icons/io/ios-flame-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlameOutline extends React.Component<IconBaseProps, any> { }
+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
index dbf77eb5be..a21289710b 100644
--- a/types/react-icons/io/ios-flame.d.ts
+++ b/types/react-icons/io/ios-flame.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlame extends React.Component<IconBaseProps, any> { }
+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
index f9ddbdbc73..2082d7a326 100644
--- a/types/react-icons/io/ios-flask-outline.d.ts
+++ b/types/react-icons/io/ios-flask-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlaskOutline extends React.Component<IconBaseProps, any> { }
+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
index 7ede7a6e3d..0b622f18e2 100644
--- a/types/react-icons/io/ios-flask.d.ts
+++ b/types/react-icons/io/ios-flask.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlask extends React.Component<IconBaseProps, any> { }
+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
index 952bf80391..7886cbc193 100644
--- a/types/react-icons/io/ios-flower-outline.d.ts
+++ b/types/react-icons/io/ios-flower-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlowerOutline extends React.Component<IconBaseProps, any> { }
+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
index b9eef055dd..9e1ba1e0bc 100644
--- a/types/react-icons/io/ios-flower.d.ts
+++ b/types/react-icons/io/ios-flower.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFlower extends React.Component<IconBaseProps, any> { }
+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
index b19c8e3978..43c60dc202 100644
--- a/types/react-icons/io/ios-folder-outline.d.ts
+++ b/types/react-icons/io/ios-folder-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolderOutline extends React.Component<IconBaseProps, any> { }
+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
index e745dc8d1d..785495d440 100644
--- a/types/react-icons/io/ios-folder.d.ts
+++ b/types/react-icons/io/ios-folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFolder extends React.Component<IconBaseProps, any> { }
+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
index 40e67f9912..6f669b0cd0 100644
--- a/types/react-icons/io/ios-football-outline.d.ts
+++ b/types/react-icons/io/ios-football-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootballOutline extends React.Component<IconBaseProps, any> { }
+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
index e7ab7d5080..0ece60db03 100644
--- a/types/react-icons/io/ios-football.d.ts
+++ b/types/react-icons/io/ios-football.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosFootball extends React.Component<IconBaseProps, any> { }
+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
index 34e9336b04..200c64a673 100644
--- a/types/react-icons/io/ios-game-controller-a-outline.d.ts
+++ b/types/react-icons/io/ios-game-controller-a-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerAOutline extends React.Component<IconBaseProps, any> { }
+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
index 1f3c55870e..e9e7048f94 100644
--- a/types/react-icons/io/ios-game-controller-a.d.ts
+++ b/types/react-icons/io/ios-game-controller-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerA extends React.Component<IconBaseProps, any> { }
+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
index 3e63a1d7a1..d7d82be788 100644
--- a/types/react-icons/io/ios-game-controller-b-outline.d.ts
+++ b/types/react-icons/io/ios-game-controller-b-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerBOutline extends React.Component<IconBaseProps, any> { }
+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
index 5afd764c98..6e5435416c 100644
--- a/types/react-icons/io/ios-game-controller-b.d.ts
+++ b/types/react-icons/io/ios-game-controller-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGameControllerB extends React.Component<IconBaseProps, any> { }
+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
index 0ed8ee7549..22181a1a55 100644
--- a/types/react-icons/io/ios-gear-outline.d.ts
+++ b/types/react-icons/io/ios-gear-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGearOutline extends React.Component<IconBaseProps, any> { }
+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
index 42869b6c7e..e899faa7a9 100644
--- a/types/react-icons/io/ios-gear.d.ts
+++ b/types/react-icons/io/ios-gear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGear extends React.Component<IconBaseProps, any> { }
+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
index c3b262fbe4..049fc5bd95 100644
--- a/types/react-icons/io/ios-glasses-outline.d.ts
+++ b/types/react-icons/io/ios-glasses-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlassesOutline extends React.Component<IconBaseProps, any> { }
+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
index 1df1f3a36a..585312b1f7 100644
--- a/types/react-icons/io/ios-glasses.d.ts
+++ b/types/react-icons/io/ios-glasses.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGlasses extends React.Component<IconBaseProps, any> { }
+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
index ef66a6a23b..f1cf87b7d6 100644
--- a/types/react-icons/io/ios-grid-view-outline.d.ts
+++ b/types/react-icons/io/ios-grid-view-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridViewOutline extends React.Component<IconBaseProps, any> { }
+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
index ea98a31a33..00f6bb916c 100644
--- a/types/react-icons/io/ios-grid-view.d.ts
+++ b/types/react-icons/io/ios-grid-view.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosGridView extends React.Component<IconBaseProps, any> { }
+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
index 82ddd17b5e..354c5543f3 100644
--- a/types/react-icons/io/ios-heart-outline.d.ts
+++ b/types/react-icons/io/ios-heart-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeartOutline extends React.Component<IconBaseProps, any> { }
+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
index 7a0bf42642..254ce938f3 100644
--- a/types/react-icons/io/ios-heart.d.ts
+++ b/types/react-icons/io/ios-heart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHeart extends React.Component<IconBaseProps, any> { }
+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
index e54f7c69b6..cd94f6ceed 100644
--- a/types/react-icons/io/ios-help-empty.d.ts
+++ b/types/react-icons/io/ios-help-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpEmpty extends React.Component<IconBaseProps, any> { }
+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
index a879ce15a6..3e73ec588b 100644
--- a/types/react-icons/io/ios-help-outline.d.ts
+++ b/types/react-icons/io/ios-help-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelpOutline extends React.Component<IconBaseProps, any> { }
+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
index ec8a79b740..00ede643d8 100644
--- a/types/react-icons/io/ios-help.d.ts
+++ b/types/react-icons/io/ios-help.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHelp extends React.Component<IconBaseProps, any> { }
+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
index b2262404d2..17f1432ff8 100644
--- a/types/react-icons/io/ios-home-outline.d.ts
+++ b/types/react-icons/io/ios-home-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHomeOutline extends React.Component<IconBaseProps, any> { }
+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
index 0cdbea6cd9..c0f80ecaf3 100644
--- a/types/react-icons/io/ios-home.d.ts
+++ b/types/react-icons/io/ios-home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosHome extends React.Component<IconBaseProps, any> { }
+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
index fb81c95cad..0b043764ee 100644
--- a/types/react-icons/io/ios-infinite-outline.d.ts
+++ b/types/react-icons/io/ios-infinite-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfiniteOutline extends React.Component<IconBaseProps, any> { }
+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
index b5cad56cf3..bf78e5f95b 100644
--- a/types/react-icons/io/ios-infinite.d.ts
+++ b/types/react-icons/io/ios-infinite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInfinite extends React.Component<IconBaseProps, any> { }
+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
index 854d87b74e..34c1b0c19c 100644
--- a/types/react-icons/io/ios-informatempty.d.ts
+++ b/types/react-icons/io/ios-informatempty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatempty extends React.Component<IconBaseProps, any> { }
+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
index 179783fdfb..f6e3295ac3 100644
--- a/types/react-icons/io/ios-information.d.ts
+++ b/types/react-icons/io/ios-information.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformation extends React.Component<IconBaseProps, any> { }
+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
index 2a8db4715a..038ce93a28 100644
--- a/types/react-icons/io/ios-informatoutline.d.ts
+++ b/types/react-icons/io/ios-informatoutline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosInformatoutline extends React.Component<IconBaseProps, any> { }
+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
index 1a6f1ff9b7..bd42bf2316 100644
--- a/types/react-icons/io/ios-ionic-outline.d.ts
+++ b/types/react-icons/io/ios-ionic-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosIonicOutline extends React.Component<IconBaseProps, any> { }
+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
index 0ea90964d8..9adff455e3 100644
--- a/types/react-icons/io/ios-keypad-outline.d.ts
+++ b/types/react-icons/io/ios-keypad-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypadOutline extends React.Component<IconBaseProps, any> { }
+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
index bca05b055d..a804cf857f 100644
--- a/types/react-icons/io/ios-keypad.d.ts
+++ b/types/react-icons/io/ios-keypad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosKeypad extends React.Component<IconBaseProps, any> { }
+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
index 9440cbb109..4c92bdd5d6 100644
--- a/types/react-icons/io/ios-lightbulb-outline.d.ts
+++ b/types/react-icons/io/ios-lightbulb-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulbOutline extends React.Component<IconBaseProps, any> { }
+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
index ca642d6f96..a7bbb177bb 100644
--- a/types/react-icons/io/ios-lightbulb.d.ts
+++ b/types/react-icons/io/ios-lightbulb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLightbulb extends React.Component<IconBaseProps, any> { }
+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
index 1946a95d14..839d753887 100644
--- a/types/react-icons/io/ios-list-outline.d.ts
+++ b/types/react-icons/io/ios-list-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosListOutline extends React.Component<IconBaseProps, any> { }
+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
index 9890fa4fd4..9789a06dc7 100644
--- a/types/react-icons/io/ios-list.d.ts
+++ b/types/react-icons/io/ios-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosList extends React.Component<IconBaseProps, any> { }
+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
index 8e9e256cec..617b853698 100644
--- a/types/react-icons/io/ios-location.d.ts
+++ b/types/react-icons/io/ios-location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocation extends React.Component<IconBaseProps, any> { }
+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
index 15a9283512..141e72e594 100644
--- a/types/react-icons/io/ios-locatoutline.d.ts
+++ b/types/react-icons/io/ios-locatoutline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocatoutline extends React.Component<IconBaseProps, any> { }
+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
index cc755e9350..3f0855a38d 100644
--- a/types/react-icons/io/ios-locked-outline.d.ts
+++ b/types/react-icons/io/ios-locked-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLockedOutline extends React.Component<IconBaseProps, any> { }
+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
index dbce77f9b5..b22a3238d4 100644
--- a/types/react-icons/io/ios-locked.d.ts
+++ b/types/react-icons/io/ios-locked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLocked extends React.Component<IconBaseProps, any> { }
+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
index 950edfe815..900c41d788 100644
--- a/types/react-icons/io/ios-loop-strong.d.ts
+++ b/types/react-icons/io/ios-loop-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoopStrong extends React.Component<IconBaseProps, any> { }
+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
index 18c559d265..0235e4f546 100644
--- a/types/react-icons/io/ios-loop.d.ts
+++ b/types/react-icons/io/ios-loop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosLoop extends React.Component<IconBaseProps, any> { }
+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
index c516b4d8c8..dadb2e61ae 100644
--- a/types/react-icons/io/ios-medical-outline.d.ts
+++ b/types/react-icons/io/ios-medical-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedicalOutline extends React.Component<IconBaseProps, any> { }
+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
index a5a075bcbe..1d63e24694 100644
--- a/types/react-icons/io/ios-medical.d.ts
+++ b/types/react-icons/io/ios-medical.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedical extends React.Component<IconBaseProps, any> { }
+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
index b80610616c..367cb88b6f 100644
--- a/types/react-icons/io/ios-medkit-outline.d.ts
+++ b/types/react-icons/io/ios-medkit-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkitOutline extends React.Component<IconBaseProps, any> { }
+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
index fc8ffa6566..bf5d378f58 100644
--- a/types/react-icons/io/ios-medkit.d.ts
+++ b/types/react-icons/io/ios-medkit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMedkit extends React.Component<IconBaseProps, any> { }
+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
index 28bcc7d966..093cc13897 100644
--- a/types/react-icons/io/ios-mic-off.d.ts
+++ b/types/react-icons/io/ios-mic-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOff extends React.Component<IconBaseProps, any> { }
+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
index f0c664bff0..1e2a4f7ca6 100644
--- a/types/react-icons/io/ios-mic-outline.d.ts
+++ b/types/react-icons/io/ios-mic-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMicOutline extends React.Component<IconBaseProps, any> { }
+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
index a61e2932a2..a561e50887 100644
--- a/types/react-icons/io/ios-mic.d.ts
+++ b/types/react-icons/io/ios-mic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMic extends React.Component<IconBaseProps, any> { }
+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
index 195c064900..d33c1a6e8c 100644
--- a/types/react-icons/io/ios-minus-empty.d.ts
+++ b/types/react-icons/io/ios-minus-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusEmpty extends React.Component<IconBaseProps, any> { }
+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
index 3173339650..d7373a37df 100644
--- a/types/react-icons/io/ios-minus-outline.d.ts
+++ b/types/react-icons/io/ios-minus-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinusOutline extends React.Component<IconBaseProps, any> { }
+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
index 057fe3ef25..abc0a2679e 100644
--- a/types/react-icons/io/ios-minus.d.ts
+++ b/types/react-icons/io/ios-minus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMinus extends React.Component<IconBaseProps, any> { }
+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
index cb519ab388..8dd207f86e 100644
--- a/types/react-icons/io/ios-monitor-outline.d.ts
+++ b/types/react-icons/io/ios-monitor-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitorOutline extends React.Component<IconBaseProps, any> { }
+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
index 25df758f44..965a9b5d3b 100644
--- a/types/react-icons/io/ios-monitor.d.ts
+++ b/types/react-icons/io/ios-monitor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMonitor extends React.Component<IconBaseProps, any> { }
+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
index 894f1ccb67..e35e94911f 100644
--- a/types/react-icons/io/ios-moon-outline.d.ts
+++ b/types/react-icons/io/ios-moon-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoonOutline extends React.Component<IconBaseProps, any> { }
+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
index 0670fc941c..cee7a782f1 100644
--- a/types/react-icons/io/ios-moon.d.ts
+++ b/types/react-icons/io/ios-moon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoon extends React.Component<IconBaseProps, any> { }
+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
index 526bc52751..a5a83f41cf 100644
--- a/types/react-icons/io/ios-more-outline.d.ts
+++ b/types/react-icons/io/ios-more-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMoreOutline extends React.Component<IconBaseProps, any> { }
+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
index 947ea0489c..9fb63209db 100644
--- a/types/react-icons/io/ios-more.d.ts
+++ b/types/react-icons/io/ios-more.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMore extends React.Component<IconBaseProps, any> { }
+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
index 9ed09e14d0..123b990474 100644
--- a/types/react-icons/io/ios-musical-note.d.ts
+++ b/types/react-icons/io/ios-musical-note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNote extends React.Component<IconBaseProps, any> { }
+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
index 3839587440..54daf1715e 100644
--- a/types/react-icons/io/ios-musical-notes.d.ts
+++ b/types/react-icons/io/ios-musical-notes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosMusicalNotes extends React.Component<IconBaseProps, any> { }
+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
index a8e0fbad8f..daaafc5c76 100644
--- a/types/react-icons/io/ios-navigate-outline.d.ts
+++ b/types/react-icons/io/ios-navigate-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigateOutline extends React.Component<IconBaseProps, any> { }
+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
index 2c898b46a5..3a8a955fa6 100644
--- a/types/react-icons/io/ios-navigate.d.ts
+++ b/types/react-icons/io/ios-navigate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNavigate extends React.Component<IconBaseProps, any> { }
+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
index 06c17c0e28..19b5f0eae6 100644
--- a/types/react-icons/io/ios-nutrition.d.ts
+++ b/types/react-icons/io/ios-nutrition.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutrition extends React.Component<IconBaseProps, any> { }
+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
index 2204a8d655..9ce2ea6d24 100644
--- a/types/react-icons/io/ios-nutritoutline.d.ts
+++ b/types/react-icons/io/ios-nutritoutline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosNutritoutline extends React.Component<IconBaseProps, any> { }
+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
index 1f18a72470..f491c2a055 100644
--- a/types/react-icons/io/ios-paper-outline.d.ts
+++ b/types/react-icons/io/ios-paper-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperOutline extends React.Component<IconBaseProps, any> { }
+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
index 05e41f9441..bf98a1330d 100644
--- a/types/react-icons/io/ios-paper.d.ts
+++ b/types/react-icons/io/ios-paper.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaper extends React.Component<IconBaseProps, any> { }
+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
index 2a273d5453..381b337e35 100644
--- a/types/react-icons/io/ios-paperplane-outline.d.ts
+++ b/types/react-icons/io/ios-paperplane-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplaneOutline extends React.Component<IconBaseProps, any> { }
+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
index 495d9d7c90..3999ec063c 100644
--- a/types/react-icons/io/ios-paperplane.d.ts
+++ b/types/react-icons/io/ios-paperplane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaperplane extends React.Component<IconBaseProps, any> { }
+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
index 98190f25b4..96fddf3405 100644
--- a/types/react-icons/io/ios-partlysunny-outline.d.ts
+++ b/types/react-icons/io/ios-partlysunny-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunnyOutline extends React.Component<IconBaseProps, any> { }
+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
index 756911a3e0..f0f7b24a0f 100644
--- a/types/react-icons/io/ios-partlysunny.d.ts
+++ b/types/react-icons/io/ios-partlysunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPartlysunny extends React.Component<IconBaseProps, any> { }
+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
index a76a0d5b59..a3c096ec70 100644
--- a/types/react-icons/io/ios-pause-outline.d.ts
+++ b/types/react-icons/io/ios-pause-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPauseOutline extends React.Component<IconBaseProps, any> { }
+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
index 9b976b46cc..5be0dbb44e 100644
--- a/types/react-icons/io/ios-pause.d.ts
+++ b/types/react-icons/io/ios-pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPause extends React.Component<IconBaseProps, any> { }
+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
index 59a948416e..59ff2ba1f0 100644
--- a/types/react-icons/io/ios-paw-outline.d.ts
+++ b/types/react-icons/io/ios-paw-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPawOutline extends React.Component<IconBaseProps, any> { }
+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
index 5ba8824883..8907243697 100644
--- a/types/react-icons/io/ios-paw.d.ts
+++ b/types/react-icons/io/ios-paw.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPaw extends React.Component<IconBaseProps, any> { }
+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
index b5a7080ed0..fca7beebf0 100644
--- a/types/react-icons/io/ios-people-outline.d.ts
+++ b/types/react-icons/io/ios-people-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeopleOutline extends React.Component<IconBaseProps, any> { }
+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
index 7e986b1b6b..47167ca242 100644
--- a/types/react-icons/io/ios-people.d.ts
+++ b/types/react-icons/io/ios-people.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPeople extends React.Component<IconBaseProps, any> { }
+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
index 8627f88cce..d9dcad6337 100644
--- a/types/react-icons/io/ios-person-outline.d.ts
+++ b/types/react-icons/io/ios-person-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonOutline extends React.Component<IconBaseProps, any> { }
+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
index 7c5012f6ff..c0a721cdc9 100644
--- a/types/react-icons/io/ios-person.d.ts
+++ b/types/react-icons/io/ios-person.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPerson extends React.Component<IconBaseProps, any> { }
+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
index 32793bccba..0c2ef41134 100644
--- a/types/react-icons/io/ios-personadd-outline.d.ts
+++ b/types/react-icons/io/ios-personadd-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonaddOutline extends React.Component<IconBaseProps, any> { }
+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
index 909a9a0df4..76064513f6 100644
--- a/types/react-icons/io/ios-personadd.d.ts
+++ b/types/react-icons/io/ios-personadd.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPersonadd extends React.Component<IconBaseProps, any> { }
+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
index 286f822461..b6bcf6e60a 100644
--- a/types/react-icons/io/ios-photos-outline.d.ts
+++ b/types/react-icons/io/ios-photos-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotosOutline extends React.Component<IconBaseProps, any> { }
+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
index d285d400f4..1f4a1d7b0a 100644
--- a/types/react-icons/io/ios-photos.d.ts
+++ b/types/react-icons/io/ios-photos.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPhotos extends React.Component<IconBaseProps, any> { }
+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
index d9f0697459..a370ac6e6e 100644
--- a/types/react-icons/io/ios-pie-outline.d.ts
+++ b/types/react-icons/io/ios-pie-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPieOutline extends React.Component<IconBaseProps, any> { }
+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
index a58b684265..4a1c78801a 100644
--- a/types/react-icons/io/ios-pie.d.ts
+++ b/types/react-icons/io/ios-pie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPie extends React.Component<IconBaseProps, any> { }
+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
index 581ca8fc9b..d400fd801a 100644
--- a/types/react-icons/io/ios-pint-outline.d.ts
+++ b/types/react-icons/io/ios-pint-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPintOutline extends React.Component<IconBaseProps, any> { }
+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
index 68f5e7b93f..21bd07ccd5 100644
--- a/types/react-icons/io/ios-pint.d.ts
+++ b/types/react-icons/io/ios-pint.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPint extends React.Component<IconBaseProps, any> { }
+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
index 01cc0413a8..4c7a550e46 100644
--- a/types/react-icons/io/ios-play-outline.d.ts
+++ b/types/react-icons/io/ios-play-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlayOutline extends React.Component<IconBaseProps, any> { }
+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
index f269433abb..18f66a8f59 100644
--- a/types/react-icons/io/ios-play.d.ts
+++ b/types/react-icons/io/ios-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlay extends React.Component<IconBaseProps, any> { }
+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
index 06f287505c..a7235d6322 100644
--- a/types/react-icons/io/ios-plus-empty.d.ts
+++ b/types/react-icons/io/ios-plus-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusEmpty extends React.Component<IconBaseProps, any> { }
+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
index 193b49ac52..719bce1444 100644
--- a/types/react-icons/io/ios-plus-outline.d.ts
+++ b/types/react-icons/io/ios-plus-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlusOutline extends React.Component<IconBaseProps, any> { }
+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
index 4c5d53ef48..7d29ea3f40 100644
--- a/types/react-icons/io/ios-plus.d.ts
+++ b/types/react-icons/io/ios-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPlus extends React.Component<IconBaseProps, any> { }
+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
index b4645106e4..23a4c0c869 100644
--- a/types/react-icons/io/ios-pricetag-outline.d.ts
+++ b/types/react-icons/io/ios-pricetag-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagOutline extends React.Component<IconBaseProps, any> { }
+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
index 6aaa518fc1..601743c434 100644
--- a/types/react-icons/io/ios-pricetag.d.ts
+++ b/types/react-icons/io/ios-pricetag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetag extends React.Component<IconBaseProps, any> { }
+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
index 02ac2adb3f..0e1e574dac 100644
--- a/types/react-icons/io/ios-pricetags-outline.d.ts
+++ b/types/react-icons/io/ios-pricetags-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetagsOutline extends React.Component<IconBaseProps, any> { }
+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
index fe9ec6b887..4cc3aebb75 100644
--- a/types/react-icons/io/ios-pricetags.d.ts
+++ b/types/react-icons/io/ios-pricetags.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPricetags extends React.Component<IconBaseProps, any> { }
+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
index 89a17301ff..d20dcedadf 100644
--- a/types/react-icons/io/ios-printer-outline.d.ts
+++ b/types/react-icons/io/ios-printer-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinterOutline extends React.Component<IconBaseProps, any> { }
+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
index 3c4c4ddc57..dc9bccfb25 100644
--- a/types/react-icons/io/ios-printer.d.ts
+++ b/types/react-icons/io/ios-printer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPrinter extends React.Component<IconBaseProps, any> { }
+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
index 8a1d704af7..8f7e12017a 100644
--- a/types/react-icons/io/ios-pulse-strong.d.ts
+++ b/types/react-icons/io/ios-pulse-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulseStrong extends React.Component<IconBaseProps, any> { }
+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
index 8e981761cb..a7ff149ddf 100644
--- a/types/react-icons/io/ios-pulse.d.ts
+++ b/types/react-icons/io/ios-pulse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosPulse extends React.Component<IconBaseProps, any> { }
+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
index f6320e3e58..7e283d1cb3 100644
--- a/types/react-icons/io/ios-rainy-outline.d.ts
+++ b/types/react-icons/io/ios-rainy-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainyOutline extends React.Component<IconBaseProps, any> { }
+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
index 6c759c23a6..a701475ef0 100644
--- a/types/react-icons/io/ios-rainy.d.ts
+++ b/types/react-icons/io/ios-rainy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRainy extends React.Component<IconBaseProps, any> { }
+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
index 3331e9076d..9fc2e6ffca 100644
--- a/types/react-icons/io/ios-recording-outline.d.ts
+++ b/types/react-icons/io/ios-recording-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecordingOutline extends React.Component<IconBaseProps, any> { }
+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
index 2f29d38bc7..77d0e299cd 100644
--- a/types/react-icons/io/ios-recording.d.ts
+++ b/types/react-icons/io/ios-recording.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRecording extends React.Component<IconBaseProps, any> { }
+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
index 47079892a2..47bae67c99 100644
--- a/types/react-icons/io/ios-redo-outline.d.ts
+++ b/types/react-icons/io/ios-redo-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedoOutline extends React.Component<IconBaseProps, any> { }
+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
index cb8a220e79..0935996be6 100644
--- a/types/react-icons/io/ios-redo.d.ts
+++ b/types/react-icons/io/ios-redo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRedo extends React.Component<IconBaseProps, any> { }
+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
index e1981a8cb5..0e7f151339 100644
--- a/types/react-icons/io/ios-refresh-empty.d.ts
+++ b/types/react-icons/io/ios-refresh-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshEmpty extends React.Component<IconBaseProps, any> { }
+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
index ff236bb6f6..7679405065 100644
--- a/types/react-icons/io/ios-refresh-outline.d.ts
+++ b/types/react-icons/io/ios-refresh-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefreshOutline extends React.Component<IconBaseProps, any> { }
+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
index d2aba01add..420affa507 100644
--- a/types/react-icons/io/ios-refresh.d.ts
+++ b/types/react-icons/io/ios-refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRefresh extends React.Component<IconBaseProps, any> { }
+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
index 890c0994f6..93e947db67 100644
--- a/types/react-icons/io/ios-reload.d.ts
+++ b/types/react-icons/io/ios-reload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReload extends React.Component<IconBaseProps, any> { }
+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
index 250cfabe12..808d6ca0bf 100644
--- a/types/react-icons/io/ios-reverse-camera-outline.d.ts
+++ b/types/react-icons/io/ios-reverse-camera-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCameraOutline extends React.Component<IconBaseProps, any> { }
+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
index 1cf519e212..0e74f82ab0 100644
--- a/types/react-icons/io/ios-reverse-camera.d.ts
+++ b/types/react-icons/io/ios-reverse-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosReverseCamera extends React.Component<IconBaseProps, any> { }
+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
index 7f5e5cdd35..dfc69fc86d 100644
--- a/types/react-icons/io/ios-rewind-outline.d.ts
+++ b/types/react-icons/io/ios-rewind-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewindOutline extends React.Component<IconBaseProps, any> { }
+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
index 1bb9dd4e44..7f883de8bf 100644
--- a/types/react-icons/io/ios-rewind.d.ts
+++ b/types/react-icons/io/ios-rewind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRewind extends React.Component<IconBaseProps, any> { }
+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
index dbb7566586..dc112023a5 100644
--- a/types/react-icons/io/ios-rose-outline.d.ts
+++ b/types/react-icons/io/ios-rose-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRoseOutline extends React.Component<IconBaseProps, any> { }
+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
index 298227776a..8cd590321f 100644
--- a/types/react-icons/io/ios-rose.d.ts
+++ b/types/react-icons/io/ios-rose.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosRose extends React.Component<IconBaseProps, any> { }
+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
index ac1c45c575..3b0ab67ed2 100644
--- a/types/react-icons/io/ios-search-strong.d.ts
+++ b/types/react-icons/io/ios-search-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearchStrong extends React.Component<IconBaseProps, any> { }
+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
index 3a5bf71861..bd95701f4d 100644
--- a/types/react-icons/io/ios-search.d.ts
+++ b/types/react-icons/io/ios-search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSearch extends React.Component<IconBaseProps, any> { }
+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
index 696396e91e..0bb6ef49aa 100644
--- a/types/react-icons/io/ios-settings-strong.d.ts
+++ b/types/react-icons/io/ios-settings-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettingsStrong extends React.Component<IconBaseProps, any> { }
+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
index 4226e79eb1..26ff75fb04 100644
--- a/types/react-icons/io/ios-settings.d.ts
+++ b/types/react-icons/io/ios-settings.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSettings extends React.Component<IconBaseProps, any> { }
+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
index 38b2d10a16..15d2841c2f 100644
--- a/types/react-icons/io/ios-shuffle-strong.d.ts
+++ b/types/react-icons/io/ios-shuffle-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffleStrong extends React.Component<IconBaseProps, any> { }
+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
index fcb2210b17..305b4ff79b 100644
--- a/types/react-icons/io/ios-shuffle.d.ts
+++ b/types/react-icons/io/ios-shuffle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosShuffle extends React.Component<IconBaseProps, any> { }
+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
index 0d854c32e6..fa9db170bd 100644
--- a/types/react-icons/io/ios-skipbackward-outline.d.ts
+++ b/types/react-icons/io/ios-skipbackward-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackwardOutline extends React.Component<IconBaseProps, any> { }
+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
index 50bec664c9..d9b009ed49 100644
--- a/types/react-icons/io/ios-skipbackward.d.ts
+++ b/types/react-icons/io/ios-skipbackward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipbackward extends React.Component<IconBaseProps, any> { }
+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
index fa9a4559dc..63c174f6b2 100644
--- a/types/react-icons/io/ios-skipforward-outline.d.ts
+++ b/types/react-icons/io/ios-skipforward-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforwardOutline extends React.Component<IconBaseProps, any> { }
+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
index eb17773269..39ce459a57 100644
--- a/types/react-icons/io/ios-skipforward.d.ts
+++ b/types/react-icons/io/ios-skipforward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSkipforward extends React.Component<IconBaseProps, any> { }
+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
index 3d0acc1663..f55f087752 100644
--- a/types/react-icons/io/ios-snowy.d.ts
+++ b/types/react-icons/io/ios-snowy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSnowy extends React.Component<IconBaseProps, any> { }
+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
index 361810b241..b0263dc761 100644
--- a/types/react-icons/io/ios-speedometer-outline.d.ts
+++ b/types/react-icons/io/ios-speedometer-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometerOutline extends React.Component<IconBaseProps, any> { }
+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
index d441937eb2..f5d6862d1a 100644
--- a/types/react-icons/io/ios-speedometer.d.ts
+++ b/types/react-icons/io/ios-speedometer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSpeedometer extends React.Component<IconBaseProps, any> { }
+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
index 5584056b3c..03adf4a4d2 100644
--- a/types/react-icons/io/ios-star-half.d.ts
+++ b/types/react-icons/io/ios-star-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarHalf extends React.Component<IconBaseProps, any> { }
+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
index bfd47c06b3..61dfe85fc1 100644
--- a/types/react-icons/io/ios-star-outline.d.ts
+++ b/types/react-icons/io/ios-star-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStarOutline extends React.Component<IconBaseProps, any> { }
+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
index 6d5b2a5b7d..763d68d34c 100644
--- a/types/react-icons/io/ios-star.d.ts
+++ b/types/react-icons/io/ios-star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStar extends React.Component<IconBaseProps, any> { }
+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
index 3b4026269e..73a9091d13 100644
--- a/types/react-icons/io/ios-stopwatch-outline.d.ts
+++ b/types/react-icons/io/ios-stopwatch-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatchOutline extends React.Component<IconBaseProps, any> { }
+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
index 7a8b4e9b5c..27bf6e3b40 100644
--- a/types/react-icons/io/ios-stopwatch.d.ts
+++ b/types/react-icons/io/ios-stopwatch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosStopwatch extends React.Component<IconBaseProps, any> { }
+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
index b7a440d37b..6c1f62f799 100644
--- a/types/react-icons/io/ios-sunny-outline.d.ts
+++ b/types/react-icons/io/ios-sunny-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunnyOutline extends React.Component<IconBaseProps, any> { }
+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
index f2bf04608d..e570cdf17c 100644
--- a/types/react-icons/io/ios-sunny.d.ts
+++ b/types/react-icons/io/ios-sunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosSunny extends React.Component<IconBaseProps, any> { }
+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
index 65c2c676cc..91d22539d0 100644
--- a/types/react-icons/io/ios-telephone-outline.d.ts
+++ b/types/react-icons/io/ios-telephone-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephoneOutline extends React.Component<IconBaseProps, any> { }
+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
index 23e4e27170..349826b187 100644
--- a/types/react-icons/io/ios-telephone.d.ts
+++ b/types/react-icons/io/ios-telephone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTelephone extends React.Component<IconBaseProps, any> { }
+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
index f3f6f2b547..df889878d4 100644
--- a/types/react-icons/io/ios-tennisball-outline.d.ts
+++ b/types/react-icons/io/ios-tennisball-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisballOutline extends React.Component<IconBaseProps, any> { }
+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
index 44ae55ae15..177485e5ea 100644
--- a/types/react-icons/io/ios-tennisball.d.ts
+++ b/types/react-icons/io/ios-tennisball.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTennisball extends React.Component<IconBaseProps, any> { }
+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
index 053fe5aa4d..ac3f8120a7 100644
--- a/types/react-icons/io/ios-thunderstorm-outline.d.ts
+++ b/types/react-icons/io/ios-thunderstorm-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstormOutline extends React.Component<IconBaseProps, any> { }
+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
index a978372b8a..9612dc49cc 100644
--- a/types/react-icons/io/ios-thunderstorm.d.ts
+++ b/types/react-icons/io/ios-thunderstorm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosThunderstorm extends React.Component<IconBaseProps, any> { }
+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
index f7c77f6447..8067387f05 100644
--- a/types/react-icons/io/ios-time-outline.d.ts
+++ b/types/react-icons/io/ios-time-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimeOutline extends React.Component<IconBaseProps, any> { }
+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
index 171b608708..cdc944bd0b 100644
--- a/types/react-icons/io/ios-time.d.ts
+++ b/types/react-icons/io/ios-time.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTime extends React.Component<IconBaseProps, any> { }
+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
index c1108e8105..21b2cdca0f 100644
--- a/types/react-icons/io/ios-timer-outline.d.ts
+++ b/types/react-icons/io/ios-timer-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimerOutline extends React.Component<IconBaseProps, any> { }
+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
index 12c2dd32d2..729f3f79d4 100644
--- a/types/react-icons/io/ios-timer.d.ts
+++ b/types/react-icons/io/ios-timer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTimer extends React.Component<IconBaseProps, any> { }
+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
index 78d89d248d..fa23191d8c 100644
--- a/types/react-icons/io/ios-toggle-outline.d.ts
+++ b/types/react-icons/io/ios-toggle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggleOutline extends React.Component<IconBaseProps, any> { }
+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
index 2b490bbd42..e01579ec53 100644
--- a/types/react-icons/io/ios-toggle.d.ts
+++ b/types/react-icons/io/ios-toggle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosToggle extends React.Component<IconBaseProps, any> { }
+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
index 7ac2f94761..55412f0ae2 100644
--- a/types/react-icons/io/ios-trash-outline.d.ts
+++ b/types/react-icons/io/ios-trash-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrashOutline extends React.Component<IconBaseProps, any> { }
+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
index e5ce0b0ddc..296e42671e 100644
--- a/types/react-icons/io/ios-trash.d.ts
+++ b/types/react-icons/io/ios-trash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosTrash extends React.Component<IconBaseProps, any> { }
+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
index 152ffb10ab..093074d857 100644
--- a/types/react-icons/io/ios-undo-outline.d.ts
+++ b/types/react-icons/io/ios-undo-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndoOutline extends React.Component<IconBaseProps, any> { }
+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
index 58f903fa9d..4bcdef2e88 100644
--- a/types/react-icons/io/ios-undo.d.ts
+++ b/types/react-icons/io/ios-undo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUndo extends React.Component<IconBaseProps, any> { }
+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
index 5b2adea53a..d14b0f7ffc 100644
--- a/types/react-icons/io/ios-unlocked-outline.d.ts
+++ b/types/react-icons/io/ios-unlocked-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlockedOutline extends React.Component<IconBaseProps, any> { }
+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
index a5a16d4ad4..d873e5f8d1 100644
--- a/types/react-icons/io/ios-unlocked.d.ts
+++ b/types/react-icons/io/ios-unlocked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUnlocked extends React.Component<IconBaseProps, any> { }
+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
index 6cfc1843a3..5f397a2bd8 100644
--- a/types/react-icons/io/ios-upload-outline.d.ts
+++ b/types/react-icons/io/ios-upload-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUploadOutline extends React.Component<IconBaseProps, any> { }
+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
index 1d8d4ab006..5b9acf6b9c 100644
--- a/types/react-icons/io/ios-upload.d.ts
+++ b/types/react-icons/io/ios-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosUpload extends React.Component<IconBaseProps, any> { }
+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
index e46717b080..96fac95c0e 100644
--- a/types/react-icons/io/ios-videocam-outline.d.ts
+++ b/types/react-icons/io/ios-videocam-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocamOutline extends React.Component<IconBaseProps, any> { }
+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
index 75b4df6bf0..a55ede9155 100644
--- a/types/react-icons/io/ios-videocam.d.ts
+++ b/types/react-icons/io/ios-videocam.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVideocam extends React.Component<IconBaseProps, any> { }
+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
index 30e0b80133..9ae46e1936 100644
--- a/types/react-icons/io/ios-volume-high.d.ts
+++ b/types/react-icons/io/ios-volume-high.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeHigh extends React.Component<IconBaseProps, any> { }
+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
index ee97720d21..402ee999cb 100644
--- a/types/react-icons/io/ios-volume-low.d.ts
+++ b/types/react-icons/io/ios-volume-low.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosVolumeLow extends React.Component<IconBaseProps, any> { }
+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
index 442d010e35..3e34e8f73d 100644
--- a/types/react-icons/io/ios-wineglass-outline.d.ts
+++ b/types/react-icons/io/ios-wineglass-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglassOutline extends React.Component<IconBaseProps, any> { }
+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
index b243b891c6..aaf3e6bd56 100644
--- a/types/react-icons/io/ios-wineglass.d.ts
+++ b/types/react-icons/io/ios-wineglass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWineglass extends React.Component<IconBaseProps, any> { }
+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
index 1cea084c48..4b5d4ab7b1 100644
--- a/types/react-icons/io/ios-world-outline.d.ts
+++ b/types/react-icons/io/ios-world-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorldOutline extends React.Component<IconBaseProps, any> { }
+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
index ee184be3f2..6a2b5a3392 100644
--- a/types/react-icons/io/ios-world.d.ts
+++ b/types/react-icons/io/ios-world.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIosWorld extends React.Component<IconBaseProps, any> { }
+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
index da2da89e50..5f534f3a70 100644
--- a/types/react-icons/io/ipad.d.ts
+++ b/types/react-icons/io/ipad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIpad extends React.Component<IconBaseProps, any> { }
+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
index 47a72fca82..4b4fc084d6 100644
--- a/types/react-icons/io/iphone.d.ts
+++ b/types/react-icons/io/iphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIphone extends React.Component<IconBaseProps, any> { }
+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
index 42fb4cd1d3..793b8f7f92 100644
--- a/types/react-icons/io/ipod.d.ts
+++ b/types/react-icons/io/ipod.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoIpod extends React.Component<IconBaseProps, any> { }
+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
index 5f1074efe9..7f8ef429e2 100644
--- a/types/react-icons/io/jet.d.ts
+++ b/types/react-icons/io/jet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoJet extends React.Component<IconBaseProps, any> { }
+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
index 6ef303d8d1..8a84a24518 100644
--- a/types/react-icons/io/key.d.ts
+++ b/types/react-icons/io/key.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoKey extends React.Component<IconBaseProps, any> { }
+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
index 8dd42c684c..f9683f399b 100644
--- a/types/react-icons/io/knife.d.ts
+++ b/types/react-icons/io/knife.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoKnife extends React.Component<IconBaseProps, any> { }
+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
index 831eb5b8c9..ffd3252609 100644
--- a/types/react-icons/io/laptop.d.ts
+++ b/types/react-icons/io/laptop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLaptop extends React.Component<IconBaseProps, any> { }
+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
index 69a9d46407..bc0235a24a 100644
--- a/types/react-icons/io/leaf.d.ts
+++ b/types/react-icons/io/leaf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLeaf extends React.Component<IconBaseProps, any> { }
+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
index d418a94915..0bd2e2c1e9 100644
--- a/types/react-icons/io/levels.d.ts
+++ b/types/react-icons/io/levels.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLevels extends React.Component<IconBaseProps, any> { }
+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
index c1816a7d47..c16e16a2fa 100644
--- a/types/react-icons/io/lightbulb.d.ts
+++ b/types/react-icons/io/lightbulb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLightbulb extends React.Component<IconBaseProps, any> { }
+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
index d4607bd0c8..c0c376d736 100644
--- a/types/react-icons/io/link.d.ts
+++ b/types/react-icons/io/link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLink extends React.Component<IconBaseProps, any> { }
+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
index bf459557cd..bf0b3ec100 100644
--- a/types/react-icons/io/load-a.d.ts
+++ b/types/react-icons/io/load-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadA extends React.Component<IconBaseProps, any> { }
+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
index e1ee3f4f6b..85dcae989a 100644
--- a/types/react-icons/io/load-b.d.ts
+++ b/types/react-icons/io/load-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadB extends React.Component<IconBaseProps, any> { }
+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
index 1b508ac7bc..733dff4bfa 100644
--- a/types/react-icons/io/load-c.d.ts
+++ b/types/react-icons/io/load-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadC extends React.Component<IconBaseProps, any> { }
+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
index ea1b63efbe..160d71b383 100644
--- a/types/react-icons/io/load-d.d.ts
+++ b/types/react-icons/io/load-d.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoadD extends React.Component<IconBaseProps, any> { }
+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
index d68e7d3874..04e657adc4 100644
--- a/types/react-icons/io/location.d.ts
+++ b/types/react-icons/io/location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLocation extends React.Component<IconBaseProps, any> { }
+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
index 4077456773..d25e21ded1 100644
--- a/types/react-icons/io/lock-combination.d.ts
+++ b/types/react-icons/io/lock-combination.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLockCombination extends React.Component<IconBaseProps, any> { }
+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
index add0e769a4..db82275a8e 100644
--- a/types/react-icons/io/locked.d.ts
+++ b/types/react-icons/io/locked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLocked extends React.Component<IconBaseProps, any> { }
+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
index 9b8f8951a0..bb045baf8e 100644
--- a/types/react-icons/io/log-in.d.ts
+++ b/types/react-icons/io/log-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLogIn extends React.Component<IconBaseProps, any> { }
+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
index 02935b3c52..0374ff539d 100644
--- a/types/react-icons/io/log-out.d.ts
+++ b/types/react-icons/io/log-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLogOut extends React.Component<IconBaseProps, any> { }
+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
index eab8d6a7f2..2f5d563c07 100644
--- a/types/react-icons/io/loop.d.ts
+++ b/types/react-icons/io/loop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoLoop extends React.Component<IconBaseProps, any> { }
+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
index 15df2942b5..b8625a2ccf 100644
--- a/types/react-icons/io/magnet.d.ts
+++ b/types/react-icons/io/magnet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMagnet extends React.Component<IconBaseProps, any> { }
+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
index e5847005f7..62bfbd5067 100644
--- a/types/react-icons/io/male.d.ts
+++ b/types/react-icons/io/male.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMale extends React.Component<IconBaseProps, any> { }
+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
index dbf11ca2c4..2770ac14e2 100644
--- a/types/react-icons/io/man.d.ts
+++ b/types/react-icons/io/man.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMan extends React.Component<IconBaseProps, any> { }
+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
index d60e14c2b3..4c48512de6 100644
--- a/types/react-icons/io/map.d.ts
+++ b/types/react-icons/io/map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMap extends React.Component<IconBaseProps, any> { }
+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
index 6701904046..e15728387c 100644
--- a/types/react-icons/io/medkit.d.ts
+++ b/types/react-icons/io/medkit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMedkit extends React.Component<IconBaseProps, any> { }
+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
index 6e0444ad87..6a41308d9b 100644
--- a/types/react-icons/io/merge.d.ts
+++ b/types/react-icons/io/merge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMerge extends React.Component<IconBaseProps, any> { }
+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
index 2aec57787d..c5cf11831d 100644
--- a/types/react-icons/io/mic-a.d.ts
+++ b/types/react-icons/io/mic-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicA extends React.Component<IconBaseProps, any> { }
+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
index c120917532..68a0acf707 100644
--- a/types/react-icons/io/mic-b.d.ts
+++ b/types/react-icons/io/mic-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicB extends React.Component<IconBaseProps, any> { }
+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
index b12d7bcb02..2d8ddc3be6 100644
--- a/types/react-icons/io/mic-c.d.ts
+++ b/types/react-icons/io/mic-c.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMicC extends React.Component<IconBaseProps, any> { }
+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
index cf9f71cb17..1b5edd59e7 100644
--- a/types/react-icons/io/minus-circled.d.ts
+++ b/types/react-icons/io/minus-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusCircled extends React.Component<IconBaseProps, any> { }
+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
index fa1607c81e..1a75a9c5d4 100644
--- a/types/react-icons/io/minus-round.d.ts
+++ b/types/react-icons/io/minus-round.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinusRound extends React.Component<IconBaseProps, any> { }
+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
index 850ebdeff2..ee58f016db 100644
--- a/types/react-icons/io/minus.d.ts
+++ b/types/react-icons/io/minus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMinus extends React.Component<IconBaseProps, any> { }
+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
index 374461f2e0..567219cde6 100644
--- a/types/react-icons/io/model-s.d.ts
+++ b/types/react-icons/io/model-s.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoModelS extends React.Component<IconBaseProps, any> { }
+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
index 3c1787f06d..3454bea09f 100644
--- a/types/react-icons/io/monitor.d.ts
+++ b/types/react-icons/io/monitor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMonitor extends React.Component<IconBaseProps, any> { }
+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
index 7496eea4df..2c528b5bae 100644
--- a/types/react-icons/io/more.d.ts
+++ b/types/react-icons/io/more.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMore extends React.Component<IconBaseProps, any> { }
+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
index f438dab466..af862564ba 100644
--- a/types/react-icons/io/mouse.d.ts
+++ b/types/react-icons/io/mouse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMouse extends React.Component<IconBaseProps, any> { }
+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
index 59d1896d0d..92875eb08a 100644
--- a/types/react-icons/io/music-note.d.ts
+++ b/types/react-icons/io/music-note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoMusicNote extends React.Component<IconBaseProps, any> { }
+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
index ce8e36e0aa..5d1bc53526 100644
--- a/types/react-icons/io/navicon-round.d.ts
+++ b/types/react-icons/io/navicon-round.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNaviconRound extends React.Component<IconBaseProps, any> { }
+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
index a9bc1ee36b..cdae5d7238 100644
--- a/types/react-icons/io/navicon.d.ts
+++ b/types/react-icons/io/navicon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNavicon extends React.Component<IconBaseProps, any> { }
+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
index 9497cb7f47..2fe67c17b2 100644
--- a/types/react-icons/io/navigate.d.ts
+++ b/types/react-icons/io/navigate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNavigate extends React.Component<IconBaseProps, any> { }
+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
index 3d28e64f76..359c0abbd2 100644
--- a/types/react-icons/io/network.d.ts
+++ b/types/react-icons/io/network.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNetwork extends React.Component<IconBaseProps, any> { }
+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
index a66d9fde0f..074789127a 100644
--- a/types/react-icons/io/no-smoking.d.ts
+++ b/types/react-icons/io/no-smoking.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNoSmoking extends React.Component<IconBaseProps, any> { }
+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
index e7a5c608e2..559674f85e 100644
--- a/types/react-icons/io/nuclear.d.ts
+++ b/types/react-icons/io/nuclear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoNuclear extends React.Component<IconBaseProps, any> { }
+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
index e564d123b2..f68de98cb1 100644
--- a/types/react-icons/io/outlet.d.ts
+++ b/types/react-icons/io/outlet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoOutlet extends React.Component<IconBaseProps, any> { }
+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
index 631e058a43..1cc12bebca 100644
--- a/types/react-icons/io/paintbrush.d.ts
+++ b/types/react-icons/io/paintbrush.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbrush extends React.Component<IconBaseProps, any> { }
+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
index c697f86db6..0e6dce8aa7 100644
--- a/types/react-icons/io/paintbucket.d.ts
+++ b/types/react-icons/io/paintbucket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaintbucket extends React.Component<IconBaseProps, any> { }
+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
index 7d5d3509f0..e5c2d64cb8 100644
--- a/types/react-icons/io/paper-airplane.d.ts
+++ b/types/react-icons/io/paper-airplane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperAirplane extends React.Component<IconBaseProps, any> { }
+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
index f019cd0c27..cb9463bdf1 100644
--- a/types/react-icons/io/paperclip.d.ts
+++ b/types/react-icons/io/paperclip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPaperclip extends React.Component<IconBaseProps, any> { }
+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
index d77258ad15..2680c5b1b4 100644
--- a/types/react-icons/io/pause.d.ts
+++ b/types/react-icons/io/pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPause extends React.Component<IconBaseProps, any> { }
+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
index bc6bbf352b..43a66e58c0 100644
--- a/types/react-icons/io/person-add.d.ts
+++ b/types/react-icons/io/person-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonAdd extends React.Component<IconBaseProps, any> { }
+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
index 70cf97c7ee..59ed89e000 100644
--- a/types/react-icons/io/person-stalker.d.ts
+++ b/types/react-icons/io/person-stalker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPersonStalker extends React.Component<IconBaseProps, any> { }
+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
index 4fdfb0dca6..0970df9ab0 100644
--- a/types/react-icons/io/person.d.ts
+++ b/types/react-icons/io/person.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPerson extends React.Component<IconBaseProps, any> { }
+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
index 8e17d07e5d..4171c0ee1d 100644
--- a/types/react-icons/io/pie-graph.d.ts
+++ b/types/react-icons/io/pie-graph.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPieGraph extends React.Component<IconBaseProps, any> { }
+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
index afd1a3791b..7e1d58f30e 100644
--- a/types/react-icons/io/pin.d.ts
+++ b/types/react-icons/io/pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPin extends React.Component<IconBaseProps, any> { }
+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
index b3d73db0f8..8ecf88a45b 100644
--- a/types/react-icons/io/pinpoint.d.ts
+++ b/types/react-icons/io/pinpoint.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPinpoint extends React.Component<IconBaseProps, any> { }
+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
index cccedbf070..ef5ce7525b 100644
--- a/types/react-icons/io/pizza.d.ts
+++ b/types/react-icons/io/pizza.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPizza extends React.Component<IconBaseProps, any> { }
+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
index d1298c4296..9f0b2eaff2 100644
--- a/types/react-icons/io/plane.d.ts
+++ b/types/react-icons/io/plane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlane extends React.Component<IconBaseProps, any> { }
+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
index eb5a637d02..b91ae2a503 100644
--- a/types/react-icons/io/planet.d.ts
+++ b/types/react-icons/io/planet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlanet extends React.Component<IconBaseProps, any> { }
+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
index cd11cd4375..8a66797eb2 100644
--- a/types/react-icons/io/play.d.ts
+++ b/types/react-icons/io/play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlay extends React.Component<IconBaseProps, any> { }
+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
index d6e09992db..315eecce09 100644
--- a/types/react-icons/io/playstation.d.ts
+++ b/types/react-icons/io/playstation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlaystation extends React.Component<IconBaseProps, any> { }
+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
index 679702dc7e..a74703c85d 100644
--- a/types/react-icons/io/plus-circled.d.ts
+++ b/types/react-icons/io/plus-circled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusCircled extends React.Component<IconBaseProps, any> { }
+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
index 50832ef1a3..3e7ba67f3a 100644
--- a/types/react-icons/io/plus-round.d.ts
+++ b/types/react-icons/io/plus-round.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlusRound extends React.Component<IconBaseProps, any> { }
+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
index 0e7badbb96..f61bf82a1a 100644
--- a/types/react-icons/io/plus.d.ts
+++ b/types/react-icons/io/plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPlus extends React.Component<IconBaseProps, any> { }
+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
index fb5d659b93..af2e204331 100644
--- a/types/react-icons/io/podium.d.ts
+++ b/types/react-icons/io/podium.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPodium extends React.Component<IconBaseProps, any> { }
+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
index 230307dbf1..b7b2e28b9e 100644
--- a/types/react-icons/io/pound.d.ts
+++ b/types/react-icons/io/pound.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPound extends React.Component<IconBaseProps, any> { }
+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
index 9058c913cd..f41d3d5e00 100644
--- a/types/react-icons/io/power.d.ts
+++ b/types/react-icons/io/power.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPower extends React.Component<IconBaseProps, any> { }
+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
index 761a7194cb..b8f2d47c03 100644
--- a/types/react-icons/io/pricetag.d.ts
+++ b/types/react-icons/io/pricetag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetag extends React.Component<IconBaseProps, any> { }
+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
index b59f206ed8..cca52cc061 100644
--- a/types/react-icons/io/pricetags.d.ts
+++ b/types/react-icons/io/pricetags.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPricetags extends React.Component<IconBaseProps, any> { }
+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
index fec75b3634..33bc74b2c2 100644
--- a/types/react-icons/io/printer.d.ts
+++ b/types/react-icons/io/printer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPrinter extends React.Component<IconBaseProps, any> { }
+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
index 0eef5a54c7..b788efefdc 100644
--- a/types/react-icons/io/pull-request.d.ts
+++ b/types/react-icons/io/pull-request.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoPullRequest extends React.Component<IconBaseProps, any> { }
+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
index 79b42b47ae..77b1ca1dcf 100644
--- a/types/react-icons/io/qr-scanner.d.ts
+++ b/types/react-icons/io/qr-scanner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoQrScanner extends React.Component<IconBaseProps, any> { }
+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
index cd0b45c094..ac7f5d32ef 100644
--- a/types/react-icons/io/quote.d.ts
+++ b/types/react-icons/io/quote.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoQuote extends React.Component<IconBaseProps, any> { }
+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
index c69ea37796..0b67b79379 100644
--- a/types/react-icons/io/radio-waves.d.ts
+++ b/types/react-icons/io/radio-waves.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRadioWaves extends React.Component<IconBaseProps, any> { }
+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
index 58a79138fd..dd7cd7a65f 100644
--- a/types/react-icons/io/record.d.ts
+++ b/types/react-icons/io/record.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRecord extends React.Component<IconBaseProps, any> { }
+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
index fc4a9e3513..8712271741 100644
--- a/types/react-icons/io/refresh.d.ts
+++ b/types/react-icons/io/refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRefresh extends React.Component<IconBaseProps, any> { }
+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
index 36e3ddaa70..568a1f8dd4 100644
--- a/types/react-icons/io/reply-all.d.ts
+++ b/types/react-icons/io/reply-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoReplyAll extends React.Component<IconBaseProps, any> { }
+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
index 8532b812a6..628b3c6ade 100644
--- a/types/react-icons/io/reply.d.ts
+++ b/types/react-icons/io/reply.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoReply extends React.Component<IconBaseProps, any> { }
+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
index 29e1731b04..38d15e1fd1 100644
--- a/types/react-icons/io/ribbon-a.d.ts
+++ b/types/react-icons/io/ribbon-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonA extends React.Component<IconBaseProps, any> { }
+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
index 58089736f9..8e2ba836cc 100644
--- a/types/react-icons/io/ribbon-b.d.ts
+++ b/types/react-icons/io/ribbon-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoRibbonB extends React.Component<IconBaseProps, any> { }
+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
index b53ff936d6..07ef27ecfb 100644
--- a/types/react-icons/io/sad-outline.d.ts
+++ b/types/react-icons/io/sad-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSadOutline extends React.Component<IconBaseProps, any> { }
+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
index 7e6cfa31b5..de6e0e3b98 100644
--- a/types/react-icons/io/sad.d.ts
+++ b/types/react-icons/io/sad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSad extends React.Component<IconBaseProps, any> { }
+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
index ead40da596..18b40acd88 100644
--- a/types/react-icons/io/scissors.d.ts
+++ b/types/react-icons/io/scissors.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoScissors extends React.Component<IconBaseProps, any> { }
+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
index 4975c28716..00175f972b 100644
--- a/types/react-icons/io/search.d.ts
+++ b/types/react-icons/io/search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSearch extends React.Component<IconBaseProps, any> { }
+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
index 8e95ca2e28..b5793e8679 100644
--- a/types/react-icons/io/settings.d.ts
+++ b/types/react-icons/io/settings.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSettings extends React.Component<IconBaseProps, any> { }
+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
index 46dbc58330..ba6d9a210a 100644
--- a/types/react-icons/io/share.d.ts
+++ b/types/react-icons/io/share.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoShare extends React.Component<IconBaseProps, any> { }
+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
index 25d4e8f370..fb4bf71aad 100644
--- a/types/react-icons/io/shuffle.d.ts
+++ b/types/react-icons/io/shuffle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoShuffle extends React.Component<IconBaseProps, any> { }
+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
index 291d6c9902..94bf5675c3 100644
--- a/types/react-icons/io/skip-backward.d.ts
+++ b/types/react-icons/io/skip-backward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipBackward extends React.Component<IconBaseProps, any> { }
+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
index 408a96b7b2..7912bd2dfa 100644
--- a/types/react-icons/io/skip-forward.d.ts
+++ b/types/react-icons/io/skip-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSkipForward extends React.Component<IconBaseProps, any> { }
+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
index 5ef58d9d05..3b306ef4a2 100644
--- a/types/react-icons/io/social-android-outline.d.ts
+++ b/types/react-icons/io/social-android-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroidOutline extends React.Component<IconBaseProps, any> { }
+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
index 5fb0909887..362c2af2c5 100644
--- a/types/react-icons/io/social-android.d.ts
+++ b/types/react-icons/io/social-android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAndroid extends React.Component<IconBaseProps, any> { }
+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
index 163e533380..be0ad623a7 100644
--- a/types/react-icons/io/social-angular-outline.d.ts
+++ b/types/react-icons/io/social-angular-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngularOutline extends React.Component<IconBaseProps, any> { }
+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
index daf255599f..0286fd5c24 100644
--- a/types/react-icons/io/social-angular.d.ts
+++ b/types/react-icons/io/social-angular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAngular extends React.Component<IconBaseProps, any> { }
+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
index 5134a8e62d..13ef33d192 100644
--- a/types/react-icons/io/social-apple-outline.d.ts
+++ b/types/react-icons/io/social-apple-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialAppleOutline extends React.Component<IconBaseProps, any> { }
+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
index 4b844abfb3..bece372480 100644
--- a/types/react-icons/io/social-apple.d.ts
+++ b/types/react-icons/io/social-apple.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialApple extends React.Component<IconBaseProps, any> { }
+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
index abdf8e1155..9044d3dc51 100644
--- a/types/react-icons/io/social-bitcoin-outline.d.ts
+++ b/types/react-icons/io/social-bitcoin-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoinOutline extends React.Component<IconBaseProps, any> { }
+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
index 857df18ddf..f13a9ca0e2 100644
--- a/types/react-icons/io/social-bitcoin.d.ts
+++ b/types/react-icons/io/social-bitcoin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBitcoin extends React.Component<IconBaseProps, any> { }
+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
index b7b40f2382..073a4d3256 100644
--- a/types/react-icons/io/social-buffer-outline.d.ts
+++ b/types/react-icons/io/social-buffer-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBufferOutline extends React.Component<IconBaseProps, any> { }
+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
index d365b3d9c1..8f103cbc23 100644
--- a/types/react-icons/io/social-buffer.d.ts
+++ b/types/react-icons/io/social-buffer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialBuffer extends React.Component<IconBaseProps, any> { }
+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
index 004da4c296..e0b96d90a9 100644
--- a/types/react-icons/io/social-chrome-outline.d.ts
+++ b/types/react-icons/io/social-chrome-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChromeOutline extends React.Component<IconBaseProps, any> { }
+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
index e2e3f2d5da..a98ec53c7b 100644
--- a/types/react-icons/io/social-chrome.d.ts
+++ b/types/react-icons/io/social-chrome.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialChrome extends React.Component<IconBaseProps, any> { }
+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
index abb202dad9..86affb85f1 100644
--- a/types/react-icons/io/social-codepen-outline.d.ts
+++ b/types/react-icons/io/social-codepen-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepenOutline extends React.Component<IconBaseProps, any> { }
+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
index 97177f6b68..bd6d0fe2ff 100644
--- a/types/react-icons/io/social-codepen.d.ts
+++ b/types/react-icons/io/social-codepen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCodepen extends React.Component<IconBaseProps, any> { }
+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
index c95689c2c9..0d792c0e6a 100644
--- a/types/react-icons/io/social-css3-outline.d.ts
+++ b/types/react-icons/io/social-css3-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3Outline extends React.Component<IconBaseProps, any> { }
+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
index c39ecce180..f8ef55d480 100644
--- a/types/react-icons/io/social-css3.d.ts
+++ b/types/react-icons/io/social-css3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialCss3 extends React.Component<IconBaseProps, any> { }
+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
index c9fb923e85..9a84d73221 100644
--- a/types/react-icons/io/social-designernews-outline.d.ts
+++ b/types/react-icons/io/social-designernews-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernewsOutline extends React.Component<IconBaseProps, any> { }
+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
index 83f79899a8..b7f5b92381 100644
--- a/types/react-icons/io/social-designernews.d.ts
+++ b/types/react-icons/io/social-designernews.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDesignernews extends React.Component<IconBaseProps, any> { }
+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
index 3c94a44d6b..ba7a99e3ab 100644
--- a/types/react-icons/io/social-dribbble-outline.d.ts
+++ b/types/react-icons/io/social-dribbble-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbbleOutline extends React.Component<IconBaseProps, any> { }
+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
index 88a91a40a2..ef43f8d862 100644
--- a/types/react-icons/io/social-dribbble.d.ts
+++ b/types/react-icons/io/social-dribbble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDribbble extends React.Component<IconBaseProps, any> { }
+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
index 353695468e..71959da367 100644
--- a/types/react-icons/io/social-dropbox-outline.d.ts
+++ b/types/react-icons/io/social-dropbox-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropboxOutline extends React.Component<IconBaseProps, any> { }
+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
index 54e01f043c..e0f243a8fa 100644
--- a/types/react-icons/io/social-dropbox.d.ts
+++ b/types/react-icons/io/social-dropbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialDropbox extends React.Component<IconBaseProps, any> { }
+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
index 7b1ab419fd..ec55bb73a5 100644
--- a/types/react-icons/io/social-euro-outline.d.ts
+++ b/types/react-icons/io/social-euro-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuroOutline extends React.Component<IconBaseProps, any> { }
+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
index 2ca01ea7c3..b0b70b5796 100644
--- a/types/react-icons/io/social-euro.d.ts
+++ b/types/react-icons/io/social-euro.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialEuro extends React.Component<IconBaseProps, any> { }
+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
index 2e80c7b06c..fce2eda2b9 100644
--- a/types/react-icons/io/social-facebook-outline.d.ts
+++ b/types/react-icons/io/social-facebook-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebookOutline extends React.Component<IconBaseProps, any> { }
+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
index b1b56bfaab..696c8f5401 100644
--- a/types/react-icons/io/social-facebook.d.ts
+++ b/types/react-icons/io/social-facebook.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFacebook extends React.Component<IconBaseProps, any> { }
+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
index ffc2cb4d14..aa643db79c 100644
--- a/types/react-icons/io/social-foursquare-outline.d.ts
+++ b/types/react-icons/io/social-foursquare-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquareOutline extends React.Component<IconBaseProps, any> { }
+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
index d2bf1a0ad0..d4555bfc41 100644
--- a/types/react-icons/io/social-foursquare.d.ts
+++ b/types/react-icons/io/social-foursquare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFoursquare extends React.Component<IconBaseProps, any> { }
+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
index 9a5e168f4d..17715e0a06 100644
--- a/types/react-icons/io/social-freebsd-devil.d.ts
+++ b/types/react-icons/io/social-freebsd-devil.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialFreebsdDevil extends React.Component<IconBaseProps, any> { }
+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
index dc67277c39..ad810dd9f5 100644
--- a/types/react-icons/io/social-github-outline.d.ts
+++ b/types/react-icons/io/social-github-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithubOutline extends React.Component<IconBaseProps, any> { }
+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
index fd5304b857..dabc247815 100644
--- a/types/react-icons/io/social-github.d.ts
+++ b/types/react-icons/io/social-github.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGithub extends React.Component<IconBaseProps, any> { }
+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
index e27701fe93..76fa21d665 100644
--- a/types/react-icons/io/social-google-outline.d.ts
+++ b/types/react-icons/io/social-google-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleOutline extends React.Component<IconBaseProps, any> { }
+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
index d4c87d0a55..c31283ade3 100644
--- a/types/react-icons/io/social-google.d.ts
+++ b/types/react-icons/io/social-google.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogle extends React.Component<IconBaseProps, any> { }
+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
index b4559eeb30..fe28dee981 100644
--- a/types/react-icons/io/social-googleplus-outline.d.ts
+++ b/types/react-icons/io/social-googleplus-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplusOutline extends React.Component<IconBaseProps, any> { }
+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
index b473804991..3fe4052899 100644
--- a/types/react-icons/io/social-googleplus.d.ts
+++ b/types/react-icons/io/social-googleplus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialGoogleplus extends React.Component<IconBaseProps, any> { }
+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
index baa35b5477..c71910be26 100644
--- a/types/react-icons/io/social-hackernews-outline.d.ts
+++ b/types/react-icons/io/social-hackernews-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernewsOutline extends React.Component<IconBaseProps, any> { }
+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
index 64fdb20e02..69f8ffd48e 100644
--- a/types/react-icons/io/social-hackernews.d.ts
+++ b/types/react-icons/io/social-hackernews.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHackernews extends React.Component<IconBaseProps, any> { }
+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
index 358c511172..3c8d43114f 100644
--- a/types/react-icons/io/social-html5-outline.d.ts
+++ b/types/react-icons/io/social-html5-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5Outline extends React.Component<IconBaseProps, any> { }
+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
index e36b3c385c..9916b17e2c 100644
--- a/types/react-icons/io/social-html5.d.ts
+++ b/types/react-icons/io/social-html5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialHtml5 extends React.Component<IconBaseProps, any> { }
+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
index 3ea6bc60a4..ffc74066b7 100644
--- a/types/react-icons/io/social-instagram-outline.d.ts
+++ b/types/react-icons/io/social-instagram-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagramOutline extends React.Component<IconBaseProps, any> { }
+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
index 1fabdee1f4..7c06ae1833 100644
--- a/types/react-icons/io/social-instagram.d.ts
+++ b/types/react-icons/io/social-instagram.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialInstagram extends React.Component<IconBaseProps, any> { }
+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
index 44347ada75..0f21ff7483 100644
--- a/types/react-icons/io/social-javascript-outline.d.ts
+++ b/types/react-icons/io/social-javascript-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascriptOutline extends React.Component<IconBaseProps, any> { }
+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
index edc53202f0..99905575bf 100644
--- a/types/react-icons/io/social-javascript.d.ts
+++ b/types/react-icons/io/social-javascript.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialJavascript extends React.Component<IconBaseProps, any> { }
+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
index 27b413188e..3ddee8261a 100644
--- a/types/react-icons/io/social-linkedin-outline.d.ts
+++ b/types/react-icons/io/social-linkedin-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedinOutline extends React.Component<IconBaseProps, any> { }
+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
index dff6da980d..0266663678 100644
--- a/types/react-icons/io/social-linkedin.d.ts
+++ b/types/react-icons/io/social-linkedin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialLinkedin extends React.Component<IconBaseProps, any> { }
+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
index cdd5a65e2a..963119614d 100644
--- a/types/react-icons/io/social-markdown.d.ts
+++ b/types/react-icons/io/social-markdown.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialMarkdown extends React.Component<IconBaseProps, any> { }
+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
index b51e5183f4..642390dc4a 100644
--- a/types/react-icons/io/social-nodejs.d.ts
+++ b/types/react-icons/io/social-nodejs.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialNodejs extends React.Component<IconBaseProps, any> { }
+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
index 403dc17f0c..0003cb487c 100644
--- a/types/react-icons/io/social-octocat.d.ts
+++ b/types/react-icons/io/social-octocat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialOctocat extends React.Component<IconBaseProps, any> { }
+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
index a645004ed6..4ed2d123ac 100644
--- a/types/react-icons/io/social-pinterest-outline.d.ts
+++ b/types/react-icons/io/social-pinterest-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterestOutline extends React.Component<IconBaseProps, any> { }
+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
index 75ff518c07..f2ee95376f 100644
--- a/types/react-icons/io/social-pinterest.d.ts
+++ b/types/react-icons/io/social-pinterest.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPinterest extends React.Component<IconBaseProps, any> { }
+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
index 03722170b6..78a6e50954 100644
--- a/types/react-icons/io/social-python.d.ts
+++ b/types/react-icons/io/social-python.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialPython extends React.Component<IconBaseProps, any> { }
+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
index ebc8142c14..9dd5355bdc 100644
--- a/types/react-icons/io/social-reddit-outline.d.ts
+++ b/types/react-icons/io/social-reddit-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRedditOutline extends React.Component<IconBaseProps, any> { }
+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
index 49086f2b68..e103be80d3 100644
--- a/types/react-icons/io/social-reddit.d.ts
+++ b/types/react-icons/io/social-reddit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialReddit extends React.Component<IconBaseProps, any> { }
+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
index 30f28e914a..4baab1f80b 100644
--- a/types/react-icons/io/social-rss-outline.d.ts
+++ b/types/react-icons/io/social-rss-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRssOutline extends React.Component<IconBaseProps, any> { }
+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
index a8d54dcdbc..2c749b4af9 100644
--- a/types/react-icons/io/social-rss.d.ts
+++ b/types/react-icons/io/social-rss.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialRss extends React.Component<IconBaseProps, any> { }
+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
index 1184f14944..6ba05bc9ae 100644
--- a/types/react-icons/io/social-sass.d.ts
+++ b/types/react-icons/io/social-sass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSass extends React.Component<IconBaseProps, any> { }
+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
index 6932ff424e..cefebe89c9 100644
--- a/types/react-icons/io/social-skype-outline.d.ts
+++ b/types/react-icons/io/social-skype-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkypeOutline extends React.Component<IconBaseProps, any> { }
+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
index 88925c8d80..a49a35ce62 100644
--- a/types/react-icons/io/social-skype.d.ts
+++ b/types/react-icons/io/social-skype.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSkype extends React.Component<IconBaseProps, any> { }
+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
index d77a400d5d..5fe324cb94 100644
--- a/types/react-icons/io/social-snapchat-outline.d.ts
+++ b/types/react-icons/io/social-snapchat-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchatOutline extends React.Component<IconBaseProps, any> { }
+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
index 215d61fbe9..ba87070d61 100644
--- a/types/react-icons/io/social-snapchat.d.ts
+++ b/types/react-icons/io/social-snapchat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialSnapchat extends React.Component<IconBaseProps, any> { }
+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
index 2aa03b43d0..dbf70d2b60 100644
--- a/types/react-icons/io/social-tumblr-outline.d.ts
+++ b/types/react-icons/io/social-tumblr-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblrOutline extends React.Component<IconBaseProps, any> { }
+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
index 182d1a9948..ce5c8b4170 100644
--- a/types/react-icons/io/social-tumblr.d.ts
+++ b/types/react-icons/io/social-tumblr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTumblr extends React.Component<IconBaseProps, any> { }
+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
index cca5f1cf1c..411ff72010 100644
--- a/types/react-icons/io/social-tux.d.ts
+++ b/types/react-icons/io/social-tux.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTux extends React.Component<IconBaseProps, any> { }
+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
index 309a881fe3..5875914d98 100644
--- a/types/react-icons/io/social-twitch-outline.d.ts
+++ b/types/react-icons/io/social-twitch-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitchOutline extends React.Component<IconBaseProps, any> { }
+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
index 95170427a7..109993f553 100644
--- a/types/react-icons/io/social-twitch.d.ts
+++ b/types/react-icons/io/social-twitch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitch extends React.Component<IconBaseProps, any> { }
+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
index bd806ab471..2ecfe578dd 100644
--- a/types/react-icons/io/social-twitter-outline.d.ts
+++ b/types/react-icons/io/social-twitter-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitterOutline extends React.Component<IconBaseProps, any> { }
+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
index 3e30bac687..81b8c0817a 100644
--- a/types/react-icons/io/social-twitter.d.ts
+++ b/types/react-icons/io/social-twitter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialTwitter extends React.Component<IconBaseProps, any> { }
+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
index 748f12fff3..8c12d195f5 100644
--- a/types/react-icons/io/social-usd-outline.d.ts
+++ b/types/react-icons/io/social-usd-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsdOutline extends React.Component<IconBaseProps, any> { }
+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
index f35df96bef..a6814ba496 100644
--- a/types/react-icons/io/social-usd.d.ts
+++ b/types/react-icons/io/social-usd.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialUsd extends React.Component<IconBaseProps, any> { }
+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
index d3960756b5..bcac0c4f79 100644
--- a/types/react-icons/io/social-vimeo-outline.d.ts
+++ b/types/react-icons/io/social-vimeo-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeoOutline extends React.Component<IconBaseProps, any> { }
+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
index f423fa539b..5e0e068a51 100644
--- a/types/react-icons/io/social-vimeo.d.ts
+++ b/types/react-icons/io/social-vimeo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialVimeo extends React.Component<IconBaseProps, any> { }
+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
index 1bef34421f..d3945dd43a 100644
--- a/types/react-icons/io/social-whatsapp-outline.d.ts
+++ b/types/react-icons/io/social-whatsapp-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsappOutline extends React.Component<IconBaseProps, any> { }
+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
index 997233554e..3f767a557e 100644
--- a/types/react-icons/io/social-whatsapp.d.ts
+++ b/types/react-icons/io/social-whatsapp.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWhatsapp extends React.Component<IconBaseProps, any> { }
+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
index 0a88b8b1f1..204f5cc4ef 100644
--- a/types/react-icons/io/social-windows-outline.d.ts
+++ b/types/react-icons/io/social-windows-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindowsOutline extends React.Component<IconBaseProps, any> { }
+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
index 10c0b33dd0..4a5a4854bd 100644
--- a/types/react-icons/io/social-windows.d.ts
+++ b/types/react-icons/io/social-windows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWindows extends React.Component<IconBaseProps, any> { }
+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
index fa0fb9655d..15e7a115dd 100644
--- a/types/react-icons/io/social-wordpress-outline.d.ts
+++ b/types/react-icons/io/social-wordpress-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpressOutline extends React.Component<IconBaseProps, any> { }
+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
index e3a745a2bc..4d6e02a859 100644
--- a/types/react-icons/io/social-wordpress.d.ts
+++ b/types/react-icons/io/social-wordpress.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialWordpress extends React.Component<IconBaseProps, any> { }
+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
index c02a5d8858..5dcc671758 100644
--- a/types/react-icons/io/social-yahoo-outline.d.ts
+++ b/types/react-icons/io/social-yahoo-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahooOutline extends React.Component<IconBaseProps, any> { }
+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
index d922022174..b5e6c878d6 100644
--- a/types/react-icons/io/social-yahoo.d.ts
+++ b/types/react-icons/io/social-yahoo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYahoo extends React.Component<IconBaseProps, any> { }
+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
index ff278c2253..889d6655a6 100644
--- a/types/react-icons/io/social-yen-outline.d.ts
+++ b/types/react-icons/io/social-yen-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYenOutline extends React.Component<IconBaseProps, any> { }
+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
index 8f2af5aae9..59d9b2b28b 100644
--- a/types/react-icons/io/social-yen.d.ts
+++ b/types/react-icons/io/social-yen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYen extends React.Component<IconBaseProps, any> { }
+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
index 9b83129b69..09812d8e86 100644
--- a/types/react-icons/io/social-youtube-outline.d.ts
+++ b/types/react-icons/io/social-youtube-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutubeOutline extends React.Component<IconBaseProps, any> { }
+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
index 909c4991b6..881e782d72 100644
--- a/types/react-icons/io/social-youtube.d.ts
+++ b/types/react-icons/io/social-youtube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSocialYoutube extends React.Component<IconBaseProps, any> { }
+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
index d438755ce7..e1fe063808 100644
--- a/types/react-icons/io/soup-can-outline.d.ts
+++ b/types/react-icons/io/soup-can-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCanOutline extends React.Component<IconBaseProps, any> { }
+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
index 6878b5f1f6..50b4167624 100644
--- a/types/react-icons/io/soup-can.d.ts
+++ b/types/react-icons/io/soup-can.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSoupCan extends React.Component<IconBaseProps, any> { }
+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
index fd077626e7..af9117f78e 100644
--- a/types/react-icons/io/speakerphone.d.ts
+++ b/types/react-icons/io/speakerphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeakerphone extends React.Component<IconBaseProps, any> { }
+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
index b93c4d1e70..50d69af596 100644
--- a/types/react-icons/io/speedometer.d.ts
+++ b/types/react-icons/io/speedometer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpeedometer extends React.Component<IconBaseProps, any> { }
+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
index f809eac4fc..107a88c9a6 100644
--- a/types/react-icons/io/spoon.d.ts
+++ b/types/react-icons/io/spoon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSpoon extends React.Component<IconBaseProps, any> { }
+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
index f9de5fb94e..f4c1953512 100644
--- a/types/react-icons/io/star.d.ts
+++ b/types/react-icons/io/star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStar extends React.Component<IconBaseProps, any> { }
+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
index 5a40cf1e07..2d5e5024cb 100644
--- a/types/react-icons/io/stats-bars.d.ts
+++ b/types/react-icons/io/stats-bars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStatsBars extends React.Component<IconBaseProps, any> { }
+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
index 118e737a5e..097461e15c 100644
--- a/types/react-icons/io/steam.d.ts
+++ b/types/react-icons/io/steam.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoSteam extends React.Component<IconBaseProps, any> { }
+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
index eec5f79678..5fed81dabb 100644
--- a/types/react-icons/io/stop.d.ts
+++ b/types/react-icons/io/stop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoStop extends React.Component<IconBaseProps, any> { }
+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
index c435f66967..f76efa25ac 100644
--- a/types/react-icons/io/thermometer.d.ts
+++ b/types/react-icons/io/thermometer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThermometer extends React.Component<IconBaseProps, any> { }
+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
index 1eba0593c9..ebbbe6a64e 100644
--- a/types/react-icons/io/thumbsdown.d.ts
+++ b/types/react-icons/io/thumbsdown.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsdown extends React.Component<IconBaseProps, any> { }
+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
index bd90335a00..285d40f186 100644
--- a/types/react-icons/io/thumbsup.d.ts
+++ b/types/react-icons/io/thumbsup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoThumbsup extends React.Component<IconBaseProps, any> { }
+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
index b66d9a50de..93cba93938 100644
--- a/types/react-icons/io/toggle-filled.d.ts
+++ b/types/react-icons/io/toggle-filled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoToggleFilled extends React.Component<IconBaseProps, any> { }
+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
index d9f81ed1de..1af341ce4f 100644
--- a/types/react-icons/io/toggle.d.ts
+++ b/types/react-icons/io/toggle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoToggle extends React.Component<IconBaseProps, any> { }
+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
index b3117beda8..254ada7d1a 100644
--- a/types/react-icons/io/transgender.d.ts
+++ b/types/react-icons/io/transgender.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTransgender extends React.Component<IconBaseProps, any> { }
+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
index 0a577ac0cd..bfd8815599 100644
--- a/types/react-icons/io/trash-a.d.ts
+++ b/types/react-icons/io/trash-a.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashA extends React.Component<IconBaseProps, any> { }
+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
index a8a9a0a7c7..c7c0cde13a 100644
--- a/types/react-icons/io/trash-b.d.ts
+++ b/types/react-icons/io/trash-b.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrashB extends React.Component<IconBaseProps, any> { }
+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
index c1564abf5f..f5f159c2e2 100644
--- a/types/react-icons/io/trophy.d.ts
+++ b/types/react-icons/io/trophy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTrophy extends React.Component<IconBaseProps, any> { }
+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
index 922871e9b9..b530f97107 100644
--- a/types/react-icons/io/tshirt-outline.d.ts
+++ b/types/react-icons/io/tshirt-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirtOutline extends React.Component<IconBaseProps, any> { }
+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
index 41baa00a8e..b0072273b9 100644
--- a/types/react-icons/io/tshirt.d.ts
+++ b/types/react-icons/io/tshirt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoTshirt extends React.Component<IconBaseProps, any> { }
+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
index 44eae28564..b85cf5b8c9 100644
--- a/types/react-icons/io/umbrella.d.ts
+++ b/types/react-icons/io/umbrella.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUmbrella extends React.Component<IconBaseProps, any> { }
+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
index c781a80e52..5947ae4172 100644
--- a/types/react-icons/io/university.d.ts
+++ b/types/react-icons/io/university.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUniversity extends React.Component<IconBaseProps, any> { }
+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
index 4a8881fc7c..741c5ea952 100644
--- a/types/react-icons/io/unlocked.d.ts
+++ b/types/react-icons/io/unlocked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUnlocked extends React.Component<IconBaseProps, any> { }
+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
index fef83000da..1ffb5c4aaf 100644
--- a/types/react-icons/io/upload.d.ts
+++ b/types/react-icons/io/upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUpload extends React.Component<IconBaseProps, any> { }
+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
index 26716b03c4..e53180c80e 100644
--- a/types/react-icons/io/usb.d.ts
+++ b/types/react-icons/io/usb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoUsb extends React.Component<IconBaseProps, any> { }
+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
index 692f081ea5..43148acede 100644
--- a/types/react-icons/io/videocamera.d.ts
+++ b/types/react-icons/io/videocamera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVideocamera extends React.Component<IconBaseProps, any> { }
+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
index f5e4827c89..fdb362c990 100644
--- a/types/react-icons/io/volume-high.d.ts
+++ b/types/react-icons/io/volume-high.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeHigh extends React.Component<IconBaseProps, any> { }
+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
index 68ff3f6a5f..1ac513c891 100644
--- a/types/react-icons/io/volume-low.d.ts
+++ b/types/react-icons/io/volume-low.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeLow extends React.Component<IconBaseProps, any> { }
+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
index 71abde99d0..7607d22632 100644
--- a/types/react-icons/io/volume-medium.d.ts
+++ b/types/react-icons/io/volume-medium.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMedium extends React.Component<IconBaseProps, any> { }
+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
index 4e4294fd06..ff7330e544 100644
--- a/types/react-icons/io/volume-mute.d.ts
+++ b/types/react-icons/io/volume-mute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoVolumeMute extends React.Component<IconBaseProps, any> { }
+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
index 82258bbcd2..e1e22869ee 100644
--- a/types/react-icons/io/wand.d.ts
+++ b/types/react-icons/io/wand.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWand extends React.Component<IconBaseProps, any> { }
+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
index 81ebe0a17c..a674835d55 100644
--- a/types/react-icons/io/waterdrop.d.ts
+++ b/types/react-icons/io/waterdrop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWaterdrop extends React.Component<IconBaseProps, any> { }
+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
index b9306f028c..3bec1b2449 100644
--- a/types/react-icons/io/wifi.d.ts
+++ b/types/react-icons/io/wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWifi extends React.Component<IconBaseProps, any> { }
+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
index 2510595e9b..33b7d9843e 100644
--- a/types/react-icons/io/wineglass.d.ts
+++ b/types/react-icons/io/wineglass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWineglass extends React.Component<IconBaseProps, any> { }
+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
index 7e3391a462..b3cbbd6294 100644
--- a/types/react-icons/io/woman.d.ts
+++ b/types/react-icons/io/woman.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWoman extends React.Component<IconBaseProps, any> { }
+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
index 271814fbb8..6f53a0a8cd 100644
--- a/types/react-icons/io/wrench.d.ts
+++ b/types/react-icons/io/wrench.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoWrench extends React.Component<IconBaseProps, any> { }
+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
index 32668564d0..2d3db0cbbc 100644
--- a/types/react-icons/io/xbox.d.ts
+++ b/types/react-icons/io/xbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class IoXbox extends React.Component<IconBaseProps, any> { }
+export default class IoXbox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/3d-rotation.d.ts b/types/react-icons/md/3d-rotation.d.ts
index b90f4f9d5c..39d7887e16 100644
--- a/types/react-icons/md/3d-rotation.d.ts
+++ b/types/react-icons/md/3d-rotation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class Md3dRotation extends React.Component<IconBaseProps, any> { }
+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
index 9191a10ea5..19f6257f61 100644
--- a/types/react-icons/md/ac-unit.d.ts
+++ b/types/react-icons/md/ac-unit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAcUnit extends React.Component<IconBaseProps, any> { }
+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
index dec0406740..8bfb8edd91 100644
--- a/types/react-icons/md/access-alarm.d.ts
+++ b/types/react-icons/md/access-alarm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarm extends React.Component<IconBaseProps, any> { }
+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
index 64d5a3ba0c..0d5b3fa4db 100644
--- a/types/react-icons/md/access-alarms.d.ts
+++ b/types/react-icons/md/access-alarms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessAlarms extends React.Component<IconBaseProps, any> { }
+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
index 0620c832c1..552cf439f3 100644
--- a/types/react-icons/md/access-time.d.ts
+++ b/types/react-icons/md/access-time.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessTime extends React.Component<IconBaseProps, any> { }
+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
index 4fe1f74a25..4160aa2c69 100644
--- a/types/react-icons/md/accessibility.d.ts
+++ b/types/react-icons/md/accessibility.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessibility extends React.Component<IconBaseProps, any> { }
+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
index 5dddf75025..180d7b0bc5 100644
--- a/types/react-icons/md/accessible.d.ts
+++ b/types/react-icons/md/accessible.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccessible extends React.Component<IconBaseProps, any> { }
+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
index 6f85cd7f94..469c3e9876 100644
--- a/types/react-icons/md/account-balance-wallet.d.ts
+++ b/types/react-icons/md/account-balance-wallet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalanceWallet extends React.Component<IconBaseProps, any> { }
+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
index c70d04d818..22edcbea9a 100644
--- a/types/react-icons/md/account-balance.d.ts
+++ b/types/react-icons/md/account-balance.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBalance extends React.Component<IconBaseProps, any> { }
+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
index 827bf3eb84..c49ee5214e 100644
--- a/types/react-icons/md/account-box.d.ts
+++ b/types/react-icons/md/account-box.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountBox extends React.Component<IconBaseProps, any> { }
+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
index 924cffee0c..6c9eab8aaf 100644
--- a/types/react-icons/md/account-circle.d.ts
+++ b/types/react-icons/md/account-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAccountCircle extends React.Component<IconBaseProps, any> { }
+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
index 8ed5026239..f056821ad5 100644
--- a/types/react-icons/md/adb.d.ts
+++ b/types/react-icons/md/adb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdb extends React.Component<IconBaseProps, any> { }
+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
index 3451da714f..570d26f3da 100644
--- a/types/react-icons/md/add-a-photo.d.ts
+++ b/types/react-icons/md/add-a-photo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAPhoto extends React.Component<IconBaseProps, any> { }
+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
index 486eac5ce0..6b6f78f4b9 100644
--- a/types/react-icons/md/add-alarm.d.ts
+++ b/types/react-icons/md/add-alarm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlarm extends React.Component<IconBaseProps, any> { }
+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
index 25a5910495..b422649d52 100644
--- a/types/react-icons/md/add-alert.d.ts
+++ b/types/react-icons/md/add-alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddAlert extends React.Component<IconBaseProps, any> { }
+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
index 5debc0110f..51e1f765c0 100644
--- a/types/react-icons/md/add-box.d.ts
+++ b/types/react-icons/md/add-box.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddBox extends React.Component<IconBaseProps, any> { }
+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
index ae70e743dc..981d8bb9ce 100644
--- a/types/react-icons/md/add-circle-outline.d.ts
+++ b/types/react-icons/md/add-circle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircleOutline extends React.Component<IconBaseProps, any> { }
+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
index 8a8a8e1b66..a0a0991c0c 100644
--- a/types/react-icons/md/add-circle.d.ts
+++ b/types/react-icons/md/add-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddCircle extends React.Component<IconBaseProps, any> { }
+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
index 2baa5240ea..98b0f328a3 100644
--- a/types/react-icons/md/add-location.d.ts
+++ b/types/react-icons/md/add-location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddLocation extends React.Component<IconBaseProps, any> { }
+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
index d40d409bd0..52ad95dd6f 100644
--- a/types/react-icons/md/add-shopping-cart.d.ts
+++ b/types/react-icons/md/add-shopping-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddShoppingCart extends React.Component<IconBaseProps, any> { }
+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
index 41815f412c..0eac8c47b2 100644
--- a/types/react-icons/md/add-to-photos.d.ts
+++ b/types/react-icons/md/add-to-photos.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToPhotos extends React.Component<IconBaseProps, any> { }
+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
index 102998aeda..2bf4474037 100644
--- a/types/react-icons/md/add-to-queue.d.ts
+++ b/types/react-icons/md/add-to-queue.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAddToQueue extends React.Component<IconBaseProps, any> { }
+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
index 56c2edddf6..1b7fb63078 100644
--- a/types/react-icons/md/add.d.ts
+++ b/types/react-icons/md/add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdd extends React.Component<IconBaseProps, any> { }
+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
index 014181f65a..c511d98a86 100644
--- a/types/react-icons/md/adjust.d.ts
+++ b/types/react-icons/md/adjust.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAdjust extends React.Component<IconBaseProps, any> { }
+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
index 4feeeb6cd0..27306970ac 100644
--- a/types/react-icons/md/airline-seat-flat-angled.d.ts
+++ b/types/react-icons/md/airline-seat-flat-angled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlatAngled extends React.Component<IconBaseProps, any> { }
+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
index 98e6482d5d..2708f28c19 100644
--- a/types/react-icons/md/airline-seat-flat.d.ts
+++ b/types/react-icons/md/airline-seat-flat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatFlat extends React.Component<IconBaseProps, any> { }
+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
index 466e730e2c..1231fdffbc 100644
--- a/types/react-icons/md/airline-seat-individual-suite.d.ts
+++ b/types/react-icons/md/airline-seat-individual-suite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatIndividualSuite extends React.Component<IconBaseProps, any> { }
+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
index 84164ed361..8e48abc5df 100644
--- a/types/react-icons/md/airline-seat-legroom-extra.d.ts
+++ b/types/react-icons/md/airline-seat-legroom-extra.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomExtra extends React.Component<IconBaseProps, any> { }
+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
index 80ee562a02..09cdf92d8a 100644
--- a/types/react-icons/md/airline-seat-legroom-normal.d.ts
+++ b/types/react-icons/md/airline-seat-legroom-normal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomNormal extends React.Component<IconBaseProps, any> { }
+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
index bcca6c8a4a..e969b216a4 100644
--- a/types/react-icons/md/airline-seat-legroom-reduced.d.ts
+++ b/types/react-icons/md/airline-seat-legroom-reduced.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatLegroomReduced extends React.Component<IconBaseProps, any> { }
+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
index 3f6571dfa4..f675688c5c 100644
--- a/types/react-icons/md/airline-seat-recline-extra.d.ts
+++ b/types/react-icons/md/airline-seat-recline-extra.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineExtra extends React.Component<IconBaseProps, any> { }
+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
index 02a417e1ed..2d7aeacd54 100644
--- a/types/react-icons/md/airline-seat-recline-normal.d.ts
+++ b/types/react-icons/md/airline-seat-recline-normal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirlineSeatReclineNormal extends React.Component<IconBaseProps, any> { }
+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
index 98922450fe..64924f7457 100644
--- a/types/react-icons/md/airplanemode-active.d.ts
+++ b/types/react-icons/md/airplanemode-active.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeActive extends React.Component<IconBaseProps, any> { }
+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
index 565c0104f8..bea28feef8 100644
--- a/types/react-icons/md/airplanemode-inactive.d.ts
+++ b/types/react-icons/md/airplanemode-inactive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplanemodeInactive extends React.Component<IconBaseProps, any> { }
+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
index 5c8c657f8c..0b7d8346dc 100644
--- a/types/react-icons/md/airplay.d.ts
+++ b/types/react-icons/md/airplay.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirplay extends React.Component<IconBaseProps, any> { }
+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
index f2aa5a953c..4d81dcca74 100644
--- a/types/react-icons/md/airport-shuttle.d.ts
+++ b/types/react-icons/md/airport-shuttle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAirportShuttle extends React.Component<IconBaseProps, any> { }
+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
index 521b2c5948..d54261c71e 100644
--- a/types/react-icons/md/alarm-add.d.ts
+++ b/types/react-icons/md/alarm-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmAdd extends React.Component<IconBaseProps, any> { }
+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
index 543a6b92e3..637956f31a 100644
--- a/types/react-icons/md/alarm-off.d.ts
+++ b/types/react-icons/md/alarm-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOff extends React.Component<IconBaseProps, any> { }
+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
index 0a81fc8a84..8ced06b55a 100644
--- a/types/react-icons/md/alarm-on.d.ts
+++ b/types/react-icons/md/alarm-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarmOn extends React.Component<IconBaseProps, any> { }
+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
index 8b0c2ea3fa..784b55604a 100644
--- a/types/react-icons/md/alarm.d.ts
+++ b/types/react-icons/md/alarm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlarm extends React.Component<IconBaseProps, any> { }
+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
index ad958a8eed..b7c2dedcad 100644
--- a/types/react-icons/md/album.d.ts
+++ b/types/react-icons/md/album.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAlbum extends React.Component<IconBaseProps, any> { }
+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
index cb62ab3bb0..121315d268 100644
--- a/types/react-icons/md/all-inclusive.d.ts
+++ b/types/react-icons/md/all-inclusive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAllInclusive extends React.Component<IconBaseProps, any> { }
+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
index dd046916da..feba801059 100644
--- a/types/react-icons/md/all-out.d.ts
+++ b/types/react-icons/md/all-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAllOut extends React.Component<IconBaseProps, any> { }
+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
index 0085ed4ce5..d5821263bd 100644
--- a/types/react-icons/md/android.d.ts
+++ b/types/react-icons/md/android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAndroid extends React.Component<IconBaseProps, any> { }
+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
index f16fbae613..05af68d6c9 100644
--- a/types/react-icons/md/announcement.d.ts
+++ b/types/react-icons/md/announcement.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAnnouncement extends React.Component<IconBaseProps, any> { }
+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
index d4d5e671b7..605c867e9d 100644
--- a/types/react-icons/md/apps.d.ts
+++ b/types/react-icons/md/apps.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdApps extends React.Component<IconBaseProps, any> { }
+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
index 900f2710dc..00cc76de31 100644
--- a/types/react-icons/md/archive.d.ts
+++ b/types/react-icons/md/archive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArchive extends React.Component<IconBaseProps, any> { }
+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
index 0ff418da87..d140fa63a4 100644
--- a/types/react-icons/md/arrow-back.d.ts
+++ b/types/react-icons/md/arrow-back.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowBack extends React.Component<IconBaseProps, any> { }
+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
index e93de66e66..2d764aa5a0 100644
--- a/types/react-icons/md/arrow-downward.d.ts
+++ b/types/react-icons/md/arrow-downward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDownward extends React.Component<IconBaseProps, any> { }
+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
index d305f10838..4a2bae7ded 100644
--- a/types/react-icons/md/arrow-drop-down-circle.d.ts
+++ b/types/react-icons/md/arrow-drop-down-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDownCircle extends React.Component<IconBaseProps, any> { }
+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
index 478b114d29..0e99216f42 100644
--- a/types/react-icons/md/arrow-drop-down.d.ts
+++ b/types/react-icons/md/arrow-drop-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropDown extends React.Component<IconBaseProps, any> { }
+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
index 7b64003aba..efa55f2df4 100644
--- a/types/react-icons/md/arrow-drop-up.d.ts
+++ b/types/react-icons/md/arrow-drop-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowDropUp extends React.Component<IconBaseProps, any> { }
+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
index 2035e20b72..1d3771ddd7 100644
--- a/types/react-icons/md/arrow-forward.d.ts
+++ b/types/react-icons/md/arrow-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowForward extends React.Component<IconBaseProps, any> { }
+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
index 0d29420652..cd8f601ed9 100644
--- a/types/react-icons/md/arrow-upward.d.ts
+++ b/types/react-icons/md/arrow-upward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArrowUpward extends React.Component<IconBaseProps, any> { }
+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
index ddd34862d2..9893405dfd 100644
--- a/types/react-icons/md/art-track.d.ts
+++ b/types/react-icons/md/art-track.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdArtTrack extends React.Component<IconBaseProps, any> { }
+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
index f4b304116e..b0d6311f3e 100644
--- a/types/react-icons/md/aspect-ratio.d.ts
+++ b/types/react-icons/md/aspect-ratio.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAspectRatio extends React.Component<IconBaseProps, any> { }
+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
index 4be4cd0a47..1c4979bd1f 100644
--- a/types/react-icons/md/assessment.d.ts
+++ b/types/react-icons/md/assessment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssessment extends React.Component<IconBaseProps, any> { }
+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
index 343eeaf6bc..6a0c5f2107 100644
--- a/types/react-icons/md/assignment-ind.d.ts
+++ b/types/react-icons/md/assignment-ind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentInd extends React.Component<IconBaseProps, any> { }
+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
index 90c5422fcf..5aa4d5dcdd 100644
--- a/types/react-icons/md/assignment-late.d.ts
+++ b/types/react-icons/md/assignment-late.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentLate extends React.Component<IconBaseProps, any> { }
+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
index e6374d8d87..e34eea0e8d 100644
--- a/types/react-icons/md/assignment-return.d.ts
+++ b/types/react-icons/md/assignment-return.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturn extends React.Component<IconBaseProps, any> { }
+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
index 565c801091..5f3c6039ee 100644
--- a/types/react-icons/md/assignment-returned.d.ts
+++ b/types/react-icons/md/assignment-returned.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentReturned extends React.Component<IconBaseProps, any> { }
+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
index 561588f5e8..c055e90d7f 100644
--- a/types/react-icons/md/assignment-turned-in.d.ts
+++ b/types/react-icons/md/assignment-turned-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignmentTurnedIn extends React.Component<IconBaseProps, any> { }
+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
index 8c3feb8965..dc96f96868 100644
--- a/types/react-icons/md/assignment.d.ts
+++ b/types/react-icons/md/assignment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssignment extends React.Component<IconBaseProps, any> { }
+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
index b414da5c27..2bf4459503 100644
--- a/types/react-icons/md/assistant-photo.d.ts
+++ b/types/react-icons/md/assistant-photo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistantPhoto extends React.Component<IconBaseProps, any> { }
+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
index 03585c1339..06007d112b 100644
--- a/types/react-icons/md/assistant.d.ts
+++ b/types/react-icons/md/assistant.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAssistant extends React.Component<IconBaseProps, any> { }
+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
index 3838e1b6c0..62aba0f830 100644
--- a/types/react-icons/md/attach-file.d.ts
+++ b/types/react-icons/md/attach-file.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachFile extends React.Component<IconBaseProps, any> { }
+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
index 186d5418f8..23dfd03a14 100644
--- a/types/react-icons/md/attach-money.d.ts
+++ b/types/react-icons/md/attach-money.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachMoney extends React.Component<IconBaseProps, any> { }
+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
index 99014ccef9..66a076a0df 100644
--- a/types/react-icons/md/attachment.d.ts
+++ b/types/react-icons/md/attachment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAttachment extends React.Component<IconBaseProps, any> { }
+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
index 7cba94f93b..0fb3a781aa 100644
--- a/types/react-icons/md/audiotrack.d.ts
+++ b/types/react-icons/md/audiotrack.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAudiotrack extends React.Component<IconBaseProps, any> { }
+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
index 2116af556a..3dc1215c35 100644
--- a/types/react-icons/md/autorenew.d.ts
+++ b/types/react-icons/md/autorenew.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAutorenew extends React.Component<IconBaseProps, any> { }
+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
index 02f4070041..d050eb13b6 100644
--- a/types/react-icons/md/av-timer.d.ts
+++ b/types/react-icons/md/av-timer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdAvTimer extends React.Component<IconBaseProps, any> { }
+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
index aeabbca7f8..c462bc8c5c 100644
--- a/types/react-icons/md/backspace.d.ts
+++ b/types/react-icons/md/backspace.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBackspace extends React.Component<IconBaseProps, any> { }
+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
index bf04105477..ab43c6934f 100644
--- a/types/react-icons/md/backup.d.ts
+++ b/types/react-icons/md/backup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBackup extends React.Component<IconBaseProps, any> { }
+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
index ef3e70de0f..c19ea98a0b 100644
--- a/types/react-icons/md/battery-alert.d.ts
+++ b/types/react-icons/md/battery-alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryAlert extends React.Component<IconBaseProps, any> { }
+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
index f82a06590b..c85f75a71a 100644
--- a/types/react-icons/md/battery-charging-full.d.ts
+++ b/types/react-icons/md/battery-charging-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryChargingFull extends React.Component<IconBaseProps, any> { }
+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
index d910c305a0..0aca5efc47 100644
--- a/types/react-icons/md/battery-full.d.ts
+++ b/types/react-icons/md/battery-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryFull extends React.Component<IconBaseProps, any> { }
+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
index 00929aafa2..3db6971900 100644
--- a/types/react-icons/md/battery-std.d.ts
+++ b/types/react-icons/md/battery-std.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryStd extends React.Component<IconBaseProps, any> { }
+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
index 7bafc97903..85dc874ccb 100644
--- a/types/react-icons/md/battery-unknown.d.ts
+++ b/types/react-icons/md/battery-unknown.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBatteryUnknown extends React.Component<IconBaseProps, any> { }
+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
index 74bbe680d2..bb0f5e8d09 100644
--- a/types/react-icons/md/beach-access.d.ts
+++ b/types/react-icons/md/beach-access.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBeachAccess extends React.Component<IconBaseProps, any> { }
+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
index ef3e577047..a428d7199e 100644
--- a/types/react-icons/md/beenhere.d.ts
+++ b/types/react-icons/md/beenhere.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBeenhere extends React.Component<IconBaseProps, any> { }
+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
index ebd3164fa6..f5496f14bb 100644
--- a/types/react-icons/md/block.d.ts
+++ b/types/react-icons/md/block.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlock extends React.Component<IconBaseProps, any> { }
+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
index 1f6904d924..29629f8a81 100644
--- a/types/react-icons/md/bluetooth-audio.d.ts
+++ b/types/react-icons/md/bluetooth-audio.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothAudio extends React.Component<IconBaseProps, any> { }
+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
index 197d8305e2..7ea9477b1b 100644
--- a/types/react-icons/md/bluetooth-connected.d.ts
+++ b/types/react-icons/md/bluetooth-connected.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothConnected extends React.Component<IconBaseProps, any> { }
+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
index b48bc4b7f4..685074c6eb 100644
--- a/types/react-icons/md/bluetooth-disabled.d.ts
+++ b/types/react-icons/md/bluetooth-disabled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothDisabled extends React.Component<IconBaseProps, any> { }
+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
index 347cfba2f0..d258e69bd7 100644
--- a/types/react-icons/md/bluetooth-searching.d.ts
+++ b/types/react-icons/md/bluetooth-searching.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetoothSearching extends React.Component<IconBaseProps, any> { }
+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
index 6f11bbc2c0..9343fadbf2 100644
--- a/types/react-icons/md/bluetooth.d.ts
+++ b/types/react-icons/md/bluetooth.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBluetooth extends React.Component<IconBaseProps, any> { }
+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
index a86c1af634..27b3bb0ae2 100644
--- a/types/react-icons/md/blur-circular.d.ts
+++ b/types/react-icons/md/blur-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurCircular extends React.Component<IconBaseProps, any> { }
+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
index a9f490b71e..e077a469b1 100644
--- a/types/react-icons/md/blur-linear.d.ts
+++ b/types/react-icons/md/blur-linear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurLinear extends React.Component<IconBaseProps, any> { }
+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
index d3e00797bb..df3c89e207 100644
--- a/types/react-icons/md/blur-off.d.ts
+++ b/types/react-icons/md/blur-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOff extends React.Component<IconBaseProps, any> { }
+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
index 7ef11d0f41..ade64f3147 100644
--- a/types/react-icons/md/blur-on.d.ts
+++ b/types/react-icons/md/blur-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBlurOn extends React.Component<IconBaseProps, any> { }
+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
index bfd3173420..593fefe912 100644
--- a/types/react-icons/md/book.d.ts
+++ b/types/react-icons/md/book.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBook extends React.Component<IconBaseProps, any> { }
+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
index 94e261e5c0..630c78b12b 100644
--- a/types/react-icons/md/bookmark-outline.d.ts
+++ b/types/react-icons/md/bookmark-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmarkOutline extends React.Component<IconBaseProps, any> { }
+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
index 2ad818c9fe..b180f81ce4 100644
--- a/types/react-icons/md/bookmark.d.ts
+++ b/types/react-icons/md/bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBookmark extends React.Component<IconBaseProps, any> { }
+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
index d2e126166e..111f24de6b 100644
--- a/types/react-icons/md/border-all.d.ts
+++ b/types/react-icons/md/border-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderAll extends React.Component<IconBaseProps, any> { }
+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
index c0c66a6879..979bd252bb 100644
--- a/types/react-icons/md/border-bottom.d.ts
+++ b/types/react-icons/md/border-bottom.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderBottom extends React.Component<IconBaseProps, any> { }
+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
index e8bbcc7713..2d76f24b12 100644
--- a/types/react-icons/md/border-clear.d.ts
+++ b/types/react-icons/md/border-clear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderClear extends React.Component<IconBaseProps, any> { }
+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
index 72f8ca8ff4..b9ddd9918c 100644
--- a/types/react-icons/md/border-color.d.ts
+++ b/types/react-icons/md/border-color.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderColor extends React.Component<IconBaseProps, any> { }
+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
index cc4c84fc4b..7f1e473277 100644
--- a/types/react-icons/md/border-horizontal.d.ts
+++ b/types/react-icons/md/border-horizontal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderHorizontal extends React.Component<IconBaseProps, any> { }
+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
index 96b0a52272..2a807b9ce2 100644
--- a/types/react-icons/md/border-inner.d.ts
+++ b/types/react-icons/md/border-inner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderInner extends React.Component<IconBaseProps, any> { }
+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
index 5f2201302b..062bf7af75 100644
--- a/types/react-icons/md/border-left.d.ts
+++ b/types/react-icons/md/border-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderLeft extends React.Component<IconBaseProps, any> { }
+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
index 2c170b7449..60e13b29ad 100644
--- a/types/react-icons/md/border-outer.d.ts
+++ b/types/react-icons/md/border-outer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderOuter extends React.Component<IconBaseProps, any> { }
+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
index 9b22251c6b..8bb225c8d9 100644
--- a/types/react-icons/md/border-right.d.ts
+++ b/types/react-icons/md/border-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderRight extends React.Component<IconBaseProps, any> { }
+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
index 27131d444b..92da93bb6d 100644
--- a/types/react-icons/md/border-style.d.ts
+++ b/types/react-icons/md/border-style.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderStyle extends React.Component<IconBaseProps, any> { }
+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
index 1bf932becd..32a4a828a8 100644
--- a/types/react-icons/md/border-top.d.ts
+++ b/types/react-icons/md/border-top.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderTop extends React.Component<IconBaseProps, any> { }
+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
index 23607bdf2a..dce912d6de 100644
--- a/types/react-icons/md/border-vertical.d.ts
+++ b/types/react-icons/md/border-vertical.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBorderVertical extends React.Component<IconBaseProps, any> { }
+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
index ccc95940a2..92ae821285 100644
--- a/types/react-icons/md/branding-watermark.d.ts
+++ b/types/react-icons/md/branding-watermark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrandingWatermark extends React.Component<IconBaseProps, any> { }
+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
index 4c31fe4483..2ac3e1dd25 100644
--- a/types/react-icons/md/brightness-1.d.ts
+++ b/types/react-icons/md/brightness-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness1 extends React.Component<IconBaseProps, any> { }
+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
index 19cb06fa65..ad9eae9cb1 100644
--- a/types/react-icons/md/brightness-2.d.ts
+++ b/types/react-icons/md/brightness-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness2 extends React.Component<IconBaseProps, any> { }
+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
index 9c73d6008e..929e3196af 100644
--- a/types/react-icons/md/brightness-3.d.ts
+++ b/types/react-icons/md/brightness-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness3 extends React.Component<IconBaseProps, any> { }
+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
index 34600e4a40..eeac7b21a5 100644
--- a/types/react-icons/md/brightness-4.d.ts
+++ b/types/react-icons/md/brightness-4.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness4 extends React.Component<IconBaseProps, any> { }
+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
index af5692ab34..26dc5fc08c 100644
--- a/types/react-icons/md/brightness-5.d.ts
+++ b/types/react-icons/md/brightness-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness5 extends React.Component<IconBaseProps, any> { }
+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
index 5941936bcd..c59e6345b0 100644
--- a/types/react-icons/md/brightness-6.d.ts
+++ b/types/react-icons/md/brightness-6.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness6 extends React.Component<IconBaseProps, any> { }
+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
index 58af8a5f66..00510b48a7 100644
--- a/types/react-icons/md/brightness-7.d.ts
+++ b/types/react-icons/md/brightness-7.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightness7 extends React.Component<IconBaseProps, any> { }
+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
index c835afbf1f..7fd30ba582 100644
--- a/types/react-icons/md/brightness-auto.d.ts
+++ b/types/react-icons/md/brightness-auto.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessAuto extends React.Component<IconBaseProps, any> { }
+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
index c6f05853b1..65eb9716e2 100644
--- a/types/react-icons/md/brightness-high.d.ts
+++ b/types/react-icons/md/brightness-high.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessHigh extends React.Component<IconBaseProps, any> { }
+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
index 5ebc44ed8b..7a4220918a 100644
--- a/types/react-icons/md/brightness-low.d.ts
+++ b/types/react-icons/md/brightness-low.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessLow extends React.Component<IconBaseProps, any> { }
+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
index be7333400c..bcae811361 100644
--- a/types/react-icons/md/brightness-medium.d.ts
+++ b/types/react-icons/md/brightness-medium.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrightnessMedium extends React.Component<IconBaseProps, any> { }
+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
index 479bc43615..26a5256e01 100644
--- a/types/react-icons/md/broken-image.d.ts
+++ b/types/react-icons/md/broken-image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrokenImage extends React.Component<IconBaseProps, any> { }
+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
index ab4aa9e7dc..71e04689f2 100644
--- a/types/react-icons/md/brush.d.ts
+++ b/types/react-icons/md/brush.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBrush extends React.Component<IconBaseProps, any> { }
+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
index 358586de52..d893d4d2a1 100644
--- a/types/react-icons/md/bubble-chart.d.ts
+++ b/types/react-icons/md/bubble-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBubbleChart extends React.Component<IconBaseProps, any> { }
+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
index f433bd4532..8d5b5f78ef 100644
--- a/types/react-icons/md/bug-report.d.ts
+++ b/types/react-icons/md/bug-report.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBugReport extends React.Component<IconBaseProps, any> { }
+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
index 080a9216d4..3969a9d67d 100644
--- a/types/react-icons/md/build.d.ts
+++ b/types/react-icons/md/build.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBuild extends React.Component<IconBaseProps, any> { }
+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
index 718d8b2ea6..2db0673b64 100644
--- a/types/react-icons/md/burst-mode.d.ts
+++ b/types/react-icons/md/burst-mode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBurstMode extends React.Component<IconBaseProps, any> { }
+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
index e3d93303b0..019568bc79 100644
--- a/types/react-icons/md/business-center.d.ts
+++ b/types/react-icons/md/business-center.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBusinessCenter extends React.Component<IconBaseProps, any> { }
+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
index f09a8b2764..aee4700728 100644
--- a/types/react-icons/md/business.d.ts
+++ b/types/react-icons/md/business.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdBusiness extends React.Component<IconBaseProps, any> { }
+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
index a7330726b8..e26b176124 100644
--- a/types/react-icons/md/cached.d.ts
+++ b/types/react-icons/md/cached.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCached extends React.Component<IconBaseProps, any> { }
+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
index 31b65c083b..757d94fa73 100644
--- a/types/react-icons/md/cake.d.ts
+++ b/types/react-icons/md/cake.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCake extends React.Component<IconBaseProps, any> { }
+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
index eb4951cf49..fcb323974c 100644
--- a/types/react-icons/md/call-end.d.ts
+++ b/types/react-icons/md/call-end.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallEnd extends React.Component<IconBaseProps, any> { }
+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
index 46150e4947..d7523be94c 100644
--- a/types/react-icons/md/call-made.d.ts
+++ b/types/react-icons/md/call-made.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMade extends React.Component<IconBaseProps, any> { }
+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
index 6e7727ffce..9c7369c900 100644
--- a/types/react-icons/md/call-merge.d.ts
+++ b/types/react-icons/md/call-merge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMerge extends React.Component<IconBaseProps, any> { }
+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
index 8974c746d9..f03613faad 100644
--- a/types/react-icons/md/call-missed-outgoing.d.ts
+++ b/types/react-icons/md/call-missed-outgoing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissedOutgoing extends React.Component<IconBaseProps, any> { }
+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
index dd147bdc98..c999bb5cab 100644
--- a/types/react-icons/md/call-missed.d.ts
+++ b/types/react-icons/md/call-missed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallMissed extends React.Component<IconBaseProps, any> { }
+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
index 0d7b1b62af..29f503af3f 100644
--- a/types/react-icons/md/call-received.d.ts
+++ b/types/react-icons/md/call-received.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallReceived extends React.Component<IconBaseProps, any> { }
+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
index ef3af31774..56330a07e8 100644
--- a/types/react-icons/md/call-split.d.ts
+++ b/types/react-icons/md/call-split.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallSplit extends React.Component<IconBaseProps, any> { }
+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
index d33d39f52b..f1f8d89d80 100644
--- a/types/react-icons/md/call-to-action.d.ts
+++ b/types/react-icons/md/call-to-action.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCallToAction extends React.Component<IconBaseProps, any> { }
+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
index 7ffee8d027..2bfec93bfc 100644
--- a/types/react-icons/md/call.d.ts
+++ b/types/react-icons/md/call.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCall extends React.Component<IconBaseProps, any> { }
+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
index c1e6d9e2bb..4951b47b34 100644
--- a/types/react-icons/md/camera-alt.d.ts
+++ b/types/react-icons/md/camera-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraAlt extends React.Component<IconBaseProps, any> { }
+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
index 1a0fc4eaed..957b0b30e4 100644
--- a/types/react-icons/md/camera-enhance.d.ts
+++ b/types/react-icons/md/camera-enhance.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraEnhance extends React.Component<IconBaseProps, any> { }
+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
index 9f5777476d..c6f2760218 100644
--- a/types/react-icons/md/camera-front.d.ts
+++ b/types/react-icons/md/camera-front.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraFront extends React.Component<IconBaseProps, any> { }
+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
index a7f85220ec..b524f4456c 100644
--- a/types/react-icons/md/camera-rear.d.ts
+++ b/types/react-icons/md/camera-rear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRear extends React.Component<IconBaseProps, any> { }
+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
index 657761fbae..b7c7b207e2 100644
--- a/types/react-icons/md/camera-roll.d.ts
+++ b/types/react-icons/md/camera-roll.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCameraRoll extends React.Component<IconBaseProps, any> { }
+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
index 2fe5112414..ca2fbf55e3 100644
--- a/types/react-icons/md/camera.d.ts
+++ b/types/react-icons/md/camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCamera extends React.Component<IconBaseProps, any> { }
+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
index b71bb71861..28248ed4f6 100644
--- a/types/react-icons/md/cancel.d.ts
+++ b/types/react-icons/md/cancel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCancel extends React.Component<IconBaseProps, any> { }
+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
index 3bdcad041e..67eb5002e6 100644
--- a/types/react-icons/md/card-giftcard.d.ts
+++ b/types/react-icons/md/card-giftcard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardGiftcard extends React.Component<IconBaseProps, any> { }
+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
index 15cddfe78f..5cb91c641d 100644
--- a/types/react-icons/md/card-membership.d.ts
+++ b/types/react-icons/md/card-membership.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardMembership extends React.Component<IconBaseProps, any> { }
+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
index c611b785d6..a54e339c09 100644
--- a/types/react-icons/md/card-travel.d.ts
+++ b/types/react-icons/md/card-travel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCardTravel extends React.Component<IconBaseProps, any> { }
+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
index 4318838299..ceb6c0cf04 100644
--- a/types/react-icons/md/casino.d.ts
+++ b/types/react-icons/md/casino.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCasino extends React.Component<IconBaseProps, any> { }
+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
index 6a7e38bf91..d4d60dcf60 100644
--- a/types/react-icons/md/cast-connected.d.ts
+++ b/types/react-icons/md/cast-connected.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCastConnected extends React.Component<IconBaseProps, any> { }
+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
index aa6b41dd93..b014c40b07 100644
--- a/types/react-icons/md/cast.d.ts
+++ b/types/react-icons/md/cast.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCast extends React.Component<IconBaseProps, any> { }
+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
index c48aa82be8..6d72ae6a11 100644
--- a/types/react-icons/md/center-focus-strong.d.ts
+++ b/types/react-icons/md/center-focus-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusStrong extends React.Component<IconBaseProps, any> { }
+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
index 197cf38320..5565dd7b63 100644
--- a/types/react-icons/md/center-focus-weak.d.ts
+++ b/types/react-icons/md/center-focus-weak.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCenterFocusWeak extends React.Component<IconBaseProps, any> { }
+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
index f12f331838..ed3344df50 100644
--- a/types/react-icons/md/change-history.d.ts
+++ b/types/react-icons/md/change-history.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChangeHistory extends React.Component<IconBaseProps, any> { }
+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
index f57378c244..ad12c21318 100644
--- a/types/react-icons/md/chat-bubble-outline.d.ts
+++ b/types/react-icons/md/chat-bubble-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubbleOutline extends React.Component<IconBaseProps, any> { }
+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
index 6f06e61bb2..6322767617 100644
--- a/types/react-icons/md/chat-bubble.d.ts
+++ b/types/react-icons/md/chat-bubble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChatBubble extends React.Component<IconBaseProps, any> { }
+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
index 0d43b316ee..7fecfed168 100644
--- a/types/react-icons/md/chat.d.ts
+++ b/types/react-icons/md/chat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChat extends React.Component<IconBaseProps, any> { }
+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
index 46312189ea..984ee8c5b0 100644
--- a/types/react-icons/md/check-box-outline-blank.d.ts
+++ b/types/react-icons/md/check-box-outline-blank.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBoxOutlineBlank extends React.Component<IconBaseProps, any> { }
+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
index 5e535c0d92..0d131960ee 100644
--- a/types/react-icons/md/check-box.d.ts
+++ b/types/react-icons/md/check-box.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckBox extends React.Component<IconBaseProps, any> { }
+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
index 6f59bbbe93..350ec8918d 100644
--- a/types/react-icons/md/check-circle.d.ts
+++ b/types/react-icons/md/check-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheckCircle extends React.Component<IconBaseProps, any> { }
+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
index 6b81272b55..df809198db 100644
--- a/types/react-icons/md/check.d.ts
+++ b/types/react-icons/md/check.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCheck extends React.Component<IconBaseProps, any> { }
+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
index 6e4ff809f5..fd0b4bff5a 100644
--- a/types/react-icons/md/chevron-left.d.ts
+++ b/types/react-icons/md/chevron-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronLeft extends React.Component<IconBaseProps, any> { }
+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
index 05d6bdd79f..fd902a1348 100644
--- a/types/react-icons/md/chevron-right.d.ts
+++ b/types/react-icons/md/chevron-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChevronRight extends React.Component<IconBaseProps, any> { }
+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
index 15fcb944e6..133bf02e0e 100644
--- a/types/react-icons/md/child-care.d.ts
+++ b/types/react-icons/md/child-care.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChildCare extends React.Component<IconBaseProps, any> { }
+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
index 1188107d8c..87f9bc1b8e 100644
--- a/types/react-icons/md/child-friendly.d.ts
+++ b/types/react-icons/md/child-friendly.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChildFriendly extends React.Component<IconBaseProps, any> { }
+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
index 2a512f7e67..c545db8e9b 100644
--- a/types/react-icons/md/chrome-reader-mode.d.ts
+++ b/types/react-icons/md/chrome-reader-mode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdChromeReaderMode extends React.Component<IconBaseProps, any> { }
+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
index 4bc3e5e596..e0e0e88367 100644
--- a/types/react-icons/md/class.d.ts
+++ b/types/react-icons/md/class.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClass extends React.Component<IconBaseProps, any> { }
+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
index 72d3d40f57..b73150c14e 100644
--- a/types/react-icons/md/clear-all.d.ts
+++ b/types/react-icons/md/clear-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClearAll extends React.Component<IconBaseProps, any> { }
+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
index 9163d1ef7c..4da44db5b5 100644
--- a/types/react-icons/md/clear.d.ts
+++ b/types/react-icons/md/clear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClear extends React.Component<IconBaseProps, any> { }
+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
index 4a94fe734b..3f693c1eec 100644
--- a/types/react-icons/md/close.d.ts
+++ b/types/react-icons/md/close.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClose extends React.Component<IconBaseProps, any> { }
+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
index 7f381cbfba..5adaf8fc91 100644
--- a/types/react-icons/md/closed-caption.d.ts
+++ b/types/react-icons/md/closed-caption.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdClosedCaption extends React.Component<IconBaseProps, any> { }
+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
index ffa37ddcca..55a5be23c2 100644
--- a/types/react-icons/md/cloud-circle.d.ts
+++ b/types/react-icons/md/cloud-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudCircle extends React.Component<IconBaseProps, any> { }
+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
index eeb9acd4dd..49f115ae3d 100644
--- a/types/react-icons/md/cloud-done.d.ts
+++ b/types/react-icons/md/cloud-done.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDone extends React.Component<IconBaseProps, any> { }
+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
index 40260196fd..c7b6f482bb 100644
--- a/types/react-icons/md/cloud-download.d.ts
+++ b/types/react-icons/md/cloud-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudDownload extends React.Component<IconBaseProps, any> { }
+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
index 4fbf6b50ad..2ebe85de9a 100644
--- a/types/react-icons/md/cloud-off.d.ts
+++ b/types/react-icons/md/cloud-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudOff extends React.Component<IconBaseProps, any> { }
+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
index 89aa187be9..3e7912edb7 100644
--- a/types/react-icons/md/cloud-queue.d.ts
+++ b/types/react-icons/md/cloud-queue.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudQueue extends React.Component<IconBaseProps, any> { }
+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
index e6ea620fbb..3813bf345b 100644
--- a/types/react-icons/md/cloud-upload.d.ts
+++ b/types/react-icons/md/cloud-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloudUpload extends React.Component<IconBaseProps, any> { }
+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
index ddea655c83..774dd53424 100644
--- a/types/react-icons/md/cloud.d.ts
+++ b/types/react-icons/md/cloud.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCloud extends React.Component<IconBaseProps, any> { }
+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
index e7f95e74a1..54f942afd1 100644
--- a/types/react-icons/md/code.d.ts
+++ b/types/react-icons/md/code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCode extends React.Component<IconBaseProps, any> { }
+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
index 7679855689..98d8755848 100644
--- a/types/react-icons/md/collections-bookmark.d.ts
+++ b/types/react-icons/md/collections-bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCollectionsBookmark extends React.Component<IconBaseProps, any> { }
+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
index 019d457ad1..7d5cf7fa68 100644
--- a/types/react-icons/md/collections.d.ts
+++ b/types/react-icons/md/collections.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCollections extends React.Component<IconBaseProps, any> { }
+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
index 0d261c2a88..71a56bc853 100644
--- a/types/react-icons/md/color-lens.d.ts
+++ b/types/react-icons/md/color-lens.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdColorLens extends React.Component<IconBaseProps, any> { }
+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
index ef7d57791e..f345627803 100644
--- a/types/react-icons/md/colorize.d.ts
+++ b/types/react-icons/md/colorize.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdColorize extends React.Component<IconBaseProps, any> { }
+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
index e1561096f3..c81ab4762a 100644
--- a/types/react-icons/md/comment.d.ts
+++ b/types/react-icons/md/comment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdComment extends React.Component<IconBaseProps, any> { }
+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
index 137c4f53d5..727031b8a7 100644
--- a/types/react-icons/md/compare-arrows.d.ts
+++ b/types/react-icons/md/compare-arrows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCompareArrows extends React.Component<IconBaseProps, any> { }
+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
index f8e1247ca5..59338cf7c9 100644
--- a/types/react-icons/md/compare.d.ts
+++ b/types/react-icons/md/compare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCompare extends React.Component<IconBaseProps, any> { }
+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
index 570982e89a..ef16df598d 100644
--- a/types/react-icons/md/computer.d.ts
+++ b/types/react-icons/md/computer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdComputer extends React.Component<IconBaseProps, any> { }
+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
index 4004832a27..8a3b8fcb8f 100644
--- a/types/react-icons/md/confirmation-number.d.ts
+++ b/types/react-icons/md/confirmation-number.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdConfirmationNumber extends React.Component<IconBaseProps, any> { }
+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
index 9e08b796b9..b5027ce2da 100644
--- a/types/react-icons/md/contact-mail.d.ts
+++ b/types/react-icons/md/contact-mail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContactMail extends React.Component<IconBaseProps, any> { }
+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
index 115b383f9c..df4405a4da 100644
--- a/types/react-icons/md/contact-phone.d.ts
+++ b/types/react-icons/md/contact-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContactPhone extends React.Component<IconBaseProps, any> { }
+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
index 5d9fddbc21..e4df5f1c11 100644
--- a/types/react-icons/md/contacts.d.ts
+++ b/types/react-icons/md/contacts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContacts extends React.Component<IconBaseProps, any> { }
+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
index e42525bd37..e069254814 100644
--- a/types/react-icons/md/content-copy.d.ts
+++ b/types/react-icons/md/content-copy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCopy extends React.Component<IconBaseProps, any> { }
+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
index 5f7328b50f..84d7b36ea0 100644
--- a/types/react-icons/md/content-cut.d.ts
+++ b/types/react-icons/md/content-cut.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentCut extends React.Component<IconBaseProps, any> { }
+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
index fba35fac39..d3825ed71f 100644
--- a/types/react-icons/md/content-paste.d.ts
+++ b/types/react-icons/md/content-paste.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdContentPaste extends React.Component<IconBaseProps, any> { }
+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
index 83dda31d83..8ba468f7bc 100644
--- a/types/react-icons/md/control-point-duplicate.d.ts
+++ b/types/react-icons/md/control-point-duplicate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPointDuplicate extends React.Component<IconBaseProps, any> { }
+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
index 79025b4de8..aa32c1b7f4 100644
--- a/types/react-icons/md/control-point.d.ts
+++ b/types/react-icons/md/control-point.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdControlPoint extends React.Component<IconBaseProps, any> { }
+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
index 7552a9d084..d786505dc9 100644
--- a/types/react-icons/md/copyright.d.ts
+++ b/types/react-icons/md/copyright.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCopyright extends React.Component<IconBaseProps, any> { }
+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
index 9ded9c4d91..5f81f01bff 100644
--- a/types/react-icons/md/create-new-folder.d.ts
+++ b/types/react-icons/md/create-new-folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreateNewFolder extends React.Component<IconBaseProps, any> { }
+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
index 80168cc8e2..75c2871644 100644
--- a/types/react-icons/md/create.d.ts
+++ b/types/react-icons/md/create.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreate extends React.Component<IconBaseProps, any> { }
+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
index f36e92fa6f..9515c900d0 100644
--- a/types/react-icons/md/credit-card.d.ts
+++ b/types/react-icons/md/credit-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCreditCard extends React.Component<IconBaseProps, any> { }
+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
index 28c7a565c9..d507bc9db9 100644
--- a/types/react-icons/md/crop-16-9.d.ts
+++ b/types/react-icons/md/crop-16-9.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop169 extends React.Component<IconBaseProps, any> { }
+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
index 78b26d886c..461cf07b2d 100644
--- a/types/react-icons/md/crop-3-2.d.ts
+++ b/types/react-icons/md/crop-3-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop32 extends React.Component<IconBaseProps, any> { }
+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
index 4d2fb3b1e4..4b0cb6c7fb 100644
--- a/types/react-icons/md/crop-5-4.d.ts
+++ b/types/react-icons/md/crop-5-4.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop54 extends React.Component<IconBaseProps, any> { }
+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
index b38ae14c87..9063520b57 100644
--- a/types/react-icons/md/crop-7-5.d.ts
+++ b/types/react-icons/md/crop-7-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop75 extends React.Component<IconBaseProps, any> { }
+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
index f57c6b1967..115106ef50 100644
--- a/types/react-icons/md/crop-din.d.ts
+++ b/types/react-icons/md/crop-din.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropDin extends React.Component<IconBaseProps, any> { }
+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
index 4ead9f64f2..e68c930ff9 100644
--- a/types/react-icons/md/crop-free.d.ts
+++ b/types/react-icons/md/crop-free.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropFree extends React.Component<IconBaseProps, any> { }
+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
index e51bb800cb..5ef2f2e4dd 100644
--- a/types/react-icons/md/crop-landscape.d.ts
+++ b/types/react-icons/md/crop-landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropLandscape extends React.Component<IconBaseProps, any> { }
+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
index c33f57c640..26733dc24e 100644
--- a/types/react-icons/md/crop-original.d.ts
+++ b/types/react-icons/md/crop-original.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropOriginal extends React.Component<IconBaseProps, any> { }
+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
index 2b48d62624..9a43790ec0 100644
--- a/types/react-icons/md/crop-portrait.d.ts
+++ b/types/react-icons/md/crop-portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropPortrait extends React.Component<IconBaseProps, any> { }
+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
index e1b1352d4c..7106d1b55b 100644
--- a/types/react-icons/md/crop-rotate.d.ts
+++ b/types/react-icons/md/crop-rotate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropRotate extends React.Component<IconBaseProps, any> { }
+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
index d5f7fac4d7..62ba826cfc 100644
--- a/types/react-icons/md/crop-square.d.ts
+++ b/types/react-icons/md/crop-square.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCropSquare extends React.Component<IconBaseProps, any> { }
+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
index 5fa763185f..dfd01a2ad8 100644
--- a/types/react-icons/md/crop.d.ts
+++ b/types/react-icons/md/crop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdCrop extends React.Component<IconBaseProps, any> { }
+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
index 9fb926950a..47f85672c9 100644
--- a/types/react-icons/md/dashboard.d.ts
+++ b/types/react-icons/md/dashboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDashboard extends React.Component<IconBaseProps, any> { }
+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
index cf8ef6ebf9..013f33ad67 100644
--- a/types/react-icons/md/data-usage.d.ts
+++ b/types/react-icons/md/data-usage.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDataUsage extends React.Component<IconBaseProps, any> { }
+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
index 8cd34c8614..a9fc01751f 100644
--- a/types/react-icons/md/date-range.d.ts
+++ b/types/react-icons/md/date-range.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDateRange extends React.Component<IconBaseProps, any> { }
+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
index eaf0327e6d..9144d9822f 100644
--- a/types/react-icons/md/dehaze.d.ts
+++ b/types/react-icons/md/dehaze.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDehaze extends React.Component<IconBaseProps, any> { }
+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
index 27c7e92f02..9820c93b1a 100644
--- a/types/react-icons/md/delete-forever.d.ts
+++ b/types/react-icons/md/delete-forever.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteForever extends React.Component<IconBaseProps, any> { }
+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
index 364444dc56..965ce9c746 100644
--- a/types/react-icons/md/delete-sweep.d.ts
+++ b/types/react-icons/md/delete-sweep.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeleteSweep extends React.Component<IconBaseProps, any> { }
+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
index 2ec6395255..f47a4b0a59 100644
--- a/types/react-icons/md/delete.d.ts
+++ b/types/react-icons/md/delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDelete extends React.Component<IconBaseProps, any> { }
+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
index fb2f0241ba..76bc0bbf1c 100644
--- a/types/react-icons/md/description.d.ts
+++ b/types/react-icons/md/description.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDescription extends React.Component<IconBaseProps, any> { }
+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
index 2060611a3a..007f0a5ae1 100644
--- a/types/react-icons/md/desktop-mac.d.ts
+++ b/types/react-icons/md/desktop-mac.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopMac extends React.Component<IconBaseProps, any> { }
+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
index 8f3a48c0e0..e735a11f72 100644
--- a/types/react-icons/md/desktop-windows.d.ts
+++ b/types/react-icons/md/desktop-windows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDesktopWindows extends React.Component<IconBaseProps, any> { }
+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
index f3b7688312..86ec926d65 100644
--- a/types/react-icons/md/details.d.ts
+++ b/types/react-icons/md/details.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDetails extends React.Component<IconBaseProps, any> { }
+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
index 52fe8600cf..a3ad5d5b89 100644
--- a/types/react-icons/md/developer-board.d.ts
+++ b/types/react-icons/md/developer-board.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperBoard extends React.Component<IconBaseProps, any> { }
+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
index 4d5d4ac71c..f2032d8e74 100644
--- a/types/react-icons/md/developer-mode.d.ts
+++ b/types/react-icons/md/developer-mode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeveloperMode extends React.Component<IconBaseProps, any> { }
+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
index ce93f82056..38815bce4d 100644
--- a/types/react-icons/md/device-hub.d.ts
+++ b/types/react-icons/md/device-hub.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDeviceHub extends React.Component<IconBaseProps, any> { }
+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
index 08606080c5..69ed6d847d 100644
--- a/types/react-icons/md/devices-other.d.ts
+++ b/types/react-icons/md/devices-other.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDevicesOther extends React.Component<IconBaseProps, any> { }
+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
index 7e12ce6ba3..00163cbb71 100644
--- a/types/react-icons/md/devices.d.ts
+++ b/types/react-icons/md/devices.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDevices extends React.Component<IconBaseProps, any> { }
+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
index 4a06fc5739..ba4ade0a30 100644
--- a/types/react-icons/md/dialer-sip.d.ts
+++ b/types/react-icons/md/dialer-sip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDialerSip extends React.Component<IconBaseProps, any> { }
+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
index 72d86f16ac..3d74b7ce08 100644
--- a/types/react-icons/md/dialpad.d.ts
+++ b/types/react-icons/md/dialpad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDialpad extends React.Component<IconBaseProps, any> { }
+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
index d53d1d0c55..3ff5b576f2 100644
--- a/types/react-icons/md/directions-bike.d.ts
+++ b/types/react-icons/md/directions-bike.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBike extends React.Component<IconBaseProps, any> { }
+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
index 22228410eb..29cb6f9727 100644
--- a/types/react-icons/md/directions-boat.d.ts
+++ b/types/react-icons/md/directions-boat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBoat extends React.Component<IconBaseProps, any> { }
+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
index 806b5298d2..12964dd1bf 100644
--- a/types/react-icons/md/directions-bus.d.ts
+++ b/types/react-icons/md/directions-bus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsBus extends React.Component<IconBaseProps, any> { }
+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
index 762046be3b..0055e4a7e9 100644
--- a/types/react-icons/md/directions-car.d.ts
+++ b/types/react-icons/md/directions-car.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsCar extends React.Component<IconBaseProps, any> { }
+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
index eaf5b2c9b7..fa5f376ab4 100644
--- a/types/react-icons/md/directions-ferry.d.ts
+++ b/types/react-icons/md/directions-ferry.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsFerry extends React.Component<IconBaseProps, any> { }
+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
index 1e81c92e7c..ee241e2f78 100644
--- a/types/react-icons/md/directions-railway.d.ts
+++ b/types/react-icons/md/directions-railway.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRailway extends React.Component<IconBaseProps, any> { }
+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
index 075e0b47a2..65fabf028c 100644
--- a/types/react-icons/md/directions-run.d.ts
+++ b/types/react-icons/md/directions-run.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsRun extends React.Component<IconBaseProps, any> { }
+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
index 2044964178..d97b4fd1e2 100644
--- a/types/react-icons/md/directions-subway.d.ts
+++ b/types/react-icons/md/directions-subway.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsSubway extends React.Component<IconBaseProps, any> { }
+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
index 833b6ddd2d..0016d21dd1 100644
--- a/types/react-icons/md/directions-transit.d.ts
+++ b/types/react-icons/md/directions-transit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsTransit extends React.Component<IconBaseProps, any> { }
+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
index e4ae77085a..5f02d00296 100644
--- a/types/react-icons/md/directions-walk.d.ts
+++ b/types/react-icons/md/directions-walk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirectionsWalk extends React.Component<IconBaseProps, any> { }
+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
index 0247b0bf0f..14a1dded8e 100644
--- a/types/react-icons/md/directions.d.ts
+++ b/types/react-icons/md/directions.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDirections extends React.Component<IconBaseProps, any> { }
+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
index 38d3318171..f23e47b0bd 100644
--- a/types/react-icons/md/disc-full.d.ts
+++ b/types/react-icons/md/disc-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDiscFull extends React.Component<IconBaseProps, any> { }
+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
index 963142ad84..42a3e45b84 100644
--- a/types/react-icons/md/dns.d.ts
+++ b/types/react-icons/md/dns.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDns extends React.Component<IconBaseProps, any> { }
+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
index a43f066539..6bad8e0875 100644
--- a/types/react-icons/md/do-not-disturb-alt.d.ts
+++ b/types/react-icons/md/do-not-disturb-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbAlt extends React.Component<IconBaseProps, any> { }
+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
index 5cce9c90d4..bcbe409363 100644
--- a/types/react-icons/md/do-not-disturb-off.d.ts
+++ b/types/react-icons/md/do-not-disturb-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturbOff extends React.Component<IconBaseProps, any> { }
+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
index a37dabac67..bb19ff2e39 100644
--- a/types/react-icons/md/do-not-disturb.d.ts
+++ b/types/react-icons/md/do-not-disturb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoNotDisturb extends React.Component<IconBaseProps, any> { }
+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
index 377a69a8c1..3de11f01a5 100644
--- a/types/react-icons/md/dock.d.ts
+++ b/types/react-icons/md/dock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDock extends React.Component<IconBaseProps, any> { }
+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
index 43bc48d10f..c9586ff2b5 100644
--- a/types/react-icons/md/domain.d.ts
+++ b/types/react-icons/md/domain.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDomain extends React.Component<IconBaseProps, any> { }
+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
index 9ec20e8db3..41e8241fcc 100644
--- a/types/react-icons/md/done-all.d.ts
+++ b/types/react-icons/md/done-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDoneAll extends React.Component<IconBaseProps, any> { }
+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
index 444ed9cb4a..977bc177a5 100644
--- a/types/react-icons/md/done.d.ts
+++ b/types/react-icons/md/done.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDone extends React.Component<IconBaseProps, any> { }
+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
index 9704ba4227..01422e1fa5 100644
--- a/types/react-icons/md/donut-large.d.ts
+++ b/types/react-icons/md/donut-large.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutLarge extends React.Component<IconBaseProps, any> { }
+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
index c1da8ff710..7475720575 100644
--- a/types/react-icons/md/donut-small.d.ts
+++ b/types/react-icons/md/donut-small.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDonutSmall extends React.Component<IconBaseProps, any> { }
+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
index 036ce7940f..3a3af21927 100644
--- a/types/react-icons/md/drafts.d.ts
+++ b/types/react-icons/md/drafts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDrafts extends React.Component<IconBaseProps, any> { }
+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
index 1ad572c6b2..80ae3229cd 100644
--- a/types/react-icons/md/drag-handle.d.ts
+++ b/types/react-icons/md/drag-handle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDragHandle extends React.Component<IconBaseProps, any> { }
+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
index dce830aa15..6cecfe8799 100644
--- a/types/react-icons/md/drive-eta.d.ts
+++ b/types/react-icons/md/drive-eta.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDriveEta extends React.Component<IconBaseProps, any> { }
+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
index 380f248c85..c9d3aa8ce5 100644
--- a/types/react-icons/md/dvr.d.ts
+++ b/types/react-icons/md/dvr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdDvr extends React.Component<IconBaseProps, any> { }
+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
index 2c42aec120..d6e3e2bfb7 100644
--- a/types/react-icons/md/edit-location.d.ts
+++ b/types/react-icons/md/edit-location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEditLocation extends React.Component<IconBaseProps, any> { }
+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
index cc3a8b65c8..aaa97a382a 100644
--- a/types/react-icons/md/edit.d.ts
+++ b/types/react-icons/md/edit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEdit extends React.Component<IconBaseProps, any> { }
+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
index 24a5eacaa6..87c366fef5 100644
--- a/types/react-icons/md/eject.d.ts
+++ b/types/react-icons/md/eject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEject extends React.Component<IconBaseProps, any> { }
+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
index 3466d64b54..1c8b5247ee 100644
--- a/types/react-icons/md/email.d.ts
+++ b/types/react-icons/md/email.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEmail extends React.Component<IconBaseProps, any> { }
+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
index d5ccaa23bd..be651f5c94 100644
--- a/types/react-icons/md/enhanced-encryption.d.ts
+++ b/types/react-icons/md/enhanced-encryption.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEnhancedEncryption extends React.Component<IconBaseProps, any> { }
+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
index 328c5057f5..ab7a2f20f9 100644
--- a/types/react-icons/md/equalizer.d.ts
+++ b/types/react-icons/md/equalizer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEqualizer extends React.Component<IconBaseProps, any> { }
+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
index e88bea4573..0d8a6051a9 100644
--- a/types/react-icons/md/error-outline.d.ts
+++ b/types/react-icons/md/error-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdErrorOutline extends React.Component<IconBaseProps, any> { }
+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
index b62722623b..c5b9fc8e71 100644
--- a/types/react-icons/md/error.d.ts
+++ b/types/react-icons/md/error.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdError extends React.Component<IconBaseProps, any> { }
+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
index e3cf51de3a..1e5b262514 100644
--- a/types/react-icons/md/euro-symbol.d.ts
+++ b/types/react-icons/md/euro-symbol.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEuroSymbol extends React.Component<IconBaseProps, any> { }
+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
index b2e6e23297..4254fe1ebf 100644
--- a/types/react-icons/md/ev-station.d.ts
+++ b/types/react-icons/md/ev-station.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEvStation extends React.Component<IconBaseProps, any> { }
+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
index d85a0b3aaf..30722d5a81 100644
--- a/types/react-icons/md/event-available.d.ts
+++ b/types/react-icons/md/event-available.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventAvailable extends React.Component<IconBaseProps, any> { }
+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
index 108ba59ced..6659755bbf 100644
--- a/types/react-icons/md/event-busy.d.ts
+++ b/types/react-icons/md/event-busy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventBusy extends React.Component<IconBaseProps, any> { }
+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
index 7caab41b02..fb3c3b0279 100644
--- a/types/react-icons/md/event-note.d.ts
+++ b/types/react-icons/md/event-note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventNote extends React.Component<IconBaseProps, any> { }
+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
index 616bf0d852..53c6fd7c85 100644
--- a/types/react-icons/md/event-seat.d.ts
+++ b/types/react-icons/md/event-seat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEventSeat extends React.Component<IconBaseProps, any> { }
+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
index e2dd921dd5..a5bba2458a 100644
--- a/types/react-icons/md/event.d.ts
+++ b/types/react-icons/md/event.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdEvent extends React.Component<IconBaseProps, any> { }
+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
index b570edd1ef..1c12dfc4b7 100644
--- a/types/react-icons/md/exit-to-app.d.ts
+++ b/types/react-icons/md/exit-to-app.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExitToApp extends React.Component<IconBaseProps, any> { }
+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
index 0e4421f7a7..766bf8886e 100644
--- a/types/react-icons/md/expand-less.d.ts
+++ b/types/react-icons/md/expand-less.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandLess extends React.Component<IconBaseProps, any> { }
+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
index e95e3c7634..bef62424b7 100644
--- a/types/react-icons/md/expand-more.d.ts
+++ b/types/react-icons/md/expand-more.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExpandMore extends React.Component<IconBaseProps, any> { }
+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
index efeb07df65..b10026c0af 100644
--- a/types/react-icons/md/explicit.d.ts
+++ b/types/react-icons/md/explicit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExplicit extends React.Component<IconBaseProps, any> { }
+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
index 5149d9c267..79180f608d 100644
--- a/types/react-icons/md/explore.d.ts
+++ b/types/react-icons/md/explore.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExplore extends React.Component<IconBaseProps, any> { }
+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
index 1e86aa5e96..f0c9222b4e 100644
--- a/types/react-icons/md/exposure-minus-1.d.ts
+++ b/types/react-icons/md/exposure-minus-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus1 extends React.Component<IconBaseProps, any> { }
+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
index d71da1e90e..7b70926bf1 100644
--- a/types/react-icons/md/exposure-minus-2.d.ts
+++ b/types/react-icons/md/exposure-minus-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureMinus2 extends React.Component<IconBaseProps, any> { }
+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
index a309651c1d..136e8abf0e 100644
--- a/types/react-icons/md/exposure-neg-1.d.ts
+++ b/types/react-icons/md/exposure-neg-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg1 extends React.Component<IconBaseProps, any> { }
+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
index 49539adbd4..ceec854625 100644
--- a/types/react-icons/md/exposure-neg-2.d.ts
+++ b/types/react-icons/md/exposure-neg-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureNeg2 extends React.Component<IconBaseProps, any> { }
+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
index a8f46d2af3..fbb81879c2 100644
--- a/types/react-icons/md/exposure-plus-1.d.ts
+++ b/types/react-icons/md/exposure-plus-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus1 extends React.Component<IconBaseProps, any> { }
+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
index 98ec267935..d22a7d3123 100644
--- a/types/react-icons/md/exposure-plus-2.d.ts
+++ b/types/react-icons/md/exposure-plus-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposurePlus2 extends React.Component<IconBaseProps, any> { }
+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
index ea889978f2..27125daa24 100644
--- a/types/react-icons/md/exposure-zero.d.ts
+++ b/types/react-icons/md/exposure-zero.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposureZero extends React.Component<IconBaseProps, any> { }
+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
index bdb1a65235..1d04f364e0 100644
--- a/types/react-icons/md/exposure.d.ts
+++ b/types/react-icons/md/exposure.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExposure extends React.Component<IconBaseProps, any> { }
+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
index c2ddd51ad8..bfb10535b0 100644
--- a/types/react-icons/md/extension.d.ts
+++ b/types/react-icons/md/extension.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdExtension extends React.Component<IconBaseProps, any> { }
+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
index 9003b1ec14..e8042f0b48 100644
--- a/types/react-icons/md/face.d.ts
+++ b/types/react-icons/md/face.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFace extends React.Component<IconBaseProps, any> { }
+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
index 12874b7637..3daeacb97a 100644
--- a/types/react-icons/md/fast-forward.d.ts
+++ b/types/react-icons/md/fast-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFastForward extends React.Component<IconBaseProps, any> { }
+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
index c0fdb2c76c..5b34d9c3a6 100644
--- a/types/react-icons/md/fast-rewind.d.ts
+++ b/types/react-icons/md/fast-rewind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFastRewind extends React.Component<IconBaseProps, any> { }
+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
index cc3af8256e..cd66fdc7e2 100644
--- a/types/react-icons/md/favorite-border.d.ts
+++ b/types/react-icons/md/favorite-border.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteBorder extends React.Component<IconBaseProps, any> { }
+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
index f1729866dd..7b1df113ba 100644
--- a/types/react-icons/md/favorite-outline.d.ts
+++ b/types/react-icons/md/favorite-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavoriteOutline extends React.Component<IconBaseProps, any> { }
+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
index f3afdc8328..84959194f9 100644
--- a/types/react-icons/md/favorite.d.ts
+++ b/types/react-icons/md/favorite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFavorite extends React.Component<IconBaseProps, any> { }
+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
index dc3b9d58ff..b8a4685778 100644
--- a/types/react-icons/md/featured-play-list.d.ts
+++ b/types/react-icons/md/featured-play-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedPlayList extends React.Component<IconBaseProps, any> { }
+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
index 4890e2b124..67aa6eb9c5 100644
--- a/types/react-icons/md/featured-video.d.ts
+++ b/types/react-icons/md/featured-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeaturedVideo extends React.Component<IconBaseProps, any> { }
+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
index 4161932cca..b69aff1e22 100644
--- a/types/react-icons/md/feedback.d.ts
+++ b/types/react-icons/md/feedback.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFeedback extends React.Component<IconBaseProps, any> { }
+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
index 328cf0b39c..f8c841d7b0 100644
--- a/types/react-icons/md/fiber-dvr.d.ts
+++ b/types/react-icons/md/fiber-dvr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberDvr extends React.Component<IconBaseProps, any> { }
+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
index 6a46f817d4..886e58432d 100644
--- a/types/react-icons/md/fiber-manual-record.d.ts
+++ b/types/react-icons/md/fiber-manual-record.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberManualRecord extends React.Component<IconBaseProps, any> { }
+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
index 40136f53d8..239b7541af 100644
--- a/types/react-icons/md/fiber-new.d.ts
+++ b/types/react-icons/md/fiber-new.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberNew extends React.Component<IconBaseProps, any> { }
+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
index fa1993c02f..327b456570 100644
--- a/types/react-icons/md/fiber-pin.d.ts
+++ b/types/react-icons/md/fiber-pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberPin extends React.Component<IconBaseProps, any> { }
+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
index e47e333dc7..0054c9fff7 100644
--- a/types/react-icons/md/fiber-smart-record.d.ts
+++ b/types/react-icons/md/fiber-smart-record.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFiberSmartRecord extends React.Component<IconBaseProps, any> { }
+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
index 31b9cdc7da..7874143a50 100644
--- a/types/react-icons/md/file-download.d.ts
+++ b/types/react-icons/md/file-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFileDownload extends React.Component<IconBaseProps, any> { }
+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
index c9df2b95cc..96d2742e3c 100644
--- a/types/react-icons/md/file-upload.d.ts
+++ b/types/react-icons/md/file-upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFileUpload extends React.Component<IconBaseProps, any> { }
+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
index 1a8e28a626..0eab79f7ff 100644
--- a/types/react-icons/md/filter-1.d.ts
+++ b/types/react-icons/md/filter-1.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter1 extends React.Component<IconBaseProps, any> { }
+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
index 943f58084f..7c2ee2aa23 100644
--- a/types/react-icons/md/filter-2.d.ts
+++ b/types/react-icons/md/filter-2.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter2 extends React.Component<IconBaseProps, any> { }
+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
index c7db4740e1..3378d361ba 100644
--- a/types/react-icons/md/filter-3.d.ts
+++ b/types/react-icons/md/filter-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter3 extends React.Component<IconBaseProps, any> { }
+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
index 19ac0b56f1..9c781a3957 100644
--- a/types/react-icons/md/filter-4.d.ts
+++ b/types/react-icons/md/filter-4.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter4 extends React.Component<IconBaseProps, any> { }
+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
index 5ec668bf86..0231749f2e 100644
--- a/types/react-icons/md/filter-5.d.ts
+++ b/types/react-icons/md/filter-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter5 extends React.Component<IconBaseProps, any> { }
+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
index 951c119351..2aa32d48cd 100644
--- a/types/react-icons/md/filter-6.d.ts
+++ b/types/react-icons/md/filter-6.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter6 extends React.Component<IconBaseProps, any> { }
+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
index 1b8ee0bdf1..3a130313a7 100644
--- a/types/react-icons/md/filter-7.d.ts
+++ b/types/react-icons/md/filter-7.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter7 extends React.Component<IconBaseProps, any> { }
+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
index fca1cfa821..bd2690c793 100644
--- a/types/react-icons/md/filter-8.d.ts
+++ b/types/react-icons/md/filter-8.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter8 extends React.Component<IconBaseProps, any> { }
+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
index fa455acecc..6e11758f2e 100644
--- a/types/react-icons/md/filter-9-plus.d.ts
+++ b/types/react-icons/md/filter-9-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9Plus extends React.Component<IconBaseProps, any> { }
+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
index 4183a3d910..b4971c93f9 100644
--- a/types/react-icons/md/filter-9.d.ts
+++ b/types/react-icons/md/filter-9.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter9 extends React.Component<IconBaseProps, any> { }
+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
index fbe43c0159..327d166bae 100644
--- a/types/react-icons/md/filter-b-and-w.d.ts
+++ b/types/react-icons/md/filter-b-and-w.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterBAndW extends React.Component<IconBaseProps, any> { }
+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
index 2c53cbaf09..6001fc45a8 100644
--- a/types/react-icons/md/filter-center-focus.d.ts
+++ b/types/react-icons/md/filter-center-focus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterCenterFocus extends React.Component<IconBaseProps, any> { }
+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
index d495b9e126..982c0518d9 100644
--- a/types/react-icons/md/filter-drama.d.ts
+++ b/types/react-icons/md/filter-drama.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterDrama extends React.Component<IconBaseProps, any> { }
+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
index f18dc689cd..daef1b137f 100644
--- a/types/react-icons/md/filter-frames.d.ts
+++ b/types/react-icons/md/filter-frames.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterFrames extends React.Component<IconBaseProps, any> { }
+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
index ce836f454e..997614833c 100644
--- a/types/react-icons/md/filter-hdr.d.ts
+++ b/types/react-icons/md/filter-hdr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterHdr extends React.Component<IconBaseProps, any> { }
+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
index bfe975386d..546734dff6 100644
--- a/types/react-icons/md/filter-list.d.ts
+++ b/types/react-icons/md/filter-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterList extends React.Component<IconBaseProps, any> { }
+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
index baa98a14ef..2e160324d8 100644
--- a/types/react-icons/md/filter-none.d.ts
+++ b/types/react-icons/md/filter-none.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterNone extends React.Component<IconBaseProps, any> { }
+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
index 4c9654b6f1..0e68c95a0a 100644
--- a/types/react-icons/md/filter-tilt-shift.d.ts
+++ b/types/react-icons/md/filter-tilt-shift.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterTiltShift extends React.Component<IconBaseProps, any> { }
+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
index 13b25ef691..af1243b86d 100644
--- a/types/react-icons/md/filter-vintage.d.ts
+++ b/types/react-icons/md/filter-vintage.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilterVintage extends React.Component<IconBaseProps, any> { }
+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
index 4e551427b9..30fd120a11 100644
--- a/types/react-icons/md/filter.d.ts
+++ b/types/react-icons/md/filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFilter extends React.Component<IconBaseProps, any> { }
+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
index e477b97b2f..3dbb98ad7d 100644
--- a/types/react-icons/md/find-in-page.d.ts
+++ b/types/react-icons/md/find-in-page.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFindInPage extends React.Component<IconBaseProps, any> { }
+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
index a5888edfa2..0a066acf85 100644
--- a/types/react-icons/md/find-replace.d.ts
+++ b/types/react-icons/md/find-replace.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFindReplace extends React.Component<IconBaseProps, any> { }
+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
index 49badb0c99..1db6d8d427 100644
--- a/types/react-icons/md/fingerprint.d.ts
+++ b/types/react-icons/md/fingerprint.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFingerprint extends React.Component<IconBaseProps, any> { }
+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
index f9dd731f8a..95576cd1a2 100644
--- a/types/react-icons/md/first-page.d.ts
+++ b/types/react-icons/md/first-page.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFirstPage extends React.Component<IconBaseProps, any> { }
+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
index 39b189b904..5874b3c1b7 100644
--- a/types/react-icons/md/fitness-center.d.ts
+++ b/types/react-icons/md/fitness-center.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFitnessCenter extends React.Component<IconBaseProps, any> { }
+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
index 8dd6425475..5767d894db 100644
--- a/types/react-icons/md/flag.d.ts
+++ b/types/react-icons/md/flag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlag extends React.Component<IconBaseProps, any> { }
+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
index 5ad77c78f4..68715b9a9d 100644
--- a/types/react-icons/md/flare.d.ts
+++ b/types/react-icons/md/flare.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlare extends React.Component<IconBaseProps, any> { }
+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
index 3033e6dd1c..e119dc247b 100644
--- a/types/react-icons/md/flash-auto.d.ts
+++ b/types/react-icons/md/flash-auto.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashAuto extends React.Component<IconBaseProps, any> { }
+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
index dbb6719280..fceeadc93a 100644
--- a/types/react-icons/md/flash-off.d.ts
+++ b/types/react-icons/md/flash-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOff extends React.Component<IconBaseProps, any> { }
+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
index c9b8a1818e..8fcec401bc 100644
--- a/types/react-icons/md/flash-on.d.ts
+++ b/types/react-icons/md/flash-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlashOn extends React.Component<IconBaseProps, any> { }
+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
index 44b6a1d99f..f0571c691c 100644
--- a/types/react-icons/md/flight-land.d.ts
+++ b/types/react-icons/md/flight-land.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightLand extends React.Component<IconBaseProps, any> { }
+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
index 64736d2528..c22f43d504 100644
--- a/types/react-icons/md/flight-takeoff.d.ts
+++ b/types/react-icons/md/flight-takeoff.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlightTakeoff extends React.Component<IconBaseProps, any> { }
+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
index f31dca8c8b..da17781711 100644
--- a/types/react-icons/md/flight.d.ts
+++ b/types/react-icons/md/flight.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlight extends React.Component<IconBaseProps, any> { }
+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
index a4dd43860b..a5d426d353 100644
--- a/types/react-icons/md/flip-to-back.d.ts
+++ b/types/react-icons/md/flip-to-back.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToBack extends React.Component<IconBaseProps, any> { }
+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
index 75a69f81e0..480c1d3466 100644
--- a/types/react-icons/md/flip-to-front.d.ts
+++ b/types/react-icons/md/flip-to-front.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlipToFront extends React.Component<IconBaseProps, any> { }
+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
index 0562e7ffd6..990872e643 100644
--- a/types/react-icons/md/flip.d.ts
+++ b/types/react-icons/md/flip.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFlip extends React.Component<IconBaseProps, any> { }
+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
index 6514875b49..813a57abba 100644
--- a/types/react-icons/md/folder-open.d.ts
+++ b/types/react-icons/md/folder-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderOpen extends React.Component<IconBaseProps, any> { }
+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
index 424b2c912e..a1734b4440 100644
--- a/types/react-icons/md/folder-shared.d.ts
+++ b/types/react-icons/md/folder-shared.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderShared extends React.Component<IconBaseProps, any> { }
+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
index f3a8acaed1..ee62be51ce 100644
--- a/types/react-icons/md/folder-special.d.ts
+++ b/types/react-icons/md/folder-special.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolderSpecial extends React.Component<IconBaseProps, any> { }
+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
index cc5a3bf912..efde8117c4 100644
--- a/types/react-icons/md/folder.d.ts
+++ b/types/react-icons/md/folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFolder extends React.Component<IconBaseProps, any> { }
+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
index 7010f45b5d..61c3368b45 100644
--- a/types/react-icons/md/font-download.d.ts
+++ b/types/react-icons/md/font-download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFontDownload extends React.Component<IconBaseProps, any> { }
+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
index 8227f1017f..e601b4115d 100644
--- a/types/react-icons/md/format-align-center.d.ts
+++ b/types/react-icons/md/format-align-center.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignCenter extends React.Component<IconBaseProps, any> { }
+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
index 417e066e9e..a35ccd43cf 100644
--- a/types/react-icons/md/format-align-justify.d.ts
+++ b/types/react-icons/md/format-align-justify.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignJustify extends React.Component<IconBaseProps, any> { }
+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
index 7b6626e3f8..45443b3013 100644
--- a/types/react-icons/md/format-align-left.d.ts
+++ b/types/react-icons/md/format-align-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignLeft extends React.Component<IconBaseProps, any> { }
+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
index f0dbbab430..4c965ed516 100644
--- a/types/react-icons/md/format-align-right.d.ts
+++ b/types/react-icons/md/format-align-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatAlignRight extends React.Component<IconBaseProps, any> { }
+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
index 2ef7ce9e9b..45c6764995 100644
--- a/types/react-icons/md/format-bold.d.ts
+++ b/types/react-icons/md/format-bold.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatBold extends React.Component<IconBaseProps, any> { }
+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
index c026c9f5cc..b60b1f0d1c 100644
--- a/types/react-icons/md/format-clear.d.ts
+++ b/types/react-icons/md/format-clear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatClear extends React.Component<IconBaseProps, any> { }
+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
index e146d90529..c3a17b53ff 100644
--- a/types/react-icons/md/format-color-fill.d.ts
+++ b/types/react-icons/md/format-color-fill.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorFill extends React.Component<IconBaseProps, any> { }
+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
index 63c90c38ef..399c41d77e 100644
--- a/types/react-icons/md/format-color-reset.d.ts
+++ b/types/react-icons/md/format-color-reset.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorReset extends React.Component<IconBaseProps, any> { }
+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
index 861b95f667..1a332ab22a 100644
--- a/types/react-icons/md/format-color-text.d.ts
+++ b/types/react-icons/md/format-color-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatColorText extends React.Component<IconBaseProps, any> { }
+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
index 8c3f24da0e..a89c15275d 100644
--- a/types/react-icons/md/format-indent-decrease.d.ts
+++ b/types/react-icons/md/format-indent-decrease.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentDecrease extends React.Component<IconBaseProps, any> { }
+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
index bd4b271136..8b2d098b69 100644
--- a/types/react-icons/md/format-indent-increase.d.ts
+++ b/types/react-icons/md/format-indent-increase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatIndentIncrease extends React.Component<IconBaseProps, any> { }
+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
index a7af1d14d8..bbc7df9a3f 100644
--- a/types/react-icons/md/format-italic.d.ts
+++ b/types/react-icons/md/format-italic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatItalic extends React.Component<IconBaseProps, any> { }
+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
index 29555f175f..3731147921 100644
--- a/types/react-icons/md/format-line-spacing.d.ts
+++ b/types/react-icons/md/format-line-spacing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatLineSpacing extends React.Component<IconBaseProps, any> { }
+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
index 66730d6027..6813d2e4a4 100644
--- a/types/react-icons/md/format-list-bulleted.d.ts
+++ b/types/react-icons/md/format-list-bulleted.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListBulleted extends React.Component<IconBaseProps, any> { }
+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
index 09f707b3ba..8c241c413f 100644
--- a/types/react-icons/md/format-list-numbered.d.ts
+++ b/types/react-icons/md/format-list-numbered.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatListNumbered extends React.Component<IconBaseProps, any> { }
+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
index acfac174dd..ebbc520c32 100644
--- a/types/react-icons/md/format-paint.d.ts
+++ b/types/react-icons/md/format-paint.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatPaint extends React.Component<IconBaseProps, any> { }
+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
index e89e53976f..bd1037ab81 100644
--- a/types/react-icons/md/format-quote.d.ts
+++ b/types/react-icons/md/format-quote.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatQuote extends React.Component<IconBaseProps, any> { }
+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
index b1c47f6661..c40f7411dd 100644
--- a/types/react-icons/md/format-shapes.d.ts
+++ b/types/react-icons/md/format-shapes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatShapes extends React.Component<IconBaseProps, any> { }
+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
index 23339c3c33..2a9e345a3e 100644
--- a/types/react-icons/md/format-size.d.ts
+++ b/types/react-icons/md/format-size.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatSize extends React.Component<IconBaseProps, any> { }
+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
index 10de907edb..fe36f12771 100644
--- a/types/react-icons/md/format-strikethrough.d.ts
+++ b/types/react-icons/md/format-strikethrough.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatStrikethrough extends React.Component<IconBaseProps, any> { }
+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
index 210b7f06a0..71b083148c 100644
--- a/types/react-icons/md/format-textdirection-l-to-r.d.ts
+++ b/types/react-icons/md/format-textdirection-l-to-r.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionLToR extends React.Component<IconBaseProps, any> { }
+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
index c5fb050b2e..58086109e0 100644
--- a/types/react-icons/md/format-textdirection-r-to-l.d.ts
+++ b/types/react-icons/md/format-textdirection-r-to-l.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatTextdirectionRToL extends React.Component<IconBaseProps, any> { }
+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
index acc3268748..126df5e540 100644
--- a/types/react-icons/md/format-underlined.d.ts
+++ b/types/react-icons/md/format-underlined.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFormatUnderlined extends React.Component<IconBaseProps, any> { }
+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
index d3352a6c05..b7bdc2c096 100644
--- a/types/react-icons/md/forum.d.ts
+++ b/types/react-icons/md/forum.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForum extends React.Component<IconBaseProps, any> { }
+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
index b4f8f6ed92..295d4e89f1 100644
--- a/types/react-icons/md/forward-10.d.ts
+++ b/types/react-icons/md/forward-10.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward10 extends React.Component<IconBaseProps, any> { }
+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
index d560b31ad1..060517c358 100644
--- a/types/react-icons/md/forward-30.d.ts
+++ b/types/react-icons/md/forward-30.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward30 extends React.Component<IconBaseProps, any> { }
+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
index a580ec7e4e..bab1bcea70 100644
--- a/types/react-icons/md/forward-5.d.ts
+++ b/types/react-icons/md/forward-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward5 extends React.Component<IconBaseProps, any> { }
+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
index bc884f4cd1..5a3c89125d 100644
--- a/types/react-icons/md/forward.d.ts
+++ b/types/react-icons/md/forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdForward extends React.Component<IconBaseProps, any> { }
+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
index 841807c1df..362b7036e4 100644
--- a/types/react-icons/md/free-breakfast.d.ts
+++ b/types/react-icons/md/free-breakfast.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFreeBreakfast extends React.Component<IconBaseProps, any> { }
+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
index 3d94414c68..0a1e720dc6 100644
--- a/types/react-icons/md/fullscreen-exit.d.ts
+++ b/types/react-icons/md/fullscreen-exit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreenExit extends React.Component<IconBaseProps, any> { }
+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
index 826a7984db..a31a4e460b 100644
--- a/types/react-icons/md/fullscreen.d.ts
+++ b/types/react-icons/md/fullscreen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFullscreen extends React.Component<IconBaseProps, any> { }
+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
index f5dce58a5b..c6b5e4e36f 100644
--- a/types/react-icons/md/functions.d.ts
+++ b/types/react-icons/md/functions.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdFunctions extends React.Component<IconBaseProps, any> { }
+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
index e0877280d0..46b09234a0 100644
--- a/types/react-icons/md/g-translate.d.ts
+++ b/types/react-icons/md/g-translate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGTranslate extends React.Component<IconBaseProps, any> { }
+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
index 05eba71dc7..8596cbd26d 100644
--- a/types/react-icons/md/gamepad.d.ts
+++ b/types/react-icons/md/gamepad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGamepad extends React.Component<IconBaseProps, any> { }
+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
index 8f877ddad4..3a64f429b9 100644
--- a/types/react-icons/md/games.d.ts
+++ b/types/react-icons/md/games.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGames extends React.Component<IconBaseProps, any> { }
+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
index 07372e1746..55fd1390e9 100644
--- a/types/react-icons/md/gavel.d.ts
+++ b/types/react-icons/md/gavel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGavel extends React.Component<IconBaseProps, any> { }
+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
index c557bb2a62..a382f009b4 100644
--- a/types/react-icons/md/gesture.d.ts
+++ b/types/react-icons/md/gesture.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGesture extends React.Component<IconBaseProps, any> { }
+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
index 73e7039152..9fe4a2a003 100644
--- a/types/react-icons/md/get-app.d.ts
+++ b/types/react-icons/md/get-app.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGetApp extends React.Component<IconBaseProps, any> { }
+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
index 218914b784..60d7666674 100644
--- a/types/react-icons/md/gif.d.ts
+++ b/types/react-icons/md/gif.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGif extends React.Component<IconBaseProps, any> { }
+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
index e26853cbcf..43610ba2e6 100644
--- a/types/react-icons/md/goat.d.ts
+++ b/types/react-icons/md/goat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGoat extends React.Component<IconBaseProps, any> { }
+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
index 45874ef139..301ee1b707 100644
--- a/types/react-icons/md/golf-course.d.ts
+++ b/types/react-icons/md/golf-course.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGolfCourse extends React.Component<IconBaseProps, any> { }
+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
index 92696ba594..12443403df 100644
--- a/types/react-icons/md/gps-fixed.d.ts
+++ b/types/react-icons/md/gps-fixed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsFixed extends React.Component<IconBaseProps, any> { }
+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
index a6546c4fd7..8af1c95e23 100644
--- a/types/react-icons/md/gps-not-fixed.d.ts
+++ b/types/react-icons/md/gps-not-fixed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsNotFixed extends React.Component<IconBaseProps, any> { }
+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
index a3410a4342..c02322b7a4 100644
--- a/types/react-icons/md/gps-off.d.ts
+++ b/types/react-icons/md/gps-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGpsOff extends React.Component<IconBaseProps, any> { }
+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
index 425949532c..cebbc96aa6 100644
--- a/types/react-icons/md/grade.d.ts
+++ b/types/react-icons/md/grade.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGrade extends React.Component<IconBaseProps, any> { }
+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
index 46965f6b83..32e62169a4 100644
--- a/types/react-icons/md/gradient.d.ts
+++ b/types/react-icons/md/gradient.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGradient extends React.Component<IconBaseProps, any> { }
+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
index 9ef824b68e..79a8b9a14d 100644
--- a/types/react-icons/md/grain.d.ts
+++ b/types/react-icons/md/grain.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGrain extends React.Component<IconBaseProps, any> { }
+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
index 6d7435e35c..7f59fa3728 100644
--- a/types/react-icons/md/graphic-eq.d.ts
+++ b/types/react-icons/md/graphic-eq.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGraphicEq extends React.Component<IconBaseProps, any> { }
+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
index 688a578315..8b5cf60336 100644
--- a/types/react-icons/md/grid-off.d.ts
+++ b/types/react-icons/md/grid-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOff extends React.Component<IconBaseProps, any> { }
+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
index e0e697d63f..4978f9912e 100644
--- a/types/react-icons/md/grid-on.d.ts
+++ b/types/react-icons/md/grid-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGridOn extends React.Component<IconBaseProps, any> { }
+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
index 531cc04f1b..bacc3ed6cf 100644
--- a/types/react-icons/md/group-add.d.ts
+++ b/types/react-icons/md/group-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupAdd extends React.Component<IconBaseProps, any> { }
+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
index 6685fb5d6b..997b1738f2 100644
--- a/types/react-icons/md/group-work.d.ts
+++ b/types/react-icons/md/group-work.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroupWork extends React.Component<IconBaseProps, any> { }
+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
index 27ef35587f..af48b3dd81 100644
--- a/types/react-icons/md/group.d.ts
+++ b/types/react-icons/md/group.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdGroup extends React.Component<IconBaseProps, any> { }
+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
index 12ab8567da..1698da3a4d 100644
--- a/types/react-icons/md/hd.d.ts
+++ b/types/react-icons/md/hd.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHd extends React.Component<IconBaseProps, any> { }
+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
index 531e8fe9fd..4a343d8a9b 100644
--- a/types/react-icons/md/hdr-off.d.ts
+++ b/types/react-icons/md/hdr-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOff extends React.Component<IconBaseProps, any> { }
+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
index 84ca1f2f0b..129aa05032 100644
--- a/types/react-icons/md/hdr-on.d.ts
+++ b/types/react-icons/md/hdr-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrOn extends React.Component<IconBaseProps, any> { }
+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
index 8250e715d2..f1eb6a8c80 100644
--- a/types/react-icons/md/hdr-strong.d.ts
+++ b/types/react-icons/md/hdr-strong.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrStrong extends React.Component<IconBaseProps, any> { }
+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
index 398a1d4e90..43be31c24d 100644
--- a/types/react-icons/md/hdr-weak.d.ts
+++ b/types/react-icons/md/hdr-weak.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHdrWeak extends React.Component<IconBaseProps, any> { }
+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
index 163bafe2c9..83c8c0547e 100644
--- a/types/react-icons/md/headset-mic.d.ts
+++ b/types/react-icons/md/headset-mic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadsetMic extends React.Component<IconBaseProps, any> { }
+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
index cc2a4f530d..988ed4b38d 100644
--- a/types/react-icons/md/headset.d.ts
+++ b/types/react-icons/md/headset.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHeadset extends React.Component<IconBaseProps, any> { }
+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
index 3e7c538f03..fc914063c2 100644
--- a/types/react-icons/md/healing.d.ts
+++ b/types/react-icons/md/healing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHealing extends React.Component<IconBaseProps, any> { }
+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
index 827b73ae90..134c7f1863 100644
--- a/types/react-icons/md/hearing.d.ts
+++ b/types/react-icons/md/hearing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHearing extends React.Component<IconBaseProps, any> { }
+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
index e5abf95feb..2734400cb9 100644
--- a/types/react-icons/md/help-outline.d.ts
+++ b/types/react-icons/md/help-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHelpOutline extends React.Component<IconBaseProps, any> { }
+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
index 64aa28df95..cce20cffd6 100644
--- a/types/react-icons/md/help.d.ts
+++ b/types/react-icons/md/help.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHelp extends React.Component<IconBaseProps, any> { }
+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
index 07f38296e4..5676b35cbd 100644
--- a/types/react-icons/md/high-quality.d.ts
+++ b/types/react-icons/md/high-quality.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighQuality extends React.Component<IconBaseProps, any> { }
+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
index d208656e4b..f188f1f9bd 100644
--- a/types/react-icons/md/highlight-off.d.ts
+++ b/types/react-icons/md/highlight-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightOff extends React.Component<IconBaseProps, any> { }
+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
index a77470eb23..7a28a3b5ae 100644
--- a/types/react-icons/md/highlight-remove.d.ts
+++ b/types/react-icons/md/highlight-remove.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlightRemove extends React.Component<IconBaseProps, any> { }
+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
index 18b7a4258c..0730ad41da 100644
--- a/types/react-icons/md/highlight.d.ts
+++ b/types/react-icons/md/highlight.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHighlight extends React.Component<IconBaseProps, any> { }
+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
index 2dfbba3ab9..d97bca17d4 100644
--- a/types/react-icons/md/history.d.ts
+++ b/types/react-icons/md/history.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHistory extends React.Component<IconBaseProps, any> { }
+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
index 0ad2b0f1b3..6defd6933f 100644
--- a/types/react-icons/md/home.d.ts
+++ b/types/react-icons/md/home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHome extends React.Component<IconBaseProps, any> { }
+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
index af05f74e38..89cf2e0591 100644
--- a/types/react-icons/md/hot-tub.d.ts
+++ b/types/react-icons/md/hot-tub.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHotTub extends React.Component<IconBaseProps, any> { }
+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
index 5cb81ea123..198fb2b211 100644
--- a/types/react-icons/md/hotel.d.ts
+++ b/types/react-icons/md/hotel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHotel extends React.Component<IconBaseProps, any> { }
+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
index 92033c533c..a7e4e25915 100644
--- a/types/react-icons/md/hourglass-empty.d.ts
+++ b/types/react-icons/md/hourglass-empty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassEmpty extends React.Component<IconBaseProps, any> { }
+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
index b1d098353b..2a3e1507a3 100644
--- a/types/react-icons/md/hourglass-full.d.ts
+++ b/types/react-icons/md/hourglass-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHourglassFull extends React.Component<IconBaseProps, any> { }
+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
index 9d34580eeb..def5a14ec5 100644
--- a/types/react-icons/md/http.d.ts
+++ b/types/react-icons/md/http.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHttp extends React.Component<IconBaseProps, any> { }
+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
index 1c37208bbe..991ad252b9 100644
--- a/types/react-icons/md/https.d.ts
+++ b/types/react-icons/md/https.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdHttps extends React.Component<IconBaseProps, any> { }
+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
index c6278ed425..2cff8927ea 100644
--- a/types/react-icons/md/image-aspect-ratio.d.ts
+++ b/types/react-icons/md/image-aspect-ratio.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImageAspectRatio extends React.Component<IconBaseProps, any> { }
+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
index 6dca0caf47..f4246f01ed 100644
--- a/types/react-icons/md/image.d.ts
+++ b/types/react-icons/md/image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImage extends React.Component<IconBaseProps, any> { }
+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
index a373ab5eb1..4012627098 100644
--- a/types/react-icons/md/import-contacts.d.ts
+++ b/types/react-icons/md/import-contacts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportContacts extends React.Component<IconBaseProps, any> { }
+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
index d7b2f1759a..9c66e17352 100644
--- a/types/react-icons/md/import-export.d.ts
+++ b/types/react-icons/md/import-export.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportExport extends React.Component<IconBaseProps, any> { }
+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
index b42fa591f3..8795301e43 100644
--- a/types/react-icons/md/important-devices.d.ts
+++ b/types/react-icons/md/important-devices.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdImportantDevices extends React.Component<IconBaseProps, any> { }
+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
index 86b88d9fcc..13d401760f 100644
--- a/types/react-icons/md/inbox.d.ts
+++ b/types/react-icons/md/inbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInbox extends React.Component<IconBaseProps, any> { }
+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
index 3f5420ea2b..01b0c58730 100644
--- a/types/react-icons/md/indeterminate-check-box.d.ts
+++ b/types/react-icons/md/indeterminate-check-box.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdIndeterminateCheckBox extends React.Component<IconBaseProps, any> { }
+export default class MdIndeterminateCheckBox extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/md/info-outline.d.ts b/types/react-icons/md/info-outline.d.ts
index 3f99924866..6ac0500f92 100644
--- a/types/react-icons/md/info-outline.d.ts
+++ b/types/react-icons/md/info-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInfoOutline extends React.Component<IconBaseProps, any> { }
+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
index fca189fc50..c16ac1add7 100644
--- a/types/react-icons/md/info.d.ts
+++ b/types/react-icons/md/info.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInfo extends React.Component<IconBaseProps, any> { }
+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
index e92b2d6513..1d620b29c8 100644
--- a/types/react-icons/md/input.d.ts
+++ b/types/react-icons/md/input.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInput extends React.Component<IconBaseProps, any> { }
+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
index 18086f5b2b..c3f11f837a 100644
--- a/types/react-icons/md/insert-chart.d.ts
+++ b/types/react-icons/md/insert-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertChart extends React.Component<IconBaseProps, any> { }
+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
index 7ff8f17311..4e9435029c 100644
--- a/types/react-icons/md/insert-comment.d.ts
+++ b/types/react-icons/md/insert-comment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertComment extends React.Component<IconBaseProps, any> { }
+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
index 61986f7877..cbef175f50 100644
--- a/types/react-icons/md/insert-drive-file.d.ts
+++ b/types/react-icons/md/insert-drive-file.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertDriveFile extends React.Component<IconBaseProps, any> { }
+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
index a154e52134..5cce434cd9 100644
--- a/types/react-icons/md/insert-emoticon.d.ts
+++ b/types/react-icons/md/insert-emoticon.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertEmoticon extends React.Component<IconBaseProps, any> { }
+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
index c95849c89b..827e395a8d 100644
--- a/types/react-icons/md/insert-invitation.d.ts
+++ b/types/react-icons/md/insert-invitation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertInvitation extends React.Component<IconBaseProps, any> { }
+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
index 835f3dec9f..31aa91358d 100644
--- a/types/react-icons/md/insert-link.d.ts
+++ b/types/react-icons/md/insert-link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertLink extends React.Component<IconBaseProps, any> { }
+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
index d27210d03b..7b023ca75f 100644
--- a/types/react-icons/md/insert-photo.d.ts
+++ b/types/react-icons/md/insert-photo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInsertPhoto extends React.Component<IconBaseProps, any> { }
+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
index 9eb9160182..bf08ac105a 100644
--- a/types/react-icons/md/invert-colors-off.d.ts
+++ b/types/react-icons/md/invert-colors-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOff extends React.Component<IconBaseProps, any> { }
+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
index d473b65065..41d3a30370 100644
--- a/types/react-icons/md/invert-colors-on.d.ts
+++ b/types/react-icons/md/invert-colors-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColorsOn extends React.Component<IconBaseProps, any> { }
+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
index d165ed781b..6700ad9028 100644
--- a/types/react-icons/md/invert-colors.d.ts
+++ b/types/react-icons/md/invert-colors.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdInvertColors extends React.Component<IconBaseProps, any> { }
+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
index 9204d41a88..13e1d8da6c 100644
--- a/types/react-icons/md/iso.d.ts
+++ b/types/react-icons/md/iso.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdIso extends React.Component<IconBaseProps, any> { }
+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
index 431d27db8c..2aa3a06de4 100644
--- a/types/react-icons/md/keyboard-arrow-down.d.ts
+++ b/types/react-icons/md/keyboard-arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowDown extends React.Component<IconBaseProps, any> { }
+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
index bbe7e3e94f..6ab86f3bdc 100644
--- a/types/react-icons/md/keyboard-arrow-left.d.ts
+++ b/types/react-icons/md/keyboard-arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index 9be76c5b8b..157f9cd453 100644
--- a/types/react-icons/md/keyboard-arrow-right.d.ts
+++ b/types/react-icons/md/keyboard-arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowRight extends React.Component<IconBaseProps, any> { }
+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
index b82b246f2d..be668094a8 100644
--- a/types/react-icons/md/keyboard-arrow-up.d.ts
+++ b/types/react-icons/md/keyboard-arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 45af94307f..361b3eacb6 100644
--- a/types/react-icons/md/keyboard-backspace.d.ts
+++ b/types/react-icons/md/keyboard-backspace.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardBackspace extends React.Component<IconBaseProps, any> { }
+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
index b9cabe7aa5..e68fb04dd4 100644
--- a/types/react-icons/md/keyboard-capslock.d.ts
+++ b/types/react-icons/md/keyboard-capslock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardCapslock extends React.Component<IconBaseProps, any> { }
+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
index 45ee764819..26a47f7942 100644
--- a/types/react-icons/md/keyboard-control.d.ts
+++ b/types/react-icons/md/keyboard-control.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardControl extends React.Component<IconBaseProps, any> { }
+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
index 7ebe0ed554..2bd9815962 100644
--- a/types/react-icons/md/keyboard-hide.d.ts
+++ b/types/react-icons/md/keyboard-hide.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardHide extends React.Component<IconBaseProps, any> { }
+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
index e604dc701b..dcc67124f3 100644
--- a/types/react-icons/md/keyboard-return.d.ts
+++ b/types/react-icons/md/keyboard-return.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardReturn extends React.Component<IconBaseProps, any> { }
+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
index ff6d433b59..fc60cb1e9d 100644
--- a/types/react-icons/md/keyboard-tab.d.ts
+++ b/types/react-icons/md/keyboard-tab.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardTab extends React.Component<IconBaseProps, any> { }
+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
index 4dcfa9e567..b0e8b84cef 100644
--- a/types/react-icons/md/keyboard-voice.d.ts
+++ b/types/react-icons/md/keyboard-voice.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboardVoice extends React.Component<IconBaseProps, any> { }
+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
index 37020cba98..c48881b8b4 100644
--- a/types/react-icons/md/keyboard.d.ts
+++ b/types/react-icons/md/keyboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKeyboard extends React.Component<IconBaseProps, any> { }
+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
index b8f2d7b6fd..9da8c6f762 100644
--- a/types/react-icons/md/kitchen.d.ts
+++ b/types/react-icons/md/kitchen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdKitchen extends React.Component<IconBaseProps, any> { }
+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
index 3f2603f956..f8565aaac8 100644
--- a/types/react-icons/md/label-outline.d.ts
+++ b/types/react-icons/md/label-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLabelOutline extends React.Component<IconBaseProps, any> { }
+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
index c5e8632158..679636e231 100644
--- a/types/react-icons/md/label.d.ts
+++ b/types/react-icons/md/label.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLabel extends React.Component<IconBaseProps, any> { }
+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
index 8b2226c590..fb4502522b 100644
--- a/types/react-icons/md/landscape.d.ts
+++ b/types/react-icons/md/landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLandscape extends React.Component<IconBaseProps, any> { }
+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
index c30dac15f3..a47388c654 100644
--- a/types/react-icons/md/language.d.ts
+++ b/types/react-icons/md/language.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLanguage extends React.Component<IconBaseProps, any> { }
+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
index fdb3794f0e..d1f25cdc3b 100644
--- a/types/react-icons/md/laptop-chromebook.d.ts
+++ b/types/react-icons/md/laptop-chromebook.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopChromebook extends React.Component<IconBaseProps, any> { }
+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
index a5c5bea7f4..25afe25920 100644
--- a/types/react-icons/md/laptop-mac.d.ts
+++ b/types/react-icons/md/laptop-mac.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopMac extends React.Component<IconBaseProps, any> { }
+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
index 38eb53d94a..bd7441fea1 100644
--- a/types/react-icons/md/laptop-windows.d.ts
+++ b/types/react-icons/md/laptop-windows.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptopWindows extends React.Component<IconBaseProps, any> { }
+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
index 66ccefbc30..2510020e0c 100644
--- a/types/react-icons/md/laptop.d.ts
+++ b/types/react-icons/md/laptop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaptop extends React.Component<IconBaseProps, any> { }
+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
index 68d8dbc6cf..162f94c0de 100644
--- a/types/react-icons/md/last-page.d.ts
+++ b/types/react-icons/md/last-page.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLastPage extends React.Component<IconBaseProps, any> { }
+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
index 505e231eaa..6bd2552cb3 100644
--- a/types/react-icons/md/launch.d.ts
+++ b/types/react-icons/md/launch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLaunch extends React.Component<IconBaseProps, any> { }
+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
index e339d3c8aa..136d4ab797 100644
--- a/types/react-icons/md/layers-clear.d.ts
+++ b/types/react-icons/md/layers-clear.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLayersClear extends React.Component<IconBaseProps, any> { }
+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
index 4d3ecb99a9..d0f2ce7f78 100644
--- a/types/react-icons/md/layers.d.ts
+++ b/types/react-icons/md/layers.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLayers extends React.Component<IconBaseProps, any> { }
+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
index 7698dfbe4b..95235a4a7d 100644
--- a/types/react-icons/md/leak-add.d.ts
+++ b/types/react-icons/md/leak-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakAdd extends React.Component<IconBaseProps, any> { }
+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
index 0002f32be8..024072b36a 100644
--- a/types/react-icons/md/leak-remove.d.ts
+++ b/types/react-icons/md/leak-remove.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLeakRemove extends React.Component<IconBaseProps, any> { }
+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
index 70b59c2f00..c5d535560e 100644
--- a/types/react-icons/md/lens.d.ts
+++ b/types/react-icons/md/lens.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLens extends React.Component<IconBaseProps, any> { }
+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
index 969710d86a..0d1e45a2d1 100644
--- a/types/react-icons/md/library-add.d.ts
+++ b/types/react-icons/md/library-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryAdd extends React.Component<IconBaseProps, any> { }
+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
index 380822b8bb..4cd9469a0f 100644
--- a/types/react-icons/md/library-books.d.ts
+++ b/types/react-icons/md/library-books.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryBooks extends React.Component<IconBaseProps, any> { }
+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
index 41affa7b98..7f25717011 100644
--- a/types/react-icons/md/library-music.d.ts
+++ b/types/react-icons/md/library-music.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLibraryMusic extends React.Component<IconBaseProps, any> { }
+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
index 38596ffd80..013344155b 100644
--- a/types/react-icons/md/lightbulb-outline.d.ts
+++ b/types/react-icons/md/lightbulb-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLightbulbOutline extends React.Component<IconBaseProps, any> { }
+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
index 5626464046..01562f8705 100644
--- a/types/react-icons/md/line-style.d.ts
+++ b/types/react-icons/md/line-style.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLineStyle extends React.Component<IconBaseProps, any> { }
+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
index 526e0653ec..2eaa15b7df 100644
--- a/types/react-icons/md/line-weight.d.ts
+++ b/types/react-icons/md/line-weight.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLineWeight extends React.Component<IconBaseProps, any> { }
+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
index cfd6483b11..e4f2196d46 100644
--- a/types/react-icons/md/linear-scale.d.ts
+++ b/types/react-icons/md/linear-scale.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLinearScale extends React.Component<IconBaseProps, any> { }
+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
index c2e7ab899b..229a79db5d 100644
--- a/types/react-icons/md/link.d.ts
+++ b/types/react-icons/md/link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLink extends React.Component<IconBaseProps, any> { }
+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
index af48dc1481..04f1059032 100644
--- a/types/react-icons/md/linked-camera.d.ts
+++ b/types/react-icons/md/linked-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLinkedCamera extends React.Component<IconBaseProps, any> { }
+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
index ae0f2553fb..ee687771dd 100644
--- a/types/react-icons/md/list.d.ts
+++ b/types/react-icons/md/list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdList extends React.Component<IconBaseProps, any> { }
+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
index 0e4350337e..baa4ecfcea 100644
--- a/types/react-icons/md/live-help.d.ts
+++ b/types/react-icons/md/live-help.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveHelp extends React.Component<IconBaseProps, any> { }
+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
index 7e9e530282..4b6700c6d7 100644
--- a/types/react-icons/md/live-tv.d.ts
+++ b/types/react-icons/md/live-tv.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLiveTv extends React.Component<IconBaseProps, any> { }
+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
index 05826445eb..c5cbc96784 100644
--- a/types/react-icons/md/local-airport.d.ts
+++ b/types/react-icons/md/local-airport.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAirport extends React.Component<IconBaseProps, any> { }
+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
index c2e8efbebf..c3aebab325 100644
--- a/types/react-icons/md/local-atm.d.ts
+++ b/types/react-icons/md/local-atm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAtm extends React.Component<IconBaseProps, any> { }
+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
index 15c825de21..4cb4733fc6 100644
--- a/types/react-icons/md/local-attraction.d.ts
+++ b/types/react-icons/md/local-attraction.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalAttraction extends React.Component<IconBaseProps, any> { }
+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
index 517dc00e8f..384cf80708 100644
--- a/types/react-icons/md/local-bar.d.ts
+++ b/types/react-icons/md/local-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalBar extends React.Component<IconBaseProps, any> { }
+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
index f73faeaf4c..1edc27271a 100644
--- a/types/react-icons/md/local-cafe.d.ts
+++ b/types/react-icons/md/local-cafe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCafe extends React.Component<IconBaseProps, any> { }
+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
index b4d7307aa7..2f8e3424d0 100644
--- a/types/react-icons/md/local-car-wash.d.ts
+++ b/types/react-icons/md/local-car-wash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalCarWash extends React.Component<IconBaseProps, any> { }
+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
index bca83b342e..60ba5980c5 100644
--- a/types/react-icons/md/local-convenience-store.d.ts
+++ b/types/react-icons/md/local-convenience-store.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalConvenienceStore extends React.Component<IconBaseProps, any> { }
+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
index abba5f595c..dd0cf01d42 100644
--- a/types/react-icons/md/local-drink.d.ts
+++ b/types/react-icons/md/local-drink.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalDrink extends React.Component<IconBaseProps, any> { }
+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
index f5c7294ed4..6744bc8c3a 100644
--- a/types/react-icons/md/local-florist.d.ts
+++ b/types/react-icons/md/local-florist.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalFlorist extends React.Component<IconBaseProps, any> { }
+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
index 3dd6b0c72e..6c6b7df0a9 100644
--- a/types/react-icons/md/local-gas-station.d.ts
+++ b/types/react-icons/md/local-gas-station.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGasStation extends React.Component<IconBaseProps, any> { }
+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
index 1a61180ebd..74be93825c 100644
--- a/types/react-icons/md/local-grocery-store.d.ts
+++ b/types/react-icons/md/local-grocery-store.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalGroceryStore extends React.Component<IconBaseProps, any> { }
+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
index 2bfb879230..3f3d22c1f1 100644
--- a/types/react-icons/md/local-hospital.d.ts
+++ b/types/react-icons/md/local-hospital.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHospital extends React.Component<IconBaseProps, any> { }
+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
index 18267cd4c0..72aa8116e3 100644
--- a/types/react-icons/md/local-hotel.d.ts
+++ b/types/react-icons/md/local-hotel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalHotel extends React.Component<IconBaseProps, any> { }
+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
index 86583c785d..bcddaa57b7 100644
--- a/types/react-icons/md/local-laundry-service.d.ts
+++ b/types/react-icons/md/local-laundry-service.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLaundryService extends React.Component<IconBaseProps, any> { }
+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
index 22e41116d6..66345dec71 100644
--- a/types/react-icons/md/local-library.d.ts
+++ b/types/react-icons/md/local-library.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalLibrary extends React.Component<IconBaseProps, any> { }
+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
index 17f3ab6010..4bc0bd9a6c 100644
--- a/types/react-icons/md/local-mall.d.ts
+++ b/types/react-icons/md/local-mall.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMall extends React.Component<IconBaseProps, any> { }
+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
index 6727f1bede..fd585253f4 100644
--- a/types/react-icons/md/local-movies.d.ts
+++ b/types/react-icons/md/local-movies.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalMovies extends React.Component<IconBaseProps, any> { }
+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
index 29b89bf08e..d68ec81829 100644
--- a/types/react-icons/md/local-offer.d.ts
+++ b/types/react-icons/md/local-offer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalOffer extends React.Component<IconBaseProps, any> { }
+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
index 18b1d22321..962af582ac 100644
--- a/types/react-icons/md/local-parking.d.ts
+++ b/types/react-icons/md/local-parking.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalParking extends React.Component<IconBaseProps, any> { }
+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
index d869dfb9b4..4f6253241e 100644
--- a/types/react-icons/md/local-pharmacy.d.ts
+++ b/types/react-icons/md/local-pharmacy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPharmacy extends React.Component<IconBaseProps, any> { }
+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
index dbe6333b76..295b71d056 100644
--- a/types/react-icons/md/local-phone.d.ts
+++ b/types/react-icons/md/local-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPhone extends React.Component<IconBaseProps, any> { }
+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
index 88b197a593..fd8f1e9b3f 100644
--- a/types/react-icons/md/local-pizza.d.ts
+++ b/types/react-icons/md/local-pizza.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPizza extends React.Component<IconBaseProps, any> { }
+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
index 4974782a72..2323020f1f 100644
--- a/types/react-icons/md/local-play.d.ts
+++ b/types/react-icons/md/local-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPlay extends React.Component<IconBaseProps, any> { }
+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
index f03b6073d1..d753132d88 100644
--- a/types/react-icons/md/local-post-office.d.ts
+++ b/types/react-icons/md/local-post-office.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPostOffice extends React.Component<IconBaseProps, any> { }
+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
index 49e0bf85ea..f5f2318b18 100644
--- a/types/react-icons/md/local-print-shop.d.ts
+++ b/types/react-icons/md/local-print-shop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalPrintShop extends React.Component<IconBaseProps, any> { }
+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
index cf6aef40cd..631a9bcdba 100644
--- a/types/react-icons/md/local-restaurant.d.ts
+++ b/types/react-icons/md/local-restaurant.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalRestaurant extends React.Component<IconBaseProps, any> { }
+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
index 6aae0f405b..6c345a7bdd 100644
--- a/types/react-icons/md/local-see.d.ts
+++ b/types/react-icons/md/local-see.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalSee extends React.Component<IconBaseProps, any> { }
+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
index d3307bc781..8862dc1e3f 100644
--- a/types/react-icons/md/local-shipping.d.ts
+++ b/types/react-icons/md/local-shipping.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalShipping extends React.Component<IconBaseProps, any> { }
+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
index 0e5f5e5371..ffee12d51a 100644
--- a/types/react-icons/md/local-taxi.d.ts
+++ b/types/react-icons/md/local-taxi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocalTaxi extends React.Component<IconBaseProps, any> { }
+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
index 486b99765c..d4154e0b4d 100644
--- a/types/react-icons/md/location-city.d.ts
+++ b/types/react-icons/md/location-city.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationCity extends React.Component<IconBaseProps, any> { }
+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
index 3b48e760fe..f890985e4c 100644
--- a/types/react-icons/md/location-disabled.d.ts
+++ b/types/react-icons/md/location-disabled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationDisabled extends React.Component<IconBaseProps, any> { }
+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
index 6f27e4d0b0..6d7ae193ef 100644
--- a/types/react-icons/md/location-history.d.ts
+++ b/types/react-icons/md/location-history.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationHistory extends React.Component<IconBaseProps, any> { }
+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
index 7e2c7b273d..ae7c278991 100644
--- a/types/react-icons/md/location-off.d.ts
+++ b/types/react-icons/md/location-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOff extends React.Component<IconBaseProps, any> { }
+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
index d319947251..9a606064c1 100644
--- a/types/react-icons/md/location-on.d.ts
+++ b/types/react-icons/md/location-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationOn extends React.Component<IconBaseProps, any> { }
+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
index 21053a6c5e..89860efc3f 100644
--- a/types/react-icons/md/location-searching.d.ts
+++ b/types/react-icons/md/location-searching.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLocationSearching extends React.Component<IconBaseProps, any> { }
+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
index 9ddeb9707e..c61129c43a 100644
--- a/types/react-icons/md/lock-open.d.ts
+++ b/types/react-icons/md/lock-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOpen extends React.Component<IconBaseProps, any> { }
+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
index 7b66070456..8d8c854627 100644
--- a/types/react-icons/md/lock-outline.d.ts
+++ b/types/react-icons/md/lock-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLockOutline extends React.Component<IconBaseProps, any> { }
+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
index 4cb73265f0..08c9bebbec 100644
--- a/types/react-icons/md/lock.d.ts
+++ b/types/react-icons/md/lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLock extends React.Component<IconBaseProps, any> { }
+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
index bcfc20f9cf..91ec18b0fa 100644
--- a/types/react-icons/md/looks-3.d.ts
+++ b/types/react-icons/md/looks-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks3 extends React.Component<IconBaseProps, any> { }
+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
index 4f9cb2cc6f..2005a3ef6c 100644
--- a/types/react-icons/md/looks-4.d.ts
+++ b/types/react-icons/md/looks-4.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks4 extends React.Component<IconBaseProps, any> { }
+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
index 06e689b9af..0e4c8830df 100644
--- a/types/react-icons/md/looks-5.d.ts
+++ b/types/react-icons/md/looks-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks5 extends React.Component<IconBaseProps, any> { }
+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
index b5ef4e3f0e..b00d207ffc 100644
--- a/types/react-icons/md/looks-6.d.ts
+++ b/types/react-icons/md/looks-6.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks6 extends React.Component<IconBaseProps, any> { }
+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
index 8e662656ec..129ebbc28b 100644
--- a/types/react-icons/md/looks-one.d.ts
+++ b/types/react-icons/md/looks-one.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksOne extends React.Component<IconBaseProps, any> { }
+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
index 79cfaaed82..5f62cb2173 100644
--- a/types/react-icons/md/looks-two.d.ts
+++ b/types/react-icons/md/looks-two.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooksTwo extends React.Component<IconBaseProps, any> { }
+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
index 39a664c2ed..5db0141f58 100644
--- a/types/react-icons/md/looks.d.ts
+++ b/types/react-icons/md/looks.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLooks extends React.Component<IconBaseProps, any> { }
+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
index 40297d4cb0..8e7f90aad0 100644
--- a/types/react-icons/md/loop.d.ts
+++ b/types/react-icons/md/loop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoop extends React.Component<IconBaseProps, any> { }
+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
index e79d95219f..8b7e0a54f1 100644
--- a/types/react-icons/md/loupe.d.ts
+++ b/types/react-icons/md/loupe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoupe extends React.Component<IconBaseProps, any> { }
+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
index 27624bb385..61f7f79811 100644
--- a/types/react-icons/md/low-priority.d.ts
+++ b/types/react-icons/md/low-priority.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLowPriority extends React.Component<IconBaseProps, any> { }
+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
index f3598b543c..de4ad7303f 100644
--- a/types/react-icons/md/loyalty.d.ts
+++ b/types/react-icons/md/loyalty.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdLoyalty extends React.Component<IconBaseProps, any> { }
+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
index 3449a69ab6..e2ea724b8c 100644
--- a/types/react-icons/md/mail-outline.d.ts
+++ b/types/react-icons/md/mail-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMailOutline extends React.Component<IconBaseProps, any> { }
+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
index 8aab4389e8..4d6ae8563e 100644
--- a/types/react-icons/md/mail.d.ts
+++ b/types/react-icons/md/mail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMail extends React.Component<IconBaseProps, any> { }
+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
index 7d0e0f1eed..e5199af23c 100644
--- a/types/react-icons/md/map.d.ts
+++ b/types/react-icons/md/map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMap extends React.Component<IconBaseProps, any> { }
+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
index 12a597c0ed..ba5d9a5982 100644
--- a/types/react-icons/md/markunread-mailbox.d.ts
+++ b/types/react-icons/md/markunread-mailbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunreadMailbox extends React.Component<IconBaseProps, any> { }
+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
index 3563e05fe1..bcf1ac3569 100644
--- a/types/react-icons/md/markunread.d.ts
+++ b/types/react-icons/md/markunread.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMarkunread extends React.Component<IconBaseProps, any> { }
+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
index c549c4880e..507da2a21c 100644
--- a/types/react-icons/md/memory.d.ts
+++ b/types/react-icons/md/memory.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMemory extends React.Component<IconBaseProps, any> { }
+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
index 271826d1b2..8d71a1981f 100644
--- a/types/react-icons/md/menu.d.ts
+++ b/types/react-icons/md/menu.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMenu extends React.Component<IconBaseProps, any> { }
+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
index 87ff0d22d7..40e48a7b93 100644
--- a/types/react-icons/md/merge-type.d.ts
+++ b/types/react-icons/md/merge-type.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMergeType extends React.Component<IconBaseProps, any> { }
+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
index fc25b95738..64488ed66b 100644
--- a/types/react-icons/md/message.d.ts
+++ b/types/react-icons/md/message.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMessage extends React.Component<IconBaseProps, any> { }
+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
index b1c4278a99..5b71761c02 100644
--- a/types/react-icons/md/mic-none.d.ts
+++ b/types/react-icons/md/mic-none.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMicNone extends React.Component<IconBaseProps, any> { }
+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
index e540d8a6d2..ce68ec3b85 100644
--- a/types/react-icons/md/mic-off.d.ts
+++ b/types/react-icons/md/mic-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMicOff extends React.Component<IconBaseProps, any> { }
+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
index a12bba0143..e827c93aee 100644
--- a/types/react-icons/md/mic.d.ts
+++ b/types/react-icons/md/mic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMic extends React.Component<IconBaseProps, any> { }
+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
index 368760a4e9..dd4635435c 100644
--- a/types/react-icons/md/mms.d.ts
+++ b/types/react-icons/md/mms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMms extends React.Component<IconBaseProps, any> { }
+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
index 5798a3cfc1..4e70e6a57e 100644
--- a/types/react-icons/md/mode-comment.d.ts
+++ b/types/react-icons/md/mode-comment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdModeComment extends React.Component<IconBaseProps, any> { }
+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
index 33c3edc06c..8ba0f1809c 100644
--- a/types/react-icons/md/mode-edit.d.ts
+++ b/types/react-icons/md/mode-edit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdModeEdit extends React.Component<IconBaseProps, any> { }
+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
index d0cbea826a..5fbac94cd6 100644
--- a/types/react-icons/md/monetization-on.d.ts
+++ b/types/react-icons/md/monetization-on.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMonetizationOn extends React.Component<IconBaseProps, any> { }
+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
index dfb05070c0..682df0c9e9 100644
--- a/types/react-icons/md/money-off.d.ts
+++ b/types/react-icons/md/money-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoneyOff extends React.Component<IconBaseProps, any> { }
+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
index 29fe739159..57d0224d92 100644
--- a/types/react-icons/md/monochrome-photos.d.ts
+++ b/types/react-icons/md/monochrome-photos.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMonochromePhotos extends React.Component<IconBaseProps, any> { }
+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
index 21ef39041f..6cb4070c36 100644
--- a/types/react-icons/md/mood-bad.d.ts
+++ b/types/react-icons/md/mood-bad.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoodBad extends React.Component<IconBaseProps, any> { }
+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
index aab0b16317..fd15fc4d9d 100644
--- a/types/react-icons/md/mood.d.ts
+++ b/types/react-icons/md/mood.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMood extends React.Component<IconBaseProps, any> { }
+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
index 688160488b..dd46d5526c 100644
--- a/types/react-icons/md/more-horiz.d.ts
+++ b/types/react-icons/md/more-horiz.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreHoriz extends React.Component<IconBaseProps, any> { }
+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
index ea8a78855d..9c1080b74a 100644
--- a/types/react-icons/md/more-vert.d.ts
+++ b/types/react-icons/md/more-vert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoreVert extends React.Component<IconBaseProps, any> { }
+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
index eaf1e94a52..395fe8b215 100644
--- a/types/react-icons/md/more.d.ts
+++ b/types/react-icons/md/more.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMore extends React.Component<IconBaseProps, any> { }
+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
index ce8172e0a9..b06e285368 100644
--- a/types/react-icons/md/motorcycle.d.ts
+++ b/types/react-icons/md/motorcycle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMotorcycle extends React.Component<IconBaseProps, any> { }
+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
index 149b4136e7..6b48389af1 100644
--- a/types/react-icons/md/mouse.d.ts
+++ b/types/react-icons/md/mouse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMouse extends React.Component<IconBaseProps, any> { }
+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
index f5a337da40..2723e6516e 100644
--- a/types/react-icons/md/move-to-inbox.d.ts
+++ b/types/react-icons/md/move-to-inbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMoveToInbox extends React.Component<IconBaseProps, any> { }
+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
index df78c0c4b2..1e795092d6 100644
--- a/types/react-icons/md/movie-creation.d.ts
+++ b/types/react-icons/md/movie-creation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieCreation extends React.Component<IconBaseProps, any> { }
+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
index 2047a11062..22da6198e8 100644
--- a/types/react-icons/md/movie-filter.d.ts
+++ b/types/react-icons/md/movie-filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovieFilter extends React.Component<IconBaseProps, any> { }
+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
index 8ae34c419f..7982199452 100644
--- a/types/react-icons/md/movie.d.ts
+++ b/types/react-icons/md/movie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMovie extends React.Component<IconBaseProps, any> { }
+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
index 9ef4f1ee95..03aba87bc1 100644
--- a/types/react-icons/md/multiline-chart.d.ts
+++ b/types/react-icons/md/multiline-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMultilineChart extends React.Component<IconBaseProps, any> { }
+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
index ed556d8d0c..b3c161252e 100644
--- a/types/react-icons/md/music-note.d.ts
+++ b/types/react-icons/md/music-note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicNote extends React.Component<IconBaseProps, any> { }
+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
index ebff70cf25..e7c4890596 100644
--- a/types/react-icons/md/music-video.d.ts
+++ b/types/react-icons/md/music-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMusicVideo extends React.Component<IconBaseProps, any> { }
+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
index c027edff2d..e9e49e3638 100644
--- a/types/react-icons/md/my-location.d.ts
+++ b/types/react-icons/md/my-location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdMyLocation extends React.Component<IconBaseProps, any> { }
+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
index f57330e30f..123a578eff 100644
--- a/types/react-icons/md/nature-people.d.ts
+++ b/types/react-icons/md/nature-people.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNaturePeople extends React.Component<IconBaseProps, any> { }
+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
index c3f71f9f88..14b871e450 100644
--- a/types/react-icons/md/nature.d.ts
+++ b/types/react-icons/md/nature.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNature extends React.Component<IconBaseProps, any> { }
+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
index 21066b5081..e66fdc2c7b 100644
--- a/types/react-icons/md/navigate-before.d.ts
+++ b/types/react-icons/md/navigate-before.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateBefore extends React.Component<IconBaseProps, any> { }
+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
index 74252196fd..f39bad2270 100644
--- a/types/react-icons/md/navigate-next.d.ts
+++ b/types/react-icons/md/navigate-next.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigateNext extends React.Component<IconBaseProps, any> { }
+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
index 1e5d81a697..be44444790 100644
--- a/types/react-icons/md/navigation.d.ts
+++ b/types/react-icons/md/navigation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNavigation extends React.Component<IconBaseProps, any> { }
+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
index 4c3a27c2a4..a1fe717c03 100644
--- a/types/react-icons/md/near-me.d.ts
+++ b/types/react-icons/md/near-me.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNearMe extends React.Component<IconBaseProps, any> { }
+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
index 0aed7fdd26..9dc116de65 100644
--- a/types/react-icons/md/network-cell.d.ts
+++ b/types/react-icons/md/network-cell.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCell extends React.Component<IconBaseProps, any> { }
+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
index f49ab14361..3497ab3224 100644
--- a/types/react-icons/md/network-check.d.ts
+++ b/types/react-icons/md/network-check.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkCheck extends React.Component<IconBaseProps, any> { }
+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
index 2cf41fe816..e7e66850e4 100644
--- a/types/react-icons/md/network-locked.d.ts
+++ b/types/react-icons/md/network-locked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkLocked extends React.Component<IconBaseProps, any> { }
+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
index 2548051458..2c9097fc57 100644
--- a/types/react-icons/md/network-wifi.d.ts
+++ b/types/react-icons/md/network-wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNetworkWifi extends React.Component<IconBaseProps, any> { }
+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
index 2d6f452868..4ff4c3e21f 100644
--- a/types/react-icons/md/new-releases.d.ts
+++ b/types/react-icons/md/new-releases.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNewReleases extends React.Component<IconBaseProps, any> { }
+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
index dfc5f3cd21..4754bfc5c5 100644
--- a/types/react-icons/md/next-week.d.ts
+++ b/types/react-icons/md/next-week.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNextWeek extends React.Component<IconBaseProps, any> { }
+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
index 588d130b7a..521ad7fe89 100644
--- a/types/react-icons/md/nfc.d.ts
+++ b/types/react-icons/md/nfc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNfc extends React.Component<IconBaseProps, any> { }
+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
index c67a635fa2..038f3eef3f 100644
--- a/types/react-icons/md/no-encryption.d.ts
+++ b/types/react-icons/md/no-encryption.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoEncryption extends React.Component<IconBaseProps, any> { }
+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
index 31fd1e2711..09e6165201 100644
--- a/types/react-icons/md/no-sim.d.ts
+++ b/types/react-icons/md/no-sim.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoSim extends React.Component<IconBaseProps, any> { }
+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
index 69dbbdd087..a21c3ca574 100644
--- a/types/react-icons/md/not-interested.d.ts
+++ b/types/react-icons/md/not-interested.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotInterested extends React.Component<IconBaseProps, any> { }
+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
index 0d0b9d8c3f..7673a94b3c 100644
--- a/types/react-icons/md/note-add.d.ts
+++ b/types/react-icons/md/note-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNoteAdd extends React.Component<IconBaseProps, any> { }
+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
index 9e6d8928f9..757dfc63fc 100644
--- a/types/react-icons/md/note.d.ts
+++ b/types/react-icons/md/note.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNote extends React.Component<IconBaseProps, any> { }
+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
index cea54a0665..afb7f84483 100644
--- a/types/react-icons/md/notifications-active.d.ts
+++ b/types/react-icons/md/notifications-active.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsActive extends React.Component<IconBaseProps, any> { }
+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
index 8c6fbda4c0..d1667a5307 100644
--- a/types/react-icons/md/notifications-none.d.ts
+++ b/types/react-icons/md/notifications-none.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsNone extends React.Component<IconBaseProps, any> { }
+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
index c6f1dc9251..ea413b9d5c 100644
--- a/types/react-icons/md/notifications-off.d.ts
+++ b/types/react-icons/md/notifications-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsOff extends React.Component<IconBaseProps, any> { }
+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
index 2481a2166c..7181f702a7 100644
--- a/types/react-icons/md/notifications-paused.d.ts
+++ b/types/react-icons/md/notifications-paused.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotificationsPaused extends React.Component<IconBaseProps, any> { }
+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
index 92e986e634..14de6c4b4e 100644
--- a/types/react-icons/md/notifications.d.ts
+++ b/types/react-icons/md/notifications.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNotifications extends React.Component<IconBaseProps, any> { }
+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
index b75c54ab6b..076ec5c4bf 100644
--- a/types/react-icons/md/now-wallpaper.d.ts
+++ b/types/react-icons/md/now-wallpaper.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWallpaper extends React.Component<IconBaseProps, any> { }
+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
index ecb9b9b604..0242391941 100644
--- a/types/react-icons/md/now-widgets.d.ts
+++ b/types/react-icons/md/now-widgets.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdNowWidgets extends React.Component<IconBaseProps, any> { }
+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
index 442995366b..0c691eb46c 100644
--- a/types/react-icons/md/offline-pin.d.ts
+++ b/types/react-icons/md/offline-pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOfflinePin extends React.Component<IconBaseProps, any> { }
+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
index 82473c57ec..2abd212bc0 100644
--- a/types/react-icons/md/ondemand-video.d.ts
+++ b/types/react-icons/md/ondemand-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOndemandVideo extends React.Component<IconBaseProps, any> { }
+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
index 4afc6af1a4..abf5830ea6 100644
--- a/types/react-icons/md/opacity.d.ts
+++ b/types/react-icons/md/opacity.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpacity extends React.Component<IconBaseProps, any> { }
+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
index d538a2b9b5..52bb107a78 100644
--- a/types/react-icons/md/open-in-browser.d.ts
+++ b/types/react-icons/md/open-in-browser.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInBrowser extends React.Component<IconBaseProps, any> { }
+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
index c5a551ffdb..c9cdd9711c 100644
--- a/types/react-icons/md/open-in-new.d.ts
+++ b/types/react-icons/md/open-in-new.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenInNew extends React.Component<IconBaseProps, any> { }
+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
index 767f9801d0..400d1e0deb 100644
--- a/types/react-icons/md/open-with.d.ts
+++ b/types/react-icons/md/open-with.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdOpenWith extends React.Component<IconBaseProps, any> { }
+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
index d2c49f3c2e..6a156250cc 100644
--- a/types/react-icons/md/pages.d.ts
+++ b/types/react-icons/md/pages.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPages extends React.Component<IconBaseProps, any> { }
+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
index c6a94b8b8d..f69c0ee9f2 100644
--- a/types/react-icons/md/pageview.d.ts
+++ b/types/react-icons/md/pageview.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPageview extends React.Component<IconBaseProps, any> { }
+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
index 02154b0938..823c529566 100644
--- a/types/react-icons/md/palette.d.ts
+++ b/types/react-icons/md/palette.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPalette extends React.Component<IconBaseProps, any> { }
+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
index 92c8d3d629..b208116369 100644
--- a/types/react-icons/md/pan-tool.d.ts
+++ b/types/react-icons/md/pan-tool.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanTool extends React.Component<IconBaseProps, any> { }
+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
index 889b818ff7..29420599ae 100644
--- a/types/react-icons/md/panorama-fish-eye.d.ts
+++ b/types/react-icons/md/panorama-fish-eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaFishEye extends React.Component<IconBaseProps, any> { }
+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
index 9d3176fe7c..201fb72074 100644
--- a/types/react-icons/md/panorama-horizontal.d.ts
+++ b/types/react-icons/md/panorama-horizontal.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaHorizontal extends React.Component<IconBaseProps, any> { }
+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
index 7ebff2cff6..460041e27d 100644
--- a/types/react-icons/md/panorama-vertical.d.ts
+++ b/types/react-icons/md/panorama-vertical.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaVertical extends React.Component<IconBaseProps, any> { }
+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
index 323b2135eb..58bf2f6a41 100644
--- a/types/react-icons/md/panorama-wide-angle.d.ts
+++ b/types/react-icons/md/panorama-wide-angle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanoramaWideAngle extends React.Component<IconBaseProps, any> { }
+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
index a198d185e0..ce2631733d 100644
--- a/types/react-icons/md/panorama.d.ts
+++ b/types/react-icons/md/panorama.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPanorama extends React.Component<IconBaseProps, any> { }
+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
index 901398cbad..61270bf1f0 100644
--- a/types/react-icons/md/party-mode.d.ts
+++ b/types/react-icons/md/party-mode.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPartyMode extends React.Component<IconBaseProps, any> { }
+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
index 358614efa0..8dcc944037 100644
--- a/types/react-icons/md/pause-circle-filled.d.ts
+++ b/types/react-icons/md/pause-circle-filled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleFilled extends React.Component<IconBaseProps, any> { }
+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
index 46c5706dd8..c694731521 100644
--- a/types/react-icons/md/pause-circle-outline.d.ts
+++ b/types/react-icons/md/pause-circle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPauseCircleOutline extends React.Component<IconBaseProps, any> { }
+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
index 399a52a235..29d68353f7 100644
--- a/types/react-icons/md/pause.d.ts
+++ b/types/react-icons/md/pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPause extends React.Component<IconBaseProps, any> { }
+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
index 5bb343d50b..bd2439d38c 100644
--- a/types/react-icons/md/payment.d.ts
+++ b/types/react-icons/md/payment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPayment extends React.Component<IconBaseProps, any> { }
+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
index 1cd34aa9d8..88a012742e 100644
--- a/types/react-icons/md/people-outline.d.ts
+++ b/types/react-icons/md/people-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPeopleOutline extends React.Component<IconBaseProps, any> { }
+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
index c73b208504..75f9cbfe7e 100644
--- a/types/react-icons/md/people.d.ts
+++ b/types/react-icons/md/people.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPeople extends React.Component<IconBaseProps, any> { }
+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
index 9ddef9993f..a17acb8788 100644
--- a/types/react-icons/md/perm-camera-mic.d.ts
+++ b/types/react-icons/md/perm-camera-mic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermCameraMic extends React.Component<IconBaseProps, any> { }
+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
index 9edcccd99c..3b2105a7cf 100644
--- a/types/react-icons/md/perm-contact-calendar.d.ts
+++ b/types/react-icons/md/perm-contact-calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermContactCalendar extends React.Component<IconBaseProps, any> { }
+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
index eb52382e9a..18d108d14f 100644
--- a/types/react-icons/md/perm-data-setting.d.ts
+++ b/types/react-icons/md/perm-data-setting.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDataSetting extends React.Component<IconBaseProps, any> { }
+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
index 3dd46f3475..db2dfcc07b 100644
--- a/types/react-icons/md/perm-device-information.d.ts
+++ b/types/react-icons/md/perm-device-information.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermDeviceInformation extends React.Component<IconBaseProps, any> { }
+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
index cb76c79062..d56d0b3c37 100644
--- a/types/react-icons/md/perm-identity.d.ts
+++ b/types/react-icons/md/perm-identity.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermIdentity extends React.Component<IconBaseProps, any> { }
+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
index dfdba65852..36f4bee6a7 100644
--- a/types/react-icons/md/perm-media.d.ts
+++ b/types/react-icons/md/perm-media.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermMedia extends React.Component<IconBaseProps, any> { }
+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
index 07dcfb1c5e..6352e415a6 100644
--- a/types/react-icons/md/perm-phone-msg.d.ts
+++ b/types/react-icons/md/perm-phone-msg.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermPhoneMsg extends React.Component<IconBaseProps, any> { }
+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
index a2a86e6776..20bb1186e4 100644
--- a/types/react-icons/md/perm-scan-wifi.d.ts
+++ b/types/react-icons/md/perm-scan-wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPermScanWifi extends React.Component<IconBaseProps, any> { }
+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
index 7d2e749577..12887556b7 100644
--- a/types/react-icons/md/person-add.d.ts
+++ b/types/react-icons/md/person-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonAdd extends React.Component<IconBaseProps, any> { }
+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
index a9b4afe379..fe49015f3f 100644
--- a/types/react-icons/md/person-outline.d.ts
+++ b/types/react-icons/md/person-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonOutline extends React.Component<IconBaseProps, any> { }
+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
index f84ff2e6e6..a26c822211 100644
--- a/types/react-icons/md/person-pin-circle.d.ts
+++ b/types/react-icons/md/person-pin-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPinCircle extends React.Component<IconBaseProps, any> { }
+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
index 7bdbf324d6..ab1aa735eb 100644
--- a/types/react-icons/md/person-pin.d.ts
+++ b/types/react-icons/md/person-pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonPin extends React.Component<IconBaseProps, any> { }
+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
index 07b5b474ab..bcae2bbac8 100644
--- a/types/react-icons/md/person.d.ts
+++ b/types/react-icons/md/person.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPerson extends React.Component<IconBaseProps, any> { }
+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
index 74eb4788e1..0fece81d04 100644
--- a/types/react-icons/md/personal-video.d.ts
+++ b/types/react-icons/md/personal-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPersonalVideo extends React.Component<IconBaseProps, any> { }
+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
index 9c7585111f..94bc0005e8 100644
--- a/types/react-icons/md/pets.d.ts
+++ b/types/react-icons/md/pets.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPets extends React.Component<IconBaseProps, any> { }
+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
index 3abcd74f6a..aa43921b51 100644
--- a/types/react-icons/md/phone-android.d.ts
+++ b/types/react-icons/md/phone-android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneAndroid extends React.Component<IconBaseProps, any> { }
+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
index 44c932d0fa..08e2cd6791 100644
--- a/types/react-icons/md/phone-bluetooth-speaker.d.ts
+++ b/types/react-icons/md/phone-bluetooth-speaker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneBluetoothSpeaker extends React.Component<IconBaseProps, any> { }
+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
index 70393e96b0..8363d7e3ec 100644
--- a/types/react-icons/md/phone-forwarded.d.ts
+++ b/types/react-icons/md/phone-forwarded.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneForwarded extends React.Component<IconBaseProps, any> { }
+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
index 954fd3522a..430f87b4e4 100644
--- a/types/react-icons/md/phone-in-talk.d.ts
+++ b/types/react-icons/md/phone-in-talk.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneInTalk extends React.Component<IconBaseProps, any> { }
+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
index abcf8a6c0a..8704ae8ad4 100644
--- a/types/react-icons/md/phone-iphone.d.ts
+++ b/types/react-icons/md/phone-iphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneIphone extends React.Component<IconBaseProps, any> { }
+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
index 50fc580bd4..68ca6e9376 100644
--- a/types/react-icons/md/phone-locked.d.ts
+++ b/types/react-icons/md/phone-locked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneLocked extends React.Component<IconBaseProps, any> { }
+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
index 52cce117bc..91b97ca8e9 100644
--- a/types/react-icons/md/phone-missed.d.ts
+++ b/types/react-icons/md/phone-missed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoneMissed extends React.Component<IconBaseProps, any> { }
+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
index f742c87fbc..ba3f998fd8 100644
--- a/types/react-icons/md/phone-paused.d.ts
+++ b/types/react-icons/md/phone-paused.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonePaused extends React.Component<IconBaseProps, any> { }
+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
index 16976e4c1c..6318cdc39d 100644
--- a/types/react-icons/md/phone.d.ts
+++ b/types/react-icons/md/phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhone extends React.Component<IconBaseProps, any> { }
+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
index 40eebe4f1b..b0cbec1c39 100644
--- a/types/react-icons/md/phonelink-erase.d.ts
+++ b/types/react-icons/md/phonelink-erase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkErase extends React.Component<IconBaseProps, any> { }
+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
index fc88cec5d8..5bb479ddc0 100644
--- a/types/react-icons/md/phonelink-lock.d.ts
+++ b/types/react-icons/md/phonelink-lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkLock extends React.Component<IconBaseProps, any> { }
+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
index 02075a1816..ec245ecd6f 100644
--- a/types/react-icons/md/phonelink-off.d.ts
+++ b/types/react-icons/md/phonelink-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkOff extends React.Component<IconBaseProps, any> { }
+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
index 36ca991c8a..f14d93a479 100644
--- a/types/react-icons/md/phonelink-ring.d.ts
+++ b/types/react-icons/md/phonelink-ring.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkRing extends React.Component<IconBaseProps, any> { }
+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
index 6fe555bb81..dd21188bb5 100644
--- a/types/react-icons/md/phonelink-setup.d.ts
+++ b/types/react-icons/md/phonelink-setup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelinkSetup extends React.Component<IconBaseProps, any> { }
+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
index f5dd1b3c70..6aa5af39d7 100644
--- a/types/react-icons/md/phonelink.d.ts
+++ b/types/react-icons/md/phonelink.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhonelink extends React.Component<IconBaseProps, any> { }
+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
index bdd73fea46..116f8b1ff6 100644
--- a/types/react-icons/md/photo-album.d.ts
+++ b/types/react-icons/md/photo-album.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoAlbum extends React.Component<IconBaseProps, any> { }
+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
index b603514992..9ca8814377 100644
--- a/types/react-icons/md/photo-camera.d.ts
+++ b/types/react-icons/md/photo-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoCamera extends React.Component<IconBaseProps, any> { }
+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
index 3ac41e2bec..e2b37a4b91 100644
--- a/types/react-icons/md/photo-filter.d.ts
+++ b/types/react-icons/md/photo-filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoFilter extends React.Component<IconBaseProps, any> { }
+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
index 4810520470..3ec4c29cac 100644
--- a/types/react-icons/md/photo-library.d.ts
+++ b/types/react-icons/md/photo-library.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoLibrary extends React.Component<IconBaseProps, any> { }
+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
index e425eadf98..15e1777cf0 100644
--- a/types/react-icons/md/photo-size-select-actual.d.ts
+++ b/types/react-icons/md/photo-size-select-actual.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectActual extends React.Component<IconBaseProps, any> { }
+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
index d2b821c99a..56025586af 100644
--- a/types/react-icons/md/photo-size-select-large.d.ts
+++ b/types/react-icons/md/photo-size-select-large.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectLarge extends React.Component<IconBaseProps, any> { }
+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
index 60a484f9b7..f1a2547ff6 100644
--- a/types/react-icons/md/photo-size-select-small.d.ts
+++ b/types/react-icons/md/photo-size-select-small.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhotoSizeSelectSmall extends React.Component<IconBaseProps, any> { }
+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
index 6227e4d9f4..3af5e8d6b9 100644
--- a/types/react-icons/md/photo.d.ts
+++ b/types/react-icons/md/photo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPhoto extends React.Component<IconBaseProps, any> { }
+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
index c3057c479e..06fd1dfb31 100644
--- a/types/react-icons/md/picture-as-pdf.d.ts
+++ b/types/react-icons/md/picture-as-pdf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureAsPdf extends React.Component<IconBaseProps, any> { }
+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
index f5b52505e2..41a6b03404 100644
--- a/types/react-icons/md/picture-in-picture-alt.d.ts
+++ b/types/react-icons/md/picture-in-picture-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPictureAlt extends React.Component<IconBaseProps, any> { }
+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
index 303130d313..e174bddfd7 100644
--- a/types/react-icons/md/picture-in-picture.d.ts
+++ b/types/react-icons/md/picture-in-picture.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPictureInPicture extends React.Component<IconBaseProps, any> { }
+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
index 1d3e81d48e..8fdaa68aee 100644
--- a/types/react-icons/md/pie-chart-outlined.d.ts
+++ b/types/react-icons/md/pie-chart-outlined.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChartOutlined extends React.Component<IconBaseProps, any> { }
+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
index a0cdd6e050..bf0203c4d9 100644
--- a/types/react-icons/md/pie-chart.d.ts
+++ b/types/react-icons/md/pie-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPieChart extends React.Component<IconBaseProps, any> { }
+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
index 5d8a7486a3..b1511912aa 100644
--- a/types/react-icons/md/pin-drop.d.ts
+++ b/types/react-icons/md/pin-drop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPinDrop extends React.Component<IconBaseProps, any> { }
+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
index 14a444efc7..6e7bc9f83d 100644
--- a/types/react-icons/md/place.d.ts
+++ b/types/react-icons/md/place.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlace extends React.Component<IconBaseProps, any> { }
+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
index 44f2932f8d..34eeedbfc9 100644
--- a/types/react-icons/md/play-arrow.d.ts
+++ b/types/react-icons/md/play-arrow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayArrow extends React.Component<IconBaseProps, any> { }
+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
index 978917b487..a952747a1f 100644
--- a/types/react-icons/md/play-circle-filled.d.ts
+++ b/types/react-icons/md/play-circle-filled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleFilled extends React.Component<IconBaseProps, any> { }
+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
index edf0d234fa..e75083c2f3 100644
--- a/types/react-icons/md/play-circle-outline.d.ts
+++ b/types/react-icons/md/play-circle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayCircleOutline extends React.Component<IconBaseProps, any> { }
+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
index 6634d073fe..4bb94a94b0 100644
--- a/types/react-icons/md/play-for-work.d.ts
+++ b/types/react-icons/md/play-for-work.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlayForWork extends React.Component<IconBaseProps, any> { }
+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
index b94dd71ee3..6b71a3b8c0 100644
--- a/types/react-icons/md/playlist-add-check.d.ts
+++ b/types/react-icons/md/playlist-add-check.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAddCheck extends React.Component<IconBaseProps, any> { }
+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
index a38927db0c..6cd4bf46e6 100644
--- a/types/react-icons/md/playlist-add.d.ts
+++ b/types/react-icons/md/playlist-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistAdd extends React.Component<IconBaseProps, any> { }
+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
index 0c59750d1d..1bbf520f44 100644
--- a/types/react-icons/md/playlist-play.d.ts
+++ b/types/react-icons/md/playlist-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlaylistPlay extends React.Component<IconBaseProps, any> { }
+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
index be2d60cd6c..1237985ba5 100644
--- a/types/react-icons/md/plus-one.d.ts
+++ b/types/react-icons/md/plus-one.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPlusOne extends React.Component<IconBaseProps, any> { }
+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
index 39d0dde06d..e0d456a28a 100644
--- a/types/react-icons/md/poll.d.ts
+++ b/types/react-icons/md/poll.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPoll extends React.Component<IconBaseProps, any> { }
+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
index b928bd8db7..6ff9e004b4 100644
--- a/types/react-icons/md/polymer.d.ts
+++ b/types/react-icons/md/polymer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPolymer extends React.Component<IconBaseProps, any> { }
+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
index 221c57e3e7..933c4f1448 100644
--- a/types/react-icons/md/pool.d.ts
+++ b/types/react-icons/md/pool.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPool extends React.Component<IconBaseProps, any> { }
+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
index 4d5e968e35..b3bdd30ff8 100644
--- a/types/react-icons/md/portable-wifi-off.d.ts
+++ b/types/react-icons/md/portable-wifi-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPortableWifiOff extends React.Component<IconBaseProps, any> { }
+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
index c0b9d85ca4..1e9b2f717e 100644
--- a/types/react-icons/md/portrait.d.ts
+++ b/types/react-icons/md/portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPortrait extends React.Component<IconBaseProps, any> { }
+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
index 1bbebc1afc..71f89e9e40 100644
--- a/types/react-icons/md/power-input.d.ts
+++ b/types/react-icons/md/power-input.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerInput extends React.Component<IconBaseProps, any> { }
+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
index e38a26d719..69221c9111 100644
--- a/types/react-icons/md/power-settings-new.d.ts
+++ b/types/react-icons/md/power-settings-new.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPowerSettingsNew extends React.Component<IconBaseProps, any> { }
+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
index c49e47f193..106471c2a5 100644
--- a/types/react-icons/md/power.d.ts
+++ b/types/react-icons/md/power.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPower extends React.Component<IconBaseProps, any> { }
+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
index e777fca01d..9e88eab156 100644
--- a/types/react-icons/md/pregnant-woman.d.ts
+++ b/types/react-icons/md/pregnant-woman.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPregnantWoman extends React.Component<IconBaseProps, any> { }
+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
index 6d66c6cb49..b88c9a45d2 100644
--- a/types/react-icons/md/present-to-all.d.ts
+++ b/types/react-icons/md/present-to-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPresentToAll extends React.Component<IconBaseProps, any> { }
+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
index 31a38f2a3c..74d6db2f37 100644
--- a/types/react-icons/md/print.d.ts
+++ b/types/react-icons/md/print.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPrint extends React.Component<IconBaseProps, any> { }
+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
index a31076c48e..56c1354dae 100644
--- a/types/react-icons/md/priority-high.d.ts
+++ b/types/react-icons/md/priority-high.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPriorityHigh extends React.Component<IconBaseProps, any> { }
+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
index 28c7a2dc8b..1615661bab 100644
--- a/types/react-icons/md/public.d.ts
+++ b/types/react-icons/md/public.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPublic extends React.Component<IconBaseProps, any> { }
+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
index ab8509e1d4..76aae7f48b 100644
--- a/types/react-icons/md/publish.d.ts
+++ b/types/react-icons/md/publish.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdPublish extends React.Component<IconBaseProps, any> { }
+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
index 4821d475df..3607cbf408 100644
--- a/types/react-icons/md/query-builder.d.ts
+++ b/types/react-icons/md/query-builder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueryBuilder extends React.Component<IconBaseProps, any> { }
+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
index 70b6400bea..b88cd376d0 100644
--- a/types/react-icons/md/question-answer.d.ts
+++ b/types/react-icons/md/question-answer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQuestionAnswer extends React.Component<IconBaseProps, any> { }
+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
index 62bf119b62..0a9a451291 100644
--- a/types/react-icons/md/queue-music.d.ts
+++ b/types/react-icons/md/queue-music.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueueMusic extends React.Component<IconBaseProps, any> { }
+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
index 99fe1090ce..4540a71df0 100644
--- a/types/react-icons/md/queue-play-next.d.ts
+++ b/types/react-icons/md/queue-play-next.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueuePlayNext extends React.Component<IconBaseProps, any> { }
+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
index 2649feba26..80b27a7f8a 100644
--- a/types/react-icons/md/queue.d.ts
+++ b/types/react-icons/md/queue.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdQueue extends React.Component<IconBaseProps, any> { }
+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
index 58f3375377..dfa06080e6 100644
--- a/types/react-icons/md/radio-button-checked.d.ts
+++ b/types/react-icons/md/radio-button-checked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonChecked extends React.Component<IconBaseProps, any> { }
+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
index faab044d52..b154b71305 100644
--- a/types/react-icons/md/radio-button-unchecked.d.ts
+++ b/types/react-icons/md/radio-button-unchecked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadioButtonUnchecked extends React.Component<IconBaseProps, any> { }
+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
index 978f1bb6eb..bd53fd4f03 100644
--- a/types/react-icons/md/radio.d.ts
+++ b/types/react-icons/md/radio.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRadio extends React.Component<IconBaseProps, any> { }
+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
index bfdd3d6ca0..6de3f28785 100644
--- a/types/react-icons/md/rate-review.d.ts
+++ b/types/react-icons/md/rate-review.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRateReview extends React.Component<IconBaseProps, any> { }
+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
index 50c15a2b68..1b781c04c7 100644
--- a/types/react-icons/md/receipt.d.ts
+++ b/types/react-icons/md/receipt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReceipt extends React.Component<IconBaseProps, any> { }
+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
index 2612679b45..cfcf0432b5 100644
--- a/types/react-icons/md/recent-actors.d.ts
+++ b/types/react-icons/md/recent-actors.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRecentActors extends React.Component<IconBaseProps, any> { }
+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
index 996540dbcc..ab9b2189b8 100644
--- a/types/react-icons/md/record-voice-over.d.ts
+++ b/types/react-icons/md/record-voice-over.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRecordVoiceOver extends React.Component<IconBaseProps, any> { }
+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
index 62d4c5212b..7690d10236 100644
--- a/types/react-icons/md/redeem.d.ts
+++ b/types/react-icons/md/redeem.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRedeem extends React.Component<IconBaseProps, any> { }
+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
index b9bcedfd5b..3e0e1fac51 100644
--- a/types/react-icons/md/redo.d.ts
+++ b/types/react-icons/md/redo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRedo extends React.Component<IconBaseProps, any> { }
+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
index 43d31af064..f037c2a972 100644
--- a/types/react-icons/md/refresh.d.ts
+++ b/types/react-icons/md/refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRefresh extends React.Component<IconBaseProps, any> { }
+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
index 880f0c7885..3488b16e2a 100644
--- a/types/react-icons/md/remove-circle-outline.d.ts
+++ b/types/react-icons/md/remove-circle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircleOutline extends React.Component<IconBaseProps, any> { }
+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
index 0f2d8bcb2e..77d8b1db6c 100644
--- a/types/react-icons/md/remove-circle.d.ts
+++ b/types/react-icons/md/remove-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveCircle extends React.Component<IconBaseProps, any> { }
+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
index 761084d25c..05299a588f 100644
--- a/types/react-icons/md/remove-from-queue.d.ts
+++ b/types/react-icons/md/remove-from-queue.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveFromQueue extends React.Component<IconBaseProps, any> { }
+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
index d4dd0744a7..8f839358ba 100644
--- a/types/react-icons/md/remove-red-eye.d.ts
+++ b/types/react-icons/md/remove-red-eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveRedEye extends React.Component<IconBaseProps, any> { }
+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
index e301f58023..2715486aea 100644
--- a/types/react-icons/md/remove-shopping-cart.d.ts
+++ b/types/react-icons/md/remove-shopping-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemoveShoppingCart extends React.Component<IconBaseProps, any> { }
+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
index cabb45226b..9522f25fe9 100644
--- a/types/react-icons/md/remove.d.ts
+++ b/types/react-icons/md/remove.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRemove extends React.Component<IconBaseProps, any> { }
+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
index 968e7461d8..9f24bc5ed5 100644
--- a/types/react-icons/md/reorder.d.ts
+++ b/types/react-icons/md/reorder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReorder extends React.Component<IconBaseProps, any> { }
+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
index 1838c1bafb..74a3642bf5 100644
--- a/types/react-icons/md/repeat-one.d.ts
+++ b/types/react-icons/md/repeat-one.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeatOne extends React.Component<IconBaseProps, any> { }
+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
index ca3fb2fadb..e1d7352ab9 100644
--- a/types/react-icons/md/repeat.d.ts
+++ b/types/react-icons/md/repeat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRepeat extends React.Component<IconBaseProps, any> { }
+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
index 9f19e05b8d..3d9f3ef0c4 100644
--- a/types/react-icons/md/replay-10.d.ts
+++ b/types/react-icons/md/replay-10.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay10 extends React.Component<IconBaseProps, any> { }
+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
index d33d97388c..402af551ba 100644
--- a/types/react-icons/md/replay-30.d.ts
+++ b/types/react-icons/md/replay-30.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay30 extends React.Component<IconBaseProps, any> { }
+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
index 36568215a5..78905ba50c 100644
--- a/types/react-icons/md/replay-5.d.ts
+++ b/types/react-icons/md/replay-5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay5 extends React.Component<IconBaseProps, any> { }
+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
index ba85efeb8c..47d8592a3d 100644
--- a/types/react-icons/md/replay.d.ts
+++ b/types/react-icons/md/replay.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplay extends React.Component<IconBaseProps, any> { }
+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
index 06bfdb353f..07aa5f01f2 100644
--- a/types/react-icons/md/reply-all.d.ts
+++ b/types/react-icons/md/reply-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReplyAll extends React.Component<IconBaseProps, any> { }
+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
index 48fec57192..648de11ef1 100644
--- a/types/react-icons/md/reply.d.ts
+++ b/types/react-icons/md/reply.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReply extends React.Component<IconBaseProps, any> { }
+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
index 70785f7746..c3dbf0101a 100644
--- a/types/react-icons/md/report-problem.d.ts
+++ b/types/react-icons/md/report-problem.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReportProblem extends React.Component<IconBaseProps, any> { }
+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
index 7ab06eec14..af51419c00 100644
--- a/types/react-icons/md/report.d.ts
+++ b/types/react-icons/md/report.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdReport extends React.Component<IconBaseProps, any> { }
+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
index e3666cf1d1..306891c857 100644
--- a/types/react-icons/md/restaurant-menu.d.ts
+++ b/types/react-icons/md/restaurant-menu.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurantMenu extends React.Component<IconBaseProps, any> { }
+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
index 130cbaf241..5adc8e8712 100644
--- a/types/react-icons/md/restaurant.d.ts
+++ b/types/react-icons/md/restaurant.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestaurant extends React.Component<IconBaseProps, any> { }
+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
index 3b4bc65be8..d836b1f669 100644
--- a/types/react-icons/md/restore-page.d.ts
+++ b/types/react-icons/md/restore-page.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestorePage extends React.Component<IconBaseProps, any> { }
+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
index 0a56ebcbda..aaadca1e08 100644
--- a/types/react-icons/md/restore.d.ts
+++ b/types/react-icons/md/restore.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRestore extends React.Component<IconBaseProps, any> { }
+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
index 0bbeddd053..41843c29bd 100644
--- a/types/react-icons/md/ring-volume.d.ts
+++ b/types/react-icons/md/ring-volume.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRingVolume extends React.Component<IconBaseProps, any> { }
+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
index 69dc2faf57..4b69032332 100644
--- a/types/react-icons/md/room-service.d.ts
+++ b/types/react-icons/md/room-service.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoomService extends React.Component<IconBaseProps, any> { }
+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
index 3eb44c5629..49ab4cae8d 100644
--- a/types/react-icons/md/room.d.ts
+++ b/types/react-icons/md/room.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoom extends React.Component<IconBaseProps, any> { }
+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
index 36735fc539..ba2f85b1e2 100644
--- a/types/react-icons/md/rotate-90-degrees-ccw.d.ts
+++ b/types/react-icons/md/rotate-90-degrees-ccw.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotate90DegreesCcw extends React.Component<IconBaseProps, any> { }
+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
index 3f15bb984f..493c21cd47 100644
--- a/types/react-icons/md/rotate-left.d.ts
+++ b/types/react-icons/md/rotate-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateLeft extends React.Component<IconBaseProps, any> { }
+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
index 60bcea4578..936625527b 100644
--- a/types/react-icons/md/rotate-right.d.ts
+++ b/types/react-icons/md/rotate-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRotateRight extends React.Component<IconBaseProps, any> { }
+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
index dfd1db48e1..592818db46 100644
--- a/types/react-icons/md/rounded-corner.d.ts
+++ b/types/react-icons/md/rounded-corner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRoundedCorner extends React.Component<IconBaseProps, any> { }
+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
index d047429e43..71effffe25 100644
--- a/types/react-icons/md/router.d.ts
+++ b/types/react-icons/md/router.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRouter extends React.Component<IconBaseProps, any> { }
+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
index c0b4cc96e2..66d50957df 100644
--- a/types/react-icons/md/rowing.d.ts
+++ b/types/react-icons/md/rowing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRowing extends React.Component<IconBaseProps, any> { }
+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
index 0777a75942..857453af7d 100644
--- a/types/react-icons/md/rss-feed.d.ts
+++ b/types/react-icons/md/rss-feed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRssFeed extends React.Component<IconBaseProps, any> { }
+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
index af874296f7..6b3f6b3a67 100644
--- a/types/react-icons/md/rv-hookup.d.ts
+++ b/types/react-icons/md/rv-hookup.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdRvHookup extends React.Component<IconBaseProps, any> { }
+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
index b280ed16b6..1371e50a1d 100644
--- a/types/react-icons/md/satellite.d.ts
+++ b/types/react-icons/md/satellite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSatellite extends React.Component<IconBaseProps, any> { }
+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
index fef4cd60c2..f3aa747a5a 100644
--- a/types/react-icons/md/save.d.ts
+++ b/types/react-icons/md/save.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSave extends React.Component<IconBaseProps, any> { }
+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
index 119c02dbaa..db18a8c57b 100644
--- a/types/react-icons/md/scanner.d.ts
+++ b/types/react-icons/md/scanner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScanner extends React.Component<IconBaseProps, any> { }
+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
index c8617ccec7..e85dac4d66 100644
--- a/types/react-icons/md/schedule.d.ts
+++ b/types/react-icons/md/schedule.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSchedule extends React.Component<IconBaseProps, any> { }
+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
index 2f6262d110..ec9ad586c7 100644
--- a/types/react-icons/md/school.d.ts
+++ b/types/react-icons/md/school.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSchool extends React.Component<IconBaseProps, any> { }
+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
index 8a2c142624..8bd82ab85e 100644
--- a/types/react-icons/md/screen-lock-landscape.d.ts
+++ b/types/react-icons/md/screen-lock-landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockLandscape extends React.Component<IconBaseProps, any> { }
+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
index 8a18707b55..4439deda82 100644
--- a/types/react-icons/md/screen-lock-portrait.d.ts
+++ b/types/react-icons/md/screen-lock-portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockPortrait extends React.Component<IconBaseProps, any> { }
+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
index 71e5f72327..7edd36c10d 100644
--- a/types/react-icons/md/screen-lock-rotation.d.ts
+++ b/types/react-icons/md/screen-lock-rotation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenLockRotation extends React.Component<IconBaseProps, any> { }
+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
index d75e0d7427..ac2cd107e2 100644
--- a/types/react-icons/md/screen-rotation.d.ts
+++ b/types/react-icons/md/screen-rotation.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenRotation extends React.Component<IconBaseProps, any> { }
+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
index ca6383e7f5..1c6e5f8f3f 100644
--- a/types/react-icons/md/screen-share.d.ts
+++ b/types/react-icons/md/screen-share.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdScreenShare extends React.Component<IconBaseProps, any> { }
+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
index 92a2013283..fbf66bc8ae 100644
--- a/types/react-icons/md/sd-card.d.ts
+++ b/types/react-icons/md/sd-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSdCard extends React.Component<IconBaseProps, any> { }
+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
index 399570723b..645f26b009 100644
--- a/types/react-icons/md/sd-storage.d.ts
+++ b/types/react-icons/md/sd-storage.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSdStorage extends React.Component<IconBaseProps, any> { }
+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
index 2ea2cea0a3..4c4f7aafeb 100644
--- a/types/react-icons/md/search.d.ts
+++ b/types/react-icons/md/search.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSearch extends React.Component<IconBaseProps, any> { }
+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
index ea223476bf..ffeffbbfeb 100644
--- a/types/react-icons/md/security.d.ts
+++ b/types/react-icons/md/security.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSecurity extends React.Component<IconBaseProps, any> { }
+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
index 9516558447..e8d8ba116a 100644
--- a/types/react-icons/md/select-all.d.ts
+++ b/types/react-icons/md/select-all.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSelectAll extends React.Component<IconBaseProps, any> { }
+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
index af0c9a3df8..a643cfddfa 100644
--- a/types/react-icons/md/send.d.ts
+++ b/types/react-icons/md/send.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSend extends React.Component<IconBaseProps, any> { }
+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
index 6e0000e986..e5e989d5ad 100644
--- a/types/react-icons/md/sentiment-dissatisfied.d.ts
+++ b/types/react-icons/md/sentiment-dissatisfied.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentDissatisfied extends React.Component<IconBaseProps, any> { }
+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
index fce36aa42a..ea95a02aea 100644
--- a/types/react-icons/md/sentiment-neutral.d.ts
+++ b/types/react-icons/md/sentiment-neutral.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentNeutral extends React.Component<IconBaseProps, any> { }
+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
index 638f37d4f4..ff9ba41c7e 100644
--- a/types/react-icons/md/sentiment-satisfied.d.ts
+++ b/types/react-icons/md/sentiment-satisfied.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentSatisfied extends React.Component<IconBaseProps, any> { }
+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
index 8397566e59..9e26b053fc 100644
--- a/types/react-icons/md/sentiment-very-dissatisfied.d.ts
+++ b/types/react-icons/md/sentiment-very-dissatisfied.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVeryDissatisfied extends React.Component<IconBaseProps, any> { }
+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
index 1833efd160..570e358c3a 100644
--- a/types/react-icons/md/sentiment-very-satisfied.d.ts
+++ b/types/react-icons/md/sentiment-very-satisfied.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSentimentVerySatisfied extends React.Component<IconBaseProps, any> { }
+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
index e5c217c942..75223b6af8 100644
--- a/types/react-icons/md/settings-applications.d.ts
+++ b/types/react-icons/md/settings-applications.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsApplications extends React.Component<IconBaseProps, any> { }
+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
index aae62cc2d6..beeec5199f 100644
--- a/types/react-icons/md/settings-backup-restore.d.ts
+++ b/types/react-icons/md/settings-backup-restore.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBackupRestore extends React.Component<IconBaseProps, any> { }
+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
index c86db5ca74..0f295f3c78 100644
--- a/types/react-icons/md/settings-bluetooth.d.ts
+++ b/types/react-icons/md/settings-bluetooth.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBluetooth extends React.Component<IconBaseProps, any> { }
+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
index a793f8d921..41c1e8360f 100644
--- a/types/react-icons/md/settings-brightness.d.ts
+++ b/types/react-icons/md/settings-brightness.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsBrightness extends React.Component<IconBaseProps, any> { }
+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
index 4b0628b58c..620d7e1fe5 100644
--- a/types/react-icons/md/settings-cell.d.ts
+++ b/types/react-icons/md/settings-cell.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsCell extends React.Component<IconBaseProps, any> { }
+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
index 531e528c16..c610f8ec24 100644
--- a/types/react-icons/md/settings-ethernet.d.ts
+++ b/types/react-icons/md/settings-ethernet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsEthernet extends React.Component<IconBaseProps, any> { }
+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
index 6da23fc7fc..f19536a4cb 100644
--- a/types/react-icons/md/settings-input-antenna.d.ts
+++ b/types/react-icons/md/settings-input-antenna.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputAntenna extends React.Component<IconBaseProps, any> { }
+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
index f695f575e5..e1fe37ccdf 100644
--- a/types/react-icons/md/settings-input-component.d.ts
+++ b/types/react-icons/md/settings-input-component.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComponent extends React.Component<IconBaseProps, any> { }
+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
index 15015a6039..266f9969fb 100644
--- a/types/react-icons/md/settings-input-composite.d.ts
+++ b/types/react-icons/md/settings-input-composite.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputComposite extends React.Component<IconBaseProps, any> { }
+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
index 91ba50efb9..be910d9b17 100644
--- a/types/react-icons/md/settings-input-hdmi.d.ts
+++ b/types/react-icons/md/settings-input-hdmi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputHdmi extends React.Component<IconBaseProps, any> { }
+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
index 4a30141a06..d9254b4996 100644
--- a/types/react-icons/md/settings-input-svideo.d.ts
+++ b/types/react-icons/md/settings-input-svideo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsInputSvideo extends React.Component<IconBaseProps, any> { }
+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
index ce648342a1..c74ed6c60b 100644
--- a/types/react-icons/md/settings-overscan.d.ts
+++ b/types/react-icons/md/settings-overscan.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsOverscan extends React.Component<IconBaseProps, any> { }
+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
index 48643c50c4..a24ed75c1a 100644
--- a/types/react-icons/md/settings-phone.d.ts
+++ b/types/react-icons/md/settings-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPhone extends React.Component<IconBaseProps, any> { }
+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
index 88a1c9ab0e..f93530a007 100644
--- a/types/react-icons/md/settings-power.d.ts
+++ b/types/react-icons/md/settings-power.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsPower extends React.Component<IconBaseProps, any> { }
+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
index a677ed0079..19720afb98 100644
--- a/types/react-icons/md/settings-remote.d.ts
+++ b/types/react-icons/md/settings-remote.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsRemote extends React.Component<IconBaseProps, any> { }
+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
index 0ec5ab48a3..654c1666d7 100644
--- a/types/react-icons/md/settings-system-daydream.d.ts
+++ b/types/react-icons/md/settings-system-daydream.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsSystemDaydream extends React.Component<IconBaseProps, any> { }
+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
index 4929d9917d..2ca59f4b0b 100644
--- a/types/react-icons/md/settings-voice.d.ts
+++ b/types/react-icons/md/settings-voice.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettingsVoice extends React.Component<IconBaseProps, any> { }
+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
index 78f4cab998..2117b4be55 100644
--- a/types/react-icons/md/settings.d.ts
+++ b/types/react-icons/md/settings.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSettings extends React.Component<IconBaseProps, any> { }
+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
index 35d60c7771..5a6639be86 100644
--- a/types/react-icons/md/share.d.ts
+++ b/types/react-icons/md/share.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShare extends React.Component<IconBaseProps, any> { }
+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
index 5e257fc2cf..ffd2e40d8a 100644
--- a/types/react-icons/md/shop-two.d.ts
+++ b/types/react-icons/md/shop-two.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShopTwo extends React.Component<IconBaseProps, any> { }
+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
index 7da1c7046f..0247f8919e 100644
--- a/types/react-icons/md/shop.d.ts
+++ b/types/react-icons/md/shop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShop extends React.Component<IconBaseProps, any> { }
+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
index e68591ccec..ce58316185 100644
--- a/types/react-icons/md/shopping-basket.d.ts
+++ b/types/react-icons/md/shopping-basket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingBasket extends React.Component<IconBaseProps, any> { }
+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
index af645eec26..2980434fd6 100644
--- a/types/react-icons/md/shopping-cart.d.ts
+++ b/types/react-icons/md/shopping-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShoppingCart extends React.Component<IconBaseProps, any> { }
+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
index 8d911c44c5..66c49133ba 100644
--- a/types/react-icons/md/short-text.d.ts
+++ b/types/react-icons/md/short-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShortText extends React.Component<IconBaseProps, any> { }
+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
index 9d9d75e44d..4fc9b77c9e 100644
--- a/types/react-icons/md/show-chart.d.ts
+++ b/types/react-icons/md/show-chart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShowChart extends React.Component<IconBaseProps, any> { }
+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
index 779d232583..b20fd0302e 100644
--- a/types/react-icons/md/shuffle.d.ts
+++ b/types/react-icons/md/shuffle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdShuffle extends React.Component<IconBaseProps, any> { }
+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
index 3b577342cc..9961d076e8 100644
--- a/types/react-icons/md/signal-cellular-4-bar.d.ts
+++ b/types/react-icons/md/signal-cellular-4-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellular4Bar extends React.Component<IconBaseProps, any> { }
+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
index 18516f7e87..35546b90db 100644
--- 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
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularConnectedNoInternet4Bar extends React.Component<IconBaseProps, any> { }
+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
index 737495b9d1..37c952ef33 100644
--- a/types/react-icons/md/signal-cellular-no-sim.d.ts
+++ b/types/react-icons/md/signal-cellular-no-sim.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNoSim extends React.Component<IconBaseProps, any> { }
+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
index 7f9723b3ec..81c4801bac 100644
--- a/types/react-icons/md/signal-cellular-null.d.ts
+++ b/types/react-icons/md/signal-cellular-null.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularNull extends React.Component<IconBaseProps, any> { }
+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
index 68faa8ba6b..71b723a036 100644
--- a/types/react-icons/md/signal-cellular-off.d.ts
+++ b/types/react-icons/md/signal-cellular-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalCellularOff extends React.Component<IconBaseProps, any> { }
+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
index 9279b47ea8..45689253f7 100644
--- a/types/react-icons/md/signal-wifi-4-bar-lock.d.ts
+++ b/types/react-icons/md/signal-wifi-4-bar-lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4BarLock extends React.Component<IconBaseProps, any> { }
+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
index eda23b08e7..9b90b1dc00 100644
--- a/types/react-icons/md/signal-wifi-4-bar.d.ts
+++ b/types/react-icons/md/signal-wifi-4-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifi4Bar extends React.Component<IconBaseProps, any> { }
+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
index 95d475aa1c..62c5ceee3c 100644
--- a/types/react-icons/md/signal-wifi-off.d.ts
+++ b/types/react-icons/md/signal-wifi-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSignalWifiOff extends React.Component<IconBaseProps, any> { }
+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
index 0bb89aa7b1..4060c4594e 100644
--- a/types/react-icons/md/sim-card-alert.d.ts
+++ b/types/react-icons/md/sim-card-alert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCardAlert extends React.Component<IconBaseProps, any> { }
+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
index 61c24e842d..da691e53ad 100644
--- a/types/react-icons/md/sim-card.d.ts
+++ b/types/react-icons/md/sim-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSimCard extends React.Component<IconBaseProps, any> { }
+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
index 291b4bbc74..ecf5c1dc78 100644
--- a/types/react-icons/md/skip-next.d.ts
+++ b/types/react-icons/md/skip-next.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipNext extends React.Component<IconBaseProps, any> { }
+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
index 968703aa68..93b71643d7 100644
--- a/types/react-icons/md/skip-previous.d.ts
+++ b/types/react-icons/md/skip-previous.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSkipPrevious extends React.Component<IconBaseProps, any> { }
+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
index d4e7399041..3604117de4 100644
--- a/types/react-icons/md/slideshow.d.ts
+++ b/types/react-icons/md/slideshow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSlideshow extends React.Component<IconBaseProps, any> { }
+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
index 7ad69e6c16..b1613e9196 100644
--- a/types/react-icons/md/slow-motion-video.d.ts
+++ b/types/react-icons/md/slow-motion-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSlowMotionVideo extends React.Component<IconBaseProps, any> { }
+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
index a31ea382a7..48e919a7f2 100644
--- a/types/react-icons/md/smartphone.d.ts
+++ b/types/react-icons/md/smartphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmartphone extends React.Component<IconBaseProps, any> { }
+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
index d8e3e1a027..494a9ffbed 100644
--- a/types/react-icons/md/smoke-free.d.ts
+++ b/types/react-icons/md/smoke-free.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokeFree extends React.Component<IconBaseProps, any> { }
+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
index b829e98747..9793808427 100644
--- a/types/react-icons/md/smoking-rooms.d.ts
+++ b/types/react-icons/md/smoking-rooms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmokingRooms extends React.Component<IconBaseProps, any> { }
+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
index 2b4ee25fab..ed04e950bd 100644
--- a/types/react-icons/md/sms-failed.d.ts
+++ b/types/react-icons/md/sms-failed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSmsFailed extends React.Component<IconBaseProps, any> { }
+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
index f378ec0b50..bcdc21c622 100644
--- a/types/react-icons/md/sms.d.ts
+++ b/types/react-icons/md/sms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSms extends React.Component<IconBaseProps, any> { }
+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
index 33c7b29c34..39ef1f6213 100644
--- a/types/react-icons/md/snooze.d.ts
+++ b/types/react-icons/md/snooze.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSnooze extends React.Component<IconBaseProps, any> { }
+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
index e2c667a933..1d823eec21 100644
--- a/types/react-icons/md/sort-by-alpha.d.ts
+++ b/types/react-icons/md/sort-by-alpha.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSortByAlpha extends React.Component<IconBaseProps, any> { }
+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
index 00edec731f..4ae7f76a01 100644
--- a/types/react-icons/md/sort.d.ts
+++ b/types/react-icons/md/sort.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSort extends React.Component<IconBaseProps, any> { }
+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
index b78a49aa60..328203f62f 100644
--- a/types/react-icons/md/spa.d.ts
+++ b/types/react-icons/md/spa.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpa extends React.Component<IconBaseProps, any> { }
+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
index 37c3c8257a..861c34892a 100644
--- a/types/react-icons/md/space-bar.d.ts
+++ b/types/react-icons/md/space-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpaceBar extends React.Component<IconBaseProps, any> { }
+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
index 045d0ba21a..81915fc511 100644
--- a/types/react-icons/md/speaker-group.d.ts
+++ b/types/react-icons/md/speaker-group.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerGroup extends React.Component<IconBaseProps, any> { }
+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
index ddf6a4a20d..bc5b008527 100644
--- a/types/react-icons/md/speaker-notes-off.d.ts
+++ b/types/react-icons/md/speaker-notes-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotesOff extends React.Component<IconBaseProps, any> { }
+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
index 61be4b191b..1c3c0e4ddc 100644
--- a/types/react-icons/md/speaker-notes.d.ts
+++ b/types/react-icons/md/speaker-notes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerNotes extends React.Component<IconBaseProps, any> { }
+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
index 8e5b7ad182..b459a0c395 100644
--- a/types/react-icons/md/speaker-phone.d.ts
+++ b/types/react-icons/md/speaker-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeakerPhone extends React.Component<IconBaseProps, any> { }
+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
index eb8d69859e..1f28f03e88 100644
--- a/types/react-icons/md/speaker.d.ts
+++ b/types/react-icons/md/speaker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpeaker extends React.Component<IconBaseProps, any> { }
+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
index 0b87768460..6b74288ebf 100644
--- a/types/react-icons/md/spellcheck.d.ts
+++ b/types/react-icons/md/spellcheck.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSpellcheck extends React.Component<IconBaseProps, any> { }
+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
index 3885aca3e1..2dda5ebb35 100644
--- a/types/react-icons/md/star-border.d.ts
+++ b/types/react-icons/md/star-border.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarBorder extends React.Component<IconBaseProps, any> { }
+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
index 4711277578..d6684bbfe0 100644
--- a/types/react-icons/md/star-half.d.ts
+++ b/types/react-icons/md/star-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarHalf extends React.Component<IconBaseProps, any> { }
+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
index ec7f64af5b..2b9f3546a3 100644
--- a/types/react-icons/md/star-outline.d.ts
+++ b/types/react-icons/md/star-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStarOutline extends React.Component<IconBaseProps, any> { }
+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
index e5a46a1b4a..f10524254e 100644
--- a/types/react-icons/md/star.d.ts
+++ b/types/react-icons/md/star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStar extends React.Component<IconBaseProps, any> { }
+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
index 2538a7c234..b92a32acd6 100644
--- a/types/react-icons/md/stars.d.ts
+++ b/types/react-icons/md/stars.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStars extends React.Component<IconBaseProps, any> { }
+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
index 243f895422..c2edfbaa27 100644
--- a/types/react-icons/md/stay-current-landscape.d.ts
+++ b/types/react-icons/md/stay-current-landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentLandscape extends React.Component<IconBaseProps, any> { }
+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
index 9799dbb461..9f523f0514 100644
--- a/types/react-icons/md/stay-current-portrait.d.ts
+++ b/types/react-icons/md/stay-current-portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayCurrentPortrait extends React.Component<IconBaseProps, any> { }
+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
index 2e941916e9..4cf222880a 100644
--- a/types/react-icons/md/stay-primary-landscape.d.ts
+++ b/types/react-icons/md/stay-primary-landscape.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryLandscape extends React.Component<IconBaseProps, any> { }
+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
index a69bd1e45f..e4371a0ff9 100644
--- a/types/react-icons/md/stay-primary-portrait.d.ts
+++ b/types/react-icons/md/stay-primary-portrait.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStayPrimaryPortrait extends React.Component<IconBaseProps, any> { }
+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
index 4e6665e0dd..aa6a7b1f11 100644
--- a/types/react-icons/md/stop-screen-share.d.ts
+++ b/types/react-icons/md/stop-screen-share.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStopScreenShare extends React.Component<IconBaseProps, any> { }
+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
index 61a3b41ea8..23972ad40d 100644
--- a/types/react-icons/md/stop.d.ts
+++ b/types/react-icons/md/stop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStop extends React.Component<IconBaseProps, any> { }
+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
index 82c6f58030..76cdb38312 100644
--- a/types/react-icons/md/storage.d.ts
+++ b/types/react-icons/md/storage.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStorage extends React.Component<IconBaseProps, any> { }
+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
index 5144a77caf..68d4294ade 100644
--- a/types/react-icons/md/store-mall-directory.d.ts
+++ b/types/react-icons/md/store-mall-directory.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStoreMallDirectory extends React.Component<IconBaseProps, any> { }
+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
index 6a2e4906fc..c64ab33e61 100644
--- a/types/react-icons/md/store.d.ts
+++ b/types/react-icons/md/store.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStore extends React.Component<IconBaseProps, any> { }
+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
index 820bb820fb..fa68ffb61f 100644
--- a/types/react-icons/md/straighten.d.ts
+++ b/types/react-icons/md/straighten.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStraighten extends React.Component<IconBaseProps, any> { }
+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
index 0807688490..b786fc4504 100644
--- a/types/react-icons/md/streetview.d.ts
+++ b/types/react-icons/md/streetview.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStreetview extends React.Component<IconBaseProps, any> { }
+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
index a6967d71cb..8ccb18a292 100644
--- a/types/react-icons/md/strikethrough-s.d.ts
+++ b/types/react-icons/md/strikethrough-s.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStrikethroughS extends React.Component<IconBaseProps, any> { }
+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
index 3b545091dd..6826a067a7 100644
--- a/types/react-icons/md/style.d.ts
+++ b/types/react-icons/md/style.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdStyle extends React.Component<IconBaseProps, any> { }
+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
index af9e01ef2c..ebfbf45689 100644
--- a/types/react-icons/md/subdirectory-arrow-left.d.ts
+++ b/types/react-icons/md/subdirectory-arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index 7b7a57f72c..435777e018 100644
--- a/types/react-icons/md/subdirectory-arrow-right.d.ts
+++ b/types/react-icons/md/subdirectory-arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubdirectoryArrowRight extends React.Component<IconBaseProps, any> { }
+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
index cf5e782635..b187b836f2 100644
--- a/types/react-icons/md/subject.d.ts
+++ b/types/react-icons/md/subject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubject extends React.Component<IconBaseProps, any> { }
+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
index 83d2830229..0baf020371 100644
--- a/types/react-icons/md/subscriptions.d.ts
+++ b/types/react-icons/md/subscriptions.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubscriptions extends React.Component<IconBaseProps, any> { }
+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
index 5e423dc638..2cacca492e 100644
--- a/types/react-icons/md/subtitles.d.ts
+++ b/types/react-icons/md/subtitles.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubtitles extends React.Component<IconBaseProps, any> { }
+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
index 62f8692e98..c5496480da 100644
--- a/types/react-icons/md/subway.d.ts
+++ b/types/react-icons/md/subway.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSubway extends React.Component<IconBaseProps, any> { }
+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
index 59a10b5a52..4c9b87c063 100644
--- a/types/react-icons/md/supervisor-account.d.ts
+++ b/types/react-icons/md/supervisor-account.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSupervisorAccount extends React.Component<IconBaseProps, any> { }
+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
index 9972125d3a..673f1fdb7e 100644
--- a/types/react-icons/md/surround-sound.d.ts
+++ b/types/react-icons/md/surround-sound.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSurroundSound extends React.Component<IconBaseProps, any> { }
+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
index e0331cc2da..5b6c5eb55b 100644
--- a/types/react-icons/md/swap-calls.d.ts
+++ b/types/react-icons/md/swap-calls.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapCalls extends React.Component<IconBaseProps, any> { }
+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
index 6d11890c87..da47fa6f40 100644
--- a/types/react-icons/md/swap-horiz.d.ts
+++ b/types/react-icons/md/swap-horiz.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapHoriz extends React.Component<IconBaseProps, any> { }
+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
index a91297045e..d034eaf517 100644
--- a/types/react-icons/md/swap-vert.d.ts
+++ b/types/react-icons/md/swap-vert.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVert extends React.Component<IconBaseProps, any> { }
+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
index d4978c081f..617a1f6d9a 100644
--- a/types/react-icons/md/swap-vertical-circle.d.ts
+++ b/types/react-icons/md/swap-vertical-circle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwapVerticalCircle extends React.Component<IconBaseProps, any> { }
+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
index 2aa0dc6e6a..c18ad57764 100644
--- a/types/react-icons/md/switch-camera.d.ts
+++ b/types/react-icons/md/switch-camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchCamera extends React.Component<IconBaseProps, any> { }
+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
index a130429807..0c95857fed 100644
--- a/types/react-icons/md/switch-video.d.ts
+++ b/types/react-icons/md/switch-video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSwitchVideo extends React.Component<IconBaseProps, any> { }
+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
index 1c9b8215f6..99fa13f705 100644
--- a/types/react-icons/md/sync-disabled.d.ts
+++ b/types/react-icons/md/sync-disabled.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncDisabled extends React.Component<IconBaseProps, any> { }
+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
index 8088ab43bf..4ef37a1cbb 100644
--- a/types/react-icons/md/sync-problem.d.ts
+++ b/types/react-icons/md/sync-problem.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSyncProblem extends React.Component<IconBaseProps, any> { }
+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
index 0507f02715..fefdf38258 100644
--- a/types/react-icons/md/sync.d.ts
+++ b/types/react-icons/md/sync.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSync extends React.Component<IconBaseProps, any> { }
+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
index 026acddda6..2725f7b77c 100644
--- a/types/react-icons/md/system-update-alt.d.ts
+++ b/types/react-icons/md/system-update-alt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdateAlt extends React.Component<IconBaseProps, any> { }
+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
index ee85fa6b32..24ebe7c98c 100644
--- a/types/react-icons/md/system-update.d.ts
+++ b/types/react-icons/md/system-update.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdSystemUpdate extends React.Component<IconBaseProps, any> { }
+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
index da524f0e90..bac83b73ed 100644
--- a/types/react-icons/md/tab-unselected.d.ts
+++ b/types/react-icons/md/tab-unselected.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabUnselected extends React.Component<IconBaseProps, any> { }
+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
index 2f8ca0d3e4..5fa18473c7 100644
--- a/types/react-icons/md/tab.d.ts
+++ b/types/react-icons/md/tab.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTab extends React.Component<IconBaseProps, any> { }
+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
index 3643ee0a88..2f30739971 100644
--- a/types/react-icons/md/tablet-android.d.ts
+++ b/types/react-icons/md/tablet-android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletAndroid extends React.Component<IconBaseProps, any> { }
+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
index b20ee6af07..cad896f80b 100644
--- a/types/react-icons/md/tablet-mac.d.ts
+++ b/types/react-icons/md/tablet-mac.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTabletMac extends React.Component<IconBaseProps, any> { }
+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
index 18d7c60fa8..839c55d2a9 100644
--- a/types/react-icons/md/tablet.d.ts
+++ b/types/react-icons/md/tablet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTablet extends React.Component<IconBaseProps, any> { }
+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
index 5facd2e34d..36fe31f9f7 100644
--- a/types/react-icons/md/tag-faces.d.ts
+++ b/types/react-icons/md/tag-faces.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTagFaces extends React.Component<IconBaseProps, any> { }
+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
index f534886bc5..50203118f9 100644
--- a/types/react-icons/md/tap-and-play.d.ts
+++ b/types/react-icons/md/tap-and-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTapAndPlay extends React.Component<IconBaseProps, any> { }
+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
index 0a52b9d500..89ddcb3ab1 100644
--- a/types/react-icons/md/terrain.d.ts
+++ b/types/react-icons/md/terrain.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTerrain extends React.Component<IconBaseProps, any> { }
+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
index 4fff803949..51d63798ed 100644
--- a/types/react-icons/md/text-fields.d.ts
+++ b/types/react-icons/md/text-fields.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFields extends React.Component<IconBaseProps, any> { }
+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
index 1f8dd6ca1f..ca4ef5d0b6 100644
--- a/types/react-icons/md/text-format.d.ts
+++ b/types/react-icons/md/text-format.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextFormat extends React.Component<IconBaseProps, any> { }
+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
index f54926021c..c8f57f986a 100644
--- a/types/react-icons/md/textsms.d.ts
+++ b/types/react-icons/md/textsms.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTextsms extends React.Component<IconBaseProps, any> { }
+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
index 35e3cef6e8..48805b49d0 100644
--- a/types/react-icons/md/texture.d.ts
+++ b/types/react-icons/md/texture.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTexture extends React.Component<IconBaseProps, any> { }
+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
index 185722372c..eeecdd668f 100644
--- a/types/react-icons/md/theaters.d.ts
+++ b/types/react-icons/md/theaters.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTheaters extends React.Component<IconBaseProps, any> { }
+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
index d72c679172..412517a68f 100644
--- a/types/react-icons/md/thumb-down.d.ts
+++ b/types/react-icons/md/thumb-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbDown extends React.Component<IconBaseProps, any> { }
+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
index 3be2e2f9c0..4aedde1b4d 100644
--- a/types/react-icons/md/thumb-up.d.ts
+++ b/types/react-icons/md/thumb-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbUp extends React.Component<IconBaseProps, any> { }
+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
index aa534655bf..f191397ff2 100644
--- a/types/react-icons/md/thumbs-up-down.d.ts
+++ b/types/react-icons/md/thumbs-up-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdThumbsUpDown extends React.Component<IconBaseProps, any> { }
+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
index 4861dcb734..6da47c86df 100644
--- a/types/react-icons/md/time-to-leave.d.ts
+++ b/types/react-icons/md/time-to-leave.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeToLeave extends React.Component<IconBaseProps, any> { }
+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
index d3d49f0e6e..57ac9ba997 100644
--- a/types/react-icons/md/timelapse.d.ts
+++ b/types/react-icons/md/timelapse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimelapse extends React.Component<IconBaseProps, any> { }
+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
index 7a87df69f9..e3c47270ce 100644
--- a/types/react-icons/md/timeline.d.ts
+++ b/types/react-icons/md/timeline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimeline extends React.Component<IconBaseProps, any> { }
+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
index 579cfebcd1..309eb0d095 100644
--- a/types/react-icons/md/timer-10.d.ts
+++ b/types/react-icons/md/timer-10.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer10 extends React.Component<IconBaseProps, any> { }
+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
index aeea11c00a..16ffff55b0 100644
--- a/types/react-icons/md/timer-3.d.ts
+++ b/types/react-icons/md/timer-3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer3 extends React.Component<IconBaseProps, any> { }
+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
index 0f2db86ecc..60b525d44f 100644
--- a/types/react-icons/md/timer-off.d.ts
+++ b/types/react-icons/md/timer-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimerOff extends React.Component<IconBaseProps, any> { }
+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
index 9d03e668f4..aefa851f3e 100644
--- a/types/react-icons/md/timer.d.ts
+++ b/types/react-icons/md/timer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTimer extends React.Component<IconBaseProps, any> { }
+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
index cbfa1c62f3..9585257382 100644
--- a/types/react-icons/md/title.d.ts
+++ b/types/react-icons/md/title.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTitle extends React.Component<IconBaseProps, any> { }
+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
index c7ca344b51..cdd1be99e6 100644
--- a/types/react-icons/md/toc.d.ts
+++ b/types/react-icons/md/toc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToc extends React.Component<IconBaseProps, any> { }
+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
index 72168ad31a..c21725c6bb 100644
--- a/types/react-icons/md/today.d.ts
+++ b/types/react-icons/md/today.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToday extends React.Component<IconBaseProps, any> { }
+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
index 206ae5390e..a95cb48e8e 100644
--- a/types/react-icons/md/toll.d.ts
+++ b/types/react-icons/md/toll.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToll extends React.Component<IconBaseProps, any> { }
+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
index d1db6e9a4f..21595adc48 100644
--- a/types/react-icons/md/tonality.d.ts
+++ b/types/react-icons/md/tonality.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTonality extends React.Component<IconBaseProps, any> { }
+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
index 1aaee18803..f5052a4d41 100644
--- a/types/react-icons/md/touch-app.d.ts
+++ b/types/react-icons/md/touch-app.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTouchApp extends React.Component<IconBaseProps, any> { }
+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
index 1ec1078425..07ecd03fbd 100644
--- a/types/react-icons/md/toys.d.ts
+++ b/types/react-icons/md/toys.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdToys extends React.Component<IconBaseProps, any> { }
+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
index 206eb4cfb5..a729929069 100644
--- a/types/react-icons/md/track-changes.d.ts
+++ b/types/react-icons/md/track-changes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrackChanges extends React.Component<IconBaseProps, any> { }
+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
index e8fe0cc2af..41cb955abb 100644
--- a/types/react-icons/md/traffic.d.ts
+++ b/types/react-icons/md/traffic.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTraffic extends React.Component<IconBaseProps, any> { }
+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
index f13c5fd389..88b32243ca 100644
--- a/types/react-icons/md/train.d.ts
+++ b/types/react-icons/md/train.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrain extends React.Component<IconBaseProps, any> { }
+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
index 7f87570d7e..ac0677ac2f 100644
--- a/types/react-icons/md/tram.d.ts
+++ b/types/react-icons/md/tram.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTram extends React.Component<IconBaseProps, any> { }
+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
index 0c5874cc5e..c8ab351a40 100644
--- a/types/react-icons/md/transfer-within-a-station.d.ts
+++ b/types/react-icons/md/transfer-within-a-station.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTransferWithinAStation extends React.Component<IconBaseProps, any> { }
+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
index cac6b20462..3898a71c86 100644
--- a/types/react-icons/md/transform.d.ts
+++ b/types/react-icons/md/transform.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTransform extends React.Component<IconBaseProps, any> { }
+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
index 4748d5784c..f8d624afc1 100644
--- a/types/react-icons/md/translate.d.ts
+++ b/types/react-icons/md/translate.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTranslate extends React.Component<IconBaseProps, any> { }
+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
index 2ad9e54912..00698234f5 100644
--- a/types/react-icons/md/trending-down.d.ts
+++ b/types/react-icons/md/trending-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingDown extends React.Component<IconBaseProps, any> { }
+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
index 0095a22c23..b511527a55 100644
--- a/types/react-icons/md/trending-flat.d.ts
+++ b/types/react-icons/md/trending-flat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingFlat extends React.Component<IconBaseProps, any> { }
+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
index b594c0af10..0c3d3d1fc1 100644
--- a/types/react-icons/md/trending-neutral.d.ts
+++ b/types/react-icons/md/trending-neutral.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingNeutral extends React.Component<IconBaseProps, any> { }
+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
index b601c2965f..4468236a4e 100644
--- a/types/react-icons/md/trending-up.d.ts
+++ b/types/react-icons/md/trending-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTrendingUp extends React.Component<IconBaseProps, any> { }
+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
index c1a99a0ce4..76c17a1112 100644
--- a/types/react-icons/md/tune.d.ts
+++ b/types/react-icons/md/tune.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTune extends React.Component<IconBaseProps, any> { }
+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
index f8ac871bdd..a2120936f2 100644
--- a/types/react-icons/md/turned-in-not.d.ts
+++ b/types/react-icons/md/turned-in-not.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedInNot extends React.Component<IconBaseProps, any> { }
+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
index a14a500911..685e4225f4 100644
--- a/types/react-icons/md/turned-in.d.ts
+++ b/types/react-icons/md/turned-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTurnedIn extends React.Component<IconBaseProps, any> { }
+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
index 9f44f1ef15..4d184b9d39 100644
--- a/types/react-icons/md/tv.d.ts
+++ b/types/react-icons/md/tv.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdTv extends React.Component<IconBaseProps, any> { }
+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
index 29ae2f95cd..5fb2297759 100644
--- a/types/react-icons/md/unarchive.d.ts
+++ b/types/react-icons/md/unarchive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnarchive extends React.Component<IconBaseProps, any> { }
+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
index 47f8a20c59..16cec6f9f2 100644
--- a/types/react-icons/md/undo.d.ts
+++ b/types/react-icons/md/undo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUndo extends React.Component<IconBaseProps, any> { }
+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
index 54adfb24b8..c13b17448f 100644
--- a/types/react-icons/md/unfold-less.d.ts
+++ b/types/react-icons/md/unfold-less.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldLess extends React.Component<IconBaseProps, any> { }
+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
index e6bc5d6a03..c87c91e57d 100644
--- a/types/react-icons/md/unfold-more.d.ts
+++ b/types/react-icons/md/unfold-more.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUnfoldMore extends React.Component<IconBaseProps, any> { }
+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
index f2d464208d..bfc17eb008 100644
--- a/types/react-icons/md/update.d.ts
+++ b/types/react-icons/md/update.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUpdate extends React.Component<IconBaseProps, any> { }
+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
index d8b28614f2..66f7b5444e 100644
--- a/types/react-icons/md/usb.d.ts
+++ b/types/react-icons/md/usb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdUsb extends React.Component<IconBaseProps, any> { }
+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
index d63aabb907..680ba2575f 100644
--- a/types/react-icons/md/verified-user.d.ts
+++ b/types/react-icons/md/verified-user.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerifiedUser extends React.Component<IconBaseProps, any> { }
+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
index 7d2f11002f..e172ed18d3 100644
--- a/types/react-icons/md/vertical-align-bottom.d.ts
+++ b/types/react-icons/md/vertical-align-bottom.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignBottom extends React.Component<IconBaseProps, any> { }
+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
index eb40f6b146..f672e556c6 100644
--- a/types/react-icons/md/vertical-align-center.d.ts
+++ b/types/react-icons/md/vertical-align-center.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignCenter extends React.Component<IconBaseProps, any> { }
+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
index 48689ab001..712e86f0e3 100644
--- a/types/react-icons/md/vertical-align-top.d.ts
+++ b/types/react-icons/md/vertical-align-top.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVerticalAlignTop extends React.Component<IconBaseProps, any> { }
+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
index a527a2c405..6f9b90222f 100644
--- a/types/react-icons/md/vibration.d.ts
+++ b/types/react-icons/md/vibration.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVibration extends React.Component<IconBaseProps, any> { }
+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
index 5f38508c75..b22ae1fcee 100644
--- a/types/react-icons/md/video-call.d.ts
+++ b/types/react-icons/md/video-call.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCall extends React.Component<IconBaseProps, any> { }
+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
index 908fa644be..037903682d 100644
--- a/types/react-icons/md/video-collection.d.ts
+++ b/types/react-icons/md/video-collection.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoCollection extends React.Component<IconBaseProps, any> { }
+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
index 6efe00c6b1..b2dc4eb7d1 100644
--- a/types/react-icons/md/video-label.d.ts
+++ b/types/react-icons/md/video-label.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLabel extends React.Component<IconBaseProps, any> { }
+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
index b7d12f5537..75bfe2a8aa 100644
--- a/types/react-icons/md/video-library.d.ts
+++ b/types/react-icons/md/video-library.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideoLibrary extends React.Component<IconBaseProps, any> { }
+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
index 090cd9fc2f..fd9d514107 100644
--- a/types/react-icons/md/videocam-off.d.ts
+++ b/types/react-icons/md/videocam-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocamOff extends React.Component<IconBaseProps, any> { }
+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
index 2195de0c8f..7dc49c3be4 100644
--- a/types/react-icons/md/videocam.d.ts
+++ b/types/react-icons/md/videocam.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideocam extends React.Component<IconBaseProps, any> { }
+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
index 129150545a..7e49edf4f8 100644
--- a/types/react-icons/md/videogame-asset.d.ts
+++ b/types/react-icons/md/videogame-asset.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVideogameAsset extends React.Component<IconBaseProps, any> { }
+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
index abc3697861..04beb28dd3 100644
--- a/types/react-icons/md/view-agenda.d.ts
+++ b/types/react-icons/md/view-agenda.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewAgenda extends React.Component<IconBaseProps, any> { }
+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
index 73c2b3217b..6b125ee5b6 100644
--- a/types/react-icons/md/view-array.d.ts
+++ b/types/react-icons/md/view-array.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewArray extends React.Component<IconBaseProps, any> { }
+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
index 051f7ec8c8..da381e92f6 100644
--- a/types/react-icons/md/view-carousel.d.ts
+++ b/types/react-icons/md/view-carousel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCarousel extends React.Component<IconBaseProps, any> { }
+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
index cfba96d13c..c5aaaea343 100644
--- a/types/react-icons/md/view-column.d.ts
+++ b/types/react-icons/md/view-column.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewColumn extends React.Component<IconBaseProps, any> { }
+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
index af7e56200c..4a8277c807 100644
--- a/types/react-icons/md/view-comfortable.d.ts
+++ b/types/react-icons/md/view-comfortable.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfortable extends React.Component<IconBaseProps, any> { }
+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
index 0b79b928c0..a7004f4eee 100644
--- a/types/react-icons/md/view-comfy.d.ts
+++ b/types/react-icons/md/view-comfy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewComfy extends React.Component<IconBaseProps, any> { }
+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
index a4e322a2eb..fefa73473f 100644
--- a/types/react-icons/md/view-compact.d.ts
+++ b/types/react-icons/md/view-compact.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewCompact extends React.Component<IconBaseProps, any> { }
+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
index 2e0954b3ab..2013b75c21 100644
--- a/types/react-icons/md/view-day.d.ts
+++ b/types/react-icons/md/view-day.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewDay extends React.Component<IconBaseProps, any> { }
+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
index 5f30f0e83e..b82272bf35 100644
--- a/types/react-icons/md/view-headline.d.ts
+++ b/types/react-icons/md/view-headline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewHeadline extends React.Component<IconBaseProps, any> { }
+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
index db999bbd39..e4cafe07c0 100644
--- a/types/react-icons/md/view-list.d.ts
+++ b/types/react-icons/md/view-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewList extends React.Component<IconBaseProps, any> { }
+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
index 821cb5e1e2..745cf535be 100644
--- a/types/react-icons/md/view-module.d.ts
+++ b/types/react-icons/md/view-module.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewModule extends React.Component<IconBaseProps, any> { }
+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
index b680d39829..f0e1e3694f 100644
--- a/types/react-icons/md/view-quilt.d.ts
+++ b/types/react-icons/md/view-quilt.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewQuilt extends React.Component<IconBaseProps, any> { }
+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
index 9c51afd104..af7906aa62 100644
--- a/types/react-icons/md/view-stream.d.ts
+++ b/types/react-icons/md/view-stream.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewStream extends React.Component<IconBaseProps, any> { }
+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
index 9e32693bd2..f40184d700 100644
--- a/types/react-icons/md/view-week.d.ts
+++ b/types/react-icons/md/view-week.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdViewWeek extends React.Component<IconBaseProps, any> { }
+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
index 8a1e87281c..0f34dde7dd 100644
--- a/types/react-icons/md/vignette.d.ts
+++ b/types/react-icons/md/vignette.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVignette extends React.Component<IconBaseProps, any> { }
+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
index b2355f575f..679a746bd7 100644
--- a/types/react-icons/md/visibility-off.d.ts
+++ b/types/react-icons/md/visibility-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibilityOff extends React.Component<IconBaseProps, any> { }
+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
index 83f2f5342a..59c3bb1f38 100644
--- a/types/react-icons/md/visibility.d.ts
+++ b/types/react-icons/md/visibility.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVisibility extends React.Component<IconBaseProps, any> { }
+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
index 64536def3f..a64ac1bee4 100644
--- a/types/react-icons/md/voice-chat.d.ts
+++ b/types/react-icons/md/voice-chat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVoiceChat extends React.Component<IconBaseProps, any> { }
+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
index 066af88746..bf922ef49e 100644
--- a/types/react-icons/md/voicemail.d.ts
+++ b/types/react-icons/md/voicemail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVoicemail extends React.Component<IconBaseProps, any> { }
+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
index 473162ef1c..f7a335c1c7 100644
--- a/types/react-icons/md/volume-down.d.ts
+++ b/types/react-icons/md/volume-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeDown extends React.Component<IconBaseProps, any> { }
+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
index 0a6f47ec4e..566bbe0003 100644
--- a/types/react-icons/md/volume-mute.d.ts
+++ b/types/react-icons/md/volume-mute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeMute extends React.Component<IconBaseProps, any> { }
+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
index 9aba14fba8..74acca188c 100644
--- a/types/react-icons/md/volume-off.d.ts
+++ b/types/react-icons/md/volume-off.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeOff extends React.Component<IconBaseProps, any> { }
+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
index c7d27eee7b..28387e23f0 100644
--- a/types/react-icons/md/volume-up.d.ts
+++ b/types/react-icons/md/volume-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVolumeUp extends React.Component<IconBaseProps, any> { }
+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
index afbfe76a4a..e2325babe7 100644
--- a/types/react-icons/md/vpn-key.d.ts
+++ b/types/react-icons/md/vpn-key.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnKey extends React.Component<IconBaseProps, any> { }
+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
index c1f0075482..b83205b117 100644
--- a/types/react-icons/md/vpn-lock.d.ts
+++ b/types/react-icons/md/vpn-lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdVpnLock extends React.Component<IconBaseProps, any> { }
+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
index fe28ccd1f8..ea0485412f 100644
--- a/types/react-icons/md/wallpaper.d.ts
+++ b/types/react-icons/md/wallpaper.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWallpaper extends React.Component<IconBaseProps, any> { }
+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
index 2432836714..74ec79fe30 100644
--- a/types/react-icons/md/warning.d.ts
+++ b/types/react-icons/md/warning.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWarning extends React.Component<IconBaseProps, any> { }
+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
index 9fd7f58a87..c4dc2a3b49 100644
--- a/types/react-icons/md/watch-later.d.ts
+++ b/types/react-icons/md/watch-later.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWatchLater extends React.Component<IconBaseProps, any> { }
+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
index 78a7861ad2..ae09dcd597 100644
--- a/types/react-icons/md/watch.d.ts
+++ b/types/react-icons/md/watch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWatch extends React.Component<IconBaseProps, any> { }
+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
index 14705b1253..216d3b41dc 100644
--- a/types/react-icons/md/wb-auto.d.ts
+++ b/types/react-icons/md/wb-auto.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbAuto extends React.Component<IconBaseProps, any> { }
+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
index b7668a2d67..2ad62d4341 100644
--- a/types/react-icons/md/wb-cloudy.d.ts
+++ b/types/react-icons/md/wb-cloudy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbCloudy extends React.Component<IconBaseProps, any> { }
+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
index b2bf9db4b7..52b597fc99 100644
--- a/types/react-icons/md/wb-incandescent.d.ts
+++ b/types/react-icons/md/wb-incandescent.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIncandescent extends React.Component<IconBaseProps, any> { }
+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
index 655b765bcc..6d16c62bba 100644
--- a/types/react-icons/md/wb-iridescent.d.ts
+++ b/types/react-icons/md/wb-iridescent.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbIridescent extends React.Component<IconBaseProps, any> { }
+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
index 5213fe5026..e8bd77c743 100644
--- a/types/react-icons/md/wb-sunny.d.ts
+++ b/types/react-icons/md/wb-sunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWbSunny extends React.Component<IconBaseProps, any> { }
+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
index 75e5a02d37..9e9cde374f 100644
--- a/types/react-icons/md/wc.d.ts
+++ b/types/react-icons/md/wc.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWc extends React.Component<IconBaseProps, any> { }
+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
index 1a5e120b7f..1871d94e5f 100644
--- a/types/react-icons/md/web-asset.d.ts
+++ b/types/react-icons/md/web-asset.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWebAsset extends React.Component<IconBaseProps, any> { }
+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
index 972567a2eb..0a6c41e697 100644
--- a/types/react-icons/md/web.d.ts
+++ b/types/react-icons/md/web.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWeb extends React.Component<IconBaseProps, any> { }
+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
index 656aa5f2fd..4a7c411c87 100644
--- a/types/react-icons/md/weekend.d.ts
+++ b/types/react-icons/md/weekend.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWeekend extends React.Component<IconBaseProps, any> { }
+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
index 7441e7d6c6..cf16b36c37 100644
--- a/types/react-icons/md/whatshot.d.ts
+++ b/types/react-icons/md/whatshot.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWhatshot extends React.Component<IconBaseProps, any> { }
+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
index 42d9b00c36..ea00e70e7b 100644
--- a/types/react-icons/md/widgets.d.ts
+++ b/types/react-icons/md/widgets.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWidgets extends React.Component<IconBaseProps, any> { }
+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
index 351072fb7e..58c31bb22c 100644
--- a/types/react-icons/md/wifi-lock.d.ts
+++ b/types/react-icons/md/wifi-lock.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiLock extends React.Component<IconBaseProps, any> { }
+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
index 4fd6887358..580c2fe273 100644
--- a/types/react-icons/md/wifi-tethering.d.ts
+++ b/types/react-icons/md/wifi-tethering.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifiTethering extends React.Component<IconBaseProps, any> { }
+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
index 598df931ba..ee81b9f84c 100644
--- a/types/react-icons/md/wifi.d.ts
+++ b/types/react-icons/md/wifi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWifi extends React.Component<IconBaseProps, any> { }
+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
index 0acf717e8c..8b1f10367f 100644
--- a/types/react-icons/md/work.d.ts
+++ b/types/react-icons/md/work.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWork extends React.Component<IconBaseProps, any> { }
+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
index e104cc94fa..4e90b8190a 100644
--- a/types/react-icons/md/wrap-text.d.ts
+++ b/types/react-icons/md/wrap-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdWrapText extends React.Component<IconBaseProps, any> { }
+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
index 39b81fd61b..0267e151dc 100644
--- a/types/react-icons/md/youtube-searched-for.d.ts
+++ b/types/react-icons/md/youtube-searched-for.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdYoutubeSearchedFor extends React.Component<IconBaseProps, any> { }
+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
index ca274701c3..068a0d9bd7 100644
--- a/types/react-icons/md/zoom-in.d.ts
+++ b/types/react-icons/md/zoom-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomIn extends React.Component<IconBaseProps, any> { }
+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
index ca6334d2c2..4d526d0095 100644
--- a/types/react-icons/md/zoom-out-map.d.ts
+++ b/types/react-icons/md/zoom-out-map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOutMap extends React.Component<IconBaseProps, any> { }
+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
index 7f3a64f009..54862f1b45 100644
--- a/types/react-icons/md/zoom-out.d.ts
+++ b/types/react-icons/md/zoom-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class MdZoomOut extends React.Component<IconBaseProps, any> { }
+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
index 1cb773fb4d..584776c0af 100644
--- a/types/react-icons/react-icons-tests.tsx
+++ b/types/react-icons/react-icons-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import FaBeer from 'react-icons/fa/beer';
 import {FaExclamation} from 'react-icons/fa';
 
-class Question extends React.Component<any, any> {
+class Question extends React.Component {
     render() {
         return <h3> Lets go for a <FaBeer /><FaExclamation />? </h3>;
     }
diff --git a/types/react-icons/scripts/generate.ts b/types/react-icons/scripts/generate.ts
index f6cdbb113c..8767babd5a 100644
--- a/types/react-icons/scripts/generate.ts
+++ b/types/react-icons/scripts/generate.ts
@@ -30,7 +30,7 @@ function getOutFile(folder: string, fileName: string): string {
 function iconFile(name: string): string {
     return `import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class ${name} extends React.Component<IconBaseProps, any> { }
+export default class ${name} extends React.Component<IconBaseProps> { }
 `;
 }
 
diff --git a/types/react-icons/ti/adjust-brightness.d.ts b/types/react-icons/ti/adjust-brightness.d.ts
index b367654e01..5beec88e6a 100644
--- a/types/react-icons/ti/adjust-brightness.d.ts
+++ b/types/react-icons/ti/adjust-brightness.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustBrightness extends React.Component<IconBaseProps, any> { }
+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
index 05c1289ea6..2d49b0ce59 100644
--- a/types/react-icons/ti/adjust-contrast.d.ts
+++ b/types/react-icons/ti/adjust-contrast.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAdjustContrast extends React.Component<IconBaseProps, any> { }
+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
index d296d24a55..7a9bc3ab6e 100644
--- a/types/react-icons/ti/anchor-outline.d.ts
+++ b/types/react-icons/ti/anchor-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchorOutline extends React.Component<IconBaseProps, any> { }
+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
index e03c87d518..3c90ca1623 100644
--- a/types/react-icons/ti/anchor.d.ts
+++ b/types/react-icons/ti/anchor.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAnchor extends React.Component<IconBaseProps, any> { }
+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
index 61f8d58e82..22c92eab3d 100644
--- a/types/react-icons/ti/archive.d.ts
+++ b/types/react-icons/ti/archive.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArchive extends React.Component<IconBaseProps, any> { }
+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
index 0d1dd0072e..c168ae0809 100644
--- a/types/react-icons/ti/arrow-back-outline.d.ts
+++ b/types/react-icons/ti/arrow-back-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBackOutline extends React.Component<IconBaseProps, any> { }
+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
index a13646e510..5eb11665a2 100644
--- a/types/react-icons/ti/arrow-back.d.ts
+++ b/types/react-icons/ti/arrow-back.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowBack extends React.Component<IconBaseProps, any> { }
+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
index 6a86077dc8..17ff0d0547 100644
--- a/types/react-icons/ti/arrow-down-outline.d.ts
+++ b/types/react-icons/ti/arrow-down-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownOutline extends React.Component<IconBaseProps, any> { }
+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
index fe224c09c9..450cbe6467 100644
--- a/types/react-icons/ti/arrow-down-thick.d.ts
+++ b/types/react-icons/ti/arrow-down-thick.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDownThick extends React.Component<IconBaseProps, any> { }
+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
index 587213ac4f..fcb3596caf 100644
--- a/types/react-icons/ti/arrow-down.d.ts
+++ b/types/react-icons/ti/arrow-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowDown extends React.Component<IconBaseProps, any> { }
+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
index 39b7a5293d..610881bf2d 100644
--- a/types/react-icons/ti/arrow-forward-outline.d.ts
+++ b/types/react-icons/ti/arrow-forward-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForwardOutline extends React.Component<IconBaseProps, any> { }
+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
index 23bc861023..a4291100ca 100644
--- a/types/react-icons/ti/arrow-forward.d.ts
+++ b/types/react-icons/ti/arrow-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowForward extends React.Component<IconBaseProps, any> { }
+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
index 744ce3f86b..fb50e3e8ae 100644
--- a/types/react-icons/ti/arrow-left-outline.d.ts
+++ b/types/react-icons/ti/arrow-left-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftOutline extends React.Component<IconBaseProps, any> { }
+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
index e090d2503e..4c5bf0e54e 100644
--- a/types/react-icons/ti/arrow-left-thick.d.ts
+++ b/types/react-icons/ti/arrow-left-thick.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeftThick extends React.Component<IconBaseProps, any> { }
+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
index 1f36f1f2d9..f4ae370d36 100644
--- a/types/react-icons/ti/arrow-left.d.ts
+++ b/types/react-icons/ti/arrow-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLeft extends React.Component<IconBaseProps, any> { }
+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
index 93f06c1ab3..40da459c5f 100644
--- a/types/react-icons/ti/arrow-loop-outline.d.ts
+++ b/types/react-icons/ti/arrow-loop-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoopOutline extends React.Component<IconBaseProps, any> { }
+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
index 81addd8344..e4d207fe46 100644
--- a/types/react-icons/ti/arrow-loop.d.ts
+++ b/types/react-icons/ti/arrow-loop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowLoop extends React.Component<IconBaseProps, any> { }
+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
index cc52f1d19e..e6900ecdb4 100644
--- a/types/react-icons/ti/arrow-maximise-outline.d.ts
+++ b/types/react-icons/ti/arrow-maximise-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximiseOutline extends React.Component<IconBaseProps, any> { }
+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
index cf4537cd8a..14797e2179 100644
--- a/types/react-icons/ti/arrow-maximise.d.ts
+++ b/types/react-icons/ti/arrow-maximise.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMaximise extends React.Component<IconBaseProps, any> { }
+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
index 5bb1f7e553..16e1c2c67d 100644
--- a/types/react-icons/ti/arrow-minimise-outline.d.ts
+++ b/types/react-icons/ti/arrow-minimise-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimiseOutline extends React.Component<IconBaseProps, any> { }
+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
index 2151de5105..557625ec1a 100644
--- a/types/react-icons/ti/arrow-minimise.d.ts
+++ b/types/react-icons/ti/arrow-minimise.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMinimise extends React.Component<IconBaseProps, any> { }
+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
index 29a5018c49..0035cbddca 100644
--- a/types/react-icons/ti/arrow-move-outline.d.ts
+++ b/types/react-icons/ti/arrow-move-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMoveOutline extends React.Component<IconBaseProps, any> { }
+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
index 65e67449fa..974082e4ed 100644
--- a/types/react-icons/ti/arrow-move.d.ts
+++ b/types/react-icons/ti/arrow-move.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowMove extends React.Component<IconBaseProps, any> { }
+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
index 6011734a66..7b4e2b2c06 100644
--- a/types/react-icons/ti/arrow-repeat-outline.d.ts
+++ b/types/react-icons/ti/arrow-repeat-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeatOutline extends React.Component<IconBaseProps, any> { }
+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
index 785f69a475..00445af479 100644
--- a/types/react-icons/ti/arrow-repeat.d.ts
+++ b/types/react-icons/ti/arrow-repeat.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRepeat extends React.Component<IconBaseProps, any> { }
+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
index 117b1124b4..7f7319172c 100644
--- a/types/react-icons/ti/arrow-right-outline.d.ts
+++ b/types/react-icons/ti/arrow-right-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightOutline extends React.Component<IconBaseProps, any> { }
+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
index 90842049b8..cc72754ddf 100644
--- a/types/react-icons/ti/arrow-right-thick.d.ts
+++ b/types/react-icons/ti/arrow-right-thick.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRightThick extends React.Component<IconBaseProps, any> { }
+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
index bf2f7e1db9..0761bfd383 100644
--- a/types/react-icons/ti/arrow-right.d.ts
+++ b/types/react-icons/ti/arrow-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowRight extends React.Component<IconBaseProps, any> { }
+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
index fef51c5768..c0cb7629b3 100644
--- a/types/react-icons/ti/arrow-shuffle.d.ts
+++ b/types/react-icons/ti/arrow-shuffle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowShuffle extends React.Component<IconBaseProps, any> { }
+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
index 186884c041..b7b8a436dd 100644
--- a/types/react-icons/ti/arrow-sorted-down.d.ts
+++ b/types/react-icons/ti/arrow-sorted-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedDown extends React.Component<IconBaseProps, any> { }
+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
index 801599f6ca..66f3ef408a 100644
--- a/types/react-icons/ti/arrow-sorted-up.d.ts
+++ b/types/react-icons/ti/arrow-sorted-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSortedUp extends React.Component<IconBaseProps, any> { }
+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
index f20e9027c9..91b296966b 100644
--- a/types/react-icons/ti/arrow-sync-outline.d.ts
+++ b/types/react-icons/ti/arrow-sync-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSyncOutline extends React.Component<IconBaseProps, any> { }
+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
index 532be16374..4a863fe22c 100644
--- a/types/react-icons/ti/arrow-sync.d.ts
+++ b/types/react-icons/ti/arrow-sync.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowSync extends React.Component<IconBaseProps, any> { }
+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
index 834ef9e071..1fbd71c7fa 100644
--- a/types/react-icons/ti/arrow-unsorted.d.ts
+++ b/types/react-icons/ti/arrow-unsorted.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUnsorted extends React.Component<IconBaseProps, any> { }
+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
index 5c7698756d..5f7d9b2baa 100644
--- a/types/react-icons/ti/arrow-up-outline.d.ts
+++ b/types/react-icons/ti/arrow-up-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpOutline extends React.Component<IconBaseProps, any> { }
+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
index 7b2d4b9d91..965192a20a 100644
--- a/types/react-icons/ti/arrow-up-thick.d.ts
+++ b/types/react-icons/ti/arrow-up-thick.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUpThick extends React.Component<IconBaseProps, any> { }
+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
index 7c3bf3397b..d8930645ae 100644
--- a/types/react-icons/ti/arrow-up.d.ts
+++ b/types/react-icons/ti/arrow-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiArrowUp extends React.Component<IconBaseProps, any> { }
+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
index 84f847a0c7..7eaadbcb42 100644
--- a/types/react-icons/ti/at.d.ts
+++ b/types/react-icons/ti/at.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAt extends React.Component<IconBaseProps, any> { }
+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
index fa4417e1f2..2f3c1c54ea 100644
--- a/types/react-icons/ti/attachment-outline.d.ts
+++ b/types/react-icons/ti/attachment-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachmentOutline extends React.Component<IconBaseProps, any> { }
+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
index 7a6299704a..ae09ff061c 100644
--- a/types/react-icons/ti/attachment.d.ts
+++ b/types/react-icons/ti/attachment.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiAttachment extends React.Component<IconBaseProps, any> { }
+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
index 121a662c9f..a7047f88fc 100644
--- a/types/react-icons/ti/backspace-outline.d.ts
+++ b/types/react-icons/ti/backspace-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspaceOutline extends React.Component<IconBaseProps, any> { }
+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
index 060f3737a0..fcd1490219 100644
--- a/types/react-icons/ti/backspace.d.ts
+++ b/types/react-icons/ti/backspace.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBackspace extends React.Component<IconBaseProps, any> { }
+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
index 92491c703c..6b1af42674 100644
--- a/types/react-icons/ti/battery-charge.d.ts
+++ b/types/react-icons/ti/battery-charge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryCharge extends React.Component<IconBaseProps, any> { }
+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
index e75706d310..6e75957baf 100644
--- a/types/react-icons/ti/battery-full.d.ts
+++ b/types/react-icons/ti/battery-full.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryFull extends React.Component<IconBaseProps, any> { }
+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
index f354a949bc..951e63a507 100644
--- a/types/react-icons/ti/battery-high.d.ts
+++ b/types/react-icons/ti/battery-high.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryHigh extends React.Component<IconBaseProps, any> { }
+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
index 3898bb17d0..9c0f370293 100644
--- a/types/react-icons/ti/battery-low.d.ts
+++ b/types/react-icons/ti/battery-low.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryLow extends React.Component<IconBaseProps, any> { }
+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
index 675ff3bd63..6625efa374 100644
--- a/types/react-icons/ti/battery-mid.d.ts
+++ b/types/react-icons/ti/battery-mid.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBatteryMid extends React.Component<IconBaseProps, any> { }
+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
index b4cd4ffb3e..0cdfe9fc68 100644
--- a/types/react-icons/ti/beaker.d.ts
+++ b/types/react-icons/ti/beaker.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBeaker extends React.Component<IconBaseProps, any> { }
+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
index 7de94ce103..a76c8d06f6 100644
--- a/types/react-icons/ti/beer.d.ts
+++ b/types/react-icons/ti/beer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBeer extends React.Component<IconBaseProps, any> { }
+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
index ecf80de006..d3dd3950ed 100644
--- a/types/react-icons/ti/bell.d.ts
+++ b/types/react-icons/ti/bell.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBell extends React.Component<IconBaseProps, any> { }
+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
index 9d787f9869..e2a2e7d952 100644
--- a/types/react-icons/ti/book.d.ts
+++ b/types/react-icons/ti/book.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBook extends React.Component<IconBaseProps, any> { }
+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
index 7f129bb675..47dc6a5e5f 100644
--- a/types/react-icons/ti/bookmark.d.ts
+++ b/types/react-icons/ti/bookmark.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBookmark extends React.Component<IconBaseProps, any> { }
+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
index ff3a143052..c830dab76b 100644
--- a/types/react-icons/ti/briefcase.d.ts
+++ b/types/react-icons/ti/briefcase.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBriefcase extends React.Component<IconBaseProps, any> { }
+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
index 5d89e2fbe4..d8a1b5a5d8 100644
--- a/types/react-icons/ti/brush.d.ts
+++ b/types/react-icons/ti/brush.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBrush extends React.Component<IconBaseProps, any> { }
+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
index 300503f90f..1ecf3f6621 100644
--- a/types/react-icons/ti/business-card.d.ts
+++ b/types/react-icons/ti/business-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiBusinessCard extends React.Component<IconBaseProps, any> { }
+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
index fa3329ee08..403ce8c3e6 100644
--- a/types/react-icons/ti/calculator.d.ts
+++ b/types/react-icons/ti/calculator.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalculator extends React.Component<IconBaseProps, any> { }
+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
index 42e00dbcbf..bd3dd9e9d3 100644
--- a/types/react-icons/ti/calendar-outline.d.ts
+++ b/types/react-icons/ti/calendar-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendarOutline extends React.Component<IconBaseProps, any> { }
+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
index 294cb8edc6..9b0ba315d5 100644
--- a/types/react-icons/ti/calendar.d.ts
+++ b/types/react-icons/ti/calendar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalendar extends React.Component<IconBaseProps, any> { }
+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
index 251b38fafb..8afcb4ef62 100644
--- a/types/react-icons/ti/calender-outline.d.ts
+++ b/types/react-icons/ti/calender-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalenderOutline extends React.Component<IconBaseProps, any> { }
+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
index 4cb44d3f20..0393fece08 100644
--- a/types/react-icons/ti/calender.d.ts
+++ b/types/react-icons/ti/calender.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCalender extends React.Component<IconBaseProps, any> { }
+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
index e7504c96b7..940ba3bd58 100644
--- a/types/react-icons/ti/camera-outline.d.ts
+++ b/types/react-icons/ti/camera-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCameraOutline extends React.Component<IconBaseProps, any> { }
+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
index d56a32b793..8291efbd7d 100644
--- a/types/react-icons/ti/camera.d.ts
+++ b/types/react-icons/ti/camera.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCamera extends React.Component<IconBaseProps, any> { }
+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
index 88d8cdc205..233d7b4b9b 100644
--- a/types/react-icons/ti/cancel-outline.d.ts
+++ b/types/react-icons/ti/cancel-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCancelOutline extends React.Component<IconBaseProps, any> { }
+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
index 1ab547d925..882317d054 100644
--- a/types/react-icons/ti/cancel.d.ts
+++ b/types/react-icons/ti/cancel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCancel extends React.Component<IconBaseProps, any> { }
+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
index 57c4b591c9..fa40a08cde 100644
--- a/types/react-icons/ti/chart-area-outline.d.ts
+++ b/types/react-icons/ti/chart-area-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartAreaOutline extends React.Component<IconBaseProps, any> { }
+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
index c311c3a36f..80806cbd7c 100644
--- a/types/react-icons/ti/chart-area.d.ts
+++ b/types/react-icons/ti/chart-area.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartArea extends React.Component<IconBaseProps, any> { }
+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
index 2a0b3aeb7f..9ec3c4ca70 100644
--- a/types/react-icons/ti/chart-bar-outline.d.ts
+++ b/types/react-icons/ti/chart-bar-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBarOutline extends React.Component<IconBaseProps, any> { }
+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
index 27d130fa50..a98da7fe10 100644
--- a/types/react-icons/ti/chart-bar.d.ts
+++ b/types/react-icons/ti/chart-bar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartBar extends React.Component<IconBaseProps, any> { }
+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
index ba922860c2..f5a982d0f1 100644
--- a/types/react-icons/ti/chart-line-outline.d.ts
+++ b/types/react-icons/ti/chart-line-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLineOutline extends React.Component<IconBaseProps, any> { }
+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
index 4512cd4090..be581f2b53 100644
--- a/types/react-icons/ti/chart-line.d.ts
+++ b/types/react-icons/ti/chart-line.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartLine extends React.Component<IconBaseProps, any> { }
+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
index 818d105715..449d799a79 100644
--- a/types/react-icons/ti/chart-pie-outline.d.ts
+++ b/types/react-icons/ti/chart-pie-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPieOutline extends React.Component<IconBaseProps, any> { }
+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
index b4884cb0fc..5a641290fb 100644
--- a/types/react-icons/ti/chart-pie.d.ts
+++ b/types/react-icons/ti/chart-pie.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChartPie extends React.Component<IconBaseProps, any> { }
+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
index edb967d63e..38ad9ab531 100644
--- a/types/react-icons/ti/chevron-left-outline.d.ts
+++ b/types/react-icons/ti/chevron-left-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeftOutline extends React.Component<IconBaseProps, any> { }
+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
index 2e5e027272..d6a3e7286c 100644
--- a/types/react-icons/ti/chevron-left.d.ts
+++ b/types/react-icons/ti/chevron-left.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronLeft extends React.Component<IconBaseProps, any> { }
+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
index 3eb020f42d..09cc6370fd 100644
--- a/types/react-icons/ti/chevron-right-outline.d.ts
+++ b/types/react-icons/ti/chevron-right-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRightOutline extends React.Component<IconBaseProps, any> { }
+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
index 1e1ce2db60..311697c66a 100644
--- a/types/react-icons/ti/chevron-right.d.ts
+++ b/types/react-icons/ti/chevron-right.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiChevronRight extends React.Component<IconBaseProps, any> { }
+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
index f0e44ffb14..cce73b1bc7 100644
--- a/types/react-icons/ti/clipboard.d.ts
+++ b/types/react-icons/ti/clipboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiClipboard extends React.Component<IconBaseProps, any> { }
+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
index 1f54990953..d36a07cdb6 100644
--- a/types/react-icons/ti/cloud-storage-outline.d.ts
+++ b/types/react-icons/ti/cloud-storage-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorageOutline extends React.Component<IconBaseProps, any> { }
+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
index dea0455a47..45142999f9 100644
--- a/types/react-icons/ti/cloud-storage.d.ts
+++ b/types/react-icons/ti/cloud-storage.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCloudStorage extends React.Component<IconBaseProps, any> { }
+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
index 9ab1170c1e..f7c2eec174 100644
--- a/types/react-icons/ti/code-outline.d.ts
+++ b/types/react-icons/ti/code-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCodeOutline extends React.Component<IconBaseProps, any> { }
+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
index ba1dacc9fc..e6bf302269 100644
--- a/types/react-icons/ti/code.d.ts
+++ b/types/react-icons/ti/code.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCode extends React.Component<IconBaseProps, any> { }
+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
index badd2561f4..df3aa18694 100644
--- a/types/react-icons/ti/coffee.d.ts
+++ b/types/react-icons/ti/coffee.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCoffee extends React.Component<IconBaseProps, any> { }
+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
index 49d76244f0..40c76991c5 100644
--- a/types/react-icons/ti/cog-outline.d.ts
+++ b/types/react-icons/ti/cog-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCogOutline extends React.Component<IconBaseProps, any> { }
+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
index 60d0c1e430..24573b9291 100644
--- a/types/react-icons/ti/cog.d.ts
+++ b/types/react-icons/ti/cog.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCog extends React.Component<IconBaseProps, any> { }
+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
index 3aff81c3ad..54c70bee8b 100644
--- a/types/react-icons/ti/compass.d.ts
+++ b/types/react-icons/ti/compass.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCompass extends React.Component<IconBaseProps, any> { }
+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
index 905ef96611..f780e8ca9c 100644
--- a/types/react-icons/ti/contacts.d.ts
+++ b/types/react-icons/ti/contacts.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiContacts extends React.Component<IconBaseProps, any> { }
+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
index 91ad9a2327..2f05b56233 100644
--- a/types/react-icons/ti/credit-card.d.ts
+++ b/types/react-icons/ti/credit-card.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCreditCard extends React.Component<IconBaseProps, any> { }
+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
index a3ac1ddd80..5af003cf93 100644
--- a/types/react-icons/ti/cross.d.ts
+++ b/types/react-icons/ti/cross.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCross extends React.Component<IconBaseProps, any> { }
+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
index 1e136bf9e8..00e79bcbce 100644
--- a/types/react-icons/ti/css3.d.ts
+++ b/types/react-icons/ti/css3.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiCss3 extends React.Component<IconBaseProps, any> { }
+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
index 5c0730ccc0..65dccc441f 100644
--- a/types/react-icons/ti/database.d.ts
+++ b/types/react-icons/ti/database.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDatabase extends React.Component<IconBaseProps, any> { }
+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
index aa6f22d9ee..bf27aa49f9 100644
--- a/types/react-icons/ti/delete-outline.d.ts
+++ b/types/react-icons/ti/delete-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeleteOutline extends React.Component<IconBaseProps, any> { }
+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
index ea3ce4095f..57791a71ab 100644
--- a/types/react-icons/ti/delete.d.ts
+++ b/types/react-icons/ti/delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDelete extends React.Component<IconBaseProps, any> { }
+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
index 5e9da4420b..d405810142 100644
--- a/types/react-icons/ti/device-desktop.d.ts
+++ b/types/react-icons/ti/device-desktop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceDesktop extends React.Component<IconBaseProps, any> { }
+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
index 150db7ccaf..dada29c74f 100644
--- a/types/react-icons/ti/device-laptop.d.ts
+++ b/types/react-icons/ti/device-laptop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceLaptop extends React.Component<IconBaseProps, any> { }
+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
index 97253f49f2..977cf3f0f1 100644
--- a/types/react-icons/ti/device-phone.d.ts
+++ b/types/react-icons/ti/device-phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDevicePhone extends React.Component<IconBaseProps, any> { }
+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
index 633aaa0c79..06a9e07cca 100644
--- a/types/react-icons/ti/device-tablet.d.ts
+++ b/types/react-icons/ti/device-tablet.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDeviceTablet extends React.Component<IconBaseProps, any> { }
+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
index 98600b7a3c..3be0928f95 100644
--- a/types/react-icons/ti/directions.d.ts
+++ b/types/react-icons/ti/directions.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDirections extends React.Component<IconBaseProps, any> { }
+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
index 1772b508eb..9b30f64d2d 100644
--- a/types/react-icons/ti/divide-outline.d.ts
+++ b/types/react-icons/ti/divide-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDivideOutline extends React.Component<IconBaseProps, any> { }
+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
index 9a21c3e37e..375a79b628 100644
--- a/types/react-icons/ti/divide.d.ts
+++ b/types/react-icons/ti/divide.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDivide extends React.Component<IconBaseProps, any> { }
+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
index 03c1b96cf1..0b2ed20d5c 100644
--- a/types/react-icons/ti/document-add.d.ts
+++ b/types/react-icons/ti/document-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentAdd extends React.Component<IconBaseProps, any> { }
+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
index 6a287f864b..916608ade9 100644
--- a/types/react-icons/ti/document-delete.d.ts
+++ b/types/react-icons/ti/document-delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentDelete extends React.Component<IconBaseProps, any> { }
+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
index d201d50d33..c3af80ad89 100644
--- a/types/react-icons/ti/document-text.d.ts
+++ b/types/react-icons/ti/document-text.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocumentText extends React.Component<IconBaseProps, any> { }
+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
index 4fa7ae704d..60ace2ba35 100644
--- a/types/react-icons/ti/document.d.ts
+++ b/types/react-icons/ti/document.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDocument extends React.Component<IconBaseProps, any> { }
+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
index 82dcd3b0fb..b405ad061c 100644
--- a/types/react-icons/ti/download-outline.d.ts
+++ b/types/react-icons/ti/download-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDownloadOutline extends React.Component<IconBaseProps, any> { }
+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
index 187687d058..6cf13f385b 100644
--- a/types/react-icons/ti/download.d.ts
+++ b/types/react-icons/ti/download.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDownload extends React.Component<IconBaseProps, any> { }
+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
index 1ba1bf872d..000560becf 100644
--- a/types/react-icons/ti/dropbox.d.ts
+++ b/types/react-icons/ti/dropbox.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiDropbox extends React.Component<IconBaseProps, any> { }
+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
index 9fa2dd13f9..7a937ccd2a 100644
--- a/types/react-icons/ti/edit.d.ts
+++ b/types/react-icons/ti/edit.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEdit extends React.Component<IconBaseProps, any> { }
+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
index 6d372acadc..be15038312 100644
--- a/types/react-icons/ti/eject-outline.d.ts
+++ b/types/react-icons/ti/eject-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEjectOutline extends React.Component<IconBaseProps, any> { }
+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
index 9ad3f68e29..3ad5cda1c4 100644
--- a/types/react-icons/ti/eject.d.ts
+++ b/types/react-icons/ti/eject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEject extends React.Component<IconBaseProps, any> { }
+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
index eb637c1229..04e77346cc 100644
--- a/types/react-icons/ti/equals-outline.d.ts
+++ b/types/react-icons/ti/equals-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEqualsOutline extends React.Component<IconBaseProps, any> { }
+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
index 56626087d3..231585549c 100644
--- a/types/react-icons/ti/equals.d.ts
+++ b/types/react-icons/ti/equals.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEquals extends React.Component<IconBaseProps, any> { }
+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
index 208742873a..4d51c29d1a 100644
--- a/types/react-icons/ti/export-outline.d.ts
+++ b/types/react-icons/ti/export-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiExportOutline extends React.Component<IconBaseProps, any> { }
+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
index be25f687b7..fe71d72677 100644
--- a/types/react-icons/ti/export.d.ts
+++ b/types/react-icons/ti/export.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiExport extends React.Component<IconBaseProps, any> { }
+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
index b6d9050bdc..1956f13f4d 100644
--- a/types/react-icons/ti/eye-outline.d.ts
+++ b/types/react-icons/ti/eye-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEyeOutline extends React.Component<IconBaseProps, any> { }
+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
index 37fd02d129..810fdf7009 100644
--- a/types/react-icons/ti/eye.d.ts
+++ b/types/react-icons/ti/eye.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiEye extends React.Component<IconBaseProps, any> { }
+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
index 34e3f50f77..b4a99ba3ec 100644
--- a/types/react-icons/ti/feather.d.ts
+++ b/types/react-icons/ti/feather.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFeather extends React.Component<IconBaseProps, any> { }
+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
index b2fef2361b..a035c6378d 100644
--- a/types/react-icons/ti/film.d.ts
+++ b/types/react-icons/ti/film.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFilm extends React.Component<IconBaseProps, any> { }
+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
index 82fdea00d3..f806a9034b 100644
--- a/types/react-icons/ti/filter.d.ts
+++ b/types/react-icons/ti/filter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFilter extends React.Component<IconBaseProps, any> { }
+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
index daf26717b1..164b221757 100644
--- a/types/react-icons/ti/flag-outline.d.ts
+++ b/types/react-icons/ti/flag-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlagOutline extends React.Component<IconBaseProps, any> { }
+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
index 204e3cb117..4aa2838c02 100644
--- a/types/react-icons/ti/flag.d.ts
+++ b/types/react-icons/ti/flag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlag extends React.Component<IconBaseProps, any> { }
+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
index 9fc9f203bb..5acea29381 100644
--- a/types/react-icons/ti/flash-outline.d.ts
+++ b/types/react-icons/ti/flash-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlashOutline extends React.Component<IconBaseProps, any> { }
+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
index 6ae8ce62e7..27bbe63a9d 100644
--- a/types/react-icons/ti/flash.d.ts
+++ b/types/react-icons/ti/flash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlash extends React.Component<IconBaseProps, any> { }
+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
index f7a1b25116..8e3a8a9246 100644
--- a/types/react-icons/ti/flow-children.d.ts
+++ b/types/react-icons/ti/flow-children.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowChildren extends React.Component<IconBaseProps, any> { }
+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
index 896a2397ff..c479b08b53 100644
--- a/types/react-icons/ti/flow-merge.d.ts
+++ b/types/react-icons/ti/flow-merge.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowMerge extends React.Component<IconBaseProps, any> { }
+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
index 60a39a9c42..4ed94844fc 100644
--- a/types/react-icons/ti/flow-parallel.d.ts
+++ b/types/react-icons/ti/flow-parallel.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowParallel extends React.Component<IconBaseProps, any> { }
+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
index 13ba4dab74..8a68f856fa 100644
--- a/types/react-icons/ti/flow-switch.d.ts
+++ b/types/react-icons/ti/flow-switch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFlowSwitch extends React.Component<IconBaseProps, any> { }
+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
index dace5b3332..83a709521a 100644
--- a/types/react-icons/ti/folder-add.d.ts
+++ b/types/react-icons/ti/folder-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderAdd extends React.Component<IconBaseProps, any> { }
+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
index cbc8f74a1f..bf96e60c12 100644
--- a/types/react-icons/ti/folder-delete.d.ts
+++ b/types/react-icons/ti/folder-delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderDelete extends React.Component<IconBaseProps, any> { }
+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
index 8b3a819259..3c0f2ab47f 100644
--- a/types/react-icons/ti/folder-open.d.ts
+++ b/types/react-icons/ti/folder-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolderOpen extends React.Component<IconBaseProps, any> { }
+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
index d2c339ff20..b12e97b6c3 100644
--- a/types/react-icons/ti/folder.d.ts
+++ b/types/react-icons/ti/folder.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiFolder extends React.Component<IconBaseProps, any> { }
+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
index 5bd68964b2..25e13a5038 100644
--- a/types/react-icons/ti/gift.d.ts
+++ b/types/react-icons/ti/gift.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGift extends React.Component<IconBaseProps, any> { }
+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
index b68f45b3e4..ee4d8cbb6b 100644
--- a/types/react-icons/ti/globe-outline.d.ts
+++ b/types/react-icons/ti/globe-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobeOutline extends React.Component<IconBaseProps, any> { }
+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
index 34c5a32654..30912a9f17 100644
--- a/types/react-icons/ti/globe.d.ts
+++ b/types/react-icons/ti/globe.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGlobe extends React.Component<IconBaseProps, any> { }
+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
index 7ad2d2de66..621001d90e 100644
--- a/types/react-icons/ti/group-outline.d.ts
+++ b/types/react-icons/ti/group-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGroupOutline extends React.Component<IconBaseProps, any> { }
+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
index 910c6bf974..bb5fcf8559 100644
--- a/types/react-icons/ti/group.d.ts
+++ b/types/react-icons/ti/group.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiGroup extends React.Component<IconBaseProps, any> { }
+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
index 7c38ee043d..90fb1a083f 100644
--- a/types/react-icons/ti/headphones.d.ts
+++ b/types/react-icons/ti/headphones.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeadphones extends React.Component<IconBaseProps, any> { }
+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
index 23826c5f65..8153a02133 100644
--- a/types/react-icons/ti/heart-full-outline.d.ts
+++ b/types/react-icons/ti/heart-full-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartFullOutline extends React.Component<IconBaseProps, any> { }
+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
index 8f69a7d949..9d7482079f 100644
--- a/types/react-icons/ti/heart-half-outline.d.ts
+++ b/types/react-icons/ti/heart-half-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartHalfOutline extends React.Component<IconBaseProps, any> { }
+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
index 64b28075b8..77ebb5ba4d 100644
--- a/types/react-icons/ti/heart-outline.d.ts
+++ b/types/react-icons/ti/heart-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeartOutline extends React.Component<IconBaseProps, any> { }
+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
index a0c0a13976..edf26ea22d 100644
--- a/types/react-icons/ti/heart.d.ts
+++ b/types/react-icons/ti/heart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHeart extends React.Component<IconBaseProps, any> { }
+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
index 64642266be..aba8177146 100644
--- a/types/react-icons/ti/home-outline.d.ts
+++ b/types/react-icons/ti/home-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHomeOutline extends React.Component<IconBaseProps, any> { }
+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
index 86b7ea33f4..ffd2e0a744 100644
--- a/types/react-icons/ti/home.d.ts
+++ b/types/react-icons/ti/home.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHome extends React.Component<IconBaseProps, any> { }
+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
index d59ee0e491..7850028128 100644
--- a/types/react-icons/ti/html5.d.ts
+++ b/types/react-icons/ti/html5.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiHtml5 extends React.Component<IconBaseProps, any> { }
+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
index 4842bc960c..e8dabff924 100644
--- a/types/react-icons/ti/image-outline.d.ts
+++ b/types/react-icons/ti/image-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiImageOutline extends React.Component<IconBaseProps, any> { }
+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
index a679eedb46..f33b613d66 100644
--- a/types/react-icons/ti/image.d.ts
+++ b/types/react-icons/ti/image.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiImage extends React.Component<IconBaseProps, any> { }
+export default class TiImage extends React.Component<IconBaseProps> { }
diff --git a/types/react-icons/ti/infinity-outline.d.ts b/types/react-icons/ti/infinity-outline.d.ts
index 55ee5253ab..396db6cef4 100644
--- a/types/react-icons/ti/infinity-outline.d.ts
+++ b/types/react-icons/ti/infinity-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinityOutline extends React.Component<IconBaseProps, any> { }
+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
index 53a8cc4a40..e2e330678f 100644
--- a/types/react-icons/ti/infinity.d.ts
+++ b/types/react-icons/ti/infinity.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfinity extends React.Component<IconBaseProps, any> { }
+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
index 52d4e467ec..3ff6a8be6c 100644
--- a/types/react-icons/ti/info-large-outline.d.ts
+++ b/types/react-icons/ti/info-large-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLargeOutline extends React.Component<IconBaseProps, any> { }
+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
index 5b1a055ece..0ad4eb3b6a 100644
--- a/types/react-icons/ti/info-large.d.ts
+++ b/types/react-icons/ti/info-large.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoLarge extends React.Component<IconBaseProps, any> { }
+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
index 642d7c3fdc..b80e266196 100644
--- a/types/react-icons/ti/info-outline.d.ts
+++ b/types/react-icons/ti/info-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfoOutline extends React.Component<IconBaseProps, any> { }
+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
index 8f0e930e02..ec2cd25bdf 100644
--- a/types/react-icons/ti/info.d.ts
+++ b/types/react-icons/ti/info.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInfo extends React.Component<IconBaseProps, any> { }
+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
index 45c2b0bc23..91f4f396a0 100644
--- a/types/react-icons/ti/input-checked-outline.d.ts
+++ b/types/react-icons/ti/input-checked-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInputCheckedOutline extends React.Component<IconBaseProps, any> { }
+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
index 1a070722d9..beb1227d76 100644
--- a/types/react-icons/ti/input-checked.d.ts
+++ b/types/react-icons/ti/input-checked.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiInputChecked extends React.Component<IconBaseProps, any> { }
+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
index 8e4fc1115d..0a2cac24a7 100644
--- a/types/react-icons/ti/key-outline.d.ts
+++ b/types/react-icons/ti/key-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyOutline extends React.Component<IconBaseProps, any> { }
+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
index 1c4ebd738b..c167c86f85 100644
--- a/types/react-icons/ti/key.d.ts
+++ b/types/react-icons/ti/key.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKey extends React.Component<IconBaseProps, any> { }
+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
index 54f693028f..c936d0245d 100644
--- a/types/react-icons/ti/keyboard.d.ts
+++ b/types/react-icons/ti/keyboard.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiKeyboard extends React.Component<IconBaseProps, any> { }
+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
index e714447245..7b34567dde 100644
--- a/types/react-icons/ti/leaf.d.ts
+++ b/types/react-icons/ti/leaf.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLeaf extends React.Component<IconBaseProps, any> { }
+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
index 67ac33b23d..389a15ff3e 100644
--- a/types/react-icons/ti/lightbulb.d.ts
+++ b/types/react-icons/ti/lightbulb.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLightbulb extends React.Component<IconBaseProps, any> { }
+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
index def891af4a..8aec8924d9 100644
--- a/types/react-icons/ti/link-outline.d.ts
+++ b/types/react-icons/ti/link-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLinkOutline extends React.Component<IconBaseProps, any> { }
+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
index e68864cab3..7de0129e97 100644
--- a/types/react-icons/ti/link.d.ts
+++ b/types/react-icons/ti/link.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLink extends React.Component<IconBaseProps, any> { }
+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
index 9a457840ae..be73bc68bb 100644
--- a/types/react-icons/ti/location-arrow-outline.d.ts
+++ b/types/react-icons/ti/location-arrow-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrowOutline extends React.Component<IconBaseProps, any> { }
+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
index daab4d6896..c9fca74a46 100644
--- a/types/react-icons/ti/location-arrow.d.ts
+++ b/types/react-icons/ti/location-arrow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationArrow extends React.Component<IconBaseProps, any> { }
+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
index ca56d17b2d..5e33402d00 100644
--- a/types/react-icons/ti/location-outline.d.ts
+++ b/types/react-icons/ti/location-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocationOutline extends React.Component<IconBaseProps, any> { }
+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
index 8f0143e731..4b2ad147b6 100644
--- a/types/react-icons/ti/location.d.ts
+++ b/types/react-icons/ti/location.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLocation extends React.Component<IconBaseProps, any> { }
+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
index d45affe777..df9d6ffaad 100644
--- a/types/react-icons/ti/lock-closed-outline.d.ts
+++ b/types/react-icons/ti/lock-closed-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosedOutline extends React.Component<IconBaseProps, any> { }
+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
index cb274a54aa..234cc40580 100644
--- a/types/react-icons/ti/lock-closed.d.ts
+++ b/types/react-icons/ti/lock-closed.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockClosed extends React.Component<IconBaseProps, any> { }
+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
index 76933e131b..380878a869 100644
--- a/types/react-icons/ti/lock-open-outline.d.ts
+++ b/types/react-icons/ti/lock-open-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpenOutline extends React.Component<IconBaseProps, any> { }
+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
index bbff173c32..c4b51c68ee 100644
--- a/types/react-icons/ti/lock-open.d.ts
+++ b/types/react-icons/ti/lock-open.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiLockOpen extends React.Component<IconBaseProps, any> { }
+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
index cad6a0a121..34979f6b13 100644
--- a/types/react-icons/ti/mail.d.ts
+++ b/types/react-icons/ti/mail.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMail extends React.Component<IconBaseProps, any> { }
+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
index ce3ba9847f..8b8092f4e7 100644
--- a/types/react-icons/ti/map.d.ts
+++ b/types/react-icons/ti/map.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMap extends React.Component<IconBaseProps, any> { }
+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
index 2ae6fee411..d58fadb21b 100644
--- a/types/react-icons/ti/media-eject-outline.d.ts
+++ b/types/react-icons/ti/media-eject-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEjectOutline extends React.Component<IconBaseProps, any> { }
+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
index 20675e0c81..41a9baaea8 100644
--- a/types/react-icons/ti/media-eject.d.ts
+++ b/types/react-icons/ti/media-eject.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaEject extends React.Component<IconBaseProps, any> { }
+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
index 7b1e3f3746..8923d0fa44 100644
--- a/types/react-icons/ti/media-fast-forward-outline.d.ts
+++ b/types/react-icons/ti/media-fast-forward-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForwardOutline extends React.Component<IconBaseProps, any> { }
+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
index 0cccabf1a1..e53638bf62 100644
--- a/types/react-icons/ti/media-fast-forward.d.ts
+++ b/types/react-icons/ti/media-fast-forward.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaFastForward extends React.Component<IconBaseProps, any> { }
+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
index 04319234f4..e792f0c894 100644
--- a/types/react-icons/ti/media-pause-outline.d.ts
+++ b/types/react-icons/ti/media-pause-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPauseOutline extends React.Component<IconBaseProps, any> { }
+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
index 45fb114925..b24950b19c 100644
--- a/types/react-icons/ti/media-pause.d.ts
+++ b/types/react-icons/ti/media-pause.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPause extends React.Component<IconBaseProps, any> { }
+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
index 6268f8a8d9..8e024e323f 100644
--- a/types/react-icons/ti/media-play-outline.d.ts
+++ b/types/react-icons/ti/media-play-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayOutline extends React.Component<IconBaseProps, any> { }
+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
index be0c3890cd..5594d646d8 100644
--- a/types/react-icons/ti/media-play-reverse-outline.d.ts
+++ b/types/react-icons/ti/media-play-reverse-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverseOutline extends React.Component<IconBaseProps, any> { }
+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
index 1dd9108114..26e71c1733 100644
--- a/types/react-icons/ti/media-play-reverse.d.ts
+++ b/types/react-icons/ti/media-play-reverse.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlayReverse extends React.Component<IconBaseProps, any> { }
+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
index 5b7d0c4169..defa546ee7 100644
--- a/types/react-icons/ti/media-play.d.ts
+++ b/types/react-icons/ti/media-play.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaPlay extends React.Component<IconBaseProps, any> { }
+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
index 7f5cf89347..0761437451 100644
--- a/types/react-icons/ti/media-record-outline.d.ts
+++ b/types/react-icons/ti/media-record-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecordOutline extends React.Component<IconBaseProps, any> { }
+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
index 55b25b2ff2..d924b105b6 100644
--- a/types/react-icons/ti/media-record.d.ts
+++ b/types/react-icons/ti/media-record.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRecord extends React.Component<IconBaseProps, any> { }
+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
index 7ec922604a..11de328095 100644
--- a/types/react-icons/ti/media-rewind-outline.d.ts
+++ b/types/react-icons/ti/media-rewind-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewindOutline extends React.Component<IconBaseProps, any> { }
+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
index e05ce27a09..f0e7151590 100644
--- a/types/react-icons/ti/media-rewind.d.ts
+++ b/types/react-icons/ti/media-rewind.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaRewind extends React.Component<IconBaseProps, any> { }
+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
index 29fc04a30e..e8728ac857 100644
--- a/types/react-icons/ti/media-stop-outline.d.ts
+++ b/types/react-icons/ti/media-stop-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStopOutline extends React.Component<IconBaseProps, any> { }
+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
index a6b7637acb..d38b31aa5a 100644
--- a/types/react-icons/ti/media-stop.d.ts
+++ b/types/react-icons/ti/media-stop.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMediaStop extends React.Component<IconBaseProps, any> { }
+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
index 5cf7670ad8..2cb5497a4e 100644
--- a/types/react-icons/ti/message-typing.d.ts
+++ b/types/react-icons/ti/message-typing.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessageTyping extends React.Component<IconBaseProps, any> { }
+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
index 7317710d31..9edcc4226a 100644
--- a/types/react-icons/ti/message.d.ts
+++ b/types/react-icons/ti/message.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessage extends React.Component<IconBaseProps, any> { }
+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
index 21c70634f3..e21fdac0a4 100644
--- a/types/react-icons/ti/messages.d.ts
+++ b/types/react-icons/ti/messages.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMessages extends React.Component<IconBaseProps, any> { }
+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
index a669927bbc..27e430bd72 100644
--- a/types/react-icons/ti/microphone-outline.d.ts
+++ b/types/react-icons/ti/microphone-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophoneOutline extends React.Component<IconBaseProps, any> { }
+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
index a17fa0f132..543db1b50a 100644
--- a/types/react-icons/ti/microphone.d.ts
+++ b/types/react-icons/ti/microphone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMicrophone extends React.Component<IconBaseProps, any> { }
+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
index 19c321e4c4..99bb9fa7df 100644
--- a/types/react-icons/ti/minus-outline.d.ts
+++ b/types/react-icons/ti/minus-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMinusOutline extends React.Component<IconBaseProps, any> { }
+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
index 79d4220485..6239684cfa 100644
--- a/types/react-icons/ti/minus.d.ts
+++ b/types/react-icons/ti/minus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMinus extends React.Component<IconBaseProps, any> { }
+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
index 83d41e7595..84d29d2b24 100644
--- a/types/react-icons/ti/mortar-board.d.ts
+++ b/types/react-icons/ti/mortar-board.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiMortarBoard extends React.Component<IconBaseProps, any> { }
+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
index cb0145cc01..31c3f66c1e 100644
--- a/types/react-icons/ti/news.d.ts
+++ b/types/react-icons/ti/news.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNews extends React.Component<IconBaseProps, any> { }
+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
index 6703b2b198..4613ba38af 100644
--- a/types/react-icons/ti/notes-outline.d.ts
+++ b/types/react-icons/ti/notes-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNotesOutline extends React.Component<IconBaseProps, any> { }
+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
index 3ca17c7358..5d2b4160f1 100644
--- a/types/react-icons/ti/notes.d.ts
+++ b/types/react-icons/ti/notes.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiNotes extends React.Component<IconBaseProps, any> { }
+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
index 41aee3642f..79b4e72f1a 100644
--- a/types/react-icons/ti/pen.d.ts
+++ b/types/react-icons/ti/pen.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPen extends React.Component<IconBaseProps, any> { }
+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
index 5740ef9c78..b8726f9010 100644
--- a/types/react-icons/ti/pencil.d.ts
+++ b/types/react-icons/ti/pencil.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPencil extends React.Component<IconBaseProps, any> { }
+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
index 1bb8c750b0..d84b152351 100644
--- a/types/react-icons/ti/phone-outline.d.ts
+++ b/types/react-icons/ti/phone-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPhoneOutline extends React.Component<IconBaseProps, any> { }
+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
index b1a6690815..af3eb027a1 100644
--- a/types/react-icons/ti/phone.d.ts
+++ b/types/react-icons/ti/phone.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPhone extends React.Component<IconBaseProps, any> { }
+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
index 192f6d1f1d..4327e47c3d 100644
--- a/types/react-icons/ti/pi-outline.d.ts
+++ b/types/react-icons/ti/pi-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPiOutline extends React.Component<IconBaseProps, any> { }
+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
index ae4ae99064..d68aefa610 100644
--- a/types/react-icons/ti/pi.d.ts
+++ b/types/react-icons/ti/pi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPi extends React.Component<IconBaseProps, any> { }
+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
index 8cefb44433..5a8943532e 100644
--- a/types/react-icons/ti/pin-outline.d.ts
+++ b/types/react-icons/ti/pin-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPinOutline extends React.Component<IconBaseProps, any> { }
+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
index 5dce6a6470..8d887edc98 100644
--- a/types/react-icons/ti/pin.d.ts
+++ b/types/react-icons/ti/pin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPin extends React.Component<IconBaseProps, any> { }
+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
index 31d4642239..4f48d8afd3 100644
--- a/types/react-icons/ti/pipette.d.ts
+++ b/types/react-icons/ti/pipette.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPipette extends React.Component<IconBaseProps, any> { }
+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
index 250f5267fc..ea4ac38deb 100644
--- a/types/react-icons/ti/plane-outline.d.ts
+++ b/types/react-icons/ti/plane-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlaneOutline extends React.Component<IconBaseProps, any> { }
+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
index 53f3a0f78a..13e32cab40 100644
--- a/types/react-icons/ti/plane.d.ts
+++ b/types/react-icons/ti/plane.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlane extends React.Component<IconBaseProps, any> { }
+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
index 54a42f6cbd..019e4adc15 100644
--- a/types/react-icons/ti/plug.d.ts
+++ b/types/react-icons/ti/plug.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlug extends React.Component<IconBaseProps, any> { }
+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
index 2dfe955599..22ec83aedd 100644
--- a/types/react-icons/ti/plus-outline.d.ts
+++ b/types/react-icons/ti/plus-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlusOutline extends React.Component<IconBaseProps, any> { }
+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
index 66a5d9887a..247f279571 100644
--- a/types/react-icons/ti/plus.d.ts
+++ b/types/react-icons/ti/plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPlus extends React.Component<IconBaseProps, any> { }
+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
index c554f714d4..63cfa579e5 100644
--- a/types/react-icons/ti/point-of-interest-outline.d.ts
+++ b/types/react-icons/ti/point-of-interest-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterestOutline extends React.Component<IconBaseProps, any> { }
+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
index 6d3023d29c..a5d480400c 100644
--- a/types/react-icons/ti/point-of-interest.d.ts
+++ b/types/react-icons/ti/point-of-interest.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPointOfInterest extends React.Component<IconBaseProps, any> { }
+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
index a788657f98..52f6a2262c 100644
--- a/types/react-icons/ti/power-outline.d.ts
+++ b/types/react-icons/ti/power-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPowerOutline extends React.Component<IconBaseProps, any> { }
+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
index 94024bf885..64dfece1af 100644
--- a/types/react-icons/ti/power.d.ts
+++ b/types/react-icons/ti/power.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPower extends React.Component<IconBaseProps, any> { }
+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
index 5349ae1a3e..556a9f07db 100644
--- a/types/react-icons/ti/printer.d.ts
+++ b/types/react-icons/ti/printer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPrinter extends React.Component<IconBaseProps, any> { }
+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
index f6352d67f4..4a7341192a 100644
--- a/types/react-icons/ti/puzzle-outline.d.ts
+++ b/types/react-icons/ti/puzzle-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzleOutline extends React.Component<IconBaseProps, any> { }
+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
index c52cb4cde1..a0c57f6b0e 100644
--- a/types/react-icons/ti/puzzle.d.ts
+++ b/types/react-icons/ti/puzzle.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiPuzzle extends React.Component<IconBaseProps, any> { }
+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
index 9e7cc743f0..aad8289852 100644
--- a/types/react-icons/ti/radar-outline.d.ts
+++ b/types/react-icons/ti/radar-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRadarOutline extends React.Component<IconBaseProps, any> { }
+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
index cb357e6333..b98c278714 100644
--- a/types/react-icons/ti/radar.d.ts
+++ b/types/react-icons/ti/radar.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRadar extends React.Component<IconBaseProps, any> { }
+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
index ed2cd33e88..38d77c5598 100644
--- a/types/react-icons/ti/refresh-outline.d.ts
+++ b/types/react-icons/ti/refresh-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRefreshOutline extends React.Component<IconBaseProps, any> { }
+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
index d419c6b743..6aeba2082a 100644
--- a/types/react-icons/ti/refresh.d.ts
+++ b/types/react-icons/ti/refresh.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRefresh extends React.Component<IconBaseProps, any> { }
+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
index dce99a29bc..0b31e05198 100644
--- a/types/react-icons/ti/rss-outline.d.ts
+++ b/types/react-icons/ti/rss-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRssOutline extends React.Component<IconBaseProps, any> { }
+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
index ce8c7c18fa..13f61bf841 100644
--- a/types/react-icons/ti/rss.d.ts
+++ b/types/react-icons/ti/rss.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiRss extends React.Component<IconBaseProps, any> { }
+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
index 3ff5dea928..82b195b7bd 100644
--- a/types/react-icons/ti/scissors-outline.d.ts
+++ b/types/react-icons/ti/scissors-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiScissorsOutline extends React.Component<IconBaseProps, any> { }
+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
index f3a406c218..da6f78e767 100644
--- a/types/react-icons/ti/scissors.d.ts
+++ b/types/react-icons/ti/scissors.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiScissors extends React.Component<IconBaseProps, any> { }
+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
index 59a5f9c229..6de75d8f81 100644
--- a/types/react-icons/ti/shopping-bag.d.ts
+++ b/types/react-icons/ti/shopping-bag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingBag extends React.Component<IconBaseProps, any> { }
+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
index a58ba23cff..2364dc03ba 100644
--- a/types/react-icons/ti/shopping-cart.d.ts
+++ b/types/react-icons/ti/shopping-cart.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiShoppingCart extends React.Component<IconBaseProps, any> { }
+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
index d37dd379f6..2c2fcee614 100644
--- a/types/react-icons/ti/social-at-circular.d.ts
+++ b/types/react-icons/ti/social-at-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialAtCircular extends React.Component<IconBaseProps, any> { }
+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
index 97e17ee2e3..7e7ddc450a 100644
--- a/types/react-icons/ti/social-dribbble-circular.d.ts
+++ b/types/react-icons/ti/social-dribbble-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbbleCircular extends React.Component<IconBaseProps, any> { }
+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
index 9c928c1ccc..b47018320f 100644
--- a/types/react-icons/ti/social-dribbble.d.ts
+++ b/types/react-icons/ti/social-dribbble.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialDribbble extends React.Component<IconBaseProps, any> { }
+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
index 8120985864..e9863905d3 100644
--- a/types/react-icons/ti/social-facebook-circular.d.ts
+++ b/types/react-icons/ti/social-facebook-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebookCircular extends React.Component<IconBaseProps, any> { }
+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
index bd57608e15..982ae3d78c 100644
--- a/types/react-icons/ti/social-facebook.d.ts
+++ b/types/react-icons/ti/social-facebook.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFacebook extends React.Component<IconBaseProps, any> { }
+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
index 36a15748b8..4c7b97dce4 100644
--- a/types/react-icons/ti/social-flickr-circular.d.ts
+++ b/types/react-icons/ti/social-flickr-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickrCircular extends React.Component<IconBaseProps, any> { }
+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
index 2994756823..ab945e0965 100644
--- a/types/react-icons/ti/social-flickr.d.ts
+++ b/types/react-icons/ti/social-flickr.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialFlickr extends React.Component<IconBaseProps, any> { }
+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
index 57d5df5156..1db20eba35 100644
--- a/types/react-icons/ti/social-github-circular.d.ts
+++ b/types/react-icons/ti/social-github-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithubCircular extends React.Component<IconBaseProps, any> { }
+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
index 18b7b4df3c..d2f3b8f628 100644
--- a/types/react-icons/ti/social-github.d.ts
+++ b/types/react-icons/ti/social-github.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGithub extends React.Component<IconBaseProps, any> { }
+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
index d9f892e491..7fd96cf1b4 100644
--- a/types/react-icons/ti/social-google-plus-circular.d.ts
+++ b/types/react-icons/ti/social-google-plus-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlusCircular extends React.Component<IconBaseProps, any> { }
+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
index 194d00284b..977e3bb738 100644
--- a/types/react-icons/ti/social-google-plus.d.ts
+++ b/types/react-icons/ti/social-google-plus.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialGooglePlus extends React.Component<IconBaseProps, any> { }
+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
index dcbbb88cb4..ef7e9ea9f1 100644
--- a/types/react-icons/ti/social-instagram-circular.d.ts
+++ b/types/react-icons/ti/social-instagram-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagramCircular extends React.Component<IconBaseProps, any> { }
+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
index 3fa529f3c8..ff4d5d3346 100644
--- a/types/react-icons/ti/social-instagram.d.ts
+++ b/types/react-icons/ti/social-instagram.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialInstagram extends React.Component<IconBaseProps, any> { }
+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
index 9e2c128d51..38e8fc08be 100644
--- a/types/react-icons/ti/social-last-fm-circular.d.ts
+++ b/types/react-icons/ti/social-last-fm-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFmCircular extends React.Component<IconBaseProps, any> { }
+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
index f1c7fc40dd..fde2b626cc 100644
--- a/types/react-icons/ti/social-last-fm.d.ts
+++ b/types/react-icons/ti/social-last-fm.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLastFm extends React.Component<IconBaseProps, any> { }
+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
index f97d083625..32b5ba1add 100644
--- a/types/react-icons/ti/social-linkedin-circular.d.ts
+++ b/types/react-icons/ti/social-linkedin-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedinCircular extends React.Component<IconBaseProps, any> { }
+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
index d7bad9afd1..6a4f1b264b 100644
--- a/types/react-icons/ti/social-linkedin.d.ts
+++ b/types/react-icons/ti/social-linkedin.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialLinkedin extends React.Component<IconBaseProps, any> { }
+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
index 583e2add27..4278c08e25 100644
--- a/types/react-icons/ti/social-pinterest-circular.d.ts
+++ b/types/react-icons/ti/social-pinterest-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterestCircular extends React.Component<IconBaseProps, any> { }
+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
index 685a9e074f..1544d9d0ff 100644
--- a/types/react-icons/ti/social-pinterest.d.ts
+++ b/types/react-icons/ti/social-pinterest.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialPinterest extends React.Component<IconBaseProps, any> { }
+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
index 05b4a348b8..7bc87167e4 100644
--- a/types/react-icons/ti/social-skype-outline.d.ts
+++ b/types/react-icons/ti/social-skype-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkypeOutline extends React.Component<IconBaseProps, any> { }
+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
index 10ac96052b..1c62817e98 100644
--- a/types/react-icons/ti/social-skype.d.ts
+++ b/types/react-icons/ti/social-skype.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialSkype extends React.Component<IconBaseProps, any> { }
+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
index bebcd4f75a..1d5823a418 100644
--- a/types/react-icons/ti/social-tumbler-circular.d.ts
+++ b/types/react-icons/ti/social-tumbler-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumblerCircular extends React.Component<IconBaseProps, any> { }
+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
index df4cca1076..25826e8f98 100644
--- a/types/react-icons/ti/social-tumbler.d.ts
+++ b/types/react-icons/ti/social-tumbler.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTumbler extends React.Component<IconBaseProps, any> { }
+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
index eb43a34459..951a8a90ac 100644
--- a/types/react-icons/ti/social-twitter-circular.d.ts
+++ b/types/react-icons/ti/social-twitter-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitterCircular extends React.Component<IconBaseProps, any> { }
+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
index 126f0b5e5d..2f5d6e6fe2 100644
--- a/types/react-icons/ti/social-twitter.d.ts
+++ b/types/react-icons/ti/social-twitter.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialTwitter extends React.Component<IconBaseProps, any> { }
+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
index 9e10f51460..a161f647e2 100644
--- a/types/react-icons/ti/social-vimeo-circular.d.ts
+++ b/types/react-icons/ti/social-vimeo-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeoCircular extends React.Component<IconBaseProps, any> { }
+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
index 7aeaa162fb..20a6fe4e96 100644
--- a/types/react-icons/ti/social-vimeo.d.ts
+++ b/types/react-icons/ti/social-vimeo.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialVimeo extends React.Component<IconBaseProps, any> { }
+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
index 46b0c8de10..5373438d05 100644
--- a/types/react-icons/ti/social-youtube-circular.d.ts
+++ b/types/react-icons/ti/social-youtube-circular.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutubeCircular extends React.Component<IconBaseProps, any> { }
+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
index 5db2c47063..6040ccbd2e 100644
--- a/types/react-icons/ti/social-youtube.d.ts
+++ b/types/react-icons/ti/social-youtube.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSocialYoutube extends React.Component<IconBaseProps, any> { }
+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
index a9e5f6a481..b822906e2c 100644
--- a/types/react-icons/ti/sort-alphabetically-outline.d.ts
+++ b/types/react-icons/ti/sort-alphabetically-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabeticallyOutline extends React.Component<IconBaseProps, any> { }
+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
index 9c835302f1..75a9622393 100644
--- a/types/react-icons/ti/sort-alphabetically.d.ts
+++ b/types/react-icons/ti/sort-alphabetically.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortAlphabetically extends React.Component<IconBaseProps, any> { }
+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
index c8d6581932..e279726f0c 100644
--- a/types/react-icons/ti/sort-numerically-outline.d.ts
+++ b/types/react-icons/ti/sort-numerically-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumericallyOutline extends React.Component<IconBaseProps, any> { }
+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
index 8bd3d924b9..d514d789f3 100644
--- a/types/react-icons/ti/sort-numerically.d.ts
+++ b/types/react-icons/ti/sort-numerically.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSortNumerically extends React.Component<IconBaseProps, any> { }
+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
index 3d2916db10..424e07581a 100644
--- a/types/react-icons/ti/spanner-outline.d.ts
+++ b/types/react-icons/ti/spanner-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpannerOutline extends React.Component<IconBaseProps, any> { }
+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
index e97f966203..bcfc2421d2 100644
--- a/types/react-icons/ti/spanner.d.ts
+++ b/types/react-icons/ti/spanner.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpanner extends React.Component<IconBaseProps, any> { }
+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
index 075de017ee..f35df30ad0 100644
--- a/types/react-icons/ti/spiral.d.ts
+++ b/types/react-icons/ti/spiral.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSpiral extends React.Component<IconBaseProps, any> { }
+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
index 3f6cbdec0a..f1c40795ae 100644
--- a/types/react-icons/ti/star-full-outline.d.ts
+++ b/types/react-icons/ti/star-full-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarFullOutline extends React.Component<IconBaseProps, any> { }
+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
index 47794fbbcb..4e93ae767e 100644
--- a/types/react-icons/ti/star-half-outline.d.ts
+++ b/types/react-icons/ti/star-half-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalfOutline extends React.Component<IconBaseProps, any> { }
+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
index 426efa442d..b9409290f7 100644
--- a/types/react-icons/ti/star-half.d.ts
+++ b/types/react-icons/ti/star-half.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarHalf extends React.Component<IconBaseProps, any> { }
+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
index 1aff2e7952..c5c504aec6 100644
--- a/types/react-icons/ti/star-outline.d.ts
+++ b/types/react-icons/ti/star-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarOutline extends React.Component<IconBaseProps, any> { }
+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
index 59b406d16d..6c7cfe125b 100644
--- a/types/react-icons/ti/star.d.ts
+++ b/types/react-icons/ti/star.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStar extends React.Component<IconBaseProps, any> { }
+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
index 7ee57068e6..621a50c206 100644
--- a/types/react-icons/ti/starburst-outline.d.ts
+++ b/types/react-icons/ti/starburst-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburstOutline extends React.Component<IconBaseProps, any> { }
+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
index 950f3f3837..5deb65f908 100644
--- a/types/react-icons/ti/starburst.d.ts
+++ b/types/react-icons/ti/starburst.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStarburst extends React.Component<IconBaseProps, any> { }
+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
index 570d22a240..2433dc6b21 100644
--- a/types/react-icons/ti/stopwatch.d.ts
+++ b/types/react-icons/ti/stopwatch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiStopwatch extends React.Component<IconBaseProps, any> { }
+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
index 7fb4340b16..629e7c1596 100644
--- a/types/react-icons/ti/support.d.ts
+++ b/types/react-icons/ti/support.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiSupport extends React.Component<IconBaseProps, any> { }
+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
index 088e59b231..a3debbbc0a 100644
--- a/types/react-icons/ti/tabs-outline.d.ts
+++ b/types/react-icons/ti/tabs-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTabsOutline extends React.Component<IconBaseProps, any> { }
+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
index 5d29cb13e2..ec88c4ff81 100644
--- a/types/react-icons/ti/tag.d.ts
+++ b/types/react-icons/ti/tag.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTag extends React.Component<IconBaseProps, any> { }
+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
index e0999089c3..a0e4a1a154 100644
--- a/types/react-icons/ti/tags.d.ts
+++ b/types/react-icons/ti/tags.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTags extends React.Component<IconBaseProps, any> { }
+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
index 5038ca9a63..652b61667c 100644
--- a/types/react-icons/ti/th-large-outline.d.ts
+++ b/types/react-icons/ti/th-large-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThLargeOutline extends React.Component<IconBaseProps, any> { }
+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
index bfaf3fc50c..bde15e269a 100644
--- a/types/react-icons/ti/th-large.d.ts
+++ b/types/react-icons/ti/th-large.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThLarge extends React.Component<IconBaseProps, any> { }
+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
index 310a2daba2..a906b52c05 100644
--- a/types/react-icons/ti/th-list-outline.d.ts
+++ b/types/react-icons/ti/th-list-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThListOutline extends React.Component<IconBaseProps, any> { }
+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
index 1fb20eb239..ebb6163713 100644
--- a/types/react-icons/ti/th-list.d.ts
+++ b/types/react-icons/ti/th-list.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThList extends React.Component<IconBaseProps, any> { }
+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
index ae6006499a..df09e4456f 100644
--- a/types/react-icons/ti/th-menu-outline.d.ts
+++ b/types/react-icons/ti/th-menu-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenuOutline extends React.Component<IconBaseProps, any> { }
+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
index 567b300de4..e03eadc959 100644
--- a/types/react-icons/ti/th-menu.d.ts
+++ b/types/react-icons/ti/th-menu.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThMenu extends React.Component<IconBaseProps, any> { }
+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
index df34e90c63..995c8c1f88 100644
--- a/types/react-icons/ti/th-small-outline.d.ts
+++ b/types/react-icons/ti/th-small-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmallOutline extends React.Component<IconBaseProps, any> { }
+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
index 62ee4f2b86..332f49b3f1 100644
--- a/types/react-icons/ti/th-small.d.ts
+++ b/types/react-icons/ti/th-small.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThSmall extends React.Component<IconBaseProps, any> { }
+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
index a289a4ebe2..771653ad7b 100644
--- a/types/react-icons/ti/thermometer.d.ts
+++ b/types/react-icons/ti/thermometer.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThermometer extends React.Component<IconBaseProps, any> { }
+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
index f5bddbdf2b..bb60d7aaa9 100644
--- a/types/react-icons/ti/thumbs-down.d.ts
+++ b/types/react-icons/ti/thumbs-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsDown extends React.Component<IconBaseProps, any> { }
+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
index 7f66dc8f75..610f5a2633 100644
--- a/types/react-icons/ti/thumbs-ok.d.ts
+++ b/types/react-icons/ti/thumbs-ok.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsOk extends React.Component<IconBaseProps, any> { }
+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
index 6d82cec29a..01747a7a8b 100644
--- a/types/react-icons/ti/thumbs-up.d.ts
+++ b/types/react-icons/ti/thumbs-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiThumbsUp extends React.Component<IconBaseProps, any> { }
+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
index 249173f1c3..8c8fd0025c 100644
--- a/types/react-icons/ti/tick-outline.d.ts
+++ b/types/react-icons/ti/tick-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTickOutline extends React.Component<IconBaseProps, any> { }
+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
index a62e4329b8..fc06a6fe51 100644
--- a/types/react-icons/ti/tick.d.ts
+++ b/types/react-icons/ti/tick.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTick extends React.Component<IconBaseProps, any> { }
+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
index d657ac60c9..3248f1018c 100644
--- a/types/react-icons/ti/ticket.d.ts
+++ b/types/react-icons/ti/ticket.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTicket extends React.Component<IconBaseProps, any> { }
+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
index e1293485fd..fd09903b66 100644
--- a/types/react-icons/ti/time.d.ts
+++ b/types/react-icons/ti/time.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTime extends React.Component<IconBaseProps, any> { }
+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
index 38641bdc1b..52fd65e3ba 100644
--- a/types/react-icons/ti/times-outline.d.ts
+++ b/types/react-icons/ti/times-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTimesOutline extends React.Component<IconBaseProps, any> { }
+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
index 06f126b3aa..1b60d77610 100644
--- a/types/react-icons/ti/times.d.ts
+++ b/types/react-icons/ti/times.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTimes extends React.Component<IconBaseProps, any> { }
+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
index 1926dfb344..2772532c76 100644
--- a/types/react-icons/ti/trash.d.ts
+++ b/types/react-icons/ti/trash.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTrash extends React.Component<IconBaseProps, any> { }
+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
index 36c4249d9f..a0f46de32e 100644
--- a/types/react-icons/ti/tree.d.ts
+++ b/types/react-icons/ti/tree.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiTree extends React.Component<IconBaseProps, any> { }
+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
index 1a6ab4d12a..541435783e 100644
--- a/types/react-icons/ti/upload-outline.d.ts
+++ b/types/react-icons/ti/upload-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUploadOutline extends React.Component<IconBaseProps, any> { }
+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
index 3721ff392a..5875c4576b 100644
--- a/types/react-icons/ti/upload.d.ts
+++ b/types/react-icons/ti/upload.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUpload extends React.Component<IconBaseProps, any> { }
+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
index 7bf5f9e6ec..80590bcdaa 100644
--- a/types/react-icons/ti/user-add-outline.d.ts
+++ b/types/react-icons/ti/user-add-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAddOutline extends React.Component<IconBaseProps, any> { }
+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
index d4cc8f6864..18d297cb33 100644
--- a/types/react-icons/ti/user-add.d.ts
+++ b/types/react-icons/ti/user-add.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserAdd extends React.Component<IconBaseProps, any> { }
+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
index 166fcee8d4..19f98f8eed 100644
--- a/types/react-icons/ti/user-delete-outline.d.ts
+++ b/types/react-icons/ti/user-delete-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDeleteOutline extends React.Component<IconBaseProps, any> { }
+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
index 3faee3fea7..2c12847a35 100644
--- a/types/react-icons/ti/user-delete.d.ts
+++ b/types/react-icons/ti/user-delete.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserDelete extends React.Component<IconBaseProps, any> { }
+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
index 678248ec48..64e4678e0c 100644
--- a/types/react-icons/ti/user-outline.d.ts
+++ b/types/react-icons/ti/user-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUserOutline extends React.Component<IconBaseProps, any> { }
+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
index 65f9301059..a333a43892 100644
--- a/types/react-icons/ti/user.d.ts
+++ b/types/react-icons/ti/user.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiUser extends React.Component<IconBaseProps, any> { }
+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
index ddeaf6294d..8075011cff 100644
--- a/types/react-icons/ti/vendor-android.d.ts
+++ b/types/react-icons/ti/vendor-android.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorAndroid extends React.Component<IconBaseProps, any> { }
+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
index 1aae854676..d100e9de7f 100644
--- a/types/react-icons/ti/vendor-apple.d.ts
+++ b/types/react-icons/ti/vendor-apple.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorApple extends React.Component<IconBaseProps, any> { }
+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
index 1560a0c875..fc2393f6c8 100644
--- a/types/react-icons/ti/vendor-microsoft.d.ts
+++ b/types/react-icons/ti/vendor-microsoft.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVendorMicrosoft extends React.Component<IconBaseProps, any> { }
+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
index ae77d76385..ff4ded254c 100644
--- a/types/react-icons/ti/video-outline.d.ts
+++ b/types/react-icons/ti/video-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVideoOutline extends React.Component<IconBaseProps, any> { }
+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
index c7236aafcf..59503c717e 100644
--- a/types/react-icons/ti/video.d.ts
+++ b/types/react-icons/ti/video.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVideo extends React.Component<IconBaseProps, any> { }
+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
index c338204f76..cd012e5287 100644
--- a/types/react-icons/ti/volume-down.d.ts
+++ b/types/react-icons/ti/volume-down.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeDown extends React.Component<IconBaseProps, any> { }
+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
index db7d255f7c..df323c2347 100644
--- a/types/react-icons/ti/volume-mute.d.ts
+++ b/types/react-icons/ti/volume-mute.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeMute extends React.Component<IconBaseProps, any> { }
+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
index cde5adfbbf..443c4bb060 100644
--- a/types/react-icons/ti/volume-up.d.ts
+++ b/types/react-icons/ti/volume-up.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolumeUp extends React.Component<IconBaseProps, any> { }
+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
index 525837ff15..ebbe9bac7a 100644
--- a/types/react-icons/ti/volume.d.ts
+++ b/types/react-icons/ti/volume.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiVolume extends React.Component<IconBaseProps, any> { }
+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
index 0c96fb1d1f..66d630a33d 100644
--- a/types/react-icons/ti/warning-outline.d.ts
+++ b/types/react-icons/ti/warning-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWarningOutline extends React.Component<IconBaseProps, any> { }
+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
index f4abcac286..394d46e315 100644
--- a/types/react-icons/ti/warning.d.ts
+++ b/types/react-icons/ti/warning.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWarning extends React.Component<IconBaseProps, any> { }
+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
index bb7dc94590..191379a23f 100644
--- a/types/react-icons/ti/watch.d.ts
+++ b/types/react-icons/ti/watch.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWatch extends React.Component<IconBaseProps, any> { }
+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
index 26699df416..814f0bb4bd 100644
--- a/types/react-icons/ti/waves-outline.d.ts
+++ b/types/react-icons/ti/waves-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWavesOutline extends React.Component<IconBaseProps, any> { }
+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
index 0abde84a67..10d88f9f9c 100644
--- a/types/react-icons/ti/waves.d.ts
+++ b/types/react-icons/ti/waves.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWaves extends React.Component<IconBaseProps, any> { }
+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
index 4fecafecd9..f0a7569133 100644
--- a/types/react-icons/ti/weather-cloudy.d.ts
+++ b/types/react-icons/ti/weather-cloudy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherCloudy extends React.Component<IconBaseProps, any> { }
+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
index 8ba3c5728b..945dd0b196 100644
--- a/types/react-icons/ti/weather-downpour.d.ts
+++ b/types/react-icons/ti/weather-downpour.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherDownpour extends React.Component<IconBaseProps, any> { }
+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
index 4c47d64bf4..72b8e61ebd 100644
--- a/types/react-icons/ti/weather-night.d.ts
+++ b/types/react-icons/ti/weather-night.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherNight extends React.Component<IconBaseProps, any> { }
+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
index 34d6675e6f..9acece9fcf 100644
--- a/types/react-icons/ti/weather-partly-sunny.d.ts
+++ b/types/react-icons/ti/weather-partly-sunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherPartlySunny extends React.Component<IconBaseProps, any> { }
+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
index 93b10b35e4..d96b321350 100644
--- a/types/react-icons/ti/weather-shower.d.ts
+++ b/types/react-icons/ti/weather-shower.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherShower extends React.Component<IconBaseProps, any> { }
+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
index 52fe41d4f8..8e274c5f85 100644
--- a/types/react-icons/ti/weather-snow.d.ts
+++ b/types/react-icons/ti/weather-snow.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSnow extends React.Component<IconBaseProps, any> { }
+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
index 62ee35ffd3..0fe69851dc 100644
--- a/types/react-icons/ti/weather-stormy.d.ts
+++ b/types/react-icons/ti/weather-stormy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherStormy extends React.Component<IconBaseProps, any> { }
+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
index 0a0d0cfd60..96bb430093 100644
--- a/types/react-icons/ti/weather-sunny.d.ts
+++ b/types/react-icons/ti/weather-sunny.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherSunny extends React.Component<IconBaseProps, any> { }
+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
index c17fbc8411..d28624e436 100644
--- a/types/react-icons/ti/weather-windy-cloudy.d.ts
+++ b/types/react-icons/ti/weather-windy-cloudy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindyCloudy extends React.Component<IconBaseProps, any> { }
+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
index 3fd222eb96..e5808895f1 100644
--- a/types/react-icons/ti/weather-windy.d.ts
+++ b/types/react-icons/ti/weather-windy.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWeatherWindy extends React.Component<IconBaseProps, any> { }
+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
index ada51caf0c..54c27adcb2 100644
--- a/types/react-icons/ti/wi-fi-outline.d.ts
+++ b/types/react-icons/ti/wi-fi-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFiOutline extends React.Component<IconBaseProps, any> { }
+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
index eed06f84b6..46cc54f2f5 100644
--- a/types/react-icons/ti/wi-fi.d.ts
+++ b/types/react-icons/ti/wi-fi.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWiFi extends React.Component<IconBaseProps, any> { }
+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
index 4db5a57881..aab4d0d43e 100644
--- a/types/react-icons/ti/wine.d.ts
+++ b/types/react-icons/ti/wine.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWine extends React.Component<IconBaseProps, any> { }
+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
index 8bd29b3a07..deb94cd766 100644
--- a/types/react-icons/ti/world-outline.d.ts
+++ b/types/react-icons/ti/world-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWorldOutline extends React.Component<IconBaseProps, any> { }
+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
index 91715929d1..54d7682959 100644
--- a/types/react-icons/ti/world.d.ts
+++ b/types/react-icons/ti/world.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiWorld extends React.Component<IconBaseProps, any> { }
+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
index 3f8573357d..9f0c9c98a7 100644
--- a/types/react-icons/ti/zoom-in-outline.d.ts
+++ b/types/react-icons/ti/zoom-in-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomInOutline extends React.Component<IconBaseProps, any> { }
+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
index 7cc26e519c..4b9716467b 100644
--- a/types/react-icons/ti/zoom-in.d.ts
+++ b/types/react-icons/ti/zoom-in.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomIn extends React.Component<IconBaseProps, any> { }
+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
index b9ebf3a40e..bdb15bbf3f 100644
--- a/types/react-icons/ti/zoom-out-outline.d.ts
+++ b/types/react-icons/ti/zoom-out-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutOutline extends React.Component<IconBaseProps, any> { }
+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
index 47bd6aa397..e6b1bb1bd3 100644
--- a/types/react-icons/ti/zoom-out.d.ts
+++ b/types/react-icons/ti/zoom-out.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOut extends React.Component<IconBaseProps, any> { }
+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
index 2740a4ff1a..066a240186 100644
--- a/types/react-icons/ti/zoom-outline.d.ts
+++ b/types/react-icons/ti/zoom-outline.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoomOutline extends React.Component<IconBaseProps, any> { }
+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
index eaf04f5f2c..74bda099c6 100644
--- a/types/react-icons/ti/zoom.d.ts
+++ b/types/react-icons/ti/zoom.d.ts
@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { IconBaseProps } from 'react-icon-base';
-export default class TiZoom extends React.Component<IconBaseProps, any> { }
+export default class TiZoom extends React.Component<IconBaseProps> { }
diff --git a/types/react-imageloader/index.d.ts b/types/react-imageloader/index.d.ts
index 8f39d72aa9..4038e90ae0 100644
--- a/types/react-imageloader/index.d.ts
+++ b/types/react-imageloader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hzdg/react-imageloader
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -33,7 +33,7 @@ declare module "react-imageloader" {
       wrapper?: (props: any) => React.ReactElement<any>;
   }
 
-  class ImageLoader extends React.Component<ImageLoaderProps, {}> {}
+  class ImageLoader extends React.Component<ImageLoaderProps> {}
 
   export = ImageLoader;
 }
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index a563b88966..b833c48981 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/CassetteRocks/react-infinite-scroller
 // Definitions by: Lauri Lavanti <https://github.com/Lapanti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-infinite-scroller' {
     import * as React from 'react';
@@ -55,7 +55,11 @@ declare module 'react-infinite-scroller' {
          * Defaults to true.
          */
         useWindow?: boolean;
+        /**
+         * Loader component for indicating "loading more".
+         */
+        loader?: React.ReactElement<any>;
     }
 
-    export default class InfiniteScroll extends React.Component<InfiniteScrollProps, any> { }
+    export default class InfiniteScroll extends React.Component<InfiniteScrollProps> { }
 }
diff --git a/types/react-infinite-scroller/react-infinite-scroller-tests.tsx b/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
index e98f1dc7f8..e3171fff46 100644
--- a/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
+++ b/types/react-infinite-scroller/react-infinite-scroller-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import InfiniteScroll from 'react-infinite-scroller';
 
-class Test1 extends React.Component<{}, {}> {
+class Test1 extends React.Component {
     public render() {
         return (
             <InfiniteScroll
@@ -13,7 +13,7 @@ class Test1 extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component {
     public render() {
         return (
             <InfiniteScroll
diff --git a/types/react-infinite/index.d.ts b/types/react-infinite/index.d.ts
index b8999b0817..28d3ead9b7 100644
--- a/types/react-infinite/index.d.ts
+++ b/types/react-infinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/seatgeek/react-infinite
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
@@ -29,7 +29,7 @@ declare namespace ReactInfinite {
 		displayBottomUpwards?: boolean;
 	}
 
-	export class Infinite extends React.Component<InfiniteProps, {}> {
+	export class Infinite extends React.Component<InfiniteProps> {
 		static containerHeightScaleFactor(n: number): any;
 	}
 }
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index ea68999afc..9736f979a0 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Infinite = require('react-infinite');
 
-class Test1 extends React.Component<{}, {}> {
+class Test1 extends React.Component {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={40}>
@@ -13,7 +13,7 @@ class Test1 extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}>
@@ -25,7 +25,7 @@ class Test2 extends React.Component<{}, {}> {
     }
 }
 
-class Test3 extends React.Component<{}, {}> {
+class Test3 extends React.Component {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}
@@ -38,7 +38,7 @@ class Test3 extends React.Component<{}, {}> {
     }
 }
 
-class Test4 extends React.Component<{}, {}> {
+class Test4 extends React.Component {
     render() {
         return (
             <Infinite containerHeight={200} elementHeight={[111, 252, 143]}
diff --git a/types/react-input-calendar/index.d.ts b/types/react-input-calendar/index.d.ts
index 11e6fd6fe8..daa97aed68 100644
--- a/types/react-input-calendar/index.d.ts
+++ b/types/react-input-calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Rudeg/react-input-calendar
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 560dc8cc2b..4396198fde 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -37,8 +37,8 @@ declare namespace reactInputMask {
          */
         alwaysShowMask?: boolean;
     }
-    class ReactInputMask extends React.Component<ReactInputMaskProps, {}> {
+    class ReactInputMask extends React.Component<ReactInputMaskProps> {
     }
 }
 declare var ReactInputMask: typeof reactInputMask.ReactInputMask;
-export = ReactInputMask;
+export default ReactInputMask;
diff --git a/types/react-input-mask/react-input-mask-tests.tsx b/types/react-input-mask/react-input-mask-tests.tsx
index 0a4f2cd74e..d116b2b27a 100644
--- a/types/react-input-mask/react-input-mask-tests.tsx
+++ b/types/react-input-mask/react-input-mask-tests.tsx
@@ -1,4 +1,4 @@
-import * as ReactInputMask from 'react-input-mask';
+import ReactInputMask from 'react-input-mask';
 import * as React from 'react';
 
 <div>
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index 6182c38cab..bd5069d8f1 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ratson/react-intl-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Action } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 2b55a471ec..018d7ec9a2 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -1,20 +1,22 @@
-// Type definitions for react-intl 2.2
+// Type definitions for react-intl 2.3
 // Project: http://formatjs.io/react/
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>,
 //                 Christian Droulers <https://github.com/cdroulers>,
 //                 Fedor Nezhivoi <https://github.com/gyzerok>,
 //                 Till Wolff <https://github.com/tillwolff>,
 //                 Karol Janyst <https://github.com/LKay>,
-//                 Brian Houser <https://github.com/bhouser>
+//                 Brian Houser <https://github.com/bhouser>,
+//                 Krister Kari <https://github.com/kristerkari>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare namespace ReactIntl {
+    type DateSource = Date | string | number;
 
     interface Locale {
         locale: string;
-        fields?: { [key: string]: string },
-        pluralRuleFunction?: (n: number, ord: boolean) => string;
+        fields?: { [key: string]: string };
+        pluralRuleFunction?(n: number, ord: boolean): string;
     }
 
     type LocaleData = Locale[];
@@ -24,7 +26,7 @@ declare namespace ReactIntl {
         withRef?: boolean;
     }
 
-    type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>
+    type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
 
     function injectIntl<P>(component: ComponentConstructor<P & InjectedIntlProps>, options?: InjectIntlConfig):
         React.ComponentClass<P> & { WrappedComponent: ComponentConstructor<P & InjectedIntlProps> };
@@ -32,7 +34,7 @@ declare namespace ReactIntl {
     function addLocaleData(data: Locale[] | Locale): void;
 
     interface Messages {
-        [key: string]: FormattedMessage.MessageDescriptor
+        [key: string]: FormattedMessage.MessageDescriptor;
     }
 
     function defineMessages<T extends Messages>(messages: T): T;
@@ -62,19 +64,19 @@ declare namespace ReactIntl {
     const intlShape: IntlShape;
 
     interface InjectedIntl {
-        formatDate: (date: Date, options?: FormattedDate.PropsBase) => string;
-        formatTime: (date: Date, options?: FormattedTime.PropsBase) => string;
-        formatRelative: (value: number, options?: FormattedRelative.PropsBase & { now?: any }) => string;
-        formatNumber: (value: number, options?: FormattedNumber.PropsBase) => string;
-        formatPlural: (value: number, options?: FormattedPlural.Base) => keyof FormattedPlural.PropsBase;
-        formatMessage: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string | number}) => string;
-        formatHTMLMessage: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string}) => string;
+        formatDate(value: DateSource, options?: FormattedDate.PropsBase): string;
+        formatTime(value: DateSource, options?: FormattedTime.PropsBase): string;
+        formatRelative(value: DateSource, options?: FormattedRelative.PropsBase & { now?: any }): string;
+        formatNumber(value: number, options?: FormattedNumber.PropsBase): string;
+        formatPlural(value: number, options?: FormattedPlural.Base): keyof FormattedPlural.PropsBase;
+        formatMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string | number | boolean | Date}): string;
+        formatHTMLMessage(messageDescriptor: FormattedMessage.MessageDescriptor, values?: {[key: string]: string | number | boolean | Date}): string;
         locale: string;
         formats: any;
         messages: { [id: string]: string };
         defaultLocale: string;
         defaultFormats: any;
-        now : () => number;
+        now(): number;
     }
 
     interface InjectedIntlProps {
@@ -88,26 +90,26 @@ declare namespace ReactIntl {
     }
 
     namespace FormattedDate {
-        export interface PropsBase extends IntlComponent.DateTimeFormatProps {}
+        type PropsBase = IntlComponent.DateTimeFormatProps;
 
-        export interface Props extends PropsBase {
-            value: Date;
+        interface Props extends PropsBase {
+            value: DateSource;
         }
     }
 
-    class FormattedDate extends React.Component<FormattedDate.Props, any> { }
+    class FormattedDate extends React.Component<FormattedDate.Props> { }
 
     namespace FormattedTime {
-        export interface PropsBase extends IntlComponent.DateTimeFormatProps {}
+        type PropsBase = IntlComponent.DateTimeFormatProps;
 
-        export interface Props extends PropsBase {
-            value: Date;
+        interface Props extends PropsBase {
+            value: DateSource;
         }
     }
-    class FormattedTime extends React.Component<FormattedTime.Props, any> { }
+    class FormattedTime extends React.Component<FormattedTime.Props> { }
 
     namespace FormattedRelative {
-        export interface PropsBase {
+        interface PropsBase {
             /*
              * one of "second", "minute", "hour", "day", "month" or "year"
              */
@@ -121,50 +123,49 @@ declare namespace ReactIntl {
             initialNow?: any;
         }
 
-        export interface Props extends PropsBase {
-            value: number;
+        interface Props extends PropsBase {
+            value: DateSource;
         }
     }
 
-    class FormattedRelative extends React.Component<FormattedRelative.Props, any> { }
+    class FormattedRelative extends React.Component<FormattedRelative.Props> { }
 
     namespace FormattedMessage {
-        export interface MessageDescriptor {
+        interface MessageDescriptor {
             id: string;
             description?: string;
             defaultMessage?: string;
         }
 
-        export interface Props extends MessageDescriptor {
+        interface Props extends MessageDescriptor {
             values?: {[key: string]: string | number | JSX.Element};
             tagName?: string;
         }
     }
-    class FormattedMessage extends React.Component<FormattedMessage.Props, any> { }
+    class FormattedMessage extends React.Component<FormattedMessage.Props> { }
 
-    class FormattedHTMLMessage extends React.Component<FormattedMessage.Props, any> { }
+    class FormattedHTMLMessage extends React.Component<FormattedMessage.Props> { }
 
     namespace FormattedNumber {
-        export interface PropsBase extends Intl.NumberFormatOptions {
+        interface PropsBase extends Intl.NumberFormatOptions {
             format?: string;
         }
 
-        export interface Props extends PropsBase {
+        interface Props extends PropsBase {
             value: number;
         }
     }
-    class FormattedNumber extends React.Component<FormattedNumber.Props, any> { }
-
+    class FormattedNumber extends React.Component<FormattedNumber.Props> { }
 
     namespace FormattedPlural {
-        export interface Base {
+        interface Base {
             /*
              * one of "cardinal" (default) | "ordinal"
              */
             style?: "cardinal" | "ordinal";
         }
 
-        export interface PropsBase extends Base {
+        interface PropsBase extends Base {
             other?: any;
             zero?: any;
             one?: any;
@@ -173,15 +174,14 @@ declare namespace ReactIntl {
             many?: any;
         }
 
-        export interface Props extends PropsBase {
+        interface Props extends PropsBase {
             value: number;
         }
     }
-    class FormattedPlural extends React.Component<FormattedPlural.Props, any> { }
-
+    class FormattedPlural extends React.Component<FormattedPlural.Props> { }
 
     namespace IntlProvider {
-        export interface Props {
+        interface Props {
             locale?: string;
             formats?: any;
             messages?: any;
@@ -191,15 +191,15 @@ declare namespace ReactIntl {
         }
     }
 
-    class IntlProvider extends React.Component<IntlProvider.Props, any> {
+    class IntlProvider extends React.Component<IntlProvider.Props> {
         getChildContext(): {
             intl: InjectedIntl;
-        }
+        };
     }
 }
 
 declare module "react-intl" {
-    export = ReactIntl
+    export = ReactIntl;
 }
 
 declare module "react-intl/locale-data/af" {
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index a9717147e9..c3882f9461 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -3,8 +3,8 @@
  * Updated by Fedor Nezhivoi
  */
 
-import * as React from "react"
-import * as reactMixin from "react-mixin"
+import * as React from "react";
+import * as reactMixin from "react-mixin";
 
 import {
     IntlProvider,
@@ -21,14 +21,14 @@ import {
     FormattedPlural,
     FormattedDate,
     FormattedTime
-} from "react-intl"
+} from "react-intl";
 
 import reactIntlEn = require("react-intl/locale-data/en");
 
 addLocaleData(reactIntlEn);
 
 interface SomeComponentProps {
-    className: string
+    className: string;
 }
 
 const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps> = injectIntl<SomeComponentProps>(({
@@ -51,7 +51,10 @@ const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps>
     const formattedNumber = formatNumber(123, { format: "short" });
     const formattedPlural = formatPlural(1, { style: "ordinal" });
     const formattedMessage = formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger" });
-    const formattedMessagePlurals = formatMessage({ id: "hello", defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!" }, { name: "Roger", unreadCount: 123 });
+    const formattedMessagePlurals = formatMessage({
+        id: "hello",
+        defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!" },
+        { name: "Roger", unreadCount: 123 });
     const formattedHTMLMessage = formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger" });
     return (
         <div className={className}>
@@ -59,7 +62,7 @@ const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps>
     );
 });
 
-class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlProps, void> {
+class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlProps> {
     static propTypes: React.ValidationMap<any> = {
         intl: intlShape.isRequired
     };
@@ -71,8 +74,17 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
         const formattedNumber = intl.formatNumber(123, { format: "short" });
         const formattedPlural = intl.formatPlural(1, { style: "ordinal" });
         const formattedMessage = intl.formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger" });
-        const formattedMessagePlurals = intl.formatMessage({ id: "hello", defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!" }, { name: "Roger", unreadCount: 123 });
+        const formattedMessageNumber = intl.formatMessage({ id: "hello", defaultMessage: "Hello {num}!" }, { num: 1 });
+        const formattedMessageDate = intl.formatMessage({ id: "hello", defaultMessage: "Hello {date}!" }, { date: new Date() });
+        const formattedMessageBool = intl.formatMessage({ id: "hello", defaultMessage: "Hello {bool}!" }, { bool: true });
+        const formattedMessagePlurals = intl.formatMessage({
+            id: "hello",
+            defaultMessage: "Hello {name} you have {unreadCount, number} {unreadCount, plural, one {message} other {messages}}!" },
+            { name: "Roger", unreadCount: 123 });
         const formattedHTMLMessage = intl.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger" });
+        const formattedHTMLMessageNumber = intl.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{num}</strong>!" }, { num: 1 });
+        const formattedHTMLMessageDate = intl.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{date}</strong>!" }, { date: new Date() });
+        const formattedHTMLMessageBool = intl.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{bool}</strong>!" }, { bool: true });
         return <div className={this.props.className}>
             <FormattedRelative
                 value={new Date().getTime()}
@@ -165,6 +177,23 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
                 second="2-digit"
                 timeZoneName="short" />
 
+            <FormattedDate
+                value={Date.now()}
+                format="short"
+                localeMatcher="best fit"
+                formatMatcher="basic"
+                timeZone="EDT"
+                hour12={false}
+                weekday="short"
+                era="short"
+                year="2-digit"
+                month="2-digit"
+                day="2-digit"
+                hour="2-digit"
+                minute="2-digit"
+                second="2-digit"
+                timeZoneName="short" />
+
             <FormattedTime
                 value={new Date()}
                 format="short"
@@ -182,28 +211,45 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
                 second="2-digit"
                 timeZoneName="short" />
 
+            <FormattedTime
+                value={Date.now()}
+                format="short"
+                localeMatcher="best fit"
+                formatMatcher="basic"
+                timeZone="EDT"
+                hour12={false}
+                weekday="short"
+                era="short"
+                year="2-digit"
+                month="2-digit"
+                day="2-digit"
+                hour="2-digit"
+                minute="2-digit"
+                second="2-digit"
+                timeZoneName="short" />
+
             <FormattedNumber value={123}>
                 {(formattedNum: string) => (
                     <span className="number">{formattedNum}</span>
                 )}
             </FormattedNumber>
-        </div>
+        </div>;
     }
 }
 
 const SomeComponentWithIntl = injectIntl(SomeComponent);
 
-class TestApp extends React.Component<{}, {}> {
+class TestApp extends React.Component {
     render(): React.ReactElement<{}> {
         const definedMessages = defineMessages({
-            "sup": {
+            sup: {
                 id: "sup",
                 defaultMessage: "Hai mom"
             }
         });
 
         const messages = {
-            "hello": "Hello, {name}!"
+            hello: "Hello, {name}!"
         };
         return (
             <IntlProvider locale="en" formats={{}} messages={messages} defaultLocale="en" defaultFormats={messages}>
@@ -216,9 +262,9 @@ class TestApp extends React.Component<{}, {}> {
 
 const intlProvider = new IntlProvider({ locale: 'en' }, {});
 const { intl } = intlProvider.getChildContext();
-const wrappedComponent = <SomeComponentWithIntl.WrappedComponent className="test" intl={intl}/>
+const wrappedComponent = <SomeComponentWithIntl.WrappedComponent className="test" intl={intl}/>;
 
 export default {
     TestApp,
     SomeComponent: SomeComponentWithIntl
-}
+};
diff --git a/types/react-intl/tslint.json b/types/react-intl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-intl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-intl/v1/index.d.ts b/types/react-intl/v1/index.d.ts
index e5f2c7e906..fcbd8ccddf 100644
--- a/types/react-intl/v1/index.d.ts
+++ b/types/react-intl/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://formatjs.io/react/
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
diff --git a/types/react-intl/v1/react-intl-tests.tsx b/types/react-intl/v1/react-intl-tests.tsx
index c7834b6583..33abc5890d 100644
--- a/types/react-intl/v1/react-intl-tests.tsx
+++ b/types/react-intl/v1/react-intl-tests.tsx
@@ -31,7 +31,7 @@ namespace I18nDirect {
     export interface Props extends IntlComponent.Props {}
 }
 
-class I18nDirect extends React.Component<I18nDirect.Props, any> {
+class I18nDirect extends React.Component<I18nDirect.Props> {
 
     private _currentLocale: string
     private _messages: {[key: string]: string}
@@ -102,7 +102,7 @@ namespace I18nMixin {
 }
 
 @reactMixin.decorate( IntlMixin )
-class I18nMixin extends React.Component<I18nMixin.Props, any> implements IntlComponent {
+class I18nMixin extends React.Component<I18nMixin.Props> implements IntlComponent {
 
     private _currentLocale: string
 
diff --git a/types/react-is-deprecated/index.d.ts b/types/react-is-deprecated/index.d.ts
index 78b69921cd..b493f793fe 100644
--- a/types/react-is-deprecated/index.d.ts
+++ b/types/react-is-deprecated/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Aweary/react-is-deprecated
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-is-deprecated' {
   import { Validator, Requireable, ValidationMap, ReactPropTypes } from 'react';
diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 82f82d26f2..757b538db1 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/gilbarbara/react-joyride
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>, Ben Dixon <https://github.com/bendxn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import React = require("react");
+import * as React from "react";
 
 export default class Joyride extends React.Component<Props, State> {
     constructor(props: Props);
diff --git a/types/react-joyride/react-joyride-tests.tsx b/types/react-joyride/react-joyride-tests.tsx
index e17745b893..b5658bda95 100644
--- a/types/react-joyride/react-joyride-tests.tsx
+++ b/types/react-joyride/react-joyride-tests.tsx
@@ -1,4 +1,4 @@
-import React = require("react");
+import * as React from "react";
 import Joyride, { Step } from "react-joyride";
 
 class NewComponent extends React.Component<undefined, undefined> {
diff --git a/types/react-json-pretty/index.d.ts b/types/react-json-pretty/index.d.ts
index 00f3f8b4ff..56ee3e50b8 100644
--- a/types/react-json-pretty/index.d.ts
+++ b/types/react-json-pretty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenckang/react-json-pretty
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, HTMLProps } from "react";
 
diff --git a/types/react-json-pretty/react-json-pretty-tests.tsx b/types/react-json-pretty/react-json-pretty-tests.tsx
index 485aaf6e68..95818442df 100644
--- a/types/react-json-pretty/react-json-pretty-tests.tsx
+++ b/types/react-json-pretty/react-json-pretty-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as JSONPretty from "react-json-pretty";
 
-export class Test extends React.Component<any, any> {
+export class Test extends React.Component {
     render() {
         const json = {
             foo: "bar"
diff --git a/types/react-json-tree/index.d.ts b/types/react-json-tree/index.d.ts
index 5939638495..d227c16a1e 100644
--- a/types/react-json-tree/index.d.ts
+++ b/types/react-json-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alexkuz/react-json-tree/
 // Definitions by: Grant Nestor <https://github.com/gnestor/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import {
     Component,
@@ -25,4 +25,4 @@ export interface JSONTreeProps extends Props<JSONTreeComponent> {
     collectionLimit?: number;
 }
 
-export default class JSONTreeComponent extends Component<JSONTreeProps, {}> { }
+export default class JSONTreeComponent extends Component<JSONTreeProps> { }
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 6ac5f40109..059c83714a 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mozilla-services/react-jsonschema-form
 // Definitions by: Dan Fox <https://github.com/iamdanfox>, Jon Surrell <https://github.com/sirreal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-jsonschema-form" {
     import * as React from "react";
@@ -33,5 +33,5 @@ declare module "react-jsonschema-form" {
         status: string;
     }
 
-    export default class Form extends React.Component<FormProps, any> {}
+    export default class Form extends React.Component<FormProps> {}
 }
diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
new file mode 100644
index 0000000000..2766d998b0
--- /dev/null
+++ b/types/react-lazyload/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for react-lazyload ver 2.2
+// Project: https://github.com/jasonslyvia/react-lazyload
+// Definitions by: m0a <https://github.com/m0a>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import {Component} from 'react';
+
+export interface LazyLoadProps {
+    once?: boolean;
+    height?: number | string;
+    offset?: number | string;
+    overflow?: boolean;
+    scroll?: boolean;
+    children?: JSX.Element;
+    throttle?: number | boolean;
+    debounce?: number | boolean;
+    placeholder?: Node;
+    unmountIfInvisible?: boolean;
+}
+
+export default class LazyLoad extends Component<LazyLoadProps> {
+    constructor(props: LazyLoad);
+}
+
+export  function lazyload(option: {}): LazyLoad;
diff --git a/types/react-lazyload/react-lazyload-tests.tsx b/types/react-lazyload/react-lazyload-tests.tsx
new file mode 100644
index 0000000000..37b928a99c
--- /dev/null
+++ b/types/react-lazyload/react-lazyload-tests.tsx
@@ -0,0 +1,32 @@
+import * as React from "react";
+import LazyLoad from "react-lazyload";
+
+interface State {
+    arr: string[];
+}
+
+class Normal extends React.Component<{}, State> {
+    constructor() {
+        super();
+        let arr: string[] = [];
+        for (let i = 0; i < 200; i++) {
+            arr.push(`${i}`);
+        }
+        this.state = { arr };
+    }
+    render() {
+        return (
+            <div>
+                {this.state.arr.map((el, index) => {
+                    return (
+                        <LazyLoad once={true} key={index} height={200} offset={50}>
+                            <p id={`${index}`}  >
+                                count={index + 1}
+                            </p>
+                        </LazyLoad>
+                    );
+                })}
+            </div>
+        );
+    }
+}
diff --git a/types/react-lazyload/tsconfig.json b/types/react-lazyload/tsconfig.json
new file mode 100644
index 0000000000..d77160e99c
--- /dev/null
+++ b/types/react-lazyload/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-lazyload-tests.tsx"
+    ]
+}
diff --git a/types/react-lazyload/tslint.json b/types/react-lazyload/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-lazyload/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts
index da829ff2cc..84269cf5bf 100644
--- a/types/react-leaflet/index.d.ts
+++ b/types/react-leaflet/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for react-leaflet 1.1
 // Project: https://github.com/PaulLeCam/react-leaflet
-// Definitions by: Dave Leaver <https://github.com/danzel>, David Schneider <https://github.com/davschne>
+// Definitions by: Dave Leaver <https://github.com/danzel>, David Schneider <https://github.com/davschne>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Leaflet from 'leaflet';
 import * as React from 'react';
@@ -118,7 +118,7 @@ export type LeafletEvents = MapEvents
 // These type parameters aren't needed for instantiating a component, but they are useful for
 // extending react-leaflet classes.
 
-export class MapComponent<P, E extends Leaflet.Class> extends React.Component<P, {}> {
+export class MapComponent<P, E extends Leaflet.Class> extends React.Component<P> {
     _leafletEvents: LeafletEvents;
     leafletElement: E;
     extractLeafletEvents(props: P): LeafletEvents;
@@ -143,7 +143,7 @@ export interface MapProps extends MapEvents, Leaflet.MapOptions, Leaflet.LocateO
     zoom?: number;
 }
 
-export class Map<P extends MapProps, E extends Leaflet.Map> extends MapComponent<P, E> {
+export class Map<P extends MapProps = MapProps, E extends Leaflet.Map = Leaflet.Map> extends MapComponent<P, E> {
     className?: string;
     container: HTMLDivElement;
     getChildContext(): { layerContainer: E, map: E };
@@ -165,7 +165,7 @@ export interface PaneProps {
 export interface PaneState {
     name?: string;
 }
-export class Pane<P extends PaneProps, S extends PaneState> extends React.Component<P, S> {
+export class Pane<P extends PaneProps = PaneProps, S extends PaneState = PaneState> extends React.Component<P, S> {
     getChildContext(): { pane: string };
     createPane(props: P): void;
     removePane(): void;
@@ -181,7 +181,7 @@ export interface LayerContainer {
     addLayer(layer: Leaflet.Layer): this;
     removeLayer(layer: number | Leaflet.Layer): this;
 }
-export class MapLayer<P extends MapLayerProps, E extends Leaflet.Class> extends MapComponent<P, E> {
+export class MapLayer<P extends MapLayerProps = MapLayerProps, E extends Leaflet.Class = Leaflet.Class> extends MapComponent<P, E> {
     createLeafletElement(props: P): E;
     updateLeafletElement(fromProps: P, toProps: P): void;
     readonly layerContainer: LayerContainer | Leaflet.Map;
@@ -190,33 +190,33 @@ export class MapLayer<P extends MapLayerProps, E extends Leaflet.Class> extends
 export interface GridLayerProps extends Leaflet.GridLayerOptions {
     children?: Children;
 }
-export class GridLayer<P extends GridLayerProps, E extends Leaflet.GridLayer> extends MapLayer<P, E> {}
+export class GridLayer<P extends GridLayerProps = GridLayerProps, E extends Leaflet.GridLayer = Leaflet.GridLayer> extends MapLayer<P, E> {}
 
 export interface TileLayerProps extends TileLayerEvents, Leaflet.TileLayerOptions {
     children?: Children;
     url: string;
 }
-export class TileLayer<P extends TileLayerProps, E extends Leaflet.TileLayer> extends GridLayer<P, E> { }
+export class TileLayer<P extends TileLayerProps = TileLayerProps, E extends Leaflet.TileLayer = Leaflet.TileLayer> extends GridLayer<P, E> { }
 
 export interface WMSTileLayerProps extends TileLayerEvents, Leaflet.WMSOptions {
     children?: Children;
     url: string;
 }
-export class WMSTileLayer<P extends WMSTileLayerProps, E extends Leaflet.TileLayer.WMS> extends GridLayer<P, E> { }
+export class WMSTileLayer<P extends WMSTileLayerProps = WMSTileLayerProps,  E extends Leaflet.TileLayer.WMS = Leaflet.TileLayer.WMS> extends GridLayer<P, E> { }
 
 export interface ImageOverlayProps extends Leaflet.ImageOverlayOptions {
     bounds: Leaflet.LatLngBoundsExpression;
     children?: Children;
     url: string;
 }
-export class ImageOverlay<P extends ImageOverlayProps, E extends Leaflet.ImageOverlay> extends MapLayer<P, E> {
+export class ImageOverlay<P extends ImageOverlayProps = ImageOverlayProps, E extends Leaflet.ImageOverlay = Leaflet.ImageOverlay> extends MapLayer<P, E> {
     getChildContext(): { popupContainer: E };
 }
 
 export interface LayerGroupProps {
     children?: Children;
 }
-export class LayerGroup<P extends LayerGroupProps, E extends Leaflet.LayerGroup> extends MapLayer<P, E> {
+export class LayerGroup<P extends LayerGroupProps = LayerGroupProps, E extends Leaflet.LayerGroup = Leaflet.LayerGroup> extends MapLayer<P, E> {
     getChildContext(): { layerContainer: E };
 }
 
@@ -224,11 +224,11 @@ export interface MarkerProps extends MarkerEvents, Leaflet.MarkerOptions {
     children?: Children;
     position: Leaflet.LatLngExpression;
 }
-export class Marker<P extends MarkerProps, E extends Leaflet.Marker> extends MapLayer<P, E> {
+export class Marker<P extends MarkerProps = MarkerProps, E extends Leaflet.Marker = Leaflet.Marker> extends MapLayer<P, E> {
     getChildContext(): { popupContainer: E };
 }
 
-export interface PathProps extends PathEvents, Leaflet.PathOptions { }
+export interface PathProps extends PathEvents, Leaflet.PathOptions, MapLayerProps { }
 export abstract class Path<P extends PathProps, E> extends MapLayer<P, E> {
     getChildContext(): { popupContainer: E };
     getPathOptions(props: P): Leaflet.PathOptions;
@@ -241,19 +241,19 @@ export interface CircleProps extends PathEvents, Leaflet.CircleMarkerOptions {
     children?: Children;
     radius: number;
 }
-export class Circle<P extends CircleProps, E extends Leaflet.Circle> extends Path<P, E> { }
+export class Circle<P extends CircleProps = CircleProps, E extends Leaflet.Circle = Leaflet.Circle> extends Path<P, E> { }
 
 export interface CircleMarkerProps extends PathEvents, Leaflet.CircleMarkerOptions {
     center: Leaflet.LatLngExpression;
     children?: Children;
     radius: number;
 }
-export class CircleMarker<P extends CircleMarkerProps, E extends Leaflet.CircleMarker> extends Path<P, E> { }
+export class CircleMarker<P extends CircleMarkerProps = CircleMarkerProps, E extends Leaflet.CircleMarker = Leaflet.CircleMarker> extends Path<P, E> { }
 
 export interface FeatureGroupProps extends FeatureGroupEvents, Leaflet.PathOptions {
     children?: Children;
 }
-export class FeatureGroup<P extends FeatureGroupProps, E extends Leaflet.FeatureGroup> extends Path<P, E> {
+export class FeatureGroup<P extends FeatureGroupProps = FeatureGroupProps, E extends Leaflet.FeatureGroup = Leaflet.FeatureGroup> extends Path<P, E> {
     getChildContext(): { layerContainer: E, popupContainer: E };
 }
 
@@ -262,33 +262,33 @@ export interface GeoJSONProps extends FeatureGroupEvents, Leaflet.GeoJSONOptions
     data: GeoJSON.GeoJsonObject;
     style?: Leaflet.StyleFunction;
 }
-export class GeoJSON<P extends GeoJSONProps, E extends Leaflet.GeoJSON> extends Path<P, E> { }
+export class GeoJSON<P extends GeoJSONProps = GeoJSONProps, E extends Leaflet.GeoJSON = Leaflet.GeoJSON> extends Path<P, E> { }
 
 export interface PolylineProps extends PathEvents, Leaflet.PolylineOptions {
     children?: Children;
     positions: Leaflet.LatLngExpression[] | Leaflet.LatLngExpression[][];
 }
-export class Polyline<P extends PolylineProps, E extends Leaflet.Polyline> extends Path<P, E> { }
+export class Polyline<P extends PolylineProps = PolylineProps, E extends Leaflet.Polyline = Leaflet.Polyline> extends Path<P, E> { }
 
 export interface PolygonProps extends PathEvents, Leaflet.PolylineOptions {
     children?: Children;
     popupContainer?: Leaflet.FeatureGroup;
     positions: Leaflet.LatLngExpression[] | Leaflet.LatLngExpression[][] | Leaflet.LatLngExpression[][][];
 }
-export class Polygon<P extends PolygonProps, E extends Leaflet.Polygon> extends Path<P, E> { }
+export class Polygon<P extends PolygonProps = PolygonProps, E extends Leaflet.Polygon = Leaflet.Polygon> extends Path<P, E> { }
 
 export interface RectangleProps extends PathEvents, Leaflet.PolylineOptions {
     children?: Children;
     bounds: Leaflet.LatLngBoundsExpression;
     popupContainer?: Leaflet.FeatureGroup;
 }
-export class Rectangle<P extends RectangleProps, E extends Leaflet.Rectangle> extends Path<P, E> { }
+export class Rectangle<P extends RectangleProps = RectangleProps, E extends Leaflet.Rectangle = Leaflet.Rectangle> extends Path<P, E> { }
 
 export interface PopupProps extends Leaflet.PopupOptions {
     children?: Children;
     position?: Leaflet.LatLngExpression;
 }
-export class Popup<P extends PopupProps, E extends Leaflet.Popup> extends MapComponent<P, E> {
+export class Popup<P extends PopupProps = PopupProps, E extends Leaflet.Popup = Leaflet.Popup> extends MapComponent<P, E> {
     onPopupOpen(arg: { popup: E }): void;
     onPopupClose(arg: { popup: E }): void;
     renderPopupContent(): void;
@@ -298,7 +298,7 @@ export class Popup<P extends PopupProps, E extends Leaflet.Popup> extends MapCom
 export interface TooltipProps extends Leaflet.TooltipOptions {
     children?: Children;
 }
-export class Tooltip<P extends TooltipProps, E extends Leaflet.Tooltip> extends MapComponent<P, E> {
+export class Tooltip<P extends TooltipProps = TooltipProps, E extends Leaflet.Tooltip = Leaflet.Tooltip> extends MapComponent<P, E> {
     onTooltipOpen(arg: { tooltip: E }): void;
     onTooltipClose(arg: { tooltip: E }): void;
     renderTooltipContent(): void;
@@ -306,21 +306,21 @@ export class Tooltip<P extends TooltipProps, E extends Leaflet.Tooltip> extends
 }
 
 export type MapControlProps = Leaflet.ControlOptions;
-export class MapControl<P extends MapControlProps, E extends Leaflet.Control> extends React.Component<P, {}> {
+export class MapControl<P extends MapControlProps = MapControlProps, E extends Leaflet.Control = Leaflet.Control> extends React.Component<P> {
     leafletElement: E;
     createLeafletElement(props: P): E;
     updateLeafletElement(fromProps: P, toProps: P): void;
 }
 
 export type AttributionControlProps = Leaflet.Control.AttributionOptions;
-export class AttributionControl<P extends AttributionControlProps, E extends Leaflet.Control.Attribution> extends MapControl<P, E> { }
+export class AttributionControl<P extends AttributionControlProps = AttributionControlProps, E extends Leaflet.Control.Attribution = Leaflet.Control.Attribution> extends MapControl<P, E> { }
 
 export interface LayersControlProps extends LayersControlEvents, Leaflet.Control.LayersOptions {
     baseLayers?: Leaflet.Control.LayersObject;
     children?: Children;
     overlays?: Leaflet.Control.LayersObject;
 }
-export class LayersControl<P extends AttributionControlProps, E extends Leaflet.Control.Layers> extends MapControl<P, E> { }
+export class LayersControl<P extends LayersControlProps = LayersControlProps, E extends Leaflet.Control.Layers = Leaflet.Control.Layers> extends MapControl<P, E> { }
 
 export namespace LayersControl {
     interface BaseControlledLayerProps {
@@ -334,18 +334,18 @@ export namespace LayersControl {
         addOverlay?(layer: Leaflet.Layer, name: string, checked: boolean): void;
         name: string;
     }
-    class ControlledLayer<P extends BaseControlledLayerProps> extends React.Component<P, {}> {
+    class ControlledLayer<P extends BaseControlledLayerProps = BaseControlledLayerProps> extends React.Component<P> {
         layer?: Leaflet.Layer;
         getChildContext(): { layerContainer: LayerContainer };
         addLayer(): void;
         removeLayer(layer: Leaflet.Layer): void;
     }
-    class BaseLayer<P extends ControlledLayerProps> extends ControlledLayer<P> { }
-    class Overlay<P extends ControlledLayerProps> extends ControlledLayer<P> { }
+    class BaseLayer<P extends ControlledLayerProps = ControlledLayerProps> extends ControlledLayer<P> { }
+    class Overlay<P extends ControlledLayerProps = ControlledLayerProps> extends ControlledLayer<P> { }
 }
 
 export type ScaleControlProps = Leaflet.Control.ScaleOptions;
-export class ScaleControl<P extends ScaleControlProps, E extends Leaflet.Control.Scale> extends MapControl<P, E> { }
+export class ScaleControl<P extends ScaleControlProps = ScaleControlProps, E extends Leaflet.Control.Scale = Leaflet.Control.Scale> extends MapControl<P, E> { }
 
 export type ZoomControlProps = Leaflet.Control.ZoomOptions;
-export class ZoomControl<P extends ZoomControlProps, E extends Leaflet.Control.Zoom> extends MapControl<P, E> { }
+export class ZoomControl<P extends ZoomControlProps = ZoomControlProps, E extends Leaflet.Control.Zoom = Leaflet.Control.Zoom> extends MapControl<P, E> { }
diff --git a/types/react-leaflet/react-leaflet-tests.tsx b/types/react-leaflet/react-leaflet-tests.tsx
index 667d92d6ea..d87d4f995e 100644
--- a/types/react-leaflet/react-leaflet-tests.tsx
+++ b/types/react-leaflet/react-leaflet-tests.tsx
@@ -686,7 +686,7 @@ class CenterControl extends MapControl<MapControlProps, Leaflet.Control> {  // n
         const centerControl = new L.Control({ position: 'bottomright' });  // see http://leafletjs.com/reference.html#control-positions for other positions
         const jsx = (
             // PUT YOUR JSX FOR THE COMPONENT HERE:
-            <div {...this.props}>
+            <div>
                 {/* add your JSX */}
             </div>
         );
@@ -713,7 +713,7 @@ class LegendControl extends MapControl<MapControlProps & { className?: string },
     componentWillMount() {
         const legend = new L.Control({ position: 'bottomright' });
         const jsx = (
-            <div {...this.props}>
+            <div>
                 {this.props.children}
             </div>
         );
diff --git a/types/react-list/index.d.ts b/types/react-list/index.d.ts
new file mode 100644
index 0000000000..4a1f04b492
--- /dev/null
+++ b/types/react-list/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for react-list 0.8
+// Project: https://github.com/orgsync/react-list
+// Definitions by: Yifei Yan <https://github.com/buptyyf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import {
+    Component,
+    Props
+} from "react";
+export as namespace ReactList;
+
+/*~ If this module has methods, declare them as functions like so.
+ */
+export function scrollTo(index: number): void;
+export function scrollAround(index: number): void;
+export function getVisibleRange(): number[];
+
+/*~ You can declare types that are available via importing the module */
+export type ItemRenderer = (index: number, key: number | string) => JSX.Element;
+export type ItemsRenderer = (items: JSX.Element[], ref: string) => JSX.Element;
+export type ItemSizeEstimator = (index: number, cache: {}) => number;
+export type ItemSizeGetter = (index: number) => number;
+export type ScrollParentGetter = () => JSX.Element;
+
+export interface ReactListProps extends Props<ReactList> {
+    axis?: 'x' | 'y';
+    initialIndex?: number;
+    itemRenderer?: ItemRenderer;
+    itemSizeEstimator?: ItemSizeEstimator;
+    itemSizeGetter?: ItemSizeGetter;
+    itemsRenderer?: ItemsRenderer;
+    length?: number;
+    minSize?: number;
+    pageSize?: number;
+    scrollParentGetter?: ScrollParentGetter;
+    threshold?: number;
+    type?: string;
+    useStaticSize?: boolean;
+    useTranslate3d?: boolean;
+}
+
+export default class ReactList extends Component<ReactListProps, {}> {}
diff --git a/types/react-list/react-list-tests.tsx b/types/react-list/react-list-tests.tsx
new file mode 100644
index 0000000000..26d2781b02
--- /dev/null
+++ b/types/react-list/react-list-tests.tsx
@@ -0,0 +1,14 @@
+import * as React from "react";
+// import * as ReactDOM from "react-dom";
+import ReactList from "react-list";
+
+const renderItem = (index: number, key: number) =>
+    <div key={key} className={'item' + (index % 2 ? '' : ' even')}>
+        {index}
+    </div>;
+
+<ReactList
+    itemRenderer={renderItem}
+    type="uniform"
+    length={1000}
+/>;
diff --git a/types/react-list/tsconfig.json b/types/react-list/tsconfig.json
new file mode 100644
index 0000000000..42ddc64a91
--- /dev/null
+++ b/types/react-list/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-list-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-list/tslint.json b/types/react-list/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-list/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-loadable/babel.d.ts b/types/react-loadable/babel.d.ts
deleted file mode 100644
index a9f18c2e00..0000000000
--- a/types/react-loadable/babel.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as babel from 'babel-core';
-
-export default function(context: Pick<typeof babel, 'types'|'template'>): { visitor: any };
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index bbe7d1aac4..424372a068 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,20 +1,19 @@
-// Type definitions for react-loadable 3.3
+// Type definitions for react-loadable 4.0
 // Project: https://github.com/thejameskyle/react-loadable#readme
-// Definitions by: Diogo Franco <https://github.com/Kovensky>
+// Definitions by: Diogo Franco <https://github.com/Kovensky>, Oden S. <https://github.com/odensc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
-export type LoadedComponent<Props> = React.ComponentClass<Props> | React.SFC<Props>;
-
 export interface LoadingComponentProps {
     isLoading: boolean;
     pastDelay: boolean;
+    timedOut: boolean;
     error: any;
 }
 
-export type Options<Props, T extends object> = OptionsWithoutResolve<Props> | OptionsWithResolve<Props, T>;
+export type Options<Props, Exports extends object> = OptionsWithoutRender<Props> | OptionsWithRender<Props, Exports>;
 
 export interface CommonOptions {
     /**
@@ -24,64 +23,76 @@ export interface CommonOptions {
      * (this is considered a valid React component).
      */
     // NOTE: () => null is only needed until React.SFC supports components returning null
-    LoadingComponent: React.ComponentClass<LoadingComponentProps> | React.SFC<LoadingComponentProps> | (() => null);
+    loading: React.ComponentType<LoadingComponentProps> | (() => null);
     /**
-     * Defaults to 200, in milliseconds
+     * Defaults to 200, in milliseconds.
      *
-     * Only show the LoadingComponent if the loader() has taken this long to succeed or error.
+     * Only show the loading component if the loader() has taken this long to succeed or error.
      */
-    delay?: number;
+    delay?: number | false | null;
     /**
-     * When rendering server-side, require() this path to load the component instead, this way it happens
-     * synchronously. If you are rendering server-side you should use this option.
+     * Disabled by default.
      *
-     * If you are using Babel, you might want to use the Babel plugin to add this option automatically.
+     * After the specified time in milliseconds passes, the component's `timedOut` prop will be set to true.
      */
-    serverSideRequirePath?: string;
+    timeout?: number | false | null;
+}
+
+export interface OptionsWithoutRender<Props> extends CommonOptions {
     /**
-     * In order for Loadable to require() a component synchronously (when possible) instead of waiting for
-     * the promise returned by import() to resolve. If you are using Webpack you should use this option.
+     * Function returning a promise which returns a React component displayed on success.
+     *
+     * Resulting React component receives all the props passed to the generated component.
+     */
+    loader(): Promise<React.ComponentType<Props> | { default: React.ComponentType<Props> }>;
+}
+
+export interface OptionsWithRender<Props, Exports extends object> extends CommonOptions {
+    /**
+     * Function returning a promise which returns an object to be passed to `render` on success.
+     */
+    loader(): Promise<Exports>;
+    /**
+     * If you want to customize what gets rendered from your loader you can also pass `render`.
+     *
+     * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
      *
      * ```ts
      * Loadable({
      *     // ...
-     *     webpackRequireWeakId: () => require.resolveWeak('./MyComponent')
+     *     render(loaded, props) {
+     *         const Component = loaded.default;
+     *         return <Component {...props} />
+     *     }
      * });
      * ```
-     *
-     * If you are using Babel, you might want to use the Babel plugin to add this option automatically.
      */
-    webpackRequireWeakId?(): number|string;
+    render(loaded: Exports, props: Props): React.ReactNode;
 }
 
-export interface OptionsWithoutResolve<Props> extends CommonOptions {
+export interface OptionsWithMap<Props, Exports extends { [key: string]: any }> extends CommonOptions {
     /**
-     * Function returning promise returning a React component displayed on success.
-     *
-     * Resulting React component receives all the props passed to the generated component.
+     * An object containing functions which return promises, which resolve to an object to be passed to `render` on success.
      */
-    loader(): Promise<LoadedComponent<Props> | { default: LoadedComponent<Props> }>;
-}
-
-export interface OptionsWithResolve<Props, T extends object> extends CommonOptions {
+    loader: {
+        [P in keyof Exports]: () => Promise<Exports[P]>
+    };
     /**
-     * Function returning promise returning a React component displayed on success.
+     * If you want to customize what gets rendered from your loader you can also pass `render`.
      *
-     * Resulting React component receives all the props passed to the generated component.
-     */
-    loader(): Promise<T>;
-    /**
-     * If the component that you want to load is not the default exported from a module you can use this
-     * function to resolve it.
+     * Note: If you want to load multiple resources at once, you can also use `Loadable.Map`.
      *
      * ```ts
      * Loadable({
      *     // ...
-     *     resolveModule: module => module.MyComponent
+     *     render(loaded, props) {
+     *         const Component = loaded.default;
+     *         return <Component {...props} />
+     *     }
      * });
      * ```
      */
-    resolveModule(obj: T): LoadedComponent<Props>;
+    render(loaded: Exports, props: Props): React.ReactNode;
 }
 
 export interface LoadableComponent {
@@ -96,22 +107,10 @@ export interface LoadableComponent {
     preload(): void;
 }
 
-export default function Loadable<Props, T extends object>(options: Options<Props, T>): LoadedComponent<Props> & LoadableComponent;
+export interface Loadable {
+    <Props, Exports extends object>(options: Options<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+    Map<Props, Exports extends { [key: string]: any }>(options: OptionsWithMap<Props, Exports>): React.ComponentType<Props> & LoadableComponent;
+}
 
-/**
- * In case you are rendering server-side and want to find out after a render cycle which
- * serverSideRequirePath's and webpackRequireWeakId's were actually rendered, you can use
- * flushServerSideRequirePaths or flushWebpackRequireWeakIds to get an array of them.
- *
- * Note: These are flushed individually, one does not affect the other.
- */
-export function flushServerSideRequirePaths(): string[];
-
-/**
- * In case you are rendering server-side and want to find out after a render cycle which
- * serverSideRequirePath's and webpackRequireWeakId's were actually rendered, you can use
- * flushServerSideRequirePaths or flushWebpackRequireWeakIds to get an array of them.
- *
- * Note: These are flushed individually, one does not affect the other.
- */
-export function flushWebpackRequireWeakIds(): string[]|number[];
+declare const LoadableExport: Loadable;
+export default LoadableExport;
diff --git a/types/react-loadable/react-loadable-tests.tsx b/types/react-loadable/react-loadable-tests.tsx
index 3455a7b23a..ab73191f1d 100644
--- a/types/react-loadable/react-loadable-tests.tsx
+++ b/types/react-loadable/react-loadable-tests.tsx
@@ -1,9 +1,16 @@
 import * as React from 'react';
 import Loadable, { LoadingComponentProps } from 'react-loadable';
 
-class LoadingComponent extends React.Component<LoadingComponentProps, {}> {
+class LoadingComponent extends React.Component<LoadingComponentProps> {
   render() {
-    return <div>{this.props.isLoading}</div>;
+    return (
+      <div>
+        {this.props.error}
+        {this.props.isLoading}
+        {this.props.pastDelay}
+        {this.props.timedOut}
+      </div>
+    );
   }
 }
 
@@ -16,36 +23,62 @@ const Component: React.SFC<ComponentProps> = ({ text }) => <div>{text}</div>;
 const Loadable100 = Loadable({
   // a module shape with 'export = Component' / 'module.exports = Component'
   loader: () => Promise.resolve(Component),
-  LoadingComponent,
-  delay: 100
+  loading: LoadingComponent,
+  delay: 100,
+  timeout: 10000
 });
 
 const Loadable200 = Loadable({
   // a module shape with 'export default Component'
   loader: () => Promise.resolve({ default: Component }),
-  LoadingComponent,
-  delay: 200
+  loading: LoadingComponent,
+  delay: null,
+  timeout: null
 });
 
 const Loadable300 = Loadable({
   // a module shape with 'export { Component }'
   loader: () => Promise.resolve({ Component }),
-  LoadingComponent,
-  delay: 300,
-  resolveModule: shape => shape.Component
+  loading: LoadingComponent,
+  delay: false,
+  timeout: false,
+  render(loaded, props: ComponentProps) {
+    const { Component } = loaded;
+    return <Component {...props} />;
+  }
 });
 
 const Loadable400 = Loadable({
   // a module shape with both 'export default Component' and 'export { Component }'
   loader: () => Promise.resolve({ default: Component, Component }),
-  LoadingComponent: () => null,
+  loading: () => null,
   delay: 300,
-  resolveModule: shape => shape.Component
+  render(loaded, props) {
+    const Component = loaded.default;
+    const NamedComponent = loaded.Component;
+    return (
+      <Component {...props}>
+        <NamedComponent {...props} />
+      </Component>
+    );
+  }
 });
 
-const used100 = <Loadable100 text='100'/>;
-const used200 = <Loadable200 text='200'/>;
-const used300 = <Loadable300 text='300'/>;
-const used400 = <Loadable400 text='400'/>;
+const LoadableMap = Loadable.Map({
+  loading: () => null,
+  loader: {
+    Component: () => Promise.resolve({ default: Component }),
+    text: () => Promise.resolve("test text")
+  },
+  render(loaded, props: ComponentProps) {
+    let Component = loaded.Component.default;
+    return <Component {...props} text={loaded.text} />;
+  }
+});
+
+const used100 = <Loadable100 text='100' />;
+const used200 = <Loadable200 text='200' />;
+const used300 = <Loadable300 text='300' />;
+const used400 = <Loadable400 text='400' />;
 
 Loadable100.preload();
diff --git a/types/react-loadable/tsconfig.json b/types/react-loadable/tsconfig.json
index bf26cfdbc5..4f1cf2c0f0 100644
--- a/types/react-loadable/tsconfig.json
+++ b/types/react-loadable/tsconfig.json
@@ -18,7 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "babel.d.ts",
         "react-loadable-tests.tsx"
     ]
 }
diff --git a/types/react-loader/index.d.ts b/types/react-loader/index.d.ts
new file mode 100644
index 0000000000..8734d1cfd9
--- /dev/null
+++ b/types/react-loader/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for react-loader 2.4
+// Project: https://github.com/quickleft/react-loader
+// Definitions by: Sudarsan Balaji <https://github.com/artfuldev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Component } from 'react';
+
+interface LoaderOptions {
+	lines?: number;
+	length?: number;
+	width?: number;
+	radius?: number;
+	scale?: number;
+	corners?: number;
+	color?: string;
+	opacity?: number;
+	rotate?: number;
+	direction?: number;
+	speed?: number;
+	trail?: number;
+	fps?: number;
+	zIndex?: number;
+	top?: string;
+	left?: string;
+	shadow?: boolean;
+	hwaccel?: boolean;
+	position?: string;
+	loadedClassName?: string;
+}
+
+interface LoaderProps extends LoaderOptions {
+	loaded: boolean;
+	options?: LoaderOptions;
+	className?: string;
+}
+
+declare class ReactLoader extends Component<LoaderProps>  {
+}
+
+declare namespace ReactLoader {
+}
+
+export = ReactLoader;
diff --git a/types/react-loader/react-loader-tests.tsx b/types/react-loader/react-loader-tests.tsx
new file mode 100644
index 0000000000..bc303f149a
--- /dev/null
+++ b/types/react-loader/react-loader-tests.tsx
@@ -0,0 +1,61 @@
+import * as Loader from 'react-loader';
+import * as React from 'react';
+
+const options = {
+    lines: 13,
+    length: 20,
+    width: 10,
+    radius: 30,
+    scale: 1.00,
+    corners: 1,
+    color: '#000',
+    opacity: 0.25,
+    rotate: 0,
+    direction: 1,
+    speed: 1,
+    trail: 60,
+    fps: 20,
+    zIndex: 2e9,
+    top: '50%',
+    left: '50%',
+    shadow: false,
+    hwaccel: false,
+    position: 'absolute'
+};
+
+class MyComponent extends React.Component {
+	getInitialState() {
+		return { loaded: false };
+	}
+
+	render() {
+		return (
+			<div>
+				<Loader
+					loaded={false}
+					lines={13}
+					length={20}
+					width={10}
+					radius={30}
+					corners={1}
+					rotate={0}
+					direction={1}
+					color="#000"
+					speed={1}
+					trail={60}
+					shadow={false}
+					hwaccel={false}
+					className="spinner"
+					zIndex={2e9}
+					top="50%"
+					left="50%"
+					scale={1.00}
+					loadedClassName="loadedContent" />
+				<Loader
+					loaded={false}
+					options={options}
+					className='spinner' />
+			</div>
+		);
+	}
+}
diff --git a/types/react-loader/tsconfig.json b/types/react-loader/tsconfig.json
new file mode 100644
index 0000000000..8148a9873f
--- /dev/null
+++ b/types/react-loader/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "react",
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-loader-tests.tsx"
+    ]
+}
diff --git a/types/react-loader/tslint.json b/types/react-loader/tslint.json
new file mode 100644
index 0000000000..b4b47a0378
--- /dev/null
+++ b/types/react-loader/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "dtslint/dt.json"
+}
diff --git a/types/react-maskedinput/index.d.ts b/types/react-maskedinput/index.d.ts
index e5e49a5140..a8efa75a00 100644
--- a/types/react-maskedinput/index.d.ts
+++ b/types/react-maskedinput/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/insin/react-maskedinput
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, HTMLAttributes } from "react";
 
diff --git a/types/react-maskedinput/react-maskedinput-tests.tsx b/types/react-maskedinput/react-maskedinput-tests.tsx
index cdc8070415..3220f79882 100644
--- a/types/react-maskedinput/react-maskedinput-tests.tsx
+++ b/types/react-maskedinput/react-maskedinput-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as MaskedInput from "react-maskedinput";
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component {
     render() {
         return (
             <MaskedInput mask="111"
diff --git a/types/react-mdl/index.d.ts b/types/react-mdl/index.d.ts
index 6265f11ec1..ff48de32c2 100644
--- a/types/react-mdl/index.d.ts
+++ b/types/react-mdl/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tleunen/react-mdl
 // Definitions by: Brad Zacher <https://github.com/bradzacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -11,7 +11,7 @@ export = __ReactMDL;
 declare namespace __ReactMDL {
     type __MDLClassProps = React.ClassAttributes<any>;
     type __MDLOtherProps = React.HTMLProps<any>;
-    class __MDLComponent<P extends __MDLClassProps> extends React.Component<P, {}> { }
+    class __MDLComponent<P> extends React.Component<P> { }
     class __MDLBasicComponent extends __MDLComponent<__MDLOtherProps> { }
 
     interface ShadowedComponent {
@@ -616,5 +616,5 @@ declare namespace __ReactMDL {
     }
     class Tooltip extends __MDLComponent<TooltipProps> { }
 
-    class MDLComponent extends React.Component<{ recursive?: boolean }, {}> { }
+    class MDLComponent extends React.Component<{ recursive?: boolean }> { }
 }
diff --git a/types/react-measure/index.d.ts b/types/react-measure/index.d.ts
index be96956dfd..cbbc928215 100644
--- a/types/react-measure/index.d.ts
+++ b/types/react-measure/index.d.ts
@@ -2,12 +2,12 @@
 // Project: https://github.com/souporserious/react-measure
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-measure" {
     import * as React from "react";
 
-    class Measure extends React.Component<Measure.MeasureProps, {}> { }
+    class Measure extends React.Component<Measure.MeasureProps> { }
     namespace Measure {
         type MeasurementType = "width" | "height" | "top" | "right" | "bottom" | "left";
         interface Dimensions {
diff --git a/types/react-measure/react-measure-tests.tsx b/types/react-measure/react-measure-tests.tsx
index da2a551a04..a12266339f 100644
--- a/types/react-measure/react-measure-tests.tsx
+++ b/types/react-measure/react-measure-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as Measure from "react-measure";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     render() {
         return (
             <Measure accurate
@@ -19,7 +19,7 @@ class Test extends React.Component<{}, {}> {
     }
 }
 
-class Test2 extends React.Component<{}, {}> {
+class Test2 extends React.Component {
     render() {
         return (
             <Measure accurate
diff --git a/types/react-mixin/index.d.ts b/types/react-mixin/index.d.ts
index 03781e659d..09f7eb8366 100644
--- a/types/react-mixin/index.d.ts
+++ b/types/react-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/brigand/react-mixin
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
diff --git a/types/react-mixin/react-mixin-tests.tsx b/types/react-mixin/react-mixin-tests.tsx
index f275869a9e..bc87b44926 100644
--- a/types/react-mixin/react-mixin-tests.tsx
+++ b/types/react-mixin/react-mixin-tests.tsx
@@ -4,7 +4,7 @@ import * as React from 'react';
 var someMixin: React.Mixin<any, any>;
 var someOtherMixin: React.Mixin<any, any>;
 
-class Foo extends React.Component<any, any> {
+class Foo extends React.Component {
     render(): JSX.Element { return <div />; }
 }
 
@@ -18,7 +18,7 @@ var mixin: React.Mixin<any, any> = {
     }
 };
 
-class Foo2 extends React.Component<any, any> {
+class Foo2 extends React.Component {
     static defaultProps = {
         a: 1
     };
@@ -31,7 +31,7 @@ class Foo2 extends React.Component<any, any> {
 reactMixin.onClass(Foo2, mixin);
 
 @reactMixin.decorate(mixin)
-class Foo3 extends React.Component<any, any> {
+class Foo3 extends React.Component {
 }
 
 function autobind(methodNames: string[]): React.Mixin<any, any> {
@@ -46,7 +46,7 @@ function autobind(methodNames: string[]): React.Mixin<any, any> {
 
 @reactMixin.decorate(mixin)
 @reactMixin.decorate(autobind(Object.keys(mixin)))
-class Foo4 extends React.Component<any, any> {
+class Foo4 extends React.Component {
 }
 
 
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index bb158bc6be..de4df20b60 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-modal
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>, Drew Noakes <https://github.com/drewnoakes>, Thomas B Homburg <https://github.com/homburg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -52,7 +52,7 @@ declare namespace ReactModal {
     }
 }
 
-declare class ReactModal extends React.Component<ReactModal.Props, {}> {
+declare class ReactModal extends React.Component<ReactModal.Props> {
     /* Override base styles for all instances of this component. */
     static defaultStyles: ReactModal.Styles;
     /* Call this to properly hide your application from assistive screenreaders and other assistive technologies while the modal is open. */
diff --git a/types/react-modal/react-modal-tests.tsx b/types/react-modal/react-modal-tests.tsx
index 51cdffba0a..697f7efb58 100644
--- a/types/react-modal/react-modal-tests.tsx
+++ b/types/react-modal/react-modal-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as ReactModal from 'react-modal';
 
-class ExampleOfUsingReactModal extends React.Component<{}, {}> {
+class ExampleOfUsingReactModal extends React.Component {
   render() {
     const onAfterOpenFn = () => { };
     const onRequestCloseFn = () => { };
diff --git a/types/react-monaco-editor/index.d.ts b/types/react-monaco-editor/index.d.ts
index 7f4a4a543e..85bb06a0f2 100644
--- a/types/react-monaco-editor/index.d.ts
+++ b/types/react-monaco-editor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/superRaytin/react-monaco-editor
 // Definitions by: Joshua Netterfield <https://github.com/jnetterf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="monaco-editor" />
 
@@ -73,6 +73,6 @@ export interface ReactMonacoEditorProps {
     context?: object;
 }
 
-export default class ReactMonacoEditor extends React.Component<ReactMonacoEditorProps, void> {
+export default class ReactMonacoEditor extends React.Component<ReactMonacoEditorProps> {
     editor: monaco.editor.ICodeEditor;
 }
diff --git a/types/react-monaco-editor/react-monaco-editor-tests.tsx b/types/react-monaco-editor/react-monaco-editor-tests.tsx
index d8e8642bf9..3c9d3c359b 100644
--- a/types/react-monaco-editor/react-monaco-editor-tests.tsx
+++ b/types/react-monaco-editor/react-monaco-editor-tests.tsx
@@ -129,7 +129,7 @@ class AnotherEditor extends React.Component<object, CodeEditorState> {
     }
 }
 
-class App extends React.Component<any, any> {
+class App extends React.Component {
     render() {
         return (
             <div>
diff --git a/types/react-motion-slider/index.d.ts b/types/react-motion-slider/index.d.ts
index 49c8caedd7..3bc8f75400 100644
--- a/types/react-motion-slider/index.d.ts
+++ b/types/react-motion-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-motion-slider
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-motion-slider" {
     import * as React from "react";
@@ -68,7 +68,7 @@ declare module "react-motion-slider" {
         afterSlide?: (currentIndex: number) => void;
     }
 
-    export default class Slider extends React.Component<SliderProps, {}> {
+    export default class Slider extends React.Component<SliderProps> {
         /**
          * Moves to next slide
          */
diff --git a/types/react-motion-slider/react-motion-slider-tests.tsx b/types/react-motion-slider/react-motion-slider-tests.tsx
index 783f2356a3..71ba3b0d11 100644
--- a/types/react-motion-slider/react-motion-slider-tests.tsx
+++ b/types/react-motion-slider/react-motion-slider-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Slider from "react-motion-slider";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     protected slider: Slider;
 
     public render() {
diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index 8254ad78aa..a60b2d57a9 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenglou/react-motion
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>, Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Component, ReactElement } from 'react';
 
@@ -70,7 +70,7 @@ interface MotionProps {
     onRest?: () => void;
 }
 
-export declare class Motion extends Component<MotionProps, any> { }
+export declare class Motion extends Component<MotionProps> { }
 
 // === TransitionMotion ===
 interface TransitionStyle {
@@ -111,7 +111,7 @@ interface TransitionProps {
      * <StaggeredMotion/>
      */
     styles: Array<TransitionStyle> | InterpolateFunction;
-    children: (interpolatedStyles: Array<TransitionPlainStyle>) => ReactElement<any>;
+    children?: (interpolatedStyles: Array<TransitionPlainStyle>) => ReactElement<any>;
     /**
      * Triggers when new elements appears
      * @param styleThatEntered
@@ -123,7 +123,7 @@ interface TransitionProps {
      */
     willLeave?: (styleThatLeft: TransitionStyle) => Style | void;
 }
-export class TransitionMotion extends Component<any, any> { }
+export class TransitionMotion extends Component<TransitionProps> { }
 
 
 interface StaggeredMotionProps {
@@ -137,7 +137,7 @@ interface StaggeredMotionProps {
      */
     styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
 }
-export declare class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
+export declare class StaggeredMotion extends Component<StaggeredMotionProps> { }
 
 
 /**
diff --git a/types/react-motion/react-motion-tests.tsx b/types/react-motion/react-motion-tests.tsx
index 7396270e52..3a672db6d6 100644
--- a/types/react-motion/react-motion-tests.tsx
+++ b/types/react-motion/react-motion-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {StaggeredMotion, Motion, spring, TransitionMotion, TransitionPlainStyle, TransitionStyle, Style, PlainStyle} from 'react-motion';
 
-class Root extends React.Component<{}, {}> {
+class Root extends React.Component {
     render() {
         return (
             <Motion defaultStyle={{ x: 0 }} style = {{ x: spring(10) }}>
@@ -11,7 +11,7 @@ class Root extends React.Component<{}, {}> {
     }
 }
 
-class TransitionTest extends React.Component<{}, {}> {
+class TransitionTest extends React.Component {
     render() {
         return (
             <TransitionMotion defaultStyles={this.getDefaultStyles() }
@@ -65,7 +65,7 @@ class TransitionTest extends React.Component<{}, {}> {
     }
 }
 
-class StaggeredTest extends React.Component<{}, {}> {
+class StaggeredTest extends React.Component {
     render() {
         return (
             <StaggeredMotion defaultStyles={[{ h: 0 }, { h: 0 }, { h: 0 }]}
diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index ab3831dde8..4d8293362c 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/xgfe/react-native-datepicker
 // Definitions by: Jacob Baskin <https://github.com/jacobbaskin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -27,7 +27,7 @@ interface DatePickerProps {
     minuteInterval?: number;
 }
 
-declare class DatePicker extends React.Component<DatePickerProps, {}> {
+declare class DatePicker extends React.Component<DatePickerProps> {
     constructor(props: DatePickerProps);
 }
 
diff --git a/types/react-native-drawer-layout/index.d.ts b/types/react-native-drawer-layout/index.d.ts
index 300119bf00..f6cf7a0d4a 100644
--- a/types/react-native-drawer-layout/index.d.ts
+++ b/types/react-native-drawer-layout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-drawer-layout
 // Definitions by: Justin Firth <https://github.com/jmfirth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import { ViewProperties } from 'react-native';
@@ -93,7 +93,7 @@ export interface DrawerLayoutProperties extends ViewProperties {
   useNativeAnimations?: boolean;
 }
 
-export default class DrawerLayout extends React.Component<DrawerLayoutProperties, {}> {
+export default class DrawerLayout extends React.Component<DrawerLayoutProperties> {
   /**
    * Opens the drawer.
    */
diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index eb5a8aa988..c36b3614f7 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/root-two/react-native-drawer
 // Definitions by: jnbt <https://github.com/jnbt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import { ViewStyle, ScaledSize } from 'react-native';
@@ -177,4 +178,4 @@ export interface DrawerProperties {
     elevation?: number;
 }
 
-export default class Drawer extends React.Component<DrawerProperties, {}> { }
+export default class Drawer extends React.Component<DrawerProperties> { }
diff --git a/types/react-native-goby/index.d.ts b/types/react-native-goby/index.d.ts
index c89cc7b065..b654bb562e 100644
--- a/types/react-native-goby/index.d.ts
+++ b/types/react-native-goby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://gitlab.com/MessageDream/react-native-goby
 // Definitions by: jaydenzhao <https://github.com/MessageDream/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export type DownloadProgressCallback = (progress: DownloadProgress) => void;
 export type SyncStatusChangedCallback = (status: Goby.SyncStatus) => void;
diff --git a/types/react-native-goby/react-native-goby-tests.tsx b/types/react-native-goby/react-native-goby-tests.tsx
index 6c8ed6737b..a72cf0ecf7 100644
--- a/types/react-native-goby/react-native-goby-tests.tsx
+++ b/types/react-native-goby/react-native-goby-tests.tsx
@@ -7,7 +7,7 @@ import {
 
 import Goby from "react-native-goby";
 
-class Home extends React.Component<any, any> {
+class Home extends React.Component {
     render() {
         return (
             <View></View>
diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index 89f0f080f5..2ee0982c86 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/brentvatne/react-native-scrollable-tab-view#readme
 // Definitions by: CaiHuan <https://github.com/CaiHuan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import {
@@ -103,5 +103,5 @@ export interface ScrollableTabViewProperties extends React.Props<ScrollableTabVi
   prerenderingSiblingsNumber?: number;
 }
 
-export default class ScrollableTabView extends React.Component<ScrollableTabViewProperties, {}> {
+export default class ScrollableTabView extends React.Component<ScrollableTabViewProperties> {
 }
diff --git a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
index 7953a4bbae..8463a7849c 100644
--- a/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
+++ b/types/react-native-scrollable-tab-view/react-native-scrollable-tab-view-tests.tsx
@@ -9,7 +9,7 @@ interface MyTextProperties extends React.Props<MyText> {
 
   text: string;
 }
-class MyText extends React.Component<MyTextProperties, {}> {
+class MyText extends React.Component<MyTextProperties> {
   constructor(props: MyTextProperties) {
     super(props);
   }
@@ -21,7 +21,7 @@ class MyText extends React.Component<MyTextProperties, {}> {
   }
 }
 
-class ScrollableTabViewDemo extends React.Component<{}, {}> {
+class ScrollableTabViewDemo extends React.Component {
   constructor(props: ScrollableTabViewDemo) {
     super(props);
   }
diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 7a80378514..cbcfbc101e 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -1,12 +1,15 @@
-// Type definitions for react-native-snap-carousel 2.1
+// Type definitions for react-native-snap-carousel 2.2
 // Project: https://github.com/archriss/react-native-snap-carousel
 // Definitions by: jnbt <https://github.com/jnbt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import {
     Animated,
+    LayoutChangeEvent,
+    NativeSyntheticEvent,
+    NativeScrollEvent,
     ScrollViewProperties,
     ScrollViewStyle,
     ViewStyle
@@ -17,12 +20,24 @@ export interface CarouselProps extends React.Props<ScrollViewProperties> {
 
     /**
      * Width in pixels of your slides, must be the same for all of them
+     * Note: Required with horizontal carousel
      */
-    itemWidth: number;
+    itemWidth?: number;
+    /**
+     * Height in pixels of carousel's items, must be the same for all of them
+     * Note: Required with vertical carousel
+     */
+    itemHeight?: number;
     /**
      * Width in pixels of your slider
+     * Note: Required with horizontal carousel
      */
-    sliderWidth: number;
+    sliderWidth?: number;
+    /**
+     * Height in pixels of the carousel itself
+     * Note: Required with vertical carousel
+     */
+    sliderHeight?: number;
 
     // Behavior
 
@@ -44,18 +59,36 @@ export interface CarouselProps extends React.Props<ScrollViewProperties> {
      * Index of the first item to display
      */
     firstItem?: number;
+    /**
+     * When momentum is disabled, this throttle helps smoothing slides' snapping by
+     * providing a bit of inertia when touch is released.
+     * Note that this will delay callback's execution.
+     */
+    scrollEndDragThrottleValue?: number;
     /**
      * Whether to implement a shouldComponentUpdate strategy to minimize updates
      */
     shouldOptimizeUpdates?: boolean;
     /**
-     * Snapping on android is kinda choppy, especially when swiping quickly so you can disable it
+     * This defines the timeframe during which multiple callback calls should be
+     * "grouped" into a single one.
+     * Note that this will delay callback's execution.
+     */
+    snapCallbackDebounceValue?: number;
+    /**
+     * Snapping on android is kinda choppy, especially when swiping quickly so you
+     * can disable it.
+     * Warning: this prop can't be changed dynamically.
      */
     snapOnAndroid?: boolean;
     /**
      * Delta x when swiping to trigger the snap
      */
     swipeThreshold?: number;
+    /*
+     * Layout slides vertically instead of horizontally
+     */
+    vertical?: boolean;
 
     // Autoplay
 
@@ -109,6 +142,23 @@ export interface CarouselProps extends React.Props<ScrollViewProperties> {
     slideStyle?: ViewStyle;
 
     // Callbacks
+    /**
+     * Exposed View callback; invoked on mount and layout changes
+     */
+    onLayout?(event: LayoutChangeEvent): void;
+
+    /**
+     * Exposed ScrollView callback; fired while scrolling
+     */
+    onScroll?(event: NativeSyntheticEvent<NativeScrollEvent>): void;
+
+    /**
+     * @deprecated: use onScroll instead
+     * Callback fired while scrolling; direct equivalent of ScrollView's onScroll
+     * Since onScroll is overriden by plugin's implementation, you should use prop onScrollViewScroll
+     * if you need a callback while scrolling.
+     */
+    onScrollViewScroll?(event: NativeSyntheticEvent<NativeScrollEvent>): void;
 
     /**
      * Callback fired when navigating to an item
@@ -120,11 +170,11 @@ export interface CarouselStatic extends React.ComponentClass<CarouselProps> {
     currentIndex: number;
     startAutoplay(instantly?: boolean): void;
     stopAutoplay(): void;
-    snapToItem(index: number, animated?: boolean): void;
+    snapToItem(index: number, animated?: boolean, fireCallback?: boolean, initial?: boolean): void;
     snapToNext(animated?: boolean): void;
     snapToPrev(animated?: boolean): void;
 }
 
 export type CarouselProperties = ScrollViewProperties & CarouselProps & React.Props<CarouselStatic>;
 
-export default class Carousel extends React.Component<CarouselProperties, {}> { }
+export default class Carousel extends React.Component<CarouselProperties> { }
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 17e92aa6ae..650fe170e5 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
@@ -1,5 +1,8 @@
 import * as React from 'react';
 import {
+    LayoutChangeEvent,
+    NativeSyntheticEvent,
+    NativeScrollEvent,
     StyleSheet,
     Text,
     View,
@@ -8,7 +11,7 @@ import {
 
 import Carousel from 'react-native-snap-carousel';
 
-class SnapCarouselTest extends React.Component<{}, {}> {
+class SnapCarouselTest extends React.Component {
     render(): React.ReactElement<any> {
         return (
             <View>
@@ -23,6 +26,9 @@ class SnapCarouselTest extends React.Component<{}, {}> {
                     enableMomentum={true}
                     keyboardDismissMode='interactive'
                     onSnapToItem={this.onSnapToItem}
+                    onScroll={this.onScroll}
+                    onLayout={this.onLayout}
+                    vertical={false}
                 >
                     <View
                         style={styles.item}
@@ -30,6 +36,11 @@ class SnapCarouselTest extends React.Component<{}, {}> {
                         <Text>Item #1</Text>
                     </View>
                 </Carousel>
+                <Carousel
+                    itemHeight={75}
+                    sliderHeight={300}
+                    vertical={true}
+                />
             </View>
         );
     }
@@ -37,6 +48,14 @@ class SnapCarouselTest extends React.Component<{}, {}> {
     private onSnapToItem = (index: number) => {
         console.log("Snapped to: ", index);
     }
+
+    private onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+        console.log("Scrolled: ", event);
+    }
+
+    private onLayout = (event: LayoutChangeEvent) => {
+        console.log("Layout: ", event);
+    }
 }
 
 const styles = StyleSheet.create({
diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts
index 777f26369b..3c1d1c967b 100644
--- a/types/react-native-sortable-list/index.d.ts
+++ b/types/react-native-sortable-list/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gitim/react-native-sortable-list
 // Definitions by: Michael Sivolobov <https://github.com/sivolobov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import { ViewStyle } from 'react-native';
diff --git a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
index 91be1dfed4..8940484ab2 100644
--- a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
+++ b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
@@ -105,7 +105,7 @@ const styles = StyleSheet.create({
 
 });
 
-class Basic extends React.Component<void, void> {
+class Basic extends React.Component {
     render() {
         return (
             <View style={styles.container}>
diff --git a/types/react-native-swiper/index.d.ts b/types/react-native-swiper/index.d.ts
index 41c9722934..7007fa6f7f 100644
--- a/types/react-native-swiper/index.d.ts
+++ b/types/react-native-swiper/index.d.ts
@@ -1,14 +1,33 @@
 // Type definitions for react-native-swiper 1.5
 // Project: https://github.com/leecade/react-native-swiper#readme
-// Definitions by: CaiHuan <https://github.com/CaiHuan>,  HuHuanming <https://github.com/huhuanming>
+// Definitions by: CaiHuan <https://github.com/CaiHuan>
+//                 HuHuanming <https://github.com/huhuanming>
+//                 mhcgrq <https://github.com/mhcgrq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import {
-  ViewStyle
+  ViewStyle,
+  NativeSyntheticEvent,
+  NativeScrollEvent,
 } from 'react-native';
 
+export interface SwiperState {
+  autoplayEnd: boolean;
+  dir: 'x' | 'y';
+  height: number;
+  width: number;
+  index: number;
+  isScrolling: boolean;
+  loopJump: boolean;
+  offset: {
+    x: number;
+    y: number;
+  };
+  total: number;
+}
+
 export interface SwiperProperties extends React.Props<Swiper> {
   horizontal?: boolean;
 
@@ -24,6 +43,8 @@ export interface SwiperProperties extends React.Props<Swiper> {
 
   scrollsToTop?: boolean;
 
+  scrollEnabled?: boolean;
+
   removeClippedSubviews?: boolean;
 
   automaticallyAdjustContentInsets?: boolean;
@@ -54,6 +75,10 @@ export interface SwiperProperties extends React.Props<Swiper> {
 
   activeDotStyle?: ViewStyle;
 
+  activeDot?: JSX.Element;
+
+  dot?: JSX.Element;
+
   dotColor?: string;
 
   activeDotColor?: string;
@@ -63,7 +88,50 @@ export interface SwiperProperties extends React.Props<Swiper> {
   width?: number;
 
   paginationStyle?: ViewStyle;
+
+  buttonWrapperStyle?: ViewStyle;
+
+  nextButton?: JSX.Element;
+
+  prevButton?: JSX.Element;
+
+  onScrollBeginDrag?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
+
+  onMomentumScrollEnd?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
+
+  onTouchStartCapture?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
+
+  onTouchStart?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
+
+  onTouchEnd?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
+
+  onResponderRelease?(
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ): void;
 }
 
-export default class Swiper extends React.Component<SwiperProperties, {}> {
+export default class Swiper extends React.Component<SwiperProperties, SwiperState> {
+  scrollBy(index: number, animated: boolean): void;
 }
diff --git a/types/react-native-swiper/react-native-swiper-tests.tsx b/types/react-native-swiper/react-native-swiper-tests.tsx
index 5bd12c3868..3313f8954c 100644
--- a/types/react-native-swiper/react-native-swiper-tests.tsx
+++ b/types/react-native-swiper/react-native-swiper-tests.tsx
@@ -3,18 +3,54 @@ import {
   StyleSheet,
   Text,
   View,
-  ViewStyle
+  ViewStyle,
+  NativeSyntheticEvent,
+  NativeScrollEvent
 } from 'react-native';
-import Swiper from 'react-native-swiper';
+import Swiper, { SwiperState } from 'react-native-swiper';
 
-class SwiperTest extends React.Component<{}, {}> {
+class SwiperTest extends React.Component {
   constructor(props: {}) {
     super(props);
   }
-
+  callback = (
+    event: NativeSyntheticEvent<NativeScrollEvent>,
+    state: SwiperState,
+    context: Swiper
+  ) => {
+    console.log(this.callback.name, event, state, context);
+  }
   render(): React.ReactElement<any> {
     return (
       <Swiper
+        horizontal
+        pagingEnabled
+        showsHorizontalScrollIndicator
+        showsVerticalScrollIndicator
+        bounces
+        scrollsToTop
+        scrollEnabled
+        removeClippedSubviews
+        automaticallyAdjustContentInsets
+        showsPagination
+        showsButtons
+        loadMinimal
+        loadMinimalSize={1}
+        loop
+        autoplay
+        autoplayTimeout={300}
+        autoplayDirection
+        renderPagination={() => (<View />)}
+        height={100}
+        width={200}
+        nextButton={<View><Text>NEXT</Text></View>}
+        prevButton={<View><Text>PREV</Text></View>}
+        onScrollBeginDrag={this.callback}
+        onMomentumScrollEnd={this.callback}
+        onTouchStartCapture={this.callback}
+        onTouchStart={this.callback}
+        onTouchEnd={this.callback}
+        onResponderRelease={this.callback}
         style={styles.wrapper}>
         <View
           style={styles.slide1}>
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 72c3ea186d..8b31bfed0d 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import {
@@ -70,7 +70,7 @@ export interface VideoProperties extends ViewProperties {
     rotation?: number;
 }
 
-export default class Video extends React.Component<VideoProperties, {}> {
+export default class Video extends React.Component<VideoProperties> {
     seek(time: number): void;
     presentFullscreenPlayer(): void;
     dismissFullscreenPlayer(): void;
diff --git a/types/react-native-video/react-native-video-tests.tsx b/types/react-native-video/react-native-video-tests.tsx
index bc240853f5..e0ec0bad73 100644
--- a/types/react-native-video/react-native-video-tests.tsx
+++ b/types/react-native-video/react-native-video-tests.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react-native';
 import Video from 'react-native-video';
 
-class SwiperTest extends React.Component<{}, {}> {
+class SwiperTest extends React.Component {
     constructor(props: {}) {
         super(props);
     }
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2e22ad489b..06e777a270 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for react-native 0.44
 // Project: https://github.com/facebook/react-native
-// Definitions by: Eloy Durán <https://github.com/alloy>, Fedor Nezhivoi <https://github.com/gyzerok>, HuHuanming <https://github.com/huhuanming>, Jeremi Stadler <https://github.com/jeremistadler>
+// Definitions by: Eloy Durán <https://github.com/alloy>, Fedor Nezhivoi <https://github.com/gyzerok>, HuHuanming <https://github.com/huhuanming>, Jeremi Stadler <https://github.com/jeremistadler>, Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -234,7 +234,7 @@ interface EventEmitter extends EventEmitterListener {
      *
      *   emitter.emit('someEvent', 'abc'); // logs 'abc'
      */
-    emit(eventType: string): void
+    emit(eventType: string, ...params: any[]): void
 
     /**
      * Removes the given listener for event of specific type.
@@ -332,7 +332,7 @@ export interface NativeMethodsMixinStatic {
     blur(): void;
 
     refs: {
-        [key: string]: React.Component<any, any>
+        [key: string]: React.Component<any>
     };
 }
 
@@ -542,6 +542,7 @@ export interface FlexStyle {
     alignContent?: "flex-start" | "flex-end" | "center" | "stretch" | "space-between" | "space-around"
     alignItems?: FlexAlignType
     alignSelf?: "auto" | FlexAlignType
+    aspectRatio?: number
     borderBottomWidth?: number
     borderLeftWidth?: number
     borderRightWidth?: number
@@ -3435,6 +3436,11 @@ export interface FlatListProperties<ItemT> extends ScrollViewProperties {
      */
     ItemSeparatorComponent?: React.ComponentClass<any> | null
 
+    /**
+     * Rendered when the list is empty.
+     */
+    ListEmptyComponent?: React.ComponentClass<any> | null
+
     /**
      * Rendered at the very end of the list.
      */
@@ -3450,6 +3456,14 @@ export interface FlatListProperties<ItemT> extends ScrollViewProperties {
      */
     columnWrapperStyle?: ViewStyle
 
+    /**
+     * When false tapping outside of the focused text input when the keyboard
+     * is up dismisses the keyboard. When true the scroll view will not catch
+     * taps and the keyboard will not dismiss automatically. The default value
+     * is false.
+     */
+    keyboardShouldPersistTaps?: boolean | 'always' | 'never' | 'handled'
+
     /**
      * For simplicity, data is just a plain array. If you want to use something else,
      * like an immutable list, use the underlying VirtualizedList directly.
@@ -3684,6 +3698,12 @@ export interface SectionListProperties<ItemT> extends ScrollViewProperties {
      * This may improve scroll performance for large lists.
     */
     removeClippedSubviews?: boolean
+
+    /**
+     * Makes section headers stick to the top of the screen until the next one pushes it off.
+     * Only enabled by default on iOS because that is the platform standard there.
+     */
+    stickySectionHeadersEnabled?: boolean
 }
 
 export interface SectionListStatic<SectionT> extends React.ComponentClass<SectionListProperties<SectionT>> {
@@ -3822,6 +3842,15 @@ export interface ListViewProperties extends ScrollViewProperties {
      * @platform ios
      */
     stickyHeaderIndices?: number[]
+
+    /**
+     * Makes the sections headers sticky. The sticky behavior means that it will scroll with the
+     * content at the top of the section until it reaches the top of the screen, at which point it
+     * will stick to the top until it is pushed off the screen by the next section header. This
+     * property is not supported in conjunction with `horizontal={true}`. Only enabled by default
+     * on iOS because of typical platform standards.
+     */
+    stickySectionHeadersEnabled?: boolean
 }
 
 
@@ -4486,6 +4515,7 @@ export interface SceneConfig {
 
 export interface JumpSceneConfig extends SceneConfig {
     gestures: {
+        pop?: LeftToRightGesture
         jumpBack: JumpGesture
         jumpForward: JumpGesture
     }
@@ -5299,7 +5329,7 @@ export interface PixelRatioStatic {
 /**
  * @see https://facebook.github.io/react-native/docs/platform-specific-code.html#content
  */
-export type PlatformOSType = 'ios' | 'android'
+export type PlatformOSType = 'ios' | 'android' | 'windows'
 
 interface PlatformStatic {
     OS: PlatformOSType
@@ -7264,9 +7294,9 @@ export interface SettingsStatic {
 
 
 /**
- * @enum('default', 'light-content')
+ * @enum('default', 'light-content', 'dark-content')
  */
-export type StatusBarStyle = "default" | "light-content"
+export type StatusBarStyle = "default" | "light-content" | "dark-content"
 
 /**
  * @enum('fade', 'slide')
@@ -8824,7 +8854,7 @@ export function requireNativeComponent<P>(
     extraConfig?: {nativeOnly?: any}
 ): React.ComponentClass<P>;
 
-export function findNodeHandle(componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>): null | number;
+export function findNodeHandle(componentOrHandle: null | number | React.Component<any> | React.ComponentClass<any>): null | number;
 
 export function processColor(color: any): number;
 
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 3d7ddeac07..abe7ae78bc 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -98,7 +98,7 @@ const stylesAlt = StyleSheet.create(
     }
 );
 
-class CustomView extends React.Component<{}, {}> {
+class CustomView extends React.Component {
 
     render() {
         return (
@@ -108,7 +108,7 @@ class CustomView extends React.Component<{}, {}> {
 
 }
 
-class Welcome extends React.Component<any, any> {
+class Welcome extends React.Component {
     refs: {
         [key: string]: any
         rootView: View
@@ -227,7 +227,7 @@ export class SectionListTest {
     }
 }
 
-export class CapsLockComponent extends React.Component<TextProperties, {}> {
+export class CapsLockComponent extends React.Component<TextProperties> {
     render() {
         const content = (this.props.children || "") as string
         return (
@@ -258,7 +258,7 @@ class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListVi
 }
 
 
-class TabBarTest extends React.Component<{}, {}> {
+class TabBarTest extends React.Component {
     render() {
         return (
             <TabBarIOS
diff --git a/types/react-native/test/init-example.tsx b/types/react-native/test/init-example.tsx
index f6fce83849..bada7e9c05 100644
--- a/types/react-native/test/init-example.tsx
+++ b/types/react-native/test/init-example.tsx
@@ -6,7 +6,7 @@ import {
   View
 } from 'react-native';
 
-export default class AwesomeProject extends React.Component<{}, {}> {
+export default class AwesomeProject extends React.Component {
   render() {
     return (
       <View style={styles.container}>
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 083139a165..829c897a6e 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1,7 +1,10 @@
 // Type definitions for react-navigation 1.0
 // Project: https://github.com/react-community/react-navigation
-// Definitions by: Huhuanming <https://github.com/huhuanming>, mhcgrq <https://github.com/mhcgrq>
+// Definitions by: Huhuanming <https://github.com/huhuanming>
+//                 mhcgrq <https://github.com/mhcgrq>
+//                 fangpenlin <https://github.com/fangpenlin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from 'react'
 import {
@@ -268,6 +271,7 @@ export interface NavigationInitAction {
 export interface NavigationResetAction {
   type?: 'Navigation/RESET',
   index: number,
+  key?: string | null,
   actions: NavigationNavigateAction[],
 }
 
@@ -319,6 +323,7 @@ export type NavigationAction =
   | NavigationTabAction
 
 export namespace NavigationActions {
+  function init(options?: NavigationInitAction): NavigationInitAction;
   function navigate(options: NavigationNavigateAction): NavigationNavigateAction;
   function reset(options: NavigationResetAction): NavigationResetAction;
   function back(options?: NavigationBackAction): NavigationBackAction;
@@ -356,7 +361,7 @@ export interface NavigationProp<S, A> {
 }
 
 export type NavigationScreenProp<S, A> = NavigationProp<S, A> & {
-  goBack: (routeKey?: string) => boolean,
+  goBack: (routeKey?: string | null) => boolean,
   navigate: (routeName: string, params?: NavigationParams, action?: NavigationAction) => boolean,
   setParams: (newParams: NavigationParams) => boolean,
 }
@@ -476,11 +481,13 @@ export interface LayoutEvent {
 }
 
 interface NavigationContainerProps {
+  screenProps?: any
   navigation?: NavigationProp<any, NavigationAction>
   onNavigationStateChange?: (
     preNavigationState: NavigationState,
     nextNavigationState: NavigationState,
-  ) => void
+  ) => void,
+  style?: ViewStyle
 }
 
 interface NavigationContainerState {
@@ -490,7 +497,7 @@ interface NavigationContainerState {
 export interface NavigationContainer extends React.ComponentClass<
   NavigationContainerProps
 > {
-  router: any
+  router: NavigationRouter
 }
 
 export type StackNavigatorConfig =
@@ -607,7 +614,7 @@ export type NavigationResetActionCreator = (options: NavigationResetAction) => b
 export type NavigationBackActionCreator = (options?: NavigationBackAction) => boolean;
 export type NavigationSetParamsActionCreator = (options: NavigationSetParamsAction) => boolean;
 
-export interface NavgationComponentProps<T> {
+export interface NavigationComponentProps<T> {
   screenProps: any
   navigation: {
     dispatch: any
@@ -624,3 +631,32 @@ export interface NavgationComponentProps<T> {
 
 export const TabBarTop: React.ReactElement<any>;
 export const TabBarBottom: React.ReactElement<any>;
+
+interface TransitionerProps {
+  configureTransition: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => NavigationTransitionSpec
+  navigation: NavigationProp<any, NavigationAction>
+  onTransitionEnd?: () => void
+  onTransitionStart?: () => void
+  render: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => any
+  style?: ViewStyle
+}
+
+interface TransitionerState {
+  layout: NavigationLayout
+  position: Animated.Value
+  progress: Animated.Value
+  scenes: Array<NavigationScene>
+}
+
+export class Transitioner extends React.Component<
+  TransitionerProps,
+  TransitionerState
+> {
+
+}
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 2493d92f84..738bd8c456 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -7,6 +7,10 @@ import {
     TabNavigatorConfig,
     TabBarTop,
     TabBarBottom,
+    NavigationProp,
+    NavigationAction,
+    NavigationTransitionProps,
+    Transitioner
 } from 'react-navigation';
 
 const Start = (
@@ -44,3 +48,34 @@ const tabNavigatorConfig: TabNavigatorConfig = {
     lazy: true,
     tabBarComponent: TabBarTop,
 }
+
+interface CustomTransitionerProps {
+    navigation: NavigationProp<any, NavigationAction>
+}
+
+const configureTransition = (
+    _transitionProps: NavigationTransitionProps,
+    _prevTransitionProps: NavigationTransitionProps
+  ) => {
+    return {}
+  }
+
+const renderTransitioner = (props: NavigationTransitionProps, prevProps: NavigationTransitionProps) => {
+    return <View />
+}
+
+const CustomTransitioner = (props: CustomTransitionerProps) => {
+    <Transitioner
+      configureTransition={configureTransition}
+      navigation={props.navigation}
+      render={renderTransitioner}
+      onTransitionStart={() => { }}
+      onTransitionEnd={() => { }}
+    />
+}
+
+const BasicStackNavigation = StackNavigator({
+    StartScreen: { screen: Start }
+});
+
+<BasicStackNavigation style={{ marginTop: 52 }} />
diff --git a/types/react-notification-system-redux/index.d.ts b/types/react-notification-system-redux/index.d.ts
index ffcda21739..43161bfa55 100644
--- a/types/react-notification-system-redux/index.d.ts
+++ b/types/react-notification-system-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gor181/react-notification-system-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Component } from "react";
 import { Action } from "redux";
@@ -12,7 +12,7 @@ export as namespace Notifications;
 
 export = Notifications;
 
-declare class Notifications extends Component<Notifications.NotificationsProps, any> {}
+declare class Notifications extends Component<Notifications.NotificationsProps> {}
 
 declare namespace Notifications {
     type NotificationsState = Notification[];
diff --git a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
index 83c8354c83..2225fa744a 100644
--- a/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
+++ b/types/react-notification-system-redux/react-notification-system-redux-tests.tsx
@@ -4,7 +4,7 @@ import { Notification } from "react-notification-system";
 import * as Notifications from "react-notification-system-redux";
 import { reducer, show, hide, info, error, warning, success, NotificationLevel } from "react-notification-system-redux";
 
-class Test extends React.Component<any, any> {
+class Test extends React.Component {
     private test() {
         const notification: Notification = {
             message : "Test"
diff --git a/types/react-notification-system/index.d.ts b/types/react-notification-system/index.d.ts
index c29f92691e..d321ee6a16 100644
--- a/types/react-notification-system/index.d.ts
+++ b/types/react-notification-system/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-notification-system
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Deividas Bakanas <https://github.com/DeividasBakanas>, Karol Janyst <https://github.com/LKay>, Bartosz Szewczyk <https://github.com/sztobar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
diff --git a/types/react-notification-system/react-notification-system-tests.tsx b/types/react-notification-system/react-notification-system-tests.tsx
index 3a7e2dd279..eb05663523 100644
--- a/types/react-notification-system/react-notification-system-tests.tsx
+++ b/types/react-notification-system/react-notification-system-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as NotificationSystem from 'react-notification-system';
 
-class MyComponent extends React.Component<any, any> {
+class MyComponent extends React.Component {
     private notificationSystem: NotificationSystem.System = null;
 
     private notification: NotificationSystem.Notification = {
diff --git a/types/react-onclickoutside/index.d.ts b/types/react-onclickoutside/index.d.ts
index 05c086fac1..b342e98529 100644
--- a/types/react-onclickoutside/index.d.ts
+++ b/types/react-onclickoutside/index.d.ts
@@ -1,38 +1,35 @@
-// Type definitions for react-onclickoutside 5.7
+// Type definitions for react-onclickoutside 6.0
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import * as React from 'react';
+import * as React from "react";
 
-declare namespace OnClickOut {
-    interface HandleClickOutside<T> {
-        handleClickOutside: React.MouseEventHandler<T>;
-    }
-
-    interface InjectedOnClickOutProps {
-        disableOnClickOutside(): void;
-        enableOnClickOutside(): void;
-    }
-
-    interface OnClickOutProps {
-        disableOnClickOutside?: boolean;
-        eventTypes?: string | string[];
-        outsideClickIgnoreClass?: string;
-        preventDefault?: boolean;
-        stopPropagation?: boolean;
-    }
+export interface HandleClickOutside<T> {
+    handleClickOutside: React.MouseEventHandler<T>;
 }
 
-type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
-interface ClickOutComponentClass<P extends OnClickOut.InjectedOnClickOutProps> extends React.ComponentClass<P> {
-    new (props?: P, context?: any): React.Component<P, React.ComponentState> & OnClickOut.HandleClickOutside<any>;
+export interface InjectedOnClickOutProps {
+    disableOnClickOutside(): void;
+    enableOnClickOutside(): void;
 }
 
-declare function OnClickOut<P>(
-    component: ComponentConstructor<P & OnClickOut.InjectedOnClickOutProps & OnClickOut.HandleClickOutside<any>>
-        | ClickOutComponentClass<P & OnClickOut.InjectedOnClickOutProps>
-): React.ComponentClass<P & OnClickOut.OnClickOutProps>;
+export interface OnClickOutProps {
+    disableOnClickOutside?: boolean;
+    eventTypes?: string | string[];
+    outsideClickIgnoreClass?: string;
+    preventDefault?: boolean;
+    stopPropagation?: boolean;
+}
 
-export = OnClickOut;
+export type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
+
+export interface ClickOutComponentClass<P extends InjectedOnClickOutProps> extends React.ComponentClass<P> {
+    new (props?: P, context?: any): React.Component<P, React.ComponentState> & HandleClickOutside<any>;
+}
+
+export default function OnClickOut<P>(
+    component: ComponentConstructor<P & InjectedOnClickOutProps & HandleClickOutside<any>>
+        | ClickOutComponentClass<P & InjectedOnClickOutProps>
+): React.ComponentClass<P & OnClickOutProps>;
diff --git a/types/react-onclickoutside/react-onclickoutside-tests.tsx b/types/react-onclickoutside/react-onclickoutside-tests.tsx
index f6ed316683..d075a5e123 100644
--- a/types/react-onclickoutside/react-onclickoutside-tests.tsx
+++ b/types/react-onclickoutside/react-onclickoutside-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Component, MouseEvent, StatelessComponent } from 'react';
 import { render } from 'react-dom';
-import * as onClickOutside from 'react-onclickoutside';
+import onClickOutside from 'react-onclickoutside';
 
 function TestStateless(props: { handleClickOutside(): void; }) {
     return (
@@ -23,7 +23,7 @@ render(
     document.getElementById("main")
 );
 
-class TestComponent extends React.Component<{ disableOnClickOutside(): void; enableOnClickOutside(): void; }, {}> {
+class TestComponent extends React.Component<{ disableOnClickOutside(): void; enableOnClickOutside(): void; }> {
     handleClickOutside = () => {
         console.log('this.handleClickOutside');
     }
diff --git a/types/react-onclickoutside/v5/index.d.ts b/types/react-onclickoutside/v5/index.d.ts
new file mode 100644
index 0000000000..8d9ed949a6
--- /dev/null
+++ b/types/react-onclickoutside/v5/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for react-onclickoutside 5.7
+// Project: https://github.com/Pomax/react-onclickoutside
+// Definitions by: Karol Janyst <https://github.com/LKay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+declare namespace OnClickOut {
+    interface HandleClickOutside<T> {
+        handleClickOutside: React.MouseEventHandler<T>;
+    }
+
+    interface InjectedOnClickOutProps {
+        disableOnClickOutside(): void;
+        enableOnClickOutside(): void;
+    }
+
+    interface OnClickOutProps {
+        disableOnClickOutside?: boolean;
+        eventTypes?: string | string[];
+        outsideClickIgnoreClass?: string;
+        preventDefault?: boolean;
+        stopPropagation?: boolean;
+    }
+}
+
+type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
+interface ClickOutComponentClass<P extends OnClickOut.InjectedOnClickOutProps> extends React.ComponentClass<P> {
+    new (props?: P, context?: any): React.Component<P, React.ComponentState> & OnClickOut.HandleClickOutside<any>;
+}
+
+declare function OnClickOut<P>(
+    component: ComponentConstructor<P & OnClickOut.InjectedOnClickOutProps & OnClickOut.HandleClickOutside<any>>
+        | ClickOutComponentClass<P & OnClickOut.InjectedOnClickOutProps>
+): React.ComponentClass<P & OnClickOut.OnClickOutProps>;
+
+export = OnClickOut;
diff --git a/types/react-onclickoutside/v5/tsconfig.json b/types/react-onclickoutside/v5/tsconfig.json
new file mode 100644
index 0000000000..af309baba2
--- /dev/null
+++ b/types/react-onclickoutside/v5/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-onclickoutside": ["react-onclickoutside/v5"] 
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/types/react-onclickoutside/v5/tslint.json b/types/react-onclickoutside/v5/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-onclickoutside/v5/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 5c25131be1..b213fec2b0 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://onsen.io/v2/docs/guide/react/
 // Definitions by: Ozytis <https://ozytis.fr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
+
 import { Component } from 'react';
 
 export interface Modifiers_string {
@@ -40,13 +41,13 @@ export class SplitterSide extends Component<{
     mode?: "collapse" | "split"
 }, any> { }
 
-export class SplitterContent extends Component<{}, any> { }
+export class SplitterContent extends Component<{}> { }
 
-export class Splitter extends Component<{}, any> { }
+export class Splitter extends Component<{}> { }
 
 /*** toolbar ***/
 
-export class Toolbar extends Component<{}, any> {}
+export class Toolbar extends Component<{}> {}
 
 export class BottomToolbar extends Component<{
     modifier?: string
@@ -179,7 +180,7 @@ export class Modal extends Component<{
 }, any> {}
 
 export class Popover extends Component<{
-    getTarget?(): Component<any, any> | HTMLElement,
+    getTarget?(): Component<any> | HTMLElement,
     onCancel?(): void,
     isOpen?: boolean,
     isCancelable?: boolean,
@@ -260,11 +261,11 @@ export class Switch extends Component<{
  * Tabs
  */
 
-export class Tab extends Component<{}, any> { }
+export class Tab extends Component<{}> { }
 
-export class TabActive extends Component<{}, any> { }
+export class TabActive extends Component<{}> { }
 
-export class TabInactive extends Component<{}, any> { }
+export class TabInactive extends Component<{}> { }
 
 export class Tabbar extends Component<{
     index?: number,
diff --git a/types/react-overlays/index.d.ts b/types/react-overlays/index.d.ts
index 1e461590d5..450e8e2e93 100644
--- a/types/react-overlays/index.d.ts
+++ b/types/react-overlays/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-overlays
 // Definitions by: Aaron Beall <https://github.com/aaronbeall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -84,7 +84,7 @@ export interface AffixProps {
 	 */
 	onAffixedBottom?(): void;
 }
-export class Affix extends React.Component<AffixProps, {}> { }
+export class Affix extends React.Component<AffixProps> { }
 
 // <AutoAffix />
 export interface AutoAffixProps extends AffixProps {
@@ -99,7 +99,7 @@ export interface AutoAffixProps extends AffixProps {
 	 */
 	autoWidth?: boolean;
 }
-export class AutoAffix extends React.Component<AutoAffixProps, {}> { }
+export class AutoAffix extends React.Component<AutoAffixProps> { }
 
 // <Transition />
 export interface TransitionProps {
@@ -181,4 +181,4 @@ export interface TransitionProps {
 	 */
 	onExited?(element: Element): void;
 }
-export class Transition extends React.Component<TransitionProps, {}> { }
+export class Transition extends React.Component<TransitionProps> { }
diff --git a/types/react-overlays/lib/RootCloseWrapper.d.ts b/types/react-overlays/lib/RootCloseWrapper.d.ts
index 384df80f4a..cfe4955f29 100644
--- a/types/react-overlays/lib/RootCloseWrapper.d.ts
+++ b/types/react-overlays/lib/RootCloseWrapper.d.ts
@@ -17,6 +17,6 @@ interface RootCloseWrapperProps {
 	event?: 'click' | 'mousedown';
 }
 
-declare class RootCloseWrapper extends React.Component<RootCloseWrapperProps, {}> { }
+declare class RootCloseWrapper extends React.Component<RootCloseWrapperProps> { }
 declare namespace RootCloseWrapper { } // module export workaround: https://github.com/Microsoft/TypeScript/issues/5073
 export = RootCloseWrapper;
diff --git a/types/react-overlays/react-overlays-tests.tsx b/types/react-overlays/react-overlays-tests.tsx
index bbe526853f..af9eabaea8 100644
--- a/types/react-overlays/react-overlays-tests.tsx
+++ b/types/react-overlays/react-overlays-tests.tsx
@@ -17,7 +17,7 @@ function testTransition() {
   );
 }
 
-class TestAffix extends React.Component<{}, {}> {
+class TestAffix extends React.Component {
   render(): JSX.Element {
     return (
       <div>
@@ -29,7 +29,7 @@ class TestAffix extends React.Component<{}, {}> {
   }
 }
 
-class TestRootCloseWrapper extends React.Component<{}, {}> {
+class TestRootCloseWrapper extends React.Component {
   handleRootClose = () => { };
   render() {
     return (
diff --git a/types/react-paginate/index.d.ts b/types/react-paginate/index.d.ts
index b6b50170c2..a6c1c41d1b 100644
--- a/types/react-paginate/index.d.ts
+++ b/types/react-paginate/index.d.ts
@@ -1,8 +1,11 @@
-// Type definitions for react-paginate 4.2
+// Type definitions for react-paginate 4.3
 // Project: https://github.com/AdeleD/react-paginate
-// Definitions by: Simon Hartcher <https://github.com/deevus>, Wouter Hardeman <https://github.com/wouterhardeman>, pegel03 <https://github.com/pegel03>
+// Definitions by: Simon Hartcher <https://github.com/deevus>
+//                 Wouter Hardeman <https://github.com/wouterhardeman>
+//                 pegel03 <https://github.com/pegel03>
+//                 Simon Archer <https://github.com/archy-bold>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -111,6 +114,11 @@ interface ReactPaginateProps {
      * The method is called to generate the href attribute value on tag a of each page element.
      */
     hrefBuilder?(pageIndex: number): void;
+
+    /**
+     * Extra context to add to the aria-label HTML attribute.
+     */
+    extraAriaContext?: string;
 }
 
 declare const ReactPaginate: React.ComponentClass<ReactPaginateProps>;
diff --git a/types/react-paginate/react-paginate-tests.tsx b/types/react-paginate/react-paginate-tests.tsx
index 31efb805ce..92d8659c0c 100644
--- a/types/react-paginate/react-paginate-tests.tsx
+++ b/types/react-paginate/react-paginate-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import ReactPaginate = require("react-paginate");
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     render() {
         return (
             <ReactPaginate
@@ -26,6 +26,7 @@ class Test extends React.Component<{}, {}> {
                 nextLinkClassName={'next-a'}
                 disabledClassName={'disabled'}
                 hrefBuilder={(pageIndex: number) => null}
+                extraAriaContext={'aria'}
             />
         );
     }
diff --git a/types/react-pointable/index.d.ts b/types/react-pointable/index.d.ts
new file mode 100644
index 0000000000..e2db8d2fb4
--- /dev/null
+++ b/types/react-pointable/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for react-pointable 1.1
+// Project: https://github.com/MilllerTime/react-pointable
+// Definitions by: Stefan Fochler <https://github.com/istefo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export type TouchAction = 'auto' | 'none' | 'pan-x' | 'pan-y' | 'manipulation';
+
+export interface PointableProps extends React.HTMLAttributes<HTMLElement> {
+    tagName?: keyof HTMLElementTagNameMap;
+    touchAction?: TouchAction;
+    elementRef?(el: HTMLElement): void;
+    onPointerMove?(evt: PointerEvent): void;
+    onPointerDown?(evt: PointerEvent): void;
+    onPointerUp?(evt: PointerEvent): void;
+    onPointerOver?(evt: PointerEvent): void;
+    onPointerOut?(evt: PointerEvent): void;
+    onPointerEnter?(evt: PointerEvent): void;
+    onPointerLeave?(evt: PointerEvent): void;
+    onPointerCancel?(evt: PointerEvent): void;
+}
+
+export default class Pointable extends React.Component<PointableProps> {
+    static defaultProps: {
+        tagName: 'div',
+        touchAction: 'auto'
+    };
+}
diff --git a/types/react-pointable/react-pointable-tests.tsx b/types/react-pointable/react-pointable-tests.tsx
new file mode 100644
index 0000000000..6331b88386
--- /dev/null
+++ b/types/react-pointable/react-pointable-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+import Pointable from 'react-pointable';
+
+class Test extends React.Component<object, object> {
+    elementRef(el: HTMLElement) {}
+    somePointerEvent(evt: PointerEvent) {}
+
+    render() {
+        return (
+            <Pointable
+                tagName="div"
+                touchAction="auto"
+                elementRef={this.elementRef}
+                onPointerMove={this.somePointerEvent}
+                onPointerDown={this.somePointerEvent}
+                onPointerUp={this.somePointerEvent}
+                onPointerOver={this.somePointerEvent}
+                onPointerOut={this.somePointerEvent}
+                onPointerEnter={this.somePointerEvent}
+                onPointerLeave={this.somePointerEvent}
+                onPointerCancel={this.somePointerEvent}
+            >
+                Child Contents
+            </Pointable>
+        );
+    }
+}
diff --git a/types/react-pointable/tsconfig.json b/types/react-pointable/tsconfig.json
new file mode 100644
index 0000000000..866ea95bb4
--- /dev/null
+++ b/types/react-pointable/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-pointable-tests.tsx"
+    ]
+}
diff --git a/types/react-pointable/tslint.json b/types/react-pointable/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-pointable/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-portal/index.d.ts b/types/react-portal/index.d.ts
index 644db637a9..48d26f8d1b 100644
--- a/types/react-portal/index.d.ts
+++ b/types/react-portal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tajo/react-portal#readme
 // Definitions by: Shun Takahashi <https://github.com/shuntksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
diff --git a/types/react-portal/react-portal-tests.tsx b/types/react-portal/react-portal-tests.tsx
index f3bd6d4b83..08d730dcf5 100644
--- a/types/react-portal/react-portal-tests.tsx
+++ b/types/react-portal/react-portal-tests.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as Portal from "react-portal";
 
-export default class App extends React.Component<{}, {}> {
+export default class App extends React.Component {
   render() {
     const button1 = <button>Open portal with pseudo modal</button>;
 
@@ -18,7 +18,7 @@ export default class App extends React.Component<{}, {}> {
   }
 }
 
-export class PseudoModal extends React.Component<{ closePortal?(): {} }, {}> {
+export class PseudoModal extends React.Component<{ closePortal?(): {} }> {
   render() {
     return (
       <div>
diff --git a/types/react-props-decorators/index.d.ts b/types/react-props-decorators/index.d.ts
index d577f7b175..64f33a495c 100644
--- a/types/react-props-decorators/index.d.ts
+++ b/types/react-props-decorators/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/popkirby/react-props-decorators
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
diff --git a/types/react-props-decorators/react-props-decorators-tests.ts b/types/react-props-decorators/react-props-decorators-tests.ts
index 654c2df98f..0bc81826fd 100644
--- a/types/react-props-decorators/react-props-decorators-tests.ts
+++ b/types/react-props-decorators/react-props-decorators-tests.ts
@@ -9,6 +9,6 @@ import { propTypes, defaultProps } from 'react-props-decorators';
     foo: "defaultString",
     bar: 100
 })
-class Baz extends React.Component<any, any> {
+class Baz extends React.Component {
     /* ... */
 }
diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index af6853efb3..e902c11040 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/appleboy/react-recaptcha
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Component } from "react";
 export = Recaptcha;
@@ -19,12 +19,12 @@ interface RecaptchaProps {
     tabindex?: string;
     theme?: "dark" | "light";
     type?: string;
-    verifyCallback?(): any;
+    verifyCallback?(response: string): any;
     verifyCallbackName?: string;
     sitekey?: string;
 }
 
-declare class Recaptcha extends Component<RecaptchaProps, any> {
+declare class Recaptcha extends Component<RecaptchaProps> {
     static propTypes: any;
     static defaultProps: RecaptchaProps;
 }
diff --git a/types/react-recaptcha/react-recaptcha-tests.tsx b/types/react-recaptcha/react-recaptcha-tests.tsx
index d931e45ae3..98f3972c00 100644
--- a/types/react-recaptcha/react-recaptcha-tests.tsx
+++ b/types/react-recaptcha/react-recaptcha-tests.tsx
@@ -1,6 +1,6 @@
 import Recaptcha = require('react-recaptcha');
-import ReactDOM = require("react-dom");
-import React = require("react");
+import * as ReactDOM from "react-dom";
+import * as React from "react";
 
 ReactDOM.render(
   <Recaptcha
diff --git a/types/react-redux-i18n/index.d.ts b/types/react-redux-i18n/index.d.ts
index a8ea035511..2195dfaeaa 100644
--- a/types/react-redux-i18n/index.d.ts
+++ b/types/react-redux-i18n/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zoover/react-redux-i18n
 // Definitions by: Clément Devos <https://github.com/clementdevos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-redux-i18n' {
   import * as react from "react"
@@ -44,8 +44,8 @@ declare module 'react-redux-i18n' {
   /**
    * React components
    */
-  export class Translate extends react.Component<TranslateProps, any>{ }
-  export class Localize extends react.Component<LocalizeProps, any>{ }
+  export class Translate extends react.Component<TranslateProps>{ }
+  export class Localize extends react.Component<LocalizeProps>{ }
 
   /**
    * Reducer
diff --git a/types/react-redux-i18n/react-redux-i18n-tests.tsx b/types/react-redux-i18n/react-redux-i18n-tests.tsx
index 0811dca83d..cf1f24ee4b 100644
--- a/types/react-redux-i18n/react-redux-i18n-tests.tsx
+++ b/types/react-redux-i18n/react-redux-i18n-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as I18n from "react-redux-i18n";
 
-class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -12,7 +12,7 @@ class ReactReduxI18nTests_Translate1 extends React.Component<React.Props<{}>, {}
 
 
 
-class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -22,7 +22,7 @@ class ReactReduxI18nTests_Translate2 extends React.Component<React.Props<{}>, {}
 }
 
 
-class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -32,7 +32,7 @@ class ReactReduxI18nTests_Translate3 extends React.Component<React.Props<{}>, {}
 }
 
 
-class ReactReduxI18nTests_Translate4 extends React.Component<React.Props<{}>, {}>{
+class ReactReduxI18nTests_Translate4 extends React.Component<React.Props<{}>>{
 
   render() {
     return (
@@ -43,8 +43,8 @@ class ReactReduxI18nTests_Translate4 extends React.Component<React.Props<{}>, {}
 
 function testI18Helper() {
   I18n.I18n.t('application.title'); // => returns 'Toffe app met i18n!'
-  I18n.I18n.t('application.name', { name: 'Aad' }); // => returns 'Hallo, Aad!' 
+  I18n.I18n.t('application.name', { name: 'Aad' }); // => returns 'Hallo, Aad!'
 
   I18n.I18n.l(1385856000000, { dateFormat: 'date.long' }); // => returns '1 december 2013'
-  I18n.I18n.l(Math.PI, { maximumFractionDigits: 2 }); // => returns '3,14' 
+  I18n.I18n.l(Math.PI, { maximumFractionDigits: 2 }); // => returns '3,14'
 }
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index af40ec724a..85a7b22bc8 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/diegoddox/react-redux-toastr
 // Definitions by: Aleksandar Ivanov <https://github.com/Smiche>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-redux-toastr" {
     import * as React from "react";
@@ -32,7 +32,7 @@ declare module "react-redux-toastr" {
     /**
      * Toastr react component.
      */
-    export default class ReduxToastr extends React.Component<ToastrOptions, any>{ }
+    export default class ReduxToastr extends React.Component<ToastrOptions>{ }
 
     interface EmitterOptions {
         /**
@@ -46,7 +46,7 @@ declare module "react-redux-toastr" {
         timeOut?: number,
         removeOnHover?: boolean,
         removeOnClick?: boolean,
-        component?: React.Component<any, any>,
+        component?: React.Component<any>,
         onShowComplete?(): void;
         onHideComplete?(): void;
     }
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 42d84b4a0d..c21ea1c33b 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rackt/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>, Sean Kelley <https://github.com/seansfkelley>, Thomas Hasner <https://github.com/thasner>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import * as Redux from 'redux';
@@ -15,17 +15,20 @@ type Store<S> = Redux.Store<S>;
 type Dispatch<S> = Redux.Dispatch<S>;
 type ActionCreator<A> = Redux.ActionCreator<A>;
 
-interface ComponentDecorator<TOwnProps, TMergedProps> {
-    (component: Component<TMergedProps>): ComponentClass<TOwnProps>;
+export interface DispatchProp<S> {
+  dispatch: Dispatch<S>;
 }
 
-/**
- * Decorator that infers the type from the original component
- *
- * Can't use the above decorator because it would default the type to {}
- */
-export interface InferableComponentDecorator<TOwnProps> {
-    <T extends Component<TOwnProps>>(component: T): T;
+interface ComponentDecorator<TMergedProps, TOwnProps> {
+    (component: Component<TOwnProps & TMergedProps>): ComponentClass<TOwnProps>;
+}
+
+interface ComponentDecoratorInfer<TMergedProps> {
+    <T>(component: Component<T & TMergedProps>): ComponentClass<T>;
+}
+
+interface ComponentMergeDecorator<TMergedProps, TOwnProps> {
+    (component: Component<TMergedProps>): ComponentClass<TOwnProps>;
 }
 
 /**
@@ -47,73 +50,73 @@ export interface InferableComponentDecorator<TOwnProps> {
  * @param mergeProps
  * @param options
  */
-export declare function connect<TOwnProps>(): InferableComponentDecorator<TOwnProps>;
+export declare function connect(): ComponentDecoratorInfer<DispatchProp<any>>;
 
 export declare function connect<TStateProps, no_dispatch, TOwnProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>
-): ComponentDecorator<TOwnProps, TStateProps & TOwnProps>;
+): ComponentDecorator<DispatchProp<any> & TStateProps, TOwnProps>;
 
 export declare function connect<no_state, TDispatchProps, TOwnProps>(
     mapStateToProps: null | undefined,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-): ComponentDecorator<TOwnProps, TDispatchProps & TOwnProps>;
+): ComponentDecorator<TDispatchProps, TOwnProps>;
 
 export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-): ComponentDecorator<TOwnProps, TStateProps & TDispatchProps & TOwnProps>;
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
 
 export declare function connect<TStateProps, no_dispatch, TOwnProps, TMergedProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: null | undefined,
     mergeProps: MergeProps<TStateProps, undefined, TOwnProps, TMergedProps>,
-): ComponentDecorator<TOwnProps, TMergedProps>;
+): ComponentMergeDecorator<TMergedProps, TOwnProps>;
 
 export declare function connect<no_state, TDispatchProps, TOwnProps, TMergedProps>(
     mapStateToProps: null | undefined,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps: MergeProps<undefined, TDispatchProps, TOwnProps, TMergedProps>,
-): ComponentDecorator<TOwnProps, TMergedProps>;
+): ComponentMergeDecorator<TMergedProps, TOwnProps>;
 
 export declare function connect<no_state, no_dispatch, TOwnProps, TMergedProps>(
     mapStateToProps: null | undefined,
     mapDispatchToProps: null | undefined,
     mergeProps: MergeProps<undefined, undefined, TOwnProps, TMergedProps>,
-): ComponentDecorator<TOwnProps, TMergedProps>;
+): ComponentMergeDecorator<TMergedProps, TOwnProps>;
 
 export declare function connect<TStateProps, TDispatchProps, TOwnProps, TMergedProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-): ComponentDecorator<TOwnProps, TMergedProps>;
+): ComponentMergeDecorator<TMergedProps, TOwnProps>;
 
 export declare function connect<TStateProps, no_dispatch, TOwnProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: null | undefined,
     mergeProps: null | undefined,
     options: Options
-): ComponentDecorator<TOwnProps, TStateProps & TOwnProps>;
+): ComponentDecorator<DispatchProp<any> & TStateProps, TOwnProps>;
 
 export declare function connect<no_state, TDispatchProps, TOwnProps>(
     mapStateToProps: null | undefined,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps: null | undefined,
     options: Options
-): ComponentDecorator<TOwnProps, TDispatchProps & TOwnProps>;
+): ComponentDecorator<TDispatchProps, TOwnProps>;
 
 export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps: null | undefined,
     options: Options
-): ComponentDecorator<TOwnProps, TStateProps & TDispatchProps & TOwnProps>;
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
 
 export declare function connect<TStateProps, TDispatchProps, TOwnProps, TMergedProps>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps>,
     mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
     mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
     options: Options
-): ComponentDecorator<TOwnProps, TMergedProps>;
+): ComponentMergeDecorator<TMergedProps, TOwnProps>;
 
 interface MapStateToProps<TStateProps, TOwnProps> {
     (state: any, ownProps?: TOwnProps): TStateProps;
@@ -173,4 +176,4 @@ export interface ProviderProps {
 /**
  * Makes the Redux store available to the connect() calls in the component hierarchy below.
  */
-export class Provider extends React.Component<ProviderProps, {}> { }
+export class Provider extends React.Component<ProviderProps> { }
diff --git a/types/react-redux/package.json b/types/react-redux/package.json
index e52256ea90..36ce503807 100644
--- a/types/react-redux/package.json
+++ b/types/react-redux/package.json
@@ -2,4 +2,4 @@
   "dependencies": {
     "redux": "^3.6.0"
   }
-}
\ No newline at end of file
+}
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index e8de2b1291..5deba4bd4e 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Store, Dispatch, bindActionCreators } from 'redux';
-import { connect, Provider } from 'react-redux';
+import { connect, Provider, DispatchProp, MapStateToProps } from 'react-redux';
 import objectAssign = require('object-assign');
 
 //
@@ -108,9 +108,7 @@ declare var store: Store<TodoState>;
 class MyRootComponent extends Component<any, any> {
 
 }
-class TodoApp extends Component<any, any> {
-
-}
+class TodoApp extends Component<any, any> {}
 interface TodoState {
     todos: string[]|string;
 }
@@ -153,7 +151,10 @@ ReactDOM.render(
 
 // Inject just dispatch and don't listen to store
 
-connect()(TodoApp);
+const AppWrap = (props: DispatchProp<any> & { children?: React.ReactNode }) => <div />
+const WrappedApp = connect()(AppWrap);
+
+<WrappedApp />
 
 // Inject dispatch and every field in the global state
 
@@ -261,7 +262,7 @@ function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProp
     });
 }
 
-connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
+connect(mapStateToProps2, actionCreators, mergeProps)(MyRootComponent);
 
 
 //https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14622#issuecomment-279820358
@@ -276,16 +277,15 @@ interface TestState {
     isLoaded: boolean;
     state1: number;
 }
-class TestComponent extends Component<TestProp, TestState> { }
+class TestComponent extends Component<TestProp & DispatchProp<any>, TestState> { }
 const WrappedTestComponent = connect()(TestComponent);
 
 // return value of the connect()(TestComponent) is of the type TestComponent
-let ATestComponent: typeof TestComponent = null;
+let ATestComponent: React.ComponentClass<TestProp> = null;
 ATestComponent = TestComponent;
 ATestComponent = WrappedTestComponent;
 
 let anElement: ReactElement<TestProp>;
-<TestComponent property1={42} />;
 <WrappedTestComponent property1={42} />;
 <ATestComponent property1={42} />;
 
@@ -343,7 +343,7 @@ namespace TestTOwnPropsInference {
         state: string;
     }
 
-    class OwnPropsComponent extends React.Component<OwnProps & StateProps, void> {
+    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp<any>> {
         render() {
             return <div/>;
         }
@@ -375,6 +375,26 @@ namespace TestTOwnPropsInference {
 
     // This should not compile, which is good.
     // React.createElement(ConnectedWithTypeHint, { anything: 'goes!' });
+
+    interface AllProps {
+        own: string
+        state: string
+    }
+
+    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
+        render() {
+            return <div/>;
+        }
+    }
+
+    type PickedOwnProps = Pick<AllProps, "own">
+    type PickedStateProps = Pick<AllProps, "state">
+
+    const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps> = (state: any): PickedStateProps => {
+        return { state: "string" }
+    }
+    const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
+    <ConnectedWithPickedOwnProps own="blah" />
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/16021
@@ -395,7 +415,7 @@ namespace TestMergedPropsInference {
         merged: string;
     }
 
-    class MergedPropsComponent extends React.Component<MergedProps, void> {
+    class MergedPropsComponent extends React.Component<MergedProps> {
         render() {
             return <div/>;
         }
@@ -433,3 +453,44 @@ namespace TestMergedPropsInference {
         }),
     )(MergedPropsComponent);
 }
+
+namespace Issue16652 {
+    interface PassedProps {
+        commentIds: string[];
+    }
+
+    interface GeneratedStateProps {
+        comments: ({ id: string } | undefined)[];
+    }
+
+    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp<any>> {}
+
+    const mapStateToProps = (state: any, ownProps: PassedProps): GeneratedStateProps => {
+        return {
+            comments: ownProps.commentIds.map(id => ({ id })),
+        };
+    };
+
+    const ConnectedCommentList = connect<GeneratedStateProps, {}, PassedProps>(mapStateToProps)(
+        CommentList
+    );
+
+    <ConnectedCommentList commentIds={['a', 'b', 'c']} />
+}
+
+namespace Issue15463 {
+    interface ISpinnerProps{
+        showGlobalSpinner: boolean;
+    }
+    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp<any>, undefined> {
+        render() {
+            return (<div />);
+        }
+    }
+
+    export const Spinner = connect((state: any) => {
+        return { showGlobalSpinner: true };
+    })(SpinnerClass);
+
+    <Spinner />
+}
diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index a693527e3e..4f9f49e5e7 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/relay
 // Definitions by: Johannes Schickling <https://github.com/graphcool>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-relay" {
     import * as React from "react";
diff --git a/types/react-relay/react-relay-tests.tsx b/types/react-relay/react-relay-tests.tsx
index 091909cabd..90425156cc 100644
--- a/types/react-relay/react-relay-tests.tsx
+++ b/types/react-relay/react-relay-tests.tsx
@@ -49,7 +49,7 @@ interface ArtworkProps {
     relay: Relay.RelayProp,
 }
 
-class Artwork extends React.Component<ArtworkProps, null> {
+class Artwork extends React.Component<ArtworkProps> {
     render() {
         return (
             <a href={`/artworks/${this.props.relay.variables.artworkID}`}>
@@ -69,7 +69,7 @@ const ArtworkContainer = Relay.createContainer(Artwork, {
     }
 })
 
-class StubbedArtwork extends React.Component<null, null> {
+class StubbedArtwork extends React.Component {
     render() {
         const props = {
             artwork: { title: "CHAMPAGNE FORMICA FLAG" },
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index b88f33697a..3b6e456c73 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/contra/react-responsive
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-responsive" {
     import * as React from "react";
@@ -59,7 +59,7 @@ declare module "react-responsive" {
         }
     }
 
-    class MediaQuery extends React.Component<MediaQuery.MediaQueryProps, any> { }
+    class MediaQuery extends React.Component<MediaQuery.MediaQueryProps> { }
     export = MediaQuery;
 
 }
diff --git a/types/react-responsive/react-responsive-tests.tsx b/types/react-responsive/react-responsive-tests.tsx
index 02b948c8a4..28f8f39c30 100644
--- a/types/react-responsive/react-responsive-tests.tsx
+++ b/types/react-responsive/react-responsive-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as MediaQuery from "react-responsive";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     render() {
         return (
             <div>
diff --git a/types/react-router-bootstrap/index.d.ts b/types/react-router-bootstrap/index.d.ts
index c133a58e5c..c09a82d770 100644
--- a/types/react-router-bootstrap/index.d.ts
+++ b/types/react-router-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
 // Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>, Olmo del Corral <https://github.com/olmobrutall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
 export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/types/react-router-bootstrap/lib/IndexLinkContainer.d.ts b/types/react-router-bootstrap/lib/IndexLinkContainer.d.ts
index 6deafb847a..10db7e399e 100644
--- a/types/react-router-bootstrap/lib/IndexLinkContainer.d.ts
+++ b/types/react-router-bootstrap/lib/IndexLinkContainer.d.ts
@@ -1,9 +1,9 @@
 import { ComponentClass } from "react";
-import { LinkProps } from "react-router-dom";
+import { NavLinkProps } from "react-router-dom";
 
-//IndexLink is removed in react-router, but continues there in react-router-bootstrap for backwards compatibility. 
+//IndexLink is removed in react-router, but continues there in react-router-bootstrap for backwards compatibility.
 //Better use <LinkContainer exact/>
-type IndexLinkContainer = ComponentClass<LinkProps>;
+type IndexLinkContainer = ComponentClass<NavLinkProps>;
 declare const IndexLinkContainer: IndexLinkContainer;
 
 export default IndexLinkContainer;
diff --git a/types/react-router-bootstrap/lib/LinkContainer.d.ts b/types/react-router-bootstrap/lib/LinkContainer.d.ts
index 95ee85ed48..b6fe025053 100644
--- a/types/react-router-bootstrap/lib/LinkContainer.d.ts
+++ b/types/react-router-bootstrap/lib/LinkContainer.d.ts
@@ -1,7 +1,7 @@
 import { ComponentClass } from "react";
-import { LinkProps } from "react-router-dom";
+import { NavLinkProps } from "react-router-dom";
 
-type LinkContainer = ComponentClass<LinkProps>;
+type LinkContainer = ComponentClass<NavLinkProps>;
 declare const LinkContainer: LinkContainer;
 
 export default LinkContainer;
diff --git a/types/react-router-bootstrap/react-router-bootstrap-tests.tsx b/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
index 7816933fe6..749edd95d3 100644
--- a/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
+++ b/types/react-router-bootstrap/react-router-bootstrap-tests.tsx
@@ -3,7 +3,7 @@ import { Component, CSSProperties } from 'react';
 import { Button } from 'react-bootstrap';
 import { LinkContainer, IndexLinkContainer } from 'react-router-bootstrap'
 
-export class ReactRouterBootstrapTest extends Component<any, any> {
+export class ReactRouterBootstrapTest extends Component {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
     }
@@ -15,6 +15,7 @@ export class ReactRouterBootstrapTest extends Component<any, any> {
 
                 <div style={style}>
                     <LinkContainer to="/page"><Button>Link</Button></LinkContainer>
+                    <LinkContainer to="/page" exact strict><Button>Link</Button></LinkContainer>
                     <IndexLinkContainer to="/index"><Button>Link</Button></IndexLinkContainer>
                 </div>
             </div>
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 4979cbfd6b..8497b0d4b8 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import { RouteComponentProps, match } from "react-router";
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 66e3a5dd98..44725be863 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 declare module 'react-router-dom' {
   import {
@@ -30,20 +30,20 @@ declare module 'react-router-dom' {
     forceRefresh?: boolean;
     keyLength?: number;
   }
-  class BrowserRouter extends React.Component<BrowserRouterProps, void> {}
+  class BrowserRouter extends React.Component<BrowserRouterProps> {}
 
   interface HashRouterProps {
     basename?: string;
     getUserConfirmation?(): void;
     hashType?: 'slash' | 'noslash' | 'hashbang';
   }
-  class HashRouter extends React.Component<HashRouterProps, void> {}
+  class HashRouter extends React.Component<HashRouterProps> {}
 
   interface LinkProps extends React.HTMLAttributes<HTMLAnchorElement> {
     to: H.LocationDescriptor;
     replace?: boolean;
   }
-  class Link extends React.Component<LinkProps, void> {}
+  class Link extends React.Component<LinkProps> {}
 
   interface NavLinkProps extends LinkProps {
     activeClassName?: string;
@@ -52,7 +52,7 @@ declare module 'react-router-dom' {
     strict?: boolean;
     isActive?<P>(match: match<P>, location: H.Location): boolean;
   }
-  class NavLink extends React.Component<NavLinkProps, void> {}
+  class NavLink extends React.Component<NavLinkProps> {}
 
   export {
     BrowserRouter,
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
new file mode 100644
index 0000000000..214e81b0d3
--- /dev/null
+++ b/types/react-router-native/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for React Router Native 4.0
+// Project: https://github.com/ReactTraining/react-router-native
+// Definitions by: Eduard Zintz <https://github.com/ezintz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export {
+  match,
+  matchPath,
+  MemoryRouter,
+  Prompt,
+  Redirect,
+  Route,
+  RouteComponentProps,
+  RouteProps,
+  Router,
+  RouterChildContext,
+  StaticRouter,
+  Switch,
+  withRouter
+} from 'react-router';
+import * as React from 'react';
+import * as H from 'history';
+
+export interface AndroidBackButtonProps {
+  children: Array<React.Component<void, void>>;
+}
+
+export class AndroidBackButton extends React.Component<AndroidBackButtonProps, void> {}
+
+export class DeepLinking extends React.Component<{}, {}> {}
+
+export interface LinkProps {
+  component?: React.Component<void, void>;
+  replace?: boolean;
+  style?: any;
+  to: H.LocationDescriptor;
+}
+
+export class Link extends React.Component<LinkProps, void> {}
+
+export interface NativeRouterProps {
+  getUserConfirmation?: Function;
+  keyLength?: number;
+}
+
+export class NativeRouter extends React.Component<NativeRouterProps, void> {}
diff --git a/types/react-router-native/react-router-native-tests.tsx b/types/react-router-native/react-router-native-tests.tsx
new file mode 100644
index 0000000000..40cd5b8532
--- /dev/null
+++ b/types/react-router-native/react-router-native-tests.tsx
@@ -0,0 +1,80 @@
+import * as React from 'react';
+import {StyleSheet, Text, View} from 'react-native';
+import {NativeRouter as Router, Route, Link} from 'react-router-native';
+
+const Home: React.SFC<{}> = () => {
+  return (
+    <View>
+      <Text style={styles.welcome}>
+        Welcome to React Native!
+      </Text>
+      <Text style={styles.instructions}>
+        Press Cmd+R to reload,{'\n'}
+        Cmd+D or shake for dev menu
+      </Text>
+    </View>
+ );
+};
+
+const About: React.SFC<{}> = () => {
+  return (
+    <Text style={styles.header}>
+      About
+    </Text>
+ );
+};
+
+export default class App extends React.Component<{}, {}> {
+  render() {
+    return (
+      <Router>
+        <View style={styles.container}>
+          <View style={styles.nav}>
+            <Link to="/" style={styles.navItem}>
+              <Text>Home</Text>
+            </Link>
+            <Link to="/about" style={styles.navItem}>
+                <Text>About</Text>
+            </Link>
+          </View>
+          <Route exact path="/" component={Home}/>
+          <Route path="/about" component={About}/>
+        </View>
+      </Router>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  header: {
+    fontSize: 20
+  },
+  nav: {
+    flexDirection: 'row',
+    justifyContent: 'space-around'
+  },
+  navItem: {
+    flex: 1,
+    alignItems: 'center',
+    padding: 10
+  },
+  subNavItem: {
+    padding: 5
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
+});
diff --git a/types/react-router-native/tsconfig.json b/types/react-router-native/tsconfig.json
new file mode 100644
index 0000000000..6764b72818
--- /dev/null
+++ b/types/react-router-native/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "jsx": "react",
+    "strictNullChecks": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true
+  },
+  "files": [
+    "index.d.ts",
+    "react-router-native-tests.tsx"
+  ]
+}
diff --git a/types/react-router-native/tslint.json b/types/react-router-native/tslint.json
new file mode 100644
index 0000000000..c9a409bbed
--- /dev/null
+++ b/types/react-router-native/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // This package uses the Function type, and it will take effort to fix.
+    "ban-types": false
+  }
+}
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index e224f92530..cf7a6cc410 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-redux
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Store,
@@ -23,7 +23,7 @@ export interface ConnectedRouterProps<State> {
     store?: Store<State>;
     history?: History;
 }
-export class ConnectedRouter<State> extends React.Component<ConnectedRouterProps<State>, {}> {}
+export class ConnectedRouter<State> extends React.Component<ConnectedRouterProps<State>> {}
 
 export const LOCATION_CHANGE: string;
 
@@ -41,7 +41,7 @@ export function go(n: number): RouterAction;
 export function goBack(): RouterAction;
 export function goForward(): RouterAction;
 
-export const routerAction: {
+export const routerActions: {
     push: typeof push
     replace: typeof replace
     go: typeof go
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 384cb2289e..72afa50e3b 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -14,7 +14,7 @@
 //                 Jérémy Fauvel <https://github.com/grmiade>
 //                 Daniel Roth <https://github.com/DaIgeb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import * as H from 'history';
@@ -37,13 +37,13 @@ export interface MemoryRouterProps {
   keyLength?: number;
 }
 
-export class MemoryRouter extends React.Component<MemoryRouterProps, void> { }
+export class MemoryRouter extends React.Component<MemoryRouterProps> { }
 
 export interface PromptProps {
   message: string | ((location: H.Location) => void);
   when?: boolean;
 }
-export class Prompt extends React.Component<PromptProps, void> { }
+export class Prompt extends React.Component<PromptProps> { }
 
 export interface RedirectProps {
   to: H.LocationDescriptor;
@@ -53,12 +53,13 @@ export interface RedirectProps {
   exact?: boolean;
   strict?: boolean;
 }
-export class Redirect extends React.Component<RedirectProps, void> { }
+export class Redirect extends React.Component<RedirectProps> { }
 
 export interface RouteComponentProps<P> {
   match: match<P>;
   location: H.Location;
   history: H.History;
+  staticContext?: any;
 }
 
 export interface RouteProps {
@@ -70,12 +71,12 @@ export interface RouteProps {
   exact?: boolean;
   strict?: boolean;
 }
-export class Route extends React.Component<RouteProps, {}> { }
+export class Route extends React.Component<RouteProps> { }
 
 export interface RouterProps {
   history: any;
 }
-export class Router extends React.Component<RouterProps, {}> { }
+export class Router extends React.Component<RouterProps> { }
 
 export interface StaticRouterProps {
   basename?: string;
@@ -83,12 +84,12 @@ export interface StaticRouterProps {
   context?: object;
 }
 
-export class StaticRouter extends React.Component<StaticRouterProps, {}> { }
+export class StaticRouter extends React.Component<StaticRouterProps> { }
 export interface SwitchProps {
   children?: React.ReactNode;
   location?: H.Location;
 }
-export class Switch extends React.Component<SwitchProps, {}> { }
+export class Switch extends React.Component<SwitchProps> { }
 
 export interface match<P> {
   params: P;
diff --git a/types/react-router/test/MemoryRouter.tsx b/types/react-router/test/MemoryRouter.tsx
index 7d947e436e..99aa385bd5 100644
--- a/types/react-router/test/MemoryRouter.tsx
+++ b/types/react-router/test/MemoryRouter.tsx
@@ -13,7 +13,7 @@ const initialRouterEntries = [
 ];
 
 const MemoryRouterExample = () => (
-  <MemoryRouter initialEntries={[initialRouterEntries]} initialIndex={1}>
+  <MemoryRouter initialEntries={initialRouterEntries} initialIndex={1}>
     <div>
       <ul>
         <li><Link to="/">Home</Link></li>
diff --git a/types/react-router/test/ModalGallery.tsx b/types/react-router/test/ModalGallery.tsx
index 3d7aadd0f7..f4b55aca20 100644
--- a/types/react-router/test/ModalGallery.tsx
+++ b/types/react-router/test/ModalGallery.tsx
@@ -16,7 +16,7 @@ import {
 // are the same as before but now we see them inside a modal
 // on top of the old screen.
 
-class ModalSwitch extends React.Component<RouteComponentProps<void>, void> {
+class ModalSwitch extends React.Component<RouteComponentProps<void>> {
   // We can pass a location to <Switch/> that will tell it to
   // ignore the router's current location and use the location
   // prop instead.
diff --git a/types/react-router/test/NavigateWithContext.tsx b/types/react-router/test/NavigateWithContext.tsx
index 89b53aef58..7a58090462 100644
--- a/types/react-router/test/NavigateWithContext.tsx
+++ b/types/react-router/test/NavigateWithContext.tsx
@@ -13,7 +13,7 @@ interface Params {
 }
 type Props = RouteComponentProps<Params>;
 
-class ComponentThatUsesContext extends React.Component<Props, {}> {
+class ComponentThatUsesContext extends React.Component<Props> {
   static contextTypes = {
     router: React.PropTypes.object.isRequired
   };
diff --git a/types/react-router/test/StaticRouter.tsx b/types/react-router/test/StaticRouter.tsx
new file mode 100644
index 0000000000..c9763bdda5
--- /dev/null
+++ b/types/react-router/test/StaticRouter.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+import { StaticRouter, Route } from 'react-router-dom';
+
+interface StaticContext {
+    statusCode?: number;
+}
+
+interface RouteStatusProps {
+    statusCode: number;
+}
+
+const RouteStatus: React.SFC<RouteStatusProps> = (props) => (
+    <Route
+        render={({ staticContext }) => {
+            if (staticContext) {
+                (staticContext as StaticContext).statusCode = props.statusCode;
+            }
+
+            return (
+                <div>
+                    {props.children}
+                </div>
+            );
+        }}
+    />
+);
+
+interface PrintContextProps {
+    staticContext: StaticContext;
+}
+
+const PrintContext: React.SFC<PrintContextProps> = (props) => (
+    <p>
+        Static context: {JSON.stringify(props.staticContext)}
+    </p>
+);
+
+class StaticRouterExample extends React.Component {
+    staticContext: StaticContext = {};
+
+    render() {
+        return (
+            <StaticRouter location="/foo" context={this.staticContext}>
+                <div>
+                    <RouteStatus statusCode={404}>
+                        <p>Route with statusCode 404</p>
+                        <PrintContext staticContext={this.staticContext} />
+                    </RouteStatus>
+                </div>
+            </StaticRouter>
+        );
+    }
+}
+
+export default StaticRouterExample;
diff --git a/types/react-router/tsconfig.json b/types/react-router/tsconfig.json
index f3a225ece1..4790f0b53d 100644
--- a/types/react-router/tsconfig.json
+++ b/types/react-router/tsconfig.json
@@ -29,6 +29,7 @@
     "test/Recursive.tsx",
     "test/RouteConfig.tsx",
     "test/Sidebar.tsx",
+    "test/StaticRouter.tsx",
     "test/Switch.tsx",
     "test/WithRouter.tsx"
   ]
diff --git a/types/react-router/v2/index.d.ts b/types/react-router/v2/index.d.ts
index 67994b6710..c2fd8e9b22 100644
--- a/types/react-router/v2/index.d.ts
+++ b/types/react-router/v2/index.d.ts
@@ -7,7 +7,7 @@
 //                 Alex Wendland <https://github.com/awendland>
 //                 Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 export as namespace ReactRouter;
 
diff --git a/types/react-router/v2/lib/withRouter.d.ts b/types/react-router/v2/lib/withRouter.d.ts
index 71330bbb21..0add30e383 100644
--- a/types/react-router/v2/lib/withRouter.d.ts
+++ b/types/react-router/v2/lib/withRouter.d.ts
@@ -1,4 +1,4 @@
 import * as React from 'react';
 
-declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C;
+declare function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any>>(component: C): C;
 export default withRouter;
diff --git a/types/react-router/v3/index.d.ts b/types/react-router/v3/index.d.ts
index 05fe9b3371..ce1e165c7c 100644
--- a/types/react-router/v3/index.d.ts
+++ b/types/react-router/v3/index.d.ts
@@ -10,7 +10,7 @@
 //                 Karol Janyst <https://github.com/LKay>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 export {
     ChangeHook,
diff --git a/types/react-router/v3/react-router-tests.tsx b/types/react-router/v3/react-router-tests.tsx
index 557712e922..db7537cd2b 100644
--- a/types/react-router/v3/react-router-tests.tsx
+++ b/types/react-router/v3/react-router-tests.tsx
@@ -45,7 +45,7 @@ interface MasterContext {
 	router: InjectedRouter;
 }
 
-class Master extends Component<any, any> {
+class Master extends Component {
 	static contextTypes: ValidationMap<any> = {
 		router: routerShape
 	};
@@ -75,7 +75,7 @@ interface DashboardProps {
 	router: InjectedRouter;
 }
 
-class Dashboard extends React.Component<DashboardProps, {}> {
+class Dashboard extends React.Component<DashboardProps> {
 	static staticMethodToBeHoisted(): void { }
 
 	navigate() {
@@ -99,7 +99,7 @@ const DashboardWithRouter = withRouter(Dashboard);
 
 DashboardWithRouter.staticMethodToBeHoisted();
 
-class NotFound extends React.Component<{}, {}> {
+class NotFound extends React.Component {
 	render() {
 		return <div>
 			This path does not exists
@@ -109,7 +109,7 @@ class NotFound extends React.Component<{}, {}> {
 
 type UsersProps = RouteComponentProps<{}, {}>;
 
-class Users extends React.Component<UsersProps, {}> {
+class Users extends React.Component<UsersProps> {
 	render() {
 		const { location, params, route, routes, router, routeParams } = this.props;
 		return <div>
diff --git a/types/react-scroll/index.d.ts b/types/react-scroll/index.d.ts
index f4e6aa45d7..5c7c3cbced 100644
--- a/types/react-scroll/index.d.ts
+++ b/types/react-scroll/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ioannis Kokkinidis <https://github.com/sudoplz>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as ReactScroll from "./modules/index";
 export = ReactScroll;
diff --git a/types/react-scroll/modules/components/Button.d.ts b/types/react-scroll/modules/components/Button.d.ts
index 831ccfb49a..262e4d26e7 100644
--- a/types/react-scroll/modules/components/Button.d.ts
+++ b/types/react-scroll/modules/components/Button.d.ts
@@ -3,4 +3,4 @@ import { ReactScrollLinkProps } from "./Link";
 
 export type ButtonProps = ReactScrollLinkProps & React.HTMLProps<HTMLButtonElement>;
 
-export default class Button extends React.Component<ButtonProps, any> { }
+export default class Button extends React.Component<ButtonProps> { }
diff --git a/types/react-scroll/modules/components/Element.d.ts b/types/react-scroll/modules/components/Element.d.ts
index 53dae7ef66..411e6b6bd2 100644
--- a/types/react-scroll/modules/components/Element.d.ts
+++ b/types/react-scroll/modules/components/Element.d.ts
@@ -5,4 +5,4 @@ export interface ElementProps extends React.HTMLProps<HTMLDivElement> {
     id?: string;
 }
 
-export default class Element extends React.Component<ElementProps, any> { }
+export default class Element extends React.Component<ElementProps> { }
diff --git a/types/react-scroll/modules/components/Link.d.ts b/types/react-scroll/modules/components/Link.d.ts
index a1333c35ca..d15d460605 100644
--- a/types/react-scroll/modules/components/Link.d.ts
+++ b/types/react-scroll/modules/components/Link.d.ts
@@ -19,4 +19,4 @@ export interface ReactScrollLinkProps {
 
 export type LinkProps = ReactScrollLinkProps & React.HTMLProps<HTMLButtonElement>;
 
-export default class Link extends React.Component<LinkProps, any> { }
+export default class Link extends React.Component<LinkProps> { }
diff --git a/types/react-scroll/test/react-scroll-tests.tsx b/types/react-scroll/test/react-scroll-tests.tsx
index f341b4d241..1970a764df 100644
--- a/types/react-scroll/test/react-scroll-tests.tsx
+++ b/types/react-scroll/test/react-scroll-tests.tsx
@@ -119,7 +119,7 @@ Events.scrollEvent.register('end', (to, element) => {
 Events.scrollEvent.remove('begin');
 Events.scrollEvent.remove('end');
 
-class CustomComponent extends React.Component<{}, {}> {
+class CustomComponent extends React.Component {
     render() {
         return <div>
             {this.props.children}
diff --git a/types/react-scrollbar/index.d.ts b/types/react-scrollbar/index.d.ts
index 8d5628f4a5..f8ddee07c9 100644
--- a/types/react-scrollbar/index.d.ts
+++ b/types/react-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souhe/reactScrollbar
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -27,7 +27,7 @@ declare module "react-scrollbar" {
       swapWheelAxes?: boolean
   }
 
-  class ScrollArea extends React.Component<ScrollAreaProps, {}> {}
+  class ScrollArea extends React.Component<ScrollAreaProps> {}
 
   export = ScrollArea;
 }
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 361dcfecc2..fd07b4545c 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JedWatson/react-select
 // Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet/>, Gilad Gray <https://github.com/giladgray/>, Izaak Baker <https://github.com/iebaker/>, Tadas Dailyda <https://github.com/skirsdeda/>, Mark Vujevits <https://github.com/vujevits/>, Mike Deverell <https://github.com/devrelm/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -434,7 +434,9 @@ declare namespace ReactSelectClass {
         /**
          *  function to call to load options asynchronously
          */
-        loadOptions: (input: string, callback: (err: any, result: AutocompleteResult) => any) => any;
+        loadOptions:
+            | ((input: string) => Promise<AutocompleteResult>)
+            | ((input: string, callback: (err: any, result: AutocompleteResult) => void) => void);
 
         /**
          *  replaces the placeholder while options are loading
@@ -467,10 +469,10 @@ declare namespace ReactSelectClass {
     }
 }
 
-declare class ReactSelectClass extends React.Component<ReactSelectClass.ReactSelectProps, {}> { }
+declare class ReactSelectClass extends React.Component<ReactSelectClass.ReactSelectProps> { }
 
 declare module ReactSelectClass {
-    class Creatable extends React.Component<ReactCreatableSelectProps, {}> { }
-    class Async extends React.Component<ReactAsyncSelectProps, {}> { }
-    class AsyncCreatable extends React.Component<ReactAsyncSelectProps & ReactCreatableSelectProps, {}> { }
+    class Creatable extends React.Component<ReactCreatableSelectProps> { }
+    class Async extends React.Component<ReactAsyncSelectProps> { }
+    class AsyncCreatable extends React.Component<ReactAsyncSelectProps & ReactCreatableSelectProps> { }
 }
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index 972a1dacdc..6a1d1b778b 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -77,7 +77,7 @@ const filterOptions = (options: Array<Option>, filter: string, values: Array<Opt
     return filteredOptions;
 };
 
-class SelectTest extends React.Component<React.Props<{}>, {}> {
+class SelectTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{ label: "Foo", value: "bar" }];
@@ -138,7 +138,7 @@ class SelectTest extends React.Component<React.Props<{}>, {}> {
     }
 }
 
-class SelectWithStringValueTest extends React.Component<React.Props<{}>, {}> {
+class SelectWithStringValueTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{
@@ -165,7 +165,7 @@ class SelectWithStringValueTest extends React.Component<React.Props<{}>, {}> {
     }
 }
 
-class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncTest extends React.Component<React.Props<{}>> {
 
     render() {
         const getOptions = (input: string, callback: (err: any, result: AutocompleteResult) => any) => {
@@ -209,7 +209,53 @@ class SelectAsyncTest extends React.Component<React.Props<{}>, {}> {
 
 }
 
-class SelectCreatableTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncPromiseTest extends React.Component<React.Props<{}>> {
+
+    render() {
+        const getOptions = (input: string): Promise<AutocompleteResult> => {
+            return new Promise(resolve => {
+                setTimeout(function() {
+                    return resolve({
+                        options: options,
+                        complete: true
+                    });
+                }, 500);
+            });
+        };
+        const options: Option[] = [{ label: "Foo", value: "bar" }];
+        const onChange = (value: any) => console.log(value);
+
+        const asyncSelectProps: ReactAsyncSelectProps = {
+            name: "test-select-async-promise",
+            className: "test-select",
+            key: "1",
+            matchPos: "any",
+            matchProp: "any",
+            multi: true,
+            onValueClick: onChange,
+            valueKey: "github",
+            labelKey: "name",
+            onChange: onChange,
+            simpleValue: undefined,
+            value: options,
+            loadOptions: getOptions,
+            cache: {},
+            ignoreAccents: false,
+            ignoreCase: true,
+            isLoading: false,
+            minimumInput: 5,
+            searchPromptText: "search...",
+            searchingText: "searching...",
+        };
+
+        return <div>
+            <Select.Async {...asyncSelectProps} />
+        </div>;
+    }
+
+}
+
+class SelectCreatableTest extends React.Component<React.Props<{}>> {
 
     render() {
         const options: Option[] = [{ label: "Foo", value: "bar" }];
@@ -234,7 +280,7 @@ class SelectCreatableTest extends React.Component<React.Props<{}>, {}> {
 
 }
 
-class SelectAsyncCreatableTest extends React.Component<React.Props<{}>, {}> {
+class SelectAsyncCreatableTest extends React.Component<React.Props<{}>> {
 
     render() {
         const getOptions = (input: string, callback: Function) => {
diff --git a/types/react-side-effect/index.d.ts b/types/react-side-effect/index.d.ts
index 10f25ae1e3..8ee1ab2df0 100644
--- a/types/react-side-effect/index.d.ts
+++ b/types/react-side-effect/index.d.ts
@@ -2,9 +2,9 @@
 // Project: https://github.com/gaearon/react-side-effect
 // Definitions by: Remo H. Jansen <https://github.com/remojansen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-import React = require("react");
+import * as React from "react";
 
 declare function withSideEffect(
     reducePropsToState: (propsList: any[]) => any,
@@ -12,7 +12,7 @@ declare function withSideEffect(
     mapStateOnServer?: (state: any) => any
 ): ClassDecorator;
 
-declare class ElementClass extends React.Component<any, any> {}
+declare class ElementClass extends React.Component<any> {}
 
 interface ClassDecorator {
     <T extends (typeof ElementClass)>(component:T): T;
diff --git a/types/react-side-effect/react-side-effect-tests.ts b/types/react-side-effect/react-side-effect-tests.ts
index 353b0754f5..60566eafa7 100644
--- a/types/react-side-effect/react-side-effect-tests.ts
+++ b/types/react-side-effect/react-side-effect-tests.ts
@@ -5,7 +5,7 @@ interface DocumentTitleProps {
     title: string
 }
 
-class DocumentTitle extends React.Component<DocumentTitleProps, any> {
+class DocumentTitle extends React.Component<DocumentTitleProps> {
   public render() {
     if (this.props.children) {
       return React.Children.only(this.props.children);
diff --git a/types/react-sidebar/index.d.ts b/types/react-sidebar/index.d.ts
index 1f3484762a..b73863a079 100644
--- a/types/react-sidebar/index.d.ts
+++ b/types/react-sidebar/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/balloob/react-sidebar#readme
 // Definitions by: Jeroen Vervaeke <https://github.com/jeroenvervaeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
+
 import { Component } from "react";
 
 export interface SidebarProps {
@@ -31,4 +32,4 @@ export interface SidebarStyles {
     sidebar?: Partial<CSSStyleDeclaration>;
 }
 
-export default class Sidebar extends Component<SidebarProps, {}> {}
+export default class Sidebar extends Component<SidebarProps> {}
diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index 1278605b27..ab010943e5 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -1,55 +1,76 @@
-// Type definitions for react-slick
+// Type definitions for react-slick 0.14
 // Project: https://github.com/akiran/react-slick
-// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>
+// Definitions by: Andrey Balokha <https://github.com/andrewBalekha>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-/// <reference types="react"/>
+import * as React from "react";
 
-interface __config {
-  accessibility?: boolean
-  nextArrow?: HTMLElement | any
-  prevArrow?: HTMLElement | any
-  pauseOnHover?: boolean
-  className?: string
-  adaptiveHeight?: boolean
-  arrows?: boolean
-  autoplay?: boolean
-  autoplaySpeed?: number // integer
-  centerMode?: boolean
-  centerPadding?: string | any
-  cssEase?: string | any
-  dots?: boolean
-  dotsClass?: string
-  draggable?: boolean
-  easing?: string
-  fade?: boolean
-  focusOnSelect?: boolean
-  infinite?: boolean //   should the gallery wrap around it's contents
-  initialSlide?: number // int
-  lazyLoad?: boolean
-  rtl?: boolean
-  slide?: string
-  slidesToShow?: number // int
-  slidesToScroll?: number //  int
-  speed?: number //int
-  swipe?: boolean
-  swipeToSlide?: boolean
-  touchMove?: boolean
-  touchThreshold?: number // int
-  variableWidth?: boolean
-  useCSS?: boolean
-  vertical?: boolean
-  afterChange?: ((currentSlide: number) => void)
-  beforeChange?: ((currentSlide: number, nextSlide: number) => void)
-  slickGoTo?: number // int
+type ComponentConstructor<TProps> = React.ComponentClass<TProps> | React.StatelessComponent<TProps>;
+
+export interface CustomArrowProps {
+  className?: string;
+  style?: React.CSSProperties;
+  onClick?: React.MouseEventHandler<any>;
 }
 
-interface Slider extends __config {
-  responsive?: { breakpoint: number; settings: __config}[]
+export interface ResponsiveObject {
+  breakpoint: number;
+  settings: "unslick" | Settings;
 }
 
-declare module "react-slick" {
-  var Slider: React.ClassicComponentClass<Slider>;
-  export = Slider;
+export type SwipeDirection = "left" | "down" | "right" | "up" | string;
+
+export interface Settings {
+  accessibility?: boolean;
+  className?: string;
+  adaptiveHeight?: boolean;
+  arrows?: boolean;
+  nextArrow?: JSX.Element;
+  prevArrow?: JSX.Element;
+  autoplay?: boolean;
+  autoplaySpeed?: number;
+  centerMode?: boolean;
+  centerPadding?: string;
+  cssEase?: string;
+  customPaging?(index: number): JSX.Element;
+  dots?: boolean;
+  dotsClass?: string;
+  draggable?: boolean;
+  easing?: string;
+  fade?: boolean;
+  focusOnSelect?: boolean;
+  infinite?: boolean;
+  initialSlide?: number;
+  lazyLoad?: boolean;
+  pauseOnHover?: boolean;
+  responsive?: ResponsiveObject[];
+  rtl?: boolean;
+  slide?: string;
+  slidesToShow?: number;
+  slidesToScroll?: number;
+  speed?: number;
+  swipe?: boolean;
+  swipeToSlide?: boolean;
+  touchMove?: boolean;
+  touchThreshold?: number;
+  variableWidth?: boolean;
+  useCSS?: boolean;
+  vertical?: boolean;
+  afterChange?(currentSlide: number): void;
+  beforeChange?(currentSlide: number, nextSlide: number): void;
+  slickGoTo?: number;
+  edgeFriction?: number;
+  waitForAnimate?: boolean;
+  edgeEvent?(swipeDirection: SwipeDirection): void;
+  swipeEvent?(swipeDirection: SwipeDirection): void;
+  init?(): void;
 }
+
+declare class Slider extends React.Component<Settings, never> {
+  slickNext(): void;
+  slickPrev(): void;
+  slickGoTo(slideNumber: number): void;
+}
+
+export default Slider;
diff --git a/types/react-slick/react-slick-tests.tsx b/types/react-slick/react-slick-tests.tsx
index 2d26b0dcf1..2871e1745a 100644
--- a/types/react-slick/react-slick-tests.tsx
+++ b/types/react-slick/react-slick-tests.tsx
@@ -1,28 +1,88 @@
-import * as React from "react"
-import * as ReactDOM from "react-dom"
-import * as Slider from "react-slick"
-
-class SliderTest extends React.Component<React.Props<{}>, {}> {
+import * as React from "react";
+import { default as Slider, Settings, CustomArrowProps } from "react-slick";
 
+class LeftNavArrow extends React.Component<CustomArrowProps> {
   render() {
-    let settings = {
-      speed: 500,
-      slidesToShow: 8,
-      slidesToScroll: 1,
-      draggable: false,
-      infinite: false,
-      prevArrow: <a href="#">link</a>
-    };
-
-    return (
-      <div>
-        <Slider {...settings} >
-          <div><h1>Slide1</h1></div>
-          <div><h1>Slide2</h1></div>
-        </Slider>
-      </div>
-    )
+    return <button onClick={this.props.onClick}>Next</button>;
   }
 }
 
-ReactDOM.render(<SliderTest />, document.body);
+function RightNavArrow(props: CustomArrowProps): JSX.Element {
+  const { className, style, onClick } = props;
+  return <div
+    className={className}
+    style={Object.assign(style, { display: 'block', background: 'green' })}
+    onClick={onClick}
+  ></div>;
+}
+
+const defaultSettings: Settings = {
+  className: "",
+  accessibility: true,
+  adaptiveHeight: false,
+  arrows: true,
+  autoplay: false,
+  autoplaySpeed: 3000,
+  centerMode: false,
+  centerPadding: "50px",
+  cssEase: "ease",
+  customPaging: (i: number) => {
+    return <button>{i + 1}</button>;
+  },
+  dots: false,
+  dotsClass: "slick-dots",
+  draggable: true,
+  easing: "linear",
+  edgeFriction: 0.35,
+  fade: false,
+  focusOnSelect: false,
+  infinite: true,
+  initialSlide: 0,
+  lazyLoad: false,
+  pauseOnHover: true,
+  responsive: [{ breakpoint: 1000, settings: "unslick" }, { breakpoint: 2000, settings: { arrows: false } }],
+  rtl: false,
+  slide: "div",
+  slidesToShow: 1,
+  slidesToScroll: 1,
+  speed: 500,
+  swipe: true,
+  swipeToSlide: false,
+  touchMove: true,
+  touchThreshold: 5,
+  useCSS: true,
+  variableWidth: false,
+  vertical: false,
+  waitForAnimate: true,
+  afterChange: (currentSlide: number) => { },
+  beforeChange: (currentSlide: number, nextSlide: number) => { },
+  edgeEvent: (swipeDirection: string) => { },
+  init: () => { },
+  swipeEvent: (swipeDirection: string) => { },
+  nextArrow: <LeftNavArrow />,
+  prevArrow: <RightNavArrow />
+};
+
+class SliderTest extends React.Component {
+  private slider: Slider;
+  render() {
+    return <div>
+      <Slider
+        {...defaultSettings}
+        ref={(component: Slider) => { this.slider = component; }}
+      >
+        <div><h3>1</h3></div>
+        <div><h3>2</h3></div>
+        <div><h3>3</h3></div>
+        <div><h3>4</h3></div>
+        <div><h3>5</h3></div>
+        <div><h3>6</h3></div>
+      </Slider>
+      <div style={{ textAlign: "center" }}>
+        <button className="button" onClick={(event) => { this.slider.slickPrev(); }}>Previous</button>
+        <button className="button" onClick={(event) => { this.slider.slickNext(); }}>Next</button>
+        <button className="button" onClick={(event) => { this.slider.slickGoTo(1); }}>First</button>
+      </div>
+    </div>;
+  }
+}
diff --git a/types/react-slick/tsconfig.json b/types/react-slick/tsconfig.json
index 295e4cd738..72d192fbf8 100644
--- a/types/react-slick/tsconfig.json
+++ b/types/react-slick/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "jsx": "react",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "react-slick-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-slick/tslint.json b/types/react-slick/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-slick/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-smooth-scrollbar/index.d.ts b/types/react-smooth-scrollbar/index.d.ts
index 54cc7d91b5..666863ed05 100644
--- a/types/react-smooth-scrollbar/index.d.ts
+++ b/types/react-smooth-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/idiotWu/react-smooth-scrollbar
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import SmoothScrollbar, { ScrollbarOptions, ScrollStatusObject } from "smooth-scrollbar";
@@ -29,7 +29,7 @@ declare namespace Scrollbar {
     }
 }
 
-declare class Scrollbar extends React.Component<Scrollbar.ScrollbarProps, {}> {
+declare class Scrollbar extends React.Component<Scrollbar.ScrollbarProps> {
     /**
      * Scrollbar instance
      */
diff --git a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
index 956df59f9c..ac9c2a31da 100644
--- a/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
+++ b/types/react-smooth-scrollbar/react-smooth-scrollbar-tests.tsx
@@ -4,11 +4,13 @@ import * as SmoothScrollbar from "react-smooth-scrollbar";
 <SmoothScrollbar className="test" alwaysShowTracks onScroll={(status, instance) => { } } />;
 <SmoothScrollbar speed={10} overscrollEffect="bounce" />;
 
-class Test extends React.Component<void, void> {
-    ref: SmoothScrollbar;
+class Test extends React.Component {
+    ref: SmoothScrollbar | null;
 
     componentDidMount() {
-        this.ref.scrollbar.scrollTo(0, 500);
+        if (this.ref) {
+            this.ref.scrollbar.scrollTo(0, 500);
+        }
     }
 
     render() {
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 1ae88e258a..72a70e8891 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/clauderic/react-sortable-hoc
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>, Charles Rey <https://github.com/charlesrey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-sortable-hoc' {
-    import React = require('react');
+    import * as React from 'react';
 
     export type Axis = 'x' | 'y' | 'xy';
 
diff --git a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
index 9bdb082ab2..4700612d01 100644
--- a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
+++ b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
@@ -1,6 +1,6 @@
-import React = require('react');
-import ReactDOM = require('react-dom');
-import ReactSortableHOC = require('react-sortable-hoc');
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as ReactSortableHOC from 'react-sortable-hoc';
 
 interface SortableItemProps {
     value: string;
@@ -13,7 +13,7 @@ interface SortableListProps {
 
 type SortableComponentState = SortableListProps;
 
-class Item extends React.Component<SortableItemProps, void> {
+class Item extends React.Component<SortableItemProps> {
     public constructor(props: SortableItemProps) {
         super(props);
     }
diff --git a/types/react-spinkit/index.d.ts b/types/react-spinkit/index.d.ts
index 49583bef8a..5f227de879 100644
--- a/types/react-spinkit/index.d.ts
+++ b/types/react-spinkit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>, zzanol <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -11,11 +11,15 @@ declare namespace spinner {
         /**
          * Specify spinner to use.
          */
+<<<<<<< HEAD
         name?: 'three-bounce' | 'double-bounce' | 'rotating-plane' | 'folding-cube' | 'wave' | 'wandering-cubes' | 'pulse' | 'chasing-dots' | 'circle' | 'cube-grid' | 'wordpress' |
         'ball-grid-beat' | 'ball-grid-pulse' | 'line-spin-fade-loader' | 'ball-spin-fade-loader' | 'ball-pulse-rise' | 'line-scale' | 'line-scale-pulse-out' |
         'line-scale-pulse-out-rapid' | 'line-scale-party' | 'ball-triangle-path' | 'ball-scale-ripple-multiple' | 'ball-pulse-sync' | 'ball-beat' |
         'ball-scale-multiple' | 'ball-zig-zag' | 'ball-zig-zag-deflect' | 'ball-clip-rotate' | 'ball-clip-rotate-pulse' | 'ball-clip-rotate-multiple' |
         'ball-scale-ripple' | 'triangle-skew-spin' | 'pacman'
+=======
+        name?: 'three-bounce' | 'double-bounce' | 'rotating-plane' | 'folding-cube' | 'wave' | 'wandering-cubes' | 'pulse' | 'chasing-dots' | 'circle' | 'cube-grid' | 'wordpress';
+>>>>>>> upstream/master
         /**
          * Set the time before the spinner fades in
          */
diff --git a/types/react-spinkit/react-spinkit-tests.tsx b/types/react-spinkit/react-spinkit-tests.tsx
index 27717503d6..d7f1b7e0fe 100644
--- a/types/react-spinkit/react-spinkit-tests.tsx
+++ b/types/react-spinkit/react-spinkit-tests.tsx
@@ -15,6 +15,7 @@ const spinners = [
     <Spinner name="circle" />,
     <Spinner name="cube-grid" />,
     <Spinner name="wordpress" />,
+<<<<<<< HEAD
 
     // 'loaders.css' spinners
     <Spinner name="ball-grid-beat" />,
@@ -47,6 +48,11 @@ const spinners = [
     <Spinner name="wordpress" fadeIn="none"/>,
     <Spinner name="wordpress" color="#F00" />,
     <Spinner name="wordpress" color="green" />,
+=======
+
+    // Spinner options
+    <Spinner name="wordpress" noFadeIn />,
+>>>>>>> upstream/master
     <Spinner name="wordpress" overrideSpinnerClassName="my-class-to-override" />,
     <Spinner name="wordpress" className="my-class" />,
 ];
diff --git a/types/react-spinkit/v1/index.d.ts b/types/react-spinkit/v1/index.d.ts
index 24de75a032..943a6dbeda 100644
--- a/types/react-spinkit/v1/index.d.ts
+++ b/types/react-spinkit/v1/index.d.ts
@@ -2,7 +2,11 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+<<<<<<< HEAD
 // TypeScript Version: 2.1
+=======
+// TypeScript Version: 2.3
+>>>>>>> upstream/master
 
 /// <reference types="react" />
 
diff --git a/types/react-split-pane/index.d.ts b/types/react-split-pane/index.d.ts
index 27006b7088..440c307100 100644
--- a/types/react-split-pane/index.d.ts
+++ b/types/react-split-pane/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-split-pane v0.1.38
+// Type definitions for react-split-pane v0.1.63
 // Project: https://github.com/tomkp/react-split-pane
 // Definitions by: Roger Chen <https://github.com/rcchen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
@@ -26,17 +26,20 @@ declare namespace ReactSplitPane {
         onDragFinished?: Function;
         onDragStarted?: Function;
         primary?: string;
+        onResizerClick?: Function;
+        onResizerDoubleClick?: Function;
+        
         /**
          * Either a number (in pixels) or string (percentage)
          */
         size?: number | string;
         split?: string;
         /* Styling to be applied to both panes */
-        paneStyle?: React.CSSProperties; 
+        paneStyle?: React.CSSProperties;
         /* Styling to be applied to the first pane, with precedence over paneStyle */
         pane1Style?: React.CSSProperties;
         /* Styling to be applied to the second pane, with precedence over paneStyle */
-        pane2Style?: React.CSSProperties; 
+        pane2Style?: React.CSSProperties;
         /* Styling to be applied to the resizer bar */
         resizerStyle?: React.CSSProperties;
     }
diff --git a/types/react-split-pane/react-split-pane-tests.tsx b/types/react-split-pane/react-split-pane-tests.tsx
index 46a13653fd..91efe8d23f 100644
--- a/types/react-split-pane/react-split-pane-tests.tsx
+++ b/types/react-split-pane/react-split-pane-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as SplitPane from "react-split-pane";
 
-class SplitPaneTest extends React.Component<React.Props<{}>, {}> {
+class SplitPaneTest extends React.Component<React.Props<{}>> {
 
     render() {
         return (
diff --git a/types/react-sticky/index.d.ts b/types/react-sticky/index.d.ts
index b83fa37ac4..23fd51d196 100644
--- a/types/react-sticky/index.d.ts
+++ b/types/react-sticky/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/captivationsoftware/react-sticky
 // Definitions by: Matej Lednicky <http://www.thinkcreatix.com/>, Curtis Warren <https://github.com/curtisw0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
diff --git a/types/react-svg-pan-zoom/index.d.ts b/types/react-svg-pan-zoom/index.d.ts
index 08b0db82b6..8ea6b07df0 100644
--- a/types/react-svg-pan-zoom/index.d.ts
+++ b/types/react-svg-pan-zoom/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/chrvadala/react-svg-pan-zoom#readme
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
+
 import * as React from 'react';
 
 // String constants:
@@ -110,7 +111,7 @@ export interface OptionalProps {
 
 	// override default toolbar component
 	// TODO: specify function type more clearly
-	customToolbar: React.Component<any, any> | React.StatelessComponent<any>;
+	customToolbar: React.Component<any> | React.StatelessComponent<any>;
 
 	// How about touch events? They are in README but not in `propTypes`.
 }
@@ -129,7 +130,7 @@ export interface RequiredProps {
 
 export type Props = RequiredProps & Partial<OptionalProps>;
 
-export class ReactSVGPanZoom extends React.Component<Props, {}> {
+export class ReactSVGPanZoom extends React.Component<Props> {
 	pan(SVGDeltaX: number, SVGDeltaY: number): void;
 	zoom(SVGPointX: number, SVGPointY: number, scaleFactor: number): void;
 	fitSelection(selectionSVGPointX: number, selectionSVGPointY: number, selectionWidth: number, selectionHeight: number): void;
diff --git a/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx b/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
index a2d078d6d2..1c861bcbdc 100644
--- a/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
+++ b/types/react-svg-pan-zoom/react-svg-pan-zoom-tests.tsx
@@ -7,22 +7,31 @@ import {
   ViewerMouseEvent
 } from 'react-svg-pan-zoom';
 
-class Example1 extends React.Component<{}, {}> {
-  Viewer: ReactSVGPanZoom;
+class Example1 extends React.Component {
+  Viewer: ReactSVGPanZoom | null;
+
   constructor(props: Props) {
     super(props);
   }
 
   componentDidMount() {
-    this.Viewer.fitToViewer();
+    if (this.Viewer) {
+      this.Viewer.fitToViewer();
+    }
   }
 
   render() {
     return (
       <div>
-        <button onClick={event => this.Viewer.zoomOnViewerCenter(1.1)}>Zoom in</button>
-        <button onClick={event => this.Viewer.fitSelection(40, 40, 200, 200)}>Zoom area 200x200</button>
-        <button onClick={event => this.Viewer.fitToViewer()}>Fit</button>
+        <button onClick={event => this.Viewer && this.Viewer.zoomOnViewerCenter(1.1)}>
+          Zoom in
+        </button>
+        <button onClick={event => this.Viewer && this.Viewer.fitSelection(40, 40, 200, 200)}>
+          Zoom area 200x200
+        </button>
+        <button onClick={event => this.Viewer && this.Viewer.fitToViewer()}>
+          Fit
+        </button>
 
         <hr/>
 
diff --git a/types/react-swf/index.d.ts b/types/react-swf/index.d.ts
index c03f2748b2..715c62bb43 100644
--- a/types/react-swf/index.d.ts
+++ b/types/react-swf/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/syranide/react-swf
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 export as namespace ReactSWF;
diff --git a/types/react-swipeable-views/index.d.ts b/types/react-swipeable-views/index.d.ts
index 91b0cfa45b..068a4e8ee6 100644
--- a/types/react-swipeable-views/index.d.ts
+++ b/types/react-swipeable-views/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oliviertassinari/react-swipeable-views
 // Definitions by: Michael Ledin <https://github.com/mxl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index fadf0f057f..b0036ae119 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,31 +1,24 @@
-// Type definitions for react-swipeable 3.3.1
+// Type definitions for react-swipeable 4.0
 // Project: https://www.npmjs.com/package/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Konstantin Vasilev <https://github.com/mctep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
-///<reference types='react' />
+import * as React from 'react';
 
-declare namespace ReactSwipeableModule {
-    interface onSwipingCallback {
-        (event: React.TouchEvent<any>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number): void;
-    }
+declare class ReactSwipeable extends React.Component<ReactSwipeable.SwipeableProps> {}
 
-    interface OnSwipedCallback {
-        (event: React.TouchEvent<any>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number): void;
-    }
+declare namespace ReactSwipeable {
+    type OnSwipingCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, absX: number, absY: number, velocity: number) => void;
+    type OnSwipedCallback = (event: React.TouchEvent<HTMLElement>, deltaX: number, deltaY: number, isFlick: boolean, velocity: number) => void;
+    type OnSwipedDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number, isFlick: boolean) => void;
+    type OnSwipingDirectionCallback = (event: React.TouchEvent<HTMLElement>, delta: number) => void;
+    type OnTapCallback = (event: React.TouchEvent<HTMLElement>) => void;
 
-    interface OnSwipedDirectionCallback {
-        (event: React.TouchEvent<any>, delta: number, isFlick: boolean): void;
-    }
-
-    interface OnSwipingDirectionCallback {
-        (event: React.TouchEvent<any>, delta: number): void;
-    }
-
-    interface Props {
+    interface SwipeableProps extends React.ClassAttributes<ReactSwipeable>, React.HTMLAttributes<HTMLElement> {
         onSwiped?: OnSwipedCallback;
-        onSwiping?: onSwipingCallback;
+        onSwiping?: OnSwipingCallback;
         onSwipingUp?: OnSwipingDirectionCallback;
         onSwipingRight?: OnSwipingDirectionCallback;
         onSwipingDown?: OnSwipingDirectionCallback;
@@ -34,18 +27,15 @@ declare namespace ReactSwipeableModule {
         onSwipedRight?: OnSwipedDirectionCallback;
         onSwipedDown?: OnSwipedDirectionCallback;
         onSwipedLeft?: OnSwipedDirectionCallback;
+        onTap?: OnTapCallback;
         flickThreshold?: number;
         delta?: number;
         preventDefaultTouchmoveEvent?: boolean;
+        stopPropagation?: boolean;
         nodeName?: string;
+        trackMouse?: boolean;
+        children?: React.ReactNode;
     }
-
-    interface ReactSwipeable extends React.ComponentClass<Props> { }
-
 }
 
-
-declare module "react-swipeable" {
-    let module: ReactSwipeableModule.ReactSwipeable;
-    export = module;
-}
+export = ReactSwipeable;
diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index 7e8682ade7..61093a203e 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -1,26 +1,46 @@
-import Swipeable = require('react-swipeable');
-import React = require('react');
+import * as React from 'react';
+import * as Swipeable from 'react-swipeable';
 
-var SampleComponent = React.createClass({
-  render: function () {
+class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
+  private handleSwiped: Swipeable.OnSwipedCallback = () => {};
+  private handleSwiping: Swipeable.OnSwipingCallback = () => {};
+  private handleSwipingUp: Swipeable.OnSwipingDirectionCallback = () => {};
+  private handleSwipingRight: Swipeable.OnSwipingDirectionCallback = () => {};
+  private handleSwipingDown: Swipeable.OnSwipingDirectionCallback = () => {};
+  private handleSwipingLeft: Swipeable.OnSwipingDirectionCallback = () => {};
+  private handleSwipedUp: Swipeable.OnSwipedDirectionCallback = () => {};
+  private handleSwipedRight: Swipeable.OnSwipedDirectionCallback = () => {};
+  private handleSwipedDown: Swipeable.OnSwipedDirectionCallback = () => {};
+  private handleSwipedLeft: Swipeable.OnSwipedDirectionCallback = () => {};
+  private handleTap: Swipeable.OnTapCallback = () => {};
+  private handleClick = () => {};
+
+  render() {
     return (
       <Swipeable
-        onSwiping={this.swiping}
-        onSwipingUp={this.swipingUp}
-        onSwipingRight={this.swipingRight}
-        onSwipingDown={this.swipingDown}
-        onSwipingLeft={this.swipingLeft}
-        onSwipedUp={this.swipedUp}
-        onSwipedRight={this.swipedRight}
-        onSwipedDown={this.swipedDown}
-        onSwipedLeft={this.swipedLeft}
-        onSwiped={this.handleSwipeAction}
-        preventDefaultTouchmoveEvent={false}
-        nodeName={"swipe"}>
+        onSwiped={this.handleSwiped}
+        onSwiping={this.handleSwiping}
+        onSwipingUp={this.handleSwipingUp}
+        onSwipingRight={this.handleSwipingRight}
+        onSwipingDown={this.handleSwipingDown}
+        onSwipingLeft={this.handleSwipingLeft}
+        onSwipedUp={this.handleSwipedUp}
+        onSwipedRight={this.handleSwipedRight}
+        onSwipedDown={this.handleSwipedDown}
+        onSwipedLeft={this.handleSwipedLeft}
+        onTap={this.handleTap}
+        flickThreshold={10}
+        delta={10}
+        preventDefaultTouchmoveEvent
+        stopPropagation
+        nodeName="swipe"
+        trackMouse
+        onClick={this.handleClick}
+      >
         <div>
           This element can be swiped
         </div>
       </Swipeable>
-    )
+    );
   }
-})
+}
diff --git a/types/react-swipeable/tslint.json b/types/react-swipeable/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-swipeable/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index 94cf519204..eb0a5c21fa 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/conorhastings/react-syntax-highlighter
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module 'react-syntax-highlighter' {
     import SyntaxHighlighter from 'react-syntax-highlighter/dist/light';
@@ -26,7 +26,7 @@ declare module 'react-syntax-highlighter/dist/light' {
         [spread: string]: any;
     }
 
-    export default class SyntaxHighlighter extends React.Component<SyntaxHighlighterProps, any> {
+    export default class SyntaxHighlighter extends React.Component<SyntaxHighlighterProps> {
 
     }
 }
diff --git a/types/react-tabs/index.d.ts b/types/react-tabs/index.d.ts
index 9e8abce3cb..df778cbc60 100644
--- a/types/react-tabs/index.d.ts
+++ b/types/react-tabs/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-tabs 0.5.3
+// Type definitions for react-tabs 1.0.0
 // Project: https://github.com/reactjs/react-tabs/
-// Definitions by: Yuu Igarashi <https://github.com/yu-i9/>
+// Definitions by: Yuu Igarashi <https://github.com/yu-i9/>, Daniel Tschinder <https://github.com/danez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
@@ -11,40 +11,38 @@ export as namespace ReactTabs;
 declare namespace ReactTabs {
 
     interface TabsProps {
-        className?: string;
-        selectedIndex?: number;
-        focus?: boolean;
+        className?: string | Array<string> | { [name: string]: boolean; };
+        defaultFocus?: boolean;
+        defaultIndex?: number;
+        disabledTabClassName?: string;
         forceRenderTabPanel?: boolean;
-        onSelect?: (index: number, last: number) => void;
+        onSelect?: (index: number, last: number, event: Event) => boolean | void;
+        selectedIndex?: number;
+        selectedTabClassName?: string;
+        selectedTabPanelClassName?: string;
     }
 
-    interface Tabs extends React.ComponentClass<TabsProps> {
-        setUseDefaultStyles: (use: boolean) => void;
-    }
+    interface Tabs extends React.ComponentClass<TabsProps> {}
 
     interface TabListProps {
-        className?: string;
-        activeTabClassName?: string;
-        disabledTabClassName?: string;
+        className?: string | Array<string> | { [name: string]: boolean; };
     }
 
     interface TabList extends React.ComponentClass<TabListProps> {}
 
     interface TabProps {
-        className?: string;
-        focus?: boolean;
-        selected?: boolean;
-        id?: string;
-        panelId?: string;
+        className?: string | Array<string> | { [name: string]: boolean; };
+        disabled?: boolean;
+        disabledClassName?: string;
+        selectedClassName?: boolean;
     }
 
     interface Tab extends React.ComponentClass<TabProps> {}
 
     interface TabPanelProps {
-        className?: string;
-        selected?: boolean;
-        id?: string;
-        tabId?: string;
+        className?: string | Array<string> | { [name: string]: boolean; };
+        forceRender?: boolean;
+        selectedClassName?: string;
     }
 
     interface TabPanel extends React.ComponentClass<TabPanelProps> {}
@@ -55,9 +53,12 @@ declare const TabList: ReactTabs.TabList;
 declare const Tab: ReactTabs.Tab;
 declare const TabPanel: ReactTabs.TabPanel;
 
+declare function resetIdCounter(): void;
+
 export {
     Tabs,
     TabList,
     Tab,
-    TabPanel
+    TabPanel,
+    resetIdCounter
 };
diff --git a/types/react-tabs/react-tabs-tests.ts b/types/react-tabs/react-tabs-tests.ts
index 9998bcafbd..40313c65b7 100644
--- a/types/react-tabs/react-tabs-tests.ts
+++ b/types/react-tabs/react-tabs-tests.ts
@@ -1,17 +1,20 @@
-import React = require("react");
-import ReactDOM = require("react-dom");
-import { Tabs, TabList, Tab, TabPanel } from "react-tabs";
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import { Tabs, TabList, Tab, TabPanel, resetIdCounter } from "react-tabs";
 
-class TestApp extends React.Component<{}, {}> {
-    onSelect = (index: number, last: number) => {
+resetIdCounter();
+
+class TestApp extends React.Component {
+    onSelect = (index: number, last: number, event: Event) => {
         console.log("selected tab: " + index.toString());
         console.log("last tab: " + last.toString());
+        console.log("event: " + event.type);
     }
 
     render() {
         return React.createElement(Tabs, {onSelect: this.onSelect, selectedIndex: 1},
                    React.createElement(TabList, {className: "test-class"},
-                       React.createElement(Tab, {}, "Tab1"),
+                       React.createElement(Tab, {disabled: true}, "Tab1"),
                        React.createElement(Tab, {}, "Tab2"),
                        React.createElement(Tab, {}, "Tab3")),
                    React.createElement(TabPanel, {}, React.createElement("h2", {}, "Content1")),
diff --git a/types/react-tabs/tsconfig.json b/types/react-tabs/tsconfig.json
index 4da6351bcf..dec5f7691c 100644
--- a/types/react-tabs/tsconfig.json
+++ b/types/react-tabs/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "react-tabs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-tagcloud/index.d.ts b/types/react-tagcloud/index.d.ts
index 11761bb142..69a2bd8f28 100644
--- a/types/react-tagcloud/index.d.ts
+++ b/types/react-tagcloud/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/madox2/react-tagcloud
 // Definitions by: wassname <https://github.com/wassname/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react"/>
 
diff --git a/types/react-test-renderer/index.d.ts b/types/react-test-renderer/index.d.ts
index e967fde49c..6e1d9037cc 100644
--- a/types/react-test-renderer/index.d.ts
+++ b/types/react-test-renderer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: Arvitaly <https://github.com/arvitaly>, Lochbrunner <https://github.com/lochbrunner>, Lochbrunner <https://github.com/lochbrunner>, John Reilly <https://github.com/johnnyreilly/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ReactElement } from "react";
 
diff --git a/types/react-test-renderer/react-test-renderer-tests.ts b/types/react-test-renderer/react-test-renderer-tests.ts
index c93b27e0b2..810fdad407 100644
--- a/types/react-test-renderer/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/react-test-renderer-tests.ts
@@ -1,4 +1,4 @@
-import React = require("react");
+import * as React from "react";
 import { create } from "react-test-renderer";
 import { createRenderer } from 'react-test-renderer/shallow';
 
@@ -15,7 +15,7 @@ tree.props = {
 tree.children = [tree];
 tree.$$typeof = "t";
 
-class TestComponent extends React.Component<{}, {}> { }
+class TestComponent extends React.Component { }
 
 const component = React.createElement(TestComponent);
 const shallowRenderer = createRenderer();
diff --git a/types/react-tether/index.d.ts b/types/react-tether/index.d.ts
index 23270282f8..1790b8abbc 100644
--- a/types/react-tether/index.d.ts
+++ b/types/react-tether/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-tether
 // Definitions by: Ryan Price <https://github.com/ryprice>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 export default TetherComponent;
 export as namespace ReactTether;
@@ -10,7 +10,7 @@ export as namespace ReactTether;
 import * as React from 'react';
 import * as Tether from 'tether';
 
-declare class TetherComponent extends React.Component<ReactTether.TetherComponentProps, null> { }
+declare class TetherComponent extends React.Component<ReactTether.TetherComponentProps> { }
 
 declare namespace ReactTether {
     interface TetherComponentProps extends React.Props<TetherComponent>, Tether.ITetherOptions {
diff --git a/types/react-textarea-autosize/index.d.ts b/types/react-textarea-autosize/index.d.ts
index 2d07898200..9629be7e37 100644
--- a/types/react-textarea-autosize/index.d.ts
+++ b/types/react-textarea-autosize/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-textarea-autosize 4.0.3
+// Type definitions for react-textarea-autosize 4.3.0
 // Project: https://github.com/andreypopp/react-textarea-autosize
-// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
+// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, Jerry Zou <https://github.com/zry656565>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 declare module "react-textarea-autosize" {
     import * as React from "react";
@@ -46,11 +46,15 @@ declare module "react-textarea-autosize" {
          * Maximum number of rows to show.
          */
         maxRows?: number;
+        /**
+         * Allows an owner to retrieve the DOM node.
+         */
+        inputRef?: (node: HTMLTextAreaElement) => void;
     }
 
     /**
      * <TextareaAutosize/>
      */
-    export default class TextareaAutosize extends React.Component<TextareaAutosizeProps, any> { }
+    export default class TextareaAutosize extends React.Component<TextareaAutosizeProps> { }
 
 }
diff --git a/types/react-textarea-autosize/react-textarea-autosize-tests.tsx b/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
index b10f92bc6f..7eb6fd531e 100644
--- a/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
+++ b/types/react-textarea-autosize/react-textarea-autosize-tests.tsx
@@ -1,13 +1,23 @@
 import * as React from "react";
 import Textarea from "react-textarea-autosize";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
+    public ref: HTMLTextAreaElement
+
+    public inputRef = (ref: HTMLTextAreaElement) => {
+        this.ref = ref
+    }
+
     public render() {
         return (
-            <Textarea minRows={5} maxRows={8}
+            <Textarea
+                rows={5}
+                minRows={5}
+                maxRows={8}
                 value="test"
                 useCacheForDOMMeasurements
                 className="test"
+                inputRef={ this.inputRef }
                 id="test"/>
         );
     }
diff --git a/types/react-toggle/index.d.ts b/types/react-toggle/index.d.ts
index 658e3c0ead..356f70ed1a 100644
--- a/types/react-toggle/index.d.ts
+++ b/types/react-toggle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/aaronshaf/react-toggle
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { Component, HTMLAttributes, ReactNode } from "react";
 
@@ -17,4 +17,4 @@ export interface ToggleProps extends HTMLAttributes<any> {
     icons?: boolean | ToggleIcons;
 }
 
-export default class Toggle extends Component<ToggleProps, any> {}
+export default class Toggle extends Component<ToggleProps> {}
diff --git a/types/react-toggle/react-toggle-tests.tsx b/types/react-toggle/react-toggle-tests.tsx
index f138268174..f02cf447e4 100644
--- a/types/react-toggle/react-toggle-tests.tsx
+++ b/types/react-toggle/react-toggle-tests.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Toggle from "react-toggle";
 
-class Test extends React.Component<{}, {}> {
+class Test extends React.Component {
     render() {
         return (
             <Toggle icons={ false } />
diff --git a/types/react-transition-group/CSSTransitionGroup.d.ts b/types/react-transition-group/CSSTransitionGroup.d.ts
index 0069962eb9..6786bca8fe 100644
--- a/types/react-transition-group/CSSTransitionGroup.d.ts
+++ b/types/react-transition-group/CSSTransitionGroup.d.ts
@@ -22,6 +22,6 @@ declare namespace CSSTransitionGroup {
     }
 }
 
-declare class CSSTransitionGroup extends Component<CSSTransitionGroup.CSSTransitionGroupProps, any> {}
+declare class CSSTransitionGroup extends Component<CSSTransitionGroup.CSSTransitionGroupProps> {}
 
 export = CSSTransitionGroup;
diff --git a/types/react-transition-group/TransitionGroup.d.ts b/types/react-transition-group/TransitionGroup.d.ts
index 04d218399c..44d9100889 100644
--- a/types/react-transition-group/TransitionGroup.d.ts
+++ b/types/react-transition-group/TransitionGroup.d.ts
@@ -14,6 +14,6 @@ declare namespace TransitionGroup {
     type TransitionGroupProps = HTMLTransitionGroupProps<TransitionGroup>;
 }
 
-declare class TransitionGroup extends Component<TransitionGroup.TransitionGroupProps, any> {}
+declare class TransitionGroup extends Component<TransitionGroup.TransitionGroupProps> {}
 
 export = TransitionGroup;
diff --git a/types/react-transition-group/index.d.ts b/types/react-transition-group/index.d.ts
index 5faf397a34..3c82827b46 100644
--- a/types/react-transition-group/index.d.ts
+++ b/types/react-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { HTMLAttributes, ReactElement, ReactType } from "react";
 
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index 4046adafdd..346fe9989a 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -3,7 +3,7 @@ import * as TransitionGroup from "react-transition-group/TransitionGroup";
 import * as CSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
 import { CSSTransitionGroupProps, TransitionGroupProps, TransitionGroupChildLifecycle } from "react-transition-group";
 
-class TestChild extends React.Component<any, any> implements TransitionGroupChildLifecycle {
+class TestChild extends React.Component implements TransitionGroupChildLifecycle {
     componentWillAppear(callback: () => void) {
         callback();
     }
@@ -27,7 +27,7 @@ class TestChild extends React.Component<any, any> implements TransitionGroupChil
     }
 }
 
-const Test: React.StatelessComponent<any> = () => {
+const Test: React.StatelessComponent = () => {
     return (
         <div>
             <TransitionGroup component="ul" className="animated-list">
diff --git a/types/react-user-tour/index.d.ts b/types/react-user-tour/index.d.ts
index 2753a6f8b6..21a8be7a61 100644
--- a/types/react-user-tour/index.d.ts
+++ b/types/react-user-tour/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/socialtables/react-user-tour
 // Definitions by: Carlo Cancellieri <https://github.com/ccancellieri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types='react' />
 
diff --git a/types/react-user-tour/react-user-tour-tests.tsx b/types/react-user-tour/react-user-tour-tests.tsx
index 35b8067f55..c961ee5bbd 100644
--- a/types/react-user-tour/react-user-tour-tests.tsx
+++ b/types/react-user-tour/react-user-tour-tests.tsx
@@ -5,8 +5,8 @@
 
 /// <reference types='react-dom' />
 
-import React = require('react');
-import ReactDOM = require('react-dom');
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 
 import ReactUserTour from 'react-user-tour';
 
diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
new file mode 100644
index 0000000000..f7c5f1197c
--- /dev/null
+++ b/types/react-virtualized-select/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-virtualized-select 3.0
+// Project: https://github.com/bvaughn/react-virtualized-select
+// Definitions by: Sean Kelley <https://github.com/seansfkelley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+import { ReactSelectProps } from "react-select";
+import { ListProps } from "react-virtualized";
+
+export interface VirtualizedOptionRenderOptions<T> {
+    focusedOption: T;
+    focusedOptionIndex: number;
+    focusOption(option: T): void;
+    key: string;
+    labelKey: keyof T;
+    listProps: ListProps;
+    option: T;
+    options: T[];
+    selectValue(option: T): void;
+    style: Record<string, string>;
+    valueArray: T[];
+}
+
+export interface VirtualizedSelectProps extends ReactSelectProps {
+    async?: boolean;
+    maxHeight?: number;
+    optionHeight?: number;
+    optionRenderer?(options: VirtualizedOptionRenderOptions<any>): JSX.Element;
+    selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
+}
+
+declare class VirtualizedSelect extends React.PureComponent<VirtualizedSelectProps> {}
+export default VirtualizedSelect;
diff --git a/types/react-virtualized-select/react-virtualized-select-tests.tsx b/types/react-virtualized-select/react-virtualized-select-tests.tsx
new file mode 100644
index 0000000000..ced2f20b41
--- /dev/null
+++ b/types/react-virtualized-select/react-virtualized-select-tests.tsx
@@ -0,0 +1,12 @@
+import * as React from "react";
+import Select = require("react-select");
+import VirtualizedSelect from "react-virtualized-select";
+
+<VirtualizedSelect
+  async={true}
+  maxHeight={0}
+  optionHeight={0}
+  optionRenderer={() => <div/>}
+  selectComponent={Select}
+  options={[]}
+/>;
diff --git a/types/react-virtualized-select/tsconfig.json b/types/react-virtualized-select/tsconfig.json
new file mode 100644
index 0000000000..8795f8aae5
--- /dev/null
+++ b/types/react-virtualized-select/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-virtualized-select-tests.tsx"
+    ]
+}
diff --git a/types/react-virtualized-select/tslint.json b/types/react-virtualized-select/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-virtualized-select/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-virtualized/dist/es/CellMeasurer.d.ts b/types/react-virtualized/dist/es/CellMeasurer.d.ts
index 1f7d2de8b3..0621d5579a 100644
--- a/types/react-virtualized/dist/es/CellMeasurer.d.ts
+++ b/types/react-virtualized/dist/es/CellMeasurer.d.ts
@@ -59,7 +59,7 @@ export type CellMeasurerProps = {
  * Measurements are stored in a per-cell cache.
  * Cached-content is not be re-measured.
  */
-export class CellMeasurer extends PureComponent<CellMeasurerProps, {}> {
+export class CellMeasurer extends PureComponent<CellMeasurerProps> {
     constructor(props: CellMeasurerProps, context: any);
 
     componentDidMount(): void;
diff --git a/types/react-virtualized/dist/es/Collection.d.ts b/types/react-virtualized/dist/es/Collection.d.ts
index 9f37eea8f6..9a6730b76e 100644
--- a/types/react-virtualized/dist/es/Collection.d.ts
+++ b/types/react-virtualized/dist/es/Collection.d.ts
@@ -1,7 +1,10 @@
 import { PureComponent, Validator, Requireable } from 'react'
 import {
+    Alignment,
     Index,
+    ScrollParams,
     ScrollPosition,
+    SectionRenderedParams,
     SizeInfo,
     SizeAndPositionInfo
 } from '../../index';
@@ -23,6 +26,11 @@ export type CollectionCellRendererParams = {
 export type CollectionCellRenderer = (params: CollectionCellRendererParams) => React.ReactNode;
 export type CollectionProps = {
     'aria-label'?: string;
+    /**
+     * Outer height of Collection is set to "auto". This property should only be
+     * used in conjunction with the WindowScroller HOC.
+     */
+    autoHeight?: boolean;
     /**
      * Number of cells in Collection.
      */
@@ -46,24 +54,65 @@ export type CollectionProps = {
      * ({ index: number }): { height: number, width: number, x: number, y: number }
      */
     cellSizeAndPositionGetter: CollectionCellSizeAndPositionGetter,
+    /**
+     * Optional custom CSS class name to attach to root Collection element.
+     */
+    className?: string;
+    height: number;
+    horizontalOverscanSize?: number;
+    /**
+     * Optional custom id to attach to root Collection element.
+     */
+    id?: string;
+    noContentRenderer?: () => JSX.Element;
+    /**
+     * Callback invoked whenever the scroll offset changes within the inner
+     * scrollable region: ({ clientHeight, clientWidth, scrollHeight, scrollLeft, scrollTop, scrollWidth }): void
+     */
+    onScroll?: (params: ScrollParams) => any;
+    /**
+     * Callback invoked with information about the section of the Collection
+     * that was just rendered: ({ indices: Array<number> }): void
+     */
+    onSectionRendered?: (params: SectionRenderedParams) => any;
+    /**
+     * Horizontal offset
+     */
+    scrollLeft?: number;
+    /**
+     * Controls the alignment of scrolled-to-cells. The default ("auto") scrolls
+     * the least amount possible to ensure that the specified cell is fully
+     * visible. Use "start" to always align cells to the top/left of the
+     * Collection and "end" to align them bottom/right. Use "center" to align
+     * specified cell in the middle of container.
+     */
+    scrollToAlignment?: Alignment;
+    scrollToCell?: number;
+    /**
+     * Vertical Offset
+     */
+    scrollTop?: number;
     /**
      * Optionally override the size of the sections a Collection's cells are split into.
      */
     sectionSize?: number;
-    className?: string;
-    height: number;
-    width: number;
-    horizontalOverscanSize?: number;
-    noContentRenderer?: () => JSX.Element;
-    scrollToCell?: number;
+    /**
+     * Optional custom inline style to attach to root Collection element.
+     */
+    style?: React.CSSProperties;
     verticalOverscanSize?: number;
+    /**
+     * Width of Collection; this property determines the number of visible
+     * (vs virtualized) columns.
+     */
+    width: number;
 };
 
 /**
  * Renders scattered or non-linear data.
  * Unlike Grid, which renders checkerboard data, Collection can render arbitrarily positioned- even overlapping- data.
  */
-export class Collection extends PureComponent<CollectionProps, {}> {
+export class Collection extends PureComponent<CollectionProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         cellCount: Validator<number>,
diff --git a/types/react-virtualized/dist/es/ColumnSizer.d.ts b/types/react-virtualized/dist/es/ColumnSizer.d.ts
index fa6788ca02..512e8db4a1 100644
--- a/types/react-virtualized/dist/es/ColumnSizer.d.ts
+++ b/types/react-virtualized/dist/es/ColumnSizer.d.ts
@@ -30,7 +30,7 @@ export type ColumnSizerProps = {
 /**
  * High-order component that auto-calculates column-widths for `Grid` cells.
  */
-export class ColumnSizer extends PureComponent<ColumnSizerProps, {}> {
+export class ColumnSizer extends PureComponent<ColumnSizerProps> {
     static propTypes: {
         children: Validator<(props: SizedColumnProps) => React.ReactNode>,
         columnMaxWidth: Requireable<number>,
diff --git a/types/react-virtualized/dist/es/InfiniteLoader.d.ts b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
index f26afd3f90..1062caeb35 100644
--- a/types/react-virtualized/dist/es/InfiniteLoader.d.ts
+++ b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
@@ -51,7 +51,7 @@ export type InfiniteLoaderProps = {
  * This component decorates a virtual component and just-in-time prefetches rows as a user scrolls.
  * It is intended as a convenience component; fork it if you'd like finer-grained control over data-loading.
  */
-export class InfiniteLoader extends PureComponent<InfiniteLoaderProps, {}> {
+export class InfiniteLoader extends PureComponent<InfiniteLoaderProps> {
     static propTypes: {
         children: Validator<(props: InfiniteLoaderChildProps) => React.ReactNode>,
         isRowLoaded: Validator<(params: Index) => boolean>,
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index c38a20c182..94dde630fd 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -72,7 +72,7 @@ export type ListProps = GridCoreProps & {
  *
  * This component renders a virtualized list of elements with either fixed or dynamic heights.
  */
-export class List extends PureComponent<ListProps, {}> {
+export class List extends PureComponent<ListProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         autoHeight: Requireable<boolean>,
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index 7e23446fc4..c1216f12b1 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -14,6 +14,7 @@ export type TableCellProps = {
     columnIndex: number,
     dataKey: string,
     isScrolling: boolean,
+    parent?: any,
     rowData: any,
     rowIndex: number
 };
@@ -96,7 +97,7 @@ export type ColumnProps = {
     /** Flex basis (width) for this column; This value can grow or shrink based on :flexGrow and :flexShrink properties. */
     width: number;
 }
-export class Column extends Component<ColumnProps, {}> {
+export class Column extends Component<ColumnProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         cellDataGetter: Requireable<TableCellDataGetter>,
@@ -317,7 +318,7 @@ export const SortIndicator: React.StatelessComponent<{ sortDirection: SortDirect
  * Table component with fixed headers and virtualized rows for improved performance with large data sets.
  * This component expects explicit width, height, and padding parameters.
  */
-export class Table extends PureComponent<TableProps, {}> {
+export class Table extends PureComponent<TableProps> {
     static propTypes: {
         'aria-label': Requireable<string>,
         autoHeight: Requireable<boolean>,
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index c1586de906..598d65302c 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for react-virtualized 9.7
 // Project: https://github.com/bvaughn/react-virtualized
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
+//                 John Gunther <https://github.com/guntherjh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export {
     ArrowKeyStepper,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index 5a816a7e1d..3f6a6d8a35 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -116,7 +116,7 @@ export class AutoSizerExample extends PureComponent<any, any> {
 import { } from 'react'
 import { CellMeasurer, CellMeasurerCache } from 'react-virtualized'
 
-export class DynamicHeightList extends PureComponent<any, any> {
+export class DynamicHeightList extends PureComponent<any> {
 
     _cache: CellMeasurerCache
 
@@ -1157,7 +1157,7 @@ const STYLE_TOP_RIGHT_GRID: React.CSSProperties = {
     fontWeight: 'bold'
 }
 
-export class MultiGridExample extends PureComponent<any, any> {
+export class MultiGridExample extends PureComponent<{}, any> {
     state
     _onFixedColumnCountChange
     _onFixedRowCountChange
@@ -1248,7 +1248,7 @@ const TOP_COLOR_FROM = hexToRgb('#000000')
 const TOP_COLOR_TO = hexToRgb('#333333')
 
 function scrollbarSize() { return 42; }
-export class GridExample3 extends PureComponent<any, any> {
+export class GridExample3 extends PureComponent<{}, any> {
     state
     constructor(props, context) {
         super(props, context)
@@ -1463,7 +1463,7 @@ function mixColors(color1, color2, amount) {
 
 import { Column, Table, SortDirection, SortIndicator } from 'react-virtualized'
 
-export class TableExample extends PureComponent<any, any> {
+export class TableExample extends PureComponent<{}, any> {
     state;
     context;
     constructor(props, context) {
@@ -1656,7 +1656,103 @@ export class TableExample extends PureComponent<any, any> {
     }
 }
 
-export class WindowScrollerExample extends PureComponent<any, any> {
+import {TableCellProps} from "react-virtualized"
+
+export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
+    state;
+    context;
+    _cache: CellMeasurerCache;
+    constructor(props, context) {
+        super(props, context)
+
+        this._cache = new CellMeasurerCache({
+            fixedWidth: true,
+            minHeight: 25
+        })
+
+        this._columnCellRenderer = this._columnCellRenderer.bind(this)
+        this._rowGetter = this._rowGetter.bind(this)
+    }
+
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.width !== this.props.width) {
+            this._cache.clearAll()
+        }
+    }
+
+    render() {
+        const { width } = this.props
+
+        return (
+            <Table
+                deferredMeasurementCache={this._cache}
+                headerHeight={20}
+                height={400}
+                overscanRowCount={2}
+                rowClassName={'styles.tableRow'}
+                rowHeight={this._cache.rowHeight}
+                rowGetter={this._rowGetter}
+                rowCount={1000}
+                width={width}
+            >
+                <Column
+                    className={'styles.tableColumn'}
+                    dataKey='name'
+                    label='Name'
+                    width={125}
+                />
+                <Column
+                    className={'styles.tableColumn'}
+                    dataKey='color'
+                    label='Color'
+                    width={75}
+                />
+                <Column
+                    width={width - 200}
+                    dataKey='random'
+                    label='Dynamic text'
+                    cellRenderer={this._columnCellRenderer}
+                />
+            </Table>
+        )
+    }
+
+    _columnCellRenderer(args: TableCellProps) {
+        const { list } = this.props
+
+        const datum = list.get(args.rowIndex % list.size)
+        const content = args.rowIndex % 5 === 0
+            ? ''
+            : datum.randomLong
+
+        return (
+            <CellMeasurer
+                cache={this._cache}
+                columnIndex={0}
+                key={args.dataKey}
+                parent={args.parent}
+                rowIndex={args.rowIndex}
+            >
+                <div
+                    className={'styles.tableColumn'}
+                    style={{
+                        whiteSpace: 'normal'
+                    }}
+                >
+                    {content}
+                </div>
+            </CellMeasurer>
+        )
+    }
+
+    _rowGetter({ index }) {
+        const { list } = this.props
+
+        return list.get(index % list.size)
+    }
+}
+
+export class WindowScrollerExample extends PureComponent<{}, any> {
     state;
     context;
     _windowScroller: WindowScroller;
diff --git a/types/react-widgets/index.d.ts b/types/react-widgets/index.d.ts
index 6cea9d195b..a10263eb81 100644
--- a/types/react-widgets/index.d.ts
+++ b/types/react-widgets/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jquense/react-widgets
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten/>, Balázs Sándor <https://github.com/sanyatuning>, Frode Hansen <https://github.com/frodehansen2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/react-widgets/react-widgets-tests.tsx b/types/react-widgets/react-widgets-tests.tsx
index 53ee0dd7f8..d0af494394 100644
--- a/types/react-widgets/react-widgets-tests.tsx
+++ b/types/react-widgets/react-widgets-tests.tsx
@@ -11,7 +11,7 @@ function itemComponent(props: { value: string }) {
     return <span>{props.value}</span>;
 }
 
-class Test extends React.Component<React.Props<{}>, {}> {
+class Test extends React.Component<React.Props<{}>> {
     render() {
         return (
         <div>
diff --git a/types/react/README.md b/types/react/README.md
index 7515510f9e..e38ba90175 100644
--- a/types/react/README.md
+++ b/types/react/README.md
@@ -38,7 +38,7 @@ This problem manifests itself in two ways. It should be fixed in [TypeScript 2.0
     ```ts
     import * as React from "react";
 
-    class MyComponent extends React.Component<Props, {}> {
+    class MyComponent extends React.Component<Props> {
         static contextTypes = {
             someValue: React.PropTypes.string
         };
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index e9aa299934..283fb57ba7 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,8 +1,17 @@
 // Type definitions for React v15.0
 // Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>, John Reilly <https://github.com/johnnyreilly/>, Benoit Benezech <https://github.com/bbenezech>, Patricio Zavolinsky <https://github.com/pzavolinsky>, Digiguru <https://github.com/digiguru>, Eric Anderson <https://github.com/ericanderson>
+// Definitions by: Asana <https://asana.com>
+//                 AssureSign <http://www.assuresign.com>
+//                 Microsoft <https://microsoft.com>
+//                 John Reilly <https://github.com/johnnyreilly/>
+//                 Benoit Benezech <https://github.com/bbenezech>
+//                 Patricio Zavolinsky <https://github.com/pzavolinsky>
+//                 Digiguru <https://github.com/digiguru>
+//                 Eric Anderson <https://github.com/ericanderson>
+//                 Albert Kurniawan <https://github.com/morcerf>
+//                 Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 type NativeAnimationEvent = AnimationEvent;
 type NativeClipboardEvent = ClipboardEvent;
@@ -25,11 +34,12 @@ declare namespace React {
     // React Elements
     // ----------------------------------------------------------------------
 
-    type ReactType = string | ComponentClass<any> | StatelessComponent<any>;
+    type ReactType = string | ComponentType<any>;
+    type ComponentType<P> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
-    type Ref<T> = string | ((instance: T) => any);
-    type ComponentState = {} | void;
+    type Ref<T> = string | ((instance: T | null) => any);
+    type ComponentState = {};
 
     interface Attributes {
         key?: Key;
@@ -175,16 +185,16 @@ declare namespace React {
     // Component API
     // ----------------------------------------------------------------------
 
-    type ReactInstance = Component<any, any> | Element;
+    type ReactInstance = Component<any> | Element;
 
     // Base component for plain JS classes
-    interface Component<P, S> extends ComponentLifecycle<P, S> { }
+    interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
     class Component<P, S> {
         constructor(props?: P, context?: any);
         setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
         setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
         forceUpdate(callBack?: () => any): void;
-        render(): JSX.Element | null;
+        render(): JSX.Element | null | false;
 
         // React.Props<T> is now deprecated, which means that the `children`
         // property is not available on `P` by default, even though you can
@@ -199,9 +209,9 @@ declare namespace React {
         };
     }
 
-    class PureComponent<P, S> extends Component<P, S> { }
+    class PureComponent<P = {}, S = {}> extends Component<P, S> { }
 
-    interface ClassicComponent<P, S> extends Component<P, S> {
+    interface ClassicComponent<P = {}, S = {}> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => any): void;
         isMounted(): boolean;
         getInitialState?(): S;
@@ -215,8 +225,8 @@ declare namespace React {
     // Class Interfaces
     // ----------------------------------------------------------------------
 
-    type SFC<P> = StatelessComponent<P>;
-    interface StatelessComponent<P> {
+    type SFC<P = {}> = StatelessComponent<P>;
+    interface StatelessComponent<P = {}> {
         (props: P & { children?: ReactNode }, context?: any): ReactElement<any>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
@@ -224,7 +234,7 @@ declare namespace React {
         displayName?: string;
     }
 
-    interface ComponentClass<P> {
+    interface ComponentClass<P = {}> {
         new (props?: P, context?: any): Component<P, ComponentState>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
@@ -233,7 +243,7 @@ declare namespace React {
         displayName?: string;
     }
 
-    interface ClassicComponentClass<P> extends ComponentClass<P> {
+    interface ClassicComponentClass<P = {}> extends ComponentClass<P> {
         new (props?: P, context?: any): ClassicComponent<P, ComponentState>;
         getDefaultProps?(): P;
     }
@@ -263,7 +273,7 @@ declare namespace React {
     }
 
     interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>;
+        mixins?: Mixin<P, S>[];
         statics?: {
             [key: string]: any;
         };
@@ -329,6 +339,10 @@ declare namespace React {
     interface FormEvent<T> extends SyntheticEvent<T> {
     }
 
+    interface InvalidEvent<T> extends SyntheticEvent<T> {
+        target: EventTarget & T;
+    }
+
     interface ChangeEvent<T> extends SyntheticEvent<T> {
         target: EventTarget & T;
     }
@@ -442,7 +456,7 @@ declare namespace React {
      * `createElement` or a factory, use `ClassAttributes<T>`:
      *
      * ```ts
-     * var b: Button;
+     * var b: Button | null;
      * var props: ButtonProps & ClassAttributes<Button> = {
      *     ref: b => button = b, // ok!
      *     label: "I'm a Button"
@@ -501,6 +515,8 @@ declare namespace React {
         onResetCapture?: FormEventHandler<T>;
         onSubmit?: FormEventHandler<T>;
         onSubmitCapture?: FormEventHandler<T>;
+        onInvalid?: FormEventHandler<T>;
+        onInvalidCapture?: FormEventHandler<T>;
 
         // Image Events
         onLoad?: ReactEventHandler<T>;
@@ -2260,6 +2276,10 @@ declare namespace React {
         type?: string;
         width?: number | string;
 
+        // Other HTML properties supported by SVG elements in browsers
+        role?: string;
+        tabIndex?: number;
+
         // SVG Specific attributes
         accentHeight?: number | string;
         accumulate?: "none" | "sum";
@@ -2722,8 +2742,8 @@ declare namespace React {
 declare global {
     namespace JSX {
         interface Element extends React.ReactElement<any> { }
-        interface ElementClass extends React.Component<any, any> {
-            render(): JSX.Element | null;
+        interface ElementClass extends React.Component<any> {
+            render(): JSX.Element | null | false;
         }
         interface ElementAttributesProperty { props: {}; }
         interface ElementChildrenAttribute { children: {}; }
@@ -2852,6 +2872,7 @@ declare global {
             svg: React.SVGProps<SVGSVGElement>;
 
             animate: React.SVGProps<SVGElement>; // TODO: It is SVGAnimateElement but is not in TypeScript's lib.dom.d.ts for now.
+            animateTransform: React.SVGProps<SVGElement>; // TODO: It is SVGAnimateTransformElement but is not in TypeScript's lib.dom.d.ts for now.
             circle: React.SVGProps<SVGCircleElement>;
             clipPath: React.SVGProps<SVGClipPathElement>;
             defs: React.SVGProps<SVGDefsElement>;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index f0fee7a00b..80d4d574df 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -1,17 +1,17 @@
-import React = require("react");
-import ReactDOM = require("react-dom");
-import ReactDOMServer = require("react-dom/server");
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import * as ReactDOMServer from "react-dom/server";
 import createFragment = require("react-addons-create-fragment");
-import CSSTransitionGroup = require("react-addons-css-transition-group");
-import LinkedStateMixin = require("react-addons-linked-state-mixin");
-import Perf = require("react-addons-perf");
-import PureRenderMixin = require("react-addons-pure-render-mixin");
-import shallowCompare = require("react-addons-shallow-compare");
-import TestUtils = require("react-addons-test-utils");
-import TransitionGroup = require("react-addons-transition-group");
+import * as CSSTransitionGroup from "react-addons-css-transition-group";
+import * as LinkedStateMixin from "react-addons-linked-state-mixin";
+import * as Perf from "react-addons-perf";
+import * as PureRenderMixin from "react-addons-pure-render-mixin";
+import * as shallowCompare from "react-addons-shallow-compare";
+import * as TestUtils from "react-addons-test-utils";
+import * as TransitionGroup from "react-addons-transition-group";
 import update = require("react-addons-update");
 
-interface Props {
+interface Props extends React.Attributes {
     hello: string;
     world?: string;
     foo: number;
@@ -112,7 +112,7 @@ class ModernComponent extends React.Component<Props, State>
     }
 
     private _myComponent: MyComponent;
-    private _input: HTMLInputElement;
+    private _input: HTMLInputElement | null;
 
     render() {
         return React.DOM.div(null,
@@ -130,7 +130,8 @@ class ModernComponent extends React.Component<Props, State>
     }
 }
 
-class ModernComponentNoState extends React.Component<Props, void> { }
+class ModernComponentNoState extends React.Component<Props> { }
+class ModernComponentNoPropsAndState extends React.Component { }
 
 interface SCProps {
     foo?: number;
@@ -199,7 +200,7 @@ React.cloneElement(element, {}, null);
 var clonedElement2: React.CElement<Props, ModernComponent> =
     // known problem: cloning with key or ref requires cast
     React.cloneElement(element, <React.ClassAttributes<ModernComponent>>{
-        ref: c => c.reset()
+        ref: c => c && c.reset()
     });
 var clonedElement3: React.CElement<Props, ModernComponent> =
     React.cloneElement(element, <{ foo: number } & React.Attributes>{
@@ -229,7 +230,7 @@ var componentNoState: ModernComponentNoState =
     ReactDOM.render(elementNoState, container);
 var componentNoStateElementOrNull: ModernComponentNoState =
     ReactDOM.render(elementNoState, document.getElementById("anelement"));
-var classicComponent: React.ClassicComponent<Props, any> =
+var classicComponent: React.ClassicComponent<Props> =
     ReactDOM.render(classicElement, container);
 var domComponent: Element =
     ReactDOM.render(domElement, container);
@@ -282,24 +283,24 @@ myComponent.reset();
 interface RCProps {
 }
 
-class RefComponent extends React.Component<RCProps, {}> {
+class RefComponent extends React.Component<RCProps> {
     static create = React.createFactory(RefComponent);
     refMethod() {
     }
 }
 
-var componentRef: RefComponent = new RefComponent();
+var componentRef: RefComponent | null = new RefComponent();
 RefComponent.create({ ref: "componentRef" });
 // type of c should be inferred
 RefComponent.create({ ref: c => componentRef = c });
 componentRef.refMethod();
 
-var domNodeRef: Element;
+var domNodeRef: Element | null;
 React.DOM.div({ ref: "domRef" });
 // type of node should be inferred
 React.DOM.div({ ref: node => domNodeRef = node });
 
-var inputNodeRef: HTMLInputElement;
+var inputNodeRef: HTMLInputElement | null;
 React.DOM.input({ ref: node => inputNodeRef = <HTMLInputElement>node });
 
 //
@@ -704,7 +705,7 @@ const formEvent:InputFormEvent = changeEvent;
         prop2: string;
         prop3?: string;
     }
-    class ComponentWithDefaultProps extends React.Component<ComponentProps, void> {
+    class ComponentWithDefaultProps extends React.Component<ComponentProps> {
         static defaultProps = {
             prop3: "default value",
         };
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 1d6b683bcf..487700495e 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -1,9 +1,8 @@
-import React = require("react");
+import * as React from "react";
 
 interface SCProps {
     foo?: number;
 }
-
 var StatelessComponent: React.SFC<SCProps> = ({ foo }: SCProps) => {
     return <div>{ foo }</div>;
 };
@@ -11,7 +10,6 @@ StatelessComponent.displayName = "StatelessComponent3";
 StatelessComponent.defaultProps = {
     foo: 42
 };
-
 <StatelessComponent />;
 
 var StatelessComponent2: React.SFC<SCProps> = ({ foo, children }) => {
@@ -21,7 +19,6 @@ StatelessComponent2.displayName = "StatelessComponent4";
 StatelessComponent2.defaultProps = {
     foo: 42
 };
-
 <StatelessComponent2>24</StatelessComponent2>;
 
 // svg sanity check
@@ -43,3 +40,27 @@ StatelessComponent2.defaultProps = {
     >
     <b>foo</b>
 </div>
+
+
+interface Props {
+    hello: string;
+}
+interface State {
+    foobar: string;
+}
+class ComponentWithPropsAndState extends React.Component<Props, State> {
+}
+<ComponentWithPropsAndState hello="TypeScript" />
+
+class ComponentWithoutState extends React.Component<Props> {
+}
+<ComponentWithoutState hello="TypeScript" />
+
+class ComponentWithoutPropsAndState extends React.Component {
+}
+<ComponentWithoutPropsAndState />
+
+const StatelessComponentWithoutProps: React.SFC = (props) => {
+    return <div />;
+};
+<StatelessComponentWithoutProps />;
diff --git a/types/reactcss/index.d.ts b/types/reactcss/index.d.ts
index fe64ed4ce9..68836afe93 100644
--- a/types/reactcss/index.d.ts
+++ b/types/reactcss/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://reactcss.com/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as React from "react"
 
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 166a009e21..c612edf234 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactstrap/reactstrap#readme
 // Definitions by: Ali Hammad Baig <https://github.com/alihammad>, Marco Falkenberg <https://github.com/mfal>, Danilo Barros <https://github.com/danilobjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export { default as Alert } from './lib/Alert';
 export { default as Badge } from './lib/Badge';
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 57e4532a31..c89150fd83 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -3,6 +3,7 @@
 export interface UncontrolledProps {
   isOpen?: boolean;
   toggle?: () => void;
+  className?: string;
 }
 
 export interface Props extends UncontrolledProps {
@@ -12,7 +13,6 @@ export interface Props extends UncontrolledProps {
   size?: string;
   tag?: React.ReactType;
   tether?: boolean | Tether.ITetherOptions;
-  className?: string;
 }
 
 declare var Dropdown: React.StatelessComponent<Props>;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 28a253e022..e28715e42f 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -5,7 +5,8 @@ interface Props {
   header?: boolean;
   onClick?: (event: React.MouseEvent<any>) => void;
   className?: string;
+  href?: string;
 }
 
 declare var DropdownItem: React.StatelessComponent<Props>;
-export default DropdownItem;
\ No newline at end of file
+export default DropdownItem;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index b318b6e6f5..61529c4a48 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,8 +1,8 @@
-interface Props {
+interface Props extends React.HTMLProps< HTMLElement> {
   className?: string;
   tag?: React.ReactType;
   noGutters?: boolean;
 }
 
-declare var Row: React.StatelessComponent<React.HTMLProps<any>>;
+declare var Row: React.StatelessComponent<Props>;
 export default Row;
\ No newline at end of file
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index ba5f5e38e1..b3a8b03838 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -127,7 +127,7 @@ function AlertExample1() {
 }
 
 // --------------- Badge
-class Example2 extends React.Component<any, any> {
+class Example2 extends React.Component {
   render() {
     return (
       <div>
@@ -142,7 +142,7 @@ class Example2 extends React.Component<any, any> {
   }
 }
 
-export class Example3 extends React.Component<any, any> {
+export class Example3 extends React.Component {
   render() {
     return (
       <div>
@@ -157,7 +157,7 @@ export class Example3 extends React.Component<any, any> {
   }
 }
 
-class Example4 extends React.Component<any, any> {
+class Example4 extends React.Component {
   render() {
     return (
       <div>
@@ -206,7 +206,7 @@ const Example6 = (props: any) => {
 };
 
 // ------------- Buttons
-class Example7 extends React.Component<any, any> {
+class Example7 extends React.Component {
   render() {
     return (
       <div>
@@ -222,7 +222,7 @@ class Example7 extends React.Component<any, any> {
   }
 }
 
-class Example8 extends React.Component<any, any> {
+class Example8 extends React.Component {
   render() {
     return (
       <div>
@@ -422,7 +422,7 @@ const Example19 = (
 );
 
 // --------------- ButtonGroup
-class Example20 extends React.Component<any, any> {
+class Example20 extends React.Component {
   render() {
     return (
       <ButtonGroup>
@@ -434,7 +434,7 @@ class Example20 extends React.Component<any, any> {
   }
 }
 
-class Example21 extends React.Component<any, any> {
+class Example21 extends React.Component {
   render() {
     return (
       <ButtonToolbar>
@@ -549,7 +549,7 @@ const Example26 = (props: any) => {
 
 const Example27 = (props: any) => {
   return (
-    <Row>
+    <Row noGutters>
       <Col sm="6">
         <Card block>
           <CardTitle>Special Title Treatment</CardTitle>
@@ -1051,7 +1051,7 @@ class Example43 extends React.Component<any, any> {
 
 function Example44() {
   return (
-    <UncontrolledDropdown>
+    <UncontrolledDropdown className="some-class">
       <DropdownToggle caret>
         Dropdown
       </DropdownToggle>
@@ -1067,7 +1067,7 @@ function Example44() {
 }
 
 // ------------------ Form
-class Example45 extends React.Component<any, any> {
+class Example45 extends React.Component {
   render() {
     return (
       <Form>
@@ -1144,7 +1144,7 @@ class Example45 extends React.Component<any, any> {
   }
 }
 
-class Example46 extends React.Component<any, any> {
+class Example46 extends React.Component {
   render() {
     return (
       <Form>
@@ -1232,7 +1232,7 @@ class Example46 extends React.Component<any, any> {
   }
 }
 
-class Example47 extends React.Component<any, any> {
+class Example47 extends React.Component {
   render() {
     return (
       <Form inline>
@@ -1252,7 +1252,7 @@ class Example47 extends React.Component<any, any> {
   }
 }
 
-class Example48 extends React.Component<any, any> {
+class Example48 extends React.Component {
   render() {
     return (
       <Form>
@@ -1279,7 +1279,7 @@ class Example48 extends React.Component<any, any> {
   }
 }
 
-class Example49 extends React.Component<any, any> {
+class Example49 extends React.Component {
   render() {
     return (
       <Form>
@@ -1372,7 +1372,7 @@ class Example49 extends React.Component<any, any> {
   }
 }
 
-class Example50 extends React.Component<any, any> {
+class Example50 extends React.Component {
   render() {
     return (
       <Form>
@@ -1393,7 +1393,7 @@ class Example50 extends React.Component<any, any> {
   }
 }
 
-class Example51 extends React.Component<any, any> {
+class Example51 extends React.Component {
   render() {
     return (
       <Form inline>
@@ -1609,7 +1609,7 @@ const Example60 = (props: any) => {
   );
 };
 
-class Example61 extends React.Component<any, any> {
+class Example61 extends React.Component {
   render() {
     return (
       <Container>
@@ -1651,7 +1651,7 @@ class Example61 extends React.Component<any, any> {
   }
 }
 
-class Example62 extends React.Component<any, any> {
+class Example62 extends React.Component {
   render() {
     return (
       <ListGroup>
@@ -1665,7 +1665,7 @@ class Example62 extends React.Component<any, any> {
   }
 }
 
-class Example63 extends React.Component<any, any> {
+class Example63 extends React.Component {
   render() {
     return (
       <ListGroup>
@@ -1677,7 +1677,7 @@ class Example63 extends React.Component<any, any> {
   }
 }
 
-class Example64 extends React.Component<any, any> {
+class Example64 extends React.Component {
   render() {
     return (
       <ListGroup>
@@ -1691,7 +1691,7 @@ class Example64 extends React.Component<any, any> {
   }
 }
 
-class Example65 extends React.Component<any, any> {
+class Example65 extends React.Component {
   render() {
     return (
       <div>
@@ -1718,7 +1718,7 @@ class Example65 extends React.Component<any, any> {
   }
 }
 
-class Example66 extends React.Component<any, any> {
+class Example66 extends React.Component {
   render() {
     return (
       <ListGroup>
@@ -1731,7 +1731,7 @@ class Example66 extends React.Component<any, any> {
   }
 }
 
-class Example67 extends React.Component<any, any> {
+class Example67 extends React.Component {
   render() {
     return (
       <ListGroup>
@@ -2156,7 +2156,7 @@ class Example76 extends React.Component<any, any> {
   }
 }
 
-class Example77 extends React.Component<any, any> {
+class Example77 extends React.Component {
   render() {
     return (
       <div>
@@ -2315,7 +2315,7 @@ class Example80 extends React.Component<any, any> {
 }
 
 // ----------- Pagination
-class Example81 extends React.Component<any, any> {
+class Example81 extends React.Component {
   render() {
     return (
       <Pagination>
@@ -2355,7 +2355,7 @@ class Example81 extends React.Component<any, any> {
   }
 }
 
-class Example82 extends React.Component<any, any> {
+class Example82 extends React.Component {
   render() {
     return (
       <Pagination>
@@ -2395,7 +2395,7 @@ class Example82 extends React.Component<any, any> {
   }
 }
 
-class Example83 extends React.Component<any, any> {
+class Example83 extends React.Component {
   render() {
     return (
       <Pagination size="lg">
@@ -2425,7 +2425,7 @@ class Example83 extends React.Component<any, any> {
   }
 }
 
-class Example84 extends React.Component<any, any> {
+class Example84 extends React.Component {
   render() {
     return (
       <Pagination size="sm">
@@ -2700,7 +2700,7 @@ const Example92 = (props: any) => {
 };
 
 // --------------- Table
-class Example93 extends React.Component<any, any> {
+class Example93 extends React.Component {
   render() {
     return (
       <Table>
@@ -2737,7 +2737,7 @@ class Example93 extends React.Component<any, any> {
   }
 }
 
-class Example94 extends React.Component<any, any> {
+class Example94 extends React.Component {
   render() {
     return (
       <Table inverse>
@@ -2774,7 +2774,7 @@ class Example94 extends React.Component<any, any> {
   }
 }
 
-class Example95 extends React.Component<any, any> {
+class Example95 extends React.Component {
   render() {
     return (
       <Table striped>
@@ -2811,7 +2811,7 @@ class Example95 extends React.Component<any, any> {
   }
 }
 
-class Example96 extends React.Component<any, any> {
+class Example96 extends React.Component {
   render() {
     return (
       <Table bordered>
@@ -2848,7 +2848,7 @@ class Example96 extends React.Component<any, any> {
   }
 }
 
-class Example97 extends React.Component<any, any> {
+class Example97 extends React.Component {
   render() {
     return (
       <Table hover>
@@ -2885,7 +2885,7 @@ class Example97 extends React.Component<any, any> {
   }
 }
 
-class Example98 extends React.Component<any, any> {
+class Example98 extends React.Component {
   render() {
     return (
       <Table size="sm">
@@ -2922,7 +2922,7 @@ class Example98 extends React.Component<any, any> {
   }
 }
 
-class Example99 extends React.Component<any, any> {
+class Example99 extends React.Component {
   render() {
     return (
       <Table responsive>
@@ -2971,7 +2971,7 @@ class Example99 extends React.Component<any, any> {
   }
 }
 
-class Example100 extends React.Component<any, any> {
+class Example100 extends React.Component {
   render() {
     return (
       <Table responsive>
diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index ae37b9fa2a..fab1650108 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jxnblk/rebass
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
diff --git a/types/rebass/rebass-tests.tsx b/types/rebass/rebass-tests.tsx
index 2d20c900db..430e277541 100644
--- a/types/rebass/rebass-tests.tsx
+++ b/types/rebass/rebass-tests.tsx
@@ -67,13 +67,13 @@ interface IconProps extends React.Props<Icon> {
   width: string;
 }
 
-class Icon extends React.Component<IconProps, {}> {
+class Icon extends React.Component<IconProps> {
   render() {
     return <div></div>;
   }
 }
 
-class RebassTest extends React.Component<{}, {}> {
+class RebassTest extends React.Component {
   render() {
     return <div>
       <Button
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index 6cef47160e..3e3d6b85ae 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for Recompose v0.22.0
+// Type definitions for Recompose 0.23
 // Project: https://github.com/acdlite/recompose
 // Definitions by: Iskander Sierra <https://github.com/iskandersierra>
+//                 Samuel DeSota <https://github.com/mrapogee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 ///<reference types="react" />
 
@@ -143,18 +144,32 @@ declare module 'recompose' {
         contextTypes: ValidationMap<TContext>
     ) : InferableComponentEnhancer;
 
-    // lifecycle: https://github.com/acdlite/recompose/blob/master/docs/API.md#lifecycle
-    interface ReactLifeCycleFunctions {
-        componentWillMount?: Function;
-        componentDidMount?: Function;
-        componentWillReceiveProps?: Function;
-        shouldComponentUpdate?: Function;
-        componentWillUpdate?: Function;
-        componentDidUpdate?: Function;
-        componentWillUnmount?: Function;
+    interface ReactLifeCycleFunctionsThisArguments<TProps, TState> {
+        props: TProps,
+        state: TState,
+        setState<TKeyOfState extends keyof TState>(f: (prevState: TState, props: TProps) => Pick<TState, TKeyOfState>, callback?: () => any): void;
+        setState<TKeyOfState extends keyof TState>(state: Pick<TState, TKeyOfState>, callback?: () => any): void;
+        forceUpdate(callBack?: () => any): void;
+
+        context: any;
+        refs: {
+            [key: string]: React.ReactInstance
+        };
     }
-    export function lifecycle(
-        spec: ReactLifeCycleFunctions
+
+    // lifecycle: https://github.com/acdlite/recompose/blob/master/docs/API.md#lifecycle
+    interface ReactLifeCycleFunctions<TProps, TState> {
+        componentWillMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
+        componentDidMount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
+        componentWillReceiveProps?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps) => void;
+        shouldComponentUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps, nextState: TState) => boolean;
+        componentWillUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, nextProps: TProps, nextState: TState) => void;
+        componentDidUpdate?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>, prevProps: TProps, prevState: TState) => void;
+        componentWillUnmount?: (this: ReactLifeCycleFunctionsThisArguments<TProps, TState>) => void;
+    }
+
+    export function lifecycle<TProps, TState>(
+        spec: ReactLifeCycleFunctions<TProps, TState>
     ): InferableComponentEnhancer;
 
     // toClass: https://github.com/acdlite/recompose/blob/master/docs/API.md#toClass
@@ -255,11 +270,21 @@ declare module 'recompose' {
         propsToReactNode: mapper<Subscribable<TProps>, Subscribable<React.ReactNode>>
     ): Component<TProps>; // ???
 
+    // componentFromStreamWithConfig: https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromstreamwithconfig
+    export function componentFromStreamWithConfig(config: ObservableConfig): <TProps> (
+        propsToReactNode: mapper<Subscribable<TProps>, Subscribable<React.ReactNode>>
+    ) => Component<TProps>
+
     // mapPropsStream: https://github.com/acdlite/recompose/blob/master/docs/API.md#mapPropsStream
     export function mapPropsStream<TInner, TOutter>(
         transform: mapper<Subscribable<TOutter>, Subscribable<TInner>>
     ): ComponentEnhancer<TInner, TOutter>;
 
+    // mapPropsStreamWithConfig: https://github.com/acdlite/recompose/blob/master/docs/API.md#mappropsstreamwithconfig
+    export function mapPropsStreamWithConfig(config: ObservableConfig): <TInner, TOutter> (
+        transform: mapper<Subscribable<TOutter>, Subscribable<TInner>>
+    ) => ComponentEnhancer<TInner, TOutter>;
+
     // createEventHandler: https://github.com/acdlite/recompose/blob/master/docs/API.md#createEventHandler
     type EventHandlerOf<T, TSubs extends Subscribable<T>> = {
         handler: (value: T) => void;
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 01bd1d28f5..a698de6ffa 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -16,6 +16,7 @@ import {
     createSink, componentFromProp, nest, hoistStatics,
     // Observable utilities
     componentFromStream, mapPropsStream, createEventHandler,
+    componentFromStreamWithConfig, mapPropsStreamWithConfig,
     setObservableConfig,
 } from "recompose";
 import rxjsconfig from "recompose/rxjsObservableConfig";
@@ -86,7 +87,7 @@ function testDefaultProps() {
     const innerComponent = ({a, b}: Props) => <div>{a}, {b}</div>;
 
     const enhancer = defaultProps({ a: "answer", b: 42 });
-    const enhanced: React.StatelessComponent<Props> = enhancer(innerComponent);
+    const enhanced: React.StatelessComponent<Props> = enhancer<Props, ({a, b}: Props) => JSX.Element>(innerComponent);
 }
 
 function testRenameProp() {
@@ -179,3 +180,10 @@ function testRenderComponent() {
     const enhanced: React.ComponentClass<OutterProps> = enhancer(innerComponent);
 }
 
+function testWithObservableConfig() {
+  let componentFromStreamMost = componentFromStreamWithConfig(mostConfig)
+  componentFromStreamMost = componentFromStream
+
+  let mapPropsStreamMost = mapPropsStreamWithConfig(mostConfig)
+  mapPropsStreamMost = mapPropsStream
+}
diff --git a/types/redis/index.d.ts b/types/redis/index.d.ts
index c20e4f1277..8ce138cd95 100644
--- a/types/redis/index.d.ts
+++ b/types/redis/index.d.ts
@@ -1,37 +1,14 @@
-// Type definitions for redis 0.12.2
+// Type definitions for redis 2.6.0
 // Project: https://github.com/mranney/node_redis
 // Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Peter Harris <https://github.com/CodeAnimal>, TANAKA Koichi <https://github.com/MugeSo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Imported from: https://github.com/soywiz/typescript-node-definitions/redis.d.ts
+// Imported from: https://github.com/types/npm-redis
 
 /// <reference types="node" />
 
-export declare function createClient(port_arg: number, host_arg?: string, options?: ClientOpts): RedisClient;
-export declare function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
-export declare function createClient(options?: ClientOpts): RedisClient;
-
-export declare function print(err: Error, reply: any): void;
-
-export declare var debug_mode: boolean;
-
-export interface MessageHandler<M> {
-    (channel: string, message: M): void;
-}
-
-export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
-    (args: any[], callback?: ResCallbackT<R>): void;
-    (...args: any[]): void;
-}
-
-export interface ResCallbackT<R> {
-    (err: Error, res: R): void;
-}
-
-export interface ServerInfo {
-    redis_version: string;
-    versions: number[];
-}
+import { EventEmitter } from 'events';
+import { Duplex } from 'stream';
 
 export interface RetryStrategyOptions {
     error: Error;
@@ -45,641 +22,1228 @@ export interface RetryStrategy {
 }
 
 export interface ClientOpts {
-    auth_pass?: string;
-    command_queue_high_water?: number;
-    command_queue_low_water?: number;
-    connect_timeout?: number;
-    db?: string;
-    detect_buffers?: boolean;
-    disable_resubscribing?: boolean;
-    enable_offline_queue?: boolean;
-    family?: string;
     host?: string;
-    max_attempts?: number;
-    no_ready_check?: boolean;
-    parser?: string;
-    password?: string;
-    path?: string;
     port?: number;
-    prefix?: string;
-    rename_commands?: any;
-    retry_max_delay?: number;
-    retry_strategy?: RetryStrategy;
-    retry_unfulfilled_commands?: boolean;
-    return_buffers?: boolean;
-    socket_keepalive?: boolean;
-    socket_nodelay?: boolean;
-    string_numbers?: boolean;
-    tls?: any;
+    path?: string;
     url?: string;
+    parser?: string;
+    string_numbers?: boolean;
+    return_buffers?: boolean;
+    detect_buffers?: boolean;
+    socket_keepalive?: boolean;
+    no_ready_check?: boolean;
+    enable_offline_queue?: boolean;
+    retry_max_delay?: number;
+    connect_timeout?: number;
+    max_attempts?: number;
+    retry_unfulfilled_commands?: boolean;
+    auth_pass?: string;
+    password?: string;
+    db?: string;
+    family?: string;
+    rename_commands?: { [command: string]: string };
+    tls?: any;
+    prefix?: string;
+    retry_strategy?: RetryStrategy;
 }
 
-export interface RedisClient extends NodeJS.EventEmitter {
-    // event: connect
-    // event: error
-    // event: message
-    // event: pmessage
-    // event: subscribe
-    // event: psubscribe
-    // event: unsubscribe
-    // event: punsubscribe
+export interface Callback<T> {
+    (err: Error | null, reply: T): void;
+}
 
+export interface ServerInfo {
+    redis_version: string;
+    versions: number[];
+}
+
+export interface OverloadedCommand<T, U, R> {
+    (args: T[], cb?: Callback<U>): R;
+    (arg: T, args: T[], cb?: Callback<U>): R;
+
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, cb?: Callback<U>): R;
+    (arg1: T, cb?: Callback<U>): R;
+    (...args: (T | Callback<U>)[]): R;
+}
+
+export interface OverloadedKeyCommand<T, U, R> {
+    (key: string, args: T[], cb?: Callback<U>): R;
+
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, cb?: Callback<U>): R;
+    (key: string, ...args: (T | Callback<U>)[]): R;
+    (...args: (string | T | Callback<U>)[]): R;
+}
+
+export interface OverloadedListCommand<T, U, R> {
+    (args: T[], cb?: Callback<U>): R;
+
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, cb?: Callback<U>): R;
+    (arg1: T, cb?: Callback<U>): R;
+    (...args: (T | Callback<U>)[]): R;
+}
+
+export interface OverloadedSetCommand<T, U, R> {
+    (key: string, args: { [key: string]: T } | T[], cb?: Callback<U>): R;
+
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, cb?: Callback<U>): R;
+    (key: string, ...args: (T | Callback<U>)[]): R;
+}
+
+export interface OverloadedLastCommand<T1, T2, U, R> {
+    (args: (T1 | T2)[], cb?: Callback<U>): R;
+    (arg: T1, args: (T1 | T2)[], cb?: Callback<U>): R;
+
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T1, arg6: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T2, cb?: Callback<U>): R;
+    (...args: (T1 | T2 | Callback<U>)[]): R;
+}
+
+export interface Commands<R> {
+    /**
+     * Listen for all requests received by the server in real time.
+     */
+    monitor(cb?: Callback<undefined>): R;
+    MONITOR(cb?: Callback<undefined>): R;
+
+    /**
+     * Get information and statistics about the server.
+     */
+    info(cb?: Callback<ServerInfo>): R;
+    info(section?: string | string[], cb?: Callback<ServerInfo>): R;
+    INFO(cb?: Callback<ServerInfo>): R;
+    INFO(section?: string | string[], cb?: Callback<ServerInfo>): R;
+
+    /**
+     * Ping the server.
+     */
+    ping(callback?: Callback<string>): R;
+    ping(message: string, callback?: Callback<string>): R;
+
+    /**
+     * Post a message to a channel.
+     */
+    publish(channel: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Authenticate to the server.
+     */
+    auth(password: string, callback?: Callback<string>): R;
+    AUTH(password: string, callback?: Callback<string>): R;
+
+    /**
+     * KILL - Kill the connection of a client.
+     * LIST - Get the list of client connections.
+     * GETNAME - Get the current connection name.
+     * PAUSE - Stop processing commands from clients for some time.
+     * REPLY - Instruct the server whether to reply to commands.
+     * SETNAME - Set the current connection name.
+     */
+    client: OverloadedCommand<string, any, R>;
+    CLIENT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Set multiple hash fields to multiple values.
+     */
+    hmset: OverloadedSetCommand<string | number, boolean, R>;
+    HMSET: OverloadedSetCommand<string | number, boolean, R>;
+
+    /**
+     * Listen for messages published to the given channels.
+     */
+    subscribe: OverloadedListCommand<string, string, R>;
+    SUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     */
+    unsubscribe: OverloadedListCommand<string, string, R>;
+    UNSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     */
+    psubscribe: OverloadedListCommand<string, string, R>;
+    PSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     */
+    punsubscribe: OverloadedListCommand<string, string, R>;
+    PUNSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Append a value to a key.
+     */
+    append(key: string, value: string, cb?: Callback<number>): R;
+    APPEND(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Asynchronously rewrite the append-only file.
+     */
+    bgrewriteaof(cb?: Callback<'OK'>): R;
+    BGREWRITEAOF(cb?: Callback<'OK'>): R;
+
+    /**
+     * Asynchronously save the dataset to disk.
+     */
+    bgsave(cb?: Callback<string>): R;
+    BGSAVE(cb?: Callback<string>): R;
+
+    /**
+     * Count set bits in a string.
+     */
+    bitcount(key: string, cb?: Callback<number>): R;
+    bitcount(key: string, start: number, end: number, cb?: Callback<number>): R;
+    BITCOUNT(key: string, cb?: Callback<number>): R;
+    BITCOUNT(key: string, start: number, end: number, cb?: Callback<number>): R;
+
+    /**
+     * Perform arbitrary bitfield integer operations on strings.
+     */
+    bitfield: OverloadedKeyCommand<string | number, [number, number], R>;
+    BITFIELD: OverloadedKeyCommand<string | number, [number, number], R>;
+
+    /**
+     * Perform bitwise operations between strings.
+     */
+    bitop(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, ...args: (string | Callback<number>)[]): R;
+    BITOP(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, ...args: (string | Callback<number>)[]): R;
+
+    /**
+     * Find first bit set or clear in a string.
+     */
+    bitpos(key: string, bit: number, start: number, end: number, cb?: Callback<number>): R;
+    bitpos(key: string, bit: number, start: number, cb?: Callback<number>): R;
+    bitpos(key: string, bit: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, start: number, end: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, start: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove and get the first element in a list, or block until one is available.
+     */
+    blpop: OverloadedLastCommand<string, number, [string, string], R>;
+    BLPOP: OverloadedLastCommand<string, number, [string, string], R>;
+
+    /**
+     * Remove and get the last element in a list, or block until one is available.
+     */
+    brpop: OverloadedLastCommand<string, number, [string, string], R>;
+    BRPOP: OverloadedLastCommand<string, number, [string, string], R>;
+
+    /**
+     * Pop a value from a list, push it to another list and return it; or block until one is available.
+     */
+    brpoplpush(source: string, destination: string, timeout: number, cb?: Callback<[string, string]>): R;
+    BRPOPLPUSH(source: string, destination: string, timeout: number, cb?: Callback<[string, string]>): R;
+
+    /**
+     * ADDSLOTS - Assign new hash slots to receiving node.
+     * COUNT-FAILURE-REPORTS - Return the number of failure reports active for a given node.
+     * COUNTKEYSINSLOT - Return the number of local keys in the specified hash slot.
+     * DELSLOTS - Set hash slots as unbound in receiving node.
+     * FAILOVER - Forces a slave to perform a manual failover of its master.
+     * FORGET - Remove a node from the nodes table.
+     * GETKEYSINSLOT - Return local key names in the specified hash slot.
+     * INFO - Provides info about Redis Cluster node state.
+     * KEYSLOT - Returns the hash slot of the specified key.
+     * MEET - Force a node cluster to handshake with another node.
+     * NODES - Get cluster config for the node.
+     * REPLICATE - Reconfigure a node as a slave of the specified master node.
+     * RESET - Reset a Redis Cluster node.
+     * SAVECONFIG - Forces the node to save cluster state on disk.
+     * SET-CONFIG-EPOCH - Set the configuration epoch in a new node.
+     * SETSLOT - Bind a hash slot to a specified node.
+     * SLAVES - List slave nodes of the specified master node.
+     * SLOTS - Get array of Cluster slot to node mappings.
+     */
+    cluster: OverloadedCommand<string, any, this>;
+    CLUSTER: OverloadedCommand<string, any, this>;
+
+    /**
+     * Get array of Redis command details.
+     *
+     * COUNT - Get total number of Redis commands.
+     * GETKEYS - Extract keys given a full Redis command.
+     * INFO - Get array of specific REdis command details.
+     */
+    command(cb?: Callback<Array<[string, number, string[], number, number, number]>>): R;
+    COMMAND(cb?: Callback<Array<[string, number, string[], number, number, number]>>): R;
+
+    /**
+     * Get array of Redis command details.
+     *
+     * COUNT - Get array of Redis command details.
+     * GETKEYS - Extract keys given a full Redis command.
+     * INFO - Get array of specific Redis command details.
+     * GET - Get the value of a configuration parameter.
+     * REWRITE - Rewrite the configuration file with the in memory configuration.
+     * SET - Set a configuration parameter to the given value.
+     * RESETSTAT - Reset the stats returned by INFO.
+     */
+    config: OverloadedCommand<string, boolean, R>;
+    CONFIG: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Return the number of keys in the selected database.
+     */
+    dbsize(cb?: Callback<number>): R;
+    DBSIZE(cb?: Callback<number>): R;
+
+    /**
+     * OBJECT - Get debugging information about a key.
+     * SEGFAULT - Make the server crash.
+     */
+    debug: OverloadedCommand<string, boolean, R>;
+    DEBUG: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Decrement the integer value of a key by one.
+     */
+    decr(key: string, cb?: Callback<number>): R;
+    DECR(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Decrement the integer value of a key by the given number.
+     */
+    decrby(key: string, decrement: number, cb?: Callback<number>): R;
+    DECRBY(key: string, decrement: number, cb?: Callback<number>): R;
+
+    /**
+     * Delete a key.
+     */
+    del: OverloadedCommand<string, number, R>;
+    DEL: OverloadedCommand<string, number, R>;
+
+    /**
+     * Discard all commands issued after MULTI.
+     */
+    discard(cb?: Callback<'OK'>): R;
+    DISCARD(cb?: Callback<'OK'>): R;
+
+    /**
+     * Return a serialized version of the value stored at the specified key.
+     */
+    dump(key: string, cb?: Callback<string>): R;
+    DUMP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Echo the given string.
+     */
+    echo<T extends string>(message: T, cb?: Callback<T>): R;
+    ECHO<T extends string>(message: T, cb?: Callback<T>): R;
+
+    /**
+     * Execute a Lua script server side.
+     */
+    eval: OverloadedCommand<string | number, any, R>;
+    EVAL: OverloadedCommand<string | number, any, R>;
+
+    /**
+     * Execute a Lue script server side.
+     */
+    evalsha: OverloadedCommand<string | number, any, R>;
+    EVALSHA: OverloadedCommand<string | number, any, R>;
+
+    /**
+     * Determine if a key exists.
+     */
+    exists: OverloadedCommand<string, number, R>;
+    EXISTS: OverloadedCommand<string, number, R>;
+
+    /**
+     * Set a key's time to live in seconds.
+     */
+    expire(key: string, seconds: number, cb?: Callback<number>): R;
+    EXPIRE(key: string, seconds: number, cb?: Callback<number>): R;
+
+    /**
+     * Set the expiration for a key as a UNIX timestamp.
+     */
+    expireat(key: string, timestamp: number, cb?: Callback<number>): R;
+    EXPIREAT(key: string, timestamp: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove all keys from all databases.
+     */
+    flushall(cb?: Callback<string>): R;
+    FLUSHALL(cb?: Callback<string>): R;
+
+    /**
+     * Remove all keys from the current database.
+     */
+    flushdb(cb?: Callback<string>): R;
+    FLUSHDB(cb?: Callback<string>): R;
+
+    /**
+     * Add one or more geospatial items in the geospatial index represented using a sorted set.
+     */
+    geoadd: OverloadedKeyCommand<string | number, number, R>;
+    GEOADD: OverloadedKeyCommand<string | number, number, R>;
+
+    /**
+     * Returns members of a geospatial index as standard geohash strings.
+     */
+    geohash: OverloadedKeyCommand<string, string, R>;
+    GEOHASH: OverloadedKeyCommand<string, string, R>;
+
+    /**
+     * Returns longitude and latitude of members of a geospatial index.
+     */
+    geopos: OverloadedKeyCommand<string, Array<[number, number]>, R>;
+    GEOPOS: OverloadedKeyCommand<string, Array<[number, number]>, R>;
+
+    /**
+     * Returns the distance between two members of a geospatial index.
+     */
+    geodist: OverloadedKeyCommand<string, string, R>;
+    GEODIST: OverloadedKeyCommand<string, string, R>;
+
+    /**
+     * Query a sorted set representing a geospatial index to fetch members matching a given maximum distance from a point.
+     */
+    georadius: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+    GEORADIUS: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+
+    /**
+     * Query a sorted set representing a geospatial index to fetch members matching a given maximum distance from a member.
+     */
+    georadiusbymember: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+    GEORADIUSBYMEMBER: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+
+    /**
+     * Get the value of a key.
+     */
+    get(key: string, cb?: Callback<string>): R;
+    GET(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Returns the bit value at offset in the string value stored at key.
+     */
+    getbit(key: string, offset: number, cb?: Callback<number>): R;
+    GETBIT(key: string, offset: number, cb?: Callback<number>): R;
+
+    /**
+     * Get a substring of the string stored at a key.
+     */
+    getrange(key: string, start: number, end: number, cb?: Callback<string>): R;
+    GETRANGE(key: string, start: number, end: number, cb?: Callback<string>): R;
+
+    /**
+     * Set the string value of a key and return its old value.
+     */
+    getset(key: string, value: string, cb?: Callback<string>): R;
+    GETSET(key: string, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Delete on or more hash fields.
+     */
+    hdel: OverloadedKeyCommand<string, number, R>;
+    HDEL: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Determine if a hash field exists.
+     */
+    hexists(key: string, field: string, cb?: Callback<number>): R;
+    HEXISTS(key: string, field: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the value of a hash field.
+     */
+    hget(key: string, field: string, cb?: Callback<string>): R;
+    HGET(key: string, field: string, cb?: Callback<string>): R;
+
+    /**
+     * Get all fields and values in a hash.
+     */
+    hgetall(key: string, cb: Callback<{ [key: string]: string }>): R;
+    HGETALL(key: string, cb: Callback<{ [key: string]: string }>): R;
+
+    /**
+     * Increment the integer value of a hash field by the given number.
+     */
+    hincrby(key: string, field: string, increment: number, cb?: Callback<number>): R;
+    HINCRBY(key: string, field: string, increment: number, cb?: Callback<number>): R;
+
+    /**
+     * Increment the float value of a hash field by the given amount.
+     */
+    hincrbyfloat(key: string, field: string, increment: number, cb?: Callback<number>): R;
+    HINCRBYFLOAT(key: string, field: string, increment: number, cb?: Callback<number>): R;
+
+    /**
+     * Get all the fields of a hash.
+     */
+    hkeys(key: string, cb?: Callback<string[]>): R;
+    HKEYS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Get the number of fields in a hash.
+     */
+    hlen(key: string, cb?: Callback<number>): R;
+    HLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the values of all the given hash fields.
+     */
+    hmget: OverloadedKeyCommand<string, string[], R>;
+    HMGET: OverloadedKeyCommand<string, string[], R>;
+
+    /**
+     * Set the string value of a hash field.
+     */
+    hset(key: string, field: string, value: string, cb?: Callback<number>): R;
+    HSET(key: string, field: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value of a hash field, only if the field does not exist.
+     */
+    hsetnx(key: string, field: string, value: string, cb?: Callback<number>): R;
+    HSETNX(key: string, field: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the length of the value of a hash field.
+     */
+    hstrlen(key: string, field: string, cb?: Callback<number>): R;
+    HSTRLEN(key: string, field: string, cb?: Callback<number>): R;
+
+    /**
+     * Get all the values of a hash.
+     */
+    hvals(key: string, cb?: Callback<string[]>): R;
+    HVALS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Increment the integer value of a key by one.
+     */
+    incr(key: string, cb?: Callback<string[]>): R;
+    INCR(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Increment the integer value of a key by the given amount.
+     */
+    incrby(key: string, increment: number, cb?: Callback<string[]>): R;
+    INCRBY(key: string, increment: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Increment the float value of a key by the given amount.
+     */
+    incrbyfloat(key: string, increment: number, cb?: Callback<string[]>): R;
+    INCRBYFLOAT(key: string, increment: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Find all keys matching the given pattern.
+     */
+    keys(pattern: string, cb?: Callback<string[]>): R;
+    KEYS(pattern: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Get the UNIX time stamp of the last successful save to disk.
+     */
+    lastsave(cb?: Callback<number>): R;
+    LASTSAVE(cb?: Callback<number>): R;
+
+    /**
+     * Get an element from a list by its index.
+     */
+    lindex(key: string, index: number, cb?: Callback<string>): R;
+    LINDEX(key: string, index: number, cb?: Callback<string>): R;
+
+    /**
+     * Insert an element before or after another element in a list.
+     */
+    linsert(key: string, dir: 'BEFORE' | 'AFTER', pivot: string, value: string, cb?: Callback<string>): R;
+    LINSERT(key: string, dir: 'BEFORE' | 'AFTER', pivot: string, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Get the length of a list.
+     */
+    llen(key: string, cb?: Callback<number>): R;
+    LLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove and get the first element in a list.
+     */
+    lpop(key: string, cb?: Callback<string>): R;
+    LPOP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Prepend one or multiple values to a list.
+     */
+    lpush: OverloadedKeyCommand<string, number, R>;
+    LPUSH: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Prepend a value to a list, only if the list exists.
+     */
+    lpushx(key: string, value: string, cb?: Callback<number>): R;
+    LPUSHX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Get a range of elements from a list.
+     */
+    lrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    LRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Remove elements from a list.
+     */
+    lrem(key: string, count: number, value: string, cb?: Callback<number>): R;
+    LREM(key: string, count: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value of an element in a list by its index.
+     */
+    lset(key: string, index: number, value: string, cb?: Callback<'OK'>): R;
+    LSET(key: string, index: number, value: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Trim a list to the specified range.
+     */
+    ltrim(key: string, start: number, stop: number, cb?: Callback<'OK'>): R;
+    LTRIM(key: string, start: number, stop: number, cb?: Callback<'OK'>): R;
+
+    /**
+     * Get the values of all given keys.
+     */
+    mget: OverloadedCommand<string, string[], R>;
+    MGET: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Atomically tranfer a key from a Redis instance to another one.
+     */
+    migrate: OverloadedCommand<string, boolean, R>;
+    MIGRATE: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Move a key to another database.
+     */
+    move(key: string, db: string | number): R;
+    MOVE(key: string, db: string | number): R;
+
+    /**
+     * Set multiple keys to multiple values.
+     */
+    mset: OverloadedCommand<string, boolean, R>;
+    MSET: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Set multiple keys to multiple values, only if none of the keys exist.
+     */
+    msetnx: OverloadedCommand<string, boolean, R>;
+    MSETNX: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Inspect the internals of Redis objects.
+     */
+    object: OverloadedCommand<string, any, R>;
+    OBJECT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Remove the expiration from a key.
+     */
+    persist(key: string, cb?: Callback<number>): R;
+    PERSIST(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove a key's time to live in milliseconds.
+     */
+    pexpire(key: string, milliseconds: number, cb?: Callback<number>): R;
+    PEXPIRE(key: string, milliseconds: number, cb?: Callback<number>): R;
+
+    /**
+     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
+     */
+    pexpireat(key: string, millisecondsTimestamp: number, cb?: Callback<number>): R;
+    PEXPIREAT(key: string, millisecondsTimestamp: number, cb?: Callback<number>): R;
+
+    /**
+     * Adds the specified elements to the specified HyperLogLog.
+     */
+    pfadd: OverloadedKeyCommand<string, number, R>;
+    PFADD: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
+     */
+    pfcount: OverloadedCommand<string, number, R>;
+    PFCOUNT: OverloadedCommand<string, number, R>;
+
+    /**
+     * Merge N different HyperLogLogs into a single one.
+     */
+    pfmerge: OverloadedCommand<string, boolean, R>;
+    PFMERGE: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Set the value and expiration in milliseconds of a key.
+     */
+    psetex(key: string, milliseconds: number, value: string, cb?: Callback<'OK'>): R;
+    PSETEX(key: string, milliseconds: number, value: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Inspect the state of the Pub/Sub subsytem.
+     */
+    pubsub: OverloadedCommand<string, number, R>;
+    PUBSUB: OverloadedCommand<string, number, R>;
+
+    /**
+     * Get the time to live for a key in milliseconds.
+     */
+    pttl(key: string, cb?: Callback<number>): R;
+    PTTL(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Close the connection.
+     */
+    quit(cb?: Callback<'OK'>): R;
+    QUIT(cb?: Callback<'OK'>): R;
+
+    /**
+     * Return a random key from the keyspace.
+     */
+    randomkey(cb?: Callback<string>): R;
+    RANDOMKEY(cb?: Callback<string>): R;
+
+    /**
+     * Enables read queries for a connection to a cluster slave node.
+     */
+    readonly(cb?: Callback<string>): R;
+    READONLY(cb?: Callback<string>): R;
+
+    /**
+     * Disables read queries for a connection to cluster slave node.
+     */
+    readwrite(cb?: Callback<string>): R;
+    READWRITE(cb?: Callback<string>): R;
+
+    /**
+     * Rename a key.
+     */
+    rename(key: string, newkey: string, cb?: Callback<'OK'>): R;
+    RENAME(key: string, newkey: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Rename a key, only if the new key does not exist.
+     */
+    renamenx(key: string, newkey: string, cb?: Callback<number>): R;
+    RENAMENX(key: string, newkey: string, cb?: Callback<number>): R;
+
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     */
+    restore(key: string, ttl: number, serializedValue: string, cb?: Callback<'OK'>): R;
+    RESTORE(key: string, ttl: number, serializedValue: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Return the role of the instance in the context of replication.
+     */
+    role(cb?: Callback<[string, number, Array<[string, string, string]>]>): R;
+    ROLE(cb?: Callback<[string, number, Array<[string, string, string]>]>): R;
+
+    /**
+     * Remove and get the last element in a list.
+     */
+    rpop(key: string, cb?: Callback<string>): R;
+    RPOP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Remove the last element in a list, prepend it to another list and return it.
+     */
+    rpoplpush(source: string, destination: string, cb?: Callback<string>): R;
+    RPOPLPUSH(source: string, destination: string, cb?: Callback<string>): R;
+
+    /**
+     * Append one or multiple values to a list.
+     */
+    rpush: OverloadedKeyCommand<string, number, R>;
+    RPUSH: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Append a value to a list, only if the list exists.
+     */
+    rpushx(key: string, value: string, cb?: Callback<number>): R;
+    RPUSHX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Append one or multiple members to a set.
+     */
+    sadd: OverloadedKeyCommand<string, number, R>;
+    SADD: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Synchronously save the dataset to disk.
+     */
+    save(cb?: Callback<string>): R;
+    SAVE(cb?: Callback<string>): R;
+
+    /**
+     * Get the number of members in a set.
+     */
+    scard(key: string, cb?: Callback<number>): R;
+    SCARD(key: string, cb?: Callback<number>): R;
+
+    /**
+     * DEBUG - Set the debug mode for executed scripts.
+     * EXISTS - Check existence of scripts in the script cache.
+     * FLUSH - Remove all scripts from the script cache.
+     * KILL - Kill the script currently in execution.
+     * LOAD - Load the specified Lua script into the script cache.
+     */
+    script: OverloadedCommand<string, any, R>;
+    SCRIPT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Subtract multiple sets.
+     */
+    sdiff: OverloadedCommand<string, string[], R>;
+    SDIFF: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Subtract multiple sets and store the resulting set in a key.
+     */
+    sdiffstore: OverloadedKeyCommand<string, number, R>;
+    SDIFFSTORE: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Change the selected database for the current connection.
+     */
+    select(index: number | string, cb?: Callback<string>): R;
+    SELECT(index: number | string, cb?: Callback<string>): R;
+
+    /**
+     * Set the string value of a key.
+     */
+    set(key: string, value: string, cb?: Callback<'OK'>): R;
+    set(key: string, value: string, flag: string, cb?: Callback<'OK'>): R;
+    set(key: string, value: string, mode: string, duration: number, cb?: Callback<'OK' | undefined>): R;
+    set(key: string, value: string, mode: string, duration: number, flag: string, cb?: Callback<'OK' | undefined>): R;
+    SET(key: string, value: string, cb?: Callback<'OK'>): R;
+    SET(key: string, value: string, flag: string, cb?: Callback<'OK'>): R;
+    SET(key: string, value: string, mode: string, duration: number, cb?: Callback<'OK' | undefined>): R;
+    SET(key: string, value: string, mode: string, duration: number, flag: string, cb?: Callback<'OK' | undefined>): R;
+
+    /**
+     * Sets or clears the bit at offset in the string value stored at key.
+     */
+    setbit(key: string, offset: number, value: string, cb?: Callback<number>): R;
+    SETBIT(key: string, offset: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value and expiration of a key.
+     */
+    setex(key: string, seconds: number, value: string, cb?: Callback<string>): R;
+    SETEX(key: string, seconds: number, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Set the value of a key, only if the key does not exist.
+     */
+    setnx(key: string, value: string, cb?: Callback<number>): R;
+    SETNX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Overwrite part of a string at key starting at the specified offset.
+     */
+    setrange(key: string, offset: number, value: string, cb?: Callback<number>): R;
+    SETRANGE(key: string, offset: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Synchronously save the dataset to disk and then shut down the server.
+     */
+    shutdown: OverloadedCommand<string, string, R>;
+    SHUTDOWN: OverloadedCommand<string, string, R>;
+
+    /**
+     * Intersect multiple sets.
+     */
+    sinter: OverloadedKeyCommand<string, string[], R>;
+    SINTER: OverloadedKeyCommand<string, string[], R>;
+
+    /**
+     * Intersect multiple sets and store the resulting set in a key.
+     */
+    sinterstore: OverloadedCommand<string, number, R>;
+    SINTERSTORE: OverloadedCommand<string, number, R>;
+
+    /**
+     * Determine if a given value is a member of a set.
+     */
+    sismember(key: string, member: string, cb?: Callback<number>): R;
+    SISMEMBER(key: string, member: string, cb?: Callback<number>): R;
+
+    /**
+     * Make the server a slave of another instance, or promote it as master.
+     */
+    slaveof(host: string, port: string | number, cb?: Callback<string>): R;
+    SLAVEOF(host: string, port: string | number, cb?: Callback<string>): R;
+
+    /**
+     * Manages the Redis slow queries log.
+     */
+    slowlog: OverloadedCommand<string, Array<[number, number, number, string[]]>, R>;
+    SLOWLOG: OverloadedCommand<string, Array<[number, number, number, string[]]>, R>;
+
+    /**
+     * Get all the members in a set.
+     */
+    smembers(key: string, cb?: Callback<string[]>): R;
+    SMEMBERS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Move a member from one set to another.
+     */
+    smove(source: string, destination: string, member: string, cb?: Callback<number>): R;
+    SMOVE(source: string, destination: string, member: string, cb?: Callback<number>): R;
+
+    /**
+     * Sort the elements in a list, set or sorted set.
+     */
+    sort: OverloadedCommand<string, string[], R>;
+    SORT: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Remove and return one or multiple random members from a set.
+     */
+    spop(key: string, cb?: Callback<string>): R;
+    spop(key: string, count: number, cb?: Callback<string[]>): R;
+    SPOP(key: string, cb?: Callback<string>): R;
+    SPOP(key: string, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Get one or multiple random members from a set.
+     */
+    srandmember(key: string, cb?: Callback<string>): R;
+    srandmember(key: string, count: number, cb?: Callback<string[]>): R;
+    SRANDMEMBER(key: string, cb?: Callback<string>): R;
+    SRANDMEMBER(key: string, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Remove one or more members from a set.
+     */
+    srem: OverloadedKeyCommand<string, number, R>;
+    SREM: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Get the length of the value stored in a key.
+     */
+    strlen(key: string, cb?: Callback<number>): R;
+    STRLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Add multiple sets.
+     */
+    sunion: OverloadedCommand<string, string[], R>;
+    SUNION: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Add multiple sets and store the resulting set in a key.
+     */
+    sunionstore: OverloadedCommand<string, number, R>;
+    SUNIONSTORE: OverloadedCommand<string, number, R>;
+
+    /**
+     * Internal command used for replication.
+     */
+    sync(cb?: Callback<undefined>): R;
+    SYNC(cb?: Callback<undefined>): R;
+
+    /**
+     * Return the current server time.
+     */
+    time(cb?: Callback<[string, string]>): R;
+    TIME(cb?: Callback<[string, string]>): R;
+
+    /**
+     * Get the time to live for a key.
+     */
+    ttl(key: string, cb?: Callback<number>): R;
+    TTL(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Determine the type stored at key.
+     */
+    type(key: string, cb?: Callback<string>): R;
+    TYPE(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Forget about all watched keys.
+     */
+    unwatch(cb?: Callback<'OK'>): R;
+    UNWATCH(cb?: Callback<'OK'>): R;
+
+    /**
+     * Wait for the synchronous replication of all the write commands sent in the context of the current connection.
+     */
+    wait(numslaves: number, timeout: number, cb?: Callback<number>): R;
+    WAIT(numslaves: number, timeout: number, cb?: Callback<number>): R;
+
+    /**
+     * Watch the given keys to determine execution of the MULTI/EXEC block.
+     */
+    watch: OverloadedCommand<string, 'OK', R>;
+    WATCH: OverloadedCommand<string, 'OK', R>;
+
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists.
+     */
+    zadd: OverloadedKeyCommand<string | number, number, R>;
+    ZADD: OverloadedKeyCommand<string | number, number, R>;
+
+    /**
+     * Get the number of members in a sorted set.
+     */
+    zcard(key: string, cb?: Callback<number>): R;
+    ZCARD(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Count the members in a sorted set with scores between the given values.
+     */
+    zcount(key: string, min: number | string, max: number | string, cb?: Callback<number>): R;
+    ZCOUNT(key: string, min: number | string, max: number | string, cb?: Callback<number>): R;
+
+    /**
+     * Increment the score of a member in a sorted set.
+     */
+    zincrby(key: string, increment: number, member: string, cb?: Callback<number>): R;
+    ZINCRBY(key: string, increment: number, member: string, cb?: Callback<number>): R;
+
+    /**
+     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
+     */
+    zinterstore: OverloadedCommand<string | number, number, R>;
+    ZINTERSTORE: OverloadedCommand<string | number, number, R>;
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographic range.
+     */
+    zlexcount(key: string, min: string, max: string, cb?: Callback<number>): R;
+    ZLEXCOUNT(key: string, min: string, max: string, cb?: Callback<number>): R;
+
+    /**
+     * Return a range of members in a sorted set, by index.
+     */
+    zrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    zrange(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+    ZRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    ZRANGE(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     */
+    zrangebylex(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    zrangebylex(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    ZRANGEBYLEX(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range, ordered from higher to lower strings.
+     */
+    zrevrangebylex(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    zrevrangebylex(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYLEX(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by score.
+     */
+    zrangebyscore(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Determine the index of a member in a sorted set.
+     */
+    zrank(key: string, member: string, cb?: Callback<number | void>): R;
+    ZRANK(key: string, member: string, cb?: Callback<number | void>): R;
+
+    /**
+     * Remove one or more members from a sorted set.
+     */
+    zrem: OverloadedKeyCommand<string, number, R>;
+    ZREM: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     */
+    zremrangebylex(key: string, min: string, max: string, cb?: Callback<number>): R;
+    ZREMRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     */
+    zremrangebyrank(key: string, start: number, stop: number, cb?: Callback<number>): R;
+    ZREMRANGEBYRANK(key: string, start: number, stop: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     */
+    zremrangebyscore(key: string, min: string | number, max: string | number, cb?: Callback<number>): R;
+    ZREMRANGEBYSCORE(key: string, min: string | number, max: string | number, cb?: Callback<number>): R;
+
+    /**
+     * Return a range of members in a sorted set, by index, with scores ordered from high to low.
+     */
+    zrevrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    zrevrange(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+    ZREVRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    ZREVRANGE(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     */
+    zrevrangebyscore(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Determine the index of a member in a sorted set, with scores ordered from high to low.
+     */
+    zrevrank(key: string, member: string, cb?: Callback<number | void>): R;
+    ZREVRANK(key: string, member: string, cb?: Callback<number | void>): R;
+
+    /**
+     * Get the score associated with the given member in a sorted set.
+     */
+    zscore(key: string, member: string, cb?: Callback<string>): R;
+    ZSCORE(key: string, member: string, cb?: Callback<string>): R;
+
+    /**
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
+     */
+    zunionstore: OverloadedCommand<string | number, number, R>;
+    ZUNIONSTORE: OverloadedCommand<string | number, number, R>;
+
+    /**
+     * Incrementally iterate the keys space.
+     */
+    scan: OverloadedCommand<string, [string, string[]], R>;
+    SCAN: OverloadedCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate Set elements.
+     */
+    sscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    SSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate hash fields and associated values.
+     */
+    hscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    HSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate sorted sets elements and associated scores.
+     */
+    zscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    ZSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+}
+
+export const RedisClient: {
+    new (options: ClientOpts): RedisClient;
+};
+
+export interface RedisClient extends Commands<boolean>, EventEmitter {
     connected: boolean;
+    command_queue_length: number;
+    offline_queue_length: number;
     retry_delay: number;
     retry_backoff: number;
     command_queue: any[];
     offline_queue: any[];
+    connection_id: number;
     server_info: ServerInfo;
+    stream: Duplex;
+
+    on(event: 'message', listener: (channel: string, message: string) => void): this;
+    on(event: 'pmessage', listener: (pattern: string, channel: string, message: string) => void): this;
+    on(event: 'message_buffer', listener: (channel: string, message: string) => void): this;
+    on(event: 'pmessage_buffer', listener: (pattern: string, channel: string, message: string) => void): this;
+    on(event: 'subscribe', listener: (channel: string, count: number) => void): this;
+    on(event: 'psubscribe', listener: (pattern: string, count: number) => void): this;
+    on(event: 'unsubscribe', listener: (channel: string, count: number) => void): this;
+    on(event: 'punsubscribe', listener: (pattern: string, count: number) => void): this;
+    on(event: string, listener: (...args: any[]) => void): this;
 
     /**
-     * Forcibly close the connection to the Redis server. Note that this does not wait until all replies have been parsed. If you want to exit cleanly, call client.quit()
-     *
-     * @param {boolean} flush You should set flush to true, if you are not absolutely sure you do not care about any other commands. If you set flush to false all still running commands will silently fail.
+     * Client methods.
      */
-    end(flush: boolean): void;
+
+    end(flush?: boolean): void;
     unref(): void;
 
-    /**
-     * Stop sending commands and queue the commands.
-     */
     cork(): void;
-
-    /**
-     * Resume and send the queued commands at once.
-     */
     uncork(): void;
 
-    // Low level command execution
-    send_command(command: string, ...args: any[]): boolean;
+    duplicate(options?: ClientOpts, cb?: Callback<RedisClient>): RedisClient;
 
-    // Connection (http://redis.io/commands#connection)
-    auth(password: string, callback?: ResCallbackT<any>): boolean;
-    ping(callback?: ResCallbackT<number>): boolean;
+    sendCommand(command: string, cb?: Callback<any>): boolean;
+    sendCommand(command: string, args?: any[], cb?: Callback<any>): boolean;
+    send_command(command: string, cb?: Callback<any>): boolean;
+    send_command(command: string, args?: any[], cb?: Callback<any>): boolean;
 
-    // Strings (http://redis.io/commands#strings)
-    append(key: string, value: string, callback?: ResCallbackT<number>): boolean;
-    bitcount(key: string, callback?: ResCallbackT<number>): boolean;
-    bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): boolean;
-    set(key: string, value: string, callback?: ResCallbackT<string>): boolean;
-    get(key: string, callback?: ResCallbackT<string>): boolean;
-    exists(key: string, value: string, callback?: ResCallbackT<number>): boolean;
-
-    publish(channel: string, value: any): boolean;
-    subscribe(channel: string): boolean;
-
-    /*
-     commands = set_union([
-     "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
-     "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
-     "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
-     "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
-     "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
-     "hget", "hmset", "hmget", "hincrby", "hincrbyfloat", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
-     "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
-     "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
-     "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
-     "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
+    /**
+     * Mark the start of a transaction block.
      */
+    multi(args?: Array<Array<string | number | Callback<any>>>): Multi;
+    MULTI(args?: Array<Array<string | number | Callback<any>>>): Multi;
 
-    get(args: any[], callback?: ResCallbackT<string>): boolean;
-    get(...args: any[]): boolean;
-    set(args: any[], callback?: ResCallbackT<string>): boolean;
-    set(...args: any[]): boolean;
-    setnx(args: any[], callback?: ResCallbackT<any>): boolean;
-    setnx(...args: any[]): boolean;
-    setex(args: any[], callback?: ResCallbackT<any>): boolean;
-    setex(...args: any[]): boolean;
-    append(args: any[], callback?: ResCallbackT<any>): boolean;
-    append(...args: any[]): boolean;
-    strlen(args: any[], callback?: ResCallbackT<any>): boolean;
-    strlen(...args: any[]): boolean;
-    del(args: any[], callback?: ResCallbackT<any>): boolean;
-    del(...args: any[]): boolean;
-    exists(args: any[], callback?: ResCallbackT<any>): boolean;
-    exists(...args: any[]): boolean;
-    setbit(args: any[], callback?: ResCallbackT<any>): boolean;
-    setbit(...args: any[]): boolean;
-    getbit(args: any[], callback?: ResCallbackT<any>): boolean;
-    getbit(...args: any[]): boolean;
-    setrange(args: any[], callback?: ResCallbackT<any>): boolean;
-    setrange(...args: any[]): boolean;
-    getrange(args: any[], callback?: ResCallbackT<any>): boolean;
-    getrange(...args: any[]): boolean;
-    substr(args: any[], callback?: ResCallbackT<any>): boolean;
-    substr(...args: any[]): boolean;
-    incr(args: any[], callback?: ResCallbackT<any>): boolean;
-    incr(...args: any[]): boolean;
-    decr(args: any[], callback?: ResCallbackT<any>): boolean;
-    decr(...args: any[]): boolean;
-    mget(args: any[], callback?: ResCallbackT<any>): boolean;
-    mget(...args: any[]): boolean;
-    rpush(...args: any[]): boolean;
-    lpush(args: any[], callback?: ResCallbackT<any>): boolean;
-    lpush(...args: any[]): boolean;
-    rpushx(args: any[], callback?: ResCallbackT<any>): boolean;
-    rpushx(...args: any[]): boolean;
-    lpushx(args: any[], callback?: ResCallbackT<any>): boolean;
-    lpushx(...args: any[]): boolean;
-    linsert(args: any[], callback?: ResCallbackT<any>): boolean;
-    linsert(...args: any[]): boolean;
-    rpop(args: any[], callback?: ResCallbackT<any>): boolean;
-    rpop(...args: any[]): boolean;
-    lpop(args: any[], callback?: ResCallbackT<any>): boolean;
-    lpop(...args: any[]): boolean;
-    brpop(args: any[], callback?: ResCallbackT<any>): boolean;
-    brpop(...args: any[]): boolean;
-    brpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
-    brpoplpush(...args: any[]): boolean;
-    blpop(args: any[], callback?: ResCallbackT<any>): boolean;
-    blpop(...args: any[]): boolean;
-    llen(args: any[], callback?: ResCallbackT<any>): boolean;
-    llen(...args: any[]): boolean;
-    lindex(args: any[], callback?: ResCallbackT<any>): boolean;
-    lindex(...args: any[]): boolean;
-    lset(args: any[], callback?: ResCallbackT<any>): boolean;
-    lset(...args: any[]): boolean;
-    lrange(args: any[], callback?: ResCallbackT<any>): boolean;
-    lrange(...args: any[]): boolean;
-    ltrim(args: any[], callback?: ResCallbackT<any>): boolean;
-    ltrim(...args: any[]): boolean;
-    lrem(args: any[], callback?: ResCallbackT<any>): boolean;
-    lrem(...args: any[]): boolean;
-    rpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
-    rpoplpush(...args: any[]): boolean;
-    sadd(args: any[], callback?: ResCallbackT<any>): boolean;
-    sadd(...args: any[]): boolean;
-    srem(args: any[], callback?: ResCallbackT<any>): boolean;
-    srem(...args: any[]): boolean;
-    smove(args: any[], callback?: ResCallbackT<any>): boolean;
-    smove(...args: any[]): boolean;
-    sismember(args: any[], callback?: ResCallbackT<any>): boolean;
-    sismember(...args: any[]): boolean;
-    scard(args: any[], callback?: ResCallbackT<any>): boolean;
-    scard(...args: any[]): boolean;
-    spop(args: any[], callback?: ResCallbackT<any>): boolean;
-    spop(...args: any[]): boolean;
-    srandmember(args: any[], callback?: ResCallbackT<any>): boolean;
-    srandmember(...args: any[]): boolean;
-    sinter(args: any[], callback?: ResCallbackT<any>): boolean;
-    sinter(...args: any[]): boolean;
-    sinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
-    sinterstore(...args: any[]): boolean;
-    sunion(args: any[], callback?: ResCallbackT<any>): boolean;
-    sunion(...args: any[]): boolean;
-    sunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
-    sunionstore(...args: any[]): boolean;
-    sdiff(args: any[], callback?: ResCallbackT<any>): boolean;
-    sdiff(...args: any[]): boolean;
-    sdiffstore(args: any[], callback?: ResCallbackT<any>): boolean;
-    sdiffstore(...args: any[]): boolean;
-    smembers(args: any[], callback?: ResCallbackT<any>): boolean;
-    smembers(...args: any[]): boolean;
-    zadd(args: any[], callback?: ResCallbackT<any>): boolean;
-    zadd(...args: any[]): boolean;
-    zincrby(args: any[], callback?: ResCallbackT<any>): boolean;
-    zincrby(...args: any[]): boolean;
-    zrem(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrem(...args: any[]): boolean;
-    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zremrangebyscore(...args: any[]): boolean;
-    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): boolean;
-    zremrangebyrank(...args: any[]): boolean;
-    zunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zunionstore(...args: any[]): boolean;
-    zinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zinterstore(...args: any[]): boolean;
-    zrange(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrange(...args: any[]): boolean;
-    zrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrangebyscore(...args: any[]): boolean;
-    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrevrangebyscore(...args: any[]): boolean;
-    zcount(args: any[], callback?: ResCallbackT<any>): boolean;
-    zcount(...args: any[]): boolean;
-    zrevrange(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrevrange(...args: any[]): boolean;
-    zcard(args: any[], callback?: ResCallbackT<any>): boolean;
-    zcard(...args: any[]): boolean;
-    zscore(args: any[], callback?: ResCallbackT<any>): boolean;
-    zscore(...args: any[]): boolean;
-    zrank(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrank(...args: any[]): boolean;
-    zrevrank(args: any[], callback?: ResCallbackT<any>): boolean;
-    zrevrank(...args: any[]): boolean;
-    hset(args: any[], callback?: ResCallbackT<any>): boolean;
-    hset(...args: any[]): boolean;
-    hsetnx(args: any[], callback?: ResCallbackT<any>): boolean;
-    hsetnx(...args: any[]): boolean;
-    hget(args: any[], callback?: ResCallbackT<any>): boolean;
-    hget(...args: any[]): boolean;
-    hmset(args: any[], callback?: ResCallbackT<any>): boolean;
-    hmset(key: string, hash: any, callback?: ResCallbackT<any>): boolean;
-    hmset(...args: any[]): boolean;
-    hmget(args: any[], callback?: ResCallbackT<any>): boolean;
-    hmget(...args: any[]): boolean;
-    hincrby(args: any[], callback?: ResCallbackT<any>): boolean;
-    hincrby(...args: any[]): boolean;
-    hincrbyfloat(args: any[], callback?: ResCallbackT<any>): boolean;
-    hincrbyfloat(...args: any[]): boolean;
-    hdel(args: any[], callback?: ResCallbackT<any>): boolean;
-    hdel(...args: any[]): boolean;
-    hlen(args: any[], callback?: ResCallbackT<any>): boolean;
-    hlen(...args: any[]): boolean;
-    hkeys(args: any[], callback?: ResCallbackT<any>): boolean;
-    hkeys(...args: any[]): boolean;
-    hvals(args: any[], callback?: ResCallbackT<any>): boolean;
-    hvals(...args: any[]): boolean;
-    hgetall(args: any[], callback?: ResCallbackT<any>): boolean;
-    hgetall(...args: any[]): boolean;
-    hgetall(key: string, callback?: ResCallbackT<any>): boolean;
-    hexists(args: any[], callback?: ResCallbackT<any>): boolean;
-    hexists(...args: any[]): boolean;
-    incrby(args: any[], callback?: ResCallbackT<any>): boolean;
-    incrby(...args: any[]): boolean;
-    decrby(args: any[], callback?: ResCallbackT<any>): boolean;
-    decrby(...args: any[]): boolean;
-    getset(args: any[], callback?: ResCallbackT<any>): boolean;
-    getset(...args: any[]): boolean;
-    mset(args: any[], callback?: ResCallbackT<any>): boolean;
-    mset(...args: any[]): boolean;
-    msetnx(args: any[], callback?: ResCallbackT<any>): boolean;
-    msetnx(...args: any[]): boolean;
-    randomkey(args: any[], callback?: ResCallbackT<any>): boolean;
-    randomkey(...args: any[]): boolean;
-    select(args: any[], callback?: ResCallbackT<any>): void;
-    select(...args: any[]): void;
-    move(args: any[], callback?: ResCallbackT<any>): boolean;
-    move(...args: any[]): boolean;
-    rename(args: any[], callback?: ResCallbackT<any>): boolean;
-    rename(...args: any[]): boolean;
-    renamenx(args: any[], callback?: ResCallbackT<any>): boolean;
-    renamenx(...args: any[]): boolean;
-    expire(args: any[], callback?: ResCallbackT<any>): boolean;
-    expire(...args: any[]): boolean;
-    expireat(args: any[], callback?: ResCallbackT<any>): boolean;
-    expireat(...args: any[]): boolean;
-    keys(args: any[], callback?: ResCallbackT<any>): boolean;
-    keys(...args: any[]): boolean;
-    dbsize(args: any[], callback?: ResCallbackT<any>): boolean;
-    dbsize(...args: any[]): boolean;
-    auth(args: any[], callback?: ResCallbackT<any>): void;
-    auth(...args: any[]): void;
-    ping(args: any[], callback?: ResCallbackT<any>): boolean;
-    ping(...args: any[]): boolean;
-    echo(args: any[], callback?: ResCallbackT<any>): boolean;
-    echo(...args: any[]): boolean;
-    save(args: any[], callback?: ResCallbackT<any>): boolean;
-    save(...args: any[]): boolean;
-    bgsave(args: any[], callback?: ResCallbackT<any>): boolean;
-    bgsave(...args: any[]): boolean;
-    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): boolean;
-    bgrewriteaof(...args: any[]): boolean;
-    shutdown(args: any[], callback?: ResCallbackT<any>): boolean;
-    shutdown(...args: any[]): boolean;
-    lastsave(args: any[], callback?: ResCallbackT<any>): boolean;
-    lastsave(...args: any[]): boolean;
-    type(args: any[], callback?: ResCallbackT<any>): boolean;
-    type(...args: any[]): boolean;
-    multi(args: any[], callback?: ResCallbackT<any>): Multi;
-    multi(...args: any[]): Multi;
-    exec(args: any[], callback?: ResCallbackT<any>): boolean;
-    exec(...args: any[]): boolean;
-    discard(args: any[], callback?: ResCallbackT<any>): boolean;
-    discard(...args: any[]): boolean;
-    sync(args: any[], callback?: ResCallbackT<any>): boolean;
-    sync(...args: any[]): boolean;
-    flushdb(args: any[], callback?: ResCallbackT<any>): boolean;
-    flushdb(...args: any[]): boolean;
-    flushall(args: any[], callback?: ResCallbackT<any>): boolean;
-    flushall(...args: any[]): boolean;
-    sort(args: any[], callback?: ResCallbackT<any>): boolean;
-    sort(...args: any[]): boolean;
-    info(args: any[], callback?: ResCallbackT<any>): boolean;
-    info(...args: any[]): boolean;
-    monitor(args: any[], callback?: ResCallbackT<any>): boolean;
-    monitor(...args: any[]): boolean;
-    ttl(args: any[], callback?: ResCallbackT<any>): boolean;
-    ttl(...args: any[]): boolean;
-    persist(args: any[], callback?: ResCallbackT<any>): boolean;
-    persist(...args: any[]): boolean;
-    slaveof(args: any[], callback?: ResCallbackT<any>): boolean;
-    slaveof(...args: any[]): boolean;
-    debug(args: any[], callback?: ResCallbackT<any>): boolean;
-    debug(...args: any[]): boolean;
-    config(args: any[], callback?: ResCallbackT<any>): boolean;
-    config(...args: any[]): boolean;
-    subscribe(args: any[], callback?: ResCallbackT<any>): boolean;
-    subscribe(...args: any[]): boolean;
-    unsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
-    unsubscribe(...args: any[]): boolean;
-    psubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
-    psubscribe(...args: any[]): boolean;
-    punsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
-    punsubscribe(...args: any[]): boolean;
-    publish(args: any[], callback?: ResCallbackT<any>): boolean;
-    publish(...args: any[]): boolean;
-    watch(args: any[], callback?: ResCallbackT<any>): boolean;
-    watch(...args: any[]): boolean;
-    unwatch(args: any[], callback?: ResCallbackT<any>): boolean;
-    unwatch(...args: any[]): boolean;
-    cluster(args: any[], callback?: ResCallbackT<any>): boolean;
-    cluster(...args: any[]): boolean;
-    restore(args: any[], callback?: ResCallbackT<any>): boolean;
-    restore(...args: any[]): boolean;
-    migrate(args: any[], callback?: ResCallbackT<any>): boolean;
-    migrate(...args: any[]): boolean;
-    dump(args: any[], callback?: ResCallbackT<any>): boolean;
-    dump(...args: any[]): boolean;
-    object(args: any[], callback?: ResCallbackT<any>): boolean;
-    object(...args: any[]): boolean;
-    client(args: any[], callback?: ResCallbackT<any>): boolean;
-    client(...args: any[]): boolean;
-    eval(args: any[], callback?: ResCallbackT<any>): boolean;
-    eval(...args: any[]): boolean;
-    evalsha(args: any[], callback?: ResCallbackT<any>): boolean;
-    evalsha(...args: any[]): boolean;
-    script(args: any[], callback?: ResCallbackT<any>): boolean;
-    script(...args: any[]): boolean;
-    script(key: string, callback?: ResCallbackT<any>): boolean;
-    quit(args: any[], callback?: ResCallbackT<any>): boolean;
-    quit(...args: any[]): boolean;
-    sscan(...args: any[]): boolean;
-    sscan(args: any[], callback?: ResCallbackT<any>): boolean;
-    scan(...args: any[]): boolean;
-    scan(args: any[], callback?: ResCallbackT<any>): boolean;
-    hscan(...args: any[]): boolean;
-    hscan(args: any[], callback?: ResCallbackT<any>): boolean;
-    zscan(...args: any[]): boolean;
-    zscan(args: any[], callback?: ResCallbackT<any>): boolean;
-
-    // Extras
-    duplicate(options?: any[], callback?: ResCallbackT<any>): RedisClient;
+    batch(args?: Array<Array<string | number | Callback<any>>>): Multi;
+    BATCH(args?: Array<Array<string | number | Callback<any>>>): Multi;
 }
 
-export interface Multi {
-    exec(callback?: ResCallbackT<any[]>): boolean;
+export const Multi: {
+    new (): Multi;
+};
 
-    get(args: any[], callback?: ResCallbackT<string>): Multi;
-    get(...args: any[]): Multi;
-    set(args: any[], callback?: ResCallbackT<string>): Multi;
-    set(...args: any[]): Multi;
-    setnx(args: any[], callback?: ResCallbackT<any>): Multi;
-    setnx(...args: any[]): Multi;
-    setex(args: any[], callback?: ResCallbackT<any>): Multi;
-    setex(...args: any[]): Multi;
-    append(args: any[], callback?: ResCallbackT<any>): Multi;
-    append(...args: any[]): Multi;
-    strlen(args: any[], callback?: ResCallbackT<any>): Multi;
-    strlen(...args: any[]): Multi;
-    del(args: any[], callback?: ResCallbackT<any>): Multi;
-    del(...args: any[]): Multi;
-    exists(args: any[], callback?: ResCallbackT<any>): Multi;
-    exists(...args: any[]): Multi;
-    setbit(args: any[], callback?: ResCallbackT<any>): Multi;
-    setbit(...args: any[]): Multi;
-    getbit(args: any[], callback?: ResCallbackT<any>): Multi;
-    getbit(...args: any[]): Multi;
-    setrange(args: any[], callback?: ResCallbackT<any>): Multi;
-    setrange(...args: any[]): Multi;
-    getrange(args: any[], callback?: ResCallbackT<any>): Multi;
-    getrange(...args: any[]): Multi;
-    substr(args: any[], callback?: ResCallbackT<any>): Multi;
-    substr(...args: any[]): Multi;
-    incr(args: any[], callback?: ResCallbackT<any>): Multi;
-    incr(...args: any[]): Multi;
-    decr(args: any[], callback?: ResCallbackT<any>): Multi;
-    decr(...args: any[]): Multi;
-    mget(args: any[], callback?: ResCallbackT<any>): Multi;
-    mget(...args: any[]): Multi;
-    rpush(...args: any[]): Multi;
-    lpush(args: any[], callback?: ResCallbackT<any>): Multi;
-    lpush(...args: any[]): Multi;
-    rpushx(args: any[], callback?: ResCallbackT<any>): Multi;
-    rpushx(...args: any[]): Multi;
-    lpushx(args: any[], callback?: ResCallbackT<any>): Multi;
-    lpushx(...args: any[]): Multi;
-    linsert(args: any[], callback?: ResCallbackT<any>): Multi;
-    linsert(...args: any[]): Multi;
-    rpop(args: any[], callback?: ResCallbackT<any>): Multi;
-    rpop(...args: any[]): Multi;
-    lpop(args: any[], callback?: ResCallbackT<any>): Multi;
-    lpop(...args: any[]): Multi;
-    brpop(args: any[], callback?: ResCallbackT<any>): Multi;
-    brpop(...args: any[]): Multi;
-    brpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
-    brpoplpush(...args: any[]): Multi;
-    blpop(args: any[], callback?: ResCallbackT<any>): Multi;
-    blpop(...args: any[]): Multi;
-    llen(args: any[], callback?: ResCallbackT<any>): Multi;
-    llen(...args: any[]): Multi;
-    lindex(args: any[], callback?: ResCallbackT<any>): Multi;
-    lindex(...args: any[]): Multi;
-    lset(args: any[], callback?: ResCallbackT<any>): Multi;
-    lset(...args: any[]): Multi;
-    lrange(args: any[], callback?: ResCallbackT<any>): Multi;
-    lrange(...args: any[]): Multi;
-    ltrim(args: any[], callback?: ResCallbackT<any>): Multi;
-    ltrim(...args: any[]): Multi;
-    lrem(args: any[], callback?: ResCallbackT<any>): Multi;
-    lrem(...args: any[]): Multi;
-    rpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
-    rpoplpush(...args: any[]): Multi;
-    sadd(args: any[], callback?: ResCallbackT<any>): Multi;
-    sadd(...args: any[]): Multi;
-    srem(args: any[], callback?: ResCallbackT<any>): Multi;
-    srem(...args: any[]): Multi;
-    smove(args: any[], callback?: ResCallbackT<any>): Multi;
-    smove(...args: any[]): Multi;
-    sismember(args: any[], callback?: ResCallbackT<any>): Multi;
-    sismember(...args: any[]): Multi;
-    scard(args: any[], callback?: ResCallbackT<any>): Multi;
-    scard(...args: any[]): Multi;
-    spop(args: any[], callback?: ResCallbackT<any>): Multi;
-    spop(...args: any[]): Multi;
-    srandmember(args: any[], callback?: ResCallbackT<any>): Multi;
-    srandmember(...args: any[]): Multi;
-    sinter(args: any[], callback?: ResCallbackT<any>): Multi;
-    sinter(...args: any[]): Multi;
-    sinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
-    sinterstore(...args: any[]): Multi;
-    sunion(args: any[], callback?: ResCallbackT<any>): Multi;
-    sunion(...args: any[]): Multi;
-    sunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
-    sunionstore(...args: any[]): Multi;
-    sdiff(args: any[], callback?: ResCallbackT<any>): Multi;
-    sdiff(...args: any[]): Multi;
-    sdiffstore(args: any[], callback?: ResCallbackT<any>): Multi;
-    sdiffstore(...args: any[]): Multi;
-    smembers(args: any[], callback?: ResCallbackT<any>): Multi;
-    smembers(...args: any[]): Multi;
-    zadd(args: any[], callback?: ResCallbackT<any>): Multi;
-    zadd(...args: any[]): Multi;
-    zincrby(args: any[], callback?: ResCallbackT<any>): Multi;
-    zincrby(...args: any[]): Multi;
-    zrem(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrem(...args: any[]): Multi;
-    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zremrangebyscore(...args: any[]): Multi;
-    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): Multi;
-    zremrangebyrank(...args: any[]): Multi;
-    zunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zunionstore(...args: any[]): Multi;
-    zinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zinterstore(...args: any[]): Multi;
-    zrange(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrange(...args: any[]): Multi;
-    zrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrangebyscore(...args: any[]): Multi;
-    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrevrangebyscore(...args: any[]): Multi;
-    zcount(args: any[], callback?: ResCallbackT<any>): Multi;
-    zcount(...args: any[]): Multi;
-    zrevrange(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrevrange(...args: any[]): Multi;
-    zcard(args: any[], callback?: ResCallbackT<any>): Multi;
-    zcard(...args: any[]): Multi;
-    zscore(args: any[], callback?: ResCallbackT<any>): Multi;
-    zscore(...args: any[]): Multi;
-    zrank(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrank(...args: any[]): Multi;
-    zrevrank(args: any[], callback?: ResCallbackT<any>): Multi;
-    zrevrank(...args: any[]): Multi;
-    hset(args: any[], callback?: ResCallbackT<any>): Multi;
-    hset(...args: any[]): Multi;
-    hsetnx(args: any[], callback?: ResCallbackT<any>): Multi;
-    hsetnx(...args: any[]): Multi;
-    hget(args: any[], callback?: ResCallbackT<any>): Multi;
-    hget(...args: any[]): Multi;
-    hmset(args: any[], callback?: ResCallbackT<any>): Multi;
-    hmset(key: string, hash: any, callback?: ResCallbackT<any>): Multi;
-    hmset(...args: any[]): Multi;
-    hmget(args: any[], callback?: ResCallbackT<any>): Multi;
-    hmget(...args: any[]): Multi;
-    hincrby(args: any[], callback?: ResCallbackT<any>): Multi;
-    hincrby(...args: any[]): Multi;
-    hdel(args: any[], callback?: ResCallbackT<any>): Multi;
-    hdel(...args: any[]): Multi;
-    hlen(args: any[], callback?: ResCallbackT<any>): Multi;
-    hlen(...args: any[]): Multi;
-    hkeys(args: any[], callback?: ResCallbackT<any>): Multi;
-    hkeys(...args: any[]): Multi;
-    hvals(args: any[], callback?: ResCallbackT<any>): Multi;
-    hvals(...args: any[]): Multi;
-    hgetall(args: any[], callback?: ResCallbackT<any>): Multi;
-    hgetall(...args: any[]): Multi;
-    hgetall(key: string, callback?: ResCallbackT<any>): Multi;
-    hexists(args: any[], callback?: ResCallbackT<any>): Multi;
-    hexists(...args: any[]): Multi;
-    incrby(args: any[], callback?: ResCallbackT<any>): Multi;
-    incrby(...args: any[]): Multi;
-    decrby(args: any[], callback?: ResCallbackT<any>): Multi;
-    decrby(...args: any[]): Multi;
-    getset(args: any[], callback?: ResCallbackT<any>): Multi;
-    getset(...args: any[]): Multi;
-    mset(args: any[], callback?: ResCallbackT<any>): Multi;
-    mset(...args: any[]): Multi;
-    msetnx(args: any[], callback?: ResCallbackT<any>): Multi;
-    msetnx(...args: any[]): Multi;
-    randomkey(args: any[], callback?: ResCallbackT<any>): Multi;
-    randomkey(...args: any[]): Multi;
-    select(args: any[], callback?: ResCallbackT<any>): void;
-    select(...args: any[]): Multi;
-    move(args: any[], callback?: ResCallbackT<any>): Multi;
-    move(...args: any[]): Multi;
-    rename(args: any[], callback?: ResCallbackT<any>): Multi;
-    rename(...args: any[]): Multi;
-    renamenx(args: any[], callback?: ResCallbackT<any>): Multi;
-    renamenx(...args: any[]): Multi;
-    expire(args: any[], callback?: ResCallbackT<any>): Multi;
-    expire(...args: any[]): Multi;
-    expireat(args: any[], callback?: ResCallbackT<any>): Multi;
-    expireat(...args: any[]): Multi;
-    keys(args: any[], callback?: ResCallbackT<any>): Multi;
-    keys(...args: any[]): Multi;
-    dbsize(args: any[], callback?: ResCallbackT<any>): Multi;
-    dbsize(...args: any[]): Multi;
-    auth(args: any[], callback?: ResCallbackT<any>): void;
-    auth(...args: any[]): void;
-    ping(args: any[], callback?: ResCallbackT<any>): Multi;
-    ping(...args: any[]): Multi;
-    echo(args: any[], callback?: ResCallbackT<any>): Multi;
-    echo(...args: any[]): Multi;
-    save(args: any[], callback?: ResCallbackT<any>): Multi;
-    save(...args: any[]): Multi;
-    bgsave(args: any[], callback?: ResCallbackT<any>): Multi;
-    bgsave(...args: any[]): Multi;
-    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): Multi;
-    bgrewriteaof(...args: any[]): Multi;
-    shutdown(args: any[], callback?: ResCallbackT<any>): Multi;
-    shutdown(...args: any[]): Multi;
-    lastsave(args: any[], callback?: ResCallbackT<any>): Multi;
-    lastsave(...args: any[]): Multi;
-    type(args: any[], callback?: ResCallbackT<any>): Multi;
-    type(...args: any[]): Multi;
-    multi(args: any[], callback?: ResCallbackT<any>): Multi;
-    multi(...args: any[]): Multi;
-    exec(args: any[], callback?: ResCallbackT<any>): Multi;
-    exec(...args: any[]): Multi;
-    discard(args: any[], callback?: ResCallbackT<any>): Multi;
-    discard(...args: any[]): Multi;
-    sync(args: any[], callback?: ResCallbackT<any>): Multi;
-    sync(...args: any[]): Multi;
-    flushdb(args: any[], callback?: ResCallbackT<any>): Multi;
-    flushdb(...args: any[]): Multi;
-    flushall(args: any[], callback?: ResCallbackT<any>): Multi;
-    flushall(...args: any[]): Multi;
-    sort(args: any[], callback?: ResCallbackT<any>): Multi;
-    sort(...args: any[]): Multi;
-    info(args: any[], callback?: ResCallbackT<any>): Multi;
-    info(...args: any[]): Multi;
-    monitor(args: any[], callback?: ResCallbackT<any>): Multi;
-    monitor(...args: any[]): Multi;
-    ttl(args: any[], callback?: ResCallbackT<any>): Multi;
-    ttl(...args: any[]): Multi;
-    persist(args: any[], callback?: ResCallbackT<any>): Multi;
-    persist(...args: any[]): Multi;
-    slaveof(args: any[], callback?: ResCallbackT<any>): Multi;
-    slaveof(...args: any[]): Multi;
-    debug(args: any[], callback?: ResCallbackT<any>): Multi;
-    debug(...args: any[]): Multi;
-    config(args: any[], callback?: ResCallbackT<any>): Multi;
-    config(...args: any[]): Multi;
-    subscribe(args: any[], callback?: ResCallbackT<any>): Multi;
-    subscribe(...args: any[]): Multi;
-    unsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
-    unsubscribe(...args: any[]): Multi;
-    psubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
-    psubscribe(...args: any[]): Multi;
-    punsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
-    punsubscribe(...args: any[]): Multi;
-    publish(args: any[], callback?: ResCallbackT<any>): Multi;
-    publish(...args: any[]): Multi;
-    watch(args: any[], callback?: ResCallbackT<any>): Multi;
-    watch(...args: any[]): Multi;
-    unwatch(args: any[], callback?: ResCallbackT<any>): Multi;
-    unwatch(...args: any[]): Multi;
-    cluster(args: any[], callback?: ResCallbackT<any>): Multi;
-    cluster(...args: any[]): Multi;
-    restore(args: any[], callback?: ResCallbackT<any>): Multi;
-    restore(...args: any[]): Multi;
-    migrate(args: any[], callback?: ResCallbackT<any>): Multi;
-    migrate(...args: any[]): Multi;
-    dump(args: any[], callback?: ResCallbackT<any>): Multi;
-    dump(...args: any[]): Multi;
-    object(args: any[], callback?: ResCallbackT<any>): Multi;
-    object(...args: any[]): Multi;
-    client(args: any[], callback?: ResCallbackT<any>): Multi;
-    client(...args: any[]): Multi;
-    eval(args: any[], callback?: ResCallbackT<any>): Multi;
-    eval(...args: any[]): Multi;
-    evalsha(args: any[], callback?: ResCallbackT<any>): Multi;
-    evalsha(...args: any[]): Multi;
-    quit(args: any[], callback?: ResCallbackT<any>): Multi;
-    quit(...args: any[]): Multi;
-    scan(...args: any[]): Multi;
-    scan(args: any[], callback?: ResCallbackT<any>): Multi;
-    hscan(...args: any[]): Multi;
-    hscan(args: any[], callback?: ResCallbackT<any>): Multi;
-    zscan(...args: any[]): Multi;
-    zscan(args: any[], callback?: ResCallbackT<any>): Multi;
+export interface Multi extends Commands<Multi> {
+    exec(cb?: Callback<any[]>): boolean;
+    EXEC(cb?: Callback<any[]>): boolean;
+
+    exec_atomic(cb?: Callback<any[]>): boolean;
+    EXEC_ATOMIC(cb?: Callback<any[]>): boolean;
 }
+
+export let debug_mode: boolean;
+
+export function createClient(port: number, host?: string, options?: ClientOpts): RedisClient;
+export function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
+export function createClient(redis_url: string, options?: ClientOpts): RedisClient;
+export function createClient(options?: ClientOpts): RedisClient;
+
+export function print(err: Error | void, reply: any): void;
diff --git a/types/redis/redis-tests.ts b/types/redis/redis-tests.ts
index c1908e1089..ae389d9a06 100644
--- a/types/redis/redis-tests.ts
+++ b/types/redis/redis-tests.ts
@@ -61,7 +61,7 @@ client.end(true);
 
 // Connection (http://redis.io/commands#connection)
 client.auth(str, resCallback);
-client.ping(numCallback);
+client.ping(strCallback);
 client.unref();
 
 // Strings (http://redis.io/commands#strings)
@@ -79,10 +79,10 @@ client.once(str, messageHandler);
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
 // some of the bulk methods
-client.get(args);
-client.get(args, resCallback);
-client.set(args);
-client.set(args, resCallback);
+client.get('test');
+client.get('test', resCallback);
+client.set('test', 'test');
+client.set('test', 'test', resCallback);
 client.mset(args, resCallback);
 
 client.incr(str, resCallback);
@@ -104,7 +104,7 @@ client.multi()
   .dbsize()
   .exec(resCallback);
 
-client.multi(commandArr).exec();
+client.multi([['get', 'test']]).exec();
 
 // Monitor mode
 client.monitor(resCallback);
diff --git a/types/redlock/index.d.ts b/types/redlock/index.d.ts
index 85e5882639..1e00de6ed1 100644
--- a/types/redlock/index.d.ts
+++ b/types/redlock/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mike-marcacci/node-redlock
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as redis from 'redis';
 import * as Promise from 'bluebird';
diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 7857532428..d5b825e28c 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -58,6 +58,10 @@ export type ActionFunction3<T1, T2, T3, R>  = (t1: T1, t2: T2, t3: T3) => R;
 export type ActionFunction4<T1, T2, T3, T4, R> = (t1: T1, t2: T2, t3: T3, t4: T4) => R;
 export type ActionFunctionAny<R> = (...args: any[]) => R;
 
+export function createAction(
+    actionType: string
+): ActionFunction0<Action<void>>;
+
 export function createAction<Payload>(
     actionType: string,
     payloadCreator: ActionFunction0<Payload>
@@ -85,7 +89,7 @@ export function createAction<Payload, Arg1, Arg2, Arg3, Arg4>(
 
 export function createAction<Payload>(
     actionType: string
-): ActionFunctionAny<Action<Payload>>;
+): ActionFunction1<Payload, Action<Payload>>;
 
 export function createAction<Payload, Meta>(
     actionType: string,
@@ -116,5 +120,5 @@ export function handleActions<State, Payload>(
 ): Reducer<State, Payload>;
 
 export function combineActions(
-    ...actionTypes: Array<ActionFunctions<any>>
+    ...actionTypes: Array<ActionFunctions<any> | string>
 ): Array<ActionFunctions<any>>;
diff --git a/types/redux-actions/redux-actions-tests.ts b/types/redux-actions/redux-actions-tests.ts
index f2d7cef7d1..e4c51aa662 100644
--- a/types/redux-actions/redux-actions-tests.ts
+++ b/types/redux-actions/redux-actions-tests.ts
@@ -110,8 +110,11 @@ const typedActionHandlerWithReduceMap = ReduxActions.handleAction<TypedState, Ty
 
 typedState = typedActionHandlerWithReduceMap({ value: 0 }, typedIncrementByActionWithMeta(10));
 
-const act = ReduxActions.createAction<string>('ACTION1');
-act('hello').payload === 'hello';
+const act0 = ReduxActions.createAction('ACTION0');
+act0().payload === null;
+
+const act1 = ReduxActions.createAction<string>('ACTION1');
+act1('hello').payload === 'hello';
 
 const act2 = ReduxActions.createAction('ACTION2', (s: {load: boolean}) => s);
 act2({load: true}).payload.load === true;
@@ -119,7 +122,7 @@ act2({load: true}).payload.load === true;
 const act3 = ReduxActions.createAction('ACTION3', (s: string) => ({s}));
 act3('hello').payload.s === 'hello';
 
-ReduxActions.handleAction<{ hello: string }, string>(act, (state, action) => {
+ReduxActions.handleAction<{ hello: string }, string>(act1, (state, action) => {
     return { hello: action.payload };
 }, {hello: 'greetings'});
 
@@ -131,7 +134,7 @@ ReduxActions.handleAction(act3, (state, action) => {
     return { hello: action.payload.s };
 }, {hello: 'greetings'});
 
-ReduxActions.handleAction(ReduxActions.combineActions(act, act3, act2), (state, action) => {}, 0);
+ReduxActions.handleAction(ReduxActions.combineActions(act1, act3, act2), (state, action) => {}, 0);
 
 /* can't do this until it lands in 2.2, HKTs
 ReduxActions.handleAction(act, (state, action) => {
diff --git a/types/redux-auth-wrapper/index.d.ts b/types/redux-auth-wrapper/index.d.ts
index e9b27d1481..453a4e7e02 100644
--- a/types/redux-auth-wrapper/index.d.ts
+++ b/types/redux-auth-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import { ComponentClass, StatelessComponent, ReactType } from "react";
 import { Action } from "redux";
diff --git a/types/redux-auth-wrapper/redux-auth-wrapper-tests.tsx b/types/redux-auth-wrapper/redux-auth-wrapper-tests.tsx
index c8c52335a6..e37390410e 100644
--- a/types/redux-auth-wrapper/redux-auth-wrapper-tests.tsx
+++ b/types/redux-auth-wrapper/redux-auth-wrapper-tests.tsx
@@ -21,7 +21,7 @@ const Auth = UserAuthWrapper<any, any, any>({
     wrapperDisplayName: "TestAuth"
 });
 
-export const TestAuthComponent: StatelessComponent<any> = () => {
+export const TestAuthComponent: StatelessComponent = () => {
     return (<div />);
 };
 
diff --git a/types/redux-bootstrap/index.d.ts b/types/redux-bootstrap/index.d.ts
index 60d53bb713..8a5d8b2152 100644
--- a/types/redux-bootstrap/index.d.ts
+++ b/types/redux-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/remojansen/redux-bootstrap
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import { Middleware, Reducer, Store } from "redux";
diff --git a/types/redux-devtools-dock-monitor/index.d.ts b/types/redux-devtools-dock-monitor/index.d.ts
index de90f9a36e..66461cecf5 100644
--- a/types/redux-devtools-dock-monitor/index.d.ts
+++ b/types/redux-devtools-dock-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-dock-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -66,4 +66,4 @@ interface IDockMonitorProps {
     defaultIsVisible?: boolean
 }
 
-export default class DockMonitor extends React.Component<IDockMonitorProps, any> { }
+export default class DockMonitor extends React.Component<IDockMonitorProps> { }
diff --git a/types/redux-devtools-log-monitor/index.d.ts b/types/redux-devtools-log-monitor/index.d.ts
index 32062607c2..d3cc1b25a6 100644
--- a/types/redux-devtools-log-monitor/index.d.ts
+++ b/types/redux-devtools-log-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-log-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react'
 import {ColorScheme} from 'base16'
@@ -48,4 +48,4 @@ interface ILogMonitorProps {
     expandStateRoot?: boolean
 }
 
-export default class LogMonitor extends React.Component<ILogMonitorProps, any> { }
+export default class LogMonitor extends React.Component<ILogMonitorProps> { }
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index f94239ff2e..6e51b2bf6d 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import { GenericStoreEnhancer } from 'redux';
diff --git a/types/redux-devtools/redux-devtools-tests.tsx b/types/redux-devtools/redux-devtools-tests.tsx
index 695fbe60ff..d489e9b960 100644
--- a/types/redux-devtools/redux-devtools-tests.tsx
+++ b/types/redux-devtools/redux-devtools-tests.tsx
@@ -1,25 +1,27 @@
 import * as React from 'react'
-import { compose, createStore, Reducer, Store, StoreEnhancerStoreCreator } from 'redux'
+import { compose, createStore, Reducer, Store, GenericStoreEnhancer } from 'redux'
 import { Provider } from 'react-redux'
 import { createDevTools, persistState } from 'redux-devtools'
 
 declare var reducer: Reducer<any>
 
-class DevToolsMonitor extends React.Component<any, any> {
+class DevToolsMonitor extends React.Component {
 }
 
 const DevTools = createDevTools(
   <DevToolsMonitor />
 )
 
-const finalCreateStore = compose(
+const storeEnhancer = compose(
   DevTools.instrument(),
   persistState('test-session')
-)(createStore)
+) as GenericStoreEnhancer
 
-const store: Store<any> = finalCreateStore(reducer)
+const finalCreateStore = storeEnhancer(createStore)
 
-class App extends React.Component<any, any> {
+const store = finalCreateStore(reducer)
+
+class App extends React.Component {
   render() {
     return (
       <Provider store={store}>
diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
new file mode 100644
index 0000000000..eb0b8e56c1
--- /dev/null
+++ b/types/redux-first-router/index.d.ts
@@ -0,0 +1,219 @@
+// Type definitions for redux-first-router 1.4
+// Project: https://github.com/faceyspacey/redux-first-router#readme
+// Definitions by: Valbrand <https://github.com/Valbrand>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import {
+    Dispatch,
+    Store,
+    Reducer,
+    Middleware,
+    GenericStoreEnhancer
+} from 'redux';
+
+export type Nullable<T> = T | null | undefined;
+
+export type StateGetter = () => object;
+
+export type RouteString = string;
+
+export type RouteThunk = <S>(dispatch: Dispatch<S>, getState: StateGetter) => any | Promise<any>;
+
+export interface RouteObject {
+    path: string;
+    capitalizedWords?: boolean;
+    toPath?(param: string, key?: string): string;
+    fromPath?(path: string, key?: string): string;
+    thunk?: RouteThunk;
+    navKey?: string;
+}
+
+export type Route = RouteString | RouteObject;
+
+export interface RoutesMap {
+    [key: string]: Route;
+}
+
+export interface ReceivedAction {
+    type: string;
+    payload: object;
+    meta?: object;
+    navKey?: string | null;
+}
+
+export interface HistoryData {
+    entries: Array<{ pathname: string }>;
+    index: number;
+    length: number;
+}
+
+export interface Location {
+    pathname: string;
+    type: string;
+    payload: object;
+}
+
+export interface LocationState {
+    pathname: string;
+    type: string;
+    payload: object;
+    prev: Location;
+    kind: Nullable<string>;
+    history: Nullable<HistoryData>;
+    routesMap: RoutesMap;
+    hasSSR?: boolean;
+}
+
+export interface ActionMetaLocation {
+    current: Location;
+    prev: Location;
+    kind: Nullable<string>;
+    history: Nullable<HistoryData>;
+}
+
+export interface NavigationAction {
+    type: string;
+    key?: Nullable<string>;
+    navKey?: Nullable<string>;
+    routeName?: string;
+    actions?: NavigationAction[];
+    action?: NavigationAction;
+    params?: object;
+    meta?: object;
+}
+
+export interface Meta {
+    location: ActionMetaLocation;
+    notFoundPath?: string;
+    navigation?: NavigationAction;
+}
+
+export interface Action {
+    type: string;
+    payload: object;
+    meta: Meta;
+    navKey?: string;
+}
+
+export interface HistoryLocation {
+    pathname: string;
+}
+
+export type HistoryAction = string;
+
+export type Listener = (location: HistoryLocation, action: HistoryAction) => void;
+
+export interface History {
+    listen(listener: Listener): void;
+    push(pathname: string): void;
+    replace(pathname: string): void;
+    goBack(): void;
+    goForward(): void;
+    go(n: number): void;
+    canGo(n: number): boolean;
+
+    entries: Array<{ pathname: string }>;
+    index: number;
+    length: number;
+    location: {
+        pathname: string;
+    };
+}
+
+export type ScrollBehavior = object;
+
+export interface Router {
+    getStateForActionOriginal(action: object, state: Nullable<object>): Nullable<object>;
+    getStateForAction(action: object, state: Nullable<object>): Nullable<object>;
+    getPathAndParamsForState(state: object): { path: Nullable<string>, params: Nullable<object> };
+    getActionForPathAndParams(path: string): Nullable<object>;
+}
+
+export interface Navigator {
+    router: Router;
+}
+
+export interface Navigators {
+    [key: string]: Navigator;
+}
+
+export interface NavigatorsConfig {
+    navigators: Navigators;
+    patchNavigators(navigators: Navigators): void;
+
+    actionToNavigation(
+        navigators: Navigators,
+        action: object, // TODO check this
+        navigationAction: Nullable<NavigationAction>,
+        route: Nullable<Route>
+    ): object;
+    navigationToAction<S>(
+        navigators: Navigators,
+        store: Store<S>,
+        routesMap: RoutesMap,
+        action: object
+    ): {
+        action: object,
+        navigationAction: Nullable<NavigationAction>
+    };
+}
+
+export interface Options {
+    title?: string;
+    location?: string;
+    notFoundPath?: string;
+    scrollTop?: boolean;
+    onBeforeChange?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
+    onAfterChange?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
+    onBackNext?<S>(dispatch: Dispatch<S>, getState: StateGetter): void;
+    restoreScroll?(history: History): ScrollBehavior;
+    navigators?: NavigatorsConfig;
+}
+
+export type ScrollUpdater = (performedByUser: boolean) => void;
+
+export const NOT_FOUND: string;
+
+export function actionToPath(action: ReceivedAction, routesMap: RoutesMap): string;
+
+export function back(): void;
+
+export function canGo(n: number): boolean;
+
+export function canGoBack(): boolean;
+
+export function canGoForward(): boolean;
+
+export function connectRoutes(history: History, routesMap: RoutesMap, options?: Options): {
+    reducer: Reducer<LocationState>
+    middleware: Middleware,
+    thunk<S>(store: Store<S>): Promise<Nullable<RouteThunk>>,
+    enhancer: GenericStoreEnhancer
+};
+
+export function go(n: number): void;
+
+export function history(): History;
+
+export function isLocationAction(action: any): boolean;
+
+export function next(): void;
+
+export function nextPath(): string | void;
+
+export function pathToAction(pathname: string, routesMap: RoutesMap): ReceivedAction;
+
+export function prevPath(): string | void;
+
+export function push(pathname: string): void;
+
+export function redirect(action: Action): Action;
+
+export function replace(pathname: string): void;
+
+export function scrollBehavior(): ScrollBehavior | void;
+
+export function setKind(action: Action, kind: string): Action;
+
+export function updateScroll(): void;
diff --git a/types/redux-first-router/package.json b/types/redux-first-router/package.json
new file mode 100644
index 0000000000..f31f265c53
--- /dev/null
+++ b/types/redux-first-router/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "redux": "^3.7.0"
+  }
+}
\ No newline at end of file
diff --git a/types/redux-first-router/redux-first-router-tests.ts b/types/redux-first-router/redux-first-router-tests.ts
new file mode 100644
index 0000000000..82d8d5366c
--- /dev/null
+++ b/types/redux-first-router/redux-first-router-tests.ts
@@ -0,0 +1,42 @@
+import { connectRoutes, History, LocationState, RoutesMap } from 'redux-first-router';
+import {
+  createStore,
+  applyMiddleware,
+  Middleware,
+  MiddlewareAPI,
+  Store,
+  Dispatch,
+  compose,
+  Action,
+  GenericStoreEnhancer,
+  StoreEnhancerStoreCreator
+} from 'redux';
+
+declare var console: any;
+declare var history: History;
+
+type State = LocationState;
+type StoreCreator = StoreEnhancerStoreCreator<State>;
+
+const routesMap = {
+  HOME: '/'
+};
+
+const {
+  reducer,
+  middleware,
+  enhancer
+} = connectRoutes(history, routesMap);
+
+const dumbMiddleware: Middleware = (store: MiddlewareAPI<LocationState>) => (next: Dispatch<LocationState>) => (action: Action) => {
+  next(action);
+};
+
+const composedMiddleware = applyMiddleware(middleware, dumbMiddleware);
+
+const storeEnhancer = compose<StoreCreator, StoreCreator, StoreCreator>(enhancer, composedMiddleware);
+
+const store = createStore(reducer, storeEnhancer);
+
+// $ExpectType Store<LocationState>
+store;
diff --git a/types/redux-first-router/tsconfig.json b/types/redux-first-router/tsconfig.json
new file mode 100644
index 0000000000..5a77030d83
--- /dev/null
+++ b/types/redux-first-router/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-first-router-tests.ts"
+    ]
+}
diff --git a/types/redux-first-router/tslint.json b/types/redux-first-router/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-first-router/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index a0e2a994a9..22b23ee23f 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import {
   ComponentClass,
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 3409c47842..d2439d87a6 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -101,7 +101,7 @@ export type Validator = (value: FieldValue, allValues?: any, props?: any) => any
 /**
  * Declare Field as this interface to specify the generic.
  */
-export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldProps & FieldCustomProps, {}> {
+export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldProps & FieldCustomProps> {
     /**
      * true if the current value is different from the initialized value,
      * false otherwise.
@@ -129,13 +129,13 @@ export interface GenericField<FieldCustomProps, S> extends Component<BaseFieldPr
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<WrappedFieldProps<S> & FieldCustomProps, any>;
+    getRenderedComponent(): Component<WrappedFieldProps<S> & FieldCustomProps>;
 }
 
 /**
  * The Field Instance API.
  */
-export class Field extends Component<any, {}> implements GenericField<any, any> {
+export class Field extends Component<any> implements GenericField<any, any> {
     /**
      * true if the current value is different from the initialized value,
      * false otherwise.
@@ -163,7 +163,7 @@ export class Field extends Component<any, {}> implements GenericField<any, any>
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 /**
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index a2f2f827cd..9629eecb27 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -51,7 +51,7 @@ interface BaseFieldArrayProps {
 /**
  * Declare FieldArray as this interface to specify the generics.
  */
-export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFieldArrayProps & FieldCustomProps, {}> {
+export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFieldArrayProps & FieldCustomProps> {
 
     /**
      * The name prop that you passed in.
@@ -68,13 +68,13 @@ export interface GenericFieldArray<T, FieldCustomProps> extends Component<BaseFi
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<WrappedFieldArrayProps<T> & FieldCustomProps, any>;
+    getRenderedComponent(): Component<WrappedFieldArrayProps<T> & FieldCustomProps>;
 }
 
 /**
  * The FieldArray Instance API.
  */
-export class FieldArray extends Component<any, {}> implements GenericFieldArray<any, any> {
+export class FieldArray extends Component<any> implements GenericFieldArray<any, any> {
 
     /**
      * The name prop that you passed in.
@@ -91,7 +91,7 @@ export class FieldArray extends Component<any, {}> implements GenericFieldArray<
      * provide a withRef prop, and your component must not be a stateless function
      * component.
      */
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 /**
diff --git a/types/redux-form/lib/Fields.d.ts b/types/redux-form/lib/Fields.d.ts
index d6548aeb6f..b2c210ba8c 100644
--- a/types/redux-form/lib/Fields.d.ts
+++ b/types/redux-form/lib/Fields.d.ts
@@ -56,7 +56,7 @@ interface BaseFieldsProps {
 /**
  * Declare Fields as this interface to specify the generics.
  */
-export interface GenericFields<T, FieldsCustomProps> extends Component<BaseFieldsProps & FieldsCustomProps, {}> {
+export interface GenericFields<T, FieldsCustomProps> extends Component<BaseFieldsProps & FieldsCustomProps> {
     /**
      * true if the current value of any of the fields is different from the initialized value, false otherwise.
      */
@@ -79,13 +79,13 @@ export interface GenericFields<T, FieldsCustomProps> extends Component<BaseField
      */
     values: { [name: string]: FieldValue };
 
-    getRenderedComponent(): Component<BaseFieldsProps & FieldsCustomProps, any>;
+    getRenderedComponent(): Component<BaseFieldsProps & FieldsCustomProps>;
 }
 
 /**
  * The Fields Instance API.
  */
-export class Fields extends Component<any, {}> implements GenericFields<any, any> {
+export class Fields extends Component<any> implements GenericFields<any, any> {
     /**
      * true if the current value of any of the fields is different from the initialized value, false otherwise.
      */
@@ -108,7 +108,7 @@ export class Fields extends Component<any, {}> implements GenericFields<any, any
      */
     values: { [name: string]: FieldValue };
 
-    getRenderedComponent(): Component<any, any>;
+    getRenderedComponent(): Component<any>;
 }
 
 interface WrappedFieldsProps<S> {
diff --git a/types/redux-form/lib/Form.d.ts b/types/redux-form/lib/Form.d.ts
index 062be3e1bf..9339348393 100644
--- a/types/redux-form/lib/Form.d.ts
+++ b/types/redux-form/lib/Form.d.ts
@@ -19,4 +19,4 @@ export interface FormComponentProps extends HTMLProps<HTMLFormElement> {
  * allows the surrounding redux-form-decorated component to trigger its
  * onSubmit function.
  */
-export class Form extends Component<FormComponentProps, any> {}
+export class Form extends Component<FormComponentProps> {}
diff --git a/types/redux-form/lib/FormSection.d.ts b/types/redux-form/lib/FormSection.d.ts
index 9ed6c0c9b7..9be46ebf80 100644
--- a/types/redux-form/lib/FormSection.d.ts
+++ b/types/redux-form/lib/FormSection.d.ts
@@ -12,4 +12,4 @@ interface FormSectionProps {
  * multiple forms. It does this by prefixing the name of Field, Fields and FieldArray children, at any depth,
  * with the value specified in the name prop.
  */
-export class FormSection extends Component<FormSectionProps, any> {}
+export class FormSection extends Component<FormSectionProps> {}
diff --git a/types/redux-form/lib/selectors.d.ts b/types/redux-form/lib/selectors.d.ts
index 86565a5715..fde6ff8702 100644
--- a/types/redux-form/lib/selectors.d.ts
+++ b/types/redux-form/lib/selectors.d.ts
@@ -39,6 +39,11 @@ export interface BooleanSelector {
  */
 export const getFormValues: DataSelector;
 
+/**
+ * Returns the form's fields meta data, namely touched and visited.
+ */
+export const getFormMeta: DataSelector;
+
 /**
  * Gets the form's initial values.
  */
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 798327f60c..7d3dbdd483 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -6,7 +6,7 @@ interface CustomComponentProps {
     customProp: string;
 }
 
-class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponentProps, {}> {
+class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponentProps> {
     render() {
         const {
             input,
@@ -24,7 +24,7 @@ class CustomComponent extends Component<WrappedFieldProps<any> & CustomComponent
     }
 }
 
-class CustomField extends Component<BaseFieldProps & CustomComponentProps, {}> {
+class CustomField extends Component<BaseFieldProps & CustomComponentProps> {
     render() {
         const F = Field as new () => GenericField<CustomComponentProps, any>;
         return <F component={CustomComponent} {...this.props} />;
@@ -39,7 +39,7 @@ interface FormData {
 @reduxForm<FormData, any, any>({
     form: 'myForm'
 })
-class MyForm extends Component<any, any> {
+class MyForm extends Component {
     render() {
         return (
             <div>
@@ -81,3 +81,63 @@ reduxForm({
     form: 'forceUnregisterOnMountForm',
     forceUnregisterOnUnmount: true
 });
+
+// adapted from: http://redux-form.com/6.0.0-alpha.4/examples/initializeFromState/
+
+import { connect, DispatchProp } from 'react-redux'
+const { DOM: { input } } = React
+
+interface DataShape {
+    firstName: string;
+}
+
+interface Props extends FormProps<DataShape, {}, {}> {}
+
+let InitializeFromStateFormFunction = (props: Props) => {
+    const { handleSubmit, pristine, reset, submitting } = props;
+    return (
+        <form onSubmit={handleSubmit}>
+        <div>
+            <label>First Name</label>
+            <div>
+            <Field name="firstName" component={input} type="text" placeholder="First Name"/>
+            </div>
+        </div>
+        <div>
+            <button type="submit" disabled={pristine || submitting}>Submit</button>
+            <button type="button" disabled={pristine || submitting} onClick={reset}>Undo Changes</button>
+        </div>
+        </form>
+    );
+}
+
+// Decorate with reduxForm(). It will read the initialValues prop provided by connect()
+const DecoratedInitializeFromStateFormFunction = reduxForm({
+  form: 'initializeFromState'  // a unique identifier for this form
+})(InitializeFromStateFormFunction)
+
+// You have to connect() to any reducers that you wish to connect to yourself
+const ConnectedDecoratedInitializeFromStateFormFunction = connect(
+    state => ({
+        initialValues: state.account.data // pull initial values from account reducer
+    }),
+)(DecoratedInitializeFromStateFormFunction);
+
+// React ComponentClass instead of StatelessComponent
+
+class InitializeFromStateFormClass extends React.Component<Props & DispatchProp<any>> {
+    render() {
+        return InitializeFromStateFormFunction(this.props);
+    }
+}
+
+// Decorate with reduxForm(). It will read the initialValues prop provided by connect()
+const DecoratedInitializeFromStateFormClass = reduxForm<DataShape, {}, {}>({
+    form: 'initializeFromState'  // a unique identifier for this form
+})(InitializeFromStateFormClass);
+
+// You have to connect() to any reducers that you wish to connect to yourself
+const mapStateToProps = (state: any) => ({
+    initialValues: { firstName: state.account.data.firstName }  // pull initial values from account reducer
+} as {initialValues?: Partial<DataShape>});
+const ConnectedDecoratedInitializeFromStateFormClass = connect(mapStateToProps)(DecoratedInitializeFromStateFormClass);
diff --git a/types/redux-form/v4/index.d.ts b/types/redux-form/v4/index.d.ts
index fa4cd9dbaa..7fecf00579 100644
--- a/types/redux-form/v4/index.d.ts
+++ b/types/redux-form/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Daniel Lytkin <https://github.com/aikoven>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import { Component, SyntheticEvent, FormEventHandler } from 'react';
@@ -272,7 +272,7 @@ export interface ReduxFormProps<T> {
     values?: FormData;
 }
 
-declare class ElementClass extends Component<any, any> {
+declare class ElementClass extends Component<any> {
 }
 interface ClassDecorator {
     <T extends (typeof ElementClass)>(component: T): T;
diff --git a/types/redux-form/v4/redux-form-tests.tsx b/types/redux-form/v4/redux-form-tests.tsx
index 8254caabbf..2c962460fa 100644
--- a/types/redux-form/v4/redux-form-tests.tsx
+++ b/types/redux-form/v4/redux-form-tests.tsx
@@ -8,7 +8,7 @@ import {reduxForm, reducer as reduxFormReducer, ReduxFormProps} from 'redux-form
 namespace SimpleForm {
   export const fields = ['firstName', 'lastName', 'email', 'sex', 'favoriteColor', 'employed', 'notes'];
 
-  class SimpleForm extends Component<ReduxFormProps<SimpleForm & HTMLFormElement>, void> {
+  class SimpleForm extends Component<ReduxFormProps<SimpleForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -123,7 +123,7 @@ namespace SynchronousValidation {
     return errors;
   };
 
-  class SynchronousValidationForm extends Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>, any> {
+  class SynchronousValidationForm extends Component<ReduxFormProps<SynchronousValidationForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -193,7 +193,7 @@ namespace SumbitValidation {
     });
   };
 
-  class SubmitValidationForm extends Component<ReduxFormProps<SubmitValidationForm>, any> {
+  class SubmitValidationForm extends Component<ReduxFormProps<SubmitValidationForm>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
@@ -255,7 +255,7 @@ namespace InitializingFromState {
     load: Function;
   }
 
-  class InitializingFromStateForm extends Component<Props<InitializingFromStateForm & HTMLFormElement>, any> {
+  class InitializingFromStateForm extends Component<Props<InitializingFromStateForm & HTMLFormElement>> {
     static propTypes = {
       fields: PropTypes.object.isRequired,
       handleSubmit: PropTypes.func.isRequired,
diff --git a/types/redux-immutable/index.d.ts b/types/redux-immutable/index.d.ts
index 483de7c9bf..ebebd7a84c 100644
--- a/types/redux-immutable/index.d.ts
+++ b/types/redux-immutable/index.d.ts
@@ -1,8 +1,12 @@
-// Type definitions for redux-immutable v3.0.10
+// Type definitions for redux-immutable v3.0.33
 // Project: https://github.com/gajus/redux-immutable
-// Definitions by: Pedro Pereira <https://github.com/oizie>, Sebastian Sebald <https://github.com/sebald/>
+// Definitions by: Pedro Pereira <https://github.com/oizie>
+//                 Sebastian Sebald <https://github.com/sebald/>
+//                 Gavin Gregory <https://github.com/gavingregory>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as Redux from 'redux';
+import { Collection } from 'immutable';
 
-export declare function combineReducers<S>(reducers: Redux.ReducersMapObject): Redux.Reducer<S>;
+export declare function combineReducers<S, T>(reducers: Redux.ReducersMapObject, getDefaultState?: () => Collection.Keyed<T, S>): Redux.Reducer<S>;
+export declare function combineReducers<S>(reducers: Redux.ReducersMapObject, getDefaultState?: () => Collection.Indexed<S>): Redux.Reducer<S>;
diff --git a/types/redux-immutable/package.json b/types/redux-immutable/package.json
index e52256ea90..be19181dda 100644
--- a/types/redux-immutable/package.json
+++ b/types/redux-immutable/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "redux": "^3.6.0"
+    "redux": "^3.6.0",
+    "immutable": "^3.8.1"
   }
 }
\ No newline at end of file
diff --git a/types/redux-immutable/redux-immutable-tests.ts b/types/redux-immutable/redux-immutable-tests.ts
index 8414252299..c790ce545e 100644
--- a/types/redux-immutable/redux-immutable-tests.ts
+++ b/types/redux-immutable/redux-immutable-tests.ts
@@ -1,5 +1,22 @@
 
 import { combineReducers } from 'redux-immutable';
+import { Map, List } from 'immutable';
 
-combineReducers({
-});
\ No newline at end of file
+// Dummy State interface
+interface State { };
+
+/**
+ * Combine reducers should work with only one argument (a reducers object).
+ */
+combineReducers({});
+combineReducers<State>({});
+
+/**
+ * Combine reducers should accepts a function (getDefaultState()) as a second parameter, that returns an immutable Collection.Keyed collection.
+ */
+combineReducers<State, string>({}, () => { return Map<string, State>(); });
+combineReducers<State, number>({}, () => { return Map<number, State>(); });
+/**
+ * Combine reducers should accepts a function (getDefaultState()) as a second parameter, that returns an immutable Collection.Indexed collection.
+ */
+combineReducers<State>({}, () => { return List<State>(); });
diff --git a/types/redux-infinite-scroll/index.d.ts b/types/redux-infinite-scroll/index.d.ts
new file mode 100644
index 0000000000..5ce0f552d9
--- /dev/null
+++ b/types/redux-infinite-scroll/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for redux-infinite-scroll 1.0
+// Project: https://github.com/RealScout/redux-infinite-scroll
+// Definitions by: Tony Nikolov <https://github.com/silkyfray/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Component, HTMLProps } from "react";
+
+interface InfiniteScrollerProps {
+    elementIsScrollable?: boolean;
+    containerHeight?: number | string;
+    threshold?: number;
+    hasMore?: boolean;
+    loadingMore?: boolean;
+    loader?: any;
+    showLoader?: boolean;
+    loadMore(): void;
+    items?: JSX.Element[];
+    children?: JSX.Element[];
+    holderType?: string;
+}
+
+declare class InfiniteScoller extends Component<InfiniteScrollerProps & HTMLProps<HTMLDivElement>> {}
+
+export default InfiniteScoller;
diff --git a/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx b/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx
new file mode 100644
index 0000000000..f1a90ea7ad
--- /dev/null
+++ b/types/redux-infinite-scroll/redux-infinite-scroll-tests.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import InfiniteScoller from "redux-infinite-scroll";
+
+class App extends React.Component {
+    state = {
+        numOfItems: 40,
+        loadingMore: false
+    };
+
+    _createData(numOfItems = this.state.numOfItems) {
+        const data: JSX.Element[] = [];
+        for (let i = 0; i < numOfItems; i++) {
+            data.push(
+                <div key={i} className="test-item">Item #{i}</div>
+            );
+        }
+
+        return data;
+    }
+
+    _loadMore() {
+        console.log('loading More');
+        this.setState({ loadingMore: true }, () => {
+            // CB emulates an ajax request
+            this.setState({
+                numOfItems: this.state.numOfItems + 40,
+                loadingMore: false
+            });
+        });
+    }
+
+    render() {
+        return (
+            <InfiniteScoller className="test"
+                elementIsScrollable={true}
+                loadMore={this._loadMore.bind(this)}
+                hasMore={true}
+                loadingMore={this.state.loadingMore}
+                showLoader={true}
+                threshold={50}
+                containerHeight={400}
+                items={this._createData()}
+            />
+        );
+    }
+}
+
+ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/types/redux-infinite-scroll/tsconfig.json b/types/redux-infinite-scroll/tsconfig.json
new file mode 100644
index 0000000000..4e78fdeaef
--- /dev/null
+++ b/types/redux-infinite-scroll/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [ "es6", "dom" ],
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-infinite-scroll-tests.tsx"
+
+    ]
+}
\ No newline at end of file
diff --git a/types/redux-infinite-scroll/tslint.json b/types/redux-infinite-scroll/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/redux-infinite-scroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/redux-mock-store/index.d.ts b/types/redux-mock-store/index.d.ts
index 9183423bfd..c92bb6bcb8 100644
--- a/types/redux-mock-store/index.d.ts
+++ b/types/redux-mock-store/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Redux Mock Store v0.0.6
+// Type definitions for Redux Mock Store v0.0.7
 // Project: https://github.com/arnaudbenard/redux-mock-store
 // Definitions by: Marian Palkus <https://github.com/MarianPalkus>, Cap3 <http://www.cap3.de>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -6,19 +6,18 @@
 ///<reference types="redux" />
 
 declare module 'redux-mock-store' {
-    import * as Redux from 'redux'
+    import * as Redux from 'redux';
 
-    function createMockStore<T>(middlewares?: Redux.Middleware[]): mockStore<T>;
-
-    export type mockStore<T> = (state?: T) => IStore<T>;
-
-    export interface IStore<T> {
-        dispatch(action: any): any;
-        getState(): T;
+    export interface MockStore<T> extends Redux.Store<T> {
         getActions(): any[];
         clearActions(): void;
-        subscribe(listener: Function): Function;
     }
 
-    export default createMockStore
+    export interface MockStoreCreator<T> {
+        (state?: T): MockStore<T>;
+    }
+
+    function createMockStore<T>(middlewares?: Redux.Middleware[]): MockStoreCreator<T>;
+
+    export default createMockStore;
 }
diff --git a/types/redux-mock-store/package.json b/types/redux-mock-store/package.json
index e52256ea90..1c5803bcd8 100644
--- a/types/redux-mock-store/package.json
+++ b/types/redux-mock-store/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "redux": "^3.6.0"
+    "redux": "^3.6.0",
+    "redux-mock-store": "^1.2.3"
   }
-}
\ No newline at end of file
+}
diff --git a/types/redux-mock-store/redux-mock-store-tests.ts b/types/redux-mock-store/redux-mock-store-tests.ts
index 15d51d1f23..c83207998f 100644
--- a/types/redux-mock-store/redux-mock-store-tests.ts
+++ b/types/redux-mock-store/redux-mock-store-tests.ts
@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import configureStore, {IStore} from 'redux-mock-store';
+import configureStore, { MockStore, MockStoreCreator } from 'redux-mock-store';
 
 // Redux store API tests
 // The following test are taken from ../redux/redux-tests.ts
@@ -24,11 +24,10 @@ function loggingMiddleware() {
     };
 }
 
-const storeMock = configureStore<number>([loggingMiddleware]);
+const mockStoreCreator: MockStoreCreator<number> = configureStore<number>([loggingMiddleware]);
 const initialState = 0
-let store: IStore<number>;
 
-store = storeMock(initialState);
+const store: MockStore<number> = mockStoreCreator(initialState);
 
 store.subscribe(() => {
     // ...
@@ -44,4 +43,4 @@ store.clearActions();
 
 // actions access without the need to cast
 var actions2 = store.getActions();
-actions2[10].payload.id;
\ No newline at end of file
+actions2[10].payload.id;
diff --git a/types/redux-router/index.d.ts b/types/redux-router/index.d.ts
index 0c0f0ff29b..d9dc0a5735 100644
--- a/types/redux-router/index.d.ts
+++ b/types/redux-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rackt/redux-router
 // Definitions by: Stepan Mikhaylyuk <http://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 import * as ReactRouter from 'react-router';
diff --git a/types/redux-ui/index.d.ts b/types/redux-ui/index.d.ts
index c30f3d1af9..b745ee2186 100644
--- a/types/redux-ui/index.d.ts
+++ b/types/redux-ui/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tonyhb/redux-ui
 // Definitions by: Andy Shu Xin <https://github.com/andyshuxin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 import * as Redux from 'redux';
diff --git a/types/redux-ui/redux-ui-tests.ts b/types/redux-ui/redux-ui-tests.ts
index 049c807af7..487a376f97 100644
--- a/types/redux-ui/redux-ui-tests.ts
+++ b/types/redux-ui/redux-ui-tests.ts
@@ -15,7 +15,7 @@ interface UIShape {
   mergeProps: () => ({}),
   options: {}
 })
-class Root extends React.Component<ReduxUIProps<UIShape>, {}> {
+class Root extends React.Component<ReduxUIProps<UIShape>> {
   componentWillMount() {
     console.info(
       this.props.ui.s,
diff --git a/types/request-promise-native/request-promise-native-tests.ts b/types/request-promise-native/request-promise-native-tests.ts
index d553ab3dcc..e4078ce2e9 100644
--- a/types/request-promise-native/request-promise-native-tests.ts
+++ b/types/request-promise-native/request-promise-native-tests.ts
@@ -186,7 +186,7 @@ rpn({
   uri: 'http://service.com/upload',
   multipart: [
     {
-      'content-type': 'application/json',
+      headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ foo: 'bar', _attachments: { 'message.txt': { follows: true, length: 18, content_type: 'text/plain' } } })
     },
     { body: 'I am an attachment' },
@@ -410,7 +410,7 @@ rpn(
     uri: 'http://mikeal.iriscouch.com/testjs/' + rand,
     multipart:
     [{
-      'content-type': 'application/json',
+      headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ foo: 'bar', _attachments: { 'message.txt': { follows: true, length: 18, content_type: 'text/plain' } } })
     },
     { body: 'I am an attachment' }
diff --git a/types/request-promise/errors.d.ts b/types/request-promise/errors.d.ts
new file mode 100644
index 0000000000..6f0a46113a
--- /dev/null
+++ b/types/request-promise/errors.d.ts
@@ -0,0 +1,41 @@
+import rp = require('request-promise');
+import http = require('http');
+
+export interface RequestError extends Error {
+    cause: any;
+    error: any;
+    options: rp.Options;
+    response: http.IncomingMessage;
+}
+export interface RequestErrorConstructor {
+    new (cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
+    (cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
+    prototype: RequestError;
+}
+export const RequestError: RequestErrorConstructor;
+
+export interface StatusCodeError extends Error {
+    statusCode: number;
+    error: any;
+    options: rp.Options;
+    response: http.IncomingMessage;
+}
+export interface StatusCodeErrorConstructor extends Error {
+    new (statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
+    (statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
+    prototype: StatusCodeError;
+}
+export const StatusCodeError: StatusCodeErrorConstructor;
+
+export interface TransformError extends Error {
+    cause: any;
+    error: any;
+    options: rp.Options;
+    response: http.IncomingMessage;
+}
+export interface TransformErrorConstructor extends Error {
+    new (cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
+    (cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
+    prototype: TransformError;
+}
+export const TransformError: TransformErrorConstructor;
diff --git a/types/request-promise/index.d.ts b/types/request-promise/index.d.ts
index aee9bed951..393abacbe7 100644
--- a/types/request-promise/index.d.ts
+++ b/types/request-promise/index.d.ts
@@ -1,84 +1,37 @@
-// Type definitions for request-promise v4.1.0
+// Type definitions for request-promise 4.1
 // Project: https://github.com/request/request-promise
 // Definitions by: Christopher Glantschnig <https://github.com/cglantschnig/>, Joe Skeen <http://github.com/joeskeen>, Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-declare module 'request-promise' {
-    import request = require('request');
-    import http = require('http');
-    import errors = require('request-promise/errors');
-    import Promise = require('bluebird');
+import request = require('request');
+import http = require('http');
+import errors = require('request-promise/errors');
+import Promise = require('bluebird');
 
-    namespace requestPromise {
-        interface RequestPromise extends request.Request {
-            then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-            then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-            catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
-            catch(onrejected?: (reason: any) => void): Promise<any>;
-            catch(type: errors.RequestErrorConstructor, onrejected?: (reason: errors.RequestError) => void): Promise<any>;
-            catch(type: errors.StatusCodeErrorConstructor, onrejected?: (reason: errors.StatusCodeError) => void): Promise<any>;
-            catch(type: errors.TransformErrorConstructor, onrejected?: (reason: errors.TransformError) => void): Promise<any>;
-            finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
-            finally<TResult>(handler: () => TResult): Promise<any>;
-            promise(): Promise<any>;
-            cancel(): void;
-        }
-
-        interface RequestPromiseOptions extends request.CoreOptions {
-            simple?: boolean;
-            transform?: (body: any, response: http.IncomingMessage, resolveWithFullResponse?: boolean) => any;
-            transform2xxOnly?: boolean;
-            resolveWithFullResponse?: boolean;
-        }
-
-        export type OptionsWithUri = request.UriOptions & RequestPromiseOptions;
-        export type OptionsWithUrl = request.UrlOptions & RequestPromiseOptions;
-        export type Options = OptionsWithUri | OptionsWithUrl;
+declare namespace requestPromise {
+    interface RequestPromise extends request.Request {
+        then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void | TResult | PromiseLike<TResult>): Promise<TResult>;
+        catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
+        catch(type: errors.RequestErrorConstructor, onrejected?: (reason: errors.RequestError) => void): Promise<any>;
+        catch(type: errors.StatusCodeErrorConstructor, onrejected?: (reason: errors.StatusCodeError) => void): Promise<any>;
+        catch(type: errors.TransformErrorConstructor, onrejected?: (reason: errors.TransformError) => void): Promise<any>;
+        finally<TResult>(handler: () => TResult | PromiseLike<TResult>): Promise<any>;
+        promise(): Promise<any>;
+        cancel(): void;
     }
 
-    var requestPromise: request.RequestAPI<requestPromise.RequestPromise, requestPromise.RequestPromiseOptions, request.RequiredUriUrl>;
-	export = requestPromise;
+    interface RequestPromiseOptions extends request.CoreOptions {
+        simple?: boolean;
+        transform?(body: any, response: http.IncomingMessage, resolveWithFullResponse?: boolean): any;
+        transform2xxOnly?: boolean;
+        resolveWithFullResponse?: boolean;
+    }
+
+    type OptionsWithUri = request.UriOptions & RequestPromiseOptions;
+    type OptionsWithUrl = request.UrlOptions & RequestPromiseOptions;
+    type Options = OptionsWithUri | OptionsWithUrl;
 }
-declare module 'request-promise/errors' {
-    import rp = require('request-promise');
-    import http = require('http');
 
-    export interface RequestError extends Error {
-        cause: any;
-        error: any;
-        options: rp.Options;
-        response: http.IncomingMessage;
-    }
-    export interface RequestErrorConstructor {
-        new (cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
-        (cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
-        prototype: RequestError;
-    }
-    export const RequestError: RequestErrorConstructor;
-
-    export interface StatusCodeError extends Error {
-        statusCode: number;
-        error: any;
-        options: rp.Options;
-        response: http.IncomingMessage;
-    }
-    export interface StatusCodeErrorConstructor extends Error {
-        new (statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
-        (statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
-        prototype: StatusCodeError;
-    }
-    export const StatusCodeError: StatusCodeErrorConstructor;
-
-    export interface TransformError extends Error {
-        cause: any;
-        error: any;
-        options: rp.Options;
-        response: http.IncomingMessage;
-    }
-    export interface TransformErrorConstructor extends Error {
-        new (cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
-        (cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
-        prototype: TransformError;
-    }
-    export const TransformError: TransformErrorConstructor;
-}
+declare var requestPromise: request.RequestAPI<requestPromise.RequestPromise, requestPromise.RequestPromiseOptions, request.RequiredUriUrl>;
+export = requestPromise;
diff --git a/types/request-promise/request-promise-tests.ts b/types/request-promise/request-promise-tests.ts
index d164c95c17..4aee91370b 100644
--- a/types/request-promise/request-promise-tests.ts
+++ b/types/request-promise/request-promise-tests.ts
@@ -1,12 +1,12 @@
-
 import rp = require('request-promise');
 import errors = require('request-promise/errors');
+import * as path from "path";
 
 rp('http://www.google.com')
     .then(console.dir)
     .catch(console.error);
 
-var options: rp.Options = {
+let options: rp.Options = {
     uri : 'http://posttestserver.com/post.php',
     method : 'POST',
     json: true,
@@ -56,7 +56,6 @@ rp({ uri: 'http://google.com', simple: false }).catch((reason) => {});
     // reason.response is the original response for which the transform operation failed
 }); */
 
-
 //Defaults tests
 (() => {
   const githubUrl = 'https://github.com';
@@ -79,18 +78,18 @@ options = {
 };
 
 rp(options)
-    .then(function (response: http.IncomingMessage) {
+    .then((response: http.IncomingMessage) => {
         console.log("DELETE succeeded with status %d", response.statusCode);
     })
     .catch(console.error);
-    
+
 //The following examples from https://github.com/request/request
 import fs = require('fs');
 import http = require('http');
-var request = rp;
+const request = rp;
 
-request('http://www.google.com', function (error, response, body) {
-  if (!error && response.statusCode == 200) {
+request('http://www.google.com', (error, response, body) => {
+  if (!error && response.statusCode === 200) {
     console.log(body); // Show the HTML for the Google homepage.
   }
 });
@@ -103,20 +102,20 @@ request.get('http://google.com/img.png').pipe(request.put('http://mysite.com/img
 
 request
   .get('http://google.com/img.png')
-  .on('response', function(response: any) {
+  .on('response', (response: any) => {
     console.log(response.statusCode); // 200
     console.log(response.headers['content-type']); // 'image/png'
   })
   .pipe(request.put('http://mysite.com/img.png'));
-  
+
 request
   .get('http://mysite.com/doodle.png')
-  .on('error', function(err: any) {
+  .on('error', (err: any) => {
     console.log(err);
   })
   .pipe(fs.createWriteStream('doodle.png'));
-  
-http.createServer(function (req, resp) {
+
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
     if (req.method === 'PUT') {
       req.pipe(request.put('http://mysite.com/doodle.png'));
@@ -126,32 +125,32 @@ http.createServer(function (req, resp) {
   }
 });
 
-http.createServer(function (req, resp) {
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
-    var x = request('http://mysite.com/doodle.png');
+    const x = request('http://mysite.com/doodle.png');
     req.pipe(x);
     x.pipe(resp);
   }
 });
 
-var resp: http.ServerResponse;
-var req: rp.RequestPromise;
+let  resp: http.ServerResponse;
+let req: rp.RequestPromise;
 req.pipe(request('http://mysite.com/doodle.png')).pipe(resp);
 
-var r = request;
-http.createServer(function (req, resp) {
+const r = request;
+http.createServer((req, resp) => {
   if (req.url === '/doodle.png') {
     r.get('http://google.com/doodle.png').pipe(resp);
   }
 });
 
-request.post('http://service.com/upload', {form:{key:'value'}});
+request.post('http://service.com/upload', { form: { key: 'value' } });
 // or
-request.post('http://service.com/upload').form({key:'value'});
+request.post('http://service.com/upload').form({ key: 'value' });
 // or
-request.post({url:'http://service.com/upload', form: {key:'value'}}, function(err,httpResponse,body){ /* ... */ });
+request.post({ url: 'http://service.com/upload', form: { key: 'value' } }, (err, httpResponse, body) => { /* ... */ });
 
-var data = {
+const data = {
   // Pass a simple key-value pair
   my_field: 'my_value',
   // Pass data via Buffers
@@ -167,22 +166,22 @@ var data = {
   // Use case: for some types of streams, you'll need to provide "file"-related information manually.
   // See the `form-data` README for more information about options: https://github.com/felixge/node-form-data
   custom_file: {
-    value:  fs.createReadStream('/dev/urandom'),
+    value: fs.createReadStream('/dev/urandom'),
     options: {
       filename: 'topsecret.jpg',
       contentType: 'image/jpg'
     }
   }
 };
-request.post({url:'http://service.com/upload', formData: data}, function optionalCallback(err, httpResponse, body) {
+request.post({ url: 'http://service.com/upload', formData: data }, (err, httpResponse, body) => {
   if (err) {
     return console.error('upload failed:', err);
   }
   console.log('Upload successful!  Server responded with:', body);
 });
 
-var requestMultipart = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {});
-var form = requestMultipart.form();
+const requestMultipart = request.post('http://service.com/upload', (err, httpResponse, body) =>  {});
+const form = requestMultipart.form();
 form.append('my_field', 'my_value');
 form.append('my_buffer', new Buffer([1, 2, 3]));
 form.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});
@@ -197,13 +196,13 @@ request({
       data: [
         {
           'content-type': 'application/json',
-          body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+          body: JSON.stringify({ foo: 'bar', _attachments: { 'message.txt': {follows: true, length: 18, content_type: 'text/plain' } } })
         },
         { body: 'I am an attachment' }
       ]
     }
   },
-  function (error, response, body) {
+  (error, response, body) => {
     if (error) {
       return console.error('upload failed:', error);
     }
@@ -216,43 +215,43 @@ request({
     uri: 'http://service.com/upload',
     multipart: [
       {
-        'content-type': 'application/json',
-        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, content_type: 'text/plain' }}})
       },
       { body: 'I am an attachment' },
       { body: fs.createReadStream('image.png') }
     ]
   },
-  function (error, response, body) {
+  (error, response, body) => {
     if (error) {
       return console.error('upload failed:', error);
     }
     console.log('Upload successful!  Server responded with:', body);
   });
-  
+
 request.get('http://some.server.com/').auth('username', 'password', false);
 // or
 request.get('http://some.server.com/', {
-  'auth': {
-    'user': 'username',
-    'pass': 'password',
-    'sendImmediately': false
+  auth: {
+    user: 'username',
+    pass: 'password',
+    sendImmediately: false
   }
 });
 // or
 request.get('http://some.server.com/').auth(null, null, true, 'bearerToken');
 // or
 request.get('http://some.server.com/', {
-  'auth': {
-    'bearer': 'bearerToken'
+  auth: {
+    bearer: 'bearerToken'
   }
 });
 
-var username = 'username',
-    password = 'password',
-    url = 'http://' + username + ':' + password + '@some.server.com';
+const username = 'username';
+const password = 'password';
+let url = 'http://' + username + ':' + password + '@some.server.com';
 
-request({url: url}, function (error, response, body) {
+request({ url }, (error, response, body) => {
    // Do more stuff with 'body' here
 });
 
@@ -264,8 +263,8 @@ options = {
 };
 
 function callback(error: any, response: http.IncomingMessage, body: string) {
-  if (!error && response.statusCode == 200) {
-    var info = JSON.parse(body);
+  if (!error && response.statusCode === 200) {
+    const info = JSON.parse(body);
     console.log(info.stargazers_count + " Stars");
     console.log(info.forks_count + " Forks");
   }
@@ -278,61 +277,54 @@ request(options, callback);
 import qs = require('querystring');
 const CONSUMER_KEY = 'key';
 const CONSUMER_SECRET = 'secret';
-var oauth =
-    { callback: 'http://mysite.com/callback/'
-    , consumer_key: CONSUMER_KEY
-    , consumer_secret: CONSUMER_SECRET
-    }
-  , url = 'https://api.twitter.com/oauth/request_token'
-  ;
-request.post({url:url, oauth:oauth}, function (e, r, body) {
+const oauth = { callback: 'http://mysite.com/callback/', consumer_key: CONSUMER_KEY, consumer_secret: CONSUMER_SECRET };
+url = 'https://api.twitter.com/oauth/request_token';
+request.post({ url, oauth }, (e, r, body) => {
   // Ideally, you would take the body in the response
   // and construct a URL that a user clicks on (like a sign in button).
   // The verifier is only available in the response after a user has
   // verified with twitter that they are authorizing your app.
 
   // step 2
-  var req_data = qs.parse(body);
-  var uri = 'https://api.twitter.com/oauth/authenticate'
+  const req_data = qs.parse(body);
+  const uri = 'https://api.twitter.com/oauth/authenticate'
     + '?' + qs.stringify({oauth_token: req_data.oauth_token});
   // redirect the user to the authorize uri
 
   // step 3
   // after the user is redirected back to your server
-  var auth_data: any = qs.parse(body)
-    , oauth =
-      { consumer_key: CONSUMER_KEY
-      , consumer_secret: CONSUMER_SECRET
-      , token: auth_data.oauth_token
-      , token_secret: req_data.oauth_token_secret
-      , verifier: auth_data.oauth_verifier
-      }
-    , url = 'https://api.twitter.com/oauth/access_token'
-    ;
-  request.post({url:url, oauth:oauth}, function (e, r, body) {
+  const auth_data: any = qs.parse(body);
+  const oauth = {
+    consumer_key: CONSUMER_KEY,
+    consumer_secret: CONSUMER_SECRET,
+    token: auth_data.oauth_token,
+    token_secret: req_data.oauth_token_secret,
+    verifier: auth_data.oauth_verifier,
+  };
+  const url = 'https://api.twitter.com/oauth/access_token';
+  request.post({ url, oauth }, (e, r, body) => {
     // ready to make signed requests on behalf of the user
-    var perm_data: any = qs.parse(body);
-    var oauth =
-        { consumer_key: CONSUMER_KEY
-        , consumer_secret: CONSUMER_SECRET
-        , token: perm_data.oauth_token
-        , token_secret: perm_data.oauth_token_secret
-        };
-    var url = 'https://api.twitter.com/1.1/users/show.json';
-    var query = { 
-      screen_name: perm_data.screen_name, 
+    const perm_data: any = qs.parse(body);
+    const oauth = {
+      consumer_key: CONSUMER_KEY,
+      consumer_secret: CONSUMER_SECRET,
+      token: perm_data.oauth_token,
+      token_secret: perm_data.oauth_token_secret,
+    };
+    const url = 'https://api.twitter.com/1.1/users/show.json';
+    const query = {
+      screen_name: perm_data.screen_name,
       user_id: perm_data.user_id
     };
-    request.get({url:url, oauth:oauth, qs:query, json:true}, function (e, r, user) {
+    request.get({ url, oauth, qs: query, json: true }, (e, r, user) => {
       console.log(user);
     });
   });
 });
 
-var path = require('path')
-    , certFile = path.resolve(__dirname, 'ssl/client.crt')
-    , keyFile = path.resolve(__dirname, 'ssl/client.key')
-    , caFile = path.resolve(__dirname, 'ssl/ca.cert.pem');
+let certFile = path.resolve(__dirname, 'ssl/client.crt');
+let keyFile = path.resolve(__dirname, 'ssl/client.key');
+let caFile = path.resolve(__dirname, 'ssl/ca.cert.pem');
 
 options = {
     url: 'https://api.some-server.com/',
@@ -344,9 +336,8 @@ options = {
 
 request.get(options);
 
-var path = require('path')
-    , certFile = path.resolve(__dirname, 'ssl/client.crt')
-    , keyFile = path.resolve(__dirname, 'ssl/client.key');
+certFile = path.resolve(__dirname, 'ssl/client.crt');
+keyFile = path.resolve(__dirname, 'ssl/client.key');
 
 options = {
     url: 'https://api.some-server.com/',
@@ -376,7 +367,6 @@ request.get({
     }
 });
 
-
 request({
     // will be ignored
     method: 'GET',
@@ -407,15 +397,15 @@ request({
       }
     }
   });
-  
+
 //requests using baseRequest() will set the 'x-token' header
-var baseRequest = request.defaults({
+const baseRequest = request.defaults({
   headers: {'x-token': 'my-token'}
 });
 
 //requests using specialRequest() will include the 'x-token' header set in
 //baseRequest and will also include the 'special' header
-var specialRequest = baseRequest.defaults({
+const specialRequest = baseRequest.defaults({
   headers: {special: 'special value'}
 });
 
@@ -429,7 +419,7 @@ request.cookie('key1=value1');
 request.jar();
 request.debug = true;
 
-request.get('http://10.255.255.1', {timeout: 1500}, function(err) {
+request.get('http://10.255.255.1', {timeout: 1500}, err => {
     console.log(err.code === 'ETIMEDOUT');
     // Set to `true` if the timeout was a connection timeout, `false` or
     // `undefined` otherwise.
@@ -437,80 +427,81 @@ request.get('http://10.255.255.1', {timeout: 1500}, function(err) {
     process.exit(0);
 });
 
-var rand = Math.floor(Math.random()*100000000).toString();
-  request(
-    { method: 'PUT'
-    , uri: 'http://mikeal.iriscouch.com/testjs/' + rand
-    , multipart:
-      [ { 'content-type': 'application/json'
-        ,  body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
-        }
-      , { body: 'I am an attachment' }
-      ]
-    }
-  , function (error, response, body) {
-      if(response.statusCode == 201){
-        console.log('document saved as: http://mikeal.iriscouch.com/testjs/'+ rand)
-      } else {
-        console.log('error: '+ response.statusCode)
-        console.log(body)
-      }
-    }
-  );
-  
+const rand = Math.floor(Math.random() * 100000000).toString();
 request(
-    { method: 'GET'
-    , uri: 'http://www.google.com'
-    , gzip: true
+  {
+    method: 'PUT',
+    uri: 'http://mikeal.iriscouch.com/testjs/' + rand,
+    multipart: [
+      {
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ foo: 'bar', _attachments: { 'message.txt': { follows: true, length: 18, content_type: 'text/plain' } } })
+      },
+      { body: 'I am an attachment' }
+    ]
+  }, (error, response, body) => {
+    if (response.statusCode === 201) {
+      console.log('document saved as: http://mikeal.iriscouch.com/testjs/' + rand);
+    } else {
+      console.log('error: ' + response.statusCode);
+      console.log(body);
     }
-  , function (error, response, body) {
-      // body is the decompressed response body
-      console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'))
-      console.log('the decoded data is: ' + body)
-    }
-  ).on('data', function(data: any) {
-    // decompressed data as it is received
-    console.log('decoded chunk: ' + data)
-  })
-  .on('response', function(response: http.IncomingMessage) {
-    // unmodified http.IncomingMessage object
-    response.on('data', function(data: any[]) {
-      // compressed data as it is received
-      console.log('received ' + data.length + ' bytes of compressed data')
-    })
   });
-  
-var requestWithJar = request.defaults({jar: true})
-requestWithJar('http://www.google.com', function () {
+
+request(
+  {
+    method: 'GET',
+    uri: 'http://www.google.com',
+    gzip: true
+  },
+  (error, response, body) => {
+    // body is the decompressed response body
+    console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'));
+    console.log('the decoded data is: ' + body);
+  })
+  .on('data', (data: any) => {
+    // decompressed data as it is received
+    console.log('decoded chunk: ' + data);
+  })
+  .on('response', (response: http.IncomingMessage) => {
+    // unmodified http.IncomingMessage object
+    response.on('data', (data: any[]) => {
+      // compressed data as it is received
+      console.log('received ' + data.length + ' bytes of compressed data');
+    });
+  });
+
+let requestWithJar = request.defaults({ jar: true });
+requestWithJar('http://www.google.com', () => {
   requestWithJar('http://images.google.com');
 });
 
-var j = request.jar()
-requestWithJar = request.defaults({jar:j})
-requestWithJar('http://www.google.com', function () {
+let jar = request.jar();
+requestWithJar = request.defaults({ jar });
+requestWithJar('http://www.google.com', () => {
   requestWithJar('http://images.google.com');
 });
 
-var j = request.jar();
-var cookie = request.cookie('key1=value1');
-var url = 'http://www.google.com';
-j.setCookie(cookie, url);
-request({url: url, jar: j}, function () {
+jar = request.jar();
+const cookie = request.cookie('key1=value1');
+url = 'http://www.google.com';
+jar.setCookie(cookie, url);
+request({ url, jar }, () => {
   request('http://images.google.com');
 });
 
 //TODO: add definitions for tough-cookie-filestore
-//var FileCookieStore = require('tough-cookie-filestore');
+//const FileCookieStore = require('tough-cookie-filestore');
 // NOTE - currently the 'cookies.json' file must already exist!
-//var j = request.jar(new FileCookieStore('cookies.json'));
-requestWithJar = request.defaults({ jar : j })
-request('http://www.google.com', function() {
+//const j = request.jar(new FileCookieStore('cookies.json'));
+requestWithJar = request.defaults({ jar });
+request('http://www.google.com', () => {
   request('http://images.google.com');
 });
 
-var j = request.jar()
-request({url: 'http://www.google.com', jar: j}, function () {
-  var cookie_string = j.getCookieString(url); // "key1=value1; key2=value2; ..."
-  var cookies = j.getCookies(url);
+jar = request.jar();
+request({ url: 'http://www.google.com', jar }, () => {
+  const cookie_string = jar.getCookieString(url); // "key1=value1; key2=value2; ..."
+  const cookies = jar.getCookies(url);
   // [{key: 'key1', value: 'value1', domain: "www.google.com", ...}, ...]
 });
diff --git a/types/request-promise/tsconfig.json b/types/request-promise/tsconfig.json
index fcc424c4d5..d1a446f125 100644
--- a/types/request-promise/tsconfig.json
+++ b/types/request-promise/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "index.d.ts",
+        "errors.d.ts",
         "request-promise-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/request-promise/tslint.json b/types/request-promise/tslint.json
new file mode 100644
index 0000000000..2d836b8d60
--- /dev/null
+++ b/types/request-promise/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // All are TODOs
+        "comment-format": false
+    }
+}
diff --git a/types/request/index.d.ts b/types/request/index.d.ts
index d27e2e89ed..fae6a2f65c 100644
--- a/types/request/index.d.ts
+++ b/types/request/index.d.ts
@@ -68,13 +68,42 @@ declare namespace request {
         TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
 
         defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
-        (): TRequest;
-        get(): TRequest;
-        post(): TRequest;
-        put(): TRequest;
-        head(): TRequest;
-        patch(): TRequest;
-        del(): TRequest;
+        (callback?: RequestCallback): TRequest;
+
+        get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        get(uri: string, callback?: RequestCallback): TRequest;
+        get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        get(callback?: RequestCallback): TRequest;
+
+        post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        post(uri: string, callback?: RequestCallback): TRequest;
+        post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        post(callback?: RequestCallback): TRequest;
+
+        put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        put(uri: string, callback?: RequestCallback): TRequest;
+        put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        put(callback?: RequestCallback): TRequest;
+
+        head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        head(uri: string, callback?: RequestCallback): TRequest;
+        head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        head(callback?: RequestCallback): TRequest;
+
+        patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        patch(uri: string, callback?: RequestCallback): TRequest;
+        patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        patch(callback?: RequestCallback): TRequest;
+
+        del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        del(uri: string, callback?: RequestCallback): TRequest;
+        del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        del(callback?: RequestCallback): TRequest;
+
+        delete(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        delete(uri: string, callback?: RequestCallback): TRequest;
+        delete(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        delete(callback?: RequestCallback): TRequest;
     }
 
     interface CoreOptions {
@@ -130,10 +159,7 @@ declare namespace request {
     }
     export type RequiredUriUrl = UriOptions | UrlOptions;
 
-    interface OptionalUriUrl {
-        uri?: string;
-        url?: string;
-    }
+    export type OptionalUriUrl = RequiredUriUrl | {};
 
     export type OptionsWithUri = UriOptions & CoreOptions;
     export type OptionsWithUrl = UrlOptions & CoreOptions;
diff --git a/types/request/request-tests.ts b/types/request/request-tests.ts
index 7b05a6476b..2ee98bdf1d 100644
--- a/types/request/request-tests.ts
+++ b/types/request/request-tests.ts
@@ -363,7 +363,7 @@ request({
     uri: 'http://service.com/upload',
     multipart: [
       {
-        'content-type': 'application/json',
+        headers: { 'content-type': 'application/json' },
         body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
       },
       { body: 'I am an attachment' },
@@ -600,8 +600,8 @@ var rand = Math.floor(Math.random()*100000000).toString();
     { method: 'PUT'
     , uri: 'http://mikeal.iriscouch.com/testjs/' + rand
     , multipart:
-      [ { 'content-type': 'application/json'
-        ,  body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
+      [ { headers: { 'content-type': 'application/json' }
+        , body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})
         }
       , { body: 'I am an attachment' }
       ]
@@ -693,3 +693,45 @@ request.get({
 request.get({
   uri: urlModule.parse('http://example.com')
 });
+
+var requestWithOptionalUri = request.defaults({ uri: 'http://example.com' });
+
+requestWithOptionalUri();
+
+requestWithOptionalUri({});
+
+requestWithOptionalUri({ uri: 'http://example.com' });
+
+requestWithOptionalUri({ uri: urlModule.parse('http://example.com') });
+
+requestWithOptionalUri({ url: 'http://example.com' });
+
+requestWithOptionalUri({ url: urlModule.parse('http://example.com') });
+
+requestWithOptionalUri('http://example.com');
+
+requestWithOptionalUri(function() {});
+
+requestWithOptionalUri.get();
+
+requestWithOptionalUri.get(function() {});
+
+requestWithOptionalUri.get('http://example.com');
+
+requestWithOptionalUri.get({});
+
+requestWithOptionalUri.get({
+  url: 'http://example.com'
+});
+
+requestWithOptionalUri.get({
+  uri: 'http://example.com'
+});
+
+requestWithOptionalUri.get({
+  url: urlModule.parse('http://example.com')
+});
+
+requestWithOptionalUri.get({
+  uri: urlModule.parse('http://example.com')
+});
diff --git a/types/requestretry/index.d.ts b/types/requestretry/index.d.ts
new file mode 100644
index 0000000000..50224e4e35
--- /dev/null
+++ b/types/requestretry/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for requestretry 1.12
+// Project: https://github.com/FGRibreau/node-request-retry
+// Definitions by: Eric Byers <https://github.com/EricByers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import request = require('request');
+import http = require('http');
+
+type RetryStrategy = (err: Error, response: http.IncomingMessage, body: any) => boolean;
+
+declare namespace requestRetry {
+	interface RequestAPI extends request.RequestAPI<request.Request, requestRetry.RequestRetryOptions, request.RequiredUriUrl> {
+		RetryStrategies: {
+			'HttpError': RetryStrategy;
+			'HTTPOrNetworkError': RetryStrategy;
+			'NetworkError': RetryStrategy;
+		};
+	}
+
+	interface RequestRetryOptions extends request.CoreOptions {
+		maxAttempts?: number;
+		retryDelay?: number;
+		retryStrategy?: RetryStrategy;
+	}
+}
+
+declare let requestretry: requestRetry.RequestAPI;
+export = requestretry;
diff --git a/types/requestretry/requestretry-tests.ts b/types/requestretry/requestretry-tests.ts
new file mode 100644
index 0000000000..32736d5649
--- /dev/null
+++ b/types/requestretry/requestretry-tests.ts
@@ -0,0 +1,75 @@
+import request = require('requestretry');
+import http = require('http');
+
+// HTTPOrNetworkError strategy.
+request({
+	url: 'https://api.example.com/v1/a/b',
+	json: true,
+	// The below parameters are specific to request-retry
+	// (default) try 5 times
+	maxAttempts: 5,
+	// (default) wait for 5s before trying again
+	retryDelay: 5000,
+	// (default) retry on 5xx or network errors
+	retryStrategy: request.RetryStrategies.HTTPOrNetworkError
+}, (err, response, body) => {
+	// Body.
+});
+
+// HttpError strategy.
+request({
+	url: 'https://api.example.com/v1/a/b',
+	json: true,
+	// The below parameters are specific to request-retry
+	// (default) try 5 times
+	maxAttempts: 5,
+	// (default) wait for 5s before trying again
+	retryDelay: 5000,
+	// (default) retry on 5xx or network errors
+	retryStrategy: request.RetryStrategies.HttpError
+}, (err, response, body) => {
+	// Body.
+});
+
+// NetworkError strategy.
+request({
+	url: 'https://api.example.com/v1/a/b',
+	json: true,
+	// The below parameters are specific to request-retry
+	// (default) try 5 times
+	maxAttempts: 5,
+	// (default) wait for 5s before trying again
+	retryDelay: 5000,
+	// (default) retry on 5xx or network errors
+	retryStrategy: request.RetryStrategies.NetworkError
+}, (err, response, body) => {
+	// Body.
+});
+
+// Custom strategy.
+const CustomRetryStrategy = (err: Error, response: http.IncomingMessage, body: any): boolean => {
+	// Return a boolean
+	return true;
+};
+
+request({
+	url: 'https://api.example.com/v1/a/b',
+	json: true,
+	// The below parameters are specific to request-retry
+	// (default) try 5 times
+	maxAttempts: 5,
+	// (default) wait for 5s before trying again
+	retryDelay: 5000,
+	// (default) retry on 5xx or network errors
+	retryStrategy: CustomRetryStrategy
+}, (err, response, body) => {
+	// Body.
+});
+
+// No options required
+request({
+	url: 'https://api.example.com/v1/a/b',
+	json: true
+}, (err, response, body) => {
+	// Body.
+});
diff --git a/types/requestretry/tsconfig.json b/types/requestretry/tsconfig.json
new file mode 100644
index 0000000000..aa47fddbed
--- /dev/null
+++ b/types/requestretry/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "requestretry-tests.ts"
+    ]
+}
diff --git a/types/requestretry/tslint.json b/types/requestretry/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/requestretry/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/restangular/index.d.ts b/types/restangular/index.d.ts
index 132475a2b9..5d871cdd67 100644
--- a/types/restangular/index.d.ts
+++ b/types/restangular/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mgonto/restangular
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
diff --git a/types/restify-errors/index.d.ts b/types/restify-errors/index.d.ts
index c22b4339a8..ea857233dd 100644
--- a/types/restify-errors/index.d.ts
+++ b/types/restify-errors/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.restify.com
 // Definitions by: Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import { VError, Options as vErrorOptions } from "verror";
 
@@ -36,6 +37,21 @@ export class HttpError extends VError {
     displayName: string;
 }
 
+export class DefinedHttpError extends HttpError {
+    constructor();
+
+    // tslint:disable-next-line unified-signatures
+    constructor(printf: string, ...args: any[]);
+
+    // tslint:disable-next-line unified-signatures
+    constructor(options: RestifyHttpErrorOptions, printf?: string, ...args: any[]);
+
+    // tslint:disable-next-line unified-signatures
+    constructor(priorErr: any, printf?: string, ...args: any[]);
+
+    constructor(priorErr: any, options: RestifyHttpErrorOptions, printf?: string, ...args: any[]);
+}
+
 export interface RestifyRestErrorOptions extends RestifyHttpErrorOptions {
     restCode?: string;
 }
@@ -53,67 +69,77 @@ export class RestError extends HttpError {
     restCode: string;
 }
 
+export class DefinedRestError extends RestError {
+    constructor();
+
+    // tslint:disable-next-line unified-signatures
+    constructor(printf: string, ...args: any[]);
+
+    // tslint:disable-next-line unified-signatures
+    constructor(options: RestifyHttpErrorOptions, printf?: string, ...args: any[]);
+
+    // tslint:disable-next-line unified-signatures
+    constructor(priorErr: any, printf?: string, ...args: any[]);
+
+    constructor(priorErr: any, options: RestifyHttpErrorOptions, printf?: string, ...args: any[]);
+}
+
 export function makeConstructor(name: string, defaults?: any): void;
 
 export function makeErrFromCode(statusCode: number, ...args: any[]): HttpError;
 
 export function bunyanSerializer(err: any): any;
 
-export const HttpErrors: {
-    BadRequestError: HttpError;
-    UnauthorizedError: HttpError;
-    PaymentRequiredError: HttpError;
-    ForbiddenError: HttpError;
-    NotFoundError: HttpError;
-    MethodNotAllowedError: HttpError;
-    NotAcceptableError: HttpError;
-    ProxyAuthenticationRequiredError: HttpError;
-    RequestTimeoutError: HttpError;
-    ConflictError: HttpError;
-    GoneError: HttpError;
-    LengthRequiredError: HttpError;
-    PreconditionFailedError: HttpError;
-    RequestEntityTooLargeError: HttpError;
-    RequesturiTooLargeError: HttpError;
-    UnsupportedMediaTypeError: HttpError;
-    RangeNotSatisfiableError: HttpError;
-    ExpectationFailedError: HttpError;
-    ImATeapotError: HttpError;
-    UnprocessableEntityError: HttpError;
-    LockedError: HttpError;
-    FailedDependencyError: HttpError;
-    UnorderedCollectionError: HttpError;
-    UpgradeRequiredError: HttpError;
-    PreconditionRequiredError: HttpError;
-    TooManyRequestsError: HttpError;
-    RequestHeaderFieldsTooLargeError: HttpError;
-    InternalServerError: HttpError;
-    NotImplementedError: HttpError;
-    BadGatewayError: HttpError;
-    ServiceUnavailableError: HttpError;
-    GatewayTimeoutError: HttpError;
-    HttpVersionNotSupportedError: HttpError;
-    VariantAlsoNegotiatesError: HttpError;
-    InsufficientStorageError: HttpError;
-    BandwidthLimitExceededError: HttpError;
-    NotExtendedError: HttpError;
-    NetworkAuthenticationRequiredError: HttpError;
-};
+export class BadRequestError extends DefinedHttpError { }
+export class UnauthorizedError extends DefinedHttpError { }
+export class PaymentRequiredError extends DefinedHttpError { }
+export class ForbiddenError extends DefinedHttpError { }
+export class NotFoundError extends DefinedHttpError { }
+export class MethodNotAllowedError extends DefinedHttpError { }
+export class NotAcceptableError extends DefinedHttpError { }
+export class ProxyAuthenticationRequiredError extends DefinedHttpError { }
+export class RequestTimeoutError extends DefinedHttpError { }
+export class ConflictError extends DefinedHttpError { }
+export class GoneError extends DefinedHttpError { }
+export class LengthRequiredError extends DefinedHttpError { }
+export class PreconditionFailedError extends DefinedHttpError { }
+export class RequestEntityTooLargeError extends DefinedHttpError { }
+export class RequesturiTooLargeError extends DefinedHttpError { }
+export class UnsupportedMediaTypeError extends DefinedHttpError { }
+export class RangeNotSatisfiableError extends DefinedHttpError { }
+export class ExpectationFailedError extends DefinedHttpError { }
+export class ImATeapotError extends DefinedHttpError { }
+export class UnprocessableEntityError extends DefinedHttpError { }
+export class LockedError extends DefinedHttpError { }
+export class FailedDependencyError extends DefinedHttpError { }
+export class UnorderedCollectionError extends DefinedHttpError { }
+export class UpgradeRequiredError extends DefinedHttpError { }
+export class PreconditionRequiredError extends DefinedHttpError { }
+export class TooManyRequestsError extends DefinedHttpError { }
+export class RequestHeaderFieldsTooLargeError extends DefinedHttpError { }
+export class InternalServerError extends DefinedHttpError { }
+export class NotImplementedError extends DefinedHttpError { }
+export class BadGatewayError extends DefinedHttpError { }
+export class ServiceUnavailableError extends DefinedHttpError { }
+export class GatewayTimeoutError extends DefinedHttpError { }
+export class HttpVersionNotSupportedError extends DefinedHttpError { }
+export class VariantAlsoNegotiatesError extends DefinedHttpError { }
+export class InsufficientStorageError extends DefinedHttpError { }
+export class BandwidthLimitExceededError extends DefinedHttpError { }
+export class NotExtendedError extends DefinedHttpError { }
+export class NetworkAuthenticationRequiredError extends DefinedHttpError { }
 
-export const RestErrors: {
-    BadDigestError: RestError;
-    BadMethodError: RestError;
-    InternalError: RestError;
-    InvalidArgumentError: RestError;
-    InvalidContentError: RestError;
-    InvalidCredentialsError: RestError;
-    InvalidHeaderError: RestError;
-    InvalidVersionError: RestError;
-    MissingParameterError: RestError;
-    NotAuthorizedError: RestError;
-    PreconditionFailedError: RestError;
-    RequestExpiredError: RestError;
-    RequestThrottledError: RestError;
-    ResourceNotFoundError: RestError;
-    WrongAcceptError: RestError;
-};
+export class BadDigestError extends DefinedRestError { }
+export class BadMethodError extends DefinedRestError { }
+export class InternalError extends DefinedRestError { }
+export class InvalidArgumentError extends DefinedRestError { }
+export class InvalidContentError extends DefinedRestError { }
+export class InvalidCredentialsError extends DefinedRestError { }
+export class InvalidHeaderError extends DefinedRestError { }
+export class InvalidVersionError extends DefinedRestError { }
+export class MissingParameterError extends DefinedRestError { }
+export class NotAuthorizedError extends DefinedRestError { }
+export class RequestExpiredError extends DefinedRestError { }
+export class RequestThrottledError extends DefinedRestError { }
+export class ResourceNotFoundError extends DefinedRestError { }
+export class WrongAcceptError extends DefinedRestError { }
diff --git a/types/restify-errors/restify-errors-tests.ts b/types/restify-errors/restify-errors-tests.ts
index a48044fd92..600a0545fb 100644
--- a/types/restify-errors/restify-errors-tests.ts
+++ b/types/restify-errors/restify-errors-tests.ts
@@ -24,58 +24,57 @@ const customError = restifyErrors.makeErrFromCode(500, "Testing....");
 const bunyanSerializer = restifyErrors.bunyanSerializer;
 
 // HttpErrors
-let httpError = restifyErrors.HttpErrors.BadRequestError;
-httpError = restifyErrors.HttpErrors.UnauthorizedError;
-httpError = restifyErrors.HttpErrors.PaymentRequiredError;
-httpError = restifyErrors.HttpErrors.ForbiddenError;
-httpError = restifyErrors.HttpErrors.NotFoundError;
-httpError = restifyErrors.HttpErrors.MethodNotAllowedError;
-httpError = restifyErrors.HttpErrors.NotAcceptableError;
-httpError = restifyErrors.HttpErrors.ProxyAuthenticationRequiredError;
-httpError = restifyErrors.HttpErrors.RequestTimeoutError;
-httpError = restifyErrors.HttpErrors.ConflictError;
-httpError = restifyErrors.HttpErrors.GoneError;
-httpError = restifyErrors.HttpErrors.LengthRequiredError;
-httpError = restifyErrors.HttpErrors.PreconditionFailedError;
-httpError = restifyErrors.HttpErrors.RequestEntityTooLargeError;
-httpError = restifyErrors.HttpErrors.RequesturiTooLargeError;
-httpError = restifyErrors.HttpErrors.UnsupportedMediaTypeError;
-httpError = restifyErrors.HttpErrors.RangeNotSatisfiableError;
-httpError = restifyErrors.HttpErrors.ExpectationFailedError;
-httpError = restifyErrors.HttpErrors.ImATeapotError;
-httpError = restifyErrors.HttpErrors.UnprocessableEntityError;
-httpError = restifyErrors.HttpErrors.LockedError;
-httpError = restifyErrors.HttpErrors.FailedDependencyError;
-httpError = restifyErrors.HttpErrors.UnorderedCollectionError;
-httpError = restifyErrors.HttpErrors.UpgradeRequiredError;
-httpError = restifyErrors.HttpErrors.PreconditionRequiredError;
-httpError = restifyErrors.HttpErrors.TooManyRequestsError;
-httpError = restifyErrors.HttpErrors.RequestHeaderFieldsTooLargeError;
-httpError = restifyErrors.HttpErrors.InternalServerError;
-httpError = restifyErrors.HttpErrors.NotImplementedError;
-httpError = restifyErrors.HttpErrors.BadGatewayError;
-httpError = restifyErrors.HttpErrors.ServiceUnavailableError;
-httpError = restifyErrors.HttpErrors.GatewayTimeoutError;
-httpError = restifyErrors.HttpErrors.HttpVersionNotSupportedError;
-httpError = restifyErrors.HttpErrors.VariantAlsoNegotiatesError;
-httpError = restifyErrors.HttpErrors.InsufficientStorageError;
-httpError = restifyErrors.HttpErrors.BandwidthLimitExceededError;
-httpError = restifyErrors.HttpErrors.NotExtendedError;
-httpError = restifyErrors.HttpErrors.NetworkAuthenticationRequiredError;
+let httpError = new restifyErrors.BadRequestError();
+httpError = new restifyErrors.UnauthorizedError();
+httpError = new restifyErrors.PaymentRequiredError();
+httpError = new restifyErrors.ForbiddenError();
+httpError = new restifyErrors.NotFoundError();
+httpError = new restifyErrors.MethodNotAllowedError();
+httpError = new restifyErrors.NotAcceptableError();
+httpError = new restifyErrors.ProxyAuthenticationRequiredError();
+httpError = new restifyErrors.RequestTimeoutError();
+httpError = new restifyErrors.ConflictError();
+httpError = new restifyErrors.GoneError();
+httpError = new restifyErrors.LengthRequiredError();
+httpError = new restifyErrors.PreconditionFailedError();
+httpError = new restifyErrors.RequestEntityTooLargeError();
+httpError = new restifyErrors.RequesturiTooLargeError();
+httpError = new restifyErrors.UnsupportedMediaTypeError();
+httpError = new restifyErrors.RangeNotSatisfiableError();
+httpError = new restifyErrors.ExpectationFailedError();
+httpError = new restifyErrors.ImATeapotError();
+httpError = new restifyErrors.UnprocessableEntityError();
+httpError = new restifyErrors.LockedError();
+httpError = new restifyErrors.FailedDependencyError();
+httpError = new restifyErrors.UnorderedCollectionError();
+httpError = new restifyErrors.UpgradeRequiredError();
+httpError = new restifyErrors.PreconditionRequiredError();
+httpError = new restifyErrors.TooManyRequestsError();
+httpError = new restifyErrors.RequestHeaderFieldsTooLargeError();
+httpError = new restifyErrors.InternalServerError();
+httpError = new restifyErrors.NotImplementedError();
+httpError = new restifyErrors.BadGatewayError();
+httpError = new restifyErrors.ServiceUnavailableError();
+httpError = new restifyErrors.GatewayTimeoutError();
+httpError = new restifyErrors.HttpVersionNotSupportedError();
+httpError = new restifyErrors.VariantAlsoNegotiatesError();
+httpError = new restifyErrors.InsufficientStorageError();
+httpError = new restifyErrors.BandwidthLimitExceededError();
+httpError = new restifyErrors.NotExtendedError();
+httpError = new restifyErrors.NetworkAuthenticationRequiredError();
 
 // RestErrors
-let restError = restifyErrors.RestErrors.BadDigestError;
-restError = restifyErrors.RestErrors.BadMethodError;
-restError = restifyErrors.RestErrors.InternalError;
-restError = restifyErrors.RestErrors.InvalidArgumentError;
-restError = restifyErrors.RestErrors.InvalidContentError;
-restError = restifyErrors.RestErrors.InvalidCredentialsError;
-restError = restifyErrors.RestErrors.InvalidHeaderError;
-restError = restifyErrors.RestErrors.InvalidVersionError;
-restError = restifyErrors.RestErrors.MissingParameterError;
-restError = restifyErrors.RestErrors.NotAuthorizedError;
-restError = restifyErrors.RestErrors.PreconditionFailedError;
-restError = restifyErrors.RestErrors.RequestExpiredError;
-restError = restifyErrors.RestErrors.RequestThrottledError;
-restError = restifyErrors.RestErrors.ResourceNotFoundError;
-restError = restifyErrors.RestErrors.WrongAcceptError;
+let restError = new restifyErrors.BadDigestError();
+restError = new restifyErrors.BadMethodError();
+restError = new restifyErrors.InternalError();
+restError = new restifyErrors.InvalidArgumentError();
+restError = new restifyErrors.InvalidContentError();
+restError = new restifyErrors.InvalidCredentialsError();
+restError = new restifyErrors.InvalidHeaderError();
+restError = new restifyErrors.InvalidVersionError();
+restError = new restifyErrors.MissingParameterError();
+restError = new restifyErrors.NotAuthorizedError();
+restError = new restifyErrors.RequestExpiredError();
+restError = new restifyErrors.RequestThrottledError();
+restError = new restifyErrors.ResourceNotFoundError();
+restError = new restifyErrors.WrongAcceptError();
diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 6074ce8284..a7781f933c 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mcavage/node-restify
 // Definitions by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="node" />
 
@@ -482,13 +483,14 @@ export interface Client {
     basicAuth(username: string, password: string): any;
 }
 
-export interface HttpClient extends Client {
+export interface HttpClient {
     get(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
     head(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
     post(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
     put(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
     patch(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
     del(opts?: string | { path?: string; [name: string]: any }, callback?: (err: any, req: Request) => void): any;
+    basicAuth(username: string, password: string): any;
 }
 
 export interface ThrottleOptions {
diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index f375a50fc7..c2dbf4b49b 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -13,6 +13,8 @@
 
 /// <reference types="node"/>
 
+import { ConnectionOptions as TLSConnectionOptions } from "tls";
+
 /**
  * https://rethinkdb.com/api/javascript/
  */
@@ -80,7 +82,7 @@ declare module "rethinkdb" {
     }
 
     interface Row extends Expression<any> {
-      (name: string): Expression<any>;
+        (name: string): Expression<any>;
     }
 
     /**
@@ -112,14 +114,11 @@ declare module "rethinkdb" {
          * there is only one option available, and if the `ssl` option is specified,
          * this key is required.
          */
-        ssl?: {
-          /** A list of Node.js `Buffer` objects containing SSL CA certificates */
-          ca: Buffer[];
-        };
+        ssl?: TLSConnectionOptions;
     }
 
     interface NoReplyWait {
-      noreplyWait: boolean;
+        noreplyWait: boolean;
     }
 
     interface Connection {
@@ -241,8 +240,8 @@ declare module "rethinkdb" {
 
         filter(rql: ExpressionFunction<boolean>): Sequence;
         filter(rql: Expression<boolean>): Sequence;
-        filter(obj: { [key: string]: any }): Sequence; 
-        
+        filter(obj: { [key: string]: any }): Sequence;
+
         /**
          * Turn a query into a changefeed, an infinite stream of objects representing
          * changes to the query’s results as they occur. A changefeed may return changes
@@ -346,7 +345,7 @@ declare module "rethinkdb" {
     }
 
     interface BooleanMap {
-      [ key: string ]: Boolean | BooleanMap;
+        [key: string]: Boolean | BooleanMap;
     }
 
     interface Expression<T> extends Writeable, Operation<T>, HasFields<Expression<number>> {
@@ -490,21 +489,21 @@ declare module "rethinkdb" {
     interface Sort { }
 
     interface ReqlType {
-      $reql_type$: string;
+        $reql_type$: string;
     }
 
     interface Time extends ReqlType {
-      $reql_type$: "TIME";
-      epoch_time: number;
-      timezone: string;
+        $reql_type$: "TIME";
+        epoch_time: number;
+        timezone: string;
     }
 
     interface Binary extends ReqlType {
-      $reql_type$: "BINARY";
-      data: string;
+        $reql_type$: "BINARY";
+        data: string;
     }
 
-    interface ReqlError extends Error {}
+    interface ReqlError extends Error { }
 
     /**
      * An error has occurred within the driver. This may be a driver bug, or it may
@@ -512,5 +511,5 @@ declare module "rethinkdb" {
      *
      * See https://www.rethinkdb.com/docs/error-types/
      */
-    interface ReqlDriverError extends ReqlError {}
+    interface ReqlDriverError extends ReqlError { }
 }
diff --git a/types/rewire/index.d.ts b/types/rewire/index.d.ts
index eca8d7b322..c93be54f58 100644
--- a/types/rewire/index.d.ts
+++ b/types/rewire/index.d.ts
@@ -1,36 +1,34 @@
-// Type definitions for rewire v2.5.1
+// Type definitions for rewire 2.5
 // Project: https://github.com/jhnns/rewire
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
+//                 Federico Caselli <https://github.com/CaselIT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace RewireInterfaces {
-    interface Rewire {
-        /**
-         * Returns a rewired version of the module found at filename. Use rewire() exactly like require().
-         */
-        (filename: string): RewiredModule;
-    }
-
     interface RewiredModule {
         /**
          * Takes all enumerable keys of obj as variable names and sets the values respectively. Returns a function which can be called to revert the change.
          */
-        __set__(obj: Object): Function;
+        __set__(obj: { [variable: string]: any }): () => void;
         /**
          * Sets the internal variable name to the given value. Returns a function which can be called to revert the change.
          */
-        __set__(name: string, value: any): Function;
+        __set__(name: string, value: any): () => void;
         /**
          * Returns the private variable with the given name.
          */
-        __get__(name: string): any;
+        __get__<T = any>(name: string): T;
         /**
          * Returns a function which - when being called - sets obj, executes the given callback and reverts obj. If callback returns a promise, obj is only reverted after
          * the promise has been resolved or rejected. For your convenience the returned function passes the received promise through.
          */
-        __with__(obj: Object): (callback: Function) => any;
+        __with__(obj: { [variable: string]: any }): (callback: () => any) => any;
     }
 }
 
-declare var rewire: RewireInterfaces.Rewire;
+/**
+ * Returns a rewired version of the module found at filename. Use rewire() exactly like require().
+ */
+declare function rewire<T = { [key: string]: any }>(filename: string): RewireInterfaces.RewiredModule & T;
 export = rewire;
diff --git a/types/rewire/rewire-tests.ts b/types/rewire/rewire-tests.ts
index 3815ceb873..9824cd4f5f 100644
--- a/types/rewire/rewire-tests.ts
+++ b/types/rewire/rewire-tests.ts
@@ -1,12 +1,12 @@
 import rewire = require("rewire");
 
-var myModule = rewire("../lib/myModule.js");
+const myModule = rewire("../lib/myModule.js");
 
 myModule.__set__("path", "/dev/null");
 myModule.__get__("path"); // = '/dev/null'
 
-var fsMock = {
-    readFile: function (path: string, encoding: string, cb: Function) {
+const fsMock = {
+    readFile(path: string, encoding: string, cb: (a: any, b: any) => any) {
         cb(null, "Success!");
     }
 };
@@ -19,14 +19,14 @@ myModule.__set__({
 
 myModule.__set__({
     console: {
-        log: function () { /* be quiet */ }
+        log() { /* be quiet */ }
     },
     process: {
         argv: ["testArg1", "testArg2"]
     }
 });
 
-var revert = myModule.__set__("port", 3000);
+const revert = myModule.__set__("port", 3000);
 
 // port is now 3000
 revert();
@@ -34,15 +34,15 @@ revert();
 
 myModule.__with__({
     port: 3000
-})(function () {
+})(() => {
     // within this function port is 3000
 });
 // now port is the previous value again
 
 myModule.__with__({
     port: 3000
-})(function () {
-}).then(function () {
+})(() => {
+}).then(() => {
     // now port is the previous value again
 });
 // port is still 3000 here because the promise hasn't been resolved yet
diff --git a/types/rewire/tslint.json b/types/rewire/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/rewire/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/rheostat/index.d.ts b/types/rheostat/index.d.ts
index 86312c4fb3..2943ecccc5 100644
--- a/types/rheostat/index.d.ts
+++ b/types/rheostat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/rheostat
 // Definitions by: Sasha Bayan <https://github.com/SashaBayan>, Wil Lee <https://github.com/kourge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as React from 'react';
 
diff --git a/types/riotjs/index.d.ts b/types/riotjs/index.d.ts
index e86634ad11..66e348fd80 100644
--- a/types/riotjs/index.d.ts
+++ b/types/riotjs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/moot/riotjs
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 /// <reference path="riotjs-render.d.ts" />
diff --git a/types/rison/index.d.ts b/types/rison/index.d.ts
index cfd6089fb6..d175f88832 100644
--- a/types/rison/index.d.ts
+++ b/types/rison/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/Nanonid/rison
 // Definitions by: Andrei Kurosh <https://github.com/impworks>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-
+export = rison;
+export as namespace rison;
 declare var rison: IRison;
 
 interface IRison {
@@ -54,4 +55,4 @@ interface IRison {
      * @returns {} Resulting array.
      */
     decode_array<T>(encoded: string): T[];
-}
\ No newline at end of file
+}
diff --git a/types/rivets/index.d.ts b/types/rivets/index.d.ts
index 4dbf02c128..c51ad122ea 100644
--- a/types/rivets/index.d.ts
+++ b/types/rivets/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://rivetsjs.com/
 // Definitions by: Trevor Baron <https://github.com/TrevorDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/royalslider/index.d.ts b/types/royalslider/index.d.ts
index c7fdb6f284..844e0d98ac 100644
--- a/types/royalslider/index.d.ts
+++ b/types/royalslider/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://dimsemenov.com/plugins/royal-slider/documentation/
 // Definitions by: Christiaan Rakowski <https://github.com/csrakowski/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
new file mode 100644
index 0000000000..6a56baf3fc
--- /dev/null
+++ b/types/rrc/index.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for rrc 0.10
+// Project: https://github.com/pshrmn/rrc#readme
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+import * as H from "history";
+import { RouteProps, RouteComponentProps, match as MatchObject } from "react-router-dom";
+
+export interface ScrollIntoViewProps {
+    alignToTop?: boolean;
+    id: string;
+}
+
+export class ScrollIntoView extends React.Component<ScrollIntoViewProps> { }
+
+export type PropIdCallback = () => string;
+
+export interface WithScrollOptions {
+    propId?: PropIdCallback;
+    alignToTop?: boolean;
+}
+
+export type ComponentConstructor<Props> = React.ComponentClass<Props> | React.SFC<Props>;
+
+export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | undefined>, options?: WithScrollOptions)
+    : ComponentConstructor<RouteComponentProps<any> | undefined>;
+
+export type RouteConfiguration = RouteProps & { inject?: { [key: string]: any } };
+
+export interface SwitchProps {
+    routes: RouteConfiguration[];
+    location: H.LocationDescriptorObject & { pathname: H.Pathname };
+}
+
+export class ConfigSwitch extends React.Component<SwitchProps> { }
+
+export type OnUpdateCall = (location: H.Location) => void;
+
+export interface OnUpdateProps {
+    call: OnUpdateCall;
+    immediate?: boolean;
+}
+
+export class OnUpdate extends React.Component<OnUpdateProps> { }
+
+export type IsActiveCallback = () => boolean;
+
+export interface WhenActiveOptions {
+    exact?: boolean;
+    strict?: boolean;
+    pathProp?: string;
+    className?: string;
+    style?: React.CSSProperties;
+    isActive?: IsActiveCallback;
+}
+
+export type WhenActiveReturnType<Props> = (component: ComponentConstructor<Props>) => ComponentConstructor<Props>;
+
+export function whenActive<Props>(options?: WhenActiveOptions): WhenActiveReturnType<Props>;
+
+export interface StatusProps {
+    code: string;
+}
+
+export class Status extends React.Component<StatusProps> { }
+
+export type GetKeyFunction<Params> = (match: MatchObject<Params>, route: RouteConfiguration, location: H.Location) => string;
+
+export interface WrapSwitchProps<Params> extends SwitchProps {
+    getKey?: GetKeyFunction<Params>;
+}
+
+export function wrapSwitch<WrapperProps, Params>(Wrapper: ComponentConstructor<WrapperProps>):
+    ComponentConstructor<WrapSwitchProps<Params> & WrapperProps>;
diff --git a/types/rrc/rrc-tests.tsx b/types/rrc/rrc-tests.tsx
new file mode 100644
index 0000000000..5356cb21a6
--- /dev/null
+++ b/types/rrc/rrc-tests.tsx
@@ -0,0 +1,122 @@
+import * as React from "react";
+import { Switch, Route, RouteComponentProps, BrowserRouter, Link } from "react-router-dom";
+import {
+    ScrollIntoView,
+    ConfigSwitch,
+    withScroll,
+    OnUpdate,
+    whenActive,
+    Status,
+    wrapSwitch,
+    RouteConfiguration,
+    GetKeyFunction,
+    OnUpdateCall
+} from "rrc";
+
+class RouteOne extends React.Component<RouteComponentProps<{}>> {
+    render() {
+        return <div>
+            <ConfigSwitch location={this.props.location} routes={[
+                {
+                    path: "/one/one",
+                    render: () => <ScrollIntoView alignToTop id="id">
+                        <div>Main view</div>
+                    </ScrollIntoView>
+                },
+                { path: "/one/two", render: () => <div>One two route</div> }
+            ]} />
+        </div>;
+    }
+}
+
+class RouteTwo extends React.Component<RouteComponentProps<{}>> {
+    private onUpdate: OnUpdateCall = (location) => { console.log("update"); };
+
+    render() {
+        return <div>
+            Route 2
+            <Link to={{ pathname: "/one" }}>Go to Route 1</Link>
+            <OnUpdate call={this.onUpdate} />
+        </div >;
+    }
+}
+
+interface LayoutProps {
+    title: string;
+    subtitle?: string;
+}
+
+class Layout extends React.Component<LayoutProps> {
+    render() {
+        return <div>
+            <div>{`Layout ${this.props.title}`}</div>
+            <div>
+                <span>Content</span>
+                {this.props.children}
+            </div>
+        </div>;
+    }
+}
+
+const WrappedLayout = wrapSwitch(Layout);
+
+interface Params {
+    page: number;
+}
+
+class RouteFour extends React.Component<RouteComponentProps<{}>> {
+    private routes: RouteConfiguration[] = [
+        { path: "/four/something/:page", component: RouteTwo }
+    ];
+
+    private getKey: GetKeyFunction<Params> = (match, route, location) => {
+        return "my-key-" + match.url;
+    }
+
+    render() {
+        return <div>
+            <div>
+                Route four
+            </div>
+            <div>
+                <WrappedLayout
+                    getKey={this.getKey}
+                    routes={this.routes}
+                    location={this.props.location}
+                    title="wrapped layout title"
+                />
+            </div>
+        </div>;
+    }
+}
+
+interface MyContainerProps {
+    className?: string;
+    color: number;
+}
+
+class MyContainer extends React.Component<MyContainerProps> {
+    render() {
+        return <div className={this.props.className}>
+            {this.props.children}
+        </div>;
+    }
+}
+
+const ExtendedContainer = whenActive<MyContainerProps>({ className: "active" })(MyContainer);
+
+const RouteTwoWithScroll = withScroll(RouteTwo);
+
+export const Routes =
+    <BrowserRouter>
+        <div>
+            <div>My page</div>
+            <Switch >
+                <Route path="/one" component={RouteOne} />
+                <Route path="/two" component={RouteTwoWithScroll} />
+                <Route path="/four" component={RouteFour} />
+                <Route strict path="/" render={() => <ExtendedContainer className="extended-container" color={3}>Route 3</ExtendedContainer>} />
+            </Switch>
+            <Status code="200" />
+        </div>
+    </BrowserRouter>;
diff --git a/types/rrc/tsconfig.json b/types/rrc/tsconfig.json
new file mode 100644
index 0000000000..12588363b6
--- /dev/null
+++ b/types/rrc/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rrc-tests.tsx"
+    ]
+}
diff --git a/types/rrc/tslint.json b/types/rrc/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rrc/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rsync/index.d.ts b/types/rsync/index.d.ts
index 7ec975e992..e86d22647a 100644
--- a/types/rsync/index.d.ts
+++ b/types/rsync/index.d.ts
@@ -48,7 +48,9 @@ interface Rsync {
         stdout: StreamDataHandler,
         stderr: StreamDataHandler
     ): child_process.ChildProcess;
-
+    
+    // cwd
+    cwd(cwd: string): string;
 
     // option shorthands
     shell(shell: string): Rsync;
diff --git a/types/rx-angular/index.d.ts b/types/rx-angular/index.d.ts
index f709bba81b..493f30963b 100644
--- a/types/rx-angular/index.d.ts
+++ b/types/rx-angular/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://reactivex.io/
 // Definitions by: Mick Delaney <https://github.com/mickdelaney/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 /// <reference types="rx" />
diff --git a/types/rx-core-binding/index.d.ts b/types/rx-core-binding/index.d.ts
index e8ba93bd3a..3b7cf59369 100644
--- a/types/rx-core-binding/index.d.ts
+++ b/types/rx-core-binding/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Carl de Billy <http://carl.debilly.net/>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-core"/>
+/// <reference types="rx-core" />
 
 declare namespace Rx {
     interface ISubject<T> extends Observable<T>, Observer<T>, IDisposable {
diff --git a/types/rx-jquery/index.d.ts b/types/rx-jquery/index.d.ts
index 912af6f5da..43f70d8b5d 100644
--- a/types/rx-jquery/index.d.ts
+++ b/types/rx-jquery/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Reactive-Extensions/RxJS-jQuery/
 // Definitions by: Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery"/>
 ///<reference types="rx"/>
@@ -63,4 +64,4 @@ interface JQuery {
 
 declare module "rx-jquery" {
 	export = Rx;
-}
\ No newline at end of file
+}
diff --git a/types/rx-lite-aggregates/index.d.ts b/types/rx-lite-aggregates/index.d.ts
index 72c2ae402f..2b2ce8d6b7 100644
--- a/types/rx-lite-aggregates/index.d.ts
+++ b/types/rx-lite-aggregates/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Carl de Billy <http://carl.debilly.net/>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite" />
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface Observable<T> {
diff --git a/types/rx-lite-async/index.d.ts b/types/rx-lite-async/index.d.ts
index 94117a1562..8979b9dd36 100644
--- a/types/rx-lite-async/index.d.ts
+++ b/types/rx-lite-async/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: zoetrope <https://github.com/zoetrope>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite" />
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface ObservableStatic {
diff --git a/types/rx-lite-backpressure/index.d.ts b/types/rx-lite-backpressure/index.d.ts
index fa997f03c6..73e9f2e8d1 100644
--- a/types/rx-lite-backpressure/index.d.ts
+++ b/types/rx-lite-backpressure/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite"/>
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface Observable<T> {
diff --git a/types/rx-lite-coincidence/index.d.ts b/types/rx-lite-coincidence/index.d.ts
index 3682126071..7649b234be 100644
--- a/types/rx-lite-coincidence/index.d.ts
+++ b/types/rx-lite-coincidence/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Carl de Billy <http://carl.debilly.net/>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite" />
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface Observable<T> {
diff --git a/types/rx-lite-time/index.d.ts b/types/rx-lite-time/index.d.ts
index e5abaf3832..e1cf93dc07 100644
--- a/types/rx-lite-time/index.d.ts
+++ b/types/rx-lite-time/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Carl de Billy <http://carl.debilly.net/>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite" />
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface Observable<T> {
diff --git a/types/rx-lite-virtualtime/index.d.ts b/types/rx-lite-virtualtime/index.d.ts
index 7413ec2604..1ff855f532 100644
--- a/types/rx-lite-virtualtime/index.d.ts
+++ b/types/rx-lite-virtualtime/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: gsino <http://www.codeplex.com/site/users/view/gsino>, Igor Oleinikov <https://github.com/Igorbek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="rx-lite" />
+/// <reference types="rx-lite" />
 
 declare namespace Rx {
     interface VirtualTimeScheduler<TAbsolute, TRelative> extends Scheduler {
diff --git a/types/rx.wamp/rx.wamp-tests.ts b/types/rx.wamp/rx.wamp-tests.ts
index 3bd6ddbffb..16c036f0a3 100644
--- a/types/rx.wamp/rx.wamp-tests.ts
+++ b/types/rx.wamp/rx.wamp-tests.ts
@@ -8,7 +8,7 @@ function nodeJS(session: autobahn.Session) {
 }
 
 function connection() {
-    var connectionSubscription = Rx.Observable.fromConnection("ws://localhost:9000")
+    var connectionSubscription = Rx.Observable.fromConnection({ url: "ws://localhost:9000" })
         .subscribe(session => console.log("A new session was created"));
 
     //Close our current connection and don't retry
@@ -32,11 +32,11 @@ function subscribe_to_topics(session: autobahn.Session, options: autobahn.ISubsc
 }
 
 function new_in_version3(onResult: Rx.Observer<autobahn.ISubscription>) {
-    Rx.Observable.subscribeAsObservable(Rx.Observable.fromConnection("ws://myconnectionurl:9090"), "wamp.my.foo", onResult);
+    Rx.Observable.subscribeAsObservable(Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090" }), "wamp.my.foo", undefined, onResult);
 }
 
 function new_in_version5(fooObserver: Rx.Observer<IWampEvent>) {
-    var connection = Rx.Observable.fromConnection("ws://myconnectionurl:9090");
+    var connection = Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090" });
 
     //You can subscribe to as many items as you want
     var subscriber =
@@ -184,4 +184,4 @@ function weather_station_monitor(session: autobahn.Session) {
         // =>  (2 + 3) * (3 + 4) = 35
         console.log("Result was %d", value);
     });
-}
\ No newline at end of file
+}
diff --git a/types/s3-uploader/index.d.ts b/types/s3-uploader/index.d.ts
index 166d98a663..d8e4501e19 100644
--- a/types/s3-uploader/index.d.ts
+++ b/types/s3-uploader/index.d.ts
@@ -29,7 +29,7 @@ declare namespace Upload {
         tmpDir?: string;
         workers?: number;
         url?: string;
-        versions?: S3UploaderVersion;
+        versions?: S3UploaderVersion[];
     }
 
     interface Meta {
diff --git a/types/s3-uploader/s3-uploader-tests.ts b/types/s3-uploader/s3-uploader-tests.ts
index 6f7fdffa88..48b55e461b 100644
--- a/types/s3-uploader/s3-uploader-tests.ts
+++ b/types/s3-uploader/s3-uploader-tests.ts
@@ -1,9 +1,7 @@
-/// <reference types="node" />
-
-
 //NOTE: Does require GM (https://github.com/aheckmann/gm) thus requires GraphicsMagick (http://www.graphicsmagick.org/) or ImageMagick (http://www.imagemagick.org/)
 
 import Upload = require('s3-uploader');
+declare var console: { log(x: any): void };
 
 var s3VersionOriginal = {
     original: true
diff --git a/types/saml2-js/saml2-js-tests.ts b/types/saml2-js/saml2-js-tests.ts
index b19f1bc76c..ca05489dd7 100644
--- a/types/saml2-js/saml2-js-tests.ts
+++ b/types/saml2-js/saml2-js-tests.ts
@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="express" />
-
 import * as fs from 'fs';
 import * as express from 'express';
 import * as saml2 from 'saml2-js';
diff --git a/types/sammy/index.d.ts b/types/sammy/index.d.ts
index 00b3b618a2..3e7b56a5f6 100644
--- a/types/sammy/index.d.ts
+++ b/types/sammy/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://sammyjs.org/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Oisin Grehan <https://github.com/oising>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -283,4 +284,4 @@ declare module "sammy" {
 interface JQueryStatic {
     sammy: Sammy.SammyFunc;
     log: Function;
-}
\ No newline at end of file
+}
diff --git a/types/sammy/sammy-tests.ts b/types/sammy/sammy-tests.ts
index a15492c55a..9771a44cea 100644
--- a/types/sammy/sammy-tests.ts
+++ b/types/sammy/sammy-tests.ts
@@ -33,7 +33,7 @@ function test_app() {
 
     var app = $.sammy(function () {
 
-        var current_user = false;
+        var current_user: any = false;
         function checkLoggedIn(callback) {
             var _this: Sammy.EventContext;
             if (!current_user) {
@@ -551,4 +551,4 @@ function test_plugins() {
     var app2 = Sammy('#div_2', function () {
         this.use(dbLoadAndDisplay);
     });
-}
\ No newline at end of file
+}
diff --git a/types/scrolltofixed/index.d.ts b/types/scrolltofixed/index.d.ts
index d1042c3792..057ce5e1f7 100644
--- a/types/scrolltofixed/index.d.ts
+++ b/types/scrolltofixed/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bigspotteddog/ScrollToFixed
 // Definitions by: Ben Dixon <https://github.com/bmdixon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/seamless/index.d.ts b/types/seamless/index.d.ts
index c6987b272f..e866ac02e2 100644
--- a/types/seamless/index.d.ts
+++ b/types/seamless/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/travist/seamless.js
 // Definitions by: Dan Manastireanu <https://github.com/danmana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/segment-analytics/index.d.ts b/types/segment-analytics/index.d.ts
index 0163568a14..7c6949d58f 100644
--- a/types/segment-analytics/index.d.ts
+++ b/types/segment-analytics/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://segment.com/docs/libraries/analytics.js/
 // Definitions by: Andrew Fong <https://github.com/fongandrew>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare interface JQuery {}
 
diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 5828dba2e9..8830f270dc 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://ivaynberg.github.com/select2/
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery"/>
@@ -25,10 +26,13 @@ interface Select2AjaxOptions {
     url?: any;
     dataType?: string;
     delay?: number;
+    headers?: any;
     cache?: boolean;
     data?: (params: Select2QueryOptions, page: number, context: any) => any;
     results?: (term: any, page: number, context: any) => any;
     processResults?:(data: any, params: any) => any;
+    templateResult?: (data: any) => any;
+	templateSelection?: (data: any) => any;
 }
 
 interface IdTextPair {
@@ -49,6 +53,7 @@ interface Select2Options {
     separator?: string;
     allowClear?: boolean;
     multiple?: boolean;
+    disabled?: boolean;
     closeOnSelect?: boolean;
     openOnEnter?: boolean;
     id?: (object: any) => string;
@@ -69,6 +74,7 @@ interface Select2Options {
     ajax?: Select2AjaxOptions;
     data?: any;
     tags?: any;
+    createTag?: any;
     containerCss?: any;
     containerCssClass?: any;
     dropdownCss?: any;
diff --git a/types/select2/select2-tests.ts b/types/select2/select2-tests.ts
index 9f9f8f3732..43f8173dd2 100644
--- a/types/select2/select2-tests.ts
+++ b/types/select2/select2-tests.ts
@@ -148,7 +148,7 @@ $("#e11").select2({
     data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
 });
 $("#e11_2").select2({
-    createSearchChoice: function (term, data) { if ($(data).filter(function () { return this.text.localeCompare(term) === 0; }).length === 0) { return { id: term, text: term }; } },
+    createSearchChoice: function (term, data) { if ($(data).filter(function () { return this.textContent.localeCompare(term) === 0; }).length === 0) { return { id: term, text: term }; } },
     multiple: true,
     data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
 });
@@ -176,7 +176,7 @@ $("#e14").val(["AL", "AZ"]).select2();
 $("#e14_init").click(function () { $("#e14").select2(); });
 $("#e14_destroy").click(function () { $("#e14").select2("destroy"); });
 $("#e15").select2({ tags: ["red", "green", "blue", "orange", "white", "black", "purple", "cyan", "teal"] });
-$("#e15").on("change", function () { $("#e15_val").html($("#e15").val()); });
+$("#e15").on("change", function () { $("#e15_val").html($("#e15").val() as string); });
 
 $("#e16").select2();
 $("#e16_2").select2();
diff --git a/types/selectize/index.d.ts b/types/selectize/index.d.ts
index 9acb0867d7..a9b7d77e7e 100644
--- a/types/selectize/index.d.ts
+++ b/types/selectize/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>, Natalie Bausch <https://github.com/naBausch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="jquery"/>
-
 declare namespace Selectize {
     // see https://github.com/brianreavis/selectize.js/blob/master/docs/usage.md
     // option identifiers are parameterized by T; data is parameterized by U
diff --git a/types/selectize/selectize-tests.ts b/types/selectize/selectize-tests.ts
index 10b12c91f2..6e66ba0992 100644
--- a/types/selectize/selectize-tests.ts
+++ b/types/selectize/selectize-tests.ts
@@ -1,3 +1,5 @@
+import $ = require('jquery');
+
 var $input = $(".test-input").selectize();
 var testApi = $input[0].selectize;
 
diff --git a/types/selectize/tsconfig.json b/types/selectize/tsconfig.json
index 57ec31a8f3..dd26dbe3be 100644
--- a/types/selectize/tsconfig.json
+++ b/types/selectize/tsconfig.json
@@ -12,6 +12,11 @@
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "jquery": [
+                "jquery/v1"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "selectize-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/semantic-ui-accordion/global.d.ts b/types/semantic-ui-accordion/global.d.ts
new file mode 100644
index 0000000000..33e3080dfb
--- /dev/null
+++ b/types/semantic-ui-accordion/global.d.ts
@@ -0,0 +1,239 @@
+interface JQuery {
+    accordion: SemanticUI.Accordion;
+}
+
+declare namespace SemanticUI {
+    interface Accordion {
+        settings: AccordionSettings;
+
+        /**
+         * Refreshes all cached selectors and data
+         */
+        (behavior: 'refresh'): JQuery;
+        /**
+         * Opens accordion content at index
+         */
+        (behavior: 'open', index: number): JQuery;
+        /**
+         * Closes accordion content that are not active
+         */
+        (behavior: 'close others'): JQuery;
+        /**
+         * Closes accordion content at index
+         */
+        (behavior: 'close', index: number): JQuery;
+        /**
+         * Toggles accordion content at index
+         */
+        (behavior: 'toggle', index: number): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof AccordionSettings>(behavior: 'setting', name: K, value?: undefined): AccordionSettings[K];
+        <K extends keyof AccordionSettings>(behavior: 'setting', name: K, value: AccordionSettings[K]): JQuery;
+        (behavior: 'setting', value: AccordionSettings.Param): JQuery;
+        (settings?: AccordionSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/accordion.html#/settings}
+     */
+    interface AccordionSettings extends Pick<AccordionSettings._Impl, keyof AccordionSettings._Impl> { }
+
+    namespace AccordionSettings {
+        type Param = AccordionSettings | object;
+
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * Only allow one section open at a time
+             *
+             * @default true
+             */
+            exclusive: boolean;
+            /**
+             * Event on title that will cause accordion to open
+             *
+             * @default 'click'
+             */
+            on: string;
+            /**
+             * Whether child content opacity should be animated (may cause performance issues with many child elements)
+             *
+             * @default true
+             */
+            animateChildren: boolean;
+            /**
+             * Close open nested accordion content when an element closes
+             *
+             * @default true
+             */
+            closeNested: boolean;
+            /**
+             * Allow active sections to collapse
+             *
+             * @default true
+             */
+            collapsible: boolean;
+            /**
+             * Duration in ms of opening animation
+             *
+             * @default 500
+             */
+            duration: number;
+            /**
+             * Easing of opening animation. EaseInOutQuint is included with accordion, for additional options you must include easing equations.
+             *
+             * @default 'easeInOutQuint'
+             * @see {@link http://gsgd.co.uk/sandbox/jquery/easing/}
+             */
+            easing: string;
+            /**
+             * whether accordion should automatically refresh on DOM insertion
+             *
+             * @default true
+             */
+            observeChanges: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback before element opens
+             */
+            onOpening(this: JQuery): void;
+            /**
+             * Callback after element is open
+             */
+            onOpen(this: JQuery): void;
+            /**
+             * Callback before element closes
+             */
+            onClosing(this: JQuery): void;
+            /**
+             * Callback after element is closed
+             */
+            onClose(this: JQuery): void;
+            /**
+             * Callback on element open or close
+             */
+            onChange(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Selectors used to find parts of a module
+             */
+            selector: Accordion.SelectorSettings;
+            /**
+             * Class names used to determine element state
+             */
+            className: Accordion.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Accordion.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Accordion {
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.accordion'
+                 */
+                accordion: string;
+                /**
+                 * @default '.title'
+                 */
+                title: string;
+                /**
+                 * @default '.title'
+                 */
+                trigger: string;
+                /**
+                 * @default '.content'
+                 */
+                content: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'animating'
+                 */
+                animating: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-accordion/index.d.ts b/types/semantic-ui-accordion/index.d.ts
new file mode 100644
index 0000000000..c17fb3d0d9
--- /dev/null
+++ b/types/semantic-ui-accordion/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-accordion 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const accordion: SemanticUI.Accordion;
+export = accordion;
diff --git a/types/semantic-ui-accordion/semantic-ui-accordion-tests.ts b/types/semantic-ui-accordion/semantic-ui-accordion-tests.ts
new file mode 100644
index 0000000000..7ab192f847
--- /dev/null
+++ b/types/semantic-ui-accordion/semantic-ui-accordion-tests.ts
@@ -0,0 +1,74 @@
+function test_static() {
+    $.fn.accordion.settings.namespace = 'namespace';
+    $.fn.accordion.settings.name = 'name';
+    $.fn.accordion.settings.silent = false;
+    $.fn.accordion.settings.debug = true;
+    $.fn.accordion.settings.performance = true;
+    $.fn.accordion.settings.verbose = true;
+}
+
+function test_accordion() {
+    const selector = '.ui.accordion';
+    $(selector).accordion('refresh') === $();
+    $(selector).accordion('open', 3) === $();
+    $(selector).accordion('close others') === $();
+    $(selector).accordion('close', 10) === $();
+    $(selector).accordion('toggle', 5) === $();
+    $(selector).accordion('destroy') === $();
+    $(selector).accordion('setting', 'debug', undefined) === false;
+    $(selector).accordion('setting', 'debug') === false;
+    $(selector).accordion('setting', 'debug', true) === $();
+    $(selector).accordion('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).accordion({
+        exclusive: true,
+        on: 'on',
+        animateChildren: false,
+        closeNested: true,
+        collapsible: false,
+        duration: 500,
+        easing: 'easeInOutQuint',
+        observeChanges: true,
+        onOpening() {
+            this === $();
+        },
+        onOpen() {
+            this === $();
+        },
+        onClosing() {
+            this === $();
+        },
+        onClose() {
+            this === $();
+        },
+        onChange() {
+            this === $();
+        },
+        selector: {
+            accordion: 'accordion',
+            title: 'title',
+            trigger: 'trigger',
+            content: 'content'
+        },
+        className: {
+            active: 'active',
+            animating: 'animating'
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).accordion() === $();
+}
+
+import accordion = require('semantic-ui-accordion');
+
+function test_module() {
+    $.fn.accordion = accordion;
+}
diff --git a/types/semantic-ui-accordion/tsconfig.json b/types/semantic-ui-accordion/tsconfig.json
new file mode 100644
index 0000000000..1cf2dd2ed4
--- /dev/null
+++ b/types/semantic-ui-accordion/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-accordion-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-accordion/tslint.json b/types/semantic-ui-accordion/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-accordion/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-api/global.d.ts b/types/semantic-ui-api/global.d.ts
new file mode 100644
index 0000000000..5c644a4d8d
--- /dev/null
+++ b/types/semantic-ui-api/global.d.ts
@@ -0,0 +1,474 @@
+interface JQueryStatic {
+    api: SemanticUI.Api;
+}
+
+interface JQuery {
+    api: SemanticUI.Api;
+}
+
+declare namespace SemanticUI {
+    interface Api {
+        settings: ApiSettings;
+
+        /**
+         * Execute query using existing API settings
+         */
+        (behavior: 'query'): JQuery;
+        /**
+         * Adds data to existing templated url and returns full url string
+         */
+        (behavior: 'add url data', url: string, data: any): string;
+        /**
+         * Gets promise for current API request
+         */
+        (behavior: 'get request'): JQueryDeferred<any> | false;
+        /**
+         * Aborts current API request
+         */
+        (behavior: 'abort'): JQuery;
+        /**
+         * Removes loading and error state from element
+         */
+        (behavior: 'reset'): JQuery;
+        /**
+         * Returns whether last request was cancelled
+         */
+        (behavior: 'was cancelled'): boolean;
+        /**
+         * Returns whether last request was failure
+         */
+        (behavior: 'was failure'): boolean;
+        /**
+         * Returns whether last request was successful
+         */
+        (behavior: 'was successful'): boolean;
+        /**
+         * Returns whether last request was completed
+         */
+        (behavior: 'was complete'): boolean;
+        /**
+         * Returns whether element is disabled
+         */
+        (behavior: 'is disabled'): boolean;
+        /**
+         * Returns whether element response is mocked
+         */
+        (behavior: 'is mocked'): boolean;
+        /**
+         * Returns whether element is loading
+         */
+        (behavior: 'is loading'): boolean;
+        /**
+         * Sets loading state to element
+         */
+        (behavior: 'set loading'): JQuery;
+        /**
+         * Sets error state to element
+         */
+        (behavior: 'set error'): JQuery;
+        /**
+         * Removes loading state to element
+         */
+        (behavior: 'remove loading'): JQuery;
+        /**
+         * Removes error state to element
+         */
+        (behavior: 'remove error'): JQuery;
+        /**
+         * Gets event that API request will occur on
+         */
+        (behavior: 'get event'): string;
+        /**
+         * Returns encodeURIComponent value only if value passed is not already encoded
+         */
+        (behavior: 'get url encoded value', value: any): string;
+        /**
+         * Reads a locally cached response for a URL
+         */
+        (behavior: 'read cached response', url: string): any;
+        /**
+         * Writes a cached response for a URL
+         */
+        (behavior: 'write cached response', url: string, response: any): JQuery;
+        /**
+         * Creates new cache, removing all locally cached URLs
+         */
+        (behavior: 'create cache'): JQuery;
+        /**
+         * Removes API settings from the page and all events
+         */
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof ApiSettings>(behavior: 'setting', name: K, value?: undefined): ApiSettings[K];
+        <K extends keyof ApiSettings>(behavior: 'setting', name: K, value: ApiSettings[K]): JQuery;
+        (behavior: 'setting', value: ApiSettings | object): JQuery;
+        (settings?: ApiSettings | object): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/behaviors/api.html#/settings}
+     */
+    interface ApiSettings extends Pick<ApiSettings._Impl, keyof ApiSettings._Impl> { }
+
+    namespace ApiSettings {
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * When API event should occur
+             *
+             * @default 'auto'
+             */
+            on: string;
+            /**
+             * Can be set to 'local' to cache successful returned AJAX responses when using a JSON API.
+             * This helps avoid server round trips when API endpoints will return the same results when accessed repeatedly.
+             * Setting to false, will add cache busting parameters to the URL.
+             *
+             * @default true
+             */
+            cache: 'local' | boolean;
+            /**
+             * UI state will be applied to this element, defaults to triggering element.
+             */
+            stateContext: string | JQuery;
+            /**
+             * Whether to encode parameters with encodeURIComponent before adding into url string
+             *
+             * @default true
+             */
+            encodeParameters: boolean;
+            /**
+             * Whether to automatically include default data like {value} and {text}
+             *
+             * @default true
+             */
+            defaultData: boolean;
+            /**
+             * Whether to serialize closest form and include in request
+             *
+             * @default false
+             */
+            serializeForm: boolean;
+            /**
+             * How long to wait when a request is made before triggering request, useful for rate limiting oninput
+             *
+             * @default 0
+             */
+            throttle: number;
+            /**
+             * When set to false will not delay the first request made, when no others are queued
+             *
+             * @default true
+             */
+            throttleFirstRequest: boolean;
+            /**
+             * Whether an API request can occur while another request is still pending
+             *
+             * @default false
+             */
+            interruptRequests: boolean;
+            /**
+             * Minimum duration to show loading indication
+             *
+             * @default 0
+             */
+            loadingDuration: number;
+            /**
+             * The default auto will automatically remove error state after error duration, unless the element is a form
+             *
+             * @default 'auto'
+             */
+            hideError: 'auto' | boolean;
+            /**
+             * Setting to true, will not remove error.
+             * Setting to a duration in milliseconds to show error state after request error.
+             *
+             * @default 2000
+             */
+            errorDuration: true | number;
+
+            // endregion
+
+            // region Request Settings
+
+            /**
+             * Named API action for query, originally specified in $.fn.settings.api
+             */
+            action: string | false;
+            /**
+             * Templated URL for query, will override specified action
+             */
+            url: string | false;
+            /**
+             * Variables to use for replacement
+             */
+            urlData: any | false;
+            /**
+             * Can be set to a Javascript object which will be returned automatically instead of requesting JSON from server
+             */
+            response: any | false;
+            /**
+             * When specified, this function can be used to retrieve content from a server and return it asynchronously instead of a standard AJAX call.
+             * The callback function should return the server response.
+             *
+             * @default false
+             */
+            responseAsync: ((settings: ApiSettings, callback: (response: any) => void) => void) | false;
+            /**
+             * @see response
+             */
+            mockResponse: any | false;
+            /**
+             * @see responseAsync
+             */
+            mockResponseAsync: ((settings: ApiSettings, callback: (response: any) => void) => void) | false;
+            /**
+             * Method for transmitting request to server
+             */
+            method: 'post' | 'get';
+            /**
+             * Expected data type of response
+             */
+            dataType: 'xml' | 'json' | 'jsonp' | 'script' | 'html' | 'text';
+            /**
+             * POST/GET Data to Send with Request
+             */
+            data: any;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Allows modifying settings before request, or cancelling request
+             */
+            beforeSend(settings: ApiSettings): any;
+            /**
+             * Allows modifying XHR object for request
+             */
+            beforeXHR(xhrObject: JQueryXHR): any;
+            /**
+             * Callback that occurs when request is made. Receives both the API success promise and the XHR request promise.
+             */
+            onRequest(promise: JQueryDeferred<any>, xhr: JQueryXHR): void;
+            /**
+             * Allows modifying the server's response before parsed by other callbacks to determine API event success
+             */
+            onResponse(response: any): void;
+            /**
+             * Determines whether completed JSON response should be treated as successful
+             *
+             * @see {@link http://semantic-ui.com/behaviors/api.html#determining-json-success}
+             */
+            successTest(response: any): boolean;
+            /**
+             * Callback after successful response, JSON response must pass successTest
+             */
+            onSuccess(response: any, element: JQuery, xhr: JQueryXHR): void;
+            /**
+             * Callback on request complete regardless of conditions
+             */
+            onComplete(response: any, element: JQuery, xhr: JQueryXHR): void;
+            /**
+             * Callback on failed response, or JSON response that fails successTest
+             */
+            onFailure(response: any, element: JQuery): void;
+            /**
+             * Callback on server error from returned status code, or XHR failure.
+             */
+            onError(errorMessage: string, element: JQuery, xhr: JQueryXHR): void;
+            /**
+             * Callback on abort caused by user clicking a link or manually cancelling request.
+             */
+            onAbort(errorMessage: string, element: JQuery, xhr: JQueryXHR): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Regular expressions used for template matching
+             */
+            regExp: Api.RegExpSettings;
+            /**
+             * Selectors used to find parts of a module
+             */
+            selector: Api.SelectorSettings;
+            /**
+             * Class names used to determine element state
+             */
+            className: Api.ClassNameSettings;
+            /**
+             * Metadata used to store XHR and response promise
+             */
+            metadata: Api.MetadataSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Api.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Api {
+        interface RegExpSettings extends Pick<RegExpSettings._Impl, keyof RegExpSettings._Impl> { }
+
+        namespace RegExpSettings {
+            interface _Impl {
+                /**
+                 * @default /\{\$*[A-z0-9]+\}/g
+                 */
+                required: RegExp;
+                /**
+                 * @default /\{\/\$*[A-z0-9]+\}/g
+                 */
+                optional: RegExp;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            interface _Impl {
+                /**
+                 * @default '.disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'form'
+                 */
+                form: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            interface _Impl {
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'error'
+                 */
+                error: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            interface _Impl {
+                /**
+                 * @default 'action'
+                 */
+                action: string;
+                /**
+                 * @default 'url'
+                 */
+                url: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            interface _Impl {
+                /**
+                 * @default 'The before send function has aborted the request'
+                 */
+                beforeSend: string;
+                /**
+                 * @default 'There was an error with your request'
+                 */
+                error: string;
+                /**
+                 * @default 'API Request Aborted. Exit conditions met'
+                 */
+                exitConditions: string;
+                /**
+                 * @default 'JSON could not be parsed during error handling'
+                 */
+                JSONParse: string;
+                /**
+                 * @default 'You are using legacy API success callback names'
+                 */
+                legacyParameters: string;
+                /**
+                 * @default 'API action used but no url was defined'
+                 */
+                missingAction: string;
+                /**
+                 * @default 'Required dependency jquery-serialize-object missing, using basic serialize'
+                 */
+                missingSerialize: string;
+                /**
+                 * @default 'No URL specified for API event'
+                 */
+                missingURL: string;
+                /**
+                 * @default 'The beforeSend callback must return a settings object, beforeSend ignored.'
+                 */
+                noReturnedValue: string;
+                /**
+                 * @default 'There was an error parsing your request'
+                 */
+                parseError: string;
+                /**
+                 * @default 'Missing a required URL parameter: '
+                 */
+                requiredParameter: string;
+                /**
+                 * @default 'Server gave an error: '
+                 */
+                statusMessage: string;
+                /**
+                 * @default 'Your request timed out'
+                 */
+                timeout: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-api/index.d.ts b/types/semantic-ui-api/index.d.ts
new file mode 100644
index 0000000000..21ffc86f93
--- /dev/null
+++ b/types/semantic-ui-api/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-api 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const api: SemanticUI.Api;
+export = api;
diff --git a/types/semantic-ui-api/semantic-ui-api-tests.ts b/types/semantic-ui-api/semantic-ui-api-tests.ts
new file mode 100644
index 0000000000..683c1a35c4
--- /dev/null
+++ b/types/semantic-ui-api/semantic-ui-api-tests.ts
@@ -0,0 +1,140 @@
+function test_api_static() {
+    $.api.settings.className.error = 'error';
+    $.api.settings.namespace = 'namespace';
+    $.api.settings.name = 'name';
+    $.api.settings.silent = false;
+    $.api.settings.debug = true;
+    $.api.settings.performance = true;
+    $.api.settings.verbose = true;
+
+    $.fn.api.settings.namespace = 'namespace';
+    $.fn.api.settings.name = 'name';
+    $.fn.api.settings.silent = false;
+    $.fn.api.settings.debug = true;
+    $.fn.api.settings.performance = true;
+    $.fn.api.settings.verbose = true;
+}
+
+function test_api() {
+    const selector = '.ui.api';
+    $(selector).api('destroy') === $();
+    $(selector).api('setting', 'debug', undefined) === false;
+    $(selector).api('setting', 'debug') === false;
+    $(selector).api('setting', 'debug', true) === $();
+    $(selector).api('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).api({
+        on: 'on',
+        cache: true,
+        stateContext: $(),
+        encodeParameters: false,
+        defaultData: true,
+        serializeForm: false,
+        throttle: 10,
+        throttleFirstRequest: true,
+        interruptRequests: false,
+        loadingDuration: 3,
+        hideError: true,
+        errorDuration: 10,
+        action: 'action',
+        url: 'url',
+        urlData: false,
+        response: false,
+        responseAsync(settings, callback) {
+            settings === ({} as SemanticUI.ApiSettings);
+            callback === ((response: any) => { });
+        },
+        mockResponse: false,
+        mockResponseAsync(settings, callback) {
+            settings === ({} as SemanticUI.ApiSettings);
+            callback === ((response: any) => { });
+        },
+        method: 'post',
+        dataType: 'xml',
+        data: {},
+        beforeSend(settings) {
+            settings === ({} as SemanticUI.ApiSettings);
+        },
+        beforeXHR(xhrObject) {
+            xhrObject === ({} as JQueryXHR);
+        },
+        onRequest(promise, xhr) {
+            promise === ({} as JQueryDeferred<any>);
+            xhr === ({} as JQueryXHR);
+        },
+        onResponse(response) {
+            response === ({} as any);
+        },
+        successTest(response) {
+            return response === ({} as any);
+        },
+        onSuccess(response, element, xhr) {
+            response === ({} as any);
+            element === $();
+            xhr === ({} as JQueryXHR);
+        },
+        onComplete(response, element, xhr) {
+            response === ({} as any);
+            element === $();
+            xhr === ({} as JQueryXHR);
+        },
+        onFailure(response, element) {
+            response === ({} as any);
+            element === $();
+        },
+        onError(errorMessage, element, xhr) {
+            errorMessage === '';
+            element === $();
+            xhr === ({} as JQueryXHR);
+        },
+        onAbort(errorMessage, element, xhr) {
+            errorMessage === '';
+            element === $();
+            xhr === ({} as JQueryXHR);
+        },
+        regExp: {
+            required: /{\$*[A-z0-9]+}/g,
+            optional: /{\/\$*[A-z0-9]+}/g
+        },
+        selector: {
+            disabled: '.disabled',
+            form: 'form'
+        },
+        className: {
+            loading: 'loading',
+            error: 'error'
+        },
+        metadata: {
+            action: 'action',
+            url: 'url'
+        },
+        error: {
+            beforeSend: 'beforeSend',
+            error: 'error',
+            exitConditions: 'exitConditions',
+            JSONParse: 'JSONParse',
+            legacyParameters: 'legacyParameters',
+            missingAction: 'missingAction',
+            missingSerialize: 'missingSerialize',
+            missingURL: 'missingURL',
+            noReturnedValue: 'noReturnedValue',
+            parseError: 'parseError',
+            requiredParameter: 'requiredParameter',
+            statusMessage: 'statusMessage',
+            timeout: 'timeout'
+        }
+    }) === $();
+    $(selector).api() === $();
+}
+
+import api = require('semantic-ui-api');
+
+function test_module() {
+    $.fn.api = api;
+}
diff --git a/types/semantic-ui-api/tsconfig.json b/types/semantic-ui-api/tsconfig.json
new file mode 100644
index 0000000000..660822f6c6
--- /dev/null
+++ b/types/semantic-ui-api/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-api-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-api/tslint.json b/types/semantic-ui-api/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-api/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-checkbox/global.d.ts b/types/semantic-ui-checkbox/global.d.ts
new file mode 100644
index 0000000000..fd3159b5b6
--- /dev/null
+++ b/types/semantic-ui-checkbox/global.d.ts
@@ -0,0 +1,306 @@
+interface JQuery {
+    checkbox: SemanticUI.Checkbox;
+}
+
+declare namespace SemanticUI {
+    interface Checkbox {
+        settings: CheckboxSettings;
+
+        /**
+         * Switches a checkbox from current state
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Set a checkbox state to checked
+         */
+        (behavior: 'check'): JQuery;
+        /**
+         * Set a checkbox state to unchecked
+         */
+        (behavior: 'uncheck'): JQuery;
+        /**
+         * Set as indeterminate checkbox
+         */
+        (behavior: 'indeterminate'): JQuery;
+        /**
+         * Set as determinate checkbox
+         */
+        (behavior: 'determinate'): JQuery;
+        /**
+         * Enable interaction with a checkbox
+         */
+        (behavior: 'enable'): JQuery;
+        /**
+         * Set a checkbox state to checked without callbacks
+         */
+        (behavior: 'set checked'): JQuery;
+        /**
+         * Set a checkbox state to unchecked without callbacks
+         */
+        (behavior: 'set unchecked'): JQuery;
+        /**
+         * Set as indeterminate checkbox without callbacks
+         */
+        (behavior: 'set indeterminate'): JQuery;
+        /**
+         * Set as determinate checkbox without callbacks
+         */
+        (behavior: 'set determinate'): JQuery;
+        /**
+         * Enable interaction with a checkbox without callbacks
+         */
+        (behavior: 'set enabled'): JQuery;
+        /**
+         * Disable interaction with a checkbox without callbacks
+         */
+        (behavior: 'set disabled'): JQuery;
+        /**
+         * Attach checkbox events to another element
+         */
+        (behavior: 'attach events', selector: string | JQuery, event?: string): JQuery;
+        /**
+         * Returns whether element is radio selection
+         */
+        (behavior: 'is radio'): boolean;
+        /**
+         * Returns whether element is currently checked
+         */
+        (behavior: 'is checked'): boolean;
+        /**
+         * Returns whether element is not checked
+         */
+        (behavior: 'is unchecked'): boolean;
+        /**
+         * Returns whether element is able to be changed
+         */
+        (behavior: 'can change'): boolean;
+        /**
+         * Returns whether element can be checked (checking if already checked or `beforeChecked` would cancel)
+         */
+        (behavior: 'should allow check'): boolean;
+        /**
+         * Returns whether element can be unchecked (checking if already unchecked or `beforeUnchecked` would cancel)
+         */
+        (behavior: 'should allow uncheck'): boolean;
+        /**
+         * Returns whether element can be determinate (checking if already determinate or `beforeDeterminate` would cancel)
+         */
+        (behavior: 'should allow determinate'): boolean;
+        /**
+         * Returns whether element can be indeterminate (checking if already indeterminate or `beforeIndeterminate` would cancel)
+         */
+        (behavior: 'should allow indeterminate'): boolean;
+        /**
+         * Returns whether element is able to be unchecked
+         */
+        (behavior: 'can uncheck'): boolean;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof CheckboxSettings>(behavior: 'setting', name: K, value?: undefined): CheckboxSettings[K];
+        <K extends keyof CheckboxSettings>(behavior: 'setting', name: K, value: CheckboxSettings[K]): JQuery;
+        (behavior: 'setting', value: CheckboxSettings.Param): JQuery;
+        (settings?: CheckboxSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/checkbox.html#/settings}
+     */
+    interface CheckboxSettings extends Pick<CheckboxSettings._Impl, keyof CheckboxSettings._Impl> { }
+
+    namespace CheckboxSettings {
+        type Param = CheckboxSettings | object;
+
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * Setting to true/false will determine whether an input will allow no selection. Auto will set disallow this behavior only for radio boxes
+             *
+             * @default 'auto'
+             */
+            uncheckable: 'auto' | boolean;
+            /**
+             * Whether callbacks for checked status should be fired on init as well as change
+             *
+             * @default false
+             */
+            fireOnInit: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback after a checkbox is either checked or unchecked.
+             */
+            onChange(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is checked.
+             */
+            onChecked(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is set to undeterminate.
+             */
+            onIndeterminate(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is set to determinate.
+             */
+            onDeterminate(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is unchecked.
+             */
+            onUnchecked(this: HTMLElement): void;
+            /**
+             * Callback before a checkbox is checked. Can cancel change by returning false
+             */
+            beforeChecked(this: HTMLElement): boolean;
+            /**
+             * Callback before a checkbox is set to undeterminate. Can cancel change by returning false
+             */
+            beforeIndeterminate(this: HTMLElement): boolean;
+            /**
+             * Callback before a checkbox is set to determinate. Can cancel change by returning false
+             */
+            beforeDeterminate(this: HTMLElement): boolean;
+            /**
+             * Callback before a checkbox is unchecked. Can cancel change by returning false
+             */
+            beforeUnchecked(this: HTMLElement): boolean;
+            /**
+             * Callback after a checkbox is enabled.
+             */
+            onEnable(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is disabled.
+             */
+            onDisable(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is enabled.
+             *
+             * @deprecated
+             */
+            onEnabled(this: HTMLElement): void;
+            /**
+             * Callback after a checkbox is disabled.
+             *
+             * @deprecated
+             */
+            onDisabled(this: HTMLElement): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Selectors used to find parts of a module
+             */
+            selector: Checkbox.SelectorSettings;
+            /**
+             * Class names used to determine element state
+             */
+            className: Checkbox.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Checkbox.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Checkbox {
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'input[type=checkbox], input[type=radio]'
+                 */
+                input: string;
+                /**
+                 * @default 'label'
+                 */
+                label: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'checked'
+                 */
+                checked: string;
+                /**
+                 * @default 'disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'radio'
+                 */
+                radio: string;
+                /**
+                 * @default 'read-only'
+                 */
+                readOnly: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-checkbox/index.d.ts b/types/semantic-ui-checkbox/index.d.ts
new file mode 100644
index 0000000000..5030c2727d
--- /dev/null
+++ b/types/semantic-ui-checkbox/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-checkbox 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const checkbox: SemanticUI.Checkbox;
+export = checkbox;
diff --git a/types/semantic-ui-checkbox/semantic-ui-checkbox-tests.ts b/types/semantic-ui-checkbox/semantic-ui-checkbox-tests.ts
new file mode 100644
index 0000000000..30ff41ebd3
--- /dev/null
+++ b/types/semantic-ui-checkbox/semantic-ui-checkbox-tests.ts
@@ -0,0 +1,109 @@
+function test_checkbox_static() {
+    $.fn.checkbox.settings.error.method = 'method';
+    $.fn.checkbox.settings.namespace = 'namespace';
+    $.fn.checkbox.settings.name = 'name';
+    $.fn.checkbox.settings.silent = false;
+    $.fn.checkbox.settings.debug = true;
+    $.fn.checkbox.settings.performance = true;
+    $.fn.checkbox.settings.verbose = true;
+}
+
+function test_checkbox() {
+    const selector = '.ui.checkbox';
+    $(selector).checkbox('toggle') === $();
+    $(selector).checkbox('check') === $();
+    $(selector).checkbox('uncheck') === $();
+    $(selector).checkbox('indeterminate') === $();
+    $(selector).checkbox('determinate') === $();
+    $(selector).checkbox('enable') === $();
+    $(selector).checkbox('set checked') === $();
+    $(selector).checkbox('set unchecked') === $();
+    $(selector).checkbox('set indeterminate') === $();
+    $(selector).checkbox('set determinate') === $();
+    $(selector).checkbox('set enabled') === $();
+    $(selector).checkbox('set disabled') === $();
+    $(selector).checkbox('attach events', $(), 'click') === $();
+    $(selector).checkbox('is radio') === true;
+    $(selector).checkbox('is checked') === true;
+    $(selector).checkbox('is unchecked') === true;
+    $(selector).checkbox('can change') === true;
+    $(selector).checkbox('should allow check') === true;
+    $(selector).checkbox('should allow uncheck') === true;
+    $(selector).checkbox('should allow determinate') === true;
+    $(selector).checkbox('should allow indeterminate') === true;
+    $(selector).checkbox('can uncheck') === true;
+    $(selector).checkbox('setting', 'debug', undefined) === false;
+    $(selector).checkbox('setting', 'debug') === false;
+    $(selector).checkbox('setting', 'debug', true) === $();
+    $(selector).checkbox('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).checkbox({
+        uncheckable: false,
+        fireOnInit: true,
+        onChange() {
+            this === new HTMLElement();
+        },
+        onChecked() {
+            this === new HTMLElement();
+        },
+        onIndeterminate() {
+            this === new HTMLElement();
+        },
+        onDeterminate() {
+            this === new HTMLElement();
+        },
+        onUnchecked() {
+            this === new HTMLElement();
+        },
+        beforeChecked() {
+            this === new HTMLElement();
+        },
+        beforeIndeterminate() {
+            this === new HTMLElement();
+        },
+        beforeDeterminate() {
+            this === new HTMLElement();
+        },
+        beforeUnchecked() {
+            this === new HTMLElement();
+        },
+        onEnable() {
+            this === new HTMLElement();
+        },
+        onDisable() {
+            this === new HTMLElement();
+        },
+        onEnabled() {
+            this === new HTMLElement();
+        },
+        onDisabled() {
+            this === new HTMLElement();
+        },
+        selector: {
+            input: 'input',
+            label: 'label'
+        },
+        className: {
+            checked: 'checked',
+            disabled: 'disabled',
+            radio: 'radio',
+            readOnly: 'read-only'
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).checkbox() === $();
+}
+
+import checkbox = require('semantic-ui-checkbox');
+
+function test_module() {
+    $.fn.checkbox = checkbox;
+}
diff --git a/types/semantic-ui-checkbox/tsconfig.json b/types/semantic-ui-checkbox/tsconfig.json
new file mode 100644
index 0000000000..5f1f5781e8
--- /dev/null
+++ b/types/semantic-ui-checkbox/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-checkbox-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-checkbox/tslint.json b/types/semantic-ui-checkbox/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-checkbox/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-dimmer/global.d.ts b/types/semantic-ui-dimmer/global.d.ts
new file mode 100644
index 0000000000..86ac3dc056
--- /dev/null
+++ b/types/semantic-ui-dimmer/global.d.ts
@@ -0,0 +1,339 @@
+interface JQuery {
+    dimmer: SemanticUI.Dimmer;
+}
+
+declare namespace SemanticUI {
+    interface Dimmer {
+        settings: DimmerSettings;
+
+        /**
+         * Detaches a given element from DOM and reattaches element inside dimmer
+         */
+        (behavior: 'add content', element: string | JQuery): JQuery;
+        /**
+         * Shows dimmer
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides dimmer
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Toggles current dimmer visibility
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Changes dimmer opacity
+         */
+        (behavior: 'set opacity', opacity: number): JQuery;
+        /**
+         * Creates a new dimmer in dimmable context
+         */
+        (behavior: 'create'): JQuery;
+        /**
+         * Returns current duration for show or hide event depending on current visibility
+         */
+        (behavior: 'get duration'): number;
+        /**
+         * Returns DOM element for dimmer
+         */
+        (behavior: 'get dimmer'): JQuery;
+        /**
+         * Returns whether current dimmable has a dimmer
+         */
+        (behavior: 'has dimmer'): boolean;
+        /**
+         * Whether section's dimmer is active
+         */
+        (behavior: 'is active'): boolean;
+        /**
+         * Whether dimmer is animating
+         */
+        (behavior: 'is animating'): boolean;
+        /**
+         * Whether current element is a dimmer
+         */
+        (behavior: 'is dimmer'): boolean;
+        /**
+         * Whether current element is a dimmable section
+         */
+        (behavior: 'is dimmable'): boolean;
+        /**
+         * Whether dimmer is disabled
+         */
+        (behavior: 'is disabled'): boolean;
+        /**
+         * Whether dimmer is not disabled
+         */
+        (behavior: 'is enabled'): boolean;
+        /**
+         * Whether dimmable section is body
+         */
+        (behavior: 'is page'): boolean;
+        /**
+         * Whether dimmer is a page dimmer
+         */
+        (behavior: 'is page dimmer'): boolean;
+        /**
+         * Sets page dimmer to active
+         */
+        (behavior: 'set active'): JQuery;
+        /**
+         * Sets an element as a dimmable section
+         */
+        (behavior: 'set dimmable'): JQuery;
+        /**
+         * Sets a dimmable section as dimmed
+         */
+        (behavior: 'set dimmed'): JQuery;
+        /**
+         * Sets current dimmer as a page dimmer
+         */
+        (behavior: 'set page dimmer'): JQuery;
+        /**
+         * Sets a dimmer as disabled
+         */
+        (behavior: 'set disabled'): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof DimmerSettings>(behavior: 'setting', name: K, value?: undefined): DimmerSettings[K];
+        <K extends keyof DimmerSettings>(behavior: 'setting', name: K, value: DimmerSettings[K]): JQuery;
+        (behavior: 'setting', value: DimmerSettings | object): JQuery;
+        (settings?: DimmerSettings | object): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/dimmer.html#/settings}
+     */
+    interface DimmerSettings extends Pick<DimmerSettings._Impl, keyof DimmerSettings._Impl> { }
+
+    namespace DimmerSettings {
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * Dimmers opacity from 0-1. Defaults to auto which uses the CSS specified opacity.
+             *
+             * @default 'auto'
+             */
+            opacity: 'auto' | number;
+            /**
+             * Specify a variation to add when generating dimmer, like inverted
+             *
+             * @default false
+             */
+            variation: false | string;
+            /**
+             * If initializing a dimmer on a dimmable context, you can use dimmerName to distinguish between multiple dimmers in that context.
+             *
+             * @default false
+             */
+            dimmerName: false | string;
+            /**
+             * Whether clicking on the dimmer should hide the dimmer (Defaults to auto, closable only when settings.on is not hover
+             *
+             * @default 'auto'
+             */
+            closable: 'auto' | boolean;
+            /**
+             * Can be set to hover or click to show/hide dimmer on dimmable event
+             *
+             * @default false
+             */
+            on: false | 'hover' | 'click';
+            /**
+             * Whether to dim dimmers using CSS transitions.
+             *
+             * @default true
+             */
+            useCSS: boolean;
+            /**
+             * Animation duration of dimming. If an integer is used, that value will apply to both show and hide animations.
+             */
+            duration: number | Dimmer.DurationSettings;
+            /**
+             * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
+             *
+             * @default 'fade'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: string;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on element show
+             */
+            onShow(this: JQuery): void;
+            /**
+             * Callback on element hide
+             */
+            onHide(this: JQuery): void;
+            /**
+             * Callback on element show or hide
+             */
+            onChange(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Object containing selectors used by module.
+             */
+            selector: Dimmer.SelectorSettings;
+            /**
+             * Templates used to generate dimmer content
+             */
+            template: Dimmer.TemplateSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Dimmer.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Error messages displayed to console
+             */
+            error: Dimmer.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Dimmer {
+        interface DurationSettings extends Pick<DurationSettings._Impl, keyof DurationSettings._Impl> { }
+
+        namespace DurationSettings {
+            interface _Impl {
+                /**
+                 * @default 500
+                 */
+                show: number;
+                /**
+                 * @default 500
+                 */
+                hide: number;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            interface _Impl {
+                /**
+                 * @default '.dimmable'
+                 */
+                dimmable: string;
+                /**
+                 * @default '.ui.dimmer'
+                 */
+                dimmer: string;
+                /**
+                 * @default '.ui.dimmer > .content, .ui.dimmer > .content > .center'
+                 */
+                content: string;
+            }
+        }
+
+        interface TemplateSettings extends Pick<TemplateSettings._Impl, keyof TemplateSettings._Impl> { }
+
+        namespace TemplateSettings {
+            interface _Impl {
+                dimmer(): JQuery;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'dimmable'
+                 */
+                dimmable: string;
+                /**
+                 * @default 'dimmed'
+                 */
+                dimmed: string;
+                /**
+                 * @default 'disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'page'
+                 */
+                pageDimmer: string;
+                /**
+                 * @default 'hide'
+                 */
+                hide: string;
+                /**
+                 * @default 'show'
+                 */
+                show: string;
+                /**
+                 * @default 'transition'
+                 */
+                transition: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-dimmer/index.d.ts b/types/semantic-ui-dimmer/index.d.ts
new file mode 100644
index 0000000000..e62b3a88bd
--- /dev/null
+++ b/types/semantic-ui-dimmer/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-dimmer 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const dimmer: SemanticUI.Dimmer;
+export = dimmer;
diff --git a/types/semantic-ui-dimmer/semantic-ui-dimmer-tests.ts b/types/semantic-ui-dimmer/semantic-ui-dimmer-tests.ts
new file mode 100644
index 0000000000..68aa418a7d
--- /dev/null
+++ b/types/semantic-ui-dimmer/semantic-ui-dimmer-tests.ts
@@ -0,0 +1,99 @@
+function test_dimmer_settings() {
+    $.fn.dimmer.settings.error.method = 'method';
+    $.fn.dimmer.settings.namespace = 'namespace';
+    $.fn.dimmer.settings.name = 'name';
+    $.fn.dimmer.settings.silent = false;
+    $.fn.dimmer.settings.debug = true;
+    $.fn.dimmer.settings.performance = true;
+    $.fn.dimmer.settings.verbose = true;
+}
+
+function test_dimmer() {
+    const selector = '.ui.dimmer';
+    $(selector).dimmer('add content', $()) === $();
+    $(selector).dimmer('show') === $();
+    $(selector).dimmer('hide') === $();
+    $(selector).dimmer('toggle') === $();
+    $(selector).dimmer('set opacity', 1) === $();
+    $(selector).dimmer('create') === $();
+    $(selector).dimmer('get duration') === 10;
+    $(selector).dimmer('get dimmer') === $();
+    $(selector).dimmer('has dimmer') === true;
+    $(selector).dimmer('is active') === true;
+    $(selector).dimmer('is animating') === true;
+    $(selector).dimmer('is dimmer') === true;
+    $(selector).dimmer('is dimmable') === true;
+    $(selector).dimmer('is disabled') === true;
+    $(selector).dimmer('is enabled') === true;
+    $(selector).dimmer('is page') === true;
+    $(selector).dimmer('is page dimmer') === true;
+    $(selector).dimmer('set active') === $();
+    $(selector).dimmer('set dimmable') === $();
+    $(selector).dimmer('set dimmed') === $();
+    $(selector).dimmer('set page dimmer') === $();
+    $(selector).dimmer('set disabled') === $();
+    $(selector).dimmer('destroy') === $();
+    $(selector).dimmer('setting', 'debug', undefined) === false;
+    $(selector).dimmer('setting', 'debug') === false;
+    $(selector).dimmer('setting', 'debug', true) === $();
+    $(selector).dimmer('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).dimmer({
+        opacity: 1,
+        variation: 'variation',
+        dimmerName: 'dimmerName',
+        closable: true,
+        on: 'click',
+        useCSS: true,
+        duration: {
+            show: 200,
+            hide: 300
+        },
+        transition: 'fade',
+        onShow() {
+            this === $();
+        },
+        onHide() {
+            this === $();
+        },
+        onChange() {
+            this === $();
+        },
+        selector: {
+            dimmable: '.dimmable',
+            dimmer: '.dimmer',
+            content: '.content'
+        },
+        template: {
+            dimmer() {
+                return $();
+            }
+        },
+        className: {
+            active: 'active',
+            dimmable: 'dimmable',
+            dimmed: 'dimmed',
+            disabled: 'disabled',
+            pageDimmer: 'pageDimmer',
+            hide: 'hide',
+            show: 'show',
+            transition: 'transition'
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).dimmer() === $();
+}
+
+import dimmer = require('semantic-ui-dimmer');
+
+function test_module() {
+    $.fn.dimmer = dimmer;
+}
diff --git a/types/semantic-ui-dimmer/tsconfig.json b/types/semantic-ui-dimmer/tsconfig.json
new file mode 100644
index 0000000000..7c4280ad64
--- /dev/null
+++ b/types/semantic-ui-dimmer/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-dimmer-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-dimmer/tslint.json b/types/semantic-ui-dimmer/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-dimmer/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-dropdown/global.d.ts b/types/semantic-ui-dropdown/global.d.ts
new file mode 100644
index 0000000000..12425cbace
--- /dev/null
+++ b/types/semantic-ui-dropdown/global.d.ts
@@ -0,0 +1,852 @@
+interface JQuery {
+    dropdown: SemanticUI.Dropdown;
+}
+
+declare namespace SemanticUI {
+    // TODO: Should 'value'/'values' parameters be of type 'string' instead of 'any'?
+
+    interface Dropdown {
+        settings: DropdownSettings;
+
+        /**
+         * Recreates dropdown menu from select option values.
+         */
+        (behavior: 'setup menu'): JQuery;
+        /**
+         * Refreshes all cached selectors and data
+         */
+        (behavior: 'refresh'): JQuery;
+        /**
+         * Toggles current visibility of dropdown
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Shows dropdown
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides dropdown
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Clears dropdown of selection
+         */
+        (behavior: 'clear'): JQuery;
+        /**
+         * Hides all other dropdowns that is not current dropdown
+         */
+        (behavior: 'hide others'): JQuery;
+        /**
+         * Restores dropdown text and value to its value on page load
+         */
+        (behavior: 'restore defaults'): JQuery;
+        /**
+         * Restores dropdown text to its value on page load
+         */
+        (behavior: 'restore default text'): JQuery;
+        /**
+         * Restores dropdown text to its prompt, placeholder text
+         */
+        (behavior: 'restore placeholder text'): JQuery;
+        /**
+         * Restores dropdown value to its value on page load
+         */
+        (behavior: 'restore default value'): JQuery;
+        /**
+         * Saves current text and value as new defaults (for use with restore)
+         */
+        (behavior: 'save defaults'): JQuery;
+        /**
+         * Sets value as selected
+         */
+        (behavior: 'set selected', value: any): JQuery;
+        /**
+         * Remove value from selected
+         */
+        (behavior: 'remove selected', value: any): JQuery;
+        /**
+         * Adds a group of values as selected
+         */
+        (behavior: 'set selected', values: any[]): JQuery;
+        /**
+         * Sets selected values to exactly specified values, removing current selection
+         */
+        (behavior: 'set exactly', values: any[]): JQuery;
+        /**
+         * Sets dropdown text to a value
+         */
+        (behavior: 'set text', text: string): JQuery;
+        /**
+         * Sets dropdown input to value (does not update display state)
+         */
+        (behavior: 'set value', value: any): JQuery;
+        /**
+         * Returns current dropdown text
+         */
+        (behavior: 'get text'): string;
+        /**
+         * Returns current dropdown input value
+         */
+        (behavior: 'get value'): any;
+        /**
+         * Returns DOM element that matches a given input value
+         */
+        (behavior: 'get item', value: any): JQuery;
+        /**
+         * Adds touch events to element
+         */
+        (behavior: 'bind touch events'): JQuery;
+        /**
+         * Adds mouse events to element
+         */
+        (behavior: 'bind mouse events'): JQuery;
+        /**
+         * Binds a click to document to determine if you click away from a dropdown
+         */
+        (behavior: 'bind intent'): JQuery;
+        /**
+         * Unbinds document intent click
+         */
+        (behavior: 'unbind intent'): JQuery;
+        /**
+         * Returns whether event occurred inside dropdown
+         */
+        (behavior: 'determine intent'): boolean;
+        /**
+         * Triggers preset item selection action based on settings passing text/value
+         */
+        (behavior: 'determine select action', text: string, value: any): JQuery;
+        /**
+         * Sets dropdown to active state
+         */
+        (behavior: 'set active'): JQuery;
+        /**
+         * Sets dropdown to visible state
+         */
+        (behavior: 'set visible'): JQuery;
+        /**
+         * Removes dropdown active state
+         */
+        (behavior: 'remove active'): JQuery;
+        /**
+         * Removes dropdown visible state
+         */
+        (behavior: 'remove visible'): JQuery;
+        /**
+         * Returns whether dropdown is a selection dropdown
+         */
+        (behavior: 'is selection'): boolean;
+        /**
+         * Returns whether dropdown is animated
+         */
+        (behavior: 'is animated'): boolean;
+        /**
+         * Returns whether dropdown is visible
+         */
+        (behavior: 'is visible'): boolean;
+        /**
+         * Returns whether dropdown is hidden
+         */
+        (behavior: 'is hidden'): boolean;
+        /**
+         * Returns dropdown value as set on page load
+         */
+        (behavior: 'get default text'): string;
+        /**
+         * Returns placeholder text
+         */
+        (behavior: 'get placeholder text'): string;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof DropdownSettings>(behavior: 'setting', name: K, value?: undefined): DropdownSettings[K];
+        <K extends keyof DropdownSettings>(behavior: 'setting', name: K, value: DropdownSettings[K]): JQuery;
+        (behavior: 'setting', value: DropdownSettings.Param): JQuery;
+        (settings?: DropdownSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/dropdown.html#/settings}
+     */
+    interface DropdownSettings extends Pick<DropdownSettings._Impl, keyof DropdownSettings._Impl> { }
+
+    namespace DropdownSettings {
+        type Param = DropdownSettings | object;
+
+        interface _Impl {
+            // region Frequently Used Settings
+
+            /**
+             * Event used to trigger dropdown (Hover, Click, Custom Event)
+             *
+             * @default 'click'
+             */
+            on: string;
+            /**
+             * When set to true will fire onChange even when the value a user select matches the currently selected value.
+             *
+             * @default false
+             */
+            allowReselection: boolean;
+            /**
+             * Whether search selection should allow users to add their own selections, works for single or multi-select.
+             *
+             * @default false
+             */
+            allowAdditions: boolean;
+            /**
+             * When disabled user additions will appear in the results menu using a specially formatted selection item formatted by templates.addition.
+             *
+             * @default true
+             */
+            hideAdditions: boolean;
+            /**
+             * Sets a default action to occur. (See usage guide)
+             *
+             * @default 'activate'
+             * @see {@link http://semantic-ui.com/modules/dropdown.html#/usage}
+             */
+            action: 'activate' | 'select' | 'combo' | 'nothing' | 'hide' | ((this: JQuery, text: string, value: string | false, element: JQuery) => void);
+            /**
+             * The minimum characters for a search to begin showing results
+             *
+             * @default 1
+             */
+            minCharacters: number;
+            /**
+             * When using search selection specifies how to match values.
+             *
+             * @default 'both'
+             */
+            match: 'both' | 'value' | 'text';
+            /**
+             * Whether dropdown should select new option when using keyboard shortcuts. Setting to false will require enter or left click to confirm a choice.
+             *
+             * @default true
+             */
+            selectOnKeydown: boolean;
+            /**
+             * Whether search selection will force currently selected choice when element is blurred.
+             *
+             * @default true
+             */
+            forceSelection: boolean;
+            /**
+             * Whether menu items with sub-menus (categories) should be selectable
+             *
+             * @default false
+             */
+            allowCategorySelection: boolean;
+            /**
+             * @default 'auto'
+             */
+            placeholder: 'auto' | 'value' | false;
+
+            // endregion
+
+            // region Remote Settings
+
+            /**
+             * Can be set to an object to specify API settings for retrieving remote selection menu content from an API endpoint
+             *
+             * @default false
+             * @see {@link http://semantic-ui.com/behaviors/api.html}
+             */
+            apiSettings: false | ApiSettings;
+            /**
+             * List mapping dropdown content to JSON Property when using API
+             */
+            fields: Dropdown.FieldsSettings;
+            /**
+             * When enabled will automatically store selected name/value pairs in sessionStorage to preserve user selection on page refresh. Disabling will clear remote dropdown values on refresh.
+             *
+             * @default true
+             */
+            saveRemoteData: boolean;
+            /**
+             * When set to true API will be expected to return the complete result set, which will then be filtered clientside to only display matching results.
+             *
+             * @default false
+             * @since 2.2.8
+             */
+            filterRemoteData: boolean;
+
+            // endregion
+
+            // region Multiple Select Settings
+
+            /**
+             * Whether multiselect should use labels. Must be set to true when allowAdditions is true
+             *
+             * @default true
+             */
+            useLabels: boolean;
+            /**
+             * When set to a number, sets the maximum number of selections
+             *
+             * @default false
+             */
+            maxSelections: false | number;
+            /**
+             * Maximum glyph width, used to calculate search size. This is usually size of a "W" in your font in em
+             *
+             * @default 1.0714
+             */
+            glyphWidth: number;
+            /**
+             * Allows customization of multi-select labels
+             */
+            label: Dropdown.LabelSettings;
+
+            // endregion
+
+            // region Additional Settings
+
+            /**
+             * When set to auto determines direction based on whether dropdown can fit on screen. Set to upward or downward to always force a direction.
+             *
+             * @default 'auto'
+             */
+            direction: 'auto' | 'upward' | 'downward';
+            /**
+             * Whether dropdown should try to keep itself on screen by checking whether menus display position in its context (Default context is page).
+             *
+             * @default true
+             */
+            keepOnScreen: boolean;
+            /**
+             * Element context to use when checking whether can show when keepOnScreen: true
+             *
+             * @default 'window'
+             */
+            context: string | JQuery;
+            /**
+             * Specifying to "true" will use a fuzzy full text search, setting to "exact" will force the exact search to be matched somewhere in the string
+             *
+             * @default false
+             */
+            fullTextSearch: boolean | 'exact';
+            /**
+             * Whether HTML included in dropdown values should be preserved. (Allows icons to show up in selected value)
+             *
+             * @default true
+             */
+            preserveHTML: boolean;
+            /**
+             * Whether to sort values when creating a dropdown automatically from a select element.
+             *
+             * @default false
+             */
+            sortSelect: boolean;
+            /**
+             * Whether to show dropdown menu automatically on element focus.
+             *
+             * @default true
+             */
+            showOnFocus: boolean;
+            /**
+             * Whether to allow the element to be navigable by keyboard, by automatically creating a tabindex
+             *
+             * @default true
+             */
+            allowTab: boolean;
+            /**
+             * Named transition to use when animating menu in and out.
+             * Defaults to slide down or slide up depending on dropdown direction.
+             * Fade and slide down are available without including ui transitions
+             *
+             * @default 'auto'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: 'auto' | string;
+            /**
+             * Duration of animation events
+             *
+             * @default 200
+             */
+            duration: number;
+            /**
+             * The keycode used to represent keyboard shortcuts. To avoid issues with some foreign languages, you can pass false for comma delimiter's value
+             */
+            keys: Dropdown.KeySettings;
+            /**
+             * Time in milliseconds to debounce show or hide behavior when on: hover is used, or when touch is used.
+             */
+            delay: Dropdown.DelaySettings;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Is called after a dropdown value changes. Receives the name and value of selection and the active menu element
+             */
+            onChange(this: JQuery, value: any, text: string, $choice: JQuery): void;
+            /**
+             * Is called after a dropdown selection is added using a multiple select dropdown, only receives the added value
+             */
+            onAdd(this: JQuery, addedValue: any, addedText: string, $addedChoice: JQuery): void;
+            /**
+             * Is called after a dropdown selection is removed using a multiple select dropdown, only receives the removed value
+             */
+            onRemove(this: JQuery, removedValue: any, removedText: string, $removedChoice: JQuery): void;
+            /**
+             * Allows you to modify a label before it is added. Expects the jQ DOM element for a label to be returned.
+             */
+            onLabelCreate(this: JQuery, value: any, text: string): JQuery;
+            /**
+             * Called when a label is remove, return false; will prevent the label from being removed.
+             */
+            onLabelRemove(this: JQuery, value: any): false | void;
+            /**
+             * Is called after a label is selected by a user
+             */
+            onLabelSelect(this: JQuery, $selectedLabels: JQuery): void;
+            /**
+             * Is called after a dropdown is searched with no matching values
+             */
+            onNoResults(this: JQuery, searchValue: any): void;
+            /**
+             * Is called before a dropdown is shown. If false is returned, dropdown will not be shown.
+             */
+            onShow(this: JQuery): false | void;
+            /**
+             * Is called before a dropdown is hidden. If false is returned, dropdown will not be hidden.
+             */
+            onHide(this: JQuery): false | void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * You can specify site wide messages by modifying $.fn.dropdown.settings.message that will apply on any dropdown if it appears in the page.
+             */
+            message: Dropdown.MessageSettings;
+            selector: Dropdown.SelectorSettings;
+            regExp: Dropdown.RegExpSettings;
+            metadata: Dropdown.MetadataSettings;
+            className: Dropdown.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Dropdown.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Dropdown {
+        interface FieldsSettings extends Pick<FieldsSettings._Impl, keyof FieldsSettings._Impl> { }
+
+        namespace FieldsSettings {
+            type Param = FieldsSettings | object;
+
+            interface _Impl {
+                /**
+                 * grouping for api results
+                 *
+                 * @default 'results'
+                 */
+                remoteValues: string;
+                /**
+                 * grouping for all dropdown values
+                 *
+                 * @default 'values'
+                 */
+                values: string;
+                /**
+                 * displayed dropdown text
+                 *
+                 * @default 'name'
+                 */
+                name: string;
+                /**
+                 * actual dropdown value
+                 *
+                 * @default 'value'
+                 */
+                value: string;
+            }
+        }
+
+        interface LabelSettings extends Pick<LabelSettings._Impl, keyof LabelSettings._Impl> { }
+
+        namespace LabelSettings {
+            type Param = LabelSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'horizontal flip'
+                 */
+                transition: string;
+                /**
+                 * @default 200
+                 */
+                duration: number;
+                /**
+                 * @default false
+                 */
+                variation: false | string;
+            }
+        }
+
+        interface KeySettings extends Pick<KeySettings._Impl, keyof KeySettings._Impl> { }
+
+        namespace KeySettings {
+            type Param = KeySettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 8
+                 */
+                backspace: number;
+                /**
+                 * @default 188
+                 */
+                delimiter: number | false;
+                /**
+                 * @default 46
+                 */
+                deleteKey: number;
+                /**
+                 * @default 13
+                 */
+                enter: number;
+                /**
+                 * @default 27
+                 */
+                escape: number;
+                /**
+                 * @default 33
+                 */
+                pageUp: number;
+                /**
+                 * @default 34
+                 */
+                pageDown: number;
+                /**
+                 * @default 37
+                 */
+                leftArrow: number;
+                /**
+                 * @default 38
+                 */
+                upArrow: number;
+                /**
+                 * @default 39
+                 */
+                rightArrow: number;
+                /**
+                 * @default 40
+                 */
+                downArrow: number;
+            }
+        }
+
+        interface DelaySettings extends Pick<DelaySettings._Impl, keyof DelaySettings._Impl> { }
+
+        namespace DelaySettings {
+            type Param = DelaySettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 300
+                 */
+                hide: number;
+                /**
+                 * @default 200
+                 */
+                show: number;
+                /**
+                 * @default 50
+                 */
+                search: number;
+                /**
+                 * @default 50
+                 */
+                touch: number;
+            }
+        }
+
+        interface MessageSettings extends Pick<MessageSettings._Impl, keyof MessageSettings._Impl> { }
+
+        namespace MessageSettings {
+            type Param = MessageSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'Add <b>{term}</b>'
+                 */
+                addResult: string;
+                /**
+                 * @default '{count} selected'
+                 */
+                count: string;
+                /**
+                 * @default 'Max {maxCount} selections'
+                 */
+                maxSelections: string;
+                /**
+                 * 'No results found.'
+                 */
+                noResults: string;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.addition'
+                 */
+                addition: string;
+                /**
+                 * @default '.ui.dropdown'
+                 */
+                dropdown: string;
+                /**
+                 * @default '> .dropdown.icon'
+                 */
+                icon: string;
+                /**
+                 * @default '> input[type="hidden"], > select'
+                 */
+                input: string;
+                /**
+                 * @default '.item'
+                 */
+                item: string;
+                /**
+                 * @default '> .label'
+                 */
+                label: string;
+                /**
+                 * @default '> .label > .delete.icon'
+                 */
+                remove: string;
+                /**
+                 * @default '.label'
+                 */
+                siblingLabel: string;
+                /**
+                 * @default '.menu'
+                 */
+                menu: string;
+                /**
+                 * @default '.message'
+                 */
+                message: string;
+                /**
+                 * @default '.dropdown.icon'
+                 */
+                menuIcon: string;
+                /**
+                 * @default 'input.search, .menu > .search > input'
+                 */
+                search: string;
+                /**
+                 * @default '> .text:not(.icon)'
+                 */
+                text: string;
+            }
+        }
+
+        interface RegExpSettings extends Pick<RegExpSettings._Impl, keyof RegExpSettings._Impl> { }
+
+        namespace RegExpSettings {
+            type Param = RegExpSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default /[-[\]{}()*+?.,\\^$|#\s]/g
+                 */
+                escape: RegExp;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'defaultText'
+                 */
+                defaultText: string;
+                /**
+                 * @default 'defaultValue'
+                 */
+                defaultValue: string;
+                /**
+                 * @default 'placeholderText'
+                 */
+                placeholderText: string;
+                /**
+                 * @default 'text'
+                 */
+                text: string;
+                /**
+                 * @default 'value'
+                 */
+                value: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'addition'
+                 */
+                addition: string;
+                /**
+                 * @default 'animating'
+                 */
+                animating: string;
+                /**
+                 * @default 'disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'ui dropdown'
+                 */
+                dropdown: string;
+                /**
+                 * @default 'filtered'
+                 */
+                filtered: string;
+                /**
+                 * @default 'hidden transition'
+                 */
+                hidden: string;
+                /**
+                 * @default 'item'
+                 */
+                item: string;
+                /**
+                 * @default 'ui label'
+                 */
+                label: string;
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'menu'
+                 */
+                menu: string;
+                /**
+                 * @default 'message'
+                 */
+                message: string;
+                /**
+                 * @default 'multiple'
+                 */
+                multiple: string;
+                /**
+                 * @default 'default'
+                 */
+                placeholder: string;
+                /**
+                 * @default 'search'
+                 */
+                search: string;
+                /**
+                 * @default 'selected'
+                 */
+                selected: string;
+                /**
+                 * @default 'selection'
+                 */
+                selection: string;
+                /**
+                 * @default 'upward'
+                 */
+                upward: string;
+                /**
+                 * @default 'visible'
+                 */
+                visible: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'You called a dropdown action that was not defined'
+                 */
+                action: string;
+                /**
+                 * @default 'Once a select has been initialized behaviors must be called on the created ui dropdown'
+                 */
+                alreadySetup: string;
+                /**
+                 * @default 'Allowing user additions currently requires the use of labels.'
+                 */
+                labels: string;
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+                /**
+                 * @default 'This module requires ui transitions <https: github.com="" semantic-org="" ui-transition="">'
+                 */
+                noTransition: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-dropdown/index.d.ts b/types/semantic-ui-dropdown/index.d.ts
new file mode 100644
index 0000000000..a2fbc7565f
--- /dev/null
+++ b/types/semantic-ui-dropdown/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for semantic-ui-dropdown 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference types="semantic-ui-api" />
+/// <reference path="global.d.ts" />
+
+declare const dropdown: SemanticUI.Dropdown;
+export = dropdown;
diff --git a/types/semantic-ui-dropdown/semantic-ui-dropdown-tests.ts b/types/semantic-ui-dropdown/semantic-ui-dropdown-tests.ts
new file mode 100644
index 0000000000..2dafbf9c8e
--- /dev/null
+++ b/types/semantic-ui-dropdown/semantic-ui-dropdown-tests.ts
@@ -0,0 +1,208 @@
+function test_dropdown_static() {
+    $.fn.dropdown.settings.error.method = 'method';
+    $.fn.dropdown.settings.namespace = 'namespace';
+    $.fn.dropdown.settings.name = 'name';
+    $.fn.dropdown.settings.silent = false;
+    $.fn.dropdown.settings.debug = true;
+    $.fn.dropdown.settings.performance = true;
+    $.fn.dropdown.settings.verbose = true;
+}
+
+function test_dropdown() {
+    const selector = '.ui.dropdown';
+    $(selector).dropdown('setup menu') === $();
+    $(selector).dropdown('refresh') === $();
+    $(selector).dropdown('toggle') === $();
+    $(selector).dropdown('show') === $();
+    $(selector).dropdown('hide') === $();
+    $(selector).dropdown('clear') === $();
+    $(selector).dropdown('hide others') === $();
+    $(selector).dropdown('restore defaults') === $();
+    $(selector).dropdown('restore default text') === $();
+    $(selector).dropdown('restore placeholder text') === $();
+    $(selector).dropdown('restore default value') === $();
+    $(selector).dropdown('save defaults') === $();
+    $(selector).dropdown('set selected', 123) === $();
+    $(selector).dropdown('remove selected', false) === $();
+    $(selector).dropdown('set selected', ['456']) === $();
+    $(selector).dropdown('set exactly', []) === $();
+    $(selector).dropdown('set text', 'hello') === $();
+    $(selector).dropdown('set value', 24) === $();
+    $(selector).dropdown('get text') === 'text';
+    $(selector).dropdown('get value') === {};
+    $(selector).dropdown('get item', 'Pennsylvania') === $();
+    $(selector).dropdown('bind touch events') === $();
+    $(selector).dropdown('bind mouse events') === $();
+    $(selector).dropdown('bind intent') === $();
+    $(selector).dropdown('unbind intent') === $();
+    $(selector).dropdown('determine intent') === true;
+    $(selector).dropdown('determine select action', 'text', 90) === $();
+    $(selector).dropdown('set active') === $();
+    $(selector).dropdown('set visible') === $();
+    $(selector).dropdown('remove active') === $();
+    $(selector).dropdown('remove visible') === $();
+    $(selector).dropdown('is selection') === false;
+    $(selector).dropdown('is animated') === false;
+    $(selector).dropdown('is visible') === false;
+    $(selector).dropdown('is hidden') === false;
+    $(selector).dropdown('get default text') === 'default text';
+    $(selector).dropdown('get placeholder text') === 'placeholder text';
+    $(selector).dropdown('destroy') === $();
+    $(selector).dropdown('setting', 'debug', undefined) === false;
+    $(selector).dropdown('setting', 'debug') === false;
+    $(selector).dropdown('setting', 'debug', true) === $();
+    $(selector).dropdown('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).dropdown({
+        on: 'hover',
+        allowReselection: true,
+        allowAdditions: false,
+        hideAdditions: true,
+        action(text, value, element) {
+            this === $();
+            text === 'text';
+            if (typeof value !== 'string') {
+                value === false;
+            }
+            element === $();
+        },
+        minCharacters: 2,
+        match: 'text',
+        selectOnKeydown: false,
+        forceSelection: true,
+        allowCategorySelection: false,
+        placeholder: 'value',
+        apiSettings: {
+            cache: 'local',
+            throttleFirstRequest: true,
+            loadingDuration: 20
+        },
+        fields: {
+            remoteValues: 'remoteValues',
+            values: 'values',
+            name: 'name',
+            value: 'value'
+        },
+        saveRemoteData: true,
+        filterRemoteData: false,
+        useLabels: true,
+        maxSelections: 20,
+        glyphWidth: 14,
+        label: {
+            transition: 'horizontal flip',
+            duration: 200,
+            variation: 'basic'
+        },
+        direction: 'downward',
+        keepOnScreen: false,
+        context: 'body',
+        fullTextSearch: 'exact',
+        preserveHTML: true,
+        sortSelect: false,
+        showOnFocus: true,
+        allowTab: false,
+        transition: 'auto',
+        duration: 500,
+        keys: {
+            backspace: 8,
+            delimiter: false,
+            deleteKey: 46,
+            enter: 13,
+            escape: 27,
+            pageUp: 33,
+            pageDown: 34,
+            leftArrow: 37,
+            upArrow: 38,
+            rightArrow: 30,
+            downArrow: 40
+        },
+        delay: {
+            hide: 300,
+            show: 200,
+            search: 50,
+            touch: 50
+        },
+        onChange(value, text, $choice) {
+            value === {};
+            text === 'text';
+            $choice === $();
+        },
+        onAdd(addedValue, addedText, $addedChoice) {
+            addedValue === {};
+            addedText === 'addedText';
+            $addedChoice === $();
+        },
+        message: {
+            addResult: 'addResult',
+            count: 'count',
+            maxSelections: 'maxSelections',
+            noResults: 'noResults',
+        },
+        selector: {
+            addition: 'addition',
+            dropdown: 'dropdown',
+            icon: 'icon',
+            input: 'input',
+            item: 'item',
+            label: 'label',
+            remove: 'remove',
+            siblingLabel: 'siblingLabel',
+            menu: 'menu',
+            message: 'message',
+            menuIcon: 'menuIcon',
+            search: 'search',
+            text: 'text',
+        },
+        regExp: {
+            escape: /[-[\]{}()*+?.,\\^$|#\s]/g
+        },
+        metadata: {
+            defaultText: 'defaultText',
+            defaultValue: 'defaultValue',
+            placeholderText: 'placeholderText',
+            text: 'text',
+            value: 'value',
+        },
+        className: {
+            active: 'active',
+            addition: 'addition',
+            animating: 'animating',
+            disabled: 'disabled',
+            dropdown: 'dropdown',
+            filtered: 'filtered',
+            hidden: 'hidden',
+            item: 'item',
+            label: 'label',
+            loading: 'loading',
+            menu: 'menu',
+            message: 'message',
+            multiple: 'multiple',
+            placeholder: 'placeholder',
+            search: 'search',
+            selected: 'selected',
+            selection: 'selection',
+            upward: 'upward',
+            visible: 'visible',
+        },
+        error: {
+            action: 'action',
+            alreadySetup: 'alreadySetup',
+            labels: 'labels',
+            method: 'method',
+            noTransition: 'noTransition'
+        }
+    }) === $();
+    $(selector).dropdown() === $();
+}
+
+import dropdown = require('semantic-ui-dropdown');
+
+function test_module() {
+    $.fn.dropdown = dropdown;
+}
diff --git a/types/semantic-ui-dropdown/tsconfig.json b/types/semantic-ui-dropdown/tsconfig.json
new file mode 100644
index 0000000000..99682f13a2
--- /dev/null
+++ b/types/semantic-ui-dropdown/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-dropdown-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-dropdown/tslint.json b/types/semantic-ui-dropdown/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-dropdown/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-embed/global.d.ts b/types/semantic-ui-embed/global.d.ts
new file mode 100644
index 0000000000..e851b252a1
--- /dev/null
+++ b/types/semantic-ui-embed/global.d.ts
@@ -0,0 +1,330 @@
+interface JQuery {
+    embed: SemanticUI.Embed;
+}
+
+declare namespace SemanticUI {
+    interface Embed {
+        settings: EmbedSettings;
+
+        /**
+         * Changes iframe to a new content source
+         */
+        (behavior: 'change', source: string, id: string, url: string): JQuery;
+        /**
+         * Removes embed and shows placeholder content if available
+         */
+        (behavior: 'reset'): JQuery;
+        /**
+         * Shows embed content
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides embed content and shows placeholder content
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Returns current content id
+         */
+        (behavior: 'get id'): string;
+        /**
+         * Returns placeholder image url
+         */
+        (behavior: 'get placeholder'): string;
+        /**
+         * Returns source name
+         */
+        (behavior: 'get sources'): string;
+        /**
+         * Returns source type
+         */
+        (behavior: 'get type'): string;
+        /**
+         * Returns URL with all parameters added
+         */
+        (behavior: 'get url'): string;
+        /**
+         * Returns whether embed content has placeholder
+         */
+        (behavior: 'has placeholder'): boolean;
+        /**
+         * Destroys instance and removes all events
+         */
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof EmbedSettings>(behavior: 'setting', name: K, value?: undefined): EmbedSettings[K];
+        <K extends keyof EmbedSettings>(behavior: 'setting', name: K, value: EmbedSettings[K]): JQuery;
+        (behavior: 'setting', value: EmbedSettings.Param): JQuery;
+        (settings?: EmbedSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/embed.html#/settings}
+     */
+    interface EmbedSettings extends Pick<EmbedSettings._Impl, keyof EmbedSettings._Impl> { }
+
+    namespace EmbedSettings {
+        type Param = EmbedSettings | object;
+
+        interface _Impl {
+            /**
+             * Specifies a url to use for embed
+             *
+             * @default false
+             */
+            url: false | string;
+
+            // region Embed Settings
+
+            /**
+             * Specifies an icon to use with placeholder content
+             *
+             * @default false
+             */
+            icon: false | string;
+            /**
+             * Specifies a source to use, if no source is provided it will be determined from the domain of a specified url.
+             *
+             * @default false
+             */
+            source: false | string;
+            /**
+             * Specifies an id value to replace with the {id} value found in templated urls
+             *
+             * @default false
+             */
+            id: false | string;
+            /**
+             * Specify an object containing key/value pairs to add to the iframes GET parameters
+             *
+             * @default false
+             */
+            parameters: false | Embed.ParametersSettings;
+
+            // endregion
+
+            // region Video Settings
+
+            /**
+             * Default setting auto will only autoplay content when a placeholder is specified. Setting to true or false will force autoplay.
+             *
+             * @default 'auto'
+             */
+            autoplay: 'auto' | boolean;
+            /**
+             * Specifies a default chrome color with Vimeo or YouTube.
+             *
+             * @default '#444444'
+             */
+            color: string;
+            /**
+             * Whether to prefer HD content
+             *
+             * @default true
+             */
+            hd: boolean;
+            /**
+             * Whether to show networks branded UI like title cards, or after video calls to action.
+             *
+             * @default false
+             */
+            brandedUI: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback when iframe is generated
+             */
+            onCreate(this: JQuery, url: string): void;
+            /**
+             * Whenever an iframe contents is shown
+             */
+            onDisplay(this: JQuery): void;
+            /**
+             * Callback immediately before Embed is removed from DOM
+             */
+            onPlaceholderDisplay(this: JQuery): void;
+            /**
+             * Callback when module parameters are determined. Allows you to adjust parameters at run time by returning a new parameters object.
+             */
+            onEmbed(this: JQuery, parameters: Embed.ParametersSettings): Embed.ParametersSettings;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * DOM Selectors used internally
+             */
+            selector: Embed.SelectorSettings;
+            /**
+             * HTML Data attributes used to store data
+             */
+            metadata: Embed.MetadataSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Embed.ClassNameSettings;
+            templates: Embed.TemplatesSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Embed.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Embed {
+        interface ParametersSettings extends Pick<ParametersSettings._Impl, keyof ParametersSettings._Impl> { }
+
+        namespace ParametersSettings {
+            type Param = ParametersSettings | object;
+
+            interface _Impl {
+                [key: string]: any;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.embed'
+                 */
+                embed: string;
+                /**
+                 * @default '.placeholder'
+                 */
+                placeholder: string;
+                /**
+                 * @default '.play'
+                 */
+                play: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'id'
+                 */
+                id: string;
+                /**
+                 * @default 'icon'
+                 */
+                icon: string;
+                /**
+                 * @default 'placeholder'
+                 */
+                placeholder: string;
+                /**
+                 * @default 'source'
+                 */
+                source: string;
+                /**
+                 * @default 'url'
+                 */
+                url: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'embed'
+                 */
+                embed: string;
+            }
+        }
+
+        interface TemplatesSettings extends Pick<TemplatesSettings._Impl, keyof TemplatesSettings._Impl> { }
+
+        namespace TemplatesSettings {
+            type Param = TemplatesSettings | object;
+
+            interface _Impl {
+                /**
+                 * returns html for iframe
+                 */
+                iframe(url: string, parameters: string): string;
+                /**
+                 * returns html for placeholder element
+                 */
+                placeholder(image: string, icon: string): string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'No URL specified'
+                 */
+                noURL: string;
+                /**
+                 * @default 'The method you called is not defined'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-embed/index.d.ts b/types/semantic-ui-embed/index.d.ts
new file mode 100644
index 0000000000..0bea40f6de
--- /dev/null
+++ b/types/semantic-ui-embed/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-embed 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const embed: SemanticUI.Embed;
+export = embed;
diff --git a/types/semantic-ui-embed/semantic-ui-embed-tests.ts b/types/semantic-ui-embed/semantic-ui-embed-tests.ts
new file mode 100644
index 0000000000..486092a2a1
--- /dev/null
+++ b/types/semantic-ui-embed/semantic-ui-embed-tests.ts
@@ -0,0 +1,102 @@
+function test_embed_static() {
+    $.fn.embed.settings.error.method = 'method';
+    $.fn.embed.settings.namespace = 'namespace';
+    $.fn.embed.settings.name = 'name';
+    $.fn.embed.settings.silent = false;
+    $.fn.embed.settings.debug = true;
+    $.fn.embed.settings.performance = true;
+    $.fn.embed.settings.verbose = true;
+}
+
+function test_embed() {
+    const selector = '.ui.embed';
+    $(selector).embed('change', 'source', 'id', 'url') === $();
+    $(selector).embed('reset') === $();
+    $(selector).embed('show') === $();
+    $(selector).embed('hide') === $();
+    $(selector).embed('get id') === 'get';
+    $(selector).embed('get placeholder') === 'get';
+    $(selector).embed('get sources') === 'get';
+    $(selector).embed('get type') === 'get';
+    $(selector).embed('get url') === 'get';
+    $(selector).embed('has placeholder') === true;
+    $(selector).embed('destroy') === $();
+    $(selector).embed('setting', 'debug', undefined) === false;
+    $(selector).embed('setting', 'debug') === false;
+    $(selector).embed('setting', 'debug', true) === $();
+    $(selector).embed('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).embed({
+        url: 'url',
+        icon: 'icon',
+        source: 'source',
+        id: 'id',
+        parameters: {
+            key: 'value'
+        },
+        autoplay: true,
+        color: 'color',
+        hd: false,
+        brandedUI: true,
+        onCreate(url) {
+            this === $();
+            url === 'url';
+        },
+        onDisplay() {
+            this === $();
+        },
+        onPlaceholderDisplay() {
+            this === $();
+        },
+        onEmbed(parameters) {
+            this === $();
+            parameters.key = 'value';
+            return parameters;
+        },
+        selector: {
+            embed: 'embed',
+            placeholder: 'placeholder',
+            play: 'play'
+        },
+        metadata: {
+            id: 'id',
+            icon: 'icon',
+            placeholder: 'placeholder',
+            source: 'source',
+            url: 'url'
+        },
+        className: {
+            active: 'active',
+            embed: 'embed'
+        },
+        templates: {
+            iframe(url, parameters) {
+                url === 'url';
+                parameters === 'parameters';
+                return url + parameters;
+            },
+            placeholder(image, icon) {
+                image === 'image';
+                icon === 'icon';
+                return image + icon;
+            }
+        },
+        error: {
+            noURL: 'noURL',
+            method: 'method'
+        }
+    }) === $();
+    $(selector).embed() === $();
+}
+
+import embed = require('semantic-ui-embed');
+
+function test_module() {
+    $.fn.embed = embed;
+}
diff --git a/types/semantic-ui-embed/tsconfig.json b/types/semantic-ui-embed/tsconfig.json
new file mode 100644
index 0000000000..0165f1c18f
--- /dev/null
+++ b/types/semantic-ui-embed/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-embed-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-embed/tslint.json b/types/semantic-ui-embed/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-embed/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-form/global.d.ts b/types/semantic-ui-form/global.d.ts
new file mode 100644
index 0000000000..13fefb8147
--- /dev/null
+++ b/types/semantic-ui-form/global.d.ts
@@ -0,0 +1,465 @@
+interface JQuery {
+    form: SemanticUI.Form;
+}
+
+declare namespace SemanticUI {
+    interface Form {
+        settings: FormSettings;
+
+        /**
+         * Submits selected form
+         */
+        (behavior: 'submit'): JQuery;
+        /**
+         * Returns true/false whether a form passes its validation rules
+         */
+        (behavior: 'is valid'): boolean;
+        /**
+         * Validates form and calls onSuccess or onFailure
+         */
+        (behavior: 'validate form'): JQuery;
+        /**
+         * gets browser property change event
+         */
+        (behavior: 'get change event'): string;
+        /**
+         * Returns element with matching name, id, or data-validate metadata to ID
+         */
+        (behavior: 'get field', id: string): JQuery;
+        /**
+         * Returns value of element with id
+         */
+        (behavior: 'get value', id: string): any;
+        /**
+         * Returns object of element values that match array of ids. If no IDS are passed will return all fields
+         */
+        (behavior: 'get values', ids?: string[]): any;
+        /**
+         * Sets value of element with id
+         */
+        (behavior: 'set value', id: string): JQuery;
+        /**
+         * Sets key/value pairs from passed values object to matching ids
+         */
+        (behavior: 'set values', values: any): JQuery;
+        /**
+         * Returns validation rules for a given jQuery-referenced input field
+         */
+        (behavior: 'get validation', element: JQuery): any;
+        /**
+         * Returns whether a field exists
+         */
+        (behavior: 'has field', identifier: string): boolean;
+        /**
+         * Adds errors to form, given an array errors
+         */
+        (behavior: 'add errors', errors: string[]): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof FormSettings>(behavior: 'setting', name: K, value?: undefined): FormSettings[K];
+        <K extends keyof FormSettings>(behavior: 'setting', name: K, value: FormSettings[K]): JQuery;
+        (behavior: 'setting', value: FormSettings.Param): JQuery;
+        (settings?: FormSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/behaviors/form.html#/settings}
+     */
+    interface FormSettings extends Pick<FormSettings._Impl, keyof FormSettings._Impl> { }
+
+    namespace FormSettings {
+        type Param = FormSettings | object;
+
+        interface _Impl {
+            // region Form Settings
+
+            /**
+             * Adds keyboard shortcuts for enter and escape keys to submit form and blur fields respectively
+             *
+             * @default true
+             */
+            keyboardShortcuts: boolean;
+            /**
+             * Event used to trigger validation. Can be either submit, blur or change.
+             *
+             * @default 'submit'
+             */
+            on: 'submit' | 'blur' | 'change';
+            /**
+             * If set to true will revalidate fields with errors on input change
+             *
+             * @default true
+             */
+            revalidate: boolean;
+            /**
+             * Delay from last typed letter to validate a field when using on: change or when revalidating a field.
+             *
+             * @default true
+             */
+            delay: boolean;
+            /**
+             * Adds inline error on field validation error
+             *
+             * @default false
+             */
+            inline: boolean;
+            /**
+             * Named transition to use when animating validation errors. Fade and slide down are available without including ui transitions
+             *
+             * @default 'scale'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: string;
+            /**
+             * Animation speed for inline prompt
+             *
+             * @default 150
+             */
+            duration: number;
+            fields: {
+                [name: string]: string | string[] | Form.Field;
+            };
+
+            // endregion
+
+            // region Form Prompts
+
+            text: Form.TextSettings;
+            prompt: Form.PromptSettings;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on each valid field
+             */
+            onValid(this: JQuery): void;
+            /**
+             * Callback on each invalid field
+             */
+            onInvalid(this: JQuery): void;
+            /**
+             * Callback if a form is all valid
+             */
+            onSuccess(this: JQuery, event: JQueryEventObject, fields: any): void;
+            /**
+             * Callback if any form field is invalid
+             */
+            onFailure(this: JQuery, formErrors: string[], fields: any): void;
+
+            // endregion
+
+            // region Templates
+
+            templates: Form.TemplatesSettings;
+
+            // endregion
+
+            // region Rules
+
+            rules: {
+                [name: string]: (this: HTMLElement, ...args: any[]) => boolean;
+            };
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Selectors used to match functionality to DOM
+             */
+            selector: Form.SelectorSettings;
+            /**
+             * HTML5 metadata attributes
+             */
+            metadata: Form.MetadataSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Form.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Form.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Form {
+        interface Field {
+            identifier: string;
+            rules: Rule[];
+        }
+
+        interface Rule {
+            type: string;
+            prompt: string;
+        }
+
+        interface TextSettings extends Pick<TextSettings._Impl, keyof TextSettings._Impl> { }
+
+        namespace TextSettings {
+            type Param = TextSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'Please enter a valid value'
+                 */
+                unspecifiedRule: string;
+                /**
+                 * @default 'This field'
+                 */
+                unspecifiedField: string;
+            }
+        }
+
+        interface PromptSettings extends Pick<PromptSettings._Impl, keyof PromptSettings._Impl> { }
+
+        namespace PromptSettings {
+            type Param = PromptSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '{name} must have a value'
+                 */
+                empty: string;
+                /**
+                 * @default '{name} must be checked'
+                 */
+                checked: string;
+                /**
+                 * @default '{name} must be a valid e-mail'
+                 */
+                email: string;
+                /**
+                 * @default '{name} must be a valid url'
+                 */
+                url: string;
+                /**
+                 * @default '{name} is not formatted correctly'
+                 */
+                regExp: string;
+                /**
+                 * @default '{name} must be an integer'
+                 */
+                integer: string;
+                /**
+                 * @default '{name} must be a decimal number'
+                 */
+                decimal: string;
+                /**
+                 * @default '{name} must be set to a number'
+                 */
+                number: string;
+                /**
+                 * @default '{name} must be \'{ruleValue}\''
+                 */
+                is: string;
+                /**
+                 * @default '{name} must be exactly \'{ruleValue}\''
+                 */
+                isExactly: string;
+                /**
+                 * @default '{name} cannot be set to \'{ruleValue}\''
+                 */
+                not: string;
+                /**
+                 * @default '{name} cannot be set to exactly \'{ruleValue}\''
+                 */
+                notExactly: string;
+                /**
+                 * @default '{name} cannot contain \'{ruleValue}\''
+                 */
+                contain: string;
+                /**
+                 * @default '{name} cannot contain exactly \'{ruleValue}\''
+                 */
+                containExactly: string;
+                /**
+                 * @default '{name} must contain  \'{ruleValue}\''
+                 */
+                doesntContain: string;
+                /**
+                 * @default '{name} must contain exactly \'{ruleValue}\''
+                 */
+                doesntContainExactly: string;
+                /**
+                 * @default '{name} must be at least {ruleValue} characters'
+                 */
+                minLength: string;
+                /**
+                 * @default '{name} must be at least {ruleValue} characters'
+                 */
+                length: string;
+                /**
+                 * @default '{name} must be exactly {ruleValue} characters'
+                 */
+                exactLength: string;
+                /**
+                 * @default '{name} cannot be longer than {ruleValue} characters'
+                 */
+                maxLength: string;
+                /**
+                 * @default '{name} must match {ruleValue} field'
+                 */
+                match: string;
+                /**
+                 * @default '{name} must have a different value than {ruleValue} field'
+                 */
+                different: string;
+                /**
+                 * @default '{name} must be a valid credit card number'
+                 */
+                creditCard: string;
+                /**
+                 * @default '{name} must have at least {ruleValue} choices'
+                 */
+                minCount: string;
+                /**
+                 * @default '{name} must have exactly {ruleValue} choices'
+                 */
+                exactCount: string;
+                /**
+                 * @default '{name} must have {ruleValue} or less choices'
+                 */
+                maxCount: string;
+            }
+        }
+
+        interface TemplatesSettings extends Pick<TemplatesSettings._Impl, keyof TemplatesSettings._Impl> { }
+
+        namespace TemplatesSettings {
+            type Param = TemplatesSettings | object;
+
+            interface _Impl {
+                error(errors: string[]): JQuery;
+                prompt(errors: string[]): JQuery;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.error.message'
+                 */
+                message: string;
+                /**
+                 * @default 'input, textarea, select'
+                 */
+                field: string;
+                /**
+                 * @default '.field'
+                 */
+                group: string;
+                /**
+                 * @default 'input'
+                 */
+                input: string;
+                /**
+                 * @default '.prompt'
+                 */
+                prompt: string;
+                /**
+                 * @default '.submit'
+                 */
+                submit: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'validate'
+                 */
+                validate: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'default'
+                 */
+                placeholder: string;
+                /**
+                 * @default 'disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'visible'
+                 */
+                visible: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-form/index.d.ts b/types/semantic-ui-form/index.d.ts
new file mode 100644
index 0000000000..17c11c479a
--- /dev/null
+++ b/types/semantic-ui-form/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-form 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const form: SemanticUI.Form;
+export = form;
diff --git a/types/semantic-ui-form/semantic-ui-form-tests.ts b/types/semantic-ui-form/semantic-ui-form-tests.ts
new file mode 100644
index 0000000000..58e8a18f70
--- /dev/null
+++ b/types/semantic-ui-form/semantic-ui-form-tests.ts
@@ -0,0 +1,156 @@
+function test_form_static() {
+    $.fn.form.settings.error.method = 'method';
+    $.fn.form.settings.namespace = 'namespace';
+    $.fn.form.settings.name = 'name';
+    $.fn.form.settings.silent = false;
+    $.fn.form.settings.debug = true;
+    $.fn.form.settings.performance = true;
+    $.fn.form.settings.verbose = true;
+}
+
+function test_form() {
+    const selector = '.ui.form';
+    $(selector).form('submit') === $();
+    $(selector).form('is valid') === false;
+    $(selector).form('validate form') === $();
+    $(selector).form('get change event') === 'change event';
+    $(selector).form('get field', 'id') === $();
+    $(selector).form('get value', 'id') === {};
+    $(selector).form('get values', ['id1', 'id2']) === {};
+    $(selector).form('set value', 'id') === $();
+    $(selector).form('set values', ['id1', 'id2']) === $();
+    $(selector).form('get validation', $()) === {};
+    $(selector).form('has field', 'identifier') === true;
+    $(selector).form('add errors', ['error1', 'error2']) === $();
+    $(selector).form('destroy') === $();
+    $(selector).form('setting', 'debug', undefined) === false;
+    $(selector).form('setting', 'debug') === false;
+    $(selector).form('setting', 'debug', true) === $();
+    $(selector).form('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).form({
+        keyboardShortcuts: false,
+        on: 'submit',
+        revalidate: true,
+        delay: 20,
+        inline: false,
+        transition: 'fade',
+        duration: 22,
+        fields: {
+            field1: 'field1',
+            field2: ['field1', 'field2'],
+            field3: {
+                identifier: 'identifier',
+                rules: [
+                    {
+                        type: 'type',
+                        prompt: 'prompt'
+                    },
+                    {
+                        type: 'type',
+                        prompt: 'prompt'
+                    }
+                ]
+            }
+        },
+        text: {
+            unspecifiedRule: 'unspecifiedRule',
+            unspecifiedField: 'unspecifiedField'
+        },
+        prompt: {
+            empty: 'empty',
+            checked: 'checked',
+            email: 'email',
+            url: 'url',
+            regExp: 'regExp',
+            integer: 'integer',
+            decimal: 'decimal',
+            number: 'number',
+            is: 'is',
+            isExactly: 'isExactly',
+            not: 'not',
+            notExactly: 'notExactly',
+            contain: 'contain',
+            containExactly: 'containExactly',
+            doesntContain: 'doesntContain',
+            doesntContainExactly: 'doesntContainExactly',
+            minLength: 'minLength',
+            length: 'length',
+            exactLength: 'exactLength',
+            maxLength: 'maxLength',
+            match: 'match',
+            different: 'different',
+            creditCard: 'creditCard',
+            minCount: 'minCount',
+            exactCount: 'exactCount',
+            maxCount: 'maxCount'
+        },
+        onValid() {
+            this === $();
+        },
+        onInvalid() {
+            this === $();
+        },
+        onSuccess(event, fields) {
+            this === $();
+            event.stopPropagation();
+            fields === {};
+        },
+        onFailure(formErrors, fields) {
+            this === $();
+            formErrors === [];
+            fields === {};
+        },
+        templates: {
+            error(errors) {
+                errors === [];
+                return $();
+            },
+            prompt(errors) {
+                errors === [];
+                return $();
+            }
+        },
+        rules: {
+            empty(value) {
+                return !(value === undefined || '' === value || $.isArray(value) && value.length === 0);
+            },
+            checked() {
+                return ($(this).filter(':checked').length > 0);
+            }
+        },
+        selector: {
+            message: 'message',
+            field: 'field',
+            group: 'group',
+            input: 'input',
+            prompt: 'prompt',
+            submit: 'submit'
+        },
+        metadata: {
+            validate: 'validate'
+        },
+        className: {
+            active: 'active',
+            placeholder: 'placeholder',
+            disabled: 'disabled',
+            visible: 'visible'
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).form() === $();
+}
+
+import form = require('semantic-ui-form');
+
+function test_module() {
+    $.fn.form = form;
+}
diff --git a/types/semantic-ui-form/tsconfig.json b/types/semantic-ui-form/tsconfig.json
new file mode 100644
index 0000000000..172834b107
--- /dev/null
+++ b/types/semantic-ui-form/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-form-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-form/tslint.json b/types/semantic-ui-form/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-form/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-modal/global.d.ts b/types/semantic-ui-modal/global.d.ts
new file mode 100644
index 0000000000..84f9116e8b
--- /dev/null
+++ b/types/semantic-ui-modal/global.d.ts
@@ -0,0 +1,286 @@
+interface JQuery {
+    modal: SemanticUI.Modal;
+}
+
+declare namespace SemanticUI {
+    interface Modal {
+        settings: ModalSettings;
+
+        /**
+         * Shows the modal
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides the modal
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Toggles the modal
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Refreshes centering of modal on page
+         */
+        (behavior: 'refresh'): JQuery;
+        /**
+         * Shows associated page dimmer
+         */
+        (behavior: 'show dimmer'): JQuery;
+        /**
+         * Hides associated page dimmer
+         */
+        (behavior: 'hide dimmer'): JQuery;
+        /**
+         * Hides all modals not selected modal in a dimmer
+         */
+        (behavior: 'hide others'): JQuery;
+        /**
+         * Hides all visible modals in the same dimmer
+         */
+        (behavior: 'hide all'): JQuery;
+        /**
+         * Caches current modal size
+         */
+        (behavior: 'cache sizes'): JQuery;
+        /**
+         * Returns whether the modal can fit on the page
+         */
+        (behavior: 'can fit'): boolean;
+        /**
+         * Returns whether the modal is active
+         */
+        (behavior: 'is active'): boolean;
+        /**
+         * Sets modal to active
+         */
+        (behavior: 'set active'): JQuery;
+        (behavior: 'attach events', selector: string | JQuery, event?: string): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof ModalSettings>(behavior: 'setting', name: K, value?: undefined): ModalSettings[K];
+        <K extends keyof ModalSettings>(behavior: 'setting', name: K, value: ModalSettings[K]): JQuery;
+        (behavior: 'setting', value: ModalSettings.Param): JQuery;
+        (settings?: ModalSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/modal.html#/settings}
+     */
+    interface ModalSettings extends Pick<ModalSettings._Impl, keyof ModalSettings._Impl> { }
+
+    namespace ModalSettings {
+        type Param = ModalSettings | object;
+
+        interface _Impl {
+            // region Modal Settings
+
+            /**
+             * If set to false will prevent the modal from being moved to inside the dimmer
+             *
+             * @default true
+             */
+            detachable: boolean;
+            /**
+             * When true, the first form input inside the modal will receive focus when shown. Set this to false to prevent this behavior.
+             *
+             * @default true
+             */
+            autofocus: boolean;
+            /**
+             * Whether any change in modal DOM should automatically refresh cached positions
+             *
+             * @default false
+             */
+            observeChanges: boolean;
+            /**
+             * If set to true will not close other visible modals when opening a new one
+             *
+             * @default false
+             */
+            allowMultiple: boolean;
+            /**
+             * Whether to automatically bind keyboard shortcuts
+             *
+             * @default true
+             */
+            keyboardShortcuts: boolean;
+            /**
+             *    A vertical offset to allow for content outside of modal, for example a close button, to be centered.
+             *
+             * @default 0
+             */
+            offset: number;
+            /**
+             * Selector or jquery object specifying the area to dim
+             *
+             * @default 'body'
+             */
+            context: string | JQuery;
+            /**
+             * Setting to false will not allow you to close the modal by clicking on the dimmer
+             *
+             * @default true
+             */
+            closable: boolean;
+            /**
+             * You can specify custom settings to extend UI dimmer
+             *
+             * @see {@link http://semantic-ui.com/modules/dimmer.html}
+             */
+            dimmerSettings: DimmerSettings;
+            /**
+             * Named transition to use when animating menu in and out, full list can be found in ui transitions docs.
+             *
+             * @default 'scale'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: string;
+            /**
+             * Duration of animation
+             *
+             * @default 400
+             */
+            duration: number;
+            /**
+             * Whether additional animations should queue
+             *
+             * @default false
+             */
+            queue: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Is called when a modal starts to show.
+             */
+            onShow(this: JQuery): void;
+            /**
+             * Is called after a modal has finished showing animating.
+             */
+            onVisible(this: JQuery): void;
+            /**
+             * Is called after a modal starts to hide. If the function returns false, the modal will not hide.
+             */
+            onHide(this: JQuery, $element: JQuery): false | void;
+            /**
+             * Is called after a modal has finished hiding animation.
+             */
+            onHidden(this: JQuery): void;
+            /**
+             * Is called after a positive, approve or ok button is pressed. If the function returns false, the modal will not hide.
+             */
+            onApprove(this: JQuery, $element: JQuery): false | void;
+            /**
+             * Is called after a negative, deny or cancel button is pressed. If the function returns false the modal will not hide.
+             */
+            onDeny(this: JQuery, $element: JQuery): false | void;
+
+            // endregion
+
+            // region DOM Settings
+
+            selector: Modal.SelectorSettings;
+            className: Modal.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Modal.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Modal {
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.close, .actions .button'
+                 */
+                close: string;
+                /**
+                 * @default '.actions .positive, .actions .approve, .actions .ok'
+                 */
+                approve: string;
+                /**
+                 * @default '.actions .negative, .actions .deny, .actions .cancel'
+                 */
+                deny: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'scrolling'
+                 */
+                scrolling: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-modal/index.d.ts b/types/semantic-ui-modal/index.d.ts
new file mode 100644
index 0000000000..2193cbce7a
--- /dev/null
+++ b/types/semantic-ui-modal/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for semantic-ui-modal 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference types="semantic-ui-dimmer" />
+/// <reference path="global.d.ts" />
+
+declare const modal: SemanticUI.Modal;
+export = modal;
diff --git a/types/semantic-ui-modal/semantic-ui-modal-tests.ts b/types/semantic-ui-modal/semantic-ui-modal-tests.ts
new file mode 100644
index 0000000000..ed2a10d3e2
--- /dev/null
+++ b/types/semantic-ui-modal/semantic-ui-modal-tests.ts
@@ -0,0 +1,139 @@
+function test_modal_static() {
+    $.fn.modal.settings.error.method = 'method';
+    $.fn.modal.settings.namespace = 'namespace';
+    $.fn.modal.settings.name = 'name';
+    $.fn.modal.settings.silent = false;
+    $.fn.modal.settings.debug = true;
+    $.fn.modal.settings.performance = true;
+    $.fn.modal.settings.verbose = true;
+}
+
+function test_modal() {
+    const selector = '.ui.modal';
+    $(selector).modal('show') === $();
+    $(selector).modal('hide') === $();
+    $(selector).modal('toggle') === $();
+    $(selector).modal('refresh') === $();
+    $(selector).modal('show dimmer') === $();
+    $(selector).modal('hide dimmer') === $();
+    $(selector).modal('hide others') === $();
+    $(selector).modal('hide all') === $();
+    $(selector).modal('cache sizes') === $();
+    $(selector).modal('can fit') === true;
+    $(selector).modal('is active') === true;
+    $(selector).modal('set active') === $();
+    $(selector).modal('attach events', 'selector', 'blur') === $();
+    $(selector).modal('destroy') === $();
+    $(selector).modal('setting', 'debug', undefined) === false;
+    $(selector).modal('setting', 'debug') === false;
+    $(selector).modal('setting', 'debug', true) === $();
+    $(selector).modal('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).modal({
+        detachable: true,
+        autofocus: false,
+        observeChanges: true,
+        allowMultiple: false,
+        keyboardShortcuts: true,
+        offset: 10,
+        context: $(),
+        closable: false,
+        dimmerSettings: {
+            opacity: 1,
+            variation: 'variation',
+            dimmerName: 'dimmerName',
+            closable: true,
+            on: 'click',
+            useCSS: true,
+            duration: {
+                show: 200,
+                hide: 300
+            },
+            transition: 'fade',
+            onShow() {
+                this === $();
+            },
+            onHide() {
+                this === $();
+            },
+            onChange() {
+                this === $();
+            },
+            selector: {
+                dimmable: '.dimmable',
+                dimmer: '.dimmer',
+                content: '.content'
+            },
+            template: {
+                dimmer() {
+                    return $();
+                }
+            },
+            className: {
+                active: 'active',
+                dimmable: 'dimmable',
+                dimmed: 'dimmed',
+                disabled: 'disabled',
+                pageDimmer: 'pageDimmer',
+                hide: 'hide',
+                show: 'show',
+                transition: 'transition'
+            },
+            error: {
+                method: 'method'
+            }
+        },
+        transition: 'scale',
+        duration: 400,
+        queue: true,
+        onShow() {
+            this === $();
+        },
+        onVisible() {
+            this === $();
+        },
+        onHide($element) {
+            this === $();
+            $element === $();
+            return false;
+        },
+        onHidden() {
+            this === $();
+        },
+        onApprove($element) {
+            this === $();
+            $element === $();
+            return false;
+        },
+        onDeny($element) {
+            this === $();
+            $element === $();
+            return false;
+        },
+        selector: {
+            close: 'close',
+            approve: 'approve',
+            deny: 'deny'
+        },
+        className: {
+            active: 'active',
+            scrolling: 'scrolling'
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).modal() === $();
+}
+
+import modal = require('semantic-ui-modal');
+
+function test_module() {
+    $.fn.modal = modal;
+}
diff --git a/types/semantic-ui-modal/tsconfig.json b/types/semantic-ui-modal/tsconfig.json
new file mode 100644
index 0000000000..804a53e74d
--- /dev/null
+++ b/types/semantic-ui-modal/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-modal-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-modal/tslint.json b/types/semantic-ui-modal/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-modal/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-nag/global.d.ts b/types/semantic-ui-nag/global.d.ts
new file mode 100644
index 0000000000..6ac11501cb
--- /dev/null
+++ b/types/semantic-ui-nag/global.d.ts
@@ -0,0 +1,223 @@
+interface JQuery {
+    nag: SemanticUI.Nag;
+}
+
+declare namespace SemanticUI {
+    interface Nag {
+        settings: NagSettings;
+
+        (behavior: 'show'): JQuery;
+        (behavior: 'hide'): JQuery;
+        /**
+         * Clears cookie so nag shows again
+         */
+        (behavior: 'clear'): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof NagSettings>(behavior: 'setting', name: K, value?: undefined): NagSettings[K];
+        <K extends keyof NagSettings>(behavior: 'setting', name: K, value: NagSettings[K]): JQuery;
+        (behavior: 'setting', value: NagSettings.Param): JQuery;
+        (settings?: NagSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/nag.html}
+     */
+    interface NagSettings extends Pick<NagSettings._Impl, keyof NagSettings._Impl> { }
+
+    namespace NagSettings {
+        type Param = NagSettings | object;
+
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * allows cookie to be overridden
+             *
+             * @default false
+             */
+            persist: boolean;
+            /**
+             * set to zero to require manually dismissal, otherwise hides on its own
+             *
+             * @default 0
+             */
+            displayTime: number;
+            animation: Nag.AnimationSettings;
+            /**
+             * @default false
+             */
+            context: false | string | JQuery;
+            /**
+             * @default false
+             */
+            detachable: boolean;
+
+            /**
+             * @default 30
+             */
+            expires: number;
+            /**
+             * @default false
+             */
+            domain: false | string;
+            /**
+             * @default '/'
+             */
+            path: string;
+
+            /**
+             * type of storage to use
+             *
+             * @default 'cookie'
+             */
+            storageMethod: 'cookie' | 'localstorage' | 'sessionstorage';
+
+            /**
+             * @default 'nag'
+             */
+            key: any;
+            /**
+             * @default 'dismiss'
+             */
+            value: any;
+
+            /**
+             * @default 500
+             */
+            speed: number;
+            /**
+             * @default 'easeOutQuad'
+             */
+            easing: string;
+
+            // endregion
+
+            // region Callbacks
+
+            onHide(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            className: Nag.ClassNameSettings;
+            selector: Nag.SelectorSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Nag.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Nag {
+        interface AnimationSettings extends Pick<AnimationSettings._Impl, keyof AnimationSettings._Impl> { }
+
+        namespace AnimationSettings {
+            type Param = AnimationSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'slide'
+                 */
+                show: string;
+                /**
+                 * @default 'slide'
+                 */
+                hide: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'bottom'
+                 */
+                bottom: string;
+                /**
+                 * @default 'fixed'
+                 */
+                fixed: string;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.close.icon'
+                 */
+                close: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '$.cookie is not included. A storage solution is required.'
+                 */
+                noCookieStorage: string;
+                /**
+                 * @default 'Neither $.cookie or store is defined. A storage solution is required for storing state'
+                 */
+                noStorage: string;
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-nag/index.d.ts b/types/semantic-ui-nag/index.d.ts
new file mode 100644
index 0000000000..3596894a29
--- /dev/null
+++ b/types/semantic-ui-nag/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-nag 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const nag: SemanticUI.Nag;
+export = nag;
diff --git a/types/semantic-ui-nag/semantic-ui-nag-tests.ts b/types/semantic-ui-nag/semantic-ui-nag-tests.ts
new file mode 100644
index 0000000000..45a95b827b
--- /dev/null
+++ b/types/semantic-ui-nag/semantic-ui-nag-tests.ts
@@ -0,0 +1,68 @@
+function test_nag_static() {
+    $.fn.nag.settings.error.method = 'method';
+    $.fn.nag.settings.namespace = 'namespace';
+    $.fn.nag.settings.name = 'name';
+    $.fn.nag.settings.silent = false;
+    $.fn.nag.settings.debug = true;
+    $.fn.nag.settings.performance = true;
+    $.fn.nag.settings.verbose = true;
+}
+
+function test_nag() {
+    const selector = '.ui.nag';
+    $(selector).nag('show') === $();
+    $(selector).nag('hide') === $();
+    $(selector).nag('clear') === $();
+    $(selector).nag('destroy') === $();
+    $(selector).nag('setting', 'debug', undefined) === false;
+    $(selector).nag('setting', 'debug') === false;
+    $(selector).nag('setting', 'debug', true) === $();
+    $(selector).nag('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).nag({
+        persist: true,
+        displayTime: 0,
+        animation: {
+            show: 'slide',
+            hide: 'slide'
+        },
+        context: $(),
+        detachable: false,
+        expires: 30,
+        domain: 'domain',
+        path: 'path',
+        storageMethod: 'localstorage',
+        key: 'nag',
+        value: 'dismiss',
+        speed: 500,
+        easing: 'easeOutQuad',
+        onHide() {
+            this === $();
+        },
+        className: {
+            bottom: 'bottom',
+            fixed: 'fixed'
+        },
+        selector: {
+            close: 'close'
+        },
+        error: {
+            noCookieStorage: 'noCookieStorage',
+            noStorage: 'noStorage',
+            method: 'method'
+        }
+    }) === $();
+    $(selector).nag() === $();
+}
+
+import nag = require('semantic-ui-nag');
+
+function test_module() {
+    $.fn.nag = nag;
+}
diff --git a/types/semantic-ui-nag/tsconfig.json b/types/semantic-ui-nag/tsconfig.json
new file mode 100644
index 0000000000..004ccc40be
--- /dev/null
+++ b/types/semantic-ui-nag/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-nag-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-nag/tslint.json b/types/semantic-ui-nag/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-nag/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-popup/global.d.ts b/types/semantic-ui-popup/global.d.ts
new file mode 100644
index 0000000000..835d196089
--- /dev/null
+++ b/types/semantic-ui-popup/global.d.ts
@@ -0,0 +1,466 @@
+interface JQuery {
+    popup: SemanticUI.Popup;
+}
+
+declare namespace SemanticUI {
+    interface Popup {
+        settings: PopupSettings;
+
+        /**
+         * Shows popup
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides popup
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Hides all visible pop ups on the page
+         */
+        (behavior: 'hide all'): JQuery;
+        /**
+         * Returns current popup dom element
+         */
+        (behavior: 'get popup'): JQuery;
+        /**
+         * Changes current popup content
+         */
+        (behavior: 'change content', html: string): JQuery;
+        /**
+         * Toggles visibility of popup
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Returns whether popup is visible
+         */
+        (behavior: 'is visible'): boolean;
+        /**
+         * Returns whether popup is hidden
+         */
+        (behavior: 'is hidden'): boolean;
+        /**
+         * Returns whether popup is created and inserted into the page
+         */
+        (behavior: 'exists'): boolean;
+        /**
+         * Adjusts popup when content size changes (only necessary for centered popups)
+         */
+        (behavior: 'reposition'): JQuery;
+        /**
+         * Repositions a popup
+         */
+        (behavior: 'set position', position: string): JQuery;
+        /**
+         * Removes popup from the page and removes all events
+         */
+        (behavior: 'destroy'): JQuery;
+        /**
+         * Removes popup from the page
+         */
+        (behavior: 'remove popup'): JQuery;
+        <K extends keyof PopupSettings>(behavior: 'setting', name: K, value?: undefined): PopupSettings[K];
+        <K extends keyof PopupSettings>(behavior: 'setting', name: K, value: PopupSettings[K]): JQuery;
+        (behavior: 'setting', value: PopupSettings.Param): JQuery;
+        (settings?: PopupSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/popup.html#/settings}
+     */
+    interface PopupSettings extends Pick<PopupSettings._Impl, keyof PopupSettings._Impl> { }
+
+    namespace PopupSettings {
+        type Param = PopupSettings | object;
+
+        interface _Impl {
+            // region Popup Settings
+
+            /**
+             * Can specify a DOM element that should be used as the popup. This is useful for including a pre-formatted popup.
+             *
+             * @default false
+             */
+            popup: false | string | JQuery;
+            /**
+             * Whether all other popups should be hidden when this popup is opened
+             *
+             * @default false
+             */
+            exclusive: boolean;
+            /**
+             * Whether to move popup to same offset container as target element when popup already exists on the page.
+             * Using a popup inside of an element without overflow:visible, like a sidebar, may require you to set this to false
+             *
+             * @default true
+             */
+            movePopup: boolean;
+            /**
+             * Whether popup should attach mutationObservers to automatically run destroy when the element is removed from the page's DOM.
+             *
+             * @default true
+             */
+            observeChanges: boolean;
+            /**
+             * When the popup surpasses the boundary of this element, it will attempt to find another display position.
+             */
+            boundary: string | JQuery;
+            /**
+             * Selector or jquery object specifying where the popup should be created.
+             *
+             * @default 'body'
+             */
+            context: string | JQuery;
+            /**
+             * Will automatically hide a popup on scroll event in this context
+             */
+            scrollContext: string | JQuery;
+            /**
+             * Number of pixels that a popup is allowed to appear outside the boundaries of its context.
+             * This allows for permissible rounding errors when an element is against the edge of its context.
+             *
+             * @default 2
+             */
+            jitter: number;
+            /**
+             * Position that the popup should appear
+             *
+             * @default 'top left'
+             */
+            position: string;
+            /**
+             * If a popup is inline it will be created next to current element, allowing for local css rules to apply.
+             * It will not be removed from the DOM after being hidden.
+             * Otherwise popups will appended to body and removed after being hidden.
+             *
+             * @default false
+             */
+            inline: boolean;
+            /**
+             * Whether popup contents should be preserved in the page after being hidden, allowing it to re-appear slightly faster on subsequent loads.
+             *
+             * @default false
+             */
+            preserve: boolean;
+            /**
+             * Can be set to adjacent or opposite to prefer adjacent or opposite position if popup cannot fit on screen
+             *
+             * @default 'adjacent'
+             */
+            prefer: 'adjacent' | 'opposite';
+            /**
+             * When set to false, a popup will not appear and produce an error message if it cannot entirely fit on page.
+             * Setting this to a position like, right center forces the popup to use this position as a last resort even if it is partially offstage.
+             * Setting this to true will use the last attempted position.
+             *
+             * @default false
+             */
+            lastResort: boolean | string;
+            /**
+             * Event used to trigger popup. Can be either focus, click, hover, or manual. Manual popups must be triggered with $('.element').popup('show');
+             *
+             * @default 'hover'
+             */
+            on: 'focus' | 'click' | 'hover' | 'manual';
+            /**
+             * Delay in milliseconds before showing or hiding a popup on hover or focus
+             */
+            delay: Popup.DelaySettings;
+            /**
+             * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
+             *
+             * @default 'slide down'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: string;
+            /**
+             * Duration of animation events
+             *
+             * @default 200
+             */
+            duration: number;
+            /**
+             * Whether popup should set fluid popup variation width on load to avoid width: 100% including padding
+             *
+             * @default true
+             */
+            setFluidWidth: boolean;
+            /**
+             * Whether popup should not close on hover (useful for popup navigation menus)
+             *
+             * @default false
+             */
+            hoverable: boolean;
+            /**
+             * When using on: 'click' specifies whether clicking the page should close the popup
+             *
+             * @default true
+             */
+            closable: boolean;
+            /**
+             * When using on: 'hover' whether touchstart events should be added to allow the popup to be triggered
+             */
+            addTouchEvents: boolean;
+            /**
+             * Whether popup should hide on scroll or touchmove, auto only hides for popups without on: 'click'.
+             * Set this to false to prevent mobile browsers from closing popups when you tap inside input fields.
+             *
+             * @default 'auto'
+             */
+            hideOnScroll: 'auto' | false;
+            /**
+             * If a selector or jQuery object is specified this allows the popup to be positioned relative to that element.
+             *
+             * @default false
+             */
+            target: false | string | JQuery;
+            /**
+             * Offset for distance of popup from element
+             *
+             * @default 0
+             */
+            distanceAway: number;
+            /**
+             * Offset in pixels from calculated position
+             *
+             * @default 0
+             */
+            offset: number;
+            /**
+             * Number of iterations before giving up search for popup position when a popup cannot fit on screen
+             *
+             * @default 10
+             */
+            maxSearchDepth: number;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on popup element creation, with created popup
+             */
+            onCreate(this: JQuery, $module: JQuery): void;
+            /**
+             * Callback immediately before Popup is removed from DOM
+             */
+            onRemove(this: JQuery, $module: JQuery): void;
+            /**
+             * Callback before popup is shown. Returning false from this callback will cancel the popup from showing.
+             */
+            onShow(this: JQuery, $module: JQuery): false | void;
+            /**
+             * Callback after popup is shown
+             */
+            onVisible(this: JQuery, $module: JQuery): void;
+            /**
+             * Callback before popup is hidden. Returning false from this callback will cancel the popup from hiding.
+             */
+            onHide(this: JQuery, $module: JQuery): false | void;
+            /**
+             * Callback after popup is hidden
+             */
+            onHidden(this: JQuery, $module: JQuery): void;
+            /**
+             * Callback after popup cannot be placed on screen
+             */
+            onUnplaceable(this: JQuery, $module: JQuery): void;
+
+            // endregion
+
+            // region Content Settings
+
+            /**
+             * Popup variation to use, can use multiple variations with a space delimiter
+             */
+            variation: string;
+            /**
+             * Content to display
+             */
+            content: string;
+            /**
+             * Title to display alongside content
+             */
+            title: string;
+            /**
+             * HTML content to display instead of preformatted title and content
+             */
+            html: string | JQuery;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * DOM Selectors used internally
+             */
+            selector: Popup.SelectorSettings;
+            /**
+             * HTML Data attributes used to store data
+             */
+            metadata: Popup.MetadataSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Popup.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Popup.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Popup {
+        interface DelaySettings extends Pick<DelaySettings._Impl, keyof DelaySettings._Impl> { }
+
+        namespace DelaySettings {
+            type Param = DelaySettings | object;
+
+            interface _Impl {
+                show: number;
+                hide: number;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.ui.popup'
+                 */
+                popup: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'content'
+                 */
+                content: string;
+                /**
+                 * @default 'html'
+                 */
+                html: string;
+                /**
+                 * @default 'offset'
+                 */
+                offset: string;
+                /**
+                 * @default 'position'
+                 */
+                position: string;
+                /**
+                 * @default 'title'
+                 */
+                title: string;
+                /**
+                 * @default 'variation'
+                 */
+                variation: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'ui popup'
+                 */
+                popup: string;
+                /**
+                 * @default 'top left center bottom right'
+                 */
+                position: string;
+                /**
+                 * @default 'visible'
+                 */
+                visible: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The position you specified is not a valid position'
+                 */
+                invalidPosition: string;
+                /**
+                 * @default 'Popup does not fit within the boundaries of the viewport'
+                 */
+                cannotPlace: string;
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+                /**
+                 * @default 'This module requires ui transitions <https: github.com="" semantic-org="" ui-transition="">'
+                 */
+                noTransition: string;
+                /**
+                 * @default 'The target or popup you specified does not exist on the page'
+                 */
+                notFound: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-popup/index.d.ts b/types/semantic-ui-popup/index.d.ts
new file mode 100644
index 0000000000..9defea8c2f
--- /dev/null
+++ b/types/semantic-ui-popup/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-popup 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const popup: SemanticUI.Popup;
+export = popup;
diff --git a/types/semantic-ui-popup/semantic-ui-popup-tests.ts b/types/semantic-ui-popup/semantic-ui-popup-tests.ts
new file mode 100644
index 0000000000..b9cda09890
--- /dev/null
+++ b/types/semantic-ui-popup/semantic-ui-popup-tests.ts
@@ -0,0 +1,132 @@
+function test_popup_static() {
+    $.fn.popup.settings.error.method = 'method';
+    $.fn.popup.settings.namespace = 'namespace';
+    $.fn.popup.settings.name = 'name';
+    $.fn.popup.settings.silent = false;
+    $.fn.popup.settings.debug = true;
+    $.fn.popup.settings.performance = true;
+    $.fn.popup.settings.verbose = true;
+}
+
+function test_popup() {
+    const selector = '.ui.popup';
+    $(selector).popup('show') === $();
+    $(selector).popup('hide') === $();
+    $(selector).popup('hide all') === $();
+    $(selector).popup('get popup') === $();
+    $(selector).popup('change content', '<div></div>') === $();
+    $(selector).popup('toggle') === $();
+    $(selector).popup('is visible') === true;
+    $(selector).popup('is hidden') === true;
+    $(selector).popup('exists') === true;
+    $(selector).popup('reposition') === $();
+    $(selector).popup('set position', 'position') === $();
+    $(selector).popup('destroy') === $();
+    $(selector).popup('setting', 'debug', undefined) === false;
+    $(selector).popup('setting', 'debug') === false;
+    $(selector).popup('setting', 'debug', true) === $();
+    $(selector).popup('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).popup({
+        popup: $(),
+        exclusive: true,
+        movePopup: false,
+        observeChanges: true,
+        boundary: $(),
+        context: $(),
+        scrollContext: $(),
+        jitter: 2,
+        position: 'position',
+        inline: false,
+        preserve: true,
+        prefer: 'opposite',
+        lastResort: false,
+        on: 'manual',
+        delay: {
+            show: 200,
+            hide: 300
+        },
+        transition: 'fade',
+        duration: 50,
+        setFluidWidth: true,
+        hoverable: true,
+        closable: false,
+        addTouchEvents: true,
+        hideOnScroll: 'auto',
+        target: $(),
+        distanceAway: 50,
+        offset: 2,
+        maxSearchDepth: 10,
+        onCreate($module) {
+            this === $();
+            $module === $();
+        },
+        onRemove($module) {
+            this === $();
+            $module === $();
+        },
+        onShow($module) {
+            this === $();
+            $module === $();
+            return false;
+        },
+        onVisible($module) {
+            this === $();
+            $module === $();
+        },
+        onHide($module) {
+            this === $();
+            $module === $();
+            return false;
+        },
+        onHidden($module) {
+            this === $();
+            $module === $();
+        },
+        onUnplaceable($module) {
+            this === $();
+            $module === $();
+        },
+        variation: 'variation',
+        content: 'content',
+        title: 'title',
+        html: $(),
+        selector: {
+            popup: 'popup'
+        },
+        metadata: {
+            content: 'content',
+            html: 'html',
+            offset: 'offset',
+            position: 'position',
+            title: 'title',
+            variation: 'variation'
+        },
+        className: {
+            loading: 'loading',
+            popup: 'popup',
+            position: 'top',
+            visible: 'visible'
+        },
+        error: {
+            invalidPosition: 'invalidPosition',
+            cannotPlace: 'cannotPlace',
+            method: 'method',
+            noTransition: 'noTransition',
+            notFound: 'notFound'
+        }
+    }) === $();
+    $(selector).popup() === $();
+}
+
+import popup = require('semantic-ui-popup');
+
+function test_module() {
+    $.fn.popup = popup;
+}
diff --git a/types/semantic-ui-popup/tsconfig.json b/types/semantic-ui-popup/tsconfig.json
new file mode 100644
index 0000000000..5eb56757b3
--- /dev/null
+++ b/types/semantic-ui-popup/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-popup-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-popup/tslint.json b/types/semantic-ui-popup/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-popup/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-progress/global.d.ts b/types/semantic-ui-progress/global.d.ts
new file mode 100644
index 0000000000..06fe3b9892
--- /dev/null
+++ b/types/semantic-ui-progress/global.d.ts
@@ -0,0 +1,437 @@
+interface JQuery {
+    progress: SemanticUI.Progress;
+}
+
+declare namespace SemanticUI {
+    interface Progress {
+        settings: ProgressSettings;
+
+        /**
+         * Sets current percent of progress to value. If using a total will convert from percent to estimated value.
+         */
+        (behavior: 'set percent', percent: number): JQuery;
+        /**
+         * Sets progress to specified value. Will automatically calculate percent from total.
+         */
+        (behavior: 'set progress', value: number): JQuery;
+        /**
+         * Increments progress by increment value, if not passed a value will use random amount specified in settings
+         */
+        (behavior: 'increment', incrementValue: number): JQuery;
+        /**
+         * Decrements progress by decrement value, if not passed a value will use random amount specified in settings
+         */
+        (behavior: 'decrement', decrementValue: number): JQuery;
+        /**
+         * Immediately updates progress to value, ignoring progress animation interval delays
+         */
+        (behavior: 'update progress', value: number): JQuery;
+        /**
+         * Finishes progress and sets loaded to 100%
+         */
+        (behavior: 'complete'): JQuery;
+        /**
+         * Resets progress to zero
+         */
+        (behavior: 'reset'): JQuery;
+        /**
+         * Set total to a new value
+         */
+        (behavior: 'set total', total: number): JQuery;
+        /**
+         * Replaces templated string with value, total, percent left and percent.
+         */
+        (behavior: 'get text', text: string): string;
+        /**
+         * Returns normalized value inside acceptable range specified by total.
+         */
+        (behavior: 'get normalized value', value: number): number;
+        /**
+         * Returns percent as last specified
+         */
+        (behavior: 'get percent'): number;
+        /**
+         * Returns current progress value
+         */
+        (behavior: 'get value'): number;
+        /**
+         * Returns total
+         */
+        (behavior: 'get total'): number;
+        /**
+         * Returns whether progress is completed
+         */
+        (behavior: 'is complete'): boolean;
+        /**
+         * Returns whether progress was a success
+         */
+        (behavior: 'is success'): boolean;
+        /**
+         * Returns whether progress is in warning state
+         */
+        (behavior: 'is warning'): boolean;
+        /**
+         * Returns whether progress is in error state
+         */
+        (behavior: 'is error'): boolean;
+        /**
+         * Returns whether progress is in active state
+         */
+        (behavior: 'is active'): boolean;
+        /**
+         * Sets progress to active state
+         */
+        (behavior: 'set active'): JQuery;
+        /**
+         * Sets progress to warning state
+         */
+        (behavior: 'set warning'): JQuery;
+        /**
+         * Sets progress to success state
+         */
+        (behavior: 'set success'): JQuery;
+        /**
+         * Sets progress to error state
+         */
+        (behavior: 'set error'): JQuery;
+        /**
+         * Changes progress animation speed
+         */
+        (behavior: 'set duration', value: number): JQuery;
+        /**
+         * Sets progress exterior label to text
+         */
+        (behavior: 'set label', text: string): JQuery;
+        /**
+         * Sets progress bar label to text
+         */
+        (behavior: 'set bar label', text: string): JQuery;
+        /**
+         * Removes progress to active state
+         */
+        (behavior: 'remove active'): JQuery;
+        /**
+         * Removes progress to warning state
+         */
+        (behavior: 'remove warning'): JQuery;
+        /**
+         * Removes progress to success state
+         */
+        (behavior: 'remove success'): JQuery;
+        /**
+         * Removes progress to error state
+         */
+        (behavior: 'remove error'): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof ProgressSettings>(behavior: 'setting', name: K, value?: undefined): ProgressSettings[K];
+        <K extends keyof ProgressSettings>(behavior: 'setting', name: K, value: ProgressSettings[K]): JQuery;
+        (behavior: 'setting', value: ProgressSettings.Param): JQuery;
+        (settings?: ProgressSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/progress.html#/settings}
+     */
+    interface ProgressSettings extends Pick<ProgressSettings._Impl, keyof ProgressSettings._Impl> { }
+
+    namespace ProgressSettings {
+        type Param = ProgressSettings | object;
+
+        interface _Impl {
+            // region Progress Settings
+
+            /**
+             * Whether success state should automatically trigger when progress completes
+             *
+             * @default true
+             */
+            autoSuccess: boolean;
+            /**
+             * Whether progress should automatically show activity when incremented
+             *
+             * @default true
+             */
+            showActivity: boolean;
+            /**
+             * When set to true, values that calculate to above 100% or below 0% will be adjusted.
+             * When set to false, inappropriate values will produce an error.
+             *
+             * @default true
+             */
+            limitValues: boolean;
+            /**
+             * Can be set to either to display progress as percent or ratio. Matches up to corresponding text template with the same name.
+             *
+             * @default 'percent'
+             */
+            label: 'percent' | 'ratio';
+            /**
+             * When incrementing without value, sets range for random increment value
+             */
+            random: Progress.RandomSettings;
+            /**
+             * Decimal point precision for calculated progress
+             *
+             * @default 1
+             */
+            precision: number;
+            /**
+             * Setting a total value will make each call to increment get closer to this total (i.e. 1/20, 2/20 etc)
+             *
+             * @default false
+             */
+            total: false | number;
+            /**
+             * Sets current value, when total is specified, this is used to calculate a ratio of the total, with percent this should be the overall percent
+             *
+             * @default false
+             */
+            value: false | number;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on percentage change
+             */
+            onChange(this: JQuery, percent: number, value: number, total: number): void;
+            /**
+             * Callback on success state
+             */
+            onSuccess(this: JQuery, total: number): void;
+            /**
+             * Callback on active state
+             */
+            onActive(this: JQuery, value: number, total: number): void;
+            /**
+             * Callback on error state
+             */
+            onError(this: JQuery, value: number, total: number): void;
+            /**
+             * Callback on warning state
+             */
+            onWarning(this: JQuery, value: number, total: number): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Text content for each state, uses simple templating with {percent}, {value}, {total}
+             */
+            text: Progress.TextSettings;
+            /**
+             * Regular expressions used by module
+             */
+            regExp: Progress.RegExpSettings;
+            /**
+             * Selectors used by module
+             */
+            selector: Progress.SelectorSettings;
+            /**
+             * DOM metadata used by module
+             */
+            metadata: Progress.MetadataSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Progress.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Progress.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Progress {
+        interface RandomSettings extends Pick<RandomSettings._Impl, keyof RandomSettings._Impl> { }
+
+        namespace RandomSettings {
+            type Param = RandomSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 2
+                 */
+                min: number;
+                /**
+                 * @default 5
+                 */
+                max: number;
+            }
+        }
+
+        interface TextSettings extends Pick<TextSettings._Impl, keyof TextSettings._Impl> { }
+
+        namespace TextSettings {
+            type Param = TextSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default false
+                 */
+                active: false | string;
+                /**
+                 * @default false
+                 */
+                error: false | string;
+                /**
+                 * @default false
+                 */
+                success: false | string;
+                /**
+                 * @default false
+                 */
+                warning: false | string;
+                /**
+                 * @default '{percent}%'
+                 */
+                percent: false | string;
+                /**
+                 * @default '{value} of {total}'
+                 */
+                ratio: false | string;
+            }
+        }
+
+        interface RegExpSettings extends Pick<RegExpSettings._Impl, keyof RegExpSettings._Impl> { }
+
+        namespace RegExpSettings {
+            type Param = RegExpSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default /\{\$*[A-z0-9]+\}/g
+                 */
+                variable: RegExp;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '> .bar
+                 */
+                bar: string;
+                /**
+                 * @default '> .label'
+                 */
+                label: string;
+                /**
+                 * @default '.bar > .progress'
+                 */
+                progress: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'percent'
+                 */
+                percent: string;
+                /**
+                 * @default 'total'
+                 */
+                total: string;
+                /**
+                 * @default 'value'
+                 */
+                value: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'error'
+                 */
+                error: string;
+                /**
+                 * @default 'success'
+                 */
+                success: string;
+                /**
+                 * @default 'warning'
+                 */
+                warning: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+                /**
+                 * @default 'Progress value is non numeric'
+                 */
+                nonNumeric: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-progress/index.d.ts b/types/semantic-ui-progress/index.d.ts
new file mode 100644
index 0000000000..1d44002c6f
--- /dev/null
+++ b/types/semantic-ui-progress/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-progress 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const progress: SemanticUI.Progress;
+export = progress;
diff --git a/types/semantic-ui-progress/semantic-ui-progress-tests.ts b/types/semantic-ui-progress/semantic-ui-progress-tests.ts
new file mode 100644
index 0000000000..b950ed786f
--- /dev/null
+++ b/types/semantic-ui-progress/semantic-ui-progress-tests.ts
@@ -0,0 +1,130 @@
+function test_progress_static() {
+    $.fn.progress.settings.error.method = 'method';
+    $.fn.progress.settings.namespace = 'namespace';
+    $.fn.progress.settings.name = 'name';
+    $.fn.progress.settings.silent = false;
+    $.fn.progress.settings.debug = true;
+    $.fn.progress.settings.performance = true;
+    $.fn.progress.settings.verbose = true;
+}
+
+function test_progress() {
+    const selector = '.ui.progress';
+    $(selector).progress('set percent', 10) === $();
+    $(selector).progress('set progress', 25) === $();
+    $(selector).progress('increment', 5) === $();
+    $(selector).progress('decrement', 2) === $();
+    $(selector).progress('update progress', 45) === $();
+    $(selector).progress('complete') === $();
+    $(selector).progress('reset') === $();
+    $(selector).progress('set total', 100) === $();
+    $(selector).progress('get text', 'text') === 'text';
+    $(selector).progress('get normalized value', 20) === 40;
+    $(selector).progress('get percent') === 22;
+    $(selector).progress('get value') === 45;
+    $(selector).progress('get total') === 67;
+    $(selector).progress('is complete') === false;
+    $(selector).progress('is success') === false;
+    $(selector).progress('is warning') === false;
+    $(selector).progress('is error') === false;
+    $(selector).progress('is active') === false;
+    $(selector).progress('set active') === $();
+    $(selector).progress('set warning') === $();
+    $(selector).progress('set success') === $();
+    $(selector).progress('set error') === $();
+    $(selector).progress('set duration', 4) === $();
+    $(selector).progress('set label', 'label') === $();
+    $(selector).progress('set bar label', 'bar label') === $();
+    $(selector).progress('remove active') === $();
+    $(selector).progress('remove warning') === $();
+    $(selector).progress('remove success') === $();
+    $(selector).progress('remove error') === $();
+    $(selector).progress('destroy') === $();
+    $(selector).progress('setting', 'debug', undefined) === false;
+    $(selector).progress('setting', 'debug') === false;
+    $(selector).progress('setting', 'debug', true) === $();
+    $(selector).progress('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).progress({
+        autoSuccess: false,
+        showActivity: true,
+        limitValues: false,
+        label: 'percent',
+        random: {
+            min: 2,
+            max: 5
+        },
+        precision: 1,
+        total: 10,
+        value: 20,
+        onChange(percent, value, total) {
+            this === $();
+            percent === 10;
+            value === 20;
+            total === 30;
+        },
+        onSuccess(total) {
+            this === $();
+            total === 30;
+        },
+        onActive(value, total) {
+            this === $();
+            value === 20;
+            total === 30;
+        },
+        onError(value, total) {
+            this === $();
+            value === 20;
+            total === 30;
+        },
+        onWarning(value, total) {
+            this === $();
+            value === 20;
+            total === 30;
+        },
+        text: {
+            active: 'active',
+            error: 'error',
+            success: 'success',
+            warning: 'warning',
+            percent: 'percent',
+            ratio: 'ratio'
+        },
+        regExp: {
+            variable: /{\$*[A-z0-9]+}/g
+        },
+        selector: {
+            bar: 'bar',
+            label: 'label',
+            progress: 'progress'
+        },
+        metadata: {
+            percent: 'percent',
+            total: 'total',
+            value: 'value'
+        },
+        className: {
+            active: 'active',
+            error: 'error',
+            success: 'success',
+            warning: 'warning'
+        },
+        error: {
+            method: 'method',
+            nonNumeric: 'nonNumeric'
+        }
+    }) === $();
+    $(selector).progress() === $();
+}
+
+import progress = require('semantic-ui-progress');
+
+function test_module() {
+    $.fn.progress = progress;
+}
diff --git a/types/semantic-ui-progress/tsconfig.json b/types/semantic-ui-progress/tsconfig.json
new file mode 100644
index 0000000000..258d157912
--- /dev/null
+++ b/types/semantic-ui-progress/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-progress-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-progress/tslint.json b/types/semantic-ui-progress/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-progress/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-rating/global.d.ts b/types/semantic-ui-rating/global.d.ts
new file mode 100644
index 0000000000..5fae40e3e3
--- /dev/null
+++ b/types/semantic-ui-rating/global.d.ts
@@ -0,0 +1,184 @@
+interface JQuery {
+    rating: SemanticUI.Rating;
+}
+
+declare namespace SemanticUI {
+    interface Rating {
+        settings: RatingSettings;
+
+        /**
+         * Sets rating programmatically
+         */
+        (behavior: 'set rating', rating: number): JQuery;
+        /**
+         * Gets current rating
+         */
+        (behavior: 'get rating'): number;
+        /**
+         * Disables interactive rating mode
+         */
+        (behavior: 'disable'): JQuery;
+        /**
+         * Enables interactive rating mode
+         */
+        (behavior: 'enable'): JQuery;
+        /**
+         * Clears current rating
+         */
+        (behavior: 'clear rating'): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof RatingSettings>(behavior: 'setting', name: K, value?: undefined): RatingSettings[K];
+        <K extends keyof RatingSettings>(behavior: 'setting', name: K, value: RatingSettings[K]): JQuery;
+        (behavior: 'setting', value: RatingSettings.Param): JQuery;
+        (settings?: RatingSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/rating.html#/settings}
+     */
+    interface RatingSettings extends Pick<RatingSettings._Impl, keyof RatingSettings._Impl> { }
+
+    namespace RatingSettings {
+        type Param = RatingSettings | object;
+
+        interface _Impl {
+            // region Rating Settings
+
+            /**
+             * A number representing the default rating to apply
+             *
+             * @default 0
+             */
+            initialRating: number;
+            /**
+             * Whether callbacks like onRate should fire immediately after initializing with the current value.
+             *
+             * @default false
+             */
+            fireOnInit: boolean;
+            /**
+             * By default a rating will be only clearable if there is 1 icon. Setting to true/false will allow or disallow a user to clear their rating
+             *
+             * @default 'auto'
+             */
+            clearable: 'auto' | boolean;
+            /**
+             * Whether to enable user's ability to rate
+             *
+             * @default true
+             */
+            interactive: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Is called after user selects a new rating
+             */
+            onRate(this: JQuery, value: number): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            selector: Rating.SelectorSettings;
+            className: Rating.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Rating.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Rating {
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.icon'
+                 */
+                icon: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'hover'
+                 */
+                hover: string;
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'You called a rating action that was not defined'
+                 */
+                action: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-rating/index.d.ts b/types/semantic-ui-rating/index.d.ts
new file mode 100644
index 0000000000..1b171fd825
--- /dev/null
+++ b/types/semantic-ui-rating/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-rating 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const rating: SemanticUI.Rating;
+export = rating;
diff --git a/types/semantic-ui-rating/semantic-ui-rating-tests.ts b/types/semantic-ui-rating/semantic-ui-rating-tests.ts
new file mode 100644
index 0000000000..8ea94b61aa
--- /dev/null
+++ b/types/semantic-ui-rating/semantic-ui-rating-tests.ts
@@ -0,0 +1,58 @@
+function test_rating_static() {
+    $.fn.rating.settings.error.action = 'action';
+    $.fn.rating.settings.namespace = 'namespace';
+    $.fn.rating.settings.name = 'name';
+    $.fn.rating.settings.silent = false;
+    $.fn.rating.settings.debug = true;
+    $.fn.rating.settings.performance = true;
+    $.fn.rating.settings.verbose = true;
+}
+
+function test_rating() {
+    const selector = '.ui.rating';
+    $(selector).rating('set rating', 3) === $();
+    $(selector).rating('get rating') === 4;
+    $(selector).rating('disable') === $();
+    $(selector).rating('enable') === $();
+    $(selector).rating('clear rating') === $();
+    $(selector).rating('destroy') === $();
+    $(selector).rating('setting', 'debug', undefined) === false;
+    $(selector).rating('setting', 'debug') === false;
+    $(selector).rating('setting', 'debug', true) === $();
+    $(selector).rating('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).rating({
+        initialRating: 0,
+        fireOnInit: false,
+        clearable: false,
+        interactive: true,
+        onRate(value) {
+            this === $();
+            value === 3;
+        },
+        selector: {
+            icon: '.icon'
+        },
+        className: {
+            active: 'active',
+            hover: 'hover',
+            loading: 'loading'
+        },
+        error: {
+            action: 'action'
+        }
+    }) === $();
+    $(selector).rating() === $();
+}
+
+import rating = require('semantic-ui-rating');
+
+function test_module() {
+    $.fn.rating = rating;
+}
diff --git a/types/semantic-ui-rating/tsconfig.json b/types/semantic-ui-rating/tsconfig.json
new file mode 100644
index 0000000000..d3590d5b76
--- /dev/null
+++ b/types/semantic-ui-rating/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-rating-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-rating/tslint.json b/types/semantic-ui-rating/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-rating/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-search/global.d.ts b/types/semantic-ui-search/global.d.ts
new file mode 100644
index 0000000000..bb3df65035
--- /dev/null
+++ b/types/semantic-ui-search/global.d.ts
@@ -0,0 +1,526 @@
+interface JQuery {
+    search: SemanticUI.Search;
+}
+
+declare namespace SemanticUI {
+    interface Search {
+        settings: SearchSettings;
+
+        /**
+         * Search for value currently set in search input
+         */
+        (behavior: 'query', callback?: () => void): JQuery;
+        /**
+         * Displays message in search results with text, using template matching type
+         */
+        (behavior: 'display message', text: string, type: string): JQuery;
+        /**
+         * Cancels current remote search query
+         */
+        (behavior: 'cancel query'): JQuery;
+        /**
+         * Search local object for specified query and display results
+         */
+        (behavior: 'search local', query: string): JQuery;
+        /**
+         * Whether has minimum characters
+         */
+        (behavior: 'has minimum characters'): boolean;
+        /**
+         * Search remote endpoint for specified query and display results
+         */
+        (behavior: 'search remote', query: string, callback?: () => void): JQuery;
+        /**
+         * Search object for specified query and return results
+         */
+        (behavior: 'search object', query: string, object: any, searchFields: string[]): any;
+        /**
+         * Cancels current remote search request
+         */
+        (behavior: 'cancel query'): JQuery;
+        /**
+         * Whether search is currently focused
+         */
+        (behavior: 'is focused'): boolean;
+        /**
+         * Whether search results are visible
+         */
+        (behavior: 'is visible'): boolean;
+        /**
+         * Whether search results are empty
+         */
+        (behavior: 'is empty'): boolean;
+        /**
+         * Returns current search value
+         */
+        (behavior: 'get value'): any;
+        /**
+         * Returns JSON object matching searched title or id (see above)
+         */
+        (behavior: 'get result', value: any): any;
+        /**
+         * Sets search input to value
+         */
+        (behavior: 'set value', value: any): JQuery;
+        /**
+         * Reads cached results for query
+         */
+        (behavior: 'read cache', query: string): JQuery;
+        /**
+         * Clears value from cache, if no parameter passed clears all cache
+         */
+        (behavior: 'clear cache', query?: string): JQuery;
+        /**
+         * Writes cached results for query
+         */
+        (behavior: 'write cache', query: string): JQuery;
+        /**
+         * Adds HTML to results and displays
+         */
+        (behavior: 'add results', html: string): JQuery;
+        /**
+         * Shows results container
+         */
+        (behavior: 'show results', callback?: () => void): JQuery;
+        /**
+         * Hides results container
+         */
+        (behavior: 'hide results', callback?: () => void): JQuery;
+        /**
+         * Generates results using parser specified by settings.template
+         */
+        (behavior: 'generate results', response: any): JQuery;
+        /**
+         * Removes all events
+         */
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof SearchSettings>(behavior: 'setting', name: K, value?: undefined): SearchSettings[K];
+        <K extends keyof SearchSettings>(behavior: 'setting', name: K, value: SearchSettings[K]): JQuery;
+        (behavior: 'setting', value: SearchSettings.Param): JQuery;
+        (settings?: SearchSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/search.html#/settings}
+     */
+    interface SearchSettings extends Pick<SearchSettings._Impl, keyof SearchSettings._Impl> { }
+
+    namespace SearchSettings {
+        type Param = SearchSettings | object;
+
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * Settings for API call.
+             *
+             * @see {@link http://semantic-ui.com/behaviors/api.html#/usage}
+             */
+            apiSettings: ApiSettings;
+            /**
+             * Minimum characters to query for results
+             *
+             * @default 1
+             */
+            minCharacters: number;
+            /**
+             * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
+             *
+             * @default 'fade'
+             * @see {@link http://semantic-ui.com/modules/transition.html}
+             */
+            transition: string;
+            /**
+             * Duration of animation events
+             *
+             * @default 300
+             */
+            duration: number;
+            /**
+             * Maximum results to display when using local and simple search, maximum category count for category search
+             *
+             * @default 7
+             */
+            maxResults: number;
+            /**
+             * Caches results locally to avoid requerying server
+             *
+             * @default true
+             */
+            cache: boolean;
+            /**
+             * Specify a Javascript object which will be searched locally
+             *
+             * @default false
+             */
+            source: false | any;
+            /**
+             * Whether the search should automatically select the first search result after searching
+             *
+             * @default false
+             */
+            selectFirstResult: boolean;
+            /**
+             * Whether a "no results" message should be shown if no results are found. (These messages can be modified using the template object specified below)
+             *
+             * @default false
+             */
+            showNoResults: boolean;
+            /**
+             * Return local results that match anywhere inside your content
+             *
+             * @default true
+             */
+            searchFullText: boolean;
+            /**
+             * List mapping display content to JSON property, either with API or source.
+             */
+            fields: Search.FieldsSettings;
+            /**
+             * Specify object properties inside local source object which will be searched
+             */
+            searchFields: string[];
+            /**
+             * Delay before hiding results after search blur
+             *
+             * @default 0
+             */
+            hideDelay: number;
+            /**
+             * Delay before querying results on inputchange
+             *
+             * @default 100
+             */
+            searchDelay: number;
+            /**
+             * Easing equation when using fallback Javascript animation
+             *
+             * @default 'easeOutExpo'
+             */
+            easing: string;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on element selection by user.
+             * The first parameter includes the filtered response results for that element.
+             * The function should return false to prevent default action (closing search results and selecting value).
+             */
+            onSelect(this: JQuery, result: any, response: any): false | void;
+            /**
+             * Callback after processing element template to add HTML to results. Function should return false to prevent default actions.
+             */
+            onResultsAdd(this: JQuery, html: string): false | void;
+            /**
+             * Callback on search query
+             */
+            onSearchQuery(this: JQuery, query: string): void;
+            /**
+             * Callback on server response
+             */
+            onResults(this: JQuery, response: any): void;
+            /**
+             * Callback when results are opened
+             */
+            onResultsOpen(this: JQuery): void;
+            /**
+             * Callback when results are closed
+             */
+            onResultsClose(this: JQuery): void;
+
+            // endregion
+
+            // region Templates
+
+            templates: Search.TemplatesSettings;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Regular expressions used for matching
+             */
+            regExp: Search.RegExpSettings;
+            /**
+             * Selectors used to find parts of a module
+             */
+            selector: Search.SelectorSettings;
+            /**
+             * HTML5 metadata attributes used internally
+             */
+            metadata: Search.MetadataSettings;
+            /**
+             * Class names used to determine element state
+             */
+            className: Search.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Search.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Search {
+        interface FieldsSettings extends Pick<FieldsSettings._Impl, keyof FieldsSettings._Impl> { }
+
+        namespace FieldsSettings {
+            type Param = FieldsSettings | object;
+
+            interface _Impl {
+                /**
+                 * array of categories (category view)
+                 *
+                 * @default 'results'
+                 */
+                categories: string;
+                /**
+                 * name of category (category view)
+                 *
+                 * @default 'name'
+                 */
+                categoryName: string;
+                /**
+                 * array of results (category view)
+                 *
+                 * @default 'results'
+                 */
+                categoryResults: string;
+                /**
+                 * result description
+                 *
+                 * @default 'description'
+                 */
+                description: string;
+                /**
+                 * result image
+                 *
+                 * @default 'image'
+                 */
+                image: string;
+                /**
+                 * result price
+                 *
+                 * @default 'price'
+                 */
+                price: string;
+                /**
+                 * array of results (standard)
+                 *
+                 * @default 'results'
+                 */
+                results: string;
+                /**
+                 * result title
+                 *
+                 * @default 'title'
+                 */
+                title: string;
+                /**
+                 * "view more" object name
+                 *
+                 * @default 'action'
+                 */
+                action: string;
+                /**
+                 * "view more" text
+                 *
+                 * @default 'text'
+                 */
+                actionText: string;
+                /**
+                 * "view more" url
+                 *
+                 * @default 'url'
+                 */
+                actionURL: string;
+            }
+        }
+
+        interface TemplatesSettings extends Pick<TemplatesSettings._Impl, keyof TemplatesSettings._Impl> { }
+
+        namespace TemplatesSettings {
+            type Param = TemplatesSettings | object;
+
+            interface _Impl {
+                escape(string: string): string;
+                message(message: string, type: string): string;
+                category(response: any): string;
+                standard(response: any): string;
+            }
+        }
+
+        interface RegExpSettings extends Pick<RegExpSettings._Impl, keyof RegExpSettings._Impl> { }
+
+        namespace RegExpSettings {
+            type Param = RegExpSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g
+                 */
+                escape: RegExp;
+                /**
+                 * @default '(?:\s|^)'
+                 */
+                beginsWith: string;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.prompt'
+                 */
+                prompt: string;
+                /**
+                 * @default '.search.button'
+                 */
+                searchButton: string;
+                /**
+                 * @default '.results'
+                 */
+                results: string;
+                /**
+                 * @default '.category'
+                 */
+                category: string;
+                /**
+                 * @default '.result'
+                 */
+                result: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'cache'
+                 */
+                cache: string;
+                /**
+                 * @default 'results'
+                 */
+                results: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'empty'
+                 */
+                empty: string;
+                /**
+                 * @default 'focus'
+                 */
+                focus: string;
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'down'
+                 */
+                pressed: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'Cannot search. No source used, and Semantic API module was not included'
+                 */
+                source: string;
+                /**
+                 * @default 'Your search returned no results'
+                 */
+                noResults: string;
+                /**
+                 * @default 'Error in debug logging, exiting.'
+                 */
+                logging: string;
+                /**
+                 * @default 'A valid template name was not specified.'
+                 */
+                noTemplate: string;
+                /**
+                 * @default 'There was an issue with querying the server.'
+                 */
+                serverError: string;
+                /**
+                 * @default 'Results must be an array to use maxResults setting'
+                 */
+                maxResults: string;
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-search/index.d.ts b/types/semantic-ui-search/index.d.ts
new file mode 100644
index 0000000000..b3861736f4
--- /dev/null
+++ b/types/semantic-ui-search/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for semantic-ui-search 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference types="semantic-ui-api" />
+/// <reference path="global.d.ts" />
+
+declare const search: SemanticUI.Search;
+export = search;
diff --git a/types/semantic-ui-search/semantic-ui-search-tests.ts b/types/semantic-ui-search/semantic-ui-search-tests.ts
new file mode 100644
index 0000000000..86760f2832
--- /dev/null
+++ b/types/semantic-ui-search/semantic-ui-search-tests.ts
@@ -0,0 +1,255 @@
+function test_search_static() {
+    $.fn.search.settings.error.method = 'method';
+    $.fn.search.settings.namespace = 'namespace';
+    $.fn.search.settings.name = 'name';
+    $.fn.search.settings.silent = false;
+    $.fn.search.settings.debug = true;
+    $.fn.search.settings.performance = true;
+    $.fn.search.settings.verbose = true;
+}
+
+function test_search() {
+    const selector = '.ui.search';
+    $(selector).search('query', () => { }) === $();
+    $(selector).search('display message', 'text', 'type') === $();
+    $(selector).search('cancel query') === $();
+    $(selector).search('search local', 'query') === $();
+    $(selector).search('has minimum characters') === true;
+    $(selector).search('search remote', 'query', () => { }) === $();
+    $(selector).search('search object', 'query', {}, ['searchField']) === {};
+    $(selector).search('cancel query') === $();
+    $(selector).search('is focused') === false;
+    $(selector).search('is visible') === true;
+    $(selector).search('is empty') === false;
+    $(selector).search('get value') === {};
+    $(selector).search('get result', 'value') === {};
+    $(selector).search('set value', 'value') === $();
+    $(selector).search('read cache', 'query') === $();
+    $(selector).search('clear cache', 'query') === $();
+    $(selector).search('write cache', 'query') === $();
+    $(selector).search('add results', 'html') === $();
+    $(selector).search('show results', () => { }) === $();
+    $(selector).search('hide results', () => { }) === $();
+    $(selector).search('generate results', {}) === $();
+    $(selector).search('destroy') === $();
+    $(selector).search('setting', 'debug', undefined) === false;
+    $(selector).search('setting', 'debug') === false;
+    $(selector).search('setting', 'debug', true) === $();
+    $(selector).search('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).search({
+        apiSettings: {
+            on: 'on',
+            cache: true,
+            stateContext: $(),
+            encodeParameters: false,
+            defaultData: true,
+            serializeForm: false,
+            throttle: 10,
+            throttleFirstRequest: true,
+            interruptRequests: false,
+            loadingDuration: 3,
+            hideError: true,
+            errorDuration: 10,
+            action: 'action',
+            url: 'url',
+            urlData: false,
+            response: false,
+            responseAsync(settings, callback) {
+                settings === ({} as SemanticUI.ApiSettings);
+                callback === ((response: any) => { });
+            },
+            mockResponse: false,
+            mockResponseAsync(settings, callback) {
+                settings === ({} as SemanticUI.ApiSettings);
+                callback === ((response: any) => { });
+            },
+            method: 'post',
+            dataType: 'xml',
+            data: {},
+            beforeSend(settings) {
+                settings === ({} as SemanticUI.ApiSettings);
+            },
+            beforeXHR(xhrObject) {
+                xhrObject === ({} as JQueryXHR);
+            },
+            onRequest(promise, xhr) {
+                promise === ({} as JQueryDeferred<any>);
+                xhr === ({} as JQueryXHR);
+            },
+            onResponse(response) {
+                response === ({} as any);
+            },
+            successTest(response) {
+                return response === ({} as any);
+            },
+            onSuccess(response, element, xhr) {
+                response === ({} as any);
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onComplete(response, element, xhr) {
+                response === ({} as any);
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onFailure(response, element) {
+                response === ({} as any);
+                element === $();
+            },
+            onError(errorMessage, element, xhr) {
+                errorMessage === '';
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onAbort(errorMessage, element, xhr) {
+                errorMessage === '';
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            regExp: {
+                required: /{\$*[A-z0-9]+}/g,
+                optional: /{\/\$*[A-z0-9]+}/g
+            },
+            selector: {
+                disabled: '.disabled',
+                form: 'form'
+            },
+            className: {
+                loading: 'loading',
+                error: 'error'
+            },
+            metadata: {
+                action: 'action',
+                url: 'url'
+            },
+            error: {
+                beforeSend: 'beforeSend',
+                error: 'error',
+                exitConditions: 'exitConditions',
+                JSONParse: 'JSONParse',
+                legacyParameters: 'legacyParameters',
+                missingAction: 'missingAction',
+                missingSerialize: 'missingSerialize',
+                missingURL: 'missingURL',
+                noReturnedValue: 'noReturnedValue',
+                parseError: 'parseError',
+                requiredParameter: 'requiredParameter',
+                statusMessage: 'statusMessage',
+                timeout: 'timeout'
+            }
+        },
+        minCharacters: 10,
+        transition: 'fade',
+        duration: 200,
+        maxResults: 2,
+        cache: false,
+        source: {},
+        selectFirstResult: true,
+        showNoResults: false,
+        searchFullText: true,
+        fields: {
+            categories: 'categories',
+            categoryName: 'categoryName',
+            categoryResults: 'categoryResults',
+            description: 'description',
+            image: 'image',
+            price: 'price',
+            results: 'results',
+            title: 'title',
+            action: 'action',
+            actionText: 'actionText',
+            actionURL: 'actionURL'
+        },
+        searchFields: [
+            'field1',
+            'field2'
+        ],
+        hideDelay: 20,
+        searchDelay: 10,
+        easing: 'easeOutExpo',
+        onSelect(result, response) {
+            this === $();
+            result === {};
+            response === {};
+            return false;
+        },
+        onResultsAdd(html) {
+            this === $();
+            html === 'html';
+            return false;
+        },
+        onSearchQuery(query) {
+            this === $();
+            query === 'query';
+        },
+        onResults(response) {
+            this === $();
+            response === {};
+        },
+        onResultsOpen() {
+            this === $();
+        },
+        onResultsClose() {
+            this === $();
+        },
+        templates: {
+            escape(string) {
+                return string;
+            },
+            message(message, type) {
+                return message + type;
+            },
+            category(response) {
+                return 'category';
+            },
+            standard(response) {
+                return 'standard';
+            }
+        },
+        regExp: {
+            escape: /[\-\[\]\/{}()*+?.\\^$|]/g,
+            beginsWith: '(?:\s|^)'
+        },
+        selector: {
+            prompt: 'prompt',
+            searchButton: 'searchButton',
+            results: 'results',
+            category: 'category',
+            result: 'result'
+        },
+        metadata: {
+            cache: 'cache',
+            results: 'results'
+        },
+        className: {
+            active: 'active',
+            empty: 'empty',
+            focus: 'focus',
+            loading: 'loading',
+            pressed: 'pressed'
+        },
+        error: {
+            source: 'source',
+            noResults: 'noResults',
+            logging: 'logging',
+            noTemplate: 'noTemplate',
+            serverError: 'serverError',
+            maxResults: 'maxResults',
+            method: 'method'
+        }
+    }) === $();
+    $(selector).search() === $();
+}
+
+import search = require('semantic-ui-search');
+
+function test_module() {
+    $.fn.search = search;
+}
diff --git a/types/semantic-ui-search/tsconfig.json b/types/semantic-ui-search/tsconfig.json
new file mode 100644
index 0000000000..b6fca8e0e6
--- /dev/null
+++ b/types/semantic-ui-search/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-search-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-search/tslint.json b/types/semantic-ui-search/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-search/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-shape/global.d.ts b/types/semantic-ui-shape/global.d.ts
new file mode 100644
index 0000000000..cfd6cc689e
--- /dev/null
+++ b/types/semantic-ui-shape/global.d.ts
@@ -0,0 +1,260 @@
+interface JQuery {
+    shape: SemanticUI.Shape;
+}
+
+declare namespace SemanticUI {
+    interface Shape {
+        settings: ShapeSettings;
+
+        /**
+         * Flips the shape upward
+         */
+        (behavior: 'flip up'): JQuery;
+        /**
+         * Flips the shape downward
+         */
+        (behavior: 'flip down'): JQuery;
+        /**
+         * Flips the shape right
+         */
+        (behavior: 'flip right'): JQuery;
+        /**
+         * Flips the shape left
+         */
+        (behavior: 'flip left'): JQuery;
+        /**
+         * Flips the shape over clock-wise
+         */
+        (behavior: 'flip over'): JQuery;
+        /**
+         * Flips the shape over counter-clockwise
+         */
+        (behavior: 'flip back'): JQuery;
+        /**
+         * Set the next side to a specific selector
+         */
+        (behavior: 'set next side', selector: string | JQuery): JQuery;
+        /**
+         * Returns whether shape is currently animating
+         */
+        (behavior: 'is animating'): boolean;
+        /**
+         * Removes all inline styles
+         */
+        (behavior: 'reset'): JQuery;
+        /**
+         * Queues an animation until after current animation
+         */
+        (behavior: 'queue', animation: string): JQuery;
+        /**
+         * Forces a reflow on element
+         */
+        (behavior: 'repaint'): JQuery;
+        /**
+         * Set the next side to next sibling to active element
+         */
+        (behavior: 'set default side'): JQuery;
+        /**
+         * Sets shape to the content size of the next side
+         */
+        (behavior: 'set stage size'): JQuery;
+        /**
+         * Refreshes the selector cache for element sides
+         */
+        (behavior: 'refresh'): JQuery;
+        /**
+         * Returns translation for next side staged below
+         */
+        (behavior: 'get transform down'): Shape.Translation;
+        /**
+         * Returns translation for next side staged left
+         */
+        (behavior: 'get transform left'): Shape.Translation;
+        /**
+         * Returns translation for next side staged right
+         */
+        (behavior: 'get transform right'): Shape.Translation;
+        /**
+         * Returns translation for next side staged up
+         */
+        (behavior: 'get transform up'): Shape.Translation;
+        /**
+         * Returns translation for next side staged down
+         */
+        (behavior: 'get transform down'): Shape.Translation;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof ShapeSettings>(behavior: 'setting', name: K, value?: undefined): ShapeSettings[K];
+        <K extends keyof ShapeSettings>(behavior: 'setting', name: K, value: ShapeSettings[K]): JQuery;
+        (behavior: 'setting', value: ShapeSettings.Param): JQuery;
+        (settings?: ShapeSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/shape.html#/settings}
+     */
+    interface ShapeSettings extends Pick<ShapeSettings._Impl, keyof ShapeSettings._Impl> { }
+
+    namespace ShapeSettings {
+        type Param = ShapeSettings | object;
+
+        interface _Impl {
+            // region Shape Settings
+
+            /**
+             * Duration of side change animation
+             *
+             * @default 700
+             */
+            duration: number;
+            /**
+             * When set to next will use the width of the next side during the shape's animation.
+             * When set to initial it will use the width of the shape at initialization.
+             * When set to a specific pixel height, will force the width to that height.
+             *
+             * @default 'initial'
+             * @since 2.2
+             */
+            width: 'next' | 'initial' | number;
+            /**
+             * When set to next will use the height of the next side during the shape's animation.
+             * When set to initial it will use the height of the shape at initialization.
+             * When set to a specific pixel height, will force the height to that height.
+             *
+             * @default 'initial'
+             * @since 2.2
+             */
+            height: 'next' | 'initial' | number;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Is called before side change
+             */
+            beforeChange(this: JQuery): void;
+            /**
+             * Is called after visible side change
+             */
+            onChange(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            selector: Shape.SelectorSettings;
+            className: Shape.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Shape.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Shape {
+        interface Translation {
+            transform: string;
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.sides'
+                 */
+                sides: string;
+                /**
+                 * @default '.side'
+                 */
+                side: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'animating'
+                 */
+                animating: string;
+                /**
+                 * @default 'hidden'
+                 */
+                hidden: string;
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'You tried to switch to a side that does not exist.'
+                 */
+                side: string;
+                /**
+                 * @default 'The method you called is not defined'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-shape/index.d.ts b/types/semantic-ui-shape/index.d.ts
new file mode 100644
index 0000000000..ef5549a1f6
--- /dev/null
+++ b/types/semantic-ui-shape/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-shape 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const shape: SemanticUI.Shape;
+export = shape;
diff --git a/types/semantic-ui-shape/semantic-ui-shape-tests.ts b/types/semantic-ui-shape/semantic-ui-shape-tests.ts
new file mode 100644
index 0000000000..994909085a
--- /dev/null
+++ b/types/semantic-ui-shape/semantic-ui-shape-tests.ts
@@ -0,0 +1,76 @@
+function test_shape_static() {
+    $.fn.shape.settings.error.method = 'method';
+    $.fn.shape.settings.namespace = 'namespace';
+    $.fn.shape.settings.name = 'name';
+    $.fn.shape.settings.silent = false;
+    $.fn.shape.settings.debug = true;
+    $.fn.shape.settings.performance = true;
+    $.fn.shape.settings.verbose = true;
+}
+
+function test_shape() {
+    const selector = '.ui.shape';
+    $(selector).shape('flip up') === $();
+    $(selector).shape('flip down') === $();
+    $(selector).shape('flip right') === $();
+    $(selector).shape('flip left') === $();
+    $(selector).shape('flip over') === $();
+    $(selector).shape('flip back') === $();
+    $(selector).shape('set next side', $()) === $();
+    $(selector).shape('is animating') === false;
+    $(selector).shape('reset') === $();
+    $(selector).shape('queue', 'animation') === $();
+    $(selector).shape('repaint') === $();
+    $(selector).shape('set default side') === $();
+    $(selector).shape('set stage size') === $();
+    $(selector).shape('refresh') === $();
+    $(selector).shape('get transform down') === { transform: 'transform' };
+    $(selector).shape('get transform left') === { transform: 'transform' };
+    $(selector).shape('get transform right') === { transform: 'transform' };
+    $(selector).shape('get transform up') === { transform: 'transform' };
+    $(selector).shape('get transform down') === { transform: 'transform' };
+    $(selector).shape('destroy') === $();
+    $(selector).shape('setting', 'debug', undefined) === false;
+    $(selector).shape('setting', 'debug') === false;
+    $(selector).shape('setting', 'debug', true) === $();
+    $(selector).shape('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).shape({
+        duration: 700,
+        width: 'next',
+        height: 200,
+        beforeChange() {
+            this === $();
+        },
+        onChange() {
+            this === $();
+        },
+        selector: {
+            sides: 'sides',
+            side: 'side'
+        },
+        className: {
+            animating: 'animating',
+            hidden: 'hidden',
+            loading: 'loading',
+            active: 'active'
+        },
+        error: {
+            side: 'side',
+            method: 'method'
+        }
+    }) === $();
+    $(selector).shape() === $();
+}
+
+import shape = require('semantic-ui-shape');
+
+function test_module() {
+    $.fn.shape = shape;
+}
diff --git a/types/semantic-ui-shape/tsconfig.json b/types/semantic-ui-shape/tsconfig.json
new file mode 100644
index 0000000000..80aca84e86
--- /dev/null
+++ b/types/semantic-ui-shape/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-shape-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-shape/tslint.json b/types/semantic-ui-shape/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-shape/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-sidebar/global.d.ts b/types/semantic-ui-sidebar/global.d.ts
new file mode 100644
index 0000000000..1217444f53
--- /dev/null
+++ b/types/semantic-ui-sidebar/global.d.ts
@@ -0,0 +1,424 @@
+interface JQuery {
+    sidebar: SemanticUI.Sidebar;
+}
+
+declare namespace SemanticUI {
+    interface Sidebar {
+        settings: SidebarSettings;
+
+        /**
+         * Attaches sidebar action to given selector. Default event if none specified is toggle
+         */
+        (behavior: 'attach events', selector: string | JQuery, event?: string): JQuery;
+        /**
+         * Shows sidebar
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Hides sidebar
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Toggles visibility of sidebar
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Returns whether sidebar is visible
+         */
+        (behavior: 'is visible'): boolean;
+        /**
+         * Returns whether sidebar is hidden
+         */
+        (behavior: 'is hidden'): boolean;
+        /**
+         * Pushes page content to be visible alongside sidebar
+         */
+        (behavior: 'push page'): JQuery;
+        /**
+         * Returns direction of current sidebar
+         */
+        (behavior: 'get direction'): string;
+        /**
+         * Returns page content to original position
+         */
+        (behavior: 'pull page'): JQuery;
+        /**
+         * Adds stylesheet to page head to trigger sidebar animations
+         */
+        (behavior: 'add body CSS'): JQuery;
+        /**
+         * Removes any inline stylesheets for sidebar animation
+         */
+        (behavior: 'remove body CSS'): JQuery;
+        /**
+         * Returns vendor prefixed transition end event
+         */
+        (behavior: 'get transition event'): string;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof SidebarSettings>(behavior: 'setting', name: K, value?: undefined): SidebarSettings[K];
+        <K extends keyof SidebarSettings>(behavior: 'setting', name: K, value: SidebarSettings[K]): JQuery;
+        (behavior: 'setting', value: SidebarSettings.Param): JQuery;
+        (settings?: SidebarSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/sidebar.html#/settings}
+     */
+    interface SidebarSettings extends Pick<SidebarSettings._Impl, keyof SidebarSettings._Impl> { }
+
+    namespace SidebarSettings {
+        type Param = SidebarSettings | object;
+
+        interface _Impl {
+            // region Behavior
+
+            /**
+             * Context which sidebar will appear inside
+             *
+             * @default 'body'
+             */
+            context: string | JQuery;
+            /**
+             * Whether multiple sidebars can be open at once
+             *
+             * @default false
+             */
+            exclusive: boolean;
+            /**
+             * Whether sidebar can be closed by clicking on page
+             *
+             * @default true
+             */
+            closable: boolean;
+            /**
+             * Whether to dim page contents when sidebar is visible
+             *
+             * @default true
+             */
+            dimPage: boolean;
+            /**
+             * Whether to lock page scroll when sidebar is visible
+             *
+             * @default false
+             */
+            scrollLock: boolean;
+            /**
+             * Whether to return to original scroll position when sidebar is hidden, automatically occurs with transition: scale
+             *
+             * @default false
+             */
+            returnScroll: boolean;
+            /**
+             * When sidebar is initialized without the proper HTML, using this option will defer creation of DOM to use requestAnimationFrame.
+             *
+             * @default false
+             */
+            delaySetup: boolean;
+
+            // endregion
+
+            // region Animation
+
+            /**
+             * Named transition to use when animating sidebar. Defaults to 'auto' which selects transition from defaultTransition based on direction.
+             *
+             * @default 'auto'
+             */
+            transition: string;
+            /**
+             * Named transition to use when animating when detecting mobile device. Defaults to 'auto' which selects transition from defaultTransition based on direction.
+             *
+             * @default 'auto'
+             */
+            mobileTransition: string;
+            /**
+             * Default transitions for each direction and screen size, used with transition: auto
+             */
+            defaultTransition: Sidebar.DefaultTransitionSettings;
+            /**
+             * Whether Javascript animations should be used. Defaults to false. Setting to auto will use legacy animations only for browsers that do not support CSS transforms
+             *
+             * @default false
+             */
+            useLegacy: 'auto' | boolean;
+            /**
+             * Duration of sidebar animation when using legacy Javascript animation
+             *
+             * @default 500
+             */
+            duration: number;
+            /**
+             * Easing to use when using legacy Javascript animation
+             *
+             * @default 'easeInOutQuint'
+             */
+            easing: string;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Is called when a sidebar begins animating in.
+             */
+            onVisible(this: JQuery): void;
+            /**
+             * Is called when a sidebar has finished animating in.
+             */
+            onShow(this: JQuery): void;
+            /**
+             * Is called when a sidebar begins to hide or show
+             */
+            onChange(this: JQuery): void;
+            /**
+             * Is called before a sidebar begins to animate out.
+             */
+            onHide(this: JQuery): void;
+            /**
+             * Is called after a sidebar has finished animating out.
+             */
+            onHidden(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            className: Sidebar.ClassNameSettings;
+            regExp: Sidebar.RegExpSettings;
+            selector: Sidebar.SelectorSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Sidebar.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Sidebar {
+        interface DefaultTransitionSettings extends Pick<DefaultTransitionSettings._Impl, keyof DefaultTransitionSettings._Impl> { }
+
+        namespace DefaultTransitionSettings {
+            type Param = DefaultTransitionSettings | object;
+
+            interface _Impl {
+                computer: ComputerSettings;
+                mobile: MobileSettings;
+            }
+
+            interface ComputerSettings extends Pick<ComputerSettings._Impl, keyof ComputerSettings._Impl> { }
+
+            namespace ComputerSettings {
+                type Param = ComputerSettings | object;
+
+                interface _Impl {
+                    /**
+                     * @default 'uncover'
+                     */
+                    left: string;
+                    /**
+                     * @default 'uncover'
+                     */
+                    right: string;
+                    /**
+                     * @default 'overlay'
+                     */
+                    top: string;
+                    /**
+                     * @default 'overlay'
+                     */
+                    bottom: string;
+                }
+            }
+
+            interface MobileSettings extends Pick<MobileSettings._Impl, keyof MobileSettings._Impl> { }
+
+            namespace MobileSettings {
+                type Param = MobileSettings | object;
+
+                interface _Impl {
+                    /**
+                     * @default 'uncover'
+                     */
+                    left: string;
+                    /**
+                     * @default 'uncover'
+                     */
+                    right: string;
+                    /**
+                     * @default 'overlay'
+                     */
+                    top: string;
+                    /**
+                     * @default 'overlay'
+                     */
+                    bottom: string;
+                }
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+                /**
+                 * @default 'animating'
+                 */
+                animating: string;
+                /**
+                 * @default 'dimmed'
+                 */
+                dimmed: string;
+                /**
+                 * @default 'ios'
+                 */
+                ios: string;
+                /**
+                 * @default 'pushable'
+                 */
+                pushable: string;
+                /**
+                 * @default 'pushed'
+                 */
+                pushed: string;
+                /**
+                 * @default 'right'
+                 */
+                right: string;
+                /**
+                 * @default 'top'
+                 */
+                top: string;
+                /**
+                 * @default 'left'
+                 */
+                left: string;
+                /**
+                 * @default 'bottom'
+                 */
+                bottom: string;
+                /**
+                 * @default 'visible'
+                 */
+                visible: string;
+            }
+        }
+
+        interface RegExpSettings extends Pick<RegExpSettings._Impl, keyof RegExpSettings._Impl> { }
+
+        namespace RegExpSettings {
+            type Param = RegExpSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default /(iPad|iPhone|iPod)/g
+                 */
+                ios: RegExp;
+                /**
+                 * @default /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/g
+                 */
+                mobile: RegExp;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.fixed'
+                 */
+                fixed: string;
+                /**
+                 * @default 'script, link, style, .ui.modal, .ui.dimmer, .ui.nag, .ui.fixed'
+                 */
+                omitted: string;
+                /**
+                 * @default '.pusher'
+                 */
+                pusher: string;
+                /**
+                 * @default '.ui.sidebar'
+                 */
+                sidebar: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+                /**
+                 * @default 'Had to add pusher element. For optimal performance make sure body content is inside a pusher element'
+                 */
+                pusher: string;
+                /**
+                 * @default 'Had to move sidebar. For optimal performance make sure sidebar and pusher are direct children of your body tag'
+                 */
+                movedSidebar: string;
+                /**
+                 * @default 'The overlay setting is no longer supported, use animation: overlay'
+                 */
+                overlay: string;
+                /**
+                 * @default 'There were no elements that matched the specified selector'
+                 */
+                notFound: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-sidebar/index.d.ts b/types/semantic-ui-sidebar/index.d.ts
new file mode 100644
index 0000000000..965ffcca8b
--- /dev/null
+++ b/types/semantic-ui-sidebar/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-sidebar 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const sidebar: SemanticUI.Sidebar;
+export = sidebar;
diff --git a/types/semantic-ui-sidebar/semantic-ui-sidebar-tests.ts b/types/semantic-ui-sidebar/semantic-ui-sidebar-tests.ts
new file mode 100644
index 0000000000..c98b73b47c
--- /dev/null
+++ b/types/semantic-ui-sidebar/semantic-ui-sidebar-tests.ts
@@ -0,0 +1,118 @@
+function test_sidebar_static() {
+    $.fn.sidebar.settings.error.method = 'method';
+    $.fn.sidebar.settings.namespace = 'namespace';
+    $.fn.sidebar.settings.name = 'name';
+    $.fn.sidebar.settings.silent = false;
+    $.fn.sidebar.settings.debug = true;
+    $.fn.sidebar.settings.performance = true;
+    $.fn.sidebar.settings.verbose = true;
+}
+
+function test_sidebar() {
+    const selector = '.ui.sidebar';
+    $(selector).sidebar('attach events', $(), 'toggle') === $();
+    $(selector).sidebar('show') === $();
+    $(selector).sidebar('hide') === $();
+    $(selector).sidebar('toggle') === $();
+    $(selector).sidebar('is visible') === false;
+    $(selector).sidebar('is hidden') === true;
+    $(selector).sidebar('push page') === $();
+    $(selector).sidebar('get direction') === 'top';
+    $(selector).sidebar('pull page') === $();
+    $(selector).sidebar('add body CSS') === $();
+    $(selector).sidebar('remove body CSS') === $();
+    $(selector).sidebar('get transition event') === 'transition';
+    $(selector).sidebar('destroy') === $();
+    $(selector).sidebar('setting', 'debug', undefined) === false;
+    $(selector).sidebar('setting', 'debug') === false;
+    $(selector).sidebar('setting', 'debug', true) === $();
+    $(selector).sidebar('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).sidebar({
+        context: $(),
+        exclusive: false,
+        closable: true,
+        dimPage: false,
+        scrollLock: true,
+        returnScroll: false,
+        delaySetup: true,
+        transition: 'auto',
+        mobileTransition: 'auto',
+        defaultTransition: {
+            mobile: {
+                left: 'left',
+                right: 'right',
+                top: 'top',
+                bottom: 'bottom'
+            },
+            computer: {
+                left: 'left',
+                right: 'right',
+                top: 'top',
+                bottom: 'bottom'
+            }
+        },
+        useLegacy: false,
+        duration: 20,
+        easing: 'easeInOutQuint',
+        onVisible() {
+            this === $();
+        },
+        onShow() {
+            this === $();
+        },
+        onChange() {
+            this === $();
+        },
+        onHide() {
+            this === $();
+        },
+        onHidden() {
+            this === $();
+        },
+        className: {
+            active: 'active',
+            animating: 'animating',
+            dimmed: 'dimmed',
+            ios: 'ios',
+            pushable: 'pushable',
+            pushed: 'pushed',
+            right: 'right',
+            top: 'top',
+            left: 'left',
+            bottom: 'bottom',
+            visible: 'visible'
+        },
+        regExp: {
+            ios: /(iPad|iPhone|iPod)/g,
+            mobile: /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/g,
+        },
+        selector: {
+            fixed: 'fixed',
+            omitted: 'omitted',
+            pusher: 'pusher',
+            sidebar: 'sidebar'
+        },
+        error: {
+            method: 'method',
+            pusher: 'pusher',
+            movedSidebar: 'movedSidebar',
+            animation: 'animation',
+            overlay: 'overlay',
+            notFound: 'notFound'
+        }
+    }) === $();
+    $(selector).sidebar() === $();
+}
+
+import sidebar = require('semantic-ui-sidebar');
+
+function test_module() {
+    $.fn.sidebar = sidebar;
+}
diff --git a/types/semantic-ui-sidebar/tsconfig.json b/types/semantic-ui-sidebar/tsconfig.json
new file mode 100644
index 0000000000..250b2dfae1
--- /dev/null
+++ b/types/semantic-ui-sidebar/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-sidebar-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-sidebar/tslint.json b/types/semantic-ui-sidebar/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-sidebar/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-site/global.d.ts b/types/semantic-ui-site/global.d.ts
new file mode 100644
index 0000000000..1cd7caa858
--- /dev/null
+++ b/types/semantic-ui-site/global.d.ts
@@ -0,0 +1,85 @@
+interface JQueryStatic {
+    site: SemanticUI.Site;
+}
+
+interface JQuery {
+    site: SemanticUI.Site;
+}
+
+declare namespace SemanticUI {
+    interface Site {
+        settings: SiteSettings;
+
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof SiteSettings>(behavior: 'setting', name: K, value?: undefined): SiteSettings[K];
+        <K extends keyof SiteSettings>(behavior: 'setting', name: K, value: SiteSettings[K]): JQuery;
+        (behavior: 'setting', value: SiteSettings.Param): JQuery;
+        (settings?: SiteSettings.Param): JQuery;
+    }
+
+    interface SiteSettings extends Pick<SiteSettings._Impl, keyof SiteSettings._Impl> { }
+
+    namespace SiteSettings {
+        type Param = SiteSettings | object;
+
+        interface _Impl {
+            modules: string[];
+            siteNamespace: string;
+            namespaceStub: Site.NamespaceStubSettings;
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Site {
+        interface NamespaceStubSettings extends Pick<NamespaceStubSettings._Impl, keyof NamespaceStubSettings._Impl> { }
+
+        namespace NamespaceStubSettings {
+            type Param = NamespaceStubSettings | object;
+
+            interface _Impl {
+                cache: any;
+                config: any;
+                sections: any;
+                section: any;
+                utilities: any;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-site/index.d.ts b/types/semantic-ui-site/index.d.ts
new file mode 100644
index 0000000000..71951847fd
--- /dev/null
+++ b/types/semantic-ui-site/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-site 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const site: SemanticUI.Site;
+export = site;
diff --git a/types/semantic-ui-site/semantic-ui-site-tests.ts b/types/semantic-ui-site/semantic-ui-site-tests.ts
new file mode 100644
index 0000000000..0eaddfc5b2
--- /dev/null
+++ b/types/semantic-ui-site/semantic-ui-site-tests.ts
@@ -0,0 +1,52 @@
+function test_site_static() {
+    $.site.settings.namespace = 'namespace';
+    $.site.settings.name = 'name';
+    $.site.settings.silent = false;
+    $.site.settings.debug = true;
+    $.site.settings.performance = true;
+    $.site.settings.verbose = true;
+
+    $.fn.site.settings.namespace = 'namespace';
+    $.fn.site.settings.name = 'name';
+    $.fn.site.settings.silent = false;
+    $.fn.site.settings.debug = true;
+    $.fn.site.settings.performance = true;
+    $.fn.site.settings.verbose = true;
+}
+
+function test_site() {
+    const selector = '.ui.site';
+    $(selector).site('destroy') === $();
+    $(selector).site('setting', 'debug', undefined) === false;
+    $(selector).site('setting', 'debug') === false;
+    $(selector).site('setting', 'debug', true) === $();
+    $(selector).site('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).site({
+        modules: [
+            'module1',
+            'module2',
+        ],
+        siteNamespace: 'siteNamespace',
+        namespaceStub: {
+            cache: {},
+            config: {},
+            sections: {},
+            section: {},
+            utilities: {}
+        }
+    }) === $();
+    $(selector).site() === $();
+}
+
+import site = require('semantic-ui-site');
+
+function test_module() {
+    $.fn.site = site;
+}
diff --git a/types/semantic-ui-site/tsconfig.json b/types/semantic-ui-site/tsconfig.json
new file mode 100644
index 0000000000..0ea895173c
--- /dev/null
+++ b/types/semantic-ui-site/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-site-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-site/tslint.json b/types/semantic-ui-site/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-site/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-sticky/global.d.ts b/types/semantic-ui-sticky/global.d.ts
new file mode 100644
index 0000000000..683d1aafc7
--- /dev/null
+++ b/types/semantic-ui-sticky/global.d.ts
@@ -0,0 +1,219 @@
+interface JQuery {
+    sticky: SemanticUI.Sticky;
+}
+
+declare namespace SemanticUI {
+    interface Sticky {
+        settings: StickySettings;
+
+        /**
+         * recalculates offsets
+         */
+        (behavior: 'refresh'): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof StickySettings>(behavior: 'setting', name: K, value?: undefined): StickySettings[K];
+        <K extends keyof StickySettings>(behavior: 'setting', name: K, value: StickySettings[K]): JQuery;
+        (behavior: 'setting', value: StickySettings.Param): JQuery;
+        (settings?: StickySettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/sticky.html#/settings}
+     */
+    interface StickySettings extends Pick<StickySettings._Impl, keyof StickySettings._Impl> { }
+
+    namespace StickySettings {
+        type Param = StickySettings | object;
+
+        interface _Impl {
+            // region Sticky Settings
+
+            /**
+             * Whether element should be "pushed" by the viewport, attaching to the bottom of the screen when scrolling up
+             *
+             * @default false
+             */
+            pushing: boolean;
+            /**
+             * Sticky container height will only be set if the difference between heights of container and context is larger than this jitter value.
+             *
+             * @default 5
+             */
+            jitter: number;
+            /**
+             * Whether any change in context DOM should automatically refresh cached sticky positions
+             *
+             * @default false
+             */
+            observeChanges: boolean;
+            /**
+             * Context which sticky element should stick to
+             *
+             * @default false
+             */
+            context: false | string | JQuery;
+            /**
+             * Context which sticky should attach onscroll events.
+             *
+             * @default 'window'
+             */
+            scrollContext: string | JQuery;
+            /**
+             * Offset in pixels from the top of the screen when fixing element to viewport
+             *
+             * @default 0
+             */
+            offset: number;
+            /**
+             * Offset in pixels from the bottom of the screen when fixing element to viewport
+             *
+             * @default 0
+             */
+            bottomOffset: number;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback when element is repositioned from layout change
+             */
+            onReposition(this: JQuery): void;
+            /**
+             * Callback when requestAnimationFrame fires from scroll handler.
+             */
+            onScroll(this: JQuery): void;
+            /**
+             * Callback when element is fixed to page
+             */
+            onStick(this: JQuery): void;
+            /**
+             * Callback when element is unfixed from page
+             */
+            onUnstick(this: JQuery): void;
+            /**
+             * Callback when element is bound to top of parent container
+             */
+            onTop(this: JQuery): void;
+            /**
+             * Callback when element is bound to bottom of parent container
+             */
+            onBottom(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Class names used to attach style to state
+             */
+            className: Sticky.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Sticky.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Sticky {
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'bound'
+                 */
+                bound: string;
+                /**
+                 * @default 'fixed'
+                 */
+                fixed: string;
+                /**
+                 * @default 'native'
+                 */
+                supported: string;
+                /**
+                 * @default 'top'
+                 */
+                top: string;
+                /**
+                 * @default 'bottom'
+                 */
+                bottom: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'Sticky element must be inside a relative container'
+                 */
+                container: string;
+                /**
+                 * @default 'Element is hidden, you must call refresh after element becomes visible'
+                 */
+                visible: string;
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+                /**
+                 * @default 'Context specified does not exist'
+                 */
+                invalidContext: string;
+                /**
+                 * @default 'Sticky element is larger than its container, cannot create sticky.'
+                 */
+                elementSize: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-sticky/index.d.ts b/types/semantic-ui-sticky/index.d.ts
new file mode 100644
index 0000000000..633c236597
--- /dev/null
+++ b/types/semantic-ui-sticky/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-sticky 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const sticky: SemanticUI.Sticky;
+export = sticky;
diff --git a/types/semantic-ui-sticky/semantic-ui-sticky-tests.ts b/types/semantic-ui-sticky/semantic-ui-sticky-tests.ts
new file mode 100644
index 0000000000..0a3585f08d
--- /dev/null
+++ b/types/semantic-ui-sticky/semantic-ui-sticky-tests.ts
@@ -0,0 +1,74 @@
+function test_sticky_static() {
+    $.fn.sticky.settings.error.method = 'method';
+    $.fn.sticky.settings.namespace = 'namespace';
+    $.fn.sticky.settings.name = 'name';
+    $.fn.sticky.settings.silent = false;
+    $.fn.sticky.settings.debug = true;
+    $.fn.sticky.settings.performance = true;
+    $.fn.sticky.settings.verbose = true;
+}
+
+function test_sticky() {
+    const selector = '.ui.sticky';
+    $(selector).sticky('refresh') === $();
+    $(selector).sticky('destroy') === $();
+    $(selector).sticky('setting', 'debug', undefined) === false;
+    $(selector).sticky('setting', 'debug') === false;
+    $(selector).sticky('setting', 'debug', true) === $();
+    $(selector).sticky('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).sticky({
+        pushing: false,
+        jitter: 4,
+        observeChanges: true,
+        context: $(),
+        scrollContext: $(),
+        offset: 1,
+        bottomOffset: 200,
+        onReposition() {
+            this === $();
+        },
+        onScroll() {
+            this === $();
+        },
+        onStick() {
+            this === $();
+        },
+        onUnstick() {
+            this === $();
+        },
+        onTop() {
+            this === $();
+        },
+        onBottom() {
+            this === $();
+        },
+        className: {
+            bound: 'bound',
+            fixed: 'fixed',
+            supported: 'supported',
+            top: 'top',
+            bottom: 'bottom'
+        },
+        error: {
+            container: 'container',
+            visible: 'visible',
+            method: 'method',
+            invalidContext: 'invalidContext',
+            elementSize: 'elementSize'
+        }
+    }) === $();
+    $(selector).sticky() === $();
+}
+
+import sticky = require('semantic-ui-sticky');
+
+function test_module() {
+    $.fn.sticky = sticky;
+}
diff --git a/types/semantic-ui-sticky/tsconfig.json b/types/semantic-ui-sticky/tsconfig.json
new file mode 100644
index 0000000000..8a60c43a02
--- /dev/null
+++ b/types/semantic-ui-sticky/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-sticky-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-sticky/tslint.json b/types/semantic-ui-sticky/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-sticky/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-tab/global.d.ts b/types/semantic-ui-tab/global.d.ts
new file mode 100644
index 0000000000..7bd8aad4fc
--- /dev/null
+++ b/types/semantic-ui-tab/global.d.ts
@@ -0,0 +1,357 @@
+interface JQuery {
+    tab: SemanticUI.Tab;
+}
+
+declare namespace SemanticUI {
+    interface Tab {
+        settings: TabSettings;
+
+        // Documentation says this exists but it does not.
+        // /**
+        //  * Attaches tab action to given selector. Default event if none specified is toggle
+        //  */
+        // (behavior: 'attach events', selector: Selector, event?: string): JQuery;
+        /**
+         * Changes tab to path
+         */
+        (behavior: 'change tab', path: string): JQuery;
+        /**
+         * Sets current path to state
+         */
+        (behavior: 'set state', path: string): JQuery;
+        /**
+         * Returns current path
+         */
+        (behavior: 'get path'): string;
+        /**
+         * Returns whether tab exists
+         */
+        (behavior: 'is tab'): boolean;
+        /**
+         * Returns cached HTML for path
+         */
+        (behavior: 'cache read', path: string): string | false;
+        /**
+         * Sets cached HTML for path
+         */
+        (behavior: 'cache add', path: string, html: string): JQuery;
+        /**
+         * Removes cached HTML for path
+         */
+        (behavior: 'cache remove', path: string): JQuery;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof TabSettings>(behavior: 'setting', name: K, value?: undefined): TabSettings[K];
+        <K extends keyof TabSettings>(behavior: 'setting', name: K, value: TabSettings[K]): JQuery;
+        (behavior: 'setting', value: TabSettings.Param): JQuery;
+        (settings?: TabSettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/tab.html#/settings}
+     */
+    interface TabSettings extends Pick<TabSettings._Impl, keyof TabSettings._Impl> { }
+
+    namespace TabSettings {
+        type Param = TabSettings | object;
+
+        interface _Impl {
+            // region Tab Settings
+
+            /**
+             * Whether tab should load remote content as same url as history
+             *
+             * @default false
+             */
+            auto: boolean;
+            /**
+             * When set to siblings will only deactivate elements that are DOM siblings with the activated element.
+             * When set to all the component will deactivate all other elements initialized at the same time.
+             *
+             * @default 'siblings'
+             * @since 2.2
+             */
+            deactivate: 'siblings' | 'all';
+            /**
+             * Whether to record history events for tab changes
+             *
+             * @default false
+             */
+            history: boolean;
+            /**
+             * Do not load content remotely on first tab load. Useful when open tab is rendered on server.
+             *
+             * @default false
+             */
+            ignoreFirstLoad: boolean;
+            /**
+             * Whether inline scripts in tab HTML should be parsed on tab load.
+             * Defaults to once, parsing only on first load.
+             * Can also be set to true or false to always parse or never parse inline scripts.
+             *
+             * @default 'once'
+             */
+            evaluateScripts: 'once' | boolean;
+            /**
+             * Tab should reload content every time it is opened
+             */
+            alwaysRefresh: boolean;
+            /**
+             * Can be set to either response, DOM or html.
+             * Using DOM will cache the a clone of the DOM tree, preserving all events as they existed on render.
+             * response will cache the original response on load, this way callbacks always receive the same content.
+             * Using html will cache the resulting html after all callbacks, making sure any changes to content are preserved.
+             *
+             * @default 'response'
+             */
+            cacheType: 'response' | 'DOM' | 'html';
+            /**
+             * Tab should cache content after loading locally to avoid server trip on second load
+             *
+             * @default true
+             */
+            cache: boolean;
+            /**
+             * Settings object for $.api call
+             *
+             * @default false
+             * @see {@link http://semantic-ui.com/behaviors/api.html}
+             */
+            apiSettings: ApiSettings;
+            /**
+             * Can be set to hash or state.
+             * Hash will use an in-page link to create history events.
+             * State will use DOM History and load pages from server on refresh.
+             *
+             * @default 'hash'
+             * @see {@link https://developer.mozilla.org/en-US/docs/Web/Guide/API/DOM/Manipulating_the_browser_history}
+             */
+            historyType: 'hash' | 'state';
+            /**
+             * When using historyType state you must specify the base URL for all internal links.
+             *
+             * @default false
+             */
+            path: false | string;
+            /**
+             * Tabs are limited to those found inside this context
+             *
+             * @default false
+             */
+            context: false | string | JQuery;
+            /**
+             * If enabled limits tabs to children of passed context
+             *
+             * @default false
+             */
+            childrenOnly: boolean;
+            /**
+             * Maximum amount of nested tabs allowed (avoids recursion)
+             *
+             * @default 25
+             */
+            maxDepth: number;
+            /**
+             * When enabled only calls remote endpoint for tab data on first load and leaves the DOM undisturbed afterwards.
+             *
+             * @default false
+             * @since 2.2.8
+             */
+            loadOnce: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback only the first time a tab is loaded
+             */
+            onFirstLoad(this: JQuery, tabPath: string, parameterArray: any[], historyEvent: any): void;
+            /**
+             * Callback every time a tab is loaded
+             */
+            onLoad(this: JQuery, tabPath: string, parameterArray: any[], historyEvent: any): void;
+            /**
+             * Called when a tab begins loading remote content
+             */
+            onRequest(this: JQuery, tabPath: string): void;
+            /**
+             * Called after a tab becomes visible
+             */
+            onVisible(this: JQuery, tabPath: string): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Functions used to return content
+             */
+            templates: Tab.TemplatesSettings;
+            /**
+             * Selectors used by module
+             */
+            selector: Tab.SelectorSettings;
+            /**
+             * DOM metadata used by module
+             */
+            metadata: Tab.MetadataSettings;
+            /**
+             * Class names used to attach style to state
+             */
+            className: Tab.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Tab.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Tab {
+        interface TemplatesSettings extends Pick<TemplatesSettings._Impl, keyof TemplatesSettings._Impl> { }
+
+        namespace TemplatesSettings {
+            type Param = TemplatesSettings | object;
+
+            interface _Impl {
+                /**
+                 * returns page title
+                 */
+                determineTitle(tabArray: any[]): string;
+            }
+        }
+
+        interface SelectorSettings extends Pick<SelectorSettings._Impl, keyof SelectorSettings._Impl> { }
+
+        namespace SelectorSettings {
+            type Param = SelectorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default '.ui.tab'
+                 */
+                tabs: string;
+                /**
+                 * @default '.ui:not(.menu)'
+                 */
+                parent: string;
+            }
+        }
+
+        interface MetadataSettings extends Pick<MetadataSettings._Impl, keyof MetadataSettings._Impl> { }
+
+        namespace MetadataSettings {
+            type Param = MetadataSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'tab'
+                 */
+                tab: string;
+                /**
+                 * @default 'loaded'
+                 */
+                loaded: string;
+                /**
+                 * @default 'promise'
+                 */
+                promise: string;
+            }
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'active'
+                 */
+                active: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'You attempted to load content without API module'
+                 */
+                api: string;
+                /**
+                 * @default 'The method you called is not defined'
+                 */
+                method: string;
+                /**
+                 * @default 'Activated tab cannot be found for this context.'
+                 */
+                missingTab: string;
+                /**
+                 * @default 'The tab you specified is missing a content url.'
+                 */
+                noContent: string;
+                /**
+                 * @default 'History enabled, but no path was specified'
+                 */
+                path: string;
+                /**
+                 * @default 'Max recursive depth reached'
+                 */
+                recursion: string;
+                /**
+                 * @default 'The state library has not been initialized'
+                 */
+                state: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-tab/index.d.ts b/types/semantic-ui-tab/index.d.ts
new file mode 100644
index 0000000000..acea430715
--- /dev/null
+++ b/types/semantic-ui-tab/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for semantic-ui-tab 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference types="semantic-ui-api" />
+/// <reference path="global.d.ts" />
+
+declare const tab: SemanticUI.Tab;
+export = tab;
diff --git a/types/semantic-ui-tab/semantic-ui-tab-tests.ts b/types/semantic-ui-tab/semantic-ui-tab-tests.ts
new file mode 100644
index 0000000000..a3bbc096c4
--- /dev/null
+++ b/types/semantic-ui-tab/semantic-ui-tab-tests.ts
@@ -0,0 +1,204 @@
+function test_tab_static() {
+    $.fn.tab.settings.error.method = 'method';
+    $.fn.tab.settings.namespace = 'namespace';
+    $.fn.tab.settings.name = 'name';
+    $.fn.tab.settings.silent = false;
+    $.fn.tab.settings.debug = true;
+    $.fn.tab.settings.performance = true;
+    $.fn.tab.settings.verbose = true;
+}
+
+function test_tab() {
+    const selector = '.ui.tab';
+    $(selector).tab('change tab', 'path') === $();
+    $(selector).tab('set state', 'path') === $();
+    $(selector).tab('get path') === 'path';
+    $(selector).tab('is tab') === false;
+    $(selector).tab('cache read', 'path') === false;
+    $(selector).tab('cache add', 'path', 'html') === $();
+    $(selector).tab('cache remove', 'path') === $();
+    $(selector).tab('destroy') === $();
+    $(selector).tab('setting', 'debug', undefined) === false;
+    $(selector).tab('setting', 'debug') === false;
+    $(selector).tab('setting', 'debug', true) === $();
+    $(selector).tab('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).tab({
+        auto: false,
+        deactivate: 'siblings',
+        history: true,
+        ignoreFirstLoad: false,
+        evaluateScripts: 'once',
+        alwaysRefresh: true,
+        cacheType: 'DOM',
+        cache: false,
+        apiSettings: {
+            on: 'on',
+            cache: true,
+            stateContext: $(),
+            encodeParameters: false,
+            defaultData: true,
+            serializeForm: false,
+            throttle: 10,
+            throttleFirstRequest: true,
+            interruptRequests: false,
+            loadingDuration: 3,
+            hideError: true,
+            errorDuration: 10,
+            action: 'action',
+            url: 'url',
+            urlData: false,
+            response: false,
+            responseAsync(settings, callback) {
+                settings === ({} as SemanticUI.ApiSettings);
+                callback === ((response: any) => { });
+            },
+            mockResponse: false,
+            mockResponseAsync(settings, callback) {
+                settings === ({} as SemanticUI.ApiSettings);
+                callback === ((response: any) => { });
+            },
+            method: 'post',
+            dataType: 'xml',
+            data: {},
+            beforeSend(settings) {
+                settings === ({} as SemanticUI.ApiSettings);
+            },
+            beforeXHR(xhrObject) {
+                xhrObject === ({} as JQueryXHR);
+            },
+            onRequest(promise, xhr) {
+                promise === ({} as JQueryDeferred<any>);
+                xhr === ({} as JQueryXHR);
+            },
+            onResponse(response) {
+                response === ({} as any);
+            },
+            successTest(response) {
+                return response === ({} as any);
+            },
+            onSuccess(response, element, xhr) {
+                response === ({} as any);
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onComplete(response, element, xhr) {
+                response === ({} as any);
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onFailure(response, element) {
+                response === ({} as any);
+                element === $();
+            },
+            onError(errorMessage, element, xhr) {
+                errorMessage === '';
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            onAbort(errorMessage, element, xhr) {
+                errorMessage === '';
+                element === $();
+                xhr === ({} as JQueryXHR);
+            },
+            regExp: {
+                required: /{\$*[A-z0-9]+}/g,
+                optional: /{\/\$*[A-z0-9]+}/g
+            },
+            selector: {
+                disabled: '.disabled',
+                form: 'form'
+            },
+            className: {
+                loading: 'loading',
+                error: 'error'
+            },
+            metadata: {
+                action: 'action',
+                url: 'url'
+            },
+            error: {
+                beforeSend: 'beforeSend',
+                error: 'error',
+                exitConditions: 'exitConditions',
+                JSONParse: 'JSONParse',
+                legacyParameters: 'legacyParameters',
+                missingAction: 'missingAction',
+                missingSerialize: 'missingSerialize',
+                missingURL: 'missingURL',
+                noReturnedValue: 'noReturnedValue',
+                parseError: 'parseError',
+                requiredParameter: 'requiredParameter',
+                statusMessage: 'statusMessage',
+                timeout: 'timeout'
+            }
+        },
+        historyType: 'state',
+        path: 'path',
+        context: $(),
+        childrenOnly: true,
+        maxDepth: 10,
+        loadOnce: false,
+        onFirstLoad(tabPath, parameterArray, historyEvent) {
+            this === $();
+            tabPath === 'tabPath';
+            parameterArray === [];
+            historyEvent === {};
+        },
+        onLoad(tabPath, parameterArray, historyEvent) {
+            this === $();
+            tabPath === 'tabPath';
+            parameterArray === [];
+            historyEvent === {};
+        },
+        onRequest(tabPath) {
+            this === $();
+            tabPath === 'tabPath';
+        },
+        onVisible(tabPath) {
+            this === $();
+            tabPath === 'tabPath';
+        },
+        templates: {
+            determineTitle(tabArray) {
+                tabArray === [];
+                return 'title';
+            }
+        },
+        selector: {
+            tabs: 'tabs',
+            parent: 'parent'
+        },
+        metadata: {
+            tab: 'tab',
+            loaded: 'loaded',
+            promise: 'promise'
+        },
+        className: {
+            loading: 'loading',
+            active: 'active'
+        },
+        error: {
+            api: 'api',
+            method: 'method',
+            missingTab: 'missingTab',
+            noContent: 'noContent',
+            path: 'path',
+            recursion: 'recursion',
+            state: 'state'
+        }
+    }) === $();
+    $(selector).tab() === $();
+}
+
+import tab = require('semantic-ui-tab');
+
+function test_module() {
+    $.fn.tab = tab;
+}
diff --git a/types/semantic-ui-tab/tsconfig.json b/types/semantic-ui-tab/tsconfig.json
new file mode 100644
index 0000000000..2896defde1
--- /dev/null
+++ b/types/semantic-ui-tab/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-tab-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-tab/tslint.json b/types/semantic-ui-tab/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-tab/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-transition/global.d.ts b/types/semantic-ui-transition/global.d.ts
new file mode 100644
index 0000000000..2ec4cf4ba4
--- /dev/null
+++ b/types/semantic-ui-transition/global.d.ts
@@ -0,0 +1,294 @@
+interface JQuery {
+    transition: SemanticUI.Transition;
+}
+
+declare namespace SemanticUI {
+    interface Transition {
+        settings: TransitionSettings;
+
+        /**
+         * Stop current animation and preserve queue
+         */
+        (behavior: 'stop'): JQuery;
+        /**
+         * Stop current animation and queued animations
+         */
+        (behavior: 'stop all'): JQuery;
+        /**
+         * Clears all queued animations
+         */
+        (behavior: 'clear queue'): JQuery;
+        /**
+         * Stop current animation and show element
+         */
+        (behavior: 'show'): JQuery;
+        /**
+         * Stop current animation and hide element
+         */
+        (behavior: 'hide'): JQuery;
+        /**
+         * Toggles between hide and show
+         */
+        (behavior: 'toggle'): JQuery;
+        /**
+         * Forces reflow using a more expensive but stable method
+         */
+        (behavior: 'force repaint'): JQuery;
+        /**
+         * Triggers reflow on element
+         */
+        (behavior: 'repaint'): JQuery;
+        /**
+         * Resets all conditions changes during transition
+         */
+        (behavior: 'reset'): JQuery;
+        /**
+         * Enables animation looping
+         */
+        (behavior: 'looping'): JQuery;
+        /**
+         * Removes looping state from element
+         */
+        (behavior: 'remove looping'): JQuery;
+        /**
+         * Adds disabled state (stops ability to animate)
+         */
+        (behavior: 'disable'): JQuery;
+        /**
+         * Removes disabled state
+         */
+        (behavior: 'enable'): JQuery;
+        /**
+         * Modifies element animation duration
+         */
+        (behavior: 'set duration', duration: number): JQuery;
+        /**
+         * Saves all class names and styles to cache to be retrieved after animation
+         */
+        (behavior: 'save conditions'): JQuery;
+        /**
+         * Adds back cached names and styles to element
+         */
+        (behavior: 'restore conditions'): JQuery;
+        /**
+         * Returns vendor prefixed animation property for animationname
+         */
+        (behavior: 'get animation name'): string;
+        /**
+         * Returns vendor prefixed animation property for animationend
+         */
+        (behavior: 'get animation event'): string;
+        /**
+         * Returns whether element is currently visible
+         */
+        (behavior: 'is visible'): boolean;
+        /**
+         * Returns whether transition is currently occurring
+         */
+        (behavior: 'is animating'): boolean;
+        /**
+         * Returns whether animation looping is set
+         */
+        (behavior: 'is looping'): boolean;
+        /**
+         * Returns whether animations are supported
+         */
+        (behavior: 'is supported'): boolean;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof TransitionSettings>(behavior: 'setting', name: K, value?: undefined): TransitionSettings[K];
+        <K extends keyof TransitionSettings>(behavior: 'setting', name: K, value: TransitionSettings[K]): JQuery;
+        (behavior: 'setting', value: TransitionSettings | object): JQuery;
+        (transition: string): JQuery;
+        (settings?: TransitionSettings | object): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/modules/transition.html#/settings}
+     */
+    interface TransitionSettings extends Pick<TransitionSettings._Impl, keyof TransitionSettings._Impl> { }
+
+    namespace TransitionSettings {
+        interface _Impl {
+            // region Transition Settings
+
+            /**
+             * Named animation event to used. Must be defined in CSS.
+             *
+             * @default 'fade'
+             */
+            animation: string;
+            /**
+             * Interval in MS between each elements transition
+             *
+             * @default 0
+             */
+            interval: number;
+            /**
+             * When an interval is specified, sets order of animations. auto reverses only animations that are hiding.
+             *
+             * @default 'auto'
+             */
+            reverse: 'auto' | boolean;
+            /**
+             * Specify the final display type (block, inline-block etc) so that it doesn't have to be calculated.
+             *
+             * @default false
+             */
+            displayType: false | string;
+            /**
+             * Duration of the CSS transition animation
+             *
+             * @default 500
+             */
+            duration: number;
+            /**
+             * If enabled a timeout will be added to ensure animationend callback occurs even if element is hidden
+             */
+            useFailSafe: boolean;
+            /**
+             * If enabled will allow same animation to be queued while it is already occurring
+             */
+            allowRepeats: boolean;
+            /**
+             * Whether to automatically queue animation if another is occurring
+             */
+            queue: boolean;
+
+            // endregion
+
+            // region Callbacks
+
+            /**
+             * Callback on each transition that changes visibility to shown
+             */
+            onShow(this: JQuery): void;
+            /**
+             * Callback on each transition that changes visibility to hidden
+             */
+            onHide(this: JQuery): void;
+            /**
+             * Callback on animation start, useful for queued animations
+             */
+            onStart(this: JQuery): void;
+            /**
+             * Callback on each transition complete
+             */
+            onComplete(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Class names used to attach style to state
+             */
+            className: Transition.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Transition.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Transition {
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            interface _Impl {
+                /**
+                 * @default 'animating'
+                 */
+                animating: string;
+                /**
+                 * @default 'disabled'
+                 */
+                disabled: string;
+                /**
+                 * @default 'hidden'
+                 */
+                hidden: string;
+                /**
+                 * @default 'in'
+                 */
+                inward: string;
+                /**
+                 * @default 'loading'
+                 */
+                loading: string;
+                /**
+                 * @default 'looping'
+                 */
+                looping: string;
+                /**
+                 * @default 'out'
+                 */
+                outward: string;
+                /**
+                 * @default 'transition'
+                 */
+                transition: string;
+                /**
+                 * @default 'visible'
+                 */
+                visible: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            interface _Impl {
+                /**
+                 * @default 'There is no CSS animation matching the one you specified.'
+                 */
+                noAnimation: string;
+                /**
+                 * @default 'The method you called is not defined'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-transition/index.d.ts b/types/semantic-ui-transition/index.d.ts
new file mode 100644
index 0000000000..1365e38f63
--- /dev/null
+++ b/types/semantic-ui-transition/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-transition 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const transition: SemanticUI.Transition;
+export = transition;
diff --git a/types/semantic-ui-transition/semantic-ui-transition-tests.ts b/types/semantic-ui-transition/semantic-ui-transition-tests.ts
new file mode 100644
index 0000000000..a9b3208e8a
--- /dev/null
+++ b/types/semantic-ui-transition/semantic-ui-transition-tests.ts
@@ -0,0 +1,92 @@
+function test_static() {
+    $.fn.transition.settings.error.method = 'method';
+    $.fn.transition.settings.namespace = 'namespace';
+    $.fn.transition.settings.name = 'name';
+    $.fn.transition.settings.silent = false;
+    $.fn.transition.settings.debug = true;
+    $.fn.transition.settings.performance = true;
+    $.fn.transition.settings.verbose = true;
+}
+
+function test_transition() {
+    const selector = '.ui.transition';
+    $(selector).transition('stop') === $();
+    $(selector).transition('stop all') === $();
+    $(selector).transition('clear queue') === $();
+    $(selector).transition('show') === $();
+    $(selector).transition('hide') === $();
+    $(selector).transition('toggle') === $();
+    $(selector).transition('force repaint') === $();
+    $(selector).transition('repaint') === $();
+    $(selector).transition('reset') === $();
+    $(selector).transition('looping') === $();
+    $(selector).transition('remove looping') === $();
+    $(selector).transition('disable') === $();
+    $(selector).transition('enable') === $();
+    $(selector).transition('set duration', 10) === $();
+    $(selector).transition('save conditions') === $();
+    $(selector).transition('restore conditions') === $();
+    $(selector).transition('get animation name') === 'animation name';
+    $(selector).transition('get animation event') === 'animation event';
+    $(selector).transition('is visible') === false;
+    $(selector).transition('is animating') === false;
+    $(selector).transition('is looping') === false;
+    $(selector).transition('is supported') === false;
+    $(selector).transition('destroy') === $();
+    $(selector).transition('setting', 'debug', undefined) === false;
+    $(selector).transition('setting', 'debug') === false;
+    $(selector).transition('setting', 'debug', true) === $();
+    $(selector).transition('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).transition('fade') === $();
+    $(selector).transition({
+        animation: 'fade',
+        interval: 200,
+        reverse: true,
+        displayType: 'inline-block',
+        duration: 300,
+        useFailSafe: false,
+        allowRepeats: true,
+        queue: false,
+        onShow() {
+            this === $();
+        },
+        onHide() {
+            this === $();
+        },
+        onStart() {
+            this === $();
+        },
+        onComplete() {
+            this === $();
+        },
+        className: {
+            animating: 'animating',
+            disabled: 'disabled',
+            hidden: 'hidden',
+            inward: 'inward',
+            loading: 'loading',
+            looping: 'looping',
+            outward: 'outward',
+            transition: 'transition',
+            visible: 'visible'
+        },
+        error: {
+            noAnimation: 'noAnimation',
+            method: 'method'
+        }
+    }) === $();
+    $(selector).transition() === $();
+}
+
+import transition = require('semantic-ui-transition');
+
+function test_module() {
+    $.fn.transition = transition;
+}
diff --git a/types/semantic-ui-transition/tsconfig.json b/types/semantic-ui-transition/tsconfig.json
new file mode 100644
index 0000000000..bf1eaa1f28
--- /dev/null
+++ b/types/semantic-ui-transition/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-transition-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-transition/tslint.json b/types/semantic-ui-transition/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-transition/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui-visibility/global.d.ts b/types/semantic-ui-visibility/global.d.ts
new file mode 100644
index 0000000000..fa735676c5
--- /dev/null
+++ b/types/semantic-ui-visibility/global.d.ts
@@ -0,0 +1,366 @@
+interface JQuery {
+    visibility: SemanticUI.Visibility;
+}
+
+declare namespace SemanticUI {
+    interface Visibility {
+        settings: VisibilitySettings;
+
+        /**
+         * Disable callbacks temporarily. This is useful if you need to adjust scroll position and do not want to trigger callbacks during the position change.
+         */
+        (behavior: 'disable callbacks'): JQuery;
+        /**
+         * Re-enable callbacks
+         */
+        (behavior: 'enable callbacks'): JQuery;
+        /**
+         * Returns whether element is on screen
+         */
+        (behavior: 'is on screen'): boolean;
+        /**
+         * Returns whether element is off screen
+         */
+        (behavior: 'is off screen'): boolean;
+        /**
+         * Returns number of pixels passed in current element from top of element
+         */
+        (behavior: 'get pixels passed'): number;
+        /**
+         * Returns element calculations as object
+         */
+        (behavior: 'get element calculations'): Visibility.ElementCalculations;
+        /**
+         * Returns screen calculations as object
+         */
+        (behavior: 'get screen calculations'): Visibility.ScreenCalculations;
+        /**
+         * Returns screen size as object
+         */
+        (behavior: 'get screen size'): Visibility.ScreenSize;
+        (behavior: 'destroy'): JQuery;
+        <K extends keyof VisibilitySettings>(behavior: 'setting', name: K, value?: undefined): VisibilitySettings[K];
+        <K extends keyof VisibilitySettings>(behavior: 'setting', name: K, value: VisibilitySettings[K]): JQuery;
+        (behavior: 'setting', value: VisibilitySettings.Param): JQuery;
+        (settings?: VisibilitySettings.Param): JQuery;
+    }
+
+    /**
+     * @see {@link http://semantic-ui.com/behaviors/visibility.html#/settings}
+     */
+    interface VisibilitySettings extends Pick<VisibilitySettings._Impl, keyof VisibilitySettings._Impl> { }
+
+    namespace VisibilitySettings {
+        type Param = VisibilitySettings | object;
+
+        interface _Impl {
+            // region Functionality
+
+            /**
+             * When set to false a callback will occur each time an element passes the threshold for a condition.
+             *
+             * @default true
+             */
+            once: boolean;
+            /**
+             * When set to true a callback will occur anytime an element passes a condition not just immediately after the threshold is met.
+             *
+             * @default false
+             */
+            continuous: boolean;
+            /**
+             * Set to image to load images when on screen. Set to fixed to add class name fixed when passed.
+             *
+             * @default false
+             */
+            type: false | 'image' | 'fixed';
+            /**
+             * Whether visibility conditions should be checked immediately on init
+             *
+             * @default true
+             */
+            initialCheck: boolean;
+            /**
+             * The scroll context visibility should use.
+             *
+             * @default 'window'
+             */
+            context: string | JQuery;
+            /**
+             * Whether visibility conditions should be checked on window load. This ensures that after images load content positions will be updated correctly.
+             *
+             * @default true
+             */
+            refreshOnLoad: boolean;
+            /**
+             * Whether visibility conditions should be checked on window resize. Useful when content resizes causes continuous changes in position
+             *
+             * @default true
+             */
+            refreshOnResize: boolean;
+            /**
+             * Whether visibility conditions should be checked on calls to refresh.
+             * These calls can be triggered from either resize, load or manually calling $('.foo').visibility('refresh')
+             *
+             * @default true
+             */
+            checkOnRefresh: boolean;
+            /**
+             * Specify a z-index when using type: 'fixed'.
+             *
+             * @default 1
+             * @since 2.2
+             */
+            zIndex: number;
+            /**
+             * Value that context scrollTop should be adjusted in pixels. Useful for making content appear below content fixed to the page.
+             *
+             * @default 0
+             */
+            offset: number;
+            /**
+             * Whether element calculations should include its margin
+             *
+             * @default false
+             */
+            includeMargin: boolean;
+            /**
+             * When set to an integer, scroll position will be debounced using this ms value. false will debounce with requestAnimationFrame.
+             *
+             * @default false
+             */
+            throttle: false | number;
+            /**
+             * Whether to automatically refresh content when changes are made to the element's DOM subtree
+             *
+             * @default true
+             */
+            observeChanges: boolean;
+            /**
+             * When using type: image allows you to specify transition when showing a loaded image
+             *
+             * @default false
+             */
+            transition: false | string;
+            /**
+             * When using type: image allows you to specify transition duration
+             *
+             * @default 1000
+             */
+            duration: number;
+
+            // endregion
+
+            // region Visibility Callbacks
+
+            /**
+             * Element's top edge has passed bottom of screen
+             */
+            onTopVisible(this: JQuery): void;
+            /**
+             * Element's top edge has passed top of the screen
+             */
+            onTopPassed(this: JQuery): void;
+            /**
+             * Element's bottom edge has passed bottom of screen
+             */
+            onBottomVisible(this: JQuery): void;
+            /**
+             * Any part of an element is visible on screen
+             */
+            onPassing(this: JQuery): void;
+            /**
+             * Element's bottom edge has passed top of screen
+             */
+            onBottomPassed(this: JQuery): void;
+            /**
+             * Element's top edge has not passed bottom of screen
+             */
+            onTopVisibleReverse(this: JQuery): void;
+            /**
+             * Element's top edge has not passed top of the screen
+             */
+            onTopPassedReverse(this: JQuery): void;
+            /**
+             * Element's bottom edge has not passed bottom of screen
+             */
+            onBottomVisibleReverse(this: JQuery): void;
+            /**
+             * Element's top has not passed top of screen but bottom has
+             */
+            onPassingReverse(this: JQuery): void;
+            /**
+             * Element's bottom edge has not passed top of screen
+             */
+            onBottomPassedReverse(this: JQuery): void;
+            onOnScreen(this: JQuery): void;
+            onOffScreen(this: JQuery): void;
+
+            // endregion
+
+            // region Image Callbacks
+
+            /**
+             * Occurs after an image has completed loading
+             *
+             * @since 2.2
+             */
+            onLoad(this: JQuery): void;
+            /**
+             * Occurs after all img initialized at the same time have loaded.
+             *
+             * @since 2.2
+             */
+            onAllLoaded(this: JQuery): void;
+
+            // endregion
+
+            // region Fixed Callbacks
+
+            /**
+             * Occurs after element has been assigned position fixed
+             *
+             * @since 2.2
+             */
+            onFixed(this: JQuery): void;
+            /**
+             * Occurs after element has been removed from fixed position
+             *
+             * @since 2.2
+             */
+            onUnfixed(this: JQuery): void;
+
+            // endregion
+
+            // region Utility Callbacks
+
+            /**
+             * Occurs each time an elements calculations are updated
+             */
+            onUpdate(this: JQuery, calculations: Visibility.ElementCalculations): void;
+            /**
+             * Occurs whenever element's visibility is refreshed
+             */
+            onRefresh(this: JQuery): void;
+
+            // endregion
+
+            // region DOM Settings
+
+            /**
+             * Class names used to attach style to state
+             */
+            className: Visibility.ClassNameSettings;
+
+            // endregion
+
+            // region Debug Settings
+
+            error: Visibility.ErrorSettings;
+
+            // endregion
+
+            // region Component Settings
+
+            // region DOM Settings
+
+            /**
+             * Event namespace. Makes sure module teardown does not effect other events attached to an element.
+             */
+            namespace: string;
+
+            // endregion
+
+            // region Debug Settings
+
+            /**
+             * Name used in log statements
+             */
+            name: string;
+            /**
+             * Silences all console output including error messages, regardless of other debug settings.
+             */
+            silent: boolean;
+            /**
+             * Debug output to console
+             */
+            debug: boolean;
+            /**
+             * Show console.table output with performance metrics
+             */
+            performance: boolean;
+            /**
+             * Debug output includes all internal behaviors
+             */
+            verbose: boolean;
+
+            // endregion
+
+            // endregion
+        }
+    }
+
+    namespace Visibility {
+        interface ElementPosition {
+            fits: boolean;
+            offset: JQueryCoordinates;
+            width: number;
+            height: number;
+        }
+
+        interface ElementCalculations extends ElementPosition {
+            margin?: {
+                top: number;
+                bottom: number;
+            };
+            top: number;
+            bottom: number;
+
+            topVisible: boolean;
+            topPassed: boolean;
+            bottomVisible: boolean;
+            bottomPassed: boolean;
+            pixelsPassed: number;
+            percentagePassed: number;
+
+            onScreen: boolean;
+            passing: boolean;
+            offScreen: boolean;
+        }
+
+        interface ScreenCalculations {
+            top: number;
+            bottom: number;
+        }
+
+        interface ScreenSize {
+            height: number;
+        }
+
+        interface ClassNameSettings extends Pick<ClassNameSettings._Impl, keyof ClassNameSettings._Impl> { }
+
+        namespace ClassNameSettings {
+            type Param = ClassNameSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'fixed'
+                 */
+                fixed: string;
+            }
+        }
+
+        interface ErrorSettings extends Pick<ErrorSettings._Impl, keyof ErrorSettings._Impl> { }
+
+        namespace ErrorSettings {
+            type Param = ErrorSettings | object;
+
+            interface _Impl {
+                /**
+                 * @default 'The method you called is not defined.'
+                 */
+                method: string;
+            }
+        }
+    }
+}
diff --git a/types/semantic-ui-visibility/index.d.ts b/types/semantic-ui-visibility/index.d.ts
new file mode 100644
index 0000000000..95e97e9155
--- /dev/null
+++ b/types/semantic-ui-visibility/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for semantic-ui-visibility 2.2
+// 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
+
+/// <reference types="jquery" />
+/// <reference path="global.d.ts" />
+
+declare const visibility: SemanticUI.Visibility;
+export = visibility;
diff --git a/types/semantic-ui-visibility/semantic-ui-visibility-tests.ts b/types/semantic-ui-visibility/semantic-ui-visibility-tests.ts
new file mode 100644
index 0000000000..960eeb5215
--- /dev/null
+++ b/types/semantic-ui-visibility/semantic-ui-visibility-tests.ts
@@ -0,0 +1,161 @@
+function test_visibility_static() {
+    $.fn.visibility.settings.error.method = 'method';
+    $.fn.visibility.settings.namespace = 'namespace';
+    $.fn.visibility.settings.name = 'name';
+    $.fn.visibility.settings.silent = false;
+    $.fn.visibility.settings.debug = true;
+    $.fn.visibility.settings.performance = true;
+    $.fn.visibility.settings.verbose = true;
+}
+
+function test_visibility() {
+    const selector = '.ui.visibility';
+    $(selector).visibility('disable callbacks') === $();
+    $(selector).visibility('enable callbacks') === $();
+    $(selector).visibility('is on screen') === false;
+    $(selector).visibility('is off screen') === true;
+    $(selector).visibility('get pixels passed') === 20;
+    $(selector).visibility('get element calculations') === {
+        fits: false,
+        offset: {
+            top: 955.96875,
+            left: 292
+        },
+        width: 466,
+        height: 1665.890625,
+        top: 955.96875,
+        bottom: 2621.859375,
+        topPassed: true,
+        bottomPassed: false,
+        topVisible: true,
+        bottomVisible: false,
+        pixelsPassed: 742.03125,
+        percentagePassed: 0.44542615155182,
+        onScreen: true,
+        passing: true,
+        offScreen: false
+    };
+    $(selector).visibility('get screen calculations') === {
+        bottom: 2658,
+        top: 1698
+    };
+    $(selector).visibility('get screen size') === {
+        height: 960
+    };
+    $(selector).visibility('destroy') === $();
+    $(selector).visibility('setting', 'debug', undefined) === false;
+    $(selector).visibility('setting', 'debug') === false;
+    $(selector).visibility('setting', 'debug', true) === $();
+    $(selector).visibility('setting', {
+        namespace: 'namespace',
+        name: 'name',
+        silent: false,
+        debug: true,
+        performance: true,
+        verbose: true
+    }) === $();
+    $(selector).visibility({
+        once: false,
+        continuous: true,
+        type: 'image',
+        initialCheck: false,
+        context: $(),
+        refreshOnLoad: true,
+        refreshOnResize: false,
+        checkOnRefresh: true,
+        zIndex: 2,
+        offset: 3,
+        includeMargin: false,
+        throttle: 10,
+        observeChanges: true,
+        transition: 'fade',
+        duration: 5,
+        onTopVisible() {
+            this === $();
+        },
+        onTopPassed() {
+            this === $();
+        },
+        onBottomVisible() {
+            this === $();
+        },
+        onPassing() {
+            this === $();
+        },
+        onBottomPassed() {
+            this === $();
+        },
+        onTopVisibleReverse() {
+            this === $();
+        },
+        onTopPassedReverse() {
+            this === $();
+        },
+        onBottomVisibleReverse() {
+            this === $();
+        },
+        onPassingReverse() {
+            this === $();
+        },
+        onBottomPassedReverse() {
+            this === $();
+        },
+        onOnScreen() {
+            this === $();
+        },
+        onOffScreen() {
+            this === $();
+        },
+        onLoad() {
+            this === $();
+        },
+        onAllLoaded() {
+            this === $();
+        },
+        onFixed() {
+            this === $();
+        },
+        onUnfixed() {
+            this === $();
+        },
+        onUpdate(calculations) {
+            this === $();
+            calculations === {
+                fits: false,
+                offset: {
+                    top: 955.96875,
+                    left: 292
+                },
+                width: 466,
+                height: 1665.890625,
+                top: 955.96875,
+                bottom: 2621.859375,
+                topPassed: true,
+                bottomPassed: false,
+                topVisible: true,
+                bottomVisible: false,
+                pixelsPassed: 742.03125,
+                percentagePassed: 0.44542615155182,
+                onScreen: true,
+                passing: true,
+                offScreen: false
+            };
+        },
+        onRefresh() {
+            this === $();
+        },
+        className: {
+            fixed: 'fixed',
+        },
+        error: {
+            method: 'method'
+        }
+    }) === $();
+    $(selector).visibility() === $();
+}
+
+import visibility = require('semantic-ui-visibility');
+
+function test_module() {
+    $.fn.visibility = visibility;
+}
diff --git a/types/semantic-ui-visibility/tsconfig.json b/types/semantic-ui-visibility/tsconfig.json
new file mode 100644
index 0000000000..dcf5313a0a
--- /dev/null
+++ b/types/semantic-ui-visibility/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "global.d.ts",
+        "semantic-ui-visibility-tests.ts"
+    ]
+}
diff --git a/types/semantic-ui-visibility/tslint.json b/types/semantic-ui-visibility/tslint.json
new file mode 100644
index 0000000000..758e484744
--- /dev/null
+++ b/types/semantic-ui-visibility/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/semantic-ui/index.d.ts b/types/semantic-ui/index.d.ts
index 96d660d82b..e36ff8c748 100644
--- a/types/semantic-ui/index.d.ts
+++ b/types/semantic-ui/index.d.ts
@@ -2,5502 +2,29 @@
 // Project: http://semantic-ui.com/
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="jquery" />
 
-interface JQueryStatic {
-    accordion: { settings: SemanticUI.AccordionSettings };
-    checkbox: { settings: SemanticUI.CheckboxSettings };
-    dimmer: { settings: SemanticUI.DimmerSettings };
-    dropdown: { settings: SemanticUI.DropdownSettings };
-    embed: { settings: SemanticUI.EmbedSettings };
-    modal: { settings: SemanticUI.ModalSettings };
-    nag: { settings: SemanticUI.NagSettings };
-    popup: { settings: SemanticUI.PopupSettings };
-    progress: { settings: SemanticUI.ProgressSettings };
-    rating: { settings: SemanticUI.RatingSettings };
-    search: { settings: SemanticUI.SearchSettings };
-    shape: { settings: SemanticUI.ShapeSettings };
-    sidebar: { settings: SemanticUI.SidebarSettings };
-    sticky: { settings: SemanticUI.StickySettings };
-    tab: { settings: SemanticUI.TabSettings };
-    transition: { settings: SemanticUI.TransitionSettings };
-
-    api: { settings: SemanticUI.ApiSettings };
-    form: { settings: SemanticUI.FormSettings };
-    visibility: { settings: SemanticUI.VisibilitySettings };
-}
-
-interface JQuery {
-    // TODO: Do all modules have a 'setting' behavior?
-
-    // region Modules
-
-    // region Accordion
-
-    /**
-     * Refreshes all cached selectors and data
-     */
-    accordion(behavior: 'refresh'): JQuery;
-    /**
-     * Opens accordion content at index
-     */
-    accordion(behavior: 'open', index: number): JQuery;
-    /**
-     * Closes accordion content that are not active
-     */
-    accordion(behavior: 'close others'): JQuery;
-    /**
-     * Closes accordion content at index
-     */
-    accordion(behavior: 'close', index: number): JQuery;
-    /**
-     * Toggles accordion content at index
-     */
-    accordion(behavior: 'toggle', index: number): JQuery;
-    accordion(settings: SemanticUI.AccordionSettings): JQuery;
-    accordion(): JQuery;
-
-    // endregion
-
-    // region Checkbox
-
-    /**
-     * Switches a checkbox from current state
-     */
-    checkbox(behavior: 'toggle'): JQuery;
-    /**
-     * Set a checkbox state to checked
-     */
-    checkbox(behavior: 'check'): JQuery;
-    /**
-     * Set a checkbox state to unchecked
-     */
-    checkbox(behavior: 'uncheck'): JQuery;
-    /**
-     * Set as indeterminate checkbox
-     */
-    checkbox(behavior: 'indeterminate'): JQuery;
-    /**
-     * Set as determinate checkbox
-     */
-    checkbox(behavior: 'determinate'): JQuery;
-    /**
-     * Enable interaction with a checkbox
-     */
-    checkbox(behavior: 'enable'): JQuery;
-    /**
-     * Set a checkbox state to checked without callbacks
-     */
-    checkbox(behavior: 'set checked'): JQuery;
-    /**
-     * Set a checkbox state to unchecked without callbacks
-     */
-    checkbox(behavior: 'set unchecked'): JQuery;
-    /**
-     * Set as indeterminate checkbox without callbacks
-     */
-    checkbox(behavior: 'set indeterminate'): JQuery;
-    /**
-     * Set as determinate checkbox without callbacks
-     */
-    checkbox(behavior: 'set determinate'): JQuery;
-    /**
-     * Enable interaction with a checkbox without callbacks
-     */
-    checkbox(behavior: 'set enabled'): JQuery;
-    /**
-     * Disable interaction with a checkbox without callbacks
-     */
-    checkbox(behavior: 'set disabled'): JQuery;
-    /**
-     * Attach checkbox events to another element
-     */
-    checkbox(behavior: 'attach events', selector: string, event: string): JQuery;
-    /**
-     * Returns whether element is radio selection
-     */
-    checkbox(behavior: 'is radio'): boolean;
-    /**
-     * Returns whether element is currently checked
-     */
-    checkbox(behavior: 'is checked'): boolean;
-    /**
-     * Returns whether element is not checked
-     */
-    checkbox(behavior: 'is unchecked'): boolean;
-    /**
-     * Returns whether element is able to be changed
-     */
-    checkbox(behavior: 'can change'): boolean;
-    /**
-     * Returns whether element can be checked (checking if already checked or `beforeChecked` would cancel)
-     */
-    checkbox(behavior: 'should allow check'): boolean;
-    /**
-     * Returns whether element can be unchecked (checking if already unchecked or `beforeUnchecked` would cancel)
-     */
-    checkbox(behavior: 'should allow uncheck'): boolean;
-    /**
-     * Returns whether element can be determinate (checking if already determinate or `beforeDeterminate` would cancel)
-     */
-    checkbox(behavior: 'should allow determinate'): boolean;
-    /**
-     * Returns whether element can be indeterminate (checking if already indeterminate or `beforeIndeterminate` would cancel)
-     */
-    checkbox(behavior: 'should allow indeterminate'): boolean;
-    /**
-     * Returns whether element is able to be unchecked
-     */
-    checkbox(behavior: 'can uncheck'): boolean;
-    checkbox(settings: SemanticUI.CheckboxSettings): JQuery;
-    checkbox(): JQuery;
-
-    // endregion
-
-    // region Dimmer
-
-    /**
-     * Detaches a given element from DOM and reattaches element inside dimmer
-     */
-    dimmer(behavior: 'add content', element: SemanticUI.Selector): JQuery;
-    /**
-     * Shows dimmer
-     */
-    dimmer(behavior: 'show'): JQuery;
-    /**
-     * Hides dimmer
-     */
-    dimmer(behavior: 'hide'): JQuery;
-    /**
-     * Toggles current dimmer visibility
-     */
-    dimmer(behavior: 'toggle'): JQuery;
-    /**
-     * Changes dimmer opacity
-     */
-    dimmer(behavior: 'set opacity', opacity: number): JQuery;
-    /**
-     * Creates a new dimmer in dimmable context
-     */
-    dimmer(behavior: 'create'): JQuery;
-    /**
-     * Returns current duration for show or hide event depending on current visibility
-     */
-    dimmer(behavior: 'get duration'): number;
-    /**
-     * Returns DOM element for dimmer
-     */
-    dimmer(behavior: 'get dimmer'): JQuery;
-    /**
-     * Returns whether current dimmable has a dimmer
-     */
-    dimmer(behavior: 'has dimmer'): boolean;
-    /**
-     * Whether section's dimmer is active
-     */
-    dimmer(behavior: 'is active'): boolean;
-    /**
-     * Whether dimmer is animating
-     */
-    dimmer(behavior: 'is animating'): boolean;
-    /**
-     * Whether current element is a dimmer
-     */
-    dimmer(behavior: 'is dimmer'): boolean;
-    /**
-     * Whether current element is a dimmable section
-     */
-    dimmer(behavior: 'is dimmable'): boolean;
-    /**
-     * Whether dimmer is disabled
-     */
-    dimmer(behavior: 'is disabled'): boolean;
-    /**
-     * Whether dimmer is not disabled
-     */
-    dimmer(behavior: 'is enabled'): boolean;
-    /**
-     * Whether dimmable section is body
-     */
-    dimmer(behavior: 'is page'): boolean;
-    /**
-     * Whether dimmer is a page dimmer
-     */
-    dimmer(behavior: 'is page dimmer'): boolean;
-    /**
-     * Sets page dimmer to active
-     */
-    dimmer(behavior: 'set active'): JQuery;
-    /**
-     * Sets an element as a dimmable section
-     */
-    dimmer(behavior: 'set dimmable'): JQuery;
-    /**
-     * Sets a dimmable section as dimmed
-     */
-    dimmer(behavior: 'set dimmed'): JQuery;
-    /**
-     * Sets current dimmer as a page dimmer
-     */
-    dimmer(behavior: 'set page dimmer'): JQuery;
-    /**
-     * Sets a dimmer as disabled
-     */
-    dimmer(behavior: 'set disabled'): JQuery;
-    dimmer(settings: SemanticUI.DimmerSettings): JQuery;
-    dimmer(): JQuery;
-
-    // endregion
-
-    // region Dropdown
-
-    // TODO: Should 'value'/'values' parameters be of type 'string' instead of 'any'?
-
-    /**
-     * Recreates dropdown menu from select option values.
-     */
-    dropdown(behavior: 'setup menu'): JQuery;
-    /**
-     * Refreshes all cached selectors and data
-     */
-    dropdown(behavior: 'refresh'): JQuery;
-    /**
-     * Toggles current visibility of dropdown
-     */
-    dropdown(behavior: 'toggle'): JQuery;
-    /**
-     * Shows dropdown
-     */
-    dropdown(behavior: 'show'): JQuery;
-    /**
-     * Hides dropdown
-     */
-    dropdown(behavior: 'hide'): JQuery;
-    /**
-     * Clears dropdown of selection
-     */
-    dropdown(behavior: 'clear'): JQuery;
-    /**
-     * Hides all other dropdowns that is not current dropdown
-     */
-    dropdown(behavior: 'hide others'): JQuery;
-    /**
-     * Restores dropdown text and value to its value on page load
-     */
-    dropdown(behavior: 'restore defaults'): JQuery;
-    /**
-     * Restores dropdown text to its value on page load
-     */
-    dropdown(behavior: 'restore default text'): JQuery;
-    /**
-     * Restores dropdown text to its prompt, placeholder text
-     */
-    dropdown(behavior: 'restore placeholder text'): JQuery;
-    /**
-     * Restores dropdown value to its value on page load
-     */
-    dropdown(behavior: 'restore default value'): JQuery;
-    /**
-     * Saves current text and value as new defaults (for use with restore)
-     */
-    dropdown(behavior: 'save defaults'): JQuery;
-    /**
-     * Sets value as selected
-     */
-    dropdown(behavior: 'set selected', value: any): JQuery;
-    /**
-     * Remove value from selected
-     */
-    dropdown(behavior: 'remove selected', value: any): JQuery;
-    /**
-     * Adds a group of values as selected
-     */
-    dropdown(behavior: 'set selected', values: any[]): JQuery;
-    /**
-     * Sets selected values to exactly specified values, removing current selection
-     */
-    dropdown(behavior: 'set exactly', values: any[]): JQuery;
-    /**
-     * Sets dropdown text to a value
-     */
-    dropdown(behavior: 'set text', text: string): JQuery;
-    /**
-     * Sets dropdown input to value (does not update display state)
-     */
-    dropdown(behavior: 'set value', value: any): JQuery;
-    /**
-     * Returns current dropdown text
-     */
-    dropdown(behavior: 'get text'): string;
-    /**
-     * Returns current dropdown input value
-     */
-    dropdown(behavior: 'get value'): any;
-    /**
-     * Returns DOM element that matches a given input value
-     */
-    dropdown(behavior: 'get item', value: any): JQuery;
-    /**
-     * Adds touch events to element
-     */
-    dropdown(behavior: 'bind touch events'): JQuery;
-    /**
-     * Adds mouse events to element
-     */
-    dropdown(behavior: 'bind mouse events'): JQuery;
-    /**
-     * Binds a click to document to determine if you click away from a dropdown
-     */
-    dropdown(behavior: 'bind intent'): JQuery;
-    /**
-     * Unbinds document intent click
-     */
-    dropdown(behavior: 'unbind intent'): JQuery;
-    /**
-     * Returns whether event occurred inside dropdown
-     */
-    dropdown(behavior: 'determine intent'): boolean;
-    /**
-     * Triggers preset item selection action based on settings passing text/value
-     */
-    dropdown(behavior: 'determine select action', text: string, value: any): JQuery;
-    /**
-     * Sets dropdown to active state
-     */
-    dropdown(behavior: 'set active'): JQuery;
-    /**
-     * Sets dropdown to visible state
-     */
-    dropdown(behavior: 'set visible'): JQuery;
-    /**
-     * Removes dropdown active state
-     */
-    dropdown(behavior: 'remove active'): JQuery;
-    /**
-     * Removes dropdown visible state
-     */
-    dropdown(behavior: 'remove visible'): JQuery;
-    /**
-     * Returns whether dropdown is a selection dropdown
-     */
-    dropdown(behavior: 'is selection'): boolean;
-    /**
-     * Returns whether dropdown is animated
-     */
-    dropdown(behavior: 'is animated'): boolean;
-    /**
-     * Returns whether dropdown is visible
-     */
-    dropdown(behavior: 'is visible'): boolean;
-    /**
-     * Returns whether dropdown is hidden
-     */
-    dropdown(behavior: 'is hidden'): boolean;
-    /**
-     * Returns dropdown value as set on page load
-     */
-    dropdown(behavior: 'get default text'): string;
-    /**
-     * Returns placeholder text
-     */
-    dropdown(behavior: 'get placeholder text'): string;
-    dropdown(settings: SemanticUI.DropdownSettings): JQuery;
-    dropdown(): JQuery;
-
-    // endregion
-
-    // region Embed
-
-    /**
-     * Changes iframe to a new content source
-     */
-    embed(behavior: 'change', source: string, id: string, url: string): JQuery;
-    /**
-     * Removes embed and shows placeholder content if available
-     */
-    embed(behavior: 'reset'): JQuery;
-    /**
-     * Shows embed content
-     */
-    embed(behavior: 'show'): JQuery;
-    /**
-     * Hides embed content and shows placeholder content
-     */
-    embed(behavior: 'hide'): JQuery;
-    /**
-     * Returns current content id
-     */
-    embed(behavior: 'get id'): string;
-    /**
-     * Returns placeholder image url
-     */
-    embed(behavior: 'get placeholder'): string;
-    /**
-     * Returns source name
-     */
-    embed(behavior: 'get sources'): string;
-    /**
-     * Returns source type
-     */
-    embed(behavior: 'get type'): string;
-    /**
-     * Returns URL with all parameters added
-     */
-    embed(behavior: 'get url'): string;
-    /**
-     * Returns whether embed content has placeholder
-     */
-    embed(behavior: 'has placeholder'): boolean;
-    /**
-     * Destroys instance and removes all events
-     */
-    embed(behavior: 'destroy'): JQuery;
-    embed(settings: SemanticUI.EmbedSettings): JQuery;
-    embed(): JQuery;
-
-    // endregion
-
-    // region Modal
-
-    /**
-     * Shows the modal
-     */
-    modal(behavior: 'show'): JQuery;
-    /**
-     * Hides the modal
-     */
-    modal(behavior: 'hide'): JQuery;
-    /**
-     * Toggles the modal
-     */
-    modal(behavior: 'toggle'): JQuery;
-    /**
-     * Refreshes centering of modal on page
-     */
-    modal(behavior: 'refresh'): JQuery;
-    /**
-     * Shows associated page dimmer
-     */
-    modal(behavior: 'show dimmer'): JQuery;
-    /**
-     * Hides associated page dimmer
-     */
-    modal(behavior: 'hide dimmer'): JQuery;
-    /**
-     * Hides all modals not selected modal in a dimmer
-     */
-    modal(behavior: 'hide others'): JQuery;
-    /**
-     * Hides all visible modals in the same dimmer
-     */
-    modal(behavior: 'hide all'): JQuery;
-    /**
-     * Caches current modal size
-     */
-    modal(behavior: 'cache sizes'): JQuery;
-    /**
-     * Returns whether the modal can fit on the page
-     */
-    modal(behavior: 'can fit'): boolean;
-    /**
-     * Returns whether the modal is active
-     */
-    modal(behavior: 'is active'): boolean;
-    /**
-     * Sets modal to active
-     */
-    modal(behavior: 'set active'): JQuery;
-    modal(behavior: 'attach events', selector: SemanticUI.Selector, event?: string): JQuery;
-    modal(behavior: 'setting', name: string, value: any): JQuery;
-    modal(settings: SemanticUI.ModalSettings): JQuery;
-    modal(): JQuery;
-
-    // endregion
-
-    // region Nag
-
-    // TODO: Documentation is lacking. Is it possible to infer intended behaviors?
-
-    nag(behavior: 'show'): JQuery;
-    /**
-     * Clears cookie so nag shows again
-     */
-    nag(behavior: 'clear'): JQuery;
-    nag(settings: SemanticUI.NagSettings): JQuery;
-
-    // endregion
-
-    // region Popup
-
-    /**
-     * Shows popup
-     */
-    popup(behavior: 'show'): JQuery;
-    /**
-     * Hides popup
-     */
-    popup(behavior: 'hide'): JQuery;
-    /**
-     * Hides all visible pop ups on the page
-     */
-    popup(behavior: 'hide all'): JQuery;
-    /**
-     * Returns current popup dom element
-     */
-    popup(behavior: 'get popup'): JQuery;
-    /**
-     * Changes current popup content
-     */
-    popup(behavior: 'change content', html: string): JQuery;
-    /**
-     * Toggles visibility of popup
-     */
-    popup(behavior: 'toggle'): JQuery;
-    /**
-     * Returns whether popup is visible
-     */
-    popup(behavior: 'is visible'): boolean;
-    /**
-     * Returns whether popup is hidden
-     */
-    popup(behavior: 'is hidden'): boolean;
-    /**
-     * Returns whether popup is created and inserted into the page
-     */
-    popup(behavior: 'exists'): boolean;
-    /**
-     * Adjusts popup when content size changes (only necessary for centered popups)
-     */
-    popup(behavior: 'reposition'): JQuery;
-    /**
-     * Repositions a popup
-     */
-    popup(behavior: 'set position', position: string): JQuery;
-    /**
-     * Removes popup from the page and removes all events
-     */
-    popup(behavior: 'destroy'): JQuery;
-    /**
-     * Removes popup from the page
-     */
-    popup(behavior: 'remove popup'): JQuery;
-    popup(settings: SemanticUI.PopupSettings): JQuery;
-    popup(): JQuery;
-
-    // endregion
-
-    // region Progress
-
-    /**
-     * Sets current percent of progress to value. If using a total will convert from percent to estimated value.
-     */
-    progress(behavior: 'set percent', percent: number): JQuery;
-    /**
-     * Sets progress to specified value. Will automatically calculate percent from total.
-     */
-    progress(behavior: 'set progress', value: number): JQuery;
-    /**
-     * Increments progress by increment value, if not passed a value will use random amount specified in settings
-     */
-    progress(behavior: 'increment', incrementValue: number): JQuery;
-    /**
-     * Decrements progress by decrement value, if not passed a value will use random amount specified in settings
-     */
-    progress(behavior: 'decrement', decrementValue: number): JQuery;
-    /**
-     * Immediately updates progress to value, ignoring progress animation interval delays
-     */
-    progress(behavior: 'update progress', value: number): JQuery;
-    /**
-     * Finishes progress and sets loaded to 100%
-     */
-    progress(behavior: 'complete'): JQuery;
-    /**
-     * Resets progress to zero
-     */
-    progress(behavior: 'reset'): JQuery;
-    /**
-     * Set total to a new value
-     */
-    progress(behavior: 'set total', total: number): JQuery;
-    /**
-     * Replaces templated string with value, total, percent left and percent.
-     */
-    progress(behavior: 'get text', text: string): string;
-    /**
-     * Returns normalized value inside acceptable range specified by total.
-     */
-    progress(behavior: 'get normalized value', value: number): number;
-    /**
-     * Returns percent as last specified
-     */
-    progress(behavior: 'get percent'): number;
-    /**
-     * Returns current progress value
-     */
-    progress(behavior: 'get value'): number;
-    /**
-     * Returns total
-     */
-    progress(behavior: 'get total'): number;
-    /**
-     * Returns whether progress is completed
-     */
-    progress(behavior: 'is complete'): boolean;
-    /**
-     * Returns whether progress was a success
-     */
-    progress(behavior: 'is success'): boolean;
-    /**
-     * Returns whether progress is in warning state
-     */
-    progress(behavior: 'is warning'): boolean;
-    /**
-     * Returns whether progress is in error state
-     */
-    progress(behavior: 'is error'): boolean;
-    /**
-     * Returns whether progress is in active state
-     */
-    progress(behavior: 'is active'): boolean;
-    /**
-     * Sets progress to active state
-     */
-    progress(behavior: 'set active'): JQuery;
-    /**
-     * Sets progress to warning state
-     */
-    progress(behavior: 'set warning'): JQuery;
-    /**
-     * Sets progress to success state
-     */
-    progress(behavior: 'set success'): JQuery;
-    /**
-     * Sets progress to error state
-     */
-    progress(behavior: 'set error'): JQuery;
-    /**
-     * Changes progress animation speed
-     */
-    progress(behavior: 'set duration', value: number): JQuery;
-    /**
-     * Sets progress exterior label to text
-     */
-    progress(behavior: 'set label', text: string): JQuery;
-    /**
-     * Sets progress bar label to text
-     */
-    progress(behavior: 'set bar label', text: string): JQuery;
-    /**
-     * Removes progress to active state
-     */
-    progress(behavior: 'remove active'): JQuery;
-    /**
-     * Removes progress to warning state
-     */
-    progress(behavior: 'remove warning'): JQuery;
-    /**
-     * Removes progress to success state
-     */
-    progress(behavior: 'remove success'): JQuery;
-    /**
-     * Removes progress to error state
-     */
-    progress(behavior: 'remove error'): JQuery;
-    progress(settings: SemanticUI.ProgressSettings): JQuery;
-    progress(): JQuery;
-
-    // endregion
-
-    // region Rating
-
-    /**
-     * Sets rating programmatically
-     */
-    rating(behavior: 'set rating', rating: number): JQuery;
-    /**
-     * Gets current rating
-     */
-    rating(behavior: 'get rating'): number;
-    /**
-     * Disables interactive rating mode
-     */
-    rating(behavior: 'disable'): JQuery;
-    /**
-     * Enables interactive rating mode
-     */
-    rating(behavior: 'enable'): JQuery;
-    /**
-     * Clears current rating
-     */
-    rating(behavior: 'clear rating'): JQuery;
-    rating(settings: SemanticUI.RatingSettings): JQuery;
-    rating(): JQuery;
-
-    // endregion
-
-    // region Search
-
-    /**
-     * Search for value currently set in search input
-     */
-    search(behavior: 'query', callback?: () => void): JQuery;
-    /**
-     * Displays message in search results with text, using template matching type
-     */
-    search(behavior: 'display message', text: string, type: string): JQuery;
-    /**
-     * Cancels current remote search query
-     */
-    search(behavior: 'cancel query'): JQuery;
-    /**
-     * Search local object for specified query and display results
-     */
-    search(behavior: 'search local', query: string): JQuery;
-    /**
-     * Whether has minimum characters
-     */
-    search(behavior: 'has minimum characters'): boolean;
-    /**
-     * Search remote endpoint for specified query and display results
-     */
-    search(behavior: 'search remote', query: string, callback?: () => void): JQuery;
-    /**
-     * Search object for specified query and return results
-     */
-    search(behavior: 'search object', query: string, object: any, searchFields: string[]): any;
-    /**
-     * Cancels current remote search request
-     */
-    search(behavior: 'cancel query'): JQuery;
-    /**
-     * Whether search is currently focused
-     */
-    search(behavior: 'is focused'): boolean;
-    /**
-     * Whether search results are visible
-     */
-    search(behavior: 'is visible'): boolean;
-    /**
-     * Whether search results are empty
-     */
-    search(behavior: 'is empty'): boolean;
-    /**
-     * Returns current search value
-     */
-    search(behavior: 'get value'): any;
-    /**
-     * Returns JSON object matching searched title or id (see above)
-     */
-    search(behavior: 'get result', value: any): any;
-    /**
-     * Sets search input to value
-     */
-    search(behavior: 'set value', value: any): JQuery;
-    /**
-     * Reads cached results for query
-     */
-    search(behavior: 'read cache', query: string): JQuery;
-    /**
-     * Clears value from cache, if no parameter passed clears all cache
-     */
-    search(behavior: 'clear cache', query?: string): JQuery;
-    /**
-     * Writes cached results for query
-     */
-    search(behavior: 'write cache', query: string): JQuery;
-    /**
-     * Adds HTML to results and displays
-     */
-    search(behavior: 'add results', html: string): JQuery;
-    /**
-     * Shows results container
-     */
-    search(behavior: 'show results', callback?: () => void): JQuery;
-    /**
-     * Hides results container
-     */
-    search(behavior: 'hide results', callback?: () => void): JQuery;
-    /**
-     * Generates results using parser specified by settings.template
-     */
-    search(behavior: 'generate results', response: any): JQuery;
-    /**
-     * Removes all events
-     */
-    search(behavior: 'destroy'): JQuery;
-    search(settings: SemanticUI.SearchSettings): JQuery;
-    search(): JQuery;
-
-    // endregion
-
-    // region Shape
-
-    /**
-     * Flips the shape upward
-     */
-    shape(behavior: 'flip up'): JQuery;
-    /**
-     * Flips the shape downward
-     */
-    shape(behavior: 'flip down'): JQuery;
-    /**
-     * Flips the shape right
-     */
-    shape(behavior: 'flip right'): JQuery;
-    /**
-     * Flips the shape left
-     */
-    shape(behavior: 'flip left'): JQuery;
-    /**
-     * Flips the shape over clock-wise
-     */
-    shape(behavior: 'flip over'): JQuery;
-    /**
-     * Flips the shape over counter-clockwise
-     */
-    shape(behavior: 'flip back'): JQuery;
-    /**
-     * Set the next side to a specific selector
-     */
-    shape(behavior: 'set next side', selector: SemanticUI.Selector): JQuery;
-    /**
-     * Returns whether shape is currently animating
-     */
-    shape(behavior: 'is animating'): boolean;
-    /**
-     * Removes all inline styles
-     */
-    shape(behavior: 'reset'): JQuery;
-    /**
-     * Queues an animation until after current animation
-     */
-    shape(behavior: 'queue', animation: string): JQuery;
-    /**
-     * Forces a reflow on element
-     */
-    shape(behavior: 'repaint'): JQuery;
-    /**
-     * Set the next side to next sibling to active element
-     */
-    shape(behavior: 'set default side'): JQuery;
-    /**
-     * Sets shape to the content size of the next side
-     */
-    shape(behavior: 'set stage size'): JQuery;
-    /**
-     * Refreshes the selector cache for element sides
-     */
-    shape(behavior: 'refresh'): JQuery;
-    /**
-     * Returns translation for next side staged below
-     */
-    shape(behavior: 'get transform down'): SemanticUI.Translation;
-    /**
-     * Returns translation for next side staged left
-     */
-    shape(behavior: 'get transform left'): SemanticUI.Translation;
-    /**
-     * Returns translation for next side staged right
-     */
-    shape(behavior: 'get transform right'): SemanticUI.Translation;
-    /**
-     * Returns translation for next side staged up
-     */
-    shape(behavior: 'get transform up'): SemanticUI.Translation;
-    /**
-     * Returns translation for next side staged down
-     */
-    shape(behavior: 'get transform down'): SemanticUI.Translation;
-    shape(settings: SemanticUI.ShapeSettings): JQuery;
-    shape(): JQuery;
-
-    // endregion
-
-    // region Sidebar
-
-    /**
-     * Attaches sidebar action to given selector. Default event if none specified is toggle
-     */
-    sidebar(behavior: 'attach events', selector: string, event?: string): JQuery;
-    /**
-     * Shows sidebar
-     */
-    sidebar(behavior: 'show'): JQuery;
-    /**
-     * Hides sidebar
-     */
-    sidebar(behavior: 'hide'): JQuery;
-    /**
-     * Toggles visibility of sidebar
-     */
-    sidebar(behavior: 'toggle'): JQuery;
-    /**
-     * Returns whether sidebar is visible
-     */
-    sidebar(behavior: 'is visible'): boolean;
-    /**
-     * Returns whether sidebar is hidden
-     */
-    sidebar(behavior: 'is hidden'): boolean;
-    /**
-     * Pushes page content to be visible alongside sidebar
-     */
-    sidebar(behavior: 'push page'): JQuery;
-    /**
-     * Returns direction of current sidebar
-     */
-    sidebar(behavior: 'get direction'): string;
-    /**
-     * Returns page content to original position
-     */
-    sidebar(behavior: 'pull page'): JQuery;
-    /**
-     * Adds stylesheet to page head to trigger sidebar animations
-     */
-    sidebar(behavior: 'add body CSS'): JQuery;
-    /**
-     * Removes any inline stylesheets for sidebar animation
-     */
-    sidebar(behavior: 'remove body CSS'): JQuery;
-    /**
-     * Returns vendor prefixed transition end event
-     */
-    sidebar(behavior: 'get transition event'): string;
-    sidebar(settings: SemanticUI.SidebarSettings): JQuery;
-    sidebar(): JQuery;
-
-    // endregion
-
-    // region Sticky
-
-    /**
-     * recalculates offsets
-     */
-    sticky(behavior: 'refresh'): JQuery;
-    sticky(settings: SemanticUI.StickySettings): JQuery;
-    sticky(): JQuery;
-
-    // endregion
-
-    // region Tab
-
-    /**
-     * Attaches tab action to given selector. Default event if none specified is toggle
-     */
-    tab(behavior: 'attach events', selector: string, event?: string): JQuery;
-    /**
-     * Changes tab to path
-     */
-    tab(behavior: 'change tab', path: string): JQuery;
-    /**
-     * Sets current path to state
-     */
-    tab(behavior: 'set state', path: string): JQuery;
-    /**
-     * Returns current path
-     */
-    tab(behavior: 'get path'): string;
-    /**
-     * Returns whether tab exists
-     */
-    tab(behavior: 'is tab'): boolean;
-    /**
-     * Returns cached HTML for path
-     */
-    tab(behavior: 'cache read', path: string): string | false;
-    /**
-     * Sets cached HTML for path
-     */
-    tab(behavior: 'cache add', path: string, html: string): JQuery;
-    /**
-     * Removes cached HTML for path
-     */
-    tab(behavior: 'cache remove', path: string): JQuery;
-    tab(settings: SemanticUI.TabSettings): JQuery;
-    tab(): JQuery;
-
-    // endregion
-
-    // region Transition
-
-    /**
-     * Stop current animation and preserve queue
-     */
-    transition(behavior: 'stop'): JQuery;
-    /**
-     * Stop current animation and queued animations
-     */
-    transition(behavior: 'stop all'): JQuery;
-    /**
-     * Clears all queued animations
-     */
-    transition(behavior: 'clear queue'): JQuery;
-    /**
-     * Stop current animation and show element
-     */
-    transition(behavior: 'show'): JQuery;
-    /**
-     * Stop current animation and hide element
-     */
-    transition(behavior: 'hide'): JQuery;
-    /**
-     * Toggles between hide and show
-     */
-    transition(behavior: 'toggle'): JQuery;
-    /**
-     * Forces reflow using a more expensive but stable method
-     */
-    transition(behavior: 'force repaint'): JQuery;
-    /**
-     * Triggers reflow on element
-     */
-    transition(behavior: 'repaint'): JQuery;
-    /**
-     * Resets all conditions changes during transition
-     */
-    transition(behavior: 'reset'): JQuery;
-    /**
-     * Enables animation looping
-     */
-    transition(behavior: 'looping'): JQuery;
-    /**
-     * Removes looping state from element
-     */
-    transition(behavior: 'remove looping'): JQuery;
-    /**
-     * Adds disabled state (stops ability to animate)
-     */
-    transition(behavior: 'disable'): JQuery;
-    /**
-     * Removes disabled state
-     */
-    transition(behavior: 'enable'): JQuery;
-    /**
-     * Modifies element animation duration
-     */
-    transition(behavior: 'set duration', duration: number): JQuery;
-    /**
-     * Saves all class names and styles to cache to be retrieved after animation
-     */
-    transition(behavior: 'save conditions'): JQuery;
-    /**
-     * Adds back cached names and styles to element
-     */
-    transition(behavior: 'restore conditions'): JQuery;
-    /**
-     * Returns vendor prefixed animation property for animationname
-     */
-    transition(behavior: 'get animation name'): string;
-    /**
-     * Returns vendor prefixed animation property for animationend
-     */
-    transition(behavior: 'get animation event'): string;
-    /**
-     * Returns whether element is currently visible
-     */
-    transition(behavior: 'is visible'): boolean;
-    /**
-     * Returns whether transition is currently occurring
-     */
-    transition(behavior: 'is animating'): boolean;
-    /**
-     * Returns whether animation looping is set
-     */
-    transition(behavior: 'is looping'): boolean;
-    /**
-     * Returns whether animations are supported
-     */
-    transition(behavior: 'is supported'): boolean;
-    transition(transition: string): JQuery;
-    transition(settings: SemanticUI.TransitionSettings): JQuery;
-    transition(): JQuery;
-
-    // endregion
-
-    // endregion
-
-    // region Behaviors
-
-    // region API
-
-    /**
-     * Execute query using existing API settings
-     */
-    api(behavior: 'query'): JQuery;
-    /**
-     * Adds data to existing templated url and returns full url string
-     */
-    api(behavior: 'add url data', url: string, data: any): string;
-    /**
-     * Gets promise for current API request
-     */
-    api(behavior: 'get request'): JQueryDeferred<any> | false;
-    /**
-     * Aborts current API request
-     */
-    api(behavior: 'abort'): JQuery;
-    /**
-     * Removes loading and error state from element
-     */
-    api(behavior: 'reset'): JQuery;
-    /**
-     * Returns whether last request was cancelled
-     */
-    api(behavior: 'was cancelled'): boolean;
-    /**
-     * Returns whether last request was failure
-     */
-    api(behavior: 'was failure'): boolean;
-    /**
-     * Returns whether last request was successful
-     */
-    api(behavior: 'was successful'): boolean;
-    /**
-     * Returns whether last request was completed
-     */
-    api(behavior: 'was complete'): boolean;
-    /**
-     * Returns whether element is disabled
-     */
-    api(behavior: 'is disabled'): boolean;
-    /**
-     * Returns whether element response is mocked
-     */
-    api(behavior: 'is mocked'): boolean;
-    /**
-     * Returns whether element is loading
-     */
-    api(behavior: 'is loading'): boolean;
-    /**
-     * Sets loading state to element
-     */
-    api(behavior: 'set loading'): JQuery;
-    /**
-     * Sets error state to element
-     */
-    api(behavior: 'set error'): JQuery;
-    /**
-     * Removes loading state to element
-     */
-    api(behavior: 'remove loading'): JQuery;
-    /**
-     * Removes error state to element
-     */
-    api(behavior: 'remove error'): JQuery;
-    /**
-     * Gets event that API request will occur on
-     */
-    api(behavior: 'get event'): string;
-    /**
-     * Returns encodeURIComponent value only if value passed is not already encoded
-     */
-    api(behavior: 'get url encoded value', value: any): string;
-    /**
-     * Reads a locally cached response for a URL
-     */
-    api(behavior: 'read cached response', url: string): any;
-    /**
-     * Writes a cached response for a URL
-     */
-    api(behavior: 'write cached response', url: string, response: any): JQuery;
-    /**
-     * Creates new cache, removing all locally cached URLs
-     */
-    api(behavior: 'create cache'): JQuery;
-    /**
-     * Removes API settings from the page and all events
-     */
-    api(behavior: 'destroy'): JQuery;
-    api(settings: SemanticUI.ApiSettings): JQuery;
-    api(): JQuery;
-
-    // endregion
-
-    // region Form Validation
-
-    /**
-     * Submits selected form
-     */
-    form(behavior: 'submit'): JQuery;
-    /**
-     * Returns true/false whether a form passes its validation rules
-     */
-    form(behavior: 'is valid'): boolean;
-    /**
-     * Validates form and calls onSuccess or onFailure
-     */
-    form(behavior: 'validate form'): JQuery;
-    /**
-     * gets browser property change event
-     */
-    form(behavior: 'get change event'): string;
-    /**
-     * Returns element with matching name, id, or data-validate metadata to ID
-     */
-    form(behavior: 'get field', id: string): JQuery;
-    /**
-     * Returns value of element with id
-     */
-    form(behavior: 'get value', id: string): any;
-    /**
-     * Returns object of element values that match array of ids. If no IDS are passed will return all fields
-     */
-    form(behavior: 'get values', ids?: string[]): any;
-    /**
-     * Sets value of element with id
-     */
-    form(behavior: 'set value', id: string): JQuery;
-    /**
-     * Sets key/value pairs from passed values object to matching ids
-     */
-    form(behavior: 'set values', values: any): JQuery;
-    /**
-     * Returns validation rules for a given jQuery-referenced input field
-     */
-    form(behavior: 'get validation', element: JQuery): any;
-    /**
-     * Returns whether a field exists
-     */
-    form(behavior: 'has field', identifier: string): boolean;
-    /**
-     * Adds errors to form, given an array errors
-     */
-    form(behavior: 'add errors', errors: string[]): JQuery;
-    form(settings: SemanticUI.FormSettings): JQuery;
-    form(): JQuery;
-
-    // endregion
-
-    // region Visibility
-
-    /**
-     * Disable callbacks temporarily. This is useful if you need to adjust scroll position and do not want to trigger callbacks during the position change.
-     */
-    visibility(behavior: 'disable callbacks'): JQuery;
-    /**
-     * Re-enable callbacks
-     */
-    visibility(behavior: 'enable callbacks'): JQuery;
-    /**
-     * Returns whether element is on screen
-     */
-    visibility(behavior: 'is on screen'): boolean;
-    /**
-     * Returns whether element is off screen
-     */
-    visibility(behavior: 'is off screen'): boolean;
-    /**
-     * Returns number of pixels passed in current element from top of element
-     */
-    visibility(behavior: 'get pixels passed'): number;
-    /**
-     * Returns element calculations as object
-     */
-    visibility(behavior: 'get element calculations'): SemanticUI.ElementCalculations;
-    /**
-     * Returns screen calculations as object
-     */
-    visibility(behavior: 'get screen calculations'): SemanticUI.ScreenCalculations;
-    /**
-     * Returns screen size as object
-     */
-    visibility(behavior: 'get screen size'): SemanticUI.ScreenSize;
-    visibility(settings: SemanticUI.VisibilitySettings): JQuery;
-    visibility(): JQuery;
-
-    // endregion
-
-    // endregion
-}
-
-declare namespace SemanticUI {
-    type Selector = string | JQuery;
-
-    /**
-     * These settings are native to all modules, and define how the component ties content to DOM attributes, and debugging settings for the module.
-     */
-    interface ComponentSettings {
-        // region DOM Settings
-
-        /**
-         * Event namespace. Makes sure module teardown does not effect other events attached to an element.
-         */
-        namespace?: string;
-
-        // endregion
-
-        // region Debug Settings
-
-        /**
-         * Name used in log statements
-         */
-        name?: string;
-        /**
-         * Silences all console output including error messages, regardless of other debug settings.
-         */
-        silent?: boolean;
-        /**
-         * Debug output to console
-         */
-        debug?: boolean;
-        /**
-         * Show console.table output with performance metrics
-         */
-        performance?: boolean;
-        /**
-         * Debug output includes all internal behaviors
-         */
-        verbose?: boolean;
-
-        // endregion
-    }
-
-    // region Modules
-
-    // region Accordion
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/accordion.html#/settings}
-     */
-    interface AccordionSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * Only allow one section open at a time
-         *
-         * @default true
-         */
-        exclusive?: boolean;
-        /**
-         * Event on title that will cause accordion to open
-         *
-         * @default 'click'
-         */
-        on?: string;
-        /**
-         * Whether child content opacity should be animated (may cause performance issues with many child elements)
-         *
-         * @default true
-         */
-        animateChildren?: boolean;
-        /**
-         * Close open nested accordion content when an element closes
-         *
-         * @default true
-         */
-        closeNested?: boolean;
-        /**
-         * Allow active sections to collapse
-         *
-         * @default true
-         */
-        collapsible?: boolean;
-        /**
-         * Duration in ms of opening animation
-         *
-         * @default 500
-         */
-        duration?: number;
-        /**
-         * Easing of opening animation. EaseInOutQuint is included with accordion, for additional options you must include easing equations.
-         *
-         * @default 'easeInOutQuint'
-         * @see {@link http://gsgd.co.uk/sandbox/jquery/easing/}
-         */
-        easing?: string;
-        // TODO: Undocumented but probably intended to be public?
-        // observeChanges?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback before element opens
-         */
-        onOpening?(this: JQuery): void;
-        /**
-         * Callback after element is open
-         */
-        onOpen?(this: JQuery): void;
-        /**
-         * Callback before element closes
-         */
-        onClosing?(this: JQuery): void;
-        /**
-         * Callback after element is closed
-         */
-        onClose?(this: JQuery): void;
-        /**
-         * Callback on element open or close
-         */
-        onChange?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Selectors used to find parts of a module
-         */
-        selector?: {
-            /**
-             * @default '.accordion'
-             */
-            accordion?: string;
-            /**
-             * @default '.title'
-             */
-            title?: string;
-            /**
-             * @default '.title'
-             */
-            trigger?: string;
-            /**
-             * @default '.content'
-             */
-            content?: string;
-        };
-        /**
-         * Class names used to determine element state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'animating'
-             */
-            animating?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Checkbox
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/checkbox.html#/settings}
-     */
-    interface CheckboxSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * Setting to true/false will determine whether an input will allow no selection. Auto will set disallow this behavior only for radio boxes
-         *
-         * @default 'auto'
-         */
-        uncheckable?: 'auto' | boolean;
-        /**
-         * Whether callbacks for checked status should be fired on init as well as change
-         *
-         * @default false
-         */
-        fireOnInit?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback after a checkbox is either checked or unchecked.
-         */
-        onChange?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is checked.
-         */
-        onChecked?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is set to undeterminate.
-         */
-        onIndeterminate?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is set to determinate.
-         */
-        onDeterminate?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is unchecked.
-         */
-        onUnchecked?(this: HTMLElement): void;
-        /**
-         * Callback before a checkbox is checked. Can cancel change by returning false
-         */
-        beforeChecked?(this: HTMLElement): boolean;
-        /**
-         * Callback before a checkbox is set to undeterminate. Can cancel change by returning false
-         */
-        beforeIndeterminate?(this: HTMLElement): boolean;
-        /**
-         * Callback before a checkbox is set to determinate. Can cancel change by returning false
-         */
-        beforeDeterminate?(this: HTMLElement): boolean;
-        /**
-         * Callback before a checkbox is unchecked. Can cancel change by returning false
-         */
-        beforeUnchecked?(this: HTMLElement): boolean;
-        /**
-         * Callback after a checkbox is enabled.
-         */
-        onEnable?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is disabled.
-         */
-        onDisable?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is enabled.
-         *
-         * @deprecated
-         */
-        onEnabled?(this: HTMLElement): void;
-        /**
-         * Callback after a checkbox is disabled.
-         *
-         * @deprecated
-         */
-        onDisabled?(this: HTMLElement): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Selectors used to find parts of a module
-         */
-        selector?: {
-            /**
-             * @default 'input[type=checkbox], input[type=radio]'
-             */
-            input?: string;
-            /**
-             * @default 'label'
-             */
-            label?: string;
-        };
-        /**
-         * Class names used to determine element state
-         */
-        className?: {
-            /**
-             * @default 'checked'
-             */
-            checked?: string;
-            /**
-             * @default 'disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'radio'
-             */
-            radio?: string;
-            /**
-             * @default 'read-only'
-             */
-            readOnly?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Dimmer
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/dimmer.html#/settings}
-     */
-    interface DimmerSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * Dimmers opacity from 0-1. Defaults to auto which uses the CSS specified opacity.
-         *
-         * @default 'auto'
-         */
-        opacity?: 'auto' | number;
-        /**
-         * Specify a variation to add when generating dimmer, like inverted
-         *
-         * @default false
-         */
-        variation?: false | string;
-        /**
-         * If initializing a dimmer on a dimmable context, you can use dimmerName to distinguish between multiple dimmers in that context.
-         *
-         * @default false
-         */
-        dimmerName?: false | string;
-        /**
-         * Whether clicking on the dimmer should hide the dimmer (Defaults to auto, closable only when settings.on is not hover
-         *
-         * @default 'auto'
-         */
-        closable?: 'auto' | boolean;
-        /**
-         * Can be set to hover or click to show/hide dimmer on dimmable event
-         *
-         * @default false
-         */
-        on?: false | 'hover' | 'click';
-        /**
-         * Whether to dim dimmers using CSS transitions.
-         *
-         * @default true
-         */
-        useCSS?: boolean;
-        /**
-         * Animation duration of dimming. If an integer is used, that value will apply to both show and hide animations.
-         */
-        duration?: number | {
-            /**
-             * @default 500
-             */
-            show?: number;
-            /**
-             * @default 500
-             */
-            hide?: number;
-        };
-        /**
-         * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
-         *
-         * @default 'fade'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: string;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on element show
-         */
-        onShow?(this: JQuery): void;
-        /**
-         * Callback on element hide
-         */
-        onHide?(this: JQuery): void;
-        /**
-         * Callback on element show or hide
-         */
-        onchange?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Object containing selectors used by module.
-         */
-        selector?: {
-            /**
-             * @default '.dimmable'
-             */
-            dimmable?: string;
-            /**
-             * @default '.ui.dimmer'
-             */
-            dimmer?: string;
-            /**
-             * @default '.ui.dimmer > .content, .ui.dimmer > .content > .center'
-             */
-            content?: string;
-        };
-        /**
-         * Templates used to generate dimmer content
-         */
-        template?: {
-            dimmer?(): JQuery;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'dimmable'
-             */
-            dimmable?: string;
-            /**
-             * @default 'dimmed'
-             */
-            dimmed?: string;
-            /**
-             * @default 'disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'page'
-             */
-            pageDimmer?: string;
-            /**
-             * @default 'hide'
-             */
-            hide?: string;
-            /**
-             * @default 'show'
-             */
-            show?: string;
-            /**
-             * @default 'transition'
-             */
-            transition?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        /**
-         * Error messages displayed to console
-         */
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Dropdown
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/dropdown.html#/settings}
-     */
-    interface DropdownSettings extends ComponentSettings {
-        // TODO: Should 'value'/'values' parameters be of type 'string' instead of 'any'?
-
-        // region Frequently Used Settings
-
-        /**
-         * Event used to trigger dropdown (Hover, Click, Custom Event)
-         *
-         * @default 'click'
-         */
-        on?: string;
-        /**
-         * When set to true will fire onChange even when the value a user select matches the currently selected value.
-         *
-         * @default false
-         */
-        allowReselection?: boolean;
-        /**
-         * Whether search selection should allow users to add their own selections, works for single or multi-select.
-         *
-         * @default false
-         */
-        allowAdditions?: boolean;
-        /**
-         * When disabled user additions will appear in the results menu using a specially formatted selection item formatted by templates.addition.
-         *
-         * @default true
-         */
-        hideAdditions?: boolean;
-        /**
-         * Sets a default action to occur. (See usage guide)
-         *
-         * @default 'activate'
-         * @see {@link http://semantic-ui.com/modules/dropdown.html#/usage}
-         */
-        action?: 'activate' | 'select' | 'combo' | 'nothing' | 'hide' | ((this: JQuery, text: string, value: string | false, element: JQuery) => void);
-        /**
-         * The minimum characters for a search to begin showing results
-         *
-         * @default 1
-         */
-        minCharacters?: number;
-        /**
-         * When using search selection specifies how to match values.
-         *
-         * @default 'both'
-         */
-        match?: 'both' | 'value' | 'text';
-        /**
-         * Whether dropdown should select new option when using keyboard shortcuts. Setting to false will require enter or left click to confirm a choice.
-         *
-         * @default true
-         */
-        selectOnKeydown?: boolean;
-        /**
-         * Whether search selection will force currently selected choice when element is blurred.
-         *
-         * @default true
-         */
-        forceSelection?: boolean;
-        /**
-         * Whether menu items with sub-menus (categories) should be selectable
-         *
-         * @default false
-         */
-        allowCategorySelection?: boolean;
-        /**
-         * @default 'auto'
-         */
-        placeholder?: 'auto' | 'value' | false;
-
-        // endregion
-
-        // region Remote Settings
-
-        /**
-         * Can be set to an object to specify API settings for retrieving remote selection menu content from an API endpoint
-         *
-         * @default false
-         * @see {@link http://semantic-ui.com/behaviors/api.html}
-         */
-        apiSettings?: false | ApiSettings;
-        /**
-         * List mapping dropdown content to JSON Property when using API
-         */
-        fields?: {
-            /**
-             * grouping for api results
-             *
-             * @default 'results'
-             */
-            remoteValues?: string;
-            /**
-             * grouping for all dropdown values
-             *
-             * @default 'values'
-             */
-            values?: string;
-            /**
-             * displayed dropdown text
-             *
-             * @default 'name'
-             */
-            name?: string;
-            /**
-             * actual dropdown value
-             *
-             * @default 'value'
-             */
-            value?: string;
-        };
-        /**
-         * When enabled will automatically store selected name/value pairs in sessionStorage to preserve user selection on page refresh. Disabling will clear remote dropdown values on refresh.
-         *
-         * @default true
-         */
-        saveRemoteData?: boolean;
-        /**
-         * When set to true API will be expected to return the complete result set, which will then be filtered clientside to only display matching results.
-         *
-         * @default false
-         * @since 2.2.8
-         */
-        filterRemoteData?: boolean;
-
-        // endregion
-
-        // region Multiple Select Settings
-
-        /**
-         * Whether multiselect should use labels. Must be set to true when allowAdditions is true
-         *
-         * @default true
-         */
-        useLabels?: boolean;
-        /**
-         * When set to a number, sets the maximum number of selections
-         *
-         * @default false
-         */
-        maxSelections?: boolean;
-        /**
-         * Maximum glyph width, used to calculate search size. This is usually size of a "W" in your font in em
-         *
-         * @default 1.0714
-         */
-        glyphWidth?: number;
-        /**
-         * Allows customization of multi-select labels
-         */
-        label?: {
-            /**
-             * @default 'horizontal flip'
-             */
-            transition?: string;
-            /**
-             * @default 200
-             */
-            duration?: number;
-            /**
-             * @default false
-             */
-            variation?: false | string;
-        };
-
-        // endregion
-
-        // region Additional Settings
-
-        /**
-         * When set to auto determines direction based on whether dropdown can fit on screen. Set to upward or downward to always force a direction.
-         *
-         * @default 'auto'
-         */
-        direction?: 'auto' | 'upward' | 'downward';
-        /**
-         * Whether dropdown should try to keep itself on screen by checking whether menus display position in its context (Default context is page).
-         *
-         * @default true
-         */
-        keepOnScreen?: boolean;
-        /**
-         * Element context to use when checking whether can show when keepOnScreen: true
-         *
-         * @default 'window'
-         */
-        context?: Selector;
-        /**
-         * Specifying to "true" will use a fuzzy full text search, setting to "exact" will force the exact search to be matched somewhere in the string
-         *
-         * @default false
-         */
-        fullTextSearch?: boolean | 'exact';
-        /**
-         * Whether HTML included in dropdown values should be preserved. (Allows icons to show up in selected value)
-         *
-         * @default true
-         */
-        preserveHTML?: boolean;
-        /**
-         * Whether to sort values when creating a dropdown automatically from a select element.
-         *
-         * @default false
-         */
-        sortSelect?: boolean;
-        /**
-         * Whether to show dropdown menu automatically on element focus.
-         *
-         * @default true
-         */
-        showOnFocus?: boolean;
-        /**
-         * Whether to allow the element to be navigable by keyboard, by automatically creating a tabindex
-         *
-         * @default true
-         */
-        allowTab?: boolean;
-        /**
-         * Named transition to use when animating menu in and out.
-         * Defaults to slide down or slide up depending on dropdown direction.
-         * Fade and slide down are available without including ui transitions
-         *
-         * @default 'auto'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: 'auto' | string;
-        /**
-         * Duration of animation events
-         *
-         * @default 200
-         */
-        duration?: number;
-        /**
-         * The keycode used to represent keyboard shortcuts. To avoid issues with some foreign languages, you can pass false for comma delimiter's value
-         */
-        keys?: {
-            /**
-             * @default 8
-             */
-            backspace?: number;
-            /**
-             * @default 188
-             */
-            delimiter?: number | false;
-            /**
-             * @default 46
-             */
-            deleteKey?: number;
-            /**
-             * @default 13
-             */
-            enter?: number;
-            /**
-             * @default 27
-             */
-            escape?: number;
-            /**
-             * @default 33
-             */
-            pageUp?: number;
-            /**
-             * @default 34
-             */
-            pageDown?: number;
-            /**
-             * @default 37
-             */
-            leftArrow?: number;
-            /**
-             * @default 38
-             */
-            upArrow?: number;
-            /**
-             * @default 39
-             */
-            rightArrow?: number;
-            /**
-             * @default 40
-             */
-            downArrow?: number;
-        };
-        /**
-         * Time in milliseconds to debounce show or hide behavior when on: hover is used, or when touch is used.
-         */
-        delay?: {
-            /**
-             * @default 300
-             */
-            hide?: number;
-            /**
-             * @default 200
-             */
-            show?: number;
-            /**
-             * @default 50
-             */
-            search?: number;
-            /**
-             * @default 50
-             */
-            touch?: number;
-        };
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Is called after a dropdown value changes. Receives the name and value of selection and the active menu element
-         */
-        onChange?(this: JQuery, value: any, text: string, $choice: JQuery): void;
-        /**
-         * Is called after a dropdown selection is added using a multiple select dropdown, only receives the added value
-         */
-        onAdd?(this: JQuery, addedValue: any, addedText: string, $addedChoice: JQuery): void;
-        /**
-         * Is called after a dropdown selection is removed using a multiple select dropdown, only receives the removed value
-         */
-        onRemove?(this: JQuery, removedValue: any, removedText: string, $removedChoice: JQuery): void;
-        /**
-         * Allows you to modify a label before it is added. Expects the jQ DOM element for a label to be returned.
-         */
-        onLabelCreate?(this: JQuery, value: any, text: string): JQuery;
-        /**
-         * Called when a label is remove, return false; will prevent the label from being removed.
-         */
-        onLabelRemove?(this: JQuery, value: any): false | void;
-        /**
-         * Is called after a label is selected by a user
-         */
-        onLabelSelect?(this: JQuery, $selectedLabels: JQuery): void;
-        /**
-         * Is called after a dropdown is searched with no matching values
-         */
-        onNoResults?(this: JQuery, searchValue: any): void;
-        /**
-         * Is called before a dropdown is shown. If false is returned, dropdown will not be shown.
-         */
-        onShow?(this: JQuery): false | void;
-        /**
-         * Is called before a dropdown is hidden. If false is returned, dropdown will not be hidden.
-         */
-        onHide?(this: JQuery): false | void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * You can specify site wide messages by modifying $.fn.dropdown.settings.message that will apply on any dropdown if it appears in the page.
-         */
-        message?: {
-            /**
-             * @default 'Add <b>{term}</b>'
-             */
-            addResult?: string;
-            /**
-             * @default '{count} selected'
-             */
-            count?: string;
-            /**
-             * @default 'Max {maxCount} selections'
-             */
-            maxSelections?: string;
-            /**
-             * 'No results found.'
-             */
-            noResults?: string;
-        };
-        selector?: {
-            /**
-             * @default '.addition'
-             */
-            addition?: string;
-            /**
-             * @default '.ui.dropdown'
-             */
-            dropdown?: string;
-            /**
-             * @default '> .dropdown.icon'
-             */
-            icon?: string;
-            /**
-             * @default '> input[type="hidden"], > select'
-             */
-            input?: string;
-            /**
-             * @default '.item'
-             */
-            item?: string;
-            /**
-             * @default '> .label'
-             */
-            label?: string;
-            /**
-             * @default '> .label > .delete.icon'
-             */
-            remove?: string;
-            /**
-             * @default '.label'
-             */
-            siblingLabel?: string;
-            /**
-             * @default '.menu'
-             */
-            menu?: string;
-            /**
-             * @default '.message'
-             */
-            message?: string;
-            /**
-             * @default '.dropdown.icon'
-             */
-            menuIcon?: string;
-            /**
-             * @default 'input.search, .menu > .search > input'
-             */
-            search?: string;
-            /**
-             * @default '> .text:not(.icon)'
-             */
-            text?: string;
-        };
-        regExp?: {
-            /**
-             * @default /[-[\]{}()*+?.,\\^$|#\s]/g
-             */
-            escape?: RegExp;
-        };
-        metadata?: {
-            /**
-             * @default 'defaultText'
-             */
-            defaultText?: string;
-            /**
-             * @default 'defaultValue'
-             */
-            defaultValue?: string;
-            /**
-             * @default 'placeholderText'
-             */
-            placeholderText?: string;
-            /**
-             * @default 'text'
-             */
-            text?: string;
-            /**
-             * @default 'value'
-             */
-            value?: string;
-        };
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'addition'
-             */
-            addition?: string;
-            /**
-             * @default 'animating'
-             */
-            animating?: string;
-            /**
-             * @default 'disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'ui dropdown'
-             */
-            dropdown?: string;
-            /**
-             * @default 'filtered'
-             */
-            filtered?: string;
-            /**
-             * @default 'hidden transition'
-             */
-            hidden?: string;
-            /**
-             * @default 'item'
-             */
-            item?: string;
-            /**
-             * @default 'ui label'
-             */
-            label?: string;
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'menu'
-             */
-            menu?: string;
-            /**
-             * @default 'message'
-             */
-            message?: string;
-            /**
-             * @default 'multiple'
-             */
-            multiple?: string;
-            /**
-             * @default 'default'
-             */
-            placeholder?: string;
-            /**
-             * @default 'search'
-             */
-            search?: string;
-            /**
-             * @default 'selected'
-             */
-            selected?: string;
-            /**
-             * @default 'selection'
-             */
-            selection?: string;
-            /**
-             * @default 'upward'
-             */
-            upward?: string;
-            /**
-             * @default 'visible'
-             */
-            visible?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'You called a dropdown action that was not defined'
-             */
-            action?: string;
-            /**
-             * @default 'Once a select has been initialized behaviors must be called on the created ui dropdown'
-             */
-            alreadySetup?: string;
-            /**
-             * @default 'Allowing user additions currently requires the use of labels.'
-             */
-            labels?: string;
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-            /**
-             * @default 'This module requires ui transitions <https: github.com="" semantic-org="" ui-transition="">'
-             */
-            noTransition?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Embed
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/embed.html#/settings}
-     */
-    interface EmbedSettings extends ComponentSettings {
-        /**
-         * Specifies a url to use for embed
-         *
-         * @default false
-         */
-        url?: false | string;
-
-        // region Embed Settings
-
-        /**
-         * Specifies an icon to use with placeholder content
-         *
-         * @default false
-         */
-        icon?: false | string;
-        /**
-         * Specifies a source to use, if no source is provided it will be determined from the domain of a specified url.
-         *
-         * @default false
-         */
-        source?: false | string;
-        /**
-         * Specifies an id value to replace with the {id} value found in templated urls
-         *
-         * @default false
-         */
-        id?: false | string;
-        /**
-         * Specify an object containing key/value pairs to add to the iframes GET parameters
-         *
-         * @default false
-         */
-        parameters?: false | any;
-
-        // endregion
-
-        // region Video Settings
-
-        /**
-         * Default setting auto will only autoplay content when a placeholder is specified. Setting to true or false will force autoplay.
-         *
-         * @default 'auto'
-         */
-        autoplay?: 'auto' | boolean;
-        /**
-         * Specifies a default chrome color with Vimeo or YouTube.
-         *
-         * @default '#444444'
-         */
-        color?: string;
-        /**
-         * Whether to prefer HD content
-         *
-         * @default true
-         */
-        hd?: boolean;
-        /**
-         * Whether to show networks branded UI like title cards, or after video calls to action.
-         *
-         * @default false
-         */
-        brandedUI?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback when iframe is generated
-         */
-        onCreate?(this: JQuery, url: string): void;
-        /**
-         * Whenever an iframe contents is shown
-         */
-        onDisplay?(this: JQuery): void;
-        /**
-         * Callback immediately before Embed is removed from DOM
-         */
-        onPlaceholderDisplay?(this: JQuery): void;
-        /**
-         * Callback when module parameters are determined. Allows you to adjust parameters at run time by returning a new parameters object.
-         */
-        onEmbed?(this: JQuery, parameters: any): any;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * DOM Selectors used internally
-         */
-        selector?: {
-            /**
-             * @default '.embed'
-             */
-            embed?: string;
-            /**
-             * @default '.placeholder'
-             */
-            placeholder?: string;
-            /**
-             * @default '.play'
-             */
-            play?: string;
-        };
-        /**
-         * HTML Data attributes used to store data
-         */
-        metadata?: {
-            /**
-             * @default 'id'
-             */
-            id?: string;
-            /**
-             * @default 'icon'
-             */
-            icon?: string;
-            /**
-             * @default 'placeholder'
-             */
-            placeholder?: string;
-            /**
-             * @default 'source'
-             */
-            source?: string;
-            /**
-             * @default 'url'
-             */
-            url?: string;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'embed'
-             */
-            embed?: string;
-        };
-        templates?: {
-            /**
-             * returns html for iframe
-             */
-            iframe?(url: string, parameters: string): string;
-            /**
-             * returns html for placeholder element
-             */
-            placeholder?(image: string, icon: string): string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'No URL specified'
-             */
-            noURL?: string;
-            /**
-             * @default 'The method you called is not defined'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Modal
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/modal.html#/settings}
-     */
-    interface ModalSettings extends ComponentSettings {
-        // region Modal Settings
-
-        /**
-         * If set to false will prevent the modal from being moved to inside the dimmer
-         *
-         * @default true
-         */
-        detachable?: boolean;
-        /**
-         * When true, the first form input inside the modal will receive focus when shown. Set this to false to prevent this behavior.
-         *
-         * @default true
-         */
-        autofocus?: boolean;
-        /**
-         * Whether any change in modal DOM should automatically refresh cached positions
-         *
-         * @default false
-         */
-        observeChanges?: boolean;
-        /**
-         * If set to true will not close other visible modals when opening a new one
-         *
-         * @default false
-         */
-        allowMultiple?: boolean;
-        /**
-         * Whether to automatically bind keyboard shortcuts
-         *
-         * @default true
-         */
-        keyboardShortcuts?: boolean;
-        /**
-         *    A vertical offset to allow for content outside of modal, for example a close button, to be centered.
-         *
-         * @default 0
-         */
-        offset?: number;
-        /**
-         * Selector or jquery object specifying the area to dim
-         *
-         * @default 'body'
-         */
-        context?: Selector;
-        /**
-         * Setting to false will not allow you to close the modal by clicking on the dimmer
-         *
-         * @default true
-         */
-        closable?: boolean;
-        /**
-         * You can specify custom settings to extend UI dimmer
-         *
-         * @see {@link http://semantic-ui.com/modules/dimmer.html}
-         */
-        dimmerSettings?: DimmerSettings;
-        /**
-         * Named transition to use when animating menu in and out, full list can be found in ui transitions docs.
-         *
-         * @default 'scale'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: string;
-        /**
-         * Duration of animation
-         *
-         * @default 400
-         */
-        duration?: number;
-        /**
-         * Whether additional animations should queue
-         *
-         * @default false
-         */
-        queue?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Is called when a modal starts to show.
-         */
-        onShow?(this: JQuery): void;
-        /**
-         * Is called after a modal has finished showing animating.
-         */
-        onVisible?(this: JQuery): void;
-        /**
-         * Is called after a modal starts to hide. If the function returns false, the modal will not hide.
-         */
-        onHide?(this: JQuery, $element: JQuery): false | void;
-        /**
-         * Is called after a modal has finished hiding animation.
-         */
-        onHidden?(this: JQuery): void;
-        /**
-         * Is called after a positive, approve or ok button is pressed. If the function returns false, the modal will not hide.
-         */
-        onApprove?(this: JQuery, $element: JQuery): false | void;
-        /**
-         * Is called after a negative, deny or cancel button is pressed. If the function returns false the modal will not hide.
-         */
-        onDeny?(this: JQuery, $element: JQuery): false | void;
-
-        // endregion
-
-        // region DOM Settings
-
-        selector?: {
-            /**
-             * @default '.close, .actions .button'
-             */
-            close?: string;
-            /**
-             * @default '.actions .positive, .actions .approve, .actions .ok'
-             */
-            approve?: string;
-            /**
-             * @default '.actions .negative, .actions .deny, .actions .cancel'
-             */
-            deny?: string;
-        };
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'scrolling'
-             */
-            scrolling?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Nag
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/nag.html}
-     */
-    interface NagSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * allows cookie to be overridden
-         *
-         * @default false
-         */
-        persist?: boolean;
-        /**
-         * set to zero to require manually dismissal, otherwise hides on its own
-         *
-         * @default 0
-         */
-        displayTime?: number;
-        animation?: {
-            /**
-             * @default 'slide'
-             */
-            show?: string;
-            /**
-             * @default 'slide'
-             */
-            hide?: string;
-        };
-        /**
-         * @default false
-         */
-        context?: false | Selector;
-        /**
-         * @default false
-         */
-        detachable?: boolean;
-
-        /**
-         * @default 30
-         */
-        expires?: number;
-        /**
-         * @default false
-         */
-        domain?: false | string;
-        /**
-         * @default '/'
-         */
-        path?: string;
-
-        /**
-         * type of storage to use
-         *
-         * @default 'cookie'
-         */
-        storageMethod?: 'cookie' | 'localstorage' | 'sessionstorage';
-
-        /**
-         * @default 'nag'
-         */
-        key?: any;
-        /**
-         * @default 'dismiss'
-         */
-        value?: any;
-
-        /**
-         * @default 500
-         */
-        speed?: number;
-        /**
-         * @default 'easeOutQuad'
-         */
-        easing?: string;
-
-        // endregion
-
-        // region Callbacks
-
-        onHide?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        className?: {
-            /**
-             * @default 'bottom'
-             */
-            bottom?: string;
-            /**
-             * @default 'fixed'
-             */
-            fixed?: string;
-        };
-        selector?: {
-            /**
-             * @default '.close.icon'
-             */
-            close?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default '$.cookie is not included. A storage solution is required.'
-             */
-            noCookieStorage?: string;
-            /**
-             * @default 'Neither $.cookie or store is defined. A storage solution is required for storing state'
-             */
-            noStorage?: string;
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Popup
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/popup.html#/settings}
-     */
-    interface PopupSettings extends ComponentSettings {
-        // region Popup Settings
-
-        /**
-         * Can specify a DOM element that should be used as the popup. This is useful for including a pre-formatted popup.
-         *
-         * @default false
-         */
-        popup?: false | Selector;
-        /**
-         * Whether all other popups should be hidden when this popup is opened
-         *
-         * @default false
-         */
-        exclusive?: boolean;
-        /**
-         * Whether to move popup to same offset container as target element when popup already exists on the page.
-         * Using a popup inside of an element without overflow:visible, like a sidebar, may require you to set this to false
-         *
-         * @default true
-         */
-        movePopup?: boolean;
-        /**
-         * Whether popup should attach mutationObservers to automatically run destroy when the element is removed from the page's DOM.
-         *
-         * @default true
-         */
-        observeChanges?: boolean;
-        /**
-         * When the popup surpasses the boundary of this element, it will attempt to find another display position.
-         */
-        boundary?: Selector;
-        /**
-         * Selector or jquery object specifying where the popup should be created.
-         *
-         * @default 'body'
-         */
-        context?: Selector;
-        /**
-         * Will automatically hide a popup on scroll event in this context
-         */
-        scrollContext?: Selector;
-        /**
-         * Number of pixels that a popup is allowed to appear outside the boundaries of its context.
-         * This allows for permissible rounding errors when an element is against the edge of its context.
-         *
-         * @default 2
-         */
-        jitter?: number;
-        /**
-         * Position that the popup should appear
-         *
-         * @default 'top left'
-         */
-        position?: string;
-        /**
-         * If a popup is inline it will be created next to current element, allowing for local css rules to apply.
-         * It will not be removed from the DOM after being hidden.
-         * Otherwise popups will appended to body and removed after being hidden.
-         *
-         * @default false
-         */
-        inline?: boolean;
-        /**
-         * Whether popup contents should be preserved in the page after being hidden, allowing it to re-appear slightly faster on subsequent loads.
-         *
-         * @default false
-         */
-        preserve?: boolean;
-        /**
-         * Can be set to adjacent or opposite to prefer adjacent or opposite position if popup cannot fit on screen
-         *
-         * @default 'adjacent'
-         */
-        prefer?: 'adjacent' | 'opposite';
-        /**
-         * When set to false, a popup will not appear and produce an error message if it cannot entirely fit on page.
-         * Setting this to a position like, right center forces the popup to use this position as a last resort even if it is partially offstage.
-         * Setting this to true will use the last attempted position.
-         *
-         * @default false
-         */
-        lastResort?: boolean | string;
-        /**
-         * Event used to trigger popup. Can be either focus, click, hover, or manual. Manual popups must be triggered with $('.element').popup('show');
-         *
-         * @default 'hover'
-         */
-        on?: 'focus' | 'click' | 'hover' | 'manual';
-        /**
-         * Delay in milliseconds before showing or hiding a popup on hover or focus
-         */
-        delay?: {
-            show?: number;
-            hide?: number;
-        };
-        /**
-         * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
-         *
-         * @default 'slide down'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: string;
-        /**
-         * Duration of animation events
-         *
-         * @default 200
-         */
-        duration?: number;
-        /**
-         * Whether popup should set fluid popup variation width on load to avoid width: 100% including padding
-         *
-         * @default true
-         */
-        setFluidWidth?: boolean;
-        /**
-         * Whether popup should not close on hover (useful for popup navigation menus)
-         *
-         * @default false
-         */
-        hoverable?: boolean;
-        /**
-         * When using on: 'click' specifies whether clicking the page should close the popup
-         *
-         * @default true
-         */
-        closable?: boolean;
-        /**
-         * When using on: 'hover' whether touchstart events should be added to allow the popup to be triggered
-         */
-        addTouchEvents?: boolean;
-        /**
-         * Whether popup should hide on scroll or touchmove, auto only hides for popups without on: 'click'.
-         * Set this to false to prevent mobile browsers from closing popups when you tap inside input fields.
-         *
-         * @default 'auto'
-         */
-        hideOnScroll?: 'auto' | false;
-        /**
-         * If a selector or jQuery object is specified this allows the popup to be positioned relative to that element.
-         *
-         * @default false
-         */
-        target?: false | Selector;
-        /**
-         * Offset for distance of popup from element
-         *
-         * @default 0
-         */
-        distanceAway?: number;
-        /**
-         * Offset in pixels from calculated position
-         *
-         * @default 0
-         */
-        offset?: number;
-        /**
-         * Number of iterations before giving up search for popup position when a popup cannot fit on screen
-         *
-         * @default 10
-         */
-        maxSearchDepth?: number;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on popup element creation, with created popup
-         */
-        onCreate?(this: JQuery, $module: JQuery): void;
-        /**
-         * Callback immediately before Popup is removed from DOM
-         */
-        onRemove?(this: JQuery, $module: JQuery): void;
-        /**
-         * Callback before popup is shown. Returning false from this callback will cancel the popup from showing.
-         */
-        onShow?(this: JQuery, $module: JQuery): false | void;
-        /**
-         * Callback after popup is shown
-         */
-        onVisible?(this: JQuery, $module: JQuery): void;
-        /**
-         * Callback before popup is hidden. Returning false from this callback will cancel the popup from hiding.
-         */
-        onHide?(this: JQuery, $module: JQuery): false | void;
-        /**
-         * Callback after popup is hidden
-         */
-        onHidden?(this: JQuery, $module: JQuery): void;
-        /**
-         * Callback after popup cannot be placed on screen
-         */
-        onUnplaceable?(this: JQuery, $module: JQuery): void;
-
-        // endregion
-
-        // region Content Settings
-
-        /**
-         * Popup variation to use, can use multiple variations with a space delimiter
-         */
-        variation?: string;
-        /**
-         * Content to display
-         */
-        content?: string;
-        /**
-         * Title to display alongside content
-         */
-        title?: string;
-        /**
-         * HTML content to display instead of preformatted title and content
-         */
-        html?: string | JQuery;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * DOM Selectors used internally
-         */
-        selector?: {
-            /**
-             * @default '.ui.popup'
-             */
-            popup?: string;
-        };
-        /**
-         * HTML Data attributes used to store data
-         */
-        metadata?: {
-            /**
-             * @default 'content'
-             */
-            content?: string;
-            /**
-             * @default 'html'
-             */
-            html?: string;
-            /**
-             * @default 'offset'
-             */
-            offset?: string;
-            /**
-             * @default 'position'
-             */
-            position?: string;
-            /**
-             * @default 'title'
-             */
-            title?: string;
-            /**
-             * @default 'variation'
-             */
-            variation?: string;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'ui popup'
-             */
-            popup?: string;
-            /**
-             * @default 'top left center bottom right'
-             */
-            position?: string;
-            /**
-             * @default 'visible'
-             */
-            visible?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The position you specified is not a valid position'
-             */
-            invalidPosition?: string;
-            /**
-             * @default 'Popup does not fit within the boundaries of the viewport'
-             */
-            cannotPlace?: string;
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-            /**
-             * @default 'This module requires ui transitions <https: github.com="" semantic-org="" ui-transition="">'
-             */
-            noTransition?: string;
-            /**
-             * @default 'The target or popup you specified does not exist on the page'
-             */
-            notFound?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Progress
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/progress.html#/settings}
-     */
-    interface ProgressSettings extends ComponentSettings {
-        // region Progress Settings
-
-        /**
-         * Whether success state should automatically trigger when progress completes
-         *
-         * @default true
-         */
-        autoSuccess?: boolean;
-        /**
-         * Whether progress should automatically show activity when incremented
-         *
-         * @default true
-         */
-        showActivity?: boolean;
-        /**
-         * When set to true, values that calculate to above 100% or below 0% will be adjusted.
-         * When set to false, inappropriate values will produce an error.
-         *
-         * @default true
-         */
-        limitValues?: boolean;
-        /**
-         * Can be set to either to display progress as percent or ratio. Matches up to corresponding text template with the same name.
-         *
-         * @default 'percent'
-         */
-        label?: 'percent' | 'ratio';
-        /**
-         * When incrementing without value, sets range for random increment value
-         */
-        random?: {
-            /**
-             * @default 2
-             */
-            min?: number;
-            /**
-             * @default 5
-             */
-            max?: number;
-        };
-        /**
-         * Decimal point precision for calculated progress
-         *
-         * @default 1
-         */
-        precision?: number;
-        /**
-         * Setting a total value will make each call to increment get closer to this total (i.e. 1/20, 2/20 etc)
-         *
-         * @default false
-         */
-        total?: false | number;
-        /**
-         * Sets current value, when total is specified, this is used to calculate a ratio of the total, with percent this should be the overall percent
-         *
-         * @default false
-         */
-        value?: false | number;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on percentage change
-         */
-        onChange?(this: JQuery, percent: number, value: number, total: number): void;
-        /**
-         * Callback on success state
-         */
-        onSuccess?(this: JQuery, total: number): void;
-        /**
-         * Callback on active state
-         */
-        onActive?(this: JQuery, value: number, total: number): void;
-        /**
-         * Callback on error state
-         */
-        onError?(this: JQuery, value: number, total: number): void;
-        /**
-         * Callback on warning state
-         */
-        onWarning?(this: JQuery, value: number, total: number): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Text content for each state, uses simple templating with {percent}, {value}, {total}
-         */
-        text?: {
-            /**
-             * @default false
-             */
-            active?: false | string;
-            /**
-             * @default false
-             */
-            error?: false | string;
-            /**
-             * @default false
-             */
-            success?: false | string;
-            /**
-             * @default false
-             */
-            warning?: false | string;
-            /**
-             * @default '{percent}%'
-             */
-            percent?: false | string;
-            /**
-             * @default '{value} of {total}'
-             */
-            ratio?: false | string;
-        };
-        /**
-         * Regular expressions used by module
-         */
-        regExp?: {
-            /**
-             * @default /\{\$*[A-z0-9]+\}/g
-             */
-            variable?: RegExp;
-        };
-        /**
-         * Selectors used by module
-         */
-        selector?: {
-            /**
-             * @default '> .bar
-             */
-            bar?: string;
-            /**
-             * @default '> .label'
-             */
-            label?: string;
-            /**
-             * @default '.bar > .progress'
-             */
-            progress?: string;
-        };
-        /**
-         * DOM metadata used by module
-         */
-        metadata?: {
-            /**
-             * @default 'percent'
-             */
-            percent?: string;
-            /**
-             * @default 'total'
-             */
-            total?: string;
-            /**
-             * @default 'value'
-             */
-            value?: string;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'error'
-             */
-            error?: string;
-            /**
-             * @default 'success'
-             */
-            success?: string;
-            /**
-             * @default 'warning'
-             */
-            warning?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-            /**
-             * @default 'Progress value is non numeric'
-             */
-            nonNumeric?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Rating
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/rating.html#/settings}
-     */
-    interface RatingSettings extends ComponentSettings {
-        // region Rating Settings
-
-        /**
-         * A number representing the default rating to apply
-         *
-         * @default 0
-         */
-        initialRating?: number;
-        /**
-         * Whether callbacks like onRate should fire immediately after initializing with the current value.
-         *
-         * @default false
-         */
-        fireOnInit?: boolean;
-        /**
-         * By default a rating will be only clearable if there is 1 icon. Setting to true/false will allow or disallow a user to clear their rating
-         *
-         * @default 'auto'
-         */
-        clearable?: 'auto' | boolean;
-        /**
-         * Whether to enable user's ability to rate
-         *
-         * @default true
-         */
-        interactive?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Is called after user selects a new rating
-         */
-        onRate?(this: JQuery, value: number): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        selector?: {
-            /**
-             * @default '.icon'
-             */
-            icon?: string;
-        };
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'hover'
-             */
-            hover?: string;
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'You called a rating action that was not defined'
-             */
-            action?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Search
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/search.html#/settings}
-     */
-    interface SearchSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * Settings for API call.
-         *
-         * @see {@link http://semantic-ui.com/behaviors/api.html#/usage}
-         */
-        apiSettings?: ApiSettings;
-        /**
-         * Minimum characters to query for results
-         *
-         * @default 1
-         */
-        minCharacters?: number;
-        /**
-         * Named transition to use when animating menu in and out. Fade and slide down are available without including ui transitions
-         *
-         * @default 'fade'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: string;
-        /**
-         * Duration of animation events
-         *
-         * @default 300
-         */
-        duration?: number;
-        /**
-         * Maximum results to display when using local and simple search, maximum category count for category search
-         *
-         * @default 7
-         */
-        maxResults?: number;
-        /**
-         * Caches results locally to avoid requerying server
-         *
-         * @default true
-         */
-        cache?: boolean;
-        /**
-         * Specify a Javascript object which will be searched locally
-         *
-         * @default false
-         */
-        source?: false | any;
-        /**
-         * Whether the search should automatically select the first search result after searching
-         *
-         * @default false
-         */
-        selectFirstResult?: boolean;
-        /**
-         * Whether a "no results" message should be shown if no results are found. (These messages can be modified using the template object specified below)
-         *
-         * @default false
-         */
-        showNoResults?: boolean;
-        /**
-         * Return local results that match anywhere inside your content
-         *
-         * @default true
-         */
-        searchFullText?: boolean;
-        /**
-         * List mapping display content to JSON property, either with API or source.
-         */
-        fields?: {
-            /**
-             * array of categories (category view)
-             *
-             * @default 'results'
-             */
-            categories?: string;
-            /**
-             * name of category (category view)
-             *
-             * @default 'name'
-             */
-            categoryName?: string;
-            /**
-             * array of results (category view)
-             *
-             * @default 'results'
-             */
-            categoryResults?: string;
-            /**
-             * result description
-             *
-             * @default 'description'
-             */
-            description?: string;
-            /**
-             * result image
-             *
-             * @default 'image'
-             */
-            image?: string;
-            /**
-             * result price
-             *
-             * @default 'price'
-             */
-            price?: string;
-            /**
-             * array of results (standard)
-             *
-             * @default 'results'
-             */
-            results?: string;
-            /**
-             * result title
-             *
-             * @default 'title'
-             */
-            title?: string;
-            /**
-             * "view more" object name
-             *
-             * @default 'action'
-             */
-            action?: string;
-            /**
-             * "view more" text
-             *
-             * @default 'text'
-             */
-            actionText?: string;
-            /**
-             * "view more" url
-             *
-             * @default 'url'
-             */
-            actionURL?: string;
-        };
-        /**
-         * Specify object properties inside local source object which will be searched
-         */
-        searchFields?: string[];
-        /**
-         * Delay before hiding results after search blur
-         *
-         * @default 0
-         */
-        hideDelay?: number;
-        /**
-         * Delay before querying results on inputchange
-         *
-         * @default 100
-         */
-        searchDelay?: number;
-        /**
-         * Easing equation when using fallback Javascript animation
-         *
-         * @default 'easeOutExpo'
-         */
-        easing?: string;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on element selection by user.
-         * The first parameter includes the filtered response results for that element.
-         * The function should return false to prevent default action (closing search results and selecting value).
-         */
-        onSelect?(this: JQuery, result: any, response: any): false | void;
-        /**
-         * Callback after processing element template to add HTML to results. Function should return false to prevent default actions.
-         */
-        onResultsAdd?(this: JQuery, html: string): false | void;
-        /**
-         * Callback on search query
-         */
-        onSearchQuery?(this: JQuery, query: string): void;
-        /**
-         * Callback on server response
-         */
-        onResults?(this: JQuery, response: any): void;
-        /**
-         * Callback when results are opened
-         */
-        onResultsOpen?(this: JQuery): void;
-        /**
-         * Callback when results are closed
-         */
-        onResultsClose?(this: JQuery): void;
-
-        // endregion
-
-        // region Templates
-
-        templates?: {
-            escape?(string: string): string;
-            message?(message: string, type: string): string;
-            category?(response: any): string;
-            standard?(response: any): string;
-        };
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Regular expressions used for matching
-         */
-        regExp?: {
-            /**
-             * @default /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g
-             */
-            escape?: RegExp;
-            /**
-             * @default '(?:\s|^)'
-             */
-            beginsWith?: string;
-        };
-        /**
-         * Selectors used to find parts of a module
-         */
-        selector?: {
-            /**
-             * @default '.prompt'
-             */
-            prompt?: string;
-            /**
-             * @default '.search.button'
-             */
-            searchButton?: string;
-            /**
-             * @default '.results'
-             */
-            results?: string;
-            /**
-             * @default '.category'
-             */
-            category?: string;
-            /**
-             * @default '.result'
-             */
-            result?: string;
-        };
-        /**
-         * HTML5 metadata attributes used internally
-         */
-        metadata?: {
-            /**
-             * @default 'cache'
-             */
-            cache?: string;
-            /**
-             * @default 'results'
-             */
-            results?: string;
-        };
-        /**
-         * Class names used to determine element state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'empty'
-             */
-            empty?: string;
-            /**
-             * @default 'focus'
-             */
-            focus?: string;
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'down'
-             */
-            pressed?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'Cannot search. No source used, and Semantic API module was not included'
-             */
-            source?: string;
-            /**
-             * @default 'Your search returned no results'
-             */
-            noResults?: string;
-            /**
-             * @default 'Error in debug logging, exiting.'
-             */
-            logging?: string;
-            /**
-             * @default 'A valid template name was not specified.'
-             */
-            noTemplate?: string;
-            /**
-             * @default 'There was an issue with querying the server.'
-             */
-            serverError?: string;
-            /**
-             * @default 'Results must be an array to use maxResults setting'
-             */
-            maxResults?: string;
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Shape
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/shape.html#/settings}
-     */
-    interface ShapeSettings extends ComponentSettings {
-        // region Shape Settings
-
-        /**
-         * Duration of side change animation
-         *
-         * @default 700
-         */
-        duration?: number;
-        /**
-         * When set to next will use the width of the next side during the shape's animation.
-         * When set to initial it will use the width of the shape at initialization.
-         * When set to a specific pixel height, will force the width to that height.
-         *
-         * @default 'initial'
-         * @since 2.2
-         */
-        width?: 'next' | 'initial' | number;
-        /**
-         * When set to next will use the height of the next side during the shape's animation.
-         * When set to initial it will use the height of the shape at initialization.
-         * When set to a specific pixel height, will force the height to that height.
-         *
-         * @default 'initial'
-         * @since 2.2
-         */
-        height?: 'next' | 'initial' | number;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Is called before side change
-         */
-        beforeChange?(this: JQuery): void;
-        /**
-         * Is called after visible side change
-         */
-        onChange?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        selector?: {
-            /**
-             * @default '.sides'
-             */
-            sides?: string;
-            /**
-             * @default '.side'
-             */
-            side?: string;
-        };
-        className?: {
-            /**
-             * @default 'animating'
-             */
-            animating?: string;
-            /**
-             * @default 'hidden'
-             */
-            hidden?: string;
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'active'
-             */
-            active?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'You tried to switch to a side that does not exist.'
-             */
-            side?: string;
-            /**
-             * @default 'The method you called is not defined'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    interface Translation {
-        transform: string;
-    }
-
-    // endregion
-
-    // region Sidebar
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/sidebar.html#/settings}
-     */
-    interface SidebarSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * Context which sidebar will appear inside
-         *
-         * @default 'body'
-         */
-        context?: Selector;
-        /**
-         * Whether multiple sidebars can be open at once
-         *
-         * @default false
-         */
-        exclusive?: boolean;
-        /**
-         * Whether sidebar can be closed by clicking on page
-         *
-         * @default true
-         */
-        closable?: boolean;
-        /**
-         * Whether to dim page contents when sidebar is visible
-         *
-         * @default true
-         */
-        dimPage?: boolean;
-        /**
-         * Whether to lock page scroll when sidebar is visible
-         *
-         * @default false
-         */
-        scrollLock?: boolean;
-        /**
-         * Whether to return to original scroll position when sidebar is hidden, automatically occurs with transition: scale
-         *
-         * @default false
-         */
-        returnScroll?: boolean;
-        /**
-         * When sidebar is initialized without the proper HTML, using this option will defer creation of DOM to use requestAnimationFrame.
-         *
-         * @default false
-         */
-        delaySetup?: boolean;
-
-        // endregion
-
-        // region Animation
-
-        /**
-         * Named transition to use when animating sidebar. Defaults to 'auto' which selects transition from defaultTransition based on direction.
-         *
-         * @default 'auto'
-         */
-        transition?: string;
-        /**
-         * Named transition to use when animating when detecting mobile device. Defaults to 'auto' which selects transition from defaultTransition based on direction.
-         *
-         * @default 'auto'
-         */
-        mobileTransition?: string;
-        /**
-         * Default transitions for each direction and screen size, used with transition: auto
-         */
-        defaultTransition?: {
-            computer?: {
-                /**
-                 * @default 'uncover'
-                 */
-                left?: string;
-                /**
-                 * @default 'uncover'
-                 */
-                right?: string;
-                /**
-                 * @default 'overlay'
-                 */
-                top?: string;
-                /**
-                 * @default 'overlay'
-                 */
-                bottom?: string;
-            };
-            mobile?: {
-                /**
-                 * @default 'uncover'
-                 */
-                left?: string;
-                /**
-                 * @default 'uncover'
-                 */
-                right?: string;
-                /**
-                 * @default 'overlay'
-                 */
-                top?: string;
-                /**
-                 * @default 'overlay'
-                 */
-                bottom?: string;
-            };
-        };
-        /**
-         * Whether Javascript animations should be used. Defaults to false. Setting to auto will use legacy animations only for browsers that do not support CSS transforms
-         *
-         * @default false
-         */
-        useLegacy?: 'auto' | boolean;
-        /**
-         * Duration of sidebar animation when using legacy Javascript animation
-         *
-         * @default 500
-         */
-        duration?: number;
-        /**
-         * Easing to use when using legacy Javascript animation
-         *
-         * @default 'easeInOutQuint'
-         */
-        easing?: string;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Is called when a sidebar begins animating in.
-         */
-        onVisible?(this: JQuery): void;
-        /**
-         * Is called when a sidebar has finished animating in.
-         */
-        onShow?(this: JQuery): void;
-        /**
-         * Is called when a sidebar begins to hide or show
-         */
-        onChange?(this: JQuery): void;
-        /**
-         * Is called before a sidebar begins to animate out.
-         */
-        onHide?(this: JQuery): void;
-        /**
-         * Is called after a sidebar has finished animating out.
-         */
-        onHidden?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'animating'
-             */
-            animating?: string;
-            /**
-             * @default 'dimmed'
-             */
-            dimmed?: string;
-            /**
-             * @default 'ios'
-             */
-            ios?: string;
-            /**
-             * @default 'pushable'
-             */
-            pushable?: string;
-            /**
-             * @default 'pushed'
-             */
-            pushed?: string;
-            /**
-             * @default 'right'
-             */
-            right?: string;
-            /**
-             * @default 'top'
-             */
-            top?: string;
-            /**
-             * @default 'left'
-             */
-            left?: string;
-            /**
-             * @default 'bottom'
-             */
-            bottom?: string;
-            /**
-             * @default 'visible'
-             */
-            visible?: string;
-        };
-        regExp?: {
-            /**
-             * @default /(iPad|iPhone|iPod)/g
-             */
-            ios?: RegExp;
-            /**
-             * @default /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/g
-             */
-            mobile?: RegExp;
-        };
-        selector?: {
-            /**
-             * @default '.fixed'
-             */
-            fixed?: string;
-            /**
-             * @default 'script, link, style, .ui.modal, .ui.dimmer, .ui.nag, .ui.fixed'
-             */
-            omitted?: string;
-            /**
-             * @default '.pusher'
-             */
-            pusher?: string;
-            /**
-             * @default '.ui.sidebar'
-             */
-            sidebar?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-            /**
-             * @default 'Had to add pusher element. For optimal performance make sure body content is inside a pusher element'
-             */
-            pusher?: string;
-            /**
-             * @default 'Had to move sidebar. For optimal performance make sure sidebar and pusher are direct children of your body tag'
-             */
-            movedSidebar?: string;
-            /**
-             * @default 'The overlay setting is no longer supported, use animation: overlay'
-             */
-            overlay?: string;
-            /**
-             * @default 'There were no elements that matched the specified selector'
-             */
-            notFound?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Sticky
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/sticky.html#/settings}
-     */
-    interface StickySettings extends ComponentSettings {
-        // region Sticky Settings
-
-        /**
-         * Whether element should be "pushed" by the viewport, attaching to the bottom of the screen when scrolling up
-         *
-         * @default false
-         */
-        pushing?: boolean;
-        /**
-         * Sticky container height will only be set if the difference between heights of container and context is larger than this jitter value.
-         *
-         * @default 5
-         */
-        jitter?: number;
-        /**
-         * Whether any change in context DOM should automatically refresh cached sticky positions
-         *
-         * @default false
-         */
-        observeChanges?: boolean;
-        /**
-         * Context which sticky element should stick to
-         *
-         * @default false
-         */
-        context?: false | Selector;
-        /**
-         * Context which sticky should attach onscroll events.
-         *
-         * @default 'window'
-         */
-        scrollContext?: Selector;
-        /**
-         * Offset in pixels from the top of the screen when fixing element to viewport
-         *
-         * @default 0
-         */
-        offset?: number;
-        /**
-         * Offset in pixels from the bottom of the screen when fixing element to viewport
-         *
-         * @default 0
-         */
-        bottomOffset?: number;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback when element is repositioned from layout change
-         */
-        onReposition?(this: JQuery): void;
-        /**
-         * Callback when requestAnimationFrame fires from scroll handler.
-         */
-        onScroll?(this: JQuery): void;
-        /**
-         * Callback when element is fixed to page
-         */
-        onStick?(this: JQuery): void;
-        /**
-         * Callback when element is unfixed from page
-         */
-        onUnstick?(this: JQuery): void;
-        /**
-         * Callback when element is bound to top of parent container
-         */
-        onTop?(this: JQuery): void;
-        /**
-         * Callback when element is bound to bottom of parent container
-         */
-        onBottom?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'bound'
-             */
-            bound?: string;
-            /**
-             * @default 'fixed'
-             */
-            fixed?: string;
-            /**
-             * @default 'native'
-             */
-            supported?: string;
-            /**
-             * @default 'top'
-             */
-            top?: string;
-            /**
-             * @default 'bottom'
-             */
-            bottom?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'Sticky element must be inside a relative container'
-             */
-            container?: string;
-            /**
-             * @default 'Element is hidden, you must call refresh after element becomes visible'
-             */
-            visible?: string;
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-            /**
-             * @default 'Context specified does not exist'
-             */
-            invalidContext?: string;
-            /**
-             * @default 'Sticky element is larger than its container, cannot create sticky.'
-             */
-            elementSize?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Tab
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/tab.html#/settings}
-     */
-    interface TabSettings extends ComponentSettings {
-        // region Tab Settings
-
-        /**
-         * Whether tab should load remote content as same url as history
-         *
-         * @default false
-         */
-        auto?: boolean;
-        /**
-         * When set to siblings will only deactivate elements that are DOM siblings with the activated element.
-         * When set to all the component will deactivate all other elements initialized at the same time.
-         *
-         * @default 'siblings'
-         * @since 2.2
-         */
-        deactivate?: 'siblings' | 'all';
-        /**
-         * Whether to record history events for tab changes
-         *
-         * @default false
-         */
-        history?: boolean;
-        /**
-         * Do not load content remotely on first tab load. Useful when open tab is rendered on server.
-         *
-         * @default false
-         */
-        ignoreFirstLoad?: boolean;
-        /**
-         * Whether inline scripts in tab HTML should be parsed on tab load.
-         * Defaults to once, parsing only on first load.
-         * Can also be set to true or false to always parse or never parse inline scripts.
-         *
-         * @default 'once'
-         */
-        evaluateScripts?: 'once' | boolean;
-        /**
-         * Tab should reload content every time it is opened
-         */
-        alwaysRefresh?: boolean;
-        /**
-         * Can be set to either response, DOM or html.
-         * Using DOM will cache the a clone of the DOM tree, preserving all events as they existed on render.
-         * response will cache the original response on load, this way callbacks always receive the same content.
-         * Using html will cache the resulting html after all callbacks, making sure any changes to content are preserved.
-         *
-         * @default 'response'
-         */
-        cacheType?: 'response' | 'DOM' | 'html';
-        /**
-         * Tab should cache content after loading locally to avoid server trip on second load
-         *
-         * @default true
-         */
-        cache?: boolean;
-        /**
-         * Settings object for $.api call
-         *
-         * @default false
-         * @see {@link http://semantic-ui.com/behaviors/api.html}
-         */
-        apiSettings?: ApiSettings;
-        /**
-         * Can be set to hash or state.
-         * Hash will use an in-page link to create history events.
-         * State will use DOM History and load pages from server on refresh.
-         *
-         * @default 'hash'
-         * @see {@link https://developer.mozilla.org/en-US/docs/Web/Guide/API/DOM/Manipulating_the_browser_history}
-         */
-        historyType?: 'hash' | 'state';
-        /**
-         * When using historyType state you must specify the base URL for all internal links.
-         *
-         * @default false
-         */
-        path?: false | string;
-        /**
-         * Tabs are limited to those found inside this context
-         *
-         * @default false
-         */
-        context?: false | Selector;
-        /**
-         * If enabled limits tabs to children of passed context
-         *
-         * @default false
-         */
-        childrenOnly?: boolean;
-        /**
-         * Maximum amount of nested tabs allowed (avoids recursion)
-         *
-         * @default 25
-         */
-        maxDepth?: number;
-        /**
-         * When enabled only calls remote endpoint for tab data on first load and leaves the DOM undisturbed afterwards.
-         *
-         * @default false
-         * @since 2.2.8
-         */
-        loadOnce?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback only the first time a tab is loaded
-         */
-        onFirstLoad?(this: JQuery, tabPath: string, parameterArray: any[], historyEvent: any): void;
-        /**
-         * Callback every time a tab is loaded
-         */
-        onLoad?(this: JQuery, tabPath: string, parameterArray: any[], historyEvent: any): void;
-        /**
-         * Called when a tab begins loading remote content
-         */
-        onRequest?(this: JQuery, tabPath: string): void;
-        /**
-         * Called after a tab becomes visible
-         */
-        onVisible?(this: JQuery, tabPath: string): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Functions used to return content
-         */
-        templates?: {
-            /**
-             * returns page title
-             */
-            determineTitle?(tabArray: any[]): string;
-        };
-        /**
-         * Selectors used by module
-         */
-        selector?: {
-            /**
-             * @default '.ui.tab'
-             */
-            tabs?: string;
-            /**
-             * @default '.ui:not(.menu)'
-             */
-            parent?: string;
-        };
-        /**
-         * DOM metadata used by module
-         */
-        metadata?: {
-            /**
-             * @default 'tab'
-             */
-            tab?: string;
-            /**
-             * @default 'loaded'
-             */
-            loaded?: string;
-            /**
-             * @default 'promise'
-             */
-            promise?: string;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'active'
-             */
-            active?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'You attempted to load content without API module'
-             */
-            api?: string;
-            /**
-             * @default 'The method you called is not defined'
-             */
-            method?: string;
-            /**
-             * @default 'Activated tab cannot be found for this context.'
-             */
-            missingTab?: string;
-            /**
-             * @default 'The tab you specified is missing a content url.'
-             */
-            noContent?: string;
-            /**
-             * @default 'History enabled, but no path was specified'
-             */
-            path?: string;
-            /**
-             * @default 'Max recursive depth reached'
-             */
-            recursion?: string;
-            /**
-             * @default 'The state library has not been initialized'
-             */
-            state?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Transition
-
-    /**
-     * @see {@link http://semantic-ui.com/modules/transition.html#/settings}
-     */
-    interface TransitionSettings extends ComponentSettings {
-        // region Transition Settings
-
-        /**
-         * Named animation event to used. Must be defined in CSS.
-         *
-         * @default 'fade'
-         */
-        animation?: string;
-        /**
-         * Interval in MS between each elements transition
-         *
-         * @default 0
-         */
-        interval?: number;
-        /**
-         * When an interval is specified, sets order of animations. auto reverses only animations that are hiding.
-         *
-         * @default 'auto'
-         */
-        reverse?: 'auto' | boolean;
-        /**
-         * Specify the final display type (block, inline-block etc) so that it doesn't have to be calculated.
-         *
-         * @default false
-         */
-        displayType?: false | string;
-        /**
-         * Duration of the CSS transition animation
-         *
-         * @default 500
-         */
-        duration?: number;
-        /**
-         * If enabled a timeout will be added to ensure animationend callback occurs even if element is hidden
-         */
-        useFailSafe?: boolean;
-        /**
-         * If enabled will allow same animation to be queued while it is already occurring
-         */
-        allowRepeats?: boolean;
-        /**
-         * Whether to automatically queue animation if another is occurring
-         */
-        queue?: boolean;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on each transition that changes visibility to shown
-         */
-        onShow?(this: JQuery): void;
-        /**
-         * Callback on each transition that changes visibility to hidden
-         */
-        onHide?(this: JQuery): void;
-        /**
-         * Callback on animation start, useful for queued animations
-         */
-        onStart?(this: JQuery): void;
-        /**
-         * Callback on each transition complete
-         */
-        onComplete?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'animating'
-             */
-            animating?: string;
-            /**
-             * @default 'disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'hidden'
-             */
-            hidden?: string;
-            /**
-             * @default 'in'
-             */
-            inward?: string;
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'looping'
-             */
-            looping?: string;
-            /**
-             * @default 'out'
-             */
-            outward?: string;
-            /**
-             * @default 'transition'
-             */
-            transition?: string;
-            /**
-             * @default 'visible'
-             */
-            visible?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'There is no CSS animation matching the one you specified.'
-             */
-            noAnimation?: string;
-            /**
-             * @default 'The method you called is not defined'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // endregion
-
-    // region Behaviors
-
-    // region API
-
-    /**
-     * @see {@link http://semantic-ui.com/behaviors/api.html#/settings}
-     */
-    interface ApiSettings extends ComponentSettings {
-        // region Behavior
-
-        /**
-         * When API event should occur
-         *
-         * @default 'auto'
-         */
-        on?: string;
-        /**
-         * Can be set to 'local' to cache successful returned AJAX responses when using a JSON API.
-         * This helps avoid server round trips when API endpoints will return the same results when accessed repeatedly.
-         * Setting to false, will add cache busting parameters to the URL.
-         *
-         * @default true
-         */
-        cache?: 'local' | boolean;
-        /**
-         * UI state will be applied to this element, defaults to triggering element.
-         */
-        stateContext?: Selector;
-        /**
-         * Whether to encode parameters with encodeURIComponent before adding into url string
-         *
-         * @default true
-         */
-        encodeParameters?: boolean;
-        /**
-         * Whether to automatically include default data like {value} and {text}
-         *
-         * @default true
-         */
-        defaultData?: boolean;
-        /**
-         * Whether to serialize closest form and include in request
-         *
-         * @default false
-         */
-        serializeForm?: boolean;
-        /**
-         * How long to wait when a request is made before triggering request, useful for rate limiting oninput
-         *
-         * @default 0
-         */
-        throttle?: number;
-        /**
-         * When set to false will not delay the first request made, when no others are queued
-         *
-         * @default true
-         */
-        throttleFirstRequest?: boolean;
-        /**
-         * Whether an API request can occur while another request is still pending
-         *
-         * @default false
-         */
-        interruptRequests?: boolean;
-        /**
-         * Minimum duration to show loading indication
-         *
-         * @default 0
-         */
-        loadingDuration?: number;
-        /**
-         * The default auto will automatically remove error state after error duration, unless the element is a form
-         *
-         * @default 'auto'
-         */
-        hideError?: 'auto' | boolean;
-        /**
-         * Setting to true, will not remove error.
-         * Setting to a duration in milliseconds to show error state after request error.
-         *
-         * @default 2000
-         */
-        errorDuration?: true | number;
-
-        // endregion
-
-        // region Request Settings
-
-        /**
-         * Named API action for query, originally specified in $.fn.settings.api
-         */
-        action?: string | false;
-        /**
-         * Templated URL for query, will override specified action
-         */
-        url?: string | false;
-        /**
-         * Variables to use for replacement
-         */
-        urlData?: any | false;
-        /**
-         * Can be set to a Javascript object which will be returned automatically instead of requesting JSON from server
-         */
-        response?: any | false;
-        /**
-         * When specified, this function can be used to retrieve content from a server and return it asynchronously instead of a standard AJAX call.
-         * The callback function should return the server response.
-         *
-         * @default false
-         */
-        responseAsync?: ((settings: ApiSettings, callback: (response: any) => void) => void) | false;
-        /**
-         * @see response
-         */
-        mockResponse?: any | false;
-        /**
-         * @see responseAsync
-         */
-        mockResponseAsync?: ((settings: ApiSettings, callback: (response: any) => void) => void) | false;
-        /**
-         * Method for transmitting request to server
-         */
-        method?: 'post' | 'get';
-        /**
-         * Expected data type of response
-         */
-        dataType?: 'xml' | 'json' | 'jsonp' | 'script' | 'html' | 'text';
-        /**
-         * POST/GET Data to Send with Request
-         */
-        data?: any;
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Allows modifying settings before request, or cancelling request
-         */
-        beforeSend?(settings: ApiSettings): any;
-        /**
-         * Allows modifying XHR object for request
-         */
-        beforeXHR?(xhrObject: JQueryXHR): any;
-        /**
-         * Callback that occurs when request is made. Receives both the API success promise and the XHR request promise.
-         */
-        onRequest?(promise: JQueryDeferred<any>, xhr: JQueryXHR): void;
-        /**
-         * Allows modifying the server's response before parsed by other callbacks to determine API event success
-         */
-        onResponse?(response: any): void;
-        /**
-         * Determines whether completed JSON response should be treated as successful
-         *
-         * @see {@link http://semantic-ui.com/behaviors/api.html#determining-json-success}
-         */
-        successTest?(response: any): boolean;
-        /**
-         * Callback after successful response, JSON response must pass successTest
-         */
-        onSuccess?(response: any, element: JQuery, xhr: JQueryXHR): void;
-        /**
-         * Callback on request complete regardless of conditions
-         */
-        onComplete?(response: any, element: JQuery, xhr: JQueryXHR): void;
-        /**
-         * Callback on failed response, or JSON response that fails successTest
-         */
-        onFailure?(response: any, element: JQuery): void;
-        /**
-         * Callback on server error from returned status code, or XHR failure.
-         */
-        onError?(errorMessage: string, element: JQuery, xhr: JQueryXHR): void;
-        /**
-         * Callback on abort caused by user clicking a link or manually cancelling request.
-         */
-        onAbort?(errorMessage: string, element: JQuery, xhr: JQueryXHR): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Regular expressions used for template matching
-         */
-        regExp?: {
-            /**
-             * @default /\{\$*[A-z0-9]+\}/g
-             */
-            required?: RegExp;
-            /**
-             * @default /\{\/\$*[A-z0-9]+\}/g
-             */
-            optional?: RegExp;
-        };
-        /**
-         * Selectors used to find parts of a module
-         */
-        selector?: {
-            /**
-             * @default '.disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'form'
-             */
-            form?: string;
-        };
-        /**
-         * Class names used to determine element state
-         */
-        className?: {
-            /**
-             * @default 'loading'
-             */
-            loading?: string;
-            /**
-             * @default 'error'
-             */
-            error?: string;
-        };
-        /**
-         * Metadata used to store XHR and response promise
-         */
-        metadata?: {
-            /**
-             * @default 'action'
-             */
-            action?: string;
-            /**
-             * @default 'url'
-             */
-            url?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The before send function has aborted the request'
-             */
-            beforeSend?: string;
-            /**
-             * @default 'There was an error with your request'
-             */
-            error?: string;
-            /**
-             * @default 'API Request Aborted. Exit conditions met'
-             */
-            exitConditions?: string;
-            /**
-             * @default 'JSON could not be parsed during error handling'
-             */
-            JSONParse?: string;
-            /**
-             * @default 'You are using legacy API success callback names'
-             */
-            legacyParameters?: string;
-            /**
-             * @default 'API action used but no url was defined'
-             */
-            missingAction?: string;
-            /**
-             * @default 'Required dependency jquery-serialize-object missing, using basic serialize'
-             */
-            missingSerialize?: string;
-            /**
-             * @default 'No URL specified for API event'
-             */
-            missingURL?: string;
-            /**
-             * @default 'The beforeSend callback must return a settings object, beforeSend ignored.'
-             */
-            noReturnedValue?: string;
-            /**
-             * @default 'There was an error parsing your request'
-             */
-            parseError?: string;
-            /**
-             * @default 'Missing a required URL parameter: '
-             */
-            requiredParameter?: string;
-            /**
-             * @default 'Server gave an error: '
-             */
-            statusMessage?: string;
-            /**
-             * @default 'Your request timed out'
-             */
-            timeout?: string;
-        };
-
-        // endregion
-    }
-
-    // endregion
-
-    // region Form Validation
-
-    /**
-     * @see {@link http://semantic-ui.com/behaviors/form.html#/settings}
-     */
-    interface FormSettings extends ComponentSettings {
-        // region Form Settings
-
-        /**
-         * Adds keyboard shortcuts for enter and escape keys to submit form and blur fields respectively
-         *
-         * @default true
-         */
-        keyboardShortcuts?: boolean;
-        /**
-         * Event used to trigger validation. Can be either submit, blur or change.
-         *
-         * @default 'submit'
-         */
-        on?: 'submit' | 'blur' | 'change';
-        /**
-         * If set to true will revalidate fields with errors on input change
-         *
-         * @default true
-         */
-        revalidate?: boolean;
-        /**
-         * Delay from last typed letter to validate a field when using on: change or when revalidating a field.
-         *
-         * @default true
-         */
-        delay?: boolean;
-        /**
-         * Adds inline error on field validation error
-         *
-         * @default false
-         */
-        inline?: boolean;
-        /**
-         * Named transition to use when animating validation errors. Fade and slide down are available without including ui transitions
-         *
-         * @default 'scale'
-         * @see {@link http://semantic-ui.com/modules/transition.html}
-         */
-        transition?: string;
-        /**
-         * Animation speed for inline prompt
-         *
-         * @default 150
-         */
-        duration?: number;
-        fields?: {
-            [name: string]: string | string[] | Field;
-        };
-
-        // endregion
-
-        // region Form Prompts
-
-        text?: {
-            /**
-             * @default 'Please enter a valid value'
-             */
-            unspecifiedRule?: string;
-            /**
-             * @default 'This field'
-             */
-            unspecifiedField?: string;
-        };
-        prompt?: {
-            /**
-             * @default '{name} must have a value'
-             */
-            empty?: string;
-            /**
-             * @default '{name} must be checked'
-             */
-            checked?: string;
-            /**
-             * @default '{name} must be a valid e-mail'
-             */
-            email?: string;
-            /**
-             * @default '{name} must be a valid url'
-             */
-            url?: string;
-            /**
-             * @default '{name} is not formatted correctly'
-             */
-            regExp?: string;
-            /**
-             * @default '{name} must be an integer'
-             */
-            integer?: string;
-            /**
-             * @default '{name} must be a decimal number'
-             */
-            decimal?: string;
-            /**
-             * @default '{name} must be set to a number'
-             */
-            number?: string;
-            /**
-             * @default '{name} must be \'{ruleValue}\''
-             */
-            is?: string;
-            /**
-             * @default '{name} must be exactly \'{ruleValue}\''
-             */
-            isExactly?: string;
-            /**
-             * @default '{name} cannot be set to \'{ruleValue}\''
-             */
-            not?: string;
-            /**
-             * @default '{name} cannot be set to exactly \'{ruleValue}\''
-             */
-            notExactly?: string;
-            /**
-             * @default '{name} cannot contain \'{ruleValue}\''
-             */
-            contain?: string;
-            /**
-             * @default '{name} cannot contain exactly \'{ruleValue}\''
-             */
-            containExactly?: string;
-            /**
-             * @default '{name} must contain  \'{ruleValue}\''
-             */
-            doesntContain?: string;
-            /**
-             * @default '{name} must contain exactly \'{ruleValue}\''
-             */
-            doesntContainExactly?: string;
-            /**
-             * @default '{name} must be at least {ruleValue} characters'
-             */
-            minLength?: string;
-            /**
-             * @default '{name} must be at least {ruleValue} characters'
-             */
-            length?: string;
-            /**
-             * @default '{name} must be exactly {ruleValue} characters'
-             */
-            exactLength?: string;
-            /**
-             * @default '{name} cannot be longer than {ruleValue} characters'
-             */
-            maxLength?: string;
-            /**
-             * @default '{name} must match {ruleValue} field'
-             */
-            match?: string;
-            /**
-             * @default '{name} must have a different value than {ruleValue} field'
-             */
-            different?: string;
-            /**
-             * @default '{name} must be a valid credit card number'
-             */
-            creditCard?: string;
-            /**
-             * @default '{name} must have at least {ruleValue} choices'
-             */
-            minCount?: string;
-            /**
-             * @default '{name} must have exactly {ruleValue} choices'
-             */
-            exactCount?: string;
-            /**
-             * @default '{name} must have {ruleValue} or less choices'
-             */
-            maxCount?: string;
-        };
-
-        // endregion
-
-        // region Callbacks
-
-        /**
-         * Callback on each valid field
-         */
-        onValid?(this: JQuery): void;
-        /**
-         * Callback on each invalid field
-         */
-        onInvalid?(this: JQuery): void;
-        /**
-         * Callback if a form is all valid
-         */
-        onSuccess?(this: JQuery, event: JQueryEventObject, fields: any): void;
-        /**
-         * Callback if any form field is invalid
-         */
-        onFailure?(this: JQuery, formErrors: string[], fields: any): void;
-
-        // endregion
-
-        // region Templates
-
-        templates?: {
-            error?: (errors: string[]) => JQuery;
-            prompt?: (errors: string[]) => JQuery;
-        };
-
-        // endregion
-
-        // region Rules
-
-        rules?: {
-            [name: string]: (...args: any[]) => boolean;
-        };
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Selectors used to match functionality to DOM
-         */
-        selector?: {
-            /**
-             * @default '.error.message'
-             */
-            message?: string;
-            /**
-             * @default 'input, textarea, select'
-             */
-            field?: string;
-            /**
-             * @default '.field'
-             */
-            group?: string;
-            /**
-             * @default 'input'
-             */
-            input?: string;
-            /**
-             * @default '.prompt'
-             */
-            prompt?: string;
-            /**
-             * @default '.submit'
-             */
-            submit?: string;
-        };
-        /**
-         * HTML5 metadata attributes
-         */
-        metadata?: {
-            /**
-             * @default 'validate'
-             */
-            validate?: string;
-        };
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'active'
-             */
-            active?: string;
-            /**
-             * @default 'default'
-             */
-            placeholder?: string;
-            /**
-             * @default 'disabled'
-             */
-            disabled?: string;
-            /**
-             * @default 'visible'
-             */
-            visible?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    interface Field {
-        identifier: string;
-        rules: Rule[];
-    }
-
-    interface Rule {
-        type: string;
-        prompt: string;
-    }
-
-    // endregion
-
-    // region Visibility
-
-    /**
-     * @see {@link http://semantic-ui.com/behaviors/visibility.html#/settings}
-     */
-    interface VisibilitySettings extends ComponentSettings {
-        // region Functionality
-
-        /**
-         * When set to false a callback will occur each time an element passes the threshold for a condition.
-         *
-         * @default true
-         */
-        once?: boolean;
-        /**
-         * When set to true a callback will occur anytime an element passes a condition not just immediately after the threshold is met.
-         *
-         * @default false
-         */
-        continuous?: boolean;
-        /**
-         * Set to image to load images when on screen. Set to fixed to add class name fixed when passed.
-         *
-         * @default false
-         */
-        type?: false | 'image' | 'fixed';
-        /**
-         * Whether visibility conditions should be checked immediately on init
-         *
-         * @default true
-         */
-        initialCheck?: boolean;
-        /**
-         * The scroll context visibility should use.
-         *
-         * @default 'window'
-         */
-        context?: Selector;
-        /**
-         * Whether visibility conditions should be checked on window load. This ensures that after images load content positions will be updated correctly.
-         *
-         * @default true
-         */
-        refreshOnLoad?: boolean;
-        /**
-         * Whether visibility conditions should be checked on window resize. Useful when content resizes causes continuous changes in position
-         *
-         * @default true
-         */
-        refreshOnResize?: boolean;
-        /**
-         * Whether visibility conditions should be checked on calls to refresh.
-         * These calls can be triggered from either resize, load or manually calling $('.foo').visibility('refresh')
-         *
-         * @default true
-         */
-        checkOnRefresh?: boolean;
-        /**
-         * Specify a z-index when using type: 'fixed'.
-         *
-         * @default 1
-         * @since 2.2
-         */
-        zIndex?: number;
-        /**
-         * Value that context scrollTop should be adjusted in pixels. Useful for making content appear below content fixed to the page.
-         *
-         * @default 0
-         */
-        offset?: number;
-        /**
-         * Whether element calculations should include its margin
-         *
-         * @default false
-         */
-        includeMargin?: boolean;
-        /**
-         * When set to an integer, scroll position will be debounced using this ms value. false will debounce with requestAnimationFrame.
-         *
-         * @default false
-         */
-        throttle?: false | number;
-        /**
-         * Whether to automatically refresh content when changes are made to the element's DOM subtree
-         *
-         * @default true
-         */
-        observeChanges?: boolean;
-        /**
-         * When using type: image allows you to specify transition when showing a loaded image
-         *
-         * @default false
-         */
-        transition?: false | string;
-        /**
-         * When using type: image allows you to specify transition duration
-         *
-         * @default 1000
-         */
-        duration?: number;
-
-        // endregion
-
-        // region Visibility Callbacks
-
-        /**
-         * Element's top edge has passed bottom of screen
-         */
-        onTopVisible?(this: JQuery): void;
-        /**
-         * Element's top edge has passed top of the screen
-         */
-        onTopPassed?(this: JQuery): void;
-        /**
-         * Element's bottom edge has passed bottom of screen
-         */
-        onBottomVisible?(this: JQuery): void;
-        /**
-         * Any part of an element is visible on screen
-         */
-        onPassing?(this: JQuery): void;
-        /**
-         * Element's bottom edge has passed top of screen
-         */
-        onBottomPassed?(this: JQuery): void;
-        /**
-         * Element's top edge has not passed bottom of screen
-         */
-        onTopVisibleReverse?(this: JQuery): void;
-        /**
-         * Element's top edge has not passed top of the screen
-         */
-        onTopPassedReverse?(this: JQuery): void;
-        /**
-         * Element's bottom edge has not passed bottom of screen
-         */
-        onBottomVisibleReverse?(this: JQuery): void;
-        /**
-         * Element's top has not passed top of screen but bottom has
-         */
-        onPassingReverse?(this: JQuery): void;
-        /**
-         * Element's bottom edge has not passed top of screen
-         */
-        onBottomPassedReverse?: (this: JQuery) => void;
-        onOnScreen?: (this: JQuery) => void;
-        onOffScreen?: (this: JQuery) => void;
-
-        // endregion
-
-        // region Image Callbacks
-
-        /**
-         * Occurs after an image has completed loading
-         *
-         * @since 2.2
-         */
-        onLoad?(this: JQuery): void;
-        /**
-         * Occurs after all img initialized at the same time have loaded.
-         *
-         * @since 2.2
-         */
-        onAllLoaded?(this: JQuery): void;
-
-        // endregion
-
-        // region Fixed Callbacks
-
-        /**
-         * Occurs after element has been assigned position fixed
-         *
-         * @since 2.2
-         */
-        onFixed?(this: JQuery): void;
-        /**
-         * Occurs after element has been removed from fixed position
-         *
-         * @since 2.2
-         */
-        onUnfixed?(this: JQuery): void;
-
-        // endregion
-
-        // region Utility Callbacks
-
-        /**
-         * Occurs each time an elements calculations are updated
-         */
-        onUpdate?(this: JQuery, calculations: ElementCalculations): void;
-        /**
-         * Occurs whenever element's visibility is refreshed
-         */
-        onRefresh?(this: JQuery): void;
-
-        // endregion
-
-        // region DOM Settings
-
-        /**
-         * Class names used to attach style to state
-         */
-        className?: {
-            /**
-             * @default 'fixed'
-             */
-            fixed?: string;
-        };
-
-        // endregion
-
-        // region Debug Settings
-
-        error?: {
-            /**
-             * @default 'The method you called is not defined.'
-             */
-            method?: string;
-        };
-
-        // endregion
-    }
-
-    interface ElementPosition {
-        fits: boolean;
-        offset: JQueryCoordinates;
-        width: number;
-        height: number;
-    }
-
-    interface ElementCalculations extends ElementPosition {
-        margin?: {
-            top: number;
-            bottom: number;
-        };
-        top: number;
-        bottom: number;
-
-        topVisible: boolean;
-        topPassed: boolean;
-        bottomVisible: boolean;
-        bottomPassed: boolean;
-        pixelsPassed: number;
-        percentagePassed: number;
-
-        onScreen: boolean;
-        passing: boolean;
-        offScreen: boolean;
-    }
-
-    interface ScreenCalculations {
-        top: number;
-        bottom: number;
-    }
-
-    interface ScreenSize {
-        height: number;
-    }
-
-    // endregion
-
-    // endregion
-}
+/// <reference types="semantic-ui-site" />
+
+/// <reference types="semantic-ui-accordion" />
+/// <reference types="semantic-ui-checkbox" />
+/// <reference types="semantic-ui-dimmer" />
+/// <reference types="semantic-ui-dropdown" />
+/// <reference types="semantic-ui-embed" />
+/// <reference types="semantic-ui-modal" />
+/// <reference types="semantic-ui-nag" />
+/// <reference types="semantic-ui-popup" />
+/// <reference types="semantic-ui-progress" />
+/// <reference types="semantic-ui-rating" />
+/// <reference types="semantic-ui-search" />
+/// <reference types="semantic-ui-shape" />
+/// <reference types="semantic-ui-sidebar" />
+/// <reference types="semantic-ui-sticky" />
+/// <reference types="semantic-ui-tab" />
+/// <reference types="semantic-ui-transition" />
+
+/// <reference types="semantic-ui-api" />
+/// <reference types="semantic-ui-form" />
+/// <reference types="semantic-ui-visibility" />
diff --git a/types/semantic-ui/semantic-ui-tests.ts b/types/semantic-ui/semantic-ui-tests.ts
index ad71c0fe92..843604940d 100644
--- a/types/semantic-ui/semantic-ui-tests.ts
+++ b/types/semantic-ui/semantic-ui-tests.ts
@@ -1,231 +1,51 @@
-function test_accordion() {
-    const selector = '.ui.accordion';
-    $(selector).accordion('refresh');
-    $(selector).accordion('open', 0);
-    $(selector).accordion('close others');
-    $(selector).accordion('close', 0);
-    $(selector).accordion('toggle', 0);
-    $(selector).accordion({
-        selector: {
-            trigger: '.title .icon'
-        }
-    });
-    $(selector).accordion();
+function test_static() {
+    $.site.settings.debug = true;
+    $.fn.site.settings.debug = true;
+
+    $.fn.accordion.settings.debug = true;
+    $.fn.checkbox.settings.debug = true;
+    $.fn.dimmer.settings.debug = true;
+    $.fn.dropdown.settings.debug = true;
+    $.fn.embed.settings.debug = true;
+    $.fn.modal.settings.debug = true;
+    $.fn.nag.settings.debug = true;
+    $.fn.popup.settings.debug = true;
+    $.fn.progress.settings.debug = true;
+    $.fn.rating.settings.debug = true;
+    $.fn.search.settings.debug = true;
+    $.fn.shape.settings.debug = true;
+    $.fn.sidebar.settings.debug = true;
+    $.fn.sticky.settings.debug = true;
+    $.fn.tab.settings.debug = true;
+    $.fn.transition.settings.debug = true;
+
+    $.api.settings.debug = true;
+    $.fn.api.settings.debug = true;
+    $.fn.form.settings.debug = true;
+    $.fn.visibility.settings.debug = true;
 }
 
-function test_checkbox() {
-    const selector = '.ui.checkbox';
-    $(selector).checkbox({});
-    $(selector).checkbox();
+function test() {
+    $('.ui.site').site() === $();
+
+    $('.ui.accordion').accordion() === $();
+    $('.ui.checkbox').checkbox() === $();
+    $('.ui.dimmer').dimmer() === $();
+    $('.ui.dropdown').dropdown() === $();
+    $('.ui.embed').embed() === $();
+    $('.ui.modal').modal() === $();
+    $('.ui.nag').nag() === $();
+    $('.ui.popup').popup() === $();
+    $('.ui.progress').progress() === $();
+    $('.ui.rating').rating() === $();
+    $('.ui.search').search() === $();
+    $('.ui.shape').shape() === $();
+    $('.ui.sidebar').sidebar() === $();
+    $('.ui.sticky').sticky() === $();
+    $('.ui.tab').tab() === $();
+    $('.ui.transition').transition() === $();
+
+    $('.ui.api').api() === $();
+    $('.ui.form').form() === $();
+    $('.ui.visibility').visibility() === $();
 }
-
-function test_dimmer() {
-    const selector = '.ui.dimmer';
-    $(selector).dimmer({});
-    $(selector).dimmer();
-}
-
-function test_dropdown() {
-    const selector = '.ui.dropdown';
-    $(selector).dropdown({});
-    $(selector).dropdown();
-}
-
-function test_embed() {
-    const selector = '.ui.embed';
-    $(selector).embed({});
-    $(selector).embed();
-}
-
-function test_modal() {
-    const selector = '.ui.modal';
-    $(selector).modal({});
-    $(selector).modal();
-}
-
-function test_nag() {
-    const selector = '.ui.nag';
-    $(selector).nag({});
-}
-
-function test_popup() {
-    const selector = '.ui.popup';
-    $(selector).popup({
-        html: '<div>Content</div>'
-    });
-    $(selector).popup({
-        html: $('<div>Content</div>')
-    });
-    $(selector).popup();
-}
-
-function test_progress() {
-    const selector = '.ui.progress';
-    $(selector).progress({});
-    $(selector).progress();
-}
-
-function test_rating() {
-    const selector = '.ui.rating';
-    $(selector).rating({});
-    $(selector).rating();
-}
-
-function test_search() {
-    const selector = '.ui.search';
-    $(selector).search({});
-    $(selector).search();
-}
-
-function test_shape() {
-    const selector = '.ui.shape';
-    $(selector).shape({});
-    $(selector).shape();
-}
-
-function test_sidebar() {
-    const selector = '.ui.sidebar';
-    $(selector).sidebar({});
-    $(selector).sidebar();
-}
-
-function test_sticky() {
-    const selector = '.ui.sticky';
-    $(selector).sticky({});
-    $(selector).sticky();
-}
-
-function test_tab() {
-    const selector = '.ui.tab';
-    $(selector).tab({});
-    $(selector).tab();
-}
-
-function test_transition() {
-    const selector = '.ui.transition';
-    $(selector).transition({});
-    $(selector).transition();
-}
-
-function test_api() {
-    const selector = '.ui.api';
-    $(selector).api({});
-    $(selector).api();
-}
-
-function test_form() {
-    const selector = '.ui.form';
-    $(selector).form({});
-    $(selector).form();
-}
-
-function test_form_specifyingValidationRules() {
-    $('.ui.form').form({
-        fields: {
-            name: 'empty',
-            gender: 'empty',
-            username: 'empty',
-            password: ['minLength[6]', 'empty'],
-            skills: ['minCount[2]', 'empty'],
-            terms: 'checked'
-        }
-    });
-
-    $('.ui.form').form({
-        fields: {
-            name: {
-                identifier: 'name',
-                rules: [{
-                    type: 'empty',
-                    prompt: 'Please enter your name'
-                }]
-            },
-            skills: {
-                identifier: 'skills',
-                rules: [{
-                    type: 'minCount[2]',
-                    prompt: 'Please select at least two skills'
-                }]
-            },
-            gender: {
-                identifier: 'gender',
-                rules: [{
-                    type: 'empty',
-                    prompt: 'Please select a gender'
-                }]
-            },
-            username: {
-                identifier: 'username',
-                rules: [{
-                    type: 'empty',
-                    prompt: 'Please enter a username'
-                }]
-            },
-            password: {
-                identifier: 'password',
-                rules: [{
-                    type: 'empty',
-                    prompt: 'Please enter a password'
-                }, {
-                    type: 'minLength[6]',
-                    prompt: 'Your password must be at least {ruleValue} characters'
-                }]
-            },
-            terms: {
-                identifier: 'terms',
-                rules: [{
-                    type: 'checked',
-                    prompt: 'You must agree to the terms and conditions'
-                }]
-            }
-        }
-    });
-}
-
-function test_form_addCustomRule() {
-    const user = { adminLevel: 1 };
-    $.fn.form.settings.rules.adminLevel = (value: any, adminLevel: number) => {
-        return (user.adminLevel >= adminLevel);
-    };
-    $('.ui.form').form({
-        fields: {
-            dog: {
-                identifier: 'dog',
-                rules: [{
-                    type: 'adminLevel[2]',
-                    prompt: 'You must be at least a level-2 admin to add a dog'
-                }]
-            }
-        }
-    });
-}
-
-function test_visibility() {
-    const selector = '.ui.visibility';
-    $(selector).visibility({});
-    $(selector).visibility();
-}
-
-function test_settings() {
-    $.fn.accordion.settings.verbose = true;
-    $.fn.checkbox.settings.verbose = true;
-    $.fn.dimmer.settings.verbose = true;
-    $.fn.dropdown.settings.verbose = true;
-    $.fn.embed.settings.verbose = true;
-    $.fn.modal.settings.verbose = true;
-    $.fn.nag.settings.verbose = true;
-    $.fn.popup.settings.verbose = true;
-    $.fn.progress.settings.verbose = true;
-    $.fn.rating.settings.verbose = true;
-    $.fn.search.settings.verbose = true;
-    $.fn.shape.settings.verbose = true;
-    $.fn.sidebar.settings.verbose = true;
-    $.fn.sticky.settings.verbose = true;
-    $.fn.tab.settings.verbose = true;
-    $.fn.transition.settings.verbose = true;
-
-    $.fn.api.settings.verbose = true;
-    $.fn.form.settings.verbose = true;
-    $.fn.visibility.settings.verbose = true;
-}
-test_settings();
diff --git a/types/semantic-ui/tslint.json b/types/semantic-ui/tslint.json
index 3ea8f1c1f1..946997cb87 100644
--- a/types/semantic-ui/tslint.json
+++ b/types/semantic-ui/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "unified-signatures": false,
-        "prefer-method-signature": false
+        "no-useless-files": false
     }
 }
diff --git a/types/send/send-tests.ts b/types/send/send-tests.ts
index 22e3e171f2..da41697e96 100644
--- a/types/send/send-tests.ts
+++ b/types/send/send-tests.ts
@@ -5,7 +5,6 @@ import * as send from 'send';
 
 var app = express();
 
-send.mime.default_type = 'text/plain';
 send.mime.define({
   'application/x-my-type': ['x-mt', 'x-mtt']
 });
@@ -34,4 +33,4 @@ app.get('/test.html', (req, res) => {
             res.setHeader('Content-Disposition', 'attachment');
         })
         .pipe(res);
-});
\ No newline at end of file
+});
diff --git a/types/sequelize-fixtures/index.d.ts b/types/sequelize-fixtures/index.d.ts
index 6114ed84e2..5a54317668 100644
--- a/types/sequelize-fixtures/index.d.ts
+++ b/types/sequelize-fixtures/index.d.ts
@@ -2,9 +2,7 @@
 // Project: https://github.com/domasx2/sequelize-fixtures
 // Definitions by: Christian Schwarz <https://github.com/cschwarz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-/// <reference types="sequelize" />
+// TypeScript Version: 2.3
 
 import * as Sequelize from "sequelize";
 
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index c227e13d55..86ecb00809 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -2,12 +2,10 @@
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>, Ivan Drinchev <https://github.com/drinchev>, Brendan Abolivier <https://github.com/babolivier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
-/// <reference types="lodash" />
-/// <reference types="bluebird" />
 /// <reference types="validator" />
 
 
@@ -811,7 +809,7 @@ declare namespace sequelize {
          */
         (
             newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-            options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+            options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -860,7 +858,7 @@ declare namespace sequelize {
          */
         (
             newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-            options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+            options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -909,7 +907,7 @@ declare namespace sequelize {
          */
         (
             newAssociation?: TInstance | TInstancePrimaryKey,
-            options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+            options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -952,7 +950,7 @@ declare namespace sequelize {
          */
         (
             values?: TAttributes,
-            options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | TJoinTableAttributes
+            options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | { through: TJoinTableAttributes }
         ): Promise<TInstance>;
     }
 
@@ -3165,13 +3163,14 @@ declare namespace sequelize {
          * Load further nested related models
          */
         include?: Array<Model<any, any> | IncludeOptions>;
-        
+
         /**
          * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
          * be returned. Only applies if `options.paranoid` is true for the model.
          */
         paranoid?: boolean;
 
+        all?: boolean | string;
     }
 
     /**
@@ -3244,13 +3243,13 @@ declare namespace sequelize {
         raw?: boolean;
 
         /**
-             * having ?!?
+         * having ?!?
          */
         having?: WhereOptions;
 
         /**
-             * Group by. It is not mentioned in sequelize's JSDoc, but mentioned in docs.
-             * https://github.com/sequelize/sequelize/blob/master/docs/docs/models-usage.md#user-content-manipulating-the-dataset-with-limit-offset-order-and-group
+         * Group by. It is not mentioned in sequelize's JSDoc, but mentioned in docs.
+         * https://github.com/sequelize/sequelize/blob/master/docs/docs/models-usage.md#user-content-manipulating-the-dataset-with-limit-offset-order-and-group
          */
         group?: string | string[] | Object;
 
@@ -3259,6 +3258,11 @@ declare namespace sequelize {
          * Apply DISTINCT(col) for FindAndCount(all)
          */
         distinct?: boolean;
+
+        /**
+         * Prevents a subquery on the main table when using include
+         */
+        subQuery?: boolean;
     }
 
     /**
@@ -3976,6 +3980,41 @@ declare namespace sequelize {
 
     }
 
+    interface AddUniqueConstraintOptions {
+        type: 'unique';
+        name?: string;
+    }
+
+    interface AddDefaultConstraintOptions {
+        type: 'default';
+        name?: string;
+        defaultValue?: any;
+    }
+
+    interface AddCheckConstraintOptions {
+        type: 'check';
+        name?: string;
+        where?: WhereOptions;
+    }
+
+    interface AddPrimaryKeyConstraintOptions {
+        type: 'primary key';
+        name?: string;
+    }
+
+    interface AddForeignKeyConstraintOptions {
+        type: 'foreign key';
+        name?: string;
+        references?: {
+            table: string;
+            field: string;
+        };
+        onDelete: string;
+        onUpdate: string;
+    }
+
+    type AddConstraintOptions = AddUniqueConstraintOptions | AddDefaultConstraintOptions | AddCheckConstraintOptions | AddPrimaryKeyConstraintOptions | AddForeignKeyConstraintOptions;
+
     /**
      * The interface that Sequelize uses to talk to all databases.
      *
@@ -4127,6 +4166,16 @@ declare namespace sequelize {
         removeIndex(tableName: string, indexNameOrAttributes: string[] | string,
             options?: QueryInterfaceOptions): Promise<void>;
 
+        /**
+         * Adds constraints to a table
+         */
+        addConstraint(tableName: string, attributes: string[], options?: AddConstraintOptions | QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Removes constraints from a table
+         */
+        removeConstraint(tableName: string, constraintName: string, options?: QueryInterfaceOptions): Promise<void>;
+
         /**
          * Inserts a new record
          */
@@ -5046,6 +5095,22 @@ declare namespace sequelize {
          */
         schema?: string;
 
+        /**
+         * Alters tables to fit models. Not recommended for production use. Deletes data in columns
+         * that were removed or had their type changed in the model.
+         */
+        alter?: boolean;
+
+        /**
+         * If hooks is true then beforeSync, afterSync, beforBulkSync, afterBulkSync hooks will be called
+         */
+        hooks?: boolean;
+
+        /**
+         * An optional parameter to specify the schema search_path (Postgres only)
+         */
+        searchPath?: string;
+
     }
 
     interface SetOptions { }
@@ -5747,7 +5812,7 @@ declare namespace sequelize {
         transaction(options: TransactionOptions,
             autoCallback: (t: Transaction) => PromiseLike<any>): Promise<any>;
         transaction(autoCallback: (t: Transaction) => PromiseLike<any>): Promise<any>;
-        transaction(): Promise<Transaction>;
+        transaction(options?: TransactionOptions): Promise<Transaction>;
 
         /**
          * Close all connections used by this sequelize instance, and free all references so the instance can be
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 7aef602a68..d786dfc4a2 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -270,19 +270,19 @@ warehouse.getBranches({ where: {} }).then((branches) => branches[0].rank);
 
 warehouse.setBranches();
 warehouse.setBranches([branch]);
-warehouse.setBranches([branch, 2], { validate: true, distance: 1 }).then(() => { });
+warehouse.setBranches([branch, 2], { validate: true, through: { distance: 1 } }).then(() => { });
 
 warehouse.addBranches();
 warehouse.addBranches([branch]);
-warehouse.addBranches([branch, 2], { validate: false, distance: 1 }).then(() => { });
+warehouse.addBranches([branch, 2], { validate: false, through: { distance: 1 } }).then(() => { });
 
 warehouse.addBranch();
 warehouse.addBranch(branch);
-warehouse.addBranch(2, { validate: true, distance: 1 }).then(() => { });
+warehouse.addBranch(2, { validate: true, through: { distance: 1 } }).then(() => { });
 
 warehouse.createBranch();
 warehouse.createBranch({ id: 1, address: 'baz' });
-warehouse.createBranch({ id: 1 }, { silent: true, distance: 1 }).then((branch) => { });
+warehouse.createBranch({ id: 1 }, { silent: true, through: { distance: 1 } }).then((branch) => { });
 
 warehouse.removeBranches();
 warehouse.removeBranches([branch]);
@@ -913,6 +913,8 @@ User.findAll( { attributes: [[s.fn('count', Sequelize.col('*')), 'count']], grou
 User.findAll( { attributes: [s.cast(s.fn('count', Sequelize.col('*')), 'INTEGER')] });
 User.findAll( { attributes: [[s.cast(s.fn('count', Sequelize.col('*')), 'INTEGER'), 'count']] });
 User.findAll( { where : s.fn('count', [0, 10]) } );
+User.findAll( { subQuery: false, include : [User], order : [[User, User, 'numYears', 'c']] } );
+
 
 User.findById( 'a string' );
 
@@ -921,7 +923,6 @@ User.findOne( { where : { id : 1 }, attributes : ['id', ['username', 'name']] }
 User.findOne( { where : { id : 1 }, attributes : ['id'] } );
 User.findOne( { where : { username : 'foo' }, logging : function(  ) { } } );
 User.findOne( { limit : 10 } );
-User.findOne( { include : [1] } );
 User.findOne( { where : { title : 'homework' }, include : [User] } );
 User.findOne( { where : { name : 'environment' }, include : [{ model : User, as : 'PrivateDomain' }] } );
 User.findOne( { where : { username : 'foo' }, transaction : t } ).then( ( p ) => p );
@@ -1626,6 +1627,18 @@ s.transaction().then( function( t ) {
 
 } );
 
+s.transaction({
+    isolationLevel: s.Transaction.ISOLATION_LEVELS.READ_COMMITTED
+    }).then(function(t2) {
+        return User.find({
+                where: {
+                    username: 'jan'
+                },
+                lock: t2.LOCK.UPDATE,
+                transaction: t2
+            });
+    });
+
 s.transaction( function() {
     return Bluebird.resolve();
 } );
@@ -1657,3 +1670,14 @@ s.transaction((): Q.Promise<void> => {
         resolve(null);
     });
 });
+
+// sync options types
+s.sync({
+    alter: true,
+    force: true,
+    hooks: false,
+    searchPath: 'some/path/',
+    schema: 'schema',
+    logging: () => {},
+    match: new RegExp('\d{4,}')
+});
diff --git a/types/sequelize/v3/index.d.ts b/types/sequelize/v3/index.d.ts
index 59c06f05bf..3abf1b970f 100644
--- a/types/sequelize/v3/index.d.ts
+++ b/types/sequelize/v3/index.d.ts
@@ -1,17 +1,20 @@
-// Type definitions for Sequelize 3.4.1
+// Type definitions for Sequelize 3.30.4
 // Project: http://sequelizejs.com
-// Definitions by: samuelneff <https://github.com/samuelneff>, Peter Harris <https://github.com/codeanimal>, Ivan Drinchev <https://github.com/drinchev>
+// Definitions by: samuelneff <https://github.com/samuelneff>
+//                 Peter Harris <https://github.com/codeanimal>
+//                 Ivan Drinchev <https://github.com/drinchev>
+//                 Nick Mueller <https://github.com/morpheusxaut>
+//                 James D. Callahan III <https://github.com/torhal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
-/// <reference types="lodash" />
-/// <reference types="bluebird" />
 /// <reference types="validator" />
 
 
 import * as _ from "lodash";
+import * as Promise from "bluebird";
 
 declare namespace sequelize {
 
@@ -3053,7 +3056,8 @@ declare namespace sequelize {
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
     interface WhereOptions {
-        [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
+        [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | object | boolean | null;
+
     }
 
     /**
@@ -3130,6 +3134,7 @@ declare namespace sequelize {
          */
         include?: Array<Model<any, any> | IncludeOptions>;
 
+        all?: boolean | string;
     }
 
     /**
@@ -4755,7 +4760,7 @@ declare namespace sequelize {
          * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
          * should be sorted in), `collate` (the collation (sort order) for the column)
          */
-        fields?: Array<string | { attribute: string, length: number, order: string, collate: string }>;
+        fields?: Array<string | fn | { attribute: string, length: number, order: string, collate: string }>;
 
         /**
          * Condition for partioal index
@@ -5706,7 +5711,7 @@ declare namespace sequelize {
         transaction(options: TransactionOptions,
             autoCallback: (t: Transaction) => PromiseLike<any>): Promise<any>;
         transaction(autoCallback: (t: Transaction) => PromiseLike<any>): Promise<any>;
-        transaction(): Promise<Transaction>;
+        transaction(options?: TransactionOptions): Promise<Transaction>;
 
         /**
          * Close all connections used by this sequelize instance, and free all references so the instance can be
diff --git a/types/sequelize/v3/sequelize-tests.ts b/types/sequelize/v3/sequelize-tests.ts
index 3cce75b440..78a89ed2d4 100644
--- a/types/sequelize/v3/sequelize-tests.ts
+++ b/types/sequelize/v3/sequelize-tests.ts
@@ -904,7 +904,6 @@ User.findOne( { where : { id : 1 }, attributes : ['id', ['username', 'name']] }
 User.findOne( { where : { id : 1 }, attributes : ['id'] } );
 User.findOne( { where : { username : 'foo' }, logging : function(  ) { } } );
 User.findOne( { limit : 10 } );
-User.findOne( { include : [1] } );
 User.findOne( { where : { title : 'homework' }, include : [User] } );
 User.findOne( { where : { name : 'environment' }, include : [{ model : User, as : 'PrivateDomain' }] } );
 User.findOne( { where : { username : 'foo' }, transaction : t } ).then( ( p ) => p );
@@ -1545,6 +1544,40 @@ s.define( 'TriggerTest', {
     hasTrigger : true
 } );
 
+s.define('DefineOptionsIndexesTest', {
+    id: {
+        type: Sequelize.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        validate: {
+            min: 1
+        }
+    },
+    email: {
+        allowNull: false,
+        type: Sequelize.STRING(255),
+        set: function (val) {
+            if (typeof val === "string") {
+                val = val.toLowerCase();
+            } else {
+                throw new Error("email must be a string");
+            }
+            this.setDataValue("email", val);
+        }
+    }
+}, {
+        timestamps: false,
+        indexes: [
+            {
+                name: "DefineOptionsIndexesTest_lower_email",
+                unique: true,
+                fields: [
+                    Sequelize.fn("LOWER", Sequelize.col("email"))
+                ]
+            }
+        ]
+} );
+
 //
 //  Transaction
 // ~~~~~~~~~~~~~
@@ -1601,6 +1634,18 @@ s.transaction().then( function( t ) {
 
 } );
 
+
+s.transaction({
+    isolationLevel: s.Transaction.ISOLATION_LEVELS.READ_COMMITTED
+    }).then(function(t2) {
+        return User.find({
+                where: {
+                    username: 'jan'
+                },
+                lock: t2.LOCK.UPDATE,
+                transaction: t2
+            });
+    });
 s.transaction( function() {
     return Promise.resolve();
 } );
diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 3520e12f06..37d708ea4e 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for Microsoft SharePoint: 2013.1
 // Project: https://msdn.microsoft.com/en-us/library/office/jj193034.aspx
-// Definitions by: Stanislav Vyshchepan <http:// blog.gandjustas.ru>, Andrey Markeev <http:// markeev.com>
+// Definitions by: Stanislav Vyshchepan <http:// blog.gandjustas.ru>, Andrey Markeev <http:// markeev.com>, Vincent Biret <https://github.com/baywet>
 // Definitions: https:// github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="microsoft-ajax" />
 
@@ -153,23 +154,79 @@ declare class JSRequest {
 declare class _spPageContextInfo {
     static alertsEnabled: boolean; // true
     static allowSilverlightPrompt: string; // "True"
+    static blockDownloadsExperienceEnabled: boolean; // true
+    static canUserCreateMicrosoftForm: boolean; // true
+    static cdnPrefix: string; // "static.sharepointonline.com/bld"
     static clientServerTimeDelta: number; // -182
+    static CorrelationId: string; // "6161f99d-10e5-4000-ad30-1016270fe31d"
     static crossDomainPhotosEnabled: boolean; // true
     static currentCultureName: string; // "ru-RU"
     static currentLanguage: number; // 1049
     static currentUICultureName: string; // "ru-RU"
+    static disableAppViews: boolean; // true
+    static disableFlows: boolean; // true
+    static env: string; // "prod"
+    static farmLabel: string; // "US_4_Content"
+    static formDigestValue: string; // "0x5F3FE84E7EE9089C7D11DCDAFFB9E69CF8241E68B9EF071FA92CD419E878AC4F7C16E34696EFA667EFD0712FC1DF4945DDC0D09B5D23153A698A727AF076B5DE,07 Jun 2017 18:55:22 -0000"
+    static formDigestTimeoutSeconds: number; // 1800
+    static groupColor: string; // "#d40ac7"
+    static groupHasHomepage: boolean; // true
+    static groupId: string; //
+    static guestsEnabled: boolean; // true
+    static hasManageWebPermissions: boolean; // true
+    static isAnonymousGuestUser: boolean; // true
+    static isAppWeb: boolean; // true
+    static isExternalGuestUser: boolean; // true
+    static isNoScriptEnabled: boolean; // true
+    static isSiteAdmin: boolean; // true
+    static isSPO: boolean; // true
+    static isTenantDevSite: boolean; // true
+    static isWebWelcomePage: boolean; // true
     static layoutsUrl: string;  // "_layouts/15"
+    static listBaseTemplate: number; // 119
+    static listId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
+    static listPermsMask: { High: number; Low: number; };
+    static listTitle: string; // "Site Pages"
+    static listUrl: string; // "/sites/site/list"
+    static maximumFileSize: number; // 15360
+    static openInClient: boolean; // true
     static pageListId: string;  // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
     static pageItemId: number;
+    static pagePermsMask: { High: number; Low: number; };
     static pagePersonalizationScope: string; // 1
+    static PreviewFeaturesEnabled: boolean; // true
+    static preferUserTimeZone: boolean; // false
+    static ProfileUrl: string; // "https://tenant-my.sharepoint.com/person.aspx"
+    static PublishingFeatureOn: boolean; // true
+    static RecycleBinItemCount: number; // -1
+    static serverRedirectedUrl: string;
     static serverRequestPath: string; // "/SPTypeScript/Lists/ConditionalFormattingTasksList/AllItems.aspx"
+    static serverTime: string; // "2017-06-07T18:55:22.3499459Z"
     static siteAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com"
+    static siteClassification: string; //
     static siteClientTag: string; // "0$$15.0.4454.1021"
+    static siteColor: string; // "#d40ac7"
+    static siteId: string; // "{3e09a056-f68f-44a3-8e0f-ff2c123b82cb}"
+    static sitePagesEnabled: boolean; // true
     static siteServerRelativeUrl: string; // "/"
+    static siteSubscriptionId: string; // 4eedf5f3-f71f-4e73-82ee-e19081363c8c
+    static supportPoundStorePath: boolean; // true
+    static supportPercentStorePath: boolean; // true
     static systemUserKey: string; // "i:0h.f|membership|10033fff84e7cb2b@live.com"
     static tenantAppVersion: string; // "0"
+    static themeCacheToken: string; // "/sites/site::0:16.0.6525.1206"
+    static themedCssFolderUrl: string;
+    static themedImageFileNames: string;
+    static updateFormDigestPageLoaded: string; // "2017-06-07T18:55:25.821Z"
+    static userDisplayName: string; // "John Doe"
+    static userEmail: string; // "john.doe@fabrikam.onmicrosoft.com"
     static userId: number; // 12
+    static userLoginName: string; // "john.doe@fabrikam.onmicrosoft.com"
+    static viewOnlyExperienceEnabled: boolean; // true
+    static viewId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
     static webAbsoluteUrl: string; // "https:// gandjustas-7b20d3715e8ed4.sharepoint.com/SPTypeScript"
+    static webDescription: string; // "Some description"
+    static webId: string; // "{06ee6d96-f27f-4160-b6bb-c18f187b18a7}"
     static webLanguage: number; // 1049
     static webLogoUrl: string; // "/_layouts/15/images/siteIcon.png?rev=23"
     static webPermMasks: { High: number; Low: number; };
@@ -179,6 +236,13 @@ declare class _spPageContextInfo {
     static webUIVersion: number; // 15
 }
 
+declare class _spFriendlyUrlPageContextInfo {
+    static termId: string;
+    static termSetId: string;
+    static termStoreId: string;
+    static title: string;
+}
+
 declare function STSHtmlEncode(value: string): string;
 declare function STSHtmlDecode(value: string): string;
 
@@ -3538,7 +3602,7 @@ declare namespace SP {
         newMode
     }
     /** Represents a list on a SharePoint Web site. */
-    class List extends SP.SecurableObject {
+    class List<T = any> extends SP.SecurableObject {
         /** Gets item by id. */
         getItemById(id: number): SP.ListItem;
         /** Gets a value that specifies whether the list supports content types. */
@@ -3750,20 +3814,20 @@ declare namespace SP {
         /** Sends the list to the site recycle bin. */
         recycle(): SP.GuidResult;
         /** Returns collection of list items based on the specified CAML query. */
-        getItems(query: SP.CamlQuery): SP.ListItemCollection;
+        getItems(query: SP.CamlQuery): SP.ListItemCollection<T>;
         /** Creates a new list item in the list. */
         addItem(parameters: SP.ListItemCreationInformation): SP.ListItem;
     }
     /** Represents a collection of SP.List objects */
     class ListCollection extends SP.ClientObjectCollection<List> {
         /** Gets the list at the specified index in the collection. */
-        itemAt(index: number): SP.List;
+        itemAt<T = any>(index: number): SP.List<T>;
         /** Gets the list at the specified index in the collection. */
-        get_item(index: number): SP.List;
+        get_item<T = any>(index: number): SP.List<T>;
         /** Returns the list with the specified title from the collection. */
-        getByTitle(title: string): SP.List;
+        getByTitle<T = any>(title: string): SP.List<T>;
         /** Returns the list with the specified list identifier. */
-        getById(id: string | SP.Guid): SP.List;
+        getById<T = any>(id: string | SP.Guid): SP.List<T>;
         /** Creates a new list or a document library. */
         add(parameters: SP.ListCreationInformation): SP.List;
         /** Gets a list that is the default location for wiki pages. */
@@ -3830,12 +3894,12 @@ declare namespace SP {
         textField,
     }
     /** Represents an item or row in a list. */
-    class ListItem extends SP.SecurableObject {
-        get_fieldValues(): any;
+    class ListItem<T = any> extends SP.SecurableObject {
+        get_fieldValues(): T;
         /** Gets the specified field value for the list item. Field value is returned as string, but it can be casted to a specific field value type, e.g. SP.LookupFieldValue, etc. */
-        get_item(fieldInternalName: string): any;
+        get_item<K extends keyof T>(fieldInternalName: K): T[K];
         /** Sets the specified field value for the list item. Consider using parseAndSetFieldValue instead. */
-        set_item(fieldInternalName: string, value: any): void;
+        set_item<K extends keyof T>(fieldInternalName: K, value: T[K]): void;
         /** Gets collection of objects that represent attachments for the list item. */
         get_attachmentFiles(): SP.AttachmentCollection;
         /** Gets the content type of the item. */
@@ -3878,10 +3942,10 @@ declare namespace SP {
         /** Validates form values specified for the list item. Errors are returned through hasException and errorMessage properties of the ListItemFormUpdateValue objects */
         validateUpdateListItem(formValues: SP.ListItemFormUpdateValue[], bNewDocumentUpdate: boolean): SP.ListItemFormUpdateValue[];
     }
-    class ListItemCollection extends SP.ClientObjectCollection<ListItem> {
-        itemAt(index: number): SP.ListItem;
-        get_item(index: number): SP.ListItem;
-        getById(id: number | string): SP.ListItem;
+    class ListItemCollection<T = any> extends SP.ClientObjectCollection<ListItem<T>> {
+        itemAt(index: number): SP.ListItem<T>;
+        get_item(index: number): SP.ListItem<T>;
+        getById(id: number | string): SP.ListItem<T>;
         get_listItemCollectionPosition(): SP.ListItemCollectionPosition;
     }
     class ListItemCollectionPosition extends SP.ClientValueObject {
diff --git a/types/sharepoint/sharepoint-tests.ts b/types/sharepoint/sharepoint-tests.ts
index e6f885dcd4..56d01b0d0d 100644
--- a/types/sharepoint/sharepoint-tests.ts
+++ b/types/sharepoint/sharepoint-tests.ts
@@ -1,5 +1,5 @@
-///<reference types="knockout" />
-///<reference types="jquery" />
+/// <reference types="knockout" />
+/// <reference types="jquery" />
 
 import * as angular from 'angular';
 import * as ng from 'angular';
@@ -370,11 +370,16 @@ function deleteFolder(resultpanel: HTMLElement) {
     }
 }
 
+interface Announcements {
+    Title: string;
+    Body: string;
+}
+
 // List item tasks
 function readItems(resultpanel: HTMLElement) {
     const clientContext = SP.ClientContext.get_current();
     const oWebsite = clientContext.get_web();
-    const oList = oWebsite.get_lists().getByTitle("Announcements");
+    const oList = oWebsite.get_lists().getByTitle<Announcements>("Announcements");
     const camlQuery = new SP.CamlQuery();
     camlQuery.set_viewXml(
         '<View><Query><Where><Geq><FieldRef Name=\'ID\'/>' +
@@ -658,7 +663,11 @@ namespace CSR {
     }
 
     export function getFieldTemplate(field: SPClientTemplates.FieldSchema, mode: SPClientTemplates.ClientControlMode): SPClientTemplates.FieldCallback {
-        const ctx = { ListSchema: { Field: [field] }, FieldControlModes: {} };
+        const ctx = {
+            ListTemplateType: 1,
+            FieldControlModes: {},
+            ListSchema: { Field: [field] },
+        };
         ctx.FieldControlModes[field.Name] = mode;
         const templates = SPClientTemplates.TemplateManager.GetTemplates(ctx);
         return templates.Fields[field.Name];
@@ -2026,7 +2035,7 @@ namespace _ {
     function showTerms(event: JQueryEventObject, groupID: SP.Guid, termSetID: SP.Guid) {
         // First, cancel the bubble so that the group div click handler does not also fire
         // because that removes all term set divs and we don't want that here.
-        event.cancelBubble = true;
+        event.originalEvent.cancelBubble = true;
 
         // Get a reference to the term set div that was click and
         // remove its children (apart from the TextNode that is currently
@@ -2332,7 +2341,7 @@ namespace App {
         activate(): void;
     }
 
-    class appcontroller implements Iappcontroller {
+    class appcontroller implements Iappcontroller, ng.IController {
         title: string = "appcontroller";
         lists: SP.List[];
 
@@ -2350,9 +2359,12 @@ namespace App {
                 .catch((e: string) => this.$n.show(e, true))
                 .finally(() => this.$n.remove(loading));
         }
+
+        $onInit() {
+        }
     }
 
-    angular.module("app").controller("appcontroller", appcontroller);
+    angular.module("app").controller("appcontroller", [appcontroller]);
 }
 
 namespace App {
diff --git a/types/sharp-timer/index.d.ts b/types/sharp-timer/index.d.ts
new file mode 100644
index 0000000000..cf2f7cba3f
--- /dev/null
+++ b/types/sharp-timer/index.d.ts
@@ -0,0 +1,315 @@
+// Type definitions for sharp-timer library. 1.0
+// Project: https://github.com/afractal/SharpTimer
+// Definitions by: Hermes Gjini - afractal <https://github.com/afractal/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export const millisPerSecond: 1000;
+export const millisPerMinute: 60000;
+export const millisPerHour: 3600000;
+export const millisPerDay: 86400000;
+export type ElapsedEvent = () => void;
+export type ElapsingEvent = (intervalValue: number) => void;
+
+/**
+ * Simulates the actions of a generic timer,
+ * generates elapsing and elapsed events for a specified interval.
+ */
+export class Timer {
+    private _enabled: boolean;
+    private _stopped: boolean;
+    private _interval: number;
+    private _intervalElapsedEvents: ElapsedEvent[];
+    private _intervalElapsingEvents: ElapsingEvent[];
+
+    /**
+     * Initializes a new instance of the Timer class,
+     * and sets all the properties to their initial values.
+     * @param interval
+     * The time, in milliseconds, in which the timer will be active.
+     * The value must be greater than zero.
+     */
+    constructor(interval: number);
+
+    /**
+     * Gets a boolean value to indicate the enabled state
+     * of the current Timer instance.
+     * @readonly
+     * @default true
+     */
+    readonly enabled: boolean;
+
+    /**
+     * Gets a boolean value to indicate the stopped state
+     * of the current Timer instance.
+     * @readonly
+     * @default false
+     */
+    readonly stopped: boolean;
+
+    /**
+     * Gets or sets the remaining interval in milliseconds.
+     * The value must be greater than zero.
+     */
+    interval: number;
+
+    /**
+     * Starts raising the Timer events
+     * by setting the enabled property to true.
+     */
+    start(): void;
+
+    /**
+     * Pauses the Timer instance by setting the enabled property to false.
+     */
+    pause(): void;
+
+    /**
+     * Resumes the Timer instance by setting the enabled property to true.
+     */
+    resume(): void;
+
+    /**
+     * Stops raising the Timer event
+     * by setting the enabled property to false.
+     */
+    stop(): void;
+
+    /**
+     * Occurs when the interval has completely elapsed.
+     * @param intervalElapsedHandler
+     * The callback which will be executed when
+     * the interval elapsed event occurs.
+     */
+    onIntervalElapsed(intervalElapsedHandler: ElapsedEvent): void;
+
+    /**
+     * Occurs when the interval elapses and completely elapsed.
+     * @param intervalElapsingHandler
+     * The callback which will be executed when
+     * the interval elapsing event occurs.
+     */
+    onIntervalElapsing(intervalElapsingHandler: ElapsingEvent): void;
+
+    /**
+     * Returns a string represenation of the remaining
+     * in this format: minutes:seconds.
+     * examples: 20:23, 00:04, 59:59
+     */
+    toString(): string;
+
+    private getDoubleDigit(number: number): string;
+
+    private checkForValidInterval(interval: number): void;
+}
+
+/**
+ * Simulates the actions of a generic stopwatch.
+ */
+export class Stopwatch {
+    private _isRunning: boolean;
+    private _elapsedMilliseconds: number;
+    private _startedTimeInMillis: number;
+    private _intervalIds: Array<number | NodeJS.Timer>;
+
+    /**
+     * Initializes a new instance of the Stopwatch class.
+     */
+    constructor();
+
+    /**
+     * Gets the elapsed time in this format:
+     * hrs:mins:secs:ms
+     * @readonly
+     */
+    readonly elapsed: string;
+
+    /**
+     * Gets the elapsed time in milliseconds.
+     * @readonly
+     */
+    readonly elapsedMilliseconds: number;
+
+    /**
+     * Gets the elapsed time in seconds.
+     * @readonly
+     */
+    readonly elapsedSeconds: number;
+
+    /**
+     * Gets the elapsed time in minutes.
+     * @readonly
+     */
+    readonly elapsedMinutes: number;
+
+    /**
+     * Gets the elapsed hours in hours.
+     * @readonly
+     */
+    readonly elapsedHours: number;
+
+    /**
+     * Gets the isRunning state of the current Stopwatch instance.
+     * @readonly
+     * @default false
+     */
+    readonly isRunning: boolean;
+
+    /**
+     * Initializes a new Stopwatch instance and
+     * starts measuring elapsed time.
+     */
+    static startNew(): Stopwatch;
+
+    /**
+     * Starts, or resumes the Stopwatch
+     * from measuring elapsed time.
+     */
+    start(): void;
+
+    /**
+     * Stops the Stopwatch from measuring elapsed time.
+     */
+    stop(): void;
+
+    /**
+     * Stops the Stopwatch and resets the elapsed time to zero.
+     */
+    reset(): void;
+
+    /**
+     * Stops the Stopwatch,
+     * resets the elapsed time to zero
+     * and starts the Stopwatch for measuring elapsed time.
+     * It is a shortcut for writing
+     * reset then start.
+     */
+    restart(): void;
+
+    /**
+     * Stops the Stopwatch and cleans up the intervals.
+     */
+    dispose(): void;
+
+    private getDoubleDigit(num: number): string;
+}
+
+/**
+ * Simulates an object that represents a time interval.
+ */
+export class Timespan {
+    private _milliseconds: number;
+    private constructor(milliseconds: number);
+
+    /**
+     * Gets the time interval in milliseconds.
+     * @readonly
+     */
+    readonly milliseconds: number;
+
+    /**
+     * Gets the time interval in seconds.
+     * @readonly
+     */
+    readonly seconds: number;
+
+    /**
+     * Gets the time interval in minutes.
+     * @readonly
+     */
+    readonly minutes: number;
+
+    /**
+     * Gets the time interval in hours.
+     * @readonly
+     */
+    readonly hours: number;
+
+    /**
+     * Gets the time interval in days.
+     * @readonly
+     */
+    readonly days: number;
+
+    /**
+     * Returns a Timespan that represents a specified number of days.
+     * @param days The number of days.
+     */
+    static fromDays(days: number): Timespan;
+
+    /**
+     * Returns a Timespan that represents a specified number of hours.
+     * @param hours The number of hours.
+     */
+    static fromHours(hours: number): Timespan;
+
+    /**
+     * Returns a Timespan that represents a specified number of minutes.
+     * @param minutes The number of minutes.
+     */
+    static fromMinutes(minutes: number): Timespan;
+
+    /**
+     * Returns a Timespan that represents a specified number of seconds.
+     * @param seconds The number of seconds.
+     */
+    static fromSeconds(seconds: number): Timespan;
+
+    /**
+     * Returns a Timespan that represents a specified number of milliseconds.
+     * @param milliseconds The number of milliseconds.
+     */
+    static fromMilliseconds(milliseconds: number): Timespan;
+
+    /**
+     * Compares two Timespan objects and
+     * returns an integer that indicates whether
+     * the first value is shorter than, equal to,
+     * or longer than the second value.
+     * @param t1 The first Timespan to compare.
+     * @param t2 The second Timespan to compare.
+     */
+    static compare(t1: Timespan, t2: Timespan): 1 | 0 | -1;
+
+    /**
+     * Returns a boolean value that indicates
+     * whether two specified instances of Timespan are equal.
+     * @param t1 The first Timespan to compare.
+     * @param t2 The second Timespan to compare.
+     */
+    static equals(t1: Timespan, t2: Timespan): boolean;
+
+    /**
+     * Adds the specified Timespan to this instance.
+     * @param timespan The Timespan to add.
+     */
+    addMutable(timespan: Timespan): void;
+
+    /**
+     * Substracts the specified Timespan from this instance.
+     * @param timespan The Timespan to substract.
+     */
+    substractMutable(timespan: Timespan): void;
+
+    /**
+     * Returns a new Timespan object whose
+     * value is the sum of the specified Timespan object and this instance.
+     * @param timespan The Timespan to add.
+     */
+    add(timespan: Timespan): Timespan;
+
+    /**
+     * Returns a new Timespan object whose
+     * value is the difference between the
+     * specified Timespan object and this instance.
+     * @param timespan The Timespan to substract.
+     */
+    substract(timespan: Timespan): Timespan;
+
+    /**
+     * Returns a new Timespan object
+     * whose value is the negated value of this instance.
+     */
+    negate(): Timespan;
+}
diff --git a/types/sharp-timer/sharp-timer-tests.ts b/types/sharp-timer/sharp-timer-tests.ts
new file mode 100644
index 0000000000..db4d21b421
--- /dev/null
+++ b/types/sharp-timer/sharp-timer-tests.ts
@@ -0,0 +1,32 @@
+import { Timer, Stopwatch, Timespan, millisPerSecond } from 'sharp-timer';
+
+const millisecondsPerSecond = millisPerSecond;
+
+// timer test
+let timer = new Timer(10);
+timer.toString();
+timer.onIntervalElapsing(i => { });
+timer.onIntervalElapsed(() => {
+    timer.stop();
+});
+
+timer.start();
+
+// stopwatch test
+let stopwatch = Stopwatch.startNew();
+
+const intervalId = setInterval(() => { }, 10);
+
+setTimeout(() => {
+    clearInterval(intervalId);
+    stopwatch.dispose();
+}, 100);
+
+// timespan test
+const {
+    days,
+    hours,
+    minutes,
+    seconds,
+    milliseconds
+} = Timespan.fromDays(2);
diff --git a/types/sharp-timer/tsconfig.json b/types/sharp-timer/tsconfig.json
new file mode 100644
index 0000000000..ffaeaf9685
--- /dev/null
+++ b/types/sharp-timer/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "sharp-timer-tests.ts"
+  ]
+}
diff --git a/types/sharp-timer/tslint.json b/types/sharp-timer/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/sharp-timer/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/sharp-timer/v0/index.d.ts b/types/sharp-timer/v0/index.d.ts
new file mode 100644
index 0000000000..928a47eed7
--- /dev/null
+++ b/types/sharp-timer/v0/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for sharp-timer 0.3
+// Project: https://github.com/afractal/SharpTimer
+// Definitions by: Hermes Gjini - afractal <https://github.com/afractal/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type ElapsedEvent = () => void;
+export type ElapsingEvent = (intervalValue: number) => void;
+
+export class Timer {
+    private _enabled;
+    private _stopped;
+    private _interval;
+    private _intervalElapsedEvents;
+    private _intervalElapsingEvents;
+    constructor(interval: number);
+    readonly enabled: boolean;
+    readonly stopped: boolean;
+    interval: number;
+    start(): void;
+    pause(): void;
+    resume(): void;
+    stop(): void;
+    onIntervalElapsed(intervalElapsedHandler: ElapsedEvent): void;
+    onIntervalElapsing(intervalElapsingHandler: ElapsingEvent): void;
+    toString(): string;
+    private getDoubleDigit(number);
+    private checkForValidInterval(interval);
+}
+
+export class Stopwatch {
+    private _isRunning;
+    private _elapsedMilliseconds;
+    private _startedTimeInMillis;
+    private _intervalIds;
+    private static readonly millisPerSecond;
+    private static readonly millisPerMinute;
+    private static readonly millisPerHour;
+    constructor();
+    readonly elapsed: string;
+    readonly elapsedMilliseconds: number;
+    readonly elapsedSeconds: number;
+    readonly elapsedMinutes: number;
+    readonly elapsedHours: number;
+    readonly isRunning: boolean;
+    static startNew(): Stopwatch;
+    start(): void;
+    stop(): void;
+    reset(): void;
+    restart(): void;
+    dispose(): void;
+    private getDoubleDigit(num);
+}
diff --git a/types/sharp-timer/v0/sharp-timer-tests.ts b/types/sharp-timer/v0/sharp-timer-tests.ts
new file mode 100644
index 0000000000..5d8976e474
--- /dev/null
+++ b/types/sharp-timer/v0/sharp-timer-tests.ts
@@ -0,0 +1,10 @@
+import { Timer, Stopwatch } from 'sharp-timer';
+
+let timer = new Timer(10);
+
+timer.onIntervalElapsing(i => { });
+timer.onIntervalElapsed(() => {
+    timer.stop();
+});
+
+timer.start();
diff --git a/types/sharp-timer/v0/tsconfig.json b/types/sharp-timer/v0/tsconfig.json
new file mode 100644
index 0000000000..37520d93f4
--- /dev/null
+++ b/types/sharp-timer/v0/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../../",
+    "typeRoots": [
+      "../../"
+    ],
+    "paths": {
+      "sharp-timer": [
+        "sharp-timer/v0"
+      ]
+    },
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "sharp-timer-tests.ts"
+  ]
+}
diff --git a/types/sharp-timer/v0/tslint.json b/types/sharp-timer/v0/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/sharp-timer/v0/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 0776b80b81..36b9af1ef7 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="node" />
+/// <reference types="node" />
 
 import { Duplex } from "stream";
 
diff --git a/types/shelljs/index.d.ts b/types/shelljs/index.d.ts
index c8a7dbaec6..3586ca06d7 100644
--- a/types/shelljs/index.d.ts
+++ b/types/shelljs/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="node"/>
+/// <reference types="node"/>
 
 import child = require("child_process");
 
diff --git a/types/shopify-buy/index.d.ts b/types/shopify-buy/index.d.ts
index 9de8249804..d055cd671f 100644
--- a/types/shopify-buy/index.d.ts
+++ b/types/shopify-buy/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://shopify.github.io/js-buy-sdk/api/
 // Definitions by: Martin Köhn <https://github.com/openminder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * The JS Buy SDK is a lightweight library that allows you to build ecommerce into any website.
diff --git a/types/shopify-buy/shopify-buy-tests.ts b/types/shopify-buy/shopify-buy-tests.ts
index a993727c4f..aeacacd216 100644
--- a/types/shopify-buy/shopify-buy-tests.ts
+++ b/types/shopify-buy/shopify-buy-tests.ts
@@ -112,7 +112,7 @@ function bindEventListeners() {
     $('.cart').on('keyup', '.cart-item__quantity', debounce(fieldQuantityHandler, 250));
 
     /* cart tab click listener */
-    $('.btn--cart-tab').click(function() {
+    $('.btn--cart-tab').click(() => {
         setPreviousFocusItem(this);
         openCart();
     });
@@ -357,7 +357,7 @@ function renderCartItems() {
     var $cartLineItems = cart.lineItems.map(function (lineItem, index) {
         return renderCartItem(lineItem);
     });
-    $cartItemContainer.append($cartLineItems);
+    $cartItemContainer.append(...$cartLineItems);
 
     setTimeout(function () {
         $cartItemContainer.find('.js-hidden').removeClass('js-hidden');
diff --git a/types/signalr/index.d.ts b/types/signalr/index.d.ts
index e393ba4d8a..37c479fd9a 100644
--- a/types/signalr/index.d.ts
+++ b/types/signalr/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.asp.net/signalr
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, T. Michael Keesey <https://github.com/keesey/>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/signalr/signalr-tests.ts b/types/signalr/signalr-tests.ts
index f678acbbf4..c6d7f7c0d2 100644
--- a/types/signalr/signalr-tests.ts
+++ b/types/signalr/signalr-tests.ts
@@ -95,7 +95,7 @@ function test_connection() {
     });
     connection.start();
     $("#broadcast").click(function () {
-        connection.send($('#msg').val());
+        connection.send($('#msg').val() as string);
     });
 }
 
@@ -191,7 +191,7 @@ $(function () {
     $.connection.hub.start().done(function () {
         $("#broadcast").click(function () {
             // Call the chat method on the server
-            chat.server.send($('#msg').val());
+            chat.server.send($('#msg').val() as string);
         });
     });
 });
diff --git a/types/signalr/v1/index.d.ts b/types/signalr/v1/index.d.ts
index 129e211d3f..66ee7b35e2 100644
--- a/types/signalr/v1/index.d.ts
+++ b/types/signalr/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.asp.net/signalr
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, T. Michael Keesey <https://github.com/keesey/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/signalr/v1/signalr-tests.ts b/types/signalr/v1/signalr-tests.ts
index ccbe018242..77b421b093 100644
--- a/types/signalr/v1/signalr-tests.ts
+++ b/types/signalr/v1/signalr-tests.ts
@@ -46,7 +46,7 @@ function test_connection() {
     });
     connection.start();
     $("#broadcast").click(function () {
-        connection.send($('#msg').val());
+        connection.send($('#msg').val() as string);
     });
 }
 
@@ -142,7 +142,7 @@ $(function () {
     $.connection.hub.start().done(function () {
         $("#broadcast").click(function () {
             // Call the chat method on the server
-            chat.server.send($('#msg').val());
+            chat.server.send($('#msg').val() as string);
         });
     });
 });
diff --git a/types/simple-cw-node/index.d.ts b/types/simple-cw-node/index.d.ts
index c73394e4b0..66aace5ddb 100644
--- a/types/simple-cw-node/index.d.ts
+++ b/types/simple-cw-node/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/astronaughts/simple-cw-node
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.2
 
 import superagent = require("superagent");
 // TODO 1. update superagent with generics
diff --git a/types/simple-cw-node/simple-cw-node-tests.ts b/types/simple-cw-node/simple-cw-node-tests.ts
index 0e1361357b..106bca4948 100644
--- a/types/simple-cw-node/simple-cw-node-tests.ts
+++ b/types/simple-cw-node/simple-cw-node-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import CW = require('simple-cw-node');
 var client = CW();
 var Deferred:any = client.Deferred;
diff --git a/types/simple-mock/simple-mock-tests.ts b/types/simple-mock/simple-mock-tests.ts
index 508399580a..05c900ee99 100644
--- a/types/simple-mock/simple-mock-tests.ts
+++ b/types/simple-mock/simple-mock-tests.ts
@@ -1,13 +1,13 @@
-/// <reference types="mocha"/>
-/// <reference types="node"/>
-/// <reference types="bluebird"/>
-
-'use strict';
-
 import Simple = require('simple-mock');
-import assert = require('assert');
-
-import Bluebird = require('bluebird');
+declare function describe(desc: string, action: () => void): void;
+declare function beforeEach(action: () => void): void;
+declare function it(desc: string, action: (done: () => void) => void): void;
+declare var assert: {
+  (cond: any, message?: string): void;
+  equal<T>(a: T, b: T): void;
+  deepEqual<T>(a: T, b: T): void;
+};
+declare function setTimeout(action: () => void, timeout: number): void;
 
 // Following code is a TypeScript convertion of the test suite bundled with Simple-mock.
 // Original test in MIT license
@@ -628,10 +628,10 @@ describe('Simple', function() {
           rejectValue: null as boolean,
           then: function(fulfilledFn: (value: any) => boolean, rejectedFn: (error: any) => boolean) {
             let self = this
-            process.nextTick(function() {
+            setTimeout(function() {
               if (self.resolveValue) return fulfilledFn(self.resolveValue)
               if (self.rejectValue) return rejectedFn(self.rejectValue)
-            })
+            }, 100)
           }
         }
 
@@ -908,9 +908,6 @@ describe('Simple', function() {
 
       let obj: any
 
-      before(function() {
-      })
-
       beforeEach(function() {
         obj = new ProtoKlass()
       })
@@ -1019,5 +1016,5 @@ describe('Simple', function() {
   })
 })
 
-Simple.Promise = Bluebird;
+Simple.Promise = Promise;
 
diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index a192e6879b..37add22766 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/lelylan/simple-oauth2
 // Definitions by: [Michael Müller] <https://github.com/mad-mike>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import Bluebird = require("bluebird");
 
diff --git a/types/simplebar/index.d.ts b/types/simplebar/index.d.ts
index 0e43773d64..64533d7408 100644
--- a/types/simplebar/index.d.ts
+++ b/types/simplebar/index.d.ts
@@ -1,37 +1,31 @@
-// Type definitions for simplebar.js 1.1.7
+// Type definitions for simplebar.js 2.4
 // Project: https://github.com/Grsmto/simplebar
-// Definitions by: Gregor Woiwode <https://github.com/gregonnet>
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-interface SimplebarOptions {
-    autoHide?: boolean;
-    wrapContent?: boolean;
+declare class SimpleBar {
+    static removeObserver(): void;
+
+    constructor(element: HTMLElement, options?: SimpleBar.Options);
+
+    recalculate(): void;
+    getScrollElement(): Element;
+    getContentElement(): Element;
 }
 
-interface JQuery {
-    /**
-    * Enables simplebar on calling element.
-    */
-    simplebar: {
-        /**
-        * Define if scrollbar should be faded out automatically
-        *
-        * @param indicator if scrollbar should be faded out automatically.
-        */
-        (options?: SimplebarOptions): JQuery;
-    };
-}
+declare namespace SimpleBar {
+    interface Options {
+        wrapContent?: boolean;
+        autoHide?: boolean;
+        scrollbarMinSize?: number;
+        classNames?: ClassNamesOptions;
+    }
 
-interface JQueryStatic {
-    /**
-    * Enables simplebar on calling element.
-    */
-    simplebar: {
-        /**
-        * Define if scrollbar should be faded out automatically
-        *
-        * @param indicator if scrollbar should be faded out automatically.
-        */
-        (options?: SimplebarOptions): JQuery;
-    };
+    interface ClassNamesOptions {
+        content?: string;
+        scrollContent?: string;
+        scrollbar?: string;
+        track?: string;
+    }
 }
diff --git a/types/simplebar/simplebar-tests.ts b/types/simplebar/simplebar-tests.ts
index 9ce78c1fdf..ad403d22a5 100644
--- a/types/simplebar/simplebar-tests.ts
+++ b/types/simplebar/simplebar-tests.ts
@@ -1,4 +1,51 @@
-/// <reference types="jquery"/>
+function test_start() {
+    new SimpleBar(document.getElementById('myElement'));
+}
 
-var simplebar = $.fn.simplebar.noConflict();
-$.fn.simplebar = simplebar;
+function test_options_wrapContent() {
+    new SimpleBar(document.getElementById('myElement'), { wrapContent: false });
+}
+
+function test_options_autoHide() {
+    new SimpleBar(document.getElementById('myElement'), { autoHide: false });
+}
+
+function test_options_scrollbarMinSize() {
+    new SimpleBar(document.getElementById('myElement'), { scrollbarMinSize: 10 });
+}
+
+function test_options_classNames() {
+    new SimpleBar(document.getElementById('myElement'), {
+        classNames: {
+            // defaults
+            content: 'simplebar-content',
+            scrollContent: 'simplebar-scroll-content',
+            scrollbar: 'simplebar-scrollbar',
+            track: 'simplebar-track'
+        }
+    });
+}
+
+function test_recalculate() {
+    const el = new SimpleBar(document.getElementById('myElement'));
+    el.recalculate();
+}
+
+function test_getScrollElement() {
+    const el = new SimpleBar(document.getElementById('myElement'));
+    el.getScrollElement();
+}
+
+function test_scrollEvent() {
+    const el = new SimpleBar(document.getElementById('myElement'));
+    el.getScrollElement().addEventListener('scroll', () => { });
+}
+
+function test_getContentElement() {
+    const el = new SimpleBar(document.getElementById('myElement'));
+    el.getContentElement();
+}
+
+function test_removeObserver() {
+    SimpleBar.removeObserver();
+}
diff --git a/types/simplebar/tslint.json b/types/simplebar/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/simplebar/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/simplebar/v1/index.d.ts b/types/simplebar/v1/index.d.ts
new file mode 100644
index 0000000000..6cdc59ee82
--- /dev/null
+++ b/types/simplebar/v1/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for simplebar.js 1.1.7
+// Project: https://github.com/Grsmto/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.3
+
+/// <reference types="jquery" />
+
+interface SimplebarOptions {
+    autoHide?: boolean;
+    wrapContent?: boolean;
+}
+
+interface SimpleBar {
+    noConflict(): SimpleBar & JQuery;
+
+    /**
+     * Enables simplebar on calling element.
+     */
+    (options?: SimplebarOptions): JQuery;
+}
+
+interface JQuery {
+    simplebar: SimpleBar;
+}
diff --git a/types/simplebar/v1/simplebar-tests.ts b/types/simplebar/v1/simplebar-tests.ts
new file mode 100644
index 0000000000..dc66c129bf
--- /dev/null
+++ b/types/simplebar/v1/simplebar-tests.ts
@@ -0,0 +1,2 @@
+var simplebar = $.fn.simplebar.noConflict();
+$.fn.simplebar = simplebar;
diff --git a/types/simplebar/v1/tsconfig.json b/types/simplebar/v1/tsconfig.json
new file mode 100644
index 0000000000..48fd782d24
--- /dev/null
+++ b/types/simplebar/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "simplebar": [
+                "simplebar/v1"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "simplebar-tests.ts"
+    ]
+}
diff --git a/types/sinon-as-promised/index.d.ts b/types/sinon-as-promised/index.d.ts
index 5efe4df979..097e13a1a0 100644
--- a/types/sinon-as-promised/index.d.ts
+++ b/types/sinon-as-promised/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bendrucker/sinon-as-promised
 // Definitions by: igrayson <https://github.com/igrayson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as s from "sinon";
 
diff --git a/types/sinon-chai/index.d.ts b/types/sinon-chai/index.d.ts
index facf13cdce..3ed2304d7a 100644
--- a/types/sinon-chai/index.d.ts
+++ b/types/sinon-chai/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/domenic/sinon-chai
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>, Jed Mao <https://github.com/jedmao/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="chai" />
 /// <reference types="sinon" />
diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index cfb769fb7c..89434cf791 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vitalets/sinon-chrome
 // Definitions by: Tim Perry <https://github.com/pimterry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="chrome"/>
 /// <reference types="sinon"/>
diff --git a/types/sinon-express-mock/index.d.ts b/types/sinon-express-mock/index.d.ts
index 240d962687..695f443642 100644
--- a/types/sinon-express-mock/index.d.ts
+++ b/types/sinon-express-mock/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/danawoodman/sinon-express-mock#readme
 // Definitions by: Jared Chapiewsky <https://github.com/jpchip>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Sinon from "sinon";
 
diff --git a/types/sinon-mongoose/index.d.ts b/types/sinon-mongoose/index.d.ts
index f2d15651e8..ac8397bf9e 100644
--- a/types/sinon-mongoose/index.d.ts
+++ b/types/sinon-mongoose/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/underscopeio/sinon-mongoose
 // Definitions by: stevehipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as s from "sinon";
 
diff --git a/types/sinon-stub-promise/index.d.ts b/types/sinon-stub-promise/index.d.ts
index 30e24650ac..10fc8adf4c 100644
--- a/types/sinon-stub-promise/index.d.ts
+++ b/types/sinon-stub-promise/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/substantial/sinon-stub-promise
 // Definitions by: Thiago Temple <https://github.com/vintem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="sinon"/>
 
@@ -16,4 +17,5 @@ declare module 'sinon' {
   }
 }
 
-export {};
+declare function sinonStubPromise(sinon: sinon.SinonStatic): void;
+export = sinonStubPromise;
\ No newline at end of file
diff --git a/types/sinon-test/index.d.ts b/types/sinon-test/index.d.ts
index 151842cf8e..4cda8702a6 100644
--- a/types/sinon-test/index.d.ts
+++ b/types/sinon-test/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sinonjs/sinon-test
 // Definitions by: Francis Saul <https://github.com/mummybot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Sinon from 'sinon';
 
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index b3caa38657..a48df85258 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,7 +1,12 @@
-// Type definitions for Sinon 2.2
+// Type definitions for Sinon 2.3
 // Project: http://sinonjs.org/
-// Definitions by: William Sears <https://github.com/mrbigdog2u>, Jonathan Little <https://github.com/rationull>, Lukas Spieß <https://github.com/lumaxis>, Nico Jansen <https://github.com/nicojs>
+// Definitions by: William Sears <https://github.com/mrbigdog2u>
+//                 Jonathan Little <https://github.com/rationull>
+//                 Lukas Spieß <https://github.com/lumaxis>
+//                 Nico Jansen <https://github.com/nicojs>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // sinon uses DOM dependencies which are absent in browser-less environment like node.js
 // to avoid compiler errors this monkey patch is used
@@ -110,6 +115,9 @@ declare namespace Sinon {
         resolves(value?: any): SinonStub;
         throws(type?: string): SinonStub;
         throws(obj: any): SinonStub;
+        throwsArg(index: number): SinonStub;
+        throwsException(type?: string): SinonStub;
+        throwsException(obj: any): SinonStub;
         rejects(): SinonStub;
         rejects(errorType: string): SinonStub;
         rejects(value: any): SinonStub;
@@ -123,12 +131,16 @@ declare namespace Sinon {
         callsArgWithAsync(index: number, ...args: any[]): SinonStub;
         callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
         callsFake(func: (...args: any[]) => void): SinonStub;
+        get(func: () => any): SinonStub;
+        set(func: (v: any) => void): SinonStub;
         onCall(n: number): SinonStub;
         onFirstCall(): SinonStub;
         onSecondCall(): SinonStub;
         onThirdCall(): SinonStub;
+        value(val: any): SinonStub;
         yields(...args: any[]): SinonStub;
         yieldsOn(context: any, ...args: any[]): SinonStub;
+        yieldsRight(...args: any[]): SinonStub;
         yieldsTo(property: string, ...args: any[]): SinonStub;
         yieldsToOn(property: string, context: any, ...args: any[]): SinonStub;
         yieldsAsync(...args: any[]): SinonStub;
@@ -495,10 +507,46 @@ declare namespace Sinon {
 
     // Utility overridables
     interface SinonStatic {
+        /**
+         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
+         *
+         * @param constructor   Object or class to stub.
+         * @returns A stubbed version of the constructor.
+         * @remarks The given constructor function is not invoked. See also the stub API.
+         */
         createStubInstance(constructor: any): any;
+
+        /**
+         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
+         *
+         * @type TType   Type being stubbed.
+         * @param constructor   Object or class to stub.
+         * @returns A stubbed version of the constructor.
+         * @remarks The given constructor function is not invoked. See also the stub API.
+         */
+        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
+
         format(obj: any): string;
         restore(object: any): void;
     }
+
+    /**
+     * Stubbed type of an object with members replaced by stubs.
+     *
+     * @type TType   Type being stubbed.
+     */
+    interface StubbableType<TType> {
+        new(...args: any[]): TType;
+    }
+
+    /**
+     * An instance of a stubbed object type with members replaced by stubs.
+     *
+     * @type TType   Object type being stubbed.
+     */
+    type SinonStubbedInstance<TType> = {
+        [P in keyof TType]: SinonStub;
+    };
 }
 
 declare const Sinon: Sinon.SinonStatic;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index fd2af880f3..9184ec6808 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -159,6 +159,41 @@ function testSetMatcher() {
     stub.calledWithMatch(sinon.match.set.contains(new Set([true])));
 }
 
+function testGetterStub() {
+    const myObj: any = {
+        prop: 'foo'
+    };
+
+    const stub = sinon.stub(myObj, 'prop').get(() => 'bar');
+    stub.restore();
+}
+
+function testSetterStub() {
+    const myObj: any = {
+        prop: 'foo',
+        prop2: 'bar'
+    };
+
+    const stub = sinon.stub(myObj, 'prop').set((val: string) => myObj.prop2 = val);
+    stub.restore();
+}
+
+function testValueStub() {
+    const myObj: any = {
+        prop: 'foo'
+    };
+
+    const stub = sinon.stub(myObj, 'prop').value('bar');
+    stub.restore();
+}
+
+function testThrowsStub() {
+    sinon.stub().throws(new Error('foo'));
+    sinon.stub().throwsException(new Error('foo'));
+    sinon.stub().throws('foo');
+    sinon.stub().throwsException('foo');
+}
+
 function testSpy() {
     const otherSpy = sinon.spy();
     sinon.spy().calledAfter(otherSpy);
@@ -182,6 +217,10 @@ testSpy();
 testSymbolMatch();
 testResetHistory();
 testUsingPromises();
+testGetterStub();
+testSetterStub();
+testValueStub();
+testThrowsStub();
 
 let clock = sinon.useFakeTimers();
 clock.setSystemTime(1000);
@@ -192,6 +231,7 @@ class TestCreateStubInstance {
 }
 
 sinon.createStubInstance(TestCreateStubInstance).someTestMethod('some argument');
+sinon.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
 
 function testGetCalls() {
     let double = sinon.spy((a: number) => a * 2);
diff --git a/types/sip.js/index.d.ts b/types/sip.js/index.d.ts
index 4cb973ad10..ca679979f1 100644
--- a/types/sip.js/index.d.ts
+++ b/types/sip.js/index.d.ts
@@ -3,331 +3,347 @@
 // Definitions by: Kir Dergachev <https://github.com/decyrus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface SIP {
-    UA: {
-        new (configuration?: sipjs.ConfigurationParameters): sipjs.UA;
-    };
-    URI: {
-        new (scheme?: string, user?: string, host?: string, port?: number, parameters?: string[], headers?: string[]): sipjs.URI;
-        parse(uri: string): sipjs.URI;
-    };
-    NameAddrHeader: {
-        new (uri: string | sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>): sipjs.NameAddrHeader;
-        parse(name_addr_header: string): sipjs.NameAddrHeader;
-    };
+export as namespace sipjs;
+
+export class URI {
+    scheme?: string;
+    user?: string;
+    host?: string;
+    port?: number;
+
+    constructor(scheme?: string, user?: string, host?: string, port?: number, parameters?: string[], headers?: string[]);
+    static parse(uri: string): sipjs.URI;
+
+    setParam(key: string, value?: string): void;
+    getParam(key: string): string;
+    hasParam(key: string): string;
+    deleteParam(key: string): string;
+    clearParams(): void;
+    setHeader(name: string, value: string): void;
+    getHeader(name: string): string[];
+    hasHeader(name: string): boolean;
+    deleteHeader(name: string): string[];
+    clearHeaders(): void;
+    clone(): URI;
+    toString(): string;
 }
 
-declare namespace sipjs {
-    interface URI {
-        scheme?: string;
-        user?: string;
-        host?: string;
-        port?: number;
+export namespace UA.EventArgs {
+    interface ConnectedArgs { attempts: number; }
+    interface UnregisteredArgs { response: string; cause: string; }
+    interface RegistrationFailedArgs extends UnregisteredArgs { }
+}
 
-        setParam(key: string, value?: string): void;
-        getParam(key: string): string;
-        hasParam(key: string): string;
-        deleteParam(key: string): string;
-        clearParams(): void;
-        setHeader(name: string, value: string): void;
-        getHeader(name: string): string[];
-        hasHeader(name: string): boolean;
-        deleteHeader(name: string): string[];
-        clearHeaders(): void;
-        clone(): URI;
-        toString(): string;
+export class UA {
+    constructor(configuration?: sipjs.ConfigurationParameters);
+
+    start(): UA;
+    stop(): UA;
+    register(options?: ExtraHeadersOptions): UA;
+    unregister(options?: UnregisterOptions): UA;
+    isRegistered(): boolean;
+    isConnected(): boolean;
+    message(target: string | URI, body: string, options?: MessageOptions): Message;
+    subscribe(target: string | URI, event: string, options?: SubscribeOptions): Subscription;
+    invite(target: string | URI, element?: InviteOptions | HTMLAudioElement | HTMLVideoElement): Session;
+    request(method: string, target: string | URI, options?: RequestOptions): ClientContext;
+
+    on(name: 'connected', callback: (args: UA.EventArgs.ConnectedArgs) => void): void;
+    on(name: 'disconnected' | 'registered' | string, callback: () => void): void;
+    on(name: 'unregistered', callback: (args: UA.EventArgs.UnregisteredArgs) => void): void;
+    on(name: 'registrationFailed', callback: (args: UA.EventArgs.RegistrationFailedArgs) => void): void;
+    on(name: 'invite', callback: (session: Session) => void): void;
+    on(name: 'message', callback: (message: Message) => void): void;
+}
+
+export namespace C {
+    namespace supported {
+        const REQUIRED: string;
+        const SUPPORTED: string;
+        const UNSUPPORTED: string;
     }
 
-    namespace UA.EventArgs {
-        interface ConnectedArgs { attempts: number; }
-        interface UnregisteredArgs { response: string; cause: string; }
-        interface RegistrationFailedArgs extends UnregisteredArgs { }
+    namespace causes {
+        const INVALID_TARGET: string;
+        const CONNECTION_ERROR: string;
+        const REQUEST_TIMEOUT: string;
+        const SIP_FAILURE_CODE: string;
+    }
+}
+
+export interface Session {
+    startTime?: Date;
+    endTime?: Date;
+    ua?: UA;
+    method?: string;
+    mediaHandler?: WebRTC.MediaHandler;
+    request?: IncomingRequest | OutgoingRequest;
+    localIdentity?: NameAddrHeader;
+    remoteIdentity?: NameAddrHeader;
+    data: ClientContext | ServerContext;
+
+    dtmf(tone: string | number, options?: Session.DtmfOptions): Session;
+    terminate(options?: Session.CommonOptions): Session;
+    bye(options?: Session.CommonOptions): Session;
+    getLocalStreams(): any[];
+    getRemoteStreams(): any[];
+    refer(target: string | Session, options?: ExtraHeadersOptions): Session;
+    mute(options?: ExtraHeadersOptions): void;
+    unmute(options?: ExtraHeadersOptions): void;
+    cancel(options?: Session.CommonOptions): void;
+    progress(options?: Session.ProgressOptions): void;
+    accept(options?: Session.AcceptOptions): void;
+    reject(options?: Session.CommonOptions): void;
+    reply(options?: Session.CommonOptions): void;
+    hold(options?: Session.HoldOptions): void;
+    unhold(options?: Session.HoldOptions): void;
+    isOnHold(): Session.Held;
+    followRefer(callback: () => void): void;
+
+    on(name: 'progress', callback: (response: IncomingResponse) => void): void;
+    on(name: 'accepted', callback: (data: { code: number, response: IncomingResponse }) => void): void;
+    on(name: 'failed' | 'rejected', callback: (response: IncomingResponse, cause: string) => void): void;
+    on(name: 'terminated', callback: (message: IncomingResponse, cause: string) => void): void;
+    on(name: 'cancel' | string, callback: () => void): void;
+    on(name: 'replaced', callback: (newSession: Session) => void): void;
+    on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
+    on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
+    on(name: 'refer' | 'bye', callback: (request: IncomingRequest) => void): void;
+}
+
+export namespace Session {
+    interface DtmfOptions extends ExtraHeadersOptions {
+        duration?: number;
+        interToneGap?: number;
     }
 
-    interface UA {
-        start(): void;
-        stop(): void;
-        register(options?: ExtraHeadersOptions): UA;
-        unregister(options?: UnregisterOptions): void;
-        isRegistered(): boolean;
-        isConnected(): boolean;
-        message(target: string | URI, body: string, options?: MessageOptions): Message;
-        subscribe(target: string | URI, event: string, options?: SubscribeOptions): Subscription;
-        invite(target: string | URI, element?: InviteOptions | HTMLAudioElement | HTMLVideoElement): Session;
-        request(method: string, target: string | URI, options?: RequestOptions): ClientContext;
-
-        on(name: 'connected', callback: (args: UA.EventArgs.ConnectedArgs) => void): void;
-        on(name: 'disconnected' | 'registered' | string, callback: () => void): void;
-        on(name: 'unregistered', callback: (args: UA.EventArgs.UnregisteredArgs) => void): void;
-        on(name: 'registrationFailed', callback: (args: UA.EventArgs.RegistrationFailedArgs) => void): void;
-        on(name: 'invite', callback: (session: Session) => void): void;
-        on(name: 'message', callback: (message: Message) => void): void;
-    }
-
-    namespace UA.C {
-        class supported {
-            REQUIRED: string;
-            SUPPORTED: string;
-            UNSUPPORTED: string;
-        }
-
-        class causes {
-            INVALID_TARGET: string;
-            CONNECTION_ERROR: string;
-            REQUEST_TIMEOUT: string;
-            SIP_FAILURE_CODE: string;
-        }
-    }
-
-    interface Session {
-        startTime?: Date;
-        endTime?: Date;
-        ua?: UA;
-        method?: string;
-        mediaHandler?: WebRTC.MediaHandler;
-        request?: IncomingRequest | OutgoingRequest;
-        localIdentity?: NameAddrHeader;
-        remoteIdentity?: NameAddrHeader;
-        data: ClientContext | ServerContext;
-
-        dtmf(tone: string | number, options?: Session.DtmfOptions): Session;
-        terminate(options?: Session.CommonOptions): Session;
-        bye(options?: Session.CommonOptions): Session;
-        getLocalStreams(): any[];
-        getRemoteStreams(): any[];
-        refer(target: string | Session, options?: ExtraHeadersOptions): Session;
-        mute(options?: ExtraHeadersOptions): void;
-        unmute(options?: ExtraHeadersOptions): void;
-        cancel(options?: Session.CommonOptions): void;
-        progress(options?: Session.ProgressOptions): void;
-        accept(options?: Session.AcceptOptions): void;
-        reject(options?: Session.CommonOptions): void;
-        reply(options?: Session.CommonOptions): void;
-        followRefer(callback: () => void): void;
-
-        on(name: 'progress', callback: (response: IncomingResponse) => void): void;
-        on(name: 'accepted', callback: (data: { code: number, response: IncomingResponse }) => void): void;
-        on(name: 'failed' | 'rejected', callback: (response: IncomingResponse, cause: string) => void): void;
-        on(name: 'terminated', callback: (message: IncomingResponse, cause: string) => void): void;
-        on(name: 'cancel' | string, callback: () => void): void;
-        on(name: 'replaced', callback: (newSession: Session) => void): void;
-        on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
-        on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
-        on(name: 'refer' | 'bye', callback: (request: IncomingRequest) => void): void;
-    }
-
-    namespace Session {
-        interface DtmfOptions extends ExtraHeadersOptions {
-            duration?: number;
-            interToneGap?: number;
-        }
-
-        interface CommonOptions extends ExtraHeadersOptions {
-            status_code?: number;
-            reason_phrase?: string;
-            body?: string;
-        }
-
-        interface ProgressOptions extends ExtraHeadersOptions {
-            rel100?: boolean;
-            media?: MediaConstraints;
-        }
-
-        interface AcceptOptions {
-            RTCConstraints?: any;
-            media?: MediaOptions;
-        }
-
-        interface DTMF extends Object {}
-
-        interface Muted {
-            audio?: boolean;
-            video?: boolean;
-        }
-    }
-
-    interface RenderHint {
-        remote?: Element;
-        local?: Element;
-    }
-
-    interface MediaConstraints {
-        audio: boolean;
-        video: boolean;
-    }
-
-    interface TurnServer {
-        urls?: string | string[];
-        username?: string;
-        password?: string;
-    }
-
-    namespace WebRTC {
-        interface Options {
-            stunServers?: string | string[];
-            turnServers?: TurnServer | TurnServer[];
-            RTCConstraints?: any;
-        }
-
-        type MediaHandlerFactory = (session: Session, options: Options) => MediaHandler;
-
-        class MediaHandler {
-            getLocalStreams(): any[];
-            getRemoteStreams(): any[];
-            render(renderHint: RenderHint): void;
-
-            on(name: 'userMediaRequest', callback: (constraints: MediaConstraints) => void): void;
-            on(name: 'addStream' | 'userMedia', callback: (stream: any) => void): void;
-            on(name: 'userMediaFailed', callback: (error: string) => void): void;
-            on(name: 'iceCandidate', callback: (candidate: any) => void): void;
-            on(
-                name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' |
-                      'iceConnectionDisconnected' | 'iceConnectionClosed' | string,
-                callback: () => void): void;
-            on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
-        }
-    }
-
-    /* Parameters */
-    interface ConfigurationParameters {
-        uri?: string;
-        wsServers?: string | string[] | Array<{ ws_uri: string; weigth: number }>;
-        allowLegacyNotifications?: boolean;
-        authenticationFactory?: WebRTC.MediaHandlerFactory;
-        authorizationUser?: string;
-        autostart?: boolean;
-        connectionRecoveryMaxInterval?: number;
-        connectionRecoveryMinInterval?: number;
-        displayName?: string;
-        hackCleanJitsiSdpImageattr?: boolean;
-        hackStripTcp?: boolean;
-        hackIpInContact?: boolean;
-        hackViaTcp?: boolean;
-        hackWssInTransport?: boolean;
-        iceCheckingTimeout?: number;
-        instanceId?: string;
-        log?: {
-            builtinEnabled?: boolean;
-            level?: number | string;
-            connector?(level: string, category: string, label: string, content: string): void;
-        };
-        mediaHandlerFactory?: WebRTC.MediaHandlerFactory;
-        noAnswerTimeout?: number;
-        password?: string;
-        register?: boolean;
-        registerExpires?: number;
-        registrarServer?: string;
-        rel100?: string;
-        replaces?: string;
-        stunServers?: string | string[];
-        traceSip?: boolean;
-        turnServers?: TurnServer | TurnServer[];
-        usePreloadedRoute?: boolean;
-        userAgentString?: string;
-        wsServerMaxReconnection?: number;
-        wsServerReconnectionTimeout?: number;
-    }
-
-    /* Options */
-    interface ExtraHeadersOptions {
-        extraHeaders?: string[];
-    }
-
-    interface UnregisterOptions extends ExtraHeadersOptions {
-        all?: boolean;
-    }
-
-    interface MessageOptions extends ExtraHeadersOptions {
-        contentType?: string;
-    }
-
-    interface SubscribeOptions extends ExtraHeadersOptions {
-        expires?: number;
-    }
-
-    interface MediaOptions {
-        constraints?: MediaConstraints;
-        stream?: any;
-        render?: RenderHint;
-    }
-
-    interface InviteOptions extends ExtraHeadersOptions {
-        media?: MediaOptions;
-        anonymous?: boolean;
-        rel100?: string;
-        inviteWithoutSdp?: boolean;
-        RTCConstraints?: any;
-    }
-
-    interface RequestOptions extends ExtraHeadersOptions {
+    interface CommonOptions extends ExtraHeadersOptions {
+        status_code?: number;
+        reason_phrase?: string;
         body?: string;
     }
 
-    /* Contexts */
-    interface Message extends ClientContext {
-        body: string;
+    interface ProgressOptions extends ExtraHeadersOptions {
+        rel100?: boolean;
+        media?: MediaConstraints;
     }
 
-    interface Subscription extends ClientContext {
-        id: string;
-        state: string;
-        event: string;
-        dialog: string;
-        timers: {};
-        errorCodes: number[];
-        subscribe(): Subscription;
-        unsubscribe(): void;
-        close(): void;
+    interface AcceptOptions {
+        RTCConstraints?: any;
+        media?: MediaOptions;
     }
 
-    /* Context */
-    interface Context {
-        ua: UA;
-        method: string;
-        request: OutgoingRequest;
-        localIdentity: NameAddrHeader;
-        remoteIdentity: NameAddrHeader;
-        data: {};
-        on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
-        on(name: 'notify', callback: (request: IncomingRequest) => void): void;
-        on(name: string, callback: () => void): void;
+    interface HoldOptions extends ExtraHeadersOptions {
+        eventHandlers?: {
+            succeeded?(): void;
+            failed?(): void;
+        };
     }
 
-    interface ClientContext extends Context {
-        cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
+    interface DTMF extends Object {}
+
+    interface Muted {
+        audio?: boolean;
+        video?: boolean;
     }
 
-    interface ServerContext extends Context {
-        progress(options?: Session.ProgressOptions): void;
-        accept(options?: Session.AcceptOptions): void;
-        reject(options?: Session.CommonOptions): void;
-        reply(options?: Session.CommonOptions): void;
-    }
-
-    /* Request */
-    interface Request extends Context {
-    }
-
-    interface IncomingRequest extends Request {
-    }
-
-    interface OutgoingRequest extends Request {
-    }
-
-    interface IncomingResponse extends Request {
-    }
-
-    interface IncomingMessage extends Request {
-    }
-
-    /* Header */
-    interface NameAddrHeader {
-        uri: string | URI;
-        displayName: string;
-
-        setParam(key: string, value?: string): void;
-        getParam(key: string): string;
-        deleteParam(key: string): string;
-        clearParams(): void;
+    interface Held {
+        local: boolean;
+        remote: boolean;
     }
 }
+
+export interface RenderHint {
+    remote?: Element;
+    local?: Element;
+}
+
+export interface MediaConstraints {
+    audio: boolean;
+    video: boolean;
+}
+
+export interface TurnServer {
+    urls?: string | string[];
+    username?: string;
+    password?: string;
+}
+
+export namespace WebRTC {
+    interface Options {
+        stunServers?: string | string[];
+        turnServers?: TurnServer | TurnServer[];
+        RTCConstraints?: any;
+    }
+
+    type MediaHandlerFactory = (session: Session, options: Options) => MediaHandler;
+
+    class MediaHandler {
+        getLocalStreams(): any[];
+        getRemoteStreams(): any[];
+        render(renderHint: RenderHint): void;
+
+        on(name: 'userMediaRequest', callback: (constraints: MediaConstraints) => void): void;
+        on(name: 'addStream' | 'userMedia', callback: (stream: any) => void): void;
+        on(name: 'userMediaFailed', callback: (error: string) => void): void;
+        on(name: 'iceCandidate', callback: (candidate: any) => void): void;
+        on(
+            name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' |
+                  'iceConnectionDisconnected' | 'iceConnectionClosed' | string,
+            callback: () => void): void;
+        on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
+    }
+}
+
+/* Parameters */
+export interface ConfigurationParameters {
+    uri?: string;
+    wsServers?: string | Array<string | { ws_uri: string; weight?: number }>;
+    allowLegacyNotifications?: boolean;
+    authenticationFactory?: WebRTC.MediaHandlerFactory;
+    authorizationUser?: string;
+    autostart?: boolean;
+    autostop?: boolean;
+    connectionRecoveryMaxInterval?: number;
+    connectionRecoveryMinInterval?: number;
+    contactTransport?: string;
+    displayName?: string;
+    extraSupported?: string[];
+    forceRport?: boolean;
+    hackAllowUnregisteredOptionTags?: boolean;
+    hackCleanJitsiSdpImageattr?: boolean;
+    hackStripTcp?: boolean;
+    hackIpInContact?: boolean;
+    hackViaTcp?: boolean;
+    hackWssInTransport?: boolean;
+    iceCheckingTimeout?: number;
+    instanceId?: string;
+    keepAliveInterval?: number;
+    log?: {
+        builtinEnabled?: boolean;
+        level?: number | string;
+        connector?(level: string, category: string, label: string, content: string): void;
+    };
+    mediaHandlerFactory?: WebRTC.MediaHandlerFactory;
+    noAnswerTimeout?: number;
+    password?: string;
+    register?: boolean;
+    registerExpires?: number;
+    registrarServer?: string;
+    rel100?: string;
+    replaces?: string;
+    rtcpMuxPolicy?: string;
+    stunServers?: string | string[];
+    traceSip?: boolean;
+    turnServers?: TurnServer | TurnServer[];
+    usePreloadedRoute?: boolean;
+    userAgentString?: string;
+    wsServerMaxReconnection?: number;
+    wsServerReconnectionTimeout?: number;
+}
+
+/* Options */
+export interface ExtraHeadersOptions {
+    extraHeaders?: string[];
+}
+
+export interface UnregisterOptions extends ExtraHeadersOptions {
+    all?: boolean;
+}
+
+export interface MessageOptions extends ExtraHeadersOptions {
+    contentType?: string;
+}
+
+export interface SubscribeOptions extends ExtraHeadersOptions {
+    expires?: number;
+}
+
+export interface MediaOptions {
+    constraints?: MediaConstraints;
+    stream?: any;
+    render?: RenderHint;
+}
+
+export interface InviteOptions extends ExtraHeadersOptions {
+    media?: MediaOptions;
+    anonymous?: boolean;
+    rel100?: string;
+    inviteWithoutSdp?: boolean;
+    RTCConstraints?: any;
+}
+
+export interface RequestOptions extends ExtraHeadersOptions {
+    body?: string;
+}
+
+/* Contexts */
+export interface Message extends ClientContext {
+    body: string;
+}
+
+export interface Subscription extends ClientContext {
+    id: string;
+    state: string;
+    event: string;
+    dialog: string;
+    timers: {};
+    errorCodes: number[];
+    subscribe(): Subscription;
+    unsubscribe(): void;
+    close(): void;
+}
+
+/* Context */
+export interface Context {
+    ua: UA;
+    method: string;
+    request: OutgoingRequest;
+    localIdentity: NameAddrHeader;
+    remoteIdentity: NameAddrHeader;
+    data: {};
+    on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
+    on(name: 'notify', callback: (request: IncomingRequest) => void): void;
+    on(name: string, callback: () => void): void;
+}
+
+export interface ClientContext extends Context {
+    cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
+}
+
+export interface ServerContext extends Context {
+    progress(options?: Session.ProgressOptions): void;
+    accept(options?: Session.AcceptOptions): void;
+    reject(options?: Session.CommonOptions): void;
+    reply(options?: Session.CommonOptions): void;
+}
+
+/* Request */
+export interface Request extends Context {
+}
+
+export interface IncomingRequest extends Request {
+}
+
+export interface OutgoingRequest extends Request {
+}
+
+export interface IncomingResponse extends Request {
+}
+
+export interface IncomingMessage extends Request {
+}
+
+/* Header */
+export class NameAddrHeader {
+    uri: string | URI;
+    displayName: string;
+
+    constructor(uri: string | sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>);
+    static parse(name_addr_header: string): sipjs.NameAddrHeader;
+
+    setParam(key: string, value?: string): void;
+    getParam(key: string): string;
+    deleteParam(key: string): string;
+    clearParams(): void;
+}
diff --git a/types/sip.js/sip.js-tests.ts b/types/sip.js/sip.js-tests.ts
index 23b2578194..df6d47c7bc 100644
--- a/types/sip.js/sip.js-tests.ts
+++ b/types/sip.js/sip.js-tests.ts
@@ -1,17 +1,18 @@
-declare var sip: SIP;
+import * as SIP from 'sip.js';
 
-let ua: sipjs.UA = new sip.UA();
+let ua: SIP.UA = new SIP.UA();
 
-const mediaHandler = (session: sipjs.Session, options: sipjs.WebRTC.Options) => new sipjs.WebRTC.MediaHandler();
+const mediaHandler = (session: SIP.Session, options: SIP.WebRTC.Options) => new SIP.WebRTC.MediaHandler();
 const logConnector = (level: string, category: string, label: string, content: string) => null;
 
-const uaWithConfig: sipjs.UA = new sip.UA({
+const uaWithConfig: SIP.UA = new SIP.UA({
     uri: "wss://uri",
-    wsServers: ["s1", "s2"],
+    wsServers: ["s1", "s2", { ws_uri: "s3", weight: 1 }],
     allowLegacyNotifications: true,
     authenticationFactory: mediaHandler,
     authorizationUser: "user",
     autostart: true,
+    autostop: false,
     connectionRecoveryMaxInterval: 1,
     connectionRecoveryMinInterval: 1,
     displayName: "name",
@@ -61,14 +62,14 @@ ua.unregister({ extraHeaders: [""], all: true });
 const isConnected: boolean = ua.isConnected();
 const isRegistered: boolean = ua.isRegistered();
 
-const message: sipjs.Message = ua.message("", "", { contentType: "" });
+const message: SIP.Message = ua.message("", "", { contentType: "" });
 
 ua.subscribe("", "", { expires: 1, extraHeaders: [""] });
-const subscription: sipjs.Subscription = ua.subscribe(new sip.URI(), "", { expires: 1, extraHeaders: [""] });
+const subscription: SIP.Subscription = ua.subscribe(new SIP.URI(), "", { expires: 1, extraHeaders: [""] });
 
 let session = ua.invite("", new HTMLVideoElement());
 
-const inviteOptions: sipjs.InviteOptions = {
+const inviteOptions: SIP.InviteOptions = {
     media: {
         constraints: { audio: true, video: false },
         stream: new MediaStream(),
@@ -82,14 +83,23 @@ const inviteOptions: sipjs.InviteOptions = {
 
 session = ua.invite("", inviteOptions);
 
-ua.on('connected', (args: sipjs.UA.EventArgs.ConnectedArgs) => { });
+ua.on('connected', (args: SIP.UA.EventArgs.ConnectedArgs) => { });
 ua.on('disconnected', () => { });
 ua.on('registered', () => { });
-ua.on('unregistered', (args: sipjs.UA.EventArgs.UnregisteredArgs) => { });
-ua.on('registrationFailed', (args: sipjs.UA.EventArgs.RegistrationFailedArgs) => { });
-ua.on('invite', (session: sipjs.Session) => {
+ua.on('unregistered', (args: SIP.UA.EventArgs.UnregisteredArgs) => { });
+ua.on('registrationFailed', (args: SIP.UA.EventArgs.RegistrationFailedArgs) => { });
+ua.on('invite', (session: SIP.Session) => {
     session.on('progress', (response) => {});
     session.on('accepted', (response) => {});
     session.on('rejected', (response) => {});
 });
-ua.on('message', (message: sipjs.Message) => { });
+ua.on('message', (message: SIP.Message) => { });
+
+session.hold({
+    extraHeaders: [""],
+    eventHandlers: {
+        succeeded: () => {}
+    }
+});
+
+ua.start().stop();
diff --git a/types/sipml/sipml-tests.ts b/types/sipml/sipml-tests.ts
index e88f11f0ff..a335d33dd0 100644
--- a/types/sipml/sipml-tests.ts
+++ b/types/sipml/sipml-tests.ts
@@ -34,7 +34,7 @@ var eventsListener = (e:any)=> {
 }
 
 function createSipStack(){
-    sipStack = new SIPml.Stack('blaat');
+    sipStack = new SIPml.Stack({ display_name: 'blaat' });
     sipStack = new SIPml.Stack({
             realm: 'example.org', // mandatory: domain name
             impi: 'bob', // mandatory: authorization name (IMS Private Identity)
diff --git a/types/slick-carousel/index.d.ts b/types/slick-carousel/index.d.ts
index b8f3bd4244..b92b1e9930 100644
--- a/types/slick-carousel/index.d.ts
+++ b/types/slick-carousel/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://kenwheeler.github.io/slick/
 // Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/slickgrid/index.d.ts b/types/slickgrid/index.d.ts
index feab55043d..669b187366 100644
--- a/types/slickgrid/index.d.ts
+++ b/types/slickgrid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mleibman/SlickGrid
 // Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /*
 SlickGrid-2.1.d.ts may be freely distributed under the MIT license.
@@ -742,7 +743,7 @@ declare namespace Slick {
 			 * Metadata indexed by column index
 			 */
 			[index: number]: ColumnMetadata<T>;
-		}
+		};
 	}
 
 	export interface ColumnMetadata<T extends SlickData> {
@@ -886,6 +887,11 @@ declare namespace Slick {
 		**/
 		public setSelectedRows(rowsArray: number[]): void;
 
+		/**
+		 * Returns container's HTML node (the element passed into Grid constructor).
+		 */
+		public getContainerNode(): HTMLElement;
+
 		/**
 		* Unregisters a current selection model and registers a new one. See the definition of SelectionModel for more information.
 		* @selectionModel A SelectionModel.
@@ -1425,6 +1431,11 @@ declare namespace Slick {
 		cell: number;
 	}
 
+	export interface Position {
+		top: number;
+		left: number;
+	}
+
 	export interface CellPosition extends Position {
 		bottom: number;
 		height: number;
@@ -1433,15 +1444,10 @@ declare namespace Slick {
 		width: number;
 	}
 
-	export interface Position {
-		top: number;
-		left: number;
-	}
-
 	export interface CellCssStylesHash {
 		[index: number]: {
 			[id: string]: string;
-		}
+		};
 	}
 
 	export interface Viewport {
@@ -1456,12 +1462,19 @@ declare namespace Slick {
 		msg: string;
 	}
 
-	export module Editors {
+	export namespace Editors {
 
 		export interface EditorOptions<T extends Slick.SlickData> {
 			column: Column<T>;
 			container: HTMLElement;
 			grid: Grid<T>;
+
+			item?: T;
+			commitChanges?: () => void;
+			cancelChanges?: () => void;
+			gridPosition?: CellPosition;
+			position?: CellPosition;
+
 		}
 
 		export class Editor<T extends Slick.SlickData> {
@@ -1469,8 +1482,8 @@ declare namespace Slick {
 			public init(): void;
 			public destroy(): void;
 			public focus(): void;
-			public loadValue(item:any): void; // todo: typeof(item)
-			public applyValue(item:any, state: string): void; // todo: typeof(item)
+			public loadValue(item: T): void;
+			public applyValue(item: T, state: string): void;
 			public isValueChanged(): boolean;
 			public serializeValue(): any;
 			public validate(): ValidateResults;
diff --git a/types/slickgrid/test/index.ts b/types/slickgrid/test/index.ts
index d87bc2240c..d0ee85a23c 100644
--- a/types/slickgrid/test/index.ts
+++ b/types/slickgrid/test/index.ts
@@ -101,7 +101,7 @@ sortable ? console.log("It's sortable!") : console.log("It's not sortable!");
 
 var data2 = grid.getColumns();
 data2[0].name = "First";
-grid.setColumns(data);
+grid.setColumns(data2);
 
 grid.updateColumnHeader("FirstName", "A First Name");
 
@@ -120,14 +120,14 @@ grid.canCellBeActive(5, 10);
 grid.canCellBeSelected(5, 10);
 
 grid.editActiveCell(new Slick.Editors.Date<MyData>({
-	column: cols,
+	column: cols[0],
 	container: undefined,
 	grid: grid
 }));
 
 grid.setActiveCell(0, 0);
 grid.editActiveCell(new Slick.Editors.Date<MyData>({
-	column: cols,
+	column: cols[0],
 	container: undefined,
 	grid: grid
 }));
diff --git a/types/slickgrid/test/slick.checkboxselectcolumn.ts b/types/slickgrid/test/slick.checkboxselectcolumn.ts
index c0f08bb2af..4006bfcf75 100644
--- a/types/slickgrid/test/slick.checkboxselectcolumn.ts
+++ b/types/slickgrid/test/slick.checkboxselectcolumn.ts
@@ -34,6 +34,6 @@
         grid = new Slick.Grid("#myGrid", data, columns, options);
         grid.setSelectionModel(new Slick.RowSelectionModel({ selectActiveRow: false }));
         grid.registerPlugin(checkboxSelector);
-        var columnpicker = new Slick.Controls.ColumnPicker(columns, grid, options);
+        var columnpicker = new Slick.Controls.ColumnPicker(columns, grid, { fadeSpeed: 1 });
     })
-})();
\ No newline at end of file
+})();
diff --git a/types/sockjs-node/index.d.ts b/types/sockjs-node/index.d.ts
deleted file mode 100644
index 1de35afd2a..0000000000
--- a/types/sockjs-node/index.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for sockjs-node 0.3.x
-// Project: https://github.com/sockjs/sockjs-node
-// Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-
-import http = require('http');
-
-export interface ServerOptions {
-    sockjs_url?: string;
-    prefix?: string;
-    response_limit?: number;
-    websocket?: boolean;
-    jsessionid?: any;
-    log?: (severity: string, message: string) => void;
-    heartbeat_delay?: number;
-    disconnect_delay?: number;
-}
-
-export declare function createServer(options?: ServerOptions): Server;
-
-export interface Server extends NodeJS.EventEmitter {
-    installHandlers(server: http.Server, options?: ServerOptions): any;
-
-    on(event: 'connection', listener: (conn: Connection) => any): this;
-    on(event: string, listener: Function): this;
-}
-
-export interface Connection extends NodeJS.ReadWriteStream {
-    remoteAddress: string;
-    remotePort: number;
-    address: {
-        [key: string]: {
-            address: string;
-            port: number;
-        };
-    };
-    headers: {
-        [key: string]: string;
-    };
-    url: string;
-    pathname: string;
-    prefix: string;
-    protocol: string;
-    readyState: number;
-    id: string;
-
-    close(code?: string, reason?: string): boolean;
-    destroy(): void;
-
-    on(event: 'data', listener: (message: string) => any): this;
-    on(event: 'close', listener: () => void): this;
-    on(event: string, listener: Function): this;
-}
diff --git a/types/sockjs/index.d.ts b/types/sockjs/index.d.ts
index e613db9f7d..50cd7fe05f 100644
--- a/types/sockjs/index.d.ts
+++ b/types/sockjs/index.d.ts
@@ -1,59 +1,55 @@
-// Type definitions for SockJS 0.3.x
-// Project: https://github.com/sockjs/sockjs-client
-// Definitions by: Emil Ivanov <https://github.com/vladev>
+// Type definitions for sockjs 0.3
+// Project: https://github.com/sockjs/sockjs-node
+// Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export as namespace SockJS;
-export = SockJS;
+/// <reference types="node" />
 
-interface SockJSSimpleEvent {
-    type: string;
-    toString(): string;
+import http = require('http');
+
+export interface ServerOptions {
+	sockjs_url?: string;
+	prefix?: string;
+	response_limit?: number;
+	websocket?: boolean;
+	jsessionid?: any;
+	log?(severity: string, message: string): void;
+	heartbeat_delay?: number;
+	disconnect_delay?: number;
 }
 
-interface SJSOpenEvent extends SockJSSimpleEvent, Event {
-    type: string;
+export function createServer(options?: ServerOptions): Server;
+
+export interface Server extends NodeJS.EventEmitter {
+	installHandlers(server: http.Server, options?: ServerOptions): any;
+
+	on(event: 'connection', listener: (conn: Connection) => any): this;
+	on(event: string, listener: Function): this;
 }
 
-interface SJSCloseEvent extends SockJSSimpleEvent, CloseEvent {
-    code: number;
-    reason: string;
-    wasClean: boolean;
-    type: string;
-}
+export interface Connection extends NodeJS.ReadWriteStream {
+	remoteAddress: string;
+	remotePort: number;
+	address: {
+		[key: string]: {
+			address: string;
+			port: number;
+		};
+	};
+	headers: {
+		[key: string]: string;
+	};
+	url: string;
+	pathname: string;
+	prefix: string;
+	protocol: string;
+	readyState: number;
+	id: string;
 
-interface SJSMessageEvent extends SockJSSimpleEvent, MessageEvent {
-    data: string;
-    type: string;
-}
+	close(code?: string, reason?: string): boolean;
+	destroy(): void;
 
-interface SockJS extends WebSocket {
-    protocol: string;
-    readyState: number;
-    onopen: (ev: SJSOpenEvent) => any;
-    onmessage: (ev: SJSMessageEvent) => any;
-    onclose: (ev: SJSCloseEvent) => any;
-    send(data: any): void;
-    close(code?: number, reason?: string): void;
-    OPEN: number;
-    CLOSING: number;
-    CONNECTING: number;
-    CLOSED: number;
+	on(event: 'data', listener: (message: string) => any): this;
+	on(event: 'close', listener: () => void): this;
+	on(event: string, listener: Function): this;
 }
-
-declare var SockJS: {
-    prototype: SockJS;
-    new (url: string, _reserved?: any, options?: {
-        debug?: boolean;
-        devel?: boolean;
-        protocols_whitelist?: string[];
-        server?: string;
-        rtt?: number;
-        rto?: number;
-        info?: {
-            websocket?: boolean;
-            cookie_needed?: boolean;
-            null_origin?: boolean;
-        };
-    }): SockJS;
-};
\ No newline at end of file
diff --git a/types/sockjs-node/sockjs-node-tests.ts b/types/sockjs/sockjs-tests.ts
similarity index 64%
rename from types/sockjs-node/sockjs-node-tests.ts
rename to types/sockjs/sockjs-tests.ts
index ca80b26e64..8da2d78afe 100644
--- a/types/sockjs-node/sockjs-node-tests.ts
+++ b/types/sockjs/sockjs-tests.ts
@@ -1,16 +1,16 @@
-import sockjs = require("sockjs-node");
-import http = require("http");
-import stream = require("stream");
+import * as sockjs from 'sockjs';
+import * as http from 'http';
+import * as stream from 'stream';
 
-var server: sockjs.Server,
-    serverOptions: sockjs.ServerOptions = {};
+let server: sockjs.Server;
+let serverOptions: sockjs.ServerOptions = {};
 
 // createServer method
 server = sockjs.createServer();
 server = sockjs.createServer(serverOptions);
 
 // installHandlers method
-var httpServer: http.Server = http.createServer();
+let httpServer: http.Server = http.createServer();
 server.installHandlers(httpServer);
 server.installHandlers(httpServer, serverOptions);
 
@@ -23,21 +23,21 @@ serverOptions.websocket = true;
 serverOptions.jsessionid = true;
 serverOptions.jsessionid = () => true;
 
-serverOptions.log = (severity: any, message: any) => { };
+serverOptions.log = (severity: string, message: string) => { };
 serverOptions.heartbeat_delay = 25000;
 serverOptions.disconnect_delay = 5000;
 
 // Connection
-var connection: sockjs.Connection;
+let connection: sockjs.Connection;
 
 // on('connection') passes a sockJS connection
-server.on('connection', (conn: any) => {
+server.on('connection', (conn: sockjs.Connection) => {
     connection = conn;
     conn = connection;
 });
 
 // connection is a ReadWriteStream
-var connectionAsReadWrite: NodeJS.ReadWriteStream = connection;
+let connectionAsReadWrite: NodeJS.ReadWriteStream = connection;
 
 connection.on('data', (message: string) => { });
 connection.on('close', () => { });
diff --git a/types/sockjs/tsconfig.json b/types/sockjs/tsconfig.json
index 8a67eaf271..7381df8ce9 100644
--- a/types/sockjs/tsconfig.json
+++ b/types/sockjs/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -17,6 +16,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "sockjs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/sockjs/tslint.json b/types/sockjs/tslint.json
new file mode 100644
index 0000000000..5bc412fb1e
--- /dev/null
+++ b/types/sockjs/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "ban-types": false
+  }
+}
diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index 8df4456483..3898c471a2 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -1,11 +1,10 @@
-// Type definitions for source-map-support 0.2.10
+// Type definitions for source-map-support 0.4
 // Project: https://github.com/evanw/source-map-support
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Jason Cheatham <https://github.com/jason0x43>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-
 /**
  * Output of retrieveSourceMap().
  */
@@ -19,9 +18,13 @@ export interface UrlAndMap {
  */
 export interface Options {
     handleUncaughtExceptions?: boolean;
+    hookRequire?: boolean;
     emptyCacheBetweenOperations?: boolean;
-    retrieveFile?: (path: string) => string;
-    retrieveSourceMap?: (source: string) => UrlAndMap;
+    environment?: 'auto' | 'browser' | 'node';
+    overrideRetrieveFile?: boolean;
+    overrideRetrieveSourceMap?: boolean;
+    retrieveFile?(path: string): string;
+    retrieveSourceMap?(source: string): UrlAndMap;
 }
 
 export interface Position {
@@ -30,13 +33,13 @@ export interface Position {
     column: number;
 }
 
-export declare function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
-export declare function getErrorSource(error: Error): string;
-export declare function mapSourcePosition(position: Position): Position;
-export declare function retrieveSourceMap(source: string): UrlAndMap;
+export function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
+export function getErrorSource(error: Error): string | null;
+export function mapSourcePosition(position: Position): Position;
+export function retrieveSourceMap(source: string): UrlAndMap | null;
 
 /**
  * Install SourceMap support.
  * @param options Can be used to e.g. disable uncaughtException handler.
  */
-export declare function install(options?: Options): void;
+export function install(options?: Options): void;
diff --git a/types/source-map-support/source-map-support-tests.ts b/types/source-map-support/source-map-support-tests.ts
index 602547509e..9a30b6a68f 100644
--- a/types/source-map-support/source-map-support-tests.ts
+++ b/types/source-map-support/source-map-support-tests.ts
@@ -1,4 +1,3 @@
-
 import sms = require('source-map-support');
 
 sms.install();
@@ -14,27 +13,31 @@ function retrieveSourceMap(source: string): sms.UrlAndMap {
 	};
 }
 
-var options: sms.Options = {
+const options: sms.Options = {
 	emptyCacheBetweenOperations: false,
 	handleUncaughtExceptions: false,
-	retrieveFile: retrieveFile,
-	retrieveSourceMap: retrieveSourceMap
+	retrieveFile,
+	retrieveSourceMap,
+	environment: 'node',
+	hookRequire: false,
+	overrideRetrieveSourceMap: false,
+	overrideRetrieveFile: false
 };
 
 sms.install(options);
 
-var stackFrame: any; // TODO: this should be a StackFrame, but it seems this would need to be defined elsewhere (in e.g. lib.d.ts)
+let stackFrame: any; // TODO: this should be a StackFrame, but it seems this would need to be defined elsewhere (in e.g. lib.d.ts)
 stackFrame = sms.wrapCallSite(stackFrame);
 
-var s: string;
+let s: string | null;
 s = sms.getErrorSource(new Error("foo"));
 
-var p: sms.Position = {
+let p: sms.Position = {
 	column: 0,
 	line: 0,
 	source: "foo"
 };
 p = sms.mapSourcePosition(p);
 
-var u: sms.UrlAndMap;
+let u: sms.UrlAndMap;
 u = retrieveSourceMap("foo");
diff --git a/types/source-map-support/tsconfig.json b/types/source-map-support/tsconfig.json
index 8a90e5ecec..3f07ef5207 100644
--- a/types/source-map-support/tsconfig.json
+++ b/types/source-map-support/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "source-map-support-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/source-map-support/tslint.json b/types/source-map-support/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/source-map-support/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/space-pen/index.d.ts b/types/space-pen/index.d.ts
index 52aaf5d320..b271f29691 100644
--- a/types/space-pen/index.d.ts
+++ b/types/space-pen/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/atom/space-pen
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/spdy/index.d.ts b/types/spdy/index.d.ts
index 8371ca4f9f..d0f44fa6a9 100644
--- a/types/spdy/index.d.ts
+++ b/types/spdy/index.d.ts
@@ -3,14 +3,19 @@
 // Definitions by: Anthony Trinh <https://github.com/tony19>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
+import * as http from 'http';
+import * as https from 'https';
+
 declare module "spdy" {
     // lib/spdy/agent.js
     namespace agent {
-        export class Agent extends node.https.Agent {}
-        export class PlainAgent extends node.http.Agent {}
+        export class Agent extends https.Agent {}
+        export class PlainAgent extends http.Agent {}
         export function create(base: any, options: AgentOptions): Agent | PlainAgent;
 
-        export interface AgentOptions extends node.https.AgentOptions {
+        export interface AgentOptions extends https.AgentOptions {
             port?: number,
             spdy?: {
                 plain?: boolean,
@@ -48,16 +53,16 @@ declare module "spdy" {
 
     // lib/spdy/server.js
     namespace server {
-        export interface Server extends node.https.Server {}
-        export interface PlainServer extends node.http.Server {}
-        export interface IncomingMessage extends node.http.IncomingMessage {}
-        export interface ServerResponse extends node.http.ServerResponse {
+        export interface Server extends https.Server {}
+        export interface PlainServer extends http.Server {}
+        export interface IncomingMessage extends http.IncomingMessage {}
+        export interface ServerResponse extends http.ServerResponse {
             push(filename: string, options: PushOptions): any;
         }
         export function create(base: any,
-                               options: node.https.ServerOptions,
+                               options: https.ServerOptions,
                                handler: (request: IncomingMessage, response: ServerResponse) => void): Server;
-        export function create(options: node.https.ServerOptions,
+        export function create(options: https.ServerOptions,
                                handler: (request: IncomingMessage, response: ServerResponse) => void): Server;
         export function create(handler: (request: IncomingMessage, response: ServerResponse) => void): Server;
 
@@ -76,7 +81,7 @@ declare module "spdy" {
             response?: any
         }
 
-        export interface ServerOptions extends node.https.ServerOptions {
+        export interface ServerOptions extends https.ServerOptions {
             spdy?: {
                 protocols?: Protocol[],
                 plain?: boolean,
@@ -89,300 +94,6 @@ declare module "spdy" {
         }
     }
 
-    // copied from definitions of Node 6.7.0
-    namespace node {
-        namespace http {
-            interface Server extends net.Server {
-                setTimeout(msecs: number, callback: Function): any;
-
-                maxHeadersCount: number;
-                timeout: number;
-                listening: boolean;
-            }
-
-            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;
-            }
-
-            class Agent {
-                maxSockets: number;
-                sockets: any;
-                requests: any;
-
-                constructor(opts?: AgentOptions);
-
-                /**
-                 * Destroy any sockets that are currently in use by the agent.
-                 * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled,
-                 * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise,
-                 * sockets may hang open for quite a long time before the server terminates them.
-                 */
-                destroy(): void;
-            }
-
-            export interface IncomingMessage {
-                path: string;
-                httpVersion: string;
-                httpVersionMajor: number;
-                httpVersionMinor: number;
-                connection: any;
-                headers: any;
-                rawHeaders: string[];
-                trailers: any;
-                rawTrailers: any;
-                setTimeout(msecs: number, callback: Function): any;
-                /**
-                 * 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: any;
-                destroy(error?: Error): void;
-                get(name: string): string;
-            }
-
-            export interface ServerResponse {
-                // Extended base methods
-                write(buffer: any): boolean;
-                write(buffer: any, 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;
-
-                writeContinue(): void;
-                writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void;
-                writeHead(statusCode: number, headers?: any): void;
-                statusCode: number;
-                statusMessage: string;
-                headersSent: boolean;
-                setHeader(name: string, value: string | string[]): void;
-                setTimeout(msecs: number, callback: Function): ServerResponse;
-                sendDate: boolean;
-                getHeader(name: string): string;
-                removeHeader(name: string): void;
-                write(chunk: any, encoding?: string): any;
-                addTrailers(headers: any): void;
-                finished: boolean;
-
-                // Extended base methods
-                end(): void;
-                end(buffer: any, cb?: Function): void;
-                end(str: string, cb?: Function): void;
-                end(str: string, encoding?: string, cb?: Function): void;
-                end(data?: any, encoding?: string): void;
-            }
-        }
-
-        namespace https {
-            interface Server extends tls.Server {
-                close(callback?: Function): Server;
-            }
-
-            interface ServerOptions {
-                pfx?: any;
-                key?: any;
-                passphrase?: string;
-                cert?: any;
-                ca?: any;
-                crl?: any;
-                ciphers?: string;
-                honorCipherOrder?: boolean;
-                requestCert?: boolean;
-                rejectUnauthorized?: boolean;
-                NPNProtocols?: any;
-                SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
-            }
-
-            class Agent extends http.Agent {}
-
-            interface AgentOptions extends http.AgentOptions {
-                pfx?: any;
-                key?: any;
-                passphrase?: string;
-                cert?: any;
-                ca?: any;
-                ciphers?: string;
-                rejectUnauthorized?: boolean;
-                secureProtocol?: string;
-                maxCachedSessions?: number;
-            }
-        }
-
-        namespace tls {
-            interface Server extends net.Server {
-                close(): Server;
-                address(): { port: number; family: string; address: string; };
-                addContext(hostName: string, credentials: {
-                    key: string;
-                    cert: string;
-                    ca: string;
-                }): void;
-                maxConnections: number;
-                connections: number;
-
-                /**
-                 * events.EventEmitter
-                 * 1. tlsClientError
-                 * 2. newSession
-                 * 3. OCSPRequest
-                 * 4. resumeSession
-                 * 5. secureConnection
-                 **/
-                addListener(event: string, listener: Function): this;
-                addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: any) => void): this;
-                addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void) => void): this;
-                addListener(event: "OCSPRequest", listener: (certificate: any, issuer: any, callback: Function) => void): this;
-                addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-                addListener(event: "secureConnection", listener: (tlsSocket: any) => void): this;
-
-                emit(event: string, ...args: any[]): boolean;
-                emit(event: "tlsClientError", err: Error, tlsSocket: any): boolean;
-                emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void): boolean;
-                emit(event: "OCSPRequest", certificate: any, issuer: any, callback: Function): boolean;
-                emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
-                emit(event: "secureConnection", tlsSocket: any): boolean;
-
-                on(event: string, listener: Function): this;
-                on(event: "tlsClientError", listener: (err: Error, tlsSocket: any) => void): this;
-                on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void) => void): this;
-                on(event: "OCSPRequest", listener: (certificate: any, issuer: any, callback: Function) => void): this;
-                on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-                on(event: "secureConnection", listener: (tlsSocket: any) => void): this;
-
-                once(event: string, listener: Function): this;
-                once(event: "tlsClientError", listener: (err: Error, tlsSocket: any) => void): this;
-                once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void) => void): this;
-                once(event: "OCSPRequest", listener: (certificate: any, issuer: any, callback: Function) => void): this;
-                once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-                once(event: "secureConnection", listener: (tlsSocket: any) => void): this;
-
-                prependListener(event: string, listener: Function): this;
-                prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: any) => void): this;
-                prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void) => void): this;
-                prependListener(event: "OCSPRequest", listener: (certificate: any, issuer: any, callback: Function) => void): this;
-                prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-                prependListener(event: "secureConnection", listener: (tlsSocket: any) => void): this;
-
-                prependOnceListener(event: string, listener: Function): this;
-                prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: any) => void): this;
-                prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: any) => void) => void): this;
-                prependOnceListener(event: "OCSPRequest", listener: (certificate: any, issuer: any, callback: Function) => void): this;
-                prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
-                prependOnceListener(event: "secureConnection", listener: (tlsSocket: any) => void): this;
-            }
-
-            interface SecureContext {
-                context: any;
-            }
-        }
-
-        namespace net {
-            interface Server {
-                // net.Server
-                listen(port: number, hostname?: string, backlog?: number, listeningListener?: Function): Server;
-                listen(port: number, hostname?: string, listeningListener?: Function): Server;
-                listen(port: number, backlog?: number, listeningListener?: Function): Server;
-                listen(port: number, listeningListener?: Function): Server;
-                listen(path: string, backlog?: number, listeningListener?: Function): Server;
-                listen(path: string, listeningListener?: Function): Server;
-                listen(handle: any, backlog?: number, listeningListener?: Function): Server;
-                listen(handle: any, listeningListener?: Function): Server;
-                listen(options: ListenOptions, listeningListener?: Function): Server;
-
-                close(callback?: Function): Server;
-
-                address(): { port: number; family: string; address: string; };
-
-                getConnections(cb: (error: Error, count: number) => void): void;
-
-                ref(): Server;
-
-                unref(): Server;
-
-                maxConnections: number;
-                connections: number;
-
-                /**
-                 * events.EventEmitter
-                 *   1. close
-                 *   2. connection
-                 *   3. error
-                 *   4. listening
-                 */
-                addListener(event: string, listener: Function): 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, ...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: Function): 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: Function): 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: Function): 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: Function): 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 ListenOptions {
-                port?: number;
-                host?: string;
-                backlog?: number;
-                path?: string;
-                exclusive?: boolean;
-            }
-        }
-    }
-
     // lib/spdy/socket.js
     namespace socket {
         export interface Socket {
diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index 41095a5839..12716fb32c 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Zachary Maybury <https://github.com/zmaybury>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
@@ -100,51 +100,51 @@ declare module "spectacle" {
 		lineHeight?:number
 	}
 
-	export class Spectacle extends React.Component<SpectacleProps, any> {}
+	export class Spectacle extends React.Component<SpectacleProps> {}
 
-	export class Deck extends React.Component<DeckProps, any> {}
+	export class Deck extends React.Component<DeckProps> {}
 
-	export class Slide extends React.Component<SlideProps, any> {}
+	export class Slide extends React.Component<SlideProps> {}
 
-	export class Layout extends React.Component<any, any> {}
+	export class Layout extends React.Component<any> {}
 
-	export class Fit extends React.Component<any, any> {}
+	export class Fit extends React.Component<any> {}
 
-	export class Fill extends React.Component<any, any> {}
+	export class Fill extends React.Component<any> {}
 
-	export class Markdown extends React.Component<MarkdownProps, any> {}
+	export class Markdown extends React.Component<MarkdownProps> {}
 
-	export class Appear extends React.Component<any, any> {}
+	export class Appear extends React.Component<any> {}
 
-	export class BlockQuote extends React.Component<BaseProps, any> {}
+	export class BlockQuote extends React.Component<BaseProps> {}
 
-	export class Quote extends React.Component<BaseProps, any> {}
+	export class Quote extends React.Component<BaseProps> {}
 
-	export class Cite extends React.Component<BaseProps, any> {}
+	export class Cite extends React.Component<BaseProps> {}
 
-	export class CodePane extends React.Component<CodePaneProps, any> {}
+	export class CodePane extends React.Component<CodePaneProps> {}
 
-	export class Code extends React.Component<BaseProps, any> {}
+	export class Code extends React.Component<BaseProps> {}
 
-	export class Heading extends React.Component<HeadingProps, any> {}
+	export class Heading extends React.Component<HeadingProps> {}
 
-	export class Image extends React.Component<ImageProps, any> {}
+	export class Image extends React.Component<ImageProps> {}
 
-	export class Link extends React.Component<LinkProps, any> {}
+	export class Link extends React.Component<LinkProps> {}
 
-	export class List extends React.Component<BaseProps, any> {}
+	export class List extends React.Component<BaseProps> {}
 
-	export class ListItem extends React.Component<BaseProps, any> {}
+	export class ListItem extends React.Component<BaseProps> {}
 
-	export class S extends React.Component<SProps, any> {}
+	export class S extends React.Component<SProps> {}
 
-	export class Table extends React.Component<BaseProps, any> {}
+	export class Table extends React.Component<BaseProps> {}
 
-	export class TableRow extends React.Component<BaseProps, any> {}
+	export class TableRow extends React.Component<BaseProps> {}
 
-	export class TableHeaderItem extends React.Component<BaseProps, any> {}
+	export class TableHeaderItem extends React.Component<BaseProps> {}
 
-	export class TableItem extends React.Component<BaseProps, any> {}
+	export class TableItem extends React.Component<BaseProps> {}
 
-	export class Text extends React.Component<TextProps, any> {}
+	export class Text extends React.Component<TextProps> {}
 }
\ No newline at end of file
diff --git a/types/spectacle/spectacle-tests.tsx b/types/spectacle/spectacle-tests.tsx
index 5f0c959a50..cfe052a1f1 100644
--- a/types/spectacle/spectacle-tests.tsx
+++ b/types/spectacle/spectacle-tests.tsx
@@ -21,7 +21,7 @@ import {
 	Text
 } from "spectacle";
 
-export class SpectacleTest extends React.Component<any, any> {
+export class SpectacleTest extends React.Component {
 	callback() {
 		alert('Callback: ' + JSON.stringify(arguments));
 	}
diff --git a/types/spectrum/index.d.ts b/types/spectrum/index.d.ts
index 64f72f2e7c..bc94644a92 100644
--- a/types/spectrum/index.d.ts
+++ b/types/spectrum/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bgrins/spectrum/
 // Definitions by: Mordechai Zuber <https://github.com/M-Zuber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 /// <reference types="tinycolor2"/>
diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 6e5ab5a322..2ecd6402ba 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for sqlite3 2.2
+// Type definitions for sqlite3 3.1
 // Project: https://github.com/mapbox/node-sqlite3
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti/>
+//                 Sumant Manne <https://github.com/dpyro/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -12,66 +13,66 @@ export const OPEN_READWRITE: number;
 export const OPEN_CREATE: number;
 
 export const cached: {
-    Database(filename: string, callback?: (err: Error) => void): Database;
-    Database(filename: string, mode?: number, callback?: (err: Error) => void): Database;
+    Database(filename: string, callback?: (this: Database, err: Error | null) => void): Database;
+    Database(filename: string, mode?: number, callback?: (this: Database, err: Error | null) => void): Database;
 };
 
-export interface RunResult {
+export interface RunResult extends Statement {
     lastID: number;
     changes: number;
 }
 
 export class Statement {
-    bind(callback?: (err: Error) => void): Statement;
-    bind(...params: any[]): Statement;
+    bind(callback?: (err: Error | null) => void): this;
+    bind(...params: any[]): this;
 
-    reset(callback?: (err: Error) => void): Statement;
+    reset(callback?: (err: null) => void): this;
 
-    finalize(callback?: (err: Error) => void): Statement;
+    finalize(callback?: (err: Error) => void): Database;
 
-    run(callback?: (err: Error) => void): Statement;
-    run(params: any, callback?: (err: Error) => void): Statement;
-    run(...params: any[]): Statement;
+    run(callback?: (err: Error | null) => void): this;
+    run(params: any, callback?: (this: RunResult, err: Error | null) => void): this;
+    run(...params: any[]): this;
 
-    get(callback?: (err: Error, row: any) => void): Statement;
-    get(params: any, callback?: (err: Error, row: any) => void): Statement;
-    get(...params: any[]): Statement;
+    get(callback?: (err: Error | null, row?: any) => void): this;
+    get(params: any, callback?: (this: RunResult, err: Error | null, row?: any) => void): this;
+    get(...params: any[]): this;
 
-    all(callback?: (err: Error, rows: any[]) => void): Statement;
-    all(params: any, callback?: (err: Error, rows: any[]) => void): Statement;
-    all(...params: any[]): Statement;
+    all(callback?: (err: Error | null, rows: any[]) => void): this;
+    all(params: any, callback?: (this: RunResult, err: Error | null, rows: any[]) => void): this;
+    all(...params: any[]): this;
 
-    each(callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
-    each(params: any, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
-    each(...params: any[]): Statement;
+    each(callback?: (err: Error | null, row: any) => void, complete?: (err: Error | null, count: number) => void): this;
+    each(params: any, callback?: (this: RunResult, err: Error | null, row: any) => void, complete?: (err: Error | null, count: number) => void): this;
+    each(...params: any[]): this;
 }
 
 export class Database extends events.EventEmitter {
-    constructor(filename: string, callback?: (err: Error) => void);
-    constructor(filename: string, mode?: number, callback?: (err: Error) => void);
+    constructor(filename: string, callback?: (err: Error | null) => void);
+    constructor(filename: string, mode?: number, callback?: (err: Error | null) => void);
 
-    close(callback?: (err: Error) => void): void;
+    close(callback?: (err: Error | null) => void): void;
 
-    run(sql: string, callback?: (err: Error) => void): Database;
-    run(sql: string, params: any, callback?: (err: Error) => void): Database;
-    run(sql: string, ...params: any[]): Database;
+    run(sql: string, callback?: (this: RunResult, err: Error | null) => void): this;
+    run(sql: string, params: any, callback?: (this: RunResult, err: Error | null) => void): this;
+    run(sql: string, ...params: any[]): this;
 
-    get(sql: string, callback?: (err: Error, row: any) => void): Database;
-    get(sql: string, params: any, callback?: (err: Error, row: any) => void): Database;
-    get(sql: string, ...params: any[]): Database;
+    get(sql: string, callback?: (this: Statement, err: Error | null, row: any) => void): this;
+    get(sql: string, params: any, callback?: (this: Statement, err: Error | null, row: any) => void): this;
+    get(sql: string, ...params: any[]): this;
 
-    all(sql: string, callback?: (err: Error, rows: any[]) => void): Database;
-    all(sql: string, params: any, callback?: (err: Error, rows: any[]) => void): Database;
-    all(sql: string, ...params: any[]): Database;
+    all(sql: string, callback?: (this: Statement, err: Error | null, rows: any[]) => void): this;
+    all(sql: string, params: any, callback?: (this: Statement, err: Error | null, rows: any[]) => void): this;
+    all(sql: string, ...params: any[]): this;
 
-    each(sql: string, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
-    each(sql: string, params: any, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
-    each(sql: string, ...params: any[]): Database;
+    each(sql: string, callback?: (this: Statement, err: Error | null, row: any) => void, complete?: (err: Error | null, count: number) => void): this;
+    each(sql: string, params: any, callback?: (this: Statement, err: Error | null, row: any) => void, complete?: (err: Error | null, count: number) => void): this;
+    each(sql: string, ...params: any[]): this;
 
-    exec(sql: string, callback?: (err: Error) => void): Database;
+    exec(sql: string, callback?: (this: Statement, err: Error | null) => void): this;
 
-    prepare(sql: string, callback?: (err: Error) => void): Statement;
-    prepare(sql: string, params: any, callback?: (err: Error) => void): Statement;
+    prepare(sql: string, callback?: (this: Statement, err: Error | null) => void): Statement;
+    prepare(sql: string, params: any, callback?: (this: Statement, err: Error | null) => void): Statement;
     prepare(sql: string, ...params: any[]): Statement;
 
     serialize(callback?: () => void): void;
diff --git a/types/ss-utils/index.d.ts b/types/ss-utils/index.d.ts
index a842b4ca45..e433d5430e 100644
--- a/types/ss-utils/index.d.ts
+++ b/types/ss-utils/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://servicestack.net/
 // Definitions by: Demis Bellot <https://github.com/mythz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/stacktrace-js/index.d.ts b/types/stacktrace-js/index.d.ts
index 4f0bac1635..96be8bfbf5 100644
--- a/types/stacktrace-js/index.d.ts
+++ b/types/stacktrace-js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for stacktrace.js
 // Project: https://github.com/stacktracejs/stacktrace.js
 // Definitions by: Exceptionless <https://github.com/exceptionless>
+//                 Chun-Yan Ho <https://github.com/pilagod>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace StackTrace {
@@ -35,6 +36,10 @@ declare namespace StackTrace {
     toString():   string;
   }
 
+  export interface RequestOptions {
+    headers: { [id: string]: string };
+  }
+
   /**
    * Get a backtrace from invocation point.
    * @param options Options Object
@@ -42,6 +47,13 @@ declare namespace StackTrace {
    */
   export function get(options?: StackTraceOptions): Promise<StackFrame[]>;
 
+  /**
+   * Get a backtrace from invocation point synchronously.
+   * @param options Options Object
+   * @return Array[StackFrame]
+   */
+  export function getSync(options?: StackTraceOptions): StackFrame[];
+
   /**
    * Given an error object, parse it.
    * @param error Error object
@@ -81,11 +93,13 @@ declare namespace StackTrace {
   /**
    * Given an Array of StackFrames, serialize and POST to given URL.
    *
-   * @param stackframes - Array[StackFrame]
-   * @param url - URL as String
-   * @return Promise<string>
+   * @param {Array} stackframes - Previously wrapped Function
+   * @param {string} url - URL to POST stack JSON to
+   * @param {string} message - Optional Error message
+   * @param {Object} requestOptions - Request Headers {headers: {key: "value"}}
+   * @return {Promise<string>} - Promise is resolved with response text from POST request.
    */
-  export function report(stackframes: StackFrame[], url: string): Promise<string>;
+  export function report(stackframes: StackFrame[], url: string, message?: string, requestOptions?: RequestOptions): Promise<string>;
 }
 
 declare module "stacktrace-js" {
diff --git a/types/stacktrace-js/stacktrace-js-tests.ts b/types/stacktrace-js/stacktrace-js-tests.ts
index da263a6485..6fac703c7f 100644
--- a/types/stacktrace-js/stacktrace-js-tests.ts
+++ b/types/stacktrace-js/stacktrace-js-tests.ts
@@ -29,6 +29,7 @@ const options: StackTrace.StackTraceOptions = {
 const error = new Error('BOOM!');
 
 StackTrace.get(options).then(logger);
+logger(StackTrace.getSync(options))
 StackTrace.fromError(error, options).then(logger);
 StackTrace.generateArtificially(options).then(logger);
 
diff --git a/types/stale-lru-cache/index.d.ts b/types/stale-lru-cache/index.d.ts
index f5ab3733b3..80be52905d 100644
--- a/types/stale-lru-cache/index.d.ts
+++ b/types/stale-lru-cache/index.d.ts
@@ -22,7 +22,7 @@ declare class Cache<K, V> {
 }
 
 declare namespace Cache {
-    type OptionsCallback<K, V> = (error: any, value: V, options?: string | SetOptions<K, V>) => void;
+    type OptionsCallback<K, V> = (error: any, value?: V, options?: string | SetOptions<K, V>) => void;
     type RevalidationCallback<K, V> = (key: K, callback: OptionsCallback<K, V>) => void;
 
     interface CacheOptions<K, V> {
diff --git a/types/state-machine/index.d.ts b/types/state-machine/index.d.ts
deleted file mode 100644
index 5ece36c4c1..0000000000
--- a/types/state-machine/index.d.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// Type definitions for Finite State Machine 2.3.5
-// Project: https://github.com/jakesgordon/javascript-state-machine
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Maarten Docter <https://github.com/mdocter>, William Sears <https://github.com/MrBigDog2U>, samael <https://github.com/samael65535>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface StateMachineErrorCallback {
-    (eventName?: string, from?: string, to?: string, args?: any[], errorCode?: number, errorMessage?: string, ex?: Error): void; // NB. errorCode? See: StateMachine.Error
-}
-
-interface StateMachineEventDef {
-    name: string;
-    from: any;    // string or string[]
-    to: string;
-}
-
-interface StateMachineEvent {
-	(...args: any[]): void;
-}
-
-interface StateMachineConfig {
-    initial?: any; // string or { state: 'foo', event: 'setup', defer: true|false }
-    events?: StateMachineEventDef[];
-    callbacks?: {
-        [s: string]: (event?: string, from?: string, to?: string, ...args: any[]) => any;
-    };
-    target?: StateMachine;
-    error?: StateMachineErrorCallback;
-}
-
-interface StateMachineIsFinished {
-    (state: string): boolean;
-}
-
-interface StateMachineStatic {
-
-    VERSION: string; 		        // = "2.3.5"
-    WILDCARD: string;		        // = '*'
-    ASYNC: string;			        // = 'async'
-
-    Result: {
-        SUCCEEDED: number;	        // = 1, the event transitioned successfully from one state to another
-        NOTRANSITION: number;	    // = 2, the event was successfull but no state transition was necessary
-        CANCELLED: number;	        // = 3, the event was cancelled by the caller in a beforeEvent callback
-        PENDING: number;		        // = 4, the event is asynchronous and the caller is in control of when the transition occurs
-    };
-
-    Error: {
-        INVALID_TRANSITION: number;	// = 100, caller tried to fire an event that was innapropriate in the current state
-        PENDING_TRANSITION: number;	// = 200, caller tried to fire an event while an async transition was still pending
-        INVALID_CALLBACK: number;	// = 300, caller provided callback function threw an exception
-    };
-
-    create(config: StateMachineConfig, target?: StateMachine): StateMachine;
-}
-
-interface StateMachineTransition {
-	(): void;
-	cancel(): void;
-}
-
-interface StateMachineIs {
-	(state: string): boolean;
-}
-
-interface StateMachineCan {
-	(evt: string): boolean;
-}
-
-interface StateMachineTransitions {
-    (): Array<string>;
-}
-
-interface StateMachine {
-    current: string;
-    is: StateMachineIs;
-    can: StateMachineCan;
-    cannot: StateMachineCan;
-    error: StateMachineErrorCallback;
-	isFinished: StateMachineIsFinished;
-    /*  transition - only available when performing async state transitions; otherwise null. Can be a: 
-        [1] fsm.transition(); // called from async callback
-        [2] fsm.transition.cancel();
-    */
-    transition: StateMachineTransition;
-    transitions: StateMachineTransitions;
-}
-
-declare var StateMachine: StateMachineStatic;
-
-declare module "state-machine" {
-    export = StateMachine;
-}
-
-declare module "javascript-state-machine" {
-
-    export let StateMachine: StateMachineStatic;
-}
diff --git a/types/state-machine/state-machine-tests.ts b/types/state-machine/state-machine-tests.ts
deleted file mode 100644
index 0a433de593..0000000000
--- a/types/state-machine/state-machine-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-interface StateMachineTest extends StateMachine {
-	warn?: StateMachineEvent;
-	panic?: StateMachineEvent;
-	calm?: StateMachineEvent;
-	clear?: StateMachineEvent;
-}
-
-var fsm: StateMachineTest = StateMachine.create({
-    initial: 'green',
-    events: [
-      { name: 'warn', from: 'green', to: 'yellow' },
-      { name: 'panic', from: 'yellow', to: 'red' },
-      { name: 'calm', from: 'red', to: 'yellow' },
-      { name: 'clear', from: 'yellow', to: 'green' }
-    ],
-    callbacks: {
-        onpanic: function (event?, from?, to?, msg?) { alert('panic! ' + msg); },
-        onclear: function (event?, from?, to?, msg?) { alert('thanks to ' + msg); },
-        ongreen: function (event?, from?, to?) { document.body.className = 'green'; },
-        onyellow: function (event?, from?, to?) { document.body.className = 'yellow'; },
-        onred: function (event?, from?, to?) { document.body.className = 'red'; },
-    }
-});
-
-//fsm.warn();					// transition from green to yellow
-//fsm.panic("ERROR ALERT");	// transition from yellow to red
-//fsm.calm();					// transition from red to yellow
-//fsm.clear("All clear");		// transition from yellow to green
-
-let transitions: Array<string> = fsm.transitions();
diff --git a/types/status-bar/index.d.ts b/types/status-bar/index.d.ts
index 44511b8998..44bce0436d 100644
--- a/types/status-bar/index.d.ts
+++ b/types/status-bar/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/atom/status-bar
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="space-pen" />
 /// <reference types="text-buffer" />
diff --git a/types/steed/steed-tests.ts b/types/steed/steed-tests.ts
index 708a443fa1..ed923202e5 100644
--- a/types/steed/steed-tests.ts
+++ b/types/steed/steed-tests.ts
@@ -1,4 +1,5 @@
-/// <reference types="node" />
+declare var console: { log(...args: any[]): void };
+declare var setTimeout: (cb: () => void, timeout: number) => void;
 
 import steed = require('steed');
 
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
new file mode 100644
index 0000000000..e351d1c919
--- /dev/null
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for @storybook/addon-knobs 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="storybook__react" />
+
+// TODO: Once TS2.3 is released,
+// https://github.com/Microsoft/TypeScript/issues/14819 should be fixed.
+// Then, upgrade this package's typescript version to 2.3 and
+// Remove the `declare module` wrapper.
+// tslint:disable-next-line no-single-declare-module
+declare module '@storybook/addon-knobs' {
+    import * as React from 'react';
+    import { RenderFunction } from '@storybook/react';
+
+    interface KnobOption<T> {
+        value: T;
+        type: 'text' | 'boolean' | 'number' | 'color' | 'object' | 'select' | 'date';
+    }
+
+    interface StoryContext {
+        kind: string;
+        story: string;
+    }
+
+    interface NumberOptions {
+        range: boolean;
+        min: number;
+        max: number;
+        step: number;
+    }
+
+    function knob<T>(name: string, options: KnobOption<T>): T;
+
+    function text(name: string, value: string | null): string;
+
+    function boolean(name: string, value: boolean): boolean;
+
+    function number(name: string, value: number, options?: NumberOptions): number;
+
+    function color(name: string, value: string): string;
+
+    function object<T>(name: string, value: T): T;
+
+    function select<T>(name: string, options: { [s: string]: T }, value: string): T;
+    function select(name: string, options: string[], value: string): string;
+
+    function date(name: string, value?: Date): Date;
+
+    interface WrapStoryProps {
+        context?: object;
+        storyFn?: RenderFunction;
+        channel?: object;
+        knobStore?: object;
+        initialContent?: object;
+    }
+
+    function withKnobs(storyFn: RenderFunction, context: StoryContext): React.ReactElement<WrapStoryProps>;
+    function withKnobsOptions(options: { debounce: boolean, timestamps: boolean }): (storyFn: RenderFunction, context: StoryContext) => React.ReactElement<WrapStoryProps>;
+}
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
new file mode 100644
index 0000000000..76c72f1a7d
--- /dev/null
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import {
+  withKnobs,
+  withKnobsOptions,
+  number,
+  color,
+  object,
+  boolean,
+  text,
+  select,
+  date,
+  knob,
+} from '@storybook/addon-knobs';
+
+const stories = storiesOf('Example of Knobs', module);
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(withKnobsOptions({ debounce: true, timestamps: true }));
+
+stories.add('with all knobs', () => {
+  const name = text('Name', 'Tom Cary');
+  const dob = date('DOB', new Date('January 20 1887'));
+
+  const bold = boolean('Bold', false);
+  const selectedColor = color('Color', 'black');
+  const favoriteNumber = number('Favorite Number', 42);
+  const comfortTemp = number('Comfort Temp', 72, { range: true, min: 60, max: 90, step: 1 });
+  const textDecoration = select('Decoration', {
+    none: 'None',
+    underline: 'Underline',
+    'line-through': 'Line-Through'
+  }, 'none');
+
+  const customStyle = object('Style', {
+    fontFamily: 'Arial',
+    padding: 20,
+  });
+
+  const genericObject: string = object<string>('Some generic object', 'value');
+  type X = 'a' | 'b';
+  const genericSelect: X = select<X>('Some generic select', { a: 'a', b: 'b'}, 'b');
+  const genericKnob: X = knob<X>('Some generic knob', { value: 'a', type: 'text' });
+
+  const style = Object.assign({}, customStyle, {
+    fontWeight: bold ? 800 : 400,
+    color: selectedColor,
+    textDecoration
+  });
+
+  return (
+    <div style={style}>
+      I'm {name} and I was born on "{dob}"
+      <p>My favorite number is {favoriteNumber}.</p>
+      <p>My most comfortable room temperature is {comfortTemp} degrees Fahrenheit.</p>
+    </div>
+  );
+});
+
+stories.add('dynamic knobs', () => {
+  const showOptional = select('Show optional', ['yes', 'no'], 'yes');
+  return (
+    <div>
+      <div>
+        {text('compulsary', 'I must be here')}
+      </div>
+      { showOptional === 'yes' ? <div>{text('optional', 'I can disapear')}</div> : null }
+    </div>
+  );
+});
diff --git a/types/storybook__addon-knobs/tsconfig.json b/types/storybook__addon-knobs/tsconfig.json
new file mode 100644
index 0000000000..952095eea1
--- /dev/null
+++ b/types/storybook__addon-knobs/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-knobs-tests.tsx"
+    ]
+}
diff --git a/types/storybook__addon-knobs/tslint.json b/types/storybook__addon-knobs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-knobs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
new file mode 100644
index 0000000000..d66f049c3c
--- /dev/null
+++ b/types/storybook__addon-links/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for @storybook/addon-links 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// TODO: Once TS2.3 is released,
+// https://github.com/Microsoft/TypeScript/issues/14819 should be fixed.
+// Then, upgrade this package's typescript version to 2.3 and
+// Remove the `declare module` wrapper.
+// tslint:disable-next-line no-single-declare-module
+declare module '@storybook/addon-links' {
+    import * as React from 'react';
+
+    function linkTo<T>(book: string, kind?: string): React.MouseEventHandler<T>;
+}
diff --git a/types/storybook__addon-links/storybook__addon-links-tests.tsx b/types/storybook__addon-links/storybook__addon-links-tests.tsx
new file mode 100644
index 0000000000..a818c12f6c
--- /dev/null
+++ b/types/storybook__addon-links/storybook__addon-links-tests.tsx
@@ -0,0 +1,13 @@
+/// <reference types="storybook__react" />
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { linkTo } from '@storybook/addon-links';
+
+storiesOf('Button', module)
+  .add('First', () => (
+    <button onClick={linkTo('Button', 'Second')}>Go to "Second"</button>
+  ))
+  .add('Second', () => (
+    <button onClick={linkTo('Button', 'First')}>Go to "First"</button>
+  ));
diff --git a/types/storybook__addon-links/tsconfig.json b/types/storybook__addon-links/tsconfig.json
new file mode 100644
index 0000000000..79562bc8c1
--- /dev/null
+++ b/types/storybook__addon-links/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-links-tests.tsx"
+    ]
+}
diff --git a/types/storybook__addon-links/tslint.json b/types/storybook__addon-links/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-links/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-notes/index.d.ts b/types/storybook__addon-notes/index.d.ts
new file mode 100644
index 0000000000..dd39d700d6
--- /dev/null
+++ b/types/storybook__addon-notes/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for @storybook/addon-notes 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// TODO: Once TS2.3 is released,
+// https://github.com/Microsoft/TypeScript/issues/14819 should be fixed.
+// Then, upgrade this package's typescript version to 2.3 and
+// Remove the `declare module` wrapper.
+// tslint:disable-next-line no-single-declare-module
+declare module '@storybook/addon-notes' {
+    import * as React from 'react';
+
+    interface WithNotesProps extends React.HTMLProps<HTMLDivElement> {
+        notes?: string;
+    }
+
+    const WithNotes: React.StatelessComponent<WithNotesProps>;
+}
diff --git a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
new file mode 100644
index 0000000000..554253952f
--- /dev/null
+++ b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
@@ -0,0 +1,13 @@
+/// <reference types="storybook__react" />
+
+import * as React from 'react';
+
+import { storiesOf } from '@storybook/react';
+import { WithNotes } from '@storybook/addon-notes';
+
+storiesOf('Component', module)
+  .add('with some emoji', () => (
+    <WithNotes notes={'A very simple component'}>
+      my component
+    </WithNotes>
+  ));
diff --git a/types/storybook__addon-notes/tsconfig.json b/types/storybook__addon-notes/tsconfig.json
new file mode 100644
index 0000000000..3b87db180c
--- /dev/null
+++ b/types/storybook__addon-notes/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-notes-tests.tsx"
+    ]
+}
diff --git a/types/storybook__addon-notes/tslint.json b/types/storybook__addon-notes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-notes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
new file mode 100644
index 0000000000..05bb10a7ff
--- /dev/null
+++ b/types/storybook__addon-options/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for @storybook/addon-options 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// TODO: Once TS2.3 is released,
+// https://github.com/Microsoft/TypeScript/issues/14819 should be fixed.
+// Then, upgrade this package's typescript version to 2.3 and
+// Remove the `declare module` wrapper.
+// tslint:disable-next-line no-single-declare-module
+declare module '@storybook/addon-options' {
+    interface Options {
+        name?: string;
+        url?: string;
+        goFullScreen?: boolean;
+        showLeftPanel?: boolean;
+        showDownPanel?: boolean;
+        showSearchBox?: boolean;
+        downPanelInRight?: boolean;
+        sortStoriesByKind?: boolean;
+    }
+
+    function setOptions(options: Options): void;
+}
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
new file mode 100644
index 0000000000..c4a53edf05
--- /dev/null
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -0,0 +1,12 @@
+import { setOptions } from '@storybook/addon-options';
+
+setOptions({
+  name: 'My Storybook',
+  url: 'https://example.com',
+  goFullScreen: false,
+  showLeftPanel: false,
+  showDownPanel: false,
+  showSearchBox: false,
+  downPanelInRight: false,
+  sortStoriesByKind: false,
+});
diff --git a/types/storybook__addon-options/tsconfig.json b/types/storybook__addon-options/tsconfig.json
new file mode 100644
index 0000000000..cd12824c53
--- /dev/null
+++ b/types/storybook__addon-options/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-options-tests.ts"
+    ]
+}
diff --git a/types/storybook__addon-options/tslint.json b/types/storybook__addon-options/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-options/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
new file mode 100644
index 0000000000..501c3cb947
--- /dev/null
+++ b/types/storybook__react/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for @storybook/react 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+// TODO: Once TS2.3 is released,
+// https://github.com/Microsoft/TypeScript/issues/14819 should be fixed.
+// Then, upgrade this package's typescript version to 2.3 and
+// Remove the `declare module` wrapper.
+// tslint:disable-next-line no-single-declare-module
+declare module '@storybook/react' {
+    import * as React from 'react';
+
+    type Renderable = React.StatelessComponent<any> | React.Component<any> | JSX.Element;
+    type RenderFunction = () => Renderable;
+
+    type StoryDecorator = (story: RenderFunction, context: { kind: string, story: string }) => Renderable | null;
+
+    interface Story {
+        add(storyName: string, callback: RenderFunction): Story;
+        addDecorator(decorator: StoryDecorator): Story;
+    }
+
+    function addDecorator(decorator: StoryDecorator): void;
+    function configure(fn: () => void, module: any): void;
+    function setAddon(addon: object): void;
+    function storiesOf(name: string, module: NodeModule): Story;
+    function storiesOf<T>(name: string, module: NodeModule): Story & T;
+
+    interface StoryObject {
+        name: string;
+        render: RenderFunction;
+    }
+
+    interface StoryBucket {
+        kind: string;
+        stories: StoryObject[];
+    }
+
+    function getStorybook(): StoryBucket[];
+}
diff --git a/types/storybook__react/storybook__react-tests.tsx b/types/storybook__react/storybook__react-tests.tsx
new file mode 100644
index 0000000000..0c43c73a74
--- /dev/null
+++ b/types/storybook__react/storybook__react-tests.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import { storiesOf, setAddon, addDecorator, configure, getStorybook, RenderFunction, Story } from '@storybook/react';
+
+const Decorator = (story: RenderFunction) => <div>{story()}</div>;
+
+storiesOf('Welcome', module)
+    // local addDecorator
+    .addDecorator(Decorator)
+    .add('to Storybook', () => <div/>);
+
+// global addDecorator
+addDecorator(Decorator);
+
+// setAddon
+interface AnyAddon {
+    xyz(): void;
+}
+const AnyAddon: AnyAddon = {
+    xyz() {}
+};
+setAddon(AnyAddon);
+storiesOf<AnyAddon>('withAnyAddon', module).xyz();
+
+// configure
+configure(() => undefined, module);
+
+// getStorybook
+getStorybook().forEach(({ kind, stories }) => stories.forEach(({ name, render }) => render()));
diff --git a/types/storybook__react/tsconfig.json b/types/storybook__react/tsconfig.json
new file mode 100644
index 0000000000..1feb9ad94d
--- /dev/null
+++ b/types/storybook__react/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__react-tests.tsx"
+    ]
+}
diff --git a/types/storybook__react/tslint.json b/types/storybook__react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stripe-checkout/index.d.ts b/types/stripe-checkout/index.d.ts
index 41f94f3a2c..b546ef1851 100644
--- a/types/stripe-checkout/index.d.ts
+++ b/types/stripe-checkout/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Chris Wrench <https://github.com/cgwrench>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="stripe"/>
+/// <reference types="stripe/v2"/>
 
 interface StripeCheckoutStatic {
     configure(options: StripeCheckoutOptions): StripeCheckoutHandler;
diff --git a/types/stripe-node/index.d.ts b/types/stripe-node/index.d.ts
index b299f5c2a1..a6193cb45d 100644
--- a/types/stripe-node/index.d.ts
+++ b/types/stripe-node/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: William Johnston <https://github.com/wjohnsto>, Peter Harris <https://github.com/codeanimal/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="bluebird" />
 /// <reference types="node" />
 
 declare module 'stripe' {
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 3e5d902060..f58d5e602f 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stripe 2.x
+// Type definitions for stripe 3.0
 // Project: https://stripe.com/
 // Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>
 //                 Eric J. Smith <https://github.com/ejsmith/>
@@ -7,161 +7,184 @@
 //                 Justin Leider <https://github.com/jleider>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare const Stripe: StripeStatic;
+export function Stripe(stripePublicKey: string): stripe.StripeStatic;
 
-interface StripeStatic {
-    applePay: StripeApplePay;
-    setPublishableKey(key: string): void;
-    validateCardNumber(cardNumber: string): boolean;
-    validateExpiry(month: string, year: string): boolean;
-    validateCVC(cardCVC: string): boolean;
-    cardType(cardNumber: string): StripeCardDataBrand;
-    getToken(token: string, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
-    card: StripeCard;
-    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
-    bankAccount: StripeBankAccount;
-}
+export namespace stripe {
+    interface StripeStatic {
+        elements(options?: elements.ElementsCreateOptions): elements.Elements;
+        createToken(element: elements.Element, options?: TokenOptions): Promise<TokenResponse>;
+    }
 
-interface StripeCardTokenData {
-    number: string;
-    exp_month?: number;
-    exp_year?: number;
-    exp?: string;
-    cvc?: string;
-    name?: string;
-    address_line1?: string;
-    address_line2?: string;
-    address_city?: string;
-    address_state?: string;
-    address_zip?: string;
-    address_country?: string;
-}
+    interface TokenOptions {
+        name?: string;
+        address_line1?: string;
+        address_line2?: string;
+        address_city?: string;
+        address_state?: string;
+        address_zip?: string;
+        address_country?: string;
+        currency?: string;
+    }
 
-interface StripeTokenResponse {
-    id: string;
-    client_ip: string;
-    created: number;
-    livemode: boolean;
-    object: string;
-    type: string;
-    used: boolean;
-    error?: StripeError;
-}
-
-interface StripeCardTokenResponse extends StripeTokenResponse {
-    card: StripeCard;
-}
-
-interface StripeError {
-    type: string;
-    code: string;
-    message: string;
-    param?: string;
-}
-
-type StripeCardDataBrand = 'Visa' | 'American Express' | 'MasterCard' | 'Discover' | 'JCB' | 'Diners Club' | 'Unknown';
-
-interface StripeCard {
-    object: string;
-    last4: string;
-    exp_month: number;
-    exp_year: number;
-    country?: string;
-    name?: string;
-    address_line1?: string;
-    address_line2?: string;
-    address_city?: string;
-    address_state?: string;
-    address_zip?: string;
-    address_country?: string;
-    brand?: StripeCardDataBrand;
-    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
-    validateCardNumber(cardNumber: string): boolean;
-    validateExpiry(month: string, year: string): boolean;
-    validateCVC(cardCVC: string): boolean;
-}
-
-interface StripeBankAccount {
-    createToken(params: StripeBankTokenParams, stripeResponseHandler: (status: number, response: StripeBankTokenResponse) => void): void;
-    validateRoutingNumber(routingNumber: number | string, countryCode: string): boolean;
-    validateAccountNumber(accountNumber: number | string, countryCode: string): boolean;
-}
-
-interface StripeBankTokenParams {
-    country: string;
-    currency: string;
-    account_number: number | string;
-    routing_number?: number | string;
-    account_holder_name: string;
-    account_holder_type: string;
-}
-
-interface StripeBankTokenResponse extends StripeTokenResponse {
-    bank_account: {
-        country: string;
-        bank_name: string;
-        last4: number;
-        validated: boolean;
+    interface Token {
+        id: string;
         object: string;
-    };
+        bank_account?: BankAccount;
+        card?: Card;
+        client_ip: string;
+        created: number;
+        livemode: boolean;
+        type: string;
+        used: boolean;
+    }
+
+    interface TokenResponse {
+        token?: Token;
+        error?: Error;
+    }
+
+    interface Error {
+        type: string;
+        charge: string;
+        message?: string;
+        code?: string;
+        declined_code?: string;
+        param?: string;
+    }
+
+    type statusType = 'new' | 'validated' | 'verified' | 'verification_failed' | 'errored';
+    interface BankAccount {
+        id: string;
+        object: string;
+        account_holder_name: string;
+        account_holder_type: string;
+        bank_name: string;
+        country: string;
+        currency: string;
+        fingerprint: string;
+        last4: string;
+        routing_number: string;
+        status: statusType;
+    }
+
+    type brandType = 'Visa' | 'American Express' | 'MasterCard' | 'Discover' | 'JCB' | 'Diners Club' | 'Unknown';
+    type checkType = 'pass' | 'fail' | 'unavailable' | 'unchecked';
+    type fundingType = 'credit' | 'debit' | 'prepaid' | 'unknown';
+    type tokenizationType = 'apple_pay' | 'android_pay';
+    interface Card {
+        id: string;
+        object: string;
+        address_city?: string;
+        address_country?: string;
+        address_line1?: string;
+        address_line1_check?: checkType;
+        address_line2?: string;
+        address_state?: string;
+        address_zip?: string;
+        address_zip_check?: checkType;
+        brand: brandType;
+        country: string;
+        currency?: string;
+        cvc_check?: checkType;
+        dynamic_last4: string;
+        exp_month: number;
+        exp_year: number;
+        fingerprint: string;
+        funding: fundingType;
+        last4: string;
+        metadata: any;
+        name?: string;
+        tokenization_method?: tokenizationType;
+    }
+
+    // Container for all elements related types
+    namespace elements {
+        interface ElementsCreateOptions {
+            fonts?: elements.Font[];
+            locale?: string;
+        }
+
+        type handler = (response?: ElementChangeResponse) => void;
+        type eventTypes = 'blur' | 'change' | 'focus' | 'ready';
+        interface Element {
+            // HTMLElement keeps giving this error for some reason:
+            // Cannot find name 'HTMLElement'
+            mount(domElement: string | any): void;
+            on(event: eventTypes, handler: handler): void;
+            blur(): void;
+            clear(): void;
+            unmount(): void;
+            update(options: ElementsOptions): void;
+        }
+
+        interface ElementChangeResponse {
+            brand: string;
+            complete: boolean;
+            empty: boolean;
+            value?: { postalCode: string | number };
+            error?: Error;
+        }
+
+        interface ElementOptions {
+            fonts?: elements.Font[];
+            locale?: string;
+        }
+
+        type elementsType = 'card' | 'cardNumber' | 'cardExpiry' | 'cardCvc' | 'postalCode';
+        interface Elements {
+            create(type: elementsType, options: ElementsOptions): Element;
+        }
+
+        interface ElementsOptions {
+            classes?: {
+                base?: string;
+                complete?: string;
+                empty?: string;
+                focus?: string;
+                invalid?: string;
+                webkitAutofill?: string;
+            };
+            hidePostalCode?: boolean;
+            hideIcon?: boolean;
+            iconStyle?: 'solid' | 'default';
+            style?: {
+                base?: Style;
+                complete?: Style;
+                empty?: Style;
+                invalid?: Style;
+            };
+            value?: string | {[objectKey: string]: string; };
+        }
+
+        interface Style extends StyleOptions {
+            ':hover'?: StyleOptions;
+            ':focus'?: StyleOptions;
+            '::placeholder'?: StyleOptions;
+            '::selection'?: StyleOptions;
+            ':-webkit-autofill'?: StyleOptions;
+        }
+
+        interface Font {
+            family?: string;
+            src?: string;
+            style?: string;
+            unicodeRange?: string;
+            weight?: string;
+        }
+
+        interface StyleOptions {
+            color?: string;
+            fontFamily?: string;
+            fontSize?: string;
+            fontSmoothing?: string;
+            fontStyle?: string;
+            fontVariant?: string;
+            iconColor?: string;
+            lineHeight?: string;
+            letterSpacing?: string;
+            textDecoration?: string;
+            textShadow?: string;
+            textTransform?: string;
+        }
+    }
 }
-
-interface StripeApplePay {
-    checkAvailability(resopnseHandler: (result: boolean) => void): void;
-    buildSession(data: StripeApplePayPaymentRequest,
-                 onSuccessHandler: (result: StripeApplePaySessionResult, completion: ((value: any) => void)) => void,
-                 onErrorHanlder: (error: { message: string }) => void): any;
-}
-
-type StripeApplePayBillingContactField = 'postalAddress' | 'name';
-type StripeApplePayShippingContactField = StripeApplePayBillingContactField | 'phone' | 'email';
-type StripeApplePayShipping = 'shipping' | 'delivery' | 'storePickup' | 'servicePickup';
-
-interface StripeApplePayPaymentRequest {
-    billingContact: StripeApplePayPaymentContact;
-    countryCode: string;
-    currencyCode: string;
-    total: StripeApplePayLineItem;
-    lineItems?: StripeApplePayLineItem[];
-    requiredBillingContactFields?: StripeApplePayBillingContactField[];
-    requiredShippingContactFields?: StripeApplePayShippingContactField[];
-    shippingContact?: StripeApplePayPaymentContact;
-    shippingMethods?: StripeApplePayShippingMethod[];
-    shippingType?: StripeApplePayShipping[];
-}
-
-// https://developer.apple.com/reference/applepayjs/1916082-applepay_js_data_types
-interface StripeApplePayLineItem {
-    type: 'pending' | 'final';
-    label: string;
-    amount: number;
-}
-
-interface StripeApplePaySessionResult {
-    token: StripeCardTokenResponse;
-    shippingContact?: StripeApplePayPaymentContact;
-    shippingMethod?: StripeApplePayShippingMethod;
-}
-
-interface StripeApplePayShippingMethod {
-    label: string;
-    detail: string;
-    amount: number;
-    identifier: string;
-}
-
-interface StripeApplePayPaymentContact {
-    emailAddress: string;
-    phoneNumber: string;
-    givenName: string;
-    familyName: string;
-    addressLines: string[];
-    locality: string;
-    administrativeArea: string;
-    postalCode: string;
-    countryCode: string;
-}
-
-// The Stripe client side APIs are not made available to package managers for direct installation.
-// As explained compliance reasons. Source: https://github.com/stripe/stripe-node/blob/master/README.md#these-are-serverside-bindings-only
-// A release date versioning schema is used to version these APIs.
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 56e6343f5c..f777c0eb34 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -1,25 +1,39 @@
-function success(card: StripeCard) {
-    console.log(card.brand && card.brand.toString());
-}
+import {stripe, Stripe} from 'stripe';
 
-const cardNumber = '4242424242424242';
-
-const isValid = Stripe.validateCardNumber(cardNumber);
-if (isValid) {
-    const tokenData: StripeCardTokenData = {
-        number: cardNumber,
-        exp_month: 1,
-        exp_year: 2100,
-        cvc: '111'
-    };
-    Stripe.card.createToken(tokenData, (status, response) => {
-        if (response.error) {
-            console.error(response.error.message);
-            if (response.error.param) {
-                console.error(response.error.param);
-            }
-        } else {
-            success(response.card);
+const stripe = Stripe('public-key');
+const elements = stripe.elements();
+const style = {
+    base: {
+        color: '#32325d',
+        lineHeight: '24px',
+        fontFamily: 'Roboto, "Helvetica Neue", sans-serif',
+        fontSmoothing: 'antialiased',
+        fontSize: '16px',
+        '::placeholder': {
+            color: '#aab7c4'
         }
-    });
-}
+    },
+    invalid: {
+        color: '#B71C1C',
+        iconColor: '#B71C1C'
+    }
+};
+const card = elements.create('card', {hidePostalCode: true, style});
+card.mount(document.createElement('div'));
+card.on('ready', () => {
+    console.log('ready');
+});
+card.on('change', (resp: stripe.elements.ElementChangeResponse) => {
+    console.log(resp.brand);
+});
+stripe.createToken(card, {
+    name: 'Jimmy',
+    address_city: 'Toronto',
+    address_country: 'Canada'
+})
+.then((result: stripe.TokenResponse) => {
+    console.log(result.token);
+},
+(error: stripe.Error) => {
+    console.error(error);
+});
diff --git a/types/stripe/tsconfig.json b/types/stripe/tsconfig.json
index 7ea61e6327..c15aeceae9 100644
--- a/types/stripe/tsconfig.json
+++ b/types/stripe/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "stripe-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/stripe/v2/index.d.ts b/types/stripe/v2/index.d.ts
new file mode 100644
index 0000000000..cc486b5d5b
--- /dev/null
+++ b/types/stripe/v2/index.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for stripe 2.x
+// Project: https://stripe.com/
+// Definitions by: Andy Hawkins <https://github.com/a904guy/,http://a904guy.com>
+//                 Eric J. Smith <https://github.com/ejsmith/>
+//                 Amrit Kahlon <https://github.com/amritk/>
+//                 Adam Cmiel <https://github.com/adamcmiel>
+//                 Justin Leider <https://github.com/jleider>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const Stripe: StripeStatic;
+
+interface StripeStatic {
+    applePay: StripeApplePay;
+    setPublishableKey(key: string): void;
+    validateCardNumber(cardNumber: string): boolean;
+    validateExpiry(month: string, year: string): boolean;
+    validateCVC(cardCVC: string): boolean;
+    cardType(cardNumber: string): StripeCardDataBrand;
+    getToken(token: string, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    card: StripeCard;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    bankAccount: StripeBankAccount;
+}
+
+interface StripeCardTokenData {
+    number: string;
+    exp_month?: number;
+    exp_year?: number;
+    exp?: string;
+    cvc?: string;
+    name?: string;
+    address_line1?: string;
+    address_line2?: string;
+    address_city?: string;
+    address_state?: string;
+    address_zip?: string;
+    address_country?: string;
+}
+
+interface StripeTokenResponse {
+    id: string;
+    client_ip: string;
+    created: number;
+    livemode: boolean;
+    object: string;
+    type: string;
+    used: boolean;
+    error?: StripeError;
+}
+
+interface StripeCardTokenResponse extends StripeTokenResponse {
+    card: StripeCard;
+}
+
+interface StripeError {
+    type: string;
+    code: string;
+    message: string;
+    param?: string;
+}
+
+type StripeCardDataBrand = 'Visa' | 'American Express' | 'MasterCard' | 'Discover' | 'JCB' | 'Diners Club' | 'Unknown';
+
+type StripeCardDataFunding = 'credit' | 'debit' | 'prepaid' | 'unknown';
+
+interface StripeCard {
+    object: string;
+    last4: string;
+    exp_month: number;
+    exp_year: number;
+    country?: string;
+    name?: string;
+    address_line1?: string;
+    address_line2?: string;
+    address_city?: string;
+    address_state?: string;
+    address_zip?: string;
+    address_country?: string;
+    brand?: StripeCardDataBrand;
+    funding?: StripeCardDataFunding;
+    createToken(data: StripeCardTokenData, responseHandler: (status: number, response: StripeCardTokenResponse) => void): void;
+    validateCardNumber(cardNumber: string): boolean;
+    validateExpiry(month: string, year: string): boolean;
+    validateCVC(cardCVC: string): boolean;
+}
+
+interface StripeBankAccount {
+    createToken(params: StripeBankTokenParams, stripeResponseHandler: (status: number, response: StripeBankTokenResponse) => void): void;
+    validateRoutingNumber(routingNumber: number | string, countryCode: string): boolean;
+    validateAccountNumber(accountNumber: number | string, countryCode: string): boolean;
+}
+
+interface StripeBankTokenParams {
+    country: string;
+    currency: string;
+    account_number: number | string;
+    routing_number?: number | string;
+    account_holder_name: string;
+    account_holder_type: string;
+}
+
+interface StripeBankTokenResponse extends StripeTokenResponse {
+    bank_account: {
+        country: string;
+        bank_name: string;
+        last4: number;
+        validated: boolean;
+        object: string;
+    };
+}
+
+interface StripeApplePay {
+    checkAvailability(resopnseHandler: (result: boolean) => void): void;
+    buildSession(data: StripeApplePayPaymentRequest,
+                 onSuccessHandler: (result: StripeApplePaySessionResult, completion: ((value: any) => void)) => void,
+                 onErrorHanlder: (error: { message: string }) => void): any;
+}
+
+type StripeApplePayBillingContactField = 'postalAddress' | 'name';
+type StripeApplePayShippingContactField = StripeApplePayBillingContactField | 'phone' | 'email';
+type StripeApplePayShipping = 'shipping' | 'delivery' | 'storePickup' | 'servicePickup';
+
+interface StripeApplePayPaymentRequest {
+    billingContact: StripeApplePayPaymentContact;
+    countryCode: string;
+    currencyCode: string;
+    total: StripeApplePayLineItem;
+    lineItems?: StripeApplePayLineItem[];
+    requiredBillingContactFields?: StripeApplePayBillingContactField[];
+    requiredShippingContactFields?: StripeApplePayShippingContactField[];
+    shippingContact?: StripeApplePayPaymentContact;
+    shippingMethods?: StripeApplePayShippingMethod[];
+    shippingType?: StripeApplePayShipping[];
+}
+
+// https://developer.apple.com/reference/applepayjs/1916082-applepay_js_data_types
+interface StripeApplePayLineItem {
+    type: 'pending' | 'final';
+    label: string;
+    amount: number;
+}
+
+interface StripeApplePaySessionResult {
+    token: StripeCardTokenResponse;
+    shippingContact?: StripeApplePayPaymentContact;
+    shippingMethod?: StripeApplePayShippingMethod;
+}
+
+interface StripeApplePayShippingMethod {
+    label: string;
+    detail: string;
+    amount: number;
+    identifier: string;
+}
+
+interface StripeApplePayPaymentContact {
+    emailAddress: string;
+    phoneNumber: string;
+    givenName: string;
+    familyName: string;
+    addressLines: string[];
+    locality: string;
+    administrativeArea: string;
+    postalCode: string;
+    countryCode: string;
+}
+
+// The Stripe client side APIs are not made available to package managers for direct installation.
+// As explained compliance reasons. Source: https://github.com/stripe/stripe-node/blob/master/README.md#these-are-serverside-bindings-only
+// A release date versioning schema is used to version these APIs.
diff --git a/types/stripe/v2/stripe-tests.ts b/types/stripe/v2/stripe-tests.ts
new file mode 100644
index 0000000000..56e6343f5c
--- /dev/null
+++ b/types/stripe/v2/stripe-tests.ts
@@ -0,0 +1,25 @@
+function success(card: StripeCard) {
+    console.log(card.brand && card.brand.toString());
+}
+
+const cardNumber = '4242424242424242';
+
+const isValid = Stripe.validateCardNumber(cardNumber);
+if (isValid) {
+    const tokenData: StripeCardTokenData = {
+        number: cardNumber,
+        exp_month: 1,
+        exp_year: 2100,
+        cvc: '111'
+    };
+    Stripe.card.createToken(tokenData, (status, response) => {
+        if (response.error) {
+            console.error(response.error.message);
+            if (response.error.param) {
+                console.error(response.error.param);
+            }
+        } else {
+            success(response.card);
+        }
+    });
+}
diff --git a/types/stripe/v2/tsconfig.json b/types/stripe/v2/tsconfig.json
new file mode 100644
index 0000000000..5917b8206d
--- /dev/null
+++ b/types/stripe/v2/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "stripe": ["stripe/v2"]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stripe-tests.ts"
+    ]
+}
diff --git a/types/stripe/v2/tslint.json b/types/stripe/v2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stripe/v2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/strophe/index.d.ts b/types/strophe/index.d.ts
index ff93346f6c..9cff5d3e02 100644
--- a/types/strophe/index.d.ts
+++ b/types/strophe/index.d.ts
@@ -3,1094 +3,1070 @@
 // Definitions by: David Deutsch <https://github.com/DavidKDeutsch/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace wrapper {
-    /** Function: $build
-     *  Create a Strophe.Builder.
-     *  This is an alias for 'new Strophe.Builder(name, attrs)'.
+declare namespace Strophe {
+    /** Constant: VERSION
+     *  The version of the Strophe library. Unreleased builds will have
+     *  a version of head-HASH where HASH is a partial revision.
+     */
+    var VERSION: string;
+
+    /** Constants: XMPP Namespace Constants
+     *  Common namespace constants from the XMPP RFCs and XEPs.
+     *
+     *  NS.HTTPBIND - HTTP BIND namespace from XEP 124.
+     *  NS.BOSH - BOSH namespace from XEP 206.
+     *  NS.CLIENT - Main XMPP client namespace.
+     *  NS.AUTH - Legacy authentication namespace.
+     *  NS.ROSTER - Roster operations namespace.
+     *  NS.PROFILE - Profile namespace.
+     *  NS.DISCO_INFO - Service discovery info namespace from XEP 30.
+     *  NS.DISCO_ITEMS - Service discovery items namespace from XEP 30.
+     *  NS.MUC - Multi-User Chat namespace from XEP 45.
+     *  NS.SASL - XMPP SASL namespace from RFC 3920.
+     *  NS.STREAM - XMPP Streams namespace from RFC 3920.
+     *  NS.BIND - XMPP Binding namespace from RFC 3920.
+     *  NS.SESSION - XMPP Session namespace from RFC 3920.
+     *  NS.XHTML_IM - XHTML-IM namespace from XEP 71.
+     *  NS.XHTML - XHTML body namespace from XEP 71.
+     */
+    var NS: {
+        HTTPBIND: string;
+        BOSH: string;
+        CLIENT: string;
+        AUTH: string;
+        ROSTER: string;
+        PROFILE: string;
+        DISCO_INFO: string;
+        DISCO_ITEMS: string;
+        MUC: string;
+        SASL: string;
+        STREAM: string;
+        FRAMING: string;
+        BIND: string;
+        SESSION: string;
+        VERSION: string;
+        STANZAS: string;
+        XHTML_IM: string;
+        XHTML: string;
+    }
+
+    /** Constants: Connection Status Constants
+     *  Connection status constants for use by the connection handler
+     *  callback.
+     *
+     *  Status.ERROR - An error has occurred
+     *  Status.CONNECTING - The connection is currently being made
+     *  Status.CONNFAIL - The connection attempt failed
+     *  Status.AUTHENTICATING - The connection is authenticating
+     *  Status.AUTHFAIL - The authentication attempt failed
+     *  Status.CONNECTED - The connection has succeeded
+     *  Status.DISCONNECTED - The connection has been terminated
+     *  Status.DISCONNECTING - The connection is currently being terminated
+     *  Status.ATTACHED - The connection has been attached
+     */
+    enum Status {
+        ERROR,
+        CONNECTING,
+        CONNFAIL,
+        AUTHENTICATING,
+        AUTHFAIL,
+        CONNECTED,
+        DISCONNECTED,
+        DISCONNECTING,
+        ATTACHED,
+        REDIRECT,
+        CONNTIMEOUT
+    }
+
+    /** Constants: Log Level Constants
+     *  Logging level indicators.
+     *
+     *  LogLevel.DEBUG - Debug output
+     *  LogLevel.INFO - Informational output
+     *  LogLevel.WARN - Warnings
+     *  LogLevel.ERROR - Errors
+     *  LogLevel.FATAL - Fatal errors
+     */
+    enum LogLevel {
+        DEBUG,
+        INFO,
+        WARN,
+        ERROR,
+        FATAL
+    }
+
+    /** Function: addNamespace
+     *  This function is used to extend the current namespaces in
+     *  Strophe.NS.  It takes a key and a value with the key being the
+     *  name of the new namespace, with its actual value.
+     *  For example:
+     *  Strophe.addNamespace('PUBSUB', "http://jabber.org/protocol/pubsub");
      *
      *  Parameters:
-     *    (String) name - The root element name.
-     *    (Object) attrs - The attributes for the root element in object notation.
-     *
-     *  Returns:
-     *    A new Strophe.Builder object.
+     *    (String) name - The name under which the namespace will be
+     *      referenced under Strophe.NS
+     *    (String) value - The actual namespace.
      */
-    function $build(name: string, attrs?: any): Strophe.Builder;
+    function addNamespace(name: string, value: string): void;
 
-    /** Function: $msg
-     *  Create a Strophe.Builder with a <message/> element as the root.
+    /** Function: forEachChild
+     *  Map a function over some or all child elements of a given element.
      *
-     *  Parmaeters:
-     *    (Object) attrs - The <message/> element attributes in object notation.
-     *
-     *  Returns:
-     *    A new Strophe.Builder object.
-     */
-    function $msg(attrs?: any): Strophe.Builder;
-
-    /** Function: $iq
-     *  Create a Strophe.Builder with an <iq/> element as the root.
+     *  This is a small convenience function for mapping a function over
+     *  some or all of the children of an element.  If elemName is null, all
+     *  children will be passed to the function, otherwise only children
+     *  whose tag names match elemName will be passed.
      *
      *  Parameters:
-     *    (Object) attrs - The <iq/> element attributes in object notation.
-     *
-     *  Returns:
-     *    A new Strophe.Builder object.
+     *    (XMLElement) elem - The element to operate on.
+     *    (String) elemName - The child element tag name filter.
+     *    (Function) func - The function to apply to each child.  This
+     *      function should take a single argument, a DOM element.
      */
-    function $iq(attrs?: any): Strophe.Builder;
+    function forEachChild(elem: Element, elemName: string, func: (child: Element) => any): void;
 
-    /** Function: $pres
-     *  Create a Strophe.Builder with a <presence/> element as the root.
+    /** Function: isTagEqual
+     *  Compare an element's tag name with a string.
+     *
+     *  This function is case sensitive.
      *
      *  Parameters:
-     *    (Object) attrs - The <presence/> element attributes in object notation.
+     *    (XMLElement) el - A DOM element.
+     *    (String) name - The element name.
      *
      *  Returns:
-     *    A new Strophe.Builder object.
+     *    true if the element's tag name matches _el_, and false
+     *    otherwise.
      */
-    function $pres(attrs?: any): Strophe.Builder;
+    function isTagEqual(el: Element, name: string): boolean;
 
-    namespace Strophe {
-        /** Constant: VERSION
-         *  The version of the Strophe library. Unreleased builds will have
-         *  a version of head-HASH where HASH is a partial revision.
-         */
-        var VERSION: string;
+    /** Function: xmlGenerator
+     *  Get the DOM document to generate elements.
+     *
+     *  Returns:
+     *    The currently used DOM document.
+     */
+    function xmlGenerator(): Document;
 
-        /** Constants: XMPP Namespace Constants
-         *  Common namespace constants from the XMPP RFCs and XEPs.
-         *
-         *  NS.HTTPBIND - HTTP BIND namespace from XEP 124.
-         *  NS.BOSH - BOSH namespace from XEP 206.
-         *  NS.CLIENT - Main XMPP client namespace.
-         *  NS.AUTH - Legacy authentication namespace.
-         *  NS.ROSTER - Roster operations namespace.
-         *  NS.PROFILE - Profile namespace.
-         *  NS.DISCO_INFO - Service discovery info namespace from XEP 30.
-         *  NS.DISCO_ITEMS - Service discovery items namespace from XEP 30.
-         *  NS.MUC - Multi-User Chat namespace from XEP 45.
-         *  NS.SASL - XMPP SASL namespace from RFC 3920.
-         *  NS.STREAM - XMPP Streams namespace from RFC 3920.
-         *  NS.BIND - XMPP Binding namespace from RFC 3920.
-         *  NS.SESSION - XMPP Session namespace from RFC 3920.
-         *  NS.XHTML_IM - XHTML-IM namespace from XEP 71.
-         *  NS.XHTML - XHTML body namespace from XEP 71.
-         */
-        var NS: {
-            HTTPBIND: string;
-            BOSH: string;
-            CLIENT: string;
-            AUTH: string;
-            ROSTER: string;
-            PROFILE: string;
-            DISCO_INFO: string;
-            DISCO_ITEMS: string;
-            MUC: string;
-            SASL: string;
-            STREAM: string;
-            FRAMING: string;
-            BIND: string;
-            SESSION: string;
-            VERSION: string;
-            STANZAS: string;
-            XHTML_IM: string;
-            XHTML: string;
-        }
+    /** Function: xmlElement
+     *  Create an XML DOM element.
+     *
+     *  This function creates an XML DOM element correctly across all
+     *  implementations. Note that these are not HTML DOM elements, which
+     *  aren't appropriate for XMPP stanzas.
+     *
+     *  Parameters:
+     *    (String) name - The name for the element.
+     *    (Array|Object) attrs - An optional array or object containing
+     *      key/value pairs to use as element attributes. The object should
+     *      be in the format {'key': 'value'} or {key: 'value'}. The array
+     *      should have the format [['key1', 'value1'], ['key2', 'value2']].
+     *    (String) text - The text child data for the element.
+     *
+     *  Returns:
+     *    A new XML DOM element.
+     */
+    function xmlElement(name: string, attrs?: any, text?: string): Element;
+    function xmlElement(name: string, text?: string, attrs?: any): Element;
 
-        /** Constants: Connection Status Constants
-         *  Connection status constants for use by the connection handler
-         *  callback.
-         *
-         *  Status.ERROR - An error has occurred
-         *  Status.CONNECTING - The connection is currently being made
-         *  Status.CONNFAIL - The connection attempt failed
-         *  Status.AUTHENTICATING - The connection is authenticating
-         *  Status.AUTHFAIL - The authentication attempt failed
-         *  Status.CONNECTED - The connection has succeeded
-         *  Status.DISCONNECTED - The connection has been terminated
-         *  Status.DISCONNECTING - The connection is currently being terminated
-         *  Status.ATTACHED - The connection has been attached
-         */
-        enum Status {
-            ERROR,
-            CONNECTING,
-            CONNFAIL,
-            AUTHENTICATING,
-            AUTHFAIL,
-            CONNECTED,
-            DISCONNECTED,
-            DISCONNECTING,
-            ATTACHED,
-            REDIRECT
-        }
+    /*  Function: xmlescape
+     *  Excapes invalid xml characters.
+     *
+     *  Parameters:
+     *     (String) text - text to escape.
+     *
+     *  Returns:
+     *      Escaped text.
+     */
+    function xmlescape(text: string): string;
 
-        /** Constants: Log Level Constants
-         *  Logging level indicators.
-         *
-         *  LogLevel.DEBUG - Debug output
-         *  LogLevel.INFO - Informational output
-         *  LogLevel.WARN - Warnings
-         *  LogLevel.ERROR - Errors
-         *  LogLevel.FATAL - Fatal errors
-         */
-        enum LogLevel {
-            DEBUG,
-            INFO,
-            WARN,
-            ERROR,
-            FATAL
-        }
+    /*  Function: xmlunescape
+    *  Unexcapes invalid xml characters.
+    *
+    *  Parameters:
+    *     (String) text - text to unescape.
+    *
+    *  Returns:
+    *      Unescaped text.
+    */
+    function xmlunescape(text: string): string;
 
-        /** Function: addNamespace
-         *  This function is used to extend the current namespaces in
-         *  Strophe.NS.  It takes a key and a value with the key being the
-         *  name of the new namespace, with its actual value.
-         *  For example:
-         *  Strophe.addNamespace('PUBSUB', "http://jabber.org/protocol/pubsub");
+    /** Function: xmlTextNode
+     *  Creates an XML DOM text node.
+     *
+     *  Provides a cross implementation version of document.createTextNode.
+     *
+     *  Parameters:
+     *    (String) text - The content of the text node.
+     *
+     *  Returns:
+     *    A new XML DOM text node.
+     */
+    function xmlTextNode(text: string): Text;
+
+    /** Function: xmlHtmlNode
+     *  Creates an XML DOM html node.
+     *
+     *  Parameters:
+     *    (String) html - The content of the html node.
+     *
+     *  Returns:
+     *    A new XML DOM text node.
+     */
+    function xmlHtmlNode(html: string): Document;
+
+    /** Function: getText
+         *  Get the concatenation of all text children of an element.
          *
          *  Parameters:
-         *    (String) name - The name under which the namespace will be
-         *      referenced under Strophe.NS
-         *    (String) value - The actual namespace.
-         */
-        function addNamespace(name: string, value: string): void;
-
-        /** Function: forEachChild
-         *  Map a function over some or all child elements of a given element.
-         *
-         *  This is a small convenience function for mapping a function over
-         *  some or all of the children of an element.  If elemName is null, all
-         *  children will be passed to the function, otherwise only children
-         *  whose tag names match elemName will be passed.
-         *
-         *  Parameters:
-         *    (XMLElement) elem - The element to operate on.
-         *    (String) elemName - The child element tag name filter.
-         *    (Function) func - The function to apply to each child.  This
-         *      function should take a single argument, a DOM element.
-         */
-        function forEachChild(elem: Element, elemName: string, func: (child: Element) => any): void;
-
-        /** Function: isTagEqual
-         *  Compare an element's tag name with a string.
-         *
-         *  This function is case sensitive.
-         *
-         *  Parameters:
-         *    (XMLElement) el - A DOM element.
-         *    (String) name - The element name.
+         *    (XMLElement) elem - A DOM element.
          *
          *  Returns:
-         *    true if the element's tag name matches _el_, and false
-         *    otherwise.
+         *    A String with the concatenated text of all text element children.
          */
-        function isTagEqual(el: Element, name: string): boolean;
+    function getText(elem: Element): string;
 
-        /** Function: xmlGenerator
-         *  Get the DOM document to generate elements.
-         *
-         *  Returns:
-         *    The currently used DOM document.
-         */
-        function xmlGenerator(): Document;
+    /** Function: copyElement
+     *  Copy an XML DOM element.
+     *
+     *  This function copies a DOM element and all its descendants and returns
+     *  the new copy.
+     *
+     *  Parameters:
+     *    (XMLElement) elem - A DOM element.
+     *
+     *  Returns:
+     *    A new, copied DOM element tree.
+     */
+    function copyElement(elem: Element): Element;
 
-        /** Function: xmlElement
-         *  Create an XML DOM element.
+    /** Function: createHtml
+     *  Copy an HTML DOM element into an XML DOM.
+     *
+     *  This function copies a DOM element and all its descendants and returns
+     *  the new copy.
+     *
+     *  Parameters:
+     *    (Element) elem - A DOM element.
+     *
+     *  Returns:
+     *    A new, copied DOM element tree.
+     */
+    function createHtml(elem: Element): Element;
+
+    /** Function: escapeNode
+     *  Escape the node part (also called local part) of a JID.
+     *
+     *  Parameters:
+     *    (String) node - A node (or local part).
+     *
+     *  Returns:
+     *    An escaped node (or local part).
+     */
+    function escapeNode(node: string): string;
+
+    /** Function: unescapeNode
+     *  Unescape a node part (also called local part) of a JID.
+     *
+     *  Parameters:
+     *    (String) node - A node (or local part).
+     *
+     *  Returns:
+     *    An unescaped node (or local part).
+     */
+    function unescapeNode(node: string): string;
+
+    /** Function: getNodeFromJid
+     *  Get the node portion of a JID String.
+     *
+     *  Parameters:
+     *    (String) jid - A JID.
+     *
+     *  Returns:
+     *    A String containing the node.
+     */
+    function getNodeFromJid(jid: string): string;
+
+    /** Function: getDomainFromJid
+     *  Get the domain portion of a JID String.
+     *
+     *  Parameters:
+     *    (String) jid - A JID.
+     *
+     *  Returns:
+     *    A String containing the domain.
+     */
+    function getDomainFromJid(jid: string): string;
+
+    /** Function: getResourceFromJid
+     *  Get the resource portion of a JID String.
+     *
+     *  Parameters:
+     *    (String) jid - A JID.
+     *
+     *  Returns:
+     *    A String containing the resource.
+     */
+    function getResourceFromJid(jid: string): string;
+
+    /** Function: getBareJidFromJid
+     *  Get the bare JID from a JID String.
+     *
+     *  Parameters:
+     *    (String) jid - A JID.
+     *
+     *  Returns:
+     *    A String containing the bare JID.
+     */
+    function getBareJidFromJid(jid: string): string;
+
+    /** Function: log
+     *  User overrideable logging function.
+     *
+     *  This function is called whenever the Strophe library calls any
+     *  of the logging functions.  The default implementation of this
+     *  function does nothing.  If client code wishes to handle the logging
+     *  messages, it should override this with
+     *  > Strophe.log = function (level, msg) {
+     *  >   (user code here)
+     *  > };
+     *
+     *  Please note that data sent and received over the wire is logged
+     *  via Strophe.Connection.rawInput() and Strophe.Connection.rawOutput().
+     *
+     *  The different levels and their meanings are
+     *
+     *    DEBUG - Messages useful for debugging purposes.
+     *    INFO - Informational messages.  This is mostly information like
+     *      'disconnect was called' or 'SASL auth succeeded'.
+     *    WARN - Warnings about potential problems.  This is mostly used
+     *      to report transient connection errors like request timeouts.
+     *    ERROR - Some error occurred.
+     *    FATAL - A non-recoverable fatal error occurred.
+     *
+     *  Parameters:
+     *    (Integer) level - The log level of the log message.  This will
+     *      be one of the values in Strophe.LogLevel.
+     *    (String) msg - The log message.
+     */
+    function log(level: LogLevel, msg: string): void;
+
+    /** Functions: debug, info, warn, error
+     *  Log a message at the appropriate Strophe.LogLevel
+     *
+     *  Parameters:
+     *    (String) msg - The log message.
+     */
+    function debug(msg: string): void;
+    function info(msg: string): void;
+    function warn(msg: string): void;
+    function error(msg: string): void;
+    function fatal(msg: string): void;
+
+    /** Function: serialize
+     *  Render a DOM element and all descendants to a String.
+     *
+     *  Parameters:
+     *    (XMLElement) elem - A DOM element.
+     *
+     *  Returns:
+     *    The serialized element tree as a String.
+     */
+    function serialize(elem: Element | Builder): string;
+
+    /** Function: addConnectionPlugin
+     *  Extends the Strophe.Connection object with the given plugin.
+     *
+     *  Parameters:
+     *    (String) name - The name of the extension.
+     *    (Object) ptype - The plugin's prototype.
+     */
+    function addConnectionPlugin(name: string, ptype: any): void;
+
+    /** Class: Strophe.Builder
+     *  XML DOM builder.
+     *
+     *  This object provides an interface similar to JQuery but for building
+     *  DOM element easily and rapidly.  All the functions except for toString()
+     *  and tree() return the object, so calls can be chained.  Here's an
+     *  example using the $iq() builder helper.
+     *  > $iq({to: 'you', from: 'me', type: 'get', id: '1'})
+     *  >     .c('query', {xmlns: 'strophe:example'})
+     *  >     .c('example')
+     *  >     .toString()
+     *  The above generates this XML fragment
+     *  > <iq to='you' from='me' type='get' id='1'>
+     *  >   <query xmlns='strophe:example'>
+     *  >     <example/>
+     *  >   </query>
+     *  > </iq>
+     *  The corresponding DOM manipulations to get a similar fragment would be
+     *  a lot more tedious and probably involve several helper variables.
+     *
+     *  Since adding children makes new operations operate on the child, up()
+     *  is provided to traverse up the tree.  To add two children, do
+     *  > builder.c('child1', ...).up().c('child2', ...)
+     *  The next operation on the Builder will be relative to the second child.
+     */
+    class Builder {
+
+        /** Constructor: Strophe.Builder
+         *  Create a Strophe.Builder object.
          *
-         *  This function creates an XML DOM element correctly across all
-         *  implementations. Note that these are not HTML DOM elements, which
-         *  aren't appropriate for XMPP stanzas.
+         *  The attributes should be passed in object notation.  For example
+         *  > var b = new Builder('message', {to: 'you', from: 'me'});
+         *  or
+         *  > var b = new Builder('messsage', {'xml:lang': 'en'});
          *
          *  Parameters:
-         *    (String) name - The name for the element.
-         *    (Array|Object) attrs - An optional array or object containing
-         *      key/value pairs to use as element attributes. The object should
-         *      be in the format {'key': 'value'} or {key: 'value'}. The array
-         *      should have the format [['key1', 'value1'], ['key2', 'value2']].
-         *    (String) text - The text child data for the element.
+         *    (String) name - The name of the root element.
+         *    (Object) attrs - The attributes for the root element in object notation.
          *
          *  Returns:
-         *    A new XML DOM element.
+         *    A new Strophe.Builder.
          */
-        function xmlElement(name: string, attrs?: any, text?: string): Element;
-        function xmlElement(name: string, text?: string, attrs?: any): Element;
+        constructor(name: string, attrs?: any);
 
-        /*  Function: xmlescape
-         *  Excapes invalid xml characters.
-         *
-         *  Parameters:
-         *     (String) text - text to escape.
-         *
-         *  Returns:
-         *      Escaped text.
-         */
-        function xmlescape(text: string): string;
-
-        /*  Function: xmlunescape
-        *  Unexcapes invalid xml characters.
+        /** Function: tree
+        *  Return the DOM tree.
         *
-        *  Parameters:
-        *     (String) text - text to unescape.
+        *  This function returns the current DOM tree as an element object.  This
+        *  is suitable for passing to functions like Strophe.Connection.send().
         *
         *  Returns:
-        *      Unescaped text.
+        *    The DOM tree as a element object.
         */
-        function xmlunescape(text: string): string;
+        tree(): Element;
 
-        /** Function: xmlTextNode
-         *  Creates an XML DOM text node.
+        /** Function: toString
+         *  Serialize the DOM tree to a String.
          *
-         *  Provides a cross implementation version of document.createTextNode.
-         *
-         *  Parameters:
-         *    (String) text - The content of the text node.
+         *  This function returns a string serialization of the current DOM
+         *  tree.  It is often used internally to pass data to a
+         *  Strophe.Request object.
          *
          *  Returns:
-         *    A new XML DOM text node.
+         *    The serialized DOM tree in a String.
          */
-        function xmlTextNode(text: string): Text;
+        toString(): string;
 
-        /** Function: xmlHtmlNode
-         *  Creates an XML DOM html node.
+        /** Function: up
+         *  Make the current parent element the new current element.
          *
-         *  Parameters:
-         *    (String) html - The content of the html node.
+         *  This function is often used after c() to traverse back up the tree.
+         *  For example, to add two children to the same element
+         *  > builder.c('child1', {}).up().c('child2', {});
          *
          *  Returns:
-         *    A new XML DOM text node.
+         *    The Stophe.Builder object.
          */
-        function xmlHtmlNode(html: string): Document;
+        up(): Builder;
 
-        /** Function: getText
-             *  Get the concatenation of all text children of an element.
-             *
-             *  Parameters:
-             *    (XMLElement) elem - A DOM element.
-             *
-             *  Returns:
-             *    A String with the concatenated text of all text element children.
-             */
-        function getText(elem: Element): string;
-
-        /** Function: copyElement
-         *  Copy an XML DOM element.
+        /** Function: attrs
+         *  Add or modify attributes of the current element.
          *
-         *  This function copies a DOM element and all its descendants and returns
-         *  the new copy.
+         *  The attributes should be passed in object notation.  This function
+         *  does not move the current element pointer.
+         *
+         *  Parameters:
+         *    (Object) moreattrs - The attributes to add/modify in object notation.
+         *
+         *  Returns:
+         *    The Strophe.Builder object.
+         */
+        attrs(moreattrs: any): Builder;
+
+        /** Function: c
+         *  Add a child to the current element and make it the new current
+         *  element.
+         *
+         *  This function moves the current element pointer to the child,
+         *  unless text is provided.  If you need to add another child, it
+         *  is necessary to use up() to go back to the parent in the tree.
+         *
+         *  Parameters:
+         *    (String) name - The name of the child.
+         *    (Object) attrs - The attributes of the child in object notation.
+         *    (String) text - The text to add to the child.
+         *
+         *  Returns:
+         *    The Strophe.Builder object.
+         */
+        c(name: string, attrs?: any, text?: string): Builder;
+
+        /** Function: cnode
+         *  Add a child to the current element and make it the new current
+         *  element.
+         *
+         *  This function is the same as c() except that instead of using a
+         *  name and an attributes object to create the child it uses an
+         *  existing DOM element object.
          *
          *  Parameters:
          *    (XMLElement) elem - A DOM element.
          *
          *  Returns:
-         *    A new, copied DOM element tree.
+         *    The Strophe.Builder object.
          */
-        function copyElement(elem: Element): Element;
+        cnode(elem: Node): Builder;
 
-        /** Function: createHtml
-         *  Copy an HTML DOM element into an XML DOM.
+        /** Function: t
+         *  Add a child text element.
          *
-         *  This function copies a DOM element and all its descendants and returns
-         *  the new copy.
+         *  This *does not* make the child the new current element since there
+         *  are no children of text elements.
          *
          *  Parameters:
-         *    (Element) elem - A DOM element.
+         *    (String) text - The text data to append to the current element.
          *
          *  Returns:
-         *    A new, copied DOM element tree.
+         *    The Strophe.Builder object.
          */
-        function createHtml(elem: Element): Element;
+        t(text: string): Builder;
 
-        /** Function: escapeNode
-         *  Escape the node part (also called local part) of a JID.
+        /** Function: h
+         *  Replace current element contents with the HTML passed in.
+         *
+         *  This *does not* make the child the new current element
          *
          *  Parameters:
-         *    (String) node - A node (or local part).
+         *    (String) html - The html to insert as contents of current element.
          *
          *  Returns:
-         *    An escaped node (or local part).
+         *    The Strophe.Builder object.
          */
-        function escapeNode(node: string): string;
+        h(html: string): Builder;
+    }
 
-        /** Function: unescapeNode
-         *  Unescape a node part (also called local part) of a JID.
+    interface ConnectionOptions {
+        keepalive?: boolean;
+        protocol?: string;
+        sync?: boolean;
+    }
+
+    /** Class: Strophe.Connection
+     *  XMPP Connection manager.
+     *
+     *  This class is the main part of Strophe.  It manages a BOSH connection
+     *  to an XMPP server and dispatches events to the user callbacks as
+     *  data arrives.  It supports SASL PLAIN, SASL DIGEST-MD5, SASL SCRAM-SHA1
+     *  and legacy authentication.
+     *
+     *  After creating a Strophe.Connection object, the user will typically
+     *  call connect() with a user supplied callback to handle connection level
+     *  events like authentication failure, disconnection, or connection
+     *  complete.
+     *
+     *  The user will also have several event handlers defined by using
+     *  addHandler() and addTimedHandler().  These will allow the user code to
+     *  respond to interesting stanzas or do something periodically with the
+     *  connection.  These handlers will be active once authentication is
+     *  finished.
+     *
+     *  To send data to the connection, use send().
+     */
+    class Connection {
+
+        jid: string;
+        authzid: string;
+        pass: string;
+        authcid: string;
+        domain: string;
+        servtype: string;
+        maxRetries: number;
+        //todo: what other members are meant to be public?
+
+        /** Constructor: Strophe.Connection
+         *  Create and initialize a Strophe.Connection object.
+         *
+         *  The transport-protocol for this connection will be chosen automatically
+         *  based on the given service parameter. URLs starting with "ws://" or
+         *  "wss://" will use WebSockets, URLs starting with "http://", "https://"
+         *  or without a protocol will use BOSH.
+         *
+         *  To make Strophe connect to the current host you can leave out the protocol
+         *  and host part and just pass the path, e.g.
+         *
+         *  > var conn = new Strophe.Connection("/http-bind/");
+         *
+         *  WebSocket options:
+         *
+         *  If you want to connect to the current host with a WebSocket connection you
+         *  can tell Strophe to use WebSockets through a "protocol" attribute in the
+         *  optional options parameter. Valid values are "ws" for WebSocket and "wss"
+         *  for Secure WebSocket.
+         *  So to connect to "wss://CURRENT_HOSTNAME/xmpp-websocket" you would call
+         *
+         *  > var conn = new Strophe.Connection("/xmpp-websocket/", {protocol: "wss"});
+         *
+         *  Note that relative URLs _NOT_ starting with a "/" will also include the path
+         *  of the current site.
+         *
+         *  Also because downgrading security is not permitted by browsers, when using
+         *  relative URLs both BOSH and WebSocket connections will use their secure
+         *  variants if the current connection to the site is also secure (https).
+         *
+         *  BOSH options:
+         *
+         *  by adding "sync" to the options, you can control if requests will
+         *  be made synchronously or not. The default behaviour is asynchronous.
+         *  If you want to make requests synchronous, make "sync" evaluate to true:
+         *  > var conn = new Strophe.Connection("/http-bind/", {sync: true});
+         *  You can also toggle this on an already established connection:
+         *  > conn.options.sync = true;
+         *
          *
          *  Parameters:
-         *    (String) node - A node (or local part).
+         *    (String) service - The BOSH or WebSocket service URL.
+         *    (Object) options - A hash of configuration options
          *
          *  Returns:
-         *    An unescaped node (or local part).
+         *    A new Strophe.Connection object.
          */
-        function unescapeNode(node: string): string;
+        constructor(service: string, options?: ConnectionOptions);
 
-        /** Function: getNodeFromJid
-         *  Get the node portion of a JID String.
+        /** Function: reset
+         *  Reset the connection.
+         *
+         *  This function should be called after a connection is disconnected
+         *  before that connection is reused.
+         */
+        reset(): void;
+
+        /** Function: pause
+         *  Pause the request manager.
+         *
+         *  This will prevent Strophe from sending any more requests to the
+         *  server.  This is very useful for temporarily pausing
+         *  BOSH-Connections while a lot of send() calls are happening quickly.
+         *  This causes Strophe to send the data in a single request, saving
+         *  many request trips.
+         */
+        pause(): void;
+
+        /** Function: resume
+         *  Resume the request manager.
+         *
+         *  This resumes after pause() has been called.
+         */
+        resume(): void;
+
+        /** Function: getUniqueId
+         *  Generate a unique ID for use in <iq/> elements.
+         *
+         *  All <iq/> stanzas are required to have unique id attributes.  This
+         *  function makes creating these easy.  Each connection instance has
+         *  a counter which starts from zero, and the value of this counter
+         *  plus a colon followed by the suffix becomes the unique id. If no
+         *  suffix is supplied, the counter is used as the unique id.
+         *
+         *  Suffixes are used to make debugging easier when reading the stream
+         *  data, and their use is recommended.  The counter resets to 0 for
+         *  every new connection for the same reason.  For connections to the
+         *  same server that authenticate the same way, all the ids should be
+         *  the same, which makes it easy to see changes.  This is useful for
+         *  automated testing as well.
          *
          *  Parameters:
-         *    (String) jid - A JID.
+         *    (String) suffix - A optional suffix to append to the id.
          *
          *  Returns:
-         *    A String containing the node.
+         *    A unique string to be used for the id attribute.
          */
-        function getNodeFromJid(jid: string): string;
+        getUniqueId(suffix?: string | number): string;
 
-        /** Function: getDomainFromJid
-         *  Get the domain portion of a JID String.
+        /** Function: connect
+         *  Starts the connection process.
+         *
+         *  As the connection process proceeds, the user supplied callback will
+         *  be triggered multiple times with status updates.  The callback
+         *  should take two arguments - the status code and the error condition.
+         *
+         *  The status code will be one of the values in the Strophe.Status
+         *  constants.  The error condition will be one of the conditions
+         *  defined in RFC 3920 or the condition 'strophe-parsererror'.
+         *
+         *  The Parameters _wait_, _hold_ and _route_ are optional and only relevant
+         *  for BOSH connections. Please see XEP 124 for a more detailed explanation
+         *  of the optional parameters.
          *
          *  Parameters:
-         *    (String) jid - A JID.
-         *
-         *  Returns:
-         *    A String containing the domain.
+         *    (String) jid - The user's JID.  This may be a bare JID,
+         *      or a full JID.  If a node is not supplied, SASL ANONYMOUS
+         *      authentication will be attempted.
+         *    (String) pass - The user's password.
+         *    (Function) callback - The connect callback function.
+         *    (Integer) wait - The optional HTTPBIND wait value.  This is the
+         *      time the server will wait before returning an empty result for
+         *      a request.  The default setting of 60 seconds is recommended.
+         *    (Integer) hold - The optional HTTPBIND hold value.  This is the
+         *      number of connections the server will hold at one time.  This
+         *      should almost always be set to 1 (the default).
+         *    (String) route - The optional route value.
          */
-        function getDomainFromJid(jid: string): string;
+        connect(jid?: string, pass?: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, route?: string): void;
 
-        /** Function: getResourceFromJid
-         *  Get the resource portion of a JID String.
+        /**
+         * Function: restore
+         * Attempt to restore a cached BOSH session.
+         *
+         * This function is only useful in conjunction with providing the
+         * “keepalive”:true option when instantiating a new Strophe.Connection.
+         * When “keepalive” is set to true, Strophe will cache the BOSH tokens
+         * RID (Request ID) and SID (Session ID) and then when this function is called,
+         * it will attempt to restore the session from those cached tokens.
+         * This function must therefore be called instead of connect or attach.
+         * For an example on how to use it, please see examples/restore.js
+         *
+         * Parameters:
+         *    (String) jid - The user’s JID.  This may be a bare JID or a full JID.
+         *    (Function) callback - The connect callback function.
+         *    (Integer) wait - The optional HTTPBIND wait value.
+         *      This is the time the server will wait before returning an empty result for a request.
+         *      The default setting of 60 seconds is recommended.
+         *    (Integer) hold - The optional HTTPBIND hold value.
+         *      This is the number of connections the server will hold at one time.
+         *      This should almost always be set to 1 (the default).
+         *    (Integer) wind - The optional HTTBIND window value.
+         *      This is the allowed range of request ids that are valid.
+         *      The default is 5.
+         */
+        restore(jid?: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, route?: string): void;
+
+        /** Function: attach
+         *  Attach to an already created and authenticated BOSH session.
+         *
+         *  This function is provided to allow Strophe to attach to BOSH
+         *  sessions which have been created externally, perhaps by a Web
+         *  application.  This is often used to support auto-login type features
+         *  without putting user credentials into the page.
          *
          *  Parameters:
-         *    (String) jid - A JID.
-         *
-         *  Returns:
-         *    A String containing the resource.
+         *    (String) jid - The full JID that is bound by the session.
+         *    (String) sid - The SID of the BOSH session.
+         *    (String) rid - The current RID of the BOSH session.  This RID
+         *      will be used by the next request.
+         *    (Function) callback The connect callback function.
+         *    (Integer) wait - The optional HTTPBIND wait value.  This is the
+         *      time the server will wait before returning an empty result for
+         *      a request.  The default setting of 60 seconds is recommended.
+         *      Other settings will require tweaks to the Strophe.TIMEOUT value.
+         *    (Integer) hold - The optional HTTPBIND hold value.  This is the
+         *      number of connections the server will hold at one time.  This
+         *      should almost always be set to 1 (the default).
+         *    (Integer) wind - The optional HTTBIND window value.  This is the
+         *      allowed range of request ids that are valid.  The default is 5.
          */
-        function getResourceFromJid(jid: string): string;
+        attach(jid: string, sid: string, rid: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, wind?: number): void;
 
-        /** Function: getBareJidFromJid
-         *  Get the bare JID from a JID String.
+        /** Function: xmlInput
+         *  User overrideable function that receives XML data coming into the
+         *  connection.
          *
-         *  Parameters:
-         *    (String) jid - A JID.
-         *
-         *  Returns:
-         *    A String containing the bare JID.
-         */
-        function getBareJidFromJid(jid: string): string;
-
-        /** Function: log
-         *  User overrideable logging function.
-         *
-         *  This function is called whenever the Strophe library calls any
-         *  of the logging functions.  The default implementation of this
-         *  function does nothing.  If client code wishes to handle the logging
-         *  messages, it should override this with
-         *  > Strophe.log = function (level, msg) {
-         *  >   (user code here)
+         *  The default function does nothing.  User code can override this with
+         *  > Strophe.Connection.xmlInput = function (elem) {
+         *  >   (user code)
          *  > };
          *
-         *  Please note that data sent and received over the wire is logged
-         *  via Strophe.Connection.rawInput() and Strophe.Connection.rawOutput().
+         *  Due to limitations of current Browsers' XML-Parsers the opening and closing
+         *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
          *
-         *  The different levels and their meanings are
-         *
-         *    DEBUG - Messages useful for debugging purposes.
-         *    INFO - Informational messages.  This is mostly information like
-         *      'disconnect was called' or 'SASL auth succeeded'.
-         *    WARN - Warnings about potential problems.  This is mostly used
-         *      to report transient connection errors like request timeouts.
-         *    ERROR - Some error occurred.
-         *    FATAL - A non-recoverable fatal error occurred.
+         *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
+         *  <Strophe.Bosh.strip> if you want to strip this tag.
          *
          *  Parameters:
-         *    (Integer) level - The log level of the log message.  This will
-         *      be one of the values in Strophe.LogLevel.
-         *    (String) msg - The log message.
+         *    (XMLElement) elem - The XML data received by the connection.
          */
-        function log(level: LogLevel, msg: string): void;
+        xmlInput(elem: Element): void;
 
-        /** Functions: debug, info, warn, error
-         *  Log a message at the appropriate Strophe.LogLevel
+        /** Function: xmlOutput
+         *  User overrideable function that receives XML data sent to the
+         *  connection.
+         *
+         *  The default function does nothing.  User code can override this with
+         *  > Strophe.Connection.xmlOutput = function (elem) {
+         *  >   (user code)
+         *  > };
+         *
+         *  Due to limitations of current Browsers' XML-Parsers the opening and closing
+         *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
+         *
+         *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
+         *  <Strophe.Bosh.strip> if you want to strip this tag.
          *
          *  Parameters:
-         *    (String) msg - The log message.
+         *    (XMLElement) elem - The XMLdata sent by the connection.
          */
-        function debug(msg: string): void;
-        function info(msg: string): void;
-        function warn(msg: string): void;
-        function error(msg: string): void;
-        function fatal(msg: string): void;
+        xmlOutput(elem: Element): void;
 
-        /** Function: serialize
-         *  Render a DOM element and all descendants to a String.
+        /** Function: rawInput
+         *  User overrideable function that receives raw data coming into the
+         *  connection.
+         *
+         *  The default function does nothing.  User code can override this with
+         *  > Strophe.Connection.rawInput = function (data) {
+         *  >   (user code)
+         *  > };
          *
          *  Parameters:
-         *    (XMLElement) elem - A DOM element.
+         *    (String) data - The data received by the connection.
+         */
+        rawInput(data: string): void;
+
+        /** Function: rawOutput
+         *  User overrideable function that receives raw data sent to the
+         *  connection.
+         *
+         *  The default function does nothing.  User code can override this with
+         *  > Strophe.Connection.rawOutput = function (data) {
+         *  >   (user code)
+         *  > };
+         *
+         *  Parameters:
+         *    (String) data - The data sent by the connection.
+         */
+        rawOutput(data: string): void;
+
+        /** Function: send
+         *  Send a stanza.
+         *
+         *  This function is called to push data onto the send queue to
+         *  go out over the wire.  Whenever a request is sent to the BOSH
+         *  server, all pending data is sent and the queue is flushed.
+         *
+         *  Parameters:
+         *    (XMLElement |
+         *     [XMLElement] |
+         *     Strophe.Builder) elem - The stanza to send.
+         */
+        send(elem: Element | Element[]| Builder): void;
+
+        /** Function: flush
+         *  Immediately send any pending outgoing data.
+         *
+         *  Normally send() queues outgoing data until the next idle period
+         *  (100ms), which optimizes network use in the common cases when
+         *  several send()s are called in succession. flush() can be used to
+         *  immediately send all pending data.
+         */
+        flush(): void;
+
+        /** Function: sendIQ
+         *  Helper function to send IQ stanzas.
+         *
+         *  Parameters:
+         *    (XMLElement) elem - The stanza to send.
+         *    (Function) callback - The callback function for a successful request.
+         *    (Function) errback - The callback function for a failed or timed
+         *      out request.  On timeout, the stanza will be null.
+         *    (Integer) timeout - The time specified in milliseconds for a
+         *      timeout to occur.
          *
          *  Returns:
-         *    The serialized element tree as a String.
-         */
-        function serialize(elem: Element | Builder): string;
+         *    The id used to send the IQ.
+        */
+        sendIQ(elem: Element | Builder, callback?: (stanza: Element) => any, errback?: (stanza: Element) => any, timeout?: number): string; //todo: Is callback correct?
 
-        /** Function: addConnectionPlugin
-         *  Extends the Strophe.Connection object with the given plugin.
+        /** Function: addTimedHandler
+         *  Add a timed handler to the connection.
+         *
+         *  This function adds a timed handler.  The provided handler will
+         *  be called every period milliseconds until it returns false,
+         *  the connection is terminated, or the handler is removed.  Handlers
+         *  that wish to continue being invoked should return true.
+         *
+         *  Because of method binding it is necessary to save the result of
+         *  this function if you wish to remove a handler with
+         *  deleteTimedHandler().
+         *
+         *  Note that user handlers are not active until authentication is
+         *  successful.
          *
          *  Parameters:
-         *    (String) name - The name of the extension.
-         *    (Object) ptype - The plugin's prototype.
+         *    (Integer) period - The period of the handler.
+         *    (Function) handler - The callback function.
+         *
+         *  Returns:
+         *    A reference to the handler that can be used to remove it.
          */
-        function addConnectionPlugin(name: string, ptype: any): void;
+        addTimedHandler(period: number, handler: () => boolean): any;
 
-        var Builder: {
-            /** Constructor: Strophe.Builder
-             *  Create a Strophe.Builder object.
-             *
-             *  The attributes should be passed in object notation.  For example
-             *  > var b = new Builder('message', {to: 'you', from: 'me'});
-             *  or
-             *  > var b = new Builder('messsage', {'xml:lang': 'en'});
-             *
-             *  Parameters:
-             *    (String) name - The name of the root element.
-             *    (Object) attrs - The attributes for the root element in object notation.
-             *
-             *  Returns:
-             *    A new Strophe.Builder.
-             */
-            new (name: string, attrs?: any): Builder;
-            prototype: any;
-        }
-
-
-        /** Class: Strophe.Builder
-         *  XML DOM builder.
+        /** Function: deleteTimedHandler
+         *  Delete a timed handler for a connection.
          *
-         *  This object provides an interface similar to JQuery but for building
-         *  DOM element easily and rapidly.  All the functions except for toString()
-         *  and tree() return the object, so calls can be chained.  Here's an
-         *  example using the $iq() builder helper.
-         *  > $iq({to: 'you', from: 'me', type: 'get', id: '1'})
-         *  >     .c('query', {xmlns: 'strophe:example'})
-         *  >     .c('example')
-         *  >     .toString()
-         *  The above generates this XML fragment
-         *  > <iq to='you' from='me' type='get' id='1'>
-         *  >   <query xmlns='strophe:example'>
-         *  >     <example/>
-         *  >   </query>
-         *  > </iq>
-         *  The corresponding DOM manipulations to get a similar fragment would be
-         *  a lot more tedious and probably involve several helper variables.
+         *  This function removes a timed handler from the connection.  The
+         *  handRef parameter is *not* the function passed to addTimedHandler(),
+         *  but is the reference returned from addTimedHandler().
          *
-         *  Since adding children makes new operations operate on the child, up()
-         *  is provided to traverse up the tree.  To add two children, do
-         *  > builder.c('child1', ...).up().c('child2', ...)
-         *  The next operation on the Builder will be relative to the second child.
+         *  Parameters:
+         *    (Strophe.TimedHandler) handRef - The handler reference.
          */
-        interface Builder {
-            /** Function: tree
-            *  Return the DOM tree.
-            *
-            *  This function returns the current DOM tree as an element object.  This
-            *  is suitable for passing to functions like Strophe.Connection.send().
-            *
-            *  Returns:
-            *    The DOM tree as a element object.
-            */
-            tree(): Element;
+        deleteTimedHandler(handRef: any): void;
 
-            /** Function: toString
-             *  Serialize the DOM tree to a String.
-             *
-             *  This function returns a string serialization of the current DOM
-             *  tree.  It is often used internally to pass data to a
-             *  Strophe.Request object.
-             *
-             *  Returns:
-             *    The serialized DOM tree in a String.
-             */
-            toString(): string;
 
-            /** Function: up
-             *  Make the current parent element the new current element.
-             *
-             *  This function is often used after c() to traverse back up the tree.
-             *  For example, to add two children to the same element
-             *  > builder.c('child1', {}).up().c('child2', {});
-             *
-             *  Returns:
-             *    The Stophe.Builder object.
-             */
-            up(): Builder;
-
-            /** Function: attrs
-             *  Add or modify attributes of the current element.
-             *
-             *  The attributes should be passed in object notation.  This function
-             *  does not move the current element pointer.
-             *
-             *  Parameters:
-             *    (Object) moreattrs - The attributes to add/modify in object notation.
-             *
-             *  Returns:
-             *    The Strophe.Builder object.
-             */
-            attrs(moreattrs: any): Builder;
-
-            /** Function: c
-             *  Add a child to the current element and make it the new current
-             *  element.
-             *
-             *  This function moves the current element pointer to the child,
-             *  unless text is provided.  If you need to add another child, it
-             *  is necessary to use up() to go back to the parent in the tree.
-             *
-             *  Parameters:
-             *    (String) name - The name of the child.
-             *    (Object) attrs - The attributes of the child in object notation.
-             *    (String) text - The text to add to the child.
-             *
-             *  Returns:
-             *    The Strophe.Builder object.
-             */
-            c(name: string, attrs?: any, text?: string): Builder;
-
-            /** Function: cnode
-             *  Add a child to the current element and make it the new current
-             *  element.
-             *
-             *  This function is the same as c() except that instead of using a
-             *  name and an attributes object to create the child it uses an
-             *  existing DOM element object.
-             *
-             *  Parameters:
-             *    (XMLElement) elem - A DOM element.
-             *
-             *  Returns:
-             *    The Strophe.Builder object.
-             */
-            cnode(elem: Node): Builder;
-
-            /** Function: t
-             *  Add a child text element.
-             *
-             *  This *does not* make the child the new current element since there
-             *  are no children of text elements.
-             *
-             *  Parameters:
-             *    (String) text - The text data to append to the current element.
-             *
-             *  Returns:
-             *    The Strophe.Builder object.
-             */
-            t(text: string): Builder;
-
-            /** Function: h
-             *  Replace current element contents with the HTML passed in.
-             *
-             *  This *does not* make the child the new current element
-             *
-             *  Parameters:
-             *    (String) html - The html to insert as contents of current element.
-             *
-             *  Returns:
-             *    The Strophe.Builder object.
-             */
-            h(html: string): Builder;
-        }
-
-        interface ConnectionOptions {
-            protocol?: string;
-            sync?: boolean;
-        }
-        var Connection: {
-            /** Constructor: Strophe.Connection
-             *  Create and initialize a Strophe.Connection object.
-             *
-             *  The transport-protocol for this connection will be chosen automatically
-             *  based on the given service parameter. URLs starting with "ws://" or
-             *  "wss://" will use WebSockets, URLs starting with "http://", "https://"
-             *  or without a protocol will use BOSH.
-             *
-             *  To make Strophe connect to the current host you can leave out the protocol
-             *  and host part and just pass the path, e.g.
-             *
-             *  > var conn = new Strophe.Connection("/http-bind/");
-             *
-             *  WebSocket options:
-             *
-             *  If you want to connect to the current host with a WebSocket connection you
-             *  can tell Strophe to use WebSockets through a "protocol" attribute in the
-             *  optional options parameter. Valid values are "ws" for WebSocket and "wss"
-             *  for Secure WebSocket.
-             *  So to connect to "wss://CURRENT_HOSTNAME/xmpp-websocket" you would call
-             *
-             *  > var conn = new Strophe.Connection("/xmpp-websocket/", {protocol: "wss"});
-             *
-             *  Note that relative URLs _NOT_ starting with a "/" will also include the path
-             *  of the current site.
-             *
-             *  Also because downgrading security is not permitted by browsers, when using
-             *  relative URLs both BOSH and WebSocket connections will use their secure
-             *  variants if the current connection to the site is also secure (https).
-             *
-             *  BOSH options:
-             *
-             *  by adding "sync" to the options, you can control if requests will
-             *  be made synchronously or not. The default behaviour is asynchronous.
-             *  If you want to make requests synchronous, make "sync" evaluate to true:
-             *  > var conn = new Strophe.Connection("/http-bind/", {sync: true});
-             *  You can also toggle this on an already established connection:
-             *  > conn.options.sync = true;
-             *
-             *
-             *  Parameters:
-             *    (String) service - The BOSH or WebSocket service URL.
-             *    (Object) options - A hash of configuration options
-             *
-             *  Returns:
-             *    A new Strophe.Connection object.
-             */
-            new (service: string, options?: ConnectionOptions): Connection;
-            prototype: any;
-        }
-
-        /** Class: Strophe.Connection
-         *  XMPP Connection manager.
+        /** Function: addHandler
+         *  Add a stanza handler for the connection.
          *
-         *  This class is the main part of Strophe.  It manages a BOSH connection
-         *  to an XMPP server and dispatches events to the user callbacks as
-         *  data arrives.  It supports SASL PLAIN, SASL DIGEST-MD5, SASL SCRAM-SHA1
-         *  and legacy authentication.
+         *  This function adds a stanza handler to the connection.  The
+         *  handler callback will be called for any stanza that matches
+         *  the parameters.  Note that if multiple parameters are supplied,
+         *  they must all match for the handler to be invoked.
          *
-         *  After creating a Strophe.Connection object, the user will typically
-         *  call connect() with a user supplied callback to handle connection level
-         *  events like authentication failure, disconnection, or connection
-         *  complete.
+         *  The handler will receive the stanza that triggered it as its argument.
+         *  *The handler should return true if it is to be invoked again;
+         *  returning false will remove the handler after it returns.*
          *
-         *  The user will also have several event handlers defined by using
-         *  addHandler() and addTimedHandler().  These will allow the user code to
-         *  respond to interesting stanzas or do something periodically with the
-         *  connection.  These handlers will be active once authentication is
-         *  finished.
+         *  As a convenience, the ns parameters applies to the top level element
+         *  and also any of its immediate children.  This is primarily to make
+         *  matching /iq/query elements easy.
          *
-         *  To send data to the connection, use send().
+         *  The options argument contains handler matching flags that affect how
+         *  matches are determined. Currently the only flag is matchBare (a
+         *  boolean). When matchBare is true, the from parameter and the from
+         *  attribute on the stanza will be matched as bare JIDs instead of
+         *  full JIDs. To use this, pass {matchBare: true} as the value of
+         *  options. The default value for matchBare is false.
+         *
+         *  The return value should be saved if you wish to remove the handler
+         *  with deleteHandler().
+         *
+         *  Parameters:
+         *    (Function) handler - The user callback.
+         *    (String) ns - The namespace to match.
+         *    (String) name - The stanza name to match.
+         *    (String) type - The stanza type attribute to match.
+         *    (String) id - The stanza id attribute to match.
+         *    (String) from - The stanza from attribute to match.
+         *    (String) options - The handler options
+         *
+         *  Returns:
+         *    A reference to the handler that can be used to remove it.
          */
-        interface Connection {
+        addHandler(handler: (stanza: Element) => boolean, ns: string, name: string, type?: string, id?: string, from?: string, options?: { matchBare: boolean }): any; //todo: is callback correct? Also, are the elements specified as optional truly optional?
 
-            jid: string;
-            authzid: string;
-            pass: string;
-            authcid: string;
-            domain: string;
-            servtype: string;
-            maxRetries: number;
-            //todo: what other members are meant to be public?
-
-            /** Function: reset
-            *  Reset the connection.
-            *
-            *  This function should be called after a connection is disconnected
-            *  before that connection is reused.
-            */
-            reset(): void;
-
-            /** Function: pause
-             *  Pause the request manager.
-             *
-             *  This will prevent Strophe from sending any more requests to the
-             *  server.  This is very useful for temporarily pausing
-             *  BOSH-Connections while a lot of send() calls are happening quickly.
-             *  This causes Strophe to send the data in a single request, saving
-             *  many request trips.
-             */
-            pause(): void;
-
-            /** Function: resume
-             *  Resume the request manager.
-             *
-             *  This resumes after pause() has been called.
-             */
-            resume(): void;
-
-            /** Function: getUniqueId
-             *  Generate a unique ID for use in <iq/> elements.
-             *
-             *  All <iq/> stanzas are required to have unique id attributes.  This
-             *  function makes creating these easy.  Each connection instance has
-             *  a counter which starts from zero, and the value of this counter
-             *  plus a colon followed by the suffix becomes the unique id. If no
-             *  suffix is supplied, the counter is used as the unique id.
-             *
-             *  Suffixes are used to make debugging easier when reading the stream
-             *  data, and their use is recommended.  The counter resets to 0 for
-             *  every new connection for the same reason.  For connections to the
-             *  same server that authenticate the same way, all the ids should be
-             *  the same, which makes it easy to see changes.  This is useful for
-             *  automated testing as well.
-             *
-             *  Parameters:
-             *    (String) suffix - A optional suffix to append to the id.
-             *
-             *  Returns:
-             *    A unique string to be used for the id attribute.
-             */
-            getUniqueId(suffix?: string | number): string;
-
-            /** Function: connect
-             *  Starts the connection process.
-             *
-             *  As the connection process proceeds, the user supplied callback will
-             *  be triggered multiple times with status updates.  The callback
-             *  should take two arguments - the status code and the error condition.
-             *
-             *  The status code will be one of the values in the Strophe.Status
-             *  constants.  The error condition will be one of the conditions
-             *  defined in RFC 3920 or the condition 'strophe-parsererror'.
-             *
-             *  The Parameters _wait_, _hold_ and _route_ are optional and only relevant
-             *  for BOSH connections. Please see XEP 124 for a more detailed explanation
-             *  of the optional parameters.
-             *
-             *  Parameters:
-             *    (String) jid - The user's JID.  This may be a bare JID,
-             *      or a full JID.  If a node is not supplied, SASL ANONYMOUS
-             *      authentication will be attempted.
-             *    (String) pass - The user's password.
-             *    (Function) callback - The connect callback function.
-             *    (Integer) wait - The optional HTTPBIND wait value.  This is the
-             *      time the server will wait before returning an empty result for
-             *      a request.  The default setting of 60 seconds is recommended.
-             *    (Integer) hold - The optional HTTPBIND hold value.  This is the
-             *      number of connections the server will hold at one time.  This
-             *      should almost always be set to 1 (the default).
-             *    (String) route - The optional route value.
-             */
-            connect(jid?: string, pass?: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, route?: string): void;
-
-            /** Function: attach
-             *  Attach to an already created and authenticated BOSH session.
-             *
-             *  This function is provided to allow Strophe to attach to BOSH
-             *  sessions which have been created externally, perhaps by a Web
-             *  application.  This is often used to support auto-login type features
-             *  without putting user credentials into the page.
-             *
-             *  Parameters:
-             *    (String) jid - The full JID that is bound by the session.
-             *    (String) sid - The SID of the BOSH session.
-             *    (String) rid - The current RID of the BOSH session.  This RID
-             *      will be used by the next request.
-             *    (Function) callback The connect callback function.
-             *    (Integer) wait - The optional HTTPBIND wait value.  This is the
-             *      time the server will wait before returning an empty result for
-             *      a request.  The default setting of 60 seconds is recommended.
-             *      Other settings will require tweaks to the Strophe.TIMEOUT value.
-             *    (Integer) hold - The optional HTTPBIND hold value.  This is the
-             *      number of connections the server will hold at one time.  This
-             *      should almost always be set to 1 (the default).
-             *    (Integer) wind - The optional HTTBIND window value.  This is the
-             *      allowed range of request ids that are valid.  The default is 5.
-             */
-            attach(jid: string, sid: string, rid: string, callback?: (status: Status, condition: string) => any, wait?: number, hold?: number, wind?: number): void;
-
-            /** Function: xmlInput
-             *  User overrideable function that receives XML data coming into the
-             *  connection.
-             *
-             *  The default function does nothing.  User code can override this with
-             *  > Strophe.Connection.xmlInput = function (elem) {
-             *  >   (user code)
-             *  > };
-             *
-             *  Due to limitations of current Browsers' XML-Parsers the opening and closing
-             *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
-             *
-             *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
-             *  <Strophe.Bosh.strip> if you want to strip this tag.
-             *
-             *  Parameters:
-             *    (XMLElement) elem - The XML data received by the connection.
-             */
-            xmlInput(elem: Element): void;
-
-            /** Function: xmlOutput
-             *  User overrideable function that receives XML data sent to the
-             *  connection.
-             *
-             *  The default function does nothing.  User code can override this with
-             *  > Strophe.Connection.xmlOutput = function (elem) {
-             *  >   (user code)
-             *  > };
-             *
-             *  Due to limitations of current Browsers' XML-Parsers the opening and closing
-             *  <stream> tag for WebSocket-Connoctions will be passed as selfclosing here.
-             *
-             *  BOSH-Connections will have all stanzas wrapped in a <body> tag. See
-             *  <Strophe.Bosh.strip> if you want to strip this tag.
-             *
-             *  Parameters:
-             *    (XMLElement) elem - The XMLdata sent by the connection.
-             */
-            xmlOutput(elem: Element): void;
-
-            /** Function: rawInput
-             *  User overrideable function that receives raw data coming into the
-             *  connection.
-             *
-             *  The default function does nothing.  User code can override this with
-             *  > Strophe.Connection.rawInput = function (data) {
-             *  >   (user code)
-             *  > };
-             *
-             *  Parameters:
-             *    (String) data - The data received by the connection.
-             */
-            rawInput(data: string): void;
-
-            /** Function: rawOutput
-             *  User overrideable function that receives raw data sent to the
-             *  connection.
-             *
-             *  The default function does nothing.  User code can override this with
-             *  > Strophe.Connection.rawOutput = function (data) {
-             *  >   (user code)
-             *  > };
-             *
-             *  Parameters:
-             *    (String) data - The data sent by the connection.
-             */
-            rawOutput(data: string): void;
-
-            /** Function: send
-             *  Send a stanza.
-             *
-             *  This function is called to push data onto the send queue to
-             *  go out over the wire.  Whenever a request is sent to the BOSH
-             *  server, all pending data is sent and the queue is flushed.
-             *
-             *  Parameters:
-             *    (XMLElement |
-             *     [XMLElement] |
-             *     Strophe.Builder) elem - The stanza to send.
-             */
-            send(elem: Element | Element[]| Builder): void;
-
-            /** Function: flush
-             *  Immediately send any pending outgoing data.
-             *
-             *  Normally send() queues outgoing data until the next idle period
-             *  (100ms), which optimizes network use in the common cases when
-             *  several send()s are called in succession. flush() can be used to
-             *  immediately send all pending data.
-             */
-            flush(): void;
-
-            /** Function: sendIQ
-             *  Helper function to send IQ stanzas.
-             *
-             *  Parameters:
-             *    (XMLElement) elem - The stanza to send.
-             *    (Function) callback - The callback function for a successful request.
-             *    (Function) errback - The callback function for a failed or timed
-             *      out request.  On timeout, the stanza will be null.
-             *    (Integer) timeout - The time specified in milliseconds for a
-             *      timeout to occur.
-             *
-             *  Returns:
-             *    The id used to send the IQ.
-            */
-            sendIQ(elem: Element | Builder, callback?: (stanza: Element) => any, errback?: (stanza: Element) => any, timeout?: number): string; //todo: Is callback correct?
-
-            /** Function: addTimedHandler
-             *  Add a timed handler to the connection.
-             *
-             *  This function adds a timed handler.  The provided handler will
-             *  be called every period milliseconds until it returns false,
-             *  the connection is terminated, or the handler is removed.  Handlers
-             *  that wish to continue being invoked should return true.
-             *
-             *  Because of method binding it is necessary to save the result of
-             *  this function if you wish to remove a handler with
-             *  deleteTimedHandler().
-             *
-             *  Note that user handlers are not active until authentication is
-             *  successful.
-             *
-             *  Parameters:
-             *    (Integer) period - The period of the handler.
-             *    (Function) handler - The callback function.
-             *
-             *  Returns:
-             *    A reference to the handler that can be used to remove it.
-             */
-            addTimedHandler(period: number, handler: () => boolean): any;
-
-            /** Function: deleteTimedHandler
-             *  Delete a timed handler for a connection.
-             *
-             *  This function removes a timed handler from the connection.  The
-             *  handRef parameter is *not* the function passed to addTimedHandler(),
-             *  but is the reference returned from addTimedHandler().
-             *
-             *  Parameters:
-             *    (Strophe.TimedHandler) handRef - The handler reference.
-             */
-            deleteTimedHandler(handRef: any): void;
-
-
-            /** Function: addHandler
-             *  Add a stanza handler for the connection.
-             *
-             *  This function adds a stanza handler to the connection.  The
-             *  handler callback will be called for any stanza that matches
-             *  the parameters.  Note that if multiple parameters are supplied,
-             *  they must all match for the handler to be invoked.
-             *
-             *  The handler will receive the stanza that triggered it as its argument.
-             *  *The handler should return true if it is to be invoked again;
-             *  returning false will remove the handler after it returns.*
-             *
-             *  As a convenience, the ns parameters applies to the top level element
-             *  and also any of its immediate children.  This is primarily to make
-             *  matching /iq/query elements easy.
-             *
-             *  The options argument contains handler matching flags that affect how
-             *  matches are determined. Currently the only flag is matchBare (a
-             *  boolean). When matchBare is true, the from parameter and the from
-             *  attribute on the stanza will be matched as bare JIDs instead of
-             *  full JIDs. To use this, pass {matchBare: true} as the value of
-             *  options. The default value for matchBare is false.
-             *
-             *  The return value should be saved if you wish to remove the handler
-             *  with deleteHandler().
-             *
-             *  Parameters:
-             *    (Function) handler - The user callback.
-             *    (String) ns - The namespace to match.
-             *    (String) name - The stanza name to match.
-             *    (String) type - The stanza type attribute to match.
-             *    (String) id - The stanza id attribute to match.
-             *    (String) from - The stanza from attribute to match.
-             *    (String) options - The handler options
-             *
-             *  Returns:
-             *    A reference to the handler that can be used to remove it.
-             */
-            addHandler(handler: (stanza: Element) => boolean, ns: string, name: string, type?: string, id?: string, from?: string, options?: { matchBare: boolean }): any; //todo: is callback correct? Also, are the elements specified as optional truly optional?
-
-            /** Function: deleteHandler
-             *  Delete a stanza handler for a connection.
-             *
-             *  This function removes a stanza handler from the connection.  The
-             *  handRef parameter is *not* the function passed to addHandler(),
-             *  but is the reference returned from addHandler().
-             *
-             *  Parameters:
-             *    (Strophe.Handler) handRef - The handler reference.
-             */
-            deleteHandler(handRef: any): void;
-
-            /** Function: disconnect
-             *  Start the graceful disconnection process.
-             *
-             *  This function starts the disconnection process.  This process starts
-             *  by sending unavailable presence and sending BOSH body of type
-             *  terminate.  A timeout handler makes sure that disconnection happens
-             *  even if the BOSH server does not respond.
-             *  If the Connection object isn't connected, at least tries to abort all pending requests
-             *  so the connection object won't generate successful requests (which were already opened).
-             *
-             *  The user supplied connection callback will be notified of the
-             *  progress as this process happens.
-             *
-             *  Parameters:
-             *    (String) reason - The reason the disconnect is occuring.
-             */
-            disconnect(reason: string): void;
-        }
-
-        /** Interface: Strophe.SASLMechanism
+        /** Function: deleteHandler
+         *  Delete a stanza handler for a connection.
          *
-         *  encapsulates SASL authentication mechanisms.
+         *  This function removes a stanza handler from the connection.  The
+         *  handRef parameter is *not* the function passed to addHandler(),
+         *  but is the reference returned from addHandler().
          *
-         *  User code may override the priority for each mechanism or disable it completely.
-         *  See <priority> for information about changing priority and <test> for informatian on
-         *  how to disable a mechanism.
-         *
-         *  By default, all mechanisms are enabled and the priorities are
-         *
-         *  SCRAM-SHA1 - 40
-         *  DIGEST-MD5 - 30
-         *  Plain - 20
+         *  Parameters:
+         *    (Strophe.Handler) handRef - The handler reference.
          */
-        interface SASLMechanism {
-            /**
-           *  Function: test
-           *  Checks if mechanism able to run.
-           *  To disable a mechanism, make this return false;
-           *
-           *  To disable plain authentication run
-           *  > Strophe.SASLPlain.test = function() {
-           *  >   return false;
-           *  > }
-           *
-           *  See <SASL mechanisms> for a list of available mechanisms.
-           *
-           *  Parameters:
-           *    (Strophe.Connection) connection - Target Connection.
-           *
-           *  Returns:
-           *    (Boolean) If mechanism was able to run.
-           */
-            test(connection: Connection): boolean;
+        deleteHandler(handRef: any): void;
 
-            /** Variable: priority
-           *  Determines which <SASLMechanism> is chosen for authentication (Higher is better).
-           *  Users may override this to prioritize mechanisms differently.
-           *
-           *  In the default configuration the priorities are
-           *
-           *  SCRAM-SHA1 - 40
-           *  DIGEST-MD5 - 30
-           *  Plain - 20
-           *
-           *  Example: (This will cause Strophe to choose the mechanism that the server sent first)
-           *
-           *  > Strophe.SASLMD5.priority = Strophe.SASLSHA1.priority;
-           *
-           *  See <SASL mechanisms> for a list of available mechanisms.
-           *
-           */
-            priority: number;
-        }
-
-        /** Constants: SASL mechanisms
-       *  Available authentication mechanisms
-       *
-       *  Strophe.SASLAnonymous - SASL Anonymous authentication.
-       *  Strophe.SASLPlain - SASL Plain authentication.
-       *  Strophe.SASLMD5 - SASL Digest-MD5 authentication
-       *  Strophe.SASLSHA1 - SASL SCRAM-SHA1 authentication
-       */
-        var SASLAnonymous: SASLMechanism;
-        var SASLPlain: SASLMechanism;
-        var SASLSHA1: SASLMechanism;
-        var SASLMD5: SASLMechanism;
+        /** Function: disconnect
+         *  Start the graceful disconnection process.
+         *
+         *  This function starts the disconnection process.  This process starts
+         *  by sending unavailable presence and sending BOSH body of type
+         *  terminate.  A timeout handler makes sure that disconnection happens
+         *  even if the BOSH server does not respond.
+         *  If the Connection object isn't connected, at least tries to abort all pending requests
+         *  so the connection object won't generate successful requests (which were already opened).
+         *
+         *  The user supplied connection callback will be notified of the
+         *  progress as this process happens.
+         *
+         *  Parameters:
+         *    (String) reason - The reason the disconnect is occuring.
+         */
+        disconnect(reason: string): void;
     }
+
+    /** Interface: Strophe.SASLMechanism
+     *
+     *  encapsulates SASL authentication mechanisms.
+     *
+     *  User code may override the priority for each mechanism or disable it completely.
+     *  See <priority> for information about changing priority and <test> for informatian on
+     *  how to disable a mechanism.
+     *
+     *  By default, all mechanisms are enabled and the priorities are
+     *
+     *  SCRAM-SHA1 - 40
+     *  DIGEST-MD5 - 30
+     *  Plain - 20
+     */
+    interface SASLMechanism {
+        /**
+       *  Function: test
+       *  Checks if mechanism able to run.
+       *  To disable a mechanism, make this return false;
+       *
+       *  To disable plain authentication run
+       *  > Strophe.SASLPlain.test = function() {
+       *  >   return false;
+       *  > }
+       *
+       *  See <SASL mechanisms> for a list of available mechanisms.
+       *
+       *  Parameters:
+       *    (Strophe.Connection) connection - Target Connection.
+       *
+       *  Returns:
+       *    (Boolean) If mechanism was able to run.
+       */
+        test(connection: Connection): boolean;
+
+        /** Variable: priority
+       *  Determines which <SASLMechanism> is chosen for authentication (Higher is better).
+       *  Users may override this to prioritize mechanisms differently.
+       *
+       *  In the default configuration the priorities are
+       *
+       *  SCRAM-SHA1 - 40
+       *  DIGEST-MD5 - 30
+       *  Plain - 20
+       *
+       *  Example: (This will cause Strophe to choose the mechanism that the server sent first)
+       *
+       *  > Strophe.SASLMD5.priority = Strophe.SASLSHA1.priority;
+       *
+       *  See <SASL mechanisms> for a list of available mechanisms.
+       *
+       */
+        priority: number;
+    }
+
+    /** Constants: SASL mechanisms
+   *  Available authentication mechanisms
+   *
+   *  Strophe.SASLAnonymous - SASL Anonymous authentication.
+   *  Strophe.SASLPlain - SASL Plain authentication.
+   *  Strophe.SASLMD5 - SASL Digest-MD5 authentication
+   *  Strophe.SASLSHA1 - SASL SCRAM-SHA1 authentication
+   */
+    var SASLAnonymous: SASLMechanism;
+    var SASLPlain: SASLMechanism;
+    var SASLSHA1: SASLMechanism;
+    var SASLMD5: SASLMechanism;
 }
 
 /** Function: $build
-     *  Create a Strophe.Builder.
-     *  This is an alias for 'new Strophe.Builder(name, attrs)'.
-     *
-     *  Parameters:
-     *    (String) name - The root element name.
-     *    (Object) attrs - The attributes for the root element in object notation.
-     *
-     *  Returns:
-     *    A new Strophe.Builder object.
-     */
-declare function $build(name: string, attrs?: any): wrapper.Strophe.Builder;
+ *  Create a Strophe.Builder.
+ *  This is an alias for 'new Strophe.Builder(name, attrs)'.
+ *
+ *  Parameters:
+ *    (String) name - The root element name.
+ *    (Object) attrs - The attributes for the root element in object notation.
+ *
+ *  Returns:
+ *    A new Strophe.Builder object.
+ */
+declare function $build(name: string, attrs?: any): Strophe.Builder;
 
 /** Function: $msg
-     *  Create a Strophe.Builder with a <message/> element as the root.
-     *
-     *  Parmaeters:
-     *    (Object) attrs - The <message/> element attributes in object notation.
-     *
-     *  Returns:
-     *    A new Strophe.Builder object.
-     */
-declare function $msg(attrs?: any): wrapper.Strophe.Builder;
+ *  Create a Strophe.Builder with a <message/> element as the root.
+ *
+ *  Parmaeters:
+ *    (Object) attrs - The <message/> element attributes in object notation.
+ *
+ *  Returns:
+ *    A new Strophe.Builder object.
+ */
+declare function $msg(attrs?: any): Strophe.Builder;
 
 /** Function: $iq
  *  Create a Strophe.Builder with an <iq/> element as the root.
@@ -1101,7 +1077,7 @@ declare function $msg(attrs?: any): wrapper.Strophe.Builder;
  *  Returns:
  *    A new Strophe.Builder object.
  */
-declare function $iq(attrs?: any): wrapper.Strophe.Builder;
+declare function $iq(attrs?: any): Strophe.Builder;
 
 /** Function: $pres
  *  Create a Strophe.Builder with a <presence/> element as the root.
@@ -1112,26 +1088,29 @@ declare function $iq(attrs?: any): wrapper.Strophe.Builder;
  *  Returns:
  *    A new Strophe.Builder object.
  */
-declare function $pres(attrs?: any): wrapper.Strophe.Builder;
-
-import Strophe = wrapper.Strophe;
+declare function $pres(attrs?: any): Strophe.Builder;
 
 // Support AMD require
-declare module '$build' {
-    export = wrapper.$build;
+declare module "strophe" {
+  export = { Strophe, $build, $msg, $iq, $pres };
 }
-declare module '$msg' {
-    export = wrapper.$msg;
+
+declare module "Strophe" {
+  export = Strophe;
 }
-declare module '$iq' {
-    export = wrapper.$iq;
+
+declare module "$build" {
+  export = $build;
 }
-declare module '$pres' {
-    export = wrapper.$pres;
+
+declare module "$msg" {
+  export = $msg;
 }
-declare module 'Strophe' {
-    export = wrapper.Strophe;
+
+declare module "$iq" {
+  export = $iq;
 }
-declare module 'strophe' {
-    export = wrapper;
+
+declare module "$pres" {
+  export = $pres;
 }
diff --git a/types/strophe/muc.d.ts b/types/strophe/muc.d.ts
new file mode 100644
index 0000000000..7d377c2302
--- /dev/null
+++ b/types/strophe/muc.d.ts
@@ -0,0 +1,837 @@
+// Type definitions for strophe.muc.js v1.2.0
+// Project: https://github.com/metajack/strophejs-plugins
+// Definitions by: Ilia Choly <https://github.com/icholy/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Strophe {
+
+  interface Connection {
+    muc: MUC.Plugin;
+  }
+
+  namespace MUC {
+
+    interface Plugin {
+
+      /**
+       * Initialize the MUC plugin. Sets the correct connection object and
+       * extends the namesace. 
+       *
+       * @param conn - the connection instance.
+       */
+      init(conn: Connection): void;
+
+      /**
+       * Join a multi-user chat room
+       *
+       * @param room - The multi-user chat room to join.
+       * @param nick - The nickname to use in the chat room. Optional
+       * @param msg_handler_cb - The function call to handle messages from the specified chat room.
+       * @param pres_handler_cb - The function call back to handle presence in the chat room.
+       * @param roster_cb - The function call to handle roster info in the chat room
+       * @param password - The optional password to use. (password protected rooms only)
+       * @param history_attrs - Optional attributes for retrieving history
+       * @param extended_presence - Optional XML for extending presence 
+       */
+      join(
+        room:               string,
+        nick:               string,
+        msg_handler_cb:     (stanza: Element, room: XmppRoom) => boolean,
+        pres_handler_cb:    (stanza: Element, room: XmppRoom) => boolean,
+        roster_cb:          (occupants: OccupantMap, room: XmppRoom) => boolean,
+        password?:          string,
+        history_attrs?:     any,
+        extended_presence?: Element
+      ): void;
+
+
+      /**
+       * Leave a multi-user chat room
+       * 
+       * @param room - The multi-user chat room to leave.
+       * @param nick - The nick name used in the room.
+       * @param handler_cb - Optional function to handle the successful leave.
+       * @param exit_msg - optional exit message.
+       * @return iqid - The unique id for the room leave.*
+       */
+      leave(
+        room:        string,
+        nick:        string,
+        handler_cb?: Function,
+        exit_msg?:   string
+      ): string;
+
+
+      /**
+       * Send a message to a room.
+       *
+       * @param) room - The multi-user chat room name.
+       * @param nick - The nick name used in the chat room.
+       * @param message - The plaintext message to send to the room.
+       * @param html_message - The message to send to the room with html markup.
+       * @param type - "groupchat" for group chat messages o "chat" for private chat messages
+       * @return msgiq - the unique id used to send the message
+       */
+      message(
+        room:         string,
+        nick:         string,
+        message:      string,
+        html_message: string,
+        type:         "groupchat"|"chat"
+      ): string;
+
+
+      /**
+       * Convenience Function to send a Message to all Occupants
+       *
+       * @param room - The multi-user chat room name.
+       * @param message - The plaintext message to send to the room.
+       * @param html_message - Optional message to send to the room with html markup.
+       * @param msgid - Optional unique ID which will be set as the 'id' attribute of the stanza
+       * @return msgiq - the unique id used to send the message
+       */
+      groupchat(
+        room:          string,
+        message:       string,
+        html_message?: string,
+        msgid?:        string
+      ): string;
+
+
+      /**
+       * Send a mediated invitation.
+       *
+       * @param room - The multi-user chat room name.
+       * @param receiver - The invitation's receiver.
+       * @param reason - Optional reason for joining the room.
+       * @return msgiq - the unique id used to send the invitation
+       */
+      invite(
+        room:     string,
+        receiver: string,
+        reason?:  string
+      ): string;
+
+
+      /**
+       * Send a mediated multiple invitation.
+       *
+       * @param room - The multi-user chat room name.
+       * @param receivers - The invitation's receivers.
+       * @param reason - Optional reason for joining the room.
+       * @return msgiq - the unique id used to send the invitation
+       */
+      multipleInvites(
+        room:      string,
+        receivers: string[],
+        reason?:   string
+      ): string;
+
+
+      /**
+       * Send a direct invitation.
+       *
+       * @param room - The multi-user chat room name.
+       * @param receiver - The invitation's receiver.
+       * @param reason - Optional reason for joining the room.
+       * @param password - Optional password for the room.
+       * @return msgiq - the unique id used to send the invitation
+       */
+      directInvite(
+        room:      string,
+        receiver:  string,
+        reason?:   string,
+        password?: string
+      ): string;
+
+
+      /**
+       * Queries a room for a list of occupants
+       *
+       * @param room - The multi-user chat room name.
+       * @param success_cb - Optional function to handle the info.
+       * @param error_cb - Optional function to handle an error.
+       * @return id - the unique id used to send the info request
+       */
+      queryOccupants(
+        room:        string,
+        success_cb?: (stanza: Element) => any,
+        error_cb?:   (error: any) => any
+      ): string;
+
+
+      /**
+       * Start a room configuration.
+       *
+       * @param room - The multi-user chat room name.
+       * @param handler_cb - Optional function to handle the config form.
+       * @param error_cb - Optional function to handle an error.
+       * @return id - the unique id used to send the configuration request
+       */
+      configure(
+        room:        string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Cancel the room configuration
+       *
+       * @param room - The multi-user chat room name.
+       * @return id - the unique id used to cancel the configuration.
+       */
+      cancelConfigure(room: string): string;
+
+
+      /**
+       * Save a room configuration.
+       *
+       * @param room - The multi-user chat room name.
+       * @param config- Form Object or an array of form elements used to configure the room.
+       * @param success_db - Optional function to handle success.
+       * @param error_cb - Optional function to handle an error.
+       * @return id - the unique id used to save the configuration.
+       */
+      saveConfiguration(
+        room:        string,
+        config:      any,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Create an instance room.
+       *
+       * @param room - The multi-user chat room name.
+       * @param success_db - Optional function to handle success.
+       * @param error_cb - Optional function to handle an error.
+       * @return id - the unique id used to create the chat room.
+       */
+      createInstantRoom(
+        room:        string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Create a configured room.
+       *
+       * @param room - The multi-user chat room name.
+       * @param config - the configuration. ex: {"muc#roomconfig_publicroom": "0", "muc#roomconfig_persistentroom": "1"}
+       * @param success_db - Optional function to handle success.
+       * @param error_cb - Optional function to handle an error.
+       * @return id - the unique id used to create the chat room.
+       */
+      createConfiguredRoom(
+        room:       string,
+        config:     any,
+        success_cb: Function,
+        error_cb:   Function
+      ): string;
+
+
+      /**
+       * Set the topic of the chat room.
+       *
+       * @param room - The multi-user chat room name.
+       * @param topic - Topic message.
+       */
+      setTopic(room: string, topic: string): void;
+
+
+      /**
+       * Changes the role of a member of a MUC room.
+       * The modification can only be done by a room moderator. An error will be
+       * returned if the user doesn't have permission.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param role - The new role of the user.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      modifyRole(
+        room:        string,
+        nick:        string,
+        role:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Kick a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      kick(
+        room:        string,
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Voice a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      voice(
+        room:        string,
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Mute a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      mute(
+        room:        string,
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Op a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      op(
+        room:        string,
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * De-Op a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param nick - The nick name of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      deop(
+        room:        string,
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Changes the affiliation of a member of a MUC room.
+       * The modification can only be done by a room moderator. An error will be
+       * returned if the user doesn't have permission.
+       * Parameters:
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param affiliation - The new affiliation of the user.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      modifyAffiliation(
+        room:        string,
+        jid:         string,
+        affiliation: string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Ban a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      ban(
+        room:        string,
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Member a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      member(
+        room:        string,
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Revoke a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      revoke(
+        room:        string,
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Owner a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      owner(
+        room:        string,
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Admin a user.
+       *
+       * @param room - The multi-user chat room name.
+       * @param jid  - The jid of the user to modify.
+       * @param reason - Optional reason for the change.
+       * @param handler_cb - Optional callback for success
+       * @param error_cb - Optional callback for error
+       * @return iq - the id of the mode change request.
+       */
+      owner(
+        room:        string,
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      /**
+       * Change the current users nick name.
+       *
+       * @param room - The multi-user chat room name.
+       * @param user - The new nick name.
+       */
+      changeNick(room: string, user: string): void;
+
+      /**
+       * Change the current users status.
+       *
+       * @param room - The multi-user chat room name.
+       * @param user - The current nick.
+       * @param show - The new show-text.
+       * @param status - The new status-text.
+       */
+      setStatus(
+        room:   string,
+        user:   string,
+        show:   string,
+        status: string
+      ): void;
+
+      /**
+       * Registering with a room.
+       * @see http://xmpp.org/extensions/xep-0045.html#register
+       *
+       * @param room - The multi-user chat room name.
+       * @param handle_cb - Function to call for room list return.
+       * @param error_cb - Function to call on error.
+       */
+      registrationRequest(
+        room:      string,
+        handle_cb: Function,
+        error_cb:  Function
+      ): void;
+
+
+      /**
+       * Submits registration form.
+       *
+       * @param room - The multi-user chat room name.
+       * @param fields - The form fields.
+       * @param handle_cb - Function to call for room list return.
+       * @param error_cb - Function to call on error.
+       */
+      submitRegistrationForm(
+        room:      string,
+        fields:    any,
+        handle_cb: Function,
+        error_cb:  Function
+      ): void;
+
+      /**
+       * List all chat room available on a server.
+       *
+       * @param server - name of chat server.
+       * @param handle_cb - Function to call for room list return.
+       * @param error_cb - Function to call on error.
+       */
+      listRooms(
+        server:    string,
+        handle_cb: (stanza: Element) => any,
+        error_cb:  (error: any) => any
+      ): void;
+    }
+
+    interface XmppRoom {
+
+      join(
+        msg_handler_cb:  Function,
+        pres_handler_cb: Function,
+        roster_cb:       Function
+      ): void;
+
+
+      leave(
+        handler_cb?: Function,
+        exit_msg?:   string
+      ): void;
+
+
+      message(
+        message:      string,
+        html_message: string,
+        type:         "groupchat"|"chat"
+      ): string;
+
+
+      groupchat(message: string, html_message?: string): string;
+
+
+      invite(receiver: string, reason?: string): string;
+
+
+      multipleInvites(receivers: string[], reason?: string): string;
+
+
+      directInvite(receiver: string, reason?: string): string;
+
+
+      configure(handler_cb: Function): string;
+
+
+      cancelConfigure(): string;
+
+
+      saveConfiguration(config: any): string;
+
+
+      queryOccupants(success_cb: Function, error_cb: Function): void;
+
+
+      setTopic(topic: string): string;
+
+
+      modifyRole(
+        nick:        string,
+        role:        string,
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      kick(
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      voice(
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      mute(
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      op(
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      deop(
+        nick:        string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      modifyAffiliation(
+        jid:         string,
+        affiliation: string,
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      ban(
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      member(
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      revoke(
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      owner(
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      admin(
+        jid:         string,
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      changeNick(nick: string): string;
+
+
+      setStatus(show: string, status: string): string;
+
+
+      /**
+       * Adds a handler to the MUC room.
+       * Parameters:
+       * @param handler_type - 'message', 'presence' or 'roster'.
+       * @param handler - The handler function.
+       * @return id - the id of handler.
+       */
+      addHandler(
+        handler_type: "presence"|"message"|"roster",
+        handler:      Function
+      ): number;
+
+
+      /**
+       * Removes a handler from the MUC room.
+       * This function takes ONLY ids returned by the addHandler function
+       * of this room. passing handler ids returned by connection.addHandler
+       * may brake things!
+       *
+       * @param id - the id of the handler
+       */
+      removeHandler(id: number): void;
+
+    }
+
+
+    interface RoomConfig {
+      parse(info?: Element): any;
+    }
+
+
+    interface OccupantInfo {
+      nick?:        string;
+      affiliation?: string;
+      role?:        string;
+      jid?:         string;
+      status?:      string;
+      show?:        string
+    }
+
+
+    interface Occupant extends OccupantInfo {
+
+      modifyRole(
+        role:        string,
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      kick(
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      voice(
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+      mute(
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      op(
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      deop(
+        reason?:     string,
+        handler_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      modifyAffiliation(
+        affiliation: string,
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      ban(
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      member(
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      revoke(
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      owner(
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+
+      admin(
+        reason?:     string,
+        success_cb?: Function,
+        error_cb?:   Function
+      ): string;
+
+      update(data: OccupantInfo): void;
+    }
+
+    interface OccupantMap {
+      [jid: string]: Occupant;
+    }
+
+  }
+}
+
diff --git a/types/strophe/strophe-tests.ts b/types/strophe/strophe-tests.ts
index 45611ae04d..c425a4efee 100644
--- a/types/strophe/strophe-tests.ts
+++ b/types/strophe/strophe-tests.ts
@@ -98,3 +98,26 @@ function onConnect(status: Strophe.Status): void {
         connection.send($pres().tree());
     }
 }
+
+function onRoomMessage(stanza: Element, room: Strophe.MUC.XmppRoom): boolean {
+  console.log(Strophe.serialize(stanza));
+  room.groupchat("hello");
+  return true;
+}
+
+function onRoomPresence(stanza: Element, room: Strophe.MUC.XmppRoom): boolean {
+  let from = stanza.getAttribute("from");
+  console.log(`${from} precense updated`);
+  return true;
+}
+
+function onRoomRoster(occupants: Strophe.MUC.OccupantMap, room: Strophe.MUC.XmppRoom): boolean {
+  for (let nick of Object.keys(occupants)) {
+    let occupant = occupants[nick];
+    console.log(occupant.nick, occupant.show, occupant.status);
+  }
+  return true;
+}
+
+connection.muc.init(connection);
+connection.muc.join("room", "nick", onRoomMessage, onRoomPresence, onRoomRoster);
diff --git a/types/strophe/tsconfig.json b/types/strophe/tsconfig.json
index 64f2d4ab19..eee9184d3b 100644
--- a/types/strophe/tsconfig.json
+++ b/types/strophe/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "muc.d.ts",
         "strophe-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/succinct/index.d.ts b/types/succinct/index.d.ts
index 33272292f2..1553f071c9 100644
--- a/types/succinct/index.d.ts
+++ b/types/succinct/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://mikeking.io/succinct/
 // Definitions by: Matt Brooks <https://github.com/EnableSoftware>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/superagent-no-cache/index.d.ts b/types/superagent-no-cache/index.d.ts
new file mode 100644
index 0000000000..c08b41af15
--- /dev/null
+++ b/types/superagent-no-cache/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for superagent-no-cache 0.1
+// Project: https://github.com/johntron/superagent-no-cache
+// Definitions by: Michael Ledin <https://github.com/mxl/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as request from 'superagent';
+
+declare const plugin: request.Plugin;
+
+export = plugin;
diff --git a/types/superagent-no-cache/superagent-no-cache-tests.ts b/types/superagent-no-cache/superagent-no-cache-tests.ts
new file mode 100644
index 0000000000..68e4e961a2
--- /dev/null
+++ b/types/superagent-no-cache/superagent-no-cache-tests.ts
@@ -0,0 +1,9 @@
+import * as request from 'superagent';
+import * as plugin from 'superagent-no-cache';
+
+request
+    .get('/some-url')
+    .use(plugin)
+    .end((err, res) => {
+        // Do something
+    });
diff --git a/types/superagent-no-cache/tsconfig.json b/types/superagent-no-cache/tsconfig.json
new file mode 100644
index 0000000000..668d406795
--- /dev/null
+++ b/types/superagent-no-cache/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "superagent-no-cache-tests.ts"
+    ]
+}
diff --git a/types/superagent-no-cache/tslint.json b/types/superagent-no-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superagent-no-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/superagent-prefix/index.d.ts b/types/superagent-prefix/index.d.ts
new file mode 100644
index 0000000000..8b7eb1d508
--- /dev/null
+++ b/types/superagent-prefix/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for superagent-prefix 0.0
+// Project: https://github.com/johntron/superagent-prefix
+// Definitions by: Michael Ledin <https://github.com/mxl/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as request from 'superagent';
+
+declare function plugin(prefix: string): request.Plugin;
+
+declare namespace plugin {
+}
+
+export = plugin;
diff --git a/types/superagent-prefix/superagent-prefix-tests.ts b/types/superagent-prefix/superagent-prefix-tests.ts
new file mode 100644
index 0000000000..01e4b52905
--- /dev/null
+++ b/types/superagent-prefix/superagent-prefix-tests.ts
@@ -0,0 +1,9 @@
+import * as request from 'superagent';
+import * as plugin from 'superagent-prefix';
+
+request
+    .get('/some-url')
+    .use(plugin('/static'))
+    .end((err, res) => {
+        // Do something
+    });
diff --git a/types/superagent-prefix/tsconfig.json b/types/superagent-prefix/tsconfig.json
new file mode 100644
index 0000000000..20c1d2c993
--- /dev/null
+++ b/types/superagent-prefix/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "superagent-prefix-tests.ts"
+    ]
+}
diff --git a/types/superagent-prefix/tslint.json b/types/superagent-prefix/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superagent-prefix/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 36caca8459..4032a9d543 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -1,20 +1,30 @@
-// Type definitions for SuperAgent v2.0.0
+// Type definitions for SuperAgent 3.5
 // Project: https://github.com/visionmedia/superagent
-// Definitions by: Alex Varju <https://github.com/varju/>
+// Definitions by: Nico Zelaya <https://github.com/NicoZelaya/>
+//                 Michael Ledin <https://github.com/mxl/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
-import stream = require('stream');
+import * as stream from 'stream';
+import * as https from 'https';
 
 type CallbackHandler = (err: any, res: request.Response) => void;
 
-declare var request: request.SuperAgentStatic;
+declare const request: request.SuperAgentStatic;
 
 declare namespace request {
-    interface SuperAgentRequest extends Request { }
+    interface SuperAgentRequest extends Request {
+        agent(agent?: https.Agent): this;
+
+        method: string;
+        url: string;
+        cookies: string;
+    }
     interface SuperAgentStatic extends SuperAgent<SuperAgentRequest> {
         (url: string): SuperAgentRequest;
+        // tslint:disable-next-line:unified-signatures
         (method: string, url: string): SuperAgentRequest;
 
         agent(): SuperAgent<SuperAgentRequest>;
@@ -49,9 +59,9 @@ declare namespace request {
         search(url: string, callback?: CallbackHandler): Req;
         connect(url: string, callback?: CallbackHandler): Req;
 
-      parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
-      saveCookies(res: Response): void;
-      attachCookies(req: Req): void;
+        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+        saveCookies(res: Response): void;
+        attachCookies(req: Req): void;
     }
 
     interface Response extends NodeJS.ReadableStream {
@@ -76,42 +86,48 @@ declare namespace request {
         notAcceptable: boolean;
         notFound: boolean;
         forbidden: boolean;
-      xhr: XMLHttpRequest;
+        xhr: XMLHttpRequest;
         get(header: string): string;
     }
 
     interface Request extends Promise<Response> /* extends NodeJS.WritableStream */ {
-      abort(): void;
-      accept(type: string): this;
-      attach(field: string, file: string, filename?: string): this;
-      auth(user: string, name: string): this;
-      buffer(val?: boolean): this;
-      clearTimeout(): this;
-      end(callback?: CallbackHandler): this;
-      field(name: string, val: string): this;
-      get(field: string): string;
-      on(name: string, handler: Function): this;
-      on(name: 'error', handler: (err: any) => void): this;
-      part(): this;
-      pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
-      query(val: Object): this;
-      redirects(n: number): this;
-      responseType(type: string): this;
-      send(data: string): this;
-      send(data: Object): this;
-      send(): this;
-      set(field: string, val: string): this;
-      set(field: Object): this;
-      timeout(ms: number): this;
-      type(val: string): this;
-      unset(field: string): this;
-      use(fn: Function): this;
-      withCredentials(): this;
-      write(data: string, encoding?: string): this;
-      write(data: Buffer, encoding?: string): this;
-      parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+        abort(): void;
+        accept(type: string): this;
+        attach(field: string, file: string | Blob, filename?: string): this;
+        auth(user: string, name: string): this;
+        buffer(val?: boolean): this;
+        clearTimeout(): this;
+        end(callback?: CallbackHandler): this;
+        field(name: string, val: string): this;
+        get(field: string): string;
+        on(name: string, handler: (event: any) => void): this;
+        on(name: 'error', handler: (err: any) => void): this;
+        on(name: 'progress', handler: (event: ProgressEvent) => void): this;
+        part(): this;
+        pipe(stream: NodeJS.WritableStream, options?: object): stream.Writable;
+        query(val: object | string): this;
+        redirects(n: number): this;
+        responseType(type: string): this;
+        send(data?: string | object): this;
+        set(field: string, val: string): this;
+        set(field: object): this;
+        timeout(ms: number | { deadline?: number, response?: number }): this;
+        type(val: string): this;
+        unset(field: string): this;
+        use(fn: Plugin): this;
+        withCredentials(): this;
+        write(data: string | Buffer, encoding?: string): this;
+        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
     }
 
+    type Plugin = (req: Request) => void;
+
+    interface ProgressEvent {
+        direction: 'download' | 'upload';
+        loaded: number;
+        percent?: number;
+        total?: number;
+    }
 }
 
 export = request;
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index 3b8539ffe5..a6d07c3eaa 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -3,310 +3,329 @@
 import * as request from 'superagent';
 import * as fs from 'fs';
 import * as assert from 'assert';
+import { Agent } from 'https';
 
 // Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
 // and https://github.com/visionmedia/superagent/blob/master/Readme.md
 
-request
-  .post('/api/pet')
-  .send({ name: 'Manny', species: 'cat' })
-  .set('X-API-Key', 'foobar')
-  .set('Accept', 'application/json')
-  .end((err, res) => {
-    if (res.ok) {
-      console.log('yay got ' + JSON.stringify(res.body));
-    } else {
-      console.log('Oh no! error ' + res.text);
-    }
-  });
+const httpsAgent: Agent = new Agent();
 
-var agent = request.agent();
+request
+    .post('/api/pet')
+    .send({name: 'Manny', species: 'cat'})
+    .set('X-API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .agent(httpsAgent)
+    .end((err, res) => {
+        if (res.ok) {
+            console.log('yay got ' + JSON.stringify(res.body));
+        } else {
+            console.log('Oh no! error ' + res.text);
+        }
+    });
+
+const agent = request.agent();
 agent
-  .post('/api/pet')
-  .send({ name: 'Manny', species: 'cat' })
-  .set('X-API-Key', 'foobar')
-  .set('Accept', 'application/json')
-  .end((err, res) => {
-    if (res.error) {
-      console.log('oh no ' + res.error.message);
-    } else {
-      console.log('got ' + res.status + ' response');
-    }
-  });
+    .post('/api/pet')
+    .send({name: 'Manny', species: 'cat'})
+    .set('X-API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .end((err, res) => {
+        if (res.error) {
+            console.log('oh no ' + res.error.message);
+        } else {
+            console.log('got ' + res.status + ' response');
+        }
+    });
 
-// Plugins
-var nocache = require('superagent-no-cache');
-var prefix = require('superagent-prefix')('/static');
-
-request
-  .get('/some-url')
-  .use(prefix) // Prefixes *only* this request
-  .use(nocache) // Prevents caching of *only* this request
-  .end(function(err, res){
-      // Do something
-  });
-
-var callback = (err: any, res: request.Response) => {};
+const callback = (err: any, res: request.Response) => {};
 
 // Request basics
 request
-  .get('/search')
-  .end(callback);
+    .get('/search')
+    .end(callback);
 
 request('GET', '/search')
-  .end(callback);
+    .end(callback);
 
 request
-   .get('http://example.com/search')
-   .end(callback);
+    .get('http://example.com/search')
+    .end(callback);
 
 request
-  .head('/favicon.ico')
-  .end(callback);
+    .head('/favicon.ico')
+    .end(callback);
 
 request
-  .del('/user/1')
-  .end(callback);
+    .del('/user/1')
+    .end(callback);
 
 request
-  .delete('/user/1')
-  .end(callback);
+    .delete('/user/1')
+    .end(callback);
 
 request
-  .delete('/user/1')
-  .send()
-  .end(callback);
+    .delete('/user/1')
+    .send()
+    .end(callback);
 
 request('/search')
-  .end(callback);
+    .end(callback);
 
 // Setting header fields
 request
-  .get('/search')
-  .set('API-Key', 'foobar')
-  .set('Accept', 'application/json')
-  .end(callback);
+    .get('/search')
+    .set('API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .end(callback);
 
 request
-  .get('/search')
-  .set({ 'API-Key': 'foobar', Accept: 'application/json' })
-  .end(callback);
+    .get('/search')
+    .set({'API-Key': 'foobar', Accept: 'application/json'})
+    .end(callback);
 
 // GET requests
 request
-  .get('/search')
-  .query({ query: 'Manny' })
-  .query({ range: '1..5' })
-  .query({ order: 'desc' })
-  .end(callback);
+    .get('/search')
+    .query({query: 'Manny'})
+    .query({range: '1..5'})
+    .query({order: 'desc'})
+    .end(callback);
 
 request
-  .get('/search')
-  .query({ query: 'Manny', range: '1..5', order: 'desc' })
-  .end(callback);
+    .get('/search')
+    .query({query: 'Manny', range: '1..5', order: 'desc'})
+    .end(callback);
 
 request
-  .get('/querystring')
-  .query('search=Manny&range=1..5')
-  .end(callback);
+    .get('/querystring')
+    .query('search=Manny&range=1..5')
+    .end(callback);
 
 request
-  .get('/querystring')
-  .query('search=Manny')
-  .query('range=1..5')
-  .end(callback);
+    .get('/querystring')
+    .query('search=Manny')
+    .query('range=1..5')
+    .end(callback);
 
 // HEAD requests
 request
-  .head('/users')
-  .query({ email: 'joe@smith.com' })
-  .end(callback);
+    .head('/users')
+    .query({email: 'joe@smith.com'})
+    .end(callback);
 
 // POST / PUT requests
 request.post('/user')
-  .set('Content-Type', 'application/json')
-  .send('{"name":"tj","pet":"tobi"}')
-  .end(callback);
+    .set('Content-Type', 'application/json')
+    .send('{"name":"tj","pet":"tobi"}')
+    .end(callback);
 
 request.post('/user')
-  .send({ name: 'tj', pet: 'tobi' })
-  .end(callback);
+    .send({name: 'tj', pet: 'tobi'})
+    .end(callback);
 
 request.post('/user')
-  .send({ name: 'tj' })
-  .send({ pet: 'tobi' })
-  .end(callback);
+    .send({name: 'tj'})
+    .send({pet: 'tobi'})
+    .end(callback);
 
 request.post('/user')
-  .send('name=tj')
-  .send('pet=tobi')
-  .end(callback);
+    .send('name=tj')
+    .send('pet=tobi')
+    .end(callback);
 
 request.post('/user')
-  .type('form')
-  .send({ name: 'tj' })
-  .send({ pet: 'tobi' })
-  .end(callback);
+    .type('form')
+    .send({name: 'tj'})
+    .send({pet: 'tobi'})
+    .end(callback);
 
 // Setting the Content-Type
 request.post('/user')
-  .set('Content-Type', 'application/json');
+    .set('Content-Type', 'application/json');
 
 request.post('/user')
-  .type('application/json');
+    .type('application/json');
 
 request.post('/user')
-  .type('json');
+    .type('json');
 
 request.post('/user')
-  .type('png');
+    .type('png');
 
 // Setting Accept
 request.get('/user')
-  .accept('application/json');
+    .accept('application/json');
 
 request.get('/user')
-  .accept('json');
+    .accept('json');
 
 request.get('/user')
-  .accept('png');
+    .accept('png');
 
 // Query strings
 request
-  .post('/')
-  .query({ format: 'json' })
-  .query({ dest: '/login' })
-  .send({ post: 'data', here: 'wahoo' })
-  .end(callback);
+    .post('/')
+    .query({format: 'json'})
+    .query({dest: '/login'})
+    .send({post: 'data', here: 'wahoo'})
+    .end(callback);
 
 // Parsing response bodies
 request('/search')
   .end((res: request.Response) => {
-    var status: number = res.status;
-    var body = res.body;
-    var files: Object = res.files;
-    var text: string = res.text;
-    var contentLength = res.header['content-length'];
-    var contentType: string = res.type;
-    var charset: string = res.charset;
+    const status: number = res.status;
+    const body = res.body;
+    const files: object = res.files;
+    const text: string = res.text;
+    const contentLength = res.header['content-length'];
+    const contentType: string = res.type;
+    const charset: string = res.charset;
   });
 
 // Custom parsers
 request
-  .post('/search')
-  .parse((res, callback) => {
-    res.setEncoding("binary");
-    let data = "";
-    res.on("data", (chunk: string) => {
-      data += chunk;
+    .post('/search')
+    .parse((res, callback) => {
+        res.setEncoding("binary");
+        let data = "";
+        res.on("data", (chunk: string) => {
+            data += chunk;
+        });
+
+        res.on("end", () => {
+            callback(null, new Buffer(data, "base64"));
+        });
+    })
+    .end((res: request.Response) => {
+        res.body.toString("hex");
     });
 
-    res.on("end", () => {
-      callback(null, new Buffer(data, "base64"));
-    });
-  })
-  .end((res: request.Response) => {
-    res.body.toString("hex");
-  });
-
-var req = request.get('/hoge');
+const req = request.get('/hoge');
 // Aborting requests
 req.abort();
 
 // Request timeouts
 req.timeout(100);
+req.timeout({ response: 5000, deadline: 60000 });
+
+const reqUrl: string = req.url;
+const reqMethod: string = req.method;
+const reqCookies: string = req.cookies;
+
+console.log(reqMethod + ' request to ' + reqUrl + ' cookies ' + reqCookies);
 
 // Basic authentication
 request.get('http://tobi:learnboost@local').end(callback);
 request
-  .get('http://local')
-  .auth('tobo', 'learnboost')
-  .end(callback);
+    .get('http://local')
+    .auth('tobo', 'learnboost')
+    .end(callback);
 
 // Following redirects
 request
-  .get('/some.png')
-  .redirects(2)
-  .end(callback);
+    .get('/some.png')
+    .redirects(2)
+    .end(callback);
 
 // Piping data
 /*
-(function() {
-var stream = fs.createReadStream('path/to/my.json');
-var req = request.post('/somewhere');
+(() => {
+const stream = fs.createReadStream('path/to/my.json');
+const req = request.post('/somewhere');
 req.type('json');
 stream.pipe(req);
 })();
 */
 
-(function() {
-var stream = fs.createWriteStream('path/to/my.json');
-var req = request.get('/some.json');
-req.pipe(stream);
+(() => {
+    const stream = fs.createWriteStream('path/to/my.json');
+    const req = request.get('/some.json');
+    req.pipe(stream);
 })();
 
 // Multipart requests
-(function() {
-var req = request.post('/upload');
+(() => {
+    const req = request.post('/upload');
 
-req.part()
-  .set('Content-Type', 'image/png')
-  .set('Content-Disposition', 'attachment; filename="myimage.png"')
-  .write('some image data')
-  .write('some more image data');
+    req.part()
+        .set('Content-Type', 'image/png')
+        .set('Content-Disposition', 'attachment; filename="myimage.png"')
+        .write('some image data')
+        .write('some more image data');
 
-req.part()
-  .set('Content-Disposition', 'form-data; name="name"')
-  .set('Content-Type', 'text/plain')
-  .write('tobi');
+    req.part()
+        .set('Content-Disposition', 'form-data; name="name"')
+        .set('Content-Type', 'text/plain')
+        .write('tobi');
 
-req.end(callback);
+    req.end(callback);
 })();
 
 // Attaching files
+const blob: Blob = new File([], 'thor.png');
 request
-  .post('/upload')
-  .attach('avatar', 'path/to/tobi.png', 'user.png')
-  .attach('image', 'path/to/loki.png')
-  .attach('file', 'path/to/jane.png')
-  .end(callback);
+    .post('/upload')
+    .attach('avatar', 'path/to/tobi.png', 'user.png')
+    .attach('image', 'path/to/loki.png')
+    .attach('file', 'path/to/jane.png')
+    .attach('blob', blob)
+    .end(callback);
 
 // Field values
 request
-  .post('/upload')
-  .field('user[name]', 'Tobi')
-  .field('user[email]', 'tobi@learnboost.com')
-  .attach('image', 'path/to/tobi.png')
-  .end(callback);
+    .post('/upload')
+    .field('user[name]', 'Tobi')
+    .field('user[email]', 'tobi@learnboost.com')
+    .attach('image', 'path/to/tobi.png')
+    .end(callback);
 
 // CORS
 request
-  .get('http://localhost:4001/')
-  .withCredentials()
-  .end(callback);
+    .get('http://localhost:4001/')
+    .withCredentials()
+    .end(callback);
 
 // Error handling
 request
-  .post('/upload')
-  .attach('image', 'path/to/tobi.png')
-  .end((err: any, res: request.Response): void => {});
+    .post('/upload')
+    .attach('image', 'path/to/tobi.png')
+    .end((err: any, res: request.Response): void => {
+    });
 request
-  .post('/upload')
-  .attach('image', 'path/to/tobi.png')
-  .on('error', (err: any) => {})
-  .end(callback);
+    .post('/upload')
+    .attach('image', 'path/to/tobi.png')
+    .on('error', (err: any) => {
+    })
+    .end(callback);
 
-//Promise
+// Progress
 request
-  .get('/search')
-  .then((response) => {})
-  .catch((error) => {});
+    .post('/upload')
+    .attach('image', 'path/to/tobi.png')
+    .on('progress', (progress: request.ProgressEvent) => {
+        if (progress.direction === 'download') {
+        } else if (progress.direction === 'upload') {
+        }
+        const loaded: number = progress.loaded;
+        const percent: number | undefined = progress.percent;
+        const total: number | undefined = progress.total;
+    })
+    .end(callback);
+
+// Promise
+request
+    .get('/search')
+    .then((response) => {
+    })
+    .catch((error) => {
+    });
 // Requesting binary data.
 // adapted from: https://github.com/visionmedia/superagent/blob/v2.0.0/test/client/request.js#L110
 request
   .get('/blob')
   .responseType('blob')
-  .end(function (err, res) {
-    assert(res.xhr instanceof XMLHttpRequest)
+  .end((err, res) => {
+    assert(res.xhr instanceof XMLHttpRequest);
     assert(res.xhr.response instanceof Blob);
   });
diff --git a/types/superagent/tsconfig.json b/types/superagent/tsconfig.json
index 1a20530571..b1f13095f7 100644
--- a/types/superagent/tsconfig.json
+++ b/types/superagent/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "superagent-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/superagent/tslint.json b/types/superagent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superagent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/superagent/v2/index.d.ts b/types/superagent/v2/index.d.ts
new file mode 100644
index 0000000000..f598bbd4fe
--- /dev/null
+++ b/types/superagent/v2/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for SuperAgent 2.3
+// Project: https://github.com/visionmedia/superagent
+// Definitions by: Alex Varju <https://github.com/varju/>
+//                 Nico Zelaya <https://github.com/NicoZelaya/>
+//                 Michael Ledin <https://github.com/mxl/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import * as stream from 'stream';
+import * as https from 'https';
+
+type CallbackHandler = (err: any, res: request.Response) => void;
+
+declare const request: request.SuperAgentStatic;
+
+declare namespace request {
+    interface SuperAgentRequest extends Request {
+        agent(agent?: https.Agent): this;
+
+        method: string;
+        url: string;
+        cookies: string;
+    }
+    interface SuperAgentStatic extends SuperAgent<SuperAgentRequest> {
+        (url: string): SuperAgentRequest;
+        // tslint:disable-next-line:unified-signatures
+        (method: string, url: string): SuperAgentRequest;
+
+        agent(): SuperAgent<SuperAgentRequest>;
+    }
+
+    interface SuperAgent<Req> extends stream.Stream {
+        get(url: string, callback?: CallbackHandler): Req;
+        post(url: string, callback?: CallbackHandler): Req;
+        put(url: string, callback?: CallbackHandler): Req;
+        head(url: string, callback?: CallbackHandler): Req;
+        del(url: string, callback?: CallbackHandler): Req;
+        delete(url: string, callback?: CallbackHandler): Req;
+        options(url: string, callback?: CallbackHandler): Req;
+        trace(url: string, callback?: CallbackHandler): Req;
+        copy(url: string, callback?: CallbackHandler): Req;
+        lock(url: string, callback?: CallbackHandler): Req;
+        mkcol(url: string, callback?: CallbackHandler): Req;
+        move(url: string, callback?: CallbackHandler): Req;
+        purge(url: string, callback?: CallbackHandler): Req;
+        propfind(url: string, callback?: CallbackHandler): Req;
+        proppatch(url: string, callback?: CallbackHandler): Req;
+        unlock(url: string, callback?: CallbackHandler): Req;
+        report(url: string, callback?: CallbackHandler): Req;
+        mkactivity(url: string, callback?: CallbackHandler): Req;
+        checkout(url: string, callback?: CallbackHandler): Req;
+        merge(url: string, callback?: CallbackHandler): Req;
+        // m-search(url: string, callback?: CallbackHandler): Req;
+        notify(url: string, callback?: CallbackHandler): Req;
+        subscribe(url: string, callback?: CallbackHandler): Req;
+        unsubscribe(url: string, callback?: CallbackHandler): Req;
+        patch(url: string, callback?: CallbackHandler): Req;
+        search(url: string, callback?: CallbackHandler): Req;
+        connect(url: string, callback?: CallbackHandler): Req;
+
+        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+        saveCookies(res: Response): void;
+        attachCookies(req: Req): void;
+    }
+
+    interface Response extends NodeJS.ReadableStream {
+        text: string;
+        body: any;
+        files: any;
+        header: any;
+        type: string;
+        charset: string;
+        status: number;
+        statusType: number;
+        info: boolean;
+        ok: boolean;
+        redirect: boolean;
+        clientError: boolean;
+        serverError: boolean;
+        error: Error;
+        accepted: boolean;
+        noContent: boolean;
+        badRequest: boolean;
+        unauthorized: boolean;
+        notAcceptable: boolean;
+        notFound: boolean;
+        forbidden: boolean;
+        xhr: XMLHttpRequest;
+        get(header: string): string;
+    }
+
+    interface Request extends Promise<Response> /* extends NodeJS.WritableStream */ {
+        abort(): void;
+        accept(type: string): this;
+        attach(field: string, file: string, filename?: string): this;
+        auth(user: string, name: string): this;
+        buffer(val?: boolean): this;
+        clearTimeout(): this;
+        end(callback?: CallbackHandler): this;
+        field(name: string, val: string): this;
+        get(field: string): string;
+        on(name: string, handler: (event: any) => void): this;
+        on(name: 'error', handler: (err: any) => void): this;
+        part(): this;
+        pipe(stream: NodeJS.WritableStream, options?: object): stream.Writable;
+        query(val: object | string): this;
+        redirects(n: number): this;
+        responseType(type: string): this;
+        send(data?: string | object): this;
+        set(field: string, val: string): this;
+        set(field: object): this;
+        timeout(ms: number): this;
+        type(val: string): this;
+        unset(field: string): this;
+        use(fn: Plugin): this;
+        withCredentials(): this;
+        write(data: string | Buffer, encoding?: string): this;
+        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+    }
+
+    type Plugin = (req: Request) => void;
+}
+
+export = request;
diff --git a/types/superagent/v2/superagent-tests.ts b/types/superagent/v2/superagent-tests.ts
new file mode 100644
index 0000000000..0ad9c302fc
--- /dev/null
+++ b/types/superagent/v2/superagent-tests.ts
@@ -0,0 +1,314 @@
+// via: http://visionmedia.github.io/superagent/
+
+import * as request from 'superagent';
+import * as fs from 'fs';
+import * as assert from 'assert';
+import { Agent } from 'https';
+
+// Examples taken from https://github.com/visionmedia/superagent/blob/gh-pages/docs/index.md
+// and https://github.com/visionmedia/superagent/blob/master/Readme.md
+
+const httpsAgent: Agent = new Agent();
+
+request
+    .post('/api/pet')
+    .send({name: 'Manny', species: 'cat'})
+    .set('X-API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .agent(httpsAgent)
+    .end((err, res) => {
+        if (res.ok) {
+            console.log('yay got ' + JSON.stringify(res.body));
+        } else {
+            console.log('Oh no! error ' + res.text);
+        }
+    });
+
+const agent = request.agent();
+agent
+    .post('/api/pet')
+    .send({name: 'Manny', species: 'cat'})
+    .set('X-API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .end((err, res) => {
+        if (res.error) {
+            console.log('oh no ' + res.error.message);
+        } else {
+            console.log('got ' + res.status + ' response');
+        }
+    });
+
+const callback = (err: any, res: request.Response) => {};
+
+// Request basics
+request
+    .get('/search')
+    .end(callback);
+
+request('GET', '/search')
+    .end(callback);
+
+request
+    .get('http://example.com/search')
+    .end(callback);
+
+request
+    .head('/favicon.ico')
+    .end(callback);
+
+request
+    .del('/user/1')
+    .end(callback);
+
+request
+    .delete('/user/1')
+    .end(callback);
+
+request
+    .delete('/user/1')
+    .send()
+    .end(callback);
+
+request('/search')
+    .end(callback);
+
+// Setting header fields
+request
+    .get('/search')
+    .set('API-Key', 'foobar')
+    .set('Accept', 'application/json')
+    .end(callback);
+
+request
+    .get('/search')
+    .set({'API-Key': 'foobar', Accept: 'application/json'})
+    .end(callback);
+
+// GET requests
+request
+    .get('/search')
+    .query({query: 'Manny'})
+    .query({range: '1..5'})
+    .query({order: 'desc'})
+    .end(callback);
+
+request
+    .get('/search')
+    .query({query: 'Manny', range: '1..5', order: 'desc'})
+    .end(callback);
+
+request
+    .get('/querystring')
+    .query('search=Manny&range=1..5')
+    .end(callback);
+
+request
+    .get('/querystring')
+    .query('search=Manny')
+    .query('range=1..5')
+    .end(callback);
+
+// HEAD requests
+request
+    .head('/users')
+    .query({email: 'joe@smith.com'})
+    .end(callback);
+
+// POST / PUT requests
+request.post('/user')
+    .set('Content-Type', 'application/json')
+    .send('{"name":"tj","pet":"tobi"}')
+    .end(callback);
+
+request.post('/user')
+    .send({name: 'tj', pet: 'tobi'})
+    .end(callback);
+
+request.post('/user')
+    .send({name: 'tj'})
+    .send({pet: 'tobi'})
+    .end(callback);
+
+request.post('/user')
+    .send('name=tj')
+    .send('pet=tobi')
+    .end(callback);
+
+request.post('/user')
+    .type('form')
+    .send({name: 'tj'})
+    .send({pet: 'tobi'})
+    .end(callback);
+
+// Setting the Content-Type
+request.post('/user')
+    .set('Content-Type', 'application/json');
+
+request.post('/user')
+    .type('application/json');
+
+request.post('/user')
+    .type('json');
+
+request.post('/user')
+    .type('png');
+
+// Setting Accept
+request.get('/user')
+    .accept('application/json');
+
+request.get('/user')
+    .accept('json');
+
+request.get('/user')
+    .accept('png');
+
+// Query strings
+request
+    .post('/')
+    .query({format: 'json'})
+    .query({dest: '/login'})
+    .send({post: 'data', here: 'wahoo'})
+    .end(callback);
+
+// Parsing response bodies
+request('/search')
+  .end((res: request.Response) => {
+    const status: number = res.status;
+    const body = res.body;
+    const files: object = res.files;
+    const text: string = res.text;
+    const contentLength = res.header['content-length'];
+    const contentType: string = res.type;
+    const charset: string = res.charset;
+  });
+
+// Custom parsers
+request
+    .post('/search')
+    .parse((res, callback) => {
+        res.setEncoding("binary");
+        let data = "";
+        res.on("data", (chunk: string) => {
+            data += chunk;
+        });
+
+        res.on("end", () => {
+            callback(null, new Buffer(data, "base64"));
+        });
+    })
+    .end((res: request.Response) => {
+        res.body.toString("hex");
+    });
+
+const req = request.get('/hoge');
+// Aborting requests
+req.abort();
+
+// Request timeouts
+req.timeout(100);
+
+const reqUrl: string = req.url;
+const reqMethod: string = req.method;
+const reqCookies: string = req.cookies;
+
+console.log(reqMethod + ' request to ' + reqUrl + ' cookies ' + reqCookies);
+
+// Basic authentication
+request.get('http://tobi:learnboost@local').end(callback);
+request
+    .get('http://local')
+    .auth('tobo', 'learnboost')
+    .end(callback);
+
+// Following redirects
+request
+    .get('/some.png')
+    .redirects(2)
+    .end(callback);
+
+// Piping data
+/*
+(() => {
+const stream = fs.createReadStream('path/to/my.json');
+const req = request.post('/somewhere');
+req.type('json');
+stream.pipe(req);
+})();
+*/
+
+(() => {
+    const stream = fs.createWriteStream('path/to/my.json');
+    const req = request.get('/some.json');
+    req.pipe(stream);
+})();
+
+// Multipart requests
+(() => {
+    const req = request.post('/upload');
+
+    req.part()
+        .set('Content-Type', 'image/png')
+        .set('Content-Disposition', 'attachment; filename="myimage.png"')
+        .write('some image data')
+        .write('some more image data');
+
+    req.part()
+        .set('Content-Disposition', 'form-data; name="name"')
+        .set('Content-Type', 'text/plain')
+        .write('tobi');
+
+    req.end(callback);
+})();
+
+// Attaching files
+request
+    .post('/upload')
+    .attach('avatar', 'path/to/tobi.png', 'user.png')
+    .attach('image', 'path/to/loki.png')
+    .attach('file', 'path/to/jane.png')
+    .end(callback);
+
+// Field values
+request
+    .post('/upload')
+    .field('user[name]', 'Tobi')
+    .field('user[email]', 'tobi@learnboost.com')
+    .attach('image', 'path/to/tobi.png')
+    .end(callback);
+
+// CORS
+request
+    .get('http://localhost:4001/')
+    .withCredentials()
+    .end(callback);
+
+// Error handling
+request
+    .post('/upload')
+    .attach('image', 'path/to/tobi.png')
+    .end((err: any, res: request.Response): void => {
+    });
+request
+    .post('/upload')
+    .attach('image', 'path/to/tobi.png')
+    .on('error', (err: any) => {
+    })
+    .end(callback);
+
+// Promise
+request
+    .get('/search')
+    .then((response) => {
+    })
+    .catch((error) => {
+    });
+// Requesting binary data.
+// adapted from: https://github.com/visionmedia/superagent/blob/v2.0.0/test/client/request.js#L110
+request
+  .get('/blob')
+  .responseType('blob')
+  .end((err, res) => {
+    assert(res.xhr instanceof XMLHttpRequest);
+    assert(res.xhr.response instanceof Blob);
+  });
diff --git a/types/superagent/v2/tsconfig.json b/types/superagent/v2/tsconfig.json
new file mode 100644
index 0000000000..9061d77842
--- /dev/null
+++ b/types/superagent/v2/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "superagent": ["superagent/v2"],
+            "superagent/*": ["superagent/v2/*"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "superagent-tests.ts"
+    ]
+}
diff --git a/types/superagent/v2/tslint.json b/types/superagent/v2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superagent/v2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/supertest/index.d.ts b/types/supertest/index.d.ts
index f3866469e3..206c70defd 100644
--- a/types/supertest/index.d.ts
+++ b/types/supertest/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/visionmedia/supertest
 // Definitions by: Alex Varju <https://github.com/varju/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as superagent from "superagent"
 
diff --git a/types/svg-sprite/index.d.ts b/types/svg-sprite/index.d.ts
index df6108242c..fd63d3f37b 100644
--- a/types/svg-sprite/index.d.ts
+++ b/types/svg-sprite/index.d.ts
@@ -243,7 +243,7 @@ declare namespace sprite {
         defs?: DefsAndSymbolSpecificModeConfig | boolean;
         symbol?: DefsAndSymbolSpecificModeConfig | boolean;
         stack?: ModeConfig | boolean;
-        [customConfigName: string]: ModeConfig;
+        [customConfigName: string]: ModeConfig | boolean;
     }
 
     interface ModeConfig {
diff --git a/types/swagger-parser/index.d.ts b/types/swagger-parser/index.d.ts
index 6191a13a0e..e29c2630e2 100644
--- a/types/swagger-parser/index.d.ts
+++ b/types/swagger-parser/index.d.ts
@@ -1,7 +1,54 @@
 // Type definitions for swagger-parser 4.x
 // Project: https://www.npmjs.com/package/swagger-parser
 // Definitions by: Tobias Wolff <https://github.com/Tobias4872/>
+//                 Eric Henry <https://github.com/EricHenry/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import { Spec as Swagger } from 'swagger-schema-official';
 
-export function parse(api: any, options?: any): Promise<any>;
-export function parse(api: any, options: any, callback: (err: any, result?: any) => void): void;
+export namespace SwaggerParser {
+    let api: any;
+    let $ref: any;
+}
+
+export interface Options {
+    allow?: {
+        json?: boolean;
+        yaml?: boolean;
+        empty?: boolean;
+        unknown?: boolean;
+    };
+    $ref?: {
+        internal?: boolean;
+        external?: boolean;
+        circular?: boolean | 'ignore';
+    };
+    validate?: {
+        schema?: boolean;
+        spec?: boolean;
+    };
+    cache?: {
+        fs?: number;
+        http?: number;
+        https?: number;
+    };
+}
+
+export function parse(api: string | Swagger, options?: Options): Promise<any>;
+export function parse(api: string | Swagger, callback: (err: any, result?: any) => void): void;
+export function parse(api: string | Swagger, options: Options, callback: (err: any, result?: any) => void): void;
+
+export function validate(api: string | Swagger, options?: Options): Promise<any>;
+export function validate(api: string | Swagger, callback: (err: any, result?: any) => void): void;
+export function validate(api: string | Swagger, options: Options, callback: (err: any, result?: any) => void): void;
+
+export function dereference(api: string | Swagger, options?: Options): Promise<any>;
+export function dereference(api: string | Swagger, callback: (err: any, result?: any) => void): void;
+export function dereference(api: string | Swagger, options: Options, callback: (err: any, result?: any) => void): void;
+
+export function bundle(api: string | Swagger, options?: Options): Promise<any>;
+export function bundle(api: string | Swagger, callback: (err: any, result?: any) => void): void;
+export function bundle(api: string | Swagger, options: Options, callback: (err: any, result?: any) => void): void;
+
+export function resolve(api: string | Swagger, options?: Options): Promise<any>;
+export function resolve(api: string | Swagger, callback: (err: any, result?: any) => void): void;
+export function resolve(api: string | Swagger, options: Options, callback: (err: any, result?: any) => void): void;
diff --git a/types/swagger-parser/swagger-parser-tests.ts b/types/swagger-parser/swagger-parser-tests.ts
index ba39d3e6cc..f880c801b2 100644
--- a/types/swagger-parser/swagger-parser-tests.ts
+++ b/types/swagger-parser/swagger-parser-tests.ts
@@ -1,7 +1,22 @@
 import parser = require("swagger-parser");
+import { Spec as Swagger } from '../swagger-schema-official';
+
+const swaggerMock: Swagger = {
+    swagger: '',
+    info: {
+        title: '',
+        version: ''
+    },
+    paths: { '': {} }
+}
 
 // Without callback which returns a promise
-parser.parse("test.yaml").then((file: string) => {
+parser.parse("test.yaml").then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.parse("test.yaml", {}).then((file) => {
     console.log(file);
 });
 
@@ -9,3 +24,188 @@ parser.parse("test.yaml").then((file: string) => {
 parser.parse("test.yaml", {}, (err, file) => {
     console.log(file);
 });
+
+// With callback and no options
+parser.parse("test.yaml", (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.parse(swaggerMock).then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.parse(swaggerMock, {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.parse(swaggerMock, {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.parse(swaggerMock, (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.dereference("test.yaml").then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.dereference("test.yaml", {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.dereference("test.yaml", {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.dereference("test.yaml", (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.dereference(swaggerMock).then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.dereference(swaggerMock, {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.dereference(swaggerMock, {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.dereference(swaggerMock, (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.bundle("test.yaml").then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.bundle("test.yaml", {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.bundle("test.yaml", {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.bundle("test.yaml", (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.bundle(swaggerMock).then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.bundle(swaggerMock, {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.bundle(swaggerMock, {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.bundle(swaggerMock, (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.resolve("test.yaml").then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.resolve("test.yaml", {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.resolve("test.yaml", {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.resolve("test.yaml", (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.resolve(swaggerMock).then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.resolve(swaggerMock, {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.resolve(swaggerMock, {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.resolve(swaggerMock, (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.validate("test.yaml").then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.validate("test.yaml", {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.validate("test.yaml", {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.validate("test.yaml", (err, file) => {
+    console.log(file);
+});
+
+// Without callback which returns a promise
+parser.validate(swaggerMock).then((file) => {
+    console.log(file);
+});
+
+// with options but, Without callback which returns a promise
+parser.validate(swaggerMock, {}).then((file) => {
+    console.log(file);
+});
+
+// With callback
+parser.validate(swaggerMock, {}, (err, file) => {
+    console.log(file);
+});
+
+// With callback and no options
+parser.validate(swaggerMock, (err, file) => {
+    console.log(file);
+});
diff --git a/types/swagger-tools/index.d.ts b/types/swagger-tools/index.d.ts
new file mode 100644
index 0000000000..09d42138b6
--- /dev/null
+++ b/types/swagger-tools/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for swagger-tools 0.10
+// Project: https://github.com/apigee-127/swagger-tools
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { NextHandleFunction } from 'connect';
+import { IncomingMessage } from 'http';
+
+export interface SwaggerRouterOptionsControllers {
+    [handlerName: string]: NextHandleFunction;
+}
+
+export interface SwaggerRouterOptions {
+    controllers?: SwaggerRouterOptionsControllers | string | string[];
+    useStubs?: boolean;
+}
+
+export interface SwaggerSecurityError {
+    code?: string;
+    message?: string;
+    state?: string;
+    statusCode?: number;
+}
+
+export type SwaggerSecurityCallback = (err?: SwaggerSecurityError) => void;
+
+export type SwaggerSecurityHandler = (request: IncomingMessage, securityDefinition: any, scopes: string | string[], callback: SwaggerSecurityCallback) => void;
+
+export interface SwaggerSecurityOptions {
+    [securityDefinitionName: string]: SwaggerSecurityHandler;
+}
+
+export interface SwaggerUi12ApiDeclarations {
+    [path: string]: any;
+}
+
+export interface SwaggerUiOptions {
+    apiDocs?: string;
+    apiDocsPrefix?: string;
+    swaggerUi?: string;
+    swaggerUiDir?: string;
+    swaggerUiPrefix?: string;
+}
+
+export interface SwaggerValidatorOptions {
+    validateResponse?: boolean;
+}
+
+export interface Middleware {
+    swaggerMetadata(): NextHandleFunction;
+    swaggerRouter(options?: SwaggerRouterOptions): NextHandleFunction;
+    swaggerSecurity(options?: SwaggerSecurityOptions): NextHandleFunction;
+    swaggerValidator(options?: SwaggerValidatorOptions): NextHandleFunction;
+}
+
+export interface Middleware12 extends Middleware {
+    swaggerUi(apiDeclarations: SwaggerUi12ApiDeclarations, options?: SwaggerUiOptions): NextHandleFunction;
+}
+
+export interface Middleware20 extends Middleware {
+    swaggerUi(options?: SwaggerUiOptions): NextHandleFunction;
+}
+
+export type InitializeMiddlewareCallback12 = (middleware: Middleware12) => void;
+
+export type InitializeMiddlewareCallback20 = (middleware: Middleware20) => void;
+
+export interface Resource {
+    resourcePath: string;
+}
+
+export function initializeMiddleware(swaggerObject: any, callback: InitializeMiddlewareCallback20): void;
+
+export function initializeMiddleware(
+    swaggerObject: any,
+    resources: Resource[],
+    callback: InitializeMiddlewareCallback12
+): void;
diff --git a/types/swagger-tools/swagger-tools-tests.ts b/types/swagger-tools/swagger-tools-tests.ts
new file mode 100644
index 0000000000..d4c695c418
--- /dev/null
+++ b/types/swagger-tools/swagger-tools-tests.ts
@@ -0,0 +1,78 @@
+// 2.0 examples from https://github.com/apigee-127/swagger-tools/blob/master/examples/2.0/index.js
+
+import * as connect from 'connect';
+import { createServer } from 'http';
+import * as swaggerTools from 'swagger-tools';
+
+const app = connect();
+
+const serverPort = 3000;
+
+// swaggerRouter configuration
+const options = {
+    controllers: './controllers',
+    useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode)
+};
+
+const swaggerUiOptions = {
+    apiDocs: 'apiDocs',
+    swaggerUi: 'swaggerUi',
+};
+
+// The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
+// tslint:disable-next-line no-var-requires
+const swaggerDoc20 = require('./api/swagger.json');
+
+// Initialize the Swagger middleware
+swaggerTools.initializeMiddleware(swaggerDoc20, middleware => {
+    // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
+    app.use(middleware.swaggerMetadata());
+
+    // Validate Swagger requests
+    app.use(middleware.swaggerValidator());
+
+    // Route validated requests to appropriate controller
+    app.use(middleware.swaggerRouter(options));
+
+    // Serve the Swagger documents and Swagger UI
+    app.use(middleware.swaggerUi(swaggerUiOptions));
+    app.use(middleware.swaggerUi());
+
+    // Start the server
+    createServer(app).listen(serverPort, () => {
+        console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
+    });
+});
+
+// 1.2 examples from https://github.com/apigee-127/swagger-tools/blob/master/examples/1.2/index.js
+
+// The Swagger Resource Listing Document (require it, build it programmatically, fetch it from a URL, ...)
+// tslint:disable-next-line no-var-requires
+const apiDoc12 = require('./api/api-doc.json');
+// The Swagger API Declaration Documents (require them, build them programmatically, fetch them from a URL, ...)
+const apiDeclarations = [
+    // tslint:disable-next-line no-var-requires
+    require('./api/weather.json')
+];
+
+// Initialize the Swagger middleware
+swaggerTools.initializeMiddleware(apiDoc12, apiDeclarations, middleware => {
+    // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
+    app.use(middleware.swaggerMetadata());
+
+    // Validate Swagger requests
+    app.use(middleware.swaggerValidator());
+
+    // Route validated requests to appropriate controller
+    app.use(middleware.swaggerRouter(options));
+
+    // Serve the Swagger documents and Swagger UI
+    app.use(middleware.swaggerUi({
+        '/weather': apiDeclarations[0]
+    }));
+
+    // Start the server
+    createServer(app).listen(serverPort, () => {
+        console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
+    });
+});
diff --git a/types/swagger-tools/tsconfig.json b/types/swagger-tools/tsconfig.json
new file mode 100644
index 0000000000..a926cbf792
--- /dev/null
+++ b/types/swagger-tools/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "swagger-tools-tests.ts"
+    ]
+}
diff --git a/types/swagger-tools/tslint.json b/types/swagger-tools/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/swagger-tools/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/swiper/v2/index.d.ts b/types/swiper/v2/index.d.ts
index 446b104aba..07be30cb69 100644
--- a/types/swiper/v2/index.d.ts
+++ b/types/swiper/v2/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nolimits4web/Swiper
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface SwiperOptions {
     speed?: number;
diff --git a/types/synaptic/index.d.ts b/types/synaptic/index.d.ts
index 9146ec4c09..abc975ee78 100644
--- a/types/synaptic/index.d.ts
+++ b/types/synaptic/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for synaptic 1.0.8
+// Type definitions for synaptic 1.0.9
 // Project: https://github.com/cazala/synaptic
 // Definitions by: Markus Peloso <https://github.com/ToastHawaii/>
+//                 Austin Cummings <https://github.com/austincummings>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as Synaptic from "synaptic"; // Need this to refer to Synaptic from within the `declare global`
@@ -291,7 +292,7 @@ export namespace Network {
  * Networks are basically an array of layers. They have an input layer, a number of hidden layers, and an output layer.
  */
 export class Network {
-    layer: Network.Options;
+    layers: Network.Options;
 
     optimized: Network.Optimized;
 
diff --git a/types/tedious/index.d.ts b/types/tedious/index.d.ts
index b89ac58beb..ac589e0d66 100644
--- a/types/tedious/index.d.ts
+++ b/types/tedious/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for tedious 1.8.0
 // Project: https://pekim.github.io/tedious
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+//                  Chris Thompson <https://github.com/cjthompson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="node" />
@@ -548,3 +549,23 @@ export declare class Connection extends events.EventEmitter {
     close(): void;
 
 }
+
+/**
+ * Error emitted by Connection class 'error' event
+ */
+export declare class ConnectionError extends Error {
+    constructor(message?: string, code?: number);
+
+    public message: string;
+    public code: number;
+}
+
+/**
+ * Error emitted by Request class
+ */
+export declare class RequestError extends Error {
+    constructor(message?: string, code?: number);
+
+    public message: string;
+    public code: number;
+}
diff --git a/types/tedious/tedious-tests.ts b/types/tedious/tedious-tests.ts
index 297deb3e3d..726436c882 100644
--- a/types/tedious/tedious-tests.ts
+++ b/types/tedious/tedious-tests.ts
@@ -31,4 +31,12 @@ request.on("row", (row: tedious.ColumnValue[]): void => {
 });
 connection.execSql(request);
 
+var requestError = new tedious.RequestError();
+requestError.message = 'test';
+requestError.code = 1;
+requestError = new tedious.RequestError('test', 50005);
 
+var connectionError = new tedious.ConnectionError();
+connectionError.message = 'test';
+connectionError.code = 1;
+connectionError = new tedious.ConnectionError('test', 50005);
diff --git a/types/testingbot-api/index.d.ts b/types/testingbot-api/index.d.ts
new file mode 100644
index 0000000000..af40e78c10
--- /dev/null
+++ b/types/testingbot-api/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for testingbot-api 1.0
+// Project: https://github.com/testingbot/testingbot-api
+// Definitions by: Tim Brust <https://github.com/timbru31>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace TestingBot {
+	type BrowserType = 'webdriver' | 'rc';
+	type TestSuccess = true | false | 0 | 1;
+
+	interface TestingBotOptions {
+		api_key?: string;
+		api_secret?: string;
+	}
+
+	interface UserInfo {
+		first_name?: string;
+		last_name?: string;
+		email?: string;
+	}
+
+	interface TestData {
+		'test[success]'?: TestSuccess;
+		'test[status_message]'?: string;
+		'test[name]'?: string;
+		'test[extra]'?: string;
+		build?: string;
+		groups?: string;
+	}
+
+	interface TestLabData {
+		'test[url]'?: string;
+		'test[name]'?: string;
+		'test[cron]'?: string;
+		'test[enabled]'?: boolean;
+	}
+
+	interface TestingBot {
+		getTestDetails(testID: string, callback?: (error: any, responseBody: any) => any): void;
+
+		getBrowsers(callback?: (error: any, responseBody: any) => any, type?: BrowserType): void;
+
+		getLabTestDetails(testID: string, callback?: (error: any, responseBody: any) => any): void;
+
+		getTunnel(callback?: (error: any, responseBody: any) => any): void;
+
+		getUserInfo(callback?: (error: any, responseBody: any) => any): void;
+
+		getTests(callback?: (error: any, responseBody: any) => any, offset?: number, limit?: number): void;
+
+		getLabTests(callback?: (error: any, responseBody: any) => any, offset?: number, limit?: number): void;
+
+		updateUserInfo(data: UserInfo, callback?: (error: any, responseBody: any) => any): void;
+
+		updateTest(data: TestData, testID: string, callback?: (error: any, responseBody: any) => any): void;
+
+		updateLabTest(data: TestLabData, testID: string, callback?: (error: any, responseBody: any) => any): void;
+
+		deleteTest(testID: string, callback?: (error: any, responseBody: any) => any): void;
+
+		deleteLabTest(testID: string, callback?: (error: any, responseBody: any) => any): void;
+	}
+}
+
+declare const TestingBot: {
+	new (options?: TestingBot.TestingBotOptions): TestingBot.TestingBot;
+};
+
+export = TestingBot;
diff --git a/types/testingbot-api/testingbot-api-tests.ts b/types/testingbot-api/testingbot-api-tests.ts
new file mode 100644
index 0000000000..2b8cd1f655
--- /dev/null
+++ b/types/testingbot-api/testingbot-api-tests.ts
@@ -0,0 +1,24 @@
+import * as TestingBot from 'testingbot-api';
+
+const sessionId = '123';
+
+const tb = new TestingBot({
+    api_key: 'api-key',
+    api_secret: 'api-secret'
+});
+
+function noop(error: any, responseBody: any) {
+    console.log(error);
+    console.log(responseBody);
+}
+
+tb.updateUserInfo({
+    email: 'new-email'
+}, noop);
+
+tb.getBrowsers(noop, 'webdriver');
+
+tb.updateTest({
+    'test[name]': 'test',
+    build: '01'
+}, sessionId);
diff --git a/types/testingbot-api/tsconfig.json b/types/testingbot-api/tsconfig.json
new file mode 100644
index 0000000000..bda7118dd7
--- /dev/null
+++ b/types/testingbot-api/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "testingbot-api-tests.ts"
+    ]
+}
diff --git a/types/testingbot-api/tslint.json b/types/testingbot-api/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/testingbot-api/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tether/index.d.ts b/types/tether/index.d.ts
index 4a5b1cc2fd..e654f5c49e 100644
--- a/types/tether/index.d.ts
+++ b/types/tether/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://github.hubspot.com/tether/
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 export = Tether;
 export as namespace Tether;
diff --git a/types/text-buffer/index.d.ts b/types/text-buffer/index.d.ts
index a3d652bd28..ea03dc4f69 100644
--- a/types/text-buffer/index.d.ts
+++ b/types/text-buffer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/atom/text-buffer
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="atom" />
 /// <reference types="emissary" />
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index f396e6b2c7..a160641d99 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -2100,7 +2100,7 @@ export class FontLoader {
 
     manager: LoadingManager;
 
-    load(url: string, onLoad?: (responseText: string) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
+    load(url: string, onLoad?: (responseFont: Font) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
     parse(json: string): Font;
 }
 
@@ -2208,7 +2208,7 @@ export class ObjectLoader {
     parseGeometries(json: any): any[]; // Array of BufferGeometry or Geometry or Geometry2.
     parseMaterials(json: any, textures: Texture[]): Material[]; // Array of Classes that inherits from Matrial.
     parseAnimations(json: any): AnimationClip[];
-    parseImages(json: any, onLoad: () => void): any[];
+    parseImages(json: any, onLoad: () => void): { [key: string]: HTMLImageElement };
     parseTextures(json: any, images: any): Texture[];
     parseObject<T extends Object3D>(data: any, geometries: any[], materials: Material[]): T;
 }
@@ -2563,7 +2563,7 @@ export interface MeshLambertMaterialParameters extends MaterialParameters {
     emissiveIntensity?: number;
     emissiveMap?: Texture;
     map?: Texture;
-    lighhtMap?: Texture;
+    lightMap?: Texture;
     lightMapIntensity?: number;
     aoMap?: Texture;
     aoMapIntensity?: number;
@@ -2590,7 +2590,7 @@ export class MeshLambertMaterial extends Material {
     emissiveIntensity: number;
     emissiveMap: Texture;
     map: Texture;
-    lighhtMap: Texture;
+    lightMap: Texture;
     lightMapIntensity: number;
     aoMap: Texture;
     aoMapIntensity: number;
@@ -2616,7 +2616,7 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
     roughness?: number;
     metalness?: number;
     map?: Texture;
-    lighhtMap?: Texture;
+    lightMap?: Texture;
     lightMapIntensity?: number;
     aoMap?: Texture;
     aoMapIntensity?: number;
@@ -2651,7 +2651,7 @@ export class MeshStandardMaterial extends Material {
     roughness: number;
     metalness: number;
     map: Texture;
-    lighhtMap: Texture;
+    lightMap: Texture;
     lightMapIntensity: number;
     aoMap: Texture;
     aoMapIntensity: number;
@@ -5886,13 +5886,13 @@ export class DataTexture extends Texture {
         data: ArrayBuffer | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array,
         width: number,
         height: number,
-        format: PixelFormat,
-        type: TextureDataType,
-        mapping: Mapping,
-        wrapS: Wrapping,
-        wrapT: Wrapping,
-        magFilter: TextureFilter,
-        minFilter: TextureFilter,
+        format?: PixelFormat,
+        type?: TextureDataType,
+        mapping?: Mapping,
+        wrapS?: Wrapping,
+        wrapT?: Wrapping,
+        magFilter?: TextureFilter,
+        minFilter?: TextureFilter,
         anisotropy?: number,
         encoding?: TextureEncoding
     );
@@ -6488,11 +6488,11 @@ export class PlaneGeometry extends Geometry {
 }
 
 export class PolyhedronGeometry extends Geometry {
-    constructor(vertices: Vector3[], faces: Face3[], radius?: number, detail?: number);
+    constructor(vertices: number[], indices: number[], radius?: number, detail?: number);
 
     parameters: {
-        vertices: Vector3[];
-        faces: Face3[];
+        vertices: number[];
+        indices: number[];
         radius: number;
         detail: number;
     };
diff --git a/types/three/three-examples.d.ts b/types/three/three-examples.d.ts
index 423f8274b3..d416757b00 100644
--- a/types/three/three-examples.d.ts
+++ b/types/three/three-examples.d.ts
@@ -1,10 +1,13 @@
 // Things from three.js/examples/ that do not (yet) have their own file
 
-import { Shader } from "./three-core";
+import {EventDispatcher, Shader} from "./three-core";
 
 export var AWDLoader: any;
+export var OBJLoader: any;
+export var OBJLoader2: any;
+export var STLLoader: any;
 export var FlyControls: any;
 export var BloomPass: any;
 export var DotScreenShader: Shader;
 export var RGBShiftShader: Shader;
-export var FXAAShader: Shader;
\ No newline at end of file
+export var FXAAShader: Shader;
diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 7cc40943e7..59156c6c13 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tinymce/tinymce
 // Definitions by: Martin Duparc <https://github.com/martinduparc/>, Poul Poulsen <https://github.com/ipoul>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Work In Progress
 
@@ -74,8 +75,12 @@ export interface Settings {
 
   target?: Element;
 
+  branding?: boolean;
+
   color_picker_callback?(callback: (hexColor: string) => void, value: string): void;
 
+  custom_ui_selector?: string;
+
   elementpath?: boolean;
 
   event_root?: boolean;
@@ -132,6 +137,8 @@ export interface Settings {
 
   content_style?: string;
 
+  inline_boundaries?: boolean;
+
   visual_anchor_class?: string;
 
   visual_table_class?: string;
diff --git a/types/to-title-case-gouch/to-title-case-gouch-tests.ts b/types/to-title-case-gouch/to-title-case-gouch-tests.ts
index c574c9e683..06893bbe6d 100644
--- a/types/to-title-case-gouch/to-title-case-gouch-tests.ts
+++ b/types/to-title-case-gouch/to-title-case-gouch-tests.ts
@@ -1,10 +1 @@
-/// <reference types="node" />
-
-
-import fs = require('fs');
-
-fs.readFile('to-title-case.js', 'utf-8', function(err: any, code: string) {
-	eval(code);
-	var lowerCase: string = 'this title is in lowercase and will be title case';
-	console.log(lowerCase.toTitleCase()); // Now in title case.
-});
+"".toTitleCase();
diff --git a/types/toastr/index.d.ts b/types/toastr/index.d.ts
index 767627c95d..ed93a08f4e 100644
--- a/types/toastr/index.d.ts
+++ b/types/toastr/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/CodeSeven/toastr
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 
 /// <reference types="jquery" />
diff --git a/types/toastr/toastr-tests.ts b/types/toastr/toastr-tests.ts
index a8297b6eb4..1f9abe7164 100644
--- a/types/toastr/toastr-tests.ts
+++ b/types/toastr/toastr-tests.ts
@@ -37,7 +37,7 @@ function test_fromdemo() {
             return msgs[i];
         };
     $('#showtoast').click(function () {
-		var shortCutFunction = $("#toastTypeGroup input:radio:checked").val(),
+		var shortCutFunction = $("#toastTypeGroup input:radio:checked").val() as string,
 			msg = $('#message').val(),
 			title = $('#title').val() || '',
 			$fadeIn = $('#fadeIn'),
@@ -48,20 +48,20 @@ function test_fromdemo() {
 		toastr.options = {
 			debug: $('#debugInfo').prop('checked'),
 			tapToDismiss: $('#tapToDismiss').prop('checked'),
-			positionClass: $('#positionGroup input:radio:checked').val() || 'toast-top-right',
+			positionClass: $('#positionGroup input:radio:checked').val() as string || 'toast-top-right',
 			preventDuplicates: true,
             progressBar: true
 		}
-        if ($fadeIn.val().length) {
+        if ((<string> $fadeIn.val()).length) {
 			toastr.options.showDuration = +$fadeIn.val()
         }
-        if ($fadeOut.val().length) {
+        if ((<string> $fadeOut.val()).length) {
 			toastr.options.hideDuration = +$fadeOut.val()
         }
-        if ($timeOut.val().length) {
+        if ((<string> $timeOut.val()).length) {
             toastr.options.timeOut = +$timeOut.val()
         }
-        if ($extendedTimeOut.val().length) {
+        if ((<string> $extendedTimeOut.val()).length) {
             toastr.options.extendedTimeOut = +$extendedTimeOut.val()
         }
         var $toast = toastr[shortCutFunction](msg, title)
@@ -83,4 +83,4 @@ function test_fromdemo() {
     $('#cleartoasts').click(function () {
         toastr.clear();
     });
-}
\ No newline at end of file
+}
diff --git a/types/tooltipster/index.d.ts b/types/tooltipster/index.d.ts
index b4450f794d..008bd556af 100644
--- a/types/tooltipster/index.d.ts
+++ b/types/tooltipster/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/iamceege/tooltipster
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/tough-cookie/index.d.ts b/types/tough-cookie/index.d.ts
new file mode 100644
index 0000000000..9871e2579f
--- /dev/null
+++ b/types/tough-cookie/index.d.ts
@@ -0,0 +1,262 @@
+// Type definitions for tough-cookie 2.3
+// Project: https://github.com/salesforce/tough-cookie
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Parse a cookie date string into a Date.
+ * Parses according to RFC6265 Section 5.1.1, not Date.parse().
+ */
+export function parseDate(string: string): Date;
+
+/**
+ * Format a Date into a RFC1123 string (the RFC6265-recommended format).
+ */
+export function formatDate(date: Date): string;
+
+/**
+ * Transforms a domain-name into a canonical domain-name.
+ * The canonical domain-name is a trimmed, lowercased, stripped-of-leading-dot
+ * and optionally punycode-encoded domain-name (Section 5.1.2 of RFC6265).
+ * For the most part, this function is idempotent (can be run again on its output without ill effects).
+ */
+export function canonicalDomain(str: string): string;
+
+/**
+ * Answers "does this real domain match the domain in a cookie?".
+ * The str is the "current" domain-name and the domStr is the "cookie" domain-name.
+ * Matches according to RFC6265 Section 5.1.3, but it helps to think of it as a "suffix match".
+ *
+ * The canonicalize parameter will run the other two paramters through canonicalDomain or not.
+ */
+export function domainMatch(str: string, domStr: string, canonicalize?: boolean): boolean;
+
+/**
+ * Given a current request/response path, gives the Path apropriate for storing in a cookie.
+ * This is basically the "directory" of a "file" in the path, but is specified by Section 5.1.4 of the RFC.
+ *
+ * The path parameter MUST be only the pathname part of a URI (i.e. excludes the hostname, query, fragment, etc.).
+ * This is the .pathname property of node's uri.parse() output.
+ */
+export function defaultPath(path: string): string;
+
+/**
+ * Answers "does the request-path path-match a given cookie-path?" as per RFC6265 Section 5.1.4.
+ * Returns a boolean.
+ *
+ * This is essentially a prefix-match where cookiePath is a prefix of reqPath.
+ */
+export function pathMatch(reqPath: string, cookiePath: string): boolean;
+
+/**
+ * alias for Cookie.fromJSON(string)
+ */
+export function fromJSON(string: string): Cookie;
+
+export function getPublicSuffix(hostname: string): string | null;
+
+export function cookieCompare(a: Cookie, b: Cookie): number;
+
+export function permuteDomain(domain: string): string[];
+
+export function permutePath(path: string): string[];
+
+// region Cookie
+
+export class Cookie {
+    static parse(cookieString: string, options?: Cookie.ParseOptions | object): Cookie | undefined;
+
+    static fromJSON(strOrObj: string | object): Cookie | null;
+
+    constructor(properties?: Cookie.Properties | object);
+
+    // TODO: Some of the following properties might actually be nullable.
+
+    key: string;
+    value: string;
+    expires: Date;
+    maxAge: number | 'Infinity' | '-Infinity';
+    domain: string;
+    path: string;
+    secure: boolean;
+    httpOnly: boolean;
+    extensions: string[];
+    creation: Date;
+    creationIndex: number;
+
+    hostOnly: boolean | null;
+    pathIsDefault: boolean | null;
+    lastAccessed: Date | null;
+
+    toString(): string;
+
+    cookieString(): string;
+
+    setExpires(String: string): void;
+
+    setMaxAge(number: number): void;
+
+    expiryTime(now?: number): number | typeof Infinity;
+
+    expiryDate(now?: number): Date;
+
+    TTL(now?: Date): number | typeof Infinity;
+
+    canonicalizedDomain(): string;
+
+    cdomain(): string;
+
+    toJSON(): { [key: string]: any; };
+
+    clone(): Cookie;
+
+    validate(): boolean | string;
+}
+
+export namespace Cookie {
+    interface ParseOptions extends Pick<ParseOptions._Impl, keyof ParseOptions._Impl> { }
+
+    namespace ParseOptions {
+        interface _Impl {
+            loose: boolean;
+        }
+    }
+
+    interface Properties extends Pick<Properties._Impl, keyof Properties._Impl> { }
+
+    namespace Properties {
+        interface _Impl {
+            key: string;
+            value: string;
+            expires: Date;
+            maxAge: number | 'Infinity' | '-Infinity';
+            domain: string;
+            path: string;
+            secure: boolean;
+            httpOnly: boolean;
+            extensions: string[];
+            creation: Date;
+            creationIndex: number;
+
+            hostOnly: boolean;
+            pathIsDefault: boolean;
+            lastAccessed: Date;
+        }
+    }
+
+    interface Serialized {
+        [key: string]: any;
+    }
+}
+
+// endregion
+
+// region CookieJar
+
+export class CookieJar {
+    static deserialize(serialized: CookieJar.Serialized | string, store: Store, cb: (err: Error | null, object: CookieJar) => void): void;
+    static deserialize(serialized: CookieJar.Serialized | string, cb: (err: Error | null, object: CookieJar) => void): void;
+
+    static deserializeSync(serialized: CookieJar.Serialized | string): CookieJar;
+
+    static fromJSON(string: string): CookieJar;
+
+    constructor(store?: Store, options?: CookieJar.Options | object);
+
+    setCookie(cookieOrString: Cookie | string, currentUrl: string, options: CookieJar.SetCookieOptions | object, cb: (err: Error | null, cookie: Cookie) => void): void;
+    setCookie(cookieOrString: Cookie | string, currentUrl: string, cb: (err: Error, cookie: Cookie) => void): void;
+
+    setCookieSync(cookieOrString: Cookie | string, currentUrl: string, options: CookieJar.SetCookieOptions | object): void;
+
+    getCookies(currentUrl: string, options: CookieJar.GetCookiesOptions | object, cb: (err: Error | null, cookies: Cookie[]) => void): void;
+    getCookies(currentUrl: string, cb: (err: Error | null, cookies: Cookie[]) => void): void;
+
+    getCookiesSync(currentUrl: string, options?: CookieJar.GetCookiesOptions | object): Cookie[];
+
+    getCookieString(currentUrl: string, options: CookieJar.GetCookiesOptions | object, cb: (err: Error | null, cookies: string) => void): void;
+    getCookieString(currentUrl: string, cb: (err: Error | null, cookies: string) => void): void;
+
+    getCookieStringSync(currentUrl: string, options?: CookieJar.GetCookiesOptions | object): string;
+
+    getSetCookieStrings(currentUrl: string, options: CookieJar.GetCookiesOptions | object, cb: (err: Error | null, cookies: string) => void): void;
+    getSetCookieStrings(currentUrl: string, cb: (err: Error | null, cookies: string) => void): void;
+
+    getSetCookieStringsSync(currentUrl: string, options?: CookieJar.GetCookiesOptions | object): string;
+
+    serialize(cb: (err: Error | null, serializedObject: CookieJar.Serialized) => void): void;
+
+    serializeSync(): CookieJar.Serialized;
+
+    toJSON(): CookieJar.Serialized;
+
+    clone(store: Store, cb: (err: Error | null, newJar: CookieJar) => void): void;
+    clone(cb: (err: Error | null, newJar: CookieJar) => void): void;
+
+    cloneSync(store: Store): CookieJar;
+}
+
+export namespace CookieJar {
+    interface Options extends Pick<Options._Impl, keyof Options._Impl> { }
+
+    namespace Options {
+        interface _Impl {
+            rejectPublicSuffixes: boolean;
+            looseMode: boolean;
+        }
+    }
+
+    interface SetCookieOptions extends Pick<SetCookieOptions._Impl, keyof SetCookieOptions._Impl> { }
+
+    namespace SetCookieOptions {
+        interface _Impl {
+            http: boolean;
+            secure: boolean;
+            now: Date;
+            ignoreError: boolean;
+        }
+    }
+
+    interface GetCookiesOptions extends Pick<GetCookiesOptions._Impl, keyof GetCookiesOptions._Impl> { }
+
+    namespace GetCookiesOptions {
+        interface _Impl {
+            http: boolean;
+            secure: boolean;
+            date: Date;
+            expire: boolean;
+            allPoints: boolean;
+        }
+    }
+
+    interface Serialized {
+        version: string;
+        storeType: string;
+        rejectPublicSuffixes: boolean;
+        cookies: Cookie.Serialized[];
+    }
+}
+
+// endregion
+
+// region Store
+
+export abstract class Store {
+    findCookie(domain: string, path: string, key: string, cb: (err: Error | null, cookie: Cookie | null) => void): void;
+
+    findCookies(domain: string, path: string, cb: (err: Error | null, cookie: Cookie[]) => void): void;
+
+    putCookie(cookie: Cookie, cb: (err: Error | null) => void): void;
+
+    updateCookie(oldCookie: Cookie, newCookie: Cookie, cb: (err: Error | null) => void): void;
+
+    removeCookie(domain: string, path: string, key: string, cb: (err: Error | null) => void): void;
+
+    removeCookies(domain: string, path: string, cb: (err: Error | null) => void): void;
+
+    getAllCookies(cb: (err: Error | null, cookie: Cookie[]) => void): void;
+}
+
+export class MemoryCookieStore extends Store { }
+
+// endregion
diff --git a/types/tough-cookie/tough-cookie-tests.ts b/types/tough-cookie/tough-cookie-tests.ts
new file mode 100644
index 0000000000..8798e0d840
--- /dev/null
+++ b/types/tough-cookie/tough-cookie-tests.ts
@@ -0,0 +1,15 @@
+import { Cookie, CookieJar } from 'tough-cookie';
+
+let header = '';
+const cb = () => { };
+
+const cookie = Cookie.parse(header)!;
+cookie.value = 'somethingdifferent';
+header = cookie.toString();
+
+const cookiejar = new CookieJar();
+cookiejar.setCookie(cookie, 'http://currentdomain.example.com/path', cb);
+// ...
+cookiejar.getCookies('http://example.com/otherpath', (err, cookies) => {
+    // res.headers['cookie'] = cookies.join('; ');
+});
diff --git a/types/tough-cookie/tsconfig.json b/types/tough-cookie/tsconfig.json
new file mode 100644
index 0000000000..7c324c4ec3
--- /dev/null
+++ b/types/tough-cookie/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "tough-cookie-tests.ts"
+    ]
+}
diff --git a/types/tough-cookie/tslint.json b/types/tough-cookie/tslint.json
new file mode 100644
index 0000000000..4f44991c3c
--- /dev/null
+++ b/types/tough-cookie/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/traceback/traceback-tests.ts b/types/traceback/traceback-tests.ts
index 89c2aea595..7556961b3a 100644
--- a/types/traceback/traceback-tests.ts
+++ b/types/traceback/traceback-tests.ts
@@ -1,5 +1,4 @@
-
-/// <reference types="node" />
+import TBReq = require("traceback");
 
 function testTraceback() {
 	var TracebackStaticClass: TracebackStatic = function () {
@@ -24,6 +23,5 @@ function testTraceback() {
 
 	var traceback: Traceback[] = TracebackStaticClass();
 
-	var TBReq: TracebackStatic = require('traceback');
 	var traceback: Traceback[] = TBReq();
 }
diff --git a/types/transducers.js/index.d.ts b/types/transducers.js/index.d.ts
new file mode 100644
index 0000000000..504496c1fb
--- /dev/null
+++ b/types/transducers.js/index.d.ts
@@ -0,0 +1,213 @@
+// Type definitions for transducers.js 0.3
+// Project: https://github.com/jlongster/transducers.js
+// Definitions by: David Philipson <https://github.com/dphilipson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Reducer<TResult, TInput> = (
+    result: TResult,
+    input: TInput,
+) => TResult;
+
+export type Transducer<TInput, TOutput> = <TResult>(
+    xf: Transformer<TResult, TOutput>,
+) => Transformer<TResult, TInput>;
+
+export interface CompletingTransformer<TResult, TCompleteResult, TInput> {
+    ["@@transducer/init"](): TResult | void;
+    ["@@transducer/result"](result: TResult): TCompleteResult;
+    ["@@transducer/step"](
+        result: TResult,
+        input: TInput,
+    ): TResult | Reduced<TResult>;
+}
+
+export type Transformer<TResult, TInput> = CompletingTransformer<
+    TResult,
+    TResult,
+    TInput
+>;
+
+export interface Reduced<T> {
+    ["@@transducer/reduced"]: true;
+    ["@@transducer/value"]: T;
+}
+
+export function reduce<TResult, TInput>(
+    coll: Iterable<TInput>,
+    xf: Transformer<TResult, TInput>,
+    init: TResult,
+): TResult;
+export function reduce<TResult, TCompleteResult, TInput>(
+    coll: Iterable<TInput>,
+    xf: CompletingTransformer<TResult, TCompleteResult, TInput>,
+    init: TResult,
+): TCompleteResult;
+// Overloads for object iteration.
+export function reduce<TResult, TInput>(
+    coll: { [key: string]: TInput },
+    xf: Transformer<TResult, [string, TInput]>,
+    init: TResult,
+): TResult;
+export function reduce<TResult, TCompleteResult, TInput>(
+    coll: { [key: string]: TInput },
+    xf: CompletingTransformer<TResult, TCompleteResult, [string, TInput]>,
+    init: TResult,
+): TCompleteResult;
+
+export function transformer<TResult, TInput>(
+    reducer: Reducer<TResult, TInput>,
+): Transformer<TResult, TInput>;
+
+export interface ReducedConstructor {
+    new <T>(value: T): Reduced<T>;
+}
+
+export const Reduced: ReducedConstructor;
+
+export function isReduced(x: any): boolean;
+
+export function iterator<T>(coll: Iterable<T>): IterableIterator<T>;
+
+export function push<T>(arr: T[], x: T): T[];
+
+export function transduce<TResult, TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf: Transducer<TInput, TOutput>,
+    f: Reducer<TResult, TOutput>,
+    init: TResult,
+): TResult;
+export function transduce<TResult, TCompleteResult, TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf: Transducer<TInput, TOutput>,
+    f: CompletingTransformer<TResult, TCompleteResult, TOutput>,
+    init?: TResult,
+): TCompleteResult;
+// Overloads for object iteration.
+export function transduce<TResult, TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf: Transducer<[string, TInput], TOutput>,
+    f: Reducer<TResult, TOutput>,
+    init: TResult,
+): TResult;
+export function transduce<TResult, TCompleteResult, TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf: Transducer<[string, TInput], TOutput>,
+    f: CompletingTransformer<TResult, TCompleteResult, TOutput>,
+    init?: TResult,
+): TCompleteResult;
+
+export function seq<TInput, TOutput>(
+    coll: TInput[],
+    xf: Transducer<TInput, TOutput>,
+): TOutput[];
+export function seq<TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf: Transducer<TInput, TOutput>,
+): IterableIterator<TOutput>;
+export function seq<TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf: Transducer<[string, TInput], [string, TOutput]>,
+): { [key: string]: TOutput };
+
+export function toArray<TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf?: Transducer<TInput, TOutput>,
+): TOutput[];
+export function toArray<TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf?: Transducer<[string, TInput], TOutput>,
+): TOutput[];
+
+export function toIter<TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf?: Transducer<TInput, TOutput>,
+): IterableIterator<TOutput>;
+export function toIter<TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf?: Transducer<[string, TInput], TOutput>,
+): IterableIterator<TOutput>;
+
+export function toObj<TInput, TOutput>(
+    coll: Iterable<TInput>,
+    xf?: Transducer<TInput, [string, TOutput]>,
+): { [key: string]: TOutput };
+export function toObj<TInput, TOutput>(
+    coll: { [key: string]: TInput },
+    xf: Transducer<[string, TInput], [string, TOutput]>,
+): { [key: string]: TOutput };
+
+export function into<TInput, TOutput>(
+    to: TOutput[],
+    xf: Transducer<TInput, TOutput>,
+    from: Iterable<TInput>,
+): TOutput[];
+export function into<TInput>(
+    to: string,
+    xf: Transducer<TInput, string>,
+    from: Iterable<TInput>,
+): string;
+export function into<TInput, TOutput>(
+    to: { [key: string]: TOutput },
+    xf: Transducer<TInput, [string, TOutput]>,
+    from: Iterable<TInput>,
+): { [key: string]: TOutput };
+
+export function compose(...fs: Array<(x: any) => any>): (x: any) => any;
+
+export function map<TInput, TOutput>(
+    f: (x: TInput) => TOutput,
+): Transducer<TInput, TOutput>;
+
+export function filter<TInput>(
+    pred: (x: TInput) => boolean,
+): Transducer<TInput, TInput>;
+
+export function remove<TInput>(
+    pred: (x: TInput) => boolean,
+): Transducer<TInput, TInput>;
+
+export function cat<TResult, TInput>(
+    f: Transformer<TResult, TInput>,
+): Transformer<TResult, Iterable<TInput>>;
+
+export function mapcat<TInput, TOutput>(
+    f: (x: TInput) => Iterable<TOutput>,
+): Transducer<TInput, TOutput>;
+
+export function keep<TInput>(): Transducer<TInput | null | undefined, TInput>;
+
+export function dedupe<TInput>(): Transducer<TInput, TInput>;
+
+export function take<TInput>(n: number): Transducer<TInput, TInput>;
+
+export function takeWhile<TInput>(
+    pred: (x: TInput) => boolean,
+): Transducer<TInput, TInput>;
+
+export function takeNth<TInput>(n: number): Transducer<TInput, TInput>;
+
+export function drop<TInput>(n: number): Transducer<TInput, TInput>;
+
+export function dropWhile<TInput>(
+    pred: (x: TInput) => boolean,
+): Transducer<TInput, TInput>;
+
+export function partition<TInput>(n: number): Transducer<TInput, TInput[]>;
+
+export function partitionBy<TInput>(
+    f: (x: TInput) => any,
+): Transducer<TInput, TInput[]>;
+
+export function interpose<TInput>(sep: TInput): Transducer<TInput, TInput>;
+
+export function repeat<TInput>(n: number): Transducer<TInput, TInput>;
+
+export function range(n: number): number[];
+
+export interface LazyTransformerConstructor {
+    new <TInput, TOutput>(xf: Transducer<TInput, TOutput>, coll: Iterable<
+        TInput
+    >): IterableIterator<TOutput>;
+}
+
+export const LazyTransformer: LazyTransformerConstructor;
diff --git a/types/transducers.js/transducers.js-tests.ts b/types/transducers.js/transducers.js-tests.ts
new file mode 100644
index 0000000000..e7a64d1432
--- /dev/null
+++ b/types/transducers.js/transducers.js-tests.ts
@@ -0,0 +1,37 @@
+import * as t from "transducers.js";
+
+const stringAppendFn: t.Reducer<string, number> = (acc, x) => acc + x;
+const stringAppendTransformer = t.transformer(stringAppendFn);
+const stringAppendThenLengthTransformer: t.CompletingTransformer<
+    string,
+    number,
+    number
+> = {
+    ["@@transducer/init"]: () => "",
+    ["@@transducer/result"]: (s: string) => s.length,
+    ["@@transducer/step"]: stringAppendFn,
+};
+const toNumberTransducer: t.Transducer<string, number> = t.map(s => +s);
+const transducedString1: string = t.transduce(
+    ["1", "2"],
+    toNumberTransducer,
+    stringAppendFn,
+    "",
+);
+const transducedString2: string = t.transduce(
+    ["1", "2"],
+    toNumberTransducer,
+    stringAppendTransformer,
+);
+
+const mapcatted: number[] = t.into([], t.mapcat((s: string) => [1, 2, 3, 4]), [
+    "a",
+    "b",
+]);
+
+const partitionedIter: Iterator<number[]> = t.toIter(
+    [1, 2, 3, 4, 5],
+    t.partition<number>(2),
+);
+
+const reduced: t.Reduced<string> = new t.Reduced("a");
diff --git a/types/transducers.js/tsconfig.json b/types/transducers.js/tsconfig.json
new file mode 100644
index 0000000000..9d2e6f5b96
--- /dev/null
+++ b/types/transducers.js/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "transducers.js-tests.ts"
+    ]
+}
diff --git a/types/transducers.js/tslint.json b/types/transducers.js/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/transducers.js/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/trunk8/index.d.ts b/types/trunk8/index.d.ts
index ff4e8d2370..1624c2f438 100644
--- a/types/trunk8/index.d.ts
+++ b/types/trunk8/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rviscomi/trunk8
 // Definitions by: Blake Niemyjski <https://github.com/niemyjski/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
@@ -48,4 +49,4 @@ interface JQuery {
     @param {Trunk8Options} options
     */
     trunk8(options?: Trunk8Options): any;
-}
\ No newline at end of file
+}
diff --git a/types/tween.js/index.d.ts b/types/tween.js/index.d.ts
index c2c5a22297..df4461425e 100644
--- a/types/tween.js/index.d.ts
+++ b/types/tween.js/index.d.ts
@@ -1,105 +1,109 @@
-// Type definitions for tween.js r12
-// Project: https://github.com/sole/tween.js/
-// Definitions by: sunetos <https://github.com/sunetos>, jzarnikov <https://github.com/jzarnikov>
+// Type definitions for tween.js v16.6.0
+// Project: https://github.com/tweenjs/tween.js/
+// Definitions by: jordan <https://github.com/Amos47>, sunetos <https://github.com/sunetos>, jzarnikov <https://github.com/jzarnikov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace TWEEN {
-  export var REVISION: string;
-  export function getAll(): Tween[];
-  export function removeAll(): void;
-  export function add(tween:Tween): void;
-  export function remove(tween:Tween): void;
-  export function update(time?:number): boolean;
+    export function getAll(): Tween[];
+    export function removeAll(): void;
+    export function add(tween: Tween): void;
+    export function remove(tween: Tween): void;
+    export function update(time?: number): boolean;
+    export function now(): number;
 
-  export class Tween {
-    constructor(object?:any);
-    to(properties:any, duration:number): Tween;
-    start(time?:number): Tween;
-    stop(): Tween;
-    delay(amount:number): Tween;
-    easing(easing: (k: number) => number): Tween;
-    interpolation(interpolation: (v:number[], k:number) => number): Tween;
-    chain(...tweens:Tween[]): Tween;
-    onStart(callback: (object?: any) => void): Tween;
-    onStop(callback: (object?: any) => void): Tween;
-    onUpdate(callback: (object?: any) => void): Tween;
-    onComplete(callback: (object?: any) => void): Tween;
-    update(time: number): boolean;
-    repeat(times: number): Tween;
-    yoyo(enable: boolean): Tween;
-  }
-  export var Easing: TweenEasing;
-  export var Interpolation: TweenInterpolation;
+    export class Tween {
+        constructor(object?: any);
+        to(properties: any, duration: number): Tween;
+        start(time?: number): Tween;
+        stop(): Tween;
+        end(): Tween;
+        stopChainedTweens(): Tween;
+        delay(amount: number): Tween;
+        repeat(times: number): Tween;
+        repeatDelay(times: number): Tween;
+        yoyo(enable: boolean): Tween;
+        easing(easing: (k: number) => number): Tween;
+        interpolation(interpolation: (v: number[], k: number) => number): Tween;
+        chain(...tweens: Tween[]): Tween;
+        onStart(callback: (object?: any) => void): Tween;
+        onStop(callback: (object?: any) => void): Tween;
+        onUpdate(callback: (object?: any) => void): Tween;
+        onComplete(callback: (object?: any) => void): Tween;
+        update(time: number): boolean;
+    }
+    export var Easing: Easing;
+    export var Interpolation: Interpolation;
 }
 
-interface TweenEasing {
-  Linear: {
-    None(k:number): number;
-  };
-  Quadratic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Cubic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Quartic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Quintic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Sinusoidal: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Exponential: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Circular: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Elastic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Back: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Bounce: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
+interface Easing {
+    Linear: {
+        None(k: number): number;
+    };
+    Quadratic: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Cubic: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Quartic: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Quintic: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Sinusoidal: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Exponential: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Circular: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Elastic: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Back: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
+    Bounce: {
+        In(k: number): number;
+        Out(k: number): number;
+        InOut(k: number): number;
+    };
 }
 
-interface TweenInterpolation {
-  Linear(v:number[], k:number): number;
-  Bezier(v:number[], k:number): number;
-  CatmullRom(v:number[], k:number): number;
+interface Interpolation {
+    Linear(v: number[], k: number): number;
+    Bezier(v: number[], k: number): number;
+    CatmullRom(v: number[], k: number): number;
 
-  Utils: {
-    Linear(p0:number, p1:number, t:number): number;
-    Bernstein(n:number, i:number): number;
-    Factorial(n:number): number;
-  };
+    Utils: {
+        Linear(p0: number, p1: number, t: number): number;
+        Bernstein(n: number, i: number): number;
+        Factorial(n: number): number;
+        CatmullRom(p0: number, p1: number, p2: number, p3: number, t: number): number;
+    };
 }
 
-declare module 'tween.js' {
-  export = TWEEN;
+declare module "@tweenjs/tween.js" {
+    export = TWEEN;
 }
diff --git a/types/twig/index.d.ts b/types/twig/index.d.ts
index ddce91ea6b..cdbf94a8b4 100644
--- a/types/twig/index.d.ts
+++ b/types/twig/index.d.ts
@@ -1,23 +1,32 @@
-// Type definitions for twig
-// Project: https://github.com/justjohn/twig.js
+// Type definitions for twig 1.10
+// Project: https://github.com/twigjs/twig.js
 // Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
+//                 Tim Schumacher <https://github.com/enko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/twig.d.ts
 
-
 export interface Parameters {
     id?: any;
-    ref?: any;
-    href?: any;
+    blocks?: any;
+    macros?: any;
+    base?: any;
     path?: any;
-    debug?: boolean;
-    trace?: boolean;
-    strict_variables?: boolean;
-    data: any;
+    url?: any;
+    name?: any;
+    method?: any;
+    options?: any;
 }
 
 export interface Template {
+    reset(blocks: any): void;
+    render(context?: any, params?: any, allow_async?: boolean): string | Promise<string>;
+    renderAsync(context?: any, params?: any): Promise<string>;
+    importFile(file: string): Template;
+    importBlocks(file: string, override?: boolean): void;
+    importMacros(file: string): Template;
+    getLoaderMethod(): string;
+    compile(options: any): string;
 }
 
 export interface CompileOptions {
@@ -25,12 +34,12 @@ export interface CompileOptions {
     settings: any;
 }
 
-export declare function twig(params: Parameters): Template;
-export declare function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
-export declare function extendFunction(name: string, definition: (...params: any[]) => string): void;
-export declare function extendTest(name: string, definition: (value: any) => boolean): void;
-export declare function extendTag(definition: any): void;
-export declare function compile(markup: string, options: CompileOptions): (context: any) => any;
-export declare function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-export declare function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-export declare function cache(value: boolean): void;
+export function twig(params: Parameters): Template;
+export function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
+export function extendFunction(name: string, definition: (...params: any[]) => string): void;
+export function extendTest(name: string, definition: (value: any) => boolean): void;
+export function extendTag(definition: any): void;
+export function compile(markup: string, options: CompileOptions): (context: any) => any;
+export function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+export function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+export function cache(value: boolean): void;
diff --git a/types/twig/tslint.json b/types/twig/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/twig/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/twig/twig-tests.ts b/types/twig/twig-tests.ts
index 6b517d0c73..1c3d34755e 100644
--- a/types/twig/twig-tests.ts
+++ b/types/twig/twig-tests.ts
@@ -1,44 +1,45 @@
-
 import twig = require('twig');
 
-var value: any;
-var str: string;
-var num: number;
-var bool: boolean;
+const value: any = "";
+const str: string = "";
+const num: number = 0;
+const bool: boolean = false;
 
-var params: twig.Parameters = {
+const params: twig.Parameters = {
 	id: value,
-	ref: value,
-	href: value,
 	path: value,
-	debug: bool,
-	trace: bool,
-	strict_variables: bool,
-	data: value
+	base: value,
+	blocks: value,
+	macros: value,
+	method: value,
+	name: value,
+	options: value,
+	url: value
 };
 
-var temp: twig.Template;
-var compOpts: twig.CompileOptions = {
+const temp: twig.Template = twig.twig(params);
+
+const compOpts: twig.CompileOptions = {
 	filename: str,
 	settings: value
 };
 
-var compiled:(context: any) => any;
-
-temp = twig.twig(params);
 twig.extendFilter(str, (left: any, ...params: any[]) => {
 	return str;
 });
+
 twig.extendFunction(str, (...params: any[]) => {
 	return str;
 });
+
 twig.extendTest(str, (value: any) => bool);
 twig.extendTag(value);
-compiled = twig.compile(str, compOpts);
+
+const compiled = twig.compile(str, compOpts);
+
 twig.renderFile(str, compOpts, (err, result) => {
-
 });
-twig.__express(str, compOpts, (err, result) => {
 
+twig.__express(str, compOpts, (err, result) => {
 });
 twig.cache(bool);
diff --git a/types/twilio/index.d.ts b/types/twilio/index.d.ts
index 358f45ca01..09db71587c 100644
--- a/types/twilio/index.d.ts
+++ b/types/twilio/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/twilio/twilio-node
 // Definitions by: nickiannone <https://github.com/nickiannone>, Ashley Brener <https://github.com/ashleybrener>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index e5ad8b5962..fa23991169 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -230,6 +230,7 @@ declare module 'twit' {
       include_entities?: boolean,
 
       // Other params from various endpoints
+      track?: string | string[],
       media_id?: string,
       media_ids?: string[],
       alt_text?: {
diff --git a/types/typeahead/index.d.ts b/types/typeahead/index.d.ts
index d6ed81a921..03e5d14a82 100644
--- a/types/typeahead/index.d.ts
+++ b/types/typeahead/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://twitter.github.io/typeahead.js/
 // Definitions by: Ivaylo Gochkov <https://github.com/igochkov/>, Gidon Junge <https://github.com/gjunge/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index d87c80aff6..d9410070a9 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -174,7 +174,7 @@ declare namespace UglifyJS {
         /**
          * Output a source map
          */
-        source_map?: SourceMapOptions;
+        source_map?: SourceMap;
 
         /**
          * Use brackets every time?
diff --git a/types/ui-grid/index.d.ts b/types/ui-grid/index.d.ts
index 7d646dbbf8..81ce3540ae 100644
--- a/types/ui-grid/index.d.ts
+++ b/types/ui-grid/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.ui-grid.info/
 // Definitions by: Ben Tesser <https://github.com/btesser>, Joe Skeen <http://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // These are very definitely preliminary. Please feel free to improve.
 
@@ -3799,7 +3800,7 @@ declare namespace uiGrid {
          * If suppressRemoveSort is also set, the unsorted state will be skipped even if it is listed here. Each direction may
          * not appear in the list more than once (e.g. [ASC, DESC, DESC] is not allowed), and the list may not be empty.*
          */
-        sortDirectionCycle?: Array<IUiGridConstants>;
+        sortDirectionCycle?: Array<null | string>;
         /**
          * Algorithm to use for sorting this column. Takes 'a' and 'b' parameters
          * like any normal sorting function with additional 'rowA', 'rowB', and 'direction'
diff --git a/types/ui-grid/ui-grid-tests.ts b/types/ui-grid/ui-grid-tests.ts
index 2426dbfe54..06f18384a5 100644
--- a/types/ui-grid/ui-grid-tests.ts
+++ b/types/ui-grid/ui-grid-tests.ts
@@ -93,6 +93,7 @@ columnDef.sort = {
     priority: 1
 };
 columnDef.sortCellFiltered = false;
+columnDef.sortDirectionCycle = [null, 'asc' , 'desc'];
 columnDef.sortingAlgorithm = (a: any, b: any, rowA: uiGrid.IGridRowOf<IMyEntity>, rowB: uiGrid.IGridRowOf<IMyEntity>, direction: string) => {
     return -1;
 };
diff --git a/types/ui-router-extras/index.d.ts b/types/ui-router-extras/index.d.ts
index 647263c912..ad3c76d101 100644
--- a/types/ui-router-extras/index.d.ts
+++ b/types/ui-router-extras/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/christopherthielen/ui-router-extras
 // Definitions by: Michael Putters <https://github.com/mputters/>, Marcel van de Kamp <https://github.com/marcel-k/>, Viktor Smirnov <https://github.com/LaserUnicorns/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="angular-ui-router" />
 
diff --git a/types/ui-select/index.d.ts b/types/ui-select/index.d.ts
index 099b3ad5eb..5b69991a3e 100644
--- a/types/ui-select/index.d.ts
+++ b/types/ui-select/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/angular-ui/ui-select
 // Definitions by: Niko Kovačič <https://github.com/nkovacic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+// TypeScript Version: 2.3
 
 /// <reference types="angular" />
 
@@ -15,4 +16,4 @@ declare module 'angular' {
 	        theme: string;
 	    }
 	}
-}
\ No newline at end of file
+}
diff --git a/types/uikit/index.d.ts b/types/uikit/index.d.ts
index ea881f23ce..3b62df407e 100644
--- a/types/uikit/index.d.ts
+++ b/types/uikit/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://getuikit.org
 // Definitions by: Giovanni Silva <https://github.com/giovannicandido>, Ivo Senner <https://github.com/s0x>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/umbraco/index.d.ts b/types/umbraco/index.d.ts
index 8d6600aa87..90d2dcc55e 100644
--- a/types/umbraco/index.d.ts
+++ b/types/umbraco/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/umbraco
 // Definitions by: DeCareSystemsIreland <https://github.com/DeCareSystemsIreland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference path="umbraco-resources.d.ts" />
 /// <reference path="umbraco-services.d.ts" />
diff --git a/types/umd/index.d.ts b/types/umd/index.d.ts
new file mode 100644
index 0000000000..f1a561bfe2
--- /dev/null
+++ b/types/umd/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for umd 3.0
+// Project: https://github.com/ForbesLindesay/umd
+// Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/** Universal Module Definition for use in automated build systems
+ * - simple synchronous wrapping of a string
+ * - return style module support
+ * - CommonJS support
+ * - prevents internal UMDs from conflicting
+ */
+declare function Umd(name: string, src: string, options?: boolean | Umd.Options): string;
+
+declare namespace Umd {
+
+    interface Options {
+        commonJS?: boolean;
+    }
+
+    function prelude(moduleName: string, options?: boolean | Options): string;
+
+    function postlude(moduleName: string, options?: boolean | Options): string;
+}
+
+export = Umd;
diff --git a/types/umd/tsconfig.json b/types/umd/tsconfig.json
new file mode 100644
index 0000000000..6327c1cf47
--- /dev/null
+++ b/types/umd/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "umd-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/umd/umd-tests.ts b/types/umd/umd-tests.ts
new file mode 100644
index 0000000000..9320a4d493
--- /dev/null
+++ b/types/umd/umd-tests.ts
@@ -0,0 +1,14 @@
+
+import umd = require("umd");
+
+var res1: string = umd("name1", "return 123");
+
+var res2: string = umd("name2", "return 'abc'", { commonJS: true });
+
+var res3: string = umd.prelude("pre1", false);
+
+var res4: string = umd.postlude("post1", true);
+
+var res5: string = umd.prelude("pre2");
+
+var res6: string = umd.postlude("post2");
\ No newline at end of file
diff --git a/types/umzug/index.d.ts b/types/umzug/index.d.ts
index 85659e246b..0c58ef40ff 100644
--- a/types/umzug/index.d.ts
+++ b/types/umzug/index.d.ts
@@ -2,10 +2,7 @@
 // Project: https://github.com/sequelize/umzug
 // Definitions by: Ivan Drinchev <https://github.com/drinchev/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-/// <reference types="bluebird" />
-/// <reference types="sequelize" />
+// TypeScript Version: 2.3
 
 import Sequelize = require("sequelize");
 
diff --git a/types/umzug/umzug-tests.ts b/types/umzug/umzug-tests.ts
index a3c9ab3916..650c4fdfbf 100644
--- a/types/umzug/umzug-tests.ts
+++ b/types/umzug/umzug-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import * as Umzug from "umzug";
 import * as Sequelize from "sequelize";
 
@@ -84,7 +82,7 @@ var AnotherUmzug = new Umzug({
 
     // A function that receives and returns the to be executed function.
     // This can be used to modify the function.
-    wrap: function (fun : Function) { return fun; }
+    wrap: <T>(fun: T) => fun,
   }
 });
 
@@ -93,7 +91,7 @@ var AnotherUmzug = new Umzug({
   // Possible values: 'json', 'sequelize', an object
   storage: 'json',
   storageOptions: {
-      path: process.cwd() + '/db/sequelize-meta.json'
+      path: '/db/sequelize-meta.json'
   }
 });
 
diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 856bf8e0fa..eb8fdb57e0 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -5689,7 +5689,7 @@ declare module _ {
         * Wrapped type `object`.
         * @see _.pairs
         **/
-        pairs(): _Chain<T>;
+        pairs(): _Chain<T[]>;
 
         /**
         * Wrapped type `object`.
diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
index 9953540fa8..11dcf477a0 100644
--- a/types/underscore/underscore-tests.ts
+++ b/types/underscore/underscore-tests.ts
@@ -520,6 +520,11 @@ function chain_tests() {
         .groupBy('property')
         .mapObject((objects: any) => _.pluck(objects, 'value'))
         .value(); // { odd: [1], even: [0, 2] }
+
+  var matrixOfString : string[][] = _.chain({'foo' : '1', 'bar': '1'})
+  	.keys()    // return ['foo', 'bar'] : string[]
+  	.pairs()   // return [['foo', '0'], ['bar', '1']] : string[][]
+  	.value();
 }
 
 var obj: { [k: string] : number } = {
diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
index 3c5da5dd99..b19ad4ac79 100644
--- a/types/undertaker/index.d.ts
+++ b/types/undertaker/index.d.ts
@@ -1,16 +1,68 @@
-// Type definitions for undertaker 0.12.0
+// Type definitions for undertaker 1.1
 // Project: https://github.com/phated/undertaker
-// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions by: Qubo <https://github.com/tkqubo>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import * as Registry from "undertaker-registry";
+import { Duplex } from "stream";
+import { EventEmitter } from "events";
 
+declare namespace Undertaker {
+    interface TaskFunctionParams {
+        name?: string;
+        displayName?: string;
+        description?: string;
+    }
 
-export interface UndertakerStatic {
-    new (registry?: Registry): Undertaker;
+    interface TaskFunction extends TaskFunctionParams {
+        (done: (error?: any) => void): void | Duplex | NodeJS.Process | Promise<never> | any;
+    }
+
+    type Task = string | TaskFunction;
+
+    interface TreeOptions {
+        /**
+         * Whether or not the whole tree should be returned.
+         * Default: false
+         */
+        deep?: boolean;
+    }
+
+    interface TreeResult {
+        label: "Tasks";
+        nodes: Node[];
+    }
+
+    interface Node {
+        label: string;
+        nodes: Node[];
+        type?: string;
+        branch?: boolean;
+    }
 }
 
-export interface Undertaker {
-    task: TaskMethod;
+declare class Undertaker extends EventEmitter {
+    constructor(registry?: Registry);
+
+    /**
+     * Returns the registered function.
+     * @param {string} taskName - Task name.
+     */
+    task(taskName: string): Undertaker.TaskFunction;
+
+    /**
+     * Register the task by the taskName.
+     * @param {string} taskName - Task name.
+     * @param {TaskFunction} fn - Task function.
+     */
+    task(taskName: string, fn: Undertaker.TaskFunction): void;
+
+    /**
+     * Register the task by the name property of the function.
+     * @param {TaskFunction} fn - Task function.
+     */
+    task(fn: Undertaker.TaskFunction): void;
+
     /**
      * Takes a variable amount of strings (taskName) and/or functions (fn)
      * and returns a function of the composed tasks or functions.
@@ -18,9 +70,21 @@ export interface Undertaker {
      *
      * When the returned function is executed, the tasks or functions will be executed in series,
      * each waiting for the prior to finish. If an error occurs, execution will stop.
-     * @param task
+     * @param {...Undertaker.Task[]} tasks - List of tasks.
      */
-    series(...tasks: (string | Task)[]): Task;
+    series(...tasks: Undertaker.Task[]): Undertaker.TaskFunction;
+
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in series,
+     * each waiting for the prior to finish. If an error occurs, execution will stop.
+     * @param {Undertaker.Task[]} tasks - List of tasks.
+     */
+    series(tasks: Undertaker.Task[]): Undertaker.TaskFunction;
+
     /**
      * Takes a variable amount of strings (taskName) and/or functions (fn)
      * and returns a function of the composed tasks or functions.
@@ -28,88 +92,46 @@ export interface Undertaker {
      *
      * When the returned function is executed, the tasks or functions will be executed in parallel,
      * all being executed at the same time. If an error occurs, all execution will complete.
-     * @param tasks
+     * @param {...Undertaker.Task[]} tasks - list of tasks.
      */
-    parallel(...tasks: (string | Task)[]): Task;
+    parallel(...tasks: Undertaker.Task[]): Undertaker.TaskFunction;
+
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in parallel,
+     * all being executed at the same time. If an error occurs, all execution will complete.
+     * @param {Undertaker.Task[]} tasks - list of tasks.
+     */
+    parallel(tasks: Undertaker.Task[]): Undertaker.TaskFunction;
+
     /**
      * Returns the current registry object.
      */
     registry(): Registry;
+
     /**
      * The tasks from the current registry will be transferred to it
      * and the current registry will be replaced with the new registry.
-     * @param registry
+     * @param {Registry} registry - Instance of registry.
      */
     registry(registry: Registry): void;
+
     /**
      * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
-     * @param options
+     * @param {Undertaker.TreeOptions} options - Tree options.
      */
-    tree(options?: { deep?: boolean }): Node[] | string[];
+    tree(options?: Undertaker.TreeOptions): Undertaker.TreeResult;
+
     /**
      * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
      * The time will be the time the task started.  Returns undefined if the task has not been run.
-     * @param task
-     * @param timeResolution
+     * @param {Undertaker.Task} task - Task.
+     * @param {number} [timeResolution] - Time resolution.
      */
-    lastRun(task: string, timeResolution?: number): number;
+    lastRun(task: Undertaker.Task, timeResolution?: number): number;
 }
 
-export interface Task {
-    (cb?: Function): any;
-}
-
-export interface TaskMethod {
-    /**
-     * Returns the registered function.
-     * @param taskName
-     */
-    (taskName: string): Task;
-    /**
-     * Register the task by the taskName.
-     * @param taskName
-     * @param fn
-     */
-    (taskName: string, fn: Task): void;
-    /**
-     * Register the task by the name property of the function.
-     * @param fn
-     */
-    (fn: Task): void;
-    /**
-     * Register the task by the displayName property of the function.
-     * @param fn
-     */
-    (fn: Task & { displayName: string }): void;
-}
-
-export interface Registry {
-    /**
-     * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
-     * @param taker
-     */
-    init(taker: Undertaker): void;
-    /**
-     * returns the task with that name or undefined if no task is registered with that name.
-     * @param taskName
-     */
-    get(taskName: string): Task;
-    /**
-     * add task to the registry. If set modifies a task, it should return the new task.
-     * @param taskName
-     * @param fn
-     */
-    set(taskName: string, fn: Task): void;
-    /**
-     * returns an object listing all tasks in the registry.
-     */
-    tasks(): { [taskName: string]: Task };
-}
-
-export interface Node {
-    label: string;
-    type: string;
-    nodes: Node[];
-}
-
-export default UndertakerStatic;
+export = Undertaker;
diff --git a/types/undertaker/tsconfig.json b/types/undertaker/tsconfig.json
index a33eb2509a..98ec0075c9 100644
--- a/types/undertaker/tsconfig.json
+++ b/types/undertaker/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/undertaker/tslint.json b/types/undertaker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/undertaker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/undertaker/undertaker-tests.ts b/types/undertaker/undertaker-tests.ts
index c8dc8dd4f5..c7969a3c52 100644
--- a/types/undertaker/undertaker-tests.ts
+++ b/types/undertaker/undertaker-tests.ts
@@ -1,43 +1,47 @@
-
 /// <reference types="node" />
+import * as fs from "fs";
+import * as Undertaker from "undertaker";
+import * as Registry from "undertaker-registry";
 
-var fs = require('fs');
-var Undertaker = require('undertaker');
-import { Registry }  from 'undertaker';
+const taker = new Undertaker();
 
-var taker = new Undertaker();
-
-taker.task('task1', function(cb: () => void){
+taker.task("task1", (cb: () => void) => {
     // do things
-
     cb(); // when everything is done
 });
 
-taker.task('task2', function(){
-    return fs.createReadStream('./myFile.js')
-        .pipe(fs.createWriteStream('./myFile.copy.js'));
+taker.task("task2", () => {
+    return fs.createReadStream("./myFile.js")
+        .pipe(fs.createWriteStream("./myFile.copy.js"));
 });
 
-taker.task('task3', function(){
-    return new Promise(function(resolve, reject){
+taker.task("task3", () => {
+    return new Promise((resolve, reject) => {
         // do things
-
         resolve(); // when everything is done
     });
 });
 
-taker.task('combined', taker.series('task1', 'task2'));
+taker.task("combined", taker.series("task1", "task2"));
 
-taker.task('all', taker.parallel('combined', 'task3'));
+taker.task("all", taker.parallel("combined", "task3"));
 
-var registry: Registry;
-function CommonRegistry(options: { buildDir: string }): Registry {
+taker.task("all-parallel-array", taker.parallel(["combined", "task3"]));
+
+taker.task("all-series-array", taker.series(["combined", "task3"]));
+
+const registry = new Registry();
+const CommonRegistry = (options: { buildDir: string }): Registry => {
     return registry;
-}
+};
 
-var taker = new Undertaker(CommonRegistry({ buildDir: '/dist' }));
+const taker2 = new Undertaker(CommonRegistry({ buildDir: "/dist" }));
 
-taker.task('build', taker.series('clean', function build(cb: () => void) {
+taker2.task("build", taker2.series("clean", (cb: () => void) => {
     // do things
     cb();
 }));
+
+taker2.addListener("event", () => {
+    // Checking for extended EventEmitter
+});
diff --git a/types/universal-analytics/index.d.ts b/types/universal-analytics/index.d.ts
index 3642d1558d..011a3adc01 100644
--- a/types/universal-analytics/index.d.ts
+++ b/types/universal-analytics/index.d.ts
@@ -1,92 +1,182 @@
-// Type definitions for universal-analytics v0.3.2
+// Type definitions for universal-analytics 0.4
 // Project: https://github.com/peaksandpies/universal-analytics
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Iker Pérez Brunelli <https://github.com/DarkerTV>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface UniversalAnalytics {
-    (accountID:string, uuid?:string, opts?:Object):UniversalAnalytics.Client;
-}
+declare namespace ua {
+    type Callback = (error: Error | null, count: number) => void;
 
-export = UniversalAnalytics;
-
-declare namespace UniversalAnalytics {
-
-    interface Client {
-        debug():UniversalAnalytics.Client;
-
-        send():void;
-
-        pageview(path:string):Client;
-        pageview(path:string, callback?:(err:any) => void):void;
-        pageview(params:Object):Client;
-        pageview(params:Object, callback?:(err:any) => void):void;
-        pageview(path:string, hostname:string):Client;
-        pageview(path:string, hostname:string, callback?:(err:any) => void):void;
-        pageview(path:string, title:string, hostname:string):Client;
-        pageview(path:string, title:string, hostname:string, callback?:(err:any) => void):void;
-
-
-        event(category:string, action:string):Client;
-        event(category:string, action:string, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string):Client;
-        event(category:string, action:string, label:string, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string, value:any):Client;
-        event(category:string, action:string, label:string, value:any, callback?:(err:any) => void):void;
-        event(category:string, action:string, label:string, value:any, params:Object, callback?:(err:any) => void):void;
-        event(params:Object):Client;
-        event(params:Object, callback:(err:any) => void):void;
-
-
-        transaction(id:string):Client;
-        transaction(id:string, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number):Client;
-        transaction(id:string, revenue:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number):Client;
-        transaction(id:string, revenue:number, shipping:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number, taxping:number):Client;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, callback:(err:any) => void):void;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string):Client;
-        transaction(id:string, revenue:number, shipping:number, taxping:number, affiliation:string, callback:(err:any) => void):void;
-        transaction(params:Object):Client;
-        transaction(params:Object, callback:(err:any) => void):void;
-
-
-        item(price:number):Client;
-        item(price:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number):Client;
-        item(price:number, quantity:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number):Client;
-        item(price:number, quantity:number, sku:number, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string):Client;
-        item(price:number, quantity:number, sku:number, name:string, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string, variation:string):Client;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, callback:(err:any) => void):void;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object):Client;
-        item(price:number, quantity:number, sku:number, name:string, variation:string, params:Object, callback:(err:any) => void):void;
-        item(params:Object):Client;
-        item(params:Object, callback:(err:any) => void):void;
-
-
-        exception(description:string):Client;
-        exception(description:string, callback:(err:any) => void):void;
-        exception(description:string, fatal:boolean):Client;
-        exception(description:string, fatal:boolean, callback:(err:any) => void):void;
-        exception(params:Object):Client;
-        exception(params:Object, callback:(err:any) => void):void;
-
-
-        timing(category:string):Client;
-        timing(category:string, callback:(err:any) => void):void;
-        timing(category:string, variable:string):Client;
-        timing(category:string, variable:string, callback:(err:any) => void):void;
-        timing(category:string, variable:string, time:number):Client;
-        timing(category:string, variable:string, time:number, callback:(err:any) => void):void;
-        timing(category:string, variable:string, time:number, label:string):Client;
-        timing(category:string, variable:string, time:number, label:string, callback:(err:any) => void):void;
-        timing(params:Object):Client;
-        timing(params:Object, callback:(err:any) => void):void;
-
-
-        middleware(accountID:string, options?:any):any;
+    interface VisitorOptions {
+        hostname?: string;
+        path?: string;
+        https?: boolean;
+        enableBatching?: boolean;
+        batchSize?: number;
+        tid?: string;
+        cid?: string;
+        uid?: string;
+        debug?: boolean;
+        strictCidFormat?: boolean;
+        requestOptions?: { [key: string]: any };
+        headers?: { [key: string]: string };
     }
+
+    interface MiddlewareOptions extends VisitorOptions {
+        cookieName?: string;
+    }
+
+    interface PageviewParams {
+        dp?: string;
+        dh?: string;
+        dt?: string;
+        dl?: string;
+        [key: string]: any;
+    }
+
+    interface ScreenviewParams {
+        cd?: string;
+        an?: string;
+        av?: string;
+        aid?: string;
+        aiid?: string;
+        [key: string]: any;
+    }
+
+    interface EventParams {
+        ec?: string;
+        ea?: string;
+        el?: string;
+        ev?: string | number;
+        p?: string;
+        dp?: string;
+        [key: string]: any;
+    }
+
+    interface TransactionParams {
+        ti?: string;
+        tr?: string | number;
+        ts?: string | number;
+        tt?: string | number;
+        ta?: string;
+        p?: string;
+        [key: string]: any;
+    }
+
+    interface ItemParams {
+        ip?: string | number;
+        iq?: string | number;
+        ic?: string;
+        in?: string;
+        iv?: string;
+        p?: string;
+        ti?: string;
+        [key: string]: any;
+    }
+
+    interface ExceptionParams {
+        exd?: string;
+        exf?: boolean;
+        [key: string]: any;
+    }
+
+    interface TimingParams {
+        utc?: string;
+        utv?: string;
+        utt?: string | number;
+        utl?: string;
+        [key: string]: any;
+    }
+
+    interface Session {
+        cid?: string;
+    }
+
+    class Visitor {
+        constructor(accountID: VisitorOptions | string);
+        constructor(accountID: string, uuid: VisitorOptions | string, context?: { [key: string]: any }, persistentParams?: { [key: string]: any });
+
+        debug(debug?: boolean): Visitor;
+
+        reset(): Visitor;
+
+        set(key: string | number, value: any): void;
+
+        pageview(path: PageviewParams | string, callback?: Callback): Visitor;
+        pageview(path: string, hostname: string, callback?: Callback): Visitor;
+        pageview(path: string, hostname: string, title: string, callback?: Callback): Visitor;
+        pageview(path: string, hostname: string, title: string, params: PageviewParams, callback?: Callback): Visitor;
+
+        pv(path: PageviewParams | string, callback?: Callback): Visitor;
+        pv(path: string, hostname: string, callback?: Callback): Visitor;
+        pv(path: string, hostname: string, title: string, callback?: Callback): Visitor;
+        pv(path: string, hostname: string, title: string, params: PageviewParams, callback?: Callback): Visitor;
+
+        screenview(params: ScreenviewParams, callback?: Callback): Visitor;
+        screenview(screenName: string, appName: string, callback?: Callback): Visitor;
+        screenview(screenName: string, appName: string, appVersion: string, callback?: Callback): Visitor;
+        screenview(screenName: string, appName: string, appVersion: string, appId: string, callback?: Callback): Visitor;
+        screenview(screenName: string, appName: string, appVersion: string, appId: string, appInstallerId: string, callback?: Callback): Visitor;
+        screenview(screenName: string, appName: string, appVersion: string, appId: string, appInstallerId: string, params: ScreenviewParams, callback?: Callback): Visitor;
+
+        event(params: EventParams, callback?: Callback): Visitor;
+        event(category: string, action: string, callback?: Callback): Visitor;
+        event(category: string, action: string, label: string, callback?: Callback): Visitor;
+        event(category: string, action: string, label: string, value: string | number, callback?: Callback): Visitor;
+        event(category: string, action: string, label: string, value: string | number, params: EventParams, callback?: Callback): Visitor;
+
+        e(params: EventParams, callback?: Callback): Visitor;
+        e(category: string, action: string, callback?: Callback): Visitor;
+        e(category: string, action: string, label: string, callback?: Callback): Visitor;
+        e(category: string, action: string, label: string, value: string | number, callback?: Callback): Visitor;
+        e(category: string, action: string, label: string, value: string | number, params: EventParams, callback?: Callback): Visitor;
+
+        transaction(id: TransactionParams | string, callback?: Callback): Visitor;
+        transaction(id: string, revenue: string | number, callback?: Callback): Visitor;
+        transaction(id: string, revenue: string | number, shipping: string | number, callback?: Callback): Visitor;
+        transaction(id: string, revenue: string | number, shipping: string | number, tax: string | number, callback?: Callback): Visitor;
+        transaction(id: string, revenue: string | number, shipping: string | number, tax: string | number, affiliation: string, callback?: Callback): Visitor;
+        transaction(id: string, revenue: string | number, shipping: string | number, tax: string | number, affiliation: string, params: TransactionParams, callback?: Callback): Visitor;
+
+        t(id: TransactionParams | string, callback?: Callback): Visitor;
+        t(id: string, revenue: string | number, callback?: Callback): Visitor;
+        t(id: string, revenue: string | number, shipping: string | number, callback?: Callback): Visitor;
+        t(id: string, revenue: string | number, shipping: string | number, tax: string | number, callback?: Callback): Visitor;
+        t(id: string, revenue: string | number, shipping: string | number, tax: string | number, affiliation: string, callback?: Callback): Visitor;
+        t(id: string, revenue: string | number, shipping: string | number, tax: string | number, affiliation: string, params: TransactionParams, callback?: Callback): Visitor;
+
+        item(price: ItemParams | string | number, callback?: Callback): Visitor;
+        item(price: string | number, quantity: string | number, callback?: Callback): Visitor;
+        item(price: string | number, quantity: string | number, sku: string, callback?: Callback): Visitor;
+        item(price: string | number, quantity: string | number, sku: string, name: string, callback?: Callback): Visitor;
+        item(price: string | number, quantity: string | number, sku: string, name: string, variation: string, callback?: Callback): Visitor;
+        item(price: string | number, quantity: string | number, sku: string, name: string, variation: string, params: ItemParams, callback?: Callback): Visitor;
+
+        i(price: ItemParams | string | number, callback?: Callback): Visitor;
+        i(price: string | number, quantity: string | number, callback?: Callback): Visitor;
+        i(price: string | number, quantity: string | number, sku: string, callback?: Callback): Visitor;
+        i(price: string | number, quantity: string | number, sku: string, name: string, callback?: Callback): Visitor;
+        i(price: string | number, quantity: string | number, sku: string, name: string, variation: string, callback?: Callback): Visitor;
+        i(price: string | number, quantity: string | number, sku: string, name: string, variation: string, params: ItemParams, callback?: Callback): Visitor;
+
+        exception(description: ExceptionParams | string, callback?: Callback): Visitor;
+        exception(description: string, fatal: boolean, callback?: Callback): Visitor;
+        exception(description: string, fatal: boolean, params: ExceptionParams, callback?: Callback): Visitor;
+
+        timing(category: TimingParams | string, callback?: Callback): Visitor;
+        timing(category: string, variable: string, callback?: Callback): Visitor;
+        timing(category: string, variable: string, time: string | number, callback?: Callback): Visitor;
+        timing(category: string, variable: string, time: string | number, label: string, callback?: Callback): Visitor;
+        timing(category: string, variable: string, time: string | number, label: string, params: TimingParams, callback?: Callback): Visitor;
+
+        send(fn?: (error: any, response: any, body: any) => void): void;
+    }
+
+    function createFromSession(session?: Session): Visitor;
+
+    function middleware(tid: string, options?: ua.MiddlewareOptions): (req: any, res: any, next: (err: any) => void) => void;
 }
+
+declare function ua(accountID: ua.VisitorOptions | string): ua.Visitor;
+declare function ua(accountID: string, uuid: ua.VisitorOptions | string): ua.Visitor;
+declare function ua(accountID: string, uuid: string, options: ua.VisitorOptions): ua.Visitor;
+export = ua;
diff --git a/types/universal-analytics/tslint.json b/types/universal-analytics/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/universal-analytics/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/universal-analytics/universal-analytics-tests.ts b/types/universal-analytics/universal-analytics-tests.ts
index 1f37e27a66..a81f728179 100644
--- a/types/universal-analytics/universal-analytics-tests.ts
+++ b/types/universal-analytics/universal-analytics-tests.ts
@@ -1,87 +1,98 @@
-import UniversalAnalytics = require("universal-analytics");
+import * as ua from 'universal-analytics';
 
-var ui:UniversalAnalytics;
+import * as express from 'express';
 
-var str:string;
-var num:number;
-var value:any;
-var bool:boolean;
-var params:Object;
-var x:any;
+const app = express();
+let visitor = ua('UA-XXXX-XX');
 
-var client:UniversalAnalytics.Client = ui('UA-123-00');
-client = client.debug();
-client.send();
+visitor = ua('UA-XXXX-XX', '6a14abda-6b12-4578-bf66-43c754eaeda9');
+visitor = ua('UA-XXXX-XX', 'CUSTOM_USERID_1', { strictCidFormat: false });
+visitor = ua('UA-XXXX-XX', { https: true });
 
-client = client.pageview(str);
-client.pageview(str, (err:any) => {});
-client = client.pageview(params);
-client.pageview(params, (err:any) => {});
-client = client.pageview(str, str);
-client.pageview(str, str, (err:any) => {});
-client = client.pageview(str, str, str);
-client.pageview(str, str, str, (err:any) => {});
+visitor.pageview('/', 'http://peaksandpies.com', 'Welcome').send();
+visitor.pageview('/', 'http://peaksandpies.com', 'Welcome', err => { });
+visitor.pageview({ dp: '/', dt: 'Welcome', dh: 'http://peaksandpies.com' }).send();
+visitor.pageview(null, err => { });
 
+visitor.pv('/', 'http://peaksandpies.com', 'Welcome').send();
+visitor.pv('/', 'http://peaksandpies.com', 'Welcome', err => { });
+visitor.pv({ dp: '/', dt: 'Welcome', dh: 'http://peaksandpies.com' }).send();
+visitor.pv(null, err => { });
 
-client = client.event(str, str);
-client.event(str, str, (err:any) => {});
-client = client.event(str, str, str);
-client.event(str, str, str, (err:any) => {});
-client = client.event(str, str, str, value);
-client.event(str, str, str, value, (err:any) => {});
-client.event(str, str, str, value, params, (err:any) => {});
-client = client.event(params);
-client.event(params, (err:any) => {});
+visitor.screenview('Home Screen', 'App Name').send();
+visitor.screenview('Home Screen', 'App Name', err => { }).send();
+visitor.screenview({ cd: 'Home Screen', an: 'App Name' }).send();
+visitor.screenview(null, err => { });
 
+visitor.event('Event Category', 'Event Action').send();
+visitor.event('Event Category', 'Event Action', '…and a label', 42).send();
+visitor.event('Event Category', 'Event Action', '…and a label', 42, err => { });
+visitor.event('Event Category', 'Event Action', '…and a label', 42, { p: '/contact' }, err => { });
+visitor.event({ ec: 'Event Category', ea: 'Event Action', el: '…and a label', ev: 42, dp: '/contact' }).send();
+visitor.event('Navigation clicks', null, err => { });
 
-client = client.transaction(str);
-client.transaction(str, (err:any) => {});
-client = client.transaction(str, num);
-client.transaction(str, num, (err:any) => {});
-client = client.transaction(str, num, num);
-client.transaction(str, num, num, (err:any) => {});
-client = client.transaction(str, num, num, num);
-client.transaction(str, num, num, num, (err:any) => {});
-client = client.transaction(str, num, num, num, str);
-client.transaction(str, num, num, num, str, (err:any) => {});
-client = client.transaction(params);
-client.transaction(params, (err:any) => {});
+visitor.e('Event Category', 'Event Action').send();
+visitor.e('Event Category', 'Event Action', '…and a label', 42).send();
+visitor.e('Event Category', 'Event Action', '…and a label', 42, err => { });
+visitor.e('Event Category', 'Event Action', '…and a label', 42, { p: '/contact' }, err => { });
+visitor.e({ ec: 'Event Category', ea: 'Event Action', el: '…and a label', ev: 42, dp: '/contact' }).send();
+visitor.e('Navigation clicks', null, err => { });
 
+visitor
+    .transaction('trans-12345', 500)
+    .item(300, 1, 'item-54321')
+    .item(200, 2, 'item-41325')
+    .send();
 
-client = client.item(num);
-client.item(num, (err:any) => {});
-client = client.item(num, num);
-client.item(num, num, (err:any) => {});
-client = client.item(num, num, num);
-client.item(num, num, num, (err:any) => {});
-client = client.item(num, num, num, str);
-client.item(num, num, num, str, (err:any) => {});
-client = client.item(num, num, num, str, str);
-client.item(num, num, num, str, str, (err:any) => {});
-client = client.item(num, num, num, str, str, params);
-client.item(num, num, num, str, str, params, (err:any) => {});
-client = client.item(params);
-client.item(params, (err:any) => {});
+visitor
+    .transaction({ ti: 'trans-12345', tr: 500, ts: 50, tt: 100, ta: 'Partner 13' })
+    .item({ ip: 300, iq: 1, ic: 'item-54321', in: 'Item 54321', iv: 'Blue' })
+    .item({ ip: 200, iq: 2, ic: 'item-41325', in: 'Item 41325', iv: 'XXL' })
+    .send();
 
+visitor
+    .t('trans-12345', 500)
+    .i(300, 1, 'item-54321')
+    .i(200, 2, 'item-41325')
+    .send();
 
-client = client.exception(str);
-client.exception(str, (err:any) => {});
-client = client.exception(str, bool);
-client.exception(str, bool, (err:any) => {});
-client = client.exception(params);
-client.exception(params, (err:any) => {});
+visitor
+    .t({ ti: 'trans-12345', tr: 500, ts: 50, tt: 100, ta: 'Partner 13' })
+    .i({ ip: 300, iq: 1, ic: 'item-54321', in: 'Item 54321', iv: 'Blue' })
+    .i({ ip: 200, iq: 2, ic: 'item-41325', in: 'Item 41325', iv: 'XXL' })
+    .send();
 
+visitor.transaction(null, err => { });
 
-client = client.timing(str);
-client.timing(str, (err:any) => {});
-client = client.timing(str, str);
-client.timing(str, str, (err:any) => {});
-client = client.timing(str, str, num);
-client.timing(str, str, num, (err:any) => {});
-client = client.timing(str, str, num, str);
-client.timing(str, str, num, str, (err:any) => {});
-client = client.timing(params);
-client.timing(params, (err:any) => {});
+visitor.exception('StackOverflow Error').send();
+visitor.exception('StackOverflow Error', true, () => { });
 
+visitor.timing('User interaction', 'Time to open login overlay', 12547).send();
 
-x = client.middleware(str, {});
+visitor.transaction('123456', '449.99').send();
+visitor.item(449.99, 1, 'ID54321', 'T-Shirt', 'Blue', { ti: '123456' }).send();
+
+visitor.pageview('/').send();
+visitor.pageview('/').pageview('/contact').send();
+visitor.pageview('/landing-page-1').event('Testing', 'Button color', 'Blue').send();
+visitor.pageview('/landing-page-1').send();
+visitor.event('Testing', 'Button color', 'Blue', 42, { p: '/landing-page-1' }).send();
+
+visitor
+    .event({ ec: 'Mail Server', ea: 'New Team Member Notification sent' })
+    .event({ ea: 'Invitation sent' })
+    .send();
+
+visitor.set('uid', '123456789');
+
+app.use(ua.middleware('UA-XXXX-Y', { cookieName: '_ga' }));
+
+ua.createFromSession({ cid: 'some-string' });
+
+ua('UA-XXXX-XX').debug();
+
+ua('UA-XXXX-XX', {
+    requestOptions: {
+        proxy: '…',
+    },
+});
diff --git a/types/uppercamelcase/index.d.ts b/types/uppercamelcase/index.d.ts
new file mode 100644
index 0000000000..cbdfed1925
--- /dev/null
+++ b/types/uppercamelcase/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for uppercamelcase
+// Project: https://github.com/samverschueren/uppercamelcase
+// Definitions by: York Yao <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function upperCamelCase(...args: string[]): string;
+export = upperCamelCase;
diff --git a/types/big-integer/tsconfig.json b/types/uppercamelcase/tsconfig.json
similarity index 92%
rename from types/big-integer/tsconfig.json
rename to types/uppercamelcase/tsconfig.json
index 4b00c0362e..acf8a44033 100644
--- a/types/big-integer/tsconfig.json
+++ b/types/uppercamelcase/tsconfig.json
@@ -17,6 +17,6 @@
     },
     "files": [
         "index.d.ts",
-        "big-integer-tests.ts"
+        "uppercamelcase-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/uppercamelcase/uppercamelcase-tests.ts b/types/uppercamelcase/uppercamelcase-tests.ts
new file mode 100644
index 0000000000..29d31d58e6
--- /dev/null
+++ b/types/uppercamelcase/uppercamelcase-tests.ts
@@ -0,0 +1,28 @@
+import upperCamelCase = require('uppercamelcase');
+
+upperCamelCase('foo-bar');
+//=> FooBar
+
+upperCamelCase('foo_bar');
+//=> FooBar
+
+upperCamelCase('Foo-Bar');
+//=> FooBar
+
+upperCamelCase('--foo.bar');
+//=> FooBar
+
+upperCamelCase('__foo__bar__');
+//=> FooBar
+
+upperCamelCase('foo bar');
+//=> FooBar
+
+upperCamelCase("--foo-bar");
+//=> FooBar
+
+upperCamelCase('foo', 'bar');
+//=> 'FooBar'
+
+upperCamelCase('__foo__', '--bar');
+//=> 'FooBar'
diff --git a/types/urijs/index.d.ts b/types/urijs/index.d.ts
index 63df83601c..ea56ef9610 100644
--- a/types/urijs/index.d.ts
+++ b/types/urijs/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/medialize/URI.js
 // Definitions by: RodneyJT <https://github.com/RodneyJT>, Brian Surowiec <https://github.com/xt0rted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/uuid/index.d.ts b/types/uuid/index.d.ts
index 2fd5467e3e..cc16cc830d 100644
--- a/types/uuid/index.d.ts
+++ b/types/uuid/index.d.ts
@@ -1,35 +1,16 @@
-// Type definitions for uuid v2.0.3
+// Type definitions for uuid 3.0
 // Project: https://github.com/defunctzombie/node-uuid
 // Definitions by: Oliver Hoffmann <https://github.com/iamolivinius/>
+//                 Felipe Ochoa <https://github.com/felipeochoa/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-/// <reference types="node" />
+import { v1, v4 } from './interfaces';
 
-declare namespace uuid {
-	interface V1Options {
-		node?: number[];
-		clockseq?: number;
-		msecs?: number | Date;
-		nsecs?: number;
-	}
-
-	type V4Options = { random: number[] } | { rng: () => number[]; }
-
-	interface UuidStatic {
-		(options?: V4Options): string;
-		(options: V4Options | null, buffer: number[], offset?: number): number[];
-		(options: V4Options | null, buffer: Buffer, offset?: number): Buffer;
-
-		v1(options?: V1Options): string;
-		v1(options: V1Options | null, buffer: number[], offset?: number): number[];
-		v1(options: V1Options | null, buffer: Buffer, offset?: number): Buffer;
-		v4: UuidStatic;
-		parse(id: string): number[];
-		parse(id: string, buffer: number[], offset?: number): number[];
-		parse(id: string, buffer: Buffer, offset?: number): Buffer;
-		unparse(buffer: number[] | Buffer, offset?: number): string;
-	}
+interface UuidStatic {
+    v1: v1;
+    v4: v4;
 }
 
-declare const uuid: uuid.UuidStatic
-export = uuid
+declare const uuid: UuidStatic & v4;
+export = uuid;
diff --git a/types/uuid/interfaces.d.ts b/types/uuid/interfaces.d.ts
new file mode 100644
index 0000000000..65ff0d4819
--- /dev/null
+++ b/types/uuid/interfaces.d.ts
@@ -0,0 +1,21 @@
+/// <reference types="node" />
+
+// Uses ArrayLike to admit Unit8 and co.
+export type OutputBuffer = ArrayLike<number> | Buffer;
+
+export interface V1Options {
+    node?: number[];
+    clockseq?: number;
+    msecs?: number | Date;
+    nsecs?: number;
+}
+
+export type V4Options = {random: number[]} | {rng(): number[]};
+
+export type v1String = (options?: V1Options) => string;
+export type v1Buffer = <T extends OutputBuffer>(options: V1Options | null | undefined, buffer: T, offset?: number) => T;
+export type v1 = v1String & v1Buffer;
+
+export type v4String = (options?: V4Options) => string;
+export type v4Buffer = <T extends OutputBuffer>(options: V4Options | null | undefined, buffer: T, offset?: number) => T;
+export type v4 = v4String & v4Buffer;
diff --git a/types/uuid/tsconfig.json b/types/uuid/tsconfig.json
index 13ef9e9cca..688d9add4b 100644
--- a/types/uuid/tsconfig.json
+++ b/types/uuid/tsconfig.json
@@ -6,7 +6,9 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
+        "alwaysStrict": true,
+        "strict": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -17,6 +19,9 @@
     },
     "files": [
         "index.d.ts",
+        "v1.d.ts",
+        "v4.d.ts",
+        "interfaces.d.ts",
         "uuid-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/uuid/tslint.json b/types/uuid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/uuid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/uuid/uuid-tests.ts b/types/uuid/uuid-tests.ts
index 2dd5ea7f46..73dedec6c5 100644
--- a/types/uuid/uuid-tests.ts
+++ b/types/uuid/uuid-tests.ts
@@ -1,31 +1,43 @@
 import uuid = require('uuid');
+import v1 = require('uuid/v1');
+import v4 = require('uuid/v4');
 
 let uuidv1: string = uuid.v1();
 
 uuidv1 = uuid.v1({
-	node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
-	clockseq: 0x1234,
-	msecs: new Date('2011-11-01').getTime(),
-	nsecs: 5678
+    node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
+    clockseq: 0x1234,
+    msecs: new Date('2011-11-01').getTime(),
+    nsecs: 5678
 });
 
-let bufferv1: number[] = new Array(32);
+uuidv1 = v1();
+uuidv1 = v1({
+    node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
+    clockseq: 0x1234,
+    msecs: new Date('2011-11-01').getTime(),
+    nsecs: 5678
+});
+
+let bufferv1 = new Uint8Array(32);
 bufferv1 = uuid.v1(null, bufferv1);
-bufferv1 = uuid.v1(null, bufferv1, 16);
+bufferv1 = uuid.v1(undefined, bufferv1, 16);
+bufferv1 = v1(undefined, bufferv1);
+bufferv1 = v1(null, bufferv1, 16);
 
 let uuidv4: string = uuid.v4();
 
 const randoms = [
-	0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea,
-	0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36
+    0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea,
+    0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36
 ];
 uuidv4 = uuid({ random: randoms });
-uuidv4 = uuid({ rng: () => randoms })
+uuidv4 = uuid({ rng: () => randoms });
+uuidv4 = v4({ random: randoms });
+uuidv4 = v4({ rng: () => randoms });
 
 let bufferv4: number[] = new Array(32);
-bufferv4 = uuid(null, bufferv4);
+bufferv4 = uuid(undefined, bufferv4);
 bufferv4 = uuid(null, bufferv4, 16);
-
-let nodeBufferv4 = Buffer.alloc(32);
-nodeBufferv4 = uuid.v4(null, nodeBufferv4);
-nodeBufferv4 = uuid.v4(null, nodeBufferv4, 16);
+bufferv4 = v4(null, bufferv4);
+bufferv4 = v4(undefined, bufferv4, 16);
diff --git a/types/uuid/v1.d.ts b/types/uuid/v1.d.ts
new file mode 100644
index 0000000000..b5fa0f6c61
--- /dev/null
+++ b/types/uuid/v1.d.ts
@@ -0,0 +1,5 @@
+import { v1 } from './interfaces';
+
+declare const v1: v1;
+
+export = v1;
diff --git a/types/uuid/v2/index.d.ts b/types/uuid/v2/index.d.ts
new file mode 100644
index 0000000000..2fd5467e3e
--- /dev/null
+++ b/types/uuid/v2/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for uuid v2.0.3
+// Project: https://github.com/defunctzombie/node-uuid
+// Definitions by: Oliver Hoffmann <https://github.com/iamolivinius/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace uuid {
+	interface V1Options {
+		node?: number[];
+		clockseq?: number;
+		msecs?: number | Date;
+		nsecs?: number;
+	}
+
+	type V4Options = { random: number[] } | { rng: () => number[]; }
+
+	interface UuidStatic {
+		(options?: V4Options): string;
+		(options: V4Options | null, buffer: number[], offset?: number): number[];
+		(options: V4Options | null, buffer: Buffer, offset?: number): Buffer;
+
+		v1(options?: V1Options): string;
+		v1(options: V1Options | null, buffer: number[], offset?: number): number[];
+		v1(options: V1Options | null, buffer: Buffer, offset?: number): Buffer;
+		v4: UuidStatic;
+		parse(id: string): number[];
+		parse(id: string, buffer: number[], offset?: number): number[];
+		parse(id: string, buffer: Buffer, offset?: number): Buffer;
+		unparse(buffer: number[] | Buffer, offset?: number): string;
+	}
+}
+
+declare const uuid: uuid.UuidStatic
+export = uuid
diff --git a/types/uuid/v2/tsconfig.json b/types/uuid/v2/tsconfig.json
new file mode 100644
index 0000000000..62f4072351
--- /dev/null
+++ b/types/uuid/v2/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../..",
+        "typeRoots": [
+            "../.."
+        ],
+        "paths": {
+            "uuid": ["uuid/v2"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "uuid-tests.ts"
+    ]
+}
diff --git a/types/uuid/v2/uuid-tests.ts b/types/uuid/v2/uuid-tests.ts
new file mode 100644
index 0000000000..2dd5ea7f46
--- /dev/null
+++ b/types/uuid/v2/uuid-tests.ts
@@ -0,0 +1,31 @@
+import uuid = require('uuid');
+
+let uuidv1: string = uuid.v1();
+
+uuidv1 = uuid.v1({
+	node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
+	clockseq: 0x1234,
+	msecs: new Date('2011-11-01').getTime(),
+	nsecs: 5678
+});
+
+let bufferv1: number[] = new Array(32);
+bufferv1 = uuid.v1(null, bufferv1);
+bufferv1 = uuid.v1(null, bufferv1, 16);
+
+let uuidv4: string = uuid.v4();
+
+const randoms = [
+	0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea,
+	0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36
+];
+uuidv4 = uuid({ random: randoms });
+uuidv4 = uuid({ rng: () => randoms })
+
+let bufferv4: number[] = new Array(32);
+bufferv4 = uuid(null, bufferv4);
+bufferv4 = uuid(null, bufferv4, 16);
+
+let nodeBufferv4 = Buffer.alloc(32);
+nodeBufferv4 = uuid.v4(null, nodeBufferv4);
+nodeBufferv4 = uuid.v4(null, nodeBufferv4, 16);
diff --git a/types/uuid/v4.d.ts b/types/uuid/v4.d.ts
new file mode 100644
index 0000000000..62b0bc5d04
--- /dev/null
+++ b/types/uuid/v4.d.ts
@@ -0,0 +1,5 @@
+import { v4 } from './interfaces';
+
+declare const v4: v4;
+
+export = v4;
diff --git a/types/velocity-animate/index.d.ts b/types/velocity-animate/index.d.ts
index 9fcdfd2bf4..84d91980e5 100644
--- a/types/velocity-animate/index.d.ts
+++ b/types/velocity-animate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://velocityjs.org/
 // Definitions by: Greg Smith <https://github.com/smrq/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/verror/verror-tests.ts b/types/verror/verror-tests.ts
index c3b560bfb2..17f7fe1bd7 100644
--- a/types/verror/verror-tests.ts
+++ b/types/verror/verror-tests.ts
@@ -12,7 +12,7 @@ const verror3 = new VError({
     name: "fooError",
     cause: error,
     info: {
-        "info0": "baz"
+        info0: "baz"
     }
 }, "bar");
 
diff --git a/types/vex-js/index.d.ts b/types/vex-js/index.d.ts
index 0635b0708a..d36f158c81 100644
--- a/types/vex-js/index.d.ts
+++ b/types/vex-js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/HubSpot/vex
 // Definitions by: Greg Cohan <https://github.com/gdcohan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 ///<reference types="jquery" />
 
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index d1d241354d..8e0bee498f 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for Victory 0.9.0
+// Type definitions for Victory 0.9.1
 // Project: https://github.com/FormidableLabs/victory
-// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, snerks <https://github.com/snerks>
+// Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
+//                 snerks <https://github.com/snerks>
+//                 Krzysztof Cebula <https://github.com/Havret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react"/>
 
@@ -34,6 +36,7 @@ declare module "victory" {
         parent?: React.CSSProperties;
         data?: React.CSSProperties;
         labels?: React.CSSProperties;
+        tickLabels?: React.CSSProperties;
     }
 
     export interface VictoryAnimationProps {
@@ -75,7 +78,7 @@ declare module "victory" {
      * VictoryAnimation animates prop changes for any React component.
      * Just use a child function inside VictoryAnimation that accepts an object of tweened values and returns a component to render.
      */
-    export class VictoryAnimation extends React.Component<VictoryAnimationProps, any> {}
+    export class VictoryAnimation extends React.Component<VictoryAnimationProps> {}
 
     /**
      * Text anchor type
@@ -169,7 +172,7 @@ declare module "victory" {
     /**
      * VictoryLabel is a text component that provides several enhancements over SVG’s <text> element.
      */
-    export class VictoryLabel extends React.Component<VictoryLabelProps, any> {}
+    export class VictoryLabel extends React.Component<VictoryLabelProps> {}
 
     export interface VictoryContainerProps {
         /**
@@ -221,7 +224,7 @@ declare module "victory" {
          */
         desc?: string;
     }
-    export class VictoryContainer extends React.Component<VictoryContainerProps, any> {}
+    export class VictoryContainer extends React.Component<VictoryContainerProps> {}
 
     // Note: Many SVG attributes are missed in CSSProperties interface
     export interface VictoryThemeDefinition {
@@ -663,7 +666,7 @@ declare module "victory" {
      * Draw area charts with React. VictoryArea is a composable component, so it doesn't include axes.
      * Add VictoryArea as a child of VictoryChart for a complete chart.
      */
-    export class VictoryArea extends React.Component<VictoryAreaProps, any> {}
+    export class VictoryArea extends React.Component<VictoryAreaProps> {}
 
     export interface VictoryAxisProps extends VictoryCommonProps {
         /**
@@ -847,7 +850,7 @@ declare module "victory" {
      * Styles and data can be customized by passing in your own values as properties to the component.
      * Data changes are animated with VictoryAnimation.
      */
-    export class VictoryAxis extends React.Component<VictoryAxisProps, any> {}
+    export class VictoryAxis extends React.Component<VictoryAxisProps> {}
 
     export interface VictoryBarProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
         /**
@@ -918,7 +921,7 @@ declare module "victory" {
      * Draw SVG bar charts with React. VictoryBar is a composable component, so it doesn't include axes
      * Check out VictoryChart for complete bar charts and more.
      */
-    export class VictoryBar extends React.Component<VictoryBarProps, any> {}
+    export class VictoryBar extends React.Component<VictoryBarProps> {}
 
     export interface VictoryChartProps extends VictoryCommonProps {
         /**
@@ -1004,7 +1007,7 @@ declare module "victory" {
      * - VictoryScatter
      * - VictoryBar
      */
-    export class VictoryChart extends React.Component<VictoryChartProps, any> {}
+    export class VictoryChart extends React.Component<VictoryChartProps> {}
 
     export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1101,7 +1104,7 @@ declare module "victory" {
          */
         style?: VictoryStyleInterface;
     }
-    export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
+    export class VictoryGroup extends React.Component<VictoryGroupProps> {}
 
     export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
         /**
@@ -1168,7 +1171,7 @@ declare module "victory" {
      * 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 class VictoryLine extends React.Component<VictoryLineProps> {}
 
     type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
     export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
@@ -1256,7 +1259,7 @@ declare module "victory" {
      * 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 class VictoryScatter extends React.Component<VictoryScatterProps> {}
 
     export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1358,7 +1361,7 @@ declare module "victory" {
          */
         xOffset?: number;
     }
-    export class VictoryStack extends React.Component<VictoryStackProps, any> {}
+    export class VictoryStack extends React.Component<VictoryStackProps> {}
 
     export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
         /**
@@ -1390,6 +1393,11 @@ declare module "victory" {
          * If a dataComponent is not provided, VictoryPie's Slice component will be used.
          */
         dataComponent?: React.ReactElement<any>;
+        /**
+         * The labelRadius prop defines the radius of the arc that will be used for positioning each slice label.
+         * If this prop is not set, the label radius will default to the radius of the pie + label padding.
+         */
+        labelRadius?: number;
         /**
          * The overall end angle of the pie in degrees. This prop is used in conjunction with
          * startAngle to create a pie that spans only a segment of a circle.
@@ -1497,5 +1505,5 @@ declare module "victory" {
      * Styles and data can be customized by passing in your own values as properties to the component.
      * Data changes are animated with VictoryAnimation.
      */
-    export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+    export class VictoryPie extends React.Component<VictoryPieProps> {}
 }
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 601780ffaf..c6e7fb24b9 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -600,6 +600,7 @@ test = (
               ({y: datum.y, label: "NEW"})
            }
         }}
+        labelRadius={20}
     />
 );
 
diff --git a/types/viewability-helper/index.d.ts b/types/viewability-helper/index.d.ts
new file mode 100644
index 0000000000..0fad1e32b7
--- /dev/null
+++ b/types/viewability-helper/index.d.ts
@@ -0,0 +1,20 @@
+// 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.)
+// Definitions by: Liron Zluf <https://github.com/lironzluf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface Options {
+    callbackParams?: any[];
+    rootMargin?: string;
+    intersectionPercentage?: number;
+    scrollDimmer?: number;
+    unobserve?: boolean;
+    threshold?: number[];
+}
+
+export class ViewabilityHelper {
+    constructor(element: Element | HTMLElement, callback: () => void, options?: Options);
+
+    observe(): void;
+}
diff --git a/types/viewability-helper/tsconfig.json b/types/viewability-helper/tsconfig.json
new file mode 100644
index 0000000000..d82bd3708a
--- /dev/null
+++ b/types/viewability-helper/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "viewability-helper-tests.ts"
+    ]
+}
diff --git a/types/viewability-helper/tslint.json b/types/viewability-helper/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/viewability-helper/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/viewability-helper/viewability-helper-tests.ts b/types/viewability-helper/viewability-helper-tests.ts
new file mode 100644
index 0000000000..b8b43102b4
--- /dev/null
+++ b/types/viewability-helper/viewability-helper-tests.ts
@@ -0,0 +1,21 @@
+// Tests for ViewabilityHelper API
+
+import {ViewabilityHelper, Options} from 'viewability-helper';
+
+let d: Element = document.createElement('DIV');
+let vh: ViewabilityHelper = new ViewabilityHelper(d, () => {});
+vh.observe();
+
+// Test with options
+
+let options: Options = {
+  callbackParams: [1, 'a', null],
+  rootMargin: '0px',
+  intersectionPercentage: 0,
+  scrollDimmer: 200,
+  unobserve: true,
+  threshold: [0]
+};
+
+let vh2: ViewabilityHelper = new ViewabilityHelper(d, () => {}, options);
+vh2.observe();
diff --git a/types/viewporter/index.d.ts b/types/viewporter/index.d.ts
index 0a493d2fb2..0a30c6f764 100644
--- a/types/viewporter/index.d.ts
+++ b/types/viewporter/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/zynga/viewporter
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 interface Viewporter {
     preventPageScroll: boolean;
diff --git a/types/vinyl-paths/index.d.ts b/types/vinyl-paths/index.d.ts
index 26878a2ac6..d4116e5ae1 100644
--- a/types/vinyl-paths/index.d.ts
+++ b/types/vinyl-paths/index.d.ts
@@ -23,8 +23,7 @@ declare namespace paths {
     }
 
     interface Callback {
-        //TODO: Function is gulp.ITaskCallback, which is currently invisible
-        (path: string, callback: Function): any;
+        (path: string): any;
     }
 }
 
diff --git a/types/vinyl-paths/vinyl-paths-tests.ts b/types/vinyl-paths/vinyl-paths-tests.ts
index 30e6a1c874..3e66d44e3a 100644
--- a/types/vinyl-paths/vinyl-paths-tests.ts
+++ b/types/vinyl-paths/vinyl-paths-tests.ts
@@ -15,7 +15,7 @@ gulp.task('delete2', function (cb: Function) {
         .pipe(vp)
         .pipe(gulp.dest('dist'))
         .on('end', function () {
-            del(vp.paths, cb);
+            del(vp.paths);
         });
 });
 
diff --git a/types/vinyl/v0/vinyl-tests.ts b/types/vinyl/v0/vinyl-tests.ts
index 910b5b7bc7..e9017f7235 100644
--- a/types/vinyl/v0/vinyl-tests.ts
+++ b/types/vinyl/v0/vinyl-tests.ts
@@ -72,9 +72,9 @@ describe('File', () => {
 		});
 
 		it('should set stat to given value', done => {
-			var val = {};
-			var file = new File(<fs.Stats><any>{stat: val});
-			file.stat.should.equal(val);
+			var stat = {} as fs.Stats;
+			var file = new File({ stat });
+			file.stat.should.equal(stat);
 			done();
 		});
 
diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 5b7cc718b2..2b71d3d6d6 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -79,6 +79,7 @@ export interface DataGroup {
   style?: string;
   subgroupOrder?: string | (() => void);
   title?: string;
+  nestedGroups?: number[];
 }
 
 export interface DataGroupOptions {
@@ -179,7 +180,7 @@ export interface TimelineOptions {
   onRemoveGroup?(): void; // TODO
   order?(): void; // TODO
   orientation?: TimelineOptionsOrientationType;
-  rollingMode?: boolean;
+  rollingMode?: any;
   selectable?: boolean;
   showCurrentTime?: boolean;
   showMajorLabels?: boolean;
diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 2b0164cc0f..4257e0f7b9 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapijs/vision
 // Definitions by: Jason Swearingen <http://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as Hapi from 'hapi';
 
diff --git a/types/vision/vision-tests.ts b/types/vision/vision-tests.ts
index 74f8f432b0..c31dc6661b 100644
--- a/types/vision/vision-tests.ts
+++ b/types/vision/vision-tests.ts
@@ -1,6 +1,3 @@
-
-/// <reference types="node" />
-
 import * as Hapi from 'hapi';
 import Vision from 'vision';
 const server = new Hapi.Server();
diff --git a/types/w2ui/index.d.ts b/types/w2ui/index.d.ts
index b17a743636..c47f940666 100644
--- a/types/w2ui/index.d.ts
+++ b/types/w2ui/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://w2ui.com/
 // Definitions by: Valentin Robert <https://github.com/Ptival/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 
diff --git a/types/wampy/wampy-tests.ts b/types/wampy/wampy-tests.ts
index 6bb301edb7..27dd90ed73 100644
--- a/types/wampy/wampy-tests.ts
+++ b/types/wampy/wampy-tests.ts
@@ -1,7 +1,5 @@
-
-/// <reference types="node" />
-
 import * as Wampy from 'wampy';
+declare var console: { log(...args: any[]): void };
 
 let ws = new Wampy('http://wamp.router.url', {realm: 'WAMPRealm'});
 
diff --git a/types/waterline/index.d.ts b/types/waterline/index.d.ts
index 6525e699b6..a3aa7c04ee 100644
--- a/types/waterline/index.d.ts
+++ b/types/waterline/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/balderdashy/waterline
 // Definitions by: Alexandro Libertino <https://github.com/arvitaly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/webcl/index.d.ts b/types/webcl/index.d.ts
index d02c5a945e..dae785d794 100644
--- a/types/webcl/index.d.ts
+++ b/types/webcl/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://www.khronos.org/registry/webcl/specs/1.0.0/
 // Definitions by: Ralph Brown <https://github.com/NCARalph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Version 1.3 - Changed enums to static enums for TS 1.5
 // Version 1.2 - Fixed some more bugs, added WebCLEvent
diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index 5c856575b2..755b9f26b9 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for WebdriverIO 4.7
+// Type definitions for WebdriverIO 4.8
 // Project: http://www.webdriver.io/
-// Definitions by: Nick Malaguti <https://github.com/nmalaguti/>, Tim Brust <https://github.com/timbru31>
+// Definitions by: Nick Malaguti <https://github.com/nmalaguti>
+//                 Tim Brust <https://github.com/timbru31>
+//                 Fredrik Smedberg <https://github.com/fsmedberg-tc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -1020,7 +1022,10 @@ declare namespace WebdriverIO {
         /** @deprecated in favour of Actions.pointerDown */
         buttonPress<P>(button?: string | Button): Client<P>;
 
+        /** @deprecated in favour of Actions.pointerUp */
         buttonUp(button?: string | Button): Client<RawResult<null>> & RawResult<null>;
+
+        /** @deprecated in favour of Actions.pointerUp */
         buttonUp<P>(button?: string | Button): Client<P>;
 
         cookie(): Client<RawResult<Cookie[]>> & RawResult<Cookie[]>;
@@ -1551,7 +1556,7 @@ declare namespace WebdriverIO {
         $(selector: string): Client<RawResult<Element>> & RawResult<Element>;
         $<P>(selector: string): Client<P>;
 
-        $$(selector: string): Client<RawResult<Element[]>> & RawResult<Element[]>;
+        $$(selector: string): Client<Array<RawResult<Element>>> & Array<RawResult<Element>>;
         $$<P>(selector: string): Client<P>;
 
         addCommand(
diff --git a/types/webgme/tsconfig.json b/types/webgme/tsconfig.json
index 2d5184486f..d1ae63d85c 100644
--- a/types/webgme/tsconfig.json
+++ b/types/webgme/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
+        "target": "es6",
         "lib": [
             "es6",
             "dom"
diff --git a/types/webgme/webgme-tests.ts b/types/webgme/webgme-tests.ts
index e6f315a3ef..1cb2c78814 100644
--- a/types/webgme/webgme-tests.ts
+++ b/types/webgme/webgme-tests.ts
@@ -15,7 +15,6 @@
  */
 const MetaDataStr = "";
 
-import Promise = require("bluebird");
 import PluginBase = require("plugin/PluginBase");
 
 import * as fs from "fs";
@@ -286,36 +285,29 @@ function test_client_using_a_blob() {
             return { stateMachine: { name: "dm", initialState: null, finalStates: [], states: [] } };
         }
 
-        public main(mainHandler: Core.ResultCallback): void {
+        async main(mainHandler: Core.ResultCallback): Promise<string[]> {
             let artifact: Core.Artifact;
 
-            Promise
-                .try(() => {
-                    return this.extractDataModel();
-                })
-                .then((dataModel) => {
-                    var dataModelStr = JSON.stringify(dataModel, null, 4);
-                    this.dataModel = dataModel;
+            const dataModel = this.extractDataModel();
+            var dataModelStr = JSON.stringify(dataModel, null, 4);
+            this.dataModel = dataModel;
 
-                    this.logger.info('Extracted dataModel', dataModelStr);
+            this.logger.info('Extracted dataModel', dataModelStr);
 
-                    return self.blobClient.putFile('dataModel.json', dataModelStr);
-                })
-                .then((jsonFileHash) => {
-                    // Add link from result to this file.
-                    self.result.addArtifact(jsonFileHash);
+            const jsonFileHash = await self.blobClient.putFile('dataModel.json', dataModelStr);
+            // Add link from result to this file.
+            self.result.addArtifact(jsonFileHash);
 
-                    // Create a complex artifact, with links to multiple files.
-                    artifact = self.blobClient.createArtifact('simulator');
+            // Create a complex artifact, with links to multiple files.
+            artifact = self.blobClient.createArtifact('simulator');
 
-                    let programJS = "some javascript file";
-                    self.logger.info('program.js', programJS);
+            let programJS = "some javascript file";
+            self.logger.info('program.js', programJS);
 
-                    return artifact.addFilesAsSoftLinks({
-                        'program.js': programJS,
-                        'index.html': this.pluginMetadata
-                    });
-                })
+            return artifact.addFilesAsSoftLinks({
+                'program.js': programJS,
+                'index.html': this.pluginMetadata
+            });
         }
     }
 }
@@ -336,13 +328,13 @@ type DictionaryAny = { [key: string]: any };
 * Related example using traverse.
 * https://github.com/webgme/xmi-tools/blob/master/src/plugins/XMIExporter/XMIExporter.js#L430
 */
-function test_core_containment_traversal_complete() {
+async function test_core_containment_traversal_complete() {
     const BLANK = "";
     const NULL_OBJECT = "_OBJECT"
     const NULL_GUID = "00000000-0000-0000-0000-000000000000";
 
-    function getEdgesModel(sponsor: PluginBase, core: Core.Core,
-        _rootNode: Common.Node, _metaNode: Common.Node): Core.Dictionary {
+    async function getEdgesModel(sponsor: PluginBase, core: Core.Core,
+        _rootNode: Common.Node, _metaNode: Common.Node): Promise<Core.Dictionary> {
 
         let fcoName = core.getAttribute(core.getFCO(sponsor.rootNode), "name");
         let languageName = core.getAttribute(sponsor.rootNode, "name");
@@ -389,7 +381,7 @@ function test_core_containment_traversal_complete() {
          * The traverse function follows the containment tree.
          * @type {[type]}
          */
-        let visitFn = (node: Node, done: Common.VoidFn): void => {
+        let visitFn = async (node: Node, done: Common.VoidFn): Promise<void> => {
             try {
                 let core = sponsor.core;
                 let nodePath: string = core.getPath(node);
@@ -486,133 +478,113 @@ function test_core_containment_traversal_complete() {
                 });
 
                 // get pointers & inv_pointers
-                Promise
-                    .try(() => {
-                        return core.getPointerNames(node);
-                    })
-                    .map((ptrName: string) => {
-                        let targetPathRaw = core.getPointerPath(node, ptrName);
-                        if (typeof targetPathRaw !== "string") { return; }
+                const ptrNames = await core.getPointerNames(node);
+                Promise.all(ptrNames.map(async ptrName => {
+                    let targetPathRaw = core.getPointerPath(node, ptrName);
+                    if (typeof targetPathRaw !== "string") { return; }
 
-                        let targetPath: string = targetPathRaw;
-                        Promise
-                            .try(() => {
-                                return core.loadByPath(sponsor.rootNode, targetPath);
-                            })
-                            .then((targetNode: Node) => {
-                                let targetGuid = core.getGuid(targetNode);
-                                if (ptrName === "base") {
+                    let targetPath: string = targetPathRaw;
+                    const targetNode = core.loadByPath(sponsor.rootNode, targetPath);
+                    let targetGuid = core.getGuid(targetNode);
+                    if (ptrName === "base") {
 
-                                } else {
-                                    let pointers: DictionaryAny = sourceEntry.pointers;
-                                    let targetMetaNode = core.getBaseType(targetNode);
-                                    let targetMetaName = core.getAttribute(targetMetaNode, "name");
-                                    if (typeof targetMetaName === "string") {
-                                        pointers[ptrName] = {
-                                            name: targetMetaName,
-                                            guid: targetGuid
-                                        };
-                                    }
-                                    let targetEntry = nodeGuidMap[targetGuid];
-                                    if (targetEntry === undefined) {
-                                        targetEntry = {
-                                            "name": {},
-                                            "guid": targetGuid,
-                                            "pointers": {}, "inv_pointers": {},
-                                            "sets": {}, "inv_sets": {}
-                                        };
-                                        nodeGuidMap[targetGuid] = targetEntry;
-                                    }
-                                    targetEntry.inv_pointers[ptrName] = {
-                                        name: targetMetaName,
-                                        guid: sourceGuid
-                                    };
-                                }
-                            });
-                    });
+                    } else {
+                        let pointers: DictionaryAny = sourceEntry.pointers;
+                        let targetMetaNode = core.getBaseType(targetNode);
+                        let targetMetaName = core.getAttribute(targetMetaNode, "name");
+                        if (typeof targetMetaName === "string") {
+                            pointers[ptrName] = {
+                                name: targetMetaName,
+                                guid: targetGuid
+                            };
+                        }
+                        let targetEntry = nodeGuidMap[targetGuid];
+                        if (targetEntry === undefined) {
+                            targetEntry = {
+                                "name": {},
+                                "guid": targetGuid,
+                                "pointers": {}, "inv_pointers": {},
+                                "sets": {}, "inv_sets": {}
+                            };
+                            nodeGuidMap[targetGuid] = targetEntry;
+                        }
+                        targetEntry.inv_pointers[ptrName] = {
+                            name: targetMetaName,
+                            guid: sourceGuid
+                        };
+                    }
+                }));
 
                 // get sets & inv_set
-                Promise
-                    .try(() => {
-                        return core.getValidSetNames(node);
-                    })
-                    .map((setName: string) => {
-                        let targetMemberPathsRaw = core.getMemberPaths(node, setName);
-                        for (let targetMemberPath of targetMemberPathsRaw) {
-                            if (typeof targetMemberPath !== "string") { return; }
-                            let targetPath: string = targetMemberPath;
+                const setNames = await core.getValidSetNames(node);
+                Promise.all(setNames.map(setName => {
+                    let targetMemberPathsRaw = core.getMemberPaths(node, setName);
+                    for (let targetMemberPath of targetMemberPathsRaw) {
+                        if (typeof targetMemberPath !== "string") { return; }
+                        let targetPath: string = targetMemberPath;
 
-                            Promise
-                                .try(() => {
-                                    return core.loadByPath(sponsor.rootNode, targetPath);
-                                })
-                                .then((targetNode: Node) => {
-                                    let targetGuid = core.getGuid(targetNode);
-                                    let sets: DictionaryAny = sourceEntry.sets;
-                                    let targetMetaNode = core.getBaseType(targetNode);
-                                    let targetMetaName = core.getAttribute(targetMetaNode, "name");
-                                    if (typeof targetMetaName === "string") {
-                                        let load = {
-                                            name: targetMetaName,
-                                            guid: targetGuid
-                                        };
-                                        let sourceSet = sets[setName];
-                                        if (sourceSet === undefined) {
-                                            sets[setName] = [load];
-                                        } else {
-                                            sourceSet.push(load);
-                                        }
-                                    }
-                                    let targetEntry = nodeGuidMap[targetGuid];
-                                    if (targetEntry === undefined) {
-                                        targetEntry = {
-                                            "name": {},
-                                            "guid": targetGuid,
-                                            "pointers": {}, "inv_pointers": {},
-                                            "sets": {}, "inv_sets": {}
-                                        };
-                                        nodeGuidMap[targetGuid] = targetEntry;
-                                    }
-                                    let invSets = targetEntry.inv_sets;
-                                    let targetSet = invSets[setName];
-                                    let invLoad = {
-                                        name: targetMetaName,
-                                        guid: sourceGuid
-                                    };
-                                    if (targetSet === undefined) {
-                                        invSets[setName] = [invLoad];
-                                    } else {
-                                        targetSet.push(invLoad);
-                                    };
-                                })
-                                .catch((err: Error) => {
-                                    console.log(`difficulty loading target path: ${targetPath} with err: ${err.message}`);
-                                    let load = {
-                                        "fault": `could not load member path: ${targetPath}`
-                                    };
-                                    let sets: DictionaryAny = sourceEntry.sets;
-                                    let sourceSet = sets[setName];
-                                    if (sourceSet === undefined) {
-                                        sets[setName] = [load];
-                                    } else {
-                                        sourceSet.push(load);
-                                    }
-                                });
+                        try {
+                            const targetNode = core.loadByPath(sponsor.rootNode, targetPath);
+                            let targetGuid = core.getGuid(targetNode);
+                            let sets: DictionaryAny = sourceEntry.sets;
+                            let targetMetaNode = core.getBaseType(targetNode);
+                            let targetMetaName = core.getAttribute(targetMetaNode, "name");
+                            if (typeof targetMetaName === "string") {
+                                let load = {
+                                    name: targetMetaName,
+                                    guid: targetGuid
+                                };
+                                let sourceSet = sets[setName];
+                                if (sourceSet === undefined) {
+                                    sets[setName] = [load];
+                                } else {
+                                    sourceSet.push(load);
+                                }
+                            }
+                            let targetEntry = nodeGuidMap[targetGuid];
+                            if (targetEntry === undefined) {
+                                targetEntry = {
+                                    "name": {},
+                                    "guid": targetGuid,
+                                    "pointers": {}, "inv_pointers": {},
+                                    "sets": {}, "inv_sets": {}
+                                };
+                                nodeGuidMap[targetGuid] = targetEntry;
+                            }
+                            let invSets = targetEntry.inv_sets;
+                            let targetSet = invSets[setName];
+                            let invLoad = {
+                                name: targetMetaName,
+                                guid: sourceGuid
+                            };
+                            if (targetSet === undefined) {
+                                invSets[setName] = [invLoad];
+                            } else {
+                                targetSet.push(invLoad);
+                            };
                         }
-                    });
+                        catch (err) {
+                            console.log(`difficulty loading target path: ${targetPath} with err: ${err.message}`);
+                            let load = {
+                                "fault": `could not load member path: ${targetPath}`
+                            };
+                            let sets: DictionaryAny = sourceEntry.sets;
+                            let sourceSet = sets[setName];
+                            if (sourceSet === undefined) {
+                                sets[setName] = [load];
+                            } else {
+                                sourceSet.push(load);
+                            }
+                        }
+                    }
+                }));
             } finally {
                 done();
             }
         };
-        return Promise
-            .try<void>(() => {
-                return core.traverse(sponsor.rootNode,
-                    { excludeRoot: false },
-                    visitFn);
-            })
-            .then(() => {
-                return nodeGuidMap;
-            });
+
+        await core.traverse(sponsor.rootNode, { excludeRoot: false }, visitFn);
+        return nodeGuidMap;
     }
 }
 
diff --git a/types/webix/index.d.ts b/types/webix/index.d.ts
index f5d2954d7a..2ddc28403a 100755
--- a/types/webix/index.d.ts
+++ b/types/webix/index.d.ts
@@ -200,7 +200,7 @@ function delay(code:WebixCallback, owner?:any, params?:any[], delay?:number):num
 function detachEvent(id:string):void;
 function dp(name:string):any;
 function editStop():void;
-function event(node:HTMLElement|string, event:string, handler:WebixCallback, context?:any):string|number;
+function event(node:HTMLElement|Window|string, event:string, handler:WebixCallback, context?:any):string|number;
 function eventRemove(id:string|number):void;
 function exec(code:string):void;
 function extend(target:any, source:any, overwrite?:boolean):any;
@@ -811,7 +811,7 @@ interface TreeCollection{
 	clearAll():void;
 	clearValidation():void;
 	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
-	count():number;	
+	count():number;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
diff --git a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
index 3764a6b9aa..a4b1d57822 100644
--- a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
+++ b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
@@ -27,7 +27,7 @@ webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, {
 });
 
 const app = express();
-app.use(webpackDevMiddlewareInstance);
+app.use([webpackDevMiddlewareInstance]);
 
 webpackDevMiddlewareInstance.close();
 webpackDevMiddlewareInstance.invalidate();
diff --git a/types/webpack-stream/index.d.ts b/types/webpack-stream/index.d.ts
index 74b8d01544..d5cb6186ee 100644
--- a/types/webpack-stream/index.d.ts
+++ b/types/webpack-stream/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ian Clanton-Thuon <https://github.com/iclanton>, Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="node" />
+/// <reference types="node" />
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 9e5d106b80..cc686b93b0 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 2.2
+// Type definitions for webpack 3.0
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Matt Lewis <https://github.com/mattlewis92>
@@ -881,6 +881,7 @@ declare namespace webpack {
     }
 
     namespace optimize {
+        class ModuleConcatenationPlugin extends Plugin {}
         class AggressiveMergingPlugin extends Plugin {
             constructor(options?: AggressiveMergingPlugin.Options);
         }
@@ -907,7 +908,59 @@ declare namespace webpack {
         }
 
         class CommonsChunkPlugin extends Plugin {
-            constructor(options?: any);
+            constructor(options?: CommonsChunkPlugin.Options);
+        }
+
+        namespace CommonsChunkPlugin {
+            type MinChunksFn = (module: any, count: number) => boolean;
+
+            interface Options {
+                /**
+                 * The chunk name of the commons chunk. An existing chunk can be selected by passing a name of an existing chunk.
+                 * If an array of strings is passed this is equal to invoking the plugin multiple times for each chunk name.
+                 * If omitted and `options.async` or `options.children` is set all chunks are used,
+                 * otherwise `options.filename` is used as chunk name.
+                 */
+                name?: string;
+                names?: string[];
+
+                /**
+                 * The filename template for the commons chunk. Can contain the same placeholders as `output.filename`.
+                 * If omitted the original filename is not modified (usually `output.filename` or `output.chunkFilename`).
+                 */
+                filename?: string;
+
+                /**
+                 * The minimum number of chunks which need to contain a module before it's moved into the commons chunk.
+                 * The number must be greater than or equal 2 and lower than or equal to the number of chunks.
+                 * Passing `Infinity` just creates the commons chunk, but moves no modules into it.
+                 * By providing a `function` you can add custom logic. (Defaults to the number of chunks)
+                 */
+                minChunks?: number | MinChunksFn;
+
+                /**
+                 * Select the source chunks by chunk names. The chunk must be a child of the commons chunk.
+                 * If omitted all entry chunks are selected.
+                 */
+                chunks?: string[];
+
+                /**
+                 * If `true` all children of the commons chunk are selected
+                 */
+                children?: boolean;
+
+                /**
+                 * If `true` a new async commons chunk is created as child of `options.name` and sibling of `options.chunks`.
+                 * It is loaded in parallel with `options.chunks`. It is possible to change the name of the output file
+                 * by providing the desired string instead of `true`.
+                 */
+                async?: boolean | string;
+
+                /**
+                 * Minimum size of all common module before a commons chunk is created.
+                 */
+                minSize?: number;
+            }
         }
 
         /** @deprecated */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 066bdfb740..6c7095483d 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -585,14 +585,6 @@ class TestResolvePlugin implements webpack.ResolvePlugin {
     }
 }
 
-const resolve: webpack.Resolve = {
-    plugins: [
-        new TestResolvePlugin()
-    ],
-    symlinks: false,
-    cachePredicate: 'boo' // why does this test _not_ fail!?
-};
-
 const performance: webpack.Options.Performance = {
     hints: 'error',
     maxEntrypointSize: 400000,
diff --git a/types/why-did-you-update/index.d.ts b/types/why-did-you-update/index.d.ts
index 4cd4567223..593cf6791d 100644
--- a/types/why-did-you-update/index.d.ts
+++ b/types/why-did-you-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/garbles/why-did-you-update
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 /// <reference types="react" />
 
@@ -13,4 +13,3 @@ declare module "why-did-you-update" {
 	}
 	export function whyDidYouUpdate(react: typeof React, options?: Options): void;
 }
-
diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
index d28a83b574..a189f03c22 100644
--- a/types/winston/index.d.ts
+++ b/types/winston/index.d.ts
@@ -400,7 +400,7 @@ declare namespace winston {
         label?: string;
         depth?: number;
 
-        timestamp: boolean | (() => string | boolean);
+        timestamp?: boolean | (() => string | boolean);
         stringify?(obj: any): string;
     }
 
diff --git a/types/words-to-numbers/index.d.ts b/types/words-to-numbers/index.d.ts
new file mode 100644
index 0000000000..97ab92be8b
--- /dev/null
+++ b/types/words-to-numbers/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for words-to-numbers 1.2
+// Project: https://github.com/finnfiddle/words-to-numbers
+// Definitions by: James Frowen <https://github.com/James-Frowen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export declare function wordsToNumbers(text: string, options?: { fuzzy: boolean }): string | number | null;
+export default wordsToNumbers;
diff --git a/types/words-to-numbers/tsconfig.json b/types/words-to-numbers/tsconfig.json
new file mode 100644
index 0000000000..282bfbae59
--- /dev/null
+++ b/types/words-to-numbers/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "words-to-numbers-tests.ts"
+    ]
+}
diff --git a/types/words-to-numbers/tslint.json b/types/words-to-numbers/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/words-to-numbers/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/words-to-numbers/words-to-numbers-tests.ts b/types/words-to-numbers/words-to-numbers-tests.ts
new file mode 100644
index 0000000000..112c59f068
--- /dev/null
+++ b/types/words-to-numbers/words-to-numbers-tests.ts
@@ -0,0 +1,5 @@
+import { wordsToNumbers } from 'words-to-numbers';
+
+let number = wordsToNumbers("one");
+
+let text = wordsToNumbers("another two", { fuzzy: true });
diff --git a/types/write-json-file/index.d.ts b/types/write-json-file/index.d.ts
new file mode 100644
index 0000000000..41adad8b2c
--- /dev/null
+++ b/types/write-json-file/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for write-json-file 2.2
+// Project: https://github.com/sindresorhus/write-json-file
+// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function writeJsonFile(filepath: string, data: any, options?: writeJsonFile.Options): Promise<void>;
+declare namespace writeJsonFile {
+    type Replacer = (key: string, value: any) => void;
+    interface Options {
+        indent?: string | number;
+        detectIndent?: boolean;
+        sortKeys?: boolean;
+        replacer?: Replacer | Array<number | string> | null;
+        mode?: number;
+    }
+    function sync(filepath: string, data: any, options?: Options): void;
+}
+export = writeJsonFile;
diff --git a/types/write-json-file/tsconfig.json b/types/write-json-file/tsconfig.json
new file mode 100644
index 0000000000..27df25f1f7
--- /dev/null
+++ b/types/write-json-file/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "write-json-file-tests.ts"
+    ]
+}
diff --git a/types/write-json-file/tslint.json b/types/write-json-file/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/write-json-file/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/write-json-file/write-json-file-tests.ts b/types/write-json-file/write-json-file-tests.ts
new file mode 100644
index 0000000000..b61fae2892
--- /dev/null
+++ b/types/write-json-file/write-json-file-tests.ts
@@ -0,0 +1,34 @@
+import * as write from 'write-json-file';
+
+// Basic
+write('foo.json', {foo: true}).then(() => { });
+write.sync('foo.json', {foo: true});
+
+// With options
+const options: write.Options = {
+    indent: '  ',
+    detectIndent: true,
+    sortKeys: true,
+    mode: 0o666
+};
+write('foo.json', {foo: true}, options).then(() => { });
+write.sync('foo.json', {foo: true}, options);
+
+// JSON.stringify replacer
+function replacer(key: any, value: any) {
+  // Filtering out properties
+  if (typeof value === 'string') {
+    return undefined;
+  }
+  return value;
+}
+
+write.sync('foo.json', {foo: true}, {replacer});
+write.sync('foo.json', {foo: true}, {replacer: null});
+write.sync('foo.json', {foo: true}, {replacer: [1, 2, 3]});
+write.sync('foo.json', {foo: true}, {replacer: ['a', 'b', 'c']});
+
+JSON.stringify({foo: true}, replacer);
+JSON.stringify({foo: true}, null);
+JSON.stringify({foo: true}, [1, 2, 3]);
+JSON.stringify({foo: true}, ['a', 'b', 'c']);
diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 9fce6f9dc3..49ae4cfb3e 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -1,31 +1,31 @@
-// Type definitions for ws
-// Project: https://github.com/einaros/ws
+// Type definitions for ws 3.0
+// Project: https://github.com/websockets/ws
 // Definitions by: Paul Loyd <https://github.com/loyd>
+//                 Matt Silverlock <https://github.com/elithrar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-
 import * as events from 'events';
 import * as http from 'http';
 import * as https from 'https';
 import * as net from 'net';
 
+// WebSocket socket.
 declare class WebSocket extends events.EventEmitter {
     static CONNECTING: number;
     static OPEN: number;
     static CLOSING: number;
     static CLOSED: number;
 
-    bytesReceived: number;
-    readyState: number;
-    protocolVersion: string;
-    url: string;
-    supports: any;
-    upgradeReq: http.IncomingMessage;
-    protocol: string;
-    bufferedAmount: number;
     binaryType: string;
+    bufferedAmount: number;
+    bytesReceived: number;
+    extensions: {};
+    protocol: string;
+    protocolVersion: number;
+    readyState: number;
+    url: string;
 
     CONNECTING: number;
     OPEN: number;
@@ -35,7 +35,7 @@ declare class WebSocket extends events.EventEmitter {
     onopen: (event: { target: WebSocket }) => void;
     onerror: (err: Error) => void;
     onclose: (event: { wasClean: boolean; code: number; reason: string; target: WebSocket }) => void;
-    onmessage: (event: { data: any; type: string; target: WebSocket }) => void;
+    onmessage: (event: { data: WebSocket.Data; type: string; target: WebSocket }) => void;
 
     constructor(address: string, options?: WebSocket.IClientOptions);
     constructor(address: string, protocols?: string | string[], options?: WebSocket.IClientOptions);
@@ -64,41 +64,69 @@ declare class WebSocket extends events.EventEmitter {
     // Events
     on(event: 'error', cb: (err: Error) => void): this;
     on(event: 'close', cb: (code: number, message: string) => void): this;
-    on(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'headers', cb: (headers: {}, request: http.IncomingMessage) => void): this;
+    on(event: 'message', cb: (data: WebSocket.Data) => void): this;
+    on(event: 'ping', cb: (data: Buffer) => void): this;
+    on(event: 'pong', cb: (data: Buffer) => void): this;
     on(event: 'open', cb: () => void): this;
+    on(event: 'unexpected-response', cb: (request: http.ClientRequest, response: http.IncomingMessage) => void): this;
     on(event: string, listener: () => void): this;
 
     addListener(event: 'error', cb: (err: Error) => void): this;
     addListener(event: 'close', cb: (code: number, message: string) => void): this;
-    addListener(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
-    addListener(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
-    addListener(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'headers', cb: (headers: {}, request: http.IncomingMessage) => void): this;
+    addListener(event: 'message', cb: (data: WebSocket.Data, flags: { binary: boolean }) => void): this;
+    addListener(event: 'ping', cb: (data: Buffer, flags: { binary: boolean }) => void): this;
+    addListener(event: 'pong', cb: (data: Buffer, flags: { binary: boolean }) => void): this;
     addListener(event: 'open', cb: () => void): this;
+    addListener(event: 'unexpected-response', cb: (request: http.ClientRequest, response: http.IncomingMessage) => void): this;
     addListener(event: string, listener: () => void): this;
 }
 
 declare namespace WebSocket {
+    /**
+     * Data represents the message payload received over the WebSocket.
+     */
+    type Data = string | Buffer | ArrayBuffer | Buffer[];
 
+    /**
+     * CertMeta represents the accepted types for certificate & key data.
+     */
+    type CertMeta = string | string[] | Buffer | Buffer[];
+
+    /**
+     * VerifyClientCallbackSync is a synchronous callback used to inspect the
+     * incoming message. The return value (boolean) of the function determines
+     * whether or not to accept the handshake.
+     */
     type VerifyClientCallbackSync = (info: { origin: string; secure: boolean; req: http.IncomingMessage }) => boolean;
+
+    /**
+     * VerifyClientCallbackAsync is an asynchronous callback used to inspect the
+     * incoming message. The return value (boolean) of the function determines
+     * whether or not to accept the handshake.
+     */
     type VerifyClientCallbackAsync = (info: { origin: string; secure: boolean; req: http.IncomingMessage }
-        , callback: (res: boolean) => void) => void;
+        , callback: (res: boolean, code?: number, message?: string) => void) => void;
 
     export interface IClientOptions {
         protocol?: string;
-        agent?: http.Agent;
+        perMessageDeflate?: boolean | IPerMessageDeflateOptions;
+        localAddress?: string;
+        protocolVersion?: number;
         headers?: { [key: string]: string };
-        protocolVersion?: any;
-        host?: string;
         origin?: string;
-        pfx?: any;
-        key?: any;
-        passphrase?: string;
-        cert?: any;
-        ca?: any[];
-        ciphers?: string;
+        agent?: http.Agent;
+        host?: string;
+        family?: number;
+        checkServerIdentity?: Function;
         rejectUnauthorized?: boolean;
+        passphrase?: string;
+        ciphers?: string;
+        cert?: CertMeta;
+        key?: CertMeta;
+        pfx?: string | Buffer;
+        ca?: CertMeta;
     }
 
     export interface IPerMessageDeflateOptions {
@@ -112,18 +140,18 @@ declare namespace WebSocket {
     export interface IServerOptions {
         host?: string;
         port?: number;
-        server?: http.Server | https.Server;
         backlog?: number;
+        server?: http.Server | https.Server;
         verifyClient?: VerifyClientCallbackAsync | VerifyClientCallbackSync;
         handleProtocols?: any;
         path?: string;
         noServer?: boolean;
-        disableHixie?: boolean;
         clientTracking?: boolean;
         perMessageDeflate?: boolean | IPerMessageDeflateOptions;
         maxPayload?: number;
     }
 
+    // WebSocket Server
     export class Server extends events.EventEmitter {
         options: IServerOptions;
         path: string;
@@ -134,16 +162,19 @@ declare namespace WebSocket {
         close(cb?: (err?: any) => void): void;
         handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
             upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
+        shouldHandle(request: http.IncomingMessage): boolean
 
         // Events
+        on(event: 'connection', cb: (client: WebSocket, request: http.IncomingMessage) => void): this;
         on(event: 'error', cb: (err: Error) => void): this;
-        on(event: 'headers', cb: (headers: string[]) => void): this;
-        on(event: 'connection', cb: (client: WebSocket) => void): this;
+        on(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
+        on(event: 'listening', cb: () => void): this;
         on(event: string, listener: () => void): this;
 
-        addListener(event: 'error', cb: (err: Error) => void): this;
-        addListener(event: 'headers', cb: (headers: string[]) => void): this;
         addListener(event: 'connection', cb: (client: WebSocket) => void): this;
+        addListener(event: 'error', cb: (err: Error) => void): this;
+        addListener(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
+        addListener(event: 'listening', cb: () => void): this;
         addListener(event: string, listener: () => void): this;
     }
 
diff --git a/types/ws/ws-tests.ts b/types/ws/ws-tests.ts
index a015f4c387..4da29311ee 100644
--- a/types/ws/ws-tests.ts
+++ b/types/ws/ws-tests.ts
@@ -1,14 +1,12 @@
 
 import * as WebSocket from 'ws';
-import * as http from'http';
-import * as https from'https';
-
-var WebSocketServer = WebSocket.Server;
+import * as http from 'http';
+import * as https from 'https';
 
 {
     var ws = new WebSocket('ws://www.host.com/path');
     ws.on('open', () => ws.send('something'));
-    ws.on('message', (data, flags) => {});
+    ws.on('message', (data) => {});
 }
 
 {
@@ -21,15 +19,20 @@ var WebSocketServer = WebSocket.Server;
 }
 
 {
-    var wss = new WebSocketServer({port: 8080});
-    wss.on('connection', (ws) => {
+    var wss = new WebSocket.Server({port: 8081});
+    wss.on('connection', (ws, req) => {
         ws.on('message', (message) => console.log('received: %s', message));
         ws.send('something');
     });
+
+    wss.on('headers', (headers, req) => {
+        console.log(`received headers: ${headers}`);
+        console.log(`received request: ${Object.keys(req)}`);
+    });
 }
 
 {
-    var wss = new WebSocketServer({port: 8080});
+    var wss = new WebSocket.Server({port: 8082});
 
     const broadcast = function(data: any) {
         for(var i in wss.clients)
@@ -38,16 +41,16 @@ var WebSocketServer = WebSocket.Server;
 }
 
 {
-    var wsc = new WebSocket('ws://echo.websocket.org/', {
-        protocolVersion: 8,
-        origin: 'http://websocket.org'
-    });
+    var wsc = new WebSocket('ws://echo.websocket.org/');
 
     wsc.on('open',  () => wsc.send(Date.now().toString(), {mask: true}));
     wsc.on('close', () => console.log('disconnected'));
+    wsc.on('error', (error) => {
+        console.log(`unexpected response: ${error}`);
+    });
 
-    wsc.on('message', (data, flags) => {
-        console.log('Roundtrip time: ' + (Date.now() - parseInt(data)) + 'ms', flags);
+    wsc.on('message', (data: string) => {
+        console.log('Roundtrip time: ' + (Date.now() - parseInt(data)) + 'ms');
         setTimeout(() => {
             wsc.send(Date.now().toString(), {mask: true});
         }, 500);
@@ -71,20 +74,23 @@ var WebSocketServer = WebSocket.Server;
     ): void {
         callback(true)
     }
-    
-    var wsv = new WebSocketServer({
-        verifyClient
+
+    var wsv = new WebSocket.Server({
+        server: http.createServer(),
+        clientTracking: true,
+        perMessageDeflate: true
     })
-    
+
     wsv.on('connection', function connection(ws) {
         console.log(ws.protocol)
     })
 }
 
 {
-    new WebSocket.Server({ perMessageDeflate: false });
-    new WebSocket.Server({ perMessageDeflate: { } });
+    new WebSocket.Server({ noServer: true, perMessageDeflate: false });
+    new WebSocket.Server({ noServer: true, perMessageDeflate: { } });
     new WebSocket.Server({
+        noServer: true,
         perMessageDeflate: {
             serverNoContextTakeover: true,
             clientNoContextTakeover: true,
diff --git a/types/x-editable/index.d.ts b/types/x-editable/index.d.ts
index 5daff4c385..cfee505b95 100644
--- a/types/x-editable/index.d.ts
+++ b/types/x-editable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://vitalets.github.io/x-editable/index.html
 // Definitions by: Chris Kirby <https://github.com/sirkirby/>
 // Definitions: https://github.com/sirkirby/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
diff --git a/types/xml-parser/xml-parser-tests.ts b/types/xml-parser/xml-parser-tests.ts
index 7370fb1eba..b5486e8635 100644
--- a/types/xml-parser/xml-parser-tests.ts
+++ b/types/xml-parser/xml-parser-tests.ts
@@ -1,7 +1,5 @@
-/// <reference types="node"/>
-
-import assert = require('assert');
 import parse = require('xml-parser');
+declare var assert: { equal<T>(a: T, b: T): void };
 
 var doc: parse.Document = parse(
   '<?xml version="1.0" encoding="utf-8"?>' +
diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 12d2488cbe..59af909a09 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -1,80 +1,78 @@
-// Type definitions for node-xml2js
+// Type definitions for node-xml2js 0.4
 // Project: https://github.com/Leonidas-from-XIV/node-xml2js
-// Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>, Edward Hinkle <https://github.com/edwardhinkle>
+// Definitions by: Michel Salib <https://github.com/michelsalib>
+//                 Jason McNeil <https://github.com/jasonrm>
+//                 Christopher Currens <https://github.com/ccurrens>
+//                 Edward Hinkle <https://github.com/edwardhinkle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="./processors.d.ts" />
+/// <reference types="node"/>
+import { EventEmitter } from 'events';
 
-export = xml2js;
+export function parseString(xml: convertableToString, callback: (err: any, result: any) => void): void;
+export function parseString(xml: convertableToString, options: OptionsV2, callback: (err: any, result: any) => void): void;
 
-import * as events from 'events'
+export const defaults: {
+    '0.1': Options;
+    '0.2': OptionsV2;
+};
 
-declare namespace xml2js {
-    function parseString(xml: convertableToString, callback: (err: any, result: any) => void): void;
-    function parseString(xml: convertableToString, options: OptionsV2, callback: (err: any, result: any) => void): void;
-
-    var defaults: {
-        '0.1': Options;
-        '0.2': OptionsV2;
-    }
-
-    class Builder {
-        constructor(options?: OptionsV2);
-        buildObject(rootObj: any): string;
-    }
-
-    class Parser extends events.EventEmitter {
-        constructor(options?: OptionsV2);
-        parseString(str: convertableToString, cb?: Function): void;
-        reset(): void;
-    }
-
-    interface Options {
-        async?: boolean;
-        attrkey?: string;
-        attrNameProcessors?: [(name: string) => any];
-        attrValueProcessors?: [(name: string) => any];
-        charkey?: string;
-        charsAsChildren?: boolean;
-        childkey?: string;
-        emptyTag?: any;
-        explicitArray?: boolean;
-        explicitCharkey?: boolean;
-        explicitChildren?: boolean;
-        explicitRoot?: boolean;
-        ignoreAttrs?: boolean;
-        includeWhiteChars?: boolean;
-        mergeAttrs?: boolean;
-        normalize?: boolean;
-        normalizeTags?: boolean;
-        strict?: boolean;
-        tagNameProcessors?: [(name: string) => any];
-        trim?: boolean;
-        validator?: Function;
-        valueProcessors?: [(name: string) => any];
-        xmlns?: boolean;
-    }
-
-    interface OptionsV2 extends Options {
-        preserveChildrenOrder?: boolean;
-        rootName?: string;
-        xmldec?: {
-            version: string;
-            encoding?: string;
-            standalone?: boolean;
-        };
-        doctype?: any;
-        renderOpts?: {
-            pretty?: boolean;
-            indent?: string;
-            newline?: string;
-        };
-        headless?: boolean;
-        chunkSize?: number;
-        cdata?: boolean;
-    }
-
-    interface convertableToString {
-        toString(): string;
-    }
+export class Builder {
+    constructor(options?: OptionsV2);
+    buildObject(rootObj: any): string;
+}
+
+export class Parser extends EventEmitter {
+    constructor(options?: OptionsV2);
+    parseString(str: convertableToString, cb?: Function): void;
+    reset(): void;
+}
+
+export interface Options {
+    async?: boolean;
+    attrkey?: string;
+    attrNameProcessors?: [(name: string) => any];
+    attrValueProcessors?: [(name: string) => any];
+    charkey?: string;
+    charsAsChildren?: boolean;
+    childkey?: string;
+    emptyTag?: any;
+    explicitArray?: boolean;
+    explicitCharkey?: boolean;
+    explicitChildren?: boolean;
+    explicitRoot?: boolean;
+    ignoreAttrs?: boolean;
+    includeWhiteChars?: boolean;
+    mergeAttrs?: boolean;
+    normalize?: boolean;
+    normalizeTags?: boolean;
+    strict?: boolean;
+    tagNameProcessors?: [(name: string) => any];
+    trim?: boolean;
+    validator?: Function;
+    valueProcessors?: [(name: string) => any];
+    xmlns?: boolean;
+}
+
+export interface OptionsV2 extends Options {
+    preserveChildrenOrder?: boolean;
+    rootName?: string;
+    xmldec?: {
+        version: string;
+        encoding?: string;
+        standalone?: boolean;
+    };
+    doctype?: any;
+    renderOpts?: {
+        pretty?: boolean;
+        indent?: string;
+        newline?: string;
+    };
+    headless?: boolean;
+    chunkSize?: number;
+    cdata?: boolean;
+}
+
+export interface convertableToString {
+    toString(): string;
 }
diff --git a/types/xml2js/lib/processors.d.ts b/types/xml2js/lib/processors.d.ts
new file mode 100644
index 0000000000..e767cca99d
--- /dev/null
+++ b/types/xml2js/lib/processors.d.ts
@@ -0,0 +1,9 @@
+export function firstCharLowerCase(name: string): string;
+
+export function normalize(name: string): string;
+
+export function parseBooleans(name: string): boolean;
+
+export function parseNumbers(name: string): number;
+
+export function stripPrefix(name: string): string;
diff --git a/types/xml2js/processors.d.ts b/types/xml2js/processors.d.ts
deleted file mode 100644
index 008a56964f..0000000000
--- a/types/xml2js/processors.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-declare module 'xml2js/lib/processors' {
-    export function firstCharLowerCase(name: string): string;
-
-    export function normalize(name: string): string;
-
-    export function parseBooleans(name: string): boolean;
-
-    export function parseNumbers(name: string): number;
-
-    export function stripPrefix(name: string): string;
-}
diff --git a/types/xml2js/tsconfig.json b/types/xml2js/tsconfig.json
index 0449642c2f..7c5f5d51f5 100644
--- a/types/xml2js/tsconfig.json
+++ b/types/xml2js/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "index.d.ts",
+        "lib/processors.d.ts",
         "xml2js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/xml2js/tslint.json b/types/xml2js/tslint.json
new file mode 100644
index 0000000000..0481faf67d
--- /dev/null
+++ b/types/xml2js/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // All TODOs
+        "ban-types": false
+    }
+}
diff --git a/types/xml2js/xml2js-tests.ts b/types/xml2js/xml2js-tests.ts
index 8ee7b7ce25..4ee1c04e5a 100644
--- a/types/xml2js/xml2js-tests.ts
+++ b/types/xml2js/xml2js-tests.ts
@@ -1,7 +1,6 @@
-/// <reference types="node"/>
-
 import xml2js = require('xml2js');
 import * as processors from 'xml2js/lib/processors';
+import fs = require('fs');
 
 xml2js.parseString('<root>Hello xml2js!</root>', (err: any, result: any) => { });
 
@@ -40,13 +39,13 @@ xml2js.parseString('<root>Hello xml2js!</root>', {
     valueProcessors: [processors.parseBooleans, processors.parseNumbers]
 }, (err: any, result: any) => { });
 
-var builder = new xml2js.Builder({
+let builder = new xml2js.Builder({
     renderOpts: {
         pretty: false
     }
 });
 
-var builder = new xml2js.Builder({
+builder = new xml2js.Builder({
     rootName: 'root',
     renderOpts: {
         pretty: true,
@@ -63,29 +62,27 @@ var builder = new xml2js.Builder({
     cdata: false
 });
 
-var outString = builder.buildObject({
-    'hello': 'xml2js!'
+const outString = builder.buildObject({
+    hello: 'xml2js!'
 });
 
-var parser = new xml2js.Parser();
+const parser = new xml2js.Parser();
 
 parser.on('end', (result: any) => {
     console.log("Parser Finished");
     return;
 });
 
-var v1Defaults = xml2js.defaults['0.1'];
+const v1Defaults = xml2js.defaults['0.1'];
 v1Defaults.async = true;
 
-var v2Defaults = xml2js.defaults['0.2'];
+const v2Defaults = xml2js.defaults['0.2'];
 v2Defaults.async = false;
 v2Defaults.chunkSize = 20000;
 
-import fs = require('fs');
- 
-fs.readFile(__dirname + '/foo.xml', function(err, data) {
-    parser.parseString(data, function (err: any, result: any) {
-        console.dir(result);
-        console.log('Done');
-    });
-});
\ No newline at end of file
+fs.readFile(__dirname + '/foo.xml', (err, data) => {
+    parser.parseString(data, (err: any, result: any) => {
+        console.dir(result);
+        console.log('Done');
+    });
+});
diff --git a/types/xmldoc/index.d.ts b/types/xmldoc/index.d.ts
index 8590c68e16..a4373606d9 100644
--- a/types/xmldoc/index.d.ts
+++ b/types/xmldoc/index.d.ts
@@ -1,11 +1,13 @@
-// Type definitions for xmldoc 0.5.1
+// Type definitions for xmldoc 1.1
 // Project: https://www.npmjs.com/package/xmldoc
-// Definitions by: Xavier Stouder <https://github.com/Xstoudi>
-// Definitions: https://github.com/DefinitelyTyped/
+// Definitions by:  Xavier Stouder <https://github.com/Xstoudi>, Andrew Sheehan <https://github.com/ajsheehan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped): // TypeScript Version: 2.1
 
 export class XmlDocument {
     constructor(xmlString: string);
 
+    doctype: string;
+
     eachChild(func: (child: XmlElement, index?: number, array?: XmlElement[]) => void): void;
     childNamed(name: string): XmlElement;
     childrenNamed(name: string): XmlElement[];
@@ -13,8 +15,19 @@ export class XmlDocument {
     descendantWithPath(path: string): XmlElement;
     valueWithPath(path: string): string;
     toString(opts?: XmlOptions): string;
+    toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }
+
 export class XmlElement {
+    constructor(tag: XmlElement);
+
+    name: string;
+    attr: XmlAttributes;
+    val: string;
+    children: XmlElement[];
+    firstChild: XmlElement;
+    lastChild: XmlElement;
+
     eachChild(func: (child: XmlElement, index?: number, array?: XmlElement[]) => void): void;
     childNamed(name: string): XmlElement;
     childrenNamed(name: string): XmlElement[];
@@ -22,10 +35,42 @@ export class XmlElement {
     descendantWithPath(path: string): XmlElement;
     valueWithPath(path: string): string;
     toString(opts?: XmlOptions): string;
+    toStringWithIndent(indent: string, opts?: XmlOptions): string;
+}
+
+export class XmlTextNode {
+    constructor(text: string);
+
+    toString(opts?: XmlOptions): string;
+    toStringWithIndent(indent: string, opts?: XmlOptions): string;
+}
+
+export class XmlCDataNode {
+    constructor(cdata: string);
+
+    toString(opts?: XmlOptions): string;
+    toStringWithIndent(indent: string, opts?: XmlOptions): string;
+}
+
+export class XmlCommentNode {
+    constructor(comment: string);
+
+    toString(opts?: XmlOptions): string;
+    toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }
 
 export interface XmlOptions {
     compressed?: boolean;
-    trimmed?: boolean;
+    html?: boolean;
     preserveWhitespace?: boolean;
+    trimmed?: boolean;
+}
+
+export interface XmlTag {
+    name: string;
+    attributes: XmlAttributes;
+}
+
+export interface XmlAttributes {
+    [key: string]: string;
 }
diff --git a/types/xmldoc/tslint.json b/types/xmldoc/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/xmldoc/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/xmldoc/xmldoc-tests.ts b/types/xmldoc/xmldoc-tests.ts
index 09a3f35d9e..5698bac85b 100644
--- a/types/xmldoc/xmldoc-tests.ts
+++ b/types/xmldoc/xmldoc-tests.ts
@@ -1,4 +1,44 @@
 import * as xmldoc from "xmldoc";
 
-const doc = new xmldoc.XmlDocument("<poney>magic</poney>");
-console.log(doc.toString());
\ No newline at end of file
+//
+// https://github.com/nfarina/xmldoc#usage
+//
+const document = new xmldoc.XmlDocument("<some>xml</some>");
+
+//
+// https://github.com/nfarina/xmldoc#descendantwithpathpath
+//
+const bookNode = new xmldoc.XmlDocument(`
+    <book>
+    <author>
+        <name isProper="true">George R. R. Martin</name>
+        ...
+    </author>
+    ...
+    </book>`);
+
+const nameNode = bookNode.descendantWithPath("author.name"); // return <name> node
+
+//
+// https://github.com/nfarina/xmldoc#valuewithpathpath
+//
+const authorName = bookNode.valueWithPath("author.name");               // return "George R. R. Martin"
+const authorIsProper = bookNode.valueWithPath("author.name@isProper");  // return "true"
+
+//
+// https://github.com/nfarina/xmldoc#tostringoptions
+//
+document.toString({ compressed: true });            // strips indents and linebreaks
+document.toString({ trimmed: true });               // trims long strings for easier debugging
+document.toString({ preserveWhitespace: true });    // prevents whitespace being removed from around element values
+
+const xml = "<author><name>looooooong value</name></author>";
+console.log("My document: \n" + new xmldoc.XmlDocument(xml).toString({ trimmed: true }));
+/* Prints:
+
+My Document:
+<hello>
+  loooooooo…
+</hello>
+
+*/
diff --git a/types/xterm/index.d.ts b/types/xterm/index.d.ts
index 603e8335c1..37bc104747 100644
--- a/types/xterm/index.d.ts
+++ b/types/xterm/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for xterm.js 2.0.1
 // Project: https://github.com/sourcelair/xterm.js/
 // Definitions by: Steven Silvester <https://github.com/blink1073>
+//                 Lucian Buzzo <https://github.com/LucianBuzzo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -8,6 +9,10 @@
  */
 interface Xterm {
 
+  cols: number;
+
+  rows: number;
+
   options: Xterm.IOptions;
 
   element: HTMLElement;
@@ -30,7 +35,7 @@ interface Xterm {
 
   off(event: string, callback: (...args: any[]) => void): void;
 
-  open(parent: HTMLElement): void;
+  open(parent: HTMLElement, focus?: boolean): void;
 
   refresh(start: number, end: number, queue?: boolean): void;
 
@@ -45,6 +50,8 @@ interface Xterm {
   write(text: string): void;
 
   writeln(text: string): void;
+
+  fit?(): void;
 }
 
 
diff --git a/types/yfiles/yfiles-tests.ts b/types/yfiles/yfiles-tests.ts
index 05e284529c..1bcaefe8c9 100644
--- a/types/yfiles/yfiles-tests.ts
+++ b/types/yfiles/yfiles-tests.ts
@@ -19,7 +19,7 @@ class BasicTest {
 
         this.graphComponent.inputMode = graphEditorInputMode;
 
-        this.graphComponent.graph.nodeDefaults.style = new yfiles.styles.ShinyPlateNodeStyle(yfiles.view.Fill.ORANGE);
+        this.graphComponent.graph.nodeDefaults.style = new yfiles.styles.ShinyPlateNodeStyle({ fill: yfiles.view.Fill.ORANGE });
 
         this.graphComponent.graph.createNode(new yfiles.geometry.Rect(0, 0, 10, 10), new MyNodeStyle());
 
diff --git a/types/yog-bigpipe/index.d.ts b/types/yog-bigpipe/index.d.ts
new file mode 100644
index 0000000000..2c275f73b2
--- /dev/null
+++ b/types/yog-bigpipe/index.d.ts
@@ -0,0 +1,141 @@
+// Type definitions for yog-bigpipe 0.4
+// Project: https://github.com/fex-team/yog-bigpipe
+// Definitions by: ssddi456 <https://github.com/ssddi456>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from 'events';
+import { Readable } from 'stream';
+import { RequestHandler } from 'express';
+
+interface BigPipeOption {
+    skipAnalysis?: boolean;
+    tpl?: {
+        _default?: string,
+        quickling?: string
+    };
+}
+
+type Callback = (done: (err: any, data: any) => any) => any;
+
+interface AddPageletConfig {
+    id: string;
+    lazy?: boolean;
+    mode?: yogBigpipe.Pagelet.mode;
+}
+
+declare function yogBigpipe(option?: BigPipeOption): RequestHandler;
+
+export = yogBigpipe;
+declare namespace yogBigpipe {
+    class BigPipe extends Readable {
+        constructor(option?: BigPipeOption)
+        map: { [key: string]: Pagelet };
+        pagelets: Pagelet[];
+        pipelines: Pagelet[];
+        rendered: Pagelet[];
+        sources: {};
+        state: Pagelet.status;
+        quicklings: {};
+        parentQuicklings: string[];
+        Pagelet: PageletConstructor<Pagelet>;
+        pageletData: {};
+
+        bind(id: string, fn: Callback): BigPipe;
+
+        bindPageOnly(fn: Callback): void;
+
+        addQuicklingPagelets(pagelets: string[]): void;
+
+        isQuicklingMode(): boolean;
+
+        isQuickingMode(): boolean;
+
+        addPagelet(obj: AddPageletConfig): void;
+
+        isQuicklingWidget(item: { 'mode': Pagelet.mode, [key: string]: any }): void;
+
+        render(): void;
+
+        preparePageOnly(): Promise<any>;
+
+        prepareAllSources(): Promise<any>;
+
+        renderPagelet(pagelet: Pagelet): void;
+
+        destroy(): void;
+
+        _onPageletDone(pagelet: Pagelet): void;
+
+        _checkFinish(): void;
+
+        outputPagelet(pagelet: Pagelet): void;
+
+        format(pagelet: Pagelet): string;
+
+        _markPageletRendered(pagelet: Pagelet): void;
+    }
+
+    type PageletConstructor<T> = new (obj: PageletOption) => T;
+
+    interface PageletOption {
+        id: string;
+        mode?: Pagelet.mode;
+        lazy?: boolean;
+        reqID: string;
+        skipAnalysis: boolean;
+
+        locals?: {};
+        compiled?: boolean;
+        container?: string;
+        for?: string;
+        model: {};
+    }
+    interface PageletData {
+        container: string;
+        reqID: string;
+        id: string;
+        html: string;
+        js: string[];
+        css: string[];
+        styles: string[];
+        scripts: string[];
+    }
+    class Pagelet extends EventEmitter {
+        constructor(obj: PageletOption)
+
+        model: {};
+        container: string;
+        mode: Pagelet.mode;
+        id: string;
+        locals: {};
+        compiled: boolean;
+        reqID: string;
+        skipAnalysis: boolean;
+        state: Pagelet.status;
+        scripts: string[];
+        styles: string[];
+        js: string[];
+        css: string[];
+        html: string;
+
+        addCss(css: string | string[]): void;
+        addCsses(css: string | string[]): void;
+        addJs(css: string | string[]): void;
+        addJses(css: string | string[]): void;
+
+        addScript(css: string | string[]): void;
+        addScripts(css: string | string[]): void;
+        addStyle(css: string | string[]): void;
+        addStyles(css: string | string[]): void;
+
+        destroy(): void;
+
+        start(provider: Promise<any>, sync: boolean): void;
+        toJson(): PageletData;
+    }
+
+    namespace Pagelet {
+        type status = 'pending' | 'rendering' | 'fulfilled' | 'failed';
+        type mode = 'async' | 'pipeline' | 'quickling';
+    }
+}
diff --git a/types/yog-bigpipe/tsconfig.json b/types/yog-bigpipe/tsconfig.json
new file mode 100644
index 0000000000..e2f641476b
--- /dev/null
+++ b/types/yog-bigpipe/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yog-bigpipe-tests.ts"
+    ]
+}
diff --git a/types/yog-bigpipe/tslint.json b/types/yog-bigpipe/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/yog-bigpipe/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/yog-bigpipe/yog-bigpipe-tests.ts b/types/yog-bigpipe/yog-bigpipe-tests.ts
new file mode 100644
index 0000000000..f23ac318a3
--- /dev/null
+++ b/types/yog-bigpipe/yog-bigpipe-tests.ts
@@ -0,0 +1,14 @@
+import yogBigpipe = require("yog-bigpipe");
+
+yogBigpipe();
+yogBigpipe({});
+yogBigpipe({
+    skipAnalysis: true
+});
+
+yogBigpipe({
+    tpl: {
+        _default: '',
+        quickling: '[test]'
+    }
+});
diff --git a/types/yog-log/index.d.ts b/types/yog-log/index.d.ts
new file mode 100644
index 0000000000..ff30bc4b8a
--- /dev/null
+++ b/types/yog-log/index.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for yog-log 0.1
+// Project: https://github.com/fex-team/yog-log
+// Definitions by: ssddi456 <https://github.com/ssddi456>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Request, Response, NextFunction } from "express";
+
+interface LEVELS {
+    // 访问日志
+    0: 'ACCESS';
+    3: 'ACCESS_ERROR';
+    // 应用日志等级 ODP格式
+    1: 'FATAL';
+    2: 'WARNING';
+    4: 'NOTICE';
+    8: 'TRACE';
+    16: 'DEBUG';
+}
+
+type LevelInt = keyof LEVELS | 0 | 3 | 1 | 2 | 4 | 8 | 16;
+type LevelName = LEVELS[LevelInt];
+
+type LogReturn = undefined | false;
+
+interface LogConfig {
+    LogIdName?: string;
+    // 模板文件地址，可以不填
+    data_path?: string;
+    // 用户只需要填写log_path配置
+    log_path?: string;
+
+    debug?: 0 | 1;
+    intLevel?: 16;
+    auto_rotate?: 0 | 1;
+    use_sub_dir?: 0 | 1;
+    IS_ODP?: boolean;
+    IS_OMP?: 0 | 1;
+
+    access_log_path?: string;
+    access_error_log_path?: string;
+
+    access?: string;
+    format_wf?: string;
+}
+
+interface WriteLogConfig {
+    filename_suffix: string;
+    errno: number;
+    escape_msg: boolean;
+}
+
+interface LogInfo {
+    msg: string;
+    custom: {};
+}
+
+type LogInput = string | LogInfo | Error;
+
+declare function yog_log(config?: LogConfig): ((req: Request, resp: Response, next: NextFunction) => any);
+
+declare namespace yog_log {
+    class Logger {
+        constructor(opts: LogConfig, req: Request);
+
+        extend(destination: {}, source: {}): {};
+
+        log(level: string, obj: string | {}): void | false;
+
+        notice(info: LogInput): void | false;
+
+        debug(info: LogInput): void | false;
+
+        fatal(info: LogInput): void | false;
+
+        trace(info: LogInput): void | false;
+
+        warning(info: LogInput): void | false;
+
+        getCookie(name: string): string | false;
+
+        getLogFile(intLevel: LevelInt): string;
+
+        getLogFormat(level: LevelName): string | false;
+
+        getLogID(req: Request, logIDName: string): string;
+
+        getLogLevelInt(level: LevelName): LevelInt | -1;
+
+        getLogPrefix(): string;
+
+        getLogString(format: string): string;
+
+        getParams(name: string): string;
+
+        md5(data: string | Buffer, len: number): string;
+
+        parseCustomLog(obj: {}): void;
+
+        // 解析日志配置，生成相应的模板函数的字符串内容
+        parseFormat(format: string): string;
+
+        parseReqParams(req: Request, res: Response): void | false;
+
+        parseStackInfo(info: LogInfo | Error): void;
+
+        setParams(name: string, value: any): void;
+
+        writeLog(intLevel: LevelInt, options: WriteLogConfig, log_format: string): void | false;
+    }
+
+    function getLogger(config?: LogConfig): Logger;
+}
+
+export = yog_log;
diff --git a/types/yog-log/tsconfig.json b/types/yog-log/tsconfig.json
new file mode 100644
index 0000000000..b4b67074f8
--- /dev/null
+++ b/types/yog-log/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yog-log-tests.ts"
+    ]
+}
diff --git a/types/yog-log/tslint.json b/types/yog-log/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/yog-log/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/yog-log/yog-log-tests.ts b/types/yog-log/yog-log-tests.ts
new file mode 100644
index 0000000000..c6129dd1eb
--- /dev/null
+++ b/types/yog-log/yog-log-tests.ts
@@ -0,0 +1,39 @@
+import yogLog = require('yog-log');
+import express = require('express');
+
+const log = yogLog.getLogger({});
+
+log.log('debug', 'test');
+
+log.notice('test');
+log.debug('test');
+log.fatal('test');
+log.fatal('test');
+log.trace('test');
+log.warning('test');
+
+const cookie_value = log.getCookie('test');
+const getLogFile = log.getLogFile(0);
+const log_format = log.getLogFormat('ACCESS');
+
+const logid = log.getLogID( <express.Request> {}, 'test');
+const intlevel = log.getLogLevelInt('ACCESS');
+const prfix = log.getLogPrefix();
+const log_str = log.getLogString('test');
+const param = log.getParams('test');
+const md5_tag = log.md5('test', 123);
+
+log.parseCustomLog({ test : 1});
+
+const formater = log.parseFormat('test');
+
+log.parseStackInfo(new Error());
+
+log.setParams('test', 'some');
+
+log.writeLog(0, { escape_msg : false, filename_suffix : '123', errno : 0 }, 'test');
+
+const middleware = yogLog({});
+
+const app = express();
+app.get('/', middleware);
diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts
new file mode 100644
index 0000000000..88dceb4de2
--- /dev/null
+++ b/types/yog2-kernel/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for yog2-kernel 1.9
+// Project: https://github.com/fex-team/yog2-kernel
+// Definitions by: ssddi456 <https://github.com/ssddi456>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as express from "express";
+import * as _ from "lodash";
+import * as ral from "node-ral";
+import * as log from "yog-log";
+import * as yogBigpipe from "yog-bigpipe";
+
+declare global {
+    const yog: yog.Yog;
+}
+
+export interface YogBootstrapOption {
+    // 设置yog根目录，默认使用启动文件的目录
+    rootPath?: string;
+    // 设置plugins目录
+    pluginsPath?: string;
+    // 设置conf目录
+    confPath?: string;
+    // 设置app，未设置则直接使用express
+    app?: express.Express;
+}
+export interface Request extends express.Request {
+    CURRENT_APP: string;
+    ral: typeof ral.RAL;
+    ralP: typeof ral.RALPromise;
+}
+export interface Response extends express.Response {
+    bigpipe: yogBigpipe.BigPipe;
+}
+
+export interface ActionObject {
+    get?: express.RequestHandler;
+    post?: express.RequestHandler;
+    put?: express.RequestHandler;
+    delete?: express.RequestHandler;
+    del?: express.RequestHandler;
+    copy?: express.RequestHandler;
+    head?: express.RequestHandler;
+    options?: express.RequestHandler;
+    purge?: express.RequestHandler;
+    lock?: express.RequestHandler;
+    unlock?: express.RequestHandler;
+    propfind?: express.RequestHandler;
+    view?: express.RequestHandler;
+    link?: express.RequestHandler;
+    unlick?: express.RequestHandler;
+    patch?: express.RequestHandler;
+    [key: string]: any;
+}
+
+export interface Router extends express.Router {
+    action(actionName: string): express.RequestHandler | ActionObject;
+    wrapAsync(fn: () => any): express.RequestHandler;
+}
+
+export namespace yog {
+    class Yog {
+        express: typeof express;
+        app: express.Express;
+        _: typeof _;
+
+        log: log.Logger;
+
+        // 当 yog.conf.promise.overrideRAL 为true时，可以当作promise使用
+        ral: typeof ral.RAL | typeof ral.RALPromise;
+        RAL: typeof ral.RAL;
+
+        ralP: typeof ral.RALPromise;
+
+        view: {
+            // 清除viewcache
+            cleanCache(): void;
+        };
+
+        // debug模式时存在
+        reloadApp?(appName: string): void;
+        // debug模式时存在
+        reloadView?(): void;
+        // debug模式时存在
+        reloadIsomorphic?(): void;
+
+        ROOT_PATH: string;
+
+        bootstrap(option: YogBootstrapOption, callback?: () => void): void;
+    }
+}
+
+export default yog;
diff --git a/types/yog2-kernel/tsconfig.json b/types/yog2-kernel/tsconfig.json
new file mode 100644
index 0000000000..f78a6c3483
--- /dev/null
+++ b/types/yog2-kernel/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "target": "es2015",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yog2-kernel-tests.ts"
+    ]
+}
diff --git a/types/yog2-kernel/tslint.json b/types/yog2-kernel/tslint.json
new file mode 100644
index 0000000000..b3fc134bd9
--- /dev/null
+++ b/types/yog2-kernel/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": [
+            false
+        ]
+    }
+}
\ No newline at end of file
diff --git a/types/yog2-kernel/yog2-kernel-tests.ts b/types/yog2-kernel/yog2-kernel-tests.ts
new file mode 100644
index 0000000000..e7267d89d5
--- /dev/null
+++ b/types/yog2-kernel/yog2-kernel-tests.ts
@@ -0,0 +1,29 @@
+import * as yog2Kernel from 'yog2-kernel';
+import { NextFunction } from 'express';
+
+yog.log.notice('some debug');
+yog.log.debug('some debug');
+yog.log.trace('some debug');
+yog.log.warning('some debug');
+yog.log.fatal('some debug');
+
+const handler = async function(req: yog2Kernel.Request, resp: yog2Kernel.Response, next: NextFunction) {
+    const test = await req.ralP("test", {});
+
+    resp.bigpipe.bind("test", function(done) {
+        done(null, 'yeap');
+    });
+
+    resp.render("test", {});
+};
+
+const router = <yog2Kernel.Router> {};
+(<yog2Kernel.ActionObject> router.action("test")).get;
+
+const handler2 = router.wrapAsync(function() { });
+
+yog.bootstrap({});
+
+yog.bootstrap({
+    rootPath: ''
+});
diff --git a/types/youtube/index.d.ts b/types/youtube/index.d.ts
index a45ec6a8c8..11e2a4e30d 100644
--- a/types/youtube/index.d.ts
+++ b/types/youtube/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://developers.google.com/youtube/
 // Definitions by: Daz Wilkin <https://github.com/DazWilkin/>,
 //                 Ian Obermiller <http://ianobermiller.com>,
-//                 Josh Goldberg <https://gitub.com/JoshuaKGoldberg>
+//                 Josh Goldberg <https://github.com/JoshuaKGoldberg>
+//                 Eliot Fallon <https://github.com/eliotfallon213>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -250,6 +251,22 @@ declare namespace YT
 		 */
 		Modest = 1
 	}
+	
+	/**
+	 * Whether to playback video inline or full-screen in an HTML5 player on iOS
+	 */
+	export const enum PlaysInline
+	{
+		/**
+		 * Playback in fullscreen.
+		 */
+		Fullscreen = 0,
+
+		/**
+		 * Playback inline
+		 */
+		Inline = 1
+	}
 
 	/**
 	 * Whether to show related videos after the video finishes.
@@ -266,7 +283,7 @@ declare namespace YT
 		 */
 		Show = 1
 	}
-
+	
 	/**
 	 * Whether to show video information before playing.
 	 */
@@ -518,6 +535,11 @@ declare namespace YT
 		 * Comma separated list of video IDs to play after the URL path's video.
 		 */
 		playlist?: string;
+		
+		/**
+		 * Whether videos play inline or fullscreen in an HTML5 player on iOS. (currently by default, Fullscreen).
+		 */
+		playsinline?: PlaysInline;
 
 		/**
 		 * Whether to show related videos after the video finishes (by default, Show).
diff --git a/types/zeroclipboard/index.d.ts b/types/zeroclipboard/index.d.ts
index 2600359826..e9c6e28dd7 100644
--- a/types/zeroclipboard/index.d.ts
+++ b/types/zeroclipboard/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/zeroclipboard/zeroclipboard
 // Definitions by: Eric J. Smith <https://github.com/ejsmith>, Blake Niemyjski <https://github.com/niemyjski>, György Balássy <https://github.com/balassy>, Leon Yu <https://github.com/leonyu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace ZC {
   // Basic collection types for shorthands and interoperation
@@ -329,13 +330,13 @@ declare namespace ZC {
      * @param {string} eventType
      * @param {EventListener<ZeroClipboardEvent>} listener
      */
-    off(eventType: string, listener: EventListenerOrEventListenerObject<ZeroClipboardEvent>): void;
     off(eventType: "ready", listener: EventListenerOrEventListenerObject<ZeroClipboardReadyEvent>): void;
     off(eventType: "beforecopy", listener: EventListenerOrEventListenerObject<ZeroClipboardBeforeCopyEvent>): void;
     off(eventType: "copy", listener: EventListenerOrEventListenerObject<ZeroClipboardCopyEvent>): void;
     off(eventType: "aftercopy", listener: EventListenerOrEventListenerObject<ZeroClipboardAfterCopyEvent>): void;
     off(eventType: "destroy", listener: EventListenerOrEventListenerObject<ZeroClipboardDestroyEvent>): void;
     off(eventType: "error", listener: EventListenerOrEventListenerObject<ZeroClipboardErrorEvent>): void;
+    off(eventType: string, listener: EventListenerOrEventListenerObject<ZeroClipboardEvent>): void;
     /**
      * Remove a set of eventType to listener function/object mappings.
      * @param {EventListener<ZeroClipboardErrorEvent>} listenerObj
@@ -348,6 +349,16 @@ declare namespace ZC {
       destroy?: EventListenerOrEventListenerObject<ZeroClipboardDestroyEvent>;
       error?: EventListenerOrEventListenerObject<ZeroClipboardErrorEvent>;
     }): void;
+    /**
+     * Remove a set of eventType to listener function/object mappings.
+     */
+    off(eventType: "ready"): void;
+    off(eventType: "beforecopy"): void;
+    off(eventType: "copy"): void;
+    off(eventType: "aftercopy"): void;
+    off(eventType: "destroy"): void;
+    off(eventType: "error"): void;
+    off(eventType: string): void;
     /**
      * Remove ALL listener functions/objects for ALL registered event types.
      */
diff --git a/types/zeroclipboard/v1/index.d.ts b/types/zeroclipboard/v1/index.d.ts
index a2ad3a5cfb..294594c45f 100644
--- a/types/zeroclipboard/v1/index.d.ts
+++ b/types/zeroclipboard/v1/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jonrohan/ZeroClipboard
 // Definitions by: Eric J. Smith <https://github.com/ejsmith>, Blake Niemyjski <https://github.com/niemyjski>, György Balássy <https://github.com/balassy>, Leon Yu <https://github.com/leonyu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare class ZeroClipboard {
     constructor(elements?: Element | { [index: number]: Element }, options?: ZeroClipboardOptions);